texinfo-commits
[Top][All Lists]
Advanced

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

texinfo/tp TODO Texinfo/Parser.pm Texinfo/Struc...


From: Patrice Dumas
Subject: texinfo/tp TODO Texinfo/Parser.pm Texinfo/Struc...
Date: Sun, 06 Feb 2011 10:07:02 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/02/06 10:07:01

Modified files:
        tp             : TODO 
        tp/Texinfo     : Parser.pm Structuring.pm 
        tp/t           : 09indices.t test_sort.t 
        tp/t/results/coverage: commands.pl def.pl multitable.pl 
                               preformatted.pl table.pl 
        tp/t/results/def: all_commands.pl all_commands_delimiters.pl 
                          all_commands_delimiters_printindex.pl 
                          all_commands_printindex.pl 
                          def_defx_mismatch.pl defx_after_comment.pl 
                          defx_after_empty_line.pl 
                          defx_after_paragraph_end.pl defx_after_text.pl 
                          double_command.pl empty_def_arguments.pl 
                          empty_def_command.pl empty_deftype.pl 
                          empty_deftypeop_name.pl 
                          end_of_line_protect_at_end.pl 
                          end_of_lines_protected.pl 
                          end_of_lines_protected_in_footnote.pl 
                          not_closed.pl protected_brace.pl 
                          wrong_braces_simple.pl 
                          wrong_braces_with_end_of_lines.pl 
        tp/t/results/float: complex_float.pl 
        tp/t/results/indices: unknown_then_known_index_entry.pl 
        tp/t/results/invalid_nestings: block_not_matching.pl center.pl 
                                       def_not_closed_in_menu_description.pl 
                                       multitable_item_in_index.pl 
                                       on_def_line.pl 
                                       on_index_entry_line.pl 
                                       tab_in_index.pl 
        tp/t/results/macro: macro_in_index_commands.pl 
        tp/t/results/misc_commands: index_entries.pl 
        tp/t/results/preformatted: def_in_example.pl 
        tp/t/results/test_count: commands.pl 
        tp/t/results/value: value_in_index_commands.pl 
Added files:
        tp/t/results/indices: double_index_entry.pl 

Log message:
        Add the index entry number.
        Use this information to sort index entries when they are equal.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.189&r2=1.190
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Structuring.pm?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/09indices.t?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/test_sort.t?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/commands.pl?cvsroot=texinfo&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/def.pl?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/multitable.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/preformatted.pl?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table.pl?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands_delimiters.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands_delimiters_printindex.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands_printindex.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/def_defx_mismatch.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_comment.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_empty_line.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_paragraph_end.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_text.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/double_command.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_def_arguments.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_def_command.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_deftype.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_deftypeop_name.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/end_of_line_protect_at_end.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/end_of_lines_protected.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/end_of_lines_protected_in_footnote.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/not_closed.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/protected_brace.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/wrong_braces_simple.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/wrong_braces_with_end_of_lines.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/complex_float.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/unknown_then_known_index_entry.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/double_index_entry.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/block_not_matching.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/center.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/multitable_item_in_index.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/on_def_line.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/on_index_entry_line.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/tab_in_index.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_index_commands.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/index_entries.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/def_in_example.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/test_count/commands.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_in_index_commands.pl?cvsroot=texinfo&r1=1.19&r2=1.20

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- TODO        2 Feb 2011 22:17:35 -0000       1.72
+++ TODO        6 Feb 2011 10:06:59 -0000       1.73
@@ -140,6 +140,7 @@
 
 indices/unknown_index_entry.texi
 indices/more_unknown_index_entry.texi (but without the document structure)
+indices/double_index_entry.texi
 
 invalid/at_after_accent_command.texi
 invalid/author_outside_titlepage_quotation.texi

Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -b -r1.189 -r1.190
--- Texinfo/Parser.pm   6 Feb 2011 00:03:51 -0000       1.189
+++ Texinfo/Parser.pm   6 Feb 2011 10:06:59 -0000       1.190
@@ -1734,11 +1734,15 @@
 
   my $prefix = $self->{'command_index_prefix'}->{$command};
   my $index_name = $self->{'prefix_to_index_name'}->{$prefix};
+  my $number = (defined($self->{'index_entries'}->{$index_name})
+                 ? (scalar(@{$self->{'index_entries'}->{$index_name}}) + 1)
+                   : 1);
   my $index_entry = { 'index_name'       => $index_name,
                       'index_at_command' => $command,
                       'index_prefix'     => $prefix,
                       'content'          => $content,
                      'command'          => $current,
+                      'number'           => $number,
                     };
   $index_entry->{'node'} = $self->{'current_node'} if 
($self->{'current_node'});
   push @{$self->{'index_entries'}->{$index_name}}, $index_entry;

Index: Texinfo/Structuring.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Structuring.pm,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- Texinfo/Structuring.pm      16 Jan 2011 01:24:20 -0000      1.29
+++ Texinfo/Structuring.pm      6 Feb 2011 10:06:59 -0000       1.30
@@ -576,9 +576,13 @@
   my $key2 = shift;
   my $a = uc($key1->{'key'});
   my $b = uc($key2->{'key'});
-  my $res = ((($a =~ /^[[:alpha:]]/ and $b =~ /^[[:alpha:]]/) or
-            ($a !~ /^[[:alpha:]]/ and $b !~ /^[[:alpha:]]/)) && $a cmp $b)
-             || ($a =~ /^[[:alpha:]]/ && 1) || -1;
+  my $res = (($a =~ /^[[:alpha:]]/ and $b =~ /^[[:alpha:]]/)
+              or ($a !~ /^[[:alpha:]]/ and $b !~ /^[[:alpha:]]/))
+              ? ($a cmp $b)
+                : (($a =~ /^[[:alpha:]]/ && 1) || -1);
+  if ($res == 0) {
+    $res = ($key1->{'number'} <=> $key2->{'number'});
+  }
   return $res;
 }
 

Index: t/09indices.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/09indices.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/09indices.t       24 Oct 2010 20:28:43 -0000      1.2
+++ t/09indices.t       6 Feb 2011 10:06:59 -0000       1.3
@@ -29,8 +29,34 @@
 
 );
 
+my @test_formatted = (
+['double_index_entry',
+'@node Top
+
address@hidden aaa
+
+Text
+
address@hidden aaa
+
address@hidden
+* other node::
address@hidden menu
+
address@hidden other node,,,Top
+
address@hidden aaa
+
address@hidden cp
+']
+);
+
+foreach my $test (@test_formatted) {
+  $test->[2]->{'test_formats'} = ['info'];
+}
+
 our ($arg_test_case, $arg_generate, $arg_debug);
 
-run_all ('indices', address@hidden, $arg_test_case,
+run_all ('indices', address@hidden, @test_formatted], $arg_test_case,
    $arg_generate, $arg_debug);
 

Index: t/test_sort.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/test_sort.t,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/test_sort.t       13 Dec 2010 01:08:20 -0000      1.4
+++ t/test_sort.t       6 Feb 2011 10:06:59 -0000       1.5
@@ -47,7 +47,8 @@
   push @entries, $entry->{'key'};
 }
 
-my @entries_ref = ('!', '``', 'aaaaaaaaaaaa', 'E', 'e', 'e~');
+# e is before E because they are equal and e appears before E in the document 
+my @entries_ref = ('!', '``', 'aaaaaaaaaaaa', 'e', 'E', 'e~');
 
 cmp_deeply (address@hidden, address@hidden, 'sorted index entries');
 

Index: t/results/coverage/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/commands.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- t/results/coverage/commands.pl      31 Jan 2011 00:37:22 -0000      1.30
+++ t/results/coverage/commands.pl      6 Feb 2011 10:06:59 -0000       1.31
@@ -322,7 +322,8 @@
           ],
           'index_at_command' => 'cindex',
           'index_name' => 'cp',
