texinfo-commits
[Top][All Lists]
Advanced

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

texinfo/tp Texinfo/Parser.pm t/results/info_tes...


From: Patrice Dumas
Subject: texinfo/tp Texinfo/Parser.pm t/results/info_tes...
Date: Sat, 30 Apr 2011 16:44:14 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/04/30 16:44:13

Modified files:
        tp/Texinfo     : Parser.pm 
        tp/t/results/info_tests: direntry_dircategory_and_commands.pl 
                                 space_at_menu_end.pl 
        tp/t/results/invalid_nestings: 
                                       table_not_closed_in_menu_comment.pl 
        tp/t/results/macro: macro_in_menu.pl 
        tp/t/results/menu: dash_in_menu.pl detailmenu.pl 
                           detailmenu_on_subnodes.pl 
                           example_in_menu_comment.pl formats_in_menu.pl 
                           menu_no_closed_after_empty_line.pl simple.pl 
                           simple_no_menu.pl 
        tp/t/results/sectioning: complex.pl 

Log message:
        Put the after_description_line in the menu_comment.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.247&r2=1.248
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/direntry_dircategory_and_commands.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/space_at_menu_end.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_menu.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/dash_in_menu.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/detailmenu.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/detailmenu_on_subnodes.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/example_in_menu_comment.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/formats_in_menu.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_no_closed_after_empty_line.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/simple.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/simple_no_menu.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/complex.pl?cvsroot=texinfo&r1=1.14&r2=1.15

Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -b -r1.247 -r1.248
--- Texinfo/Parser.pm   30 Apr 2011 09:53:57 -0000      1.247
+++ Texinfo/Parser.pm   30 Apr 2011 16:44:12 -0000      1.248
@@ -1991,13 +1991,13 @@
       # first parent is menu_entry
       $current = $current->{'parent'}->{'parent'};
       
-      push @{$current->{'contents'}}, { 'type' => 'after_description_line', 
-                                        'text' => $empty_line->{'text'},
-                                        'parent' => $current };
       push @{$current->{'contents'}}, { 'type' => 'menu_comment',
                                         'parent' => $current,
                                         'contents' => [] };
       $current = $current->{'contents'}->[-1];
+      push @{$current->{'contents'}}, { 'type' => 'after_description_line', 
+                                        'text' => $empty_line->{'text'},
+                                        'parent' => $current };
       push @{$current->{'contents'}}, { 'type' => 'preformatted',
                                         'parent' => $current,
                                         'contents' => [] };
@@ -3158,9 +3158,12 @@
             and $current->{'parent'}->{'type'} 
             and $current->{'parent'}->{'type'} eq 'menu_comment') {
           my $menu = $current->{'parent'}->{'parent'};
-          pop @{$menu->{'contents'}} 
-            if (address@hidden>{'contents'}} 
-                and scalar(@{$current->{'parent'}->{'contents'}}) == 1);
+          if (address@hidden>{'contents'}}) {
+            pop @{$current->{'parent'}->{'contents'}};
+            if (!scalar(@{$current->{'parent'}->{'contents'}})) {
+              pop @{$menu->{'contents'}}; 
+            }
+          }
           $current = $menu;
           #print STDERR "Close MENU_COMMENT because new menu entry\n";
           pop @{$self->{'context_stack'}};
