texinfo-commits
[Top][All Lists]
Advanced

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

[7106] don't set prefix array for index records


From: Gavin D. Smith
Subject: [7106] don't set prefix array for index records
Date: Sat, 09 Apr 2016 11:48:12 +0000

Revision: 7106
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7106
Author:   gavin
Date:     2016-04-09 11:48:10 +0000 (Sat, 09 Apr 2016)
Log Message:
-----------
don't set prefix array for index records

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Common.pm
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/parsetexi/Common.pm
    trunk/tp/t/results/conditionals/command_conditionals_user_defined.pl
    trunk/tp/t/results/converters_tests/at_commands_in_raw.pl
    trunk/tp/t/results/converters_tests/char_latin1_latin1_in_refs.pl
    trunk/tp/t/results/converters_tests/char_latin1_utf8_in_refs.pl
    trunk/tp/t/results/converters_tests/char_latin2_latin2_in_refs.pl
    trunk/tp/t/results/converters_tests/complex_nestings.pl
    trunk/tp/t/results/converters_tests/index_entry_in_preformatted.pl
    trunk/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
    trunk/tp/t/results/converters_tests/sample_utf8.pl
    trunk/tp/t/results/converters_tests/test_deftypefnnewline.pl
    trunk/tp/t/results/converters_tests/things_before_setfilename.pl
    trunk/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
    trunk/tp/t/results/coverage/commands.pl
    trunk/tp/t/results/coverage/def.pl
    trunk/tp/t/results/coverage/formats_titles.pl
    trunk/tp/t/results/coverage/multitable.pl
    trunk/tp/t/results/coverage/preformatted.pl
    trunk/tp/t/results/coverage/punctuation_in_line_commands.pl
    trunk/tp/t/results/coverage/table.pl
    trunk/tp/t/results/coverage_braces/heading_in_footnote.pl
    trunk/tp/t/results/def/all_commands.pl
    trunk/tp/t/results/def/all_commands_delimiters.pl
    trunk/tp/t/results/def/all_commands_delimiters_printindex.pl
    trunk/tp/t/results/def/all_commands_printindex.pl
    trunk/tp/t/results/def/def_defx_mismatch.pl
    trunk/tp/t/results/def/defx_after_comment.pl
    trunk/tp/t/results/def/defx_after_comment_in_example.pl
    trunk/tp/t/results/def/defx_after_empty_line.pl
    trunk/tp/t/results/def/defx_after_empty_line_in_example.pl
    trunk/tp/t/results/def/defx_after_paragraph_end.pl
    trunk/tp/t/results/def/defx_after_preformatted_with_text.pl
    trunk/tp/t/results/def/defx_after_text.pl
    trunk/tp/t/results/def/defx_in_example.pl
    trunk/tp/t/results/def/double_command.pl
    trunk/tp/t/results/def/empty_def_arguments.pl
    trunk/tp/t/results/def/empty_def_command.pl
    trunk/tp/t/results/def/empty_deftype.pl
    trunk/tp/t/results/def/end_of_line_protect_at_end.pl
    trunk/tp/t/results/def/end_of_lines_protected.pl
    trunk/tp/t/results/def/end_of_lines_protected_in_footnote.pl
    trunk/tp/t/results/def/inter_item_commands_in_def.pl
    trunk/tp/t/results/def/inter_item_commands_in_def_in_example.pl
    trunk/tp/t/results/def/leading_space_in_def_arg.pl
    trunk/tp/t/results/def/no_category_or_no_name.pl
    trunk/tp/t/results/def/not_closed.pl
    trunk/tp/t/results/def/protected_brace.pl
    trunk/tp/t/results/def/ref_in_def.pl
    trunk/tp/t/results/def/space_in_def_for_index.pl
    trunk/tp/t/results/def/wrong_braces_simple.pl
    trunk/tp/t/results/def/wrong_braces_with_end_of_lines.pl
    trunk/tp/t/results/float/cindex_in_caption.pl
    trunk/tp/t/results/float/complex_float.pl
    trunk/tp/t/results/float/float_copying.pl
    trunk/tp/t/results/heading/heading_in_copying.pl
    trunk/tp/t/results/html_tests/index_and_node_same_name.pl
    trunk/tp/t/results/html_tests/index_below.pl
    trunk/tp/t/results/indices/complex_recursive_synindex.pl
    trunk/tp/t/results/indices/def_syn_indices.pl
    trunk/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
    trunk/tp/t/results/indices/double_index_entry.pl
    trunk/tp/t/results/indices/double_syncodeindex.pl
    trunk/tp/t/results/indices/empty_string_index_entry.pl
    trunk/tp/t/results/indices/encoding_index_ascii.pl
    trunk/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
    trunk/tp/t/results/indices/encoding_index_latin1.pl
    trunk/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
    trunk/tp/t/results/indices/encoding_index_utf8.pl
    trunk/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
    trunk/tp/t/results/indices/ftable_vtable.pl
    trunk/tp/t/results/indices/image_lines_count.pl
    trunk/tp/t/results/indices/image_text_lines_count.pl
    trunk/tp/t/results/indices/index_entries_locations.pl
    trunk/tp/t/results/indices/index_entry_before_first_node.pl
    trunk/tp/t/results/indices/index_entry_before_node.pl
    trunk/tp/t/results/indices/index_entry_in_footnote.pl
    trunk/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
    trunk/tp/t/results/indices/index_entry_in_footnote_separate.pl
    trunk/tp/t/results/indices/print_merged_index.pl
    trunk/tp/t/results/indices/printindex_index_entry_in_copying.pl
    trunk/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
    
trunk/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
    trunk/tp/t/results/indices/printindex_with_space_before.pl
    trunk/tp/t/results/indices/recursive_synindex.pl
    trunk/tp/t/results/indices/same_index_entry_merged_indices.pl
    trunk/tp/t/results/indices/syncode_index_print_both.pl
    trunk/tp/t/results/indices/syncodeindex_to_plain.pl
    trunk/tp/t/results/indices/unknown_then_known_index_entry.pl
    trunk/tp/t/results/indices/wrong_synindex.pl
    trunk/tp/t/results/info_tests/before_node_and_section.pl
    trunk/tp/t/results/info_tests/colon_in_index_entry.pl
    trunk/tp/t/results/info_tests/def_in_copying.pl
    trunk/tp/t/results/info_tests/index_entry_at_end_node.pl
    trunk/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
    trunk/tp/t/results/info_tests/nested_multitable_anchor_index.pl
    trunk/tp/t/results/info_tests/test_index.pl
    trunk/tp/t/results/invalid_nestings/block_not_matching.pl
    trunk/tp/t/results/invalid_nestings/center.pl
    trunk/tp/t/results/invalid_nestings/def_in_style_command.pl
    trunk/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
    trunk/tp/t/results/invalid_nestings/in_table.pl
    trunk/tp/t/results/invalid_nestings/multitable_item_in_index.pl
    trunk/tp/t/results/invalid_nestings/on_def_line.pl
    trunk/tp/t/results/invalid_nestings/on_index_entry_line.pl
    trunk/tp/t/results/invalid_nestings/section_on_defx_line.pl
    trunk/tp/t/results/invalid_nestings/tab_in_index.pl
    trunk/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
    trunk/tp/t/results/itemize/inter_item_commands_in_itemize.pl
    trunk/tp/t/results/languages/multiple.pl
    trunk/tp/t/results/languages/multiple_lang_chapters.pl
    trunk/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
    trunk/tp/t/results/languages/simple.pl
    trunk/tp/t/results/languages/unknown_region.pl
    trunk/tp/t/results/macro/backslash_in_arg.pl
    trunk/tp/t/results/macro/macro_in_index_commands.pl
    trunk/tp/t/results/menu/menu_in_deffn.pl
    trunk/tp/t/results/misc_commands/comment_space_command_on_line.pl
    trunk/tp/t/results/misc_commands/index_entries.pl
    trunk/tp/t/results/misc_commands/simple.pl
    trunk/tp/t/results/multitable/inter_item_commands_in_multitable.pl
    trunk/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
    trunk/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
    trunk/tp/t/results/preformatted/def_in_example.pl
    trunk/tp/t/results/sectioning/no_element.pl
    trunk/tp/t/results/sectioning/placed_things_before_element.pl
    trunk/tp/t/results/sectioning/placed_things_before_node.pl
    trunk/tp/t/results/test_count/commands.pl
    trunk/tp/t/results/test_count/printindex.pl
    trunk/tp/t/results/value/value_in_index_commands.pl
    trunk/tp/t/results/xml_tests/commands_and_spaces.pl
    trunk/tp/t/results/xtable/block_commands_in_table.pl
    trunk/tp/t/results/xtable/empty_item_itemx.pl
    trunk/tp/t/results/xtable/inter_item_commands_in_table.pl
    trunk/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
    trunk/tp/t/results/xtable/table_nested.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/ChangeLog     2016-04-09 11:48:10 UTC (rev 7106)
@@ -1,5 +1,25 @@
 2016-04-09  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Common.pm (%index_names): Don't set a 'prefix' 
+       array on each member.
+       (%command_index_prefix): Replace with a new variable called 
+       %command_index.
+       (definition_category, %index_type_def): Update.
+
+       * tp/Texinfo/Parser.pm (%command_index_prefix, %command_index): Update.
+       (_enter_index_entry, _register_index_commands): Don't use 
+       $self->{'prefix_to_index_name'}.  Don't set 'index_prefix' on 
+       index entry record.
+       (_end_line) <def commands>,
+       (_end_line) <@item, @itemx>,
+       (_parse_texi) <@ifcommanddefined>,
+       (parser, simple_parser): Use %command_index instead of 
+       %command_index_prefix.
+       (_register_index_commmands): Don't use 'prefix' array on index 
+       record.  Inline into calling sites.
+
+2016-04-09  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Parser.pm (parse_texi_file, _parse_texi): Set 
        'parent' field on created elements in the main tree.
 

Modified: trunk/tp/Texinfo/Common.pm
===================================================================
--- trunk/tp/Texinfo/Common.pm  2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/Texinfo/Common.pm  2016-04-09 11:48:10 UTC (rev 7106)
@@ -519,37 +519,24 @@
   'allow-recursion'   => 'skipline',
 );
 
