texinfo/tp/Texinfo Parser.pm

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/10/04 22:18:42

Modified files:
        tp/Texinfo     : Parser.pm 

Log message:
        Handle @verb character and content in one go.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.42&r2=1.43

Patches:
Index: Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- Parser.pm   4 Oct 2010 22:10:54 -0000       1.42
+++ Parser.pm   4 Oct 2010 22:18:42 -0000       1.43
@@ -1179,6 +1179,16 @@
       } elsif ($current->{'parent'} and $current->{'parent'}->{'cmdname'}
              and $current->{'parent'}->{'cmdname'} eq 'verb') { 
              # type should be 'brace_command_arg'
+        if (!defined($current->{'parent'}->{'type'})) {
+          if ($line =~ /^$/) {
+            $current->{'parent'}->{'type'} = '';
+            _line_error ($self, sprintf($self->
+                __("address@hidden without associated character"), 'verb'), 
$line_nr);
+          } else {
+            $line =~ s/^(.)//;
+            $current->{'parent'}->{'type'} = $1;
+          }
+        }
         my $char = quotemeta($current->{'parent'}->{'type'});
         if ($line =~ s/^(.*?)$char\}/\}/) {
           push @{$current->{'contents'}}, 
@@ -1612,16 +1622,6 @@
                and (defined($brace_commands{$current->{'cmdname'}})
                      or $self->{'definfoenclose'}->{$current->{'cmdname'}})) {
             my $command = $current->{'cmdname'};
-            if ($command eq 'verb') {
-              if ($line =~ /^$/) {
-                $current->{'type'} = '';
-                _line_error ($self, sprintf($self->
-                  __("address@hidden without associated character"), 
$command), $line_nr);
-              } else {
-                $line =~ s/^(.)//;
-                $current->{'type'} = $1;
-              }
-            }
             $current->{'args'} = [ { 'parent' => $current,
                                    'contents' => [] } ];
             $current->{'remaining_args'} = $brace_commands{$command} -1