@@ -3693,10 +3696,12 @@
               if ($current->{'type'} eq 'preformatted') {
                 $menu = $current->{'parent'}->{'parent'};
                 # don't keep empty menu_comment
-                if (address@hidden>{'contents'}} and
-                     scalar(@{$current->{'parent'}->{'contents'}}) == 1) {
+                if (address@hidden>{'contents'}}) {
+                  pop @{$current->{'parent'}->{'contents'}};
+                  if (!scalar(@{$current->{'parent'}->{'contents'}})) {
                   pop @{$menu->{'contents'}};
                 }
+                }
               } else {
                 $menu = $current->{'parent'};
                 pop @{$menu->{'contents'}}

Index: t/results/info_tests/direntry_dircategory_and_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/info_tests/direntry_dircategory_and_commands.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/info_tests/direntry_dircategory_and_commands.pl   23 Apr 2011 
15:59:06 -0000      1.2
+++ t/results/info_tests/direntry_dircategory_and_commands.pl   30 Apr 2011 
16:44:12 -0000      1.3
@@ -332,6 +332,8 @@
               'type' => 'menu_entry'
             },
             {
+              'contents' => [
+                {
               'parent' => {},
               'text' => '
 ',
@@ -340,8 +342,6 @@
             {
               'contents' => [
                 {
-                  'contents' => [
-                    {
                       'parent' => {},
                       'text' => 'menutitle
 '
@@ -583,17 +583,17 @@
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[1]{'contents'}[1];
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4];
+$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
+$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[1];
+$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2];
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[2]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4];
-$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'contents'}[0];
-$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3];
+$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0];
+$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0];
+$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0];
+$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3];
+$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'extra'}{'command'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4];
-$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0];
-$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0];
-$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0];
-$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[4];
-$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[4]{'extra'}{'command'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4];
-$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[4]{'parent'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4];
-$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[4];
+$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'extra'}{'end_command'}
 = 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'contents'}[3];
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'direntry_dircategory_and_commands'}{'contents'}[0];
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'direntry_dircategory_and_commands'}{'contents'}[0];
 
$result_trees{'direntry_dircategory_and_commands'}{'contents'}[0]{'contents'}[6]{'parent'}
 = $result_trees{'direntry_dircategory_and_commands'}{'contents'}[0];

Index: t/results/info_tests/space_at_menu_end.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/info_tests/space_at_menu_end.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/info_tests/space_at_menu_end.pl   23 Apr 2011 15:59:06 -0000      
1.2
+++ t/results/info_tests/space_at_menu_end.pl   30 Apr 2011 16:44:12 -0000      
1.3
@@ -106,13 +106,14 @@
               'type' => 'menu_entry'
             },
             {
+              'contents' => [
+                {
               'parent' => {},
               'text' => '
 ',
               'type' => 'after_description_line'
-            },
-            {
-              'contents' => [],
+                }
+              ],
               'parent' => {},
               'type' => 'menu_comment'
             },
@@ -220,15 +221,15 @@
 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1];
 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1];
+$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1];
+$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
+$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'command'}
 = $result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'extra'}{'command'}
 = $result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1];
-$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
+$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
 $result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'space_at_menu_end'}{'contents'}[1];
 $result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'space_at_menu_end'}{'contents'}[1];
 
$result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'space_at_menu_end'}{'contents'}[1]{'contents'}[3];

