branch master updated: * tp/Texinfo/Convert/Converter.pm (%common_converters_defaults), tp/Texinfo/Convert/HTML.pm (_load_htmlxref_files), tp/texi2any.pl: rename language_config_dirs as texinfo_language_config_dirs.

[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 e1cbdf613b * tp/Texinfo/Convert/Converter.pm 
(%common_converters_defaults), tp/Texinfo/Convert/HTML.pm 
(_load_htmlxref_files), tp/texi2any.pl: rename language_config_dirs as 
texinfo_language_config_dirs.
e1cbdf613b is described below

commit e1cbdf613b8b383c758949b0723a14954804468f
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Aug 25 16:39:54 2024 +0200

    * tp/Texinfo/Convert/Converter.pm (%common_converters_defaults),
    tp/Texinfo/Convert/HTML.pm (_load_htmlxref_files), tp/texi2any.pl:
    rename language_config_dirs as texinfo_language_config_dirs.
---
 ChangeLog                       |  6 ++++++
 tp/Texinfo/Convert/Converter.pm |  2 +-
 tp/Texinfo/Convert/HTML.pm      |  6 +++---
 tp/texi2any.pl                  | 21 +++++++++++----------
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 72baa7719f..6f5b4cf435 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-08-03  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/Converter.pm (%common_converters_defaults),
+       tp/Texinfo/Convert/HTML.pm (_load_htmlxref_files), tp/texi2any.pl:
+       rename language_config_dirs as texinfo_language_config_dirs.
+
 2024-08-25  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Common.pm (locate_file_in_dirs): if the input file path
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 7b29c8e11d..fc08cdeff9 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -140,7 +140,7 @@ my %defaults = (
 # customization options instead.
 my %common_converters_defaults = (
   # Following are set in the main program
-  'language_config_dirs' => undef,
+  'texinfo_language_config_dirs' => undef,
   'converted_format'     => undef, # also in converter defaults, but
                                    # in general set by the caller
   # can be different from the converted_format, for example, epub3
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 1806f7b772..b5596b4a4e 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -8724,9 +8724,9 @@ sub _load_htmlxref_files {
         unshift @htmlxref_dirs, File::Spec->catdir(
           $Texinfo::ModulePath::top_srcdir, 'tp', 't', 'input_files');
       }
-    } elsif ($self->{'language_config_dirs'}
-             and @{$self->{'language_config_dirs'}}) {
-      @htmlxref_dirs = @{$self->{'language_config_dirs'}};
+    } elsif ($self->{'texinfo_language_config_dirs'}
+             and @{$self->{'texinfo_language_config_dirs'}}) {
+      @htmlxref_dirs = @{$self->{'texinfo_language_config_dirs'}};
     }
     unshift @htmlxref_dirs, '.';
 
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index 784c64e1db..643ed76c67 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -381,15 +381,15 @@ my $main_program_default_options = {
 # used as part of binary strings
 my $conf_file_name = 'texi2any-config.pm';
 
-# directories for texinfo configuration files, used as part of binary strings.
-my @language_config_dirs = File::Spec->catdir($curdir, '.texinfo');
-push @language_config_dirs, File::Spec->catdir($ENV{'HOME'}, '.texinfo')
+# directories for Texinfo configuration files, as far as possible
+# implementation independent.  Used as part of binary strings.
+my @texinfo_language_config_dirs = File::Spec->catdir($curdir, '.texinfo');
+push @texinfo_language_config_dirs, File::Spec->catdir($ENV{'HOME'}, 
'.texinfo')
                                 if (defined($ENV{'HOME'}));
-push @language_config_dirs, File::Spec->catdir($sysconfdir, 'texinfo')
+push @texinfo_language_config_dirs, File::Spec->catdir($sysconfdir, 'texinfo')
                                if (defined($sysconfdir));
-push @language_config_dirs, File::Spec->catdir($datadir, 'texinfo')
+push @texinfo_language_config_dirs, File::Spec->catdir($datadir, 'texinfo')
                                if (defined($datadir));
-my @texinfo_config_dirs = ($curdir, @language_config_dirs);
 
 # these variables are used as part of binary strings.
 my @program_config_dirs;
@@ -405,7 +405,7 @@ push @program_config_dirs, File::Spec->catdir($datadir, 
$program_name)
   if (defined($datadir));
 
 @program_init_dirs = @program_config_dirs;
-foreach my $texinfo_config_dir (@language_config_dirs) {
+foreach my $texinfo_config_dir (@texinfo_language_config_dirs) {
   push @program_init_dirs, File::Spec->catdir($texinfo_config_dir, 'init');
 }
 
@@ -1759,7 +1759,8 @@ while(@input_files) {
   # and Converters.
   $converter_options->{'output_format'} = $format;
   $converter_options->{'converted_format'} = $converted_format;
-  $converter_options->{'language_config_dirs'} = \@language_config_dirs;
+  $converter_options->{'texinfo_language_config_dirs'}
+    = \@texinfo_language_config_dirs;
   unshift @{$converter_options->{'INCLUDE_DIRECTORIES'}},
           @prepended_include_directories;
 
@@ -1871,8 +1872,8 @@ while(@input_files) {
     # hand, the information of the format could be useful.  Not very
     # important as long as this information is not used.
     $sort_element_converter_options->{'converted_format'} = $converted_format;
-    $sort_element_converter_options->{'language_config_dirs'}
-       = \@language_config_dirs;
+    $sort_element_converter_options->{'texinfo_language_config_dirs'}
+       = \@texinfo_language_config_dirs;
     unshift @{$sort_element_converter_options->{'INCLUDE_DIRECTORIES'}},
             @prepended_include_directories;