-# key is index name, keys of the reference value are the prefixes.
-# value associated with the prefix is 0 if the prefix is not a code-like
-# prefix, 1 if it is a code-like prefix (set by defcodeindex/syncodeindex).
-#our %index_names = (
-# 'cp' => {'cp' => 0, 'c' => 0},
-# 'fn' => {'fn' => 1, 'f' => 1},
-# 'vr' => {'vr' => 1, 'v' => 1},
-# 'ky' => {'ky' => 1, 'k' => 1},
-# 'pg' => {'pg' => 1, 'p' => 1},
-# 'tp' => {'tp' => 1, 't' => 1}
-#);
-
 our %index_names = (
- 'cp' => {'prefix' => ['c'], 'in_code' => 0},
- 'fn' => {'prefix' => ['f'], 'in_code' => 1},
- 'vr' => {'prefix' => ['v'], 'in_code' => 1},
- 'ky' => {'prefix' => ['k'], 'in_code' => 1},
- 'pg' => {'prefix' => ['p'], 'in_code' => 1},
- 'tp' => {'prefix' => ['t'], 'in_code' => 1},
+ 'cp' => {'in_code' => 0},
+ 'fn' => {'in_code' => 1},
+ 'vr' => {'in_code' => 1},
+ 'ky' => {'in_code' => 1},
+ 'pg' => {'in_code' => 1},
+ 'tp' => {'in_code' => 1},
 );
 
 foreach my $index(keys(%index_names)) {
   $index_names{$index}->{'name'} = $index;
-  push @{$index_names{$index}->{'prefix'}}, $index;
 }
 
 our %default_index_commands;
 # all the commands are readded dynamically in the Parser.
 foreach my $index_name (keys (%index_names)) {
-  foreach my $index_prefix (@{$index_names{$index_name}->{'prefix'}}) {
-    next if ($index_prefix eq $index_name);
+  if ($index_name =~ /^(.).$/) {
+    my $index_prefix = $1;
     # only put the one letter versions in the hash.
     $misc_commands{$index_prefix.'index'} = 'line';
     $default_index_commands{$index_prefix.'index'} = 1;
@@ -726,21 +713,22 @@
     'deftypemethod', {'deftypeop' => gdt('Method')},
 );
 
-# the type of index, f: function, v: variable, t: type
+# the type of index, fn: function, vr: variable, tp: type
 my %index_type_def = (
- 'f' => ['deffn', 'deftypefn', 'deftypeop', 'defop'],
- 'v' => ['defvr', 'deftypevr', 'defcv', 'deftypecv' ],
- 't' => ['deftp']
+ 'fn' => ['deffn', 'deftypefn', 'deftypeop', 'defop'],
+ 'vr' => ['defvr', 'deftypevr', 'defcv', 'deftypecv' ],
+ 'tp' => ['deftp']
 );
 
-our %command_index_prefix;
+# Keys are commmands, values are names of indices.
+our %command_index;
 
-$command_index_prefix{'vtable'} = 'v';
-$command_index_prefix{'ftable'} = 'f';
+$command_index{'vtable'} = 'vr';
+$command_index{'ftable'} = 'fn';
 
 foreach my $index_type (keys %index_type_def) {
   foreach my $def (@{$index_type_def{$index_type}}) {
-    $command_index_prefix{$def} = $index_type;
+    $command_index{$def} = $index_type;
   }
 }
 
@@ -749,14 +737,14 @@
 foreach my $def_command(keys %def_map) {
   if (ref($def_map{$def_command}) eq 'HASH') {
     my ($real_command) = keys (%{$def_map{$def_command}});
-    $command_index_prefix{$def_command} = $command_index_prefix{$real_command};
+    $command_index{$def_command} = $command_index{$real_command};
     $def_aliases{$def_command} = $real_command;
   }
   $block_commands{$def_command} = 'def';
   $misc_commands{$def_command.'x'} = 'line';
   $def_commands{$def_command} = 1;
   $def_commands{$def_command.'x'} = 1;
-  $command_index_prefix{$def_command.'x'} = 
$command_index_prefix{$def_command};
+  $command_index{$def_command.'x'} = $command_index{$def_command};
 }
 
 #print STDERR "".Data::Dumper->Dump([\%def_aliases]);
@@ -1198,16 +1186,15 @@
   return $arg_category
     if (!defined($arg_class));
   
-  my $style = 
-    $command_index_prefix{$current->{'extra'}->{'def_command'}};
-  if ($style eq 'f') {
+  my $style = $command_index{$current->{'extra'}->{'def_command'}};
+  if ($style eq 'fn') {
     if ($self) {
       return $self->gdt('{category} on {class}', { 'category' => $arg_category,
                                           'class' => $arg_class });
     } else {
       return {'contents' => [$arg_category, {'text' => ' on '}, $arg_class]};
     }
-  } elsif ($style eq 'v') {
+  } elsif ($style eq 'vr') {
     if ($self) {
       return $self->gdt('{category} of {class}', { 'category' => $arg_category,
                                           'class' => $arg_class });

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/Texinfo/Parser.pm  2016-04-09 11:48:10 UTC (rev 7106)
@@ -152,7 +152,7 @@
 #
 # expanded_formats_hash   each key comes from expanded_formats value is 1
 # index_names             a structure holding the link between index 
-#                         names, prefixes, merged indices,
+#                         names, merged indices,
 #                         initial value is %index_names in Texinfo::Common.
 # context_stack           stack of the contexts, more recent on top.
 #                         'line' is added when on a line or 
@@ -190,8 +190,7 @@
 # current_node            last seen node.
 # current_section         last seen section.
 # nodes                   list of nodes.
-# command_index_prefix    associate a command name to an index prefix.
-# prefix_to_index_name    associate an index prefix to the index name.
+# command_index           associate a command name with an index name
 # floats                  key is the normalized float type, value is an array
 #                         reference holding all the floats.
 # internal_references     an array holding all the internal references.
@@ -250,7 +249,7 @@
 my %deprecated_commands       = %Texinfo::Common::deprecated_commands;
 my %root_commands             = %Texinfo::Common::root_commands;
 my %sectioning_commands       = %Texinfo::Common::sectioning_commands;
-my %command_index_prefix      = %Texinfo::Common::command_index_prefix;
+my %command_index             = %Texinfo::Common::command_index;
 my %command_structuring_level = %Texinfo::Common::command_structuring_level;
 my %ref_commands              = %Texinfo::Common::ref_commands;
 my %region_commands           = %Texinfo::Common::region_commands;
@@ -311,9 +310,10 @@
 # index names that cannot be set by the user.
 my %forbidden_index_name = ();
 
-foreach my $name(keys(%index_names)) {
-  foreach my $prefix (@{$index_names{$name}->{'prefix'}}) {
-    $forbidden_index_name{$prefix} = 1;
+foreach my $name (keys(%index_names)) {
+  $forbidden_index_name{$name} = 1;
+  if ($name =~ /^(.).$/) {
+    $forbidden_index_name{$1} = 1;
   }
 }
 
@@ -559,30 +559,6 @@
   return !$self->{'expanded_formats_stack'}->[-1];
 }
 
-# enter all the commands associated with an index name using the prefix
-# list
-sub _register_index_commands($$)
-{
-  my $self = shift;
-  my $index_name = shift;
-  if (!$self->{'index_names'}->{$index_name}->{'prefix'}) {
-    $self->{'index_names'}->{$index_name}->{'prefix'} = [$index_name];
-  }
-  if (!exists($self->{'index_names'}->{$index_name}->{'name'})) {
-    $self->{'index_names'}->{$index_name}->{'name'} = $index_name;
-  }
-  if (!exists($self->{'index_names'}->{$index_name}->{'contained_indices'})) {
-    
$self->{'index_names'}->{$index_name}->{'contained_indices'}->{$index_name} = 1;
-  }
-  foreach my $prefix (@{$self->{'index_names'}->{$index_name}->{'prefix'}}) {
-    $self->{'misc_commands'}->{$prefix.'index'} = 'line';
-    $self->{'no_paragraph_commands'}->{$prefix.'index'} = 1;
-    $self->{'valid_nestings'}->{$prefix.'index'} = \%in_simple_text_commands;
-    $self->{'command_index_prefix'}->{$prefix.'index'} = $prefix;
-    $self->{'prefix_to_index_name'}->{$prefix} = $index_name;
-  }
-}
-
 sub _setup_conf($$$)
 {
   my $parser = shift;
@@ -675,7 +651,7 @@
   $parser->{'valid_nestings'} = dclone(\%default_valid_nestings);
   $parser->{'no_paragraph_commands'} = { %default_no_paragraph_commands };
   $parser->{'index_names'} = dclone(\%index_names);
-  $parser->{'command_index_prefix'} = {%command_index_prefix};
+  $parser->{'command_index'} = {%command_index};
   $parser->{'close_paragraph_commands'} = {%close_paragraph_commands};
   $parser->{'close_preformatted_commands'} = {%close_preformatted_commands};
   if ($parser->{'INLINE_INSERTCOPYING'}) {
@@ -692,7 +668,18 @@
     }
   }
   foreach my $index (keys (%{$parser->{'index_names'}})) {
-    $parser->_register_index_commands($index);
+    if (!exists($parser->{'index_names'}->{$index}->{'name'})) {
+      $parser->{'index_names'}->{$index}->{'name'} = $index;
+    }
+    if (!exists($parser->{'index_names'}->{$index}->{'contained_indices'})) {
+      $parser->{'index_names'}->{$index}->{'contained_indices'}->{$index} = 1;
+    }
+    foreach my $prefix ($index, substr($index, 0, 1)) {
+      $parser->{'misc_commands'}->{$prefix.'index'} = 'line';
+      $parser->{'no_paragraph_commands'}->{$prefix.'index'} = 1;
+      $parser->{'valid_nestings'}->{$prefix.'index'} = 
\%in_simple_text_commands;
+      $parser->{'command_index'}->{$prefix.'index'} = $index;
+    }
   }
   if ($parser->{'merged_indices'}) {
     foreach my $index_from (keys (%{$parser->{'merged_indices'}})) {
@@ -739,7 +726,7 @@
 my $simple_parser_valid_nestings = dclone(\%default_valid_nestings);
 my $simple_parser_no_paragraph_commands = { %default_no_paragraph_commands };
 my $simple_parser_index_names = dclone(\%index_names);
-my $simple_parser_command_index_prefix = {%command_index_prefix};
+my $simple_parser_command_index = {%command_index};
 my $simple_parser_close_paragraph_commands = {%close_paragraph_commands};
 my $simple_parser_close_preformatted_commands = {%close_preformatted_commands};
 sub simple_parser(;$)
@@ -755,7 +742,7 @@
   $parser->{'valid_nestings'} = $simple_parser_valid_nestings;
   $parser->{'no_paragraph_commands'} = $simple_parser_no_paragraph_commands;
   $parser->{'index_names'} = $simple_parser_index_names;
-  $parser->{'command_index_prefix'} = $simple_parser_command_index_prefix;
+  $parser->{'command_index'} = $simple_parser_command_index;
   $parser->{'close_paragraph_commands'} = 
$simple_parser_close_paragraph_commands;
   $parser->{'close_preformatted_commands'} = 
$simple_parser_close_preformatted_commands;
 
@@ -2689,8 +2676,7 @@
 
   $content_normalized = $content if (!defined($content_normalized));
 
-  my $prefix = $self->{'command_index_prefix'}->{$command_container};
-  my $index_name = $self->{'prefix_to_index_name'}->{$prefix};
+  my $index_name = $self->{'command_index'}->{$command_container};
   my $index = $self->{'index_names'}->{$index_name};
 
   my $number;
@@ -2702,7 +2688,6 @@
   my $index_entry = { 'index_name'           => $index_name,
                       'index_at_command'     => $command,
                       'index_type_command'   => $command_container,
-                      'index_prefix'         => $prefix,
                       'content'              => $content,
                       'content_normalized'   => $content_normalized,
                       'command'              => $current,
@@ -2972,7 +2957,7 @@
       if (defined($index_entry)) {
         my $index_contents_normalized;
         if ($def_parsed_hash->{'class'}) {
-          if ($command_index_prefix{$def_command} eq 'f') {
+          if ($command_index{$def_command} eq 'fn') {
             $index_entry = $self->gdt('{name} on {class}', 
                                   {'name' => $def_parsed_hash->{'name'},
                                    'class' => $def_parsed_hash->{'class'}});
@@ -2980,7 +2965,7 @@
              = [_non_bracketed_contents($def_parsed_hash->{'name'}),
                 { 'text' => ' on '},
                 _non_bracketed_contents($def_parsed_hash->{'class'})];
-          } elsif ($command_index_prefix{$def_command} eq 'v'
+          } elsif ($command_index{$def_command} eq 'vr'
                   and $def_command ne 'defcv') {
             $index_entry = $self->gdt('{name} of {class}', 
                                      {'name' => $def_parsed_hash->{'name'},
@@ -3408,12 +3393,12 @@
       } else {
         $current->{'extra'}->{'misc_content'} = address@hidden;
         if (($command eq 'item' or $command eq 'itemx')
-            and 
$self->{'command_index_prefix'}->{$current->{'parent'}->{'cmdname'}}) {
+            and $self->{'command_index'}->{$current->{'parent'}->{'cmdname'}}) 
{
           _enter_index_entry($self, $current->{'parent'}->{'cmdname'}, 
                              $command, $current,
                              $current->{'extra'}->{'misc_content'}, 
                              undef, $line_nr);
-        } elsif ($self->{'command_index_prefix'}->{$current->{'cmdname'}}) {
+        } elsif ($self->{'command_index'}->{$current->{'cmdname'}}) {
           _enter_index_entry($self, $current->{'cmdname'}, 
                              $current->{'cmdname'}, $current,
                              $current->{'extra'}->{'misc_content'}, 
@@ -4848,7 +4833,7 @@
                   or $self->{'macros'}->{$name}
                   or $self->{'definfoenclose'}->{$name}
                   or $self->{'aliases'}->{$name}
-                  or $self->{'command_index_prefix'}->{$name}
+                  or $self->{'command_index'}->{$name}
                 );
                 if (($command_is_defined
                      and $command eq 'ifcommanddefined')
@@ -5839,7 +5824,16 @@
         $args = [$name];
         if (! _ignore_global_commands($self)) {
           $self->{'index_names'}->{$name} = {'in_code' => $in_code};
-          $self->_register_index_commands($name);
+          if (!exists($self->{'index_names'}->{$name}->{'name'})) {
+            $self->{'index_names'}->{$name}->{'name'} = $name;
+          }
+          if (!exists($self->{'index_names'}->{$name}->{'contained_indices'})) 
{
+            $self->{'index_names'}->{$name}->{'contained_indices'}->{$name} = 
1;
+          }
+          $self->{'misc_commands'}->{$name.'index'} = 'line';
+          $self->{'no_paragraph_commands'}->{$name.'index'} = 1;
+          $self->{'valid_nestings'}->{$name.'index'} = 
\%in_simple_text_commands;
+          $self->{'command_index'}->{$name.'index'} = $name;
         }
       }
     } else {
@@ -6399,10 +6393,6 @@
 
 The index name.
 
-=item index_prefix
-
-The associated index prefix.
-
 =item index_at_command
 
 The name of the @-command associated with the index entry.
@@ -6443,22 +6433,19 @@
 
 =back
 
-The following shows the references corresponding with the default indexes
+The following shows the references corresponding to the default indexes
 I<cp> and I<fn>, the I<fn> index having its entries formatted as code and 
 the indices corresponding to the following texinfo
 
   @defindex some
   @defcodeindex code
 
-  $index_names = {'cp' => {'name' => 'cp', 'in_code' => 0, 
-                                           'prefix' => ['c', 'cp']},
-                  'fn' => {'name' => 'fn', 'in_code' => 1, 
-                                           'prefix' => ['f', 'fn']},
+  $index_names = {'cp' => {'name' => 'cp', 'in_code' => 0, },
+                  'fn' => {'name' => 'fn', 'in_code' => 1, },
                   'some' => {'in_code' => 0},
                   'code' => {'in_code' => 1}};
 
-If C<name> is not set, it is set to the index name.  If C<prefix> is 
-not set, it is set to an array containing the index name.
+If C<name> is not set, it is set to the index name.
 
 I<$merged_indices_hash> is a hash reference, the key is an index
 name merged in the value.

Modified: trunk/tp/parsetexi/Common.pm
===================================================================
--- trunk/tp/parsetexi/Common.pm        2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/parsetexi/Common.pm        2016-04-09 11:48:10 UTC (rev 7106)
@@ -721,21 +721,21 @@
     'deftypemethod', {'deftypeop' => gdt('Method')},
 );
 
-# the type of index, f: function, v: variable, t: type
+# the type of index, fn: function, vr: variable, tp: type
 my %index_type_def = (
- 'f' => ['deffn', 'deftypefn', 'deftypeop', 'defop'],
- 'v' => ['defvr', 'deftypevr', 'defcv', 'deftypecv' ],
- 't' => ['deftp']
+ 'fn' => ['deffn', 'deftypefn', 'deftypeop', 'defop'],
+ 'vr' => ['defvr', 'deftypevr', 'defcv', 'deftypecv' ],
+ 'tp' => ['deftp']
 );
 
-our %command_index_prefix;
+our %command_index;
 
-$command_index_prefix{'vtable'} = 'v';
-$command_index_prefix{'ftable'} = 'f';
+$command_index{'vtable'} = 'vr';
+$command_index{'ftable'} = 'fn';
 
 foreach my $index_type (keys %index_type_def) {
   foreach my $def (@{$index_type_def{$index_type}}) {
-    $command_index_prefix{$def} = $index_type;
+    $command_index{$def} = $index_type;
   }
 }
 
@@ -744,14 +744,14 @@
 foreach my $def_command(keys %def_map) {
   if (ref($def_map{$def_command}) eq 'HASH') {
     my ($real_command) = keys (%{$def_map{$def_command}});
-    $command_index_prefix{$def_command} = $command_index_prefix{$real_command};
+    $command_index{$def_command} = $command_index{$real_command};
     $def_aliases{$def_command} = $real_command;
   }
   $block_commands{$def_command} = 'def';
   $misc_commands{$def_command.'x'} = 'line';
   $def_commands{$def_command} = 1;
   $def_commands{$def_command.'x'} = 1;
-  $command_index_prefix{$def_command.'x'} = 
$command_index_prefix{$def_command};
+  $command_index{$def_command.'x'} = $command_index{$def_command};
 }
 
 #print STDERR "".Data::Dumper->Dump([\%def_aliases]);
@@ -1180,16 +1180,15 @@
   return $arg_category
     if (!defined($arg_class));
   
-  my $style = 
-    $command_index_prefix{$current->{'extra'}->{'def_command'}};
-  if ($style eq 'f') {
+  my $style = $command_index{$current->{'extra'}->{'def_command'}};
+  if ($style eq 'fn') {
     if ($self) {
       return $self->gdt('{category} on {class}', { 'category' => $arg_category,
                                           'class' => $arg_class });
     } else {
       return {'contents' => [$arg_category, {'text' => ' on '}, $arg_class]};
     }
-  } elsif ($style eq 'v') {
+  } elsif ($style eq 'vr') {
     if ($self) {
       return $self->gdt('{category} of {class}', { 'category' => $arg_category,
                                           'class' => $arg_class });

Modified: trunk/tp/t/results/conditionals/command_conditionals_user_defined.pl
===================================================================
--- trunk/tp/t/results/conditionals/command_conditionals_user_defined.pl        
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/conditionals/command_conditionals_user_defined.pl        
2016-04-09 11:48:10 UTC (rev 7106)
@@ -389,76 +389,49 @@
         'auth' => 1
       },
       'in_code' => 0,
-      'name' => 'auth',
-      'prefix' => [
-        'auth'
-      ]
+      'name' => 'auth'
     },
     'cp' => {
       'contained_indices' => {
         'cp' => 1
       },
       'in_code' => 0,
-      'name' => 'cp',
-      'prefix' => [
-        'c',
-        'cp'
-      ]
+      'name' => 'cp'
     },
     'fn' => {
       'contained_indices' => {
         'fn' => 1
       },
       'in_code' => 1,
-      'name' => 'fn',
-      'prefix' => [
-        'f',
-        'fn'
-      ]
+      'name' => 'fn'
     },
     'ky' => {
       'contained_indices' => {
         'ky' => 1
       },
       'in_code' => 1,
-      'name' => 'ky',
-      'prefix' => [
-        'k',
-        'ky'
-      ]
+      'name' => 'ky'
     },
     'pg' => {
       'contained_indices' => {
         'pg' => 1
       },
       'in_code' => 1,
-      'name' => 'pg',
-      'prefix' => [
-        'p',
-        'pg'
-      ]
+      'name' => 'pg'
     },
     'tp' => {
       'contained_indices' => {
         'tp' => 1
       },
       'in_code' => 1,
-      'name' => 'tp',
-      'prefix' => [
-        't',
-        'tp'
-      ]
+      'name' => 'tp'
     },
     'vr' => {
       'contained_indices' => {
         'vr' => 1
       },
       'in_code' => 1,
-      'name' => 'vr',
-      'prefix' => [
-        'v',
-        'vr'
-      ]
+      'name' => 'vr'
     }
   }
 };

Modified: trunk/tp/t/results/converters_tests/at_commands_in_raw.pl
===================================================================
--- trunk/tp/t/results/converters_tests/at_commands_in_raw.pl   2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/converters_tests/at_commands_in_raw.pl   2016-04-09 
11:48:10 UTC (rev 7106)
@@ -476,7 +476,6 @@
                       'content_normalized' => [],
                       'index_at_command' => 'cindex',
                       'index_name' => 'cp',
-                      'index_prefix' => 'c',
                       'index_type_command' => 'cindex',
                       'node' => {},
                       'number' => undef
@@ -529,7 +528,6 @@
                       'content_normalized' => [],
                       'index_at_command' => 'findex',
                       'index_name' => 'fn',
-                      'index_prefix' => 'f',
                       'index_type_command' => 'findex',
                       'node' => {},
                       'number' => undef
@@ -1680,7 +1678,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'findex',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'findex',
                   'key' => 'fentry2',
                   'node' => {},

Modified: trunk/tp/t/results/converters_tests/char_latin1_latin1_in_refs.pl
===================================================================
--- trunk/tp/t/results/converters_tests/char_latin1_latin1_in_refs.pl   
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/converters_tests/char_latin1_latin1_in_refs.pl   
2016-04-09 11:48:10 UTC (rev 7106)
@@ -1370,7 +1370,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff}",
               'node' => {},
@@ -1425,7 +1424,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{c4} \x{cb} \x{cf} \x{d6} \x{dc}",
               'node' => {},
@@ -1480,7 +1478,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{e9}",
               'node' => {},
@@ -1535,7 +1532,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{e8}",
               'node' => {},
@@ -1590,7 +1586,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} 
\x{ce} \x{d4} \x{db}",
               'node' => {},
@@ -1645,7 +1640,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{e7}",
               'node' => {},

Modified: trunk/tp/t/results/converters_tests/char_latin1_utf8_in_refs.pl
===================================================================
--- trunk/tp/t/results/converters_tests/char_latin1_utf8_in_refs.pl     
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/converters_tests/char_latin1_utf8_in_refs.pl     
2016-04-09 11:48:10 UTC (rev 7106)
@@ -1370,7 +1370,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{e4} \x{eb} \x{ef} \x{f6} \x{fc} \x{ff}",
               'node' => {},
@@ -1425,7 +1424,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{c4} \x{cb} \x{cf} \x{d6} \x{dc}",
               'node' => {},
@@ -1480,7 +1478,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{e9}",
               'node' => {},
@@ -1535,7 +1532,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{e8}",
               'node' => {},
@@ -1590,7 +1586,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{e2} \x{ea} \x{ee} \x{f4} \x{fb} \x{c2} \x{ca} 
\x{ce} \x{d4} \x{db}",
               'node' => {},
@@ -1645,7 +1640,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{e7}",
               'node' => {},

Modified: trunk/tp/t/results/converters_tests/char_latin2_latin2_in_refs.pl
===================================================================
--- trunk/tp/t/results/converters_tests/char_latin2_latin2_in_refs.pl   
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/converters_tests/char_latin2_latin2_in_refs.pl   
2016-04-09 11:48:10 UTC (rev 7106)
@@ -590,7 +590,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{104} \x{105} \x{2db} \x{118} \x{119}",
               'node' => {},

Modified: trunk/tp/t/results/converters_tests/complex_nestings.pl
===================================================================
--- trunk/tp/t/results/converters_tests/complex_nestings.pl     2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/converters_tests/complex_nestings.pl     2016-04-09 
11:48:10 UTC (rev 7106)
@@ -224,7 +224,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'defun',
                       'index_name' => 'fn',
-                      'index_prefix' => 'f',
                       'index_type_command' => 'defun',
                       'key' => 'my def',
                       'node' => {},
@@ -340,7 +339,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'defunx',
                       'index_name' => 'fn',
-                      'index_prefix' => 'f',
                       'index_type_command' => 'defun',
                       'key' => 'other def',
                       'node' => {},
@@ -504,7 +502,6 @@
                               'in_code' => 1,
                               'index_at_command' => 'deffn',
                               'index_name' => 'fn',
-                              'index_prefix' => 'f',
                               'index_type_command' => 'deffn',
                               'key' => 'name',
                               'node' => {},
@@ -611,7 +608,6 @@
                                       'in_code' => 1,
                                       'index_at_command' => 'defvar',
                                       'index_name' => 'vr',
-                                      'index_prefix' => 'v',
                                       'index_type_command' => 'defvar',
                                       'key' => 'variables',
                                       'node' => {},
@@ -732,7 +728,6 @@
                                       'in_code' => 1,
                                       'index_at_command' => 'defvarx',
                                       'index_name' => 'vr',
-                                      'index_prefix' => 'v',
                                       'index_type_command' => 'defvar',
                                       'key' => 'variables too',
                                       'node' => {},

Modified: trunk/tp/t/results/converters_tests/index_entry_in_preformatted.pl
===================================================================
--- trunk/tp/t/results/converters_tests/index_entry_in_preformatted.pl  
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/converters_tests/index_entry_in_preformatted.pl  
2016-04-09 11:48:10 UTC (rev 7106)
@@ -99,7 +99,6 @@
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_name' => 'cp',
-                      'index_prefix' => 'c',
                       'index_type_command' => 'cindex',
                       'key' => 'first',
                       'node' => {},
@@ -182,7 +181,6 @@
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_name' => 'cp',
-                      'index_prefix' => 'c',
                       'index_type_command' => 'cindex',
                       'key' => 'other',
                       'node' => {},
@@ -242,7 +240,6 @@
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_name' => 'cp',
-                      'index_prefix' => 'c',
                       'index_type_command' => 'cindex',
                       'key' => 'last',
                       'node' => {},

Modified: 
trunk/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl
===================================================================
--- trunk/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl 
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl 
2016-04-09 11:48:10 UTC (rev 7106)
@@ -181,7 +181,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'c"b',
               'node' => {},
@@ -242,7 +241,6 @@
               'in_code' => 0,
               'index_at_command' => 'vindex',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'vindex',
               'key' => 'v"j',
               'node' => {},
@@ -303,7 +301,6 @@
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'findex',
               'key' => 'f``g',
               'node' => {},
@@ -459,7 +456,6 @@
               'in_code' => 0,
               'index_at_command' => 'cdiindex',
               'index_name' => 'cdi',
-              'index_prefix' => 'cdi',
               'index_type_command' => 'cdiindex',
               'key' => 'cdi"h',
               'node' => {},
@@ -615,7 +611,6 @@
               'in_code' => 1,
               'index_at_command' => 'ddiindex',
               'index_name' => 'ddi',
-              'index_prefix' => 'ddi',
               'index_type_command' => 'ddiindex',
               'key' => 'ddi``g',
               'node' => {},
@@ -916,10 +911,7 @@
       },
       'in_code' => 0,
       'merged_in' => 'fn',
-      'name' => 'cdi',
-      'prefix' => [
-        'cdi'
-      ]
+      'name' => 'cdi'
     },
     'cp' => {
       'contained_indices' => {
@@ -927,11 +919,7 @@
       },
       'in_code' => 0,
       'merged_in' => 'fn',
-      'name' => 'cp',
-      'prefix' => [
-        'c',
-        'cp'
-      ]
+      'name' => 'cp'
     },
     'ddi' => {
       'contained_indices' => {
@@ -939,10 +927,7 @@
       },
       'in_code' => 1,
       'merged_in' => 'fn',
-      'name' => 'ddi',
-      'prefix' => [
-        'ddi'
-      ]
+      'name' => 'ddi'
     },
     'fn' => {
       'contained_indices' => {
@@ -953,44 +938,28 @@
         'vr' => 1
       },
       'in_code' => 1,
-      'name' => 'fn',
-      'prefix' => [
-        'f',
-        'fn'
-      ]
+      'name' => 'fn'
     },
     'ky' => {
       'contained_indices' => {
         'ky' => 1
       },
       'in_code' => 1,
-      'name' => 'ky',
-      'prefix' => [
-        'k',
-        'ky'
-      ]
+      'name' => 'ky'
     },
     'pg' => {
       'contained_indices' => {
         'pg' => 1
       },
       'in_code' => 1,
-      'name' => 'pg',
-      'prefix' => [
-        'p',
-        'pg'
-      ]
+      'name' => 'pg'
     },
     'tp' => {
       'contained_indices' => {
         'tp' => 1
       },
       'in_code' => 1,
-      'name' => 'tp',
-      'prefix' => [
-        't',
-        'tp'
-      ]
+      'name' => 'tp'
     },
     'vr' => {
       'contained_indices' => {
@@ -998,11 +967,7 @@
       },
       'in_code' => 0,
       'merged_in' => 'fn',
-      'name' => 'vr',
-      'prefix' => [
-        'v',
-        'vr'
-      ]
+      'name' => 'vr'
     }
   },
   'merged_indices' => {

Modified: trunk/tp/t/results/converters_tests/sample_utf8.pl
===================================================================
--- trunk/tp/t/results/converters_tests/sample_utf8.pl  2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/converters_tests/sample_utf8.pl  2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -1000,7 +1000,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'chapter, first',
               'node' => {},
@@ -1068,7 +1067,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => "\x{53e6}\x{4e00}\x{4e2a}\x{ff0c}index entry",
                   'node' => {},
@@ -1123,7 +1121,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => "\x{104}\x{118} ae \x{105}\x{119}",
                   'node' => {},
@@ -1178,7 +1175,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => "\x{e9} \x{c2}",
                   'node' => {},

Modified: trunk/tp/t/results/converters_tests/test_deftypefnnewline.pl
===================================================================
--- trunk/tp/t/results/converters_tests/test_deftypefnnewline.pl        
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/converters_tests/test_deftypefnnewline.pl        
2016-04-09 11:48:10 UTC (rev 7106)
@@ -185,7 +185,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypefun',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypefun',
                   'key' => 'name',
                   'node' => {},
@@ -336,7 +335,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'arg',
                   'node' => {},
@@ -561,7 +559,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypefun',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypefun',
                   'key' => 'name2',
                   'node' => {},
@@ -712,7 +709,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'arg2',
                   'node' => {},

Modified: trunk/tp/t/results/converters_tests/things_before_setfilename.pl
===================================================================
--- trunk/tp/t/results/converters_tests/things_before_setfilename.pl    
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/converters_tests/things_before_setfilename.pl    
2016-04-09 11:48:10 UTC (rev 7106)
@@ -886,7 +886,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => 'index entry',
                   'number' => 1

Modified: 
trunk/tp/t/results/converters_tests/things_before_setfilename_no_element.pl
===================================================================
--- trunk/tp/t/results/converters_tests/things_before_setfilename_no_element.pl 
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/converters_tests/things_before_setfilename_no_element.pl 
2016-04-09 11:48:10 UTC (rev 7106)
@@ -884,7 +884,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'index entry',
               'number' => 1

Modified: trunk/tp/t/results/coverage/commands.pl
===================================================================
--- trunk/tp/t/results/coverage/commands.pl     2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/coverage/commands.pl     2016-04-09 11:48:10 UTC (rev 
7106)
@@ -375,7 +375,6 @@
           'in_code' => 0,
           'index_at_command' => 'cindex',
           'index_name' => 'cp',
-          'index_prefix' => 'c',
           'index_type_command' => 'cindex',
           'key' => 'index entry "in text" LaTeX',
           'number' => 1

Modified: trunk/tp/t/results/coverage/def.pl
===================================================================
--- trunk/tp/t/results/coverage/def.pl  2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/coverage/def.pl  2016-04-09 11:48:10 UTC (rev 7106)
@@ -106,7 +106,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'd--effn_name',
               'number' => 1
@@ -349,7 +348,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'de--ffn_name',
               'number' => 2
@@ -549,7 +547,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'i',
               'number' => 3
@@ -663,7 +660,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'truc',
               'number' => 4
@@ -782,7 +778,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'log trap',
               'number' => 5
@@ -919,7 +914,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'log trap1',
               'number' => 6
@@ -1043,7 +1037,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'log trap2',
               'number' => 7
@@ -1153,7 +1146,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'id ule',
               'number' => 8
@@ -1285,7 +1277,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'id i ule',
               'number' => 9
@@ -1362,7 +1353,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'machin',
               'number' => 10
@@ -1463,7 +1453,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'bidule machin',
               'number' => 11
@@ -1552,7 +1541,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'machin',
               'number' => 12
@@ -1688,7 +1676,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'followed',
               'number' => 13
@@ -1841,7 +1828,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'after',
               'number' => 14
@@ -1994,7 +1980,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'deffnx',
               'number' => 15

Modified: trunk/tp/t/results/coverage/formats_titles.pl
===================================================================
--- trunk/tp/t/results/coverage/formats_titles.pl       2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/coverage/formats_titles.pl       2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -525,7 +525,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'item',
                       'index_name' => 'vr',
-                      'index_prefix' => 'v',
                       'index_type_command' => 'vtable',
                       'key' => 'vtab',
                       'number' => 1

Modified: trunk/tp/t/results/coverage/multitable.pl
===================================================================
--- trunk/tp/t/results/coverage/multitable.pl   2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/coverage/multitable.pl   2016-04-09 11:48:10 UTC (rev 
7106)
@@ -335,7 +335,6 @@
                               'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
-                              'index_prefix' => 'c',
                               'index_type_command' => 'cindex',
                               'key' => 'index entry within multitable',
                               'number' => 1

Modified: trunk/tp/t/results/coverage/preformatted.pl
===================================================================
--- trunk/tp/t/results/coverage/preformatted.pl 2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/coverage/preformatted.pl 2016-04-09 11:48:10 UTC (rev 
7106)
@@ -196,7 +196,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v',
                           'index_type_command' => 'vtable',
                           'key' => 'item in table in format',
                           'number' => 1

Modified: trunk/tp/t/results/coverage/punctuation_in_line_commands.pl
===================================================================
--- trunk/tp/t/results/coverage/punctuation_in_line_commands.pl 2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/coverage/punctuation_in_line_commands.pl 2016-04-09 
11:48:10 UTC (rev 7106)
@@ -828,7 +828,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'index! After punc',
               'node' => {},

Modified: trunk/tp/t/results/coverage/table.pl
===================================================================
--- trunk/tp/t/results/coverage/table.pl        2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/coverage/table.pl        2016-04-09 11:48:10 UTC (rev 
7106)
@@ -333,7 +333,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => 'index entry',
                   'number' => 1
@@ -401,7 +400,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'item',
                       'index_name' => 'vr',
-                      'index_prefix' => 'v',
                       'index_type_command' => 'vtable',
                       'key' => 'vtable item',
                       'number' => 1
@@ -474,7 +472,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'kindex',
                           'index_name' => 'ky',
-                          'index_prefix' => 'k',
                           'index_type_command' => 'kindex',
                           'key' => 'key',
                           'number' => 1
@@ -549,7 +546,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'itemx',
                       'index_name' => 'vr',
-                      'index_prefix' => 'v',
                       'index_type_command' => 'vtable',
                       'key' => 'itemx vtable',
                       'number' => 2

Modified: trunk/tp/t/results/coverage_braces/heading_in_footnote.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/heading_in_footnote.pl   2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/coverage_braces/heading_in_footnote.pl   2016-04-09 
11:48:10 UTC (rev 7106)
@@ -114,7 +114,6 @@
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_name' => 'cp',
-                      'index_prefix' => 'c',
                       'index_type_command' => 'cindex',
                       'key' => 'ind e',
                       'number' => 1

Modified: trunk/tp/t/results/def/all_commands.pl
===================================================================
--- trunk/tp/t/results/def/all_commands.pl      2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/def/all_commands.pl      2016-04-09 11:48:10 UTC (rev 
7106)
@@ -70,7 +70,6 @@
               'in_code' => 1,
               'index_at_command' => 'defvr',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'defvr',
               'key' => 'd--efvr_name',
               'number' => 1
@@ -247,7 +246,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypefn',
               'key' => 'd--eftypefn_name',
               'number' => 1
@@ -450,7 +448,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypeop',
               'key' => 'd--eftypeop_name on c--lass',
               'number' => 2
@@ -614,7 +611,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypevr',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'deftypevr',
               'key' => 'd--eftypevr_name',
               'number' => 2
@@ -778,7 +774,6 @@
               'in_code' => 1,
               'index_at_command' => 'defcv',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'defcv',
               'key' => 'd--efcv_name',
               'number' => 3
@@ -967,7 +962,6 @@
               'in_code' => 1,
               'index_at_command' => 'defop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'defop',
               'key' => 'd--efop_name on c--lass',
               'number' => 3
@@ -1130,7 +1124,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftp',
               'index_name' => 'tp',
-              'index_prefix' => 't',
               'index_type_command' => 'deftp',
               'key' => 'd--eftp_name',
               'number' => 1
@@ -1293,7 +1286,6 @@
               'in_code' => 1,
               'index_at_command' => 'defun',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'defun',
               'key' => 'd--efun_name',
               'number' => 4
@@ -1456,7 +1448,6 @@
               'in_code' => 1,
               'index_at_command' => 'defmac',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'defmac',
               'key' => 'd--efmac_name',
               'number' => 5
@@ -1629,7 +1620,6 @@
               'in_code' => 1,
               'index_at_command' => 'defspec',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'defspec',
               'key' => 'd--efspec_name',
               'number' => 6
@@ -1779,7 +1769,6 @@
               'in_code' => 1,
               'index_at_command' => 'defvar',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'defvar',
               'key' => 'd--efvar_name',
               'number' => 4
@@ -1939,7 +1928,6 @@
               'in_code' => 1,
               'index_at_command' => 'defopt',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'defopt',
               'key' => 'd--efopt_name',
               'number' => 5
@@ -2116,7 +2104,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypefun',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypefun',
               'key' => 'd--eftypefun_name',
               'number' => 7
@@ -2280,7 +2267,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypevar',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'deftypevar',
               'key' => 'd--eftypevar_name',
               'number' => 6
@@ -2466,7 +2452,6 @@
               'in_code' => 1,
               'index_at_command' => 'defivar',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'defivar',
               'key' => 'd--efivar_name of c--lass',
               'number' => 7
@@ -2666,7 +2651,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypeivar',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'deftypeivar',
               'key' => 'd--eftypeivar_name of c--lass',
               'number' => 8
@@ -2855,7 +2839,6 @@
               'in_code' => 1,
               'index_at_command' => 'defmethod',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'defmethod',
               'key' => 'd--efmethod_name on c--lass',
               'number' => 8
@@ -3058,7 +3041,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypemethod',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypemethod',
               'key' => 'd--eftypemethod_name on c--lass',
               'number' => 9

Modified: trunk/tp/t/results/def/all_commands_delimiters.pl
===================================================================
--- trunk/tp/t/results/def/all_commands_delimiters.pl   2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/def/all_commands_delimiters.pl   2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -446,7 +446,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'forward--char',
               'number' => 1
@@ -898,7 +897,6 @@
               'in_code' => 1,
               'index_at_command' => 'defvr',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'defvr',
               'key' => 'fill-column',
               'number' => 1
@@ -1171,7 +1169,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypefn',
               'key' => 'foobar',
               'number' => 2
@@ -1746,7 +1743,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypefn',
               'key' => 'foobar',
               'number' => 3
@@ -1936,7 +1932,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypefn',
               'key' => 'foobug',
               'number' => 4
@@ -2283,7 +2278,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypefn',
               'key' => 'push',
               'number' => 5
@@ -2702,7 +2696,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypevr',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'deftypevr',
               'key' => 'enable',
               'number' => 2
@@ -3133,7 +3126,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftp',
               'index_name' => 'tp',
-              'index_prefix' => 't',
               'index_type_command' => 'deftp',
               'key' => 'pair',
               'number' => 1
@@ -3552,7 +3544,6 @@
               'in_code' => 1,
               'index_at_command' => 'defcv',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'defcv',
               'key' => 'border-pattern',
               'number' => 3
@@ -4017,7 +4008,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypecv',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'deftypecv',
               'key' => 'border-pattern of Window',
               'number' => 4
@@ -4431,7 +4421,6 @@
               'in_code' => 1,
               'index_at_command' => 'defop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'defop',
               'key' => 'expose on windows',
               'number' => 6
@@ -4887,7 +4876,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypeop',
               'key' => 'expose on W,indow',
               'number' => 7
@@ -5106,7 +5094,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypeop',
               'key' => 'expose on Window',
               'number' => 8
@@ -5359,7 +5346,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypeop',
               'key' => 'e,xpose on W,indow',
               'number' => 9
@@ -5612,7 +5598,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypeop',
               'key' => ',expose on ,Window',
               'number' => 10
@@ -5831,7 +5816,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypeop',
               'key' => 'e,xpose on W,indow',
               'number' => 11
@@ -6050,7 +6034,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypeop',
               'key' => ',expose on ,Window',
               'number' => 12
@@ -6303,7 +6286,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypeop',
               'key' => 'e)xpose on W)indow',
               'number' => 13
@@ -6556,7 +6538,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypeop',
               'key' => ')expose on )Window',
               'number' => 14
@@ -6775,7 +6756,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypeop',
               'key' => 'e)xpose on W)indow',
               'number' => 15
@@ -6994,7 +6974,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypeop',
               'key' => ')expose on )Window',
               'number' => 16
@@ -7247,7 +7226,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypeop',
               'key' => 'e;xpose on W;indow',
               'number' => 17
@@ -7500,7 +7478,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypeop',
               'key' => ';expose on ;Window',
               'number' => 18
@@ -7719,7 +7696,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypeop',
               'key' => 'e;xpose on W;indow',
               'number' => 19
@@ -7938,7 +7914,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypeop',
               'key' => ';expose on ;Window',
               'number' => 20
@@ -8200,7 +8175,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypeop',
               'key' => 'name on Windowint',
               'number' => 21
@@ -8368,7 +8342,6 @@
               'in_code' => 1,
               'index_at_command' => 'defun',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'defun',
               'key' => 'apply',
               'number' => 22
@@ -8607,7 +8580,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'A2',
               'number' => 23
@@ -8842,7 +8814,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'A2',
               'number' => 24
@@ -9077,7 +9048,6 @@
               'in_code' => 1,
               'index_at_command' => 'defvr',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'defvr',
               'key' => 'A2',
               'number' => 5
@@ -9312,7 +9282,6 @@
               'in_code' => 1,
               'index_at_command' => 'defvr',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'defvr',
               'key' => 'A2',
               'number' => 6
@@ -9581,7 +9550,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypefn',
               'key' => 'A3',
               'number' => 25
@@ -9850,7 +9818,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypefn',
               'key' => 'A3',
               'number' => 26
@@ -10119,7 +10086,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypevr',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'deftypevr',
               'key' => 'A3',
               'number' => 7
@@ -10388,7 +10354,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypevr',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'deftypevr',
               'key' => 'A3',
               'number' => 8
@@ -10623,7 +10588,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftp',
               'index_name' => 'tp',
-              'index_prefix' => 't',
               'index_type_command' => 'deftp',
               'key' => 'A2',
               'number' => 2
@@ -10858,7 +10822,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftp',
               'index_name' => 'tp',
-              'index_prefix' => 't',
               'index_type_command' => 'deftp',
               'key' => 'A2',
               'number' => 3
@@ -11127,7 +11090,6 @@
               'in_code' => 1,
               'index_at_command' => 'defcv',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'defcv',
               'key' => 'A3',
               'number' => 9
@@ -11395,7 +11357,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftp',
               'index_name' => 'tp',
-              'index_prefix' => 't',
               'index_type_command' => 'deftp',
               'key' => 'A2',
               'number' => 4
@@ -11710,7 +11671,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypecv',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'deftypecv',
               'key' => 'A4 of A2',
               'number' => 10
@@ -12025,7 +11985,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypecv',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'deftypecv',
               'key' => 'A4 of A2',
               'number' => 11
@@ -12306,7 +12265,6 @@
               'in_code' => 1,
               'index_at_command' => 'defop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'defop',
               'key' => 'A3 on A2',
               'number' => 27
@@ -12587,7 +12545,6 @@
               'in_code' => 1,
               'index_at_command' => 'defop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'defop',
               'key' => 'A3 on A2',
               'number' => 28
@@ -12902,7 +12859,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypeop',
               'key' => 'A4 on A2',
               'number' => 29
@@ -13217,7 +13173,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypeop',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypeop',
               'key' => 'A4 on A2',
               'number' => 30
@@ -13543,7 +13498,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypefn',
               'key' => 'fun_name',
               'number' => 31
@@ -13869,7 +13823,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypefn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypefn',
               'key' => 'fun_name1',
               'number' => 32

Modified: trunk/tp/t/results/def/all_commands_delimiters_printindex.pl
===================================================================
--- trunk/tp/t/results/def/all_commands_delimiters_printindex.pl        
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/def/all_commands_delimiters_printindex.pl        
2016-04-09 11:48:10 UTC (rev 7106)
@@ -480,7 +480,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'forward--char',
                   'node' => {},
@@ -933,7 +932,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defvr',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defvr',
                   'key' => 'fill-column',
                   'node' => {},
@@ -1207,7 +1205,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypefn',
                   'key' => 'foobar',
                   'node' => {},
@@ -1783,7 +1780,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypefn',
                   'key' => 'foobar',
                   'node' => {},
@@ -1974,7 +1970,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypefn',
                   'key' => 'foobug',
                   'node' => {},
@@ -2322,7 +2317,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypefn',
                   'key' => 'push',
                   'node' => {},
@@ -2742,7 +2736,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypevr',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'deftypevr',
                   'key' => 'enable',
                   'node' => {},
@@ -3174,7 +3167,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftp',
                   'index_name' => 'tp',
-                  'index_prefix' => 't',
                   'index_type_command' => 'deftp',
                   'key' => 'pair',
                   'node' => {},
@@ -3594,7 +3586,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defcv',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defcv',
                   'key' => 'border-pattern',
                   'node' => {},
@@ -4060,7 +4051,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'deftypecv',
                   'key' => 'border-pattern of Window',
                   'node' => {},
@@ -4475,7 +4465,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'defop',
                   'key' => 'expose on windows',
                   'node' => {},
@@ -4932,7 +4921,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypeop',
                   'key' => 'expose on W,indow',
                   'node' => {},
@@ -5152,7 +5140,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypeop',
                   'key' => 'expose on Window',
                   'node' => {},
@@ -5406,7 +5393,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypeop',
                   'key' => 'e,xpose on W,indow',
                   'node' => {},
@@ -5660,7 +5646,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypeop',
                   'key' => ',expose on ,Window',
                   'node' => {},
@@ -5880,7 +5865,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypeop',
                   'key' => 'e,xpose on W,indow',
                   'node' => {},
@@ -6100,7 +6084,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypeop',
                   'key' => ',expose on ,Window',
                   'node' => {},
@@ -6354,7 +6337,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypeop',
                   'key' => 'e)xpose on W)indow',
                   'node' => {},
@@ -6608,7 +6590,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypeop',
                   'key' => ')expose on )Window',
                   'node' => {},
@@ -6828,7 +6809,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypeop',
                   'key' => 'e)xpose on W)indow',
                   'node' => {},
@@ -7048,7 +7028,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypeop',
                   'key' => ')expose on )Window',
                   'node' => {},
@@ -7302,7 +7281,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypeop',
                   'key' => 'e;xpose on W;indow',
                   'node' => {},
@@ -7556,7 +7534,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypeop',
                   'key' => ';expose on ;Window',
                   'node' => {},
@@ -7776,7 +7753,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypeop',
                   'key' => 'e;xpose on W;indow',
                   'node' => {},
@@ -7996,7 +7972,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypeop',
                   'key' => ';expose on ;Window',
                   'node' => {},
@@ -8259,7 +8234,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypeop',
                   'key' => 'name on Windowint',
                   'node' => {},
@@ -8428,7 +8402,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defun',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'defun',
                   'key' => 'apply',
                   'node' => {},
@@ -8668,7 +8641,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'A2',
                   'node' => {},
@@ -8904,7 +8876,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'A2',
                   'node' => {},
@@ -9140,7 +9111,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defvr',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defvr',
                   'key' => 'A2',
                   'node' => {},
@@ -9376,7 +9346,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defvr',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defvr',
                   'key' => 'A2',
                   'node' => {},
@@ -9646,7 +9615,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypefn',
                   'key' => 'A3',
                   'node' => {},
@@ -9916,7 +9884,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypefn',
                   'key' => 'A3',
                   'node' => {},
@@ -10186,7 +10153,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypevr',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'deftypevr',
                   'key' => 'A3',
                   'node' => {},
@@ -10456,7 +10422,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypevr',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'deftypevr',
                   'key' => 'A3',
                   'node' => {},
@@ -10692,7 +10657,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftp',
                   'index_name' => 'tp',
-                  'index_prefix' => 't',
                   'index_type_command' => 'deftp',
                   'key' => 'A2',
                   'node' => {},
@@ -10928,7 +10892,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftp',
                   'index_name' => 'tp',
-                  'index_prefix' => 't',
                   'index_type_command' => 'deftp',
                   'key' => 'A2',
                   'node' => {},
@@ -11198,7 +11161,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defcv',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defcv',
                   'key' => 'A3',
                   'node' => {},
@@ -11467,7 +11429,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftp',
                   'index_name' => 'tp',
-                  'index_prefix' => 't',
                   'index_type_command' => 'deftp',
                   'key' => 'A2',
                   'node' => {},
@@ -11783,7 +11744,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'deftypecv',
                   'key' => 'A4 of A2',
                   'node' => {},
@@ -12099,7 +12059,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypecv',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'deftypecv',
                   'key' => 'A4 of A2',
                   'node' => {},
@@ -12381,7 +12340,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'defop',
                   'key' => 'A3 on A2',
                   'node' => {},
@@ -12663,7 +12621,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'defop',
                   'key' => 'A3 on A2',
                   'node' => {},
@@ -12979,7 +12936,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypeop',
                   'key' => 'A4 on A2',
                   'node' => {},
@@ -13295,7 +13251,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypeop',
                   'key' => 'A4 on A2',
                   'node' => {},
@@ -13622,7 +13577,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypefn',
                   'key' => 'fun_name',
                   'node' => {},
@@ -13949,7 +13903,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypefn',
                   'key' => 'fun_name1',
                   'node' => {},

Modified: trunk/tp/t/results/def/all_commands_printindex.pl
===================================================================
--- trunk/tp/t/results/def/all_commands_printindex.pl   2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/def/all_commands_printindex.pl   2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -104,7 +104,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defvr',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defvr',
                   'key' => 'd--efvr_name',
                   'node' => {},
@@ -282,7 +281,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypefn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypefn',
                   'key' => 'd--eftypefn_name',
                   'node' => {},
@@ -486,7 +484,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypeop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypeop',
                   'key' => 'd--eftypeop_name on c--lass',
                   'node' => {},
@@ -651,7 +648,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypevr',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'deftypevr',
                   'key' => 'd--eftypevr_name',
                   'node' => {},
@@ -816,7 +812,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defcv',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defcv',
                   'key' => 'd--efcv_name',
                   'node' => {},
@@ -1006,7 +1001,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defop',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'defop',
                   'key' => 'd--efop_name on c--lass',
                   'node' => {},
@@ -1170,7 +1164,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftp',
                   'index_name' => 'tp',
-                  'index_prefix' => 't',
                   'index_type_command' => 'deftp',
                   'key' => 'd--eftp_name',
                   'node' => {},
@@ -1334,7 +1327,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defun',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'defun',
                   'key' => 'd--efun_name',
                   'node' => {},
@@ -1498,7 +1490,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defmac',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'defmac',
                   'key' => 'd--efmac_name',
                   'node' => {},
@@ -1672,7 +1663,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defspec',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'defspec',
                   'key' => 'd--efspec_name',
                   'node' => {},
@@ -1823,7 +1813,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defvar',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defvar',
                   'key' => 'd--efvar_name',
                   'node' => {},
@@ -1984,7 +1973,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defopt',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defopt',
                   'key' => 'd--efopt_name',
                   'node' => {},
@@ -2162,7 +2150,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypefun',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypefun',
                   'key' => 'd--eftypefun_name',
                   'node' => {},
@@ -2327,7 +2314,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypevar',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'deftypevar',
                   'key' => 'd--eftypevar_name',
                   'node' => {},
@@ -2514,7 +2500,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defivar',
                   'key' => 'd--efivar_name of c--lass',
                   'node' => {},
@@ -2715,7 +2700,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypeivar',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'deftypeivar',
                   'key' => 'd--eftypeivar_name of c--lass',
                   'node' => {},
@@ -2905,7 +2889,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defmethod',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'defmethod',
                   'key' => 'd--efmethod_name on c--lass',
                   'node' => {},
@@ -3109,7 +3092,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deftypemethod',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deftypemethod',
                   'key' => 'd--eftypemethod_name on c--lass',
                   'node' => {},

Modified: trunk/tp/t/results/def/def_defx_mismatch.pl
===================================================================
--- trunk/tp/t/results/def/def_defx_mismatch.pl 2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/def/def_defx_mismatch.pl 2016-04-09 11:48:10 UTC (rev 
7106)
@@ -161,7 +161,6 @@
               'in_code' => 1,
               'index_at_command' => 'defun',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'defun',
               'key' => 'my def',
               'number' => 1
@@ -319,7 +318,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'name',
               'number' => 2

Modified: trunk/tp/t/results/def/defx_after_comment.pl
===================================================================
--- trunk/tp/t/results/def/defx_after_comment.pl        2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/def/defx_after_comment.pl        2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -120,7 +120,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'i',
               'number' => 1
@@ -246,7 +245,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'bidulr',
               'number' => 2

Modified: trunk/tp/t/results/def/defx_after_comment_in_example.pl
===================================================================
--- trunk/tp/t/results/def/defx_after_comment_in_example.pl     2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/def/defx_after_comment_in_example.pl     2016-04-09 
11:48:10 UTC (rev 7106)
@@ -132,7 +132,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'i',
                   'number' => 1
@@ -264,7 +263,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'bidulr',
                   'number' => 2

Modified: trunk/tp/t/results/def/defx_after_empty_line.pl
===================================================================
--- trunk/tp/t/results/def/defx_after_empty_line.pl     2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/def/defx_after_empty_line.pl     2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -120,7 +120,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'i',
               'number' => 1
@@ -234,7 +233,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'bidulr',
               'number' => 2

Modified: trunk/tp/t/results/def/defx_after_empty_line_in_example.pl
===================================================================
--- trunk/tp/t/results/def/defx_after_empty_line_in_example.pl  2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/def/defx_after_empty_line_in_example.pl  2016-04-09 
11:48:10 UTC (rev 7106)
@@ -132,7 +132,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'i',
                   'number' => 1
@@ -294,7 +293,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'bidulr',
                   'number' => 2

Modified: trunk/tp/t/results/def/defx_after_paragraph_end.pl
===================================================================
--- trunk/tp/t/results/def/defx_after_paragraph_end.pl  2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/def/defx_after_paragraph_end.pl  2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -120,7 +120,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'i',
               'number' => 1
@@ -245,7 +244,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'bidulr',
               'number' => 2

Modified: trunk/tp/t/results/def/defx_after_preformatted_with_text.pl
===================================================================
--- trunk/tp/t/results/def/defx_after_preformatted_with_text.pl 2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/def/defx_after_preformatted_with_text.pl 2016-04-09 
11:48:10 UTC (rev 7106)
@@ -132,7 +132,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'i',
                   'number' => 1
@@ -257,7 +256,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'bidulr',
                   'number' => 2

Modified: trunk/tp/t/results/def/defx_after_text.pl
===================================================================
--- trunk/tp/t/results/def/defx_after_text.pl   2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/def/defx_after_text.pl   2016-04-09 11:48:10 UTC (rev 
7106)
@@ -120,7 +120,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'i',
               'number' => 1
@@ -239,7 +238,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'bidulr',
               'number' => 2

Modified: trunk/tp/t/results/def/defx_in_example.pl
===================================================================
--- trunk/tp/t/results/def/defx_in_example.pl   2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/def/defx_in_example.pl   2016-04-09 11:48:10 UTC (rev 
7106)
@@ -132,7 +132,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'i',
                   'number' => 1
@@ -234,7 +233,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'bidulr',
                   'number' => 2

Modified: trunk/tp/t/results/def/double_command.pl
===================================================================
--- trunk/tp/t/results/def/double_command.pl    2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/def/double_command.pl    2016-04-09 11:48:10 UTC (rev 
7106)
@@ -194,7 +194,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'deffnx',
                       'index_name' => 'fn',
-                      'index_prefix' => 'f',
                       'index_type_command' => 'deffn',
                       'key' => 'plot2',
                       'number' => 1
@@ -353,7 +352,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'plot',
               'number' => 2
@@ -518,7 +516,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'defvr',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v',
                           'index_type_command' => 'defvr',
                           'key' => 'd--efvr_name',
                           'number' => 1
@@ -608,7 +605,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'aaaa',
               'number' => 3

Modified: trunk/tp/t/results/def/empty_def_arguments.pl
===================================================================
--- trunk/tp/t/results/def/empty_def_arguments.pl       2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/def/empty_def_arguments.pl       2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -120,7 +120,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'i',
               'number' => 1

Modified: trunk/tp/t/results/def/empty_def_command.pl
===================================================================
--- trunk/tp/t/results/def/empty_def_command.pl 2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/def/empty_def_command.pl 2016-04-09 11:48:10 UTC (rev 
7106)
@@ -70,7 +70,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'deffn',
               'number' => 1
@@ -229,7 +228,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'deffn',
               'number' => 2
@@ -305,7 +303,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'deffnx',
               'number' => 3

Modified: trunk/tp/t/results/def/empty_deftype.pl
===================================================================
--- trunk/tp/t/results/def/empty_deftype.pl     2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/def/empty_deftype.pl     2016-04-09 11:48:10 UTC (rev 
7106)
@@ -149,7 +149,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypefun',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypefun',
               'key' => 'f',
               'number' => 1
@@ -348,7 +347,6 @@
               'in_code' => 1,
               'index_at_command' => 'defun',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'defun',
               'key' => 'f',
               'number' => 2
@@ -607,7 +605,6 @@
               'in_code' => 1,
               'index_at_command' => 'deftypemethod',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deftypemethod',
               'key' => 'f on c',
               'number' => 3
@@ -832,7 +829,6 @@
               'in_code' => 1,
               'index_at_command' => 'defmethod',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'defmethod',
               'key' => 'f on c',
               'number' => 4

Modified: trunk/tp/t/results/def/end_of_line_protect_at_end.pl
===================================================================
--- trunk/tp/t/results/def/end_of_line_protect_at_end.pl        2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/def/end_of_line_protect_at_end.pl        2016-04-09 
11:48:10 UTC (rev 7106)
@@ -95,7 +95,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'deffn_name2',
               'number' => 1

Modified: trunk/tp/t/results/def/end_of_lines_protected.pl
===================================================================
--- trunk/tp/t/results/def/end_of_lines_protected.pl    2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/def/end_of_lines_protected.pl    2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -228,7 +228,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'deffn_name',
               'number' => 1

Modified: trunk/tp/t/results/def/end_of_lines_protected_in_footnote.pl
===================================================================
--- trunk/tp/t/results/def/end_of_lines_protected_in_footnote.pl        
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/def/end_of_lines_protected_in_footnote.pl        
2016-04-09 11:48:10 UTC (rev 7106)
@@ -253,7 +253,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'deffn',
                           'index_name' => 'fn',
-                          'index_prefix' => 'f',
                           'index_type_command' => 'deffn',
                           'key' => 'deffn_name',
                           'number' => 1

Modified: trunk/tp/t/results/def/inter_item_commands_in_def.pl
===================================================================
--- trunk/tp/t/results/def/inter_item_commands_in_def.pl        2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/def/inter_item_commands_in_def.pl        2016-04-09 
11:48:10 UTC (rev 7106)
@@ -120,7 +120,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'i',
               'number' => 1
@@ -286,7 +285,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'log trap1',
               'number' => 2
@@ -338,7 +336,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => 'between deffnx',
                   'number' => 1
@@ -478,7 +475,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'id i ule',
               'number' => 3
@@ -530,7 +526,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => 'cindex in deff item',
                   'number' => 2

Modified: trunk/tp/t/results/def/inter_item_commands_in_def_in_example.pl
===================================================================
--- trunk/tp/t/results/def/inter_item_commands_in_def_in_example.pl     
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/def/inter_item_commands_in_def_in_example.pl     
2016-04-09 11:48:10 UTC (rev 7106)
@@ -132,7 +132,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'i',
                   'number' => 1
@@ -304,7 +303,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'log trap1',
                   'number' => 2
@@ -358,7 +356,6 @@
                           'in_code' => 0,
                           'index_at_command' => 'cindex',
                           'index_name' => 'cp',
-                          'index_prefix' => 'c',
                           'index_type_command' => 'cindex',
                           'key' => 'between deffnx',
                           'number' => 1
@@ -502,7 +499,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'id i ule',
                   'number' => 3
@@ -556,7 +552,6 @@
                           'in_code' => 0,
                           'index_at_command' => 'cindex',
                           'index_name' => 'cp',
-                          'index_prefix' => 'c',
                           'index_type_command' => 'cindex',
                           'key' => 'cindex in deff item',
                           'number' => 2

Modified: trunk/tp/t/results/def/leading_space_in_def_arg.pl
===================================================================
--- trunk/tp/t/results/def/leading_space_in_def_arg.pl  2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/def/leading_space_in_def_arg.pl  2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -115,7 +115,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'name',
               'number' => 1

Modified: trunk/tp/t/results/def/no_category_or_no_name.pl
===================================================================
--- trunk/tp/t/results/def/no_category_or_no_name.pl    2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/def/no_category_or_no_name.pl    2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -341,7 +341,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'b',
               'number' => 1

Modified: trunk/tp/t/results/def/not_closed.pl
===================================================================
--- trunk/tp/t/results/def/not_closed.pl        2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/def/not_closed.pl        2016-04-09 11:48:10 UTC (rev 
7106)
@@ -83,7 +83,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'bidule',
               'number' => 1
@@ -172,7 +171,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'chose',
               'number' => 2
@@ -279,7 +277,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'defvar',
                       'index_name' => 'vr',
-                      'index_prefix' => 'v',
                       'index_type_command' => 'defvar',
                       'key' => 'type1',
                       'number' => 1

Modified: trunk/tp/t/results/def/protected_brace.pl
===================================================================
--- trunk/tp/t/results/def/protected_brace.pl   2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/def/protected_brace.pl   2016-04-09 11:48:10 UTC (rev 
7106)
@@ -76,7 +76,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => '{',
               'number' => 1

Modified: trunk/tp/t/results/def/ref_in_def.pl
===================================================================
--- trunk/tp/t/results/def/ref_in_def.pl        2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/def/ref_in_def.pl        2016-04-09 11:48:10 UTC (rev 
7106)
@@ -369,7 +369,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'myanchor',
                   'node' => {},
@@ -662,7 +661,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'myanchor',
                   'node' => {},

Modified: trunk/tp/t/results/def/space_in_def_for_index.pl
===================================================================
--- trunk/tp/t/results/def/space_in_def_for_index.pl    2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/def/space_in_def_for_index.pl    2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -235,7 +235,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'name',
                   'node' => {},
@@ -355,7 +354,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'AAA2',
                   'node' => {},

Modified: trunk/tp/t/results/def/wrong_braces_simple.pl
===================================================================
--- trunk/tp/t/results/def/wrong_braces_simple.pl       2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/def/wrong_braces_simple.pl       2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -116,7 +116,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'machin',
               'number' => 1
@@ -301,7 +300,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'machin',
               'number' => 2
@@ -510,7 +508,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'machin',
               'number' => 3
@@ -724,7 +721,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'machin',
               'number' => 4
@@ -892,7 +888,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'b',
               'number' => 5
@@ -1014,7 +1009,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'machin',
               'number' => 6
@@ -1143,7 +1137,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'machin',
               'number' => 7
@@ -1296,7 +1289,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'machin',
               'number' => 8
@@ -1454,7 +1446,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'machin',
               'number' => 9

Modified: trunk/tp/t/results/def/wrong_braces_with_end_of_lines.pl
===================================================================
--- trunk/tp/t/results/def/wrong_braces_with_end_of_lines.pl    2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/def/wrong_braces_with_end_of_lines.pl    2016-04-09 
11:48:10 UTC (rev 7106)
@@ -129,7 +129,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'name',
               'number' => 1
@@ -322,7 +321,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'name',
               'number' => 2

Modified: trunk/tp/t/results/float/cindex_in_caption.pl
===================================================================
--- trunk/tp/t/results/float/cindex_in_caption.pl       2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/float/cindex_in_caption.pl       2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -201,7 +201,6 @@
                               'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
-                              'index_prefix' => 'c',
                               'index_type_command' => 'cindex',
                               'key' => 'index entry',
                               'node' => {},

Modified: trunk/tp/t/results/float/complex_float.pl
===================================================================
--- trunk/tp/t/results/float/complex_float.pl   2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/float/complex_float.pl   2016-04-09 11:48:10 UTC (rev 
7106)
@@ -447,7 +447,6 @@
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_name' => 'cp',
-                      'index_prefix' => 'c',
                       'index_type_command' => 'cindex',
                       'key' => 'float example',
                       'node' => {},
@@ -1813,7 +1812,6 @@
                               'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
-                              'index_prefix' => 'c',
                               'index_type_command' => 'cindex',
                               'key' => 'float example in caption',
                               'node' => {},
@@ -3479,7 +3477,6 @@
                               'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
-                              'index_prefix' => 'c',
                               'index_type_command' => 'cindex',
                               'key' => 'float example in caption 2',
                               'node' => {},

Modified: trunk/tp/t/results/float/float_copying.pl
===================================================================
--- trunk/tp/t/results/float/float_copying.pl   2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/float/float_copying.pl   2016-04-09 11:48:10 UTC (rev 
7106)
@@ -216,7 +216,6 @@
                                           'in_code' => 0,
                                           'index_at_command' => 'cindex',
                                           'index_name' => 'cp',
-                                          'index_prefix' => 'c',
                                           'index_type_command' => 'cindex',
                                           'key' => 'indexed caption copying 
footnote',
                                           'number' => 1,
@@ -271,7 +270,6 @@
                                           'in_code' => 1,
                                           'index_at_command' => 'findex',
                                           'index_name' => 'fn',
-                                          'index_prefix' => 'f',
                                           'index_type_command' => 'findex',
                                           'key' => 'public domain function',
                                           'number' => 1,
@@ -511,7 +509,6 @@
                               'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
-                              'index_prefix' => 'c',
                               'index_type_command' => 'cindex',
                               'key' => 'indexed caption',
                               'number' => 2,
@@ -566,7 +563,6 @@
                               'in_code' => 1,
                               'index_at_command' => 'findex',
                               'index_name' => 'fn',
-                              'index_prefix' => 'f',
                               'index_type_command' => 'findex',
                               'key' => 'indexed caption function',
                               'number' => 2,

Modified: trunk/tp/t/results/heading/heading_in_copying.pl
===================================================================
--- trunk/tp/t/results/heading/heading_in_copying.pl    2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/heading/heading_in_copying.pl    2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -136,7 +136,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => 'cindex copying',
                   'number' => 1,

Modified: trunk/tp/t/results/html_tests/index_and_node_same_name.pl
===================================================================
--- trunk/tp/t/results/html_tests/index_and_node_same_name.pl   2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/html_tests/index_and_node_same_name.pl   2016-04-09 
11:48:10 UTC (rev 7106)
@@ -128,7 +128,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'node',
               'node' => {},

Modified: trunk/tp/t/results/html_tests/index_below.pl
===================================================================
--- trunk/tp/t/results/html_tests/index_below.pl        2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/html_tests/index_below.pl        2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -206,7 +206,6 @@
                 'in_code' => 0,
                 'index_at_command' => 'cindex',
                 'index_name' => 'cp',
-                'index_prefix' => 'c',
                 'index_type_command' => 'cindex',
                 'key' => 'entry',
                 'number' => 1

Modified: trunk/tp/t/results/indices/complex_recursive_synindex.pl
===================================================================
--- trunk/tp/t/results/indices/complex_recursive_synindex.pl    2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/indices/complex_recursive_synindex.pl    2016-04-09 
11:48:10 UTC (rev 7106)
@@ -466,7 +466,6 @@
               'in_code' => 0,
               'index_at_command' => 'eeeindex',
               'index_name' => 'eee',
-              'index_prefix' => 'eee',
               'index_type_command' => 'eeeindex',
               'key' => 'e before synindex',
               'node' => {},
@@ -613,7 +612,6 @@
               'in_code' => 0,
               'index_at_command' => 'cccindex',
               'index_name' => 'ccc',
-              'index_prefix' => 'ccc',
               'index_type_command' => 'cccindex',
               'key' => 'c index',
               'node' => {},
@@ -668,7 +666,6 @@
               'in_code' => 0,
               'index_at_command' => 'bbbindex',
               'index_name' => 'bbb',
-              'index_prefix' => 'bbb',
               'index_type_command' => 'bbbindex',
               'key' => 'b entry',
               'node' => {},
@@ -723,7 +720,6 @@
               'in_code' => 0,
               'index_at_command' => 'aaaindex',
               'index_name' => 'aaa',
-              'index_prefix' => 'aaa',
               'index_type_command' => 'aaaindex',
               'key' => 'a entry',
               'node' => {},
@@ -778,7 +774,6 @@
               'in_code' => 0,
               'index_at_command' => 'dddindex',
               'index_name' => 'ddd',
-              'index_prefix' => 'ddd',
               'index_type_command' => 'dddindex',
               'key' => 'd index',
               'node' => {},
@@ -833,7 +828,6 @@
               'in_code' => 0,
               'index_at_command' => 'eeeindex',
               'index_name' => 'eee',
-              'index_prefix' => 'eee',
               'index_type_command' => 'eeeindex',
               'key' => 'e index',
               'node' => {},
@@ -1531,10 +1525,7 @@
       },
       'in_code' => 0,
       'merged_in' => 'bbb',
-      'name' => 'aaa',
-      'prefix' => [
-        'aaa'
-      ]
+      'name' => 'aaa'
     },
     'bbb' => {
       'contained_indices' => {
@@ -1545,10 +1536,7 @@
         'eee' => 1
       },
       'in_code' => 0,
-      'name' => 'bbb',
-      'prefix' => [
-        'bbb'
-      ]
+      'name' => 'bbb'
     },
     'ccc' => {
       'contained_indices' => {
@@ -1556,21 +1544,14 @@
       },
       'in_code' => 0,
       'merged_in' => 'bbb',
-      'name' => 'ccc',
-      'prefix' => [
-        'ccc'
-      ]
+      'name' => 'ccc'
     },
     'cp' => {
       'contained_indices' => {
         'cp' => 1
       },
       'in_code' => 0,
-      'name' => 'cp',
-      'prefix' => [
-        'c',
-        'cp'
-      ]
+      'name' => 'cp'
     },
     'ddd' => {
       'contained_indices' => {
@@ -1578,10 +1559,7 @@
       },
       'in_code' => 0,
       'merged_in' => 'bbb',
-      'name' => 'ddd',
-      'prefix' => [
-        'ddd'
-      ]
+      'name' => 'ddd'
     },
     'eee' => {
       'contained_indices' => {
@@ -1589,65 +1567,42 @@
       },
       'in_code' => 0,
       'merged_in' => 'bbb',
-      'name' => 'eee',
-      'prefix' => [
-        'eee'
-      ]
+      'name' => 'eee'
     },
     'fn' => {
       'contained_indices' => {
         'fn' => 1
       },
       'in_code' => 1,
-      'name' => 'fn',
-      'prefix' => [
-        'f',
-        'fn'
-      ]
+      'name' => 'fn'
     },
     'ky' => {
       'contained_indices' => {
         'ky' => 1
       },
       'in_code' => 1,
-      'name' => 'ky',
-      'prefix' => [
-        'k',
-        'ky'
-      ]
+      'name' => 'ky'
     },
     'pg' => {
       'contained_indices' => {
         'pg' => 1
       },
       'in_code' => 1,
-      'name' => 'pg',
-      'prefix' => [
-        'p',
-        'pg'
-      ]
+      'name' => 'pg'
     },
     'tp' => {
       'contained_indices' => {
         'tp' => 1
       },
       'in_code' => 1,
-      'name' => 'tp',
-      'prefix' => [
-        't',
-        'tp'
-      ]
+      'name' => 'tp'
     },
     'vr' => {
       'contained_indices' => {
         'vr' => 1
       },
       'in_code' => 1,
-      'name' => 'vr',
-      'prefix' => [
-        'v',
-        'vr'
-      ]
+      'name' => 'vr'
     }
   },
   'merged_indices' => {

Modified: trunk/tp/t/results/indices/def_syn_indices.pl
===================================================================
--- trunk/tp/t/results/indices/def_syn_indices.pl       2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/indices/def_syn_indices.pl       2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -203,7 +203,6 @@
               'in_code' => 0,
               'index_at_command' => 'trucindex',
               'index_name' => 'truc',
-              'index_prefix' => 'truc',
               'index_type_command' => 'trucindex',
               'key' => 'index truc',
               'node' => {},
@@ -396,7 +395,6 @@
               'in_code' => 1,
               'index_at_command' => 'codeidxindex',
               'index_name' => 'codeidx',
-              'index_prefix' => 'codeidx',
               'index_type_command' => 'codeidxindex',
               'key' => 'a index entry te~ i^',
               'node' => {},
@@ -453,7 +451,6 @@
               'in_code' => 1,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'cindex entry',
               'node' => {},
@@ -562,7 +559,6 @@
               'in_code' => 1,
               'index_at_command' => 'kindex',
               'index_name' => 'ky',
-              'index_prefix' => 'k',
               'index_type_command' => 'kindex',
               'key' => 'truc kindex',
               'node' => {},
@@ -617,7 +613,6 @@
               'in_code' => 1,
               'index_at_command' => 'pindex',
               'index_name' => 'pg',
-              'index_prefix' => 'p',
               'index_type_command' => 'pindex',
               'key' => 'pindex codeidx',
               'node' => {},
@@ -904,7 +899,6 @@
               'in_code' => 0,
               'index_at_command' => 'defgindex',
               'index_name' => 'defg',
-              'index_prefix' => 'defg',
               'index_type_command' => 'defgindex',
               'key' => 'defg index entry',
               'node' => {},
@@ -965,7 +959,6 @@
               'in_code' => 0,
               'index_at_command' => 'abcindex',
               'index_name' => 'abc',
-              'index_prefix' => 'abc',
               'index_type_command' => 'abcindex',
               'key' => 'abc index entry',
               'node' => {},
@@ -2017,20 +2010,14 @@
       },
       'in_code' => 0,
       'merged_in' => 'pg',
-      'name' => 'abc',
-      'prefix' => [
-        'abc'
-      ]
+      'name' => 'abc'
     },
     'codeidx' => {
       'contained_indices' => {
         'codeidx' => 1
       },
       'in_code' => 1,
-      'name' => 'codeidx',
-      'prefix' => [
-        'codeidx'
-      ]
+      'name' => 'codeidx'
     },
     'cp' => {
       'contained_indices' => {
@@ -2038,11 +2025,7 @@
       },
       'in_code' => 1,
       'merged_in' => 'fn',
-      'name' => 'cp',
-      'prefix' => [
-        'c',
-        'cp'
-      ]
+      'name' => 'cp'
     },
     'defg' => {
       'contained_indices' => {
@@ -2051,10 +2034,7 @@
       },
       'in_code' => 0,
       'merged_in' => 'pg',
-      'name' => 'defg',
-      'prefix' => [
-        'defg'
-      ]
+      'name' => 'defg'
     },
     'fn' => {
       'contained_indices' => {
@@ -2063,11 +2043,7 @@
         'truc' => 1
       },
       'in_code' => 1,
-      'name' => 'fn',
-      'prefix' => [
-        'f',
-        'fn'
-      ]
+      'name' => 'fn'
     },
     'ky' => {
       'contained_indices' => {
@@ -2075,11 +2051,7 @@
       },
       'in_code' => 1,
       'merged_in' => 'pg',
-      'name' => 'ky',
-      'prefix' => [
-        'k',
-        'ky'
-      ]
+      'name' => 'ky'
     },
     'pg' => {
       'contained_indices' => {
@@ -2089,22 +2061,14 @@
         'pg' => 1
       },
       'in_code' => 1,
-      'name' => 'pg',
-      'prefix' => [
-        'p',
-        'pg'
-      ]
+      'name' => 'pg'
     },
     'tp' => {
       'contained_indices' => {
         'tp' => 1
       },
       'in_code' => 1,
-      'name' => 'tp',
-      'prefix' => [
-        't',
-        'tp'
-      ]
+      'name' => 'tp'
     },
     'truc' => {
       'contained_indices' => {
@@ -2112,21 +2076,14 @@
       },
       'in_code' => 0,
       'merged_in' => 'fn',
-      'name' => 'truc',
-      'prefix' => [
-        'truc'
-      ]
+      'name' => 'truc'
     },
     'vr' => {
       'contained_indices' => {
         'vr' => 1
       },
       'in_code' => 1,
-      'name' => 'vr',
-      'prefix' => [
-        'v',
-        'vr'
-      ]
+      'name' => 'vr'
     }
   },
   'merged_indices' => {

Modified: 
trunk/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
===================================================================
--- trunk/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl  
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl  
2016-04-09 11:48:10 UTC (rev 7106)
@@ -133,7 +133,6 @@
               'in_code' => 1,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '--cindex',
               'node' => {},
@@ -188,7 +187,6 @@
               'in_code' => 1,
               'index_at_command' => 'cpindex',
               'index_name' => 'cp',
-              'index_prefix' => 'cp',
               'index_type_command' => 'cpindex',
               'key' => '--cpindex',
               'node' => {},
@@ -383,11 +381,7 @@
       },
       'in_code' => 1,
       'merged_in' => 'fn',
-      'name' => 'cp',
-      'prefix' => [
-        'c',
-        'cp'
-      ]
+      'name' => 'cp'
     },
     'fn' => {
       'contained_indices' => {
@@ -395,55 +389,35 @@
         'fn' => 1
       },
       'in_code' => 1,
-      'name' => 'fn',
-      'prefix' => [
-        'f',
-        'fn'
-      ]
+      'name' => 'fn'
     },
     'ky' => {
       'contained_indices' => {
         'ky' => 1
       },
       'in_code' => 1,
-      'name' => 'ky',
-      'prefix' => [
-        'k',
-        'ky'
-      ]
+      'name' => 'ky'
     },
     'pg' => {
       'contained_indices' => {
         'pg' => 1
       },
       'in_code' => 1,
-      'name' => 'pg',
-      'prefix' => [
-        'p',
-        'pg'
-      ]
+      'name' => 'pg'
     },
     'tp' => {
       'contained_indices' => {
         'tp' => 1
       },
       'in_code' => 1,
-      'name' => 'tp',
-      'prefix' => [
-        't',
-        'tp'
-      ]
+      'name' => 'tp'
     },
     'vr' => {
       'contained_indices' => {
         'vr' => 1
       },
       'in_code' => 1,
-      'name' => 'vr',
-      'prefix' => [
-        'v',
-        'vr'
-      ]
+      'name' => 'vr'
     }
   },
   'merged_indices' => {

Modified: trunk/tp/t/results/indices/double_index_entry.pl
===================================================================
--- trunk/tp/t/results/indices/double_index_entry.pl    2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/indices/double_index_entry.pl    2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -85,7 +85,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'aaa',
               'node' => {},
@@ -163,7 +162,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'aaa',
               'node' => {},
@@ -428,7 +426,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'aaa',
               'node' => {},

Modified: trunk/tp/t/results/indices/double_syncodeindex.pl
===================================================================
--- trunk/tp/t/results/indices/double_syncodeindex.pl   2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/indices/double_syncodeindex.pl   2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -176,7 +176,6 @@
               'in_code' => 1,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'cindex entry',
               'node' => {},
@@ -231,7 +230,6 @@
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'findex',
               'key' => 'findex entry',
               'node' => {},
@@ -493,11 +491,7 @@
       },
       'in_code' => 1,
       'merged_in' => 'fn',
-      'name' => 'cp',
-      'prefix' => [
-        'c',
-        'cp'
-      ]
+      'name' => 'cp'
     },
     'fn' => {
       'contained_indices' => {
@@ -505,55 +499,35 @@
         'fn' => 1
       },
       'in_code' => 1,
-      'name' => 'fn',
-      'prefix' => [
-        'f',
-        'fn'
-      ]
+      'name' => 'fn'
     },
     'ky' => {
       'contained_indices' => {
         'ky' => 1
       },
       'in_code' => 1,
-      'name' => 'ky',
-      'prefix' => [
-        'k',
-        'ky'
-      ]
+      'name' => 'ky'
     },
     'pg' => {
       'contained_indices' => {
         'pg' => 1
       },
       'in_code' => 1,
-      'name' => 'pg',
-      'prefix' => [
-        'p',
-        'pg'
-      ]
+      'name' => 'pg'
     },
     'tp' => {
       'contained_indices' => {
         'tp' => 1
       },
       'in_code' => 1,
-      'name' => 'tp',
-      'prefix' => [
-        't',
-        'tp'
-      ]
+      'name' => 'tp'
     },
     'vr' => {
       'contained_indices' => {
         'vr' => 1
       },
       'in_code' => 1,
-      'name' => 'vr',
-      'prefix' => [
-        'v',
-        'vr'
-      ]
+      'name' => 'vr'
     }
   },
   'merged_indices' => {

Modified: trunk/tp/t/results/indices/empty_string_index_entry.pl
===================================================================
--- trunk/tp/t/results/indices/empty_string_index_entry.pl      2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/indices/empty_string_index_entry.pl      2016-04-09 
11:48:10 UTC (rev 7106)
@@ -98,7 +98,6 @@
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'findex',
               'key' => '',
               'node' => {},
@@ -208,7 +207,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_name' => 'fn',
-                          'index_prefix' => 'f',
                           'index_type_command' => 'ftable',
                           'key' => '',
                           'node' => {},
@@ -428,7 +426,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defun',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'defun',
                   'key' => '',
                   'node' => {},
@@ -577,7 +574,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defunx',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'defun',
                   'key' => '',
                   'node' => {},

Modified: trunk/tp/t/results/indices/encoding_index_ascii.pl
===================================================================
--- trunk/tp/t/results/indices/encoding_index_ascii.pl  2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/indices/encoding_index_ascii.pl  2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -269,7 +269,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'e\' e\'',
               'node' => {},
@@ -400,7 +399,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i" i"i"i"',
               'node' => {},
@@ -550,7 +548,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i^ i^i^i^i^',
               'node' => {},
@@ -601,7 +598,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'a',
               'node' => {},
@@ -656,7 +652,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'b',
               'node' => {},
@@ -711,7 +706,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'c',
               'node' => {},
@@ -766,7 +760,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'd',
               'node' => {},
@@ -821,7 +814,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'e',
               'node' => {},
@@ -876,7 +868,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'f',
               'node' => {},
@@ -931,7 +922,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'g',
               'node' => {},
@@ -986,7 +976,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'h',
               'node' => {},
@@ -1041,7 +1030,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i',
               'node' => {},
@@ -1096,7 +1084,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'j',
               'node' => {},
@@ -1151,7 +1138,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'k',
               'node' => {},
@@ -1206,7 +1192,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'l',
               'node' => {},
@@ -1261,7 +1246,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'm',
               'node' => {},
@@ -1316,7 +1300,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'n',
               'node' => {},
@@ -1371,7 +1354,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'o',
               'node' => {},
@@ -1426,7 +1408,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'p',
               'node' => {},
@@ -1481,7 +1462,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'q',
               'node' => {},
@@ -1536,7 +1516,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'r',
               'node' => {},
@@ -1591,7 +1570,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 's',
               'node' => {},
@@ -1646,7 +1624,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 't',
               'node' => {},
@@ -1701,7 +1678,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'u',
               'node' => {},
@@ -1756,7 +1732,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'v',
               'node' => {},
@@ -1811,7 +1786,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'w',
               'node' => {},
@@ -1866,7 +1840,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'x',
               'node' => {},
@@ -1921,7 +1894,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'y',
               'node' => {},
@@ -1976,7 +1948,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'z',
               'node' => {},
@@ -2031,7 +2002,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'A',
               'node' => {},
@@ -2086,7 +2056,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'B',
               'node' => {},
@@ -2154,7 +2123,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'l',
               'node' => {},
@@ -2218,7 +2186,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'L',
               'node' => {},
@@ -2316,7 +2283,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i i (dotless)',
               'node' => {},
@@ -2442,7 +2408,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i^ i^ (dotless)',
               'node' => {},
@@ -2506,7 +2471,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'ss',
               'node' => {},
@@ -2570,7 +2534,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'Euro',
               'node' => {},
@@ -2634,7 +2597,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'AE',
               'node' => {},
@@ -2698,7 +2660,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '!',
               'node' => {},
@@ -2762,7 +2723,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'TH',
               'node' => {},
@@ -2826,7 +2786,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'D',
               'node' => {},
@@ -2890,7 +2849,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'o',
               'node' => {},
@@ -2941,7 +2899,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '0',
               'node' => {},
@@ -2996,7 +2953,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '9',
               'node' => {},
@@ -3064,7 +3020,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '``',
               'node' => {},
@@ -3128,7 +3083,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '>=',
               'node' => {},
@@ -3192,7 +3146,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => ',',
               'node' => {},
@@ -3243,7 +3196,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '"',
               'node' => {},
@@ -3298,7 +3250,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '`',
               'node' => {},
@@ -3353,7 +3304,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '\'',
               'node' => {},
@@ -3408,7 +3358,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '"',
               'node' => {},
@@ -3463,7 +3412,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '"',
               'node' => {},
@@ -3518,7 +3466,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '@',
               'node' => {},
@@ -3573,7 +3520,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '-',
               'node' => {},
@@ -3628,7 +3574,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '--',
               'node' => {},

Modified: trunk/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl
===================================================================
--- trunk/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl  
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/indices/encoding_index_ascii_enable_encoding.pl  
2016-04-09 11:48:10 UTC (rev 7106)
@@ -269,7 +269,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'e\' e\'',
               'node' => {},
@@ -400,7 +399,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i" i"i"i"',
               'node' => {},
@@ -550,7 +548,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i^ i^i^i^i^',
               'node' => {},
@@ -601,7 +598,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'a',
               'node' => {},
@@ -656,7 +652,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'b',
               'node' => {},
@@ -711,7 +706,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'c',
               'node' => {},
@@ -766,7 +760,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'd',
               'node' => {},
@@ -821,7 +814,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'e',
               'node' => {},
@@ -876,7 +868,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'f',
               'node' => {},
@@ -931,7 +922,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'g',
               'node' => {},
@@ -986,7 +976,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'h',
               'node' => {},
@@ -1041,7 +1030,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i',
               'node' => {},
@@ -1096,7 +1084,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'j',
               'node' => {},
@@ -1151,7 +1138,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'k',
               'node' => {},
@@ -1206,7 +1192,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'l',
               'node' => {},
@@ -1261,7 +1246,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'm',
               'node' => {},
@@ -1316,7 +1300,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'n',
               'node' => {},
@@ -1371,7 +1354,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'o',
               'node' => {},
@@ -1426,7 +1408,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'p',
               'node' => {},
@@ -1481,7 +1462,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'q',
               'node' => {},
@@ -1536,7 +1516,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'r',
               'node' => {},
@@ -1591,7 +1570,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 's',
               'node' => {},
@@ -1646,7 +1624,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 't',
               'node' => {},
@@ -1701,7 +1678,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'u',
               'node' => {},
@@ -1756,7 +1732,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'v',
               'node' => {},
@@ -1811,7 +1786,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'w',
               'node' => {},
@@ -1866,7 +1840,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'x',
               'node' => {},
@@ -1921,7 +1894,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'y',
               'node' => {},
@@ -1976,7 +1948,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'z',
               'node' => {},
@@ -2031,7 +2002,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'A',
               'node' => {},
@@ -2086,7 +2056,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'B',
               'node' => {},
@@ -2154,7 +2123,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'l',
               'node' => {},
@@ -2218,7 +2186,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'L',
               'node' => {},
@@ -2316,7 +2283,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i i (dotless)',
               'node' => {},
@@ -2442,7 +2408,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i^ i^ (dotless)',
               'node' => {},
@@ -2506,7 +2471,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'ss',
               'node' => {},
@@ -2570,7 +2534,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'Euro',
               'node' => {},
@@ -2634,7 +2597,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'AE',
               'node' => {},
@@ -2698,7 +2660,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '!',
               'node' => {},
@@ -2762,7 +2723,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'TH',
               'node' => {},
@@ -2826,7 +2786,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'D',
               'node' => {},
@@ -2890,7 +2849,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'o',
               'node' => {},
@@ -2941,7 +2899,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '0',
               'node' => {},
@@ -2996,7 +2953,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '9',
               'node' => {},
@@ -3064,7 +3020,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '``',
               'node' => {},
@@ -3128,7 +3083,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '>=',
               'node' => {},
@@ -3192,7 +3146,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => ',',
               'node' => {},
@@ -3243,7 +3196,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '"',
               'node' => {},
@@ -3298,7 +3250,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '`',
               'node' => {},
@@ -3353,7 +3304,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '\'',
               'node' => {},
@@ -3408,7 +3358,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '"',
               'node' => {},
@@ -3463,7 +3412,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '"',
               'node' => {},
@@ -3518,7 +3466,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '@',
               'node' => {},
@@ -3573,7 +3520,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '-',
               'node' => {},
@@ -3628,7 +3574,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '--',
               'node' => {},

Modified: trunk/tp/t/results/indices/encoding_index_latin1.pl
===================================================================
--- trunk/tp/t/results/indices/encoding_index_latin1.pl 2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/indices/encoding_index_latin1.pl 2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -227,7 +227,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'é é',
               'node' => {},
@@ -362,7 +361,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i" i"i"i"',
               'node' => {},
@@ -512,7 +510,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i^ i^i^i^i^',
               'node' => {},
@@ -563,7 +560,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'a',
               'node' => {},
@@ -618,7 +614,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'b',
               'node' => {},
@@ -673,7 +668,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'c',
               'node' => {},
@@ -728,7 +722,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'd',
               'node' => {},
@@ -783,7 +776,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'e',
               'node' => {},
@@ -838,7 +830,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'f',
               'node' => {},
@@ -893,7 +884,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'g',
               'node' => {},
@@ -948,7 +938,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'h',
               'node' => {},
@@ -1003,7 +992,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i',
               'node' => {},
@@ -1058,7 +1046,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'j',
               'node' => {},
@@ -1113,7 +1100,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'k',
               'node' => {},
@@ -1168,7 +1154,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'l',
               'node' => {},
@@ -1223,7 +1208,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'm',
               'node' => {},
@@ -1278,7 +1262,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'n',
               'node' => {},
@@ -1333,7 +1316,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'o',
               'node' => {},
@@ -1388,7 +1370,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'p',
               'node' => {},
@@ -1443,7 +1424,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'q',
               'node' => {},
@@ -1498,7 +1478,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'r',
               'node' => {},
@@ -1553,7 +1532,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 's',
               'node' => {},
@@ -1608,7 +1586,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 't',
               'node' => {},
@@ -1663,7 +1640,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'u',
               'node' => {},
@@ -1718,7 +1694,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'v',
               'node' => {},
@@ -1773,7 +1748,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'w',
               'node' => {},
@@ -1828,7 +1802,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'x',
               'node' => {},
@@ -1883,7 +1856,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'y',
               'node' => {},
@@ -1938,7 +1910,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'z',
               'node' => {},
@@ -1993,7 +1964,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'A',
               'node' => {},
@@ -2048,7 +2018,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'B',
               'node' => {},
@@ -2116,7 +2085,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'l',
               'node' => {},
@@ -2180,7 +2148,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'L',
               'node' => {},
@@ -2278,7 +2245,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i i (dotless)',
               'node' => {},
@@ -2404,7 +2370,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i^ i^ (dotless)',
               'node' => {},
@@ -2468,7 +2433,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'ss',
               'node' => {},
@@ -2532,7 +2496,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'Euro',
               'node' => {},
@@ -2596,7 +2559,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'AE',
               'node' => {},
@@ -2660,7 +2622,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '!',
               'node' => {},
@@ -2724,7 +2685,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'TH',
               'node' => {},
@@ -2788,7 +2748,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'D',
               'node' => {},
@@ -2852,7 +2811,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'o',
               'node' => {},
@@ -2903,7 +2861,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '0',
               'node' => {},
@@ -2958,7 +2915,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '9',
               'node' => {},
@@ -3026,7 +2982,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '``',
               'node' => {},
@@ -3090,7 +3045,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '>=',
               'node' => {},
@@ -3154,7 +3108,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => ',',
               'node' => {},
@@ -3205,7 +3158,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '"',
               'node' => {},
@@ -3260,7 +3212,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '`',
               'node' => {},
@@ -3315,7 +3266,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '\'',
               'node' => {},
@@ -3370,7 +3320,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '"',
               'node' => {},
@@ -3425,7 +3374,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '"',
               'node' => {},
@@ -3480,7 +3428,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '@',
               'node' => {},
@@ -3535,7 +3482,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '-',
               'node' => {},
@@ -3590,7 +3536,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '--',
               'node' => {},

Modified: trunk/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl
===================================================================
--- trunk/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl 
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/indices/encoding_index_latin1_enable_encoding.pl 
2016-04-09 11:48:10 UTC (rev 7106)
@@ -227,7 +227,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'é é',
               'node' => {},
@@ -362,7 +361,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{ef} \x{ef}\x{ef}\x{ef}",
               'node' => {},
@@ -512,7 +510,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{ee} \x{ee}\x{ee}\x{ee}\x{ee}",
               'node' => {},
@@ -563,7 +560,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'a',
               'node' => {},
@@ -618,7 +614,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'b',
               'node' => {},
@@ -673,7 +668,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'c',
               'node' => {},
@@ -728,7 +722,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'd',
               'node' => {},
@@ -783,7 +776,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'e',
               'node' => {},
@@ -838,7 +830,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'f',
               'node' => {},
@@ -893,7 +884,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'g',
               'node' => {},
@@ -948,7 +938,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'h',
               'node' => {},
@@ -1003,7 +992,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i',
               'node' => {},
@@ -1058,7 +1046,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'j',
               'node' => {},
@@ -1113,7 +1100,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'k',
               'node' => {},
@@ -1168,7 +1154,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'l',
               'node' => {},
@@ -1223,7 +1208,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'm',
               'node' => {},
@@ -1278,7 +1262,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'n',
               'node' => {},
@@ -1333,7 +1316,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'o',
               'node' => {},
@@ -1388,7 +1370,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'p',
               'node' => {},
@@ -1443,7 +1424,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'q',
               'node' => {},
@@ -1498,7 +1478,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'r',
               'node' => {},
@@ -1553,7 +1532,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 's',
               'node' => {},
@@ -1608,7 +1586,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 't',
               'node' => {},
@@ -1663,7 +1640,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'u',
               'node' => {},
@@ -1718,7 +1694,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'v',
               'node' => {},
@@ -1773,7 +1748,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'w',
               'node' => {},
@@ -1828,7 +1802,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'x',
               'node' => {},
@@ -1883,7 +1856,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'y',
               'node' => {},
@@ -1938,7 +1910,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'z',
               'node' => {},
@@ -1993,7 +1964,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'A',
               'node' => {},
@@ -2048,7 +2018,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'B',
               'node' => {},
@@ -2116,7 +2085,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'l',
               'node' => {},
@@ -2180,7 +2148,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'L',
               'node' => {},
@@ -2278,7 +2245,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i i (dotless)',
               'node' => {},
@@ -2404,7 +2370,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{ee} \x{ee} (dotless)",
               'node' => {},
@@ -2468,7 +2433,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{df}",
               'node' => {},
@@ -2532,7 +2496,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'Euro',
               'node' => {},
@@ -2596,7 +2559,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{c6}",
               'node' => {},
@@ -2660,7 +2622,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{a1}",
               'node' => {},
@@ -2724,7 +2685,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{de}",
               'node' => {},
@@ -2788,7 +2748,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{d0}",
               'node' => {},
@@ -2852,7 +2811,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{b0}",
               'node' => {},
@@ -2903,7 +2861,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '0',
               'node' => {},
@@ -2958,7 +2915,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '9',
               'node' => {},
@@ -3026,7 +2982,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '``',
               'node' => {},
@@ -3090,7 +3045,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '>=',
               'node' => {},
@@ -3154,7 +3108,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => ',',
               'node' => {},
@@ -3205,7 +3158,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '"',
               'node' => {},
@@ -3260,7 +3212,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '`',
               'node' => {},
@@ -3315,7 +3266,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '\'',
               'node' => {},
@@ -3370,7 +3320,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '"',
               'node' => {},
@@ -3425,7 +3374,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '"',
               'node' => {},
@@ -3480,7 +3428,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '@',
               'node' => {},
@@ -3535,7 +3482,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '-',
               'node' => {},
@@ -3590,7 +3536,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '--',
               'node' => {},

Modified: trunk/tp/t/results/indices/encoding_index_utf8.pl
===================================================================
--- trunk/tp/t/results/indices/encoding_index_utf8.pl   2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/indices/encoding_index_utf8.pl   2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -227,7 +227,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'é é',
               'node' => {},
@@ -362,7 +361,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i" i"i"i"',
               'node' => {},
@@ -512,7 +510,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i^ i^i^i^i^',
               'node' => {},
@@ -563,7 +560,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'a',
               'node' => {},
@@ -618,7 +614,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'b',
               'node' => {},
@@ -673,7 +668,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'c',
               'node' => {},
@@ -728,7 +722,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'd',
               'node' => {},
@@ -783,7 +776,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'e',
               'node' => {},
@@ -838,7 +830,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'f',
               'node' => {},
@@ -893,7 +884,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'g',
               'node' => {},
@@ -948,7 +938,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'h',
               'node' => {},
@@ -1003,7 +992,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i',
               'node' => {},
@@ -1058,7 +1046,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'j',
               'node' => {},
@@ -1113,7 +1100,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'k',
               'node' => {},
@@ -1168,7 +1154,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'l',
               'node' => {},
@@ -1223,7 +1208,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'm',
               'node' => {},
@@ -1278,7 +1262,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'n',
               'node' => {},
@@ -1333,7 +1316,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'o',
               'node' => {},
@@ -1388,7 +1370,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'p',
               'node' => {},
@@ -1443,7 +1424,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'q',
               'node' => {},
@@ -1498,7 +1478,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'r',
               'node' => {},
@@ -1553,7 +1532,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 's',
               'node' => {},
@@ -1608,7 +1586,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 't',
               'node' => {},
@@ -1663,7 +1640,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'u',
               'node' => {},
@@ -1718,7 +1694,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'v',
               'node' => {},
@@ -1773,7 +1748,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'w',
               'node' => {},
@@ -1828,7 +1802,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'x',
               'node' => {},
@@ -1883,7 +1856,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'y',
               'node' => {},
@@ -1938,7 +1910,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'z',
               'node' => {},
@@ -1993,7 +1964,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'A',
               'node' => {},
@@ -2048,7 +2018,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'B',
               'node' => {},
@@ -2116,7 +2085,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'l',
               'node' => {},
@@ -2180,7 +2148,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'L',
               'node' => {},
@@ -2278,7 +2245,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i i (dotless)',
               'node' => {},
@@ -2404,7 +2370,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i^ i^ (dotless)',
               'node' => {},
@@ -2468,7 +2433,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'ss',
               'node' => {},
@@ -2532,7 +2496,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'Euro',
               'node' => {},
@@ -2596,7 +2559,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'AE',
               'node' => {},
@@ -2660,7 +2622,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '!',
               'node' => {},
@@ -2724,7 +2685,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'TH',
               'node' => {},
@@ -2788,7 +2748,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'D',
               'node' => {},
@@ -2852,7 +2811,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'o',
               'node' => {},
@@ -2903,7 +2861,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '0',
               'node' => {},
@@ -2958,7 +2915,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '9',
               'node' => {},
@@ -3026,7 +2982,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '``',
               'node' => {},
@@ -3090,7 +3045,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '>=',
               'node' => {},
@@ -3154,7 +3108,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => ',',
               'node' => {},
@@ -3205,7 +3158,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '"',
               'node' => {},
@@ -3260,7 +3212,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '`',
               'node' => {},
@@ -3315,7 +3266,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '\'',
               'node' => {},
@@ -3370,7 +3320,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '"',
               'node' => {},
@@ -3425,7 +3374,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '"',
               'node' => {},
@@ -3480,7 +3428,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '@',
               'node' => {},
@@ -3535,7 +3482,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '-',
               'node' => {},
@@ -3590,7 +3536,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '--',
               'node' => {},

Modified: trunk/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl
===================================================================
--- trunk/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl   
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/indices/encoding_index_utf8_enable_encoding.pl   
2016-04-09 11:48:10 UTC (rev 7106)
@@ -227,7 +227,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'é é',
               'node' => {},
@@ -362,7 +361,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{ef} \x{ef}\x{ef}\x{ef}",
               'node' => {},
@@ -512,7 +510,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{ee} \x{ee}\x{ee}\x{ee}\x{ee}",
               'node' => {},
@@ -563,7 +560,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'a',
               'node' => {},
@@ -618,7 +614,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'b',
               'node' => {},
@@ -673,7 +668,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'c',
               'node' => {},
@@ -728,7 +722,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'd',
               'node' => {},
@@ -783,7 +776,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'e',
               'node' => {},
@@ -838,7 +830,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'f',
               'node' => {},
@@ -893,7 +884,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'g',
               'node' => {},
@@ -948,7 +938,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'h',
               'node' => {},
@@ -1003,7 +992,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'i',
               'node' => {},
@@ -1058,7 +1046,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'j',
               'node' => {},
@@ -1113,7 +1100,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'k',
               'node' => {},
@@ -1168,7 +1154,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'l',
               'node' => {},
@@ -1223,7 +1208,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'm',
               'node' => {},
@@ -1278,7 +1262,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'n',
               'node' => {},
@@ -1333,7 +1316,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'o',
               'node' => {},
@@ -1388,7 +1370,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'p',
               'node' => {},
@@ -1443,7 +1424,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'q',
               'node' => {},
@@ -1498,7 +1478,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'r',
               'node' => {},
@@ -1553,7 +1532,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 's',
               'node' => {},
@@ -1608,7 +1586,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 't',
               'node' => {},
@@ -1663,7 +1640,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'u',
               'node' => {},
@@ -1718,7 +1694,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'v',
               'node' => {},
@@ -1773,7 +1748,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'w',
               'node' => {},
@@ -1828,7 +1802,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'x',
               'node' => {},
@@ -1883,7 +1856,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'y',
               'node' => {},
@@ -1938,7 +1910,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'z',
               'node' => {},
@@ -1993,7 +1964,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'A',
               'node' => {},
@@ -2048,7 +2018,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'B',
               'node' => {},
@@ -2116,7 +2085,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{142}",
               'node' => {},
@@ -2180,7 +2148,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{141}",
               'node' => {},
@@ -2278,7 +2245,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{131} \x{131} (dotless)",
               'node' => {},
@@ -2404,7 +2370,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{ee} \x{ee} (dotless)",
               'node' => {},
@@ -2468,7 +2433,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{df}",
               'node' => {},
@@ -2532,7 +2496,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{20ac}",
               'node' => {},
@@ -2596,7 +2559,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{c6}",
               'node' => {},
@@ -2660,7 +2622,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{a1}",
               'node' => {},
@@ -2724,7 +2685,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{de}",
               'node' => {},
@@ -2788,7 +2748,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{d0}",
               'node' => {},
@@ -2852,7 +2811,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{b0}",
               'node' => {},
@@ -2903,7 +2861,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '0',
               'node' => {},
@@ -2958,7 +2915,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '9',
               'node' => {},
@@ -3026,7 +2982,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{201c}",
               'node' => {},
@@ -3090,7 +3045,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => "\x{2265}",
               'node' => {},
@@ -3154,7 +3108,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => ',',
               'node' => {},
@@ -3205,7 +3158,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '"',
               'node' => {},
@@ -3260,7 +3212,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '`',
               'node' => {},
@@ -3315,7 +3266,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '\'',
               'node' => {},
@@ -3370,7 +3320,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '"',
               'node' => {},
@@ -3425,7 +3374,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '"',
               'node' => {},
@@ -3480,7 +3428,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '@',
               'node' => {},
@@ -3535,7 +3482,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '-',
               'node' => {},
@@ -3590,7 +3536,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '--',
               'node' => {},

Modified: trunk/tp/t/results/indices/ftable_vtable.pl
===================================================================
--- trunk/tp/t/results/indices/ftable_vtable.pl 2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/indices/ftable_vtable.pl 2016-04-09 11:48:10 UTC (rev 
7106)
@@ -132,7 +132,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_name' => 'fn',
-                          'index_prefix' => 'f',
                           'index_type_command' => 'ftable',
                           'key' => 'function1',
                           'node' => {},
@@ -186,7 +185,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'itemx',
                           'index_name' => 'fn',
-                          'index_prefix' => 'f',
                           'index_type_command' => 'ftable',
                           'key' => 'function2x',
                           'node' => {},
@@ -269,7 +267,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_name' => 'fn',
-                          'index_prefix' => 'f',
                           'index_type_command' => 'ftable',
                           'key' => 'fun3',
                           'node' => {},
@@ -450,7 +447,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v',
                           'index_type_command' => 'vtable',
                           'key' => 'var1 error->',
                           'node' => {},
@@ -500,7 +496,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'itemx',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v',
                           'index_type_command' => 'vtable',
                           'key' => 'varx2',
                           'node' => {},
@@ -583,7 +578,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v',
                           'index_type_command' => 'vtable',
                           'key' => 'var3',
                           'node' => {},
@@ -706,7 +700,6 @@
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'findex',
               'key' => 'function1',
               'node' => {},

Modified: trunk/tp/t/results/indices/image_lines_count.pl
===================================================================
--- trunk/tp/t/results/indices/image_lines_count.pl     2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/indices/image_lines_count.pl     2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -125,7 +125,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'index entry',
               'node' => {},

Modified: trunk/tp/t/results/indices/image_text_lines_count.pl
===================================================================
--- trunk/tp/t/results/indices/image_text_lines_count.pl        2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/indices/image_text_lines_count.pl        2016-04-09 
11:48:10 UTC (rev 7106)
@@ -125,7 +125,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'index entry',
               'node' => {},

Modified: trunk/tp/t/results/indices/index_entries_locations.pl
===================================================================
--- trunk/tp/t/results/indices/index_entries_locations.pl       2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/indices/index_entries_locations.pl       2016-04-09 
11:48:10 UTC (rev 7106)
@@ -116,7 +116,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => 'entry in paragraph',
                   'node' => {},
@@ -176,7 +175,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => 'entry at end of paragraph.',
                   'node' => {},
@@ -258,7 +256,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'Entry before paragraph',
               'node' => {},
@@ -330,7 +327,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'lone entry',
               'node' => {},

Modified: trunk/tp/t/results/indices/index_entry_before_first_node.pl
===================================================================
--- trunk/tp/t/results/indices/index_entry_before_first_node.pl 2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/indices/index_entry_before_first_node.pl 2016-04-09 
11:48:10 UTC (rev 7106)
@@ -53,7 +53,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'before nodes',
               'number' => 1

Modified: trunk/tp/t/results/indices/index_entry_before_node.pl
===================================================================
--- trunk/tp/t/results/indices/index_entry_before_node.pl       2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/indices/index_entry_before_node.pl       2016-04-09 
11:48:10 UTC (rev 7106)
@@ -368,7 +368,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'lone entry',
               'node' => {},

Modified: trunk/tp/t/results/indices/index_entry_in_footnote.pl
===================================================================
--- trunk/tp/t/results/indices/index_entry_in_footnote.pl       2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/indices/index_entry_in_footnote.pl       2016-04-09 
11:48:10 UTC (rev 7106)
@@ -102,7 +102,6 @@
                               'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
-                              'index_prefix' => 'c',
                               'index_type_command' => 'cindex',
                               'key' => 'index entry in footnote',
                               'node' => {},

Modified: 
trunk/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl
===================================================================
--- trunk/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl    
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/indices/index_entry_in_footnote_different_node_end.pl    
2016-04-09 11:48:10 UTC (rev 7106)
@@ -230,7 +230,6 @@
                               'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
-                              'index_prefix' => 'c',
                               'index_type_command' => 'cindex',
                               'key' => 'index entry in footnote',
                               'node' => {},
@@ -329,7 +328,6 @@
                           'in_code' => 0,
                           'index_at_command' => 'cindex',
                           'index_name' => 'cp',
-                          'index_prefix' => 'c',
                           'index_type_command' => 'cindex',
                           'key' => 'counting entry',
                           'node' => {},

Modified: trunk/tp/t/results/indices/index_entry_in_footnote_separate.pl
===================================================================
--- trunk/tp/t/results/indices/index_entry_in_footnote_separate.pl      
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/indices/index_entry_in_footnote_separate.pl      
2016-04-09 11:48:10 UTC (rev 7106)
@@ -272,7 +272,6 @@
                               'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
-                              'index_prefix' => 'c',
                               'index_type_command' => 'cindex',
                               'key' => 'index entry in footnote',
                               'node' => {},
@@ -371,7 +370,6 @@
                           'in_code' => 0,
                           'index_at_command' => 'cindex',
                           'index_name' => 'cp',
-                          'index_prefix' => 'c',
                           'index_type_command' => 'cindex',
                           'key' => 'counting entry',
                           'node' => {},

Modified: trunk/tp/t/results/indices/print_merged_index.pl
===================================================================
--- trunk/tp/t/results/indices/print_merged_index.pl    2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/indices/print_merged_index.pl    2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -223,11 +223,7 @@
         'fn' => 1
       },
       'in_code' => 0,
-      'name' => 'cp',
-      'prefix' => [
-        'c',
-        'cp'
-      ]
+      'name' => 'cp'
     },
     'fn' => {
       'contained_indices' => {
@@ -235,55 +231,35 @@
       },
       'in_code' => 1,
       'merged_in' => 'cp',
-      'name' => 'fn',
-      'prefix' => [
-        'f',
-        'fn'
-      ]
+      'name' => 'fn'
     },
     'ky' => {
       'contained_indices' => {
         'ky' => 1
       },
       'in_code' => 1,
-      'name' => 'ky',
-      'prefix' => [
-        'k',
-        'ky'
-      ]
+      'name' => 'ky'
     },
     'pg' => {
       'contained_indices' => {
         'pg' => 1
       },
       'in_code' => 1,
-      'name' => 'pg',
-      'prefix' => [
-        'p',
-        'pg'
-      ]
+      'name' => 'pg'
     },
     'tp' => {
       'contained_indices' => {
         'tp' => 1
       },
       'in_code' => 1,
-      'name' => 'tp',
-      'prefix' => [
-        't',
-        'tp'
-      ]
+      'name' => 'tp'
     },
     'vr' => {
       'contained_indices' => {
         'vr' => 1
       },
       'in_code' => 1,
-      'name' => 'vr',
-      'prefix' => [
-        'v',
-        'vr'
-      ]
+      'name' => 'vr'
     }
   },
   'merged_indices' => {

Modified: trunk/tp/t/results/indices/printindex_index_entry_in_copying.pl
===================================================================
--- trunk/tp/t/results/indices/printindex_index_entry_in_copying.pl     
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/indices/printindex_index_entry_in_copying.pl     
2016-04-09 11:48:10 UTC (rev 7106)
@@ -65,7 +65,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'findex',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'findex',
                   'key' => 'Copying this document',
                   'number' => 1,
@@ -164,7 +163,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'defun',
                       'index_name' => 'fn',
-                      'index_prefix' => 'f',
                       'index_type_command' => 'defun',
                       'key' => 'fun',
                       'number' => 2,
@@ -254,7 +252,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'defunx',
                       'index_name' => 'fn',
-                      'index_prefix' => 'f',
                       'index_type_command' => 'defun',
                       'key' => 'xf',
                       'number' => 3,
@@ -421,7 +418,6 @@
                               'in_code' => 1,
                               'index_at_command' => 'item',
                               'index_name' => 'fn',
-                              'index_prefix' => 'f',
                               'index_type_command' => 'ftable',
                               'key' => 'ftable item',
                               'number' => 4,
@@ -475,7 +471,6 @@
                               'in_code' => 1,
                               'index_at_command' => 'itemx',
                               'index_name' => 'fn',
-                              'index_prefix' => 'f',
                               'index_type_command' => 'ftable',
                               'key' => 'xftable xitem',
                               'number' => 5,

Modified: 
trunk/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
===================================================================
--- trunk/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl 
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl 
2016-04-09 11:48:10 UTC (rev 7106)
@@ -88,7 +88,6 @@
                                   'in_code' => 0,
                                   'index_at_command' => 'cindex',
                                   'index_name' => 'cp',
-                                  'index_prefix' => 'c',
                                   'index_type_command' => 'cindex',
                                   'key' => 'Copying this document',
                                   'number' => 1,

Modified: 
trunk/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
===================================================================
--- 
trunk/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
    2016-04-09 09:48:54 UTC (rev 7105)
+++ 
trunk/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
    2016-04-09 11:48:10 UTC (rev 7106)
@@ -65,7 +65,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'findex',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'findex',
                   'key' => 'Copying this document',
                   'number' => 1,
@@ -164,7 +163,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'defun',
                       'index_name' => 'fn',
-                      'index_prefix' => 'f',
                       'index_type_command' => 'defun',
                       'key' => 'fun',
                       'number' => 2,
@@ -254,7 +252,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'defunx',
                       'index_name' => 'fn',
-                      'index_prefix' => 'f',
                       'index_type_command' => 'defun',
                       'key' => 'xf',
                       'number' => 3,
@@ -421,7 +418,6 @@
                               'in_code' => 1,
                               'index_at_command' => 'item',
                               'index_name' => 'fn',
-                              'index_prefix' => 'f',
                               'index_type_command' => 'ftable',
                               'key' => 'ftable item',
                               'number' => 4,
@@ -475,7 +471,6 @@
                               'in_code' => 1,
                               'index_at_command' => 'itemx',
                               'index_name' => 'fn',
-                              'index_prefix' => 'f',
                               'index_type_command' => 'ftable',
                               'key' => 'xftable xitem',
                               'number' => 5,

Modified: trunk/tp/t/results/indices/printindex_with_space_before.pl
===================================================================
--- trunk/tp/t/results/indices/printindex_with_space_before.pl  2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/indices/printindex_with_space_before.pl  2016-04-09 
11:48:10 UTC (rev 7106)
@@ -85,7 +85,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'index',
               'node' => {},

Modified: trunk/tp/t/results/indices/recursive_synindex.pl
===================================================================
--- trunk/tp/t/results/indices/recursive_synindex.pl    2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/indices/recursive_synindex.pl    2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -223,10 +223,7 @@
       },
       'in_code' => 0,
       'merged_in' => 'bbb',
