texinfo-commits
[Top][All Lists]
Advanced

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

texinfo/tp texi2any.pl Texinfo/Structuring.pm T...


From: Patrice Dumas
Subject: texinfo/tp texi2any.pl Texinfo/Structuring.pm T...
Date: Sun, 14 Aug 2011 00:34:14 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/08/14 00:34:13

Modified files:
        tp             : texi2any.pl 
        tp/Texinfo     : Structuring.pm 
        tp/Texinfo/Convert: HTML.pm Info.pm Text.pm 
        tp/t           : test_sort.t test_utils.pl 
        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 
                          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 
        tp/t/results/indices: double_index_entry.pl empty_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 
                              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 
                                 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: 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 
                             table_nested.pl 

Log message:
        Output internal links.
        Mark index entries to be formatted as code.
        Pass the information of code style in Convert::Text.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Structuring.pm?cvsroot=texinfo&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.126&r2=1.127
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Text.pm?cvsroot=texinfo&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/test_sort.t?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/test_utils.pl?cvsroot=texinfo&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/commands.pl?cvsroot=texinfo&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/def.pl?cvsroot=texinfo&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/multitable.pl?cvsroot=texinfo&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/preformatted.pl?cvsroot=texinfo&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table.pl?cvsroot=texinfo&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/heading_in_footnote.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands_delimiters.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands_delimiters_printindex.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/all_commands_printindex.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/def_defx_mismatch.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_comment.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_comment_in_example.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_empty_line.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_empty_line_in_example.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_paragraph_end.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_preformatted_with_text.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_after_text.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/defx_in_example.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/double_command.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_def_arguments.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_def_command.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_deftype.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_deftypeop_name.pl?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/end_of_line_protect_at_end.pl?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/end_of_lines_protected.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/end_of_lines_protected_in_footnote.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/inter_item_commands_in_def.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/leading_space_in_def_arg.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/no_category_or_no_name.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/not_closed.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/protected_brace.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/space_in_def_for_index.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/wrong_braces_simple.pl?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/wrong_braces_with_end_of_lines.pl?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/cindex_in_caption.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/complex_float.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/float_copying.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/heading/heading_in_copying.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/html_tests/index_and_node_same_name.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/double_index_entry.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/empty_index_entry.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/image_lines_count.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/image_text_lines_count.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/index_entries_locations.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/index_entry_before_first_node.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/index_entry_before_node.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/index_entry_in_footnote.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.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/printindex_with_space_before.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/syncode_index_print_both.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/unknown_then_known_index_entry.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/before_node_and_section.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/def_in_copying.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/nested_multitable_anchor_index.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/block_not_matching.pl?cvsroot=texinfo&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/center.pl?cvsroot=texinfo&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/def_in_style_command.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/in_table.pl?cvsroot=texinfo&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/multitable_item_in_index.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/on_def_line.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/on_index_entry_line.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/tab_in_index.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/inter_item_commands_in_itemize.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/languages/multiple.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/languages/simple.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_index_commands.pl?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/menu_in_deffn.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/index_entries.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/inter_item_commands_in_multitable.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/preformatted/def_in_example.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/no_element.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/placed_things_before_element.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/test_count/commands.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/test_count/printindex.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_in_index_commands.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/empty_item_itemx.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/inter_item_commands_in_table.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/table_nested.pl?cvsroot=texinfo&r1=1.7&r2=1.8

Patches:
Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- texi2any.pl 4 Jun 2011 20:35:10 -0000       1.43
+++ texi2any.pl 14 Aug 2011 00:34:05 -0000      1.44
@@ -608,6 +608,7 @@
              'nodes_tree' => 1,
              'floats' => 1,
              'split' => 1,
+             'internal_links' => 1,
              'converter' => sub{Texinfo::Convert::HTML->converter(@_)},
            },
   'debugcount' => {
@@ -758,5 +759,23 @@
   my $converter = 
&{$formats_table{$format}->{'converter'}}($converter_options);
   $converter->output($tree);
   handle_errors($converter, $error_count);
+  if (defined(get_conf('INTERNAL_LINKS')) and $file_number == 0
+      and $formats_table{$format}->{'internal_links'}) {
+    my $internal_links_file = get_conf('INTERNAL_LINKS');
+    my $internal_links_fh = Texinfo::Common::open_out({}, $internal_links_file,
+                                               $parser->{'perl_encoding'});
+    if (defined ($internal_links_fh)) {
+      # FIXME no possibility of configuration?
+      Texinfo::Structuring::output_internal_links($converter, 
+                                                  $internal_links_fh);
+      close ($internal_links_fh);
+    } else {
+      warn (sprintf(__("Could not open %s for writing: %s\n"), 
+                    $internal_links_file, $!));
+      $error_count++;
+      exit (1) if ($error_count and (!get_conf('FORCE')
+         or $error_count > get_conf('ERROR_LIMIT')));
+    }
+  }
 }
 

Index: Texinfo/Structuring.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Structuring.pm,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- Texinfo/Structuring.pm      1 Aug 2011 21:13:08 -0000       1.73
+++ Texinfo/Structuring.pm      14 Aug 2011 00:34:05 -0000      1.74
@@ -1056,16 +1056,21 @@
   return $res;
 }
 
