texinfo-commits
[Top][All Lists]
Advanced

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

texinfo/tp Texinfo/Structuring.pm t/results/inv...


From: Patrice Dumas
Subject: texinfo/tp Texinfo/Structuring.pm t/results/inv...
Date: Sun, 31 Oct 2010 13:32:38 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/10/31 13:32:38

Modified files:
        tp/Texinfo     : Structuring.pm 
        tp/t/results/invalid_nestings: 
                                       
style_not_closed_no_newline_root_commands.pl 
                                       style_not_closed_root_commands.pl 
        tp/t/results/macro: macro_in_misc_commands.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:
        Error message for wrong menu/node up structuring.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Structuring.pm?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_misc_commands.pl?cvsroot=texinfo&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/nodename_parentheses.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/raiselowersections.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/some_at_commands_in_ref_nodes.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_in_node.pl?cvsroot=texinfo&r1=1.29&r2=1.30

Patches:
Index: Texinfo/Structuring.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Structuring.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- Texinfo/Structuring.pm      31 Oct 2010 11:03:22 -0000      1.14
+++ Texinfo/Structuring.pm      31 Oct 2010 13:32:37 -0000      1.15
@@ -291,6 +291,12 @@
   return $sec_root;
 }
 
+sub _node_extra_to_texi($)
+{
+  my $node = shift;
+  return tree_to_texi ({'contents' => $node->{'node_content'}});
+}
+
 my @node_directions = ('next', 'prev', 'up');
 # FIXME i18n?
 my %direction_texts = (
@@ -319,22 +325,25 @@
             if 
(!$self->{'labels'}->{$menu_content->{'extra'}->{'menu_entry_node'}->{'normalized'}})
 {
               if (!$self->{'novalidate'}) {
                 $self->_line_error (sprintf($self->__("Menu reference to 
nonexistent node `%s'"), 
-                  tree_to_texi({ 'contents' => 
$menu_content->{'extra'}->{'menu_entry_node'}->{'node_content'} })), 
+                  
_node_extra_to_texi($menu_content->{'extra'}->{'menu_entry_node'})), 
                   $menu_content->{'line_nr'});
               }
             } else {
+              # this may happen more than once for a given node if the node 
+              # is in more than one menu.  Therefore all the menu up node 
+              # are kept in $menu_node->{'menu_up_hash'}
               my $normalized_menu_node
                 = 
$menu_content->{'extra'}->{'menu_entry_node'}->{'normalized'};
               my $menu_node =
                 $self->{'labels'}->{$normalized_menu_node};
               $menu_node->{'menu_up'} = $node;
+              $menu_node->{'menu_up_hash'}->{$node->{'extra'}->{'normalized'}} 
=1;
               if ($previous_node) {
                 $menu_node->{'menu_prev'} = $previous_node;
                 $previous_node->{'menu_next'} = $menu_node;
               } else {
                 $node->{'menu_child'} = $menu_node;
               }
-              $node->{'extra'}->{'menu_childs'}->{$normalized_menu_node} = 1;
               $previous_node = $menu_node;
             }
           }
@@ -347,8 +356,7 @@
     # warn if node is not top node and doesn't appear in menu
     if ($node ne $top_node and !$node->{'menu_up'}) {
       $self->_line_warn (sprintf($self->__("unreferenced node `%s'"), 
-        tree_to_texi({ 'contents' => $node->{'extra'}->{'node_content'}})), 
-                       $node->{'line_nr'});
+        _node_extra_to_texi($node->{'extra'})), $node->{'line_nr'});
     }
     my $automatic_directions = 
       (scalar(@{$node->{'extra'}->{'nodes_manuals'}}) == 1);
@@ -396,21 +404,29 @@
             } else {
               $self->_line_error (sprintf($self->__("%s reference to 
nonexistent `%s'"),
                     $direction_texts{$direction}, 
-                    tree_to_texi({'contents' => 
$node_direction->{'node_content'}})), 
+                    _node_extra_to_texi($node_direction)), 
                     $node->{'line_nr'});
             }
           }
         }
       }
     }
-    if ($node->{'node_up'} 
-        and !$node->{'node_up'}->{'extra'}->{'manual_content'}
-        and (!$node->{'node_up'}->{'extra'}->{'menu_childs'}
-             or 
!$node->{'node_up'}->{'extra'}->{'menu_childs'}->{$node->{'extra'}->{'normalized'}}))
 {
+    if ($node->{'node_up'} and (!$node->{'menu_up_hash'}
+         or 
!$node->{'menu_up_hash'}->{$node->{'node_up'}->{'extra'}->{'normalized'}})) {
+      if (!$node->{'node_up'}->{'extra'}->{'manual_content'}) {
+      # up node has no menu entry
       $self->_line_error(sprintf($self->__("Node `%s' lacks menu item for `%s' 
despite being its Up target"), 
-           tree_to_texi({'contents' => 
$node->{'node_up'}->{'extra'}->{'node_content'}}), 
-           tree_to_texi({'contents' => $node->{'extra'}->{'node_content'}})),
+             _node_extra_to_texi($node->{'node_up'}->{'extra'}), 
+             _node_extra_to_texi($node->{'extra'})),
            $node->{'node_up'}->{'line_nr'});
+      # This leads to an error when there is an external nodes as up, and 
+      # not in Top node.
+      } elsif ($node->{'menu_up'}) {
+        $self->_line_warn(sprintf($self->__("For `%s', up in menu `%s' and up 
`%s' don't match"), 
+          _node_extra_to_texi($node->{'extra'}),
+          _node_extra_to_texi($node->{'menu_up'}->{'extra'}), 
+          _node_extra_to_texi($node->{'node_up'}->{'extra'})), 
$node->{'line_nr'});
+      }
     }
   }
   return $top_node;

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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl     
31 Oct 2010 11:03:22 -0000      1.18
+++ t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl     
31 Oct 2010 13:32:37 -0000      1.19
@@ -200,6 +200,9 @@
         'line_nr' => 8,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -353,6 +356,9 @@
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'chapter'
+          },
+          'menu_up_hash' => {
+            'Top' => 1
           }
         }
       },
@@ -380,6 +386,9 @@
       },
       'normalized' => 'chapter'
     },
+    'menu_up_hash' => {
+      'Top' => 1
+    },
     'node_prev' => {},
     'node_up' => {}
   },
@@ -405,9 +414,6 @@
 $result_menus{'style_not_closed_no_newline_root_commands'} = {
   'cmdname' => 'node',
   'extra' => {
-    'menu_childs' => {
-      'chapter' => 1
-    },
     'normalized' => 'Top'
   },
   'menu_child' => {
@@ -415,7 +421,10 @@
     'extra' => {
       'normalized' => 'chapter'
     },
-    'menu_up' => {}
+    'menu_up' => {},
+    'menu_up_hash' => {
+      'Top' => 1
+    }
   }
 };
 
$result_menus{'style_not_closed_no_newline_root_commands'}{'menu_child'}{'menu_up'}
 = $result_menus{'style_not_closed_no_newline_root_commands'};

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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/invalid_nestings/style_not_closed_root_commands.pl        31 Oct 
2010 11:03:22 -0000      1.17
+++ t/results/invalid_nestings/style_not_closed_root_commands.pl        31 Oct 
2010 13:32:37 -0000      1.18
@@ -206,6 +206,9 @@
         'line_nr' => 9,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -371,6 +374,9 @@
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'chapter'
+          },
+          'menu_up_hash' => {
+            'Top' => 1
           }
         }
       },
@@ -398,6 +404,9 @@
       },
       'normalized' => 'chapter'
     },
+    'menu_up_hash' => {
+      'Top' => 1
+    },
     'node_prev' => {},
     'node_up' => {}
   },
@@ -423,9 +432,6 @@
 $result_menus{'style_not_closed_root_commands'} = {
   'cmdname' => 'node',
   'extra' => {
-    'menu_childs' => {
-      'chapter' => 1
-    },
     'normalized' => 'Top'
   },
   'menu_child' => {
@@ -433,7 +439,10 @@
     'extra' => {
       'normalized' => 'chapter'
     },
-    'menu_up' => {}
+    'menu_up' => {},
+    'menu_up_hash' => {
+      'Top' => 1
+    }
   }
 };
 $result_menus{'style_not_closed_root_commands'}{'menu_child'}{'menu_up'} = 
$result_menus{'style_not_closed_root_commands'};

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.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- t/results/macro/macro_in_misc_commands.pl   31 Oct 2010 11:03:22 -0000      
1.30
+++ t/results/macro/macro_in_misc_commands.pl   31 Oct 2010 13:32:37 -0000      
1.31
@@ -2969,6 +2969,9 @@
         'line_nr' => 195,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -3853,6 +3856,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'node-atext'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -3889,6 +3895,9 @@
       },
       'normalized' => 'node-atext'
     },
+    'menu_up_hash' => {
+      'Top' => 1
+    },
     'node_prev' => {},
     'node_up' => {}
   },
@@ -3914,9 +3923,6 @@
 $result_menus{'macro_in_misc_commands'} = {
   'cmdname' => 'node',
   'extra' => {
-    'menu_childs' => {
-      'node-atext' => 1
-    },
     'normalized' => 'Top'
   },
   'menu_child' => {
@@ -3924,7 +3930,10 @@
     'extra' => {
       'normalized' => 'node-atext'
     },
-    'menu_up' => {}
+    'menu_up' => {},
+    'menu_up_hash' => {
+      'Top' => 1
+    }
   }
 };
 $result_menus{'macro_in_misc_commands'}{'menu_child'}{'menu_up'} = 
$result_menus{'macro_in_misc_commands'};

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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/sectioning/at_commands_in_refs.pl 31 Oct 2010 11:03:22 -0000      
1.14
+++ t/results/sectioning/at_commands_in_refs.pl 31 Oct 2010 13:32:37 -0000      
1.15
@@ -3638,6 +3638,9 @@
         'line_nr' => 31,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -3822,6 +3825,9 @@
         'line_nr' => 34,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -4090,6 +4096,9 @@
         'line_nr' => 37,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -4380,6 +4389,9 @@
         'line_nr' => 40,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -4600,6 +4612,9 @@
         'line_nr' => 43,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -4844,6 +4859,9 @@
         'line_nr' => 46,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -5116,6 +5134,9 @@
         'line_nr' => 49,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -5518,6 +5539,9 @@
         'line_nr' => 52,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -6071,6 +6095,9 @@
         'line_nr' => 55,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -6539,6 +6566,9 @@
         'line_nr' => 58,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -6864,6 +6894,9 @@
         'line_nr' => 61,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -7138,6 +7171,9 @@
         'line_nr' => 64,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -7314,6 +7350,9 @@
         'line_nr' => 67,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -7475,6 +7514,9 @@
         'line_nr' => 70,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -7705,6 +7747,9 @@
         'line_nr' => 73,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -7928,6 +7973,9 @@
         'line_nr' => 78,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -8156,6 +8204,9 @@
         'line_nr' => 81,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -8333,6 +8384,9 @@
         'line_nr' => 86,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -8675,6 +8729,9 @@
         'line_nr' => 91,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -9154,6 +9211,9 @@
         'line_nr' => 94,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -9416,6 +9476,9 @@
         'line_nr' => 97,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -9557,6 +9620,9 @@
         'line_nr' => 100,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -9692,6 +9758,9 @@
         'line_nr' => 103,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -9881,6 +9950,9 @@
         'line_nr' => 106,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -15467,6 +15539,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => '-_007b-_007d'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15481,6 +15556,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => '----_0021---_002e--_002e-_003f-_0040'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15496,6 +15574,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15511,6 +15592,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_2192-_2212'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15526,6 +15610,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => '_2265-_2264-_2192'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15541,6 +15628,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15556,6 +15646,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => '_21d2-_00b0-a-b--_00e5'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15571,6 +15664,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15586,6 +15682,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15601,6 +15700,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => '_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15616,6 +15718,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15631,6 +15736,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => '_00ab-_00bb-_00ab-_00bb-_2039-_203a'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15646,6 +15754,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15661,6 +15772,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'AAA-AAA-BBB'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15676,6 +15790,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'CCC-CCC-DDD'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15691,6 +15808,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'the-someone-no_005fexplain_0040there'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15706,6 +15826,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'f_002d_002dile1-f_002d_002dile'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15721,6 +15844,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => '-_0040-_007b_007d-_002e-'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15736,6 +15862,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15751,6 +15880,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'env-code-option-samp-command-file-C_002dx-ESC'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15766,6 +15898,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => '8_002e27in'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15781,6 +15916,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'sansserif-slanted'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15796,6 +15934,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'indicateurl'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15811,6 +15952,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -15894,6 +16038,9 @@
       },
       'normalized' => '-_007b-_007d'
     },
+    'menu_up_hash' => {
+      'Top' => 1
+    },
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
@@ -15905,6 +16052,9 @@
         },
         'normalized' => '----_0021---_002e--_002e-_003f-_0040'
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'node_next' => {
         'cmdname' => 'node',
         'extra' => {
@@ -15916,6 +16066,9 @@
           },
           'normalized' => 'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e'
         },
+        'menu_up_hash' => {
+          'Top' => 1
+        },
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
@@ -15927,6 +16080,9 @@
             },
             'normalized' => 
'_2261-error_002d_002d_003e-_20ac-_00a1-_2192-_2212'
           },
+          'menu_up_hash' => {
+            'Top' => 1
+          },
           'node_next' => {
             'cmdname' => 'node',
             'extra' => {
@@ -15938,6 +16094,9 @@
               },
               'normalized' => '_2265-_2264-_2192'
             },
+            'menu_up_hash' => {
+              'Top' => 1
+            },
             'node_next' => {
               'cmdname' => 'node',
               'extra' => {
@@ -15949,6 +16108,9 @@
                 },
                 'normalized' => '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae'
               },
+              'menu_up_hash' => {
+                'Top' => 1
+              },
               'node_next' => {
                 'cmdname' => 'node',
                 'extra' => {
@@ -15960,6 +16122,9 @@
                   },
                   'normalized' => '_21d2-_00b0-a-b--_00e5'
                 },
+                'menu_up_hash' => {
+                  'Top' => 1
+                },
                 'node_next' => {
                   'cmdname' => 'node',
                   'extra' => {
@@ -15971,6 +16136,9 @@
                     },
                     'normalized' => 
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
                   },
+                  'menu_up_hash' => {
+                    'Top' => 1
+                  },
                   'node_next' => {
                     'cmdname' => 'node',
                     'extra' => {
@@ -15982,6 +16150,9 @@
                       },
                       'normalized' => 
'_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119'
                     },
+                    'menu_up_hash' => {
+                      'Top' => 1
+                    },
                     'node_next' => {
                       'cmdname' => 'node',
                       'extra' => {
@@ -15993,6 +16164,9 @@
                         },
                         'normalized' => 
'_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361'
                       },
+                      'menu_up_hash' => {
+                        'Top' => 1
+                      },
                       'node_next' => {
                         'cmdname' => 'node',
                         'extra' => {
@@ -16004,6 +16178,9 @@
                           },
                           'normalized' => '_201c-_201d-_2018-_2019-_201e-_201a'
                         },
+                        'menu_up_hash' => {
+                          'Top' => 1
+                        },
                         'node_next' => {
                           'cmdname' => 'node',
                           'extra' => {
@@ -16015,6 +16192,9 @@
                             },
                             'normalized' => 
'_00ab-_00bb-_00ab-_00bb-_2039-_203a'
                           },
+                          'menu_up_hash' => {
+                            'Top' => 1
+                          },
                           'node_next' => {
                             'cmdname' => 'node',
                             'extra' => {
@@ -16026,6 +16206,9 @@
                               },
                               'normalized' => 
'_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d'
                             },
+                            'menu_up_hash' => {
+                              'Top' => 1
+                            },
                             'node_next' => {
                               'cmdname' => 'node',
                               'extra' => {
@@ -16037,6 +16220,9 @@
                                 },
                                 'normalized' => 'AAA-AAA-BBB'
                               },
+                              'menu_up_hash' => {
+                                'Top' => 1
+                              },
                               'node_next' => {
                                 'cmdname' => 'node',
                                 'extra' => {
@@ -16048,6 +16234,9 @@
                                   },
                                   'normalized' => 'CCC-CCC-DDD'
                                 },
+                                'menu_up_hash' => {
+                                  'Top' => 1
+                                },
                                 'node_next' => {
                                   'cmdname' => 'node',
                                   'extra' => {
@@ -16059,6 +16248,9 @@
                                     },
                                     'normalized' => 
'the-someone-no_005fexplain_0040there'
                                   },
+                                  'menu_up_hash' => {
+                                    'Top' => 1
+                                  },
                                   'node_next' => {
                                     'cmdname' => 'node',
                                     'extra' => {
@@ -16070,6 +16262,9 @@
                                       },
                                       'normalized' => 
'f_002d_002dile1-f_002d_002dile'
                                     },
+                                    'menu_up_hash' => {
+                                      'Top' => 1
+                                    },
                                     'node_next' => {
                                       'cmdname' => 'node',
                                       'extra' => {
@@ -16081,6 +16276,9 @@
                                         },
                                         'normalized' => 
'-_0040-_007b_007d-_002e-'
                                       },
+                                      'menu_up_hash' => {
+                                        'Top' => 1
+                                      },
                                       'node_next' => {
                                         'cmdname' => 'node',
                                         'extra' => {
@@ -16092,6 +16290,9 @@
                                           },
                                           'normalized' => 
'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i'
                                         },
+                                        'menu_up_hash' => {
+                                          'Top' => 1
+                                        },
                                         'node_next' => {
                                           'cmdname' => 'node',
                                           'extra' => {
@@ -16103,6 +16304,9 @@
                                             },
                                             'normalized' => 
'env-code-option-samp-command-file-C_002dx-ESC'
                                           },
+                                          'menu_up_hash' => {
+                                            'Top' => 1
+                                          },
                                           'node_next' => {
                                             'cmdname' => 'node',
                                             'extra' => {
@@ -16114,6 +16318,9 @@
                                               },
                                               'normalized' => '8_002e27in'
                                             },
+                                            'menu_up_hash' => {
+                                              'Top' => 1
+                                            },
                                             'node_next' => {
                                               'cmdname' => 'node',
                                               'extra' => {
@@ -16125,6 +16332,9 @@
                                                 },
                                                 'normalized' => 
'sansserif-slanted'
                                               },
+                                              'menu_up_hash' => {
+                                                'Top' => 1
+                                              },
                                               'node_next' => {
                                                 'cmdname' => 'node',
                                                 'extra' => {
@@ -16136,6 +16346,9 @@
                                                   },
                                                   'normalized' => 'indicateurl'
                                                 },
+                                                'menu_up_hash' => {
+                                                  'Top' => 1
+                                                },
                                                 'node_next' => {
                                                   'cmdname' => 'node',
                                                   'extra' => {
@@ -16147,6 +16360,9 @@
                                                     },
                                                     'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
                                                   },
+                                                  'menu_up_hash' => {
+                                                    'Top' => 1
+                                                  },
                                                   'node_prev' => {},
                                                   'node_up' => {}
                                                 },
@@ -16287,32 +16503,6 @@
 $result_menus{'at_commands_in_refs'} = {
   'cmdname' => 'node',
   'extra' => {
-    'menu_childs' => {
-      '----_0021---_002e--_002e-_003f-_0040' => 1,
-      '-_0040-_007b_007d-_002e-' => 1,
-      '-_007b-_007d' => 1,
-      '8_002e27in' => 1,
-      'AAA-AAA-BBB' => 1,
-      'CCC-CCC-DDD' => 1,
-      'LaTeX-TeX-_2022-_002c-_00a9-_2026-_002e_002e_002e' => 1,
-      '_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d' => 1,
-      '_00aa-_00ba-_2605-_00a3-_22a3-_00bf-_00ae' => 1,
-      '_00ab-_00bb-_00ab-_00bb-_2039-_203a' => 1,
-      
'_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe'
 => 1,
-      '_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119' => 
1,
-      '_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361' => 1,
-      '_201c-_201d-_2018-_2019-_201e-_201a' => 1,
-      '_21d2-_00b0-a-b--_00e5' => 1,
-      '_2261-error_002d_002d_003e-_20ac-_00a1-_2192-_2212' => 1,
-      '_2265-_2264-_2192' => 1,
-      'cite-asis-in-_0040w-b-in-r-SC-str-t-var-dfn-i' => 1,
-      'env-code-option-samp-command-file-C_002dx-ESC' => 1,
-      'f_002d_002dile1-f_002d_002dile' => 1,
-      'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls' 
=> 1,
-      'indicateurl' => 1,
-      'sansserif-slanted' => 1,
-      'the-someone-no_005fexplain_0040there' => 1
-    },
     'normalized' => 'Top'
   },
   'menu_child' => {
@@ -16436,75 +16626,147 @@
                                                     'normalized' => 
'http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls'
                                                   },
                                                   'menu_prev' => {},
-                                                  'menu_up' => {}
+                                                  'menu_up' => {},
+                                                  'menu_up_hash' => {
+                                                    'Top' => 1
+                                                  }
                                                 },
                                                 'menu_prev' => {},
-                                                'menu_up' => {}
+                                                'menu_up' => {},
+                                                'menu_up_hash' => {
+                                                  'Top' => 1
+                                                }
                                               },
                                               'menu_prev' => {},
-                                              'menu_up' => {}
+                                              'menu_up' => {},
+                                              'menu_up_hash' => {
+                                                'Top' => 1
+                                              }
                                             },
                                             'menu_prev' => {},
-                                            'menu_up' => {}
+                                            'menu_up' => {},
+                                            'menu_up_hash' => {
+                                              'Top' => 1
+                                            }
                                           },
                                           'menu_prev' => {},
-                                          'menu_up' => {}
+                                          'menu_up' => {},
+                                          'menu_up_hash' => {
+                                            'Top' => 1
+                                          }
                                         },
                                         'menu_prev' => {},
-                                        'menu_up' => {}
+                                        'menu_up' => {},
+                                        'menu_up_hash' => {
+                                          'Top' => 1
+                                        }
                                       },
                                       'menu_prev' => {},
-                                      'menu_up' => {}
+                                      'menu_up' => {},
+                                      'menu_up_hash' => {
+                                        'Top' => 1
+                                      }
                                     },
                                     'menu_prev' => {},
-                                    'menu_up' => {}
+                                    'menu_up' => {},
+                                    'menu_up_hash' => {
+                                      'Top' => 1
+                                    }
                                   },
                                   'menu_prev' => {},
-                                  'menu_up' => {}
+                                  'menu_up' => {},
+                                  'menu_up_hash' => {
+                                    'Top' => 1
+                                  }
                                 },
                                 'menu_prev' => {},
-                                'menu_up' => {}
+                                'menu_up' => {},
+                                'menu_up_hash' => {
+                                  'Top' => 1
+                                }
                               },
                               'menu_prev' => {},
-                              'menu_up' => {}
+                              'menu_up' => {},
+                              'menu_up_hash' => {
+                                'Top' => 1
+                              }
                             },
                             'menu_prev' => {},
-                            'menu_up' => {}
+                            'menu_up' => {},
+                            'menu_up_hash' => {
+                              'Top' => 1
+                            }
                           },
                           'menu_prev' => {},
-                          'menu_up' => {}
+                          'menu_up' => {},
+                          'menu_up_hash' => {
+                            'Top' => 1
+                          }
                         },
                         'menu_prev' => {},
-                        'menu_up' => {}
+                        'menu_up' => {},
+                        'menu_up_hash' => {
+                          'Top' => 1
+                        }
                       },
                       'menu_prev' => {},
-                      'menu_up' => {}
+                      'menu_up' => {},
+                      'menu_up_hash' => {
+                        'Top' => 1
+                      }
                     },
                     'menu_prev' => {},
-                    'menu_up' => {}
+                    'menu_up' => {},
+                    'menu_up_hash' => {
+                      'Top' => 1
+                    }
                   },
                   'menu_prev' => {},
-                  'menu_up' => {}
+                  'menu_up' => {},
+                  'menu_up_hash' => {
+                    'Top' => 1
+                  }
                 },
                 'menu_prev' => {},
-                'menu_up' => {}
+                'menu_up' => {},
+                'menu_up_hash' => {
+                  'Top' => 1
+                }
               },
               'menu_prev' => {},
-              'menu_up' => {}
+              'menu_up' => {},
+              'menu_up_hash' => {
+                'Top' => 1
+              }
             },
             'menu_prev' => {},
-            'menu_up' => {}
+            'menu_up' => {},
+            'menu_up_hash' => {
+              'Top' => 1
+            }
           },
           'menu_prev' => {},
-          'menu_up' => {}
+          'menu_up' => {},
+          'menu_up_hash' => {
+            'Top' => 1
+          }
         },
         'menu_prev' => {},
-        'menu_up' => {}
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Top' => 1
+        }
       },
       'menu_prev' => {},
-      'menu_up' => {}
+      'menu_up' => {},
+      'menu_up_hash' => {
+        'Top' => 1
+      }
     },
-    'menu_up' => {}
+    'menu_up' => {},
+    'menu_up_hash' => {
+      'Top' => 1
+    }
   }
 };
 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'at_commands_in_refs'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'}{'menu_next'};

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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/sectioning/character_and_spaces_in_refs.pl        31 Oct 2010 
11:03:23 -0000      1.14
+++ t/results/sectioning/character_and_spaces_in_refs.pl        31 Oct 2010 
13:32:37 -0000      1.15
@@ -637,6 +637,9 @@
         'line_nr' => 20,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -966,6 +969,9 @@
         'line_nr' => 29,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'other-nodes' => 1
+      },
       'parent' => {}
     },
     {
@@ -1070,6 +1076,9 @@
         'line_nr' => 31,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'other-nodes' => 1
+      },
       'parent' => {}
     },
     {
@@ -1160,6 +1169,9 @@
         'line_nr' => 33,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'other-nodes' => 1
+      },
       'parent' => {}
     },
     {
@@ -1444,6 +1456,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'other-nodes'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -1485,16 +1500,25 @@
       'extra' => {
         'normalized' => 
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e'
       },
+      'menu_up_hash' => {
+        'other-nodes' => 1
+      },
       'node_next' => {
         'cmdname' => 'node',
         'extra' => {
           'normalized' => 
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e'
         },
+        'menu_up_hash' => {
+          'other-nodes' => 1
+        },
         'node_next' => {
           'cmdname' => 'node',
           'extra' => {
             'normalized' => 'local-node'
           },
+          'menu_up_hash' => {
+            'other-nodes' => 1
+          },
           'node_prev' => {},
           'node_up' => {}
         },
@@ -1504,6 +1528,9 @@
       'node_prev' => {},
       'node_up' => {}
     },
+    'menu_up_hash' => {
+      'Top' => 1
+    },
     'menus' => [
       {
         'cmdname' => 'menu'
@@ -1542,19 +1569,11 @@
 $result_menus{'character_and_spaces_in_refs'} = {
   'cmdname' => 'node',
   'extra' => {
-    'menu_childs' => {
-      'other-nodes' => 1
-    },
     'normalized' => 'Top'
   },
   'menu_child' => {
     'cmdname' => 'node',
     'extra' => {
-      'menu_childs' => {
-        
'_0021_005f_0022_0023_0024_0025_0026_0027_0028_0029_002a_002b_002d_002e' => 1,
-        
'_002f_003b_003c_003d_003e_003f_005b_005c_005d_005e_005f_0060_007c_007e' => 1,
-        'local-node' => 1
-      },
       'normalized' => 'other-nodes'
     },
     'menu_child' => {
@@ -1573,14 +1592,26 @@
             'normalized' => 'local-node'
           },
           'menu_prev' => {},
-          'menu_up' => {}
+          'menu_up' => {},
+          'menu_up_hash' => {
+            'other-nodes' => 1
+          }
         },
         'menu_prev' => {},
-        'menu_up' => {}
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'other-nodes' => 1
+        }
       },
-      'menu_up' => {}
+      'menu_up' => {},
+      'menu_up_hash' => {
+        'other-nodes' => 1
+      }
     },
-    'menu_up' => {}
+    'menu_up' => {},
+    'menu_up_hash' => {
+      'Top' => 1
+    }
   }
 };
 
$result_menus{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'}{'menu_next'}{'menu_next'}{'menu_prev'}
 = 
$result_menus{'character_and_spaces_in_refs'}{'menu_child'}{'menu_child'}{'menu_next'};

Index: t/results/sectioning/nodename_parentheses.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/nodename_parentheses.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/sectioning/nodename_parentheses.pl        31 Oct 2010 11:03:23 
-0000      1.16
+++ t/results/sectioning/nodename_parentheses.pl        31 Oct 2010 13:32:37 
-0000      1.17
@@ -320,6 +320,9 @@
         'line_nr' => 10,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -425,6 +428,9 @@
         'line_nr' => 15,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -898,6 +904,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'Node-_0028with-parentheses_0029'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -912,6 +921,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'Other-node'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -968,6 +980,9 @@
       },
       'normalized' => 'Node-_0028with-parentheses_0029'
     },
+    'menu_up_hash' => {
+      'Top' => 1
+    },
     'node_next' => {
       'cmdname' => 'node',
       'extra' => {
@@ -979,6 +994,9 @@
         },
         'normalized' => 'Other-node'
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'node_prev' => {},
       'node_up' => {}
     },
@@ -1009,10 +1027,6 @@
 $result_menus{'nodename_parentheses'} = {
   'cmdname' => 'node',
   'extra' => {
-    'menu_childs' => {
-      'Node-_0028with-parentheses_0029' => 1,
-      'Other-node' => 1
-    },
     'normalized' => 'Top'
   },
   'menu_child' => {
@@ -1026,9 +1040,15 @@
         'normalized' => 'Other-node'
       },
       'menu_prev' => {},
-      'menu_up' => {}
+      'menu_up' => {},
+      'menu_up_hash' => {
+        'Top' => 1
+      }
     },
-    'menu_up' => {}
+    'menu_up' => {},
+    'menu_up_hash' => {
+      'Top' => 1
+    }
   }
 };
 $result_menus{'nodename_parentheses'}{'menu_child'}{'menu_next'}{'menu_prev'} 
= $result_menus{'nodename_parentheses'}{'menu_child'};

Index: t/results/sectioning/raiselowersections.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/raiselowersections.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/sectioning/raiselowersections.pl  31 Oct 2010 11:03:23 -0000      
1.18
+++ t/results/sectioning/raiselowersections.pl  31 Oct 2010 13:32:37 -0000      
1.19
@@ -275,6 +275,9 @@
         'line_nr' => 10,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -507,6 +510,9 @@
         'line_nr' => 13,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Chapter' => 1
+      },
       'parent' => {}
     },
     {
@@ -671,6 +677,9 @@
         'line_nr' => 20,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Chapter-in-included-file' => 1
+      },
       'parent' => {}
     },
     {
@@ -835,6 +844,9 @@
         'line_nr' => 27,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Section' => 1
+      },
       'parent' => {}
     },
     {
@@ -962,6 +974,9 @@
         'line_nr' => 30,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -1304,6 +1319,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'Chapter'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -1317,6 +1335,9 @@
                   'cmdname' => 'node',
                   'extra' => {
                     'normalized' => 'Chapter-in-included-file'
+                  },
+                  'menu_up_hash' => {
+                    'Chapter' => 1
                   }
                 },
                 'sections_level' => -1
@@ -1331,6 +1352,9 @@
                       'cmdname' => 'node',
                       'extra' => {
                         'normalized' => 'Section'
+                      },
+                      'menu_up_hash' => {
+                        'Chapter-in-included-file' => 1
                       }
                     },
                     'sections_level' => -1
@@ -1345,6 +1369,9 @@
                           'cmdname' => 'node',
                           'extra' => {
                             'normalized' => 'Subsection'
+                          },
+                          'menu_up_hash' => {
+                            'Section' => 1
                           }
                         },
                         'sections_level' => -1
@@ -1369,6 +1396,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'Second-chapter'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -1450,8 +1480,14 @@
             },
             'normalized' => 'Subsection'
           },
+          'menu_up_hash' => {
+            'Section' => 1
+          },
           'node_up' => {}
         },
+        'menu_up_hash' => {
+          'Chapter-in-included-file' => 1
+        },
         'menus' => [
           {
             'cmdname' => 'menu'
@@ -1459,6 +1495,9 @@
         ],
         'node_up' => {}
       },
+      'menu_up_hash' => {
+        'Chapter' => 1
+      },
       'menus' => [
         {
           'cmdname' => 'menu'
@@ -1466,6 +1505,9 @@
       ],
       'node_up' => {}
     },
+    'menu_up_hash' => {
+      'Top' => 1
+    },
     'menus' => [
       {
         'cmdname' => 'menu'
@@ -1482,6 +1524,9 @@
         },
         'normalized' => 'Second-chapter'
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'node_prev' => {},
       'node_up' => {}
     },
@@ -1515,34 +1560,21 @@
 $result_menus{'raiselowersections'} = {
   'cmdname' => 'node',
   'extra' => {
-    'menu_childs' => {
-      'Chapter' => 1,
-      'Second-chapter' => 1
-    },
     'normalized' => 'Top'
   },
   'menu_child' => {
     'cmdname' => 'node',
     'extra' => {
-      'menu_childs' => {
-        'Chapter-in-included-file' => 1
-      },
       'normalized' => 'Chapter'
     },
     'menu_child' => {
       'cmdname' => 'node',
       'extra' => {
-        'menu_childs' => {
-          'Section' => 1
-        },
         'normalized' => 'Chapter-in-included-file'
       },
       'menu_child' => {
         'cmdname' => 'node',
         'extra' => {
-          'menu_childs' => {
-            'Subsection' => 1
-          },
           'normalized' => 'Section'
         },
         'menu_child' => {
@@ -1550,11 +1582,20 @@
           'extra' => {
             'normalized' => 'Subsection'
           },
-          'menu_up' => {}
+          'menu_up' => {},
+          'menu_up_hash' => {
+            'Section' => 1
+          }
         },
-        'menu_up' => {}
+        'menu_up' => {},
+        'menu_up_hash' => {
+          'Chapter-in-included-file' => 1
+        }
       },
-      'menu_up' => {}
+      'menu_up' => {},
+      'menu_up_hash' => {
+        'Chapter' => 1
+      }
     },
     'menu_next' => {
       'cmdname' => 'node',
@@ -1562,9 +1603,15 @@
         'normalized' => 'Second-chapter'
       },
       'menu_prev' => {},
-      'menu_up' => {}
+      'menu_up' => {},
+      'menu_up_hash' => {
+        'Top' => 1
+      }
     },
-    'menu_up' => {}
+    'menu_up' => {},
+    'menu_up_hash' => {
+      'Top' => 1
+    }
   }
 };
 
$result_menus{'raiselowersections'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_child'}{'menu_up'}
 = 
$result_menus{'raiselowersections'}{'menu_child'}{'menu_child'}{'menu_child'};

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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/sectioning/some_at_commands_in_ref_nodes.pl       31 Oct 2010 
11:03:23 -0000      1.14
+++ t/results/sectioning/some_at_commands_in_ref_nodes.pl       31 Oct 2010 
13:32:38 -0000      1.15
@@ -546,6 +546,9 @@
         'line_nr' => 9,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -1185,6 +1188,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -1221,6 +1227,9 @@
       },
       'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
     },
+    'menu_up_hash' => {
+      'Top' => 1
+    },
     'node_prev' => {},
     'node_up' => {}
   },
@@ -1246,9 +1255,6 @@
 $result_menus{'some_at_commands_in_ref_nodes'} = {
   'cmdname' => 'node',
   'extra' => {
-    'menu_childs' => {
-      'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1' => 1
-    },
     'normalized' => 'Top'
   },
   'menu_child' => {
@@ -1256,7 +1262,10 @@
     'extra' => {
       'normalized' => 'A-SC-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1'
     },
-    'menu_up' => {}
+    'menu_up' => {},
+    'menu_up_hash' => {
+      'Top' => 1
+    }
   }
 };
 $result_menus{'some_at_commands_in_ref_nodes'}{'menu_child'}{'menu_up'} = 
$result_menus{'some_at_commands_in_ref_nodes'};

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.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- t/results/value/value_in_node.pl    31 Oct 2010 11:03:23 -0000      1.29
+++ t/results/value/value_in_node.pl    31 Oct 2010 13:32:38 -0000      1.30
@@ -356,6 +356,9 @@
         'line_nr' => 10,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Top' => 1
+      },
       'parent' => {}
     },
     {
@@ -630,6 +633,9 @@
         'line_nr' => 19,
         'macro' => ''
       },
+      'menu_up_hash' => {
+        'Node-1' => 1
+      },
       'parent' => {}
     }
   ],
@@ -792,6 +798,9 @@
               'cmdname' => 'node',
               'extra' => {
                 'normalized' => 'Node-1'
+              },
+              'menu_up_hash' => {
+                'Top' => 1
               }
             }
           },
@@ -833,9 +842,15 @@
       'extra' => {
         'normalized' => 'Section-1_002e1'
       },
+      'menu_up_hash' => {
+        'Node-1' => 1
+      },
       'node_prev' => {},
       'node_up' => {}
     },
+    'menu_up_hash' => {
+      'Top' => 1
+    },
     'menus' => [
       {
         'cmdname' => 'menu'
@@ -885,17 +900,11 @@
 $result_menus{'value_in_node'} = {
   'cmdname' => 'node',
   'extra' => {
-    'menu_childs' => {
-      'Node-1' => 1
-    },
     'normalized' => 'Top'
   },
   'menu_child' => {
     'cmdname' => 'node',
     'extra' => {
-      'menu_childs' => {
-        'Section-1_002e1' => 1
-      },
       'normalized' => 'Node-1'
     },
     'menu_child' => {
@@ -903,9 +912,15 @@
       'extra' => {
         'normalized' => 'Section-1_002e1'
       },
-      'menu_up' => {}
+      'menu_up' => {},
+      'menu_up_hash' => {
+        'Node-1' => 1
+      }
     },
-    'menu_up' => {}
+    'menu_up' => {},
+    'menu_up_hash' => {
+      'Top' => 1
+    }
   }
 };
 $result_menus{'value_in_node'}{'menu_child'}{'menu_child'}{'menu_up'} = 
$result_menus{'value_in_node'}{'menu_child'};



reply via email to

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