texinfo/tp Texinfo/Parser.pm t/results/macro/ma...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/10/09 23:22:52

Modified files:
        tp/Texinfo     : Parser.pm 
        tp/t/results/macro: macro_in_menu.pl 

Log message:
        Really handle macro at the beginning of menu entry.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_menu.pl?cvsroot=texinfo&r1=1.2&r2=1.3

Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- Texinfo/Parser.pm   9 Oct 2010 23:10:34 -0000       1.55
+++ Texinfo/Parser.pm   9 Oct 2010 23:22:52 -0000       1.56
@@ -1564,10 +1564,12 @@
                                  'contents' => [],
                                  'parent' => $current } ];
         $current = $current->{'args'}->[-1];
+      # * folllowed by something else than a space.
       } elsif (@{$current->{'contents'}} 
                and $current->{'contents'}->[-1]->{'type'}
-               and $current->{'contents'}->[-1]->{'type'} eq 'menu_star') {
-        print STDERR "ABORT MENU STAR\n" if ($self->{'debug'});
+               and $current->{'contents'}->[-1]->{'type'} eq 'menu_star'
+               and $line ne '') {
+        print STDERR "ABORT MENU STAR ($line)\n" if ($self->{'debug'});
         delete $current->{'contents'}->[-1]->{'type'};
         # REMACRO
       } elsif ($line =~ s/^\@(["'address@hidden,\.!\?\s\*\-\^`=:\|\/\\])//o 

Index: t/results/macro/macro_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/macro_in_menu.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/macro/macro_in_menu.pl    9 Oct 2010 23:10:34 -0000       1.2
+++ t/results/macro/macro_in_menu.pl    9 Oct 2010 23:22:52 -0000       1.3
@@ -215,18 +215,74 @@
               'parent' => {},
               'text' => 'menu comment
 '
+            }
+          ],
+          'parent' => {},
+          'type' => 'menu_comment'
             },
             {
-              'text' => '* node::
-'
+          'args' => [
+            {
+              'parent' => {},
+              'text' => '* ',
+              'type' => 'menu_entry_leading_text'
             },
             {
-              'text' => '* other node::
-'
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'node'
             }
           ],
           'parent' => {},
-          'type' => 'menu_comment'
+              'type' => 'menu_entry_node'
+            },
+            {
+              'parent' => {},
+              'text' => '::
+',
+              'type' => 'menu_entry_separator'
+            },
+            {
+              'contents' => [],
+              'parent' => {},
+              'type' => 'menu_entry_description'
+            }
+          ],
+          'parent' => {},
+          'type' => 'menu_entry'
+        },
+        {
+          'args' => [
+            {
+              'parent' => {},
+              'text' => '* ',
+              'type' => 'menu_entry_leading_text'
+            },
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'other node'
+                }
+              ],
+              'parent' => {},
+              'type' => 'menu_entry_node'
+            },
+            {
+              'parent' => {},
+              'text' => '::
+',
+              'type' => 'menu_entry_separator'
+            },
+            {
+              'contents' => [],
+              'parent' => {},
+              'type' => 'menu_entry_description'
+            }
+          ],
+          'parent' => {},
+          'type' => 'menu_entry'
         },
         {
           'args' => [
@@ -310,10 +366,22 @@
 
$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[1];
 
$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3];
 
$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[3];
 
$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3];
-$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'args'}[4]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3];
 $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[11];
+$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4];
+$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[1];
+$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4];
+$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4];
+$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4];
+$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[4]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[11];
+$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5];
+$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[1];
+$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5];
+$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5];
+$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[3];
+$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5];
+$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'args'}[4]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5];
+$result_trees{'macro_in_menu'}{'contents'}[11]{'contents'}[5]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[11];
 $result_trees{'macro_in_menu'}{'contents'}[11]{'parent'} = 
$result_trees{'macro_in_menu'};
 
 $result_texts{'macro_in_menu'} = '