-          'index_prefix' => 'c'
+          'index_prefix' => 'c',
+          'number' => 1
         },
         'misc_content' => []
       },

Index: t/results/coverage/def.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/def.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- t/results/coverage/def.pl   30 Jan 2011 11:37:44 -0000      1.29
+++ t/results/coverage/def.pl   6 Feb 2011 10:06:59 -0000       1.30
@@ -91,7 +91,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 1
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -277,7 +278,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 2
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -411,7 +413,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 3
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -508,7 +511,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 4
             },
             'original_def_cmdname' => 'deffnx'
           },
@@ -614,7 +618,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 5
             },
             'original_def_cmdname' => 'deffnx'
           },
@@ -720,7 +725,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 6
             },
             'original_def_cmdname' => 'deffnx'
           },
@@ -826,7 +832,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 7
             },
             'original_def_cmdname' => 'deffnx'
           },
@@ -924,7 +931,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 8
             },
             'original_def_cmdname' => 'deffnx'
           },
@@ -1043,7 +1051,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 9
             },
             'original_def_cmdname' => 'deffnx'
           },
@@ -1111,7 +1120,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 10
             },
             'original_def_cmdname' => 'deffnx'
           },
@@ -1195,7 +1205,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 11
             },
             'original_def_cmdname' => 'deffnx'
           },
@@ -1268,7 +1279,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 12
             },
             'original_def_cmdname' => 'deffnx'
           },
@@ -1385,7 +1397,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 13
             },
             'original_def_cmdname' => 'deffnx'
           },
@@ -1514,7 +1527,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 14
             },
             'original_def_cmdname' => 'deffnx'
           },
@@ -1643,7 +1657,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 15
             },
             'original_def_cmdname' => 'deffnx'
           },

Index: t/results/coverage/multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/multitable.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/coverage/multitable.pl    1 Jan 2011 16:11:01 -0000       1.27
+++ t/results/coverage/multitable.pl    6 Feb 2011 10:06:59 -0000       1.28
@@ -271,7 +271,8 @@
                           ],
                           'index_at_command' => 'cindex',
                           'index_name' => 'cp',
-                          'index_prefix' => 'c'
+                          'index_prefix' => 'c',
+                          'number' => 1
                         },
                         'misc_content' => []
                       },

Index: t/results/coverage/preformatted.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/preformatted.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- t/results/coverage/preformatted.pl  4 Feb 2011 23:45:38 -0000       1.29
+++ t/results/coverage/preformatted.pl  6 Feb 2011 10:06:59 -0000       1.30
@@ -130,7 +130,8 @@
                   ],
                   'index_at_command' => 'vtable',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v'
+                  'index_prefix' => 'v',
+                  'number' => 1
                 },
                 'misc_content' => []
               },

Index: t/results/coverage/table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/table.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- t/results/coverage/table.pl 7 Dec 2010 20:34:27 -0000       1.26
+++ t/results/coverage/table.pl 6 Feb 2011 10:07:00 -0000       1.27
@@ -226,7 +226,8 @@
                   ],
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c'
+                  'index_prefix' => 'c',
+                  'number' => 1
                 },
                 'misc_content' => []
               },
@@ -280,7 +281,8 @@
               ],
               'index_at_command' => 'vtable',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 1
             },
             'misc_content' => []
           },
@@ -331,7 +333,8 @@
               ],
               'index_at_command' => 'kindex',
               'index_name' => 'ky',
-              'index_prefix' => 'k'
+              'index_prefix' => 'k',
+              'number' => 1
             },
             'misc_content' => []
           },
@@ -386,7 +389,8 @@
               ],
               'index_at_command' => 'vtable',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 2
             },
             'misc_content' => []
           },

Index: t/results/def/all_commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/all_commands.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/def/all_commands.pl       30 Jan 2011 11:37:45 -0000      1.16
+++ t/results/def/all_commands.pl       6 Feb 2011 10:07:00 -0000       1.17
@@ -60,7 +60,8 @@
               ],
               'index_at_command' => 'defvr',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 1
             },
             'original_def_cmdname' => 'defvr'
           },
@@ -176,7 +177,8 @@
               ],
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 1
             },
             'original_def_cmdname' => 'deftypefn'
           },
@@ -316,7 +318,8 @@
               ],
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 2
             },
             'original_def_cmdname' => 'deftypeop'
           },
@@ -419,7 +422,8 @@
               ],
               'index_at_command' => 'deftypevr',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 2
             },
             'original_def_cmdname' => 'deftypevr'
           },
@@ -522,7 +526,8 @@
               ],
               'index_at_command' => 'defcv',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 3
             },
             'original_def_cmdname' => 'defcv'
           },
@@ -648,7 +653,8 @@
               ],
               'index_at_command' => 'defop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 3
             },
             'original_def_cmdname' => 'defop'
           },
@@ -750,7 +756,8 @@
               ],
               'index_at_command' => 'deftp',
               'index_name' => 'tp',
-              'index_prefix' => 't'
+              'index_prefix' => 't',
+              'number' => 1
             },
             'original_def_cmdname' => 'deftp'
           },
@@ -852,7 +859,8 @@
               ],
               'index_at_command' => 'defun',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 4
             },
             'original_def_cmdname' => 'defun'
           },
@@ -954,7 +962,8 @@
               ],
               'index_at_command' => 'defmac',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 5
             },
             'original_def_cmdname' => 'defmac'
           },
@@ -1066,7 +1075,8 @@
               ],
               'index_at_command' => 'defspec',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 6
             },
             'original_def_cmdname' => 'defspec'
           },
@@ -1155,7 +1165,8 @@
               ],
               'index_at_command' => 'defvar',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 4
             },
             'original_def_cmdname' => 'defvar'
           },
@@ -1254,7 +1265,8 @@
               ],
               'index_at_command' => 'defopt',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 5
             },
             'original_def_cmdname' => 'defopt'
           },
@@ -1370,7 +1382,8 @@
               ],
               'index_at_command' => 'deftypefun',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 7
             },
             'original_def_cmdname' => 'deftypefun'
           },
@@ -1473,7 +1486,8 @@
               ],
               'index_at_command' => 'deftypevar',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 6
             },
             'original_def_cmdname' => 'deftypevar'
           },
@@ -1596,7 +1610,8 @@
               ],
               'index_at_command' => 'defivar',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 7
             },
             'original_def_cmdname' => 'defivar'
           },
@@ -1733,7 +1748,8 @@
               ],
               'index_at_command' => 'deftypeivar',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 8
             },
             'original_def_cmdname' => 'deftypeivar'
           },
@@ -1859,7 +1875,8 @@
               ],
               'index_at_command' => 'defmethod',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 8
             },
             'original_def_cmdname' => 'defmethod'
           },
@@ -1999,7 +2016,8 @@
               ],
               'index_at_command' => 'deftypemethod',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 9
             },
             'original_def_cmdname' => 'deftypemethod'
           },

Index: t/results/def/all_commands_delimiters.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/all_commands_delimiters.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/def/all_commands_delimiters.pl    5 Feb 2011 22:34:34 -0000       
1.17
+++ t/results/def/all_commands_delimiters.pl    6 Feb 2011 10:07:00 -0000       
1.18
@@ -420,7 +420,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 1
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -807,7 +808,8 @@
               ],
               'index_at_command' => 'defvr',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 1
             },
             'original_def_cmdname' => 'defvr'
           },
@@ -1022,7 +1024,8 @@
               ],
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 2
             },
             'original_def_cmdname' => 'deftypefn'
           },
@@ -1530,7 +1533,8 @@
               ],
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 3
             },
             'original_def_cmdname' => 'deftypefn'
           },
@@ -1663,7 +1667,8 @@
               ],
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 4
             },
             'original_def_cmdname' => 'deftypefn'
           },
@@ -1949,7 +1954,8 @@
               ],
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 5
             },
             'original_def_cmdname' => 'deftypefn'
           },
