branch master updated: * tp/Texinfo/Structuring.pm (setup_index_entry_keys_formatting) (do_index_keys, sort_indices, sort_indices_by_letter), tp/Texinfo/Convert/LaTeX.pm, tp/init/chm.pm, tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/Plaintext.pm, tp/Texinfo/Convert/IXIN.pm: remove the now unused $parser_informations argument.

[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 8cca7d5  * tp/Texinfo/Structuring.pm 
(setup_index_entry_keys_formatting) (do_index_keys, sort_indices, 
sort_indices_by_letter), tp/Texinfo/Convert/LaTeX.pm, tp/init/chm.pm, 
tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/Plaintext.pm, 
tp/Texinfo/Convert/IXIN.pm: remove the now unused $parser_informations argument.
8cca7d5 is described below

commit 8cca7d5832b3d1e091fa93279105783dd75ea95c
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Aug 29 13:56:12 2021 +0200

    * tp/Texinfo/Structuring.pm (setup_index_entry_keys_formatting)
    (do_index_keys, sort_indices, sort_indices_by_letter),
    tp/Texinfo/Convert/LaTeX.pm, tp/init/chm.pm,
    tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/Plaintext.pm,
    tp/Texinfo/Convert/IXIN.pm: remove the now unused
    $parser_informations argument.
---
 ChangeLog                       |  9 +++++++++
 tp/Texinfo/Convert/HTML.pm      |  1 -
 tp/Texinfo/Convert/IXIN.pm      |  2 +-
 tp/Texinfo/Convert/LaTeX.pm     |  3 +--
 tp/Texinfo/Convert/Plaintext.pm |  2 +-
 tp/Texinfo/Structuring.pm       | 28 +++++++++++-----------------
 tp/init/chm.pm                  |  1 -
 tp/t/test_sort.t                |  6 +++---
 tp/t/test_utils.pl              |  2 +-
 9 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9c5eefb..70cd175 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2021-08-29  Patrice Dumas  <pertusus@free.fr>
 
+       * tp/Texinfo/Structuring.pm (setup_index_entry_keys_formatting)
+       (do_index_keys, sort_indices, sort_indices_by_letter),
+       tp/Texinfo/Convert/LaTeX.pm, tp/init/chm.pm,
+       tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/Plaintext.pm,
+       tp/Texinfo/Convert/IXIN.pm: remove the now unused
+       $parser_informations argument.
+
+2021-08-29  Patrice Dumas  <pertusus@free.fr>
+
        * tp/Texinfo/Structuring.pm (setup_index_entry_keys_formatting):
        do not use input encoding to determine the encoding used in index
        key sorting.
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index bf4500d..3b4c30e 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -6105,7 +6105,6 @@ sub _prepare_index_entries($)
         = Texinfo::Structuring::merge_indices($index_names);
     $self->{'index_entries_by_letter'}
       = Texinfo::Structuring::sort_indices_by_letter ($self->{'parser'}, $self,
-                          $self->{'parser_info'},
                           $merged_index_entries, $index_names);
     $self->{'index_entries'} = $merged_index_entries;
 
diff --git a/tp/Texinfo/Convert/IXIN.pm b/tp/Texinfo/Convert/IXIN.pm
index 061e489..f7f78d9 100644
--- a/tp/Texinfo/Convert/IXIN.pm
+++ b/tp/Texinfo/Convert/IXIN.pm
@@ -617,7 +617,7 @@ sub output_ixin($$)
         = Texinfo::Structuring::merge_indices($index_names);
     my $entries 
       = $self->Texinfo::Structuring::sort_indices($self->{'parser'}, $self,
-           $self->{'parser_info'}, $merged_index_entries, $index_names);
+                                   $merged_index_entries, $index_names);
     # first do the dts_text as the counts are needed for the dts index
     foreach my $index_name (sort(keys(%$entries))) {
       my $dts_text_result = '';
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index b92da08..04a45d5 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -1603,8 +1603,7 @@ sub _index_entry($$)
     # may change dynamically.  But the current code does not set the
     # values dynamically for now.  Actually not set at all...
     my ($options, $ignore_chars)
-      = Texinfo::Structuring::setup_index_entry_keys_formatting($self, $self,
-                                                $self->{'parser_info'});
+      = Texinfo::Structuring::setup_index_entry_keys_formatting($self, $self);
     my $current_entry = $root;
     my $current_sortas;
     my $subentry_commands = [$root];
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 2bf2462..dda829e 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -1207,7 +1207,7 @@ sub _printindex_formatted($$;$)
       = Texinfo::Structuring::merge_indices($index_names);
     $self->{'index_entries'} 
       = Texinfo::Structuring::sort_indices($self->{'parser'}, $self,
-           $self->{'parser_info'}, $merged_index_entries, $index_names);
+                                   $merged_index_entries, $index_names);
     $self->{'index_names'} = $index_names;
   }
   if (!$self->{'index_entries'} or !$self->{'index_entries'}->{$index_name}
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 75837aa..63e56c1 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -1591,11 +1591,10 @@ sub _sort_index_entries_in_letter($$)
   return $res;
 }
 
