Terminate > html entity references

Fixes #33

diff --git a/doc/info/shapes.html b/doc/info/shapes.html
index b82957560e1217df24bde3c39cf1b4c8d6b4b0c7..7166e818574b8a46f3b4be24c65996219d8ebd1f 100644 (file)
--- a/doc/info/shapes.html
+++ b/doc/info/shapes.html
@@ -451,7 +451,7 @@ that are newer than mid-November 2003. In particular, it is not part
 of release 1.10.</EM>
 <P>
 <B>NOTE:</B><EM>The font markups for bold, italic, underlining, subscript and 
-superscript </EM>(<TT>&lt;B&gt;</TT>, <TT>&lt;I&gt;</TT>, <TT>&lt;U&gt;</TT>, <TT>&lt;SUB&gt</TT> and <TT>&lt;SUP&gt;</TT>) 
+superscript </EM>(<TT>&lt;B&gt;</TT>, <TT>&lt;I&gt;</TT>, <TT>&lt;U&gt;</TT>, <TT>&lt;SUB&gt;</TT> and <TT>&lt;SUP&gt;</TT>) 
 <EM>are only available in versions after 14 October 2011, and 
 the markup for strike-through (<TT>&lt;S&gt;</TT>) requires versions later than 15 September 2013.
 In addition, all of these markups are
@@ -559,27 +559,27 @@ Note that, as in HTML, element and attribute names are case-insensitive.
 <TR>
   <TD ALIGN=RIGHT></TD>
   <TD ALIGN=LEFT>|</TD>
-  <TD ALIGN=LEFT><B>&lt;U&gt;</B> <I>text</I> <B>&lt;/U&gt</B></TD>
+  <TD ALIGN=LEFT><B>&lt;U&gt;</B> <I>text</I> <B>&lt;/U&gt;</B></TD>
 </TR>
 <TR>
   <TD ALIGN=RIGHT></TD>
   <TD ALIGN=LEFT>|</TD>
-  <TD ALIGN=LEFT><B>&lt;O&gt;</B> <I>text</I> <B>&lt;/O&gt</B></TD>
+  <TD ALIGN=LEFT><B>&lt;O&gt;</B> <I>text</I> <B>&lt;/O&gt;</B></TD>
 </TR>
 <TR>
   <TD ALIGN=RIGHT></TD>
   <TD ALIGN=LEFT>|</TD>
-  <TD ALIGN=LEFT><B>&lt;SUB&gt;</B> <I>text</I> <B>&lt;/SUB&gt</B></TD>
+  <TD ALIGN=LEFT><B>&lt;SUB&gt;</B> <I>text</I> <B>&lt;/SUB&gt;</B></TD>
 </TR>
 <TR>
   <TD ALIGN=RIGHT></TD>
   <TD ALIGN=LEFT>|</TD>
-  <TD ALIGN=LEFT><B>&lt;SUP&gt;</B> <I>text</I> <B>&lt;/SUP&gt</B></TD>
+  <TD ALIGN=LEFT><B>&lt;SUP&gt;</B> <I>text</I> <B>&lt;/SUP&gt;</B></TD>
 </TR>
 <TR>
   <TD ALIGN=RIGHT></TD>
   <TD ALIGN=LEFT>|</TD>
-  <TD ALIGN=LEFT><B>&lt;S&gt;</B> <I>text</I> <B>&lt;/S&gt</B></TD>
+  <TD ALIGN=LEFT><B>&lt;S&gt;</B> <I>text</I> <B>&lt;/S&gt;</B></TD>
 </TR>
 <TR>
   <TD ALIGN=RIGHT><I>fonttable</I></TD>
@@ -604,12 +604,12 @@ Note that, as in HTML, element and attribute names are case-insensitive.
 <TR>
   <TD ALIGN=RIGHT></TD>
   <TD ALIGN=LEFT>|</TD>
-  <TD ALIGN=LEFT><B>&lt;U&gt;</B> <I>table</I> <B>&lt;/U&gt</B></TD>
+  <TD ALIGN=LEFT><B>&lt;U&gt;</B> <I>table</I> <B>&lt;/U&gt;</B></TD>
 </TR>
 <TR>
   <TD ALIGN=RIGHT></TD>
   <TD ALIGN=LEFT>|</TD>
-  <TD ALIGN=LEFT><B>&lt;O&gt;</B> <I>table</I> <B>&lt;/O&gt</B></TD>
+  <TD ALIGN=LEFT><B>&lt;O&gt;</B> <I>table</I> <B>&lt;/O&gt;</B></TD>
 </TR>
 <TR>
   <TD ALIGN=RIGHT><I>table</I></TD>