@@ -2304,7 +2310,8 @@
               ],
               'index_at_command' => 'deftypevr',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 2
             },
             'original_def_cmdname' => 'deftypevr'
           },
@@ -2671,7 +2678,8 @@
               ],
               'index_at_command' => 'deftp',
               'index_name' => 'tp',
-              'index_prefix' => 't'
+              'index_prefix' => 't',
+              'number' => 1
             },
             'original_def_cmdname' => 'deftp'
           },
@@ -3026,7 +3034,8 @@
               ],
               'index_at_command' => 'defcv',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 3
             },
             'original_def_cmdname' => 'defcv'
           },
@@ -3424,7 +3433,8 @@
               ],
               'index_at_command' => 'deftypecv',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 4
             },
             'original_def_cmdname' => 'deftypecv'
           },
@@ -3777,7 +3787,8 @@
               ],
               'index_at_command' => 'defop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 6
             },
             'original_def_cmdname' => 'defop'
           },
@@ -4163,7 +4174,8 @@
               ],
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 7
             },
             'original_def_cmdname' => 'deftypeop'
           },
@@ -4324,7 +4336,8 @@
               ],
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 8
             },
             'original_def_cmdname' => 'deftypeop'
           },
@@ -4517,7 +4530,8 @@
               ],
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 9
             },
             'original_def_cmdname' => 'deftypeop'
           },
@@ -4710,7 +4724,8 @@
               ],
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 10
             },
             'original_def_cmdname' => 'deftypeop'
           },
@@ -4871,7 +4886,8 @@
               ],
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 11
             },
             'original_def_cmdname' => 'deftypeop'
           },
@@ -5032,7 +5048,8 @@
               ],
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 12
             },
             'original_def_cmdname' => 'deftypeop'
           },
@@ -5225,7 +5242,8 @@
               ],
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 13
             },
             'original_def_cmdname' => 'deftypeop'
           },
@@ -5418,7 +5436,8 @@
               ],
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 14
             },
             'original_def_cmdname' => 'deftypeop'
           },
@@ -5579,7 +5598,8 @@
               ],
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 15
             },
             'original_def_cmdname' => 'deftypeop'
           },
@@ -5740,7 +5760,8 @@
               ],
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 16
             },
             'original_def_cmdname' => 'deftypeop'
           },
@@ -5933,7 +5954,8 @@
               ],
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 17
             },
             'original_def_cmdname' => 'deftypeop'
           },
@@ -6126,7 +6148,8 @@
               ],
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 18
             },
             'original_def_cmdname' => 'deftypeop'
           },
@@ -6287,7 +6310,8 @@
               ],
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 19
             },
             'original_def_cmdname' => 'deftypeop'
           },
@@ -6448,7 +6472,8 @@
               ],
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 20
             },
             'original_def_cmdname' => 'deftypeop'
           },
@@ -6647,7 +6672,8 @@
               ],
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 21
             },
             'original_def_cmdname' => 'deftypeop'
           },
@@ -6764,7 +6790,8 @@
               ],
               'index_at_command' => 'defun',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 22
             },
             'original_def_cmdname' => 'defun'
           },
@@ -6940,7 +6967,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 23
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -7116,7 +7144,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 24
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -7292,7 +7321,8 @@
               ],
               'index_at_command' => 'defvr',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 5
             },
             'original_def_cmdname' => 'defvr'
           },
@@ -7468,7 +7498,8 @@
               ],
               'index_at_command' => 'defvr',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 6
             },
             'original_def_cmdname' => 'defvr'
           },
@@ -7677,7 +7708,8 @@
               ],
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 25
             },
             'original_def_cmdname' => 'deftypefn'
           },
@@ -7886,7 +7918,8 @@
               ],
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 26
             },
             'original_def_cmdname' => 'deftypefn'
           },
@@ -8095,7 +8128,8 @@
               ],
               'index_at_command' => 'deftypevr',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 7
             },
             'original_def_cmdname' => 'deftypevr'
           },
@@ -8304,7 +8338,8 @@
               ],
               'index_at_command' => 'deftypevr',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 8
             },
             'original_def_cmdname' => 'deftypevr'
           },
@@ -8480,7 +8515,8 @@
               ],
               'index_at_command' => 'deftp',
               'index_name' => 'tp',
-              'index_prefix' => 't'
+              'index_prefix' => 't',
+              'number' => 2
             },
             'original_def_cmdname' => 'deftp'
           },
@@ -8656,7 +8692,8 @@
               ],
               'index_at_command' => 'deftp',
               'index_name' => 'tp',
-              'index_prefix' => 't'
+              'index_prefix' => 't',
+              'number' => 3
             },
             'original_def_cmdname' => 'deftp'
           },
@@ -8865,7 +8902,8 @@
               ],
               'index_at_command' => 'defcv',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 9
             },
             'original_def_cmdname' => 'defcv'
           },
@@ -9073,7 +9111,8 @@
               ],
               'index_at_command' => 'deftp',
               'index_name' => 'tp',
-              'index_prefix' => 't'
+              'index_prefix' => 't',
+              'number' => 4
             },
             'original_def_cmdname' => 'deftp'
           },
@@ -9325,7 +9364,8 @@
               ],
               'index_at_command' => 'deftypecv',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 10
             },
             'original_def_cmdname' => 'deftypecv'
           },
@@ -9577,7 +9617,8 @@
               ],
               'index_at_command' => 'deftypecv',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 11
             },
             'original_def_cmdname' => 'deftypecv'
           },
@@ -9796,7 +9837,8 @@
               ],
               'index_at_command' => 'defop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 27
             },
             'original_def_cmdname' => 'defop'
           },
@@ -10015,7 +10057,8 @@
               ],
               'index_at_command' => 'defop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 28
             },
             'original_def_cmdname' => 'defop'
           },
@@ -10267,7 +10310,8 @@
               ],
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 29
             },
             'original_def_cmdname' => 'deftypeop'
           },
@@ -10519,7 +10563,8 @@
               ],
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 30
             },
             'original_def_cmdname' => 'deftypeop'
           },
@@ -10783,7 +10828,8 @@
               ],
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 31
             },
             'original_def_cmdname' => 'deftypefn'
           },
@@ -11047,7 +11093,8 @@
               ],
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 32
             },
             'original_def_cmdname' => 'deftypefn'
           },

Index: t/results/def/all_commands_delimiters_printindex.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/def/all_commands_delimiters_printindex.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/def/all_commands_delimiters_printindex.pl 5 Feb 2011 22:34:34 
-0000       1.8
+++ t/results/def/all_commands_delimiters_printindex.pl 6 Feb 2011 10:07:00 
-0000       1.9
@@ -453,7 +453,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'forward--char',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 1
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -842,7 +843,8 @@
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
                   'key' => 'fill-column',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 1
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -1059,7 +1061,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'foobar',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 2
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -1569,7 +1572,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'foobar',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 3
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -1704,7 +1708,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'foobug',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 4
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -1992,7 +1997,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'push',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 5
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -2349,7 +2355,8 @@
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
                   'key' => 'enable',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 2
                 },
                 'original_def_cmdname' => 'deftypevr'
               },
