texinfo-commits
[Top][All Lists]
Advanced

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

texinfo/tp Texinfo/Parser.pm Texinfo/Convert/No...


From: Patrice Dumas
Subject: texinfo/tp Texinfo/Parser.pm Texinfo/Convert/No...
Date: Thu, 28 Oct 2010 21:33:10 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/10/28 21:33:10

Modified files:
        tp/Texinfo     : Parser.pm 
        tp/Texinfo/Convert: NormalizeNode.pm 
        tp/t/results/invalid_nestings: 
                                       def_not_closed_in_menu_description.pl 
                                       
style_not_closed_no_newline_root_commands.pl 
                                       style_not_closed_root_commands.pl 
                                       table_not_closed_in_menu_comment.pl 
                                       table_not_closed_in_menu_description.pl 
        tp/t/results/macro: macro_in_menu.pl macro_in_misc_commands.pl 
        tp/t/results/menu: detailmenu.pl menu_entry_name.pl 
                           menu_entry_name_comment.pl menu_entry_node.pl 
                           menu_entry_node_comments.pl 
                           menu_no_closed_after_empty_line.pl 
                           menu_no_closed_in_description.pl simple.pl 
        tp/t/results/sectioning: at_commands_in_refs.pl 
                                 character_and_spaces_in_refs.pl 
                                 nodename_parentheses.pl 
                                 raiselowersections.pl 
                                 some_at_commands_in_ref_nodes.pl 
        tp/t/results/value: value_in_node.pl 

Log message:
        Enter normalized node entry in menu entry.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/NormalizeNode.pm?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.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_description.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_menu.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_misc_commands.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/detailmenu.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_name.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_name_comment.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_node.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_entry_node_comments.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_no_closed_after_empty_line.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_no_closed_in_description.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/simple.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/nodename_parentheses.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/raiselowersections.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/some_at_commands_in_ref_nodes.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_in_node.pl?cvsroot=texinfo&r1=1.17&r2=1.18

Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- Texinfo/Parser.pm   28 Oct 2010 20:11:32 -0000      1.118
+++ Texinfo/Parser.pm   28 Oct 2010 21:33:08 -0000      1.119
@@ -1516,10 +1516,12 @@
 }
 
 # isolate last space in a command to help expansion disregard unuseful spaces.
-sub _isolate_last_space($$)
+sub _isolate_last_space($$;$)
 {
   my $self = shift;
   my $current = shift;
+  my $type = shift;
+  $type = 'spaces_at_end' if (!defined($type));
   if ($current->{'contents'} and @{$current->{'contents'}}) {
     my $index = -1;
     $index = -2 
@@ -1530,12 +1532,12 @@
         and !$current->{'contents'}->[$index]->{'type'}
         and $current->{'contents'}->[$index]->{'text'} =~ /\s+$/) {
       if ($current->{'contents'}->[$index]->{'text'} !~ /\S/) {
-        $current->{'contents'}->[$index]->{'type'} = 'spaces_at_end';
+        $current->{'contents'}->[$index]->{'type'} = $type;
       } else {
         $current->{'contents'}->[$index]->{'text'} =~ s/(\s+)$//;
         my $spaces = $1;
         my $new_spaces = { 'text' => $spaces, 'parent' => $current,
-                           'type' => 'spaces_at_end' };
+                           'type' => $type };
         if ($index == -1) {
           push @{$current->{'contents'}}, $new_spaces;
         } else {
@@ -1799,13 +1801,13 @@
       $current = $current->{'parent'};
       push @{$current->{'args'}}, { 'type' => 'menu_entry_description',
                                   'contents' => [], 'parent' => $current };
+      _enter_menu_entry_node($self, $current, $line_nr);
       $current = $current->{'args'}->[-1];
       if (defined($end_comment)) {
         $end_comment->{'parent'} = $current;
         push @{$current->{'contents'}}, $end_comment;
       }
     }
-
   # def line
   } elsif ($current->{'parent'}
             and $current->{'parent'}->{'type'}
@@ -2096,6 +2098,25 @@
   }
   return _check_empty_node($self, $parsed_node, $command, $line_nr);
 }
+
+sub _enter_menu_entry_node($$$)
+{
+  my $self = shift;
+  my $current = shift;
+  my $line_nr = shift;
+  foreach my $arg (@{$current->{'args'}}) {
+    if ($arg->{'type'} eq 'menu_entry_node') {
+      $self->_isolate_last_space($arg, 'space_at_end_menu_node');
+      my $parsed_entry_node = _parse_node_manual($arg);
+      if (! defined($parsed_entry_node)) {
+        _line_error ($self, $self->__("Empty node in menu entry"), $line_nr);
+      } else {
+        $current->{'extra'}->{'menu_entry_node'} = $parsed_entry_node;
+      }
+    }
+  }
+}
+
 # the different types
 #c 'menu_entry'
 #c 'menu_entry'
@@ -2499,6 +2520,7 @@
           push @{$current->{'args'}}, { 'type' => 'menu_entry_description',
                                         'contents' => [],
                                         'parent' => $current };
+          _enter_menu_entry_node($self, $current, $line_nr);
           $current = $current->{'args'}->[-1];
         # end of the menu entry name  
         } elsif ($separator =~ /^:/) {
@@ -2513,6 +2535,7 @@
           push @{$current->{'args'}}, { 'type' => 'menu_entry_description',
                                         'contents' => [],
                                         'parent' => $current };
+          _enter_menu_entry_node($self, $current, $line_nr);
           $current = $current->{'args'}->[-1];
         }
         # REMACRO

