branch master updated: * tp/Texinfo/Convert/TexinfoXML.pm (format_header): revert previous change, the TexinfoML is not a typo, the 'X' of XML is replaced by 'Texinfo' on purpose to obtain TexinfoML.

[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 29b5d78c3b * tp/Texinfo/Convert/TexinfoXML.pm (format_header): revert 
previous change, the TexinfoML is not a typo, the 'X' of XML is replaced by 
'Texinfo' on purpose to obtain TexinfoML.
29b5d78c3b is described below

commit 29b5d78c3b61ab5aa0ec08f292e902abebc21d40
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Sep 12 09:11:10 2022 +0200

    * tp/Texinfo/Convert/TexinfoXML.pm (format_header): revert
    previous change, the TexinfoML is not a typo, the 'X' of XML is
    replaced by 'Texinfo' on purpose to obtain TexinfoML.
---
 ChangeLog                                                           | 6 ++++++
 tp/Texinfo/Convert/TexinfoXML.pm                                    | 3 ++-
 .../converters_tests/combined_fonts/res_xml/combined_fonts.xml      | 2 +-
 tp/t/results/converters_tests/empty/res_xml/empty.xml               | 2 +-
 .../minimal_empty_empty/res_xml/minimal_empty_empty.xml             | 2 +-
 .../minimal_empty_with_bye/res_xml/minimal_empty_with_bye.xml       | 2 +-
 .../minimal_empty_with_input/res_xml/minimal_empty_with_input.xml   | 2 +-
 .../simplest_no_node_section/res_xml/simplest_no_node_section.xml   | 2 +-
 .../res_xml/char_latin1_latin1_in_refs.xml                          | 2 +-
 .../formatting/split_for_format_not_split/res_xml/simplest.xml      | 2 +-
 tp/tests/layout/res_parser/formatting_xml/formatting.xml            | 2 +-
 11 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 181bb368c7..574cb506d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-09-12  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/TexinfoXML.pm (format_header): revert
+       previous change, the TexinfoML is not a typo, the 'X' of XML is
+       replaced by 'Texinfo' on purpose to obtain TexinfoML.
+
 2022-09-11  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Common.pm (%default_converter_customization),
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index 9bbd5f5ad7..ee7b22c300 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -264,8 +264,9 @@ sub format_header($$$)
     $texinfo_dtd_version = '1.00';
   }
 
+  # In the TexinfoML name, the X of XML is replaced by Texinfo.
   my $header =  "<?xml version=\"1.0\"${encoding}?>".'
