[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: C locale for remaining tests
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: C locale for remaining tests |
|
Date: |
Tue, 31 May 2022 18:58:51 -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 c6d250cedc C locale for remaining tests
c6d250cedc is described below
commit c6d250cedc4aba307160b52bc42f5c008cc08bc4
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Jun 1 00:58:42 2022 +0200
C locale for remaining tests
* tp/init/tex4ht.pm (tex4ht_process_format): use already
encoded file name on the command line.
* tp/tests/many_input_files/input_dir_non_ascii.sh,
tp/tests/many_input_files/output_dir_file_non_ascii.sh,
tp/tests/many_input_files/output_dir_non_ascii.sh,
tp/tests/many_input_files/tex_l2h_output_dir_non_ascii.sh,
tp/tests/many_input_files/tex_t4ht_output_dir_non_ascii.sh:
Set LC_ALL to C and LANG to en, both previously
en_US.UTF-8 (last changed on 2022-02-14). Set extra variables
on tests to use UTF-8 encoding where required.
* tp/tests/tex_html/list-of-tests: Set extra variables on
tests to use UTF-8 encoding where required.
---
ChangeLog | 18 ++++++++++++++++++
tp/init/tex4ht.pm | 12 +++++++++---
tp/tests/many_input_files/input_dir_non_ascii.sh | 4 ++--
tp/tests/many_input_files/output_dir_file_non_ascii.sh | 10 ++++++----
tp/tests/many_input_files/output_dir_non_ascii.sh | 10 ++++++----
.../many_input_files/tex_l2h_output_dir_non_ascii.sh | 11 +++++++----
.../many_input_files/tex_t4ht_output_dir_non_ascii.sh | 11 +++++++----
tp/tests/tex_html/list-of-tests | 4 ++--
8 files changed, 57 insertions(+), 23 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index eeeeaa80c8..b789eecf68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2022-06-01 Patrice Dumas <pertusus@free.fr>
+
+ C locale for remaining tests
+
+ * tp/init/tex4ht.pm (tex4ht_process_format): use already
+ encoded file name on the command line.
+
+ * tp/tests/many_input_files/input_dir_non_ascii.sh,
+ tp/tests/many_input_files/output_dir_file_non_ascii.sh,
+ tp/tests/many_input_files/output_dir_non_ascii.sh,
+ tp/tests/many_input_files/tex_l2h_output_dir_non_ascii.sh,
+ tp/tests/many_input_files/tex_t4ht_output_dir_non_ascii.sh:
+ Set LC_ALL to C and LANG to en, both previously
+ en_US.UTF-8 (last changed on 2022-02-14). Set extra variables
+ on tests to use UTF-8 encoding where required.
+ * tp/tests/tex_html/list-of-tests: Set extra variables on
+ tests to use UTF-8 encoding where required.
+
2022-05-31 Gavin Smith <gavinsmith0123@gmail.com>
Documentation of whitespace
diff --git a/tp/init/tex4ht.pm b/tp/init/tex4ht.pm
index 2f35c04ea2..e969e8992c 100644
--- a/tp/init/tex4ht.pm
+++ b/tp/init/tex4ht.pm
@@ -301,12 +301,18 @@ sub tex4ht_process_format($$) {
my $cmd = "$formats{$format}->{'exec'} $formats{$format}->{'basefile_name'}
$options";
my $encoding = $self->get_conf('MESSAGE_ENCODING');
- my $encoded_cmd;
+ my $encoded_exec;
+ my $encoded_options;
if (defined($encoding)) {
- $encoded_cmd = encode($encoding, $cmd);
+ $encoded_exec = encode($encoding, $formats{$format}->{'exec'});
+ $encoded_options = encode($encoding, $options);
} else {
- $encoded_cmd = $cmd;
+ $encoded_exec = $formats{$format}->{'exec'};
+ $encoded_options = $options;
}
+ my $encoded_cmd = $encoded_exec . " " . $formats{$format}->{'basefile_path'}
+ . " $encoded_options";
+
print STDERR "tex4ht command: $encoded_cmd\n" if
($self->get_conf('VERBOSE'));
# do not use system in order to be sure that tex STDIN is not
# mixed up with the main script STDIN. It is important because
diff --git a/tp/tests/many_input_files/input_dir_non_ascii.sh
b/tp/tests/many_input_files/input_dir_non_ascii.sh
index 62f9239a17..f56ecc6729 100755
--- a/tp/tests/many_input_files/input_dir_non_ascii.sh
+++ b/tp/tests/many_input_files/input_dir_non_ascii.sh
@@ -12,8 +12,8 @@
#
# Originally written by Patrice Dumas.
-LC_ALL=en_US.UTF-8; export LC_ALL
-LANGUAGE=en_US.UTF-8; export LANGUAGE
+LC_ALL=C; export LC_ALL
+LANGUAGE=en; export LANGUAGE
basename=input_dir_non_ascii
diffs_dir=diffs
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 0d403e7aec..53f0a0b555 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
@@ -12,8 +12,8 @@
#
# Originally written by Patrice Dumas.
-LC_ALL=en_US.UTF-8; export LC_ALL
-LANGUAGE=en_US.UTF-8; export LANGUAGE
+LC_ALL=C; export LC_ALL
+LANGUAGE=en; export LANGUAGE
basename=output_dir_file_non_ascii
diffs_dir=diffs
@@ -38,8 +38,10 @@ raw_outdir=$raw_output_dir/$basename
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' --conf-dir
$srcdir/../../init --out $basename/encodé/non_asçî_i.info
$srcdir/../formatting/simplest.texi --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 --out
$basename/encodé/non_asçî_i.info $srcdir/../formatting/simplest.texi --force >>
$basename/$stdout_file 2>$basename/${basename}.2
+# 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
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 05b78d5276..db25f86686 100755
--- a/tp/tests/many_input_files/output_dir_non_ascii.sh
+++ b/tp/tests/many_input_files/output_dir_non_ascii.sh
@@ -12,8 +12,8 @@
#
# Originally written by Patrice Dumas.
-LC_ALL=en_US.UTF-8; export LC_ALL
-LANGUAGE=en_US.UTF-8; export LANGUAGE
+LC_ALL=C; export LC_ALL
+LANGUAGE=en; export LANGUAGE
basename=output_dir_non_ascii
diffs_dir=diffs
@@ -38,8 +38,10 @@ raw_outdir=$raw_output_dir/$basename
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' --conf-dir
$srcdir/../../init --out $basename/encodé/ $srcdir/../formatting/simplest.texi
--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 --out
$basename/encodé/ $srcdir/../formatting/simplest.texi --force >>
$basename/$stdout_file 2>$basename/${basename}.2
+# 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
return_code=0
ret=$?
diff --git a/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii.sh
b/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii.sh
index e14111765d..da6d7d491f 100755
--- a/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii.sh
+++ b/tp/tests/many_input_files/tex_l2h_output_dir_non_ascii.sh
@@ -12,8 +12,8 @@
#
# Originally written by Patrice Dumas.
-LC_ALL=en_US.UTF-8; export LC_ALL
-LANGUAGE=en_US.UTF-8; export LANGUAGE
+LC_ALL=C; export LC_ALL
+LANGUAGE=en; export LANGUAGE
if test "z$TEX_HTML_TESTS" != z'yes'; then
echo "Skipping HTML TeX tests that are not easily reproducible ($0)"
@@ -54,8 +54,11 @@ 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
--set-customization-variable 'TEXI2HTML 1' --set-customization-variable 'TEST
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init
--set-customization-variable 'HTML_MATH l2h' --set-customization-variable
L2H_FILE=$srcdir/../../t/init/l2h.init --set-cu [...]
-$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 'TEXI2HTML 1' --set-customization-variable 'TEST
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init
--set-customization-variable 'HTML_MATH l2h' --set-customization-variable
L2H_FILE=$srcdir/../../t/init/l2h.init --set-customiz [...]
+
+# 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 'TEXI2HTML 1' --set-customization-variable 'TEST
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init
--set-customization-variable 'HTML_MATH l2h' --set-customization-variable
L2H_FILE=$srcdir/../../t/init/l2h.init --set-cu [...]
+$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 'TEXI2HTML 1' --set-customization-variable 'TEST
1' --set-customization-variable L2H_TMP=$tmp_dir --conf-dir $srcdir/../../init
--set-customization-variable 'HTML_MATH l2h' --set-customization-variable
L2H_FILE=$srcdir/../../t/init/l2h.init --set-customiz [...]
return_code=0
ret=$?
diff --git a/tp/tests/many_input_files/tex_t4ht_output_dir_non_ascii.sh
b/tp/tests/many_input_files/tex_t4ht_output_dir_non_ascii.sh
index cf35208c70..d12b54eb98 100755
--- a/tp/tests/many_input_files/tex_t4ht_output_dir_non_ascii.sh
+++ b/tp/tests/many_input_files/tex_t4ht_output_dir_non_ascii.sh
@@ -1,7 +1,7 @@
#! /bin/sh
-LC_ALL=en_US.UTF-8; export LC_ALL
-LANGUAGE=en_US.UTF-8; export LANGUAGE
+LC_ALL=C; export LC_ALL
+LANGUAGE=en; export LANGUAGE
if test "z$TEX_HTML_TESTS" != z'yes'; then
echo "Skipping HTML TeX tests that are not easily reproducible"
@@ -36,8 +36,11 @@ raw_outdir=$raw_output_dir/$basename
[ -d $raw_outdir ] && rm -rf $raw_outdir
mkdir $basename
: > $basename/$stdout_file
-echo "$PERL -w $srcdir/../../texi2any.pl --set-customization-variable
'TEXI2HTML 1' --set-customization-variable 'TEST 1' --conf-dir
$srcdir/../../init --init-file tex4ht.pm --iftex --out $basename/encodé/
$srcdir/../tex_html/tex_encodé_utf8.texi $srcdir/../tex_html/tex_complex.texi
--force >> $basename/$stdout_file 2>$basename/${basename}.2" >> $logfile
-$PERL -w $srcdir/../../texi2any.pl --set-customization-variable 'TEXI2HTML 1'
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init --init-file
tex4ht.pm --iftex --out $basename/encodé/
$srcdir/../tex_html/tex_encodé_utf8.texi $srcdir/../tex_html/tex_complex.texi
--force >> $basename/$stdout_file 2>$basename/${basename}.2
+
+# note that it is important to have -c 'COMMAND_LINE_ENCODING UTF-8' before
--out
+# such that --out is correctly decoded
+echo "$PERL -w $srcdir/../../texi2any.pl --set-customization-variable
'TEXI2HTML 1' --set-customization-variable 'TEST 1' --conf-dir
$srcdir/../../init --init-file tex4ht.pm --iftex -c 'COMMAND_LINE_ENCODING
UTF-8' --out $basename/encodé/ $srcdir/../tex_html/tex_encodé_utf8.texi
$srcdir/../tex_html/tex_complex.texi -c LOCALE_OUTPUT_FILE_NAME_ENCODING=UTF-8
--force >> $basename/$stdout_file 2>$basename/${basename}.2" >> $logfile
+$PERL -w $srcdir/../../texi2any.pl --set-customization-variable 'TEXI2HTML 1'
--set-customization-variable 'TEST 1' --conf-dir $srcdir/../../init --init-file
tex4ht.pm --iftex -c 'COMMAND_LINE_ENCODING UTF-8' --out $basename/encodé/
$srcdir/../tex_html/tex_encodé_utf8.texi $srcdir/../tex_html/tex_complex.texi
-c LOCALE_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 1dc9126241..bc2e884a88 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
-tex_encoded_utf8_httex tex_encodé_utf8.texi --init tex4ht.pm --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_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
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: C locale for remaining tests,
Patrice Dumas <=