Index: Texinfo/Convert/NormalizeNode.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/NormalizeNode.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Texinfo/Convert/NormalizeNode.pm    28 Oct 2010 19:09:23 -0000      1.2
+++ Texinfo/Convert/NormalizeNode.pm    28 Oct 2010 21:33:09 -0000      1.3
@@ -77,7 +77,7 @@
 my %ignored_types;
 foreach my $type ('empty_line_after_command', 
             'empty_spaces_after_command', 'spaces_at_end',
-            'empty_spaces_before_argument') {
+            'empty_spaces_before_argument', 'space_at_end_menu_node') {
   $ignored_types{$type} = 1;
 }
 

Index: t/results/invalid_nestings/def_not_closed_in_menu_description.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/invalid_nestings/def_not_closed_in_menu_description.pl    25 Oct 
2010 19:37:08 -0000      1.3
+++ t/results/invalid_nestings/def_not_closed_in_menu_description.pl    28 Oct 
2010 21:33:09 -0000      1.4
@@ -120,6 +120,16 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'info'
+                }
+              ]
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         }
@@ -149,6 +159,7 @@
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1];
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3];
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1];
+$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[1];
 
$result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'def_not_closed_in_menu_description'}{'contents'}[0];
 $result_trees{'def_not_closed_in_menu_description'}{'contents'}[0]{'parent'} = 
$result_trees{'def_not_closed_in_menu_description'};
 $result_trees{'def_not_closed_in_menu_description'}{'contents'}[1]{'parent'} = 
$result_trees{'def_not_closed_in_menu_description'};

Index: t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl     
28 Oct 2010 19:09:24 -0000      1.6
+++ t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl     
28 Oct 2010 21:33:09 -0000      1.7
@@ -81,6 +81,14 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'chapter'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             }
@@ -267,6 +275,7 @@
 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[1];
 
$result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'style_not_closed_no_newline_root_commands'}{'contents'}[1];

Index: t/results/invalid_nestings/style_not_closed_root_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/invalid_nestings/style_not_closed_root_commands.pl        28 Oct 
2010 19:09:24 -0000      1.5
+++ t/results/invalid_nestings/style_not_closed_root_commands.pl        28 Oct 
2010 21:33:09 -0000      1.6
@@ -81,6 +81,14 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'chapter'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             }
@@ -279,6 +287,7 @@
 
$result_trees{'style_not_closed_root_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'style_not_closed_root_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
 
$result_trees{'style_not_closed_root_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'style_not_closed_root_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3];
 
$result_trees{'style_not_closed_root_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'style_not_closed_root_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
+$result_trees{'style_not_closed_root_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'style_not_closed_root_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'style_not_closed_root_commands'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'style_not_closed_root_commands'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'style_not_closed_root_commands'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'style_not_closed_root_commands'}{'contents'}[1];
 
$result_trees{'style_not_closed_root_commands'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'style_not_closed_root_commands'}{'contents'}[1];

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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/invalid_nestings/table_not_closed_in_menu_comment.pl      24 Oct 
2010 19:08:33 -0000      1.2
+++ t/results/invalid_nestings/table_not_closed_in_menu_comment.pl      28 Oct 
2010 21:33:09 -0000      1.3
@@ -45,6 +45,16 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'manual'
+                }
+              ]
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -150,6 +160,7 @@
 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$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]{'args'}[3]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[1];
+$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]{'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];

Index: t/results/invalid_nestings/table_not_closed_in_menu_description.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/invalid_nestings/table_not_closed_in_menu_description.pl  24 Oct 
2010 19:08:33 -0000      1.2
+++ t/results/invalid_nestings/table_not_closed_in_menu_description.pl  28 Oct 
2010 21:33:09 -0000      1.3
@@ -110,6 +110,16 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'gcc'
+                }
+              ]
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         }
@@ -144,6 +154,7 @@
 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[2]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1];
 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3];
 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1];
+$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[1];
 
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0];
 $result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'parent'} 
= $result_trees{'table_not_closed_in_menu_description'};
 $result_trees{'table_not_closed_in_menu_description'}{'contents'}[1]{'parent'} 
= $result_trees{'table_not_closed_in_menu_description'};

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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/macro/macro_in_menu.pl    25 Oct 2010 19:37:09 -0000      1.12
+++ t/results/macro/macro_in_menu.pl    28 Oct 2010 21:33:09 -0000      1.13
@@ -273,6 +273,14 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'node_content' => [
+                {}
+              ],
+              'normalized' => 'menu-entry'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -327,6 +335,14 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'node_content' => [
+                {}
+              ],
+              'normalized' => 'node'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -364,6 +380,14 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'node_content' => [
+                {}
+              ],
+              'normalized' => 'other-node'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -401,6 +425,14 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'node_content' => [
+                {}
+              ],
+              'normalized' => 'node-colon-macro'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -453,6 +485,14 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'node_content' => [
+                {}
+              ],
+              'normalized' => 'entry'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         }
@@ -506,6 +546,7 @@
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[1]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[1];
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[1]{'args'}[3];
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[1]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[1];
+$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]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[19];
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[3];
@@ -516,6 +557,7 @@
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[4]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[4];
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[4]{'args'}[3];
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[4]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[4];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[4]{'args'}[1]{'contents'}[0];
 $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[4]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[19];
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[5];
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[5]{'args'}[1];
@@ -523,6 +565,7 @@
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[5]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[5];
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[5]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[5]{'args'}[3];
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[5]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[5];
+$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[5]{'args'}[1]{'contents'}[0];
 $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[5]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[19];
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6];
 
$result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_menu'}{'contents'}[19]{'contents'}[6]{'args'}[1];
@@ -530,6 +573,7 @@
 
$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_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]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[19];
 
$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];
@@ -540,6 +584,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_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]{'parent'} = 
$result_trees{'macro_in_menu'}{'contents'}[19];
 $result_trees{'macro_in_menu'}{'contents'}[19]{'parent'} = 
$result_trees{'macro_in_menu'};
 $result_trees{'macro_in_menu'}{'contents'}[20]{'parent'} = 
$result_trees{'macro_in_menu'};