@@ -2718,7 +2725,8 @@
                   'index_name' => 'tp',
                   'index_prefix' => 't',
                   'key' => 'pair',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 1
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -3075,7 +3083,8 @@
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
                   'key' => 'border-pattern',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 3
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -3475,7 +3484,8 @@
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
                   'key' => 'border-pattern of Window',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 4
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -3830,7 +3840,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'expose on windows',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 6
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -4218,7 +4229,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'expose on W,indow',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 7
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -4381,7 +4393,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'expose on Window',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 8
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -4576,7 +4589,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'e,xpose on W,indow',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 9
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -4771,7 +4785,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => ',expose on ,Window',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 10
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -4934,7 +4949,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'e,xpose on W,indow',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 11
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5097,7 +5113,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => ',expose on ,Window',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 12
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5292,7 +5309,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'e)xpose on W)indow',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 13
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5487,7 +5505,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => ')expose on )Window',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 14
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5650,7 +5669,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'e)xpose on W)indow',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 15
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -5813,7 +5833,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => ')expose on )Window',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 16
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6008,7 +6029,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'e;xpose on W;indow',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 17
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6203,7 +6225,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => ';expose on ;Window',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 18
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6366,7 +6389,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'e;xpose on W;indow',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 19
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6529,7 +6553,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => ';expose on ;Window',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 20
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6730,7 +6755,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'expose on com',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 21
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -6849,7 +6875,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'apply',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 22
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -7027,7 +7054,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'A2',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 23
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -7205,7 +7233,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'A2',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 24
                 },
                 'original_def_cmdname' => 'deffn'
               },
@@ -7383,7 +7412,8 @@
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
                   'key' => 'A2',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 5
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -7561,7 +7591,8 @@
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
                   'key' => 'A2',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 6
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -7772,7 +7803,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'A3',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 25
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -7983,7 +8015,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'A3',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 26
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -8194,7 +8227,8 @@
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
                   'key' => 'A3',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 7
                 },
                 'original_def_cmdname' => 'deftypevr'
               },
@@ -8405,7 +8439,8 @@
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
                   'key' => 'A3',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 8
                 },
                 'original_def_cmdname' => 'deftypevr'
               },
@@ -8583,7 +8618,8 @@
                   'index_name' => 'tp',
                   'index_prefix' => 't',
                   'key' => 'A2',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 2
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -8761,7 +8797,8 @@
                   'index_name' => 'tp',
                   'index_prefix' => 't',
                   'key' => 'A2',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 3
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -8972,7 +9009,8 @@
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
                   'key' => 'A3',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 9
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -9182,7 +9220,8 @@
                   'index_name' => 'tp',
                   'index_prefix' => 't',
                   'key' => 'A2',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 4
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -9436,7 +9475,8 @@
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
                   'key' => 'A4 of A2',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 10
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -9690,7 +9730,8 @@
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
                   'key' => 'A4 of A2',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 11
                 },
                 'original_def_cmdname' => 'deftypecv'
               },
@@ -9911,7 +9952,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'A3 on A2',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 27
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -10132,7 +10174,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'A3 on A2',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 28
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -10386,7 +10429,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'A4 on A2',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 29
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -10640,7 +10684,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'A4 on A2',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 30
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -10906,7 +10951,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'fun_name',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 31
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -11172,7 +11218,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'fun_name1',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 32
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -13501,27 +13548,27 @@
 * ,expose on ,Window <1>:                Top.                 (line  47)
 * ;expose on ;Window:                    Top.                 (line  59)
 * ;expose on ;Window <1>:                Top.                 (line  63)
-* `A2\':                                  Top.                 (line  71)
 * A2:                                    Top.                 (line  69)
-* `A3\':                                  Top.                 (line  79)
+* `A2\':                                  Top.                 (line  71)
 * A3:                                    Top.                 (line  77)
-* `A3\' on `A2\':                          Top.                 (line  99)
+* `A3\':                                  Top.                 (line  79)
 * A3 on A2:                              Top.                 (line  97)
-* `A4\' on `A2\':                          Top.                 (line 103)
+* `A3\' on `A2\':                          Top.                 (line  99)
 * A4 on A2:                              Top.                 (line 101)
+* `A4\' on `A2\':                          Top.                 (line 103)
 * apply:                                 Top.                 (line  67)
-* e)xpose on W)indow:                    Top.                 (line  53)
-* e)xpose on W)indow <1>:                Top.                 (line  49)
-* e,xpose on W,indow:                    Top.                 (line  45)
-* e,xpose on W,indow <1>:                Top.                 (line  41)
-* e;xpose on W;indow:                    Top.                 (line  61)
-* e;xpose on W;indow <1>:                Top.                 (line  57)
+* e)xpose on W)indow:                    Top.                 (line  49)
+* e)xpose on W)indow <1>:                Top.                 (line  53)
+* e,xpose on W,indow:                    Top.                 (line  41)
+* e,xpose on W,indow <1>:                Top.                 (line  45)
+* e;xpose on W;indow:                    Top.                 (line  57)
+* e;xpose on W;indow <1>:                Top.                 (line  61)
 * expose on `com\':                       Top.                 (line  65)
 * expose on W,indow:                     Top.                 (line  36)
 * expose on Window:                      Top.                 (line  39)
 * expose on windows:                     Top.                 (line  33)
-* foobar:                                Top.                 (line  11)
-* foobar <1>:                            Top.                 (line   9)
+* foobar:                                Top.                 (line   9)
+* foobar <1>:                            Top.                 (line  11)
 * foobug:                                Top.                 (line  16)
 * FORWARD--CHAR:                         Top.                 (line   3)
 * fun_name:                              Top.                 (line 105)
@@ -13534,9 +13581,9 @@
 [index]
 * Menu:
 
-* `A2\':                                  Top.                  (line 91)
-* `A2\' <1>:                              Top.                  (line 87)
 * A2:                                    Top.                  (line 85)
+* `A2\':                                  Top.                  (line 87)
+* `A2\' <1>:                              Top.                  (line 91)
 * pair:                                  Top.                  (line 24)
 
 Variables
@@ -13545,11 +13592,11 @@
 [index]
 * Menu:
 
-* `A2\':                                  Top.                  (line 75)
 * A2:                                    Top.                  (line 73)
-* A3:                                    Top.                  (line 89)
+* `A2\':                                  Top.                  (line 75)
+* A3:                                    Top.                  (line 81)
 * `A3\':                                  Top.                  (line 83)
-* A3 <1>:                                Top.                  (line 81)
+* A3 <1>:                                Top.                  (line 89)
 * A4 of A2:                              Top.                  (line 93)
 * `A4\' of `A2\':                          Top.                  (line 95)
 * border-pattern:                        Top.                  (line 27)

Index: t/results/def/all_commands_printindex.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/all_commands_printindex.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/def/all_commands_printindex.pl    2 Feb 2011 22:17:36 -0000       
1.7
+++ t/results/def/all_commands_printindex.pl    6 Feb 2011 10:07:00 -0000       
1.8
@@ -93,7 +93,8 @@
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
                   'key' => 'd--efvr_name',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 1
                 },
                 'original_def_cmdname' => 'defvr'
               },
@@ -211,7 +212,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'd--eftypefn_name',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 1
                 },
                 'original_def_cmdname' => 'deftypefn'
               },
@@ -353,7 +355,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'd--eftypeop_name on c--lass',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 2
                 },
                 'original_def_cmdname' => 'deftypeop'
               },
@@ -458,7 +461,8 @@
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
                   'key' => 'd--eftypevr_name',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 2
                 },
                 'original_def_cmdname' => 'deftypevr'
               },
@@ -563,7 +567,8 @@
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
                   'key' => 'd--efcv_name',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 3
                 },
                 'original_def_cmdname' => 'defcv'
               },
@@ -691,7 +696,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'd--efop_name on c--lass',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 3
                 },
                 'original_def_cmdname' => 'defop'
               },
@@ -795,7 +801,8 @@
                   'index_name' => 'tp',
                   'index_prefix' => 't',
                   'key' => 'd--eftp_name',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 1
                 },
                 'original_def_cmdname' => 'deftp'
               },
@@ -899,7 +906,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'd--efun_name',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 4
                 },
                 'original_def_cmdname' => 'defun'
               },
@@ -1003,7 +1011,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'd--efmac_name',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 5
                 },
                 'original_def_cmdname' => 'defmac'
               },
@@ -1117,7 +1126,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'd--efspec_name',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 6
                 },
                 'original_def_cmdname' => 'defspec'
               },
@@ -1208,7 +1218,8 @@
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
                   'key' => 'd--efvar_name',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 4
                 },
                 'original_def_cmdname' => 'defvar'
               },
