texinfo-commits
[Top][All Lists]
Advanced

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

[7232] don't handle hash or array @value


From: gavinsmith0123
Subject: [7232] don't handle hash or array @value
Date: Sun, 19 Jun 2016 14:59:36 +0000 (UTC)

Revision: 7232
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7232
Author:   gavin
Date:     2016-06-19 14:59:35 +0000 (Sun, 19 Jun 2016)
Log Message:
-----------
don't handle hash or array @value

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Parser.pm

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-06-18 21:22:29 UTC (rev 7231)
+++ trunk/ChangeLog     2016-06-19 14:59:35 UTC (rev 7232)
@@ -1,3 +1,9 @@
+2016-06-19  Gavin Smith  <address@hidden>
+
+       * tp/Texinfo/Parser.pm (_parse_texi) <@value>: Don't handle 
+       arrays or hashes as values any more.  These used to be used for 
+       string translation.
+
 2016-06-18  Gavin Smith  <address@hidden>
 
        * doc/texinfo-tex-test.texi (Final page of index hard to balance):

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2016-06-18 21:22:29 UTC (rev 7231)
+++ trunk/tp/Texinfo/Parser.pm  2016-06-19 14:59:35 UTC (rev 7232)
@@ -4244,7 +4244,6 @@
         }
         print STDERR "COMMAND $command\n" if ($self->{'DEBUG'});
 
-
         if ($command eq 'value') {
           $line =~ s/^\s*// 
              if ($self->{'IGNORE_SPACE_AFTER_BRACED_COMMAND_NAME'});
@@ -4256,23 +4255,8 @@
                 print STDERR "BUG? $value exists but not defined\n";
               } elsif (!ref($self->{'values'}->{$value})) {
                 $line = $self->{'values'}->{$value} . $line;
-              # the push @{$current->{'contents'}}, {}; prevents a trailing
-              # text to be merged, to avoid having the value tree modified.
-              } elsif (ref($self->{'values'}->{$value}) eq 'ARRAY') {
-                # we don't know for sure, but if we don't do it here it 
-                # won't be done
-                _abort_empty_line($self, $current);
-                foreach my $content (@{$self->{'values'}->{$value}}) {
-                  push @{$current->{'contents'}}, $content;
-                }
-                push @{$current->{'contents'}}, {};
-              } elsif (ref($self->{'values'}->{$value}) eq 'HASH') {
-                # we don't know for sure, but if we don't do it here it 
-                # won't be done
-                _abort_empty_line($self, $current);
-                my $content = $self->{'values'}->{$value};
-                push @{$current->{'contents'}}, $content;
-                push @{$current->{'contents'}}, {};
+              } else {
+                print STDERR "BUG? $value defined as reference\n";
               }
             } else {
               # Flag not defined.  This is an error if it comes from




reply via email to

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