texinfo-commits
[Top][All Lists]
Advanced

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

texinfo/tp Texinfo/Convert/Info.pm Texinfo/Conv...


From: Patrice Dumas
Subject: texinfo/tp Texinfo/Convert/Info.pm Texinfo/Conv...
Date: Sun, 27 May 2012 10:45:17 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/05/27 10:45:16

Modified files:
        tp/Texinfo/Convert: Info.pm Plaintext.pm 
        tp/t           : 09indices.t 
        tp/t/results/coverage: punctuation_in_line_commands.pl 
        tp/t/results/float: cindex_in_caption.pl float_copying.pl 
        tp/t/results/indices: def_syn_indices.pl double_index_entry.pl 
                              double_syncodeindex.pl 
                              empty_cindex_entry.pl empty_index_entry.pl 
                              empty_string_index_entry.pl 
                              ftable_vtable.pl image_lines_count.pl 
                              image_text_lines_count.pl 
                              index_entries_locations.pl 
                              index_entry_before_first_node.pl 
                              index_entry_before_node.pl 
                              index_entry_in_footnote.pl 
                              index_entry_in_footnote_separate.pl 
                              printindex_index_entry_in_copying.pl 
                              printindex_index_entry_in_copying_in_footnote.pl 
                              
printindex_index_entry_in_copying_no_insertcopying.pl 
                              printindex_with_space_before.pl 
                              syncode_index_print_both.pl 
                              syncodeindex_to_plain.pl 
        tp/t/results/misc_commands: comment_space_command_on_line.pl 
        tp/tests/layout/res_parser/formatting_plaintext: formatting.1 
Added files:
        tp/t/results/indices/encoding_index_ascii/res_plaintext: 
                                                                 
encoding_index_ascii.txt 
        
tp/t/results/indices/encoding_index_ascii_enable_encoding/res_plaintext: 
                                                                                
 encoding_index_ascii_enable_encoding.txt 
        tp/t/results/indices/encoding_index_latin1/res_plaintext: 
                                                                  
encoding_index_latin1.txt 
        
tp/t/results/indices/encoding_index_latin1_enable_encoding/res_plaintext: 
                                                                                
  encoding_index_latin1_enable_encoding.txt 
        tp/t/results/indices/encoding_index_utf8/res_plaintext: 
                                                                
encoding_index_utf8.txt 
        tp/t/results/indices/encoding_index_utf8_enable_encoding/res_plaintext: 
                                                                                
encoding_index_utf8_enable_encoding.txt 

Log message:
        Do not reset line count in _convert_node, let it be done in _node.
        Format printindex in plaintext.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.209&r2=1.210
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/09indices.t?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/cindex_in_caption.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/float_copying.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/def_syn_indices.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/double_index_entry.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/double_syncodeindex.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/empty_cindex_entry.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/empty_index_entry.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/empty_string_index_entry.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/ftable_vtable.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/image_lines_count.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/image_text_lines_count.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/index_entries_locations.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/index_entry_before_first_node.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/index_entry_before_node.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/index_entry_in_footnote.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/index_entry_in_footnote_separate.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/printindex_index_entry_in_copying.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/printindex_with_space_before.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/syncode_index_print_both.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/syncodeindex_to_plain.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/encoding_index_ascii/res_plaintext/encoding_index_ascii.txt?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/encoding_index_ascii_enable_encoding/res_plaintext/encoding_index_ascii_enable_encoding.txt?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/encoding_index_latin1/res_plaintext/encoding_index_latin1.txt?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/encoding_index_latin1_enable_encoding/res_plaintext/encoding_index_latin1_enable_encoding.txt?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/encoding_index_utf8/res_plaintext/encoding_index_utf8.txt?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/encoding_index_utf8_enable_encoding/res_plaintext/encoding_index_utf8_enable_encoding.txt?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_plaintext/formatting.1?cvsroot=texinfo&r1=1.2&r2=1.3

Patches:
Index: Texinfo/Convert/Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- Texinfo/Convert/Info.pm     15 Feb 2012 20:45:30 -0000      1.82
+++ Texinfo/Convert/Info.pm     27 May 2012 10:45:13 -0000      1.83
@@ -313,175 +313,11 @@
   return ('', 0);
 }
 