@@ -1309,7 +1320,8 @@
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
                   'key' => 'd--efopt_name',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 5
                 },
                 'original_def_cmdname' => 'defopt'
               },
@@ -1427,7 +1439,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'd--eftypefun_name',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 7
                 },
                 'original_def_cmdname' => 'deftypefun'
               },
@@ -1532,7 +1545,8 @@
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
                   'key' => 'd--eftypevar_name',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 6
                 },
                 'original_def_cmdname' => 'deftypevar'
               },
@@ -1657,7 +1671,8 @@
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
                   'key' => 'd--efivar_name of c--lass',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 7
                 },
                 'original_def_cmdname' => 'defivar'
               },
@@ -1796,7 +1811,8 @@
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
                   'key' => 'd--eftypeivar_name of c--lass',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 8
                 },
                 'original_def_cmdname' => 'deftypeivar'
               },
@@ -1924,7 +1940,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'd--efmethod_name on c--lass',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 8
                 },
                 'original_def_cmdname' => 'defmethod'
               },
@@ -2066,7 +2083,8 @@
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
                   'key' => 'd--eftypemethod_name on c--lass',
-                  'node' => {}
+                  'node' => {},
+                  'number' => 9
                 },
                 'original_def_cmdname' => 'deftypemethod'
               },

Index: t/results/def/def_defx_mismatch.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/def_defx_mismatch.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/def/def_defx_mismatch.pl  30 Jan 2011 11:37:45 -0000      1.14
+++ t/results/def/def_defx_mismatch.pl  6 Feb 2011 10:07:00 -0000       1.15
@@ -144,7 +144,8 @@
               ],
               'index_at_command' => 'defun',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 1
             },
             'original_def_cmdname' => 'defun'
           },
@@ -285,7 +286,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 2
             },
             'original_def_cmdname' => 'deffnx'
           },

Index: t/results/def/defx_after_comment.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/defx_after_comment.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/def/defx_after_comment.pl 30 Jan 2011 11:37:45 -0000      1.15
+++ t/results/def/defx_after_comment.pl 6 Feb 2011 10:07:00 -0000       1.16
@@ -105,7 +105,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 1
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -203,7 +204,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 2
             },
             'original_def_cmdname' => 'deffnx'
           },

Index: t/results/def/defx_after_empty_line.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/defx_after_empty_line.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/def/defx_after_empty_line.pl      30 Jan 2011 11:37:45 -0000      
1.14
+++ t/results/def/defx_after_empty_line.pl      6 Feb 2011 10:07:00 -0000       
1.15
@@ -105,7 +105,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 1
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -197,7 +198,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 2
             },
             'original_def_cmdname' => 'deffnx'
           },

Index: t/results/def/defx_after_paragraph_end.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/def/defx_after_paragraph_end.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/def/defx_after_paragraph_end.pl   30 Jan 2011 11:37:45 -0000      
1.14
+++ t/results/def/defx_after_paragraph_end.pl   6 Feb 2011 10:07:00 -0000       
1.15
@@ -105,7 +105,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 1
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -208,7 +209,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 2
             },
             'original_def_cmdname' => 'deffnx'
           },

Index: t/results/def/defx_after_text.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/defx_after_text.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/def/defx_after_text.pl    30 Jan 2011 11:37:45 -0000      1.14
+++ t/results/def/defx_after_text.pl    6 Feb 2011 10:07:00 -0000       1.15
@@ -105,7 +105,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 1
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -198,7 +199,8 @@
                   ],
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f'
+                  'index_prefix' => 'f',
+                  'number' => 2
                 },
                 'original_def_cmdname' => 'deffnx'
               },

Index: t/results/def/double_command.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/double_command.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/def/double_command.pl     30 Jan 2011 11:37:45 -0000      1.16
+++ t/results/def/double_command.pl     6 Feb 2011 10:07:00 -0000       1.17
@@ -181,7 +181,8 @@
                       ],
                       'index_at_command' => 'deffn',
                       'index_name' => 'fn',
-                      'index_prefix' => 'f'
+                      'index_prefix' => 'f',
+                      'number' => 1
                     },
                     'invalid_nesting' => 1,
                     'original_def_cmdname' => 'deffnx'
@@ -331,7 +332,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 2
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -436,7 +438,8 @@
                           ],
                           'index_at_command' => 'defvr',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v'
+                          'index_prefix' => 'v',
+                          'number' => 1
                         },
                         'invalid_nesting' => 1,
                         'original_def_cmdname' => 'defvr'
@@ -513,7 +516,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 3
             },
             'original_def_cmdname' => 'deffn'
           },

Index: t/results/def/empty_def_arguments.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/empty_def_arguments.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/def/empty_def_arguments.pl        30 Jan 2011 11:37:45 -0000      
1.13
+++ t/results/def/empty_def_arguments.pl        6 Feb 2011 10:07:00 -0000       
1.14
@@ -105,7 +105,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 1
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -334,7 +335,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 2
             },
             'original_def_cmdname' => 'deffnx'
           },
@@ -468,7 +470,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 3
             },
             'original_def_cmdname' => 'deffnx'
           },
@@ -597,7 +600,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 4
             },
             'original_def_cmdname' => 'deffnx'
           },

Index: t/results/def/empty_def_command.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/empty_def_command.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/def/empty_def_command.pl  30 Jan 2011 11:37:45 -0000      1.15
+++ t/results/def/empty_def_command.pl  6 Feb 2011 10:07:00 -0000       1.16
@@ -60,7 +60,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 1
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -164,7 +165,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 2
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -225,7 +227,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 3
             },
             'original_def_cmdname' => 'deffnx'
           },

Index: t/results/def/empty_deftype.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/empty_deftype.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/def/empty_deftype.pl      30 Jan 2011 11:37:45 -0000      1.16
+++ t/results/def/empty_deftype.pl      6 Feb 2011 10:07:00 -0000       1.17
@@ -134,7 +134,8 @@
               ],
               'index_at_command' => 'deftypefun',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 1
             },
             'original_def_cmdname' => 'deftypefun'
           },
@@ -276,7 +277,8 @@
               ],
               'index_at_command' => 'defun',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 2
             },
             'original_def_cmdname' => 'defun'
           },
@@ -467,7 +469,8 @@
               ],
               'index_at_command' => 'deftypemethod',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 3
             },
             'original_def_cmdname' => 'deftypemethod'
           },
@@ -633,7 +636,8 @@
               ],
               'index_at_command' => 'defmethod',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 4
             },
             'original_def_cmdname' => 'defmethod'
           },

Index: t/results/def/empty_deftypeop_name.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/empty_deftypeop_name.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/def/empty_deftypeop_name.pl       30 Jan 2011 11:37:45 -0000      
1.13
+++ t/results/def/empty_deftypeop_name.pl       6 Feb 2011 10:07:00 -0000       
1.14
@@ -168,7 +168,8 @@
               ],
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 1
             },
             'original_def_cmdname' => 'deftypeop'
           },

Index: t/results/def/end_of_line_protect_at_end.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/def/end_of_line_protect_at_end.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/def/end_of_line_protect_at_end.pl 30 Jan 2011 11:37:45 -0000      
1.14
+++ t/results/def/end_of_line_protect_at_end.pl 6 Feb 2011 10:07:00 -0000       
1.15
@@ -78,7 +78,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 1
             },
             'original_def_cmdname' => 'deffn'
           },

Index: t/results/def/end_of_lines_protected.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/end_of_lines_protected.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/def/end_of_lines_protected.pl     30 Jan 2011 11:37:45 -0000      
1.14
+++ t/results/def/end_of_lines_protected.pl     6 Feb 2011 10:07:00 -0000       
1.15
@@ -208,7 +208,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 1
             },
             'original_def_cmdname' => 'deffn'
           },