Index: t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/invalid_nestings/table_not_closed_in_menu_comment.pl      23 Apr 
2011 15:59:06 -0000      1.22
+++ t/results/invalid_nestings/table_not_closed_in_menu_comment.pl      30 Apr 
2011 16:44:12 -0000      1.23
@@ -69,14 +69,14 @@
           'type' => 'menu_entry'
         },
         {
+          'contents' => [
+            {
           'parent' => {},
           'text' => '
 ',
           'type' => 'after_description_line'
         },
         {
-          'contents' => [
-            {
               'args' => [
                 {
                   'contents' => [
@@ -232,31 +232,31 @@
 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'args'}[3];
 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'args'}[1];
 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0]
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command_as_argument'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'extra'}{'command'}
 = $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0];
 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[4];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[4]{'extra'}{'command'}
 = $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[4];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3];
 $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'table_not_closed_in_menu_comment'};
 
 $result_texis{'table_not_closed_in_menu_comment'} = '@menu

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.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/macro/macro_in_menu.pl    23 Apr 2011 15:59:07 -0000      1.27
+++ t/results/macro/macro_in_menu.pl    30 Apr 2011 16:44:12 -0000      1.28
@@ -325,6 +325,8 @@
           'type' => 'menu_entry'
         },
         {
+          'contents' => [
+            {
           'parent' => {},
           'text' => '  
 ',
@@ -333,8 +335,6 @@
         {
           'contents' => [
             {
-              'contents' => [
-                {
                   'parent' => {},
                   'text' => 'menu comment
 '
@@ -659,9 +659,18 @@
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[1]{'extra'}{'menu_entry_description'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[1]{'args'}[3];
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[1]{'args'}[1]{'contents'}[0];
 $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[19];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[2];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[2]{'contents'}[1];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[2];
 $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[19];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3]{'contents'}[0];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3]{'args'}[1];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3]{'args'}[3];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3]{'extra'}{'menu_entry_description'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3]{'args'}[3];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3]{'args'}[1]{'contents'}[0];
 $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[19];
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[4];
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[4]{'args'}[1];
@@ -687,29 +696,20 @@
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6];
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'args'}[3];
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'extra'}{'menu_entry_description'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'args'}[3];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'args'}[1]{'contents'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'args'}[4]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'args'}[5];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'args'}[5]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'extra'}{'menu_entry_description'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'args'}[5];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'extra'}{'menu_entry_name'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'args'}[1];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'args'}[3]{'contents'}[0];
 $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[19];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[0];
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[1];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[3];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[4]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[5];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[5]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'extra'}{'menu_entry_description'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[5];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'extra'}{'menu_entry_name'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[1];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'args'}[3]{'contents'}[0];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'extra'}{'command'}
 = $result_trees{'macro_in_menu'}{'contents'}[19];
 $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[19];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[8]{'args'}[0];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[8]{'args'}[0];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[8]{'args'}[0];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[8];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[8]{'extra'}{'command'}
 = $result_trees{'macro_in_menu'}{'contents'}[19];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[8]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[19];
-$result_trees{'macro_in_menu'}{'contents'}[19]{'extra'}{'end_command'} = 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[8];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'extra'}{'end_command'} = 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[7];
 $result_trees{'macro_in_menu'}{'contents'}[19]{'parent'} = 
$result_trees{'macro_in_menu'};
 
 $result_texis{'macro_in_menu'} = '

