[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Rename LOCALE_INPUT_FILE_NAME_ENCODING
|
From: |
Gavin D. Smith |
|
Subject: |
branch master updated: Rename LOCALE_INPUT_FILE_NAME_ENCODING |
|
Date: |
Fri, 22 Jul 2022 10:41:22 -0400 |
This is an automated email from the git hooks/post-receive script.
gavin pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new a3294a277e Rename LOCALE_INPUT_FILE_NAME_ENCODING
a3294a277e is described below
commit a3294a277e7e71c502263a01c543bd08c6164a75
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Fri Jul 22 15:40:26 2022 +0100
Rename LOCALE_INPUT_FILE_NAME_ENCODING
* tp/Texinfo/Common.pm (@variable_string_settables):
Rename LOCALE_INPUT_FILE_NAME_ENCODING and
LOCALE_OUTPUT_FILE_NAME_ENCODING by removing LOCALE_ prefix.
All uses updated.
---
ChangeLog | 9 +++++++++
tp/Texinfo/Common.pm | 14 +++++++-------
tp/Texinfo/Convert/Converter.pm | 2 +-
tp/Texinfo/Convert/Utils.pm | 4 ++--
tp/Texinfo/ParserNonXS.pm | 2 +-
tp/Texinfo/XS/parsetexi/Parsetexi.pm | 2 +-
tp/init/epub3.pm | 2 +-
tp/tests/formatting/list-of-tests | 12 ++++++------
tp/tests/many_input_files/output_dir_file_non_ascii.sh | 4 ++--
tp/tests/many_input_files/output_dir_non_ascii.sh | 4 ++--
tp/tests/tex_html/list-of-tests | 4 ++--
tp/texi2any.pl | 4 ++--
12 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6dd81ef4b7..87dbc9a141 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-07-22 Gavin Smith <gavinsmith0123@gmail.com>
+
+ Rename LOCALE_INPUT_FILE_NAME_ENCODING
+
+ * tp/Texinfo/Common.pm (@variable_string_settables):
+ Rename LOCALE_INPUT_FILE_NAME_ENCODING and
+ LOCALE_OUTPUT_FILE_NAME_ENCODING by removing LOCALE_ prefix.
+ All uses updated.
+
2022-07-22 Patrice Dumas <pertusus@free.fr>
Update Emacs related documentation, other changes
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index d7a68abf68..d1dfb949a5 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -110,10 +110,10 @@ my %default_parser_common_customization = (
'FORMAT_MENU' => 'menu', # if not 'menu' no menu error related.
'DOC_ENCODING_FOR_INPUT_FILE_NAME' => 1, # if true use the document
encoding for input
# file names encoding, else use
- # LOCALE_INPUT_FILE_NAME_ENCODING
+ # INPUT_FILE_NAME_ENCODING
'COMMAND_LINE_ENCODING' => undef, # encoding of command line strings
- 'LOCALE_INPUT_FILE_NAME_ENCODING' => undef, # used for input file encoding if
- #
DOC_ENCODING_FOR_INPUT_FILE_NAME is 0
+ 'INPUT_FILE_NAME_ENCODING' => undef, # used for input file encoding if
+ # DOC_ENCODING_FOR_INPUT_FILE_NAME is 0
);
# Customization variables obeyed only by the parser, and the default values.
@@ -263,10 +263,10 @@ our %default_converter_customization = (
'TEXTCONTENT_COMMENT', => undef, # in textcontent format
'DOC_ENCODING_FOR_INPUT_FILE_NAME' => 1, # if true use the document
encoding for input
# file names encoding, else use
- # LOCALE_INPUT_FILE_NAME_ENCODING
+ # INPUT_FILE_NAME_ENCODING
'DOC_ENCODING_FOR_OUTPUT_FILE_NAME' => 0, # if true use the document
encoding for input
# file names encoding, else use
- # LOCALE_OUTPUT_FILE_NAME_ENCODING
+ # OUTPUT_FILE_NAME_ENCODING
);
# Some are for all converters, EXTENSION for instance, some for
@@ -320,6 +320,7 @@ my @variable_string_settables = (
'INFO_SPECIAL_CHARS_QUOTE',
'INFO_SPECIAL_CHARS_WARNING',
'INLINE_CSS_STYLE',
+'INPUT_FILE_NAME_ENCODING',
'JS_WEBLABELS',
'JS_WEBLABELS_FILE',
'KEEP_TOP_EXTERNAL_REF',
@@ -335,8 +336,6 @@ my @variable_string_settables = (
'MENU_ENTRY_COLON',
'MENU_SYMBOL',
'MESSAGE_ENCODING',
-'LOCALE_INPUT_FILE_NAME_ENCODING',
-'LOCALE_OUTPUT_FILE_NAME_ENCODING',
'MONOLITHIC',
'NO_CSS',
'NO_NUMBER_FOOTNOTE_SYMBOL',
@@ -348,6 +347,7 @@ my @variable_string_settables = (
'NO_USE_SETFILENAME',
'OPEN_QUOTE_SYMBOL',
'OUTPUT_ENCODING_NAME',
+'OUTPUT_FILE_NAME_ENCODING',
'OUTPUT_PERL_ENCODING',
'PACKAGE',
'PACKAGE_AND_VERSION',
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index a80e4878b3..1ab0c190ef 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1045,7 +1045,7 @@ sub encoded_input_file_name($$)
$document_encoding);
} else {
return Texinfo::Common::encode_file_name($self, $file_name,
- $self->get_conf('LOCALE_INPUT_FILE_NAME_ENCODING'));
+ $self->get_conf('INPUT_FILE_NAME_ENCODING'));
}
}
diff --git a/tp/Texinfo/Convert/Utils.pm b/tp/Texinfo/Convert/Utils.pm
index a2052b74aa..139806c2e3 100644
--- a/tp/Texinfo/Convert/Utils.pm
+++ b/tp/Texinfo/Convert/Utils.pm
@@ -214,7 +214,7 @@ sub expand_verbatiminclude($$$)
($file_name, $file_name_encoding)
= Texinfo::Common::encode_file_name($configuration_information,
$file_name_text,
- $configuration_information->get_conf('LOCALE_INPUT_FILE_NAME_ENCODING'));
+ $configuration_information->get_conf('INPUT_FILE_NAME_ENCODING'));
}
my $file = Texinfo::Common::locate_include_file($configuration_information,
@@ -323,7 +323,7 @@ sub encoded_output_file_name($$)
$document_encoding);
} else {
return Texinfo::Common::encode_file_name($self, $file_name,
- $self->get_conf('LOCALE_OUTPUT_FILE_NAME_ENCODING'));
+ $self->get_conf('OUTPUT_FILE_NAME_ENCODING'));
}
}
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index f05d91d3b5..d689f43e7e 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -2033,7 +2033,7 @@ sub _encode_file_name($$)
$self->{'info'}->{'input_perl_encoding'});
} else {
return Texinfo::Common::encode_file_name($self, $file_name,
- $self->get_conf('LOCALE_INPUT_FILE_NAME_ENCODING'));
+ $self->get_conf('INPUT_FILE_NAME_ENCODING'));
}
}
diff --git a/tp/Texinfo/XS/parsetexi/Parsetexi.pm
b/tp/Texinfo/XS/parsetexi/Parsetexi.pm
index 41114e2836..7b67d58f2d 100644
--- a/tp/Texinfo/XS/parsetexi/Parsetexi.pm
+++ b/tp/Texinfo/XS/parsetexi/Parsetexi.pm
@@ -132,7 +132,7 @@ sub parser (;$$)
set_debug($conf->{$key}) if $conf->{$key};
} elsif ($key eq 'DOC_ENCODING_FOR_INPUT_FILE_NAME') {
set_DOC_ENCODING_FOR_INPUT_FILE_NAME ($conf->{$key});
- } elsif ($key eq 'LOCALE_INPUT_FILE_NAME_ENCODING') {
+ } elsif ($key eq 'INPUT_FILE_NAME_ENCODING') {
if (defined ($conf->{$key})) {
set_locale_input_file_name_encoding ($conf->{$key});
}
diff --git a/tp/init/epub3.pm b/tp/init/epub3.pm
index d29eeabe82..4b508831db 100644
--- a/tp/init/epub3.pm
+++ b/tp/init/epub3.pm
@@ -84,7 +84,7 @@
texinfo_set_from_init_file('DOC_ENCODING_FOR_OUTPUT_FILE_NAME', 0);
# This is also needed for Archive::Zip in case there are non ascii
# file name.
# As a consequence, the epub file file name is also always utf-8 encoded.
-texinfo_set_from_init_file('LOCALE_OUTPUT_FILE_NAME_ENCODING', 'utf-8');
+texinfo_set_from_init_file('OUTPUT_FILE_NAME_ENCODING', 'utf-8');
# a "book like" output is most likely expected for epub. So we set
# NO_TOP_NODE_OUTPUT, which in turn sets titlepage to be used
diff --git a/tp/tests/formatting/list-of-tests
b/tp/tests/formatting/list-of-tests
index 0938dd90b8..c5d330685c 100644
--- a/tp/tests/formatting/list-of-tests
+++ b/tp/tests/formatting/list-of-tests
@@ -19,16 +19,16 @@ cpp_lines ../../t/input_files/cpp_lines.texi -c
MESSAGE_ENCODING=UTF-8
# ./texi2any.pl --footnote-style=bâd
# ./texi2any.pl --paragraph-indent=ïndent
# check non ascii command line arguments and css files
-non_ascii_command_line osé_utf8.texi -c COMMAND_LINE_ENCODING=UTF-8 -c
MESSAGE_ENCODING=UTF-8 -c LOCALE_OUTPUT_FILE_NAME_ENCODING=UTF-8 --html
--split=Mekanïk --document-language=Destruktïw -c 'Kommandöh vâl' -D TÛT -D
'vùr ké' -U ôndef -c 'FORMAT_MENU mînù'
--macro-expand=@OUT_DIR@osé-texinfo.texi --internal-links=@OUT_DIR@intérnal.txt
--css-include çss.css --css-include cêss.css --css-ref=rëf --css-ref=öref
+non_ascii_command_line osé_utf8.texi -c COMMAND_LINE_ENCODING=UTF-8 -c
MESSAGE_ENCODING=UTF-8 -c OUTPUT_FILE_NAME_ENCODING=UTF-8 --html
--split=Mekanïk --document-language=Destruktïw -c 'Kommandöh vâl' -D TÛT -D
'vùr ké' -U ôndef -c 'FORMAT_MENU mînù'
--macro-expand=@OUT_DIR@osé-texinfo.texi --internal-links=@OUT_DIR@intérnal.txt
--css-include çss.css --css-include cêss.css --css-ref=rëf --css-ref=öref
# test for the copying of image with non ascii characters for epub
-non_ascii_test_epub osé_utf8.texi -c COMMAND_LINE_ENCODING=UTF-8 -c
MESSAGE_ENCODING=UTF-8 -c LOCALE_OUTPUT_FILE_NAME_ENCODING=UTF-8 --init
epub3.pm -c 'EPUB_CREATE_CONTAINER 0' -c 'COMMAND_LINE_ENCODING UTF-8'
+non_ascii_test_epub osé_utf8.texi -c COMMAND_LINE_ENCODING=UTF-8 -c
MESSAGE_ENCODING=UTF-8 -c OUTPUT_FILE_NAME_ENCODING=UTF-8 --init epub3.pm -c
'EPUB_CREATE_CONTAINER 0' -c 'COMMAND_LINE_ENCODING UTF-8'
# check that the output is right when based on @setfilename
-non_ascii_test_rawtext osé_utf8.texi -c COMMAND_LINE_ENCODING=UTF-8 -c
MESSAGE_ENCODING=UTF-8 -c LOCALE_OUTPUT_FILE_NAME_ENCODING=UTF-8 -c
LOCALE_INPUT_FILE_NAME_ENCODING=UTF-8 -c TEXINFO_OUTPUT_FORMAT=rawtext -c
'COMMAND_LINE_ENCODING UTF-8'
+non_ascii_test_rawtext osé_utf8.texi -c COMMAND_LINE_ENCODING=UTF-8 -c
MESSAGE_ENCODING=UTF-8 -c OUTPUT_FILE_NAME_ENCODING=UTF-8 -c
INPUT_FILE_NAME_ENCODING=UTF-8 -c TEXINFO_OUTPUT_FORMAT=rawtext -c
'COMMAND_LINE_ENCODING UTF-8'
# check that the output is right when based on input file name
-non_ascii_no_setfilename_test_rawtext osé_utf8_no_setfilename.texi -c
COMMAND_LINE_ENCODING=UTF-8 -c MESSAGE_ENCODING=UTF-8 -c
LOCALE_OUTPUT_FILE_NAME_ENCODING=UTF-8 -c LOCALE_INPUT_FILE_NAME_ENCODING=UTF-8
-c TEXINFO_OUTPUT_FORMAT=rawtext
+non_ascii_no_setfilename_test_rawtext osé_utf8_no_setfilename.texi -c
COMMAND_LINE_ENCODING=UTF-8 -c MESSAGE_ENCODING=UTF-8 -c
OUTPUT_FILE_NAME_ENCODING=UTF-8 -c INPUT_FILE_NAME_ENCODING=UTF-8 -c
TEXINFO_OUTPUT_FORMAT=rawtext
# test of non utf8 encoded file name in non utf8 document
# "Need recoded file names" string is used in test driving script
@@ -36,9 +36,9 @@ non_ascii_no_setfilename_test_rawtext
osé_utf8_no_setfilename.texi -c COMMAND_L
# succeeded for this test not to be skipped
manual_include_accented_file_name_latin1
manual_include_accented_file_name_latin1.texi --info -D 'needrecodedfilenames
Need recoded file names'
-manual_include_accented_file_name_latin1_explicit_encoding
manual_include_accented_file_name_latin1.texi --info -c
DOC_ENCODING_FOR_INPUT_FILE_NAME=0 -c
LOCALE_INPUT_FILE_NAME_ENCODING=ISO-8859-1 -D 'needrecodedfilenames Need
recoded file names'
+manual_include_accented_file_name_latin1_explicit_encoding
manual_include_accented_file_name_latin1.texi --info -c
DOC_ENCODING_FOR_INPUT_FILE_NAME=0 -c INPUT_FILE_NAME_ENCODING=ISO-8859-1 -D
'needrecodedfilenames Need recoded file names'
# fails to find the latin1 encoded include file as the locale encoding
# of the test suite is utf8
-manual_include_accented_file_name_latin1_use_locale_encoding
manual_include_accented_file_name_latin1.texi --info -c
DOC_ENCODING_FOR_INPUT_FILE_NAME=0 -D 'needrecodedfilenames Need recoded file
names' -c MESSAGE_ENCODING=UTF-8 -c LOCALE_INPUT_FILE_NAME_ENCODING=UTF-8
+manual_include_accented_file_name_latin1_use_locale_encoding
manual_include_accented_file_name_latin1.texi --info -c
DOC_ENCODING_FOR_INPUT_FILE_NAME=0 -D 'needrecodedfilenames Need recoded file
names' -c MESSAGE_ENCODING=UTF-8 -c INPUT_FILE_NAME_ENCODING=UTF-8
diff --git a/tp/tests/many_input_files/output_dir_file_non_ascii.sh
b/tp/tests/many_input_files/output_dir_file_non_ascii.sh
index 53f0a0b555..21d50863ee 100755
--- a/tp/tests/many_input_files/output_dir_file_non_ascii.sh
+++ b/tp/tests/many_input_files/output_dir_file_non_ascii.sh
@@ -40,8 +40,8 @@ mkdir $basename
# note that it is important to have -c 'COMMAND_LINE_ENCODING UTF-8' before
--out
# such that --out is correctly decoded
-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
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init -c
'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/non_asçî_i.info
$srcdir/../formatting/simplest.texi -c LOCALE_OUTPUT_FILE_NAME_ENCODING=UTF-8
--force >> $basename/$stdout_file 2>$basename/${basename}.2" [...]
-$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
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init -c
'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/non_asçî_i.info
$srcdir/../formatting/simplest.texi -c LOCALE_OUTPUT_FILE_NAME_ENCODING=UTF-8
--force >> $basename/$stdout_file 2>$basename/${basename}.2
+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
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init -c
'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/non_asçî_i.info
$srcdir/../formatting/simplest.texi -c OUTPUT_FILE_NAME_ENCODING=UTF-8 --force
>> $basename/$stdout_file 2>$basename/${basename}.2" >> $logfile
+$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
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init -c
'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/non_asçî_i.info
$srcdir/../formatting/simplest.texi -c OUTPUT_FILE_NAME_ENCODING=UTF-8 --force
>> $basename/$stdout_file 2>$basename/${basename}.2
return_code=0
ret=$?
diff --git a/tp/tests/many_input_files/output_dir_non_ascii.sh
b/tp/tests/many_input_files/output_dir_non_ascii.sh
index db25f86686..351bad24a3 100755
--- a/tp/tests/many_input_files/output_dir_non_ascii.sh
+++ b/tp/tests/many_input_files/output_dir_non_ascii.sh
@@ -40,8 +40,8 @@ mkdir $basename
# note that it is important to have -c 'COMMAND_LINE_ENCODING UTF-8' before
--out
# such that --out is correctly decoded
-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
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init -c
'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/
$srcdir/../formatting/simplest.texi -c LOCALE_OUTPUT_FILE_NAME_ENCODING=UTF-8
--force >> $basename/$stdout_file 2>$basename/${basename}.2" >> $logfile
-$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
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init -c
'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/
$srcdir/../formatting/simplest.texi -c LOCALE_OUTPUT_FILE_NAME_ENCODING=UTF-8
--force >> $basename/$stdout_file 2>$basename/${basename}.2
+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
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init -c
'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/
$srcdir/../formatting/simplest.texi -c OUTPUT_FILE_NAME_ENCODING=UTF-8 --force
>> $basename/$stdout_file 2>$basename/${basename}.2" >> $logfile
+$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
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init -c
'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/
$srcdir/../formatting/simplest.texi -c OUTPUT_FILE_NAME_ENCODING=UTF-8 --force
>> $basename/$stdout_file 2>$basename/${basename}.2
return_code=0
ret=$?
diff --git a/tp/tests/tex_html/list-of-tests b/tp/tests/tex_html/list-of-tests
index bc2e884a88..1223c1fe5c 100644
--- a/tp/tests/tex_html/list-of-tests
+++ b/tp/tests/tex_html/list-of-tests
@@ -20,8 +20,8 @@ tex_eqalign_l2h tex_eqalign.texi -c 'HTML_MATH l2h' --iftex
math_not_closed math_not_closed.texi -c 'HTML_MATH l2h' --iftex
tex_not_closed tex_not_closed.texi -c 'HTML_MATH l2h' --iftex
tex_in_copying tex_in_copying.texi -c 'HTML_MATH l2h' --iftex
-tex_encoded_utf8_l2h tex_encodé_utf8.texi -c 'HTML_MATH l2h' --iftex -c
'COMMAND_LINE_ENCODING UTF-8' -c LOCALE_OUTPUT_FILE_NAME_ENCODING=UTF-8
-tex_encoded_utf8_httex tex_encodé_utf8.texi --init tex4ht.pm --iftex -c
'COMMAND_LINE_ENCODING UTF-8' -c LOCALE_OUTPUT_FILE_NAME_ENCODING=UTF-8
+tex_encoded_utf8_l2h tex_encodé_utf8.texi -c 'HTML_MATH l2h' --iftex -c
'COMMAND_LINE_ENCODING UTF-8' -c OUTPUT_FILE_NAME_ENCODING=UTF-8
+tex_encoded_utf8_httex tex_encodé_utf8.texi --init tex4ht.pm --iftex -c
'COMMAND_LINE_ENCODING UTF-8' -c OUTPUT_FILE_NAME_ENCODING=UTF-8
tex_encoded_latin1_l2h tex_encode_latin1.texi -c 'HTML_MATH l2h' --iftex
tex_encoded_latin1_httex tex_encode_latin1.texi --init tex4ht.pm --iftex
formatting_singular ../layout/formatting.texi --init-file t2h_singular.init -c
'HTML_MATH l2h' -c 'EXTENSION htm' -c 'PREFIX sing' -c 'TOP_FILE index.htm'
--no-verbose
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index 822b1e1796..7667345c3c 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -300,8 +300,8 @@ my $main_program_set_options = {
'TEXINFO_DTD_VERSION' => $texinfo_dtd_version,
'COMMAND_LINE_ENCODING' => $locale_encoding,
'MESSAGE_ENCODING' => $locale_encoding,
- 'LOCALE_INPUT_FILE_NAME_ENCODING' => $file_name_encoding,
- 'LOCALE_OUTPUT_FILE_NAME_ENCODING' => $file_name_encoding,
+ 'INPUT_FILE_NAME_ENCODING' => $file_name_encoding,
+ 'OUTPUT_FILE_NAME_ENCODING' => $file_name_encoding,
};
# use locale on Windows to set encoding of input file name as
- branch master updated: Rename LOCALE_INPUT_FILE_NAME_ENCODING,
Gavin D. Smith <=