[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Gavin D. Smith |
|
Date: |
Sun, 29 May 2022 08:09:56 -0400 (EDT) |
branch: master
commit 45393657a22999a7d5aad254123fe08882f698bf
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun May 29 13:04:43 2022 +0100
Rename DATA_INPUT_ENCODING_NAME to COMMAND_LINE_ENCODING.
* tp/Texinfo/Common.pm (@variable_string_settables):
Rename DATA_INPUT_ENCODING_NAME to COMMAND_LINE_ENCODING.
---
ChangeLog | 9 ++++++++-
tp/TODO | 4 ++--
tp/Texinfo/Common.pm | 4 ++--
tp/Texinfo/Config.pm | 2 +-
tp/Texinfo/Convert/Converter.pm | 2 +-
tp/Texinfo/Convert/HTML.pm | 8 ++++----
tp/Texinfo/Convert/Text.pm | 2 +-
tp/Texinfo/ParserNonXS.pm | 6 +++---
tp/Texinfo/XS/parsetexi/Parsetexi.pm | 4 ++--
tp/texi2any.pl | 8 ++++----
10 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f44a1cada9..9f600e3b0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
2022-05-29 Gavin Smith <gavinsmith0123@gmail.com>
- * TODO: Mention DATA_INPUT_ENCODING_NAME.
+ Rename DATA_INPUT_ENCODING_NAME to COMMAND_LINE_ENCODING.
+
+ * tp/Texinfo/Common.pm (@variable_string_settables):
+ Rename DATA_INPUT_ENCODING_NAME to COMMAND_LINE_ENCODING.
+
+2022-05-29 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * NEWS: Mention DATA_INPUT_ENCODING_NAME.
2022-05-29 Gavin Smith <gavinsmith0123@gmail.com>
diff --git a/tp/TODO b/tp/TODO
index 886deaca12..f6acd2dd67 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -414,8 +414,8 @@ résultat/encodé.txt file name encoded in latin1.
char_latin1_latin1_in_refs_tree.txt content encoded in latin1
utf8 encoded manual name and latex2html in latin1 locale
-./texi2any.pl --verbose -c 'DATA_INPUT_ENCODING_NAME=utf-8' --html --init
init/latex2html.pm -c 'L2H_CLEAN 0' tests/tex_html/tex_encod*_utf8.texi
-DATA_INPUT_ENCODING_NAME=utf-8 is required in order to have the
+./texi2any.pl --verbose -c 'COMMAND_LINE_ENCODING=utf-8' --html --init
init/latex2html.pm -c 'L2H_CLEAN 0' tests/tex_html/tex_encod*_utf8.texi
+COMMAND_LINE_ENCODING=utf-8 is required in order to have the
input file name correctly decoded as document_name which is used
in init file to set the file names.
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 4ac6bd848b..0d20d789dd 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -111,7 +111,7 @@ my %default_parser_common_customization = (
'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
- 'DATA_INPUT_ENCODING_NAME' => undef, # encoding of command line strings
+ '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
);
@@ -286,6 +286,7 @@ my @variable_string_settables = (
'CHAPTER_HEADER_LEVEL',
'CHECK_HTMLXREF',
'CLOSE_QUOTE_SYMBOL',
+'COMMAND_LINE_ENCODING',
'COMPLEX_FORMAT_IN_TABLE',
'CONTENTS_OUTPUT_LOCATION',
'CONVERT_TO_LATEX_IN_MATH',
@@ -327,7 +328,6 @@ my @variable_string_settables = (
'L2H_L2H',
'L2H_SKIP',
'L2H_TMP',
-'DATA_INPUT_ENCODING_NAME',
'MATHJAX_SCRIPT',
'MATHJAX_SOURCE',
'MAX_HEADER_LEVEL',
diff --git a/tp/Texinfo/Config.pm b/tp/Texinfo/Config.pm
index 4cccd92bf9..2ac2c644a9 100644
--- a/tp/Texinfo/Config.pm
+++ b/tp/Texinfo/Config.pm
@@ -100,7 +100,7 @@ sub _GNUT_decode_input($)
{
my $text = shift;
- my $encoding = texinfo_get_conf('DATA_INPUT_ENCODING_NAME');
+ my $encoding = texinfo_get_conf('COMMAND_LINE_ENCODING');
if (defined($encoding)) {
return decode($encoding, $text);
} else {
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 9b705b6d68..46664be890 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -543,7 +543,7 @@ sub determine_files_and_directory($;$)
# decoded character strings such that they can easily be mixed
# with other character strings, so we decode here.
my $input_file_name = $self->{'parser_info'}->{'input_file_name'};
- my $encoding = $self->get_conf('DATA_INPUT_ENCODING_NAME');
+ my $encoding = $self->get_conf('COMMAND_LINE_ENCODING');
if (defined($encoding)) {
$input_file_name = decode($encoding, $input_file_name, sub { '?' });
# use '?' as replacement character rather than U+FFFD in case it
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index d28ce497e5..5b9da4e75d 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -6591,7 +6591,7 @@ sub _parse_htmlxref_files($$)
print STDERR "html refs config file: $file\n" if
($self->get_conf('DEBUG'));
unless (open(HTMLXREF, $file)) {
my $htmlxref_file_name = $file;
- my $encoding = $self->get_conf('DATA_INPUT_ENCODING_NAME');
+ my $encoding = $self->get_conf('COMMAND_LINE_ENCODING');
if (defined($encoding)) {
$htmlxref_file_name = decode($encoding, $htmlxref_file_name);
}
@@ -7264,7 +7264,7 @@ sub _prepare_css($)
$css_file = $self->Texinfo::Common::locate_include_file($file);
unless (defined($css_file)) {
my $input_file_name = $file;
- my $encoding = $self->get_conf('DATA_INPUT_ENCODING_NAME');
+ my $encoding = $self->get_conf('COMMAND_LINE_ENCODING');
if (defined($encoding)) {
$input_file_name = decode($encoding, $input_file_name);
}
@@ -7274,7 +7274,7 @@ sub _prepare_css($)
}
unless (open (CSSFILE, $css_file)) {
my $css_file_name = $css_file;
- my $encoding = $self->get_conf('DATA_INPUT_ENCODING_NAME');
+ my $encoding = $self->get_conf('COMMAND_LINE_ENCODING');
if (defined($encoding)) {
$css_file_name = decode($encoding, $css_file_name);
}
@@ -7290,7 +7290,7 @@ sub _prepare_css($)
= $self->_process_css_file($css_file_fh, $css_file);
if (!close($css_file_fh)) {
my $css_file_name = $css_file;
- my $encoding = $self->get_conf('DATA_INPUT_ENCODING_NAME');
+ my $encoding = $self->get_conf('COMMAND_LINE_ENCODING');
if (defined($encoding)) {
$css_file_name = decode($encoding, $css_file_name);
}
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index a73785a9f6..eeb9163d50 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -724,7 +724,7 @@ sub output($$)
my $input_basename;
if (defined($self->{'parser_info'}->{'input_file_name'})) {
my $input_file_name = $self->{'parser_info'}->{'input_file_name'};
- my $encoding = $self->{'DATA_INPUT_ENCODING_NAME'};
+ my $encoding = $self->{'COMMAND_LINE_ENCODING'};
if (defined($encoding)) {
$input_file_name = decode($encoding, $input_file_name);
}
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 4ab5ee2ae0..43898ad310 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1023,7 +1023,7 @@ sub parse_texi_file($$)
my $filehandle = do { local *FH };
if (!_open_in($self, $filehandle, $input_file_path)) {
my $input_file_name = $input_file_path;
- my $encoding = $self->get_conf('DATA_INPUT_ENCODING_NAME');
+ my $encoding = $self->get_conf('COMMAND_LINE_ENCODING');
if (defined($encoding)) {
$input_file_name = decode($encoding, $input_file_path);
}
@@ -2112,7 +2112,7 @@ sub _next_text($$)
if (defined($previous_input->{'file_name_encoding'})) {
$file_name_encoding = $previous_input->{'file_name_encoding'};
} else {
- $file_name_encoding = $self->get_conf('DATA_INPUT_ENCODING_NAME');
+ $file_name_encoding = $self->get_conf('COMMAND_LINE_ENCODING');
}
my $file_name = $previous_input->{'input_file_info'}->{'file_name'};
if (defined($file_name_encoding)) {
@@ -6420,7 +6420,7 @@ C<input_perl_encoding> string is a corresponding Perl
encoding name.
The name of the main Texinfo input file and the associated directory.
Binary strings. They should come from the command line and can
be decoded with the encoding in the customization variable
-C<DATA_INPUT_ENCODING_NAME>.
+C<COMMAND_LINE_ENCODING>.
=back
diff --git a/tp/Texinfo/XS/parsetexi/Parsetexi.pm
b/tp/Texinfo/XS/parsetexi/Parsetexi.pm
index 10bb7d1156..41114e2836 100644
--- a/tp/Texinfo/XS/parsetexi/Parsetexi.pm
+++ b/tp/Texinfo/XS/parsetexi/Parsetexi.pm
@@ -138,7 +138,7 @@ sub parser (;$$)
}
} elsif ($key eq 'accept_internalvalue') {
set_accept_internalvalue();
- } elsif ($key eq 'registrar' or $key eq 'DATA_INPUT_ENCODING_NAME') {
+ } elsif ($key eq 'registrar' or $key eq 'COMMAND_LINE_ENCODING') {
# no action needed, only used in perl code
} else {
warn "ignoring parser configuration value \"$key\"\n";
@@ -242,7 +242,7 @@ sub parse_texi_file ($$)
if ($status) {
my ($registrar, $configuration_information) = _get_error_registrar($self);
my $input_file_name = $input_file_path;
- my $encoding = $self->get_conf('DATA_INPUT_ENCODING_NAME');
+ my $encoding = $self->get_conf('COMMAND_LINE_ENCODING');
if (defined($encoding)) {
$input_file_name = decode($encoding, $input_file_path);
}
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index 972a831aca..8b8f9eea1d 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -298,7 +298,7 @@ my $main_program_set_options = {
'PACKAGE_URL' => $configured_url,
'PROGRAM' => $real_command_name,
'TEXINFO_DTD_VERSION' => $texinfo_dtd_version,
- 'DATA_INPUT_ENCODING_NAME' => $locale_encoding,
+ 'COMMAND_LINE_ENCODING' => $locale_encoding,
'LOCALE_OUTPUT_ENCODING_NAME' => $locale_encoding,
'LOCALE_INPUT_FILE_NAME_ENCODING' => $file_name_encoding,
'LOCALE_OUTPUT_FILE_NAME_ENCODING' => $file_name_encoding,
@@ -383,7 +383,7 @@ sub _decode_input($)
{
my $text = shift;
- my $encoding = get_conf('DATA_INPUT_ENCODING_NAME');
+ my $encoding = get_conf('COMMAND_LINE_ENCODING');
if (defined($encoding)) {
return decode($encoding, $text);
} else {
@@ -469,9 +469,9 @@ my $parser_options = {'values' => {'txicommandconditionals'
=> 1}};
my $init_files_options = Texinfo::Config::GNUT_initialize_config(
$real_command_name, $main_program_default_options, $cmdline_options);
-# FIXME should we reset the messages encoding if 'DATA_INPUT_ENCODING_NAME'
+# FIXME should we reset the messages encoding if 'COMMAND_LINE_ENCODING'
# is reset?
-my $messages_encoding = get_conf('DATA_INPUT_ENCODING_NAME');
+my $messages_encoding = get_conf('COMMAND_LINE_ENCODING');
if (defined($messages_encoding) and $messages_encoding ne 'us-ascii') {
my $Encode_encoding_object = find_encoding($messages_encoding);
my $perl_messages_encoding = $Encode_encoding_object->name();