From 4d2f552a5d55201606a4dd06fc161472329fde13 Mon Sep 17 00:00:00 2001 From: Mark Hansen Date: Wed, 3 Jun 2020 20:36:20 +1000 Subject: [PATCH] Terminate > html entity references Fixes #33 --- doc/info/shapes.html | 18 +++++++++--------- doc/infosrc/html.1 | 2 +- doc/infosrc/html.2 | 2 +- doc/infosrc/html_grammar | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/info/shapes.html b/doc/info/shapes.html index b82957560..7166e8185 100644 --- 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.

NOTE:The font markups for bold, italic, underlining, subscript and -superscript (<B>, <I>, <U>, <SUB> and <SUP>) +superscript (<B>, <I>, <U>, <SUB> and <SUP>) are only available in versions after 14 October 2011, and the markup for strike-through (<S>) 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. | - <U> text </U> + <U> text </U> | - <O> text </O> + <O> text </O> | - <SUB> text </SUB> + <SUB> text </SUB> | - <SUP> text </SUP> + <SUP> text </SUP> | - <S> text </S> + <S> text </S> fonttable @@ -604,12 +604,12 @@ Note that, as in HTML, element and attribute names are case-insensitive. | - <U> table </U> + <U> table </U> | - <O> table </O> + <O> table </O> table @@ -674,7 +674,7 @@ the label 

 < <U><TABLE><TR><TD>a</TD></TR></U>>
-is not legal. Removing either the space or the <U>...</U> will fix this. +is not legal. Removing either the space or the <U>...</U> will fix this.

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 dc2d58a88..0a31b2cc2 100644 --- 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.

NOTE:The font markups for bold, italic, underlining, subscript and -superscript (<B>, <I>, <U>, <SUB> and <SUP>) +superscript (<B>, <I>, <U>, <SUB> and <SUP>) are only available in versions after 14 October 2011, and the markup for strike-through (<S>) 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 6a594872c..e0a055107 100644 --- a/doc/infosrc/html.2 +++ b/doc/infosrc/html.2 @@ -11,7 +11,7 @@ the label 

 < <U><TABLE><TR><TD>a</TD></TR></U>>
-is not legal. Removing either the space or the <U>...</U> will fix this. +is not legal. Removing either the space or the <U>...</U> will fix this.

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 ab343f266..d200d6e44 100644 --- 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> | 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> +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> -- 2.40.0