branch master updated: USE_UNICODE_COLLATION

[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 ee73bab564 USE_UNICODE_COLLATION
ee73bab564 is described below

commit ee73bab564cef0948ccd91e6763597b8901bb855
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Jan 28 20:59:07 2024 +0000

    USE_UNICODE_COLLATION
    
    * tp/Texinfo/options_data.txt: Add USE_UNICODE_COLLATION, 1 by default.
    * tp/Texinfo/Indices.pm (setup_sortable_index_entries): If
    USE_UNICODE_COLLATION is false, use the Texinfo::CollateStub
    module instead of Unicode::Collate.
---
 ChangeLog                   | 9 +++++++++
 tp/Texinfo/Indices.pm       | 3 ++-
 tp/Texinfo/options_data.txt | 1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1b3f9d1035..538ad8175f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-01-28  Gavin Smith <gavinsmith0123@gmail.com>
+
+       USE_UNICODE_COLLATION
+
+       * tp/Texinfo/options_data.txt: Add USE_UNICODE_COLLATION, 1 by default.
+       * tp/Texinfo/Indices.pm (setup_sortable_index_entries): If
+       USE_UNICODE_COLLATION is false, use the Texinfo::CollateStub
+       module instead of Unicode::Collate.
+
 2024-01-28  Patrice Dumas  <pertusus@free.fr>
 
        * tp/texi2any.pl: set also PACKAGE*_CONFIG to have the same symbols
diff --git a/tp/Texinfo/Indices.pm b/tp/Texinfo/Indices.pm
index a9c31b2d24..09c583941b 100644
--- a/tp/Texinfo/Indices.pm
+++ b/tp/Texinfo/Indices.pm
@@ -392,7 +392,8 @@ sub setup_sortable_index_entries($$$$$)
   my $collator;
   eval { require Unicode::Collate; Unicode::Collate->import; };
   my $unicode_collate_loading_error = $@;
-  if ($unicode_collate_loading_error eq '') {
+  if ($unicode_collate_loading_error eq ''
+        and $customization_information->get_conf('USE_UNICODE_COLLATION')) {
     $collator = Unicode::Collate->new(%collate_options);
   } else {
     $collator = Texinfo::CollateStub->new();
diff --git a/tp/Texinfo/options_data.txt b/tp/Texinfo/options_data.txt
index e972d75f6b..5910c5191e 100644
--- a/tp/Texinfo/options_data.txt
+++ b/tp/Texinfo/options_data.txt
@@ -185,6 +185,7 @@ TEXTCONTENT_COMMENT                converter_customization 
undef   integer
 # be good to update from time to time to avoid test results that are not
 # valid against their reported DTD.
 TEXINFO_DTD_VERSION                converter_customization 7.1     char
+USE_UNICODE_COLLATION              converter_customization 1       integer
 
 # Some are for all converters, EXTENSION for instance, some for
 # some converters, for example CLOSE_QUOTE_SYMBOL and many