1.1 --- a/doc-src/isar.sty	Fri May 09 12:44:31 2008 +0200
     1.2 +++ b/doc-src/isar.sty	Fri May 09 23:18:52 2008 +0200
     1.3 @@ -12,17 +12,7 @@
     1.4  
     1.5  \newcommand{\indexoutertoken}[1]{\indexdef{}{syntax}{#1}}
     1.6  \newcommand{\indexouternonterm}[1]{\indexdef{}{syntax}{#1}}
     1.7 -\newcommand{\indexisarcmd}[1]{\indexdef{}{command}{#1}}
     1.8  \newcommand{\indexisarelem}[1]{\indexdef{}{element}{#1}}
     1.9 -\newcommand{\indexisarmeth}[1]{\indexdef{}{method}{#1}}
    1.10 -\newcommand{\indexisaratt}[1]{\indexdef{}{attribute}{#1}}
    1.11 -\newcommand{\indexisarthm}[1]{\indexdef{}{fact}{#1}}
    1.12 -\newcommand{\indexisarvar}[1]{\indexdef{}{term}{#1}}
    1.13 -\newcommand{\indexisarcase}[1]{\indexdef{}{case}{#1}}
    1.14 -\newcommand{\indexisarant}[1]{\indexdef{}{antiquotation}{#1}}
    1.15 -\newcommand{\indexisarcmdof}[2]{\indexdef{#1}{command}{#2}}
    1.16 -\newcommand{\indexisarmethof}[2]{\indexdef{#1}{method}{#2}}
    1.17 -\newcommand{\indexisarattof}[2]{\indexdef{#1}{attribute}{#2}}
    1.18  
    1.19  \newcommand{\isasymAND}{\isakeyword{and}}
    1.20  \newcommand{\isasymIS}{\isakeyword{is}}
    1.21 @@ -32,118 +22,8 @@
    1.22  \newcommand{\isasymIN}{\isakeyword{in}}
    1.23  \newcommand{\isasymSTRUCTURE}{\isakeyword{structure}}
    1.24  
    1.25 -\newcommand{\isarkeyword}[1]{{\mathord{\mathbf{#1}}}}
    1.26 -\newcommand{\isarcmd}[1]{\isarkeyword{#1}}
    1.27  \newcommand{\isartrans}[2]{#1 \mathbin{\,\to\,} #2}
    1.28  \newcommand{\isarkeep}[1]{#1 \mathbin{\,\to\,} #1}
    1.29  \newcommand{\isarantiq}{antiquotation}
    1.30  \newcommand{\isarmeth}{method}
    1.31  \newcommand{\isaratt}{attribute}
    1.32 -
    1.33 -\newcommand{\I@optname}[1]{\ifthenelse{\equal{}{#1}}{}{~#1\colon}}
    1.34 -\newcommand{\I@optmeth}[1]{\ifthenelse{\equal{}{#1}}{}{~#1}}
    1.35 -
    1.36 -\newcommand{\AND}{\isarkeyword{and}}
    1.37 -\newcommand{\IN}{\isarkeyword{in}}
    1.38 -\newcommand{\COROLLARYNAME}{\isarkeyword{corollary}}
    1.39 -\newcommand{\LEMMANAME}{\isarkeyword{lemma}}
    1.40 -\newcommand{\THEOREMNAME}{\isarkeyword{theorem}}
    1.41 -\newcommand{\NOTENAME}{\isarkeyword{note}}
    1.42 -\newcommand{\FROMNAME}{\isarkeyword{from}}
    1.43 -\newcommand{\WITHNAME}{\isarkeyword{with}}
    1.44 -\newcommand{\USINGNAME}{\isarkeyword{using}}
    1.45 -\newcommand{\UNFOLDINGNAME}{\isarkeyword{unfolding}}
    1.46 -\newcommand{\FIXESNAME}{\isarkeyword{fixes}}
    1.47 -\newcommand{\CONSTRAINSNAME}{\isarkeyword{constrains}}
    1.48 -\newcommand{\ASSUMESNAME}{\isarkeyword{assumes}}
    1.49 -\newcommand{\DEFINESNAME}{\isarkeyword{defines}}
    1.50 -\newcommand{\NOTESNAME}{\isarkeyword{notes}}
    1.51 -\newcommand{\INCLUDESNAME}{\isarkeyword{includes}}
    1.52 -\newcommand{\FIXNAME}{\isarkeyword{fix}}
    1.53 -\newcommand{\ASSUMENAME}{\isarkeyword{assume}}
    1.54 -\newcommand{\PRESUMENAME}{\isarkeyword{presume}}
    1.55 -\newcommand{\CASENAME}{\isarkeyword{case}}
    1.56 -\newcommand{\HAVENAME}{\isarkeyword{have}}
    1.57 -\newcommand{\SHOWNAME}{\isarkeyword{show}}
    1.58 -\newcommand{\HENCENAME}{\isarkeyword{hence}}
    1.59 -\newcommand{\THUSNAME}{\isarkeyword{thus}}
    1.60 -\newcommand{\PROOFNAME}{\isarkeyword{proof}}
    1.61 -\newcommand{\QEDNAME}{\isarkeyword{qed}}
    1.62 -\newcommand{\BYNAME}{\isarkeyword{by}}
    1.63 -\newcommand{\APPLYNAME}{\isarkeyword{apply}}
    1.64 -\newcommand{\ISNAME}{\isarkeyword{is}}
    1.65 -\newcommand{\CONCLNAME}{\isarkeyword{concl}}
    1.66 -\newcommand{\LETNAME}{\isarkeyword{let}}
    1.67 -\newcommand{\DEFNAME}{\isarkeyword{def}}
    1.68 -\newcommand{\OBTAINNAME}{\isarkeyword{obtain}}
    1.69 -\newcommand{\CMTNAME}{\textbf{---}}
    1.70 -
    1.71 -\newcommand{\THEORY}{\isarkeyword{theory}}
    1.72 -\newcommand{\CONTEXT}{\isarkeyword{context}}
    1.73 -\newcommand{\END}{\isarkeyword{end}}
    1.74 -
    1.75 -\newcommand{\TYPES}{\isarkeyword{types}}
    1.76 -\newcommand{\CONSTS}{\isarkeyword{consts}}
    1.77 -\newcommand{\CONSTDEFS}{\isarkeyword{constdefs}}
    1.78 -\newcommand{\DEFS}{\isarkeyword{defs}}
    1.79 -\newcommand{\AXCLASS}{\isarkeyword{axclass}}
    1.80 -\newcommand{\INSTANCE}{\isarkeyword{instance}}
    1.81 -\newcommand{\INSTANTIATION}{\isarkeyword{instantiation}}
    1.82 -\newcommand{\OVERLOADING}{\isarkeyword{overloading}}
    1.83 -\newcommand{\DECLARE}{\isarkeyword{declare}}
    1.84 -\newcommand{\LEMMAS}{\isarkeyword{lemmas}}
    1.85 -\newcommand{\THEOREMS}{\isarkeyword{theorems}}
    1.86 -\newcommand{\LOCALE}{\isarkeyword{locale}}
    1.87 -\newcommand{\CLASS}{\isarkeyword{class}}
    1.88 -\newcommand{\SUBCLASS}{\isarkeyword{subclass}}
    1.89 -\newcommand{\TEXT}{\isarkeyword{text}}
    1.90 -\newcommand{\TXT}{\isarkeyword{txt}}
    1.91 -\newcommand{\NOTE}[2]{\NOTENAME~\ifthenelse{\equal{}{#1}}{}{#1=}#2}
    1.92 -\newcommand{\FROM}[1]{\FROMNAME~#1}
    1.93 -\newcommand{\WITH}[1]{\WITHNAME~#1}
    1.94 -\newcommand{\USING}[1]{\USINGNAME~#1}
    1.95 -\newcommand{\UNFOLDING}[1]{\UNFOLDINGNAME~#1}
    1.96 -\newcommand{\FIXES}[1]{\FIXESNAME~#1}
    1.97 -\newcommand{\CONSTRAINS}[1]{\CONSTRAINSNAME~#1}
    1.98 -\newcommand{\ASSUMES}[2]{\ASSUMESNAME\I@optname{#1}~#2}
    1.99 -\newcommand{\DEFINES}[2]{\DEFINESNAME\I@optname{#1}~#2}
   1.100 -\newcommand{\NOTES}[2]{\NOTESNAME~\ifthenelse{\equal{}{#1}}{}{#1=}#2}
   1.101 -\newcommand{\INCLUDES}[1]{\INCLUDESNAME~#1}
   1.102 -\newcommand{\SHOWS}[2]{\isarkeyword{shows}\I@optname{#1}~#2}
   1.103 -\newcommand{\FIX}[1]{\FIXNAME~#1}
   1.104 -\newcommand{\ASSUME}[2]{\ASSUMENAME\I@optname{#1}~#2}
   1.105 -\newcommand{\PRESUME}[2]{\PRESUMENAME\I@optname{#1}~#2}
   1.106 -\newcommand{\CASE}[1]{\CASENAME~#1}
   1.107 -\newcommand{\THEN}{\isarkeyword{then}}
   1.108 -\newcommand{\HAVE}[2]{\isarkeyword{have}\I@optname{#1}~#2}
   1.109 -\newcommand{\SHOW}[2]{\isarkeyword{show}\I@optname{#1}~#2}
   1.110 -\newcommand{\HENCE}[2]{\isarkeyword{hence}\I@optname{#1}~#2}
   1.111 -\newcommand{\THUS}[2]{\isarkeyword{thus}\I@optname{#1}~#2}
   1.112 -\newcommand{\COROLLARY}[2]{\COROLLARYNAME\I@optname{#1}~#2}
   1.113 -\newcommand{\LEMMA}[2]{\LEMMANAME\I@optname{#1}~#2}
   1.114 -\newcommand{\THEOREM}[2]{\THEOREMNAME\I@optname{#1}~#2}
   1.115 -\newcommand{\PROOF}[1]{\PROOFNAME\I@optmeth{#1}}
   1.116 -\newcommand{\QED}[1]{\QEDNAME\I@optmeth{#1}}
   1.117 -\newcommand{\BY}[1]{\BYNAME\I@optmeth{#1}}
   1.118 -\newcommand{\BYY}[2]{\BYNAME\I@optmeth{#1}\I@optmeth{#2}}
   1.119 -\newcommand{\APPLY}[1]{\APPLYNAME\I@optmeth{#1}}
   1.120 -\newcommand{\DONE}{\isarkeyword{done}}
   1.121 -\newcommand{\DOT}{\textbf{.}}
   1.122 -\newcommand{\DDOT}{\textbf{.\,.}}
   1.123 -\newcommand{\DDDOT}{\dots}
   1.124 -\newcommand{\IS}[1]{(\ISNAME~#1)}
   1.125 -\newcommand{\ISS}[2]{(\ISNAME~#1~\ISNAME~#2)}
   1.126 -\newcommand{\LET}[1]{\LETNAME~#1}
   1.127 -\newcommand{\DEF}[2]{\DEFNAME\I@optname{#1}~#2}
   1.128 -\newcommand{\ATT}[1]{\ap [#1]}
   1.129 -\newcommand{\CMT}[1]{\CMTNAME~\Text{#1}}
   1.130 -\newcommand{\ALSO}{\isarkeyword{also}}
   1.131 -\newcommand{\FINALLY}{\isarkeyword{finally}}
   1.132 -\newcommand{\MOREOVER}{\isarkeyword{moreover}}
   1.133 -\newcommand{\ULTIMATELY}{\isarkeyword{ultimately}}
   1.134 -\newcommand{\OBTAIN}[3]{\OBTAINNAME~#1~\isarkeyword{where}\I@optname{#2}~#3}
   1.135 -\newcommand{\BG}{\isarkeyword{\textbf{\{}}}
   1.136 -\newcommand{\EN}{\isarkeyword{\textbf{\}}}}
   1.137 -\newcommand{\NEXT}{\isarkeyword{next}}
   1.138 -\newcommand{\SORRY}{\isarkeyword{sorry}}
   1.139 -\newcommand{\OOPS}{\isarkeyword{oops}}