[no subject]

[Patrice Dumas]

branch: master
commit 473abafbf68ea35a3e105d36a0d7465442190a3e
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri May 3 22:02:36 2024 +0200

    * util/texinfo.dtd: add defbracketed, defblock, defline and
    deftypeline.
    
    * configure.ac (TEXINFO_DTD_VERSION): bump.
---
 ChangeLog        |  7 +++++++
 configure.ac     |  2 +-
 util/texinfo.dtd | 54 +++++++++++++++++++++++++++++++++++++-----------------
 3 files changed, 45 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 84c0e5fec9..ce68152869 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-05-03  Patrice Dumas  <pertusus@free.fr>
+
+       * util/texinfo.dtd: add defbracketed, defblock, defline and
+       deftypeline.
+
+       * configure.ac (TEXINFO_DTD_VERSION): bump.
+
 2024-05-03  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): add an element for
diff --git a/configure.ac b/configure.ac
index f4eabb56b4..7b9003872a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AC_CONFIG_SRCDIR([info/info.c])
 # 3. It may be kept as is in case there were no change in the DTD
 #    between releases.  This is rare, but has happened.
 #
-TEXINFO_DTD_VERSION=7.1
+TEXINFO_DTD_VERSION=7.2
 AC_SUBST([TEXINFO_DTD_VERSION])
 
 # Package date.
diff --git a/util/texinfo.dtd b/util/texinfo.dtd
index c3b0c2f263..69e9a26176 100644
--- a/util/texinfo.dtd
+++ b/util/texinfo.dtd
@@ -10,7 +10,7 @@
   As soon as this file is nontrivially modified, update
   TEXINFO_DTD_VERSION in configure.ac (if not already done).
   See comments there for explanation.
-  
+
   Email bug-texinfo@gnu.org with any discussion.
   (Original author: Philippe Martin.)
 -->
@@ -68,14 +68,14 @@
 <!ENTITY % def.cmds "deffn | defvr | deftypefn | deftypeop | deftypevr
       | defcv | deftypecv | defop | deftp | defun | defmac 
       | defspec | defvar | defopt | deftypefun | deftypevar 
-      | defivar | deftypeivar | defmethod | deftypemethod">
+      | defivar | deftypeivar | defmethod | deftypemethod | defblock">
 
 <!ENTITY % raw.cmds "html | tex | latex | docbook | xml | ignore">
 
 <!-- Commands that appear everywhere, both with block and in paragraphs -->
 <!-- include is in general absent, since it is replaced, but it is
      present if the file was not found -->
-<!ENTITY % ubiquitous.cmds "sp | anchor | indent | noindent | %raw.cmds; 
+<!ENTITY % ubiquitous.cmds "sp | anchor | indent | noindent | %raw.cmds;
                  | %define.cmds; | %option.cmds; | errormsg | include
                  | %indexentry.cmds; | refill | quote-arg | allow-recursion">
 
@@ -175,17 +175,22 @@
 <!ENTITY % Inline.linetext "%Inline.linesimpletext; | %Inline.reference;
                             | %Inline.footnote;">
 <!ENTITY % Inline.line "%Inline.linetext; | image">
-<!-- %Inline.line; appears on @vtable item, so it must be valid in
-     indexterm generated for such item.  In that context seealso,
+<!-- %Inline.line; appears on @vtable item or @def*, so it must be valid in
+     indexterm generated in such context.  In that context seealso,
      seeentry and sortas are not valid.
      In index commands (@cindex...) indexterm, however, footnotes and
      cross-reference are not valid, so %Inline.linesimpletext;, for example,
      would have been better than %Inline.line;.
+     defbracketed can only appear in @def* indexterm, it is invalid in other
+     index term contexts.
      It is not possible to have different contents in different contexts
      in the DTD, so we use the contents for all the contexts -->
-<!ENTITY % Inline.indexentryline "%Inline.line; | seealso | seeentry | sortas">
+<!ENTITY % Inline.indexentryline "%Inline.line; | seealso | seeentry | sortas
+                                  | defbracketed">
 <!ENTITY % Inline.fullline "%Inline.line; | titlefont | anchor">
 
