branch master updated: * tp/Texinfo/Structuring.pm (setup_index_entry_keys_formatting) (sort_indices), tp/Texinfo/Convert/HTML.pm, tp/Texinfo/Convert/IXIN.pm, tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/Plaintext.pm, tp/init/chm.pm: remove first arguments of setup_index_entry_keys_formatting() and sort_indices() that are unused.

[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 7f29b404c1 * tp/Texinfo/Structuring.pm 
(setup_index_entry_keys_formatting) (sort_indices), tp/Texinfo/Convert/HTML.pm, 
tp/Texinfo/Convert/IXIN.pm, tp/Texinfo/Convert/LaTeX.pm, 
tp/Texinfo/Convert/Plaintext.pm, tp/init/chm.pm: remove first arguments of 
setup_index_entry_keys_formatting() and sort_indices() that are unused.
7f29b404c1 is described below

commit 7f29b404c17e10d7a7edb5e451fcce991ad9a530
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Jan 24 01:09:32 2022 +0100

    * tp/Texinfo/Structuring.pm (setup_index_entry_keys_formatting)
    (sort_indices), tp/Texinfo/Convert/HTML.pm,
    tp/Texinfo/Convert/IXIN.pm, tp/Texinfo/Convert/LaTeX.pm,
    tp/Texinfo/Convert/Plaintext.pm, tp/init/chm.pm: remove first
    arguments of setup_index_entry_keys_formatting() and sort_indices()
    that are unused.
---
 ChangeLog                       |  9 +++++++++
 tp/Texinfo/Convert/HTML.pm      |  6 +++---
 tp/Texinfo/Convert/IXIN.pm      |  2 +-
 tp/Texinfo/Convert/LaTeX.pm     |  2 +-
 tp/Texinfo/Convert/Plaintext.pm |  2 +-
 tp/Texinfo/Structuring.pm       | 26 +++++++++++---------------
 tp/init/chm.pm                  |  4 ++--
 tp/t/test_sort.t                |  4 ++--
 tp/t/test_utils.pl              |  2 +-
 9 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 922121450f..25f22a6313 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2022-01-24  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Structuring.pm (setup_index_entry_keys_formatting)
+       (sort_indices), tp/Texinfo/Convert/HTML.pm,
+       tp/Texinfo/Convert/IXIN.pm, tp/Texinfo/Convert/LaTeX.pm,
+       tp/Texinfo/Convert/Plaintext.pm, tp/init/chm.pm: remove first
+       arguments of setup_index_entry_keys_formatting() and sort_indices()
+       that are unused.
+
 2022-01-23  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (%available_converter_info)
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 92d40d1e23..082cc770bb 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -7711,7 +7711,7 @@ sub _prepare_index_entries($)
         = Texinfo::Structuring::merge_indices($index_names);
     my $index_entries_sort_strings;
     ($self->{'index_entries_by_letter'}, $index_entries_sort_strings)
-            = Texinfo::Structuring::sort_indices($self->{'parser'}, $self,
+            = Texinfo::Structuring::sort_indices($self,
                                $self, $merged_index_entries, 'by_letter');
     $self->{'index_entries'} = $merged_index_entries;
 
@@ -8792,9 +8792,9 @@ sub output_internal_links($)
       }
     }
   }