-<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoXML 
V'.$texinfo_dtd_version.'//EN" 
"http://www.gnu.org/software/texinfo/dtd/'.$texinfo_dtd_version.'/texinfo.dtd">
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V'.$texinfo_dtd_version.'//EN" 
"http://www.gnu.org/software/texinfo/dtd/'.$texinfo_dtd_version.'/texinfo.dtd">
 '. $self->open_element('texinfo')."\n";
   if ($output_file ne '') {
     $header .= $self->open_element('filename', [['file', $output_filename]])
diff --git 
a/tp/t/results/converters_tests/combined_fonts/res_xml/combined_fonts.xml 
b/tp/t/results/converters_tests/combined_fonts/res_xml/combined_fonts.xml
index 04656831f3..9bf9a79e19 100644
--- a/tp/t/results/converters_tests/combined_fonts/res_xml/combined_fonts.xml
+++ b/tp/t/results/converters_tests/combined_fonts/res_xml/combined_fonts.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoXML V6.8//EN" 
"http://www.gnu.org/software/texinfo/dtd/6.8/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V6.8//EN" 
"http://www.gnu.org/software/texinfo/dtd/6.8/texinfo.dtd";>
 <texinfo>
 <filename file="combined_fonts.xml"></filename>
 <setfilename file="combined_fonts.info" spaces=" 
">combined_fonts.info</setfilename>
diff --git a/tp/t/results/converters_tests/empty/res_xml/empty.xml 
b/tp/t/results/converters_tests/empty/res_xml/empty.xml
index a4c937d777..eeca72c0a1 100644
--- a/tp/t/results/converters_tests/empty/res_xml/empty.xml
+++ b/tp/t/results/converters_tests/empty/res_xml/empty.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoXML V6.8//EN" 
"http://www.gnu.org/software/texinfo/dtd/6.8/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V6.8//EN" 
"http://www.gnu.org/software/texinfo/dtd/6.8/texinfo.dtd";>
 <texinfo>
 <filename file="empty.xml"></filename>
 </texinfo>
diff --git 
a/tp/t/results/converters_tests/minimal_empty_empty/res_xml/minimal_empty_empty.xml
 
b/tp/t/results/converters_tests/minimal_empty_empty/res_xml/minimal_empty_empty.xml
index 0af37f5a00..9f7bcd4798 100644
--- 
a/tp/t/results/converters_tests/minimal_empty_empty/res_xml/minimal_empty_empty.xml
+++ 
b/tp/t/results/converters_tests/minimal_empty_empty/res_xml/minimal_empty_empty.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoXML V6.8//EN" 
"http://www.gnu.org/software/texinfo/dtd/6.8/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V6.8//EN" 
"http://www.gnu.org/software/texinfo/dtd/6.8/texinfo.dtd";>
 <texinfo>
 <filename file="minimal_empty_empty.xml"></filename>
 <preamblebeforebeginning>
diff --git 
a/tp/t/results/converters_tests/minimal_empty_with_bye/res_xml/minimal_empty_with_bye.xml
 
b/tp/t/results/converters_tests/minimal_empty_with_bye/res_xml/minimal_empty_with_bye.xml
index b19f8bdac9..f4018c0cb6 100644
--- 
a/tp/t/results/converters_tests/minimal_empty_with_bye/res_xml/minimal_empty_with_bye.xml
+++ 
b/tp/t/results/converters_tests/minimal_empty_with_bye/res_xml/minimal_empty_with_bye.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoXML V6.8//EN" 
"http://www.gnu.org/software/texinfo/dtd/6.8/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V6.8//EN" 
"http://www.gnu.org/software/texinfo/dtd/6.8/texinfo.dtd";>
 <texinfo>
 <filename file="minimal_empty_with_bye.xml"></filename>
 <preamblebeforebeginning>\input texinfo.tex
diff --git 
a/tp/t/results/converters_tests/minimal_empty_with_input/res_xml/minimal_empty_with_input.xml
 
b/tp/t/results/converters_tests/minimal_empty_with_input/res_xml/minimal_empty_with_input.xml
index c8f406e340..8195cdf257 100644
--- 
a/tp/t/results/converters_tests/minimal_empty_with_input/res_xml/minimal_empty_with_input.xml
+++ 
b/tp/t/results/converters_tests/minimal_empty_with_input/res_xml/minimal_empty_with_input.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoXML V6.8//EN" 
"http://www.gnu.org/software/texinfo/dtd/6.8/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V6.8//EN" 
"http://www.gnu.org/software/texinfo/dtd/6.8/texinfo.dtd";>
 <texinfo>
 <filename file="minimal_empty_with_input.xml"></filename>
 <preamblebeforebeginning>\input texinfo.tex
diff --git 
a/tp/t/results/converters_tests/simplest_no_node_section/res_xml/simplest_no_node_section.xml
 
b/tp/t/results/converters_tests/simplest_no_node_section/res_xml/simplest_no_node_section.xml
index 806f72c3d8..6ed4982f1f 100644
--- 
a/tp/t/results/converters_tests/simplest_no_node_section/res_xml/simplest_no_node_section.xml
+++ 
b/tp/t/results/converters_tests/simplest_no_node_section/res_xml/simplest_no_node_section.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoXML V6.8//EN" 
"http://www.gnu.org/software/texinfo/dtd/6.8/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V6.8//EN" 
"http://www.gnu.org/software/texinfo/dtd/6.8/texinfo.dtd";>
 <texinfo>
 <filename file="simplest_no_node_section.xml"></filename>
 <preamblebeforebeginning>\input texinfo @c -*-texinfo-*-
diff --git 
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_xml/char_latin1_latin1_in_refs.xml
 
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_xml/char_latin1_latin1_in_refs.xml
index 650d23d6b9..d0af3c40e3 100644
--- 
a/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_xml/char_latin1_latin1_in_refs.xml
+++ 
b/tp/t/results/formats_encodings/char_latin1_latin1_in_refs/res_xml/char_latin1_latin1_in_refs.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
-<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoXML V6.8//EN" 
"http://www.gnu.org/software/texinfo/dtd/6.8/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V6.8//EN" 
"http://www.gnu.org/software/texinfo/dtd/6.8/texinfo.dtd";>
 <texinfo>
 <filename file="char_latin1_latin1_in_refs.xml"></filename>
 <preamblebeforebeginning>\input texinfo
diff --git 
a/tp/t/results/formatting/split_for_format_not_split/res_xml/simplest.xml 
b/tp/t/results/formatting/split_for_format_not_split/res_xml/simplest.xml
index a158c15525..889ebba806 100644
--- a/tp/t/results/formatting/split_for_format_not_split/res_xml/simplest.xml
+++ b/tp/t/results/formatting/split_for_format_not_split/res_xml/simplest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoXML V6.8//EN" 
"http://www.gnu.org/software/texinfo/dtd/6.8/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V6.8//EN" 
"http://www.gnu.org/software/texinfo/dtd/6.8/texinfo.dtd";>
 <texinfo>
 <filename file="simplest.xml"></filename>
 <preamblebeforebeginning>\input texinfo @c -*-texinfo-*-
diff --git a/tp/tests/layout/res_parser/formatting_xml/formatting.xml 
b/tp/tests/layout/res_parser/formatting_xml/formatting.xml
index ae6202909b..3d4bf66cde 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 TexinfoXML V6.9//EN" 
"http://www.gnu.org/software/texinfo/dtd/6.9/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V6.9//EN" 
"http://www.gnu.org/software/texinfo/dtd/6.9/texinfo.dtd";>
 <texinfo>
 <filename file="formatting.xml"></filename>
 <preamblebeforebeginning>\input texinfo @c -*-texinfo-*-