merged
authorwenzelm
Mon Nov 15 14:59:53 2010 +0100 (2010-11-15)
changeset 4054338804edb8cf5
parent 40542 9a173a22771c
parent 40537 8ac69a7960d3
child 40544 34e56a6668ba
child 40549 63a3c8539d41
merged
     1.1 --- a/doc-src/IsarRef/Thy/Quick_Reference.thy	Mon Nov 15 14:59:21 2010 +0100
     1.2 +++ b/doc-src/IsarRef/Thy/Quick_Reference.thy	Mon Nov 15 14:59:53 2010 +0100
     1.3 @@ -22,14 +22,14 @@
     1.4      @{command "next"} & switch blocks \\
     1.5      @{command "note"}~@{text "a = b"} & reconsider facts \\
     1.6      @{command "let"}~@{text "p = t"} & abbreviate terms by higher-order matching \\
     1.7 +    @{command "write"}~@{text "c  (mx)"} & declare local mixfix syntax \\
     1.8    \end{tabular}
     1.9  
    1.10    \medskip
    1.11  
    1.12    \begin{tabular}{rcl}
    1.13 -    @{text "theory\<dash>stmt"} & = & @{command "theorem"}~@{text "name: props proof  |"}~~@{command "definition"}~@{text "\<dots>  |  \<dots>"} \\[1ex]
    1.14      @{text "proof"} & = & @{text "prfx\<^sup>*"}~@{command "proof"}~@{text "method\<^sup>? stmt\<^sup>*"}~@{command "qed"}~@{text "method\<^sup>?"} \\
    1.15 -    & @{text "|"} & @{text "prfx\<^sup>*"}~@{command "done"} \\[1ex]
    1.16 +    & @{text "|"} & @{text "prfx\<^sup>*"}~@{command "done"} \\[0.5ex]
    1.17      @{text prfx} & = & @{command "apply"}~@{text method} \\
    1.18      & @{text "|"} & @{command "using"}~@{text "facts"} \\
    1.19      & @{text "|"} & @{command "unfolding"}~@{text "facts"} \\
    1.20 @@ -37,6 +37,7 @@
    1.21      & @{text "|"} & @{command "next"} \\
    1.22      & @{text "|"} & @{command "note"}~@{text "name = facts"} \\
    1.23      & @{text "|"} & @{command "let"}~@{text "term = term"} \\
    1.24 +    & @{text "|"} & @{command "write"}~@{text "name (mixfix)"} \\
    1.25      & @{text "|"} & @{command "fix"}~@{text "var\<^sup>+"} \\
    1.26      & @{text "|"} & @{command "assume"}~@{text "name: props"} \\
    1.27      & @{text "|"} & @{command "then"}@{text "\<^sup>?"}~@{text goal} \\
    1.28 @@ -57,7 +58,7 @@
    1.29      @{command "hence"} & @{text "\<equiv>"} & @{command "then"}~@{command "have"} \\
    1.30      @{command "thus"} & @{text "\<equiv>"} & @{command "then"}~@{command "show"} \\
    1.31      @{command "from"}~@{text a} & @{text "\<equiv>"} & @{command "note"}~@{text a}~@{command "then"} \\
    1.32 -    @{command "with"}~@{text a} & @{text "\<equiv>"} & @{command "from"}~@{text "a \<AND> this"} \\[1ex]
    1.33 +    @{command "with"}~@{text a} & @{text "\<equiv>"} & @{command "from"}~@{text "a \<AND> this"} \\[0.5ex]
    1.34      @{command "from"}~@{text this} & @{text "\<equiv>"} & @{command "then"} \\
    1.35      @{command "from"}~@{text this}~@{command "have"} & @{text "\<equiv>"} & @{command "hence"} \\
    1.36      @{command "from"}~@{text this}~@{command "show"} & @{text "\<equiv>"} & @{command "thus"} \\
    1.37 @@ -99,9 +100,9 @@
    1.38    \begin{tabular}{ll}
    1.39      @{command "pr"} & print current state \\
    1.40      @{command "thm"}~@{text a} & print fact \\
    1.41 +    @{command "prop"}~@{text \<phi>} & print proposition \\
    1.42      @{command "term"}~@{text t} & print term \\
    1.43 -    @{command "prop"}~@{text \<phi>} & print meta-level proposition \\
    1.44 -    @{command "typ"}~@{text \<tau>} & print meta-level type \\
    1.45 +    @{command "typ"}~@{text \<tau>} & print type \\
    1.46    \end{tabular}
    1.47  *}
    1.48  
     2.1 --- a/doc-src/IsarRef/Thy/document/Quick_Reference.tex	Mon Nov 15 14:59:21 2010 +0100
     2.2 +++ b/doc-src/IsarRef/Thy/document/Quick_Reference.tex	Mon Nov 15 14:59:53 2010 +0100
     2.3 @@ -44,14 +44,14 @@
     2.4      \hyperlink{command.next}{\mbox{\isa{\isacommand{next}}}} & switch blocks \\
     2.5      \hyperlink{command.note}{\mbox{\isa{\isacommand{note}}}}~\isa{{\isaliteral{22}{\isachardoublequote}}a\ {\isaliteral{3D}{\isacharequal}}\ b{\isaliteral{22}{\isachardoublequote}}} & reconsider facts \\
     2.6      \hyperlink{command.let}{\mbox{\isa{\isacommand{let}}}}~\isa{{\isaliteral{22}{\isachardoublequote}}p\ {\isaliteral{3D}{\isacharequal}}\ t{\isaliteral{22}{\isachardoublequote}}} & abbreviate terms by higher-order matching \\
     2.7 +    \hyperlink{command.write}{\mbox{\isa{\isacommand{write}}}}~\isa{{\isaliteral{22}{\isachardoublequote}}c\ \ {\isaliteral{28}{\isacharparenleft}}mx{\isaliteral{29}{\isacharparenright}}{\isaliteral{22}{\isachardoublequote}}} & declare local mixfix syntax \\
     2.8    \end{tabular}
     2.9  
    2.10    \medskip
    2.11  
    2.12    \begin{tabular}{rcl}
    2.13 -    \isa{{\isaliteral{22}{\isachardoublequote}}theory{\isaliteral{5C3C646173683E}{\isasymdash}}stmt{\isaliteral{22}{\isachardoublequote}}} & = & \hyperlink{command.theorem}{\mbox{\isa{\isacommand{theorem}}}}~\isa{{\isaliteral{22}{\isachardoublequote}}name{\isaliteral{3A}{\isacharcolon}}\ props\ proof\ \ {\isaliteral{7C}{\isacharbar}}{\isaliteral{22}{\isachardoublequote}}}~~\hyperlink{command.definition}{\mbox{\isa{\isacommand{definition}}}}~\isa{{\isaliteral{22}{\isachardoublequote}}{\isaliteral{5C3C646F74733E}{\isasymdots}}\ \ {\isaliteral{7C}{\isacharbar}}\ \ {\isaliteral{5C3C646F74733E}{\isasymdots}}{\isaliteral{22}{\isachardoublequote}}} \\[1ex]
    2.14      \isa{{\isaliteral{22}{\isachardoublequote}}proof{\isaliteral{22}{\isachardoublequote}}} & = & \isa{{\isaliteral{22}{\isachardoublequote}}prfx\isaliteral{5C3C5E7375703E}{}\isactrlsup {\isaliteral{2A}{\isacharasterisk}}{\isaliteral{22}{\isachardoublequote}}}~\hyperlink{command.proof}{\mbox{\isa{\isacommand{proof}}}}~\isa{{\isaliteral{22}{\isachardoublequote}}method\isaliteral{5C3C5E7375703E}{}\isactrlsup {\isaliteral{3F}{\isacharquery}}\ stmt\isaliteral{5C3C5E7375703E}{}\isactrlsup {\isaliteral{2A}{\isacharasterisk}}{\isaliteral{22}{\isachardoublequote}}}~\hyperlink{command.qed}{\mbox{\isa{\isacommand{qed}}}}~\isa{{\isaliteral{22}{\isachardoublequote}}method\isaliteral{5C3C5E7375703E}{}\isactrlsup {\isaliteral{3F}{\isacharquery}}{\isaliteral{22}{\isachardoublequote}}} \\
    2.15 -    & \isa{{\isaliteral{22}{\isachardoublequote}}{\isaliteral{7C}{\isacharbar}}{\isaliteral{22}{\isachardoublequote}}} & \isa{{\isaliteral{22}{\isachardoublequote}}prfx\isaliteral{5C3C5E7375703E}{}\isactrlsup {\isaliteral{2A}{\isacharasterisk}}{\isaliteral{22}{\isachardoublequote}}}~\hyperlink{command.done}{\mbox{\isa{\isacommand{done}}}} \\[1ex]
    2.16 +    & \isa{{\isaliteral{22}{\isachardoublequote}}{\isaliteral{7C}{\isacharbar}}{\isaliteral{22}{\isachardoublequote}}} & \isa{{\isaliteral{22}{\isachardoublequote}}prfx\isaliteral{5C3C5E7375703E}{}\isactrlsup {\isaliteral{2A}{\isacharasterisk}}{\isaliteral{22}{\isachardoublequote}}}~\hyperlink{command.done}{\mbox{\isa{\isacommand{done}}}} \\[0.5ex]
    2.17      \isa{prfx} & = & \hyperlink{command.apply}{\mbox{\isa{\isacommand{apply}}}}~\isa{method} \\
    2.18      & \isa{{\isaliteral{22}{\isachardoublequote}}{\isaliteral{7C}{\isacharbar}}{\isaliteral{22}{\isachardoublequote}}} & \hyperlink{command.using}{\mbox{\isa{\isacommand{using}}}}~\isa{{\isaliteral{22}{\isachardoublequote}}facts{\isaliteral{22}{\isachardoublequote}}} \\
    2.19      & \isa{{\isaliteral{22}{\isachardoublequote}}{\isaliteral{7C}{\isacharbar}}{\isaliteral{22}{\isachardoublequote}}} & \hyperlink{command.unfolding}{\mbox{\isa{\isacommand{unfolding}}}}~\isa{{\isaliteral{22}{\isachardoublequote}}facts{\isaliteral{22}{\isachardoublequote}}} \\
    2.20 @@ -59,6 +59,7 @@
    2.21      & \isa{{\isaliteral{22}{\isachardoublequote}}{\isaliteral{7C}{\isacharbar}}{\isaliteral{22}{\isachardoublequote}}} & \hyperlink{command.next}{\mbox{\isa{\isacommand{next}}}} \\
    2.22      & \isa{{\isaliteral{22}{\isachardoublequote}}{\isaliteral{7C}{\isacharbar}}{\isaliteral{22}{\isachardoublequote}}} & \hyperlink{command.note}{\mbox{\isa{\isacommand{note}}}}~\isa{{\isaliteral{22}{\isachardoublequote}}name\ {\isaliteral{3D}{\isacharequal}}\ facts{\isaliteral{22}{\isachardoublequote}}} \\
    2.23      & \isa{{\isaliteral{22}{\isachardoublequote}}{\isaliteral{7C}{\isacharbar}}{\isaliteral{22}{\isachardoublequote}}} & \hyperlink{command.let}{\mbox{\isa{\isacommand{let}}}}~\isa{{\isaliteral{22}{\isachardoublequote}}term\ {\isaliteral{3D}{\isacharequal}}\ term{\isaliteral{22}{\isachardoublequote}}} \\
    2.24 +    & \isa{{\isaliteral{22}{\isachardoublequote}}{\isaliteral{7C}{\isacharbar}}{\isaliteral{22}{\isachardoublequote}}} & \hyperlink{command.write}{\mbox{\isa{\isacommand{write}}}}~\isa{{\isaliteral{22}{\isachardoublequote}}name\ {\isaliteral{28}{\isacharparenleft}}mixfix{\isaliteral{29}{\isacharparenright}}{\isaliteral{22}{\isachardoublequote}}} \\
    2.25      & \isa{{\isaliteral{22}{\isachardoublequote}}{\isaliteral{7C}{\isacharbar}}{\isaliteral{22}{\isachardoublequote}}} & \hyperlink{command.fix}{\mbox{\isa{\isacommand{fix}}}}~\isa{{\isaliteral{22}{\isachardoublequote}}var\isaliteral{5C3C5E7375703E}{}\isactrlsup {\isaliteral{2B}{\isacharplus}}{\isaliteral{22}{\isachardoublequote}}} \\
    2.26      & \isa{{\isaliteral{22}{\isachardoublequote}}{\isaliteral{7C}{\isacharbar}}{\isaliteral{22}{\isachardoublequote}}} & \hyperlink{command.assume}{\mbox{\isa{\isacommand{assume}}}}~\isa{{\isaliteral{22}{\isachardoublequote}}name{\isaliteral{3A}{\isacharcolon}}\ props{\isaliteral{22}{\isachardoublequote}}} \\
    2.27      & \isa{{\isaliteral{22}{\isachardoublequote}}{\isaliteral{7C}{\isacharbar}}{\isaliteral{22}{\isachardoublequote}}} & \hyperlink{command.then}{\mbox{\isa{\isacommand{then}}}}\isa{{\isaliteral{22}{\isachardoublequote}}\isaliteral{5C3C5E7375703E}{}\isactrlsup {\isaliteral{3F}{\isacharquery}}{\isaliteral{22}{\isachardoublequote}}}~\isa{goal} \\
    2.28 @@ -81,7 +82,7 @@
    2.29      \hyperlink{command.hence}{\mbox{\isa{\isacommand{hence}}}} & \isa{{\isaliteral{22}{\isachardoublequote}}{\isaliteral{5C3C65717569763E}{\isasymequiv}}{\isaliteral{22}{\isachardoublequote}}} & \hyperlink{command.then}{\mbox{\isa{\isacommand{then}}}}~\hyperlink{command.have}{\mbox{\isa{\isacommand{have}}}} \\
    2.30      \hyperlink{command.thus}{\mbox{\isa{\isacommand{thus}}}} & \isa{{\isaliteral{22}{\isachardoublequote}}{\isaliteral{5C3C65717569763E}{\isasymequiv}}{\isaliteral{22}{\isachardoublequote}}} & \hyperlink{command.then}{\mbox{\isa{\isacommand{then}}}}~\hyperlink{command.show}{\mbox{\isa{\isacommand{show}}}} \\
    2.31      \hyperlink{command.from}{\mbox{\isa{\isacommand{from}}}}~\isa{a} & \isa{{\isaliteral{22}{\isachardoublequote}}{\isaliteral{5C3C65717569763E}{\isasymequiv}}{\isaliteral{22}{\isachardoublequote}}} & \hyperlink{command.note}{\mbox{\isa{\isacommand{note}}}}~\isa{a}~\hyperlink{command.then}{\mbox{\isa{\isacommand{then}}}} \\
    2.32 -    \hyperlink{command.with}{\mbox{\isa{\isacommand{with}}}}~\isa{a} & \isa{{\isaliteral{22}{\isachardoublequote}}{\isaliteral{5C3C65717569763E}{\isasymequiv}}{\isaliteral{22}{\isachardoublequote}}} & \hyperlink{command.from}{\mbox{\isa{\isacommand{from}}}}~\isa{{\isaliteral{22}{\isachardoublequote}}a\ {\isaliteral{5C3C414E443E}{\isasymAND}}\ this{\isaliteral{22}{\isachardoublequote}}} \\[1ex]
    2.33 +    \hyperlink{command.with}{\mbox{\isa{\isacommand{with}}}}~\isa{a} & \isa{{\isaliteral{22}{\isachardoublequote}}{\isaliteral{5C3C65717569763E}{\isasymequiv}}{\isaliteral{22}{\isachardoublequote}}} & \hyperlink{command.from}{\mbox{\isa{\isacommand{from}}}}~\isa{{\isaliteral{22}{\isachardoublequote}}a\ {\isaliteral{5C3C414E443E}{\isasymAND}}\ this{\isaliteral{22}{\isachardoublequote}}} \\[0.5ex]
    2.34      \hyperlink{command.from}{\mbox{\isa{\isacommand{from}}}}~\isa{this} & \isa{{\isaliteral{22}{\isachardoublequote}}{\isaliteral{5C3C65717569763E}{\isasymequiv}}{\isaliteral{22}{\isachardoublequote}}} & \hyperlink{command.then}{\mbox{\isa{\isacommand{then}}}} \\
    2.35      \hyperlink{command.from}{\mbox{\isa{\isacommand{from}}}}~\isa{this}~\hyperlink{command.have}{\mbox{\isa{\isacommand{have}}}} & \isa{{\isaliteral{22}{\isachardoublequote}}{\isaliteral{5C3C65717569763E}{\isasymequiv}}{\isaliteral{22}{\isachardoublequote}}} & \hyperlink{command.hence}{\mbox{\isa{\isacommand{hence}}}} \\
    2.36      \hyperlink{command.from}{\mbox{\isa{\isacommand{from}}}}~\isa{this}~\hyperlink{command.show}{\mbox{\isa{\isacommand{show}}}} & \isa{{\isaliteral{22}{\isachardoublequote}}{\isaliteral{5C3C65717569763E}{\isasymequiv}}{\isaliteral{22}{\isachardoublequote}}} & \hyperlink{command.thus}{\mbox{\isa{\isacommand{thus}}}} \\
    2.37 @@ -127,9 +128,9 @@
    2.38  \begin{tabular}{ll}
    2.39      \hyperlink{command.pr}{\mbox{\isa{\isacommand{pr}}}} & print current state \\
    2.40      \hyperlink{command.thm}{\mbox{\isa{\isacommand{thm}}}}~\isa{a} & print fact \\
    2.41 +    \hyperlink{command.prop}{\mbox{\isa{\isacommand{prop}}}}~\isa{{\isaliteral{5C3C7068693E}{\isasymphi}}} & print proposition \\
    2.42      \hyperlink{command.term}{\mbox{\isa{\isacommand{term}}}}~\isa{t} & print term \\
    2.43 -    \hyperlink{command.prop}{\mbox{\isa{\isacommand{prop}}}}~\isa{{\isaliteral{5C3C7068693E}{\isasymphi}}} & print meta-level proposition \\
    2.44 -    \hyperlink{command.typ}{\mbox{\isa{\isacommand{typ}}}}~\isa{{\isaliteral{5C3C7461753E}{\isasymtau}}} & print meta-level type \\
    2.45 +    \hyperlink{command.typ}{\mbox{\isa{\isacommand{typ}}}}~\isa{{\isaliteral{5C3C7461753E}{\isasymtau}}} & print type \\
    2.46    \end{tabular}%
    2.47  \end{isamarkuptext}%
    2.48  \isamarkuptrue%
     3.1 --- a/src/Tools/jEdit/README	Mon Nov 15 14:59:21 2010 +0100
     3.2 +++ b/src/Tools/jEdit/README	Mon Nov 15 14:59:53 2010 +0100
     3.3 @@ -60,10 +60,12 @@
     3.4    used in Isabelle sub/superscripts).
     3.5  
     3.6  
     3.7 -Windows/Linux
     3.8 -=============
     3.9 +Known problems with OpenJDK
    3.10 +===========================
    3.11  
    3.12 -- Works best with Sun Java 1.6.x -- avoid OpenJDK for now.
    3.13 +- The 2D rendering engine of OpenJDK 1.6.x distorts the appearance of
    3.14 +  the jEdit text area.  Always use official JRE 1.6.x from
    3.15 +  Sun/Oracle/Apple.
    3.16  
    3.17  
    3.18  Licenses and home sites of contributing systems
    3.19 @@ -77,7 +79,3 @@
    3.20  
    3.21  * Lobo/Cobra: GPL and LGPL
    3.22    http://lobobrowser.org/
    3.23 -
    3.24 -
    3.25 -     Makarius
    3.26 -     31-May-2010