-      'name' => 'aaa',
-      'prefix' => [
-        'aaa'
-      ]
+      'name' => 'aaa'
     },
     'bbb' => {
       'contained_indices' => {
@@ -234,76 +231,49 @@
         'bbb' => 1
       },
       'in_code' => 0,
-      'name' => 'bbb',
-      'prefix' => [
-        'bbb'
-      ]
+      'name' => 'bbb'
     },
     'cp' => {
       'contained_indices' => {
         'cp' => 1
       },
       'in_code' => 0,
-      'name' => 'cp',
-      'prefix' => [
-        'c',
-        'cp'
-      ]
+      'name' => 'cp'
     },
     'fn' => {
       'contained_indices' => {
         'fn' => 1
       },
       'in_code' => 1,
-      'name' => 'fn',
-      'prefix' => [
-        'f',
-        'fn'
-      ]
+      'name' => 'fn'
     },
     'ky' => {
       'contained_indices' => {
         'ky' => 1
       },
       'in_code' => 1,
-      'name' => 'ky',
-      'prefix' => [
-        'k',
-        'ky'
-      ]
+      'name' => 'ky'
     },
     'pg' => {
       'contained_indices' => {
         'pg' => 1
       },
       'in_code' => 1,
-      'name' => 'pg',
-      'prefix' => [
-        'p',
-        'pg'
-      ]
+      'name' => 'pg'
     },
     'tp' => {
       'contained_indices' => {
         'tp' => 1
       },
       'in_code' => 1,
-      'name' => 'tp',
-      'prefix' => [
-        't',
-        'tp'
-      ]
+      'name' => 'tp'
     },
     'vr' => {
       'contained_indices' => {
         'vr' => 1
       },
       'in_code' => 1,
-      'name' => 'vr',
-      'prefix' => [
-        'v',
-        'vr'
-      ]
+      'name' => 'vr'
     }
   },
   'merged_indices' => {

Modified: trunk/tp/t/results/indices/same_index_entry_merged_indices.pl
===================================================================
--- trunk/tp/t/results/indices/same_index_entry_merged_indices.pl       
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/indices/same_index_entry_merged_indices.pl       
2016-04-09 11:48:10 UTC (rev 7106)
@@ -253,7 +253,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'mmm-mode',
                   'node' => {},
@@ -400,7 +399,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defvar',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defvar',
                   'key' => 'mmm-mode',
                   'node' => {},
@@ -732,11 +730,7 @@
         'cp' => 1
       },
       'in_code' => 0,
