[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Common.pm (%default_converter_custom
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Common.pm (%default_converter_customization), tp/Texinfo/Convert/TexinfoXML.pm (%defaults), tp/Texinfo/Convert/TexinfoSXML.pm (%defaults), tp/Texinfo/Convert/IXINSXML.pm (%defaults): set 'TEXINFO_DTD_VERSION' in tp/Texinfo/Common.pm. |
|
Date: |
Sun, 11 Sep 2022 18:13:16 -0400 |
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 ef8eccc379 * tp/Texinfo/Common.pm (%default_converter_customization),
tp/Texinfo/Convert/TexinfoXML.pm (%defaults), tp/Texinfo/Convert/TexinfoSXML.pm
(%defaults), tp/Texinfo/Convert/IXINSXML.pm (%defaults): set
'TEXINFO_DTD_VERSION' in tp/Texinfo/Common.pm.
ef8eccc379 is described below
commit ef8eccc3795b6848c1bd7d4d78f33c3a873a0b74
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Sep 12 00:13:04 2022 +0200
* tp/Texinfo/Common.pm (%default_converter_customization),
tp/Texinfo/Convert/TexinfoXML.pm (%defaults),
tp/Texinfo/Convert/TexinfoSXML.pm (%defaults),
tp/Texinfo/Convert/IXINSXML.pm (%defaults):
set 'TEXINFO_DTD_VERSION' in tp/Texinfo/Common.pm.
* tp/Texinfo/Convert/TexinfoXML.pm (format_header): correct
typo in DOCTYPE.
---
ChangeLog | 11 +++++++++++
tp/Texinfo/Common.pm | 10 ++++++++++
tp/Texinfo/Convert/IXINSXML.pm | 3 ---
tp/Texinfo/Convert/TexinfoSXML.pm | 2 --
tp/Texinfo/Convert/TexinfoXML.pm | 8 ++------
.../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 +-
.../res_xml/minimal_empty_with_input.xml | 2 +-
.../res_xml/simplest_no_node_section.xml | 2 +-
.../res_xml/char_latin1_latin1_in_refs.xml | 2 +-
.../split_for_format_not_split/res_xml/simplest.xml | 2 +-
tp/tests/layout/res_parser/formatting_xml/formatting.xml | 2 +-
14 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index da476b91e1..181bb368c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2022-09-11 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Common.pm (%default_converter_customization),
+ tp/Texinfo/Convert/TexinfoXML.pm (%defaults),
+ tp/Texinfo/Convert/TexinfoSXML.pm (%defaults),
+ tp/Texinfo/Convert/IXINSXML.pm (%defaults):
+ set 'TEXINFO_DTD_VERSION' in tp/Texinfo/Common.pm.
+
+ * tp/Texinfo/Convert/TexinfoXML.pm (format_header): correct
+ typo in DOCTYPE.
+
2022-09-11 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/parsetexi/parser.c (is_end_current_command):
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 3555ce70d6..18c273373f 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -262,6 +262,16 @@ our %default_converter_customization = (
'HANDLER_FATAL_ERROR_LEVEL' => 100,
'TEST' => 0,
'TEXTCONTENT_COMMENT' => undef, # in textcontent format
+ # used in TexinfoXML/SXML
+ # Reset by the main program, therefore this value is only used
+ # in converter tests. Does not need to be updated every time a DTD
+ # is released, but it should be good to update from time to time
+ # to avoid test results that are not valid against their reported DTD.
+ 'TEXINFO_DTD_VERSION' => '6.8', # this is not the value documented,
+ # but it is better for tests to have a
+ # value that never changes.
+ # The main program sets the
+ # variable to the documented value.
);
# Some are for all converters, EXTENSION for instance, some for
diff --git a/tp/Texinfo/Convert/IXINSXML.pm b/tp/Texinfo/Convert/IXINSXML.pm
index 6864af4aca..660d24aaaf 100644
--- a/tp/Texinfo/Convert/IXINSXML.pm
+++ b/tp/Texinfo/Convert/IXINSXML.pm
@@ -37,10 +37,7 @@ my %defaults = (
'ENABLE_ENCODING' => 0,
'FORMAT_MENU' => 'menu',
'EXTENSION' => 'ixin',
- #'output_perl_encoding' => 'utf8',
'OUTPUT_ENCODING_NAME' => 'utf-8',
- # useful?
- 'TEXINFO_DTD_VERSION' => '5.0',
'OUTFILE' => undef,
'SUBDIR' => undef,
'converted_format' => 'ixinsxml',
diff --git a/tp/Texinfo/Convert/TexinfoSXML.pm
b/tp/Texinfo/Convert/TexinfoSXML.pm
index 1c1b5df7f4..bf5c035c05 100644
--- a/tp/Texinfo/Convert/TexinfoSXML.pm
+++ b/tp/Texinfo/Convert/TexinfoSXML.pm
@@ -39,9 +39,7 @@ my %defaults = (
'ENABLE_ENCODING' => 0,
'FORMAT_MENU' => 'menu',
'EXTENSION' => 'sxml',
- #'output_perl_encoding' => 'utf8',
'OUTPUT_ENCODING_NAME' => 'utf-8',
- 'TEXINFO_DTD_VERSION' => '5.0',
'OUTFILE' => undef,
'SUBDIR' => undef,
'converted_format' => 'texinfosxml',
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index b5f567d948..9bbd5f5ad7 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -36,16 +36,12 @@ use vars qw($VERSION @ISA);
$VERSION = '6.8dev';
-# XML specific
+# TexinfoXML specific
my %defaults = (
'ENABLE_ENCODING' => 0,
'FORMAT_MENU' => 'menu',
'EXTENSION' => 'xml',
- #'output_perl_encoding' => 'utf8',
'OUTPUT_ENCODING_NAME' => 'utf-8',
- # the TEXINFO_DTD_VERSION is reset by the main program
- # so this would only be used in tests
- 'TEXINFO_DTD_VERSION' => '5.0',
'OUTFILE' => undef,
'SUBDIR' => undef,
'converted_format' => 'xml',
@@ -269,7 +265,7 @@ sub format_header($$$)
}
my $header = "<?xml version=\"1.0\"${encoding}?>".'
-<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML V'.$texinfo_dtd_version.'//EN"
"http://www.gnu.org/software/texinfo/dtd/'.$texinfo_dtd_version.'/texinfo.dtd">
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoXML
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 ed30be1524..04656831f3 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 TexinfoML V5.0//EN"
"http://www.gnu.org/software/texinfo/dtd/5.0/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoXML 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 3871735c96..a4c937d777 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 TexinfoML V5.0//EN"
"http://www.gnu.org/software/texinfo/dtd/5.0/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoXML 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 7610c2e795..0af37f5a00 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 TexinfoML V5.0//EN"
"http://www.gnu.org/software/texinfo/dtd/5.0/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoXML 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 24a48c7410..b19f8bdac9 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 TexinfoML V5.0//EN"
"http://www.gnu.org/software/texinfo/dtd/5.0/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoXML 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 2d6edff035..c8f406e340 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 TexinfoML V5.0//EN"
"http://www.gnu.org/software/texinfo/dtd/5.0/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoXML 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 0ae3fdb86e..806f72c3d8 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 TexinfoML V5.0//EN"
"http://www.gnu.org/software/texinfo/dtd/5.0/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoXML 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 442763a27b..650d23d6b9 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 TexinfoML V5.0//EN"
"http://www.gnu.org/software/texinfo/dtd/5.0/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoXML 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 c206a5a3ed..a158c15525 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 TexinfoML V5.0//EN"
"http://www.gnu.org/software/texinfo/dtd/5.0/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoXML 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 3d4bf66cde..ae6202909b 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 V6.9//EN"
"http://www.gnu.org/software/texinfo/dtd/6.9/texinfo.dtd";>
+<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoXML 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-*-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Common.pm (%default_converter_customization), tp/Texinfo/Convert/TexinfoXML.pm (%defaults), tp/Texinfo/Convert/TexinfoSXML.pm (%defaults), tp/Texinfo/Convert/IXINSXML.pm (%defaults): set 'TEXINFO_DTD_VERSION' in tp/Texinfo/Common.pm.,
Patrice Dumas <=