branch master updated: Rename LOCALE_OUTPUT_ENCODING_NAME to MESSAGE_ENCODING.

[Gavin D. Smith]

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 e088c180cf Rename LOCALE_OUTPUT_ENCODING_NAME to MESSAGE_ENCODING.
e088c180cf is described below

commit e088c180cf3cc88e179193ce54858bbc60b5bd99
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun May 29 14:01:00 2022 +0100

    Rename LOCALE_OUTPUT_ENCODING_NAME to MESSAGE_ENCODING.
    
    * tp/Texinfo/Common.pm (@variable_string_settables):
    Rename LOCALE_OUTPUT_ENCODING_NAME to MESSAGE_ENCODING.
    * NEWS, doc/texinfo.texi: Update.
---
 NEWS                        |  6 +++---
 doc/texinfo.texi            | 15 ++++++++-------
 tp/Texinfo/Common.pm        |  2 +-
 tp/Texinfo/Config.pm        |  2 +-
 tp/init/highlight_syntax.pm |  2 +-
 tp/init/latex2html.pm       |  2 +-
 tp/init/tex4ht.pm           |  2 +-
 tp/texi2any.pl              |  4 ++--
 8 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/NEWS b/NEWS
index d9c049f3fd..d850eed84f 100644
--- a/NEWS
+++ b/NEWS
@@ -16,9 +16,9 @@ See the manual for detailed information.
  . reform throughout the code in general
  . thorough review of character encoding issues
  . new customization variables involved with character encoding:
-     LOCALE_OUTPUT_ENCODING_NAME, LOCALE_INPUT_FILE_NAME_ENCODING,
-     LOCALE_OUTPUT_FILE_NAME_ENCODING, DOC_ENCODING_FOR_INPUT_FILE_NAME,
-     DOC_ENCODING_FOR_OUTPUT_FILE_NAME and COMMAND_LINE_ENCODING.
+     LOCALE_INPUT_FILE_NAME_ENCODING, LOCALE_OUTPUT_FILE_NAME_ENCODING,
+     DOC_ENCODING_FOR_INPUT_FILE_NAME, DOC_ENCODING_FOR_OUTPUT_FILE_NAME,
+     MESSAGE_ENCODING and COMMAND_LINE_ENCODING.
  . IGNORE_BEFORE_SETFILENAME variable removed.  former effect
    is always on.
  . new variable NO_TOP_NODE_OUTPUT
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index e1ca4e6876..730b894350 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -16825,18 +16825,19 @@ is unset.  Default is based on the locale encoding.
 Encoding for output file names if @code{DOC_ENCODING_FOR_INPUT_FILE_NAME}
 is unsed.  Default is based on the locale encoding.
 
-@item LOCALE_OUTPUT_ENCODING_NAME
-Encoding used to encode messages output by @command{texi2any} and command line
-arguments strings passed to commands called from @command{texi2any}.  For
-example @command{latex2html} will be called from @command{texi2any} if
-@code{HTML_MATH} is set to @samp{l2h}.  Default is based on the locale
-encoding.
-
 @item MAX_MACRO_CALL_NESTING
 The maximal number of recursive calls of @@-commands defined through
 @code{@@rmacro}; default 100000.  The purpose of this variable is to
 avoid infinite recursions.
 