-      'name' => 'cp',
-      'prefix' => [
-        'c',
-        'cp'
-      ]
+      'name' => 'cp'
     },
     'fn' => {
       'contained_indices' => {
@@ -744,44 +738,28 @@
         'vr' => 1
       },
       'in_code' => 1,
-      'name' => 'fn',
-      'prefix' => [
-        'f',
-        'fn'
-      ]
+      'name' => 'fn'
     },
     'ky' => {
       'contained_indices' => {
         'ky' => 1
       },
       'in_code' => 1,
-      'name' => 'ky',
-      'prefix' => [
-        'k',
-        'ky'
-      ]
+      'name' => 'ky'
     },
     'pg' => {
       'contained_indices' => {
         'pg' => 1
       },
       'in_code' => 1,
-      'name' => 'pg',
-      'prefix' => [
-        'p',
-        'pg'
-      ]
+      'name' => 'pg'
     },
     'tp' => {
       'contained_indices' => {
         'tp' => 1
       },
       'in_code' => 1,
-      'name' => 'tp',
-      'prefix' => [
-        't',
-        'tp'
-      ]
+      'name' => 'tp'
     },
     'vr' => {
       'contained_indices' => {
@@ -789,11 +767,7 @@
       },
       'in_code' => 1,
       'merged_in' => 'fn',
-      'name' => 'vr',
-      'prefix' => [
-        'v',
-        'vr'
-      ]
+      'name' => 'vr'
     }
   },
   'merged_indices' => {

Modified: trunk/tp/t/results/indices/syncode_index_print_both.pl
===================================================================
--- trunk/tp/t/results/indices/syncode_index_print_both.pl      2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/indices/syncode_index_print_both.pl      2016-04-09 
11:48:10 UTC (rev 7106)
@@ -134,7 +134,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'c--oncept',
               'node' => {},
@@ -189,7 +188,6 @@
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'findex',
               'key' => 'f---un',
               'node' => {},
@@ -518,11 +516,7 @@
         'fn' => 1
       },
       'in_code' => 0,