Index: t/results/menu/dash_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/dash_in_menu.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/menu/dash_in_menu.pl      23 Apr 2011 15:59:07 -0000      1.6
+++ t/results/menu/dash_in_menu.pl      30 Apr 2011 16:44:13 -0000      1.7
@@ -98,6 +98,8 @@
           'type' => 'menu_entry'
         },
         {
+          'contents' => [
+            {
           'parent' => {},
           'text' => '
 ',
@@ -106,8 +108,6 @@
         {
           'contents' => [
             {
-              'contents' => [
-                {
                   'parent' => {},
                   'text' => 'comment --- in.
 '
@@ -187,17 +187,17 @@
 
$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[1]{'args'}[3];
 
$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[1]{'args'}[3];
 $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'dash_in_menu'}{'contents'}[1];
+$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[2];
+$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1];
+$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[2];
 $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'dash_in_menu'}{'contents'}[1];
-$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[3]{'contents'}[0];
-$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[3];
+$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[3];
+$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[3]{'extra'}{'command'}
 = $result_trees{'dash_in_menu'}{'contents'}[1];
 $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'dash_in_menu'}{'contents'}[1];
-$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[4]{'args'}[0];
-$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[4]{'args'}[0];
-$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[4]{'args'}[0];
-$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[4];
-$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[4]{'extra'}{'command'}
 = $result_trees{'dash_in_menu'}{'contents'}[1];
-$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'dash_in_menu'}{'contents'}[1];
-$result_trees{'dash_in_menu'}{'contents'}[1]{'extra'}{'end_command'} = 
$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[4];
+$result_trees{'dash_in_menu'}{'contents'}[1]{'extra'}{'end_command'} = 
$result_trees{'dash_in_menu'}{'contents'}[1]{'contents'}[3];
 $result_trees{'dash_in_menu'}{'contents'}[1]{'parent'} = 
$result_trees{'dash_in_menu'};
 
 $result_texis{'dash_in_menu'} = '

Index: t/results/menu/detailmenu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/detailmenu.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/menu/detailmenu.pl        23 Apr 2011 15:59:07 -0000      1.22
+++ t/results/menu/detailmenu.pl        30 Apr 2011 16:44:13 -0000      1.23
@@ -73,10 +73,16 @@
           'type' => 'menu_entry'
         },
         {
+          'contents' => [
+            {
           'parent' => {},
           'text' => '
 ',
           'type' => 'after_description_line'
+            }
+          ],
+          'parent' => {},
+          'type' => 'menu_comment'
         },
         {
           'cmdname' => 'detailmenu',
@@ -248,6 +254,7 @@
 
$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
 = $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[1]{'args'}[3];
 
$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
 $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'detailmenu'}{'contents'}[1];
+$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[2];
 $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'detailmenu'}{'contents'}[1];
 
$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[3]{'contents'}[1];

Index: t/results/menu/detailmenu_on_subnodes.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/detailmenu_on_subnodes.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/menu/detailmenu_on_subnodes.pl    23 Apr 2011 15:59:07 -0000      
1.3
+++ t/results/menu/detailmenu_on_subnodes.pl    30 Apr 2011 16:44:13 -0000      
1.4
@@ -155,10 +155,16 @@
               'type' => 'menu_entry'
             },
             {
+              'contents' => [
+                {
               'parent' => {},
               'text' => '
 ',
               'type' => 'after_description_line'
+                }
+              ],
+              'parent' => {},
+              'type' => 'menu_comment'
             },
             {
               'cmdname' => 'detailmenu',
@@ -1289,6 +1295,7 @@
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[3];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1];
+$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[4];
 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'detailmenu_on_subnodes'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1];

