branch master updated: * tp/maintain/setup_converters_code_tables.pl: fix package of text_brace_no_arg_commands.

[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 d3618fdc76 * tp/maintain/setup_converters_code_tables.pl: fix package 
of text_brace_no_arg_commands.
d3618fdc76 is described below

commit d3618fdc76a37b749f9eb17f8b0e1f5b3f481410
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Feb 5 08:52:39 2024 +0100

    * tp/maintain/setup_converters_code_tables.pl: fix package of
    text_brace_no_arg_commands.
    
    * tp/t/test_sort.t: no need to setup encoding anymore for index
    entries sorting.
    
    * tp/Texinfo/Indices.pm (setup_sortable_index_entries): move code.
---
 ChangeLog                                   | 10 ++++++++++
 tp/Texinfo/Indices.pm                       | 10 +++++-----
 tp/maintain/setup_converters_code_tables.pl |  4 ++--
 tp/t/test_sort.t                            |  3 +--
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f613a06fd2..0e44c2c918 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2024-02-05  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/maintain/setup_converters_code_tables.pl: fix package of
+       text_brace_no_arg_commands.
+
+       * tp/t/test_sort.t: no need to setup encoding anymore for index
+       entries sorting.
+
+       * tp/Texinfo/Indices.pm (setup_sortable_index_entries): move code.
+
 2024-02-05  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Indices.pm (_setup_collator)
diff --git a/tp/Texinfo/Indices.pm b/tp/Texinfo/Indices.pm
index 0c7a41648c..90e69ada30 100644
--- a/tp/Texinfo/Indices.pm
+++ b/tp/Texinfo/Indices.pm
@@ -339,6 +339,11 @@ sub setup_sortable_index_entries($$$$$)
   my $index_entries = shift;
   my $indices_information = shift;
 
+  my $index_sortable_index_entries;
+  my $index_entries_sort_strings = {};
+  return $index_sortable_index_entries, $index_entries_sort_strings
+    unless ($index_entries);
+
   # convert index entries to sort string using unicode when possible
   # independently of input and output encodings
   my $convert_text_options = {};
@@ -349,11 +354,6 @@ sub setup_sortable_index_entries($$$$$)
   #$convert_text_options->{'INCLUDE_DIRECTORIES'}
   #   = $customization_information->get_conf('INCLUDE_DIRECTORIES');
 
-  my $index_sortable_index_entries;
-  my $index_entries_sort_strings = {};
-  return $index_sortable_index_entries, $index_entries_sort_strings
-    unless ($index_entries);
-
   $index_sortable_index_entries = {};
   foreach my $index_name (keys(%$index_entries)) {
     my $sortable_index_entries = [];
diff --git a/tp/maintain/setup_converters_code_tables.pl 
b/tp/maintain/setup_converters_code_tables.pl
index a273c31ac0..9a475dc749 100755
--- a/tp/maintain/setup_converters_code_tables.pl
+++ b/tp/maintain/setup_converters_code_tables.pl
@@ -269,8 +269,8 @@ foreach my $command_name (@commands_order) {
   if (exists($name_commands{$command_name})) {
     $command = $name_commands{$command_name};
   }
-  if 
(defined($Texinfo::Convert::Text::text_brace_no_arg_commands{$command_name})) {
-    my $result = 
$Texinfo::Convert::Text::text_brace_no_arg_commands{$command_name};
+  if (defined($Texinfo::Common::text_brace_no_arg_commands{$command_name})) {
+    my $result = $Texinfo::Common::text_brace_no_arg_commands{$command_name};
     my $protected = join ('', map {_protect_char($_)} split ('', $result));
     print TEXT "\"$protected\",   /* $command */\n";
   } else {
diff --git a/tp/t/test_sort.t b/tp/t/test_sort.t
index 51b225e446..e824c44ac2 100644
--- a/tp/t/test_sort.t
+++ b/tp/t/test_sort.t
@@ -47,8 +47,7 @@ $tree = $document->tree();
 my $registrar = $parser->registered_errors();
 my $indices_information = $document->indices_information();
 my $index_entries = $document->merged_indices();
-my $main_configuration = Texinfo::MainConfig::new({'ENABLE_ENCODING' => 1});
-Texinfo::Common::set_output_encodings($main_configuration, $document);
+my $main_configuration = Texinfo::MainConfig::new({});
 $main_configuration->{'document_descriptor'}
   = $document->document_descriptor();
 $main_configuration->register_XS_document_main_configuration($document);