[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Sun, 25 Dec 2022 19:11:46 -0500 (EST) |
branch: master
commit c9c1879e851f5d08585ae00a9b3fe86ea1fe6fdc
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Dec 26 01:11:11 2022 +0100
Use OUTPUT_CHARACTERS instead of --enable-encoding for XML-based and
LaTeX
* NEWS, doc/texinfo.texi (@code{@@documentencoding})
(Other Customization Variables), tp/Texinfo/Common.pm
(@variable_string_settables), tp/Texinfo/Convert/Converter.pm
(xml_accents), tp/Texinfo/Convert/HTML.pm (_convert_accent_command)
(_css_string_convert_accent_command, _convert_text)
(converter_initialize), tp/Texinfo/Convert/LaTeX.pm
(converter_initialize, copy_options_for_convert_to_latex_math)
(_convert), /tp/Texinfo/Convert/TexinfoMarkup.pm (_convert):
use the OUTPUT_CHARACTERS customization variable for HTML, XML,
DocBook and LaTeX to determine if encoded characters are output
instead of entities or macros.
* t/09indices.t, tp/t/formats_encodings.t, tp/t/html_tests.t,
tp/tests/layout/list-of-tests,
tp/tests/many_input_files/different_encodings.sh: set
OUTPUT_CHARACTERS in addition to ENABLE_ENCODING/--enable-encoding.
---
ChangeLog | 22 ++++++++++++++++
NEWS | 4 +++
doc/texinfo.texi | 32 ++++++++++++------------
tp/Texinfo/Common.pm | 1 +
tp/Texinfo/Convert/Converter.pm | 2 +-
tp/Texinfo/Convert/HTML.pm | 14 +++++------
tp/Texinfo/Convert/LaTeX.pm | 12 ++++-----
tp/Texinfo/Convert/TexinfoMarkup.pm | 2 +-
tp/t/09indices.t | 4 +--
tp/t/formats_encodings.t | 4 +--
tp/t/html_tests.t | 22 ++++++++--------
tp/tests/layout/list-of-tests | 2 +-
tp/tests/many_input_files/different_encodings.sh | 4 +--
13 files changed, 77 insertions(+), 48 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 95c5724dc6..bea08aafd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,28 @@
preloaded. Begin with \relax rather than space token to terminate
filename.
+2022-12-25 Patrice Dumas <pertusus@free.fr>
+
+ Use OUTPUT_CHARACTERS instead of --enable-encoding for XML-based and
+ LaTeX
+
+ * NEWS, doc/texinfo.texi (@code{@@documentencoding})
+ (Other Customization Variables), tp/Texinfo/Common.pm
+ (@variable_string_settables), tp/Texinfo/Convert/Converter.pm
+ (xml_accents), tp/Texinfo/Convert/HTML.pm (_convert_accent_command)
+ (_css_string_convert_accent_command, _convert_text)
+ (converter_initialize), tp/Texinfo/Convert/LaTeX.pm
+ (converter_initialize, copy_options_for_convert_to_latex_math)
+ (_convert), /tp/Texinfo/Convert/TexinfoMarkup.pm (_convert):
+ use the OUTPUT_CHARACTERS customization variable for HTML, XML,
+ DocBook and LaTeX to determine if encoded characters are output
+ instead of entities or macros.
+
+ * t/09indices.t, tp/t/formats_encodings.t, tp/t/html_tests.t,
+ tp/tests/layout/list-of-tests,
+ tp/tests/many_input_files/different_encodings.sh: set
+ OUTPUT_CHARACTERS in addition to ENABLE_ENCODING/--enable-encoding.
+
2022-12-25 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/Converter.pm (convert_accents, xml_accents),
diff --git a/NEWS b/NEWS
index 24ff1005fb..7940a7c3da 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,10 @@ See the manual for detailed information.
* texi2any
. @itemx at the beginning of a @table is now an error, not a warning
+ . --enable-encoding and --disable-encoding do not determine anymore
+ if encoded characters are output instead of entities or commands for
+ HTML, XML, DocBook and LaTeX, instead the OUTPUT_CHARACTERS customization
+ variable valaue is used.
. HTML output:
. format @subentry and index entry with @seealso or @seeentry more in line
with printed output.
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index f459fbdf5b..7eb0639807 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -12473,16 +12473,16 @@ this:
charset=utf-8">
@end example
-In HTML and @LaTeX{} output, if the option @option{--enable-encoding} is given
-to @command{texi2any}, accent constructs and special characters, such as
-@code{@@'e} or @code{``}, are output as the actual UTF-8 sequence or
-8-bit character in the output encoding where possible. Otherwise, HTML
-entities are used for those characters in HTML, and @LaTeX{} macros
-are used in @LaTeX{}.
+In HTML and @LaTeX{} output, if @code{OUTPUT_CHARACTERS} is set
+(@pxref{Other Customization Variables}), accent constructs and special
+characters, such as @code{@@'e} or @code{``}, are output as the actual
+UTF-8 sequence or 8-bit character in the output encoding where possible.
+Otherwise, HTML entities are used for those characters in HTML, and
+@LaTeX{} macros are used in @LaTeX{}.
In DocBook output, if the encoding is different from UTF-8,
an @code{encoding} attribute is added to the XML declaration.
-If the option @option{--enable-encoding} is given to @command{texi2any},
+If @code{OUTPUT_CHARACTERS} is set (@pxref{Other Customization Variables}),
accent constructs such as @code{@@'e} are output as the actual 8-bit or
UTF-8 character in the output encoding where possible. Otherwise XML
entities are used for those constructs.
@@ -15429,13 +15429,6 @@ special characters in Info and plain text output based
on
the document encoding. With @option{--disable-encoding}, 7-bit
ASCII transliterations are output.
-By default, or with @option{--disable-encoding}, output accented and
-special characters in HTML, XML and DocBook using XML entities.
-With @option{--enable-encoding}, output accented characters in HTML,
-XML and DocBook output and special characters in HTML output
-based on the document encoding. @xref{@code{@@documentencoding}},
-and @ref{Inserting Accents}.
-
@item --epub3
@opindex --epub3
Generate EPUB 3 output.
@@ -16739,7 +16732,7 @@ are not consistent with the order of node menu entries.
When a closing quote is needed, use this character; default @code{’}
in DocBook. Undefined in the default case in HTML and set to @code{’}
if @code{USE_NUMERIC_ENTITY} is not set, to @code{’} if set, and
-to a quote character if @option{--enable-encoding} is set and the output
+to a quote character if @code{OUTPUT_CHARACTERS} is set and the output
encoding includes that character.
The default for Info is set the same as for @code{OPEN_QUOTE_SYMBOL},
@@ -16926,7 +16919,7 @@ When an opening quote is needed, e.g., for
@samp{@@samp} output, use
the specified character; default @code{‘} for DocBook.
Undefined in the default case in HTML and set to @code{‘}
if @code{USE_NUMERIC_ENTITY} is not set, to @code{’} if set, and
-to a quote character if @option{--enable-encoding} is set and the output
+to a quote character if @code{OUTPUT_CHARACTERS} is set and the output
encoding includes that character.
For Info, the default depends on the enabled document encoding. If
@@ -16935,6 +16928,13 @@ For Info, the default depends on the enabled document
encoding. If
as an undirected single quote on modern systems. Otherwise, the Info
output uses a Unicode left quote.
+@item OUTPUT_CHARACTERS
+If not set, the default, output accented and special characters in HTML, XML
+and DocBook using XML entities, and in @LaTeX{} using macros. If set, output
+accented characters in HTML, XML, DocBook and @LaTeX{} output and special
+characters in HTML and @LaTeX{} output based on the document encoding.
+@xref{@code{@@documentencoding}}, and @ref{Inserting Accents}.
+
@item OUTPUT_ENCODING_NAME
Normalized encoding name used for output files. Should be a usable
charset name in HTML, typically one of the preferred IANA encoding
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 0826f1ca0c..d6f2d42177 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -414,6 +414,7 @@ our @variable_string_settables = (
'NO_TOP_NODE_OUTPUT',
'NO_USE_SETFILENAME',
'OPEN_QUOTE_SYMBOL',
+'OUTPUT_CHARACTERS',
'OUTPUT_ENCODING_NAME',
'OUTPUT_FILE_NAME_ENCODING',
'OUTPUT_PERL_ENCODING',
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 083cd02bed..2e1049c2c2 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1737,7 +1737,7 @@ sub xml_accents($$;$)
}
return $self->convert_accents($accent, $format_accents,
- $self->get_conf('ENABLE_ENCODING'),
+ $self->get_conf('OUTPUT_CHARACTERS'),
$in_upper_case);
}
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index f80f1579a6..964538a0fa 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1835,7 +1835,7 @@ my %defaults = (
'documentlanguage' => 'en',
'DOCTYPE' => '<!DOCTYPE html>',
'DO_ABOUT' => 0,
- 'ENABLE_ENCODING' => 0,
+ 'OUTPUT_CHARACTERS' => 0,
'EXTENSION' => 'html',
'EXTERNAL_CROSSREF_EXTENSION' => undef, # based on EXTENSION
'FOOTNOTE_END_HEADER_LEVEL' => 4,
@@ -3309,7 +3309,7 @@ sub _convert_accent_command($$$$)
$format_accents = \&_accent_entities_html_accent;
}
return $self->convert_accents($command, $format_accents,
- $self->get_conf('ENABLE_ENCODING'),
+ $self->get_conf('OUTPUT_CHARACTERS'),
$self->in_upper_case());
}
@@ -3364,7 +3364,7 @@ sub _css_string_convert_accent_command($$$$)
my $format_accents = \&_css_string_accent;
return $self->convert_accents($command, $format_accents,
- $self->get_conf('ENABLE_ENCODING'),
+ $self->get_conf('OUTPUT_CHARACTERS'),
$self->in_upper_case());
}
@@ -6166,10 +6166,10 @@ sub _convert_text($$$)
$text = _default_format_protect_text($self, $text);
# API info: get_conf() API code conforming would be:
- #if ($self->get_conf('ENABLE_ENCODING')
+ #if ($self->get_conf('OUTPUT_CHARACTERS')
# and $self->get_conf('OUTPUT_ENCODING_NAME')
# and $self->get_conf('OUTPUT_ENCODING_NAME') eq 'utf-8') {
- if ($self->{'conf'}->{'ENABLE_ENCODING'}
+ if ($self->{'conf'}->{'OUTPUT_CHARACTERS'}
and $self->{'conf'}->{'OUTPUT_ENCODING_NAME'}
and $self->{'conf'}->{'OUTPUT_ENCODING_NAME'} eq 'utf-8') {
$text = Texinfo::Convert::Unicode::unicode_text($text,
@@ -7500,7 +7500,7 @@ sub converter_initialize($)
foreach my $special_character (keys(%special_characters)) {
my ($default_entity, $unicode_point) =
@{$special_characters{$special_character}};
- if ($self->get_conf('ENABLE_ENCODING')
+ if ($self->get_conf('OUTPUT_CHARACTERS')
and Texinfo::Convert::Unicode::unicode_point_decoded_in_encoding(
$output_encoding, $unicode_point)) {
$special_characters_set{$special_character} = chr(hex($unicode_point));
@@ -7722,7 +7722,7 @@ sub converter_initialize($)
= $conf_default_no_arg_commands_formatting_normal;
}
if
(defined($context_default_default_no_arg_commands_formatting->{$command})) {
- if ($self->get_conf('ENABLE_ENCODING')
+ if ($self->get_conf('OUTPUT_CHARACTERS')
and Texinfo::Convert::Unicode::brace_no_arg_command(
$command,
$self->get_conf('OUTPUT_ENCODING_NAME'))) {
$self->{'no_arg_commands_formatting'}->{$context}->{$command}
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 74f496e778..2e2ed3b8f9 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -776,7 +776,7 @@ foreach my $command
(keys(%{$LaTeX_style_brace_commands{'cmd_text'}})) {
my %defaults = (
- 'ENABLE_ENCODING' => 0,
+ 'OUTPUT_CHARACTERS' => 0,
'FORMAT_MENU' => 'nomenu',
'EXTENSION' => 'tex',
@@ -851,7 +851,7 @@ sub converter_initialize($)
# cache this to avoid redoing calls to get_conf
$self->{'to_utf8'} = 1;
- if ($self->get_conf('ENABLE_ENCODING')) {
+ if ($self->get_conf('OUTPUT_CHARACTERS')) {
foreach my $quoted_command (@quoted_commands) {
# Directed single quotes
$self->{'quotes_map'}->{$quoted_command} = ["\x{2018}", "\x{2019}"];
@@ -871,7 +871,7 @@ sub converter_initialize($)
}
}
# some caching to avoid calling get_conf
- $self->{'enable_encoding'} = $self->get_conf('ENABLE_ENCODING');
+ $self->{'output_characters'} = $self->get_conf('OUTPUT_CHARACTERS');
$self->{'output_encoding_name'} = $self->get_conf('OUTPUT_ENCODING_NAME');
$self->{'debug'} = $self->get_conf('DEBUG');
@@ -1189,7 +1189,7 @@ sub copy_options_for_convert_to_latex_math($)
{
my $self = shift;
my %options;
- foreach my $option_name ('DEBUG', 'ENABLE_ENCODING', 'OUTPUT_ENCODING_NAME',
+ foreach my $option_name ('DEBUG', 'OUTPUT_CHARACTERS',
'OUTPUT_ENCODING_NAME',
'TEST') {
$options{$option_name} = $self->get_conf($option_name)
if (defined($self->get_conf($option_name)));
@@ -2529,7 +2529,7 @@ sub _convert($$)
and exists($element->{'extra'}->{'clickstyle'})) {
$converted_command = $element->{'extra'}->{'clickstyle'};
}
- if ($self->{'enable_encoding'}) {
+ if ($self->{'output_characters'}) {
my $encoding = $self->{'output_encoding_name'};
if ($letter_no_arg_commands{$converted_command}) {
my $conversion
@@ -2575,7 +2575,7 @@ sub _convert($$)
return $result;
# commands with braces
} elsif ($accent_commands{$cmdname}) {
- if ($self->{'enable_encoding'}) {
+ if ($self->{'output_characters'}) {
my $encoding = $self->{'output_encoding_name'};
my $sc;
my $accented_text
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 192e65ff77..31599f1f09 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -656,7 +656,7 @@ sub _convert($$;$)
}
return $self->_format_command($element->{'cmdname'});
} elsif ($accent_types{$element->{'cmdname'}}) {
- if ($self->get_conf('ENABLE_ENCODING')) {
+ if ($self->get_conf('OUTPUT_CHARACTERS')) {
return $self->convert_accents($element, \&_accent, 1);
} else {
my $attributes = [];
diff --git a/tp/t/09indices.t b/tp/t/09indices.t
index 258cfb7f7e..526f325224 100644
--- a/tp/t/09indices.t
+++ b/tp/t/09indices.t
@@ -836,12 +836,12 @@ undef,
['encoding_index_latin1_enable_encoding',
undef,
{'test_file' => 'encoding_index_latin1.texi', 'ENABLE_ENCODING' => 1},
-{'ENABLE_ENCODING' => 1}
+{'ENABLE_ENCODING' => 1, 'OUTPUT_CHARACTERS' => 1}
],
['encoding_index_utf8_enable_encoding',
undef,
{'test_file' => 'encoding_index_utf8.texi', 'ENABLE_ENCODING' => 1},
-{'ENABLE_ENCODING' => 1}
+{'ENABLE_ENCODING' => 1, 'OUTPUT_CHARACTERS' => 1}
],
);
diff --git a/tp/t/formats_encodings.t b/tp/t/formats_encodings.t
index f42056e6d8..c12d111dfd 100644
--- a/tp/t/formats_encodings.t
+++ b/tp/t/formats_encodings.t
@@ -324,7 +324,7 @@ $weird_accents_text, {'ENABLE_ENCODING' => 0}
$accents_text
],
['accent_enable_encoding',
-$accents_text, {'ENABLE_ENCODING' => 1}
+$accents_text, {'ENABLE_ENCODING' => 1}, {'OUTPUT_CHARACTERS' => 1}
],
# numerous LaTeX formatting errors
['at_commands_in_refs',
@@ -335,7 +335,7 @@ $at_commands_in_refs_text,
my @html_text_cases = (
['accentenc_enable_encoding',
-$latin1_accents_text, {'ENABLE_ENCODING' => 1}
+$latin1_accents_text, {'ENABLE_ENCODING' => 1}, {'OUTPUT_CHARACTERS' => 1}
],
);
diff --git a/tp/t/html_tests.t b/tp/t/html_tests.t
index 66bcfc4cc7..2628e2dd24 100644
--- a/tp/t/html_tests.t
+++ b/tp/t/html_tests.t
@@ -495,7 +495,7 @@ $mathjax_with_texinfo, {}, {'HTML_MATH' => 'mathjax'}],
['mathjax_with_texinfo_enable_encoding',
$mathjax_with_texinfo, {'test_formats' => ['latex_text', 'file_latex'],
'full_document' => 1},
-{'HTML_MATH' => 'mathjax', 'ENABLE_ENCODING' => 1,},],
+{'HTML_MATH' => 'mathjax', 'ENABLE_ENCODING' => 1, 'OUTPUT_CHARACTERS' => 1}],
['mathjax_with_texinfo_no_convert_to_latex',
$mathjax_with_texinfo, {}, {'HTML_MATH' => 'mathjax',
'CONVERT_TO_LATEX_IN_MATH' => 0}],
@@ -583,11 +583,12 @@ AA @^e --- -- \'` \'\' ``'],
['utf8_enable_encoding',
'@documentencoding utf-8
-AA @^e --- -- \'` \'\' ``', {'ENABLE_ENCODING' => 1}],
+AA @^e --- -- \'` \'\' ``', {'ENABLE_ENCODING' => 1}, {'OUTPUT_CHARACTERS' =>
1}],
['utf8_enable_encoding_no_use_iso',
'@documentencoding utf-8
-AA @^e --- -- \'` \'\' ``', {'ENABLE_ENCODING' => 1}, {'USE_ISO' => 0}],
+AA @^e --- -- \'` \'\' ``', {'ENABLE_ENCODING' => 1},
+ {'OUTPUT_CHARACTERS' => 1, 'USE_ISO' => 0}],
['utf8_use_numeric_entity',
'@documentencoding utf-8
@@ -595,7 +596,8 @@ AA @^e --- -- \'` \'\' ``', {}, {'USE_NUMERIC_ENTITY' =>
1}],
['utf8_enable_encoding_use_numeric_entity',
'@documentencoding utf-8
-AA @^e --- -- \'` \'\' ``', {'ENABLE_ENCODING' => 1}, {'USE_NUMERIC_ENTITY' =>
1}],
+AA @^e --- -- \'` \'\' ``', {'ENABLE_ENCODING' => 1}, {'OUTPUT_CHARACTERS' =>
1,
+ 'USE_NUMERIC_ENTITY' =>
1}],
['ref_in_preformatted',
'@node Top
@@ -638,17 +640,17 @@ my @test_cases_file_text = (
undef, {'test_file' => 'punctuation_small_case_accents_utf8.texi'}],
['test_accents_sc_enable_encoding',
undef, {'test_file' => 'punctuation_small_case_accents_utf8.texi',
- 'ENABLE_ENCODING' => 1}],
+ 'ENABLE_ENCODING' => 1}, {'OUTPUT_CHARACTERS' => 1}],
['test_accents_sc_default_latin1',
undef, {'test_file' => 'punctuation_small_case_accents_latin1.texi'}],
['test_accents_sc_enable_encoding_latin1',
undef, {'test_file' => 'punctuation_small_case_accents_latin1.texi',
- 'ENABLE_ENCODING' => 1}],
+ 'ENABLE_ENCODING' => 1}, {'OUTPUT_CHARACTERS' => 1}],
['test_accents_sc_default_usascii',
undef, {'test_file' => 'punctuation_small_case_accents_us_ascii.texi'}],
['test_accents_sc_enable_encoding_usascii',
undef, {'test_file' => 'punctuation_small_case_accents_us_ascii.texi',
- 'ENABLE_ENCODING' => 1}],
+ 'ENABLE_ENCODING' => 1, {'OUTPUT_CHARACTERS' => 1}}],
['test_accents_sc_use_numeric_entity',
undef, {'test_file' => 'punctuation_small_case_accents_utf8.texi'},
{'USE_NUMERIC_ENTITY' => 1}],
@@ -659,11 +661,11 @@ undef, {'test_file' =>
'punctuation_small_case_accents_latin1.texi'},
['test_accents_sc_enable_encoding_to_utf8_latin1',
undef, {'test_file' => 'punctuation_small_case_accents_latin1.texi',
'ENABLE_ENCODING' => 1},
- {'OUTPUT_ENCODING_NAME' => 'utf-8'}],
+ {'OUTPUT_CHARACTERS' => 1, 'OUTPUT_ENCODING_NAME' => 'utf-8'}],
['test_accents_sc_enable_encoding_to_utf8_usascii',
undef, {'test_file' => 'punctuation_small_case_accents_us_ascii.texi',
'ENABLE_ENCODING' => 1},
- {'OUTPUT_ENCODING_NAME' => 'utf-8'}],
+ {'OUTPUT_CHARACTERS' => 1, 'OUTPUT_ENCODING_NAME' => 'utf-8'}],
);
# test that the node name that goes in the redirection file is reproducible.
@@ -726,7 +728,7 @@ $itemize_arguments_text
],
['itemize_arguments_enable_encoding',
$itemize_arguments_text
-, {'ENABLE_ENCODING' => 1}
+, {'ENABLE_ENCODING' => 1}, {'OUTPUT_CHARACTERS' => 1}
],
['check_htmlxref_no_use_nodes',
$check_htmlxref_text
diff --git a/tp/tests/layout/list-of-tests b/tp/tests/layout/list-of-tests
index c0c6e26bce..9f1fdd339f 100644
--- a/tp/tests/layout/list-of-tests
+++ b/tp/tests/layout/list-of-tests
@@ -35,7 +35,7 @@ formatting_weird_quotes formatting.texi -c 'OPEN_QUOTE_SYMBOL
@' -c "CLOSE_QUOTE
formatting_html32 formatting.texi --init html32.pm
formatting_regions formatting_regions.texi
formatting_numerical_entities formatting.texi -c 'USE_NUMERIC_ENTITY 1'
-formatting_enable_encoding formatting.texi --enable-encoding
+formatting_enable_encoding formatting.texi --enable-encoding -c
OUTPUT_CHARACTERS=1
formatting_xhtml formatting.texi -c DOCTYPE='<?xml version="1.0"
encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd";>' -c 'USE_XML_SYNTAX 1' -c
'NO_CUSTOM_HTML_ATTRIBUTE 1' -c 'HTML_ROOT_ELEMENT_ATTRIBUTES
xmlns="http://www.w3.org/1999/xhtml";'
formatting_exotic formatting.texi --split section --no-header
--no-number-sections -c 'TOC_LINKS 1' -c 'DEF_TABLE 1' -c
'XREF_USE_NODE_NAME_ARG 1' --footnote-style=end --css-ref
http://www.environnement.ens.fr/perso/dumas/background-color.css
--internal-links=/dev/null -c 'USE_TITLEPAGE_FOR_TITLE 0'
# use of the doctype is to be able to use W3C old validator, it
diff --git a/tp/tests/many_input_files/different_encodings.sh
b/tp/tests/many_input_files/different_encodings.sh
index 04eb778c24..3e185dccfa 100755
--- a/tp/tests/many_input_files/different_encodings.sh
+++ b/tp/tests/many_input_files/different_encodings.sh
@@ -36,8 +36,8 @@ raw_outdir=$raw_output_dir/$basename
[ -d $raw_outdir ] && rm -rf $raw_outdir
mkdir $basename
: > $basename/$stdout_file
-echo "$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--html --no-split --set-customization-variable 'TEST 1' --enable-encoding
--conf-dir $srcdir/../../init --out $basename/
$srcdir/../../t/input_files/char_latin1_latin1_in_refs.texi
$srcdir/../../t/input_files/char_latin1_utf8_in_refs.texi --force >>
$basename/$stdout_file 2>$bas [...]
-$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--html --no-split --set-customization-variable 'TEST 1' --enable-encoding
--conf-dir $srcdir/../../init --out $basename/
$srcdir/../../t/input_files/char_latin1_latin1_in_refs.texi
$srcdir/../../t/input_files/char_latin1_utf8_in_refs.texi --force >>
$basename/$stdout_file 2>$basename/ [...]
+echo "$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--html --no-split --set-customization-variable 'TEST 1' --enable-encoding -c
OUTPUT_CHARACTERS=1 --conf-dir $srcdir/../../init --out $basename/
$srcdir/../../t/input_files/char_latin1_latin1_in_refs.texi
$srcdir/../../t/input_files/char_latin1_utf8_in_refs.texi --force >> $basen
[...]
+$PERL -I $srcdir/../.. -I
$srcdir/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$srcdir/../../maintain/lib/libintl-perl/lib -I
$srcdir/../../maintain/lib/Text-Unidecode/lib/ -w $srcdir/../../texi2any.pl
--html --no-split --set-customization-variable 'TEST 1' --enable-encoding -c
OUTPUT_CHARACTERS=1 --conf-dir $srcdir/../../init --out $basename/
$srcdir/../../t/input_files/char_latin1_latin1_in_refs.texi
$srcdir/../../t/input_files/char_latin1_utf8_in_refs.texi --force >>
$basename/$s [...]
return_code=0
ret=$?