Index: t/results/macro/macro_in_misc_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_misc_commands.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/macro/macro_in_misc_commands.pl   28 Oct 2010 19:09:24 -0000      
1.17
+++ t/results/macro/macro_in_misc_commands.pl   28 Oct 2010 21:33:09 -0000      
1.18
@@ -2727,6 +2727,14 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'node-atext'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             }
@@ -3330,6 +3338,7 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[152]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[152]{'contents'}[1];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[152]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[152]{'contents'}[1]{'args'}[3];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[152]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[152]{'contents'}[1];
+$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[152]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[152]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[152]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[152];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[152]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[2]{'contents'}[153]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[2];

Index: t/results/menu/detailmenu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/detailmenu.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/menu/detailmenu.pl        24 Oct 2010 19:08:34 -0000      1.7
+++ t/results/menu/detailmenu.pl        28 Oct 2010 21:33:09 -0000      1.8
@@ -51,6 +51,14 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'node_content' => [
+                {}
+              ],
+              'normalized' => 'Copying-Conditions'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -103,6 +111,14 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'detailmenu'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             }
@@ -135,6 +151,7 @@
 $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'} 
= $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[1];
 
$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[1]{'args'}[3];
 $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'} 
= $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[1];
+$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]{'parent'} = 
$result_trees{'detailmenu'}{'contents'}[1];
 
$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[3];
@@ -144,6 +161,7 @@
 
$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[2]{'parent'}
 = $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
 
$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[3];
 
$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[3]{'parent'}
 = $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'detailmenu'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[3];
 $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'detailmenu'}{'contents'}[1];
 $result_trees{'detailmenu'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'detailmenu'}{'contents'}[1];

Index: t/results/menu/menu_entry_name.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/menu_entry_name.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/menu/menu_entry_name.pl   24 Oct 2010 19:08:34 -0000      1.8
+++ t/results/menu/menu_entry_name.pl   28 Oct 2010 21:33:09 -0000      1.9
@@ -37,8 +37,13 @@
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => '(f)b
-'
+                  'text' => '(f)b'
+                },
+                {
+                  'parent' => {},
+                  'text' => '
+',
+                  'type' => 'space_at_end_menu_node'
                 }
               ],
               'parent' => {},
@@ -50,6 +55,24 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'b'
+                },
+                {}
+              ],
+              'normalized' => 'b'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -102,6 +125,23 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'b1.c'
+                }
+              ],
+              'normalized' => 'b1_002ec'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -154,6 +194,23 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'b2.c'
+                }
+              ],
+              'normalized' => 'b2_002ec'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -206,6 +263,23 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'b3.c'
+                }
+              ],
+              'normalized' => 'b3_002ec'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -258,6 +332,23 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'b1.'
+                }
+              ],
+              'normalized' => 'b1_002e'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -310,6 +401,23 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => ' b2 .'
+                }
+              ],
+              'normalized' => '-b2-_002e'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -362,6 +470,23 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'b3.'
+                }
+              ],
+              'normalized' => 'b3_002e'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -414,6 +539,23 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'b1.c'
+                }
+              ],
+              'normalized' => 'b1_002ec'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -466,6 +608,23 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'b2.c'
+                }
+              ],
+              'normalized' => 'b2_002ec'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -518,6 +677,23 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'b3.c'
+                }
+              ],
+              'normalized' => 'b3_002ec'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         }
@@ -539,8 +715,12 @@
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'args'}[1]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'args'}[2]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'args'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'args'}[3];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'args'}[4]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'args'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'args'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1];
 $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'menu_entry_name'}{'contents'}[0];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'args'}[1];
@@ -551,6 +731,8 @@
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'args'}[4]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'args'}[5];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'args'}[5]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'args'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'args'}[3];
 $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'menu_entry_name'}{'contents'}[0];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[3]{'args'}[1];
@@ -561,6 +743,8 @@
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[3]{'args'}[4]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[3]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[3]{'args'}[5];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[3]{'args'}[5]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[3]{'args'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[3]{'args'}[3];
 $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'menu_entry_name'}{'contents'}[0];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4]{'args'}[1];
@@ -571,6 +755,8 @@
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4]{'args'}[4]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4]{'args'}[5];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4]{'args'}[5]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4]{'args'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4]{'args'}[3];
 $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'menu_entry_name'}{'contents'}[0];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'args'}[1];
@@ -581,6 +767,8 @@
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'args'}[4]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'args'}[5];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'args'}[5]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'args'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'args'}[3];
 $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[5]{'parent'} = 
$result_trees{'menu_entry_name'}{'contents'}[0];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[6]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[6]{'args'}[1];
@@ -591,6 +779,8 @@
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[6]{'args'}[4]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[6];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[6]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[6]{'args'}[5];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[6]{'args'}[5]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[6];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[6]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[6]{'args'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[6]{'args'}[3];
 $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[6]{'parent'} = 
$result_trees{'menu_entry_name'}{'contents'}[0];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7]{'args'}[1];
@@ -601,6 +791,8 @@
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7]{'args'}[4]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7]{'args'}[5];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7]{'args'}[5]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7]{'args'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7]{'args'}[3];
 $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[7]{'parent'} = 
$result_trees{'menu_entry_name'}{'contents'}[0];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'args'}[1];
@@ -611,6 +803,8 @@
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'args'}[4]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'args'}[5];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'args'}[5]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'args'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'args'}[3];
 $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[8]{'parent'} = 
