texinfo-commits
[Top][All Lists]
Advanced

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

texinfo/tp t/09indices.t t/results/coverage/com...


From: Patrice Dumas
Subject: texinfo/tp t/09indices.t t/results/coverage/com...
Date: Sat, 03 Dec 2011 14:58:42 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/12/03 14:58:41

Modified files:
        tp/t           : 09indices.t 
        tp/t/results/coverage: commands.pl def.pl multitable.pl 
                               preformatted.pl 
                               punctuation_in_line_commands.pl table.pl 
        tp/t/results/coverage_braces: heading_in_footnote.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_comment_in_example.pl 
                          defx_after_empty_line.pl 
                          defx_after_empty_line_in_example.pl 
                          defx_after_paragraph_end.pl 
                          defx_after_preformatted_with_text.pl 
                          defx_after_text.pl defx_in_example.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 
                          inter_item_commands_in_def.pl 
                          inter_item_commands_in_def_in_example.pl 
                          leading_space_in_def_arg.pl 
                          no_category_or_no_name.pl not_closed.pl 
                          protected_brace.pl space_in_def_for_index.pl 
                          wrong_braces_simple.pl 
                          wrong_braces_with_end_of_lines.pl 
        tp/t/results/float: cindex_in_caption.pl complex_float.pl 
                            float_copying.pl 
        tp/t/results/heading: heading_in_copying.pl 
        tp/t/results/html_tests: index_and_node_same_name.pl 
                                 index_below.pl 
        tp/t/results/indices: double_index_entry.pl image_lines_count.pl 
                              image_text_lines_count.pl 
                              index_entries_locations.pl 
                              index_entry_before_first_node.pl 
                              index_entry_before_node.pl 
                              index_entry_in_footnote.pl 
                              index_entry_in_footnote_separate.pl 
                              printindex_index_entry_in_copying.pl 
                              printindex_index_entry_in_copying_in_footnote.pl 
                              
printindex_index_entry_in_copying_no_insertcopying.pl 
                              printindex_with_space_before.pl 
                              syncode_index_print_both.pl 
                              unknown_then_known_index_entry.pl 
        tp/t/results/info_tests: before_node_and_section.pl 
                                 colon_in_index_entry.pl 
                                 def_in_copying.pl 
                                 multitable_anchor_and_index_entry.pl 
                                 nested_multitable_anchor_index.pl 
        tp/t/results/invalid_nestings: block_not_matching.pl center.pl 
                                       def_in_style_command.pl 
                                       def_not_closed_in_menu_description.pl 
                                       in_table.pl 
                                       multitable_item_in_index.pl 
                                       on_def_line.pl 
                                       on_index_entry_line.pl 
                                       tab_in_index.pl 
        tp/t/results/itemize: inter_item_commands_in_itemize.pl 
        tp/t/results/languages: multiple.pl simple.pl 
        tp/t/results/macro: backslash_in_arg.pl 
                            macro_in_index_commands.pl 
        tp/t/results/menu: menu_in_deffn.pl 
        tp/t/results/misc_commands: comment_space_command_on_line.pl 
                                    index_entries.pl 
        tp/t/results/multitable: inter_item_commands_in_multitable.pl 
        tp/t/results/plaintext_tests: at_commands_glued_in_example.pl 
                                      at_commands_glued_in_paragraph.pl 
        tp/t/results/preformatted: def_in_example.pl 
        tp/t/results/sectioning: no_element.pl 
                                 placed_things_before_element.pl 
        tp/t/results/test_count: commands.pl printindex.pl 
        tp/t/results/value: value_in_index_commands.pl 
        tp/t/results/xtable: empty_item_itemx.pl 
                             inter_item_commands_in_table.pl 
                             inter_item_commands_in_table_in_example.pl 
                             table_nested.pl 
        tp/Texinfo     : Parser.pm Structuring.pm 
Added files:
        tp/t/results/indices: empty_string_index_entry.pl 

Log message:
        Warn empty strings for indices.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/09indices.t?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/commands.pl?cvsroot=texinfo&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/def.pl?cvsroot=texinfo&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/multitable.pl?cvsroot=texinfo&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/preformatted.pl?cvsroot=texinfo&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table.pl?cvsroot=texinfo&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/heading_in_footnote.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands.pl?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands_delimiters.pl?cvsroot=texinfo&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands_delimiters_printindex.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands_printindex.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/def_defx_mismatch.pl?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_comment.pl?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_comment_in_example.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.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_empty_line_in_example.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_paragraph_end.pl?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_preformatted_with_text.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_text.pl?cvsroot=texinfo&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_in_example.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.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_def_arguments.pl?cvsroot=texinfo&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_def_command.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_deftype.pl?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_deftypeop_name.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/end_of_line_protect_at_end.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/end_of_lines_protected.pl?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/end_of_lines_protected_in_footnote.pl?cvsroot=texinfo&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/inter_item_commands_in_def.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/inter_item_commands_in_def_in_example.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/leading_space_in_def_arg.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/no_category_or_no_name.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.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/protected_brace.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/space_in_def_for_index.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/wrong_braces_simple.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/wrong_braces_with_end_of_lines.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/cindex_in_caption.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/complex_float.pl?cvsroot=texinfo&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/float_copying.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/heading/heading_in_copying.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/html_tests/index_and_node_same_name.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/html_tests/index_below.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/double_index_entry.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/image_lines_count.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/image_text_lines_count.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/index_entries_locations.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/index_entry_before_first_node.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/index_entry_before_node.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/index_entry_in_footnote.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/index_entry_in_footnote_separate.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/printindex_index_entry_in_copying.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/printindex_with_space_before.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/syncode_index_print_both.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/unknown_then_known_index_entry.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/empty_string_index_entry.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/before_node_and_section.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/colon_in_index_entry.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/def_in_copying.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/nested_multitable_anchor_index.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/block_not_matching.pl?cvsroot=texinfo&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/center.pl?cvsroot=texinfo&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/def_in_style_command.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/in_table.pl?cvsroot=texinfo&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/multitable_item_in_index.pl?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/on_def_line.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/on_index_entry_line.pl?cvsroot=texinfo&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/tab_in_index.pl?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/inter_item_commands_in_itemize.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/languages/multiple.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/languages/simple.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/backslash_in_arg.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_index_commands.pl?cvsroot=texinfo&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_in_deffn.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/index_entries.pl?cvsroot=texinfo&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/inter_item_commands_in_multitable.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/def_in_example.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/no_element.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/placed_things_before_element.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/test_count/commands.pl?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/test_count/printindex.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_in_index_commands.pl?cvsroot=texinfo&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/empty_item_itemx.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/inter_item_commands_in_table.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/table_nested.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.338&r2=1.339
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Structuring.pm?cvsroot=texinfo&r1=1.108&r2=1.109

Patches:
Index: t/09indices.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/09indices.t,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/09indices.t       22 Nov 2011 00:34:58 -0000      1.17
+++ t/09indices.t       3 Dec 2011 14:58:31 -0000       1.18
@@ -149,6 +149,21 @@
 '@node Top
 @cindex
 '],
+['empty_string_index_entry',
+'@node Top
+
address@hidden @w{}
+
address@hidden @code
address@hidden @w{}
address@hidden ftable
+
address@hidden address@hidden {} {}
address@hidden address@hidden {} {}
address@hidden defun
+
address@hidden fn
+'],
 ['printindex_index_entry_in_copying',
 '@copying
 

Index: t/results/coverage/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/commands.pl,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- t/results/coverage/commands.pl      30 Oct 2011 00:51:17 -0000      1.50
+++ t/results/coverage/commands.pl      3 Dec 2011 14:58:31 -0000       1.51
@@ -360,6 +360,7 @@
           'index_at_command' => 'cindex',
           'index_name' => 'cp',
           'index_prefix' => 'c',
+          'index_type_command' => 'cindex',
           'key' => 'index entry "in text" LaTeX',
           'number' => 1
         },

Index: t/results/coverage/def.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/def.pl,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- t/results/coverage/def.pl   1 Dec 2011 17:50:06 -0000       1.59
+++ t/results/coverage/def.pl   3 Dec 2011 14:58:31 -0000       1.60
@@ -107,6 +107,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'd--effn_name',
               'number' => 1
             },
@@ -347,6 +348,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'de--ffn_name',
               'number' => 2
             },
@@ -544,6 +546,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'i',
               'number' => 3
             },
@@ -657,6 +660,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'truc',
               'number' => 4
             },
@@ -774,6 +778,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'log trap',
               'number' => 5
             },
@@ -895,6 +900,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'log trap1',
               'number' => 6
             },
@@ -1017,6 +1023,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'log trap2',
               'number' => 7
             },
@@ -1125,6 +1132,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'id ule',
               'number' => 8
             },
@@ -1255,6 +1263,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'id i ule',
               'number' => 9
             },
@@ -1330,6 +1339,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'machin',
               'number' => 10
             },
@@ -1422,6 +1432,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'bidule machin',
               'number' => 11
             },
@@ -1502,6 +1513,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'machin',
               'number' => 12
             },
@@ -1629,6 +1641,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'followed',
               'number' => 13
             },
@@ -1774,6 +1787,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'after',
               'number' => 14
             },
@@ -1919,6 +1933,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'deffnx',
               'number' => 15
             },

Index: t/results/coverage/multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/multitable.pl,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- t/results/coverage/multitable.pl    1 Oct 2011 10:29:27 -0000       1.50
+++ t/results/coverage/multitable.pl    3 Dec 2011 14:58:31 -0000       1.51
@@ -324,6 +324,7 @@
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
                               'index_prefix' => 'c',
+                              'index_type_command' => 'cindex',
                               'key' => 'index entry within multitable',
                               'number' => 1
                             },

Index: t/results/coverage/preformatted.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/preformatted.pl,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- t/results/coverage/preformatted.pl  31 Oct 2011 14:59:01 -0000      1.53
+++ t/results/coverage/preformatted.pl  3 Dec 2011 14:58:31 -0000       1.54
@@ -186,9 +186,10 @@
                           ],
                           'content_normalized' => [],
                           'in_code' => 1,
-                          'index_at_command' => 'vtable',
+                          'index_at_command' => 'item',
                           'index_name' => 'vr',
                           'index_prefix' => 'v',
+                          'index_type_command' => 'vtable',
                           'key' => 'item in table in format',
                           'number' => 1
                         },

Index: t/results/coverage/punctuation_in_line_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/coverage/punctuation_in_line_commands.pl  11 Oct 2011 22:41:54 
-0000      1.25
+++ t/results/coverage/punctuation_in_line_commands.pl  3 Dec 2011 14:58:32 
-0000       1.26
@@ -813,6 +813,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'index! After punc',
               'node' => {},
               'number' => 1

Index: t/results/coverage/table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/table.pl,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- t/results/coverage/table.pl 31 Oct 2011 14:59:01 -0000      1.54
+++ t/results/coverage/table.pl 3 Dec 2011 14:58:32 -0000       1.55
@@ -310,6 +310,7 @@
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
+                  'index_type_command' => 'cindex',
                   'key' => 'index entry',
                   'number' => 1
                 },
@@ -373,9 +374,10 @@
                       ],
                       'content_normalized' => [],
                       'in_code' => 1,
-                      'index_at_command' => 'vtable',
+                      'index_at_command' => 'item',
                       'index_name' => 'vr',
                       'index_prefix' => 'v',
+                      'index_type_command' => 'vtable',
                       'key' => 'vtable item',
                       'number' => 1
                     },
@@ -441,6 +443,7 @@
                           'index_at_command' => 'kindex',
                           'index_name' => 'ky',
                           'index_prefix' => 'k',
+                          'index_type_command' => 'kindex',
                           'key' => 'key',
                           'number' => 1
                         },
@@ -505,9 +508,10 @@
                       ],
                       'content_normalized' => [],
                       'in_code' => 1,
-                      'index_at_command' => 'vtable',
+                      'index_at_command' => 'itemx',
                       'index_name' => 'vr',
                       'index_prefix' => 'v',
+                      'index_type_command' => 'vtable',
                       'key' => 'itemx vtable',
                       'number' => 2
                     },

Index: t/results/coverage_braces/heading_in_footnote.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage_braces/heading_in_footnote.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/coverage_braces/heading_in_footnote.pl    3 Nov 2011 23:54:50 
-0000       1.16
+++ t/results/coverage_braces/heading_in_footnote.pl    3 Dec 2011 14:58:32 
-0000       1.17
@@ -114,6 +114,7 @@
                       'index_at_command' => 'cindex',
                       'index_name' => 'cp',
                       'index_prefix' => 'c',
+                      'index_type_command' => 'cindex',
                       'key' => 'ind e',
                       'number' => 1
                     },

Index: t/results/def/all_commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/all_commands.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- t/results/def/all_commands.pl       3 Sep 2011 21:51:31 -0000       1.31
+++ t/results/def/all_commands.pl       3 Dec 2011 14:58:32 -0000       1.32
@@ -71,6 +71,7 @@
               'index_at_command' => 'defvr',
               'index_name' => 'vr',
               'index_prefix' => 'v',
+              'index_type_command' => 'defvr',
               'key' => 'd--efvr_name',
               'number' => 1
             },
@@ -245,6 +246,7 @@
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypefn',
               'key' => 'd--eftypefn_name',
               'number' => 1
             },
@@ -447,6 +449,7 @@
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypeop',
               'key' => 'd--eftypeop_name on c--lass',
               'number' => 2
             },
@@ -608,6 +611,7 @@
               'index_at_command' => 'deftypevr',
               'index_name' => 'vr',
               'index_prefix' => 'v',
+              'index_type_command' => 'deftypevr',
               'key' => 'd--eftypevr_name',
               'number' => 2
             },
@@ -769,6 +773,7 @@
               'index_at_command' => 'defcv',
               'index_name' => 'vr',
               'index_prefix' => 'v',
+              'index_type_command' => 'defcv',
               'key' => 'd--efcv_name',
               'number' => 3
             },
@@ -957,6 +962,7 @@
               'index_at_command' => 'defop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'defop',
               'key' => 'd--efop_name on c--lass',
               'number' => 3
             },
@@ -1117,6 +1123,7 @@
               'index_at_command' => 'deftp',
               'index_name' => 'tp',
               'index_prefix' => 't',
+              'index_type_command' => 'deftp',
               'key' => 'd--eftp_name',
               'number' => 1
             },
@@ -1277,6 +1284,7 @@
               'index_at_command' => 'defun',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'defun',
               'key' => 'd--efun_name',
               'number' => 4
             },
@@ -1437,6 +1445,7 @@
               'index_at_command' => 'defmac',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'defmac',
               'key' => 'd--efmac_name',
               'number' => 5
             },
