branch master updated: * util/texinfo.dtd, configure.ac (TEXINFO_DTD_VERSION): add the index entries in tableterm before the @item.

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new d65b0333b6 * util/texinfo.dtd, configure.ac (TEXINFO_DTD_VERSION): add 
the index entries in tableterm before the @item.
d65b0333b6 is described below

commit d65b0333b6f73e4534d092c3671de2ab264e2a35
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Nov 27 00:43:41 2022 +0100

    * util/texinfo.dtd, configure.ac (TEXINFO_DTD_VERSION): add the
    index entries in tableterm before the @item.
---
 ChangeLog                                                | 5 +++++
 configure.ac                                             | 2 +-
 tp/tests/layout/res_parser/formatting_xml/formatting.xml | 2 +-
 util/texinfo.dtd                                         | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b79d0bc3cc..af49cab634 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-11-26  Patrice Dumas  <pertusus@free.fr>
+
+       * util/texinfo.dtd, configure.ac (TEXINFO_DTD_VERSION): add the
+       index entries in tableterm before the @item.
+
 2022-11-26  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/DocBook.pm (_convert): output <term> when
diff --git a/configure.ac b/configure.ac
index bf008c3973..f1f0b64efa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,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.0
+TEXINFO_DTD_VERSION=7.1
 AC_SUBST([TEXINFO_DTD_VERSION])
 
 # Package date.
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml 
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index 345664992a..89343d12f5 100644
--- a/tp/tests/layout/res_parser/formatting_xml/formatting.xml
+++ b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V7.0//EN" 
"http://www.gnu.org/software/texinfo/dtd/7.0/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V7.1//EN" 
"http://www.gnu.org/software/texinfo/dtd/7.1/texinfo.dtd";>
 <texinfo>
 <filename file="formatting.xml"></filename>
 <preamblebeforebeginning>\input texinfo @c -*-texinfo-*-
diff --git a/util/texinfo.dtd b/util/texinfo.dtd
index 7f93e5f28e..1556014eec 100644
--- a/util/texinfo.dtd
+++ b/util/texinfo.dtd
@@ -830,7 +830,7 @@
           %blocktablearg;>
 <!ELEMENT tableentry (tableterm, tableitem?)>
 <!-- tableterm contains directly pre if there is an index entry before @itemx 
-->
-<!ELEMENT tableterm (item,  (pre | itemx | %indexentry.cmds;)*)>
+<!ELEMENT tableterm ((%indexentry.cmds;)*, item,  (pre | itemx | 
%indexentry.cmds;)*)>
 <!ELEMENT item (#PCDATA | %Inline.line; | itemformat | indexterm)*>
 <!ATTLIST item
           %spacesattr;>