@@ -674,7 +674,7 @@ the label
 <PRE>
 &lt; &lt;U&gt;&lt;TABLE&gt;&lt;TR&gt;&lt;TD&gt;a&lt;/TD&gt;&lt;/TR&gt;&lt;/U&gt;&gt;
 </PRE>
-is not legal. Removing either the space or the &lt;U&gt...&lt;/U&gt will fix this.
+is not legal. Removing either the space or the &lt;U&gt;...&lt;/U&gt; will fix this.
 <P>
 HTML comments are allowed within an HTML string. They can occur anywhere
 provided that, if they contain part of an HTML element, they must contain

diff --git a/doc/infosrc/html.1 b/doc/infosrc/html.1
index dc2d58a882d2cc3a16b15e5c78d9bbe38af6a124..0a31b2cc206ef073704b8b22089c4d4e448f36b2 100644 (file)
--- a/doc/infosrc/html.1
+++ b/doc/infosrc/html.1
@@ -5,7 +5,7 @@ that are newer than mid-November 2003. In particular, it is not part
 of release 1.10.</EM>
 <P>
 <B>NOTE:</B><EM>The font markups for bold, italic, underlining, subscript and 
-superscript </EM>(<TT>&lt;B&gt;</TT>, <TT>&lt;I&gt;</TT>, <TT>&lt;U&gt;</TT>, <TT>&lt;SUB&gt</TT> and <TT>&lt;SUP&gt;</TT>) 
+superscript </EM>(<TT>&lt;B&gt;</TT>, <TT>&lt;I&gt;</TT>, <TT>&lt;U&gt;</TT>, <TT>&lt;SUB&gt;</TT> and <TT>&lt;SUP&gt;</TT>) 
 <EM>are only available in versions after 14 October 2011, and 
 the markup for strike-through (<TT>&lt;S&gt;</TT>) requires versions later than 15 September 2013.
 In addition, all of these markups are

diff --git a/doc/infosrc/html.2 b/doc/infosrc/html.2
index 6a594872c213d97656fe1f0d75361dae1433995b..e0a05510707c3e4e2c532eb0509295f5edeaeeef 100644 (file)
--- a/doc/infosrc/html.2
+++ b/doc/infosrc/html.2
@@ -11,7 +11,7 @@ the label
 <PRE>
 &lt; &lt;U&gt;&lt;TABLE&gt;&lt;TR&gt;&lt;TD&gt;a&lt;/TD&gt;&lt;/TR&gt;&lt;/U&gt;&gt;
 </PRE>
-is not legal. Removing either the space or the &lt;U&gt...&lt;/U&gt will fix this.
+is not legal. Removing either the space or the &lt;U&gt;...&lt;/U&gt; will fix this.
 <P>
 HTML comments are allowed within an HTML string. They can occur anywhere
 provided that, if they contain part of an HTML element, they must contain

diff --git a/doc/infosrc/html_grammar b/doc/infosrc/html_grammar
index ab343f26617025e4922763c0a1524d7ab94f9960..d200d6e445f86cec3318e9cc4d65fe70cbc048be 100644 (file)
--- a/doc/infosrc/html_grammar
+++ b/doc/infosrc/html_grammar
@@ -1,7 +1,7 @@
 label    =  text | fonttable
 text     = textitem | text textitem
-textitem = string | T_<BR/> | T_<FONT> text T_</FONT> | T_<I> text T_</I> | T_<B> text T_</B> | T_<U> text T_</U&gt | T_<O> text T_</O&gt | T_<SUB> text T_</SUB&gt |T_<SUP> text T_</SUP&gt | T_<S> text T_</S&gt
-fonttable =  table | T_<FONT> table  T_</FONT> | T_<I> table T_</I> | T_<B> table T_</B> | T_<U> table T_</U&gt | T_<O> table T_</O&gt
+textitem = string | T_<BR/> | T_<FONT> text T_</FONT> | T_<I> text T_</I> | T_<B> text T_</B> | T_<U> text T_</U> | T_<O> text T_</O> | T_<SUB> text T_</SUB> |T_<SUP> text T_</SUP> | T_<S> text T_</S>
+fonttable =  table | T_<FONT> table  T_</FONT> | T_<I> table T_</I> | T_<B> table T_</B> | T_<U> table T_</U> | T_<O> table T_</O>
 table =  T_<TABLE> rows T_</TABLE>
 rows = row | rows row | rows T_<HR/> row
 row = T_<TR> cells T_</TR>