texinfo-commits
[Top][All Lists]
Advanced

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

texinfo/tp Texinfo/Structuring.pm t/test_utils....


From: Patrice Dumas
Subject: texinfo/tp Texinfo/Structuring.pm t/test_utils....
Date: Sun, 31 Oct 2010 11:03:24 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/10/31 11:03:23

Modified files:
        tp/Texinfo     : Structuring.pm 
        tp/t           : test_utils.pl 
        tp/t/results/include: macro_and_commands_in_early_commands.pl 
                              macro_in_early_commands.pl 
                              value_expansion_in_include.pl 
        tp/t/results/invalid_nestings: node_in_copying_not_closed.pl 
                                       style_not_closed_before_first_node.pl 
                                       
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_node.pl 
                                 character_and_spaces_in_refs.pl 
                                 nodename_parentheses.pl 
                                 raiselowersections.pl 
                                 some_at_commands_in_ref_nodes.pl 
                                 unknown_node_in_menu.pl 
        tp/t/results/value: value_in_misc_commands.pl value_in_node.pl 

Log message:
        Compare menus tres results too.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Structuring.pm?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/test_utils.pl?cvsroot=texinfo&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/include/macro_and_commands_in_early_commands.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/include/macro_in_early_commands.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/include/value_expansion_in_include.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/style_not_closed_root_commands.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_misc_commands.pl?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/character_and_spaces_in_node.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/character_and_spaces_in_refs.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/nodename_parentheses.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/raiselowersections.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/some_at_commands_in_ref_nodes.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/unknown_node_in_menu.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_in_misc_commands.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_in_node.pl?cvsroot=texinfo&r1=1.28&r2=1.29

Patches:
Index: Texinfo/Structuring.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Structuring.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- Texinfo/Structuring.pm      30 Oct 2010 21:55:00 -0000      1.13
+++ Texinfo/Structuring.pm      31 Oct 2010 11:03:22 -0000      1.14
@@ -323,8 +323,10 @@
                   $menu_content->{'line_nr'});
               }
             } else {
+              my $normalized_menu_node
+                = 
$menu_content->{'extra'}->{'menu_entry_node'}->{'normalized'};
               my $menu_node =
-                
$self->{'labels'}->{$menu_content->{'extra'}->{'menu_entry_node'}->{'normalized'}};
+                $self->{'labels'}->{$normalized_menu_node};
               $menu_node->{'menu_up'} = $node;
               if ($previous_node) {
                 $menu_node->{'menu_prev'} = $previous_node;
@@ -332,6 +334,7 @@
               } else {
                 $node->{'menu_child'} = $menu_node;
               }
+              $node->{'extra'}->{'menu_childs'}->{$normalized_menu_node} = 1;
               $previous_node = $menu_node;
             }
           }
@@ -400,6 +403,15 @@
         }
       }
     }
+    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'}}))
 {
+      $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->{'node_up'}->{'line_nr'});
+    }
   }
   return $top_node;
 }

Index: t/test_utils.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/test_utils.pl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- t/test_utils.pl     31 Oct 2010 10:27:33 -0000      1.37
+++ t/test_utils.pl     31 Oct 2010 11:03:22 -0000      1.38
@@ -22,7 +22,7 @@
 our $arg_generate;
 our $arg_debug;
 our $arg_complete;
-our $nr_comparisons = 7;
+our $nr_comparisons = 8;
 
 Getopt::Long::Configure("gnu_getopt");
 GetOptions('g|generate' => \$arg_generate, 'd|debug' => \$arg_debug, 
@@ -103,7 +103,7 @@
 
 my @contents_keys = ('contents', 'args', 'parent', 'line_nr', 'node_content', 
   'nodes_manuals');
-my @menus_keys = ('menu_next', 'menu_up', 'menu_prev');
+my @menus_keys = ('menu_next', 'menu_up', 'menu_prev', 'menu_childs');
 my @sections_keys = ('section_next', 'section_prev', 'section_up', 
   'section_childs', 'associated_node');
 my @node_keys = ('node_next', 'node_prev', 'node_up', 'menus', 
@@ -294,6 +294,9 @@
        #print STDERR  Data::Dumper->Dump([$trimmed], ['$top_node']);
   #      print STDERR  Data::Dumper->Dump([$result_nodes{$test_name}], 
['$result']);
     }