-sub setup_index_entry_keys_formatting($$$)
+sub setup_index_entry_keys_formatting($$)
 {
   my $self = shift;
   my $configuration_informations = shift;
-  my $parser_informations = shift;
 
   my $ignore_chars = '';
 
@@ -1648,15 +1647,14 @@ sub index_key($$$$;$)
 
 # Go through all the index entries and set 'key', the sort key, on
 # each one.
-sub do_index_keys($$$$)
+sub do_index_keys($$$)
 {
   my $self = shift;
   my $configuration_informations = shift;
-  my $parser_informations = shift;
   my $index_names = shift;
 
   my ($options, $ignore_chars) = setup_index_entry_keys_formatting($self,
-                        $configuration_informations, $parser_informations);
+                                             $configuration_informations);
 
   foreach my $index_name (keys(%$index_names)) {
     foreach my $entry (@{$index_names->{$index_name}->{'index_entries'}}) {
@@ -1671,17 +1669,15 @@ sub do_index_keys($$$$)
   }
 }
 
-sub sort_indices($$$$$)
+sub sort_indices($$$$)
 {
   my $self = shift;
   my $configuration_informations = shift;
-  my $parser_informations = shift;
   my $index_entries = shift;
   my $index_names = shift;
 
   my $sorted_index_entries;
-  do_index_keys($self, $configuration_informations, $parser_informations,
-                $index_names);
+  do_index_keys($self, $configuration_informations, $index_names);
   foreach my $index_name (keys(%$index_entries)) {
     @{$sorted_index_entries->{$index_name}} = 
         sort _sort_index_entries 
@@ -1690,17 +1686,15 @@ sub sort_indices($$$$$)
   return $sorted_index_entries;
 }
 
-sub sort_indices_by_letter($$$$$)
+sub sort_indices_by_letter($$$$)
 {
   my $self = shift;
   my $configuration_informations = shift;
-  my $parser_informations = shift;
   my $index_entries = shift;
   my $index_names = shift;
 
   my $indices_sorted_by_letters;
-  do_index_keys($self, $configuration_informations, $parser_informations,
-                $index_names);
+  do_index_keys($self, $configuration_informations, $index_names);
   foreach my $index_name (keys(%$index_entries)) {
     my $index_letter_hash;
     foreach my $index_entry (@{$index_entries->{$index_name}}) {
@@ -1783,10 +1777,10 @@ Texinfo::Structuring - information on Texinfo::Parser 
tree
      = merge_indices($index_names);
   my $index_entries_sorted;
   if ($sort_by_letter) {
-    $index_entries_sorted = sort_indices_by_letter($parser, $parser, 
$parser_informations,
+    $index_entries_sorted = sort_indices_by_letter($parser, $parser,
                                        $merged_index_entries, $index_names);
   } else {
-    $index_entries_sorted = sort_indices($parser, $parser, 
$parser_informations,
+    $index_entries_sorted = sort_indices($parser, $parser,
                                          $merged_index_entries, $index_names);
   }
   
@@ -2108,9 +2102,9 @@ The I<$merged_entries> returned is a hash reference whose
 keys are the index names and values arrays of index entry structures
 described in details in L<Texinfo::Parser/index_entries>.
 
-=item $index_entries_sorted = sort_indices_by_letter($parser, 
$configuration_informations, $parser_informations, $merged_index_entries, 
$index_names)
+=item $index_entries_sorted = sort_indices_by_letter($parser, 
$configuration_informations, $merged_index_entries, $index_names)
 
-=item $index_entries_sorted = sort_indices($parser, 
$configuration_informations, $parser_informations, $merged_index_entries, 
$index_names)
+=item $index_entries_sorted = sort_indices($parser, 
$configuration_informations, $merged_index_entries, $index_names)
 
 These functions first sets a plain text key for each index entry, used for 
 sorting.  In both cases, a hash reference with index names as keys is returned.
diff --git a/tp/init/chm.pm b/tp/init/chm.pm
index 67a918e..b981410 100644
--- a/tp/init/chm.pm
+++ b/tp/init/chm.pm
@@ -236,7 +236,6 @@ sub chm_init($)
   print $hhk_fh "</OBJECT>\n";
 
   my $index_entries = Texinfo::Structuring::sort_indices($self, $self,
-                                          $self->{'parser_info'},
                                           $self->{'index_entries'},
                                           $self->{'index_names'});
   if ($index_entries) {
diff --git a/tp/t/test_sort.t b/tp/t/test_sort.t
index 14d92a6..2612edc 100644
--- a/tp/t/test_sort.t
+++ b/tp/t/test_sort.t
@@ -48,8 +48,8 @@ my $parser_informations = $parser->global_informations();
 # holding only configuration instead
 $parser->{'OUTPUT_ENCODING_NAME'} = 
$parser_informations->{'input_encoding_name'};
 my $sorted_index_entries 
-  = Texinfo::Structuring::sort_indices($parser, $parser, $parser_informations,
-                                          $index_entries, $index_names);
+  = Texinfo::Structuring::sort_indices($parser, $parser,
+                                  $index_entries, $index_names);
 
 my @entries = ();
 foreach my $entry (@{$sorted_index_entries->{'cp'}}) {
@@ -64,7 +64,7 @@ my @entries_ref = ('!', '"', 'aaaaaaaaaaaa', 'e', 'E', 'ł', 
'ẽ');
 cmp_deeply (\@entries, \@entries_ref, 'sorted index entries');
 
 my $sorted_index_entries_by_letter 
-  = Texinfo::Structuring::sort_indices_by_letter($parser, $parser, 
$parser_informations,
+  = Texinfo::Structuring::sort_indices_by_letter($parser, $parser,
                                                  $index_entries, $index_names);
 
 my @letter_entries_ref = (
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index 46bcc0d..8923922 100644
--- a/tp/t/test_utils.pl
+++ b/tp/t/test_utils.pl
@@ -903,7 +903,7 @@ sub test($$)
   if ($merged_index_entries) {
     $sorted_index_entries 
       = Texinfo::Structuring::sort_indices_by_letter($parser, $parser,
-             $parser_informations, $merged_index_entries, $index_names);
+                                   $merged_index_entries, $index_names);
   }
   if ($simple_menus) {
     # require instead of use for speed when this module is not needed