-      'name' => 'cp',
-      'prefix' => [
-        'c',
-        'cp'
-      ]
+      'name' => 'cp'
     },
     'fn' => {
       'contained_indices' => {
@@ -530,55 +524,35 @@
       },
       'in_code' => 1,
       'merged_in' => 'cp',
-      'name' => 'fn',
-      'prefix' => [
-        'f',
-        'fn'
-      ]
+      'name' => 'fn'
     },
     'ky' => {
       'contained_indices' => {
         'ky' => 1
       },
       'in_code' => 1,
-      'name' => 'ky',
-      'prefix' => [
-        'k',
-        'ky'
-      ]
+      'name' => 'ky'
     },
     'pg' => {
       'contained_indices' => {
         'pg' => 1
       },
       'in_code' => 1,
-      'name' => 'pg',
-      'prefix' => [
-        'p',
-        'pg'
-      ]
+      'name' => 'pg'
     },
     'tp' => {
       'contained_indices' => {
         'tp' => 1
       },
       'in_code' => 1,
-      'name' => 'tp',
-      'prefix' => [
-        't',
-        'tp'
-      ]
+      'name' => 'tp'
     },
     'vr' => {
       'contained_indices' => {
         'vr' => 1
       },
       'in_code' => 1,
-      'name' => 'vr',
-      'prefix' => [
-        'v',
-        'vr'
-      ]
+      'name' => 'vr'
     }
   },
   'merged_indices' => {

Modified: trunk/tp/t/results/indices/syncodeindex_to_plain.pl
===================================================================
--- trunk/tp/t/results/indices/syncodeindex_to_plain.pl 2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/indices/syncodeindex_to_plain.pl 2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -134,7 +134,6 @@
               'in_code' => 1,
               'index_at_command' => 'kindex',
               'index_name' => 'ky',
-              'index_prefix' => 'k',
               'index_type_command' => 'kindex',
               'key' => '--k1',
               'node' => {},
@@ -189,7 +188,6 @@
               'in_code' => 1,
               'index_at_command' => 'vindex',
               'index_name' => 'vr',
-              'index_prefix' => 'v',
               'index_type_command' => 'vindex',
               'key' => '--v',
               'node' => {},
@@ -244,7 +242,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => '-c',
               'node' => {},
@@ -540,22 +537,14 @@
         'ky' => 1
       },
       'in_code' => 0,