Index: t/results/def/end_of_lines_protected_in_footnote.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/def/end_of_lines_protected_in_footnote.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/def/end_of_lines_protected_in_footnote.pl 30 Jan 2011 11:37:45 
-0000      1.16
+++ t/results/def/end_of_lines_protected_in_footnote.pl 6 Feb 2011 10:07:00 
-0000       1.17
@@ -233,7 +233,8 @@
                           ],
                           'index_at_command' => 'deffn',
                           'index_name' => 'fn',
-                          'index_prefix' => 'f'
+                          'index_prefix' => 'f',
+                          'number' => 1
                         },
                         'original_def_cmdname' => 'deffn'
                       },

Index: t/results/def/not_closed.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/not_closed.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/def/not_closed.pl 5 Feb 2011 22:34:34 -0000       1.14
+++ t/results/def/not_closed.pl 6 Feb 2011 10:07:00 -0000       1.15
@@ -73,7 +73,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 1
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -147,7 +148,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 2
             },
             'original_def_cmdname' => 'deffnx'
           },
@@ -241,7 +243,8 @@
                   ],
                   'index_at_command' => 'defvar',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v'
+                  'index_prefix' => 'v',
+                  'number' => 1
                 },
                 'original_def_cmdname' => 'defvar'
               },

Index: t/results/def/protected_brace.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/protected_brace.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/def/protected_brace.pl    30 Jan 2011 11:37:45 -0000      1.5
+++ t/results/def/protected_brace.pl    6 Feb 2011 10:07:00 -0000       1.6
@@ -66,7 +66,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 1
             },
             'original_def_cmdname' => 'deffn'
           },

Index: t/results/def/wrong_braces_simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/wrong_braces_simple.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/def/wrong_braces_simple.pl        30 Jan 2011 11:37:45 -0000      
1.13
+++ t/results/def/wrong_braces_simple.pl        6 Feb 2011 10:07:00 -0000       
1.14
@@ -99,7 +99,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 1
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -229,7 +230,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 2
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -371,7 +373,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 3
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -513,7 +516,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 4
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -630,7 +634,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 5
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -730,7 +735,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 6
             },
             'original_def_cmdname' => 'deffnx'
           },
@@ -848,7 +854,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 7
             },
             'original_def_cmdname' => 'deffnx'
           },
@@ -978,7 +985,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 8
             },
             'original_def_cmdname' => 'deffnx'
           },
@@ -1108,7 +1116,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 9
             },
             'original_def_cmdname' => 'deffnx'
           },

Index: t/results/def/wrong_braces_with_end_of_lines.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/def/wrong_braces_with_end_of_lines.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/def/wrong_braces_with_end_of_lines.pl     30 Jan 2011 11:37:45 
-0000      1.12
+++ t/results/def/wrong_braces_with_end_of_lines.pl     6 Feb 2011 10:07:00 
-0000       1.13
@@ -98,7 +98,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 1
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -234,7 +235,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 2
             },
             'original_def_cmdname' => 'deffn'
           },

Index: t/results/float/complex_float.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/complex_float.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/float/complex_float.pl    6 Feb 2011 00:03:52 -0000       1.4
+++ t/results/float/complex_float.pl    6 Feb 2011 10:07:00 -0000       1.5
@@ -360,7 +360,8 @@
                       'index_at_command' => 'cindex',
                       'index_name' => 'cp',
                       'index_prefix' => 'c',
-                      'node' => {}
+                      'node' => {},
+                      'number' => 1
                     },
                     'misc_content' => []
                   },
@@ -1379,7 +1380,8 @@
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
                               'index_prefix' => 'c',
-                              'node' => {}
+                              'node' => {},
+                              'number' => 2
                             },
                             'misc_content' => []
                           },
@@ -2706,7 +2708,8 @@
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
                               'index_prefix' => 'c',
-                              'node' => {}
+                              'node' => {},
+                              'number' => 3
                             },
                             'misc_content' => []
                           },

Index: t/results/indices/unknown_then_known_index_entry.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/unknown_then_known_index_entry.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/indices/unknown_then_known_index_entry.pl 7 Dec 2010 20:34:29 
-0000       1.10
+++ t/results/indices/unknown_then_known_index_entry.pl 6 Feb 2011 10:07:00 
-0000       1.11
@@ -81,7 +81,8 @@
               ],
               'index_at_command' => 'someindex',
               'index_name' => 'some',
-              'index_prefix' => 'some'
+              'index_prefix' => 'some',
+              'number' => 1
             },
             'misc_content' => []
           },

Index: t/results/invalid_nestings/block_not_matching.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/block_not_matching.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/invalid_nestings/block_not_matching.pl    30 Jan 2011 17:00:50 
-0000      1.18
+++ t/results/invalid_nestings/block_not_matching.pl    6 Feb 2011 10:07:00 
-0000       1.19
@@ -120,7 +120,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 1
             },
             'original_def_cmdname' => 'deffn'
           },

Index: t/results/invalid_nestings/center.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/invalid_nestings/center.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/invalid_nestings/center.pl        7 Dec 2010 20:34:29 -0000       
1.23
+++ t/results/invalid_nestings/center.pl        6 Feb 2011 10:07:00 -0000       
1.24
@@ -191,7 +191,8 @@
                   ],
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c'
+                  'index_prefix' => 'c',
+                  'number' => 1
                 },
                 'invalid_nesting' => 1,
                 'misc_content' => []

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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/invalid_nestings/def_not_closed_in_menu_description.pl    30 Jan 
2011 11:37:46 -0000      1.15
+++ t/results/invalid_nestings/def_not_closed_in_menu_description.pl    6 Feb 
2011 10:07:00 -0000       1.16
@@ -110,7 +110,8 @@
                           ],
                           'index_at_command' => 'deffn',
                           'index_name' => 'fn',
-                          'index_prefix' => 'f'
+                          'index_prefix' => 'f',
+                          'number' => 1
                         },
                         'original_def_cmdname' => 'deffn'
                       },

Index: t/results/invalid_nestings/multitable_item_in_index.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/multitable_item_in_index.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/invalid_nestings/multitable_item_in_index.pl      7 Dec 2010 
20:34:29 -0000       1.13
+++ t/results/invalid_nestings/multitable_item_in_index.pl      6 Feb 2011 
10:07:00 -0000       1.14
@@ -90,7 +90,8 @@
                   ],
                   'index_at_command' => 'vindex',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v'
+                  'index_prefix' => 'v',
+                  'number' => 1
                 },
                 'misc_content' => []
               },

Index: t/results/invalid_nestings/on_def_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/on_def_line.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/invalid_nestings/on_def_line.pl   30 Jan 2011 11:37:46 -0000      
1.11
+++ t/results/invalid_nestings/on_def_line.pl   6 Feb 2011 10:07:00 -0000       
1.12
@@ -216,7 +216,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 1
             },
             'original_def_cmdname' => 'deffn'
           },
@@ -433,7 +434,8 @@
               ],
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f'
+              'index_prefix' => 'f',
+              'number' => 2
             },
             'original_def_cmdname' => 'deffnx'
           },

Index: t/results/invalid_nestings/on_index_entry_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/on_index_entry_line.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/invalid_nestings/on_index_entry_line.pl   7 Dec 2010 20:34:29 
-0000       1.20
+++ t/results/invalid_nestings/on_index_entry_line.pl   6 Feb 2011 10:07:00 
-0000       1.21
@@ -177,7 +177,8 @@
           ],
           'index_at_command' => 'cindex',
           'index_name' => 'cp',
-          'index_prefix' => 'c'
+          'index_prefix' => 'c',
+          'number' => 1
         },
         'misc_content' => []
       },

Index: t/results/invalid_nestings/tab_in_index.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/tab_in_index.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/invalid_nestings/tab_in_index.pl  7 Dec 2010 20:34:29 -0000       
1.14
+++ t/results/invalid_nestings/tab_in_index.pl  6 Feb 2011 10:07:00 -0000       
1.15
@@ -139,7 +139,8 @@
                           ],
                           'index_at_command' => 'vindex',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v'