$result_trees{'menu_entry_name'}{'contents'}[0];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[9]{'args'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[9];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[9]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[9]{'args'}[1];
@@ -621,6 +815,8 @@
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[9]{'args'}[4]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[9];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[9]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[9]{'args'}[5];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[9]{'args'}[5]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[9];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[9]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[9]{'args'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[9]{'args'}[3];
 $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[9]{'parent'} = 
$result_trees{'menu_entry_name'}{'contents'}[0];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[10]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[10]{'args'}[1];
@@ -631,6 +827,8 @@
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[10]{'args'}[4]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[10];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[10]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[10]{'args'}[5];
 
$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[10]{'args'}[5]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[10];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[10]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[10]{'args'}[3];
+$result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[10]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[10]{'args'}[3];
 $result_trees{'menu_entry_name'}{'contents'}[0]{'contents'}[10]{'parent'} = 
$result_trees{'menu_entry_name'}{'contents'}[0];
 $result_trees{'menu_entry_name'}{'contents'}[0]{'parent'} = 
$result_trees{'menu_entry_name'};
 $result_trees{'menu_entry_name'}{'contents'}[1]{'parent'} = 
$result_trees{'menu_entry_name'};

Index: t/results/menu/menu_entry_name_comment.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/menu_entry_name_comment.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/menu/menu_entry_name_comment.pl   24 Oct 2010 19:08:34 -0000      
1.7
+++ t/results/menu/menu_entry_name_comment.pl   28 Oct 2010 21:33:09 -0000      
1.8
@@ -62,6 +62,23 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'b'
+                }
+              ],
+              'normalized' => 'b'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -91,7 +108,12 @@
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => '(f)b '
+                  'text' => '(f)b'
+                },
+                {
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'space_at_end_menu_node'
                 }
               ],
               'parent' => {},
@@ -116,6 +138,24 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'b'
+                },
+                {}
+              ],
+              'normalized' => 'b'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -175,6 +215,23 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'b1c.c'
+                }
+              ],
+              'normalized' => 'b1c_002ec'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -234,6 +291,23 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'b2c.c'
+                }
+              ],
+              'normalized' => 'b2c_002ec'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -297,6 +371,23 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'b3c.c'
+                }
+              ],
+              'normalized' => 'b3c_002ec'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         }
@@ -322,16 +413,22 @@
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[1]{'args'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[1]{'args'}[4]{'contents'}[0];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[1]{'args'}[4];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[1]{'args'}[4]{'parent'}
 = $result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[1];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[1]{'args'}[3];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[1]{'args'}[3];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'menu_entry_name_comment'}{'contents'}[0];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'args'}[1];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'parent'}
 = $result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'args'}[2]{'parent'}
 = $result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'args'}[3];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'args'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'args'}[3];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'args'}[3]{'parent'}
 = $result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'args'}[4]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'args'}[4]{'contents'}[0];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'args'}[4]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'args'}[4];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'args'}[4]{'parent'}
 = $result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'args'}[3];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'args'}[3];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'args'}[3]{'contents'}[1];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'menu_entry_name_comment'}{'contents'}[0];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[3]{'args'}[1];
@@ -343,6 +440,8 @@
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[3]{'args'}[5]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[3]{'args'}[5]{'contents'}[0];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[3]{'args'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[3]{'args'}[5];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[3]{'args'}[5]{'parent'}
 = $result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[3];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[3]{'args'}[3];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[3]{'args'}[3];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'menu_entry_name_comment'}{'contents'}[0];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[4]{'args'}[1];
@@ -354,6 +453,8 @@
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[4]{'args'}[5]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[4]{'args'}[5]{'contents'}[0];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[4]{'args'}[5]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[4]{'args'}[5];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[4]{'args'}[5]{'parent'}
 = $result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[4];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[4]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[4]{'args'}[3];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[4]{'args'}[3];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'menu_entry_name_comment'}{'contents'}[0];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[5];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[5]{'args'}[1];
@@ -366,6 +467,8 @@
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[5]{'args'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[5]{'args'}[5]{'contents'}[1];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[5]{'args'}[5]{'contents'}[1]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[5]{'args'}[5];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[5]{'args'}[5]{'parent'}
 = $result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[5];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[5]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[5]{'args'}[3];
+$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[5]{'args'}[3];
 
$result_trees{'menu_entry_name_comment'}{'contents'}[0]{'contents'}[5]{'parent'}
 = $result_trees{'menu_entry_name_comment'}{'contents'}[0];
 $result_trees{'menu_entry_name_comment'}{'contents'}[0]{'parent'} = 
$result_trees{'menu_entry_name_comment'};
 $result_trees{'menu_entry_name_comment'}{'contents'}[1]{'parent'} = 
$result_trees{'menu_entry_name_comment'};

Index: t/results/menu/menu_entry_node.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/menu_entry_node.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/menu/menu_entry_node.pl   24 Oct 2010 19:08:34 -0000      1.8
+++ t/results/menu/menu_entry_node.pl   28 Oct 2010 21:33:09 -0000      1.9
@@ -45,6 +45,23 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'a1'
+                }
+              ],
+              'normalized' => 'a1'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -82,6 +99,23 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'a2'
+                }
+              ],
+              'normalized' => 'a2'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -119,6 +153,23 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'a3'
+                }
+              ],
+              'normalized' => 'a3'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -168,6 +219,22 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {},
+                {},
+                {}
+              ],
+              'normalized' => '_0040a'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         }
@@ -190,6 +257,8 @@
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1]{'args'}[2]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1]{'args'}[3];
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1]{'args'}[1];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1]{'args'}[1];
 $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[1]{'parent'} = 
$result_trees{'menu_entry_node'}{'contents'}[0];
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[2]{'args'}[1];
@@ -197,6 +266,8 @@
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[2]{'args'}[2]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[2]{'args'}[3];
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[2]{'args'}[3]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[2];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[2]{'args'}[1];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[2]{'args'}[1];
 $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[2]{'parent'} = 
$result_trees{'menu_entry_node'}{'contents'}[0];
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3]{'args'}[1];
@@ -204,6 +275,8 @@
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3]{'args'}[2]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3]{'args'}[3];
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3]{'args'}[3]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3]{'args'}[1];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3]{'args'}[1];
 $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[3]{'parent'} = 