@@ -1607,6 +1616,7 @@
               'index_at_command' => 'defspec',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'defspec',
               'key' => 'd--efspec_name',
               'number' => 6
             },
@@ -1754,6 +1764,7 @@
               'index_at_command' => 'defvar',
               'index_name' => 'vr',
               'index_prefix' => 'v',
+              'index_type_command' => 'defvar',
               'key' => 'd--efvar_name',
               'number' => 4
             },
@@ -1911,6 +1922,7 @@
               'index_at_command' => 'defopt',
               'index_name' => 'vr',
               'index_prefix' => 'v',
+              'index_type_command' => 'defopt',
               'key' => 'd--efopt_name',
               'number' => 5
             },
@@ -2085,6 +2097,7 @@
               'index_at_command' => 'deftypefun',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypefun',
               'key' => 'd--eftypefun_name',
               'number' => 7
             },
@@ -2246,6 +2259,7 @@
               'index_at_command' => 'deftypevar',
               'index_name' => 'vr',
               'index_prefix' => 'v',
+              'index_type_command' => 'deftypevar',
               'key' => 'd--eftypevar_name',
               'number' => 6
             },
@@ -2431,6 +2445,7 @@
               'index_at_command' => 'defivar',
               'index_name' => 'vr',
               'index_prefix' => 'v',
+              'index_type_command' => 'defivar',
               'key' => 'd--efivar_name of c--lass',
               'number' => 7
             },
@@ -2630,6 +2645,7 @@
               'index_at_command' => 'deftypeivar',
               'index_name' => 'vr',
               'index_prefix' => 'v',
+              'index_type_command' => 'deftypeivar',
               'key' => 'd--eftypeivar_name of c--lass',
               'number' => 8
             },
@@ -2818,6 +2834,7 @@
               'index_at_command' => 'defmethod',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'defmethod',
               'key' => 'd--efmethod_name on c--lass',
               'number' => 8
             },
@@ -3020,6 +3037,7 @@
               'index_at_command' => 'deftypemethod',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypemethod',
               'key' => 'd--eftypemethod_name on c--lass',
               'number' => 9
             },

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.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- t/results/def/all_commands_delimiters.pl    29 Oct 2011 16:38:04 -0000      
1.32
+++ t/results/def/all_commands_delimiters.pl    3 Dec 2011 14:58:32 -0000       
1.33
@@ -447,6 +447,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'forward--char',
               'number' => 1
             },
@@ -896,6 +897,7 @@
               'index_at_command' => 'defvr',
               'index_name' => 'vr',
               'index_prefix' => 'v',
+              'index_type_command' => 'defvr',
               'key' => 'fill-column',
               'number' => 1
             },
@@ -1166,6 +1168,7 @@
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypefn',
               'key' => 'foobar',
               'number' => 2
             },
@@ -1738,6 +1741,7 @@
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypefn',
               'key' => 'foobar',
               'number' => 3
             },
@@ -1925,6 +1929,7 @@
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypefn',
               'key' => 'foobug',
               'number' => 4
             },
@@ -2269,6 +2274,7 @@
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypefn',
               'key' => 'push',
               'number' => 5
             },
@@ -2685,6 +2691,7 @@
               'index_at_command' => 'deftypevr',
               'index_name' => 'vr',
               'index_prefix' => 'v',
+              'index_type_command' => 'deftypevr',
               'key' => 'enable',
               'number' => 2
             },
@@ -3113,6 +3120,7 @@
               'index_at_command' => 'deftp',
               'index_name' => 'tp',
               'index_prefix' => 't',
+              'index_type_command' => 'deftp',
               'key' => 'pair',
               'number' => 1
             },
@@ -3529,6 +3537,7 @@
               'index_at_command' => 'defcv',
               'index_name' => 'vr',
               'index_prefix' => 'v',
+              'index_type_command' => 'defcv',
               'key' => 'border-pattern',
               'number' => 3
             },
@@ -3993,6 +4002,7 @@
               'index_at_command' => 'deftypecv',
               'index_name' => 'vr',
               'index_prefix' => 'v',
+              'index_type_command' => 'deftypecv',
               'key' => 'border-pattern of Window',
               'number' => 4
             },
@@ -4406,6 +4416,7 @@
               'index_at_command' => 'defop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'defop',
               'key' => 'expose on windows',
               'number' => 6
             },
@@ -4861,6 +4872,7 @@
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypeop',
               'key' => 'expose on W,indow',
               'number' => 7
             },
@@ -5079,6 +5091,7 @@
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypeop',
               'key' => 'expose on Window',
               'number' => 8
             },
@@ -5331,6 +5344,7 @@
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypeop',
               'key' => 'e,xpose on W,indow',
               'number' => 9
             },
@@ -5583,6 +5597,7 @@
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypeop',
               'key' => ',expose on ,Window',
               'number' => 10
             },
@@ -5801,6 +5816,7 @@
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypeop',
               'key' => 'e,xpose on W,indow',
               'number' => 11
             },
@@ -6019,6 +6035,7 @@
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypeop',
               'key' => ',expose on ,Window',
               'number' => 12
             },
@@ -6271,6 +6288,7 @@
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypeop',
               'key' => 'e)xpose on W)indow',
               'number' => 13
             },
@@ -6523,6 +6541,7 @@
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypeop',
               'key' => ')expose on )Window',
               'number' => 14
             },
@@ -6741,6 +6760,7 @@
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypeop',
               'key' => 'e)xpose on W)indow',
               'number' => 15
             },
@@ -6959,6 +6979,7 @@
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypeop',
               'key' => ')expose on )Window',
               'number' => 16
             },
@@ -7211,6 +7232,7 @@
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypeop',
               'key' => 'e;xpose on W;indow',
               'number' => 17
             },
@@ -7463,6 +7485,7 @@
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypeop',
               'key' => ';expose on ;Window',
               'number' => 18
             },
@@ -7681,6 +7704,7 @@
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypeop',
               'key' => 'e;xpose on W;indow',
               'number' => 19
             },
@@ -7899,6 +7923,7 @@
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypeop',
               'key' => ';expose on ;Window',
               'number' => 20
             },
@@ -8158,6 +8183,7 @@
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypeop',
               'key' => 'expose on com',
               'number' => 21
             },
@@ -8323,6 +8349,7 @@
               'index_at_command' => 'defun',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'defun',
               'key' => 'apply',
               'number' => 22
             },
@@ -8559,6 +8586,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'A2',
               'number' => 23
             },
@@ -8791,6 +8819,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'A2',
               'number' => 24
             },
@@ -9023,6 +9052,7 @@
               'index_at_command' => 'defvr',
               'index_name' => 'vr',
               'index_prefix' => 'v',
+              'index_type_command' => 'defvr',
               'key' => 'A2',
               'number' => 5
             },
@@ -9255,6 +9285,7 @@
               'index_at_command' => 'defvr',
               'index_name' => 'vr',
               'index_prefix' => 'v',
+              'index_type_command' => 'defvr',
               'key' => 'A2',
               'number' => 6
             },
@@ -9521,6 +9552,7 @@
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypefn',
               'key' => 'A3',
               'number' => 25
             },
@@ -9787,6 +9819,7 @@
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypefn',
               'key' => 'A3',
               'number' => 26
             },
@@ -10053,6 +10086,7 @@
               'index_at_command' => 'deftypevr',
               'index_name' => 'vr',
               'index_prefix' => 'v',
+              'index_type_command' => 'deftypevr',
               'key' => 'A3',
               'number' => 7
             },
@@ -10319,6 +10353,7 @@
               'index_at_command' => 'deftypevr',
               'index_name' => 'vr',
               'index_prefix' => 'v',
+              'index_type_command' => 'deftypevr',
               'key' => 'A3',
               'number' => 8
             },
@@ -10551,6 +10586,7 @@
               'index_at_command' => 'deftp',
               'index_name' => 'tp',
               'index_prefix' => 't',
+              'index_type_command' => 'deftp',
               'key' => 'A2',
               'number' => 2
             },
@@ -10783,6 +10819,7 @@
               'index_at_command' => 'deftp',
               'index_name' => 'tp',
               'index_prefix' => 't',
+              'index_type_command' => 'deftp',
               'key' => 'A2',
               'number' => 3
             },
@@ -11049,6 +11086,7 @@
               'index_at_command' => 'defcv',
               'index_name' => 'vr',
               'index_prefix' => 'v',
+              'index_type_command' => 'defcv',
               'key' => 'A3',
               'number' => 9
             },
@@ -11314,6 +11352,7 @@
               'index_at_command' => 'deftp',
               'index_name' => 'tp',
               'index_prefix' => 't',
+              'index_type_command' => 'deftp',
               'key' => 'A2',
               'number' => 4
             },
@@ -11628,6 +11667,7 @@
               'index_at_command' => 'deftypecv',
               'index_name' => 'vr',
               'index_prefix' => 'v',
+              'index_type_command' => 'deftypecv',
               'key' => 'A4 of A2',
               'number' => 10
             },
@@ -11942,6 +11982,7 @@
               'index_at_command' => 'deftypecv',
               'index_name' => 'vr',
               'index_prefix' => 'v',
+              'index_type_command' => 'deftypecv',
               'key' => 'A4 of A2',
               'number' => 11
             },
@@ -12222,6 +12263,7 @@
               'index_at_command' => 'defop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'defop',
               'key' => 'A3 on A2',
               'number' => 27
             },
@@ -12502,6 +12544,7 @@
               'index_at_command' => 'defop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'defop',
               'key' => 'A3 on A2',
               'number' => 28
             },
@@ -12816,6 +12859,7 @@
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypeop',
               'key' => 'A4 on A2',
               'number' => 29
             },
@@ -13130,6 +13174,7 @@
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypeop',
               'key' => 'A4 on A2',
               'number' => 30
             },
@@ -13453,6 +13498,7 @@
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypefn',
               'key' => 'fun_name',
               'number' => 31
             },
@@ -13776,6 +13822,7 @@
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypefn',
               'key' => 'fun_name1',
               'number' => 32
             },

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.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/def/all_commands_delimiters_printindex.pl 1 Nov 2011 12:26:00 
-0000       1.23
+++ t/results/def/all_commands_delimiters_printindex.pl 3 Dec 2011 14:58:32 
-0000       1.24
@@ -481,6 +481,7 @@
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deffn',
                   'key' => 'forward--char',
                   'node' => {},
                   'number' => 1
@@ -931,6 +932,7 @@
                   'index_at_command' => 'defvr',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'defvr',
                   'key' => 'fill-column',
                   'node' => {},
                   'number' => 1
@@ -1202,6 +1204,7 @@
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypefn',
                   'key' => 'foobar',
                   'node' => {},
                   'number' => 2
@@ -1775,6 +1778,7 @@
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypefn',
                   'key' => 'foobar',
                   'node' => {},
                   'number' => 3
@@ -1963,6 +1967,7 @@
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypefn',
                   'key' => 'foobug',
                   'node' => {},
                   'number' => 4
@@ -2308,6 +2313,7 @@
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypefn',
                   'key' => 'push',
                   'node' => {},
                   'number' => 5
@@ -2725,6 +2731,7 @@
                   'index_at_command' => 'deftypevr',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'deftypevr',
                   'key' => 'enable',
                   'node' => {},
                   'number' => 2
@@ -3154,6 +3161,7 @@
                   'index_at_command' => 'deftp',
                   'index_name' => 'tp',
                   'index_prefix' => 't',
+                  'index_type_command' => 'deftp',
                   'key' => 'pair',
                   'node' => {},
                   'number' => 1
@@ -3571,6 +3579,7 @@
                   'index_at_command' => 'defcv',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'defcv',
                   'key' => 'border-pattern',
                   'node' => {},
                   'number' => 3
@@ -4036,6 +4045,7 @@
                   'index_at_command' => 'deftypecv',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'deftypecv',
                   'key' => 'border-pattern of Window',
                   'node' => {},
                   'number' => 4
@@ -4450,6 +4460,7 @@
                   'index_at_command' => 'defop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'defop',
                   'key' => 'expose on windows',
                   'node' => {},
                   'number' => 6
@@ -4906,6 +4917,7 @@
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypeop',
                   'key' => 'expose on W,indow',
                   'node' => {},
                   'number' => 7
@@ -5125,6 +5137,7 @@
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypeop',
                   'key' => 'expose on Window',
                   'node' => {},
                   'number' => 8
@@ -5378,6 +5391,7 @@
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypeop',
                   'key' => 'e,xpose on W,indow',
                   'node' => {},
                   'number' => 9
@@ -5631,6 +5645,7 @@
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypeop',
                   'key' => ',expose on ,Window',
                   'node' => {},
                   'number' => 10
@@ -5850,6 +5865,7 @@
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypeop',
                   'key' => 'e,xpose on W,indow',
                   'node' => {},
                   'number' => 11
@@ -6069,6 +6085,7 @@
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypeop',
                   'key' => ',expose on ,Window',
                   'node' => {},
                   'number' => 12
@@ -6322,6 +6339,7 @@
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypeop',
                   'key' => 'e)xpose on W)indow',
                   'node' => {},
                   'number' => 13
@@ -6575,6 +6593,7 @@
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypeop',
                   'key' => ')expose on )Window',
                   'node' => {},
                   'number' => 14
@@ -6794,6 +6813,7 @@
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypeop',
                   'key' => 'e)xpose on W)indow',
                   'node' => {},
                   'number' => 15
@@ -7013,6 +7033,7 @@
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypeop',
                   'key' => ')expose on )Window',
                   'node' => {},
                   'number' => 16
@@ -7266,6 +7287,7 @@
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypeop',
                   'key' => 'e;xpose on W;indow',
                   'node' => {},
                   'number' => 17
@@ -7519,6 +7541,7 @@
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypeop',
                   'key' => ';expose on ;Window',
                   'node' => {},
                   'number' => 18
@@ -7738,6 +7761,7 @@
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypeop',
                   'key' => 'e;xpose on W;indow',
                   'node' => {},
                   'number' => 19
@@ -7957,6 +7981,7 @@
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypeop',
                   'key' => ';expose on ;Window',
                   'node' => {},
                   'number' => 20
@@ -8217,6 +8242,7 @@
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypeop',
                   'key' => 'expose on com',
                   'node' => {},
                   'number' => 21
@@ -8383,6 +8409,7 @@
                   'index_at_command' => 'defun',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'defun',
                   'key' => 'apply',
                   'node' => {},
                   'number' => 22
@@ -8620,6 +8647,7 @@
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deffn',
                   'key' => 'A2',
                   'node' => {},
                   'number' => 23