+@item MESSAGE_ENCODING
+Encoding used to encode messages output by @command{texi2any}.  Default is
+based on the locale encoding.
+
+It is also used for command-line argument passed to commands called from
+@command{texi2any}.  For example, @command{latex2html} will be called from
+@command{texi2any} if @code{HTML_MATH} is set to @samp{l2h}.
+
 @item NO_TOP_NODE_OUTPUT
 If set do not output the Top node content.  The Top node is still
 parsed, but the content is discarded.  Not set in the default case
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 0d20d789dd..4282084127 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -333,7 +333,7 @@ my @variable_string_settables = (
 'MAX_HEADER_LEVEL',
 'MENU_ENTRY_COLON',
 'MENU_SYMBOL',
-'LOCALE_OUTPUT_ENCODING_NAME',
+'MESSAGE_ENCODING',
 'LOCALE_INPUT_FILE_NAME_ENCODING',
 'LOCALE_OUTPUT_FILE_NAME_ENCODING',
 'MONOLITHIC',
diff --git a/tp/Texinfo/Config.pm b/tp/Texinfo/Config.pm
index 2ac2c644a9..32b23f1afa 100644
--- a/tp/Texinfo/Config.pm
+++ b/tp/Texinfo/Config.pm
@@ -87,7 +87,7 @@ sub GNUT_initialize_config($$$) {
 sub _GNUT_encode_message($)
 {
   my $text = shift;
-  my $encoding = texinfo_get_conf('LOCALE_OUTPUT_ENCODING_NAME');
+  my $encoding = texinfo_get_conf('MESSAGE_ENCODING');
   if (defined($encoding)) {
     return Encode::encode($encoding, $text);
   } else {
diff --git a/tp/init/highlight_syntax.pm b/tp/init/highlight_syntax.pm
index f184efd2a7..0452f9b6e6 100644
--- a/tp/init/highlight_syntax.pm
+++ b/tp/init/highlight_syntax.pm
@@ -240,7 +240,7 @@ sub highlight_process($$)
     my $option_line_range_str = join(',', @option_line_ranges);
     my $cmd = "source-highlight ${version_option}--src-lang=$language 
--out-format=html5 -i '$input_language_path_name' -o '$html_result_path_name' 
--line-range=$option_line_range_str --range-separator='$range_separator'";
 
-    my $encoding = $self->get_conf('LOCALE_OUTPUT_ENCODING_NAME');
+    my $encoding = $self->get_conf('MESSAGE_ENCODING');
     my $encoded_cmd;
     if (defined($encoding)) {
       $encoded_cmd = encode($encoding, $cmd);
diff --git a/tp/init/latex2html.pm b/tp/init/latex2html.pm
index 0e4b799c0a..dcdd654f93 100644
--- a/tp/init/latex2html.pm
+++ b/tp/init/latex2html.pm
@@ -412,7 +412,7 @@ sub l2h_to_html($)
   $call_start .= " -address 0 -info 0 -split 0 -no_navigation -no_auto_link";
 
   # FIXME use utf-8 here?
-  my $encoding = $self->get_conf('LOCALE_OUTPUT_ENCODING_NAME');
+  my $encoding = $self->get_conf('MESSAGE_ENCODING');
   my $encoded_call_start;
   if (defined($encoding)) {
     $encoded_call_start = encode($encoding, $call_start);
diff --git a/tp/init/tex4ht.pm b/tp/init/tex4ht.pm
index d1c70b8c59..2f35c04ea2 100644
--- a/tp/init/tex4ht.pm
+++ b/tp/init/tex4ht.pm
@@ -300,7 +300,7 @@ sub tex4ht_process_format($$) {
   }
 
   my $cmd = "$formats{$format}->{'exec'} $formats{$format}->{'basefile_name'} 
$options";
-  my $encoding = $self->get_conf('LOCALE_OUTPUT_ENCODING_NAME');
+  my $encoding = $self->get_conf('MESSAGE_ENCODING');
   my $encoded_cmd;
   if (defined($encoding)) {
     $encoded_cmd = encode($encoding, $cmd);
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index 8b8f9eea1d..68b28f8ddb 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -299,7 +299,7 @@ my $main_program_set_options = {
     'PROGRAM' => $real_command_name, 
     'TEXINFO_DTD_VERSION' => $texinfo_dtd_version,
     'COMMAND_LINE_ENCODING' => $locale_encoding,
-    'LOCALE_OUTPUT_ENCODING_NAME' => $locale_encoding,
+    'MESSAGE_ENCODING' => $locale_encoding,
     'LOCALE_INPUT_FILE_NAME_ENCODING' => $file_name_encoding,
     'LOCALE_OUTPUT_FILE_NAME_ENCODING' => $file_name_encoding,
 };
@@ -362,7 +362,7 @@ sub _decode_i18n_string($$)
 sub _encode_message($)
 {
   my $text = shift;
-  my $encoding = get_conf('LOCALE_OUTPUT_ENCODING_NAME');
+  my $encoding = get_conf('MESSAGE_ENCODING');
   if (defined($encoding)) {
     return encode($encoding, $text);
   } else {