-my $index_length_to_node = 41;
-
 sub _printindex($$)
 {
   my $self = shift;
   my $printindex = shift;
-
-  my $index_name;
-
-  if ($printindex->{'extra'} and $printindex->{'extra'}->{'misc_args'}
-      and defined($printindex->{'extra'}->{'misc_args'}->[0])) {
-    $index_name = $printindex->{'extra'}->{'misc_args'}->[0];
-  } else {
-    return '';
-  }
-
-  # this is not redone for each index, only once
-  if (!defined($self->{'index_entries'}) and $self->{'parser'}) {
-
-    my ($index_names, $merged_indices, $index_entries)
-       = $self->{'parser'}->indices_information();
-    my $merged_index_entries 
-      = Texinfo::Structuring::merge_indices($index_names, $merged_indices,
-                                            $index_entries);
-    $self->{'index_entries'} 
-      = $self->Texinfo::Structuring::sort_indices($merged_index_entries,
-                                                  $index_names);
-    $self->{'index_names'} = $index_names;
-  }
-  if (!$self->{'index_entries'} or !$self->{'index_entries'}->{$index_name}
-      or ! @{$self->{'index_entries'}->{$index_name}}) {
-    return '';
-  }
-
-  my $result = '';
-  $result .= $self->_add_newline_if_needed();
-  my $heading = "\x{00}\x{08}[index\x{00}\x{08}]\n* Menu:\n\n";
-
-  $result .= $heading;
-  $self->_add_text_count($heading);
-  $self->_add_lines_count(3);
-
-  # first determine the line numbers for the spacing of their formatting
-  my %line_nrs;
-  my %entry_nodes;
-  my $max_index_line_nr_string_length = 0;
-  my %ignored_entries;
-  foreach my $entry (@{$self->{'index_entries'}->{$index_name}}) {
-    my $line_nr;
-
-    if (defined 
($self->{'index_entries_line_location'}->{$entry->{'command'}})) {
-      $line_nr = 
$self->{'index_entries_line_location'}->{$entry->{'command'}}->{'lines'};
-      # ignore index entries in special regions that haven't been seen
-    } elsif ($entry->{'region'}) {
-      $ignored_entries{$entry} = 1;
-      next;
-    }
-
-    my $node;
-    # priority given to the location determined dynamically as the
-    # index entry may be in footnote.
-    if 
(defined($self->{'index_entries_line_location'}->{$entry->{'command'}}->{'node'}))
 {
-      $node = 
$self->{'index_entries_line_location'}->{$entry->{'command'}}->{'node'};
-    } elsif (defined($entry->{'node'})) {
-      $node = $entry->{'node'};
-    }
-    $entry_nodes{$entry} = $node;
-    if (!defined($node)) {
-      $line_nr = 0;
-    } else {
-      $line_nr = 3 if (defined($line_nr) and $line_nr < 3);
-      $line_nr = 4 if (!defined($line_nr));
-    }
-    my $index_line_nr_string_length = 
-      Texinfo::Convert::Unicode::string_width($line_nr);
-    $max_index_line_nr_string_length = $index_line_nr_string_length 
-     if ($max_index_line_nr_string_length < $index_line_nr_string_length);
-    $line_nrs{$entry} = $line_nr;
-  }
-
-  # this is used to count entries that are the same
-  my %entry_counts = ();
-
-  foreach my $entry (@{$self->{'index_entries'}->{$index_name}}) {
-    #my @keys = keys(%$entry);
-    #print STDERR "$index_name $entry: @keys\n";
-    next if ($ignored_entries{$entry});
-    my $entry_tree = {'contents' => $entry->{'content'}};
-    if ($entry->{'in_code'}) {
-      $entry_tree->{'type'} = 'code';
-    } else {
-      $entry_tree->{'type'} = 'frenchspacing';
-    }
-    my $entry_text = '';
-    $entry_text .= $self->convert_line($entry_tree, {'indent' => 0});
-    next if ($entry_text !~ /\S/);
-    # FIXME protect instead
-    #if ($entry_text =~ /:/) {
-      #$self->line_warn (sprintf($self->__("Index entry in address@hidden with 
: produces invalid Info: %s"),
-      #                           $entry->{'index_at_command'},
-      #    Texinfo::Convert::Texinfo::convert($entry_tree)), 
-      #                  $entry->{'command'}->{'line_nr'});
-    #}
-
-    my $entry_nr = '';
-    if (!defined($entry_counts{$entry_text})) {
-      $entry_counts{$entry_text} = 0;
-    } else {
-      $entry_counts{$entry_text}++;
-      $entry_nr = ' <'.$entry_counts{$entry_text}.'>';
-      $self->_add_text_count($entry_nr);
-    }
-    my $entry_line = "* $entry_text${entry_nr}: ";
-    $self->_add_text_count("* ".": ");
-    #$self->_add_text_count($entry_line);
-    
-    my $line_width = Texinfo::Convert::Unicode::string_width($entry_line);
-    if ($line_width < $index_length_to_node) {
-      my $spaces = ' ' x ($index_length_to_node - $line_width);
-      $entry_line .= $spaces;
-      $self->_add_text_count($spaces);
-    }
-    my $node_text;
-    my $node = $entry_nodes{$entry};
-
-    if (!defined($node)) {
-      $node_text = $self->gdt('(outside of any node)');
-      # FIXME when outside of sectioning commands this message was already
-      # done by the Parser.
-      # Warn, only once.
-      if (!$self->{'index_entries_no_node'}->{$entry}) {
-        $self->line_warn (sprintf($self->__("Entry for index `%s' outside of 
any node"),
-                                 $index_name), 
$entry->{'command'}->{'line_nr'});
-        $self->{'index_entries_no_node'}->{$entry} = 1;
-      }
-    } else {
-      $node_text = {'type' => 'code',
-                'contents' => $node->{'extra'}->{'node_content'}};
-    }
-    $entry_line .= $self->convert_line($node_text);
-    $entry_line .= '.';
-    $self->_add_text_count('.');
-
-    $result .= $entry_line;
-
-    my $line_nr = $line_nrs{$entry};
-    my $line_nr_spaces = sprintf("%${max_index_line_nr_string_length}d", 
$line_nr);
-    my $line_part = "(line ${line_nr_spaces})";
-    $line_width = Texinfo::Convert::Unicode::string_width($entry_line);
-    my $line_part_width = Texinfo::Convert::Unicode::string_width($line_part);
-    if ($line_width + $line_part_width +1 > $self->{'fillcolumn'}) {
-      $line_part = "\n" . ' ' x ($self->{'fillcolumn'} - $line_part_width) 
-           . "$line_part\n";
-      $self->_add_lines_count(1);
-    } else { 
-      $line_part 
-        = ' ' x ($self->{'fillcolumn'} - $line_part_width - $line_width)
-           . "$line_part\n";
-    }
-    $self->_add_lines_count(1);
-    $self->_add_text_count($line_part);
-    $result .= $line_part;
-  }
-
-  $result .= "\n"; 
-  $self->_add_text_count("\n");
-  $self->_add_lines_count(1);
-  
-  return $result;
+  return $self->_printindex_formatted($printindex, 1);
 }
 
 sub _error_outside_of_any_node($$)

Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -b -r1.209 -r1.210
--- Texinfo/Convert/Plaintext.pm        27 May 2012 09:43:50 -0000      1.209
+++ Texinfo/Convert/Plaintext.pm        27 May 2012 10:45:13 -0000      1.210
@@ -380,7 +380,6 @@
   print STDERR "NEW NODE\n" if ($self->get_conf('DEBUG'));
   die "Too much count_context\n" if (scalar(@{$self->{'count_context'}}) != 1);
 
-  $self->{'count_context'}->[-1]->{'lines'} = 0;
   $result .= $self->_convert($element);
 
   print STDERR "END NODE 
($self->{'count_context'}->[-1]->{'lines'},$self->{'count_context'}->[-1]->{'bytes'})\n"
 if ($self->get_conf('DEBUG'));
@@ -923,9 +922,188 @@
 {
   my $self = shift;
   my $printindex = shift;
-  return ('');
+  return $self->_printindex_formatted($printindex);
 }
 
+my $index_length_to_node = 41;
+
+sub _printindex_formatted($$;$)
+{
+  my $self = shift;
+  my $printindex = shift;
+  my $in_info = shift;
+
+  my $index_name;
+
+  if ($printindex->{'extra'} and $printindex->{'extra'}->{'misc_args'}
+      and defined($printindex->{'extra'}->{'misc_args'}->[0])) {
+    $index_name = $printindex->{'extra'}->{'misc_args'}->[0];
+  } else {
+    return '';
+  }
+
+  # this is not redone for each index, only once
+  if (!defined($self->{'index_entries'}) and $self->{'parser'}) {
+
+    my ($index_names, $merged_indices, $index_entries)
+       = $self->{'parser'}->indices_information();
+    my $merged_index_entries 
+      = Texinfo::Structuring::merge_indices($index_names, $merged_indices,
+                                            $index_entries);
+    $self->{'index_entries'} 
+      = $self->Texinfo::Structuring::sort_indices($merged_index_entries,
+                                                  $index_names);
+    $self->{'index_names'} = $index_names;
+  }
+  if (!$self->{'index_entries'} or !$self->{'index_entries'}->{$index_name}
+      or ! @{$self->{'index_entries'}->{$index_name}}) {
+    return '';
+  }
+
+  my $result = '';
+  $result .= $self->_add_newline_if_needed();
+  if ($in_info) {
+    my $info_printindex_magic = "\x{00}\x{08}[index\x{00}\x{08}]\n";
+    $result .= $info_printindex_magic;
+    $self->_add_text_count($info_printindex_magic);
+    $self->_add_lines_count(1);
+  }
+  my $heading = "* Menu:\n\n";
+
+  $result .= $heading;
+  $self->_add_text_count($heading);
+  $self->_add_lines_count(2);
+
+  # first determine the line numbers for the spacing of their formatting
+  my %line_nrs;
+  my %entry_nodes;
+  my $max_index_line_nr_string_length = 0;
+  my %ignored_entries;
+  foreach my $entry (@{$self->{'index_entries'}->{$index_name}}) {
+    my $line_nr;
+
+    if (defined 
($self->{'index_entries_line_location'}->{$entry->{'command'}})) {
+      $line_nr = 
$self->{'index_entries_line_location'}->{$entry->{'command'}}->{'lines'};
+      # ignore index entries in special regions that haven't been seen
+    } elsif ($entry->{'region'}) {
+      $ignored_entries{$entry} = 1;
+      next;
+    }
+
+    my $node;
+    # priority given to the location determined dynamically as the
+    # index entry may be in footnote.
+    if 
(defined($self->{'index_entries_line_location'}->{$entry->{'command'}}->{'node'}))
 {
+      $node = 
$self->{'index_entries_line_location'}->{$entry->{'command'}}->{'node'};
+    } elsif (defined($entry->{'node'})) {
+      $node = $entry->{'node'};
+    }
+    $entry_nodes{$entry} = $node;
+    if (!defined($node)) {
+      $line_nr = 0;
+    } else {
+      $line_nr = 3 if (defined($line_nr) and $line_nr < 3);
+      $line_nr = 4 if (!defined($line_nr));
+    }
+    my $index_line_nr_string_length = 
+      Texinfo::Convert::Unicode::string_width($line_nr);
+    $max_index_line_nr_string_length = $index_line_nr_string_length 
+     if ($max_index_line_nr_string_length < $index_line_nr_string_length);
+    $line_nrs{$entry} = $line_nr;
+  }
+
+  # this is used to count entries that are the same
+  my %entry_counts = ();
+
+  foreach my $entry (@{$self->{'index_entries'}->{$index_name}}) {
+    #my @keys = keys(%$entry);
+    #print STDERR "$index_name $entry: @keys\n";
+    next if ($ignored_entries{$entry});
+    my $entry_tree = {'contents' => $entry->{'content'}};
+    if ($entry->{'in_code'}) {
+      $entry_tree->{'type'} = 'code';
+    } else {
+      $entry_tree->{'type'} = 'frenchspacing';
+    }
+    my $entry_text = '';
+    $entry_text .= $self->convert_line($entry_tree, {'indent' => 0});
+    next if ($entry_text !~ /\S/);
+    # FIXME protect instead
+    #if ($entry_text =~ /:/) {
+      #$self->line_warn (sprintf($self->__("Index entry in address@hidden with 
: produces invalid Info: %s"),
+      #                           $entry->{'index_at_command'},
+      #    Texinfo::Convert::Texinfo::convert($entry_tree)), 
+      #                  $entry->{'command'}->{'line_nr'});
+    #}
+
+    my $entry_nr = '';
+    if (!defined($entry_counts{$entry_text})) {
+      $entry_counts{$entry_text} = 0;
+    } else {
+      $entry_counts{$entry_text}++;
+      $entry_nr = ' <'.$entry_counts{$entry_text}.'>';
+      $self->_add_text_count($entry_nr);
+    }
+    my $entry_line = "* $entry_text${entry_nr}: ";
+    $self->_add_text_count("* ".": ");
+    #$self->_add_text_count($entry_line);
+    
+    my $line_width = Texinfo::Convert::Unicode::string_width($entry_line);
+    if ($line_width < $index_length_to_node) {
+      my $spaces = ' ' x ($index_length_to_node - $line_width);
+      $entry_line .= $spaces;
+      $self->_add_text_count($spaces);
+    }
+    my $node_text;
+    my $node = $entry_nodes{$entry};
+
+    if (!defined($node)) {
+      $node_text = $self->gdt('(outside of any node)');
+      # FIXME when outside of sectioning commands this message was already
+      # done by the Parser.
+      # Warn, only once.
+      if (!$self->{'index_entries_no_node'}->{$entry}) {
+        $self->line_warn (sprintf($self->__("Entry for index `%s' outside of 
any node"),
+                                 $index_name), 
$entry->{'command'}->{'line_nr'});
+        $self->{'index_entries_no_node'}->{$entry} = 1;
+      }
+    } else {
+      $node_text = {'type' => 'code',
+                'contents' => $node->{'extra'}->{'node_content'}};
+    }
+    $entry_line .= $self->convert_line($node_text);
+    $entry_line .= '.';
+    $self->_add_text_count('.');
+
+    $result .= $entry_line;
+
+    my $line_nr = $line_nrs{$entry};
+    my $line_nr_spaces = sprintf("%${max_index_line_nr_string_length}d", 
$line_nr);
+    my $line_part = "(line ${line_nr_spaces})";
+    $line_width = Texinfo::Convert::Unicode::string_width($entry_line);
+    my $line_part_width = Texinfo::Convert::Unicode::string_width($line_part);
+    if ($line_width + $line_part_width +1 > $self->{'fillcolumn'}) {
+      $line_part = "\n" . ' ' x ($self->{'fillcolumn'} - $line_part_width) 
+           . "$line_part\n";
+      $self->_add_lines_count(1);
+    } else { 
+      $line_part 
+        = ' ' x ($self->{'fillcolumn'} - $line_part_width - $line_width)
+           . "$line_part\n";
+    }
+    $self->_add_lines_count(1);
+    $self->_add_text_count($line_part);
+    $result .= $line_part;
+  }
+
+  $result .= "\n"; 
+  $self->_add_text_count("\n");
+  $self->_add_lines_count(1);
+  
+  return $result;
+}
+
+
 sub _node($$)
 {
   my $self = shift;

Index: t/09indices.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/09indices.t,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/09indices.t       27 Jan 2012 22:55:42 -0000      1.22
+++ t/09indices.t       27 May 2012 10:45:13 -0000      1.23
@@ -571,11 +571,13 @@
 
 foreach my $test (@test_formatted) {
   push @{$test->[2]->{'test_formats'}}, 'info';
+  push @{$test->[2]->{'test_formats'}}, 'plaintext';
   push @{$test->[2]->{'test_formats'}}, 'html_text';
 }
 
 foreach my $test (@file_tests) {
   push @{$test->[2]->{'test_formats'}}, 'file_html';
+  push @{$test->[2]->{'test_formats'}}, 'file_plaintext';
   push @{$test->[2]->{'test_formats'}}, 'file_info';
 }
 

Index: t/results/coverage/punctuation_in_line_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/coverage/punctuation_in_line_commands.pl  26 May 2012 09:47:38 
-0000      1.28
+++ t/results/coverage/punctuation_in_line_commands.pl  27 May 2012 10:45:13 
-0000      1.29
@@ -1448,6 +1448,10 @@
 
                           center! After punc
 
+* Menu:
+
+* index! After punc:                     node! After punc.     (line 23)
+
 top! After punc
 ';
 

Index: t/results/float/cindex_in_caption.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/cindex_in_caption.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/float/cindex_in_caption.pl        25 Feb 2012 13:15:41 -0000      
1.16
+++ t/results/float/cindex_in_caption.pl        27 May 2012 10:45:13 -0000      
1.17
@@ -556,6 +556,10 @@
 
 fl 1: in caption
 
+* Menu:
+
+* index entry:                           Top.                   (line 6)
+
 ';
 
 

Index: t/results/float/float_copying.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/float_copying.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/float/float_copying.pl    25 Feb 2012 13:15:42 -0000      1.18
+++ t/results/float/float_copying.pl    27 May 2012 10:45:13 -0000      1.19
@@ -1643,6 +1643,16 @@
 
 * Copyright notice 1: public domain.     The Public Domain notice(2)
 
+* Menu:
+
+* indexed caption:                       Copying and floats.   (line 31)
+* indexed caption copying footnote:      Top.                  (line 16)
+
+* Menu:
+
+* indexed caption function:              Copying and floats.   (line 31)
+* public domain function:                Top.                  (line 16)
+
    ---------- Footnotes ----------
 
    (1) The caption copying footnote

Index: t/results/indices/def_syn_indices.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/def_syn_indices.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/indices/def_syn_indices.pl        7 Jan 2012 15:48:09 -0000       
1.1
+++ t/results/indices/def_syn_indices.pl        27 May 2012 10:45:14 -0000      
1.2
@@ -2060,6 +2060,41 @@
 ';
 
 
+$result_converted{'plaintext'}->{'def_syn_indices'} = 'definedx truc after
+
+   pg
+
+* Menu:
+
+* abc index entry:                       Top.                   (line 3)
+* defg index entry:                      Top.                   (line 3)
+* pindex codeidx:                        Top.                   (line 3)
+* truc kindex:                           Top.                   (line 3)
+
+   ky
+
+   truc
+
+   value truc
+
+   cp
+
+   value cp
+
+   defg
+
+   abc
+
+   fn
+
+* Menu:
+
+* cindex entry:                          Top.                   (line 3)
+* index truc:                            Top.                   (line 3)
+
+';
+
+
 $result_converted{'html_text'}->{'def_syn_indices'} = '
 
 <a name="Top"></a>

Index: t/results/indices/double_index_entry.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/double_index_entry.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/indices/double_index_entry.pl     7 Jan 2012 15:20:10 -0000       
1.16
+++ t/results/indices/double_index_entry.pl     27 May 2012 10:45:14 -0000      
1.17
@@ -741,6 +741,21 @@
 ';
 
 
+$result_converted{'plaintext'}->{'double_index_entry'} = 'Text
+
+* Menu:
+
+* other node::
+
+* Menu:
+
+* aaa:                                   Top.                   (line 3)
+* aaa <1>:                               Top.                   (line 3)
+* aaa <2>:                               other node.            (line 6)
+
+';
+
+
 $result_converted{'html_text'}->{'double_index_entry'} = '<a name="Top"></a>
 <div class="header">
 <p>

Index: t/results/indices/double_syncodeindex.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/double_syncodeindex.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/indices/double_syncodeindex.pl    7 Jan 2012 15:20:10 -0000       
1.1
+++ t/results/indices/double_syncodeindex.pl    27 May 2012 10:45:14 -0000      
1.2
@@ -499,6 +499,14 @@
 ';
 
 
+$result_converted{'plaintext'}->{'double_syncodeindex'} = '* Menu:
+
+* cindex entry:                          Top.                   (line 3)
+* findex entry:                          Top.                   (line 3)
+
+';
+
+
 $result_converted{'html_text'}->{'double_syncodeindex'} = '
 <a name="Top"></a>
 <h1 class="node-heading">Top</h1>

Index: t/results/indices/empty_cindex_entry.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/empty_cindex_entry.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/indices/empty_cindex_entry.pl     7 Jan 2012 15:20:10 -0000       
1.9
+++ t/results/indices/empty_cindex_entry.pl     27 May 2012 10:45:14 -0000      
1.10
@@ -170,6 +170,9 @@
 ';
 
 
+$result_converted{'plaintext'}->{'empty_cindex_entry'} = '';
+
+
 $result_converted{'html_text'}->{'empty_cindex_entry'} = '<a name="Top"></a>
 <h1 class="node-heading">Top</h1>
 <hr>

Index: t/results/indices/empty_index_entry.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/empty_index_entry.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/indices/empty_index_entry.pl      7 Jan 2012 15:20:10 -0000       
1.17
+++ t/results/indices/empty_index_entry.pl      27 May 2012 10:45:14 -0000      
1.18
@@ -366,6 +366,11 @@
 ';
 
 
+$result_converted{'plaintext'}->{'empty_index_entry'} = ' -- :
+
+';
+
+
 $result_converted{'html_text'}->{'empty_index_entry'} = '<a name="Top"></a>
 <h1 class="node-heading">Top</h1>
 

Index: t/results/indices/empty_string_index_entry.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/empty_string_index_entry.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/indices/empty_string_index_entry.pl       24 Jan 2012 22:17:00 
-0000      1.3
+++ t/results/indices/empty_string_index_entry.pl       27 May 2012 10:45:14 
-0000      1.4
@@ -982,6 +982,54 @@
 
 
 
+$result_converted{'plaintext'}->{'empty_string_index_entry'} = '\'\'
+
+ -- Function: 
+ -- Function: 
+
+';
+
+$result_converted_errors{'plaintext'}->{'empty_string_index_entry'} = [
+  {
+    'file_name' => '',
+    'error_line' => ':3: warning: Empty index key in @findex
+',
+    'text' => 'Empty index key in @findex',
+    'type' => 'warning',
+    'macro' => '',
+    'line_nr' => 3
+  },
+  {
+    'file_name' => '',
+    'error_line' => ':6: warning: Empty index key in @item
+',
+    'text' => 'Empty index key in @item',
+    'type' => 'warning',
+    'macro' => '',
+    'line_nr' => 6
+  },
+  {
+    'file_name' => '',
+    'error_line' => ':9: warning: Empty index key in @defun
+',
+    'text' => 'Empty index key in @defun',
+    'type' => 'warning',
+    'macro' => '',
+    'line_nr' => 9
+  },
+  {
+    'file_name' => '',
+    'error_line' => ':10: warning: Empty index key in @defunx
+',
+    'text' => 'Empty index key in @defunx',
+    'type' => 'warning',
+    'macro' => '',
+    'line_nr' => 10
+  }
+];
+
+
+
 $result_converted{'html_text'}->{'empty_string_index_entry'} = '<a 
name="Top"></a>
 <h1 class="node-heading">Top</h1>
 

Index: t/results/indices/ftable_vtable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/ftable_vtable.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/indices/ftable_vtable.pl  13 Jan 2012 18:26:20 -0000      1.1
+++ t/results/indices/ftable_vtable.pl  27 May 2012 10:45:14 -0000      1.2
@@ -1097,6 +1097,32 @@
 ';
 
 
+$result_converted{'plaintext'}->{'ftable_vtable'} = '_function1_
+_function2x_
+     Text
+_fun3_
+
+_var1 error->_
+_varx2_
+     Text
+_var3_
+
+* Menu:
+
+* fun3:                                  Top.                  (line  3)
+* function1:                             Top.                  (line  3)
+* function1 <1>:                         Top.                  (line 10)
+* function2x:                            Top.                  (line  3)
+
+* Menu:
+
+* var1 error->:                          Top.                   (line 5)
+* var3:                                  Top.                   (line 8)
+* varx2:                                 Top.                   (line 6)
+
+';
+
+
 $result_converted{'html_text'}->{'ftable_vtable'} = '
 <a name="Top"></a>
 <h1 class="node-heading">Top</h1>

Index: t/results/indices/image_lines_count.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/image_lines_count.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/indices/image_lines_count.pl      7 Jan 2012 15:20:11 -0000       
1.13
+++ t/results/indices/image_lines_count.pl      27 May 2012 10:45:14 -0000      
1.14
@@ -320,6 +320,20 @@
 ';
 
 
+$result_converted{'plaintext'}->{'image_lines_count'} = 'aaaa
+bbb
+cc
+
+ff
+
+
+* Menu:
+
+* index entry:                           Top.                   (line 7)
+
+';
+
+
 $result_converted{'html_text'}->{'image_lines_count'} = '<a name="Top"></a>
 <h1 class="node-heading">Top</h1>
 

Index: t/results/indices/image_text_lines_count.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/image_text_lines_count.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/indices/image_text_lines_count.pl 7 Jan 2012 15:20:11 -0000       
1.12
+++ t/results/indices/image_text_lines_count.pl 27 May 2012 10:45:14 -0000      
1.13
@@ -319,6 +319,20 @@
 ';
 
 
+$result_converted{'plaintext'}->{'image_text_lines_count'} = 'aaaa
+bbb
+cc
+
+ff
+
+
+* Menu:
+
+* index entry:                           Top.                   (line 7)
+
+';
+
+
 $result_converted{'html_text'}->{'image_text_lines_count'} = '<a 
name="Top"></a>
 <h1 class="node-heading">Top</h1>
 

Index: t/results/indices/index_entries_locations.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/index_entries_locations.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/indices/index_entries_locations.pl        7 Jan 2012 15:20:11 
-0000       1.12
+++ t/results/indices/index_entries_locations.pl        27 May 2012 10:45:14 
-0000      1.13
@@ -611,6 +611,26 @@
 ';
 
 
+$result_converted{'plaintext'}->{'index_entries_locations'} = 'Initial 
paragraph.
+
+   Paragraph end paragraph.
+
+   New paragraph.
+
+   Another paragraph.
+
+   Last paragraph.
+
+* Menu:
+
+* entry at end of paragraph.:            Top.                   (line 3)
+* Entry before paragraph:                Top.                   (line 6)
+* entry in paragraph:                    Top.                   (line 3)
+* lone entry:                            Top.                   (line 8)
+
+';
+
+
 $result_converted{'html_text'}->{'index_entries_locations'} = '
 <a name="Top"></a>
 <h1 class="node-heading">Top</h1>

Index: t/results/indices/index_entry_before_first_node.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/index_entry_before_first_node.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/indices/index_entry_before_first_node.pl  7 Jan 2012 15:20:11 
-0000       1.12
+++ t/results/indices/index_entry_before_first_node.pl  27 May 2012 10:45:14 
-0000      1.13
@@ -293,6 +293,26 @@
 
 
 
+$result_converted{'plaintext'}->{'index_entry_before_first_node'} = '* Menu:
+
+* before nodes:                          (outside of any node). (line 0)
+
+';
+
+$result_converted_errors{'plaintext'}->{'index_entry_before_first_node'} = [
+  {
+    'file_name' => '',
+    'error_line' => ':2: warning: Entry for index `cp\' outside of any node
+',
+    'text' => 'Entry for index `cp\' outside of any node',
+    'type' => 'warning',
+    'macro' => '',
+    'line_nr' => 2
+  }
+];
+
+
+
 $result_converted{'html_text'}->{'index_entry_before_first_node'} = '
 <a name="index-before-nodes"></a>
 

Index: t/results/indices/index_entry_before_node.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/index_entry_before_node.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/indices/index_entry_before_node.pl        7 Jan 2012 15:20:11 
-0000       1.17
+++ t/results/indices/index_entry_before_node.pl        27 May 2012 10:45:14 
-0000      1.18
@@ -810,6 +810,20 @@
 ';
 
 
+$result_converted{'plaintext'}->{'index_entry_before_node'} = '* Menu:
+
+* first::
+* second::
+
+Para.
+
+* Menu:
+
+* lone entry:                            first.                 (line 6)
+
+';
+
+
 $result_converted{'html_text'}->{'index_entry_before_node'} = '<a 
name="Top"></a>
 <div class="header">
 <p>

Index: t/results/indices/index_entry_in_footnote.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/indices/index_entry_in_footnote.pl        7 Jan 2012 15:20:11 
-0000       1.8
+++ t/results/indices/index_entry_in_footnote.pl        27 May 2012 10:45:14 
-0000      1.9
@@ -323,6 +323,19 @@
 ';
 
 
+$result_converted{'plaintext'}->{'index_entry_in_footnote'} = 'Top node(1)
+
+* Menu:
+
+* index entry in footnote:               Top.                   (line 4)
+
+   ---------- Footnotes ----------
+
+   (1) in footnote
+
+';
+
+
 $result_converted{'html_text'}->{'index_entry_in_footnote'} = '<a 
name="Top"></a>
 <h1 class="node-heading">Top</h1>
 

Index: t/results/indices/index_entry_in_footnote_separate.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/index_entry_in_footnote_separate.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/indices/index_entry_in_footnote_separate.pl       7 Jan 2012 
15:20:11 -0000       1.3
+++ t/results/indices/index_entry_in_footnote_separate.pl       27 May 2012 
10:45:14 -0000      1.4
@@ -764,6 +764,26 @@
 ';
 
 
+$result_converted{'plaintext'}->{'index_entry_in_footnote_separate'} = '* Menu:
+
+* First::
+
+Top node(1) (*note Top-Footnote-1::)
+
+   (1) in footnote
+
+   Blah
+
+   Blih
+
+* Menu:
+
+* counting entry:                        Top-Footnotes.        (line 11)
+* index entry in footnote:               Top-Footnotes.        (line  6)
+
+';
+
+
 $result_converted{'html_text'}->{'index_entry_in_footnote_separate'} = '<a 
name="Top"></a>
 <div class="header">
 <p>

Index: t/results/indices/printindex_index_entry_in_copying.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/indices/printindex_index_entry_in_copying.pl      5 Feb 2012 
22:22:09 -0000       1.21
+++ t/results/indices/printindex_index_entry_in_copying.pl      27 May 2012 
10:45:15 -0000      1.22
@@ -1516,6 +1516,59 @@
 ';
 
 
+$result_converted{'plaintext'}->{'printindex_index_entry_in_copying'} = 'top
+***
+
+Top.
+
+ -- Function: fun arg
+ -- Function: xf arg
+     Defun
+
+ftable item
+xftable xitem
+
+* Menu:
+
+* Copying this document:                 Top.                  (line  5)
+* ftable item:                           Top.                  (line  9)
+* fun:                                   Top.                  (line  5)
+* xf:                                    Top.                  (line  6)
+* xftable xitem:                         Top.                  (line 10)
+
+* Menu:
+
+* chapter::
+
+1 Chapter
+*********
+
+ -- Function: fun arg
+ -- Function: xf arg
+     Defun
+
+ftable item
+xftable xitem
+
+* Menu:
+
+* Copying this document:                 chapter.              (line 27)
+* ftable item:                           chapter.              (line 31)
+* fun:                                   chapter.              (line 27)
+* xf:                                    chapter.              (line 28)
+* xftable xitem:                         chapter.              (line 32)
+
+* Menu:
+
+* Copying this document:                 chapter.              (line 27)
+* ftable item:                           chapter.              (line 31)
+* fun:                                   chapter.              (line 27)
+* xf:                                    chapter.              (line 28)
+* xftable xitem:                         chapter.              (line 32)
+
+';
+
+
 $result_converted{'html_text'}->{'printindex_index_entry_in_copying'} = '
 <a name="Top"></a>
 <div class="header">

Index: t/results/indices/printindex_index_entry_in_copying_in_footnote.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_in_footnote.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/indices/printindex_index_entry_in_copying_in_footnote.pl  5 Feb 
2012 22:22:09 -0000       1.18
+++ t/results/indices/printindex_index_entry_in_copying_in_footnote.pl  27 May 
2012 10:45:15 -0000      1.19
@@ -960,6 +960,40 @@
 ';
 
 
+$result_converted{'plaintext'}->{'printindex_index_entry_in_copying_in_footnote'}
 = 'top
+***
+
+Top.
+
+   Copying(1).
+
+* Menu:
+
+
+* Menu:
+
+* chapter::
+
+   ---------- Footnotes ----------
+
+   (1) In footnote
+
+1 Chapter
+*********
+
+Copying(1).
+
+* Menu:
+
+* Copying this document:                 Top.                  (line 16)
+
+   ---------- Footnotes ----------
+
+   (1) In footnote
+
+';
+
+
 
$result_converted{'html_text'}->{'printindex_index_entry_in_copying_in_footnote'}
 = '
 <a name="Top"></a>
 <div class="header">

Index: t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl     
7 Jan 2012 15:20:12 -0000       1.17
+++ t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl     
27 May 2012 10:45:15 -0000      1.18
@@ -1443,6 +1443,24 @@
 ';
 
 
+$result_converted{'plaintext'}->{'printindex_index_entry_in_copying_no_insertcopying'}
 = 'top
+***
+
+Top.
+
+* Menu:
+
+* chapter::
+
+1 Chapter
+*********
+
+* Menu:
+
+
+';
+
+
 
$result_converted{'html_text'}->{'printindex_index_entry_in_copying_no_insertcopying'}
 = '
 <a name="Top"></a>
 <div class="header">

Index: t/results/indices/printindex_with_space_before.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/printindex_with_space_before.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/indices/printindex_with_space_before.pl   7 Jan 2012 15:20:12 
-0000       1.12
+++ t/results/indices/printindex_with_space_before.pl   27 May 2012 10:45:15 
-0000      1.13
@@ -279,6 +279,15 @@
 ';
 
 
+$result_converted{'plaintext'}->{'printindex_with_space_before'} = 'Text.
+
+* Menu:
+
+* index:                                 Top.                   (line 3)
+
+';
+
+
 $result_converted{'html_text'}->{'printindex_with_space_before'} = '<a 
name="Top"></a>
 <h1 class="node-heading">Top</h1>
 

Index: t/results/indices/syncode_index_print_both.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/syncode_index_print_both.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/indices/syncode_index_print_both.pl       7 Jan 2012 15:20:12 
-0000       1.13
+++ t/results/indices/syncode_index_print_both.pl       27 May 2012 10:45:15 
-0000      1.14
@@ -530,6 +530,18 @@
 ';
 
 
+$result_converted{'plaintext'}->{'syncode_index_print_both'} = 'Print fn
+
+   Print vr
+
+* Menu:
+
+* c--oncept:                             Top.                   (line 3)
+* f---un:                                Top.                   (line 3)
+
+';
+
+
 $result_converted{'html_text'}->{'syncode_index_print_both'} = '
 <a name="Top"></a>
 <h1 class="node-heading">Top</h1>

Index: t/results/indices/syncodeindex_to_plain.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/indices/syncodeindex_to_plain.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/indices/syncodeindex_to_plain.pl  13 Jan 2012 18:26:20 -0000      
1.1
+++ t/results/indices/syncodeindex_to_plain.pl  27 May 2012 10:45:15 -0000      
1.2
@@ -555,6 +555,22 @@
 ';
 
 
+$result_converted{'plaintext'}->{'syncodeindex_to_plain'} = 'cp index.
+
+* Menu:
+
+* --k1:                                  Top.                   (line 3)
+* -c:                                    Top.                   (line 3)
+
+   vr index.
+
+* Menu:
+
+* --v:                                   Top.                   (line 3)
+
+';
+
+
 $result_converted{'html_text'}->{'syncodeindex_to_plain'} = '
 <a name="Top"></a>
 <h1 class="node-heading">Top</h1>

Index: t/results/misc_commands/comment_space_command_on_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/misc_commands/comment_space_command_on_line.pl    17 May 2012 
11:12:18 -0000      1.22
+++ t/results/misc_commands/comment_space_command_on_line.pl    27 May 2012 
10:45:16 -0000      1.23
@@ -910,6 +910,10 @@
 Heading  
 =========
 
+* Menu:
+
+* index entry  :                         Top.                   (line 3)
+
 float
 
 Text 1

Index: tests/layout/res_parser/formatting_plaintext/formatting.1
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_plaintext/formatting.1,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/layout/res_parser/formatting_plaintext/formatting.1   24 Jan 2012 
22:17:09 -0000      1.2
+++ tests/layout/res_parser/formatting_plaintext/formatting.1   27 May 2012 
10:45:16 -0000      1.3
@@ -1196,16 +1196,188 @@
 
    cp
 
+* Menu:
+
+* ":                                     Top.                (line   16)
+* " <1>:                                 Top.                (line  363)
+* " <2>:                                 Top.                (line  721)
+* -option:                               Top.                (line   16)
+* -option <1>:                           Top.                (line  363)
+* -option <2>:                           Top.                (line  721)
+* .:                                     Top.                (line 1196)
+* ?:                                     Top.                (line 1196)
+* a:                                     Top.                (line 1196)
+* index entry between item and itemx:    Top.                (line  309)
+* index entry between item and itemx <1>: Top.               (line  656)
+* index entry between item and itemx <2>: Top.               (line 1143)
+* index entry within deffn:              Top.                (line  155)
+* index entry within deffn <1>:          Top.                (line  502)
+* index entry within deffn <2>:          Top.                (line  989)
+* index entry within itemize:            Top.                (line  117)
+* index entry within itemize <1>:        Top.                (line  464)
+* index entry within itemize <2>:        Top.                (line  951)
+* index entry within multitable:         Top.                (line  125)
+* index entry within multitable <1>:     Top.                (line  472)
+* index entry within multitable <2>:     Top.                (line  960)
+* t-ruc:                                 Top.                (line 1196)
+* T-ruc:                                 Top.                (line 1196)
+
    fn
 
+* Menu:
+
+* --foption:                             Top.                (line   16)
+* --foption <1>:                         Top.                (line  363)
+* --foption <2>:                         Top.                (line  721)
+* .:                                     Top.                (line 1196)
+* ?:                                     Top.                (line 1196)
+* ``:                                    Top.                (line   16)
+* `` <1>:                                Top.                (line  363)
+* `` <2>:                                Top.                (line  721)
+* a:                                     Top.                (line  172)
+* a <1>:                                 Top.                (line  308)
+* a <2>:                                 Top.                (line  519)
+* a <3>:                                 Top.                (line  655)
+* a <4>:                                 Top.                (line 1006)
+* a <5>:                                 Top.                (line 1142)
+* a <6>:                                 Top.                (line 1196)
+* b:                                     Top.                (line  309)
+* b <1>:                                 Top.                (line  656)
+* b <2>:                                 Top.                (line 1143)
+* bidule machin:                         Top.                (line  166)
+* bidule machin <1>:                     Top.                (line  513)
+* bidule machin <2>:                     Top.                (line 1000)
+* d--effn_name:                          Top.                (line  147)
+* d--effn_name <1>:                      Top.                (line  494)
+* d--effn_name <2>:                      Top.                (line  981)
+* d--efmac_name:                         Top.                (line  208)
+* d--efmac_name <1>:                     Top.                (line  555)
+* d--efmac_name <2>:                     Top.                (line 1042)
+* d--efmethod_name on c--lass:           Top.                (line  232)
+* d--efmethod_name on c--lass <1>:       Top.                (line  579)
+* d--efmethod_name on c--lass <2>:       Top.                (line 1066)
+* d--efop_name on c--lass:               Top.                (line  199)
+* d--efop_name on c--lass <1>:           Top.                (line  546)
+* d--efop_name on c--lass <2>:           Top.                (line 1033)
+* d--efspec_name:                        Top.                (line  211)
+* d--efspec_name <1>:                    Top.                (line  558)
+* d--efspec_name <2>:                    Top.                (line 1045)
+* d--eftypefn_name:                      Top.                (line  187)
+* d--eftypefn_name <1>:                  Top.                (line  534)
+* d--eftypefn_name <2>:                  Top.                (line 1021)
+* d--eftypefun_name:                     Top.                (line  220)
+* d--eftypefun_name <1>:                 Top.                (line  567)
+* d--eftypefun_name <2>:                 Top.                (line 1054)
+* d--eftypemethod_name on c--lass:       Top.                (line  235)
+* d--eftypemethod_name on c--lass <1>:   Top.                (line  582)
+* d--eftypemethod_name on c--lass <2>:   Top.                (line 1069)
+* d--eftypeop_name on c--lass:           Top.                (line  190)
+* d--eftypeop_name on c--lass <1>:       Top.                (line  537)
+* d--eftypeop_name on c--lass <2>:       Top.                (line 1024)
+* d--efun_name:                          Top.                (line  205)
+* d--efun_name <1>:                      Top.                (line  552)
+* d--efun_name <2>:                      Top.                (line 1039)
+* de--ffn_name:                          Top.                (line  150)
+* de--ffn_name <1>:                      Top.                (line  497)
+* de--ffn_name <2>:                      Top.                (line  984)
+* deffn:                                 Top.                (line  175)
+* deffn <1>:                             Top.                (line  177)
+* deffn <2>:                             Top.                (line  522)
+* deffn <3>:                             Top.                (line  524)
+* deffn <4>:                             Top.                (line 1009)
+* deffn <5>:                             Top.                (line 1011)
+* deffnx:                                Top.                (line  173)
+* deffnx <1>:                            Top.                (line  178)
+* deffnx <2>:                            Top.                (line  520)
+* deffnx <3>:                            Top.                (line  525)
+* deffnx <4>:                            Top.                (line 1007)
+* deffnx <5>:                            Top.                (line 1012)
+* followed:                              Top.                (line  169)
+* followed <1>:                          Top.                (line  516)
+* followed <2>:                          Top.                (line 1003)
+* I:                                     Top.                (line  154)
+* I <1>:                                 Top.                (line  180)
+* I <2>:                                 Top.                (line  501)
+* I <3>:                                 Top.                (line  527)
+* I <4>:                                 Top.                (line  988)
+* I <5>:                                 Top.                (line 1014)
+* id 'i' ule:                            Top.                (line  160)
+* id 'i' ule <1>:                        Top.                (line  507)
+* id 'i' ule <2>:                        Top.                (line  994)
+* id ule:                                Top.                (line  159)
+* id ule <1>:                            Top.                (line  506)
+* id ule <2>:                            Top.                (line  993)
+* log trap:                              Top.                (line  156)
+* log trap <1>:                          Top.                (line  503)
+* log trap <2>:                          Top.                (line  990)
+* log trap1:                             Top.                (line  157)
+* log trap1 <1>:                         Top.                (line  504)
+* log trap1 <2>:                         Top.                (line  991)
+* log trap2:                             Top.                (line  158)
+* log trap2 <1>:                         Top.                (line  505)
+* log trap2 <2>:                         Top.                (line  992)
+* machin:                                Top.                (line  165)
+* machin <1>:                            Top.                (line  167)
+* machin <2>:                            Top.                (line  512)
+* machin <3>:                            Top.                (line  514)
+* machin <4>:                            Top.                (line  999)
+* machin <5>:                            Top.                (line 1001)
+* t--ruc:                                Top.                (line 1196)
+* T--ruc:                                Top.                (line 1196)
+* truc:                                  Top.                (line  155)
+* truc <1>:                              Top.                (line  181)
+* truc <2>:                              Top.                (line  502)
+* truc <3>:                              Top.                (line  528)
+* truc <4>:                              Top.                (line  989)
+* truc <5>:                              Top.                (line 1015)
+
    vr
 
+* Menu:
+
+* a:                                     Top.                (line  304)
+* a <1>:                                 Top.                (line  651)
+* a <2>:                                 Top.                (line 1138)
+* b:                                     Top.                (line  305)
+* b <1>:                                 Top.                (line  652)
+* b <2>:                                 Top.                (line 1139)
+* d--efcv_name:                          Top.                (line  196)
+* d--efcv_name <1>:                      Top.                (line  543)
+* d--efcv_name <2>:                      Top.                (line 1030)
+* d--efivar_name of c--lass:             Top.                (line  226)
+* d--efivar_name of c--lass <1>:         Top.                (line  573)
+* d--efivar_name of c--lass <2>:         Top.                (line 1060)
+* d--efopt_name:                         Top.                (line  217)
+* d--efopt_name <1>:                     Top.                (line  564)
+* d--efopt_name <2>:                     Top.                (line 1051)
+* d--eftypeivar_name of c--lass:         Top.                (line  229)
+* d--eftypeivar_name of c--lass <1>:     Top.                (line  576)
+* d--eftypeivar_name of c--lass <2>:     Top.                (line 1063)
+* d--eftypevar_name:                     Top.                (line  223)
+* d--eftypevar_name <1>:                 Top.                (line  570)
+* d--eftypevar_name <2>:                 Top.                (line 1057)
+* d--eftypevr_name:                      Top.                (line  193)
+* d--eftypevr_name <1>:                  Top.                (line  540)
+* d--eftypevr_name <2>:                  Top.                (line 1027)
+* d--efvar_name:                         Top.                (line  214)
+* d--efvar_name <1>:                     Top.                (line  561)
+* d--efvar_name <2>:                     Top.                (line 1048)
+* d--efvr_name:                          Top.                (line  184)
+* d--efvr_name <1>:                      Top.                (line  531)
+* d--efvr_name <2>:                      Top.                (line 1018)
+
    ky
 
    pg
 
    tp
 
+* Menu:
+
+* d--eftp_name:                          Top.                (line  202)
+* d--eftp_name <1>:                      Top.                (line  549)
+* d--eftp_name <2>:                      Top.                (line 1036)
+
    ---------- Footnotes ----------
 
    (1) in footnote
@@ -1244,6 +1416,139 @@
 chapter 2
 *********
 
+* Menu:
+
+* ":                                     Top.                (line   16)
+* " <1>:                                 Top.                (line  363)
+* " <2>:                                 Top.                (line  721)
+* -option:                               Top.                (line   16)
+* -option <1>:                           Top.                (line  363)
+* -option <2>:                           Top.                (line  721)
+* .:                                     Top.                (line 1196)
+* ?:                                     Top.                (line 1196)
+* a:                                     Top.                (line 1196)
+* index entry between item and itemx:    Top.                (line  309)
+* index entry between item and itemx <1>: Top.               (line  656)
+* index entry between item and itemx <2>: Top.               (line 1143)
+* index entry within deffn:              Top.                (line  155)
+* index entry within deffn <1>:          Top.                (line  502)
+* index entry within deffn <2>:          Top.                (line  989)
+* index entry within itemize:            Top.                (line  117)
+* index entry within itemize <1>:        Top.                (line  464)
+* index entry within itemize <2>:        Top.                (line  951)
+* index entry within multitable:         Top.                (line  125)
+* index entry within multitable <1>:     Top.                (line  472)
+* index entry within multitable <2>:     Top.                (line  960)
+* t-ruc:                                 Top.                (line 1196)
+* T-ruc:                                 Top.                (line 1196)
+
+* Menu:
+
+* --foption:                             Top.                (line   16)
+* --foption <1>:                         Top.                (line  363)
+* --foption <2>:                         Top.                (line  721)
+* .:                                     Top.                (line 1196)
+* ?:                                     Top.                (line 1196)
+* ``:                                    Top.                (line   16)
+* `` <1>:                                Top.                (line  363)
+* `` <2>:                                Top.                (line  721)
+* a:                                     Top.                (line  172)
+* a <1>:                                 Top.                (line  308)
+* a <2>:                                 Top.                (line  519)
+* a <3>:                                 Top.                (line  655)
+* a <4>:                                 Top.                (line 1006)
+* a <5>:                                 Top.                (line 1142)
+* a <6>:                                 Top.                (line 1196)
+* b:                                     Top.                (line  309)
+* b <1>:                                 Top.                (line  656)
+* b <2>:                                 Top.                (line 1143)
+* bidule machin:                         Top.                (line  166)
+* bidule machin <1>:                     Top.                (line  513)
+* bidule machin <2>:                     Top.                (line 1000)
+* d--effn_name:                          Top.                (line  147)
+* d--effn_name <1>:                      Top.                (line  494)
+* d--effn_name <2>:                      Top.                (line  981)
+* d--efmac_name:                         Top.                (line  208)
+* d--efmac_name <1>:                     Top.                (line  555)
+* d--efmac_name <2>:                     Top.                (line 1042)
+* d--efmethod_name on c--lass:           Top.                (line  232)
+* d--efmethod_name on c--lass <1>:       Top.                (line  579)
+* d--efmethod_name on c--lass <2>:       Top.                (line 1066)
+* d--efop_name on c--lass:               Top.                (line  199)
+* d--efop_name on c--lass <1>:           Top.                (line  546)
+* d--efop_name on c--lass <2>:           Top.                (line 1033)
+* d--efspec_name:                        Top.                (line  211)
+* d--efspec_name <1>:                    Top.                (line  558)
+* d--efspec_name <2>:                    Top.                (line 1045)
+* d--eftypefn_name:                      Top.                (line  187)
+* d--eftypefn_name <1>:                  Top.                (line  534)
+* d--eftypefn_name <2>:                  Top.                (line 1021)
+* d--eftypefun_name:                     Top.                (line  220)
+* d--eftypefun_name <1>:                 Top.                (line  567)
+* d--eftypefun_name <2>:                 Top.                (line 1054)
+* d--eftypemethod_name on c--lass:       Top.                (line  235)
+* d--eftypemethod_name on c--lass <1>:   Top.                (line  582)
+* d--eftypemethod_name on c--lass <2>:   Top.                (line 1069)
+* d--eftypeop_name on c--lass:           Top.                (line  190)
+* d--eftypeop_name on c--lass <1>:       Top.                (line  537)
+* d--eftypeop_name on c--lass <2>:       Top.                (line 1024)
+* d--efun_name:                          Top.                (line  205)
+* d--efun_name <1>:                      Top.                (line  552)
+* d--efun_name <2>:                      Top.                (line 1039)
+* de--ffn_name:                          Top.                (line  150)
+* de--ffn_name <1>:                      Top.                (line  497)
+* de--ffn_name <2>:                      Top.                (line  984)
+* deffn:                                 Top.                (line  175)
+* deffn <1>:                             Top.                (line  177)
+* deffn <2>:                             Top.                (line  522)
+* deffn <3>:                             Top.                (line  524)
+* deffn <4>:                             Top.                (line 1009)
+* deffn <5>:                             Top.                (line 1011)
+* deffnx:                                Top.                (line  173)
+* deffnx <1>:                            Top.                (line  178)
+* deffnx <2>:                            Top.                (line  520)
+* deffnx <3>:                            Top.                (line  525)
+* deffnx <4>:                            Top.                (line 1007)
+* deffnx <5>:                            Top.                (line 1012)
+* followed:                              Top.                (line  169)
+* followed <1>:                          Top.                (line  516)
+* followed <2>:                          Top.                (line 1003)
+* I:                                     Top.                (line  154)
+* I <1>:                                 Top.                (line  180)
+* I <2>:                                 Top.                (line  501)
+* I <3>:                                 Top.                (line  527)
+* I <4>:                                 Top.                (line  988)
+* I <5>:                                 Top.                (line 1014)
+* id 'i' ule:                            Top.                (line  160)
+* id 'i' ule <1>:                        Top.                (line  507)
+* id 'i' ule <2>:                        Top.                (line  994)
+* id ule:                                Top.                (line  159)
+* id ule <1>:                            Top.                (line  506)
+* id ule <2>:                            Top.                (line  993)
+* log trap:                              Top.                (line  156)
+* log trap <1>:                          Top.                (line  503)
+* log trap <2>:                          Top.                (line  990)
+* log trap1:                             Top.                (line  157)
+* log trap1 <1>:                         Top.                (line  504)
+* log trap1 <2>:                         Top.                (line  991)
+* log trap2:                             Top.                (line  158)
+* log trap2 <1>:                         Top.                (line  505)
+* log trap2 <2>:                         Top.                (line  992)
+* machin:                                Top.                (line  165)
+* machin <1>:                            Top.                (line  167)
+* machin <2>:                            Top.                (line  512)
+* machin <3>:                            Top.                (line  514)
+* machin <4>:                            Top.                (line  999)
+* machin <5>:                            Top.                (line 1001)
+* t--ruc:                                Top.                (line 1196)
+* T--ruc:                                Top.                (line 1196)
+* truc:                                  Top.                (line  155)
+* truc <1>:                              Top.                (line  181)
+* truc <2>:                              Top.                (line  502)
+* truc <3>:                              Top.                (line  528)
+* truc <4>:                              Top.                (line  989)
+* truc <5>:                              Top.                (line 1015)
+
 Top section
 1 chapter
   1.1 A section

Index: 
t/results/indices/encoding_index_ascii/res_plaintext/encoding_index_ascii.txt
===================================================================
RCS file: 
t/results/indices/encoding_index_ascii/res_plaintext/encoding_index_ascii.txt
diff -N 
t/results/indices/encoding_index_ascii/res_plaintext/encoding_index_ascii.txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ 
t/results/indices/encoding_index_ascii/res_plaintext/encoding_index_ascii.txt   
    27 May 2012 10:45:15 -0000      1.1
@@ -0,0 +1,61 @@
+top
+***
+
+* Menu:
+
+* !:                                     Top.                   (line 3)
+* ":                                     Top.                   (line 3)
+* " <1>:                                 Top.                   (line 3)
+* " <2>:                                 Top.                   (line 3)
+* ':                                     Top.                   (line 3)
+* ,:                                     Top.                   (line 3)
+* -:                                     Top.                   (line 3)
+* --:                                    Top.                   (line 3)
+* 0:                                     Top.                   (line 3)
+* 9:                                     Top.                   (line 3)
+* >=:                                    Top.                   (line 3)
+* @:                                     Top.                   (line 3)
+* ' <1>:                                 Top.                   (line 3)
+* ``:                                    Top.                   (line 3)
+* a:                                     Top.                   (line 3)
+* A:                                     Top.                   (line 3)
+* AE:                                    Top.                   (line 3)
+* b:                                     Top.                   (line 3)
+* B:                                     Top.                   (line 3)
+* c:                                     Top.                   (line 3)
+* d:                                     Top.                   (line 3)
+* D:                                     Top.                   (line 3)
+* e:                                     Top.                   (line 3)
+* e' e':                                 Top.                   (line 3)
+* Euro:                                  Top.                   (line 3)
+* f:                                     Top.                   (line 3)
+* g:                                     Top.                   (line 3)
+* h:                                     Top.                   (line 3)
+* i:                                     Top.                   (line 3)
+* i i (dotless):                         Top.                   (line 3)
+* i" i"i"i":                             Top.                   (line 3)
+* i^ i^ (dotless):                       Top.                   (line 3)
+* i^ i^i^i^i^:                           Top.                   (line 3)
+* j:                                     Top.                   (line 3)
+* k:                                     Top.                   (line 3)
+* l:                                     Top.                   (line 3)
+* /l:                                    Top.                   (line 3)
+* /L:                                    Top.                   (line 3)
+* m:                                     Top.                   (line 3)
+* n:                                     Top.                   (line 3)
+* o:                                     Top.                   (line 3)
+* o <1>:                                 Top.                   (line 3)
+* p:                                     Top.                   (line 3)
+* q:                                     Top.                   (line 3)
+* r:                                     Top.                   (line 3)
+* s:                                     Top.                   (line 3)
+* ss:                                    Top.                   (line 3)
+* t:                                     Top.                   (line 3)
+* TH:                                    Top.                   (line 3)
+* u:                                     Top.                   (line 3)
+* v:                                     Top.                   (line 3)
+* w:                                     Top.                   (line 3)
+* x:                                     Top.                   (line 3)
+* y:                                     Top.                   (line 3)
+* z:                                     Top.                   (line 3)
+

Index: 
t/results/indices/encoding_index_ascii_enable_encoding/res_plaintext/encoding_index_ascii_enable_encoding.txt
===================================================================
RCS file: 
t/results/indices/encoding_index_ascii_enable_encoding/res_plaintext/encoding_index_ascii_enable_encoding.txt
diff -N 
t/results/indices/encoding_index_ascii_enable_encoding/res_plaintext/encoding_index_ascii_enable_encoding.txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ 
t/results/indices/encoding_index_ascii_enable_encoding/res_plaintext/encoding_index_ascii_enable_encoding.txt
       27 May 2012 10:45:15 -0000      1.1
@@ -0,0 +1,61 @@
+top
+***
+
+* Menu:
+
+* !:                                     Top.                   (line 3)
+* ":                                     Top.                   (line 3)
+* " <1>:                                 Top.                   (line 3)
+* " <2>:                                 Top.                   (line 3)
+* ':                                     Top.                   (line 3)
+* ,:                                     Top.                   (line 3)
+* -:                                     Top.                   (line 3)
+* --:                                    Top.                   (line 3)
+* 0:                                     Top.                   (line 3)
+* 9:                                     Top.                   (line 3)
+* >=:                                    Top.                   (line 3)
+* @:                                     Top.                   (line 3)
+* ' <1>:                                 Top.                   (line 3)
+* ``:                                    Top.                   (line 3)
+* a:                                     Top.                   (line 3)
+* A:                                     Top.                   (line 3)
+* AE:                                    Top.                   (line 3)
+* b:                                     Top.                   (line 3)
+* B:                                     Top.                   (line 3)
+* c:                                     Top.                   (line 3)
+* d:                                     Top.                   (line 3)
+* D:                                     Top.                   (line 3)
+* e:                                     Top.                   (line 3)
+* e' e':                                 Top.                   (line 3)
+* Euro:                                  Top.                   (line 3)
+* f:                                     Top.                   (line 3)
+* g:                                     Top.                   (line 3)
+* h:                                     Top.                   (line 3)
+* i:                                     Top.                   (line 3)
+* i i (dotless):                         Top.                   (line 3)
+* i" i"i"i":                             Top.                   (line 3)
+* i^ i^ (dotless):                       Top.                   (line 3)
+* i^ i^i^i^i^:                           Top.                   (line 3)
+* j:                                     Top.                   (line 3)
+* k:                                     Top.                   (line 3)
+* l:                                     Top.                   (line 3)
+* /l:                                    Top.                   (line 3)
+* /L:                                    Top.                   (line 3)
+* m:                                     Top.                   (line 3)
+* n:                                     Top.                   (line 3)
+* o:                                     Top.                   (line 3)
+* o <1>:                                 Top.                   (line 3)
+* p:                                     Top.                   (line 3)
+* q:                                     Top.                   (line 3)
+* r:                                     Top.                   (line 3)
+* s:                                     Top.                   (line 3)
+* ss:                                    Top.                   (line 3)
+* t:                                     Top.                   (line 3)
+* TH:                                    Top.                   (line 3)
+* u:                                     Top.                   (line 3)
+* v:                                     Top.                   (line 3)
+* w:                                     Top.                   (line 3)
+* x:                                     Top.                   (line 3)
+* y:                                     Top.                   (line 3)
+* z:                                     Top.                   (line 3)
+

Index: 
t/results/indices/encoding_index_latin1/res_plaintext/encoding_index_latin1.txt
===================================================================
RCS file: 
t/results/indices/encoding_index_latin1/res_plaintext/encoding_index_latin1.txt
diff -N 
t/results/indices/encoding_index_latin1/res_plaintext/encoding_index_latin1.txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ 
t/results/indices/encoding_index_latin1/res_plaintext/encoding_index_latin1.txt 
    27 May 2012 10:45:16 -0000      1.1
@@ -0,0 +1,61 @@
+top
+***
+
+* Menu:
+
+* !:                                     Top.                   (line 3)
+* ":                                     Top.                   (line 3)
+* " <1>:                                 Top.                   (line 3)
+* " <2>:                                 Top.                   (line 3)
+* ':                                     Top.                   (line 3)
+* ,:                                     Top.                   (line 3)
+* -:                                     Top.                   (line 3)
+* --:                                    Top.                   (line 3)
+* 0:                                     Top.                   (line 3)
+* 9:                                     Top.                   (line 3)
+* >=:                                    Top.                   (line 3)
+* @:                                     Top.                   (line 3)
+* ' <1>:                                 Top.                   (line 3)
+* ``:                                    Top.                   (line 3)
+* é é:                                   Top.                   (line 3)
+* a:                                     Top.                   (line 3)
+* A:                                     Top.                   (line 3)
+* AE:                                    Top.                   (line 3)
+* b:                                     Top.                   (line 3)
+* B:                                     Top.                   (line 3)
+* c:                                     Top.                   (line 3)
+* d:                                     Top.                   (line 3)
+* D:                                     Top.                   (line 3)
+* e:                                     Top.                   (line 3)
+* Euro:                                  Top.                   (line 3)
+* f:                                     Top.                   (line 3)
+* g:                                     Top.                   (line 3)
+* h:                                     Top.                   (line 3)
+* i:                                     Top.                   (line 3)
+* i i (dotless):                         Top.                   (line 3)
+* i" i"i"i":                             Top.                   (line 3)
+* i^ i^ (dotless):                       Top.                   (line 3)
+* i^ i^i^i^i^:                           Top.                   (line 3)
+* j:                                     Top.                   (line 3)
+* k:                                     Top.                   (line 3)
+* l:                                     Top.                   (line 3)
+* /l:                                    Top.                   (line 3)
+* /L:                                    Top.                   (line 3)
+* m:                                     Top.                   (line 3)
+* n:                                     Top.                   (line 3)
+* o:                                     Top.                   (line 3)
+* o <1>:                                 Top.                   (line 3)
+* p:                                     Top.                   (line 3)
+* q:                                     Top.                   (line 3)
+* r:                                     Top.                   (line 3)
+* s:                                     Top.                   (line 3)
+* ss:                                    Top.                   (line 3)
+* t:                                     Top.                   (line 3)
+* TH:                                    Top.                   (line 3)
+* u:                                     Top.                   (line 3)
+* v:                                     Top.                   (line 3)
+* w:                                     Top.                   (line 3)
+* x:                                     Top.                   (line 3)
+* y:                                     Top.                   (line 3)
+* z:                                     Top.                   (line 3)
+

Index: 
t/results/indices/encoding_index_latin1_enable_encoding/res_plaintext/encoding_index_latin1_enable_encoding.txt
===================================================================
RCS file: 
t/results/indices/encoding_index_latin1_enable_encoding/res_plaintext/encoding_index_latin1_enable_encoding.txt
diff -N 
t/results/indices/encoding_index_latin1_enable_encoding/res_plaintext/encoding_index_latin1_enable_encoding.txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ 
t/results/indices/encoding_index_latin1_enable_encoding/res_plaintext/encoding_index_latin1_enable_encoding.txt
     27 May 2012 10:45:16 -0000      1.1
@@ -0,0 +1,61 @@
+top
+***
+
+* Menu:
+
+* ":                                     Top.                   (line 3)
+* " <1>:                                 Top.                   (line 3)
+* " <2>:                                 Top.                   (line 3)
+* ':                                     Top.                   (line 3)
+* ,:                                     Top.                   (line 3)
+* -:                                     Top.                   (line 3)
+* --:                                    Top.                   (line 3)
+* 0:                                     Top.                   (line 3)
+* 9:                                     Top.                   (line 3)
+* >=:                                    Top.                   (line 3)
+* @:                                     Top.                   (line 3)
+* ' <1>:                                 Top.                   (line 3)
+* ``:                                    Top.                   (line 3)
+* ¡:                                     Top.                   (line 3)
+* °:                                     Top.                   (line 3)
+* é é:                                   Top.                   (line 3)
+* a:                                     Top.                   (line 3)
+* A:                                     Top.                   (line 3)
+* b:                                     Top.                   (line 3)
+* B:                                     Top.                   (line 3)
+* c:                                     Top.                   (line 3)
+* d:                                     Top.                   (line 3)
+* e:                                     Top.                   (line 3)
+* Euro:                                  Top.                   (line 3)
+* f:                                     Top.                   (line 3)
+* g:                                     Top.                   (line 3)
+* h:                                     Top.                   (line 3)
+* i:                                     Top.                   (line 3)
+* i i (dotless):                         Top.                   (line 3)
+* j:                                     Top.                   (line 3)
+* k:                                     Top.                   (line 3)
+* l:                                     Top.                   (line 3)
+* /l:                                    Top.                   (line 3)
+* /L:                                    Top.                   (line 3)
+* m:                                     Top.                   (line 3)
+* n:                                     Top.                   (line 3)
+* o:                                     Top.                   (line 3)
+* p:                                     Top.                   (line 3)
+* q:                                     Top.                   (line 3)
+* r:                                     Top.                   (line 3)
+* s:                                     Top.                   (line 3)
+* ß:                                     Top.                   (line 3)
+* t:                                     Top.                   (line 3)
+* u:                                     Top.                   (line 3)
+* v:                                     Top.                   (line 3)
+* w:                                     Top.                   (line 3)
+* x:                                     Top.                   (line 3)
+* y:                                     Top.                   (line 3)
+* z:                                     Top.                   (line 3)
+* Æ:                                     Top.                   (line 3)
+* î î (dotless):                         Top.                   (line 3)
+* î îîîî:                                Top.                   (line 3)
+* ï ïïï:                                 Top.                   (line 3)
+* Ð:                                     Top.                   (line 3)
+* Þ:                                     Top.                   (line 3)
+

Index: 
t/results/indices/encoding_index_utf8/res_plaintext/encoding_index_utf8.txt
===================================================================
RCS file: 
t/results/indices/encoding_index_utf8/res_plaintext/encoding_index_utf8.txt
diff -N 
t/results/indices/encoding_index_utf8/res_plaintext/encoding_index_utf8.txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/indices/encoding_index_utf8/res_plaintext/encoding_index_utf8.txt 
27 May 2012 10:45:16 -0000      1.1
@@ -0,0 +1,61 @@
+top
+***
+
+* Menu:
+
+* !:                                     Top.                   (line 3)
+* ":                                     Top.                   (line 3)
+* " <1>:                                 Top.                   (line 3)
+* " <2>:                                 Top.                   (line 3)
+* ':                                     Top.                   (line 3)
+* ,:                                     Top.                   (line 3)
+* -:                                     Top.                   (line 3)
+* --:                                    Top.                   (line 3)
+* 0:                                     Top.                   (line 3)
+* 9:                                     Top.                   (line 3)
+* >=:                                    Top.                   (line 3)
+* @:                                     Top.                   (line 3)
+* ' <1>:                                 Top.                   (line 3)
+* ``:                                    Top.                   (line 3)
+* é é:                                   Top.                   (line 3)
+* a:                                     Top.                   (line 3)
+* A:                                     Top.                   (line 3)
+* AE:                                    Top.                   (line 3)
+* b:                                     Top.                   (line 3)
+* B:                                     Top.                   (line 3)
+* c:                                     Top.                   (line 3)
+* d:                                     Top.                   (line 3)
+* D:                                     Top.                   (line 3)
+* e:                                     Top.                   (line 3)
+* Euro:                                  Top.                   (line 3)
+* f:                                     Top.                   (line 3)
+* g:                                     Top.                   (line 3)
+* h:                                     Top.                   (line 3)
+* i:                                     Top.                   (line 3)
+* i i (dotless):                         Top.                   (line 3)
+* i" i"i"i":                             Top.                   (line 3)
+* i^ i^ (dotless):                       Top.                   (line 3)
+* i^ i^i^i^i^:                           Top.                   (line 3)
+* j:                                     Top.                   (line 3)
+* k:                                     Top.                   (line 3)
+* l:                                     Top.                   (line 3)
+* /l:                                    Top.                   (line 3)
+* /L:                                    Top.                   (line 3)
+* m:                                     Top.                   (line 3)
+* n:                                     Top.                   (line 3)
+* o:                                     Top.                   (line 3)
+* o <1>:                                 Top.                   (line 3)
+* p:                                     Top.                   (line 3)
+* q:                                     Top.                   (line 3)
+* r:                                     Top.                   (line 3)
+* s:                                     Top.                   (line 3)
+* ss:                                    Top.                   (line 3)
+* t:                                     Top.                   (line 3)
+* TH:                                    Top.                   (line 3)
+* u:                                     Top.                   (line 3)
+* v:                                     Top.                   (line 3)
+* w:                                     Top.                   (line 3)
+* x:                                     Top.                   (line 3)
+* y:                                     Top.                   (line 3)
+* z:                                     Top.                   (line 3)
+

Index: 
t/results/indices/encoding_index_utf8_enable_encoding/res_plaintext/encoding_index_utf8_enable_encoding.txt
===================================================================
RCS file: 
t/results/indices/encoding_index_utf8_enable_encoding/res_plaintext/encoding_index_utf8_enable_encoding.txt
diff -N 
t/results/indices/encoding_index_utf8_enable_encoding/res_plaintext/encoding_index_utf8_enable_encoding.txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ 
t/results/indices/encoding_index_utf8_enable_encoding/res_plaintext/encoding_index_utf8_enable_encoding.txt
 27 May 2012 10:45:16 -0000      1.1
@@ -0,0 +1,61 @@
+top
+***
+
+* Menu:
+
+* “:                                     Top.                   (line 3)
+* ”:                                     Top.                   (line 3)
+* ":                                     Top.                   (line 3)
+* ’:                                     Top.                   (line 3)
+* ,:                                     Top.                   (line 3)
+* –:                                     Top.                   (line 3)
+* —:                                     Top.                   (line 3)
+* 0:                                     Top.                   (line 3)
+* 9:                                     Top.                   (line 3)
+* @:                                     Top.                   (line 3)
+* ‘:                                     Top.                   (line 3)
+* ¡:                                     Top.                   (line 3)
+* °:                                     Top.                   (line 3)
+* é é:                                   Top.                   (line 3)
+* “ <1>:                                 Top.                   (line 3)
+* €:                                     Top.                   (line 3)
+* ≥:                                     Top.                   (line 3)
+* a:                                     Top.                   (line 3)
+* A:                                     Top.                   (line 3)
+* b:                                     Top.                   (line 3)
+* B:                                     Top.                   (line 3)
+* c:                                     Top.                   (line 3)
+* d:                                     Top.                   (line 3)
+* e:                                     Top.                   (line 3)
+* f:                                     Top.                   (line 3)
+* g:                                     Top.                   (line 3)
+* h:                                     Top.                   (line 3)
+* i:                                     Top.                   (line 3)
+* ı ı (dotless):                         Top.                   (line 3)
+* j:                                     Top.                   (line 3)
+* k:                                     Top.                   (line 3)
+* l:                                     Top.                   (line 3)
+* m:                                     Top.                   (line 3)
+* n:                                     Top.                   (line 3)
+* o:                                     Top.                   (line 3)
+* p:                                     Top.                   (line 3)
+* q:                                     Top.                   (line 3)
+* r:                                     Top.                   (line 3)
+* s:                                     Top.                   (line 3)
+* ß:                                     Top.                   (line 3)
+* t:                                     Top.                   (line 3)
+* u:                                     Top.                   (line 3)
+* v:                                     Top.                   (line 3)
+* w:                                     Top.                   (line 3)
+* x:                                     Top.                   (line 3)
+* y:                                     Top.                   (line 3)
+* z:                                     Top.                   (line 3)
+* Æ:                                     Top.                   (line 3)
+* î î (dotless):                         Top.                   (line 3)
+* î îîîî:                                Top.                   (line 3)
+* ï ïïï:                                 Top.                   (line 3)
+* Ð:                                     Top.                   (line 3)
+* Þ:                                     Top.                   (line 3)
+* ł:                                     Top.                   (line 3)
+* Ł:                                     Top.                   (line 3)
+



reply via email to

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