+                          'index_prefix' => 'v',
+                          'number' => 1
                         },
                         'misc_content' => []
                       },

Index: t/results/macro/macro_in_index_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_index_commands.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/macro/macro_in_index_commands.pl  7 Dec 2010 20:34:30 -0000       
1.22
+++ t/results/macro/macro_in_index_commands.pl  6 Feb 2011 10:07:00 -0000       
1.23
@@ -562,7 +562,8 @@
           ],
           'index_at_command' => 'trucindex',
           'index_name' => 'truc',
-          'index_prefix' => 'truc'
+          'index_prefix' => 'truc',
+          'number' => 1
         },
         'misc_content' => []
       },
@@ -809,7 +810,8 @@
           ],
           'index_at_command' => 'codeidxindex',
           'index_name' => 'codeidx',
-          'index_prefix' => 'codeidx'
+          'index_prefix' => 'codeidx',
+          'number' => 1
         },
         'misc_content' => []
       },
@@ -859,7 +861,8 @@
           ],
           'index_at_command' => 'cindex',
           'index_name' => 'cp',
-          'index_prefix' => 'c'
+          'index_prefix' => 'c',
+          'number' => 1
         },
         'misc_content' => []
       },
@@ -953,7 +956,8 @@
           ],
           'index_at_command' => 'kindex',
           'index_name' => 'ky',
-          'index_prefix' => 'k'
+          'index_prefix' => 'k',
+          'number' => 1
         },
         'misc_content' => []
       },
@@ -997,7 +1001,8 @@
           ],
           'index_at_command' => 'pindex',
           'index_name' => 'pg',
-          'index_prefix' => 'p'
+          'index_prefix' => 'p',
+          'number' => 1
         },
         'misc_content' => []
       },
@@ -1253,7 +1258,8 @@
           ],
           'index_at_command' => 'defgindex',
           'index_name' => 'defg',
-          'index_prefix' => 'defg'
+          'index_prefix' => 'defg',
+          'number' => 1
         },
         'misc_content' => []
       },
@@ -1303,7 +1309,8 @@
           ],
           'index_at_command' => 'abcindex',
           'index_name' => 'abc',
-          'index_prefix' => 'abc'
+          'index_prefix' => 'abc',
+          'number' => 1
         },
         'misc_content' => []
       },

Index: t/results/misc_commands/index_entries.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/misc_commands/index_entries.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/misc_commands/index_entries.pl    7 Dec 2010 20:34:30 -0000       
1.20
+++ t/results/misc_commands/index_entries.pl    6 Feb 2011 10:07:01 -0000       
1.21
@@ -37,7 +37,8 @@
           ],
           'index_at_command' => 'cindex',
           'index_name' => 'cp',
-          'index_prefix' => 'c'
+          'index_prefix' => 'c',
+          'number' => 1
         },
         'misc_content' => []
       },
@@ -130,7 +131,8 @@
           ],
           'index_at_command' => 'trucindex',
           'index_name' => 'truc',
-          'index_prefix' => 'truc'
+          'index_prefix' => 'truc',
+          'number' => 1
         },
         'misc_content' => []
       },

Index: t/results/preformatted/def_in_example.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/preformatted/def_in_example.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/preformatted/def_in_example.pl    31 Jan 2011 00:37:24 -0000      
1.1
+++ t/results/preformatted/def_in_example.pl    6 Feb 2011 10:07:01 -0000       
1.2
@@ -82,7 +82,8 @@
                   ],
                   'index_at_command' => 'defun',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f'
+                  'index_prefix' => 'f',
+                  'number' => 1
                 },
                 'original_def_cmdname' => 'defun'
               },

Index: t/results/test_count/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/test_count/commands.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/test_count/commands.pl    2 Feb 2011 00:36:20 -0000       1.4
+++ t/results/test_count/commands.pl    6 Feb 2011 10:07:01 -0000       1.5
@@ -211,7 +211,8 @@
               ],
               'index_at_command' => 'vtable',
               'index_name' => 'vr',
-              'index_prefix' => 'v'
+              'index_prefix' => 'v',
+              'number' => 1
             },
             'misc_content' => []
           },

Index: t/results/value/value_in_index_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/value/value_in_index_commands.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/value/value_in_index_commands.pl  7 Dec 2010 20:34:32 -0000       
1.19
+++ t/results/value/value_in_index_commands.pl  6 Feb 2011 10:07:01 -0000       
1.20
@@ -296,7 +296,8 @@
           ],
           'index_at_command' => 'trucindex',
           'index_name' => 'truc',
-          'index_prefix' => 'truc'
+          'index_prefix' => 'truc',
+          'number' => 1
         },
         'misc_content' => []
       },
@@ -511,7 +512,8 @@
           ],
           'index_at_command' => 'codeidxindex',
           'index_name' => 'codeidx',
-          'index_prefix' => 'codeidx'
+          'index_prefix' => 'codeidx',
+          'number' => 1
         },
         'misc_content' => []
       },
@@ -561,7 +563,8 @@
           ],
           'index_at_command' => 'cindex',
           'index_name' => 'cp',
-          'index_prefix' => 'c'
+          'index_prefix' => 'c',
+          'number' => 1
         },
         'misc_content' => []
       },
@@ -655,7 +658,8 @@
           ],
           'index_at_command' => 'kindex',
           'index_name' => 'ky',
-          'index_prefix' => 'k'
+          'index_prefix' => 'k',
+          'number' => 1
         },
         'misc_content' => []
       },
@@ -699,7 +703,8 @@
           ],
           'index_at_command' => 'pindex',
           'index_name' => 'pg',
-          'index_prefix' => 'p'
+          'index_prefix' => 'p',
+          'number' => 1
         },
         'misc_content' => []
       },
@@ -955,7 +960,8 @@
           ],
           'index_at_command' => 'defgindex',
           'index_name' => 'defg',
-          'index_prefix' => 'defg'
+          'index_prefix' => 'defg',
+          'number' => 1
         },
         'misc_content' => []
       },
@@ -1005,7 +1011,8 @@
           ],
           'index_at_command' => 'abcindex',
           'index_name' => 'abc',
-          'index_prefix' => 'abc'
+          'index_prefix' => 'abc',
+          'number' => 1
         },
         'misc_content' => []
       },