@@ -8853,6 +8881,7 @@
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deffn',
                   'key' => 'A2',
                   'node' => {},
                   'number' => 24
@@ -9086,6 +9115,7 @@
                   'index_at_command' => 'defvr',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'defvr',
                   'key' => 'A2',
                   'node' => {},
                   'number' => 5
@@ -9319,6 +9349,7 @@
                   'index_at_command' => 'defvr',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'defvr',
                   'key' => 'A2',
                   'node' => {},
                   'number' => 6
@@ -9586,6 +9617,7 @@
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypefn',
                   'key' => 'A3',
                   'node' => {},
                   'number' => 25
@@ -9853,6 +9885,7 @@
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypefn',
                   'key' => 'A3',
                   'node' => {},
                   'number' => 26
@@ -10120,6 +10153,7 @@
                   'index_at_command' => 'deftypevr',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'deftypevr',
                   'key' => 'A3',
                   'node' => {},
                   'number' => 7
@@ -10387,6 +10421,7 @@
                   'index_at_command' => 'deftypevr',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'deftypevr',
                   'key' => 'A3',
                   'node' => {},
                   'number' => 8
@@ -10620,6 +10655,7 @@
                   'index_at_command' => 'deftp',
                   'index_name' => 'tp',
                   'index_prefix' => 't',
+                  'index_type_command' => 'deftp',
                   'key' => 'A2',
                   'node' => {},
                   'number' => 2
@@ -10853,6 +10889,7 @@
                   'index_at_command' => 'deftp',
                   'index_name' => 'tp',
                   'index_prefix' => 't',
+                  'index_type_command' => 'deftp',
                   'key' => 'A2',
                   'node' => {},
                   'number' => 3
@@ -11120,6 +11157,7 @@
                   'index_at_command' => 'defcv',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'defcv',
                   'key' => 'A3',
                   'node' => {},
                   'number' => 9
@@ -11386,6 +11424,7 @@
                   'index_at_command' => 'deftp',
                   'index_name' => 'tp',
                   'index_prefix' => 't',
+                  'index_type_command' => 'deftp',
                   'key' => 'A2',
                   'node' => {},
                   'number' => 4
@@ -11701,6 +11740,7 @@
                   'index_at_command' => 'deftypecv',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'deftypecv',
                   'key' => 'A4 of A2',
                   'node' => {},
                   'number' => 10
@@ -12016,6 +12056,7 @@
                   'index_at_command' => 'deftypecv',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'deftypecv',
                   'key' => 'A4 of A2',
                   'node' => {},
                   'number' => 11
@@ -12297,6 +12338,7 @@
                   'index_at_command' => 'defop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'defop',
                   'key' => 'A3 on A2',
                   'node' => {},
                   'number' => 27
@@ -12578,6 +12620,7 @@
                   'index_at_command' => 'defop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'defop',
                   'key' => 'A3 on A2',
                   'node' => {},
                   'number' => 28
@@ -12893,6 +12936,7 @@
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypeop',
                   'key' => 'A4 on A2',
                   'node' => {},
                   'number' => 29
@@ -13208,6 +13252,7 @@
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypeop',
                   'key' => 'A4 on A2',
                   'node' => {},
                   'number' => 30
@@ -13532,6 +13577,7 @@
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypefn',
                   'key' => 'fun_name',
                   'node' => {},
                   'number' => 31
@@ -13856,6 +13902,7 @@
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypefn',
                   'key' => 'fun_name1',
                   'node' => {},
                   'number' => 32

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.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/def/all_commands_printindex.pl    1 Nov 2011 12:26:00 -0000       
1.22
+++ t/results/def/all_commands_printindex.pl    3 Dec 2011 14:58:32 -0000       
1.23
@@ -105,6 +105,7 @@
                   'index_at_command' => 'defvr',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'defvr',
                   'key' => 'd--efvr_name',
                   'node' => {},
                   'number' => 1
@@ -280,6 +281,7 @@
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypefn',
                   'key' => 'd--eftypefn_name',
                   'node' => {},
                   'number' => 1
@@ -483,6 +485,7 @@
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypeop',
                   'key' => 'd--eftypeop_name on c--lass',
                   'node' => {},
                   'number' => 2
@@ -645,6 +648,7 @@
                   'index_at_command' => 'deftypevr',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'deftypevr',
                   'key' => 'd--eftypevr_name',
                   'node' => {},
                   'number' => 2
@@ -807,6 +811,7 @@
                   'index_at_command' => 'defcv',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'defcv',
                   'key' => 'd--efcv_name',
                   'node' => {},
                   'number' => 3
@@ -996,6 +1001,7 @@
                   'index_at_command' => 'defop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'defop',
                   'key' => 'd--efop_name on c--lass',
                   'node' => {},
                   'number' => 3
@@ -1157,6 +1163,7 @@
                   'index_at_command' => 'deftp',
                   'index_name' => 'tp',
                   'index_prefix' => 't',
+                  'index_type_command' => 'deftp',
                   'key' => 'd--eftp_name',
                   'node' => {},
                   'number' => 1
@@ -1318,6 +1325,7 @@
                   'index_at_command' => 'defun',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'defun',
                   'key' => 'd--efun_name',
                   'node' => {},
                   'number' => 4
@@ -1479,6 +1487,7 @@
                   'index_at_command' => 'defmac',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'defmac',
                   'key' => 'd--efmac_name',
                   'node' => {},
                   'number' => 5
@@ -1650,6 +1659,7 @@
                   'index_at_command' => 'defspec',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'defspec',
                   'key' => 'd--efspec_name',
                   'node' => {},
                   'number' => 6
@@ -1798,6 +1808,7 @@
                   'index_at_command' => 'defvar',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'defvar',
                   'key' => 'd--efvar_name',
                   'node' => {},
                   'number' => 4
@@ -1956,6 +1967,7 @@
                   'index_at_command' => 'defopt',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'defopt',
                   'key' => 'd--efopt_name',
                   'node' => {},
                   'number' => 5
@@ -2131,6 +2143,7 @@
                   'index_at_command' => 'deftypefun',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypefun',
                   'key' => 'd--eftypefun_name',
                   'node' => {},
                   'number' => 7
@@ -2293,6 +2306,7 @@
                   'index_at_command' => 'deftypevar',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'deftypevar',
                   'key' => 'd--eftypevar_name',
                   'node' => {},
                   'number' => 6
@@ -2479,6 +2493,7 @@
                   'index_at_command' => 'defivar',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'defivar',
                   'key' => 'd--efivar_name of c--lass',
                   'node' => {},
                   'number' => 7
@@ -2679,6 +2694,7 @@
                   'index_at_command' => 'deftypeivar',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'deftypeivar',
                   'key' => 'd--eftypeivar_name of c--lass',
                   'node' => {},
                   'number' => 8
@@ -2868,6 +2884,7 @@
                   'index_at_command' => 'defmethod',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'defmethod',
                   'key' => 'd--efmethod_name on c--lass',
                   'node' => {},
                   'number' => 8
@@ -3071,6 +3088,7 @@
                   'index_at_command' => 'deftypemethod',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deftypemethod',
                   'key' => 'd--eftypemethod_name on c--lass',
                   'node' => {},
                   'number' => 9

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.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- t/results/def/def_defx_mismatch.pl  29 Oct 2011 16:38:04 -0000      1.31
+++ t/results/def/def_defx_mismatch.pl  3 Dec 2011 14:58:32 -0000       1.32
@@ -161,6 +161,7 @@
               'index_at_command' => 'defun',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'defun',
               'key' => 'my def',
               'number' => 1
             },
@@ -318,6 +319,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'name',
               'number' => 2
             },

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.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- t/results/def/defx_after_comment.pl 29 Oct 2011 16:38:04 -0000      1.31
+++ t/results/def/defx_after_comment.pl 3 Dec 2011 14:58:33 -0000       1.32
@@ -121,6 +121,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'i',
               'number' => 1
             },
@@ -240,6 +241,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'bidulr',
               'number' => 2
             },

Index: t/results/def/defx_after_comment_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/def/defx_after_comment_in_example.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/def/defx_after_comment_in_example.pl      29 Oct 2011 16:38:05 
-0000      1.15
+++ t/results/def/defx_after_comment_in_example.pl      3 Dec 2011 14:58:33 
-0000       1.16
@@ -133,6 +133,7 @@
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deffn',
                   'key' => 'i',
                   'number' => 1
                 },
@@ -258,6 +259,7 @@
                   'index_at_command' => 'deffnx',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deffn',
                   'key' => 'bidulr',
                   'number' => 2
                 },

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.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- t/results/def/defx_after_empty_line.pl      29 Oct 2011 16:38:05 -0000      
1.31
+++ t/results/def/defx_after_empty_line.pl      3 Dec 2011 14:58:33 -0000       
1.32
@@ -121,6 +121,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'i',
               'number' => 1
             },
@@ -234,6 +235,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'bidulr',
               'number' => 2
             },

Index: t/results/def/defx_after_empty_line_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/def/defx_after_empty_line_in_example.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/def/defx_after_empty_line_in_example.pl   29 Oct 2011 16:38:05 
-0000      1.15
+++ t/results/def/defx_after_empty_line_in_example.pl   3 Dec 2011 14:58:33 
-0000       1.16
@@ -133,6 +133,7 @@
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deffn',
                   'key' => 'i',
                   'number' => 1
                 },
@@ -282,6 +283,7 @@
                   'index_at_command' => 'deffnx',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deffn',
                   'key' => 'bidulr',
                   'number' => 2
                 },

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.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- t/results/def/defx_after_paragraph_end.pl   29 Oct 2011 16:38:05 -0000      
1.31
+++ t/results/def/defx_after_paragraph_end.pl   3 Dec 2011 14:58:33 -0000       
1.32
@@ -121,6 +121,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'i',
               'number' => 1
             },
@@ -245,6 +246,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'bidulr',
               'number' => 2
             },

Index: t/results/def/defx_after_preformatted_with_text.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/def/defx_after_preformatted_with_text.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/def/defx_after_preformatted_with_text.pl  29 Oct 2011 16:38:05 
-0000      1.16
+++ t/results/def/defx_after_preformatted_with_text.pl  3 Dec 2011 14:58:33 
-0000       1.17
@@ -133,6 +133,7 @@
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deffn',
                   'key' => 'i',
                   'number' => 1
                 },
@@ -257,6 +258,7 @@
                   'index_at_command' => 'deffnx',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deffn',
                   'key' => 'bidulr',
                   'number' => 2
                 },

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.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- t/results/def/defx_after_text.pl    29 Oct 2011 16:38:05 -0000      1.32
+++ t/results/def/defx_after_text.pl    3 Dec 2011 14:58:33 -0000       1.33
@@ -121,6 +121,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'i',
               'number' => 1
             },
@@ -239,6 +240,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'bidulr',
               'number' => 2
             },

Index: t/results/def/defx_in_example.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/defx_in_example.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/def/defx_in_example.pl    29 Oct 2011 16:38:05 -0000      1.14
+++ t/results/def/defx_in_example.pl    3 Dec 2011 14:58:33 -0000       1.15
@@ -133,6 +133,7 @@
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deffn',
                   'key' => 'i',
                   'number' => 1
                 },
@@ -234,6 +235,7 @@
                   'index_at_command' => 'deffnx',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deffn',
                   'key' => 'bidulr',
                   'number' => 2
                 },

Index: t/results/def/double_command.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/double_command.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- t/results/def/double_command.pl     29 Oct 2011 14:44:49 -0000      1.31
+++ t/results/def/double_command.pl     3 Dec 2011 14:58:33 -0000       1.32
@@ -195,6 +195,7 @@
                       'index_at_command' => 'deffnx',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',
+                      'index_type_command' => 'deffn',
                       'key' => 'plot2',
                       'number' => 1
                     },
@@ -352,6 +353,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'plot',
               'number' => 2
             },
@@ -514,6 +516,7 @@
                           'index_at_command' => 'defvr',
                           'index_name' => 'vr',
                           'index_prefix' => 'v',
+                          'index_type_command' => 'defvr',
                           'key' => 'd--efvr_name',
                           'number' => 1
                         },
@@ -602,6 +605,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'aaaa',
               'number' => 3
             },

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.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- t/results/def/empty_def_arguments.pl        5 Nov 2011 00:12:37 -0000       
1.30
+++ t/results/def/empty_def_arguments.pl        3 Dec 2011 14:58:33 -0000       
1.31
@@ -121,6 +121,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'i',
               'number' => 1
             },

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.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/def/empty_def_command.pl  3 Sep 2011 21:51:32 -0000       1.28
+++ t/results/def/empty_def_command.pl  3 Dec 2011 14:58:33 -0000       1.29
@@ -71,6 +71,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'deffn',
               'number' => 1
             },
@@ -227,6 +228,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'deffn',
               'number' => 2
             },
@@ -302,6 +304,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'deffnx',
               'number' => 3
             },

Index: t/results/def/empty_deftype.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/empty_deftype.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- t/results/def/empty_deftype.pl      29 Oct 2011 16:38:05 -0000      1.31
+++ t/results/def/empty_deftype.pl      3 Dec 2011 14:58:33 -0000       1.32
@@ -150,6 +150,7 @@
               'index_at_command' => 'deftypefun',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypefun',
               'key' => 'f',
               'number' => 1
             },
@@ -346,6 +347,7 @@
               'index_at_command' => 'defun',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'defun',
               'key' => 'f',
               'number' => 2
             },
@@ -604,6 +606,7 @@
               'index_at_command' => 'deftypemethod',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypemethod',
               'key' => 'f on c',
               'number' => 3
             },
@@ -828,6 +831,7 @@
               'index_at_command' => 'defmethod',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'defmethod',
               'key' => 'f on c',
               'number' => 4
             },

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.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/def/empty_deftypeop_name.pl       29 Oct 2011 16:38:05 -0000      
1.28
+++ t/results/def/empty_deftypeop_name.pl       3 Dec 2011 14:58:33 -0000       
1.29
@@ -191,6 +191,7 @@
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deftypeop',
               'key' => 'expose on com',
               'number' => 1
             },

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.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/def/end_of_line_protect_at_end.pl 3 Sep 2011 21:51:32 -0000       
1.27
+++ t/results/def/end_of_line_protect_at_end.pl 3 Dec 2011 14:58:34 -0000       
1.28
@@ -89,6 +89,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'deffn_name2',
               'number' => 1
             },

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.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- t/results/def/end_of_lines_protected.pl     29 Oct 2011 16:38:05 -0000      
1.29
+++ t/results/def/end_of_lines_protected.pl     3 Dec 2011 14:58:34 -0000       
1.30
@@ -229,6 +229,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'deffn_name',
               'number' => 1
             },

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.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- t/results/def/end_of_lines_protected_in_footnote.pl 29 Oct 2011 16:38:05 
-0000      1.32
+++ t/results/def/end_of_lines_protected_in_footnote.pl 3 Dec 2011 14:58:34 
-0000       1.33
@@ -254,6 +254,7 @@
                           'index_at_command' => 'deffn',
                           'index_name' => 'fn',
                           'index_prefix' => 'f',
