texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: * tp/texi2any.pl (%formats_table): remove interna


From: Patrice Dumas
Subject: branch master updated: * tp/texi2any.pl (%formats_table): remove internal_links for latex, it is not implemented.
Date: Mon, 23 Dec 2024 18:30:43 -0500

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 b1784b895e * tp/texi2any.pl (%formats_table): remove internal_links 
for latex, it is not implemented.
b1784b895e is described below

commit b1784b895ec48793771492a94888287574b76ca4
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Dec 20 21:12:20 2024 +0100

    * tp/texi2any.pl (%formats_table): remove internal_links for latex, it
    is not implemented.
    
    * tp/texi2any.pl (set_format): remove end of line in message.
    
    * tp/texi2any.pl (set_format): do not recognize undef for
    TEXINFO_OUTPUT_FORMAT.
---
 ChangeLog      | 10 ++++++++++
 tp/texi2any.pl | 35 ++++++++++++++++++-----------------
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a4e477fe9b..5d70e5ae4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2024-12-20  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/texi2any.pl (%formats_table): remove internal_links for latex, it
+       is not implemented.
+
+       * tp/texi2any.pl (set_format): remove end of line in message.
+
+       * tp/texi2any.pl (set_format): do not recognize undef for
+       TEXINFO_OUTPUT_FORMAT.
+
 2024-12-20  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/main/utils.c (remove_from_strings_list): free removed
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index b06a968318..c7bfad794f 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -821,7 +821,6 @@ my %formats_table = (
            },
   'latex' => {
              'floats' => 1,
-             'internal_links' => 1,
              'move_index_entries_after_items' => 1,
              'no_warn_non_empty_parts' => 1,
              'module' => 'Texinfo::Convert::LaTeX'
@@ -909,7 +908,7 @@ sub set_format($)
   }
   if (!$formats_table{$new_output_format}) {
     document_warn(sprintf(__(
-                   "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"),
+                 "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'"),
                          $set_format));
   } else {
     Texinfo::Config::texinfo_set_from_init_file('TEXINFO_OUTPUT_FORMAT',
@@ -1250,24 +1249,26 @@ There is NO WARRANTY, to the extent permitted by 
law."), "2024")."\n";
    if ($var_val =~ s/^(\w+)\s*=?\s*//) {
      my $var = $1;
      my $value = $var_val;
-     if ($value =~ /^undef$/i) {
-       $value = undef;
-     } elsif (!$Texinfo::Common::non_decoded_customization_variables{$var}) {
-       $value = _decode_input($var_val);
-     }
-     # TODO verify that it is the best.  It is inconsistent with other
-     # customization options that have the same precedence as command
-     # line option when specified on the command line.  This is because
-     # in the manual, it is said:
-     # "The customization variable of the same name is also read; if set,
-     # that overrides an environment variable setting, but not a command-line
-     # option."
-     # If read means "read from an init file" then we could change here, but
-     # if it means "read from the command line or an init file" we should
-     # keep it as it is.
+
      if ($var eq 'TEXINFO_OUTPUT_FORMAT') {
+       $value = _decode_input($var_val);
+       # TODO verify that it is the best.  It is inconsistent with other
+       # customization options that have the same precedence as command
+       # line option when specified on the command line.  This is because
+       # in the manual, it is said:
+       # "The customization variable of the same name is also read; if set,
+       # that overrides an environment variable setting, but not a command-line
+       # option."
+       # If read means "read from an init file" then we could change here, but
+       # if it means "read from the command line or an init file" we should
+       # keep it as it is.
        set_format($value);
      } else {
+       if ($value =~ /^undef$/i) {
+         $value = undef;
+       } elsif (!$Texinfo::Common::non_decoded_customization_variables{$var}) {
+         $value = _decode_input($var_val);
+       }
        set_from_cmdline($var, $value);
      }
    }



reply via email to

[Prev in Thread] Current Thread [Next in Thread]