$result_trees{'menu_entry_node'}{'contents'}[0];
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[4]{'args'}[1];
@@ -214,6 +287,10 @@
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[4]{'args'}[2]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[4]{'args'}[3];
 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[4]{'args'}[3]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[4];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[4]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[4]{'args'}[1];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[1];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[2];
+$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[3];
 $result_trees{'menu_entry_node'}{'contents'}[0]{'contents'}[4]{'parent'} = 
$result_trees{'menu_entry_node'}{'contents'}[0];
 $result_trees{'menu_entry_node'}{'contents'}[0]{'parent'} = 
$result_trees{'menu_entry_node'};
 $result_trees{'menu_entry_node'}{'contents'}[1]{'parent'} = 
$result_trees{'menu_entry_node'};

Index: t/results/menu/menu_entry_node_comments.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/menu_entry_node_comments.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/menu/menu_entry_node_comments.pl  24 Oct 2010 19:08:34 -0000      
1.7
+++ t/results/menu/menu_entry_node_comments.pl  28 Oct 2010 21:33:09 -0000      
1.8
@@ -52,6 +52,23 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'a1c'
+                }
+              ],
+              'normalized' => 'a1c'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -96,6 +113,23 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'a2c'
+                }
+              ],
+              'normalized' => 'a2c'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -144,6 +178,23 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'a3c'
+                }
+              ],
+              'normalized' => 'a3c'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -158,7 +209,12 @@
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => '(f) a4 '
+                  'text' => '(f) a4'
+                },
+                {
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'space_at_end_menu_node'
                 }
               ],
               'parent' => {},
@@ -188,6 +244,24 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'f'
+                }
+              ],
+              'node_content' => [
+                {
+                  'parent' => {},
+                  'text' => ' a4'
+                },
+                {}
+              ],
+              'normalized' => '-a4'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         }
@@ -211,6 +285,8 @@
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[1]{'args'}[3];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'parent'}
 = $result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[1];
+$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[1]{'args'}[1];
+$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[1]{'args'}[1];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'menu_entry_node_comments'}{'contents'}[0];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[2];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[2]{'args'}[1];
@@ -219,6 +295,8 @@
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[2]{'args'}[3];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[2]{'args'}[3]{'parent'}
 = $result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[2];
+$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[2]{'args'}[1];
+$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[2]{'args'}[1];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'menu_entry_node_comments'}{'contents'}[0];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[3];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[3]{'args'}[1];
@@ -228,14 +306,20 @@
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[3]{'args'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[3]{'args'}[3]{'contents'}[1];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[3]{'args'}[3]{'contents'}[1]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[3]{'args'}[3];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[3]{'args'}[3]{'parent'}
 = $result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[3];
+$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[3]{'args'}[1];
+$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[3]{'args'}[1];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[3]{'parent'}
 = $result_trees{'menu_entry_node_comments'}{'contents'}[0];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4]{'args'}[1];
+$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4]{'args'}[1];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'parent'}
 = $result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4]{'args'}[2]{'parent'}
 = $result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4]{'args'}[3]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4]{'args'}[3]{'contents'}[0];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4]{'args'}[3];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4]{'args'}[3]{'parent'}
 = $result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4];
+$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4]{'args'}[1];
+$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4]{'args'}[1];
+$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4]{'args'}[1]{'contents'}[1];
 
$result_trees{'menu_entry_node_comments'}{'contents'}[0]{'contents'}[4]{'parent'}
 = $result_trees{'menu_entry_node_comments'}{'contents'}[0];
 $result_trees{'menu_entry_node_comments'}{'contents'}[0]{'parent'} = 
$result_trees{'menu_entry_node_comments'};
 $result_trees{'menu_entry_node_comments'}{'contents'}[1]{'parent'} = 
$result_trees{'menu_entry_node_comments'};

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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/menu/menu_no_closed_after_empty_line.pl   24 Oct 2010 19:08:34 
-0000      1.2
+++ t/results/menu/menu_no_closed_after_empty_line.pl   28 Oct 2010 21:33:09 
-0000      1.3
@@ -45,6 +45,16 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'manual_in_menu'
+                }
+              ]
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -79,6 +89,7 @@
 
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$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]{'args'}[3]{'parent'}
 = 
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[1];
+$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]{'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]{'parent'}
 = 
$result_trees{'menu_no_closed_after_empty_line'}{'contents'}[0]{'contents'}[3];

Index: t/results/menu/menu_no_closed_in_description.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/menu/menu_no_closed_in_description.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/menu/menu_no_closed_in_description.pl     24 Oct 2010 19:08:34 
-0000      1.2
+++ t/results/menu/menu_no_closed_in_description.pl     28 Oct 2010 21:33:09 
-0000      1.3
@@ -44,6 +44,16 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'manual_content' => [
+                {
+                  'parent' => {},
+                  'text' => 'manual_in_menu'
+                }
+              ]
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         }
@@ -60,6 +70,7 @@
 
$result_trees{'menu_no_closed_in_description'}{'contents'}[0]{'contents'}[1]{'args'}[2]{'parent'}
 = $result_trees{'menu_no_closed_in_description'}{'contents'}[0]{'contents'}[1];
 