+                          'index_type_command' => 'deffn',
                           'key' => 'deffn_name',
                           'number' => 1
                         },

Index: t/results/def/inter_item_commands_in_def.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/def/inter_item_commands_in_def.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/def/inter_item_commands_in_def.pl 29 Oct 2011 16:38:06 -0000      
1.14
+++ t/results/def/inter_item_commands_in_def.pl 3 Dec 2011 14:58:34 -0000       
1.15
@@ -121,6 +121,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'i',
               'number' => 1
             },
@@ -266,6 +267,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'log trap1',
               'number' => 2
             },
@@ -316,6 +318,7 @@
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
+                  'index_type_command' => 'cindex',
                   'key' => 'between deffnx',
                   'number' => 1
                 },
@@ -454,6 +457,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'id i ule',
               'number' => 3
             },
@@ -504,6 +508,7 @@
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
+                  'index_type_command' => 'cindex',
                   'key' => 'cindex in deff item',
                   'number' => 2
                 },

Index: t/results/def/inter_item_commands_in_def_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/def/inter_item_commands_in_def_in_example.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/def/inter_item_commands_in_def_in_example.pl      29 Oct 2011 
16:38:06 -0000      1.2
+++ t/results/def/inter_item_commands_in_def_in_example.pl      3 Dec 2011 
14:58:34 -0000       1.3
@@ -133,6 +133,7 @@
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deffn',
                   'key' => 'i',
                   'number' => 1
                 },
@@ -284,6 +285,7 @@
                   'index_at_command' => 'deffnx',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deffn',
                   'key' => 'log trap1',
                   'number' => 2
                 },
@@ -336,6 +338,7 @@
                           'index_at_command' => 'cindex',
                           'index_name' => 'cp',
                           'index_prefix' => 'c',
+                          'index_type_command' => 'cindex',
                           'key' => 'between deffnx',
                           'number' => 1
                         },
@@ -478,6 +481,7 @@
                   'index_at_command' => 'deffnx',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deffn',
                   'key' => 'id i ule',
                   'number' => 3
                 },
@@ -530,6 +534,7 @@
                           'index_at_command' => 'cindex',
                           'index_name' => 'cp',
                           'index_prefix' => 'c',
+                          'index_type_command' => 'cindex',
                           'key' => 'cindex in deff item',
                           'number' => 2
                         },

Index: t/results/def/leading_space_in_def_arg.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/def/leading_space_in_def_arg.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/def/leading_space_in_def_arg.pl   29 Oct 2011 16:38:06 -0000      
1.10
+++ t/results/def/leading_space_in_def_arg.pl   3 Dec 2011 14:58:34 -0000       
1.11
@@ -109,6 +109,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'name',
               'number' => 1
             },

Index: t/results/def/no_category_or_no_name.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/no_category_or_no_name.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/def/no_category_or_no_name.pl     29 Oct 2011 16:38:06 -0000      
1.16
+++ t/results/def/no_category_or_no_name.pl     3 Dec 2011 14:58:34 -0000       
1.17
@@ -331,6 +331,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'b',
               'number' => 1
             },

Index: t/results/def/not_closed.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/not_closed.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/def/not_closed.pl 3 Sep 2011 21:51:33 -0000       1.28
+++ t/results/def/not_closed.pl 3 Dec 2011 14:58:34 -0000       1.29
@@ -84,6 +84,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'bidule',
               'number' => 1
             },
@@ -172,6 +173,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'chose',
               'number' => 2
             },
@@ -277,6 +279,7 @@
                       'index_at_command' => 'defvar',
                       'index_name' => 'vr',
                       'index_prefix' => 'v',
+                      'index_type_command' => 'defvar',
                       'key' => 'type1',
                       'number' => 1
                     },

Index: t/results/def/protected_brace.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/protected_brace.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/def/protected_brace.pl    3 Sep 2011 21:51:33 -0000       1.18
+++ t/results/def/protected_brace.pl    3 Dec 2011 14:58:34 -0000       1.19
@@ -77,6 +77,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => '{',
               'number' => 1
             },

Index: t/results/def/space_in_def_for_index.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/space_in_def_for_index.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/def/space_in_def_for_index.pl     1 Nov 2011 12:26:00 -0000       
1.14
+++ t/results/def/space_in_def_for_index.pl     3 Dec 2011 14:58:34 -0000       
1.15
@@ -215,6 +215,7 @@
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deffn',
                   'key' => 'name',
                   'node' => {},
                   'number' => 1
@@ -334,6 +335,7 @@
                   'index_at_command' => 'deffnx',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deffn',
                   'key' => 'AAA2',
                   'node' => {},
                   'number' => 2

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.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/def/wrong_braces_simple.pl        29 Oct 2011 16:38:06 -0000      
1.28
+++ t/results/def/wrong_braces_simple.pl        3 Dec 2011 14:58:34 -0000       
1.29
@@ -110,6 +110,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'machin',
               'number' => 1
             },
@@ -292,6 +293,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'machin',
               'number' => 2
             },
@@ -491,6 +493,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'machin',
               'number' => 3
             },
@@ -695,6 +698,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'machin',
               'number' => 4
             },
@@ -860,6 +864,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'b',
               'number' => 5
             },
@@ -974,6 +979,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'machin',
               'number' => 6
             },
@@ -1101,6 +1107,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'machin',
               'number' => 7
             },
@@ -1245,6 +1252,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'machin',
               'number' => 8
             },
@@ -1394,6 +1402,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'machin',
               'number' => 9
             },

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.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/def/wrong_braces_with_end_of_lines.pl     29 Oct 2011 16:38:06 
-0000      1.28
+++ t/results/def/wrong_braces_with_end_of_lines.pl     3 Dec 2011 14:58:35 
-0000       1.29
@@ -123,6 +123,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'name',
               'number' => 1
             },
@@ -313,6 +314,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'name',
               'number' => 2
             },

Index: t/results/float/cindex_in_caption.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/cindex_in_caption.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/float/cindex_in_caption.pl        1 Nov 2011 12:26:01 -0000       
1.13
+++ t/results/float/cindex_in_caption.pl        3 Dec 2011 14:58:35 -0000       
1.14
@@ -200,6 +200,7 @@
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
                               'index_prefix' => 'c',
+                              'index_type_command' => 'cindex',
                               'key' => 'index entry',
                               'node' => {},
                               'number' => 1

Index: t/results/float/complex_float.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/complex_float.pl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- t/results/float/complex_float.pl    22 Nov 2011 00:34:59 -0000      1.32
+++ t/results/float/complex_float.pl    3 Dec 2011 14:58:35 -0000       1.33
@@ -432,6 +432,7 @@
                       'index_at_command' => 'cindex',
                       'index_name' => 'cp',
                       'index_prefix' => 'c',
+                      'index_type_command' => 'cindex',
                       'key' => 'float example',
                       'node' => {},
                       'number' => 1
@@ -1765,6 +1766,7 @@
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
                               'index_prefix' => 'c',
+                              'index_type_command' => 'cindex',
                               'key' => 'float example in caption',
                               'node' => {},
                               'number' => 2
@@ -3398,6 +3400,7 @@
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
                               'index_prefix' => 'c',
+                              'index_type_command' => 'cindex',
                               'key' => 'float example in caption 2',
                               'node' => {},
                               'number' => 3

Index: t/results/float/float_copying.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/float_copying.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/float/float_copying.pl    22 Nov 2011 00:34:59 -0000      1.14
+++ t/results/float/float_copying.pl    3 Dec 2011 14:58:35 -0000       1.15
@@ -215,6 +215,7 @@
                                           'index_at_command' => 'cindex',
                                           'index_name' => 'cp',
                                           'index_prefix' => 'c',
+                                          'index_type_command' => 'cindex',
                                           'key' => 'indexed caption copying 
footnote',
                                           'number' => 1,
                                           'region' => {}
@@ -268,6 +269,7 @@
                                           'index_at_command' => 'findex',
                                           'index_name' => 'fn',
                                           'index_prefix' => 'f',
+                                          'index_type_command' => 'findex',
                                           'key' => 'public domain function',
                                           'number' => 1,
                                           'region' => {}
@@ -501,6 +503,7 @@
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
                               'index_prefix' => 'c',
+                              'index_type_command' => 'cindex',
                               'key' => 'indexed caption',
                               'number' => 2,
                               'region' => {}
@@ -554,6 +557,7 @@
                               'index_at_command' => 'findex',
                               'index_name' => 'fn',
                               'index_prefix' => 'f',
+                              'index_type_command' => 'findex',
                               'key' => 'indexed caption function',
                               'number' => 2,
                               'region' => {}

Index: t/results/heading/heading_in_copying.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/heading/heading_in_copying.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/heading/heading_in_copying.pl     4 Sep 2011 12:14:04 -0000       
1.10
+++ t/results/heading/heading_in_copying.pl     3 Dec 2011 14:58:35 -0000       
1.11
@@ -136,6 +136,7 @@
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
+                  'index_type_command' => 'cindex',
                   'key' => 'cindex copying',
                   'number' => 1,
                   'region' => {}

Index: t/results/html_tests/index_and_node_same_name.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/html_tests/index_and_node_same_name.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/html_tests/index_and_node_same_name.pl    1 Nov 2011 12:01:38 
-0000       1.7
+++ t/results/html_tests/index_and_node_same_name.pl    3 Dec 2011 14:58:35 
-0000       1.8
@@ -128,6 +128,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'node',
               'node' => {},
               'number' => 1

Index: t/results/html_tests/index_below.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/html_tests/index_below.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/html_tests/index_below.pl 22 Nov 2011 00:34:59 -0000      1.3
+++ t/results/html_tests/index_below.pl 3 Dec 2011 14:58:35 -0000       1.4
@@ -205,6 +205,7 @@
                 'index_at_command' => 'cindex',
                 'index_name' => 'cp',
                 'index_prefix' => 'c',
+                'index_type_command' => 'cindex',
                 'key' => 'entry',
                 'number' => 1
               },

Index: t/results/indices/double_index_entry.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/double_index_entry.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/indices/double_index_entry.pl     1 Nov 2011 12:26:01 -0000       
1.14
+++ t/results/indices/double_index_entry.pl     3 Dec 2011 14:58:35 -0000       
1.15
@@ -86,6 +86,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'aaa',
               'node' => {},
               'number' => 1
@@ -162,6 +163,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'aaa',
               'node' => {},
               'number' => 2
@@ -422,6 +424,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'aaa',
               'node' => {},
               'number' => 3

Index: t/results/indices/image_lines_count.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/image_lines_count.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/indices/image_lines_count.pl      1 Nov 2011 12:26:01 -0000       
1.11
+++ t/results/indices/image_lines_count.pl      3 Dec 2011 14:58:36 -0000       
1.12
@@ -126,6 +126,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'index entry',
               'node' => {},
               'number' => 1

Index: t/results/indices/image_text_lines_count.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/image_text_lines_count.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/indices/image_text_lines_count.pl 1 Nov 2011 12:26:01 -0000       
1.10
+++ t/results/indices/image_text_lines_count.pl 3 Dec 2011 14:58:36 -0000       
1.11
@@ -126,6 +126,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'index entry',
               'node' => {},
               'number' => 1

Index: t/results/indices/index_entries_locations.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/index_entries_locations.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/indices/index_entries_locations.pl        1 Nov 2011 12:26:01 
-0000       1.10
+++ t/results/indices/index_entries_locations.pl        3 Dec 2011 14:58:36 
-0000       1.11
@@ -117,6 +117,7 @@
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
+                  'index_type_command' => 'cindex',
                   'key' => 'entry in paragraph',
                   'node' => {},
                   'number' => 1
@@ -175,6 +176,7 @@
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
+                  'index_type_command' => 'cindex',
                   'key' => 'entry at end of paragraph.',
                   'node' => {},
                   'number' => 2
@@ -255,6 +257,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'Entry before paragraph',
               'node' => {},
               'number' => 3
@@ -325,6 +328,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'lone entry',
               'node' => {},
               'number' => 4

Index: t/results/indices/index_entry_before_first_node.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/index_entry_before_first_node.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/indices/index_entry_before_first_node.pl  1 Nov 2011 12:26:01 
-0000       1.10
+++ t/results/indices/index_entry_before_first_node.pl  3 Dec 2011 14:58:36 
-0000       1.11
@@ -54,6 +54,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'before nodes',
               'number' => 1
             },

Index: t/results/indices/index_entry_before_node.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/index_entry_before_node.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/indices/index_entry_before_node.pl        1 Nov 2011 12:26:01 
-0000       1.15
+++ t/results/indices/index_entry_before_node.pl        3 Dec 2011 14:58:36 
-0000       1.16
@@ -366,6 +366,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'lone entry',
               'node' => {},
               'number' => 1

Index: t/results/indices/index_entry_in_footnote.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/indices/index_entry_in_footnote.pl        1 Nov 2011 12:26:02 
-0000       1.6
+++ t/results/indices/index_entry_in_footnote.pl        3 Dec 2011 14:58:37 
-0000       1.7
@@ -103,6 +103,7 @@
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
                               'index_prefix' => 'c',
+                              'index_type_command' => 'cindex',
                               'key' => 'index entry in footnote',
                               'node' => {},
                               'number' => 1

Index: t/results/indices/index_entry_in_footnote_separate.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote_separate.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/indices/index_entry_in_footnote_separate.pl       4 Nov 2011 
19:02:30 -0000       1.1
+++ t/results/indices/index_entry_in_footnote_separate.pl       3 Dec 2011 
14:58:37 -0000       1.2
@@ -270,6 +270,7 @@
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
                               'index_prefix' => 'c',
+                              'index_type_command' => 'cindex',
                               'key' => 'index entry in footnote',
                               'node' => {},
                               'number' => 1
@@ -367,6 +368,7 @@
                           'index_at_command' => 'cindex',
                           'index_name' => 'cp',
                           'index_prefix' => 'c',
+                          'index_type_command' => 'cindex',
                           'key' => 'counting entry',
                           'node' => {},
                           'number' => 2