Index: t/results/menu/example_in_menu_comment.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/example_in_menu_comment.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/menu/example_in_menu_comment.pl   23 Apr 2011 15:59:07 -0000      
1.6
+++ t/results/menu/example_in_menu_comment.pl   30 Apr 2011 16:44:13 -0000      
1.7
@@ -67,14 +67,14 @@
           'type' => 'menu_entry'
         },
         {
+          'contents' => [
+            {
           'parent' => {},
           'text' => '
 ',
           'type' => 'after_description_line'
         },
         {
-          'contents' => [
-            {
               'cmdname' => 'example',
               'contents' => [
                 {
@@ -241,32 +241,32 @@
 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'args'}[3];
 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'example_in_menu_comment'}{'contents'}[0];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[2];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[2];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'example_in_menu_comment'}{'contents'}[0];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[1];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'extra'}{'command'}
 = $result_trees{'example_in_menu_comment'}{'contents'}[0];
 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'example_in_menu_comment'}{'contents'}[0];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[4];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[4]{'extra'}{'command'}
 = $result_trees{'example_in_menu_comment'}{'contents'}[0];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'example_in_menu_comment'}{'contents'}[0];
-$result_trees{'example_in_menu_comment'}{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[4];
+$result_trees{'example_in_menu_comment'}{'contents'}[0]{'extra'}{'end_command'}
 = $result_trees{'example_in_menu_comment'}{'contents'}[0]{'contents'}[3];
 $result_trees{'example_in_menu_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'example_in_menu_comment'};
 
 $result_texis{'example_in_menu_comment'} = '@menu

Index: t/results/menu/formats_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/formats_in_menu.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/menu/formats_in_menu.pl   23 Apr 2011 15:59:07 -0000      1.4
+++ t/results/menu/formats_in_menu.pl   30 Apr 2011 16:44:13 -0000      1.5
@@ -224,10 +224,16 @@
               'type' => 'menu_entry'
             },
             {
+              'contents' => [
+                {
               'parent' => {},
               'text' => '
 ',
               'type' => 'after_description_line'
+                }
+              ],
+              'parent' => {},
+              'type' => 'menu_comment'
             },
             {
               'args' => [
@@ -495,14 +501,14 @@
               'type' => 'menu_entry'
             },
             {
+              'contents' => [
+                {
               'parent' => {},
               'text' => '
 ',
               'type' => 'after_description_line'
             },
             {
-              'contents' => [
-                {
                   'cmdname' => 'example',
                   'contents' => [
                     {
@@ -699,6 +705,7 @@
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[1];
@@ -745,29 +752,29 @@
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[1];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'args'}[3]{'contents'}[0]{'line_nr'};
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2]{'extra'}{'command'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[2];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[2];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'contents'}[2]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[6]{'parent'}
 = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[2];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[2]{'extra'}{'command'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'end_command'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[2];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[1];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'extra'}{'command'}
 = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7]{'parent'}
 = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'args'}[0];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'args'}[0];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'args'}[0];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[8];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'extra'}{'command'}
 = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[8]{'parent'}
 = $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[8];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'extra'}{'end_command'}
 = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[7];
 $result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'formats_in_menu'}{'contents'}[1];
 $result_trees{'formats_in_menu'}{'contents'}[1]{'extra'}{'node_content'}[0] = 
$result_trees{'formats_in_menu'}{'contents'}[1]{'args'}[0]{'contents'}[1];
 
$result_trees{'formats_in_menu'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
 = $result_trees{'formats_in_menu'}{'contents'}[1]{'extra'}{'node_content'};

Index: t/results/menu/menu_no_closed_after_empty_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/menu_no_closed_after_empty_line.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/menu/menu_no_closed_after_empty_line.pl   23 Apr 2011 15:59:07 
-0000      1.16
+++ t/results/menu/menu_no_closed_after_empty_line.pl   30 Apr 2011 16:44:13 
-0000      1.17
@@ -69,6 +69,8 @@
           'type' => 'menu_entry'
         },
         {
+          'contents' => [
+            {
           'parent' => {},
           'text' => '
 ',
@@ -77,8 +79,6 @@
         {
           'contents' => [
             {
-              'contents' => [
-                {
                   'parent' => {},
                   'text' => '
 ',
@@ -113,10 +113,10 @@
 
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[3];
 
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = 
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[1];
 
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0];
+$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[2];
+$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
+$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
 = 
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0];
-$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
-$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[3];
-$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0];
 $result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'parent'} = 
$result_trees{'menu_no_closed_after_empty_line'};
 
 $result_texis{'menu_no_closed_after_empty_line'} = '@menu

Index: t/results/menu/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/simple.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/menu/simple.pl    23 Apr 2011 15:59:07 -0000      1.25
+++ t/results/menu/simple.pl    30 Apr 2011 16:44:13 -0000      1.26
@@ -302,6 +302,8 @@
           'type' => 'menu_entry'
         },
         {
+          'contents' => [
+            {
           'parent' => {},
           'text' => '
 ',
@@ -310,8 +312,6 @@
         {
           'contents' => [
             {
-              'contents' => [
-                {
                   'parent' => {},
                   'text' => 'new comment
 '
@@ -503,28 +503,28 @@
 
$result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'extra'}{'menu_entry_description'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'args'}[3];
 
$result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'args'}[1]{'contents'}[0];
 $result_trees{'simple'}{'contents'}[3]{'contents'}[5]{'parent'} = 
$result_trees{'simple'}{'contents'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[6]{'contents'}[0]{'parent'} 
= $result_trees{'simple'}{'contents'}[3]{'contents'}[6];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[6]{'contents'}[1];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[6]{'contents'}[1]{'parent'} 
= $result_trees{'simple'}{'contents'}[3]{'contents'}[6];
 $result_trees{'simple'}{'contents'}[3]{'contents'}[6]{'parent'} = 
$result_trees{'simple'}{'contents'}[3];
-$result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'contents'}[0];
-$result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'contents'}[0]{'parent'} 
= $result_trees{'simple'}{'contents'}[3]{'contents'}[7];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[7];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'args'}[1];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'args'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'args'}[1];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'args'}[1]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[7];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'args'}[2]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[7];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'args'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'args'}[3]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[7];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'extra'}{'menu_entry_description'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'args'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'args'}[1]{'contents'}[0];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'args'}[1]{'contents'}[1];
 $result_trees{'simple'}{'contents'}[3]{'contents'}[7]{'parent'} = 
$result_trees{'simple'}{'contents'}[3];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[0];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[0];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[0];
 $result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[8];
-$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[1];
-$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[1];
-$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[1]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[8];
-$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[2]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[8];
-$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[3];
-$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[3]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[8];
-$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'extra'}{'menu_entry_description'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[3];
-$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[1]{'contents'}[0];
-$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'args'}[1]{'contents'}[1];
+$result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'extra'}{'command'} = 
$result_trees{'simple'}{'contents'}[3];
 $result_trees{'simple'}{'contents'}[3]{'contents'}[8]{'parent'} = 