-      'name' => 'cp',
-      'prefix' => [
-        'c',
-        'cp'
-      ]
+      'name' => 'cp'
     },
     'fn' => {
       'contained_indices' => {
         'fn' => 1
       },
       'in_code' => 1,
-      'name' => 'fn',
-      'prefix' => [
-        'f',
-        'fn'
-      ]
+      'name' => 'fn'
     },
     'ky' => {
       'contained_indices' => {
@@ -563,44 +552,28 @@
       },
       'in_code' => 1,
       'merged_in' => 'cp',
-      'name' => 'ky',
-      'prefix' => [
-        'k',
-        'ky'
-      ]
+      'name' => 'ky'
     },
     'pg' => {
       'contained_indices' => {
         'pg' => 1
       },
       'in_code' => 1,
-      'name' => 'pg',
-      'prefix' => [
-        'p',
-        'pg'
-      ]
+      'name' => 'pg'
     },
     'tp' => {
       'contained_indices' => {
         'tp' => 1
       },
       'in_code' => 1,
-      'name' => 'tp',
-      'prefix' => [
-        't',
-        'tp'
-      ]
+      'name' => 'tp'
     },
     'vr' => {
       'contained_indices' => {
         'vr' => 1
       },
       'in_code' => 1,
-      'name' => 'vr',
-      'prefix' => [
-        'v',
-        'vr'
-      ]
+      'name' => 'vr'
     }
   },
   'merged_indices' => {

Modified: trunk/tp/t/results/indices/unknown_then_known_index_entry.pl
===================================================================
--- trunk/tp/t/results/indices/unknown_then_known_index_entry.pl        
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/indices/unknown_then_known_index_entry.pl        
2016-04-09 11:48:10 UTC (rev 7106)
@@ -93,7 +93,6 @@
               'in_code' => 0,
               'index_at_command' => 'someindex',
               'index_name' => 'some',
-              'index_prefix' => 'some',
               'index_type_command' => 'someindex',
               'key' => 'someindex entry.',
               'number' => 1
@@ -175,76 +174,49 @@
         'cp' => 1
       },
       'in_code' => 0,