$result_trees{'menu_no_closed_in_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'menu_no_closed_in_description'}{'contents'}[0]{'contents'}[1]{'args'}[3];
 
$result_trees{'menu_no_closed_in_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'parent'}
 = $result_trees{'menu_no_closed_in_description'}{'contents'}[0]{'contents'}[1];
+$result_trees{'menu_no_closed_in_description'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = 
$result_trees{'menu_no_closed_in_description'}{'contents'}[0]{'contents'}[1]{'args'}[1];
 
$result_trees{'menu_no_closed_in_description'}{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'menu_no_closed_in_description'}{'contents'}[0];
 $result_trees{'menu_no_closed_in_description'}{'contents'}[0]{'parent'} = 
$result_trees{'menu_no_closed_in_description'};
 

Index: t/results/menu/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/simple.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/menu/simple.pl    24 Oct 2010 19:08:34 -0000      1.9
+++ t/results/menu/simple.pl    28 Oct 2010 21:33:09 -0000      1.10
@@ -77,6 +77,14 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'node_content' => [
+                {}
+              ],
+              'normalized' => 'node'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -114,6 +122,14 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'node_content' => [
+                {}
+              ],
+              'normalized' => 'node-name'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -166,6 +182,14 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'node_content' => [
+                {}
+              ],
+              'normalized' => 'node'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -213,6 +237,14 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'node_content' => [
+                {}
+              ],
+              'normalized' => 'last'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         },
@@ -244,7 +276,12 @@
               'contents' => [
                 {
                   'parent' => {},
-                  'text' => 'last node entry '
+                  'text' => 'last node entry'
+                },
+                {
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'space_at_end_menu_node'
                 }
               ],
               'parent' => {},
@@ -267,6 +304,15 @@
               'type' => 'menu_entry_description'
             }
           ],
+          'extra' => {
+            'menu_entry_node' => {
+              'node_content' => [
+                {},
+                {}
+              ],
+              'normalized' => 'last-node-entry'
+            }
+          },
           'parent' => {},
           'type' => 'menu_entry'
         }
@@ -295,6 +341,7 @@
 $result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'args'}[4]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[2];
 
$result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'args'}[5];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'args'}[5]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[2];
+$result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'simple'}{'contents'}[1];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[1];
@@ -302,6 +349,7 @@
 $result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[2]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[3];
 
$result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[3];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[3]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[3];
+$result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'simple'}{'contents'}[1];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[4];
 
$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[1];
@@ -312,6 +360,7 @@
 $result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[4]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[4];
 
$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[5];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[5]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[4];
+$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'simple'}{'contents'}[1];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[5];
 
$result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[1];
@@ -321,16 +370,20 @@
 
$result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[3];
 
$result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[3];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[3]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[5];
+$result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[5]{'parent'} = 
$result_trees{'simple'}{'contents'}[1];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[6]{'parent'} = 
$result_trees{'simple'}{'contents'}[1];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'parent'} 
= $result_trees{'simple'}{'contents'}[1]{'contents'}[7];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[7]{'parent'} = 
$result_trees{'simple'}{'contents'}[1];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[8];
 
$result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[1];
+$result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[1];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[8];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[2]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[8];
 
$result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[3];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[3]{'parent'} = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[8];
+$result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0];
+$result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[1];
 $result_trees{'simple'}{'contents'}[1]{'contents'}[8]{'parent'} = 
$result_trees{'simple'}{'contents'}[1];
 $result_trees{'simple'}{'contents'}[1]{'parent'} = $result_trees{'simple'};
 $result_trees{'simple'}{'contents'}[2]{'parent'} = $result_trees{'simple'};