$result_trees{'simple'}{'contents'}[3];
-$result_trees{'simple'}{'contents'}[3]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[9]{'args'}[0];
-$result_trees{'simple'}{'contents'}[3]{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[9]{'args'}[0];
-$result_trees{'simple'}{'contents'}[3]{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'simple'}{'contents'}[3]{'contents'}[9]{'args'}[0];
-$result_trees{'simple'}{'contents'}[3]{'contents'}[9]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[9];
-$result_trees{'simple'}{'contents'}[3]{'contents'}[9]{'extra'}{'command'} = 
$result_trees{'simple'}{'contents'}[3];
-$result_trees{'simple'}{'contents'}[3]{'contents'}[9]{'parent'} = 
$result_trees{'simple'}{'contents'}[3];
-$result_trees{'simple'}{'contents'}[3]{'extra'}{'end_command'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[9];
+$result_trees{'simple'}{'contents'}[3]{'extra'}{'end_command'} = 
$result_trees{'simple'}{'contents'}[3]{'contents'}[8];
 $result_trees{'simple'}{'contents'}[3]{'parent'} = $result_trees{'simple'};
 $result_trees{'simple'}{'contents'}[4]{'parent'} = $result_trees{'simple'};
 $result_trees{'simple'}{'contents'}[5]{'contents'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[5];

Index: t/results/menu/simple_no_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/simple_no_menu.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/menu/simple_no_menu.pl    23 Apr 2011 15:59:08 -0000      1.2
+++ t/results/menu/simple_no_menu.pl    30 Apr 2011 16:44:13 -0000      1.3
@@ -302,6 +302,8 @@
           'type' => 'menu_entry'
         },
         {
+          'contents' => [
+            {
           'parent' => {},
           'text' => '
 ',
@@ -310,8 +312,6 @@
         {
           'contents' => [
             {
-              'contents' => [
-                {
                   'parent' => {},
                   'text' => 'new comment
 '
@@ -503,28 +503,28 @@
 
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'extra'}{'menu_entry_description'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'args'}[3];
 
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'args'}[1]{'contents'}[0];
 $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[5]{'parent'} = 
$result_trees{'simple_no_menu'}{'contents'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[6]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[6];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[6]{'contents'}[1];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[6]{'contents'}[1]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[6];
 $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[6]{'parent'} = 
$result_trees{'simple_no_menu'}{'contents'}[3];
-$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'contents'}[0];
-$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'args'}[1];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'args'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'args'}[1];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'args'}[1]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'args'}[2]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'args'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'args'}[3]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'extra'}{'menu_entry_description'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'args'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'args'}[1]{'contents'}[0];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'args'}[1]{'contents'}[1];
 $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[7]{'parent'} = 
$result_trees{'simple_no_menu'}{'contents'}[3];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[0];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[0];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[0];
 
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8];
-$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[1];
-$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[1];
-$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[1]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8];
-$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[2]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8];
-$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[3];
-$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[3]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8];
-$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'extra'}{'menu_entry_description'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[3];
-$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[1]{'contents'}[0];
-$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'args'}[1]{'contents'}[1];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'extra'}{'command'}
 = $result_trees{'simple_no_menu'}{'contents'}[3];
 $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8]{'parent'} = 