Index: t/results/indices/printindex_index_entry_in_copying.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/indices/printindex_index_entry_in_copying.pl      22 Nov 2011 
00:34:59 -0000      1.18
+++ t/results/indices/printindex_index_entry_in_copying.pl      3 Dec 2011 
14:58:37 -0000       1.19
@@ -66,6 +66,7 @@
                   'index_at_command' => 'findex',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'findex',
                   'key' => 'Copying this document',
                   'number' => 1,
                   'region' => {}
@@ -163,6 +164,7 @@
                       'index_at_command' => 'defun',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',
+                      'index_type_command' => 'defun',
                       'key' => 'fun',
                       'number' => 2,
                       'region' => {}
@@ -252,6 +254,7 @@
                       'index_at_command' => 'defunx',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',
+                      'index_type_command' => 'defun',
                       'key' => 'xf',
                       'number' => 3,
                       'region' => {}
@@ -406,9 +409,10 @@
                               ],
                               'content_normalized' => [],
                               'in_code' => 1,
-                              'index_at_command' => 'ftable',
+                              'index_at_command' => 'item',
                               'index_name' => 'fn',
                               'index_prefix' => 'f',
+                              'index_type_command' => 'ftable',
                               'key' => 'ftable item',
                               'number' => 4,
                               'region' => {}
@@ -458,9 +462,10 @@
                               ],
                               'content_normalized' => [],
                               'in_code' => 1,
-                              'index_at_command' => 'ftable',
+                              'index_at_command' => 'itemx',
                               'index_name' => 'fn',
                               'index_prefix' => 'f',
+                              'index_type_command' => 'ftable',
                               'key' => 'xftable xitem',
                               'number' => 5,
                               'region' => {}

Index: t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/indices/printindex_index_entry_in_copying_in_footnote.pl  22 Nov 
2011 00:35:00 -0000      1.15
+++ t/results/indices/printindex_index_entry_in_copying_in_footnote.pl  3 Dec 
2011 14:58:37 -0000       1.16
@@ -89,6 +89,7 @@
                                   'index_at_command' => 'cindex',
                                   'index_name' => 'cp',
                                   'index_prefix' => 'c',
+                                  'index_type_command' => 'cindex',
                                   'key' => 'Copying this document',
                                   'number' => 1,
                                   'region' => {}

Index: t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl     
22 Nov 2011 00:35:00 -0000      1.15
+++ t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl     
3 Dec 2011 14:58:37 -0000       1.16
@@ -66,6 +66,7 @@
                   'index_at_command' => 'findex',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'findex',
                   'key' => 'Copying this document',
                   'number' => 1,
                   'region' => {}
@@ -163,6 +164,7 @@
                       'index_at_command' => 'defun',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',
+                      'index_type_command' => 'defun',
                       'key' => 'fun',
                       'number' => 2,
                       'region' => {}
@@ -252,6 +254,7 @@
                       'index_at_command' => 'defunx',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',
+                      'index_type_command' => 'defun',
                       'key' => 'xf',
                       'number' => 3,
                       'region' => {}
@@ -406,9 +409,10 @@
                               ],
                               'content_normalized' => [],
                               'in_code' => 1,
-                              'index_at_command' => 'ftable',
+                              'index_at_command' => 'item',
                               'index_name' => 'fn',
                               'index_prefix' => 'f',
+                              'index_type_command' => 'ftable',
                               'key' => 'ftable item',
                               'number' => 4,
                               'region' => {}
@@ -458,9 +462,10 @@
                               ],
                               'content_normalized' => [],
                               'in_code' => 1,
-                              'index_at_command' => 'ftable',
+                              'index_at_command' => 'itemx',
                               'index_name' => 'fn',
                               'index_prefix' => 'f',
+                              'index_type_command' => 'ftable',
                               'key' => 'xftable xitem',
                               'number' => 5,
                               'region' => {}

Index: t/results/indices/printindex_with_space_before.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/printindex_with_space_before.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/indices/printindex_with_space_before.pl   1 Nov 2011 12:26:02 
-0000       1.10
+++ t/results/indices/printindex_with_space_before.pl   3 Dec 2011 14:58:37 
-0000       1.11
@@ -86,6 +86,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'index',
               'node' => {},
               'number' => 1

Index: t/results/indices/syncode_index_print_both.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/syncode_index_print_both.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/indices/syncode_index_print_both.pl       1 Nov 2011 12:26:02 
-0000       1.11
+++ t/results/indices/syncode_index_print_both.pl       3 Dec 2011 14:58:37 
-0000       1.12
@@ -134,6 +134,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'c--oncept',
               'node' => {},
               'number' => 1
@@ -187,6 +188,7 @@
               'index_at_command' => 'findex',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'findex',
               'key' => 'f---un',
               'node' => {},
               'number' => 1

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.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/indices/unknown_then_known_index_entry.pl 4 Sep 2011 12:14:04 
-0000       1.20
+++ t/results/indices/unknown_then_known_index_entry.pl 3 Dec 2011 14:58:37 
-0000       1.21
@@ -93,6 +93,7 @@
               'index_at_command' => 'someindex',
               'index_name' => 'some',
               'index_prefix' => 'some',
+              'index_type_command' => 'someindex',
               'key' => 'someindex entry.',
               'number' => 1
             },

Index: t/results/info_tests/before_node_and_section.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/info_tests/before_node_and_section.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/info_tests/before_node_and_section.pl     22 Nov 2011 00:35:00 
-0000      1.15
+++ t/results/info_tests/before_node_and_section.pl     3 Dec 2011 14:58:38 
-0000       1.16
@@ -147,6 +147,7 @@
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
+                  'index_type_command' => 'cindex',
                   'key' => 'index entry before anything',
                   'number' => 1
                 },

Index: t/results/info_tests/colon_in_index_entry.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/info_tests/colon_in_index_entry.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/info_tests/colon_in_index_entry.pl        1 Nov 2011 12:26:03 
-0000       1.7
+++ t/results/info_tests/colon_in_index_entry.pl        3 Dec 2011 14:58:38 
-0000       1.8
@@ -133,6 +133,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'a:b',
               'node' => {},
               'number' => 1
@@ -223,9 +224,10 @@
                           ],
                           'content_normalized' => [],
                           'in_code' => 0,
-                          'index_at_command' => 'vtable',
+                          'index_at_command' => 'item',
                           'index_name' => 'vr',
                           'index_prefix' => 'v',
+                          'index_type_command' => 'vtable',
                           'key' => '%main::value',
                           'node' => {},
                           'number' => 1
@@ -434,6 +436,7 @@
                   'index_at_command' => 'defvr',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'defvr',
                   'key' => 'c:d',
                   'node' => {},
                   'number' => 2
@@ -579,6 +582,7 @@
                   'index_at_command' => 'defvrx',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'defvr',
                   'key' => 'z:t',
                   'node' => {},
                   'number' => 3
@@ -922,9 +926,9 @@
 $result_converted_errors{'info'}->{'colon_in_index_entry'} = [
   {
     'file_name' => '',
-    'error_line' => ':8: warning: Index entry in @vtable with : produces 
invalid Info: %main::value
+    'error_line' => ':8: warning: Index entry in @item with : produces invalid 
Info: %main::value
 ',
-    'text' => 'Index entry in @vtable with : produces invalid Info: 
%main::value',
+    'text' => 'Index entry in @item with : produces invalid Info: 
%main::value',
     'type' => 'warning',
     'macro' => '',
     'line_nr' => 8

Index: t/results/info_tests/def_in_copying.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/info_tests/def_in_copying.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/info_tests/def_in_copying.pl      1 Nov 2011 12:26:03 -0000       
1.16
+++ t/results/info_tests/def_in_copying.pl      3 Dec 2011 14:58:38 -0000       
1.17
@@ -267,6 +267,7 @@
                       'index_at_command' => 'deffn',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',
+                      'index_type_command' => 'deffn',
                       'key' => 'bb',
                       'number' => 1,
                       'region' => {}
@@ -356,6 +357,7 @@
                       'index_at_command' => 'deffnx',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',
+                      'index_type_command' => 'deffn',
                       'key' => 'bbx',
                       'number' => 2,
                       'region' => {}
@@ -579,6 +581,7 @@
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deffn',
                   'key' => 'bb',
                   'node' => {},
                   'number' => 3
@@ -668,6 +671,7 @@
                   'index_at_command' => 'deffnx',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deffn',
                   'key' => 'bbx',
                   'node' => {},
                   'number' => 4

Index: t/results/info_tests/multitable_anchor_and_index_entry.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/info_tests/multitable_anchor_and_index_entry.pl   1 Nov 2011 
12:26:05 -0000       1.16
+++ t/results/info_tests/multitable_anchor_and_index_entry.pl   3 Dec 2011 
14:58:38 -0000       1.17
@@ -358,6 +358,7 @@
                                   'index_at_command' => 'cindex',
                                   'index_name' => 'cp',
                                   'index_prefix' => 'c',
+                                  'index_type_command' => 'cindex',
                                   'key' => 'index entry within multitable',
                                   'node' => {},
                                   'number' => 1
@@ -740,6 +741,7 @@
                                   'index_at_command' => 'cindex',
                                   'index_name' => 'cp',
                                   'index_prefix' => 'c',
+                                  'index_type_command' => 'cindex',
                                   'key' => 'index entry',
                                   'node' => {},
                                   'number' => 2

Index: t/results/info_tests/nested_multitable_anchor_index.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/info_tests/nested_multitable_anchor_index.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/info_tests/nested_multitable_anchor_index.pl      1 Nov 2011 
12:26:05 -0000       1.15
+++ t/results/info_tests/nested_multitable_anchor_index.pl      3 Dec 2011 
14:58:38 -0000       1.16
@@ -285,6 +285,7 @@
                                                   'index_at_command' => 
'cindex',
                                                   'index_name' => 'cp',
                                                   'index_prefix' => 'c',
+                                                  'index_type_command' => 
'cindex',
                                                   'key' => 'index entry 
inside',
                                                   'node' => {},
                                                   'number' => 1
@@ -565,6 +566,7 @@
                                   'index_at_command' => 'cindex',
                                   'index_name' => 'cp',
                                   'index_prefix' => 'c',
+                                  'index_type_command' => 'cindex',
                                   'key' => 'index entry',
                                   'node' => {},
                                   'number' => 2

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.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- t/results/invalid_nestings/block_not_matching.pl    29 Oct 2011 16:38:07 
-0000      1.37
+++ t/results/invalid_nestings/block_not_matching.pl    3 Dec 2011 14:58:38 
-0000       1.38
@@ -138,6 +138,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'print_navigation',
               'number' => 1
             },

Index: t/results/invalid_nestings/center.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/invalid_nestings/center.pl,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- t/results/invalid_nestings/center.pl        29 Oct 2011 14:44:49 -0000      
1.45
+++ t/results/invalid_nestings/center.pl        3 Dec 2011 14:58:38 -0000       
1.46
@@ -212,6 +212,7 @@
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
+                  'index_type_command' => 'cindex',
                   'key' => 'cindex',
                   'number' => 1
                 },

Index: t/results/invalid_nestings/def_in_style_command.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/def_in_style_command.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/invalid_nestings/def_in_style_command.pl  29 Oct 2011 14:44:49 
-0000      1.11
+++ t/results/invalid_nestings/def_in_style_command.pl  3 Dec 2011 14:58:38 
-0000       1.12
@@ -113,6 +113,7 @@
               'index_at_command' => 'defun',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'defun',
               'key' => 'name',
               'number' => 1
             },

Index: t/results/invalid_nestings/def_not_closed_in_menu_description.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- t/results/invalid_nestings/def_not_closed_in_menu_description.pl    3 Sep 
2011 21:51:36 -0000       1.31
+++ t/results/invalid_nestings/def_not_closed_in_menu_description.pl    3 Dec 
2011 14:58:38 -0000       1.32
@@ -130,6 +130,7 @@
                           'index_at_command' => 'deffn',
                           'index_name' => 'fn',
                           'index_prefix' => 'f',
+                          'index_type_command' => 'deffn',
                           'key' => 'truc',
                           'number' => 1
                         },

Index: t/results/invalid_nestings/in_table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/invalid_nestings/in_table.pl,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- t/results/invalid_nestings/in_table.pl      20 Oct 2011 20:51:08 -0000      
1.42
+++ t/results/invalid_nestings/in_table.pl      3 Dec 2011 14:58:38 -0000       
1.43
@@ -659,6 +659,7 @@
                                   'index_at_command' => 'cindex',
                                   'index_name' => 'cp',
                                   'index_prefix' => 'c',
+                                  'index_type_command' => 'cindex',
                                   'key' => 'index',
                                   'node' => {},
                                   'number' => 1
@@ -844,6 +845,7 @@
                                   'index_at_command' => 'cindex',
                                   'index_name' => 'cp',
                                   'index_prefix' => 'c',
+                                  'index_type_command' => 'cindex',
                                   'key' => 'index',
                                   'node' => {},
                                   'number' => 2
@@ -873,9 +875,10 @@
                           ],
                           'content_normalized' => [],
                           'in_code' => 1,
-                          'index_at_command' => 'vtable',
+                          'index_at_command' => 'item',
                           'index_name' => 'vr',
                           'index_prefix' => 'v',
+                          'index_type_command' => 'vtable',
                           'key' => '',
                           'node' => {},
                           'number' => 1
@@ -992,6 +995,7 @@
                                   'index_at_command' => 'cindex',
                                   'index_name' => 'cp',
                                   'index_prefix' => 'c',
+                                  'index_type_command' => 'cindex',
                                   'key' => '2 index',
                                   'node' => {},
                                   'number' => 3
@@ -1021,9 +1025,10 @@
                           ],
                           'content_normalized' => [],
                           'in_code' => 1,
-                          'index_at_command' => 'vtable',
+                          'index_at_command' => 'item',
                           'index_name' => 'vr',
                           'index_prefix' => 'v',
+                          'index_type_command' => 'vtable',
                           'key' => '',
                           'node' => {},
                           'number' => 2
@@ -1666,6 +1671,24 @@
     'macro' => '',
     'text' => '@cindex should not appear in @item',
     'type' => 'warning'
+  },
+  {
+    'error_line' => ':17: warning: Empty index key in @item
+',
+    'file_name' => '',
+    'line_nr' => 17,
+    'macro' => '',
+    'text' => 'Empty index key in @item',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':20: warning: Empty index key in @item
+',
+    'file_name' => '',
+    'line_nr' => 20,
+    'macro' => '',
+    'text' => 'Empty index key in @item',
+    'type' => 'warning'
   }
 ];
 

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.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- t/results/invalid_nestings/multitable_item_in_index.pl      29 Oct 2011 
14:44:49 -0000      1.26
+++ t/results/invalid_nestings/multitable_item_in_index.pl      3 Dec 2011 
14:58:38 -0000       1.27
@@ -105,6 +105,7 @@
                   'index_at_command' => 'vindex',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'vindex',
                   'key' => 'on item line',
                   'number' => 1
                 },

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.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/invalid_nestings/on_def_line.pl   29 Oct 2011 16:38:07 -0000      
1.25
+++ t/results/invalid_nestings/on_def_line.pl   3 Dec 2011 14:58:39 -0000       
1.26
@@ -231,6 +231,7 @@
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'in titlefont',
               'number' => 1
             },