+<!ENTITY % Inline.defargline "%Inline.line; | defbracketed">
+
 <!-- on headings specification lines -->
 <!ENTITY % Inline.headingmark "thischapter | thischaptername
            | thischapternum | thissection | thissectionname | thissectionnum
@@ -1031,44 +1036,59 @@
 <!ATTLIST deftypemethodx
           %spacesattr;>
 
+<!ELEMENT defblock (((defline | deftypeline), (%indexentry.cmds;)*)+, 
definitionitem?)>
+<!ATTLIST defblock
+          endspaces CDATA #IMPLIED>
+<!ELEMENT defline (definitionterm)>
+<!ATTLIST defline
+          %spacesattr;>
+<!ELEMENT deftypeline (definitionterm)>
+<!ATTLIST deftypeline
+          %spacesattr;>
+
 <!ELEMENT definitionterm (indexterm?, (%definition.args;)+)>
 <!ELEMENT definitionitem (%block;)*>
 
 <!ENTITY % defargattr
          "%bracketedattr; %spacestrailingspacesattr;">
-<!ELEMENT defcategory  (#PCDATA | %Inline.line;)*>
+
+<!ELEMENT defbracketed (#PCDATA | %Inline.line;)*>
+<!ATTLIST defbracketed
+          %defargattr;>
+
+<!ELEMENT defcategory  (#PCDATA | %Inline.defargline;)*>
 <!ATTLIST defcategory
           %defargattr;
           automatic (%onoff;) 'off'>
-<!ELEMENT deffunction  (#PCDATA | %Inline.line;)*>
+<!ELEMENT deffunction  (#PCDATA | %Inline.defargline;)*>
 <!ATTLIST deffunction
           %defargattr;>
-<!ELEMENT defsymbol (#PCDATA | %Inline.line;)*>
+<!ELEMENT defsymbol (#PCDATA | %Inline.defargline;)*>
 <!ATTLIST defsymbol
           %defargattr;>
-<!ELEMENT defvariable  (#PCDATA | %Inline.line;)*>
+<!ELEMENT defvariable  (#PCDATA | %Inline.defargline;)*>
 <!ATTLIST defvariable
           %defargattr;>
-<!ELEMENT defparam     (#PCDATA | %Inline.line;)*>
+<!ELEMENT defparam     (#PCDATA | %Inline.defargline;)*>
 <!ATTLIST defparam
           %defargattr;>
 <!ELEMENT defdelimiter (#PCDATA | %Inline.line;)*>
-<!ELEMENT deftype      (#PCDATA | %Inline.line;)*>
+<!ELEMENT deftype      (#PCDATA | %Inline.defargline;)*>
 <!ATTLIST deftype
           %defargattr;>
-<!ELEMENT defparamtype (#PCDATA | %Inline.line;)*>
+<!ELEMENT defparamtype (#PCDATA | %Inline.defargline;)*>
 <!ATTLIST defparamtype
           %defargattr;>
-<!ELEMENT defdatatype  (#PCDATA | %Inline.line;)*>
+<!ELEMENT defdatatype  (#PCDATA | %Inline.defargline;)*>
 <!ATTLIST defdatatype
           %defargattr;>
-<!ELEMENT defclass     (#PCDATA | %Inline.line;)*>
+<!ELEMENT defclass     (#PCDATA | %Inline.defargline;)*>
 <!ATTLIST defclass
           %defargattr;>
-<!ELEMENT defclassvar  (#PCDATA | %Inline.line;)*>
+<!ELEMENT defclassvar  (#PCDATA | %Inline.defargline;)*>
 <!ATTLIST defclassvar
           %defargattr;>
-<!ELEMENT defoperation (#PCDATA | %Inline.line;)*>
+<!ELEMENT defoperation (#PCDATA | %Inline.defargline;)*>
 <!ATTLIST defoperation
           %defargattr;>