Index: t/results/sectioning/at_commands_in_refs.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/at_commands_in_refs.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/sectioning/at_commands_in_refs.pl 28 Oct 2010 19:09:24 -0000      
1.2
+++ t/results/sectioning/at_commands_in_refs.pl 28 Oct 2010 21:33:09 -0000      
1.3
@@ -140,6 +140,18 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => '-_007b-_007d'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -241,6 +253,30 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => '----_0021---_002e--_002e-_003f-_0040'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -382,6 +418,26 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -507,6 +563,24 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_2192-_2212'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -584,6 +658,18 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => '_2265-_2264-_2192'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -725,6 +811,26 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -834,6 +940,22 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => '_21d2-_00b0-a-b--_00e5'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -1087,6 +1209,40 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -1353,6 +1509,34 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -1529,6 +1713,26 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -1654,6 +1858,24 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -1779,6 +2001,24 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -1816,6 +2056,14 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -1922,6 +2170,18 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => 'AAA-AAA-BBB'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -2028,6 +2288,18 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => 'CCC-CCC-DDD'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -2129,6 +2401,16 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => 'the-someone-no_005fexplain_0040there'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -2240,6 +2522,16 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => 'f_002d_002dile1-f_002d_002dile'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -2292,6 +2584,14 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => '-_0040-_007b_007d-_002e-'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -2552,6 +2852,30 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -2745,6 +3069,26 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -2799,6 +3143,15 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {}
+                  ],
+                  'normalized' => '8_002e27in'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -2870,6 +3223,16 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => 'sansserif-slanted'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -2920,6 +3283,14 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'indicateurl'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -3041,6 +3412,18 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             }
@@ -12053,6 +12436,11 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[4];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1];
@@ -12076,6 +12464,23 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[16];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0];
@@ -12102,6 +12507,19 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[12];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0];
@@ -12125,6 +12543,17 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'menu_entry_node'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[10];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0];
@@ -12139,6 +12568,11 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'extra'}{'menu_entry_node'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'args'}[1]{'contents'}[4];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[0];
@@ -12165,6 +12599,19 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'menu_entry_node'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[1]{'contents'}[12];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0];
@@ -12185,6 +12632,15 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'extra'}{'menu_entry_node'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'args'}[1]{'contents'}[8];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0];
@@ -12232,6 +12688,33 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[17]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[17];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[18];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[19];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[20];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[21]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[21];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[22]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[22];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[23]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[23];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[24]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[24];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[25]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[25];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'extra'}{'menu_entry_node'}{'node_content'}[26]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'args'}[1]{'contents'}[26];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0]{'args'}[0];
@@ -12282,6 +12765,27 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[17]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[17];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[18]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[18];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[19]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[19];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'extra'}{'menu_entry_node'}{'node_content'}[20]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[20];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[9]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0]{'args'}[0];
@@ -12315,6 +12819,19 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'extra'}{'menu_entry_node'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'args'}[1]{'contents'}[12];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[10]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[1]{'contents'}[0];
@@ -12338,6 +12855,17 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'extra'}{'menu_entry_node'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'args'}[1]{'contents'}[10];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[11]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0];
@@ -12361,6 +12889,17 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'extra'}{'menu_entry_node'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'args'}[1]{'contents'}[10];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[12]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1];
@@ -12368,6 +12907,7 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'args'}[1]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[13]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0]{'args'}[0];
@@ -12387,6 +12927,11 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'extra'}{'menu_entry_node'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'extra'}{'menu_entry_node'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'args'}[1]{'contents'}[4];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[14]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[0]{'args'}[0];
@@ -12406,6 +12951,11 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'extra'}{'menu_entry_node'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'extra'}{'menu_entry_node'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'args'}[1]{'contents'}[4];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[15]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0]{'args'}[0];
@@ -12425,6 +12975,9 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'args'}[1]{'contents'}[2];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[16]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0]{'args'}[0];
@@ -12446,6 +12999,9 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'args'}[1]{'contents'}[2];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[17]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0]{'args'}[0];
@@ -12455,6 +13011,7 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'args'}[1]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[18]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[1]{'contents'}[0]{'args'}[0];
@@ -12504,6 +13061,23 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'extra'}{'menu_entry_node'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'extra'}{'menu_entry_node'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'extra'}{'menu_entry_node'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'extra'}{'menu_entry_node'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'extra'}{'menu_entry_node'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'extra'}{'menu_entry_node'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'extra'}{'menu_entry_node'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'extra'}{'menu_entry_node'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'extra'}{'menu_entry_node'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'extra'}{'menu_entry_node'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[1]{'contents'}[12];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'extra'}{'menu_entry_node'}{'node_content'}[13]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[1]{'contents'}[13];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'extra'}{'menu_entry_node'}{'node_content'}[14]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[1]{'contents'}[14];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'extra'}{'menu_entry_node'}{'node_content'}[15]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[1]{'contents'}[15];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'extra'}{'menu_entry_node'}{'node_content'}[16]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'args'}[1]{'contents'}[16];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[19]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'args'}[1]{'contents'}[0]{'args'}[0];
@@ -12540,6 +13114,19 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'args'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'args'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'args'}[1]{'contents'}[4];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node'}{'node_content'}[5]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'args'}[1]{'contents'}[5];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node'}{'node_content'}[6]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'args'}[1]{'contents'}[6];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node'}{'node_content'}[7]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'args'}[1]{'contents'}[7];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node'}{'node_content'}[8]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'args'}[1]{'contents'}[8];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node'}{'node_content'}[9]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'args'}[1]{'contents'}[9];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node'}{'node_content'}[10]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'args'}[1]{'contents'}[10];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node'}{'node_content'}[11]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'args'}[1]{'contents'}[11];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'extra'}{'menu_entry_node'}{'node_content'}[12]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'args'}[1]{'contents'}[12];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[20]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'args'}[1];
@@ -12550,6 +13137,8 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'args'}[1]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[21]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'args'}[1]{'contents'}[0]{'args'}[0];
@@ -12563,6 +13152,9 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'args'}[1]{'contents'}[2];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[22]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'args'}[1]{'contents'}[0]{'args'}[0];
@@ -12572,6 +13164,7 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'args'}[1]{'contents'}[0];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[23]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'args'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'args'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'args'}[1]{'contents'}[0]{'args'}[0];
@@ -12594,6 +13187,11 @@
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'args'}[2]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'args'}[3];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'args'}[3]{'parent'}
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'args'}[1]{'contents'}[0];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'args'}[1]{'contents'}[1];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'args'}[1]{'contents'}[2];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'extra'}{'menu_entry_node'}{'node_content'}[3]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'args'}[1]{'contents'}[3];
+$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'extra'}{'menu_entry_node'}{'node_content'}[4]
 = 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'args'}[1]{'contents'}[4];
 
$result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[24]{'parent'}
 = $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1];
 $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'at_commands_in_refs'}{'contents'}[2];
 $result_trees{'at_commands_in_refs'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'at_commands_in_refs'}{'contents'}[2];

Index: t/results/sectioning/character_and_spaces_in_refs.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/sectioning/character_and_spaces_in_refs.pl        28 Oct 2010 
19:09:24 -0000      1.2
+++ t/results/sectioning/character_and_spaces_in_refs.pl        28 Oct 2010 
21:33:09 -0000      1.3
@@ -124,6 +124,14 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'other-nodes'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             }
@@ -694,6 +702,14 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -731,6 +747,14 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -768,6 +792,14 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'local-node'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             }
@@ -1119,6 +1151,7 @@
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'character_and_spaces_in_refs'}{'contents'}[2];
@@ -1213,6 +1246,7 @@
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[3];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[1];
@@ -1220,6 +1254,7 @@
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[3];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[3];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[1];
@@ -1227,6 +1262,7 @@
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[2]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[3];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[3];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[3]{'parent'}
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[3];
+$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[1]{'parent'}
 = $result_trees{'character_and_spaces_in_refs'}{'contents'}[4];
 
$result_trees{'character_and_spaces_in_refs'}{'contents'}[4]{'contents'}[2]{'parent'}
 = $result_trees{'character_and_spaces_in_refs'}{'contents'}[4];

Index: t/results/sectioning/nodename_parentheses.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/nodename_parentheses.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/sectioning/nodename_parentheses.pl        28 Oct 2010 20:11:32 
-0000      1.2
+++ t/results/sectioning/nodename_parentheses.pl        28 Oct 2010 21:33:09 
-0000      1.3
@@ -124,6 +124,14 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'Node-_0028with-parentheses_0029'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -161,6 +169,14 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'Other-node'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -198,6 +214,23 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'manual_content' => [
+                    {
+                      'parent' => {},
+                      'text' => 'manual'
+                    }
+                  ],
+                  'node_content' => [
+                    {
+                      'parent' => {},
+                      'text' => 'node'
+                    }
+                  ],
+                  'normalized' => 'node'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             }
@@ -650,6 +683,7 @@
 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1];