+    cmp_trimmed($top_node, $result_menus{$test_name}, address@hidden,
+                $test_name.' menus');
+
     ok (Data::Compare::Compare($errors, $result_errors{$test_name}), 
         $test_name.' errors');
     ok (Data::Compare::Compare($indices, $result_indices{$test_name}), 

Index: t/results/include/macro_and_commands_in_early_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/include/macro_and_commands_in_early_commands.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/include/macro_and_commands_in_early_commands.pl   30 Oct 2010 
21:55:01 -0000      1.20
+++ t/results/include/macro_and_commands_in_early_commands.pl   31 Oct 2010 
11:03:22 -0000      1.21
@@ -575,6 +575,7 @@
     'normalized' => 'Top'
   },
   'node_up' => {
+    'extra' => {},
     'manual_content' => [
       {
         'text' => 'dir'

Index: t/results/include/macro_in_early_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/include/macro_in_early_commands.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/include/macro_in_early_commands.pl        30 Oct 2010 21:55:01 
-0000      1.19
+++ t/results/include/macro_in_early_commands.pl        31 Oct 2010 11:03:22 
-0000      1.20
@@ -656,6 +656,7 @@
     'normalized' => 'Top'
   },
   'node_up' => {
+    'extra' => {},
     'manual_content' => [
       {
         'text' => 'dir'

Index: t/results/include/value_expansion_in_include.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/include/value_expansion_in_include.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/include/value_expansion_in_include.pl     30 Oct 2010 21:55:01 
-0000      1.18
+++ t/results/include/value_expansion_in_include.pl     31 Oct 2010 11:03:22 
-0000      1.19
@@ -568,6 +568,7 @@
     'normalized' => 'Top'
   },
   'node_up' => {
+    'extra' => {},
     'manual_content' => [
       {
         'text' => 'dir'

Index: t/results/invalid_nestings/node_in_copying_not_closed.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/node_in_copying_not_closed.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/invalid_nestings/node_in_copying_not_closed.pl    30 Oct 2010 
21:55:01 -0000      1.14
+++ t/results/invalid_nestings/node_in_copying_not_closed.pl    31 Oct 2010 
11:03:22 -0000      1.15
@@ -219,6 +219,7 @@
     'normalized' => 'Top'
   },
   'node_up' => {
+    'extra' => {},
     'manual_content' => [
       {
         'text' => 'dir'

Index: t/results/invalid_nestings/style_not_closed_before_first_node.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_before_first_node.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/invalid_nestings/style_not_closed_before_first_node.pl    30 Oct 
2010 21:55:01 -0000      1.13
+++ t/results/invalid_nestings/style_not_closed_before_first_node.pl    31 Oct 
2010 11:03:22 -0000      1.14
@@ -133,6 +133,7 @@
     'normalized' => 'Top'
   },
   'node_up' => {
+    'extra' => {},
     'manual_content' => [
       {
         'text' => 'dir'

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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl     
30 Oct 2010 21:55:01 -0000      1.17
+++ t/results/invalid_nestings/style_not_closed_no_newline_root_commands.pl     
31 Oct 2010 11:03:22 -0000      1.18
@@ -390,6 +390,7 @@
   ],
   'node_next' => {},
   'node_up' => {
+    'extra' => {},
     'manual_content' => [
       {
         'text' => 'dir'
@@ -404,6 +405,9 @@
 $result_menus{'style_not_closed_no_newline_root_commands'} = {
   'cmdname' => 'node',
   'extra' => {
+    'menu_childs' => {
+      'chapter' => 1
+    },
     'normalized' => 'Top'
   },
   'menu_child' => {

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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/invalid_nestings/style_not_closed_root_commands.pl        30 Oct 
2010 21:55:01 -0000      1.16
+++ t/results/invalid_nestings/style_not_closed_root_commands.pl        31 Oct 
2010 11:03:22 -0000      1.17
@@ -408,6 +408,7 @@
   ],
   'node_next' => {},
   'node_up' => {
+    'extra' => {},
     'manual_content' => [
       {
         'text' => 'dir'
@@ -422,6 +423,9 @@
 $result_menus{'style_not_closed_root_commands'} = {
   'cmdname' => 'node',
   'extra' => {
+    'menu_childs' => {
+      'chapter' => 1
+    },
     'normalized' => 'Top'
   },
   'menu_child' => {

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.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- t/results/macro/macro_in_misc_commands.pl   30 Oct 2010 21:55:01 -0000      
1.29
+++ t/results/macro/macro_in_misc_commands.pl   31 Oct 2010 11:03:22 -0000      
1.30
@@ -3899,6 +3899,7 @@
   ],
   'node_next' => {},
   'node_up' => {
+    'extra' => {},
     'manual_content' => [
       {
         'text' => 'dir'
@@ -3913,6 +3914,9 @@
 $result_menus{'macro_in_misc_commands'} = {
   'cmdname' => 'node',
   'extra' => {
+    'menu_childs' => {
+      'node-atext' => 1
+    },
     'normalized' => 'Top'
   },
   'menu_child' => {

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.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/sectioning/at_commands_in_refs.pl 30 Oct 2010 21:55:01 -0000      
1.13
+++ t/results/sectioning/at_commands_in_refs.pl 31 Oct 2010 11:03:22 -0000      
1.14
@@ -16226,6 +16226,7 @@
   ],
   'node_next' => {},
   'node_up' => {
+    'extra' => {},
     'manual_content' => [
       {
         'text' => 'dir'
@@ -16286,6 +16287,32 @@
 $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' => {

Index: t/results/sectioning/character_and_spaces_in_node.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/character_and_spaces_in_node.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/sectioning/character_and_spaces_in_node.pl        30 Oct 2010 
21:55:01 -0000      1.11
+++ t/results/sectioning/character_and_spaces_in_node.pl        31 Oct 2010 
11:03:23 -0000      1.12
@@ -543,6 +543,7 @@
     'normalized' => 'Top'
   },
   'node_up' => {
+    'extra' => {},
     'manual_content' => [
       {
         'text' => 'dir'
@@ -569,6 +570,15 @@
     'type' => 'warning'
   },
   {
+    'error_line' => ':2: Node `Top\' lacks menu item for `other nodes\' 
despite being its Up target
+',
+    'file_name' => '',
+    'line_nr' => 2,
+    'macro' => '',
+    'text' => 'Node `Top\' lacks menu item for `other nodes\' despite being 
its Up target',
+    'type' => 'error'
+  },
+  {
     'error_line' => ':4: warning: unreferenced node `!_"#$%&\'()*+-.\'
 ',
     'file_name' => '',
@@ -578,6 +588,15 @@
     'type' => 'warning'
   },
   {
+    'error_line' => ':3: Node `other nodes\' lacks menu item for 
`!_"#$%&\'()*+-.\' despite being its Up target
+',
+    'file_name' => '',
+    'line_nr' => 3,
+    'macro' => '',
+    'text' => 'Node `other nodes\' lacks menu item for `!_"#$%&\'()*+-.\' 
despite being its Up target',
+    'type' => 'error'
+  },
+  {
     'error_line' => ':5: warning: unreferenced node `/;<=>?[\\]^_`|~\'
 ',
     'file_name' => '',
@@ -587,6 +606,15 @@
     'type' => 'warning'
   },
   {
+    'error_line' => ':3: Node `other nodes\' lacks menu item for 
`/;<=>?[\\]^_`|~\' despite being its Up target
+',
+    'file_name' => '',
+    'line_nr' => 3,
+    'macro' => '',
+    'text' => 'Node `other nodes\' lacks menu item for `/;<=>?[\\]^_`|~\' 
despite being its Up target',
+    'type' => 'error'
+  },
+  {
     'error_line' => ':6: warning: unreferenced node `local   node\'
 ',
     'file_name' => '',
@@ -594,6 +622,15 @@
     'macro' => '',
     'text' => 'unreferenced node `local   node\'',
     'type' => 'warning'
+  },
+  {
+    'error_line' => ':3: Node `other nodes\' lacks menu item for `local   
node\' despite being its Up target
+',
+    'file_name' => '',
+    'line_nr' => 3,
+    'macro' => '',
+    'text' => 'Node `other nodes\' lacks menu item for `local   node\' despite 
being its Up target',
+    'type' => 'error'
   }
 ];
 

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.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/sectioning/character_and_spaces_in_refs.pl        30 Oct 2010 
21:55:01 -0000      1.13
+++ t/results/sectioning/character_and_spaces_in_refs.pl        31 Oct 2010 
11:03:23 -0000      1.14
@@ -1520,6 +1520,7 @@
   ],
   'node_next' => {},
   'node_up' => {
+    'extra' => {},
     'manual_content' => [
       {
         'text' => 'dir'
@@ -1541,11 +1542,19 @@
 $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' => {

Index: t/results/sectioning/nodename_parentheses.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/nodename_parentheses.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/sectioning/nodename_parentheses.pl        30 Oct 2010 21:55:01 
-0000      1.15
+++ t/results/sectioning/nodename_parentheses.pl        31 Oct 2010 11:03:23 
-0000      1.16
@@ -992,6 +992,7 @@
   ],
   'node_next' => {},
   'node_up' => {
+    'extra' => {},
     'manual_content' => [
       {
         'text' => 'dir'
@@ -1008,6 +1009,10 @@
 $result_menus{'nodename_parentheses'} = {
   'cmdname' => 'node',
   'extra' => {
+    'menu_childs' => {
+      'Node-_0028with-parentheses_0029' => 1,
+      'Other-node' => 1
+    },
     'normalized' => 'Top'
   },
   'menu_child' => {

Index: t/results/sectioning/raiselowersections.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/raiselowersections.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/sectioning/raiselowersections.pl  30 Oct 2010 21:55:02 -0000      
1.17
+++ t/results/sectioning/raiselowersections.pl  31 Oct 2010 11:03:23 -0000      
1.18
@@ -1495,6 +1495,7 @@
   ],
   'node_next' => {},
   'node_up' => {
+    'extra' => {},
     'manual_content' => [
       {
         'text' => 'dir'
@@ -1514,21 +1515,34 @@
 $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' => {

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.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/sectioning/some_at_commands_in_ref_nodes.pl       30 Oct 2010 
21:55:02 -0000      1.13
+++ t/results/sectioning/some_at_commands_in_ref_nodes.pl       31 Oct 2010 
11:03:23 -0000      1.14
@@ -1231,6 +1231,7 @@
   ],
   'node_next' => {},
   'node_up' => {
+    'extra' => {},
     'manual_content' => [
       {
         'text' => 'dir'
@@ -1245,6 +1246,9 @@
 $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' => {

Index: t/results/sectioning/unknown_node_in_menu.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/unknown_node_in_menu.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/sectioning/unknown_node_in_menu.pl        30 Oct 2010 21:55:02 
-0000      1.4
+++ t/results/sectioning/unknown_node_in_menu.pl        31 Oct 2010 11:03:23 
-0000      1.5
@@ -175,6 +175,7 @@
     }
   ],
   'node_up' => {
+    'extra' => {},
     'manual_content' => [
       {
         'text' => 'dir'

Index: t/results/value/value_in_misc_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/value/value_in_misc_commands.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/value/value_in_misc_commands.pl   30 Oct 2010 21:55:02 -0000      
1.25
+++ t/results/value/value_in_misc_commands.pl   31 Oct 2010 11:03:23 -0000      
1.26
@@ -3183,6 +3183,7 @@
     'normalized' => 'Top'
   },
   'node_up' => {
+    'extra' => {},
     'manual_content' => [
       {
         'text' => 'dir'

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.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/value/value_in_node.pl    30 Oct 2010 21:55:02 -0000      1.28
+++ t/results/value/value_in_node.pl    31 Oct 2010 11:03:23 -0000      1.29
@@ -885,11 +885,17 @@
 $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' => {



reply via email to

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