branch master updated: * tp/Texinfo/Convert/Utils.pm (encoded_output_file_name) (encoded_input_file_name): use input_encoding_name instead of input_perl_encoding, Encode determines the alias itself.

[Patrice Dumas]

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 abb79a2ca2 * tp/Texinfo/Convert/Utils.pm (encoded_output_file_name) 
(encoded_input_file_name): use input_encoding_name instead of 
input_perl_encoding, Encode determines the alias itself.
abb79a2ca2 is described below

commit abb79a2ca25dddb503c6fdf939d9594a56a85d40
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Oct 20 11:47:47 2024 +0200

    * tp/Texinfo/Convert/Utils.pm (encoded_output_file_name)
    (encoded_input_file_name): use input_encoding_name instead of
    input_perl_encoding, Encode determines the alias itself.
    
    * tp/Texinfo/Document.pm (new_document), tp/Texinfo/ParserNonXS.pm
    (get_parser_info), tp/Texinfo/XS/main/DocumentXS.xs
    (set_document_global_info), tp/Texinfo/XS/main/build_perl_info.c
    (build_global_info), tp/Texinfo/XS/main/document_types.h
    (GLOBAL_INFO), tp/Texinfo/XS/main/utils.c (delete_global_info),
    tp/Texinfo/XS/parsetexi/Parsetexi.pm (_get_parser_info),
    tp/t/test_document.t: remove input_perl_encoding.
---
 ChangeLog                                     | 14 ++++++++++++++
 doc/tp_api/api_includes/Texinfo-Common.texi   |  2 +-
 doc/tp_api/api_includes/Texinfo-Document.texi |  4 ----
 tp/Texinfo/Convert/Utils.pm                   |  8 ++++----
 tp/Texinfo/Document.pm                        |  6 +-----
 tp/Texinfo/ParserNonXS.pm                     | 10 +---------
 tp/Texinfo/XS/main/DocumentXS.xs              |  8 --------
 tp/Texinfo/XS/main/build_perl_info.c          |  3 ---
 tp/Texinfo/XS/main/document_types.h           |  3 ---
 tp/Texinfo/XS/main/utils.c                    |  3 ---
 tp/Texinfo/XS/parsetexi/Parsetexi.pm          | 13 -------------
 tp/t/test_document.t                          |  4 ++--
 12 files changed, 23 insertions(+), 55 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 79d2496e31..ecba20e306 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2024-10-19  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/Utils.pm (encoded_output_file_name)
+       (encoded_input_file_name): use input_encoding_name instead of
+       input_perl_encoding, Encode determines the alias itself.
+
+       * tp/Texinfo/Document.pm (new_document), tp/Texinfo/ParserNonXS.pm
+       (get_parser_info), tp/Texinfo/XS/main/DocumentXS.xs
+       (set_document_global_info), tp/Texinfo/XS/main/build_perl_info.c
+       (build_global_info), tp/Texinfo/XS/main/document_types.h
+       (GLOBAL_INFO), tp/Texinfo/XS/main/utils.c (delete_global_info),
+       tp/Texinfo/XS/parsetexi/Parsetexi.pm (_get_parser_info),
+       tp/t/test_document.t: remove input_perl_encoding.
+
 2024-10-19  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/parsetexi/Parsetexi.pm (parser): never set the 'conf'
diff --git a/doc/tp_api/api_includes/Texinfo-Common.texi 
b/doc/tp_api/api_includes/Texinfo-Common.texi
index 7ee4b8cba4..375b947ac7 100644
--- a/doc/tp_api/api_includes/Texinfo-Common.texi
+++ b/doc/tp_api/api_includes/Texinfo-Common.texi
@@ -104,7 +104,7 @@ and @code{plaintext}.
 @end table
 
 TODO: undocumented
-%null_device_file %default_parser_customization_values 
%parser_settable_configuration %multiple_at_command_options 
%unique_at_command_options %converter_cmdline_options 
%default_main_program_customization_options %converter_customization_options 
%document_settable_at_commands %def_map %command_structuring_level 
%level_to_structuring_command %encoding_name_conversion_map 
%text_brace_no_arg_commands
+%null_device_file %default_parser_customization_values 
%multiple_at_command_options %unique_at_command_options 
%converter_cmdline_options %default_main_program_customization_options 
%converter_customization_options %document_settable_at_commands %def_map 
%command_structuring_level %level_to_structuring_command 
%encoding_name_conversion_map %text_brace_no_arg_commands
 
 @node Texinfo@asis{::}Common @@-COMMAND INFORMATION
 @section @@-COMMAND INFORMATION