@@ -462,6 +463,7 @@
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'deffn',
               'key' => 'in titlefontx',
               'number' => 2
             },

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.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- t/results/invalid_nestings/on_index_entry_line.pl   4 Sep 2011 12:14:05 
-0000       1.30
+++ t/results/invalid_nestings/on_index_entry_line.pl   3 Dec 2011 14:58:39 
-0000       1.31
@@ -192,6 +192,7 @@
           'index_at_command' => 'cindex',
           'index_name' => 'cp',
           'index_prefix' => 'c',
+          'index_type_command' => 'cindex',
           'key' => 'in titlefont exdent
 ',
           'number' => 1

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.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- t/results/invalid_nestings/tab_in_index.pl  29 Oct 2011 14:44:50 -0000      
1.29
+++ t/results/invalid_nestings/tab_in_index.pl  3 Dec 2011 14:58:39 -0000       
1.30
@@ -162,6 +162,7 @@
                               'index_at_command' => 'vindex',
                               'index_name' => 'vr',
                               'index_prefix' => 'v',
+                              'index_type_command' => 'vindex',
                               'key' => 'in index entry in tab',
                               'number' => 1
                             },

Index: t/results/itemize/inter_item_commands_in_itemize.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/itemize/inter_item_commands_in_itemize.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/itemize/inter_item_commands_in_itemize.pl 4 Sep 2011 12:14:05 
-0000       1.10
+++ t/results/itemize/inter_item_commands_in_itemize.pl 3 Dec 2011 14:58:39 
-0000       1.11
@@ -90,6 +90,7 @@
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
+                  'index_type_command' => 'cindex',
                   'key' => 'also a cindex in itemize',
                   'number' => 1
                 },
@@ -274,6 +275,7 @@
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
+                  'index_type_command' => 'cindex',
                   'key' => 'index entry within itemize',
                   'number' => 2
                 },
@@ -384,6 +386,7 @@
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
+                  'index_type_command' => 'cindex',
                   'key' => 'index entry right after @item',
                   'number' => 3
                 },
@@ -550,6 +553,7 @@
                       'index_at_command' => 'cindex',
                       'index_name' => 'cp',
                       'index_prefix' => 'c',
+                      'index_type_command' => 'cindex',
                       'key' => 'also a cindex in itemize',
                       'number' => 4
                     },

Index: t/results/languages/multiple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/languages/multiple.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/languages/multiple.pl     1 Dec 2011 17:50:06 -0000       1.16
+++ t/results/languages/multiple.pl     3 Dec 2011 14:58:39 -0000       1.17
@@ -180,6 +180,7 @@
                       'index_at_command' => 'defivar',
                       'index_name' => 'vr',
                       'index_prefix' => 'v',
+                      'index_type_command' => 'defivar',
                       'key' => 'a de copying',
                       'number' => 1,
                       'region' => {}
@@ -452,6 +453,7 @@
                   'index_at_command' => 'defivar',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'defivar',
                   'key' => 'BBB de fr',
                   'node' => {},
                   'number' => 2
@@ -693,6 +695,7 @@
                   'index_at_command' => 'defivar',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'defivar',
                   'key' => 'BBB da pt',
                   'node' => {},
                   'number' => 3

Index: t/results/languages/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/languages/simple.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/languages/simple.pl       3 Sep 2011 21:51:37 -0000       1.10
+++ t/results/languages/simple.pl       3 Dec 2011 14:58:39 -0000       1.11
@@ -207,6 +207,7 @@
                   'index_at_command' => 'defivar',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
+                  'index_type_command' => 'defivar',
                   'key' => 'BBB de AAA',
                   'node' => {},
                   'number' => 1

Index: t/results/macro/backslash_in_arg.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/macro/backslash_in_arg.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/macro/backslash_in_arg.pl 26 Sep 2011 17:15:48 -0000      1.4
+++ t/results/macro/backslash_in_arg.pl 3 Dec 2011 14:58:39 -0000       1.5
@@ -144,6 +144,7 @@
               'index_at_command' => 'findex',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'findex',
               'key' => '\\\\q',
               'node' => {},
               'number' => 1
@@ -197,6 +198,7 @@
               'index_at_command' => 'findex',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'findex',
               'key' => '\\r',
               'node' => {},
               'number' => 2
@@ -250,6 +252,7 @@
               'index_at_command' => 'findex',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'findex',
               'key' => '\\q',
               'node' => {},
               'number' => 3
@@ -303,6 +306,7 @@
               'index_at_command' => 'findex',
               'index_name' => 'fn',
               'index_prefix' => 'f',
+              'index_type_command' => 'findex',
               'key' => '\\r',
               'node' => {},
               'number' => 4

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.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- t/results/macro/macro_in_index_commands.pl  30 Oct 2011 00:51:19 -0000      
1.37
+++ t/results/macro/macro_in_index_commands.pl  3 Dec 2011 14:58:39 -0000       
1.38
@@ -829,6 +829,7 @@
               'index_at_command' => 'trucindex',
               'index_name' => 'truc',
               'index_prefix' => 'truc',
+              'index_type_command' => 'trucindex',
               'key' => 'index truc',
               'node' => {},
               'number' => 1
@@ -971,6 +972,7 @@
               'index_at_command' => 'codeidxindex',
               'index_name' => 'codeidx',
               'index_prefix' => 'codeidx',
+              'index_type_command' => 'codeidxindex',
               'key' => 'a index entry te\' i^',
               'node' => {},
               'number' => 1
@@ -1030,6 +1032,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'cindex entry',
               'node' => {},
               'number' => 1
@@ -1136,6 +1139,7 @@
               'index_at_command' => 'kindex',
               'index_name' => 'ky',
               'index_prefix' => 'k',
+              'index_type_command' => 'kindex',
               'key' => 'truc kindex',
               'node' => {},
               'number' => 1
@@ -1189,6 +1193,7 @@
               'index_at_command' => 'pindex',
               'index_name' => 'pg',
               'index_prefix' => 'p',
+              'index_type_command' => 'pindex',
               'key' => 'pindex codeidx',
               'node' => {},
               'number' => 1
@@ -1469,6 +1474,7 @@
               'index_at_command' => 'defgindex',
               'index_name' => 'defg',
               'index_prefix' => 'defg',
+              'index_type_command' => 'defgindex',
               'key' => 'defg index entry',
               'node' => {},
               'number' => 1
@@ -1528,6 +1534,7 @@
               'index_at_command' => 'abcindex',
               'index_name' => 'abc',
               'index_prefix' => 'abc',
+              'index_type_command' => 'abcindex',
               'key' => 'abc index entry',
               'node' => {},
               'number' => 1

Index: t/results/menu/menu_in_deffn.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/menu_in_deffn.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/menu/menu_in_deffn.pl     3 Sep 2011 21:51:37 -0000       1.16
+++ t/results/menu/menu_in_deffn.pl     3 Dec 2011 14:58:39 -0000       1.17
@@ -124,6 +124,7 @@
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'deffn',
                   'key' => 'b',
                   'node' => {},
                   'number' => 1

Index: t/results/misc_commands/comment_space_command_on_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/misc_commands/comment_space_command_on_line.pl    1 Nov 2011 
12:26:08 -0000       1.20
+++ t/results/misc_commands/comment_space_command_on_line.pl    3 Dec 2011 
14:58:39 -0000       1.21
@@ -291,6 +291,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'index entry  ',
               'node' => {},
               'number' => 1

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.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- t/results/misc_commands/index_entries.pl    4 Sep 2011 12:14:06 -0000       
1.30
+++ t/results/misc_commands/index_entries.pl    3 Dec 2011 14:58:40 -0000       
1.31
@@ -46,6 +46,7 @@
           'index_at_command' => 'cindex',
           'index_name' => 'cp',
           'index_prefix' => 'c',
+          'index_type_command' => 'cindex',
           'key' => 'cindex entry',
           'number' => 1
         },
@@ -150,6 +151,7 @@
           'index_at_command' => 'trucindex',
           'index_name' => 'truc',
           'index_prefix' => 'truc',
+          'index_type_command' => 'trucindex',
           'key' => 'index truc',
           'number' => 1
         },

Index: t/results/multitable/inter_item_commands_in_multitable.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/multitable/inter_item_commands_in_multitable.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/multitable/inter_item_commands_in_multitable.pl   4 Sep 2011 
12:14:06 -0000       1.12
+++ t/results/multitable/inter_item_commands_in_multitable.pl   3 Dec 2011 
14:58:40 -0000       1.13
@@ -136,6 +136,7 @@
                           'index_at_command' => 'cindex',
                           'index_name' => 'cp',
                           'index_prefix' => 'c',
+                          'index_type_command' => 'cindex',
                           'key' => 'index entry between empty lines',
                           'number' => 1
                         },
@@ -607,6 +608,7 @@
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
                               'index_prefix' => 'c',
+                              'index_type_command' => 'cindex',
                               'key' => 'index entry within multitable',
                               'number' => 2
                             },

Index: t/results/plaintext_tests/at_commands_glued_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/plaintext_tests/at_commands_glued_in_example.pl   4 Sep 2011 
12:14:06 -0000       1.11
+++ t/results/plaintext_tests/at_commands_glued_in_example.pl   3 Dec 2011 
14:58:40 -0000       1.12
@@ -531,6 +531,7 @@
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
+                  'index_type_command' => 'cindex',
                   'key' => 'index',
                   'number' => 1
                 },

Index: t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/plaintext_tests/at_commands_glued_in_paragraph.pl 4 Sep 2011 
12:14:06 -0000       1.11
+++ t/results/plaintext_tests/at_commands_glued_in_paragraph.pl 3 Dec 2011 
14:58:40 -0000       1.12
@@ -525,6 +525,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'index',
               'number' => 1
             },

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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/preformatted/def_in_example.pl    1 Dec 2011 17:50:07 -0000       
1.18
+++ t/results/preformatted/def_in_example.pl    3 Dec 2011 14:58:40 -0000       
1.19
@@ -96,6 +96,7 @@
                   'index_at_command' => 'defun',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
+                  'index_type_command' => 'defun',
                   'key' => 'name',
                   'number' => 1
                 },

Index: t/results/sectioning/no_element.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/no_element.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/sectioning/no_element.pl  3 Nov 2011 23:54:51 -0000       1.22
+++ t/results/sectioning/no_element.pl  3 Dec 2011 14:58:40 -0000       1.23
@@ -751,6 +751,7 @@
           'index_at_command' => 'cindex',
           'index_name' => 'cp',
           'index_prefix' => 'c',
+          'index_type_command' => 'cindex',
           'key' => 'index entry',
           'number' => 1
         },

Index: t/results/sectioning/placed_things_before_element.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/sectioning/placed_things_before_element.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/sectioning/placed_things_before_element.pl        3 Nov 2011 
23:54:51 -0000       1.21
+++ t/results/sectioning/placed_things_before_element.pl        3 Dec 2011 
14:58:40 -0000       1.22
@@ -661,6 +661,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'index entry',
               'number' => 1
             },

Index: t/results/test_count/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/test_count/commands.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- t/results/test_count/commands.pl    30 Oct 2011 00:51:21 -0000      1.26
+++ t/results/test_count/commands.pl    3 Dec 2011 14:58:40 -0000       1.27
@@ -361,9 +361,10 @@
                       ],
                       'content_normalized' => [],
                       'in_code' => 1,
-                      'index_at_command' => 'vtable',
+                      'index_at_command' => 'item',
                       'index_name' => 'vr',
                       'index_prefix' => 'v',
+                      'index_type_command' => 'vtable',
                       'key' => 'vitem table',
                       'number' => 1
                     },

Index: t/results/test_count/printindex.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/test_count/printindex.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/test_count/printindex.pl  1 Nov 2011 12:26:12 -0000       1.12
+++ t/results/test_count/printindex.pl  3 Dec 2011 14:58:40 -0000       1.13
@@ -86,6 +86,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'index entry',
               'node' => {},
               'number' => 1
@@ -139,6 +140,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'index entry',
               'node' => {},
               'number' => 2
@@ -192,6 +194,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 
'looooooooooooooooooooooooooooooooooooooooooooooooooooooooooong index entry',
               'node' => {},
               'number' => 3
@@ -297,6 +300,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'after index',
               'node' => {},
               'number' => 4

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.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- t/results/value/value_in_index_commands.pl  30 Oct 2011 00:51:21 -0000      
1.33
+++ t/results/value/value_in_index_commands.pl  3 Dec 2011 14:58:41 -0000       
1.34
@@ -453,6 +453,7 @@
               'index_at_command' => 'trucindex',
               'index_name' => 'truc',
               'index_prefix' => 'truc',
+              'index_type_command' => 'trucindex',
               'key' => 'index truc',
               'node' => {},
               'number' => 1
@@ -595,6 +596,7 @@
               'index_at_command' => 'codeidxindex',
               'index_name' => 'codeidx',
               'index_prefix' => 'codeidx',
+              'index_type_command' => 'codeidxindex',
               'key' => 'a index entry te\' i^',
               'node' => {},
               'number' => 1
@@ -650,6 +652,7 @@
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
+              'index_type_command' => 'cindex',
               'key' => 'cindex entry',
               'node' => {},
               'number' => 1
@@ -756,6 +759,7 @@
               'index_at_command' => 'kindex',
               'index_name' => 'ky',
               'index_prefix' => 'k',
+              'index_type_command' => 'kindex',
               'key' => 'truc kindex',
               'node' => {},
               'number' => 1
@@ -809,6 +813,7 @@
               'index_at_command' => 'pindex',
               'index_name' => 'pg',
               'index_prefix' => 'p',
+              'index_type_command' => 'pindex',
               'key' => 'pindex codeidx',
               'node' => {},
               'number' => 1
@@ -1089,6 +1094,7 @@
               'index_at_command' => 'defgindex',
               'index_name' => 'defg',
               'index_prefix' => 'defg',
+              'index_type_command' => 'defgindex',
               'key' => 'defg index entry',
               'node' => {},
               'number' => 1
@@ -1148,6 +1154,7 @@
               'index_at_command' => 'abcindex',
               'index_name' => 'abc',
               'index_prefix' => 'abc',
