tuned exposition of {* ... *};
authorwenzelm
Mon, 20 Oct 2014 21:44:33 +0200
changeset 58725 9402a7f15ed5
parent 58724 e5f809f52f26
child 58726 cee57ab1f76f
tuned exposition of {* ... *};
src/Doc/Isar_Ref/Document_Preparation.thy
src/Doc/Isar_Ref/Outer_Syntax.thy
--- a/src/Doc/Isar_Ref/Document_Preparation.thy	Mon Oct 20 21:32:54 2014 +0200
+++ b/src/Doc/Isar_Ref/Document_Preparation.thy	Mon Oct 20 21:44:33 2014 +0200
@@ -194,8 +194,7 @@
 
   Note that the syntax of antiquotations may \emph{not} include source
   comments @{verbatim "(*"}~@{text "\<dots>"}~@{verbatim "*)"} nor verbatim
-  text @{verbatim "{"}@{verbatim "*"}~@{text "\<dots>"}~@{verbatim
-  "*"}@{verbatim "}"}.
+  text @{verbatim "{*"}~@{text "\<dots>"}~@{verbatim "*}"}.
 
   \begin{description}
   
--- a/src/Doc/Isar_Ref/Outer_Syntax.thy	Mon Oct 20 21:32:54 2014 +0200
+++ b/src/Doc/Isar_Ref/Outer_Syntax.thy	Mon Oct 20 21:44:33 2014 +0200
@@ -148,7 +148,7 @@
     @{syntax_def string} & = & @{verbatim \<open>"\<close>} @{text "\<dots>"} @{verbatim \<open>"\<close>} \\
     @{syntax_def altstring} & = & @{verbatim "`"} @{text "\<dots>"} @{verbatim "`"} \\
     @{syntax_def cartouche} & = & @{verbatim "\<open>"} @{text "\<dots>"} @{verbatim "\<close>"} \\
-    @{syntax_def verbatim} & = & @{verbatim "{*"} @{text "\<dots>"} @{verbatim "*"}@{verbatim "}"} \\[1ex]
+    @{syntax_def verbatim} & = & @{verbatim "{*"} @{text "\<dots>"} @{verbatim "*}"} \\[1ex]
 
     @{text letter} & = & @{text "latin  |  "}@{verbatim \<open>\\<close>}@{verbatim "<"}@{text latin}@{verbatim ">"}@{text "  |  "}@{verbatim \<open>\\<close>}@{verbatim "<"}@{text "latin latin"}@{verbatim ">"}@{text "  |  greek  |"} \\
     @{text subscript} & = & @{verbatim "\<^sub>"} \\
@@ -185,12 +185,10 @@
   @{syntax_ref altstring} are analogous, using single back-quotes
   instead.
 
-  The body of @{syntax_ref verbatim} may consist of any text not
-  containing ``@{verbatim "*"}@{verbatim "}"}''; this allows
-  convenient inclusion of quotes without further escapes.  There is no
-  way to escape ``@{verbatim "*"}@{verbatim "}"}''.  If the quoted
-  text is {\LaTeX} source, one may usually add some blank or comment
-  to avoid the critical character sequence.
+  The body of @{syntax_ref verbatim} may consist of any text not containing
+  ``@{verbatim "*}"}''; this allows to include quotes without further
+  escapes, but there is no way to escape ``@{verbatim "*}"}''. Cartouches
+  do not have this limitation.
 
   A @{syntax_ref cartouche} consists of arbitrary text, with properly
   balanced blocks of ``@{verbatim "\<open>"}~@{text "\<dots>"}~@{verbatim
@@ -263,13 +261,12 @@
 
 subsection \<open>Comments \label{sec:comments}\<close>
 
-text \<open>Large chunks of plain @{syntax text} are usually given
-  @{syntax verbatim}, i.e.\ enclosed in @{verbatim "{"}@{verbatim
-  "*"}~@{text "\<dots>"}~@{verbatim "*"}@{verbatim "}"}, or as @{syntax
-  cartouche} @{text "\<open>\<dots>\<close>"}.  For convenience, any of the smaller text
-  units conforming to @{syntax nameref} are admitted as well.  A
-  marginal @{syntax comment} is of the form @{verbatim "--"}~@{syntax
-  text}.  Any number of these may occur within Isabelle/Isar commands.
+text \<open>Large chunks of plain @{syntax text} are usually given @{syntax
+  verbatim}, i.e.\ enclosed in @{verbatim "{*"}~@{text "\<dots>"}~@{verbatim "*}"},
+  or as @{syntax cartouche} @{text "\<open>\<dots>\<close>"}. For convenience, any of the
+  smaller text units conforming to @{syntax nameref} are admitted as well. A
+  marginal @{syntax comment} is of the form @{verbatim "--"}~@{syntax text}.
+  Any number of these may occur within Isabelle/Isar commands.
 
   @{rail \<open>
     @{syntax_def text}: @{syntax verbatim} | @{syntax cartouche} | @{syntax nameref}