branch master updated: * tp/texi2any.pl (%converter_format_expanded_region_name) (set_format): more explicit code and variable names to distinguish output format, converter format and expanded region.

[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 a1f48fd962 * tp/texi2any.pl (%converter_format_expanded_region_name) 
(set_format): more explicit code and variable names to distinguish output 
format, converter format and expanded region.
a1f48fd962 is described below

commit a1f48fd96289dd72b2cfee0475a668cb7228beac
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Aug 26 08:20:29 2024 +0200

    * tp/texi2any.pl (%converter_format_expanded_region_name)
    (set_format): more explicit code and variable names to distinguish
    output format, converter format and expanded region.
---
 ChangeLog      |  6 ++++++
 tp/texi2any.pl | 53 +++++++++++++++++++++++++++++++++++------------------
 2 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index da2cd34b91..cea2e614e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-08-26  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/texi2any.pl (%converter_format_expanded_region_name)
+       (set_format): more explicit code and variable names to distinguish
+       output format, converter format and expanded region. 
+
 2024-08-25  Patrice Dumas  <pertusus@free.fr>
 
        * tp/texi2any.pl: fix a typo.
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index 8f34a30323..a968e6dd48 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -618,6 +618,10 @@ my %possible_split = (
 
 my $format_from_command_line = 0;
 
+my %converter_format_expanded_region_name = (
+  'texinfoxml' => 'xml',
+);
+
 my %format_command_line_names = (
   'xml' => 'texinfoxml',
 );
@@ -728,41 +732,54 @@ sub set_format($;$$)
   $previous_format = $format if (!defined($previous_format));
   my $do_not_override_command_line = shift;
 
-  my $new_format;
+  my $new_output_format;
   if ($format_command_line_names{$set_format}) {
-    $new_format = $format_command_line_names{$set_format};
+    $new_output_format = $format_command_line_names{$set_format};
   } else {
-    $new_format = $set_format;
+    $new_output_format = $set_format;
   }
-  my $expanded_format = $set_format;
-  if (!$formats_table{$new_format}) {
+  if (!$formats_table{$new_output_format}) {
     document_warn(sprintf(__(
                    "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"),
-                         $new_format));
-    $new_format = $previous_format;
+                         $set_format));
+    $new_output_format = $previous_format;
   } else {
     if ($format_from_command_line and $do_not_override_command_line) {
-      $new_format = $previous_format;
+      $new_output_format = $previous_format;
     } else {
-      if ($formats_table{$new_format}->{'texi2dvi_format'}) {
+      my $converter_format;
+      my $expanded_region;
+
+      if ($formats_table{$new_output_format}->{'texi2dvi_format'}) {
         $call_texi2dvi = 1;
-        push @texi2dvi_args, '--'.$new_format;
-        $expanded_format = 'tex';
-      } elsif ($formats_table{$new_format}->{'converted_format'}) {
-        $expanded_format = $formats_table{$new_format}->{'converted_format'};
+        push @texi2dvi_args, '--'.$new_output_format;
+        $converter_format = 'tex';
+      } elsif ($formats_table{$new_output_format}->{'converted_format'}) {
+        $converter_format
+          = $formats_table{$new_output_format}->{'converted_format'};
+      } else {
+        $converter_format = $new_output_format;
       }
-      if ($Texinfo::Common::texinfo_output_formats{$expanded_format}) {
-        if ($expanded_format eq 'plaintext') {
-          $default_expanded_format = [$expanded_format, 'info'];
+
+      if ($converter_format_expanded_region_name{$converter_format}) {
+        $expanded_region
+          = $converter_format_expanded_region_name{$converter_format};
+      } else {
+        $expanded_region = $converter_format;
+      }
+
+      if ($Texinfo::Common::texinfo_output_formats{$expanded_region}) {
+        if ($expanded_region eq 'plaintext') {
+          $default_expanded_format = [$expanded_region, 'info'];
         } else {
-          $default_expanded_format = [$expanded_format];
+          $default_expanded_format = [$expanded_region];
         }
       }
       $format_from_command_line = 1
         unless ($do_not_override_command_line);
     }
   }
-  return $new_format;
+  return $new_output_format;
 }
 
 sub _get_converter_default($)