+              'index_type_command' => 'abcindex',
               'key' => 'abc index entry',
               'node' => {},
               'number' => 1

Index: t/results/xtable/empty_item_itemx.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/empty_item_itemx.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/xtable/empty_item_itemx.pl        15 Oct 2011 16:11:18 -0000      
1.19
+++ t/results/xtable/empty_item_itemx.pl        3 Dec 2011 14:58:41 -0000       
1.20
@@ -106,9 +106,10 @@
                       ],
                       'content_normalized' => [],
                       'in_code' => 1,
-                      'index_at_command' => 'vtable',
+                      'index_at_command' => 'item',
                       'index_name' => 'vr',
                       'index_prefix' => 'v',
+                      'index_type_command' => 'vtable',
                       'key' => 'first item',
                       'number' => 1
                     },
@@ -186,9 +187,10 @@
                       ],
                       'content_normalized' => [],
                       'in_code' => 1,
-                      'index_at_command' => 'vtable',
+                      'index_at_command' => 'itemx',
                       'index_name' => 'vr',
                       'index_prefix' => 'v',
+                      'index_type_command' => 'vtable',
                       'key' => 'after an empty itemx, before an empty item',
                       'number' => 2
                     },
@@ -290,9 +292,10 @@
                       ],
                       'content_normalized' => [],
                       'in_code' => 1,
-                      'index_at_command' => 'vtable',
+                      'index_at_command' => 'item',
                       'index_name' => 'vr',
                       'index_prefix' => 'v',
+                      'index_type_command' => 'vtable',
                       'key' => 'in item before end table',
                       'number' => 3
                     },

Index: t/results/xtable/inter_item_commands_in_table.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/xtable/inter_item_commands_in_table.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/xtable/inter_item_commands_in_table.pl    17 Sep 2011 21:24:00 
-0000      1.17
+++ t/results/xtable/inter_item_commands_in_table.pl    3 Dec 2011 14:58:41 
-0000       1.18
@@ -95,9 +95,10 @@
                       ],
                       'content_normalized' => [],
                       'in_code' => 1,
-                      'index_at_command' => 'vtable',
+                      'index_at_command' => 'item',
                       'index_name' => 'vr',
                       'index_prefix' => 'v',
+                      'index_type_command' => 'vtable',
                       'key' => 'a',
                       'number' => 1
                     },
@@ -268,9 +269,10 @@
                       ],
                       'content_normalized' => [],
                       'in_code' => 1,
-                      'index_at_command' => 'vtable',
+                      'index_at_command' => 'item',
                       'index_name' => 'vr',
                       'index_prefix' => 'v',
+                      'index_type_command' => 'vtable',
                       'key' => 'a',
                       'number' => 2
                     },
@@ -337,9 +339,10 @@
                       ],
                       'content_normalized' => [],
                       'in_code' => 1,
-                      'index_at_command' => 'vtable',
+                      'index_at_command' => 'itemx',
                       'index_name' => 'vr',
                       'index_prefix' => 'v',
+                      'index_type_command' => 'vtable',
                       'key' => 'b',
                       'number' => 3
                     },
@@ -510,9 +513,10 @@
                       ],
                       'content_normalized' => [],
                       'in_code' => 1,
-                      'index_at_command' => 'ftable',
+                      'index_at_command' => 'item',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',
+                      'index_type_command' => 'ftable',
                       'key' => 'a',
                       'number' => 1
                     },
@@ -566,6 +570,7 @@
                           'index_at_command' => 'cindex',
                           'index_name' => 'cp',
                           'index_prefix' => 'c',
+                          'index_type_command' => 'cindex',
                           'key' => 'index entry between item and itemx',
                           'number' => 1
                         },
@@ -643,9 +648,10 @@
                       ],
                       'content_normalized' => [],
                       'in_code' => 1,
-                      'index_at_command' => 'ftable',
+                      'index_at_command' => 'itemx',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',
+                      'index_type_command' => 'ftable',
                       'key' => 'b',
                       'number' => 2
                     },
@@ -723,9 +729,10 @@
                       ],
                       'content_normalized' => [],
                       'in_code' => 1,
-                      'index_at_command' => 'ftable',
+                      'index_at_command' => 'item',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',
+                      'index_type_command' => 'ftable',
                       'key' => 'c',
                       'number' => 3
                     },
@@ -804,9 +811,10 @@
                       ],
                       'content_normalized' => [],
                       'in_code' => 1,
-                      'index_at_command' => 'ftable',
+                      'index_at_command' => 'itemx',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',
+                      'index_type_command' => 'ftable',
                       'key' => 'd',
                       'number' => 4
                     },
@@ -985,6 +993,7 @@
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
+                  'index_type_command' => 'cindex',
                   'key' => 'cindex in table',
                   'number' => 2
                 },
@@ -1217,6 +1226,7 @@
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
+                  'index_type_command' => 'cindex',
                   'key' => 'cindex in table',
                   'number' => 3
                 },

Index: t/results/xtable/inter_item_commands_in_table_in_example.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/xtable/inter_item_commands_in_table_in_example.pl 27 Sep 2011 
21:16:06 -0000      1.1
+++ t/results/xtable/inter_item_commands_in_table_in_example.pl 3 Dec 2011 
14:58:41 -0000       1.2
@@ -136,6 +136,7 @@
                                   'index_at_command' => 'cindex',
                                   'index_name' => 'cp',
                                   'index_prefix' => 'c',
+                                  'index_type_command' => 'cindex',
                                   'key' => 'index entry between item and 
itemx',
                                   'number' => 1
                                 },

Index: t/results/xtable/table_nested.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/table_nested.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/xtable/table_nested.pl    2 Nov 2011 12:13:58 -0000       1.17
+++ t/results/xtable/table_nested.pl    3 Dec 2011 14:58:41 -0000       1.18
@@ -290,9 +290,10 @@
                           ],
                           'content_normalized' => [],
                           'in_code' => 1,
-                          'index_at_command' => 'vtable',
+                          'index_at_command' => 'item',
                           'index_name' => 'vr',
                           'index_prefix' => 'v',
+                          'index_type_command' => 'vtable',
                           'key' => 'first item',
                           'number' => 1
                         },
@@ -341,9 +342,10 @@
                           ],
                           'content_normalized' => [],
                           'in_code' => 1,
-                          'index_at_command' => 'vtable',
+                          'index_at_command' => 'itemx',
                           'index_name' => 'vr',
                           'index_prefix' => 'v',
+                          'index_type_command' => 'vtable',
                           'key' => 'second itemx',
                           'number' => 2
                         },
@@ -433,9 +435,10 @@
                           ],
                           'content_normalized' => [],
                           'in_code' => 1,
-                          'index_at_command' => 'vtable',
+                          'index_at_command' => 'item',
                           'index_name' => 'vr',
                           'index_prefix' => 'v',
+                          'index_type_command' => 'vtable',
                           'key' => 'second item',
                           'number' => 3
                         },
@@ -525,9 +528,10 @@
                           ],
                           'content_normalized' => [],
                           'in_code' => 1,
-                          'index_at_command' => 'vtable',
+                          'index_at_command' => 'item',
                           'index_name' => 'vr',
                           'index_prefix' => 'v',
+                          'index_type_command' => 'vtable',
                           'key' => 'last',
                           'number' => 4
                         },
@@ -1008,9 +1012,10 @@
                           ],
                           'content_normalized' => [],
                           'in_code' => 1,
-                          'index_at_command' => 'vtable',
+                          'index_at_command' => 'item',
                           'index_name' => 'vr',
                           'index_prefix' => 'v',
+                          'index_type_command' => 'vtable',
                           'key' => 'first item',
                           'number' => 5
                         },
@@ -1059,9 +1064,10 @@
                           ],
                           'content_normalized' => [],
                           'in_code' => 1,
-                          'index_at_command' => 'vtable',
+                          'index_at_command' => 'itemx',
                           'index_name' => 'vr',
                           'index_prefix' => 'v',
+                          'index_type_command' => 'vtable',
                           'key' => 'second itemx',
                           'number' => 6
                         },
@@ -1151,9 +1157,10 @@
                           ],
                           'content_normalized' => [],
                           'in_code' => 1,
-                          'index_at_command' => 'vtable',
+                          'index_at_command' => 'item',
                           'index_name' => 'vr',
                           'index_prefix' => 'v',
+                          'index_type_command' => 'vtable',
                           'key' => 'second item',
                           'number' => 7
                         },
@@ -1243,9 +1250,10 @@
                           ],
                           'content_normalized' => [],
                           'in_code' => 1,
-                          'index_at_command' => 'vtable',
+                          'index_at_command' => 'item',
                           'index_name' => 'vr',
                           'index_prefix' => 'v',
+                          'index_type_command' => 'vtable',
                           'key' => 'last',
                           'number' => 8
                         },
@@ -1738,9 +1746,10 @@
                               ],
                               'content_normalized' => [],
                               'in_code' => 1,
-                              'index_at_command' => 'vtable',
+                              'index_at_command' => 'item',
                               'index_name' => 'vr',
                               'index_prefix' => 'v',
+                              'index_type_command' => 'vtable',
                               'key' => 'first item',
                               'number' => 9
                             },
@@ -1789,9 +1798,10 @@
                               ],
                               'content_normalized' => [],
                               'in_code' => 1,
-                              'index_at_command' => 'vtable',
+                              'index_at_command' => 'itemx',
                               'index_name' => 'vr',
                               'index_prefix' => 'v',
+                              'index_type_command' => 'vtable',
                               'key' => 'second itemx',
                               'number' => 10
                             },
@@ -1881,9 +1891,10 @@
                               ],
                               'content_normalized' => [],
                               'in_code' => 1,
-                              'index_at_command' => 'vtable',
+                              'index_at_command' => 'item',
                               'index_name' => 'vr',
                               'index_prefix' => 'v',
+                              'index_type_command' => 'vtable',
                               'key' => 'second item',
                               'number' => 11
                             },
@@ -1973,9 +1984,10 @@
                               ],
                               'content_normalized' => [],
                               'in_code' => 1,
-                              'index_at_command' => 'vtable',
+                              'index_at_command' => 'item',
                               'index_name' => 'vr',
                               'index_prefix' => 'v',
+                              'index_type_command' => 'vtable',
                               'key' => 'last',
                               'number' => 12
                             },

Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -b -r1.338 -r1.339
--- Texinfo/Parser.pm   30 Nov 2011 00:11:16 -0000      1.338
+++ Texinfo/Parser.pm   3 Dec 2011 14:58:41 -0000       1.339
@@ -2211,9 +2211,10 @@
 # for index entries and v|ftable items, it is the index entry content, 
 # for def, it is the parsed arguments, based on the definition line 
 # arguments.
-sub _enter_index_entry($$$$$$)
+sub _enter_index_entry($$$$$$$)
 {
   my $self = shift;
+  my $command_container = shift;
   my $command = shift;
   my $current = shift;
   my $content = shift;
@@ -2222,13 +2223,14 @@
 
   $content_normalized = $content if (!defined($content_normalized));
 
-  my $prefix = $self->{'command_index_prefix'}->{$command};
+  my $prefix = $self->{'command_index_prefix'}->{$command_container};
   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_type_command'   => $command_container,
                       'index_prefix'         => $prefix,
                       'content'              => $content,
                       'content_normalized'   => $content_normalized,
@@ -2511,6 +2513,7 @@
           $index_contents = [$index_entry];
         }
         _enter_index_entry($self, 
+          $current->{'parent'}->{'extra'}->{'def_command'},
           $current->{'parent'}->{'extra'}->{'original_def_cmdname'},
           $current->{'parent'}, $index_contents, 
           $index_contents_normalized, $line_nr);