$result_trees{'simple_no_menu'}{'contents'}[3];
-$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9]{'args'}[0];
-$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9]{'args'}[0];
-$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9]{'args'}[0];
-$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9]{'args'}[0]{'parent'}
 = $result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9];
-$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9]{'extra'}{'command'}
 = $result_trees{'simple_no_menu'}{'contents'}[3];
-$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9]{'parent'} = 
$result_trees{'simple_no_menu'}{'contents'}[3];
-$result_trees{'simple_no_menu'}{'contents'}[3]{'extra'}{'end_command'} = 
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[9];
+$result_trees{'simple_no_menu'}{'contents'}[3]{'extra'}{'end_command'} = 
$result_trees{'simple_no_menu'}{'contents'}[3]{'contents'}[8];
 $result_trees{'simple_no_menu'}{'contents'}[3]{'parent'} = 
$result_trees{'simple_no_menu'};
 $result_trees{'simple_no_menu'}{'contents'}[4]{'parent'} = 
$result_trees{'simple_no_menu'};
 $result_trees{'simple_no_menu'}{'contents'}[5]{'contents'}[0]{'parent'} = 
$result_trees{'simple_no_menu'}{'contents'}[5];

Index: t/results/sectioning/complex.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/complex.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/sectioning/complex.pl     23 Apr 2011 15:59:08 -0000      1.14
+++ t/results/sectioning/complex.pl     30 Apr 2011 16:44:13 -0000      1.15
@@ -726,13 +726,14 @@
               'type' => 'menu_entry'
             },
             {
+              'contents' => [
+                {
               'parent' => {},
               'text' => '
 ',
               'type' => 'after_description_line'
-            },
-            {
-              'contents' => [],
+                }
+              ],
               'parent' => {},
               'type' => 'menu_comment'
             },
@@ -2525,15 +2526,15 @@
 
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[3]{'extra'}{'menu_entry_description'}
 = 
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[3]{'args'}[3];
 
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[3]{'parent'} 
= $result_trees{'complex'}{'contents'}[4]{'contents'}[2];
+$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[4];
 
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[4]{'parent'} 
= $result_trees{'complex'}{'contents'}[4]{'contents'}[2];
+$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[5]{'args'}[0];
+$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[5]{'args'}[0];
+$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[5]{'args'}[0];
+$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[5];
+$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[5]{'extra'}{'command'}
 = $result_trees{'complex'}{'contents'}[4]{'contents'}[2];
 
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[5]{'parent'} 
= $result_trees{'complex'}{'contents'}[4]{'contents'}[2];
-$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[6]{'args'}[0];
-$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[6]{'args'}[0];
-$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[6]{'args'}[0];
-$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[6];
-$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[6]{'extra'}{'command'}
 = $result_trees{'complex'}{'contents'}[4]{'contents'}[2];
-$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[6]{'parent'}
 = $result_trees{'complex'}{'contents'}[4]{'contents'}[2];
-$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'extra'}{'end_command'} 
= $result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[6];
+$result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'extra'}{'end_command'} 
= $result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'contents'}[5];
 $result_trees{'complex'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'complex'}{'contents'}[4];
 $result_trees{'complex'}{'contents'}[4]{'contents'}[3]{'parent'} = 
$result_trees{'complex'}{'contents'}[4];
 $result_trees{'complex'}{'contents'}[4]{'extra'}{'misc_content'}[0] = 
$result_trees{'complex'}{'contents'}[4]{'args'}[0]{'contents'}[1];



reply via email to

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