-  if ($self->{'parser'}) {
+  my $index_entries_by_letter = $self->get_info('index_entries_by_letter');
+  if ($index_entries_by_letter) {
     my %options = Texinfo::Convert::Text::copy_options_for_convert_text($self);
-    my $index_entries_by_letter = $self->get_info('index_entries_by_letter');
     foreach my $index_name (sort(keys (%{$index_entries_by_letter}))) {
       foreach my $letter_entry (@{$index_entries_by_letter->{$index_name}}) {
         foreach my $index_entry (@{$letter_entry->{'entries'}}) {
diff --git a/tp/Texinfo/Convert/IXIN.pm b/tp/Texinfo/Convert/IXIN.pm
index 140f81e9eb..fd820f8e95 100644
--- a/tp/Texinfo/Convert/IXIN.pm
+++ b/tp/Texinfo/Convert/IXIN.pm
@@ -612,7 +612,7 @@ sub output_ixin($$)
     my $merged_index_entries
         = Texinfo::Structuring::merge_indices($index_names);
     my ($entries, $index_entries_sort_strings)
-      = $self->Texinfo::Structuring::sort_indices($self->{'parser'}, $self,
+      = $self->Texinfo::Structuring::sort_indices($self,
                                               $self, $merged_index_entries);
     # first do the dts_text as the counts are needed for the dts index
     foreach my $index_name (sort(keys(%$entries))) {
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 0404e5a62c..16555f9801 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -1918,7 +1918,7 @@ sub _index_entry($$)
       $in_code = 1;
     }
     my $options
-      = Texinfo::Structuring::setup_index_entry_keys_formatting($self, $self);
+      = Texinfo::Structuring::setup_index_entry_keys_formatting($self);
     my $current_entry = $element;
     my $current_sortas;
     my $subentry_commands = [$element];
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 54cc3bedd2..835ebf4dd9 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -1214,7 +1214,7 @@ sub process_printindex($$;$)
       = Texinfo::Structuring::merge_indices($index_names);
     my $index_entries_sort_strings;
     ($self->{'index_entries'}, $index_entries_sort_strings)
-      = Texinfo::Structuring::sort_indices($self->{'parser'}, $self, $self,
+      = Texinfo::Structuring::sort_indices($self, $self,
                                            $merged_index_entries);
     $self->{'index_names'} = $index_names;
   }
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index a5da9f5c58..4b26ad8cf8 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -56,7 +56,6 @@ use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
   sectioning_structure
   set_menus_node_directions
   sort_indices
-  sort_indices_by_letter
   split_by_node
   split_by_section
   split_pages
@@ -1565,9 +1564,8 @@ sub _sort_index_entries($$)
   return $res;
 }
 
-sub setup_index_entry_keys_formatting($$)
+sub setup_index_entry_keys_formatting($)
 {
-  my $self = shift;
   my $configuration_informations = shift;
 
   my $options = {'sort_string' => 1, 'ascii_punctuation' => 1,
@@ -1613,16 +1611,14 @@ sub index_entry_sort_string($$$$)
 
 # the structure returned depends on $SORT_BY_LETTER being set
 # or not.  It is described in the pod documentation.
-sub sort_indices($$$$;$)
+sub sort_indices($$$;$)
 {
-  my $self = shift;
   my $registrar = shift;
   my $configuration_informations = shift;
   my $index_entries = shift;
   my $sort_by_letter = shift;
 
-  my $options = setup_index_entry_keys_formatting($self,
-                               $configuration_informations);
+  my $options = setup_index_entry_keys_formatting($configuration_informations);
   my $sorted_index_entries;
   my $index_entries_sort_strings = {};
   foreach my $index_name (keys(%$index_entries)) {
@@ -1725,7 +1721,7 @@ Texinfo::Structuring - information on Texinfo::Parser tree
     $tree_units = split_by_section($tree);
   }
   split_pages($tree_units, $split);
-  elements_directions($parser, $parser, $tree_units);
+  elements_directions($config, $labels, $tree_units);
   elements_file_directions($tree_units);
 
   my $index_names = $parser->indices_information();
@@ -1733,10 +1729,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($parser, $parser, $parser,
+    $index_entries_sorted = sort_indices($registrar, $config,
                                        $merged_index_entries, 'by_letter');
   } else {
-    $index_entries_sorted = sort_indices($parser, $parser, $parser,
+    $index_entries_sorted = sort_indices($registrar, $config,
                                          $merged_index_entries);
   }
  
@@ -1809,10 +1805,10 @@ Complete nodes directions with menu directions.  Check 
consistency
 of menus, sectionning and nodes direction structures.
 Register errors in I<$registrar>.
 
-=item elements_directions($parser, $configuration_informations, $tree_units)
+=item elements_directions($configuration_informations, $labels, $tree_units)
 
-Directions are set up for the tree unit elements in the array reference given 
in
-argument.  The corresponding hash is in
+Directions are set up for the tree unit elements in the array reference
+I<$tree_units> given in argument.  The corresponding hash is in
 C<< {'structure'}->{'directions'} >>
 and keys correspond to directions while values are elements.
 
@@ -2022,11 +2018,11 @@ Up, next and previous directions as set in menus.
 
 =back
 
-=item setup_index_entry_keys_formatting($self, $configuration_informations)
+=item setup_index_entry_keys_formatting($configuration_informations)
 
 TODO
 
-=item ($index_entries_sorted, $index_entries_sort_strings) = 
sort_indices($parser, $registrar, $configuration_informations, 
$merged_index_entries, $sort_by_letter)
+=item ($index_entries_sorted, $index_entries_sort_strings) = 
sort_indices($registrar, $configuration_informations, $merged_index_entries, 
$sort_by_letter)
 
 If I<$sort_by_letter> is set, sort by letter, otherwise sort all
 entries together.  In both cases, a hash reference with index names
diff --git a/tp/init/chm.pm b/tp/init/chm.pm
index 49073ad372..951ee03ecf 100644
--- a/tp/init/chm.pm
+++ b/tp/init/chm.pm
@@ -236,8 +236,8 @@ sub chm_init($)
   print $hhk_fh "</OBJECT>\n";
 
   my ($index_entries, $index_entries_sort_strings)
-       = Texinfo::Structuring::sort_indices($self->{'parser'},
-                           $self, $self, $self->get_info('index_entries'));
+       = Texinfo::Structuring::sort_indices($self, $self,
+                             $self->get_info('index_entries'));
   if ($index_entries) {
     foreach my $index_name (sort(keys(%$index_entries))) {
       foreach my $index_entry_ref (@{$index_entries->{$index_name}}) {
diff --git a/tp/t/test_sort.t b/tp/t/test_sort.t
index 57ab71999a..8371cd1767 100644
--- a/tp/t/test_sort.t
+++ b/tp/t/test_sort.t
@@ -50,7 +50,7 @@ my $parser_informations = $parser->global_informations();
 my $main_configuration = Texinfo::MainConfig::new({'ENABLE_ENCODING' => 1});
 Texinfo::Common::set_output_encodings($main_configuration, 
$parser_informations);
 my ($sorted_index_entries, $index_entries_sort_strings)
-  = Texinfo::Structuring::sort_indices($parser, $registrar, 
$main_configuration,
+  = Texinfo::Structuring::sort_indices($registrar, $main_configuration,
                                        $index_entries);
 
 my @entries = ();
@@ -66,7 +66,7 @@ my @entries_ref = ('!', '"', 'aaaaaaaaaaaa', 'e', 'E', 'ł', 
'ẽ');
 cmp_deeply (\@entries, \@entries_ref, 'sorted index entries');
 
 my ($sorted_index_entries_by_letter, $by_letter_index_entries_sort_strings)
-  = Texinfo::Structuring::sort_indices($parser, $registrar, 
$main_configuration,
+  = Texinfo::Structuring::sort_indices($registrar, $main_configuration,
                                        $index_entries, 'by_letter');
 
 my @letter_entries_ref = (
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index d572baea2b..e12e637baa 100644
--- a/tp/t/test_utils.pl
+++ b/tp/t/test_utils.pl
@@ -969,7 +969,7 @@ sub test($$)
   my $indices_sorted_sort_strings;
   if ($merged_index_entries) {
     ($sorted_index_entries, $index_entries_sort_strings)
-      = Texinfo::Structuring::sort_indices($parser, $registrar,
+      = Texinfo::Structuring::sort_indices($registrar,
                                    $main_configuration,
                                    $merged_index_entries);
     foreach my $index_name (keys(%$sorted_index_entries)) {