@@ -2898,11 +2901,13 @@
         $current->{'extra'}->{'misc_content'} = address@hidden;
         if (($command eq 'item' or $command eq 'itemx')
             and 
$self->{'command_index_prefix'}->{$current->{'parent'}->{'cmdname'}}) {
-          _enter_index_entry($self, $current->{'parent'}->{'cmdname'}, 
$current,
+          _enter_index_entry($self, $current->{'parent'}->{'cmdname'}, 
+                             $command, $current,
                              $current->{'extra'}->{'misc_content'}, 
                              undef, $line_nr);
         } elsif ($self->{'command_index_prefix'}->{$current->{'cmdname'}}) {
-          _enter_index_entry($self, $current->{'cmdname'}, $current,
+          _enter_index_entry($self, $current->{'cmdname'}, 
+                             $current->{'cmdname'}, $current,
                              $current->{'extra'}->{'misc_content'}, 
                              undef, $line_nr);
           $current->{'type'} = 'index_entry_command';
@@ -5328,6 +5333,11 @@
 
 The name of the @-command associated with the index entry.
 
+=item index_type_command
+
+The @-command associated with the index entry allowing to 
+find the index type.
+
 =item content
 
 An array reference corresponding to the index entry content.

Index: Texinfo/Structuring.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Structuring.pm,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- Texinfo/Structuring.pm      23 Nov 2011 22:13:56 -0000      1.108
+++ Texinfo/Structuring.pm      3 Dec 2011 14:58:41 -0000       1.109
@@ -1180,6 +1180,11 @@
       $entry->{'key'} = Texinfo::Convert::Text::convert(
                               {'contents' => $entry->{'content'}},
                   {%$options, Texinfo::Common::_convert_text_options($self)});
+      if ($entry->{'key'} !~ /\S/) {
+        $self->line_warn(sprintf($self->__("Empty index key in 
address@hidden"), 
+                                 $entry->{'index_at_command'}),
+                        $entry->{'command'}->{'line_nr'});
+      }
     }
   }
 }

Index: t/results/indices/empty_string_index_entry.pl
===================================================================
RCS file: t/results/indices/empty_string_index_entry.pl
diff -N t/results/indices/empty_string_index_entry.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/indices/empty_string_index_entry.pl       3 Dec 2011 14:58:36 
-0000       1.1
@@ -0,0 +1,984 @@
+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_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'empty_string_index_entry'} = {
+  'contents' => [
+    {
+      'contents' => [],
+      'parent' => {},
+      'type' => 'text_root'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'extra' => {
+                'command' => {}
+              },
+              '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' => [
+                {
+                  'extra' => {
+                    'command' => {}
+                  },
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'args' => [
+                    {
+                      'contents' => [],
+                      'parent' => {},
+                      'type' => 'brace_command_arg'
+                    }
+                  ],
+                  'cmdname' => 'w',
+                  'contents' => [],
+                  'line_nr' => {
+                    'file_name' => '',
+                    'line_nr' => 3,
+                    'macro' => ''
+                  },
+                  'parent' => {}
+                },
+                {
+                  'parent' => {},
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'findex',
+          'extra' => {
+            'index_entry' => {
+              'command' => {},
+              'content' => [
+                {}
+              ],
+              'content_normalized' => [],
+              'in_code' => 1,
+              'index_at_command' => 'findex',
+              'index_name' => 'fn',
+              'index_prefix' => 'f',
+              'index_type_command' => 'findex',
+              'key' => '',
+              'node' => {},
+              'number' => 1
+            },
+            'misc_content' => []
+          },
+          'line_nr' => {},
+          'parent' => {},
+          'type' => 'index_entry_command'
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'extra' => {
+                    'command' => {}
+                  },
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'cmdname' => 'code',
+                  'parent' => {},
+                  'type' => 'command_as_argument'
+                },
+                {
+                  'parent' => {},
+                  'text' => '
+',
+                  'type' => 'space_at_end_block_command'
+                }
+              ],
+              'parent' => {},
+              'type' => 'block_line_arg'
+            }
+          ],
+          'cmdname' => 'ftable',
+          'contents' => [
+            {
+              'contents' => [
+                {
+                  'contents' => [
+                    {
+                      'args' => [
+                        {
+                          'contents' => [
+                            {
+                              'extra' => {
+                                'command' => {}
+                              },
+                              'parent' => {},
+                              'text' => ' ',
+                              'type' => 'empty_spaces_after_command'
+                            },
+                            {
+                              'args' => [
+                                {
+                                  'contents' => [],
+                                  'parent' => {},
+                                  'type' => 'brace_command_arg'
+                                }
+                              ],
+                              'cmdname' => 'w',
+                              'contents' => [],
+                              'line_nr' => {
+                                'file_name' => '',
+                                'line_nr' => 6,
+                                'macro' => ''
+                              },
+                              'parent' => {}
+                            },
+                            {
+                              'parent' => {},
+                              'text' => '
+',
+                              'type' => 'spaces_at_end'
+                            }
+                          ],
+                          'parent' => {},
+                          'type' => 'misc_line_arg'
+                        }
+                      ],
+                      'cmdname' => 'item',
+                      'extra' => {
+                        'index_entry' => {
+                          'command' => {},
+                          'content' => [
+                            {}
+                          ],
+                          'content_normalized' => [],
+                          'in_code' => 1,
+                          'index_at_command' => 'item',
+                          'index_name' => 'fn',
+                          'index_prefix' => 'f',
+                          'index_type_command' => 'ftable',
+                          'key' => '',
+                          'node' => {},
+                          'number' => 2
+                        },
+                        'misc_content' => []
+                      },
+                      'line_nr' => {},
+                      'parent' => {}
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'table_term'
+                }
+              ],
+              'parent' => {},
+              'type' => 'table_entry'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'extra' => {
+                        'command' => {}
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'empty_spaces_after_command'
+                    },
+                    {
+                      'parent' => {},
+                      'text' => 'ftable'
+                    },
+                    {
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'misc_line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'command' => {},
+                'command_argument' => 'ftable',
+                'text_arg' => 'ftable'
+              },
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 7,
+                'macro' => ''
+              },
+              'parent' => {}
+            }
+          ],
+          'extra' => {
+            'block_command_line_contents' => [
+              [
+                {}
+              ]
+            ],
+            'command_as_argument' => {},
+            'end_command' => {}
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 5,
+            'macro' => ''
+          },
+          'parent' => {}
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'cmdname' => 'defun',
+          'contents' => [
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'extra' => {
+                        'command' => {}
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'empty_spaces_after_command'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'args' => [
+                            {
+                              'contents' => [],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'w',
+                          'contents' => [],
+                          'line_nr' => {
+                            'file_name' => '',
+                            'line_nr' => 9,
+                            'macro' => ''
+                          },
+                          'parent' => {}
+                        }
+                      ],
+                      'line_nr' => {},
+                      'parent' => {},
+                      'type' => 'bracketed'
+                    },
+                    {
+                      'parent' => {},
+                      'text' => ' '
+                    },
+                    {
+                      'contents' => [],
+                      'line_nr' => {},
+                      'parent' => {},
+                      'type' => 'bracketed'
+                    },
+                    {
+                      'parent' => {},
+                      'text' => ' '
+                    },
+                    {
+                      'contents' => [],
+                      'line_nr' => {},
+                      'parent' => {},
+                      'type' => 'bracketed'
+                    },
+                    {
+                      'parent' => {},
+                      'text' => '
+'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'block_line_arg'
+                }
+              ],
+              'extra' => {
+                'def_args' => [
+                  [
+                    'category',
+                    {
+                      'text' => 'Function'
+                    }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    }
+                  ],
+                  [
+                    'name',
+                    {
+                      'contents' => [],
+                      'parent' => {},
+                      'type' => 'bracketed_def_content'
+                    }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    }
+                  ],
+                  [
+                    'arg',
+                    {
+                      'contents' => [],
+                      'parent' => {},
+                      'type' => 'bracketed_def_content'
+                    }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    }
+                  ],
+                  [
+                    'arg',
+                    {
+                      'contents' => [],
+                      'parent' => {},
+                      'type' => 'bracketed_def_content'
+                    }
+                  ]
+                ],
+                'def_command' => 'defun',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'defun',
+                  'index_name' => 'fn',
+                  'index_prefix' => 'f',
+                  'index_type_command' => 'defun',
+                  'key' => '',
+                  'node' => {},
+                  'number' => 3
+                },
+                'original_def_cmdname' => 'defun'
+              },
+              'line_nr' => {},
+              'parent' => {},
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'extra' => {
+                        'command' => {}
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'empty_spaces_after_command'
+                    },
+                    {
+                      'contents' => [
+                        {
+                          'args' => [
+                            {
+                              'contents' => [],
+                              'parent' => {},
+                              'type' => 'brace_command_arg'
+                            }
+                          ],
+                          'cmdname' => 'w',
+                          'contents' => [],
+                          'line_nr' => {
+                            'file_name' => '',
+                            'line_nr' => 10,
+                            'macro' => ''
+                          },
+                          'parent' => {}
+                        }
+                      ],
+                      'line_nr' => {},
+                      'parent' => {},
+                      'type' => 'bracketed'
+                    },
+                    {
+                      'parent' => {},
+                      'text' => ' '
+                    },
+                    {
+                      'contents' => [],
+                      'line_nr' => {},
+                      'parent' => {},
+                      'type' => 'bracketed'
+                    },
+                    {
+                      'parent' => {},
+                      'text' => ' '
+                    },
+                    {
+                      'contents' => [],
+                      'line_nr' => {},
+                      'parent' => {},
+                      'type' => 'bracketed'
+                    },
+                    {
+                      'parent' => {},
+                      'text' => '
+'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'misc_line_arg'
+                }
+              ],
+              'cmdname' => 'defunx',
+              'extra' => {
+                'def_args' => [
+                  [
+                    'category',
+                    {
+                      'text' => 'Function'
+                    }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    }
+                  ],
+                  [
+                    'name',
+                    {
+                      'contents' => [],
+                      'parent' => {},
+                      'type' => 'bracketed_def_content'
+                    }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    }
+                  ],
+                  [
+                    'arg',
+                    {
+                      'contents' => [],
+                      'parent' => {},
+                      'type' => 'bracketed_def_content'
+                    }
+                  ],
+                  [
+                    'spaces',
+                    {
+                      'text' => ' ',
+                      'type' => 'spaces'
+                    }
+                  ],
+                  [
+                    'arg',
+                    {
+                      'contents' => [],
+                      'parent' => {},
+                      'type' => 'bracketed_def_content'
+                    }
+                  ]
+                ],
+                'def_command' => 'defun',
+                'def_parsed_hash' => {
+                  'category' => {},
+                  'name' => {}
+                },
+                'index_entry' => {
+                  'command' => {},
+                  'content' => [
+                    {}
+                  ],
+                  'content_normalized' => [
+                    {}
+                  ],
+                  'in_code' => 1,
+                  'index_at_command' => 'defunx',
+                  'index_name' => 'fn',
+                  'index_prefix' => 'f',
+                  'index_type_command' => 'defun',
+                  'key' => '',
+                  'node' => {},
+                  'number' => 4
+                },
+                'original_def_cmdname' => 'defunx'
+              },
+              'line_nr' => {},
+              'parent' => {},
+              'type' => 'def_line'
+            },
+            {
+              'args' => [
+                {
+                  'contents' => [
+                    {
+                      'extra' => {
+                        'command' => {}
+                      },
+                      'parent' => {},
+                      'text' => ' ',
+                      'type' => 'empty_spaces_after_command'
+                    },
+                    {
+                      'parent' => {},
+                      'text' => 'defun'
+                    },
+                    {
+                      'parent' => {},
+                      'text' => '
+',
+                      'type' => 'spaces_at_end'
+                    }
+                  ],
+                  'parent' => {},
+                  'type' => 'misc_line_arg'
+                }
+              ],
+              'cmdname' => 'end',
+              'extra' => {
+                'command' => {},
+                'command_argument' => 'defun',
+                'text_arg' => 'defun'
+              },
+              'line_nr' => {
+                'file_name' => '',
+                'line_nr' => 11,
+                'macro' => ''
+              },
+              'parent' => {}
+            }
+          ],
+          'extra' => {
+            'end_command' => {}
+          },
+          'line_nr' => {},
+          'parent' => {}
+        },
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'empty_line'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'extra' => {
+                    'command' => {}
+                  },
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => 'fn'
+                },
+                {
+                  'parent' => {},
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'printindex',
+          'extra' => {
+            'misc_args' => [
+              'fn'
+            ]
+          },
+          'line_nr' => {
+            'file_name' => '',
+            'line_nr' => 13,
+            'macro' => ''
+          },
+          'parent' => {}
+        }
+      ],
+      'extra' => {
+        'node_content' => [
+          {}
+        ],
+        'nodes_manuals' => [
+          {
+            'node_content' => [],
+            'normalized' => 'Top'
+          }
+        ],
+        'normalized' => 'Top'
+      },
+      'line_nr' => {
+        'file_name' => '',
+        'line_nr' => 1,
+        'macro' => ''
+      },
+      'parent' => {}
+    }
+  ],
+  'type' => 'document_root'
+};
+$result_trees{'empty_string_index_entry'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_string_index_entry'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'args'}[0]{'parent'} 
= $result_trees{'empty_string_index_entry'}{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'misc_content'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'index_entry'}{'content'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'index_entry'}{'content'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'command'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'command_as_argument'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'end_command'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[4]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'contents'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[0][1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[3]{'line_nr'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[4]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[5]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[6]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[2][1]{'contents'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[2][1]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[4][1]{'contents'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[4][1]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[6][1]{'contents'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[6][1]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[0][1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_parsed_hash'}{'name'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[2][1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'command'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'content'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[2][1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'content_normalized'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'def_args'}[2][1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'index_entry'}{'node'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[2];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[2];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'extra'}{'command'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'end_command'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[2];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'line_nr'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[5]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[6]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[7];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[7]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[7]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[7]{'args'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[7];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'contents'}[7]{'parent'}
 = $result_trees{'empty_string_index_entry'}{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'extra'}{'node_content'}[0]
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
 = 
$result_trees{'empty_string_index_entry'}{'contents'}[1]{'extra'}{'node_content'};
+$result_trees{'empty_string_index_entry'}{'contents'}[1]{'parent'} = 
$result_trees{'empty_string_index_entry'};
+
+$result_texis{'empty_string_index_entry'} = '@node Top
+
address@hidden @w{}
+
address@hidden @code
address@hidden @w{}
address@hidden ftable
+
address@hidden address@hidden {} {}
address@hidden address@hidden {} {}
address@hidden defun
+
address@hidden fn
+';
+
+
+$result_texts{'empty_string_index_entry'} = '
+
+
+
+Function:   
+Function:   
+
+';
+
+$result_sectioning{'empty_string_index_entry'} = {};
+
+$result_nodes{'empty_string_index_entry'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'normalized' => 'Top'
+  },
+  'node_up' => {
+    'extra' => {
+      'manual_content' => [
+        {
+          'text' => 'dir'
+        }
+      ],
+      'top_node_up' => {}
+    },
+    'type' => 'top_node_up'
+  }
+};
+$result_nodes{'empty_string_index_entry'}{'node_up'}{'extra'}{'top_node_up'} = 
$result_nodes{'empty_string_index_entry'};
+
+$result_menus{'empty_string_index_entry'} = {
+  'cmdname' => 'node',
+  'extra' => {
+    'normalized' => 'Top'
+  }
+};
+
+$result_errors{'empty_string_index_entry'} = [
+  {
+    'error_line' => ':3: warning: Empty index key in @findex
+',
+    'file_name' => '',
+    'line_nr' => 3,
+    'macro' => '',
+    'text' => 'Empty index key in @findex',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':6: warning: Empty index key in @item
+',
+    'file_name' => '',
+    'line_nr' => 6,
+    'macro' => '',
+    'text' => 'Empty index key in @item',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':9: warning: Empty index key in @defun
+',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => '',
+    'text' => 'Empty index key in @defun',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':10: warning: Empty index key in @defunx
+',
+    'file_name' => '',
+    'line_nr' => 10,
+    'macro' => '',
+    'text' => 'Empty index key in @defunx',
+    'type' => 'warning'
+  }
+];
+
+
+
+$result_converted{'info'}->{'empty_string_index_entry'} = 'This is , produced 
by tp version from .
+
+
+File: ,  Node: Top,  Up: (dir)
+
+`\'
+
+ -- Function: 
+ -- Function: 
+
+
+
+Tag Table:
+Node: Top41
+
+End Tag Table
+';
+
+$result_converted_errors{'info'}->{'empty_string_index_entry'} = [
+  {
+    'file_name' => '',
+    'error_line' => ':3: warning: Empty index key in @findex
+',
+    'text' => 'Empty index key in @findex',
+    'type' => 'warning',
+    'macro' => '',
+    'line_nr' => 3
+  },
+  {
+    'file_name' => '',
+    'error_line' => ':6: warning: Empty index key in @item
+',
+    'text' => 'Empty index key in @item',
+    'type' => 'warning',
+    'macro' => '',
+    'line_nr' => 6
+  },
+  {
+    'file_name' => '',
+    'error_line' => ':9: warning: Empty index key in @defun
+',
+    'text' => 'Empty index key in @defun',
+    'type' => 'warning',
+    'macro' => '',
+    'line_nr' => 9
+  },
+  {
+    'file_name' => '',
+    'error_line' => ':10: warning: Empty index key in @defunx
+',
+    'text' => 'Empty index key in @defunx',
+    'type' => 'warning',
+    'macro' => '',
+    'line_nr' => 10
+  }
+];
+
+
+1;



reply via email to

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