-sub _do_index_keys($$)
+sub _do_index_keys($$$)
 {
   my $self = shift;
   my $index_entries = shift;
+  my $index_names = shift;
+
   my $options = {'sort_string' => 1};
   if ($self->get_conf('ENABLE_ENCODING') and $self->{'encoding_name'}) {
     $options->{'enabled_encoding'} = $self->{'encoding_name'};
   }
   foreach my $index_name (keys(%$index_entries)) {
     foreach my $entry (@{$index_entries->{$index_name}}) {
+      $entry->{'in_code'} 
+         = $index_names->{$index_name}->{$entry->{'index_name'}};
+      $options->{'code'} = $entry->{'in_code'};
       $entry->{'key'} = Texinfo::Convert::Text::convert(
                               {'contents' => $entry->{'content'}},
                               $options);
@@ -1074,12 +1079,13 @@
 }
 
 # FIXME empty index entries are kept here, but not when sorting by letter.
-sub sort_indices($$)
+sub sort_indices($$$)
 {
   my $self = shift;
   my $index_entries = shift;
+  my $index_names = shift;
   my $sorted_index_entries;
-  _do_index_keys($self, $index_entries);
+  _do_index_keys($self, $index_entries, $index_names);
   foreach my $index_name (keys(%$index_entries)) {
     @{$sorted_index_entries->{$index_name}} = 
         sort _sort_index_entries @{$index_entries->{$index_name}};
@@ -1087,12 +1093,13 @@
   return $sorted_index_entries;
 }
 
-sub sort_indices_by_letter($$)
+sub sort_indices_by_letter($$$)
 {
   my $self = shift;
   my $index_entries = shift;
+  my $index_names = shift;
   my $indices_sorted_by_letters;
-  _do_index_keys($self, $index_entries);
+  _do_index_keys($self, $index_entries, $index_names);
   foreach my $index_name (keys(%$index_entries)) {
     my $index_letter_hash;
     foreach my $index_entry (@{$index_entries->{$index_name}}) {
@@ -1132,4 +1139,57 @@
   return $merged_index_entries;
 }
 
+sub output_internal_links($$$)
+{
+  my $converter = shift;
+  my $fh = shift;
+  if ($converter->{'elements'}) {
+    my $options = {'converter' => $converter};
+    if ($converter->get_conf('ENABLE_ENCODING') and 
$converter->{'encoding_name'}) {
+      $options->{'enabled_encoding'} = $converter->{'encoding_name'};
+    }
+    foreach my $element (@{$converter->{'elements'}}) {
+      my $text;
+      my $href;
+      my $command = $converter->element_command($element);
+      if (defined($command)) {
+        # Use '' for filename, to force a filename in href.
+        $href = $converter->command_href($command, '');
+        my $tree = $converter->command_text($command, 'tree');
+        if ($tree) {
+          $text = Texinfo::Convert::Text::convert($tree, $options);
+        }
+      }
+      if (defined($href) or defined($text)) {
+        my $out_string = '';
+        $out_string .= $href if (defined($href));
+        $out_string .= "\ttoc\t";
+        $out_string .= $text if (defined($text));
+        $out_string .= "\n";
+        print $fh $out_string;
+      }
+    }
+  }
+  if ($converter->{'parser'}) {
+    foreach my $index_name (sort(keys 
(%{$converter->{'index_entries_by_letter'}}))) {
+      foreach my $letter_entry 
(@{$converter->{'index_entries_by_letter'}->{$index_name}}) {
+        foreach my $index_entry (@{$letter_entry->{'entries'}}) {
+          my $href;
+          my $key;
+          $href = $converter->command_href($index_entry->{'command'}, '');
+          $key = $index_entry->{'key'};
+          if (defined($key) and $key =~ /\S/) {
+            my $out_string = '';
+            $out_string .= $href if (defined($href));
+            $out_string .= "\t$index_name\t";
+            $out_string .= $key;
+            $out_string .= "\n";
+            print $fh $out_string;
+          }
+        }
+      }
+    }
+  }
+}
+
 1;

Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- Texinfo/Convert/HTML.pm     13 Aug 2011 20:19:10 -0000      1.126
+++ Texinfo/Convert/HTML.pm     14 Aug 2011 00:34:05 -0000      1.127
@@ -4937,10 +4937,12 @@
        = $self->{'parser'}->indices_information();
     $self->{'index_names'} = $index_names;
     #print STDERR "IIII ($index_names, $merged_indices, $index_entries)\n";
+    my $merged_index_entries 
+        = Texinfo::Structuring::merge_indices($index_names, $merged_indices,
+                                              $index_entries);
     $self->{'index_entries_by_letter'}
-      = $self->Texinfo::Structuring::sort_indices_by_letter(
-          Texinfo::Structuring::merge_indices($index_names, $merged_indices,
-                                              $index_entries));
+      = 
$self->Texinfo::Structuring::sort_indices_by_letter($merged_index_entries,
+                                                            $index_names);
 
     foreach my $index_name (sort(keys(%$index_entries))) {
       foreach my $index_entry (@{$index_entries->{$index_name}}) {

Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- Texinfo/Convert/Info.pm     28 May 2011 23:27:39 -0000      1.54
+++ Texinfo/Convert/Info.pm     14 Aug 2011 00:34:05 -0000      1.55
@@ -300,10 +300,12 @@
 
     my ($index_names, $merged_indices, $index_entries)
        = $self->{'parser'}->indices_information();
+    my $merged_index_entries 
+      = Texinfo::Structuring::merge_indices($index_names, $merged_indices,
+                                            $index_entries);
     $self->{'index_entries'} 
-      = $self->Texinfo::Structuring::sort_indices(
-          Texinfo::Structuring::merge_indices($index_names, $merged_indices, 
-                                              $index_entries));
+      = $self->Texinfo::Structuring::sort_indices($merged_index_entries,
+                                                  $index_names);
     $self->{'index_names'} = $index_names;
   }
   if (!$self->{'index_entries'} or !$self->{'index_entries'}->{$index_name}

Index: Texinfo/Convert/Text.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Text.pm,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- Texinfo/Convert/Text.pm     12 Aug 2011 07:21:28 -0000      1.53
+++ Texinfo/Convert/Text.pm     14 Aug 2011 00:34:05 -0000      1.54
@@ -971,6 +971,19 @@
   return $text;
 }
 
+sub _code_options($)
+{
+  my $options = shift;
+  my $code_options;
+  if (defined($options)) {
+    $code_options = { %$options };
+  } else {
+    $code_options = {};
+  }
+  $code_options->{'code'} = 1;
+  return $code_options;
+}
+
 sub convert($;$);
 
 sub convert($;$)
@@ -1009,8 +1022,11 @@
       # for Xref anymore since '' `` should lead to " irrespective of code
       # style.  However it is important, for instance in @image file 
       # argument...
-      #$result =~ s/``/"/g;
-      #$result =~ s/\'\'/"/g;
+      #if (!$options->{'code'}) {
+      #  $result =~ s/``/"/g;
+      #  $result =~ s/\'\'/"/g;
+      #  $result =~ s/---/\x{1F}/g;
+      #  $result =~ s/--/-/g;
     }
   }
   if ($root->{'cmdname'}) {
@@ -1040,9 +1056,10 @@
                                         $options->{'sc'});
       return $result;
     } elsif ($root->{'cmdname'} eq 'image') {
-      return convert($root->{'args'}->[0], $options);
+      return convert($root->{'args'}->[0], _code_options($options));
     } elsif ($root->{'cmdname'} eq 'email') {
-      my $mail = _normalise_space(convert($root->{'args'}->[0], $options));
+      my $mail = _normalise_space(convert($root->{'args'}->[0], 
+                                          _code_options($options)));
       my $text;
       $text = _normalise_space(convert($root->{'args'}->[1], $options)) 
          if (defined($root->{'args'}->[1]));
@@ -1056,7 +1073,7 @@
       my $text;
       $text = convert($root->{'args'}->[1], $options)
         if (defined($root->{'args'}->[1]));
-      my $url = convert($root->{'args'}->[0], $options);
+      my $url = convert($root->{'args'}->[0], _code_options($options));
       if (defined($text) and $text ne '') {
         return "$url ($text)";
       } else {
@@ -1077,6 +1094,8 @@
       my $result;
       if ($root->{'cmdname'} eq 'sc') {
         $options = {%$options, 'sc' => 1};
+      } elsif ($Texinfo::Common::code_style_commands{$root->{'cmdname'}}) {
+        $options = _code_options($options);
       }
       $result = convert($root->{'args'}->[0], $options);
       return $result;
@@ -1147,15 +1166,23 @@
         push @contents, @$arguments;
       }
       push @contents, {'text' => "\n"};
-      $result = convert({'contents' => address@hidden, $options);
+      $result = convert({'contents' => address@hidden, 
_code_options($options));
     }
     #$result = convert($root->{'args'}->[0], $options) if ($root->{'args'});
   } elsif ($root->{'type'} and $root->{'type'} eq 'menu_entry') {
     foreach my $arg (@{$root->{'args'}}) {
+      if ($arg->{'type'} eq 'menu_entry_node') {
+        $result .= convert($arg, _code_options($options));
+      } else {
       $result .= convert($arg, $options);
     }
   }
+  }
   if ($root->{'contents'}) {
+    if ($root->{'cmdname'} 
+        and $Texinfo::Common::preformatted_code_commands{$root->{'cmdname'}}) {
+      $options = _code_options($options);
+    }
     if (ref($root->{'contents'}) ne 'ARRAY') {
       cluck "contents not an array($root->{'contents'}).";
     }

Index: t/test_sort.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/test_sort.t,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/test_sort.t       2 Aug 2011 21:01:34 -0000       1.8
+++ t/test_sort.t       14 Aug 2011 00:34:06 -0000      1.9
@@ -42,7 +42,8 @@
 
 my ($index_names, $merged_indices, $index_entries) = 
    $parser->indices_information();
-my $sorted_index_entries = Texinfo::Structuring::sort_indices($parser, 
$index_entries);
+my $sorted_index_entries 
+  = Texinfo::Structuring::sort_indices($parser, $index_entries, $index_names);
 
 my @entries = ();
 foreach my $entry (@{$sorted_index_entries->{'cp'}}) {
@@ -55,7 +56,8 @@
 cmp_deeply (address@hidden, address@hidden, 'sorted index entries');
 
 my $sorted_index_entries_by_letter 
-  = Texinfo::Structuring::sort_indices_by_letter($parser, $index_entries);
+  = Texinfo::Structuring::sort_indices_by_letter($parser, $index_entries,
+                                                 $index_names);
 
 my @letter_entries_ref = (
    {'!' => [ '!' ]},

Index: t/test_utils.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/test_utils.pl,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- t/test_utils.pl     13 Aug 2011 18:40:23 -0000      1.91
+++ t/test_utils.pl     14 Aug 2011 00:34:06 -0000      1.92
@@ -394,7 +394,8 @@
   if ($index_entries) {
     $sorted_index_entries 
       = Texinfo::Structuring::sort_indices_by_letter($parser, 
-                                                     $merged_index_entries);
+                                                     $merged_index_entries,
+                                                     $index_names);
   }
 
   my $converted_text = Texinfo::Convert::Text::convert($result, {'TEST' => 1});

Index: t/results/coverage/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/commands.pl,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- t/results/coverage/commands.pl      13 Aug 2011 15:33:05 -0000      1.41
+++ t/results/coverage/commands.pl      14 Aug 2011 00:34:06 -0000      1.42
@@ -344,6 +344,7 @@
             {},
             {}
           ],
+          'in_code' => 0,
           'index_at_command' => 'cindex',
           'index_name' => 'cp',
           'index_prefix' => 'c',

Index: t/results/coverage/def.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/def.pl,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- t/results/coverage/def.pl   13 Aug 2011 15:33:05 -0000      1.46
+++ t/results/coverage/def.pl   14 Aug 2011 00:34:06 -0000      1.47
@@ -95,6 +95,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -334,6 +335,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -526,6 +528,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -628,6 +631,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -739,6 +743,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -854,6 +859,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -970,6 +976,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -1078,6 +1085,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -1204,6 +1212,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -1270,6 +1279,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -1356,6 +1366,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -1431,6 +1442,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -1553,6 +1565,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -1693,6 +1706,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -1833,6 +1847,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',

Index: t/results/coverage/multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/multitable.pl,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- t/results/coverage/multitable.pl    13 Aug 2011 15:33:06 -0000      1.39
+++ t/results/coverage/multitable.pl    14 Aug 2011 00:34:06 -0000      1.40
@@ -294,6 +294,7 @@
                           'content' => [
                             {}
                           ],
+                          'in_code' => 0,
                           'index_at_command' => 'cindex',
                           'index_name' => 'cp',
                           'index_prefix' => 'c',

Index: t/results/coverage/preformatted.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/preformatted.pl,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- t/results/coverage/preformatted.pl  13 Aug 2011 15:33:06 -0000      1.43
+++ t/results/coverage/preformatted.pl  14 Aug 2011 00:34:06 -0000      1.44
@@ -180,6 +180,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'vtable',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',

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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/coverage/punctuation_in_line_commands.pl  13 Aug 2011 15:33:06 
-0000      1.12
+++ t/results/coverage/punctuation_in_line_commands.pl  14 Aug 2011 00:34:07 
-0000      1.13
@@ -791,6 +791,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',

Index: t/results/coverage/table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/table.pl,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- t/results/coverage/table.pl 13 Aug 2011 15:33:06 -0000      1.41
+++ t/results/coverage/table.pl 14 Aug 2011 00:34:07 -0000      1.42
@@ -283,6 +283,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
@@ -342,6 +343,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'vtable',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -400,6 +402,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'kindex',
                   'index_name' => 'ky',
                   'index_prefix' => 'k',
@@ -464,6 +467,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'vtable',
               'index_name' => 'vr',
               'index_prefix' => 'v',

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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/coverage_braces/heading_in_footnote.pl    13 Aug 2011 15:33:07 
-0000      1.10
+++ t/results/coverage_braces/heading_in_footnote.pl    14 Aug 2011 00:34:07 
-0000      1.11
@@ -109,6 +109,7 @@
                       'content' => [
                         {}
                       ],
+                      'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_name' => 'cp',
                       'index_prefix' => 'c',

Index: t/results/def/all_commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/all_commands.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/def/all_commands.pl       7 Aug 2011 21:27:22 -0000       1.27
+++ t/results/def/all_commands.pl       14 Aug 2011 00:34:07 -0000      1.28
@@ -64,6 +64,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defvr',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -233,6 +234,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -426,6 +428,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -582,6 +585,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypevr',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -738,6 +742,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defcv',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -917,6 +922,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -1072,6 +1078,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftp',
               'index_name' => 'tp',
               'index_prefix' => 't',
@@ -1227,6 +1234,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defun',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -1382,6 +1390,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defmac',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -1547,6 +1556,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defspec',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -1689,6 +1699,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defvar',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -1841,6 +1852,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defopt',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -2010,6 +2022,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypefun',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -2166,6 +2179,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypevar',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -2342,6 +2356,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defivar',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -2532,6 +2547,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypeivar',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -2711,6 +2727,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defmethod',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -2904,6 +2921,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypemethod',
               'index_name' => 'fn',
               'index_prefix' => 'f',

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.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/def/all_commands_delimiters.pl    7 Aug 2011 21:27:22 -0000       
1.28
+++ t/results/def/all_commands_delimiters.pl    14 Aug 2011 00:34:07 -0000      
1.29
@@ -437,6 +437,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -874,6 +875,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defvr',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -1142,6 +1144,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -1706,6 +1709,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -1882,6 +1886,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -2225,6 +2230,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -2630,6 +2636,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypevr',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -3051,6 +3058,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftp',
               'index_name' => 'tp',
               'index_prefix' => 't',
@@ -3460,6 +3468,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defcv',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -3917,6 +3926,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypecv',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -4320,6 +4330,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -4765,6 +4776,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -4974,6 +4986,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -5215,6 +5228,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -5456,6 +5470,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -5665,6 +5680,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -5874,6 +5890,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -6115,6 +6132,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -6356,6 +6374,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -6565,6 +6584,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -6774,6 +6794,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -7015,6 +7036,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -7256,6 +7278,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -7465,6 +7488,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -7674,6 +7698,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -7923,6 +7948,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -8083,6 +8109,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defun',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -8314,6 +8341,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -8541,6 +8569,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -8768,6 +8797,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defvr',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -8995,6 +9025,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defvr',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -9256,6 +9287,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -9517,6 +9549,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -9778,6 +9811,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypevr',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -10039,6 +10073,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypevr',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -10266,6 +10301,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftp',
               'index_name' => 'tp',
               'index_prefix' => 't',
@@ -10493,6 +10529,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftp',
               'index_name' => 'tp',
               'index_prefix' => 't',
@@ -10754,6 +10791,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defcv',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -11014,6 +11052,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftp',
               'index_name' => 'tp',
               'index_prefix' => 't',
@@ -11319,6 +11358,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypecv',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -11624,6 +11664,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypecv',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -11895,6 +11936,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -12166,6 +12208,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -12471,6 +12514,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -12776,6 +12820,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -13091,6 +13136,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -13406,6 +13452,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
               'index_prefix' => 'f',

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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/def/all_commands_delimiters_printindex.pl 3 Jul 2011 14:50:55 
-0000       1.17
+++ t/results/def/all_commands_delimiters_printindex.pl 14 Aug 2011 00:34:07 
-0000      1.18
@@ -471,6 +471,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -909,6 +910,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defvr',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -1178,6 +1180,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -1743,6 +1746,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -1920,6 +1924,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -2264,6 +2269,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -2670,6 +2676,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypevr',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -3092,6 +3099,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftp',
                   'index_name' => 'tp',
                   'index_prefix' => 't',
@@ -3502,6 +3510,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defcv',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -3960,6 +3969,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -4364,6 +4374,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -4810,6 +4821,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -5020,6 +5032,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -5262,6 +5275,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -5504,6 +5518,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -5714,6 +5729,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -5924,6 +5940,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -6166,6 +6183,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -6408,6 +6426,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -6618,6 +6637,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -6828,6 +6848,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -7070,6 +7091,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -7312,6 +7334,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -7522,6 +7545,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -7732,6 +7756,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -7982,6 +8007,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -8143,6 +8169,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defun',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -8375,6 +8402,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -8603,6 +8631,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -8831,6 +8860,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defvr',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -9059,6 +9089,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defvr',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -9321,6 +9352,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -9583,6 +9615,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -9845,6 +9878,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypevr',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -10107,6 +10141,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypevr',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -10335,6 +10370,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftp',
                   'index_name' => 'tp',
                   'index_prefix' => 't',
@@ -10563,6 +10599,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftp',
                   'index_name' => 'tp',
                   'index_prefix' => 't',
@@ -10825,6 +10862,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defcv',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -11086,6 +11124,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftp',
                   'index_name' => 'tp',
                   'index_prefix' => 't',
@@ -11392,6 +11431,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -11698,6 +11738,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -11970,6 +12011,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -12242,6 +12284,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -12548,6 +12591,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -12854,6 +12898,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -13170,6 +13215,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -13486,6 +13532,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',

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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/def/all_commands_printindex.pl    3 Jul 2011 14:50:55 -0000       
1.16
+++ t/results/def/all_commands_printindex.pl    14 Aug 2011 00:34:07 -0000      
1.17
@@ -98,6 +98,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defvr',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -268,6 +269,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -462,6 +464,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -619,6 +622,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypevr',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -776,6 +780,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defcv',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -956,6 +961,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -1112,6 +1118,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftp',
                   'index_name' => 'tp',
                   'index_prefix' => 't',
@@ -1268,6 +1275,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defun',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -1424,6 +1432,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defmac',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -1590,6 +1599,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defspec',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -1733,6 +1743,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defvar',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -1886,6 +1897,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defopt',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -2056,6 +2068,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypefun',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -2213,6 +2226,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypevar',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -2390,6 +2404,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -2581,6 +2596,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypeivar',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -2761,6 +2777,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defmethod',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -2955,6 +2972,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deftypemethod',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',

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.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/def/def_defx_mismatch.pl  7 Aug 2011 21:27:23 -0000       1.27
+++ t/results/def/def_defx_mismatch.pl  14 Aug 2011 00:34:07 -0000      1.28
@@ -153,6 +153,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defun',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -299,6 +300,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',

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.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/def/defx_after_comment.pl 7 Aug 2011 21:27:23 -0000       1.27
+++ t/results/def/defx_after_comment.pl 14 Aug 2011 00:34:08 -0000      1.28
@@ -114,6 +114,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -223,6 +224,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',

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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/def/defx_after_comment_in_example.pl      7 Aug 2011 21:27:23 
-0000       1.11
+++ t/results/def/defx_after_comment_in_example.pl      14 Aug 2011 00:34:08 
-0000      1.12
@@ -126,6 +126,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -241,6 +242,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',

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.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/def/defx_after_empty_line.pl      7 Aug 2011 21:27:23 -0000       
1.27
+++ t/results/def/defx_after_empty_line.pl      14 Aug 2011 00:34:08 -0000      
1.28
@@ -114,6 +114,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -217,6 +218,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',

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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/def/defx_after_empty_line_in_example.pl   7 Aug 2011 21:27:23 
-0000       1.11
+++ t/results/def/defx_after_empty_line_in_example.pl   14 Aug 2011 00:34:08 
-0000      1.12
@@ -126,6 +126,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -265,6 +266,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',

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.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/def/defx_after_paragraph_end.pl   7 Aug 2011 21:27:23 -0000       
1.27
+++ t/results/def/defx_after_paragraph_end.pl   14 Aug 2011 00:34:08 -0000      
1.28
@@ -114,6 +114,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -228,6 +229,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',

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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/def/defx_after_preformatted_with_text.pl  7 Aug 2011 21:27:23 
-0000       1.12
+++ t/results/def/defx_after_preformatted_with_text.pl  14 Aug 2011 00:34:08 
-0000      1.13
@@ -126,6 +126,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -240,6 +241,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',

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.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/def/defx_after_text.pl    7 Aug 2011 21:27:23 -0000       1.28
+++ t/results/def/defx_after_text.pl    14 Aug 2011 00:34:08 -0000      1.29
@@ -114,6 +114,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -222,6 +223,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',

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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/def/defx_in_example.pl    7 Aug 2011 21:27:23 -0000       1.10
+++ t/results/def/defx_in_example.pl    14 Aug 2011 00:34:08 -0000      1.11
@@ -126,6 +126,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -217,6 +218,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',

Index: t/results/def/double_command.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/double_command.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/def/double_command.pl     7 Aug 2011 21:27:23 -0000       1.27
+++ t/results/def/double_command.pl     14 Aug 2011 00:34:08 -0000      1.28
@@ -188,6 +188,7 @@
                       'content' => [
                         {}
                       ],
+                      'in_code' => 1,
                       'index_at_command' => 'deffn',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',
@@ -341,6 +342,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -498,6 +500,7 @@
                           'content' => [
                             {}
                           ],
+                          'in_code' => 1,
                           'index_at_command' => 'defvr',
                           'index_name' => 'vr',
                           'index_prefix' => 'v',
@@ -582,6 +585,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',

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.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/def/empty_def_arguments.pl        7 Aug 2011 21:27:23 -0000       
1.25
+++ t/results/def/empty_def_arguments.pl        14 Aug 2011 00:34:08 -0000      
1.26
@@ -114,6 +114,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -359,6 +360,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -495,6 +497,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -626,6 +629,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',

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.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/def/empty_def_command.pl  7 Aug 2011 21:27:23 -0000       1.25
+++ t/results/def/empty_def_command.pl  14 Aug 2011 00:34:08 -0000      1.26
@@ -64,6 +64,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -215,6 +216,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -281,6 +283,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',

Index: t/results/def/empty_deftype.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/empty_deftype.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/def/empty_deftype.pl      7 Aug 2011 21:27:23 -0000       1.27
+++ t/results/def/empty_deftype.pl      14 Aug 2011 00:34:08 -0000      1.28
@@ -138,6 +138,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypefun',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -333,6 +334,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defun',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -577,6 +579,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypemethod',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -796,6 +799,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defmethod',
               'index_name' => 'fn',
               'index_prefix' => 'f',

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.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- t/results/def/empty_deftypeop_name.pl       7 Aug 2011 21:27:23 -0000       
1.24
+++ t/results/def/empty_deftypeop_name.pl       14 Aug 2011 00:34:09 -0000      
1.25
@@ -179,6 +179,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
               'index_prefix' => 'f',

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.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- t/results/def/end_of_line_protect_at_end.pl 7 Aug 2011 21:27:23 -0000       
1.24
+++ t/results/def/end_of_line_protect_at_end.pl 14 Aug 2011 00:34:09 -0000      
1.25
@@ -82,6 +82,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',

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.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/def/end_of_lines_protected.pl     7 Aug 2011 21:27:23 -0000       
1.25
+++ t/results/def/end_of_lines_protected.pl     14 Aug 2011 00:34:09 -0000      
1.26
@@ -212,6 +212,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',

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.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/def/end_of_lines_protected_in_footnote.pl 7 Aug 2011 21:27:24 
-0000       1.28
+++ t/results/def/end_of_lines_protected_in_footnote.pl 14 Aug 2011 00:34:09 
-0000      1.29
@@ -237,6 +237,7 @@
                           'content' => [
                             {}
                           ],
+                          'in_code' => 1,
                           'index_at_command' => 'deffn',
                           'index_name' => 'fn',
                           'index_prefix' => 'f',

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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/def/inter_item_commands_in_def.pl 7 Aug 2011 21:27:24 -0000       
1.9
+++ t/results/def/inter_item_commands_in_def.pl 14 Aug 2011 00:34:09 -0000      
1.10
@@ -114,6 +114,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -248,6 +249,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -300,6 +302,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
@@ -433,6 +436,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -481,6 +485,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',

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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/def/leading_space_in_def_arg.pl   7 Aug 2011 21:27:24 -0000       
1.6
+++ t/results/def/leading_space_in_def_arg.pl   14 Aug 2011 00:34:09 -0000      
1.7
@@ -97,6 +97,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',

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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/def/no_category_or_no_name.pl     7 Aug 2011 21:27:24 -0000       
1.12
+++ t/results/def/no_category_or_no_name.pl     14 Aug 2011 00:34:09 -0000      
1.13
@@ -321,6 +321,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',

Index: t/results/def/not_closed.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/not_closed.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/def/not_closed.pl 7 Aug 2011 21:27:24 -0000       1.25
+++ t/results/def/not_closed.pl 14 Aug 2011 00:34:09 -0000      1.26
@@ -77,6 +77,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -156,6 +157,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -257,6 +259,7 @@
                       'content' => [
                         {}
                       ],
+                      'in_code' => 1,
                       'index_at_command' => 'defvar',
                       'index_name' => 'vr',
                       'index_prefix' => 'v',

Index: t/results/def/protected_brace.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/protected_brace.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/def/protected_brace.pl    7 Aug 2011 21:27:24 -0000       1.15
+++ t/results/def/protected_brace.pl    14 Aug 2011 00:34:09 -0000      1.16
@@ -70,6 +70,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',

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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/def/space_in_def_for_index.pl     3 Jul 2011 14:50:55 -0000       
1.8
+++ t/results/def/space_in_def_for_index.pl     14 Aug 2011 00:34:09 -0000      
1.9
@@ -201,6 +201,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -309,6 +310,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',

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.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- t/results/def/wrong_braces_simple.pl        7 Aug 2011 21:27:24 -0000       
1.24
+++ t/results/def/wrong_braces_simple.pl        14 Aug 2011 00:34:09 -0000      
1.25
@@ -103,6 +103,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -280,6 +281,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -469,6 +471,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -667,6 +670,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -831,6 +835,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -936,6 +941,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -1059,6 +1065,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -1194,6 +1201,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -1338,6 +1346,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',

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.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- t/results/def/wrong_braces_with_end_of_lines.pl     7 Aug 2011 21:27:24 
-0000       1.24
+++ t/results/def/wrong_braces_with_end_of_lines.pl     14 Aug 2011 00:34:09 
-0000      1.25
@@ -111,6 +111,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -300,6 +301,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',

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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/float/cindex_in_caption.pl        13 Jul 2011 14:49:10 -0000      
1.8
+++ t/results/float/cindex_in_caption.pl        14 Aug 2011 00:34:09 -0000      
1.9
@@ -195,6 +195,7 @@
                               'content' => [
                                 {}
                               ],
+                              'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
                               'index_prefix' => 'c',

Index: t/results/float/complex_float.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/complex_float.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/float/complex_float.pl    7 Aug 2011 21:27:24 -0000       1.22
+++ t/results/float/complex_float.pl    14 Aug 2011 00:34:09 -0000      1.23
@@ -421,6 +421,7 @@
                       'content' => [
                         {}
                       ],
+                      'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_name' => 'cp',
                       'index_prefix' => 'c',
@@ -1688,6 +1689,7 @@
                               'content' => [
                                 {}
                               ],
+                              'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
                               'index_prefix' => 'c',
@@ -3266,6 +3268,7 @@
                               'content' => [
                                 {}
                               ],
+                              'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
                               'index_prefix' => 'c',

Index: t/results/float/float_copying.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/float_copying.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/float/float_copying.pl    9 Jul 2011 06:35:40 -0000       1.7
+++ t/results/float/float_copying.pl    14 Aug 2011 00:34:09 -0000      1.8
@@ -210,6 +210,7 @@
                                           'content' => [
                                             {}
                                           ],
+                                          'in_code' => 0,
                                           'index_at_command' => 'cindex',
                                           'index_name' => 'cp',
                                           'index_prefix' => 'c',
@@ -260,6 +261,7 @@
                                           'content' => [
                                             {}
                                           ],
+                                          'in_code' => 1,
                                           'index_at_command' => 'findex',
                                           'index_name' => 'fn',
                                           'index_prefix' => 'f',
@@ -490,6 +492,7 @@
                               'content' => [
                                 {}
                               ],
+                              'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
                               'index_prefix' => 'c',
@@ -540,6 +543,7 @@
                               'content' => [
                                 {}
                               ],
+                              'in_code' => 1,
                               'index_at_command' => 'findex',
                               'index_name' => 'fn',
                               'index_prefix' => 'f',

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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/heading/heading_in_copying.pl     7 Aug 2011 21:27:24 -0000       
1.6
+++ t/results/heading/heading_in_copying.pl     14 Aug 2011 00:34:09 -0000      
1.7
@@ -131,6 +131,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',

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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/html_tests/index_and_node_same_name.pl    30 Jul 2011 09:46:20 
-0000      1.1
+++ t/results/html_tests/index_and_node_same_name.pl    14 Aug 2011 00:34:10 
-0000      1.2
@@ -123,6 +123,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',

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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/indices/double_index_entry.pl     3 Jul 2011 14:50:56 -0000       
1.8
+++ t/results/indices/double_index_entry.pl     14 Aug 2011 00:34:10 -0000      
1.9
@@ -81,6 +81,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
@@ -154,6 +155,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
@@ -405,6 +407,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',

Index: t/results/indices/empty_index_entry.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/empty_index_entry.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/indices/empty_index_entry.pl      3 Jul 2011 14:50:57 -0000       
1.8
+++ t/results/indices/empty_index_entry.pl      14 Aug 2011 00:34:10 -0000      
1.9
@@ -127,6 +127,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',

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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/indices/image_lines_count.pl      3 Jul 2011 14:50:57 -0000       
1.6
+++ t/results/indices/image_lines_count.pl      14 Aug 2011 00:34:10 -0000      
1.7
@@ -121,6 +121,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',

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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/indices/image_text_lines_count.pl 3 Jul 2011 14:50:57 -0000       
1.5
+++ t/results/indices/image_text_lines_count.pl 14 Aug 2011 00:34:10 -0000      
1.6
@@ -121,6 +121,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',

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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/indices/index_entries_locations.pl        3 Jul 2011 14:50:57 
-0000       1.5
+++ t/results/indices/index_entries_locations.pl        14 Aug 2011 00:34:10 
-0000      1.6
@@ -112,6 +112,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
@@ -167,6 +168,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
@@ -244,6 +246,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
@@ -311,6 +314,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',

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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/indices/index_entry_before_first_node.pl  3 Jul 2011 14:50:57 
-0000       1.5
+++ t/results/indices/index_entry_before_first_node.pl  14 Aug 2011 00:34:10 
-0000      1.6
@@ -49,6 +49,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',

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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/indices/index_entry_before_node.pl        3 Jul 2011 14:50:57 
-0000       1.9
+++ t/results/indices/index_entry_before_node.pl        14 Aug 2011 00:34:10 
-0000      1.10
@@ -349,6 +349,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',

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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/indices/index_entry_in_footnote.pl        30 Jul 2011 09:46:20 
-0000      1.1
+++ t/results/indices/index_entry_in_footnote.pl        14 Aug 2011 00:34:10 
-0000      1.2
@@ -98,6 +98,7 @@
                               'content' => [
                                 {}
                               ],
+                              'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
                               'index_prefix' => 'c',

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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/indices/printindex_index_entry_in_copying.pl      3 Jul 2011 
14:50:57 -0000       1.9
+++ t/results/indices/printindex_index_entry_in_copying.pl      14 Aug 2011 
00:34:10 -0000      1.10
@@ -61,6 +61,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'findex',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -153,6 +154,7 @@
                       'content' => [
                         {}
                       ],
+                      'in_code' => 1,
                       'index_at_command' => 'defun',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',
@@ -233,6 +235,7 @@
                       'content' => [
                         {}
                       ],
+                      'in_code' => 1,
                       'index_at_command' => 'defun',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',
@@ -388,6 +391,7 @@
                       'content' => [
                         {}
                       ],
+                      'in_code' => 1,
                       'index_at_command' => 'ftable',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',
@@ -433,6 +437,7 @@
                       'content' => [
                         {}
                       ],
+                      'in_code' => 1,
                       'index_at_command' => 'ftable',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',

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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/indices/printindex_index_entry_in_copying_in_footnote.pl  3 Jul 
2011 14:50:57 -0000       1.8
+++ t/results/indices/printindex_index_entry_in_copying_in_footnote.pl  14 Aug 
2011 00:34:10 -0000      1.9
@@ -84,6 +84,7 @@
                                   'content' => [
                                     {}
                                   ],
+                                  'in_code' => 0,
                                   'index_at_command' => 'cindex',
                                   'index_name' => 'cp',
                                   'index_prefix' => 'c',

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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl     
3 Jul 2011 14:50:57 -0000       1.6
+++ t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl     
14 Aug 2011 00:34:10 -0000      1.7
@@ -61,6 +61,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'findex',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -153,6 +154,7 @@
                       'content' => [
                         {}
                       ],
+                      'in_code' => 1,
                       'index_at_command' => 'defun',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',
@@ -233,6 +235,7 @@
                       'content' => [
                         {}
                       ],
+                      'in_code' => 1,
                       'index_at_command' => 'defun',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',
@@ -388,6 +391,7 @@
                       'content' => [
                         {}
                       ],
+                      'in_code' => 1,
                       'index_at_command' => 'ftable',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',
@@ -433,6 +437,7 @@
                       'content' => [
                         {}
                       ],
+                      'in_code' => 1,
                       'index_at_command' => 'ftable',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',

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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/indices/printindex_with_space_before.pl   3 Jul 2011 14:50:57 
-0000       1.5
+++ t/results/indices/printindex_with_space_before.pl   14 Aug 2011 00:34:10 
-0000      1.6
@@ -81,6 +81,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',

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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/indices/syncode_index_print_both.pl       3 Jul 2011 14:50:57 
-0000       1.5
+++ t/results/indices/syncode_index_print_both.pl       14 Aug 2011 00:34:10 
-0000      1.6
@@ -129,6 +129,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
@@ -179,6 +180,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'findex',
               'index_name' => 'fn',
               'index_prefix' => 'f',

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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/indices/unknown_then_known_index_entry.pl 7 Aug 2011 21:27:24 
-0000       1.17
+++ t/results/indices/unknown_then_known_index_entry.pl 14 Aug 2011 00:34:10 
-0000      1.18
@@ -88,6 +88,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'someindex',
               'index_name' => 'some',
               'index_prefix' => 'some',

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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/info_tests/before_node_and_section.pl     9 Jul 2011 06:35:40 
-0000       1.8
+++ t/results/info_tests/before_node_and_section.pl     14 Aug 2011 00:34:10 
-0000      1.9
@@ -142,6 +142,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',

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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/info_tests/def_in_copying.pl      3 Jul 2011 14:50:57 -0000       
1.10
+++ t/results/info_tests/def_in_copying.pl      14 Aug 2011 00:34:11 -0000      
1.11
@@ -255,6 +255,7 @@
                       'content' => [
                         {}
                       ],
+                      'in_code' => 1,
                       'index_at_command' => 'deffn',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',
@@ -335,6 +336,7 @@
                       'content' => [
                         {}
                       ],
+                      'in_code' => 1,
                       'index_at_command' => 'deffn',
                       'index_name' => 'fn',
                       'index_prefix' => 'f',
@@ -558,6 +560,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',
@@ -638,6 +641,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',

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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/info_tests/multitable_anchor_and_index_entry.pl   3 Jul 2011 
14:50:57 -0000       1.8
+++ t/results/info_tests/multitable_anchor_and_index_entry.pl   14 Aug 2011 
00:34:11 -0000      1.9
@@ -328,6 +328,7 @@
                               'content' => [
                                 {}
                               ],
+                              'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
                               'index_prefix' => 'c',
@@ -685,6 +686,7 @@
                               'content' => [
                                 {}
                               ],
+                              'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
                               'index_prefix' => 'c',

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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/info_tests/nested_multitable_anchor_index.pl      3 Jul 2011 
14:50:57 -0000       1.8
+++ t/results/info_tests/nested_multitable_anchor_index.pl      14 Aug 2011 
00:34:11 -0000      1.9
@@ -275,6 +275,7 @@
                                           'content' => [
                                             {}
                                           ],
+                                          'in_code' => 0,
                                           'index_at_command' => 'cindex',
                                           'index_name' => 'cp',
                                           'index_prefix' => 'c',
@@ -536,6 +537,7 @@
                               'content' => [
                                 {}
                               ],
+                              'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
                               'index_prefix' => 'c',

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.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- t/results/invalid_nestings/block_not_matching.pl    7 Aug 2011 21:27:24 
-0000       1.32
+++ t/results/invalid_nestings/block_not_matching.pl    14 Aug 2011 00:34:11 
-0000      1.33
@@ -126,6 +126,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',

Index: t/results/invalid_nestings/center.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/invalid_nestings/center.pl,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- t/results/invalid_nestings/center.pl        7 Aug 2011 21:27:24 -0000       
1.36
+++ t/results/invalid_nestings/center.pl        14 Aug 2011 00:34:11 -0000      
1.37
@@ -204,6 +204,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',

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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/invalid_nestings/def_in_style_command.pl  7 Aug 2011 21:27:25 
-0000       1.7
+++ t/results/invalid_nestings/def_in_style_command.pl  14 Aug 2011 00:34:11 
-0000      1.8
@@ -106,6 +106,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'defun',
               'index_name' => 'fn',
               'index_prefix' => 'f',

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.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/invalid_nestings/def_not_closed_in_menu_description.pl    7 Aug 
2011 21:27:25 -0000       1.27
+++ t/results/invalid_nestings/def_not_closed_in_menu_description.pl    14 Aug 
2011 00:34:11 -0000      1.28
@@ -117,6 +117,7 @@
                           'content' => [
                             {}
                           ],
+                          'in_code' => 1,
                           'index_at_command' => 'deffn',
                           'index_name' => 'fn',
                           'index_prefix' => 'f',

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.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- t/results/invalid_nestings/in_table.pl      7 Aug 2011 21:27:25 -0000       
1.35
+++ t/results/invalid_nestings/in_table.pl      14 Aug 2011 00:34:11 -0000      
1.36
@@ -617,6 +617,7 @@
                           'content' => [
                             {}
                           ],
+                          'in_code' => 0,
                           'index_at_command' => 'cindex',
                           'index_name' => 'cp',
                           'index_prefix' => 'c',
@@ -786,6 +787,7 @@
                           'content' => [
                             {}
                           ],
+                          'in_code' => 0,
                           'index_at_command' => 'cindex',
                           'index_name' => 'cp',
                           'index_prefix' => 'c',
@@ -815,6 +817,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'vtable',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -916,6 +919,7 @@
                           'content' => [
                             {}
                           ],
+                          'in_code' => 0,
                           'index_at_command' => 'cindex',
                           'index_name' => 'cp',
                           'index_prefix' => 'c',
@@ -945,6 +949,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'vtable',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',

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.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/invalid_nestings/multitable_item_in_index.pl      7 Aug 2011 
21:27:25 -0000       1.22
+++ t/results/invalid_nestings/multitable_item_in_index.pl      14 Aug 2011 
00:34:11 -0000      1.23
@@ -100,6 +100,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'vindex',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',

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.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/invalid_nestings/on_def_line.pl   7 Aug 2011 21:27:25 -0000       
1.21
+++ t/results/invalid_nestings/on_def_line.pl   14 Aug 2011 00:34:11 -0000      
1.22
@@ -223,6 +223,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -448,6 +449,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
               'index_prefix' => 'f',

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.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/invalid_nestings/on_index_entry_line.pl   7 Aug 2011 21:27:25 
-0000       1.27
+++ t/results/invalid_nestings/on_index_entry_line.pl   14 Aug 2011 00:34:11 
-0000      1.28
@@ -187,6 +187,7 @@
             {},
             {}
           ],
+          'in_code' => 0,
           'index_at_command' => 'cindex',
           'index_name' => 'cp',
           'index_prefix' => 'c',

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.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/invalid_nestings/tab_in_index.pl  7 Aug 2011 21:27:25 -0000       
1.23
+++ t/results/invalid_nestings/tab_in_index.pl  14 Aug 2011 00:34:11 -0000      
1.24
@@ -150,6 +150,7 @@
                             {},
                             {}
                           ],
+                          'in_code' => 1,
                           'index_at_command' => 'vindex',
                           'index_name' => 'vr',
                           'index_prefix' => 'v',

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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/itemize/inter_item_commands_in_itemize.pl 7 Aug 2011 21:27:25 
-0000       1.5
+++ t/results/itemize/inter_item_commands_in_itemize.pl 14 Aug 2011 00:34:12 
-0000      1.6
@@ -85,6 +85,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
@@ -261,6 +262,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
@@ -363,6 +365,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
@@ -525,6 +528,7 @@
                       'content' => [
                         {}
                       ],
+                      'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_name' => 'cp',
                       'index_prefix' => 'c',

Index: t/results/languages/multiple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/languages/multiple.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/languages/multiple.pl     7 Aug 2011 21:27:25 -0000       1.6
+++ t/results/languages/multiple.pl     14 Aug 2011 00:34:12 -0000      1.7
@@ -169,6 +169,7 @@
                         {},
                         {}
                       ],
+                      'in_code' => 1,
                       'index_at_command' => 'defivar',
                       'index_name' => 'vr',
                       'index_prefix' => 'v',
@@ -424,6 +425,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -648,6 +650,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',

Index: t/results/languages/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/languages/simple.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/languages/simple.pl       7 Aug 2011 21:27:25 -0000       1.6
+++ t/results/languages/simple.pl       14 Aug 2011 00:34:12 -0000      1.7
@@ -196,6 +196,7 @@
                     {},
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',

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.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- t/results/macro/macro_in_index_commands.pl  7 Aug 2011 21:27:25 -0000       
1.31
+++ t/results/macro/macro_in_index_commands.pl  14 Aug 2011 00:34:12 -0000      
1.32
@@ -779,6 +779,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'trucindex',
               'index_name' => 'truc',
               'index_prefix' => 'truc',
@@ -912,6 +913,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'codeidxindex',
               'index_name' => 'codeidx',
               'index_prefix' => 'codeidx',
@@ -968,6 +970,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
@@ -1071,6 +1074,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'kindex',
               'index_name' => 'ky',
               'index_prefix' => 'k',
@@ -1121,6 +1125,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'pindex',
               'index_name' => 'pg',
               'index_prefix' => 'p',
@@ -1398,6 +1403,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'defgindex',
               'index_name' => 'defg',
               'index_prefix' => 'defg',
@@ -1454,6 +1460,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'abcindex',
               'index_name' => 'abc',
               'index_prefix' => 'abc',

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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/menu/menu_in_deffn.pl     7 Aug 2011 21:27:25 -0000       1.11
+++ t/results/menu/menu_in_deffn.pl     14 Aug 2011 00:34:12 -0000      1.12
@@ -117,6 +117,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',

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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/misc_commands/comment_space_command_on_line.pl    13 Aug 2011 
15:33:08 -0000      1.8
+++ t/results/misc_commands/comment_space_command_on_line.pl    14 Aug 2011 
00:34:12 -0000      1.9
@@ -286,6 +286,7 @@
                 {},
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',

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.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/misc_commands/index_entries.pl    7 Aug 2011 21:27:26 -0000       
1.27
+++ t/results/misc_commands/index_entries.pl    14 Aug 2011 00:34:12 -0000      
1.28
@@ -41,6 +41,7 @@
           'content' => [
             {}
           ],
+          'in_code' => 0,
           'index_at_command' => 'cindex',
           'index_name' => 'cp',
           'index_prefix' => 'c',
@@ -142,6 +143,7 @@
           'content' => [
             {}
           ],
+          'in_code' => 0,
           'index_at_command' => 'trucindex',
           'index_name' => 'truc',
           'index_prefix' => 'truc',

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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/multitable/inter_item_commands_in_multitable.pl   7 Aug 2011 
21:27:26 -0000       1.6
+++ t/results/multitable/inter_item_commands_in_multitable.pl   14 Aug 2011 
00:34:12 -0000      1.7
@@ -129,6 +129,7 @@
                       'content' => [
                         {}
                       ],
+                      'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_name' => 'cp',
                       'index_prefix' => 'c',
@@ -558,6 +559,7 @@
                           'content' => [
                             {}
                           ],
+                          'in_code' => 0,
                           'index_at_command' => 'cindex',
                           'index_name' => 'cp',
                           'index_prefix' => 'c',

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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/plaintext_tests/at_commands_glued_in_example.pl   7 Aug 2011 
21:27:26 -0000       1.8
+++ t/results/plaintext_tests/at_commands_glued_in_example.pl   14 Aug 2011 
00:34:12 -0000      1.9
@@ -526,6 +526,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',

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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/plaintext_tests/at_commands_glued_in_paragraph.pl 7 Aug 2011 
21:27:26 -0000       1.8
+++ t/results/plaintext_tests/at_commands_glued_in_paragraph.pl 14 Aug 2011 
00:34:12 -0000      1.9
@@ -520,6 +520,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',

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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/preformatted/def_in_example.pl    13 Aug 2011 15:33:11 -0000      
1.14
+++ t/results/preformatted/def_in_example.pl    14 Aug 2011 00:34:12 -0000      
1.15
@@ -89,6 +89,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'defun',
                   'index_name' => 'fn',
                   'index_prefix' => 'f',

Index: t/results/sectioning/no_element.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/sectioning/no_element.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/sectioning/no_element.pl  7 Aug 2011 21:27:26 -0000       1.11
+++ t/results/sectioning/no_element.pl  14 Aug 2011 00:34:13 -0000      1.12
@@ -740,6 +740,7 @@
           'content' => [
             {}
           ],
+          'in_code' => 0,
           'index_at_command' => 'cindex',
           'index_name' => 'cp',
           'index_prefix' => 'c',

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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/sectioning/placed_things_before_element.pl        7 Aug 2011 
21:27:26 -0000       1.9
+++ t/results/sectioning/placed_things_before_element.pl        14 Aug 2011 
00:34:13 -0000      1.10
@@ -650,6 +650,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',

Index: t/results/test_count/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/test_count/commands.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/test_count/commands.pl    7 Aug 2011 21:27:26 -0000       1.20
+++ t/results/test_count/commands.pl    14 Aug 2011 00:34:13 -0000      1.21
@@ -349,6 +349,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'vtable',
               'index_name' => 'vr',
               'index_prefix' => 'v',

Index: t/results/test_count/printindex.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/test_count/printindex.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/test_count/printindex.pl  3 Jul 2011 14:51:03 -0000       1.7
+++ t/results/test_count/printindex.pl  14 Aug 2011 00:34:13 -0000      1.8
@@ -81,6 +81,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
@@ -131,6 +132,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
@@ -181,6 +183,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
@@ -283,6 +286,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',

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.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/value/value_in_index_commands.pl  7 Aug 2011 21:27:27 -0000       
1.28
+++ t/results/value/value_in_index_commands.pl  14 Aug 2011 00:34:13 -0000      
1.29
@@ -448,6 +448,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'trucindex',
               'index_name' => 'truc',
               'index_prefix' => 'truc',
@@ -581,6 +582,7 @@
                 {},
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'codeidxindex',
               'index_name' => 'codeidx',
               'index_prefix' => 'codeidx',
@@ -633,6 +635,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
               'index_prefix' => 'c',
@@ -736,6 +739,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'kindex',
               'index_name' => 'ky',
               'index_prefix' => 'k',
@@ -786,6 +790,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'pindex',
               'index_name' => 'pg',
               'index_prefix' => 'p',
@@ -1063,6 +1068,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'defgindex',
               'index_name' => 'defg',
               'index_prefix' => 'defg',
@@ -1119,6 +1125,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 0,
               'index_at_command' => 'abcindex',
               'index_name' => 'abc',
               'index_prefix' => 'abc',

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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/xtable/empty_item_itemx.pl        7 Aug 2011 21:27:27 -0000       
1.11
+++ t/results/xtable/empty_item_itemx.pl        14 Aug 2011 00:34:13 -0000      
1.12
@@ -100,6 +100,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'vtable',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -168,6 +169,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'vtable',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -236,6 +238,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'vtable',
               'index_name' => 'vr',
               'index_prefix' => 'v',

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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/xtable/inter_item_commands_in_table.pl    7 Aug 2011 21:27:27 
-0000       1.7
+++ t/results/xtable/inter_item_commands_in_table.pl    14 Aug 2011 00:34:13 
-0000      1.8
@@ -89,6 +89,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'vtable',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -243,6 +244,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'vtable',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -305,6 +307,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'vtable',
               'index_name' => 'vr',
               'index_prefix' => 'v',
@@ -459,6 +462,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'ftable',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -505,6 +509,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
@@ -582,6 +587,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'ftable',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -643,6 +649,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'ftable',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -717,6 +724,7 @@
               'content' => [
                 {}
               ],
+              'in_code' => 1,
               'index_at_command' => 'ftable',
               'index_name' => 'fn',
               'index_prefix' => 'f',
@@ -880,6 +888,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',
@@ -1092,6 +1101,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
                   'index_prefix' => 'c',

Index: t/results/xtable/table_nested.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/table_nested.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/xtable/table_nested.pl    7 Aug 2011 21:27:27 -0000       1.7
+++ t/results/xtable/table_nested.pl    14 Aug 2011 00:34:13 -0000      1.8
@@ -279,6 +279,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'vtable',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -323,6 +324,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'vtable',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -396,6 +398,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'vtable',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -469,6 +472,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'vtable',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -899,6 +903,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'vtable',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -943,6 +948,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'vtable',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -1016,6 +1022,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'vtable',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -1089,6 +1096,7 @@
                   'content' => [
                     {}
                   ],
+                  'in_code' => 1,
                   'index_at_command' => 'vtable',
                   'index_name' => 'vr',
                   'index_prefix' => 'v',
@@ -1531,6 +1539,7 @@
                       'content' => [
                         {}
                       ],
+                      'in_code' => 1,
                       'index_at_command' => 'vtable',
                       'index_name' => 'vr',
                       'index_prefix' => 'v',
@@ -1575,6 +1584,7 @@
                       'content' => [
                         {}
                       ],
+                      'in_code' => 1,
                       'index_at_command' => 'vtable',
                       'index_name' => 'vr',
                       'index_prefix' => 'v',
@@ -1648,6 +1658,7 @@
                       'content' => [
                         {}
                       ],
+                      'in_code' => 1,
                       'index_at_command' => 'vtable',
                       'index_name' => 'vr',
                       'index_prefix' => 'v',
@@ -1721,6 +1732,7 @@
                       'content' => [
                         {}
                       ],
+                      'in_code' => 1,
                       'index_at_command' => 'vtable',
                       'index_name' => 'vr',
                       'index_prefix' => 'v',



reply via email to

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