diff --git a/doc/tp_api/api_includes/Texinfo-Document.texi 
b/doc/tp_api/api_includes/Texinfo-Document.texi
index 8ddf52eeec..544c1b067a 100644
--- a/doc/tp_api/api_includes/Texinfo-Document.texi
+++ b/doc/tp_api/api_includes/Texinfo-Document.texi
@@ -95,12 +95,8 @@ strings.  From both @code{@@include} and 
@code{@@verbatiminclude}.
 @item input_encoding_name
 @anchor{Texinfo@asis{::}Document input_encoding_name}
 
-@item input_perl_encoding
-@anchor{Texinfo@asis{::}Document input_perl_encoding}
-
 @code{input_encoding_name} string is the encoding name used for the
 Texinfo code.
-@code{input_perl_encoding} string is a corresponding Perl encoding name.
 
 @item input_file_name
 @anchor{Texinfo@asis{::}Document input_file_name}
diff --git a/tp/Texinfo/Convert/Utils.pm b/tp/Texinfo/Convert/Utils.pm
index ecc2469781..dd5e2a3841 100644
--- a/tp/Texinfo/Convert/Utils.pm
+++ b/tp/Texinfo/Convert/Utils.pm
@@ -602,9 +602,9 @@ sub encoded_output_file_name($$)
       $document_info = $self->{'document'}->global_information();
     }
 
-    $encoding = $document_info->{'input_perl_encoding'}
+    $encoding = $document_info->{'input_encoding_name'}
       if ($document_info
-          and defined($document_info->{'input_perl_encoding'}));
+          and defined($document_info->{'input_encoding_name'}));
   } else {
     $encoding = $self->get_conf('LOCALE_ENCODING');
   }
@@ -645,9 +645,9 @@ sub encoded_input_file_name($$;$)
         $document_info = $self->{'document'}->global_information();
       }
 