-      'name' => 'cp',
-      'prefix' => [
-        'c',
-        'cp'
-      ]
+      'name' => 'cp'
     },
     'fn' => {
       'contained_indices' => {
         'fn' => 1
       },
       'in_code' => 1,
-      'name' => 'fn',
-      'prefix' => [
-        'f',
-        'fn'
-      ]
+      'name' => 'fn'
     },
     'ky' => {
       'contained_indices' => {
         'ky' => 1
       },
       'in_code' => 1,
-      'name' => 'ky',
-      'prefix' => [
-        'k',
-        'ky'
-      ]
+      'name' => 'ky'
     },
     'pg' => {
       'contained_indices' => {
         'pg' => 1
       },
       'in_code' => 1,
-      'name' => 'pg',
-      'prefix' => [
-        'p',
-        'pg'
-      ]
+      'name' => 'pg'
     },
     'some' => {
       'contained_indices' => {
         'some' => 1
       },
       'in_code' => 0,
-      'name' => 'some',
-      'prefix' => [
-        'some'
-      ]
+      'name' => 'some'
     },
     'tp' => {
       'contained_indices' => {
         'tp' => 1
       },
       'in_code' => 1,
-      'name' => 'tp',
-      'prefix' => [
-        't',
-        'tp'
-      ]
+      'name' => 'tp'
     },
     'vr' => {
       'contained_indices' => {
         'vr' => 1
       },
       'in_code' => 1,
-      'name' => 'vr',
-      'prefix' => [
-        'v',
-        'vr'
-      ]
+      'name' => 'vr'
     }
   }
 };

Modified: trunk/tp/t/results/indices/wrong_synindex.pl
===================================================================
--- trunk/tp/t/results/indices/wrong_synindex.pl        2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/indices/wrong_synindex.pl        2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -123,76 +123,49 @@
         'aaa' => 1
       },
       'in_code' => 0,
-      'name' => 'aaa',
-      'prefix' => [
-        'aaa'
-      ]
+      'name' => 'aaa'
     },
     'cp' => {
       'contained_indices' => {
         'cp' => 1
       },
       'in_code' => 0,
-      'name' => 'cp',
-      'prefix' => [
-        'c',
-        'cp'
-      ]
+      'name' => 'cp'
     },
     'fn' => {
       'contained_indices' => {
         'fn' => 1
       },
       'in_code' => 1,
-      'name' => 'fn',
-      'prefix' => [
-        'f',
-        'fn'
-      ]
+      'name' => 'fn'
     },
     'ky' => {
       'contained_indices' => {
         'ky' => 1
       },
       'in_code' => 1,
-      'name' => 'ky',
-      'prefix' => [
-        'k',
-        'ky'
-      ]
+      'name' => 'ky'
     },
     'pg' => {
       'contained_indices' => {
         'pg' => 1
       },
       'in_code' => 1,
-      'name' => 'pg',
-      'prefix' => [
-        'p',
-        'pg'
-      ]
+      'name' => 'pg'
     },
     'tp' => {
       'contained_indices' => {
         'tp' => 1
       },
       'in_code' => 1,
-      'name' => 'tp',
-      'prefix' => [
-        't',
-        'tp'
-      ]
+      'name' => 'tp'
     },
     'vr' => {
       'contained_indices' => {
         'vr' => 1
       },
       'in_code' => 1,
-      'name' => 'vr',
-      'prefix' => [
-        'v',
-        'vr'
-      ]
+      'name' => 'vr'
     }
   }
 };

Modified: trunk/tp/t/results/info_tests/before_node_and_section.pl
===================================================================
--- trunk/tp/t/results/info_tests/before_node_and_section.pl    2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/info_tests/before_node_and_section.pl    2016-04-09 
11:48:10 UTC (rev 7106)
@@ -147,7 +147,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => 'index entry before anything',
                   'number' => 1

Modified: trunk/tp/t/results/info_tests/colon_in_index_entry.pl
===================================================================
--- trunk/tp/t/results/info_tests/colon_in_index_entry.pl       2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/info_tests/colon_in_index_entry.pl       2016-04-09 
11:48:10 UTC (rev 7106)
@@ -133,7 +133,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'a:b',
               'node' => {},
@@ -234,7 +233,6 @@
                           'in_code' => 0,
                           'index_at_command' => 'item',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v',
                           'index_type_command' => 'vtable',
                           'key' => '%main::value',
                           'node' => {},
@@ -442,7 +440,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'defvr',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defvr',
                   'key' => 'c:d',
                   'node' => {},
@@ -588,7 +585,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'defvrx',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defvr',
                   'key' => 'z:t',
                   'node' => {},
@@ -920,55 +916,35 @@
         'vr' => 1
       },
       'in_code' => 0,
-      'name' => 'cp',
-      'prefix' => [
-        'c',
-        'cp'
-      ]
+      'name' => 'cp'
     },
     'fn' => {
       'contained_indices' => {
         'fn' => 1
       },
       'in_code' => 1,
-      'name' => 'fn',
-      'prefix' => [
-        'f',
-        'fn'
-      ]
+      'name' => 'fn'
     },
     'ky' => {
       'contained_indices' => {
         'ky' => 1
       },
       'in_code' => 1,
-      'name' => 'ky',
-      'prefix' => [
-        'k',
-        'ky'
-      ]
+      'name' => 'ky'
     },
     'pg' => {
       'contained_indices' => {
         'pg' => 1
       },
       'in_code' => 1,
-      'name' => 'pg',
-      'prefix' => [
-        'p',
-        'pg'
-      ]
+      'name' => 'pg'
     },
     'tp' => {
       'contained_indices' => {
         'tp' => 1
       },
       'in_code' => 1,
-      'name' => 'tp',
-      'prefix' => [
-        't',
-        'tp'
-      ]
+      'name' => 'tp'
     },
     'vr' => {
       'contained_indices' => {
@@ -976,11 +952,7 @@
       },
       'in_code' => 0,
       'merged_in' => 'cp',
-      'name' => 'vr',
-      'prefix' => [
-        'v',
-        'vr'
-      ]
+      'name' => 'vr'
     }
   },
   'merged_indices' => {

Modified: trunk/tp/t/results/info_tests/def_in_copying.pl
===================================================================
--- trunk/tp/t/results/info_tests/def_in_copying.pl     2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/info_tests/def_in_copying.pl     2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -268,7 +268,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'deffn',
                       'index_name' => 'fn',
-                      'index_prefix' => 'f',
                       'index_type_command' => 'deffn',
                       'key' => 'bb',
                       'number' => 1,
@@ -358,7 +357,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'deffnx',
                       'index_name' => 'fn',
-                      'index_prefix' => 'f',
                       'index_type_command' => 'deffn',
                       'key' => 'bbx',
                       'number' => 2,
@@ -587,7 +585,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'bb',
                   'node' => {},
@@ -677,7 +674,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'bbx',
                   'node' => {},

Modified: trunk/tp/t/results/info_tests/index_entry_at_end_node.pl
===================================================================
--- trunk/tp/t/results/info_tests/index_entry_at_end_node.pl    2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/info_tests/index_entry_at_end_node.pl    2016-04-09 
11:48:10 UTC (rev 7106)
@@ -436,7 +436,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'index entry',
               'node' => {},

Modified: trunk/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
===================================================================
--- trunk/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl  
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl  
2016-04-09 11:48:10 UTC (rev 7106)
@@ -369,7 +369,6 @@
                                   'in_code' => 0,
                                   'index_at_command' => 'cindex',
                                   'index_name' => 'cp',
-                                  'index_prefix' => 'c',
                                   'index_type_command' => 'cindex',
                                   'key' => 'index entry within multitable',
                                   'node' => {},
@@ -760,7 +759,6 @@
                                   'in_code' => 0,
                                   'index_at_command' => 'cindex',
                                   'index_name' => 'cp',
-                                  'index_prefix' => 'c',
                                   'index_type_command' => 'cindex',
                                   'key' => 'index entry',
                                   'node' => {},

Modified: trunk/tp/t/results/info_tests/nested_multitable_anchor_index.pl
===================================================================
--- trunk/tp/t/results/info_tests/nested_multitable_anchor_index.pl     
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/info_tests/nested_multitable_anchor_index.pl     
2016-04-09 11:48:10 UTC (rev 7106)
@@ -286,7 +286,6 @@
                                                   'in_code' => 0,
                                                   'index_at_command' => 
'cindex',
                                                   'index_name' => 'cp',
-                                                  'index_prefix' => 'c',
                                                   'index_type_command' => 
'cindex',
                                                   'key' => 'index entry 
inside',
                                                   'node' => {},
@@ -573,7 +572,6 @@
                                   'in_code' => 0,
                                   'index_at_command' => 'cindex',
                                   'index_name' => 'cp',
-                                  'index_prefix' => 'c',
                                   'index_type_command' => 'cindex',
                                   'key' => 'index entry',
                                   'node' => {},

Modified: trunk/tp/t/results/info_tests/test_index.pl
===================================================================
--- trunk/tp/t/results/info_tests/test_index.pl 2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/info_tests/test_index.pl 2016-04-09 11:48:10 UTC (rev 
7106)
@@ -223,7 +223,6 @@
                             'in_code' => 0,
                             'index_at_command' => 'cindex',
                             'index_name' => 'cp',
-                            'index_prefix' => 'c',
                             'index_type_command' => 'cindex',
                             'key' => 'index in chapter end',
                             'node' => {
@@ -398,7 +397,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => 'in Top',
                   'node' => {},
@@ -453,7 +451,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => '@',
                   'node' => {},
@@ -521,7 +518,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => '!',
                   'node' => {},
@@ -572,7 +568,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => '"',
                   'node' => {},
@@ -712,7 +707,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'i',
                   'node' => {},
@@ -811,7 +805,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffnx',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'machin',
                   'node' => {},
@@ -973,7 +966,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_name' => 'fn',
-                          'index_prefix' => 'f',
                           'index_type_command' => 'ftable',
                           'key' => 'a fun',
                           'node' => {},
@@ -1062,7 +1054,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_name' => 'fn',
-                          'index_prefix' => 'f',
                           'index_type_command' => 'ftable',
                           'key' => 'second fun',
                           'node' => {},
@@ -1116,7 +1107,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'itemx',
                           'index_name' => 'fn',
-                          'index_prefix' => 'f',
                           'index_type_command' => 'ftable',
                           'key' => 'itemx fun',
                           'node' => {},
@@ -1535,7 +1525,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'index entry 
looooooooooooooooooooooooooooooooooooooooooooooooooooooooong',
               'node' => {},
@@ -1590,7 +1579,6 @@
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'findex',
               'key' => 'function index entry',
               'node' => {},
@@ -1658,7 +1646,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'findex',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'findex',
                   'key' => 'other function',
                   'node' => {},
@@ -1813,7 +1800,6 @@
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'findex',
               'key' => 'after lines.',
               'node' => {},
@@ -3149,7 +3135,6 @@
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'findex',
               'key' => 'after more than 100 lines',
               'node' => {},
@@ -3262,7 +3247,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'index entry in appendix before para',
               'node' => {},
@@ -3392,7 +3376,6 @@
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'findex',
               'key' => 'index entry between indices',
               'node' => {},

Modified: trunk/tp/t/results/invalid_nestings/block_not_matching.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/block_not_matching.pl   2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/invalid_nestings/block_not_matching.pl   2016-04-09 
11:48:10 UTC (rev 7106)
@@ -140,7 +140,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'print_navigation',
               'number' => 1

Modified: trunk/tp/t/results/invalid_nestings/center.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/center.pl       2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/invalid_nestings/center.pl       2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -213,7 +213,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => 'cindex',
                   'number' => 1

Modified: trunk/tp/t/results/invalid_nestings/def_in_style_command.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/def_in_style_command.pl 2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/invalid_nestings/def_in_style_command.pl 2016-04-09 
11:48:10 UTC (rev 7106)
@@ -112,7 +112,6 @@
               'in_code' => 1,
               'index_at_command' => 'defun',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'defun',
               'key' => 'name',
               'number' => 1

Modified: 
trunk/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl   
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/invalid_nestings/def_not_closed_in_menu_description.pl   
2016-04-09 11:48:10 UTC (rev 7106)
@@ -129,7 +129,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'deffn',
                           'index_name' => 'fn',
-                          'index_prefix' => 'f',
                           'index_type_command' => 'deffn',
                           'key' => 'truc',
                           'number' => 1

Modified: trunk/tp/t/results/invalid_nestings/in_table.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/in_table.pl     2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/invalid_nestings/in_table.pl     2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -674,7 +674,6 @@
                                   'in_code' => 0,
                                   'index_at_command' => 'cindex',
                                   'index_name' => 'cp',
-                                  'index_prefix' => 'c',
                                   'index_type_command' => 'cindex',
                                   'key' => 'index',
                                   'node' => {},
@@ -866,7 +865,6 @@
                                   'in_code' => 0,
                                   'index_at_command' => 'cindex',
                                   'index_name' => 'cp',
-                                  'index_prefix' => 'c',
                                   'index_type_command' => 'cindex',
                                   'key' => 'index',
                                   'node' => {},
@@ -900,7 +898,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v',
                           'index_type_command' => 'vtable',
                           'key' => '',
                           'node' => {},
@@ -1018,7 +1015,6 @@
                                   'in_code' => 0,
                                   'index_at_command' => 'cindex',
                                   'index_name' => 'cp',
-                                  'index_prefix' => 'c',
                                   'index_type_command' => 'cindex',
                                   'key' => '2 index',
                                   'node' => {},
@@ -1052,7 +1048,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v',
                           'index_type_command' => 'vtable',
                           'key' => '',
                           'node' => {},

Modified: trunk/tp/t/results/invalid_nestings/multitable_item_in_index.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/multitable_item_in_index.pl     
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/invalid_nestings/multitable_item_in_index.pl     
2016-04-09 11:48:10 UTC (rev 7106)
@@ -101,7 +101,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'vindex',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'vindex',
                   'key' => 'on item line',
                   'number' => 1

Modified: trunk/tp/t/results/invalid_nestings/on_def_line.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/on_def_line.pl  2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/invalid_nestings/on_def_line.pl  2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -231,7 +231,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffn',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'in titlefont',
               'number' => 1
@@ -464,7 +463,6 @@
               'in_code' => 1,
               'index_at_command' => 'deffnx',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'deffn',
               'key' => 'in titlefontx',
               'number' => 2

Modified: trunk/tp/t/results/invalid_nestings/on_index_entry_line.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/on_index_entry_line.pl  2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/invalid_nestings/on_index_entry_line.pl  2016-04-09 
11:48:10 UTC (rev 7106)
@@ -193,7 +193,6 @@
           'in_code' => 0,
           'index_at_command' => 'cindex',
           'index_name' => 'cp',
-          'index_prefix' => 'c',
           'index_type_command' => 'cindex',
           'key' => 'in titlefont exdent
 ',

Modified: trunk/tp/t/results/invalid_nestings/section_on_defx_line.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/section_on_defx_line.pl 2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/invalid_nestings/section_on_defx_line.pl 2016-04-09 
11:48:10 UTC (rev 7106)
@@ -105,7 +105,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'j',
                   'number' => 1

Modified: trunk/tp/t/results/invalid_nestings/tab_in_index.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/tab_in_index.pl 2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/invalid_nestings/tab_in_index.pl 2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -159,7 +159,6 @@
                               'in_code' => 1,
                               'index_at_command' => 'vindex',
                               'index_name' => 'vr',
-                              'index_prefix' => 'v',
                               'index_type_command' => 'vindex',
                               'key' => 'in index entry in tab',
                               'number' => 1

Modified: trunk/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
===================================================================
--- trunk/tp/t/results/itemize/inter_item_commands_in_enumerate.pl      
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/itemize/inter_item_commands_in_enumerate.pl      
2016-04-09 11:48:10 UTC (rev 7106)
@@ -202,7 +202,6 @@
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_name' => 'cp',
-                      'index_prefix' => 'c',
                       'index_type_command' => 'cindex',
                       'key' => 'cindex',
                       'number' => 1

Modified: trunk/tp/t/results/itemize/inter_item_commands_in_itemize.pl
===================================================================
--- trunk/tp/t/results/itemize/inter_item_commands_in_itemize.pl        
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/itemize/inter_item_commands_in_itemize.pl        
2016-04-09 11:48:10 UTC (rev 7106)
@@ -101,7 +101,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => 'also a cindex in itemize',
                   'number' => 1
@@ -292,7 +291,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => 'index entry within itemize',
                   'number' => 2
@@ -405,7 +403,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => 'index entry right after @item',
                   'number' => 3
@@ -578,7 +575,6 @@
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_name' => 'cp',
-                      'index_prefix' => 'c',
                       'index_type_command' => 'cindex',
                       'key' => 'also a cindex in itemize',
                       'number' => 4

Modified: trunk/tp/t/results/languages/multiple.pl
===================================================================
--- trunk/tp/t/results/languages/multiple.pl    2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/languages/multiple.pl    2016-04-09 11:48:10 UTC (rev 
7106)
@@ -178,7 +178,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'defivar',
                       'index_name' => 'vr',
-                      'index_prefix' => 'v',
                       'index_type_command' => 'defivar',
                       'key' => 'a de copying',
                       'number' => 1,
@@ -453,7 +452,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defivar',
                   'key' => 'BBB de fr',
                   'node' => {},
@@ -701,7 +699,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defivar',
                   'key' => 'BBB da pt',
                   'node' => {},

Modified: trunk/tp/t/results/languages/multiple_lang_chapters.pl
===================================================================
--- trunk/tp/t/results/languages/multiple_lang_chapters.pl      2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/languages/multiple_lang_chapters.pl      2016-04-09 
11:48:10 UTC (rev 7106)
@@ -840,7 +840,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defivar',
                   'key' => 'BBB of AAA',
                   'node' => {},
@@ -1213,7 +1212,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defivar',
                   'key' => 'BBB of AAA',
                   'node' => {},
@@ -1535,7 +1533,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defivar',
                   'key' => 'BBB de AAA',
                   'node' => {},

Modified: trunk/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
===================================================================
--- trunk/tp/t/results/languages/multiple_lang_chapters_texi2html.pl    
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/languages/multiple_lang_chapters_texi2html.pl    
2016-04-09 11:48:10 UTC (rev 7106)
@@ -840,7 +840,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defivar',
                   'key' => 'BBB of AAA',
                   'node' => {},
@@ -1213,7 +1212,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defivar',
                   'key' => 'BBB of AAA',
                   'node' => {},
@@ -1535,7 +1533,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defivar',
                   'key' => 'BBB de AAA',
                   'node' => {},

Modified: trunk/tp/t/results/languages/simple.pl
===================================================================
--- trunk/tp/t/results/languages/simple.pl      2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/languages/simple.pl      2016-04-09 11:48:10 UTC (rev 
7106)
@@ -205,7 +205,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defivar',
                   'key' => 'BBB de AAA',
                   'node' => {},

Modified: trunk/tp/t/results/languages/unknown_region.pl
===================================================================
--- trunk/tp/t/results/languages/unknown_region.pl      2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/languages/unknown_region.pl      2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -205,7 +205,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defivar',
                   'index_name' => 'vr',
-                  'index_prefix' => 'v',
                   'index_type_command' => 'defivar',
                   'key' => 'BBB de AAA',
                   'node' => {},

Modified: trunk/tp/t/results/macro/backslash_in_arg.pl
===================================================================
--- trunk/tp/t/results/macro/backslash_in_arg.pl        2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/macro/backslash_in_arg.pl        2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -144,7 +144,6 @@
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'findex',
               'key' => '\\\\q',
               'node' => {},
@@ -199,7 +198,6 @@
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'findex',
               'key' => '\\r',
               'node' => {},
@@ -254,7 +252,6 @@
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'findex',
               'key' => '\\q',
               'node' => {},
@@ -309,7 +306,6 @@
               'in_code' => 1,
               'index_at_command' => 'findex',
               'index_name' => 'fn',
-              'index_prefix' => 'f',
               'index_type_command' => 'findex',
               'key' => '\\r',
               'node' => {},

Modified: trunk/tp/t/results/macro/macro_in_index_commands.pl
===================================================================
--- trunk/tp/t/results/macro/macro_in_index_commands.pl 2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/macro/macro_in_index_commands.pl 2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -631,7 +631,6 @@
               'in_code' => 0,
               'index_at_command' => 'trucindex',
               'index_name' => 'truc',
-              'index_prefix' => 'truc',
               'index_type_command' => 'trucindex',
               'key' => 'index truc',
               'node' => {},
@@ -777,7 +776,6 @@
               'in_code' => 1,
               'index_at_command' => 'codeidxindex',
               'index_name' => 'codeidx',
-              'index_prefix' => 'codeidx',
               'index_type_command' => 'codeidxindex',
               'key' => 'a index entry te\' i^',
               'node' => {},
@@ -838,7 +836,6 @@
               'in_code' => 1,
               'index_at_command' => 'kindex',
               'index_name' => 'ky',
-              'index_prefix' => 'k',
               'index_type_command' => 'kindex',
               'key' => 'truc kindex',
               'node' => {},
@@ -893,7 +890,6 @@
               'in_code' => 1,
               'index_at_command' => 'pindex',
               'index_name' => 'pg',
-              'index_prefix' => 'p',
               'index_type_command' => 'pindex',
               'key' => 'pindex codeidx',
               'node' => {},
@@ -1369,10 +1365,7 @@
         'codeidx' => 1
       },
       'in_code' => 1,
-      'name' => 'codeidx',
-      'prefix' => [
-        'codeidx'
-      ]
+      'name' => 'codeidx'
     },
     'cp' => {
       'contained_indices' => {
@@ -1380,11 +1373,7 @@
       },
       'in_code' => 1,
       'merged_in' => 'fn',
-      'name' => 'cp',
-      'prefix' => [
-        'c',
-        'cp'
-      ]
+      'name' => 'cp'
     },
     'fn' => {
       'contained_indices' => {
@@ -1392,65 +1381,42 @@
         'fn' => 1
       },
       'in_code' => 1,
-      'name' => 'fn',
-      'prefix' => [
-        'f',
-        'fn'
-      ]
+      'name' => 'fn'
     },
     'ky' => {
       'contained_indices' => {
         'ky' => 1
       },
       'in_code' => 1,
-      'name' => 'ky',
-      'prefix' => [
-        'k',
-        'ky'
-      ]
+      'name' => 'ky'
     },
     'pg' => {
       'contained_indices' => {
         'pg' => 1
       },
       'in_code' => 1,
-      'name' => 'pg',
-      'prefix' => [
-        'p',
-        'pg'
-      ]
+      'name' => 'pg'
     },
     'tp' => {
       'contained_indices' => {
         'tp' => 1
       },
       'in_code' => 1,
-      'name' => 'tp',
-      'prefix' => [
-        't',
-        'tp'
-      ]
+      'name' => 'tp'
     },
     'truc' => {
       'contained_indices' => {
         'truc' => 1
       },
       'in_code' => 0,
-      'name' => 'truc',
-      'prefix' => [
-        'truc'
-      ]
+      'name' => 'truc'
     },
     'vr' => {
       'contained_indices' => {
         'vr' => 1
       },
       'in_code' => 1,
-      'name' => 'vr',
-      'prefix' => [
-        'v',
-        'vr'
-      ]
+      'name' => 'vr'
     }
   },
   'merged_indices' => {

Modified: trunk/tp/t/results/menu/menu_in_deffn.pl
===================================================================
--- trunk/tp/t/results/menu/menu_in_deffn.pl    2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/menu/menu_in_deffn.pl    2016-04-09 11:48:10 UTC (rev 
7106)
@@ -130,7 +130,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'b',
                   'node' => {},

Modified: trunk/tp/t/results/misc_commands/comment_space_command_on_line.pl
===================================================================
--- trunk/tp/t/results/misc_commands/comment_space_command_on_line.pl   
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/misc_commands/comment_space_command_on_line.pl   
2016-04-09 11:48:10 UTC (rev 7106)
@@ -323,7 +323,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'index entry  ',
               'node' => {},

Modified: trunk/tp/t/results/misc_commands/index_entries.pl
===================================================================
--- trunk/tp/t/results/misc_commands/index_entries.pl   2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/misc_commands/index_entries.pl   2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -45,7 +45,6 @@
           'in_code' => 0,
           'index_at_command' => 'cindex',
           'index_name' => 'cp',
-          'index_prefix' => 'c',
           'index_type_command' => 'cindex',
           'key' => 'cindex entry',
           'number' => 1
@@ -152,7 +151,6 @@
           'in_code' => 0,
           'index_at_command' => 'trucindex',
           'index_name' => 'truc',
-          'index_prefix' => 'truc',
           'index_type_command' => 'trucindex',
           'key' => 'index truc',
           'number' => 1
@@ -244,76 +242,49 @@
         'cp' => 1
       },
       'in_code' => 0,
