[no subject]

[Patrice Dumas]

branch: master
commit c85480e96c0c120ecebc088313e172a56b5dbbd9
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri May 3 23:38:54 2024 +0200

    * util/texinfo.dtd: add nodedescriptionblock and nodedescription.
    Fix defblock to allow definitionitem interspeded with defline.
---
 ChangeLog                                  |  5 +++++
 tp/maintain/check_back_xml_forth_texi_t.sh |  7 ++++++-
 util/texinfo.dtd                           | 15 ++++++++++++---
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d196df2452..f6afd4b1fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-05-03  Patrice Dumas  <pertusus@free.fr>
+
+       * util/texinfo.dtd: add nodedescriptionblock and nodedescription.
+       Fix defblock to allow definitionitem interspeded with defline.
+
 2024-05-03  Patrice Dumas  <pertusus@free.fr>
 
        * util/txixml2texi.pl: handle linemacro.
diff --git a/tp/maintain/check_back_xml_forth_texi_t.sh 
b/tp/maintain/check_back_xml_forth_texi_t.sh
index 515499ebd1..c8b10f415b 100755
--- a/tp/maintain/check_back_xml_forth_texi_t.sh
+++ b/tp/maintain/check_back_xml_forth_texi_t.sh
@@ -111,4 +111,9 @@ diff -u -r $mdir/backforth_plaintexi/ 
$mdir/backforth_checktexi/ > $mdir/plain_t
 
 # To find XML parsing errors
 # grep --color 'parser error' check_back_xml_forth_texi/backforth_logs/*
-
+#
+# If document encoding is US-ASCII, it is interpreted in Texinfo as being
+# possibly ISO-8859-1 for backward compatibility as it was the default
+# encoding for Texinfo in the past.  The XML parser, however does not accept
+# ISO-8859-1 characters if the XML encoding is US-ASCII, therefore there are
+# parsing errors if there are ISO-8859-1 characters in US-ASCII generated XML.
diff --git a/util/texinfo.dtd b/util/texinfo.dtd
index 69e9a26176..91937dff1b 100644
--- a/util/texinfo.dtd
+++ b/util/texinfo.dtd
@@ -86,7 +86,7 @@
                   | cartouche | float | format | smallformat
                   | display | smalldisplay
                   | raggedright | flushleft | flushright
-                  | itemize | enumerate | group
+                  | itemize | enumerate | group | nodedescriptionblock
                   | table | vtable | ftable | multitable | displaymath
                   | %def.cmds; | verbatim">
 
@@ -98,7 +98,7 @@
 <!ENTITY % block  "%block.cmds; | verbatiminclude
                   | %heading.cmds;
                   | %ubiquitous.cmds;
-                  | image | titlefont | center
+                  | image | titlefont | center | nodedescription
                   | insertcopying | page | need | vskip">
 
 <!-- API definition line -->
@@ -689,11 +689,18 @@
 <!ELEMENT displaymath  (#PCDATA | %Inline.phrase;)*>
 <!ATTLIST displaymath
           %spacesblockattr;>
+<!ELEMENT nodedescriptionblock (%block;)*>
+<!ATTLIST nodedescriptionblock
+          %spacesblockattr;>
 
 <!ELEMENT center       (#PCDATA | %Inline.fullline;)*>
 <!ATTLIST center
           %spacesattr;>
 
+<!ELEMENT nodedescription  (#PCDATA | %Inline.fullline;)*>
+<!ATTLIST nodedescription
+          %spacesattr;>
+
 <!ELEMENT image        (imagefile, imagewidth?, imageheight?, alttext?,
                         imageextension?)>
 <!ATTLIST image
@@ -1036,7 +1043,7 @@
 <!ATTLIST deftypemethodx
           %spacesattr;>
 
-<!ELEMENT defblock (((defline | deftypeline), (%indexentry.cmds;)*)+, 
definitionitem?)>
+<!ELEMENT defblock (((defline | deftypeline), (%indexentry.cmds;)*, 
definitionitem?)+)>
 <!ATTLIST defblock
           endspaces CDATA #IMPLIED>
 <!ELEMENT defline (definitionterm)>
@@ -1361,6 +1368,8 @@
 <!ATTLIST url
           %spacesafterincmdattr;>
 <!ELEMENT urefurl         (#PCDATA | %Inline.phrase;)*>
+<!ATTLIST urefurl
+          %spacesattr;>
 <!ELEMENT urefdesc        (#PCDATA | %Inline.phrase;)*>
 <!ATTLIST urefdesc
           %spacesattr;>