@@ -657,6 +691,7 @@
 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[2]{'parent'}
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[3];
 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[3]{'parent'}
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2];
+$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
@@ -664,6 +699,8 @@
 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[2]{'parent'}
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[3];
 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[3]{'parent'}
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3];
+$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
+$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'extra'}{'menu_entry_node'}{'node_content'}[0]{'parent'}
 = 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'args'}[1];
 
$result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1];
 $result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[1]{'parent'} 
= $result_trees{'nodename_parentheses'}{'contents'}[2];
 $result_trees{'nodename_parentheses'}{'contents'}[2]{'contents'}[2]{'parent'} 
= $result_trees{'nodename_parentheses'}{'contents'}[2];

Index: t/results/sectioning/raiselowersections.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/raiselowersections.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/sectioning/raiselowersections.pl  28 Oct 2010 19:09:24 -0000      
1.6
+++ t/results/sectioning/raiselowersections.pl  28 Oct 2010 21:33:09 -0000      
1.7
@@ -138,6 +138,14 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'Chapter'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             },
@@ -175,6 +183,14 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'Second-chapter'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             }
@@ -319,6 +335,14 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'Chapter-in-included-file'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             }
@@ -533,6 +557,14 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'Section'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             }
@@ -680,6 +712,14 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'Subsection'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             }
@@ -963,6 +1003,7 @@
 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[1];
 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[3];
 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0];
 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2];
 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[1];
@@ -970,6 +1011,7 @@
 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[2]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2];
 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[3];
 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[3]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2];
+$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'args'}[1]{'contents'}[0];
 
$result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0];
 $result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'raiselowersections'}{'contents'}[2];
 $result_trees{'raiselowersections'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'raiselowersections'}{'contents'}[2];
@@ -993,6 +1035,7 @@
 
$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[3];
 
$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[1];
+$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1];
 $result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'raiselowersections'}{'contents'}[4];
 $result_trees{'raiselowersections'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'raiselowersections'}{'contents'}[4];
@@ -1028,6 +1071,7 @@
 
$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[3];
 
$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[1];
+$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1];
 $result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[1]{'parent'} = 
$result_trees{'raiselowersections'}{'contents'}[6];
 $result_trees{'raiselowersections'}{'contents'}[6]{'contents'}[2]{'parent'} = 
$result_trees{'raiselowersections'}{'contents'}[6];
@@ -1051,6 +1095,7 @@
 
$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
 
$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[3];
 
$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[1];
+$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1];
 $result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[1]{'parent'} = 
$result_trees{'raiselowersections'}{'contents'}[8];
 $result_trees{'raiselowersections'}{'contents'}[8]{'contents'}[2]{'parent'} = 
$result_trees{'raiselowersections'}{'contents'}[8];

Index: t/results/sectioning/some_at_commands_in_ref_nodes.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/some_at_commands_in_ref_nodes.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/sectioning/some_at_commands_in_ref_nodes.pl       28 Oct 2010 
19:09:24 -0000      1.2
+++ t/results/sectioning/some_at_commands_in_ref_nodes.pl       28 Oct 2010 
21:33:09 -0000      1.3
@@ -282,6 +282,27 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {},
+                    {}
+                  ],
+                  'normalized' => 
'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             }
@@ -961,6 +982,20 @@
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[2]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[2];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[3]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[3];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[4]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[4];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[5]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[5];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[6]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[6];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[7]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[7];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[8]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[8];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[9]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[9];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[10]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[10];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[11]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[11];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[12]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[12];
+$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[13]
 = 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[13];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[1]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2];
 
$result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2]{'contents'}[2]{'parent'}
 = $result_trees{'some_at_commands_in_ref_nodes'}{'contents'}[2];

Index: t/results/value/value_in_node.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/value/value_in_node.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/value/value_in_node.pl    28 Oct 2010 19:09:24 -0000      1.17
+++ t/results/value/value_in_node.pl    28 Oct 2010 21:33:09 -0000      1.18
@@ -194,7 +194,12 @@
                   'contents' => [
                     {
                       'parent' => {},
-                      'text' => 'Node 1  '
+                      'text' => 'Node 1'
+                    },
+                    {
+                      'parent' => {},
+                      'text' => '  ',
+                      'type' => 'space_at_end_menu_node'
                     }
                   ],
                   'parent' => {},
@@ -217,6 +222,15 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {},
+                    {}
+                  ],
+                  'normalized' => 'Node-1'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             }
@@ -433,6 +447,14 @@
                   'type' => 'menu_entry_description'
                 }
               ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'Section-1_002e1'
+                }
+              },
               'parent' => {},
               'type' => 'menu_entry'
             }
@@ -618,10 +640,13 @@
 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
+$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1];
 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'parent'}
 = $result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
 = $result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
 = $result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
+$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[1]
 = 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[1];
 
$result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1];
 $result_trees{'value_in_node'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'value_in_node'}{'contents'}[2];
 $result_trees{'value_in_node'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'value_in_node'}{'contents'}[2];
@@ -656,6 +681,7 @@
 
$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[2]{'parent'}
 = $result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
 
$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[3];
 
$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[3]{'parent'}
 = $result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1];
+$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[0];
 
$result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3];
 $result_trees{'value_in_node'}{'contents'}[4]{'contents'}[3]{'parent'} = 
$result_trees{'value_in_node'}{'contents'}[4];
 $result_trees{'value_in_node'}{'contents'}[4]{'contents'}[4]{'parent'} = 
$result_trees{'value_in_node'}{'contents'}[4];



reply via email to

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