Index: t/results/indices/double_index_entry.pl
===================================================================
RCS file: t/results/indices/double_index_entry.pl
diff -N t/results/indices/double_index_entry.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/indices/double_index_entry.pl     6 Feb 2011 10:07:00 -0000       
1.1
@@ -0,0 +1,625 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors);
+
+$result_trees{'double_index_entry'} = {
+  'contents' => [
+    {
+      'contents' => [],
+      'parent' => {},
+      'type' => 'text_root'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'Top'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'spaces_at_end'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'node',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'aaa'
+                },
+                {
+                  'parent' => {},
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'cindex',
+          'extra' => {
+            'index_entry' => {
+              'command' => {},
+              'content' => [
+                {}
+              ],
+              'index_at_command' => 'cindex',
+              'index_name' => 'cp',
+              'index_prefix' => 'c',
+              'key' => 'aaa',
+              'node' => {},
+              'number' => 1
+            },
+            'misc_content' => []
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 3,
+            'macro' => ''
+          },
+          'parent' => {}
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => 'Text
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'paragraph'
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'aaa'
+                },
+                {
+                  'parent' => {},
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'cindex',
+          'extra' => {
+            'index_entry' => {
+              'command' => {},
+              'content' => [
+                {}
+              ],
+              'index_at_command' => 'cindex',
+              'index_name' => 'cp',
+              'index_prefix' => 'c',
+              'key' => 'aaa',
+              'node' => {},
+              'number' => 2
+            },
+            'misc_content' => []
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 7,
+            'macro' => ''
+          },
+          'parent' => {}
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'menu',
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'empty_line_after_command'
+            },
+            {
+              'args' => [
+                {
+                  'parent' => {},
+                  'text' => '* ',
+                  'type' => 'menu_entry_leading_text'
+                },
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => 'other node'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'menu_entry_node'
+                },
+                {
+                  'parent' => {},
+                  'text' => '::',
+                  'type' => 'menu_entry_separator'
+                },
+                {
+                  'contents' => [
+                    {
+                      'parent' => {},
+                      'text' => '
+'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'menu_entry_description'
+                }
+              ],
+              'extra' => {
+                'menu_entry_node' => {
+                  'node_content' => [
+                    {}
+                  ],
+                  'normalized' => 'other-node'
+                }
+              },
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 10,
+                'macro' => ''
+              },
+              'parent' => {},
+              'type' => 'menu_entry'
+            }
+          ],
+          'parent' => {}
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line_after_command'
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        }
+      ],
+      'extra' => {
+        'node_content' => [
+          {}
+        ],
+        'nodes_manuals' => [
+          {
+            'node_content' => [],
+            'normalized' => 'Top'
+          }
+        ],
+        'normalized' => 'Top'
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 1,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'other node'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        },
+        {
+          'contents' => [],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        },
+        {
+          'contents' => [],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        },
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => 'Top'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'spaces_at_end'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'node',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'aaa'
+                },
+                {
+                  'parent' => {},
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'cindex',
+          'extra' => {
+            'index_entry' => {
+              'command' => {},
+              'content' => [
+                {}
+              ],
+              'index_at_command' => 'cindex',
+              'index_name' => 'cp',
+              'index_prefix' => 'c',
+              'key' => 'aaa',
+              'node' => {},
+              'number' => 3
+            },
+            'misc_content' => []
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 15,
+            'macro' => ''
+          },
+          'parent' => {}
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'cp'
+                },
+                {
+                  'parent' => {},
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'printindex',
+          'extra' => {
+            'misc_args' => [
+              'cp'
+            ]
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 17,
+            'macro' => ''
+          },
+          'parent' => {}
+        }
+      ],
+      'extra' => {
+        'node_content' => [
+          {}
+        ],
+        'nodes_manuals' => [
+          {
+            'node_content' => [],
+            'normalized' => 'other-node'
+          },
+          undef,
+          undef,
+          {
+            'node_content' => [
+              {}
+            ],
+            'normalized' => 'Top'
+          }
+        ],
+        'normalized' => 'other-node'
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 13,
+        'macro' => ''
+      },
+      'parent' => {}
+    }
+  ],
+  'type' => 'document_root'
+};
+$result_trees{'double_index_entry'}{'contents'}[0]{'parent'} = 
$result_trees{'double_index_entry'};
+$result_trees{'double_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'args'}[0];
+$result_trees{'double_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'args'}[0];
+$result_trees{'double_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'args'}[0];
+$result_trees{'double_index_entry'}{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'misc_content'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'};
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[2]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[3];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[3]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[4]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'misc_content'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'content'};
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[5]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[6]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[1]{'parent'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[2]{'parent'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[3];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[3]{'parent'}
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
 = 
$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[7]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[8]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'contents'}[9]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'extra'}{'node_content'}[0] 
= $result_trees{'double_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
 = $result_trees{'double_index_entry'}{'contents'}[1]{'extra'}{'node_content'};
+$result_trees{'double_index_entry'}{'contents'}[1]{'parent'} = 
$result_trees{'double_index_entry'};
+$result_trees{'double_index_entry'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'args'}[0];
+$result_trees{'double_index_entry'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'args'}[0];
+$result_trees{'double_index_entry'}{'contents'}[2]{'args'}[0]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[2];
+$result_trees{'double_index_entry'}{'contents'}[2]{'args'}[1]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[2];
+$result_trees{'double_index_entry'}{'contents'}[2]{'args'}[2]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[2];
+$result_trees{'double_index_entry'}{'contents'}[2]{'args'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'args'}[3];
+$result_trees{'double_index_entry'}{'contents'}[2]{'args'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'args'}[3];
+$result_trees{'double_index_entry'}{'contents'}[2]{'args'}[3]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[2];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[2];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'double_index_entry'}{'contents'}[2];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'misc_content'}
 = 
$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'index_entry'}{'content'};
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[1]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[2];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[2]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[2];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[3]{'args'}[0];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[3]{'args'}[0];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[3]{'args'}[0];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[3];
+$result_trees{'double_index_entry'}{'contents'}[2]{'contents'}[3]{'parent'} = 
$result_trees{'double_index_entry'}{'contents'}[2];
+$result_trees{'double_index_entry'}{'contents'}[2]{'extra'}{'node_content'}[0] 
= $result_trees{'double_index_entry'}{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'double_index_entry'}{'contents'}[2]{'extra'}{'nodes_manuals'}[0]{'node_content'}
 = $result_trees{'double_index_entry'}{'contents'}[2]{'extra'}{'node_content'};
+$result_trees{'double_index_entry'}{'contents'}[2]{'extra'}{'nodes_manuals'}[3]{'node_content'}[0]
 = $result_trees{'double_index_entry'}{'contents'}[2]{'args'}[3]{'contents'}[0];
+$result_trees{'double_index_entry'}{'contents'}[2]{'parent'} = 
$result_trees{'double_index_entry'};
+
+$result_texis{'double_index_entry'} = '@node Top
+
address@hidden aaa
+
+Text
+
address@hidden aaa
+
address@hidden
+* other node::
address@hidden menu
+
address@hidden other node,,,Top
+
address@hidden aaa
+
address@hidden cp
+';
+
+
+$result_texts{'double_index_entry'} = '
+
+Text
+
+
+* other node::
+
+
+
+';
+
+$result_sectioning{'double_index_entry'} = {};
+
+$result_nodes{'double_index_entry'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'normalized' => 'Top'
+  },
+  'menu_child' => {
+    'cmdname' => 'node',
+    'extra' => {
+      'normalized' => 'other-node'
+    },
+    'node_prev' => {},
+    'node_up' => {}
+  },
+  'menus' => [
+    {
+      'cmdname' => 'menu'
+    }
+  ],
+  'node_next' => {},
+  'node_up' => {
+    'extra' => {
+      'manual_content' => [
+        {
+          'text' => 'dir'
+        }
+      ]
+    }
+  }
+};
+$result_nodes{'double_index_entry'}{'menu_child'}{'node_prev'} = 
$result_nodes{'double_index_entry'};
+$result_nodes{'double_index_entry'}{'menu_child'}{'node_up'} = 
$result_nodes{'double_index_entry'};
+$result_nodes{'double_index_entry'}{'node_next'} = 
$result_nodes{'double_index_entry'}{'menu_child'};
+
+$result_menus{'double_index_entry'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'normalized' => 'Top'
+  },
+  'menu_child' => {
+    'cmdname' => 'node',
+    'extra' => {
+      'normalized' => 'other-node'
+    },
+    'menu_up' => {},
+    'menu_up_hash' => {
+      'Top' => 1
+    }
+  }
+};
+$result_menus{'double_index_entry'}{'menu_child'}{'menu_up'} = 
$result_menus{'double_index_entry'};
+
+$result_errors{'double_index_entry'} = [];
+
+
+
+$result_converted{'info'}->{'double_index_entry'} = 'This is , produced by 
makeinfo version 4.13 from .
+
+
+File: ,  Node: Top,  Next: other node,  Up: (dir)
+
+Text
+
+* Menu:
+
+* other node::
+
+
+File: ,  Node: other node,  Prev: Top,  Up: Top
+
+[index]
+* Menu:
+
+* aaa:                                   Top.                   (line 3)
+* aaa <1>:                               Top.                   (line 5)
+* aaa <2>:                               other node.            (line 3)
+
+
+
+Tag Table:
+Node: Top52
+Node: other node136
+
+End Tag Table
+';
+
+1;



reply via email to

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