-      'name' => 'cp',
-      'prefix' => [
-        'c',
-        'cp'
-      ]
+      'name' => 'cp'
     },
     'fn' => {
       'contained_indices' => {
         'fn' => 1
       },
       'in_code' => 1,
-      'name' => 'fn',
-      'prefix' => [
-        'f',
-        'fn'
-      ]
+      'name' => 'fn'
     },
     'ky' => {
       'contained_indices' => {
         'ky' => 1
       },
       'in_code' => 1,
-      'name' => 'ky',
-      'prefix' => [
-        'k',
-        'ky'
-      ]
+      'name' => 'ky'
     },
     'pg' => {
       'contained_indices' => {
         'pg' => 1
       },
       'in_code' => 1,
-      'name' => 'pg',
-      'prefix' => [
-        'p',
-        'pg'
-      ]
+      'name' => 'pg'
     },
     'tp' => {
       'contained_indices' => {
         'tp' => 1
       },
       'in_code' => 1,
-      'name' => 'tp',
-      'prefix' => [
-        't',
-        'tp'
-      ]
+      'name' => 'tp'
     },
     'truc' => {
       'contained_indices' => {
         'truc' => 1
       },
       'in_code' => 0,
-      'name' => 'truc',
-      'prefix' => [
-        'truc'
-      ]
+      'name' => 'truc'
     },
     'vr' => {
       'contained_indices' => {
         'vr' => 1
       },
       'in_code' => 1,
-      'name' => 'vr',
-      'prefix' => [
-        'v',
-        'vr'
-      ]
+      'name' => 'vr'
     }
   }
 };

Modified: trunk/tp/t/results/misc_commands/simple.pl
===================================================================
--- trunk/tp/t/results/misc_commands/simple.pl  2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/misc_commands/simple.pl  2016-04-09 11:48:10 UTC (rev 
7106)
@@ -67,76 +67,49 @@
         'cp' => 1
       },
       'in_code' => 0,
-      'name' => 'cp',
-      'prefix' => [
-        'c',
-        'cp'
-      ]
+      'name' => 'cp'
     },
     'fn' => {
       'contained_indices' => {
         'fn' => 1
       },
       'in_code' => 1,
-      'name' => 'fn',
-      'prefix' => [
-        'f',
-        'fn'
-      ]
+      'name' => 'fn'
     },
     'idx' => {
       'contained_indices' => {
         'idx' => 1
       },
       'in_code' => 0,
-      'name' => 'idx',
-      'prefix' => [
-        'idx'
-      ]
+      'name' => 'idx'
     },
     'ky' => {
       'contained_indices' => {
         'ky' => 1
       },
       'in_code' => 1,
-      'name' => 'ky',
-      'prefix' => [
-        'k',
-        'ky'
-      ]
+      'name' => 'ky'
     },
     'pg' => {
       'contained_indices' => {
         'pg' => 1
       },
       'in_code' => 1,
-      'name' => 'pg',
-      'prefix' => [
-        'p',
-        'pg'
-      ]
+      'name' => 'pg'
     },
     'tp' => {
       'contained_indices' => {
         'tp' => 1
       },
       'in_code' => 1,
-      'name' => 'tp',
-      'prefix' => [
-        't',
-        'tp'
-      ]
+      'name' => 'tp'
     },
     'vr' => {
       'contained_indices' => {
         'vr' => 1
       },
       'in_code' => 1,
-      'name' => 'vr',
-      'prefix' => [
-        'v',
-        'vr'
-      ]
+      'name' => 'vr'
     }
   }
 };

Modified: trunk/tp/t/results/multitable/inter_item_commands_in_multitable.pl
===================================================================
--- trunk/tp/t/results/multitable/inter_item_commands_in_multitable.pl  
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/multitable/inter_item_commands_in_multitable.pl  
2016-04-09 11:48:10 UTC (rev 7106)
@@ -141,7 +141,6 @@
                           'in_code' => 0,
                           'index_at_command' => 'cindex',
                           'index_name' => 'cp',
-                          'index_prefix' => 'c',
                           'index_type_command' => 'cindex',
                           'key' => 'index entry between empty lines',
                           'number' => 1
@@ -647,7 +646,6 @@
                               'in_code' => 0,
                               'index_at_command' => 'cindex',
                               'index_name' => 'cp',
-                              'index_prefix' => 'c',
                               'index_type_command' => 'cindex',
                               'key' => 'index entry within multitable',
                               'number' => 2
@@ -867,7 +865,6 @@
                       'in_code' => 0,
                       'index_at_command' => 'cindex',
                       'index_name' => 'cp',
-                      'index_prefix' => 'c',
                       'index_type_command' => 'cindex',
                       'key' => 'cindex',
                       'number' => 3

Modified: trunk/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl
===================================================================
--- trunk/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl  
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/plaintext_tests/at_commands_glued_in_example.pl  
2016-04-09 11:48:10 UTC (rev 7106)
@@ -541,7 +541,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => 'index',
                   'number' => 1

Modified: trunk/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl
===================================================================
--- trunk/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl        
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/plaintext_tests/at_commands_glued_in_paragraph.pl        
2016-04-09 11:48:10 UTC (rev 7106)
@@ -535,7 +535,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'index',
               'number' => 1

Modified: trunk/tp/t/results/preformatted/def_in_example.pl
===================================================================
--- trunk/tp/t/results/preformatted/def_in_example.pl   2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/preformatted/def_in_example.pl   2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -95,7 +95,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'defun',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'defun',
                   'key' => 'name',
                   'number' => 1

Modified: trunk/tp/t/results/sectioning/no_element.pl
===================================================================
--- trunk/tp/t/results/sectioning/no_element.pl 2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/sectioning/no_element.pl 2016-04-09 11:48:10 UTC (rev 
7106)
@@ -759,7 +759,6 @@
           'in_code' => 0,
           'index_at_command' => 'cindex',
           'index_name' => 'cp',
-          'index_prefix' => 'c',
           'index_type_command' => 'cindex',
           'key' => 'index entry',
           'number' => 1

Modified: trunk/tp/t/results/sectioning/placed_things_before_element.pl
===================================================================
--- trunk/tp/t/results/sectioning/placed_things_before_element.pl       
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/sectioning/placed_things_before_element.pl       
2016-04-09 11:48:10 UTC (rev 7106)
@@ -667,7 +667,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'index entry',
               'number' => 1

Modified: trunk/tp/t/results/sectioning/placed_things_before_node.pl
===================================================================
--- trunk/tp/t/results/sectioning/placed_things_before_node.pl  2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/sectioning/placed_things_before_node.pl  2016-04-09 
11:48:10 UTC (rev 7106)
@@ -667,7 +667,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'index entry',
               'number' => 1

Modified: trunk/tp/t/results/test_count/commands.pl
===================================================================
--- trunk/tp/t/results/test_count/commands.pl   2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/test_count/commands.pl   2016-04-09 11:48:10 UTC (rev 
7106)
@@ -380,7 +380,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'item',
                       'index_name' => 'vr',
-                      'index_prefix' => 'v',
                       'index_type_command' => 'vtable',
                       'key' => 'vitem table',
                       'number' => 1

Modified: trunk/tp/t/results/test_count/printindex.pl
===================================================================
--- trunk/tp/t/results/test_count/printindex.pl 2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/test_count/printindex.pl 2016-04-09 11:48:10 UTC (rev 
7106)
@@ -85,7 +85,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'index entry',
               'node' => {},
@@ -140,7 +139,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'index entry',
               'node' => {},
@@ -195,7 +193,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 
'looooooooooooooooooooooooooooooooooooooooooooooooooooooooooong index entry',
               'node' => {},
@@ -303,7 +300,6 @@
               'in_code' => 0,
               'index_at_command' => 'cindex',
               'index_name' => 'cp',
-              'index_prefix' => 'c',
               'index_type_command' => 'cindex',
               'key' => 'after index',
               'node' => {},

Modified: trunk/tp/t/results/value/value_in_index_commands.pl
===================================================================
--- trunk/tp/t/results/value/value_in_index_commands.pl 2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/value/value_in_index_commands.pl 2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -484,7 +484,6 @@
               'in_code' => 0,
               'index_at_command' => 'trucindex',
               'index_name' => 'truc',
-              'index_prefix' => 'truc',
               'index_type_command' => 'trucindex',
               'key' => 'index truc',
               'node' => {},
@@ -630,7 +629,6 @@
               'in_code' => 1,
               'index_at_command' => 'codeidxindex',
               'index_name' => 'codeidx',
-              'index_prefix' => 'codeidx',
               'index_type_command' => 'codeidxindex',
               'key' => 'a index entry te\' i^',
               'node' => {},
@@ -687,7 +685,6 @@
               'in_code' => 1,
               'index_at_command' => 'kindex',
               'index_name' => 'ky',
-              'index_prefix' => 'k',
               'index_type_command' => 'kindex',
               'key' => 'truc kindex',
               'node' => {},
@@ -742,7 +739,6 @@
               'in_code' => 1,
               'index_at_command' => 'pindex',
               'index_name' => 'pg',
-              'index_prefix' => 'p',
               'index_type_command' => 'pindex',
               'key' => 'pindex codeidx',
               'node' => {},
@@ -1168,10 +1164,7 @@
         'codeidx' => 1
       },
       'in_code' => 1,
-      'name' => 'codeidx',
-      'prefix' => [
-        'codeidx'
-      ]
+      'name' => 'codeidx'
     },
     'cp' => {
       'contained_indices' => {
@@ -1179,11 +1172,7 @@
       },
       'in_code' => 1,
       'merged_in' => 'fn',
-      'name' => 'cp',
-      'prefix' => [
-        'c',
-        'cp'
-      ]
+      'name' => 'cp'
     },
     'fn' => {
       'contained_indices' => {
@@ -1191,65 +1180,42 @@
         'fn' => 1
       },
       'in_code' => 1,
-      'name' => 'fn',
-      'prefix' => [
-        'f',
-        'fn'
-      ]
+      'name' => 'fn'
     },
     'ky' => {
       'contained_indices' => {
         'ky' => 1
       },
       'in_code' => 1,
-      'name' => 'ky',
-      'prefix' => [
-        'k',
-        'ky'
-      ]
+      'name' => 'ky'
     },
     'pg' => {
       'contained_indices' => {
         'pg' => 1
       },
       'in_code' => 1,
-      'name' => 'pg',
-      'prefix' => [
-        'p',
-        'pg'
-      ]
+      'name' => 'pg'
     },
     'tp' => {
       'contained_indices' => {
         'tp' => 1
       },
       'in_code' => 1,
-      'name' => 'tp',
-      'prefix' => [
-        't',
-        'tp'
-      ]
+      'name' => 'tp'
     },
     'truc' => {
       'contained_indices' => {
         'truc' => 1
       },
       'in_code' => 0,
-      'name' => 'truc',
-      'prefix' => [
-        'truc'
-      ]
+      'name' => 'truc'
     },
     'vr' => {
       'contained_indices' => {
         'vr' => 1
       },
       'in_code' => 1,
-      'name' => 'vr',
-      'prefix' => [
-        'v',
-        'vr'
-      ]
+      'name' => 'vr'
     }
   },
   'merged_indices' => {

Modified: trunk/tp/t/results/xml_tests/commands_and_spaces.pl
===================================================================
--- trunk/tp/t/results/xml_tests/commands_and_spaces.pl 2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/xml_tests/commands_and_spaces.pl 2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -2110,7 +2110,6 @@
                   'in_code' => 1,
                   'index_at_command' => 'deffn',
                   'index_name' => 'fn',
-                  'index_prefix' => 'f',
                   'index_type_command' => 'deffn',
                   'key' => 'machin',
                   'node' => {},

Modified: trunk/tp/t/results/xtable/block_commands_in_table.pl
===================================================================
--- trunk/tp/t/results/xtable/block_commands_in_table.pl        2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/xtable/block_commands_in_table.pl        2016-04-09 
11:48:10 UTC (rev 7106)
@@ -898,7 +898,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v',
                           'index_type_command' => 'vtable',
                           'key' => 'item before ignored lines',
                           'node' => {},
@@ -972,7 +971,6 @@
                               'in_code' => 1,
                               'index_at_command' => 'vindex',
                               'index_name' => 'vr',
-                              'index_prefix' => 'v',
                               'index_type_command' => 'vindex',
                               'key' => 'vindex',
                               'node' => {},
@@ -1031,7 +1029,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'itemx',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v',
                           'index_type_command' => 'vtable',
                           'key' => 'itemx now',
                           'node' => {},
@@ -1211,7 +1208,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v',
                           'index_type_command' => 'vtable',
                           'key' => 'item',
                           'node' => {},
@@ -1277,7 +1273,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'itemx',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v',
                           'index_type_command' => 'vtable',
                           'key' => 'itemx after an empty line',
                           'node' => {},

Modified: trunk/tp/t/results/xtable/empty_item_itemx.pl
===================================================================
--- trunk/tp/t/results/xtable/empty_item_itemx.pl       2016-04-09 09:48:54 UTC 
(rev 7105)
+++ trunk/tp/t/results/xtable/empty_item_itemx.pl       2016-04-09 11:48:10 UTC 
(rev 7106)
@@ -114,7 +114,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'item',
                       'index_name' => 'vr',
-                      'index_prefix' => 'v',
                       'index_type_command' => 'vtable',
                       'key' => 'first item',
                       'number' => 1
@@ -197,7 +196,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'itemx',
                       'index_name' => 'vr',
-                      'index_prefix' => 'v',
                       'index_type_command' => 'vtable',
                       'key' => 'after an empty itemx, before an empty item',
                       'number' => 2
@@ -304,7 +302,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'item',
                       'index_name' => 'vr',
-                      'index_prefix' => 'v',
                       'index_type_command' => 'vtable',
                       'key' => 'in item before end table',
                       'number' => 3

Modified: trunk/tp/t/results/xtable/inter_item_commands_in_table.pl
===================================================================
--- trunk/tp/t/results/xtable/inter_item_commands_in_table.pl   2016-04-09 
09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/xtable/inter_item_commands_in_table.pl   2016-04-09 
11:48:10 UTC (rev 7106)
@@ -109,7 +109,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'item',
                       'index_name' => 'vr',
-                      'index_prefix' => 'v',
                       'index_type_command' => 'vtable',
                       'key' => 'a',
                       'number' => 1
@@ -288,7 +287,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'item',
                       'index_name' => 'vr',
-                      'index_prefix' => 'v',
                       'index_type_command' => 'vtable',
                       'key' => 'a',
                       'number' => 2
@@ -365,7 +363,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'itemx',
                       'index_name' => 'vr',
-                      'index_prefix' => 'v',
                       'index_type_command' => 'vtable',
                       'key' => 'b',
                       'number' => 3
@@ -544,7 +541,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'item',
                       'index_name' => 'fn',
-                      'index_prefix' => 'f',
                       'index_type_command' => 'ftable',
                       'key' => 'a',
                       'number' => 1
@@ -599,7 +595,6 @@
                           'in_code' => 0,
                           'index_at_command' => 'cindex',
                           'index_name' => 'cp',
-                          'index_prefix' => 'c',
                           'index_type_command' => 'cindex',
                           'key' => 'index entry between item and itemx',
                           'number' => 1
@@ -693,7 +688,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'itemx',
                       'index_name' => 'fn',
-                      'index_prefix' => 'f',
                       'index_type_command' => 'ftable',
                       'key' => 'b',
                       'number' => 2
@@ -775,7 +769,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'item',
                       'index_name' => 'fn',
-                      'index_prefix' => 'f',
                       'index_type_command' => 'ftable',
                       'key' => 'c',
                       'number' => 3
@@ -864,7 +857,6 @@
                       'in_code' => 1,
                       'index_at_command' => 'itemx',
                       'index_name' => 'fn',
-                      'index_prefix' => 'f',
                       'index_type_command' => 'ftable',
                       'key' => 'd',
                       'number' => 4
@@ -1054,7 +1046,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => 'cindex in table',
                   'number' => 2
@@ -1299,7 +1290,6 @@
                   'in_code' => 0,
                   'index_at_command' => 'cindex',
                   'index_name' => 'cp',
-                  'index_prefix' => 'c',
                   'index_type_command' => 'cindex',
                   'key' => 'cindex in table',
                   'number' => 3

Modified: trunk/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
===================================================================
--- trunk/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl        
2016-04-09 09:48:54 UTC (rev 7105)
+++ trunk/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl        
2016-04-09 11:48:10 UTC (rev 7106)
@@ -142,7 +142,6 @@
                                   'in_code' => 0,
                                   'index_at_command' => 'cindex',
                                   'index_name' => 'cp',
-                                  'index_prefix' => 'c',
                                   'index_type_command' => 'cindex',
                                   'key' => 'index entry between item and 
itemx',
                                   'number' => 1

Modified: trunk/tp/t/results/xtable/table_nested.pl
===================================================================
--- trunk/tp/t/results/xtable/table_nested.pl   2016-04-09 09:48:54 UTC (rev 
7105)
+++ trunk/tp/t/results/xtable/table_nested.pl   2016-04-09 11:48:10 UTC (rev 
7106)
@@ -299,7 +299,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v',
                           'index_type_command' => 'vtable',
                           'key' => 'first item',
                           'number' => 1
@@ -352,7 +351,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'itemx',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v',
                           'index_type_command' => 'vtable',
                           'key' => 'second itemx',
                           'number' => 2
@@ -446,7 +444,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v',
                           'index_type_command' => 'vtable',
                           'key' => 'second item',
                           'number' => 3
@@ -540,7 +537,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v',
                           'index_type_command' => 'vtable',
                           'key' => 'last',
                           'number' => 4
@@ -1037,7 +1033,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v',
                           'index_type_command' => 'vtable',
                           'key' => 'first item',
                           'number' => 5
@@ -1090,7 +1085,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'itemx',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v',
                           'index_type_command' => 'vtable',
                           'key' => 'second itemx',
                           'number' => 6
@@ -1184,7 +1178,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v',
                           'index_type_command' => 'vtable',
                           'key' => 'second item',
                           'number' => 7
@@ -1278,7 +1271,6 @@
                           'in_code' => 1,
                           'index_at_command' => 'item',
                           'index_name' => 'vr',
-                          'index_prefix' => 'v',
                           'index_type_command' => 'vtable',
                           'key' => 'last',
                           'number' => 8
@@ -1787,7 +1779,6 @@
                               'in_code' => 1,
                               'index_at_command' => 'item',
                               'index_name' => 'vr',
-                              'index_prefix' => 'v',
                               'index_type_command' => 'vtable',
                               'key' => 'first item',
                               'number' => 9
@@ -1840,7 +1831,6 @@
                               'in_code' => 1,
                               'index_at_command' => 'itemx',
                               'index_name' => 'vr',
-                              'index_prefix' => 'v',
                               'index_type_command' => 'vtable',
                               'key' => 'second itemx',
                               'number' => 10
@@ -1934,7 +1924,6 @@
                               'in_code' => 1,
                               'index_at_command' => 'item',
                               'index_name' => 'vr',
-                              'index_prefix' => 'v',
                               'index_type_command' => 'vtable',
                               'key' => 'second item',
                               'number' => 11
@@ -2028,7 +2017,6 @@
                               'in_code' => 1,
                               'index_at_command' => 'item',
                               'index_name' => 'vr',
-                              'index_prefix' => 'v',
                               'index_type_command' => 'vtable',
                               'key' => 'last',
                               'number' => 12




reply via email to

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