branch master updated: * tp/Texinfo/Document.pm (sorted_indices_by_letter, sorted_indices_by_index): Remove "registrar" argument.

[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 4735b3e4c8 * tp/Texinfo/Document.pm (sorted_indices_by_letter, 
sorted_indices_by_index): Remove "registrar" argument.
4735b3e4c8 is described below

commit 4735b3e4c87a64942f2e0d4be82630be1085dd85
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Feb 25 15:17:31 2024 +0000

    * tp/Texinfo/Document.pm
    (sorted_indices_by_letter, sorted_indices_by_index):
    Remove "registrar" argument.
---
 ChangeLog                       |  6 ++++++
 tp/Texinfo/Convert/Converter.pm | 10 ++++------
 tp/Texinfo/Document.pm          | 24 ++++++++++--------------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eec716b0f1..c311f6c46c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-02-25  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * tp/Texinfo/Document.pm
+       (sorted_indices_by_letter, sorted_indices_by_index):
+       Remove "registrar" argument.
+
 2024-02-25  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/Utils.pm (find_innermost_accent_contents),
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 7665e082bb..0a313a55cc 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1574,8 +1574,7 @@ sub get_converter_indices_sorted_by_letter($)
       }
 
       return Texinfo::Document::sorted_indices_by_letter($self->{'document'},
-                                                 undef, $self,
-                                   $use_unicode_collation, $locale_lang);
+                            $self, $use_unicode_collation, $locale_lang);
     }
   }
   return undef;
@@ -1602,8 +1601,7 @@ sub get_converter_indices_sorted_by_index($)
       }
 
       return Texinfo::Document::sorted_indices_by_index($self->{'document'},
-                                               undef, $self,
-                                 $use_unicode_collation, $locale_lang);
+                            $self, $use_unicode_collation, $locale_lang);
     }
   }
   return undef;
@@ -2579,8 +2577,8 @@ the best to use for output.
 When simply sorting, the array of the sorted index entries is associated
 with the index name.
 
-The functions call L<< 
C<Texinfo::Document::sorted_indices_by_letter>|Texinfo::Document/$sorted_indices
 = $document->sorted_indices_by_letter($registrar, $customization_information, 
$use_unicode_collation, $locale_lang) >>
-or L<< 
C<Texinfo::Document::sorted_indices_by_index>|Texinfo::Document/$sorted_indices 
= $document->sorted_indices_by_index($registrar, $customization_information, 
$use_unicode_collation, $locale_lang) >>
+The functions call L<< 
C<Texinfo::Document::sorted_indices_by_letter>|Texinfo::Document/$sorted_indices
 = $document->sorted_indices_by_letter($customization_information, 
$use_unicode_collation, $locale_lang) >>
+or L<< 
C<Texinfo::Document::sorted_indices_by_index>|Texinfo::Document/$sorted_indices 
= $document->sorted_indices_by_index($customization_information, 
$use_unicode_collation, $locale_lang) >>
 with arguments based on C<USE_UNICODE_COLLATION>, C<COLLATION_LANGUAGE> and
 C<DOCUMENTLANGUAGE_COLLATION> customization options, and, if relevant, current
 C<@documentlanguage>.
diff --git a/tp/Texinfo/Document.pm b/tp/Texinfo/Document.pm
index 16c18f764c..a9858cb0f0 100644
--- a/tp/Texinfo/Document.pm
+++ b/tp/Texinfo/Document.pm
@@ -231,10 +231,9 @@ sub indices_sort_strings($$;$)
 }
 
 # call Texinfo::Indices::sort_indices_by_letter and cache the result
-sub sorted_indices_by_letter($$$$$)
+sub sorted_indices_by_letter($$$$)
 {
   my $document = shift;
-  my $registrar = shift;
   my $customization_information = shift;
   my $use_unicode_collation = shift;
   my $locale_lang = shift;
@@ -256,18 +255,17 @@ sub sorted_indices_by_letter($$$$$)
   if (!$document->{'sorted_indices_by_letter'}->{$lang_key}) {
     $document->merged_indices();
     $document->{'sorted_indices_by_letter'}->{$lang_key}
-      = Texinfo::Indices::sort_indices_by_letter($document,
-                          $registrar, $customization_information,
-                           $use_unicode_collation, $locale_lang);
+      = Texinfo::Indices::sort_indices_by_letter
+          ($document, $document->{'registrar'}, $customization_information,
+           $use_unicode_collation, $locale_lang);
   }
   return $document->{'sorted_indices_by_letter'}->{$lang_key};
 }
 
 # call Texinfo::Indices::sort_indices_by_index and cache the result
-sub sorted_indices_by_index($$$$$)
+sub sorted_indices_by_index($$$$)
 {
   my $document = shift;
-  my $registrar = shift;
   my $customization_information = shift;
   my $use_unicode_collation = shift;
   my $locale_lang = shift;
@@ -289,9 +287,9 @@ sub sorted_indices_by_index($$$$$)
   if (!$document->{'sorted_indices_by_index'}->{$lang_key}) {
     $document->merged_indices();
     $document->{'sorted_indices_by_index'}->{$lang_key}
-      = Texinfo::Indices::sort_indices_by_index($document,
-                       $registrar, $customization_information,
-                        $use_unicode_collation, $locale_lang);
+      = Texinfo::Indices::sort_indices_by_index
+          ($document, $document->{'registrar'}, $customization_information,
+           $use_unicode_collation, $locale_lang);
   }
   return $document->{'sorted_indices_by_index'}->{$lang_key};
 }
@@ -711,9 +709,9 @@ of index entry structures described in L</index_entries>.
 L<< C<Texinfo::Indices::merge_indices>|Texinfo::Indices/$merged_indices = 
merge_indices($indices_information) >>
 is used to merge the indices.
 
-=item $sorted_indices = $document->sorted_indices_by_index($registrar, 
$customization_information, $use_unicode_collation, $locale_lang)
+=item $sorted_indices = 
$document->sorted_indices_by_index($customization_information, 
$use_unicode_collation, $locale_lang)
 
-=item $sorted_indices = $document->sorted_indices_by_letter($registrar, 
$customization_information, $use_unicode_collation, $locale_lang)
+=item $sorted_indices = 
$document->sorted_indices_by_letter($customization_information, 
$use_unicode_collation, $locale_lang)
 X<C<sorted_indices_by_index>> X<C<sorted_indices_by_letter>>
 
 C<sorted_indices_by_letter> returns the indices sorted by index and letter,
@@ -738,8 +736,6 @@ the best to use for output.
 When simply sorting, the array of the sorted index entries is associated
 with the index name.
 
-Register errors in I<$registrar> or through I<$customization_information>.
-
 L<< 
C<Texinfo::Indices::sort_indices_by_index>|Texinfo::Indices/$index_entries_sorted
 = sort_indices_by_index($document, $registrar, $customization_information, 
$use_unicode_collation, $locale_lang) >>
 and L<< 
C<Texinfo::Indices::sort_indices_by_letter>|Texinfo::Indices/$index_entries_sorted
 = sort_indices_by_letter($document, $registrar, $customization_information, 
$use_unicode_collation, $locale_lang) >>
 are used to sort the indices, if needed.