-      $encoding = $document_info->{'input_perl_encoding'}
+      $encoding = $document_info->{'input_encoding_name'}
         if ($document_info
-          and defined($document_info->{'input_perl_encoding'}));
+          and defined($document_info->{'input_encoding_name'}));
     }
   } else {
     $encoding = $self->get_conf('LOCALE_ENCODING');
diff --git a/tp/Texinfo/Document.pm b/tp/Texinfo/Document.pm
index 92b99d96a5..c1f619d5aa 100644
--- a/tp/Texinfo/Document.pm
+++ b/tp/Texinfo/Document.pm
@@ -104,8 +104,7 @@ sub new_document($)
     'indices' => $indices_information,
     'listoffloats_list' => {},
     'internal_references' => [],
-    'global_info' => {'input_perl_encoding' => 'utf-8',
-                    'input_encoding_name' => 'utf-8',
+    'global_info' => {'input_encoding_name' => 'utf-8',
                     #'included_files' => [],
                     },
     'commands_info' => {},
@@ -599,11 +598,8 @@ strings.  From both C<@include> and C<@verbatiminclude>.
 
 =item input_encoding_name
 
-=item input_perl_encoding
-
 C<input_encoding_name> string is the encoding name used for the
 Texinfo code.
-C<input_perl_encoding> string is a corresponding Perl encoding name.
 
 =item input_file_name
 
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 26b02006ea..379d046e07 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -135,8 +135,7 @@ our $VERSION = '7.1.90';
                                # external manual.
   #'labels_list' => [],        # array of elements associated with labels.
                               # information on document
-  #'global_info' => {'input_perl_encoding' => 'utf-8',
-  #                  'input_encoding_name' => 'utf-8',
+  #'global_info' => {'input_encoding_name' => 'utf-8',
   #                  'included_files' => [],},
 # indices             a structure holding the link between index
 #                     names and merged indices;
@@ -909,13 +908,6 @@ sub get_parser_info($)
 
   my $document = $self->{'document'};
 
-  my $encoding = $document->{'global_info'}->{'input_encoding_name'};
-
-  my $perl_encoding = Texinfo::Common::perl_encoding_name($encoding);
-  if (defined($perl_encoding)) {
-    $document->{'global_info'}->{'input_perl_encoding'} = $perl_encoding
-  }
-
   my $global_commands = $document->{'commands_info'};
 
   # information based on commands commonly needed.
diff --git a/tp/Texinfo/XS/main/DocumentXS.xs b/tp/Texinfo/XS/main/DocumentXS.xs
index d23715f303..550689a35c 100644
--- a/tp/Texinfo/XS/main/DocumentXS.xs
+++ b/tp/Texinfo/XS/main/DocumentXS.xs
@@ -213,14 +213,6 @@ set_document_global_info (SV *document_in, char *key, SV 
*value_sv)
                 document->global_info.input_file_name
                   = non_perl_strdup (value);
               }
-            else if (!strcmp (key, "input_perl_encoding"))
-              {
-                /* should not be needed, but in case global information
-                   is reused, it will avoid memory leaks */
-                non_perl_free (document->global_info.input_perl_encoding);
-                document->global_info.input_perl_encoding
-                   = non_perl_strdup ((char *)SvPVbyte_nolen(value_sv));
-              }
             else
               {
                 add_other_global_info_string (
diff --git a/tp/Texinfo/XS/main/build_perl_info.c 
b/tp/Texinfo/XS/main/build_perl_info.c
index d833ccb709..0d6769e0f0 100644
--- a/tp/Texinfo/XS/main/build_perl_info.c
+++ b/tp/Texinfo/XS/main/build_perl_info.c
@@ -1553,9 +1553,6 @@ build_global_info (const GLOBAL_INFO *global_info_ref,
   if (global_info.input_directory)
     hv_store (hv, "input_directory", strlen ("input_directory"),
               newSVpv (global_info.input_directory, 0), 0);
-  if (global_info.input_perl_encoding)
-    hv_store (hv, "input_perl_encoding", strlen ("input_perl_encoding"),
-              newSVpv (global_info.input_perl_encoding, 0), 0);
 
   if (global_info.included_files.number)
     {
diff --git a/tp/Texinfo/XS/main/document_types.h 
b/tp/Texinfo/XS/main/document_types.h
index a63a1034f6..9022bc6a5e 100644
--- a/tp/Texinfo/XS/main/document_types.h
+++ b/tp/Texinfo/XS/main/document_types.h
@@ -91,9 +91,6 @@ typedef struct GLOBAL_INFO {
 
     /* remaining, in general passed to/from perl but not used in C */
     OTHER_GLOBAL_INFO other_info;
-
-    /* perl specific */
-    char *input_perl_encoding;
 } GLOBAL_INFO;
 
 typedef struct INDEX_LIST {
diff --git a/tp/Texinfo/XS/main/utils.c b/tp/Texinfo/XS/main/utils.c
index 9684259f3b..15b2e0ac21 100644
--- a/tp/Texinfo/XS/main/utils.c
+++ b/tp/Texinfo/XS/main/utils.c
@@ -1242,9 +1242,6 @@ delete_global_info (GLOBAL_INFO *global_info)
       free (k->string);
     }
   free (global_info->other_info.info);
-
-  /* perl specific information */
-  free (global_info->input_perl_encoding);
 }
 
 void
diff --git a/tp/Texinfo/XS/parsetexi/Parsetexi.pm 
b/tp/Texinfo/XS/parsetexi/Parsetexi.pm
index c601751cc1..477e3932dc 100644
--- a/tp/Texinfo/XS/parsetexi/Parsetexi.pm
+++ b/tp/Texinfo/XS/parsetexi/Parsetexi.pm
@@ -67,8 +67,6 @@ sub parser (;$)
   # Texinfo::Common parser_document_parsing_options.
   reset_parser($debug);
 
-  # Following code does the same as Perl code just above to
-  # setup parser_conf in C.
   # (re)set debug in any case, assuming that undef DEBUG is no debug
   parser_conf_set_DEBUG($debug);
 
@@ -157,17 +155,6 @@ sub _get_parser_info($$;$) {
     $document = build_document ($document_descriptor, 1);
   }
 
-  # additional info relevant in perl only.
-  my $encoding = $document->{'global_info'}->{'input_encoding_name'};
-
-  my $perl_encoding = Texinfo::Common::perl_encoding_name($encoding);
-  if (defined($perl_encoding)) {
-    $document->{'global_info'}->{'input_perl_encoding'} = $perl_encoding
-  }
-  $perl_encoding = 'utf-8' if (!defined($perl_encoding));
-  Texinfo::Document::set_document_global_info($document,
-                     'input_perl_encoding', $perl_encoding);
-
   # New error registrar for document to be used after parsing, for
   # structuring and tree modifications
   $document->{'registrar'} = Texinfo::Report::new();
diff --git a/tp/t/test_document.t b/tp/t/test_document.t
index dc4b5e96e8..d474182c02 100644
--- a/tp/t/test_document.t
+++ b/tp/t/test_document.t
@@ -28,13 +28,13 @@ T
 my $global_info = $document->global_information();
 
 is (join('|', sort(keys(%$global_info))),
-    'input_encoding_name|input_perl_encoding',
+    'input_encoding_name',
     'initial global info keys');
 
 $document->set_document_global_info('toto', 'la tete a');
 
 is (join('|', sort(keys(%$global_info))),
-    'input_encoding_name|input_perl_encoding|toto',
+    'input_encoding_name|toto',
     'with set global info keys');
 
 is ($global_info->{'toto'}, 'la tete a', 'check global info set value');