texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/Convert/Plaintext.pm (_convert) <@li


From: Gavin D. Smith
Subject: branch master updated: * tp/Texinfo/Convert/Plaintext.pm (_convert) <@listoffloats>: Eliminate default of ':' for "float entry text" as it does not appear to be used for valid input and would produce malformed Info output if used. Simply skip the entry if the "entry text" cannot be obtained.
Date: Fri, 08 Dec 2023 15:30:05 -0500

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 8158cc5979 * tp/Texinfo/Convert/Plaintext.pm (_convert) 
<@listoffloats>: Eliminate default of ':' for "float entry text" as it does not 
appear to be used for valid input and would produce malformed Info output if 
used.  Simply skip the entry if the "entry text" cannot be obtained.
8158cc5979 is described below

commit 8158cc59792c4b28be63e390942a2dc804e43fd4
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Fri Dec 8 20:28:44 2023 +0000

    * tp/Texinfo/Convert/Plaintext.pm (_convert) <@listoffloats>:
    Eliminate default of ':' for "float entry text" as it does
    not appear to be used for valid input and would produce malformed
    Info output if used.  Simply skip the entry if the "entry text"
    cannot be obtained.
---
 ChangeLog                       |  8 ++++++++
 tp/Texinfo/Convert/Plaintext.pm | 13 +++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ab5dfc89b7..53ca0f63fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-12-08  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * tp/Texinfo/Convert/Plaintext.pm (_convert) <@listoffloats>:
+       Eliminate default of ':' for "float entry text" as it does
+       not appear to be used for valid input and would produce malformed
+       Info output if used.  Simply skip the entry if the "entry text"
+       cannot be obtained.
+
 2023-12-08  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/convert/convert_html.c (convert_no_arg_command)
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 3376f677bd..4fc36349a0 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -2975,14 +2975,15 @@ sub _convert($$)
           next if !$float->{'args'} or !$float->{'args'}->[1]
                    or !$float->{'args'}->[1]->{'contents'}
                    or !@{$float->{'args'}->[1]->{'contents'}};
+
+          my $float_entry = $self->float_type_number($float);
+          next if !defined($float_entry);
+          $float_entry->{'type'} = 'frenchspacing';
+          my $float_entry_text = $self->convert_line($float_entry);
+
           my $float_label_text = $self->convert_line({'type' => '_code',
              'contents' => [$float->{'args'}->[1]]});
-          my $float_entry = $self->float_type_number($float);
-          my $float_entry_text = ':';
-          if (defined($float_entry)) {
-            $float_entry->{'type'} = 'frenchspacing';
-            $float_entry_text = $self->convert_line($float_entry);
-          }
+
           # no translation here, this is required Info format.
           my $float_line = "* $float_entry_text: $float_label_text.";
           my $line_width



reply via email to

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