[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Common.pm Texinfo/Parser.pm ...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Common.pm Texinfo/Parser.pm ... |
|
Date: |
Sat, 15 Dec 2012 17:12:59 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/12/15 17:12:59
Modified files:
tp/Texinfo : Common.pm Parser.pm Structuring.pm
tp/Texinfo/Convert: HTML.pm Plaintext.pm XML.pm
tp/t : automatic_nodes.t converters_tests.t
test_sort.t test_utils.pl
tp/t/results/conditionals: command_conditionals_user_defined.pl
tp/t/results/indices: complex_recursive_synindex.pl
def_syn_indices.pl
default_cp_index_and_one_letter_syncodeindex.pl
double_syncodeindex.pl
print_merged_index.pl
recursive_synindex.pl
syncode_index_print_both.pl
syncodeindex_to_plain.pl
unknown_then_known_index_entry.pl
wrong_synindex.pl
tp/t/results/info_tests: colon_in_index_entry.pl
tp/t/results/macro: macro_in_index_commands.pl
tp/t/results/misc_commands: index_entries.pl simple.pl
tp/t/results/value: value_in_index_commands.pl
Added files:
tp/t/results/converters_tests:
printindex_merged_indices_code_style.pl
Log message:
Change the structure holding indices information, with more informations
in the per index hash, in particular the index entries.
Keep the @def*index font information even if the index is
merged indirectly again.
Add information about the code formatting in XML for new indices and
default indices if different from the default.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.163&r2=1.164
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.403&r2=1.404
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Structuring.pm?cvsroot=texinfo&r1=1.139&r2=1.140
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.265&r2=1.266
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.228&r2=1.229
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/automatic_nodes.t?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/converters_tests.t?cvsroot=texinfo&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/test_sort.t?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/test_utils.pl?cvsroot=texinfo&r1=1.126&r2=1.127
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/conditionals/command_conditionals_user_defined.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/printindex_merged_indices_code_style.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/complex_recursive_synindex.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/def_syn_indices.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/double_syncodeindex.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/print_merged_index.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/recursive_synindex.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/syncode_index_print_both.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/syncodeindex_to_plain.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/unknown_then_known_index_entry.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/wrong_synindex.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/colon_in_index_entry.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_index_commands.pl?cvsroot=texinfo&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/index_entries.pl?cvsroot=texinfo&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/simple.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/value/value_in_index_commands.pl?cvsroot=texinfo&r1=1.36&r2=1.37
Patches:
Index: Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- Texinfo/Common.pm 10 Dec 2012 01:34:13 -0000 1.163
+++ Texinfo/Common.pm 15 Dec 2012 17:12:56 -0000 1.164
@@ -490,19 +490,33 @@
# key is index name, keys of the reference value are the prefixes.
# value associated with the prefix is 0 if the prefix is not a code-like
# prefix, 1 if it is a code-like prefix (set by defcodeindex/syncodeindex).
+#our %index_names = (
+# 'cp' => {'cp' => 0, 'c' => 0},
+# 'fn' => {'fn' => 1, 'f' => 1},
+# 'vr' => {'vr' => 1, 'v' => 1},
+# 'ky' => {'ky' => 1, 'k' => 1},
+# 'pg' => {'pg' => 1, 'p' => 1},
+# 'tp' => {'tp' => 1, 't' => 1}
+#);
+
our %index_names = (
- 'cp' => {'cp' => 0, 'c' => 0},
- 'fn' => {'fn' => 1, 'f' => 1},
- 'vr' => {'vr' => 1, 'v' => 1},
- 'ky' => {'ky' => 1, 'k' => 1},
- 'pg' => {'pg' => 1, 'p' => 1},
- 'tp' => {'tp' => 1, 't' => 1}
+ 'cp' => {'prefix' => ['c'], 'in_code' => 0},
+ 'fn' => {'prefix' => ['f'], 'in_code' => 1},
+ 'vr' => {'prefix' => ['v'], 'in_code' => 1},
+ 'ky' => {'prefix' => ['k'], 'in_code' => 1},
+ 'pg' => {'prefix' => ['p'], 'in_code' => 1},
+ 'tp' => {'prefix' => ['t'], 'in_code' => 1},
);
+foreach my $index(keys(%index_names)) {
+ $index_names{$index}->{'name'} = $index;
+ push @{$index_names{$index}->{'prefix'}}, $index;
+}
+
our %default_index_commands;
# all the commands are readded dynamically in the Parser.
foreach my $index_name (keys (%index_names)) {
- foreach my $index_prefix (keys (%{$index_names{$index_name}})) {
+ foreach my $index_prefix (@{$index_names{$index_name}->{'prefix'}}) {
next if ($index_prefix eq $index_name);
# only put the one letter versions in the hash.
$misc_commands{$index_prefix.'index'} = 'line';
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -b -r1.403 -r1.404
--- Texinfo/Parser.pm 20 Nov 2012 01:49:28 -0000 1.403
+++ Texinfo/Parser.pm 15 Dec 2012 17:12:56 -0000 1.404
@@ -136,8 +136,8 @@
#
# expanded_formats_hash each key comes from expanded_formats value is 1
# index_names a structure holding the link between index
-# names and prefixes
-# see the initial value as %index_names below.
+# names, prefixes, merged indices,
+# initial value is %index_names in Texinfo::Common.
# context_stack stack of the contexts, more recent on top.
# 'line' is added when on a line or
# block @-command line,
@@ -171,8 +171,6 @@
# nodes list of nodes.
# command_index_prefix associate a command name to an index prefix.
# prefix_to_index_name associate an index prefix to the index name.
-# index_entries key is an index name, value is an array reference
-# on index_entry.
# floats key is the normalized float type, value is an array
# reference holding all the floats.
# internal_references an array holding all the internal references.
@@ -278,16 +276,13 @@
$global_unique_commands{$global_unique_command} = 1;
}
-# key is index name, keys of the reference value are the prefixes.
-# value associated with the prefix is 0 if the prefix is not a code-like
-# prefix, 1 if it is a code-like prefix (set by defcodeindex/syncodeindex).
my %index_names = %Texinfo::Common::index_names;
# index names that cannot be set by the user.
my %forbidden_index_name = ();
foreach my $name(keys(%index_names)) {
- foreach my $prefix (keys %{$index_names{$name}}) {
+ foreach my $prefix (@{$index_names{$name}->{'prefix'}}) {
$forbidden_index_name{$prefix} = 1;
}
}
@@ -514,7 +509,7 @@
}
# simple deep copy of a structure
-sub _deep_copy ($)
+sub _deep_copy($)
{
my $struct = shift;
my $string = Data::Dumper->Dump([$struct], ['struct']);
@@ -524,11 +519,20 @@
# enter all the commands associated with an index name using the prefix
# list
-sub _register_index_commands ($$)
+sub _register_index_commands($$)
{
my $self = shift;
my $index_name = shift;
- foreach my $prefix (keys (%{$self->{'index_names'}->{$index_name}})) {
+ if (!$self->{'index_names'}->{$index_name}->{'prefix'}) {
+ $self->{'index_names'}->{$index_name}->{'prefix'} = [$index_name];
+ }
+ if (!exists($self->{'index_names'}->{$index_name}->{'name'})) {
+ $self->{'index_names'}->{$index_name}->{'name'} = $index_name;
+ }
+ if (!exists($self->{'index_names'}->{$index_name}->{'contained_indices'})) {
+
$self->{'index_names'}->{$index_name}->{'contained_indices'}->{$index_name} = 1;
+ }
+ foreach my $prefix (@{$self->{'index_names'}->{$index_name}->{'prefix'}}) {
$self->{'misc_commands'}->{$prefix.'index'} = 'line';
$self->{'no_paragraph_commands'}->{$prefix.'index'} = 1;
$self->{'valid_nestings'}->{$prefix.'index'} = \%in_simple_text_commands;
@@ -624,12 +628,22 @@
%{$parser->{'indices'}});
} else { # an array holds index names defined with @defindex
foreach my $name (@{$parser->{'indices'}}) {
- $parser->{'index_names'}->{$name} = {$name => 0};
+ $parser->{'index_names'}->{$name} = {'in_code' => 0};
}
}
foreach my $index (keys (%{$parser->{'index_names'}})) {
$parser->_register_index_commands($index);
}
+ if ($parser->{'merged_indices'}) {
+ foreach my $index_from (keys (%{$parser->{'merged_indices'}})) {
+ my $index_to = $parser->{'merged_indices'}->{$index_from};
+ if (defined($parser->{'index_names'}->{$index_from})
+ and defined($parser->{'index_names'}->{$index_to})) {
+ $parser->{'index_names'}->{$index_from}->{'merged_in'} = $index_to;
+
$parser->{'index_names'}->{$index_to}->{'contained_indices'}->{$index_from} = 1;
+ }
+ }
+ }
foreach my $explained_command(keys(%explained_commands)) {
if (!defined($parser->{'explained_commands'}->{$explained_command})) {
$parser->{'explained_commands'}->{$explained_command} = {};
@@ -895,26 +909,26 @@
}
# return indices informations
-sub indices_information ($)
+sub indices_information($)
{
my $self = shift;
- #return ($self->{'index_names'}, $self->{'merged_indices'});
- return ($self->{'index_names'}, $self->{'merged_indices'},
$self->{'index_entries'});
+ return ($self->{'index_names'}, $self->{'merged_indices'});
+ #return ($self->{'index_names'}, $self->{'merged_indices'},
$self->{'index_entries'});
}
-sub floats_information ($)
+sub floats_information($)
{
my $self = shift;
return $self->{'floats'};
}
-sub internal_references_information ($)
+sub internal_references_information($)
{
my $self = shift;
return $self->{'internal_references'};
}
-sub global_commands_information ($)
+sub global_commands_information($)
{
my $self = shift;
return $self->{'extra'};
@@ -925,13 +939,13 @@
# perl_encoding
# input_encoding_name
# input_file_name
-sub global_informations ($)
+sub global_informations($)
{
my $self = shift;
return $self->{'info'};
}
-sub labels_information ($)
+sub labels_information($)
{
my $self = shift;
return $self->{'labels'};
@@ -1090,7 +1104,7 @@
}
# start a paragraph if in a context where paragraphs are to be started.
-sub _begin_paragraph ($$;$)
+sub _begin_paragraph($$;$)
{
my $self = shift;
my $current = shift;
@@ -1233,7 +1247,7 @@
}
# close brace commands except for @caption, @footnote then the paragraph
-sub _end_paragraph ($$$)
+sub _end_paragraph($$$)
{
my $self = shift;
my $current = shift;
@@ -1248,7 +1262,7 @@
}
# close brace commands except for @caption, @footnote then the preformatted
-sub _end_preformatted ($$$)
+sub _end_preformatted($$$)
{
my $self = shift;
my $current = shift;
@@ -2430,8 +2444,9 @@
my $prefix = $self->{'command_index_prefix'}->{$command_container};
my $index_name = $self->{'prefix_to_index_name'}->{$prefix};
- my $number = (defined($self->{'index_entries'}->{$index_name})
- ? (scalar(@{$self->{'index_entries'}->{$index_name}}) + 1)
+ my $index = $self->{'index_names'}->{$index_name};
+ my $number = (defined($index->{'index_entries'})
+ ? (scalar(@{$index->{'index_entries'}}) + 1)
: 1);
my $index_entry = { 'index_name' => $index_name,
'index_at_command' => $command,
@@ -2451,7 +2466,7 @@
$index_name), $line_nr);
}
#print STDERR "INDEX ENTRY address@hidden>{'cmdname'}
$index_name($number)\n";
- push @{$self->{'index_entries'}->{$index_name}}, $index_entry;
+ push @{$index->{'index_entries'}}, $index_entry;
$current->{'extra'}->{'index_entry'} = $index_entry;
}
@@ -5231,7 +5246,7 @@
my $in_code = 0;
$in_code = 1 if ($command eq 'defcodeindex');
$args = [$name];
- $self->{'index_names'}->{$name} = {$name => $in_code};
+ $self->{'index_names'}->{$name} = {'in_code' => $in_code};
$self->_register_index_commands($name);
}
} else {
@@ -5256,12 +5271,23 @@
$current_to = $self->{'merged_indices'}->{$current_to};
}
if ($current_to ne $index_from) {
+ my $index_from_info = $self->{'index_names'}->{$index_from};
+ my $index_to_info = $self->{'index_names'}->{$current_to};
+
my $in_code = 0;
$in_code = 1 if ($command eq 'syncodeindex');
$self->{'merged_indices'}->{$index_from} = $current_to;
- foreach my $prefix (keys(%{$self->{'index_names'}->{$index_from}})) {
- $self->{'index_names'}->{$current_to}->{$prefix} = $in_code;
+ $index_from_info->{'in_code'} = $in_code;
+ foreach my $contained_index (keys
%{$index_from_info->{'contained_indices'}}) {
+ $index_to_info->{'contained_indices'}->{$contained_index} = 1;
+ $self->{'index_names'}->{$contained_index}->{'merged_in'} =
$current_to;
}
+ $index_from_info->{'merged_in'} = $current_to;
+ $index_to_info->{'contained_indices'}->{$index_from} = 1;
+
+ #foreach my $prefix (keys(%{$self->{'index_names'}->{$index_from}}))
{
+ # $self->{'index_names'}->{$current_to}->{$prefix} = $in_code;
+ #}
$args = [$index_from, $index_to];
} else {
$self->line_warn (sprintf($self->__("address@hidden leads to a
merging of %s in itself, ignoring"),
@@ -5411,7 +5437,7 @@
warn $error_message->{'error_line'};
}
- my ($index_names, $merged_indices_hash, $index_entries_arrays)
+ my ($index_names, $merged_indices_hash)
= $parser->indices_information();
my $float_types_arrays = $parser->floats_information();
my $internal_references_array
@@ -5703,33 +5729,43 @@
=item indices_information
- ($index_names, $merged_indices_hash, $index_entries_arrays)
+ ($index_names, $merged_indices_hash)
= indices_information($parser);
-The index names is a hash reference. The keys are the index names. They
-are associated to a hash reference. The keys of these hash references are
-the index prefixes associated to the index name, and the value is set if
-the index entries should be formatted as code.
+The index names is a hash reference. The keys are
-The following shows the references corresponding with the default indexes
-I<cp> and I<fn>, the I<fn> index having its entries formatted as code and
-the indices corresponding to the following texinfo
+=over
- @defindex some
- @defcodeindex code
+=item in_code
- $index_names = {'cp' => {'cp' => 0, 'c' => 0},
- 'fn' => {'fn' => 1, 'f' => 1},
- 'some' => {'some' => 0},
- 'code' => {'code' => 1}};
+1 if the index entries should be formatted as code, 0 in the opposite case.
-I<$merged_indices_hash> is a hash reference, the key is an index
-name merged in the value.
+=item name
+
+The index name.
+
+=item prefix
-Last, I<$index_entries_arrays> is an hash reference. The keys are
-index names, the values are index entry structures that are associated
-with the index entries, associated to @-commands like C<@cindex>,
-or C<@item> in C<@vtable>, or definition commands entries like C<@deffn>.
+An array reference of prefix associated to the index.
+
+=item merged_in
+
+In case the index is merged to another index, this key holds the name of
+the index the index is merged into. It takes into account indirectly
+merged indices.
+
+=item contained_indices
+
+An hash reference holding names of indices that are merged to the index,
+including itself. It also contains indirectly merged indices. This key
+is present even if the index is itself later merged to another index.
+
+=item index_entries
+
+An array reference containing index entry structures for index entries
+associated with the index. The index entry could be associated to
address@hidden like C<@cindex>, or C<@item> in C<@vtable>, or definition
+commands entries like C<@deffn>.
The keys of the index entry structures are
@@ -5783,6 +5819,28 @@
=back
+The following shows the references corresponding with the default indexes
+I<cp> and I<fn>, the I<fn> index having its entries formatted as code and
+the indices corresponding to the following texinfo
+
+ @defindex some
+ @defcodeindex code
+
+ $index_names = {'cp' => {'name' => 'cp', 'in_code' => 0,
+ 'prefix' => ['c', 'cp']},
+ 'fn' => {'name' => 'fn', 'in_code' => 1,
+ 'prefix' => ['f', 'fn']},
+ 'some' => {'in_code' => 0},
+ 'code' => {'in_code' => 1}};
+
+If C<name> is not set, it is set to the index name. If C<prefix> is
+not set, it is set to an array containing the index name.
+
+I<$merged_indices_hash> is a hash reference, the key is an index
+name merged in the value.
+
+=back
+
=head2 Texinfo Parser options
Setting those options is the same as seeing some Texinfo constructs in the
@@ -5873,7 +5931,7 @@
= item merged_indices
The associated hash reference holds merged indices information, each key
-is merged in the value. Same as setting C<@synindex> of C<syncodeindex>.
+is merged in the value. Same as setting C<@synindex> or C<syncodeindex>.
=item novalidate
@@ -6369,7 +6427,7 @@
=item index_entry
-The index entry information (described in L</indices_information>
+The index entry information (described in L</index_entries>
in details) is associated to @-commands that have an associated
index entry.
Index: Texinfo/Structuring.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Structuring.pm,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -b -r1.139 -r1.140
--- Texinfo/Structuring.pm 13 Dec 2012 01:06:08 -0000 1.139
+++ Texinfo/Structuring.pm 15 Dec 2012 17:12:56 -0000 1.140
@@ -1897,8 +1897,7 @@
}
foreach my $index_name (keys(%$index_entries)) {
foreach my $entry (@{$index_entries->{$index_name}}) {
- $entry->{'in_code'}
- = $index_names->{$index_name}->{$entry->{'index_prefix'}};
+ $entry->{'in_code'} =
$index_names->{$entry->{'index_name'}}->{'in_code'};
$options->{'code'} = $entry->{'in_code'};
$entry->{'key'} = Texinfo::Convert::Text::convert(
{'contents' => $entry->{'content'}},
@@ -1951,22 +1950,21 @@
return $indices_sorted_by_letters;
}
-sub merge_indices($$$)
+sub merge_indices($)
{
my $index_names = shift;
- my $merged_indices = shift;
- my $index_entries = shift;
my $merged_index_entries;
foreach my $index_name (keys(%$index_names)) {
+ my $index_info = $index_names->{$index_name};
#print STDERR "MERGE_INDICES: $index_name\n";
- next if ($merged_indices->{$index_name});
- foreach my $index_prefix (keys (%{$index_names->{$index_name}})) {
+ next if ($index_info->{'merged_in'});
+ foreach my $contained_index (keys (%{$index_info->{'contained_indices'}}))
{
#print STDERR "MERGE_INDICES: $index_name, prefix $index_prefix\n";
- if ($index_entries->{$index_prefix}) {
+ if ($index_names->{$contained_index}->{'index_entries'}) {
#print STDERR "MERGE_INDICES: final $index_name <- $index_prefix\n";
push @{$merged_index_entries->{$index_name}},
- @{$index_entries->{$index_prefix}};
+ @{$index_names->{$contained_index}->{'index_entries'}};
}
}
}
@@ -2089,10 +2087,10 @@
elements_directions($parser, $elements);
elements_file_directions($parser, $elements);
- my ($index_names, $merged_indices, $index_entries)
+ my ($index_names, $merged_indices)
= $parser->indices_information();
my $merged_index_entries
- = merge_indices($index_names, $merged_indices, $index_entries);
+ = merge_indices($index_names);
my $index_entries_sorted;
if ($sort_by_letter) {
$index_entries_sorted = sort_indices_by_letter($parser,
@@ -2374,15 +2372,16 @@
The API for association of pages/elements to files is not defined yet.
-=item $merged_entries = merge_indices($index_names, $merged_indices,
$index_entries)
+=item $merged_entries = merge_indices($index_names)
Using informations returned by L<Texinfo::Parser/indices_information>,
-a structure similar with the one returned by
-L<Texinfo::Parser/indices_information>, but with all the entries of
-merged indices merged with those of the indice merged into.
+a structure holding all the index entries by index name is returned,
+with all the entries of merged indices merged with those of the indice
+merged into.
+
The I<$merged_entries> returned is a hash reference whose
keys are the index names and values arrays of index entry structures
-described in details in L<Texinfo::Parser/indices_information>.
+described in details in L<Texinfo::Parser/index_entries>.
=item $index_entries_sorted = sort_indices_by_letter($parser,
$merged_index_entries, $index_names)
Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -b -r1.265 -r1.266
--- Texinfo/Convert/HTML.pm 11 Nov 2012 16:25:01 -0000 1.265
+++ Texinfo/Convert/HTML.pm 15 Dec 2012 17:12:56 -0000 1.266
@@ -5676,20 +5676,19 @@
$no_unidecode = 1 if (defined($self->get_conf('USE_UNIDECODE'))
and !$self->get_conf('USE_UNIDECODE'));
- my ($index_names, $merged_indices, $index_entries)
+ my ($index_names, $merged_indices)
= $self->{'parser'}->indices_information();
$self->{'index_names'} = $index_names;
#print STDERR "IIII ($index_names, $merged_indices, $index_entries)\n";
my $merged_index_entries
- = Texinfo::Structuring::merge_indices($index_names, $merged_indices,
- $index_entries);
+ = Texinfo::Structuring::merge_indices($index_names);
$self->{'index_entries_by_letter'}
=
$self->Texinfo::Structuring::sort_indices_by_letter($merged_index_entries,
$index_names);
$self->{'index_entries'} = $merged_index_entries;
- foreach my $index_name (sort(keys(%$index_entries))) {
- foreach my $index_entry (@{$index_entries->{$index_name}}) {
+ foreach my $index_name (sort(keys(%$index_names))) {
+ foreach my $index_entry
(@{$index_names->{$index_name}->{'index_entries'}}) {
my $region = '';
$region = "$index_entry->{'region'}->{'cmdname'}-"
if (defined($index_entry->{'region'}));
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -b -r1.228 -r1.229
--- Texinfo/Convert/Plaintext.pm 11 Nov 2012 16:25:01 -0000 1.228
+++ Texinfo/Convert/Plaintext.pm 15 Dec 2012 17:12:56 -0000 1.229
@@ -987,11 +987,10 @@
# this is not redone for each index, only once
if (!defined($self->{'index_entries'}) and $self->{'parser'}) {
- my ($index_names, $merged_indices, $index_entries)
+ my ($index_names, $merged_indices)
= $self->{'parser'}->indices_information();
my $merged_index_entries
- = Texinfo::Structuring::merge_indices($index_names, $merged_indices,
- $index_entries);
+ = Texinfo::Structuring::merge_indices($index_names);
$self->{'index_entries'}
= $self->Texinfo::Structuring::sort_indices($merged_index_entries,
$index_names);
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- Texinfo/Convert/XML.pm 10 Dec 2012 01:34:13 -0000 1.88
+++ Texinfo/Convert/XML.pm 15 Dec 2012 17:12:57 -0000 1.89
@@ -259,6 +259,11 @@
$self->{'context_block_commands'}->{$raw} = 1
if $self->{'expanded_formats_hash'}->{$raw};
}
+ if ($self->{'parser'}) {
+ my ($index_names, $merged_indices)
+ = $self->{'parser'}->indices_information();
+ $self->{'index_names'} = $index_names;
+ }
}
sub output($$)
@@ -321,7 +326,17 @@
my $root = shift;
if ($root->{'extra'} and $root->{'extra'}->{'index_entry'}) {
my $index_entry = $root->{'extra'}->{'index_entry'};
- my $result = "<indexterm index=\"$index_entry->{'index_name'}\">";
+ my $attribute = '';
+ # in case the index is not a default index, or the style of the
+ # entry (in code or not) is not the default for this index
+ if ($self->{'index_names'}) {
+ my $in_code =
$self->{'index_names'}->{$index_entry->{'index_name'}}->{'in_code'};
+ if (!$Texinfo::Common::index_names{$index_entry->{'index_name'}}
+ or $in_code !=
$Texinfo::Common::index_names{$index_entry->{'index_name'}}->{'in_code'}) {
+ $attribute .= " incode=\"$in_code\"";
+ }
+ }
+ my $result = "<indexterm
index=\"$index_entry->{'index_name'}\"${attribute}>";
push @{$self->{'document_context'}}, {'monospace' => [0]};
$self->{'document_context'}->[-1]->{'monospace'}->[-1] = 1
if ($index_entry->{'in_code'});
Index: t/automatic_nodes.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/automatic_nodes.t,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/automatic_nodes.t 24 Aug 2012 20:42:54 -0000 1.12
+++ t/automatic_nodes.t 15 Dec 2012 17:12:57 -0000 1.13
@@ -156,7 +156,7 @@
($new_content, $added_nodes)
= Texinfo::Structuring::insert_nodes_for_sectioning_commands($parser,
$tree);
$tree->{'contents'} = $new_content;
-my ($index_names, $merged_indices, $index_entries) =
$parser->indices_information();
+my ($index_names, $merged_indices) = $parser->indices_information();
my $labels = $parser->labels_information();
ok (($labels->{'chap'}->{'menus'} and @{$labels->{'chap'}->{'menus'}}
and scalar(@{$labels->{'chap'}->{'menus'}}) == 1
@@ -166,8 +166,8 @@
* (some_manual)::
@end menu
', 'reassociated menu is correct');
-#print STDERR join('|', keys(%$index_entries))."\n";
-is ($labels->{'chap'}, $index_entries->{'cp'}->[0]->{'node'},
+#print STDERR join('|', keys(%{$index_names->{'cp'}->{'index_entries'}}))."\n";
+is ($labels->{'chap'}, $index_names->{'cp'}->{'index_entries'}->[0]->{'node'},
'index entry reassociated');
#print STDERR Texinfo::Convert::Texinfo::convert($tree);
@@ -185,8 +185,8 @@
# In fact, here we also check that there is no debugging message...
($new_content, $added_nodes)
= Texinfo::Structuring::insert_nodes_for_sectioning_commands($parser,
$tree);
-($index_names, $merged_indices, $index_entries) =
$parser->indices_information();
+($index_names, $merged_indices) = $parser->indices_information();
$labels = $parser->labels_information();
-is ($labels->{'SEE-ALSO'}, $index_entries->{'cp'}->[0]->{'node'},
+is ($labels->{'SEE-ALSO'},
$index_names->{'cp'}->{'index_entries'}->[0]->{'node'},
'index entry reassociated duplicate node ignored');
Index: t/converters_tests.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/converters_tests.t,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- t/converters_tests.t 7 Dec 2012 20:05:50 -0000 1.40
+++ t/converters_tests.t 15 Dec 2012 17:12:57 -0000 1.41
@@ -785,6 +785,33 @@
@cindex last
@end example
'],
+['printindex_merged_indices_code_style',
+'@node Top
+
address@hidden cp fn
+
address@hidden vr fn
+
address@hidden c``b
+
address@hidden v``j
+
address@hidden f``g
+
address@hidden cdi
+
address@hidden cdi fn
+
address@hidden cdi``h
+
address@hidden ddi
+
address@hidden ddi cp
+
address@hidden ddi``g
+
address@hidden fn
+'],
);
my @html_text_cases = (
Index: t/test_sort.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/test_sort.t,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/test_sort.t 26 Aug 2012 14:15:06 -0000 1.12
+++ t/test_sort.t 15 Dec 2012 17:12:57 -0000 1.13
@@ -40,8 +40,9 @@
@cindex @l{}
');
-my ($index_names, $merged_indices, $index_entries) =
+my ($index_names, $merged_indices) =
$parser->indices_information();
+my $index_entries = Texinfo::Structuring::merge_indices($index_names);
my $sorted_index_entries
= Texinfo::Structuring::sort_indices($parser, $index_entries, $index_names);
Index: t/test_utils.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/test_utils.pl,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- t/test_utils.pl 10 Dec 2012 01:34:14 -0000 1.126
+++ t/test_utils.pl 15 Dec 2012 17:12:57 -0000 1.127
@@ -658,7 +658,7 @@
my ($initial_index_names, $initial_merged_indices)
= $parser->indices_information();
# do a copy to compare the values and not the references
- $initial_index_names = { %{$initial_index_names} };
+ $initial_index_names = dclone($initial_index_names);
$initial_merged_indices = { %{$initial_merged_indices} };
print STDERR " TEST $test_name\n" if ($self->{'DEBUG'});
my $result;
@@ -680,20 +680,23 @@
my $top_node = Texinfo::Structuring::nodes_tree($parser);
my ($errors, $error_nrs) = $parser->errors();
- my ($index_names, $merged_indices, $index_entries)
+ my ($index_names, $merged_indices)
= $parser->indices_information();
# FIXME maybe it would be good to compare $merged_index_entries?
my $merged_index_entries
- = Texinfo::Structuring::merge_indices($index_names, $merged_indices,
$index_entries);
+ = Texinfo::Structuring::merge_indices($index_names);
+ # only print indices information if it differs from the default
+ # indices
my $indices;
- $indices->{'index_names'} = $index_names
- unless (Data::Compare::Compare($index_names, $initial_index_names));
+ my $trimmed_index_names = remove_keys($index_names, ['index_entries']);
+ $indices->{'index_names'} = $trimmed_index_names
+ unless (Data::Compare::Compare($trimmed_index_names,
$initial_index_names));
$indices->{'merged_indices'} = $merged_indices
unless (Data::Compare::Compare($merged_indices, $initial_merged_indices));
my $sorted_index_entries;
- if ($index_entries) {
+ if ($merged_index_entries) {
$sorted_index_entries
= Texinfo::Structuring::sort_indices_by_letter($parser,
$merged_index_entries,
Index: t/results/conditionals/command_conditionals_user_defined.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/conditionals/command_conditionals_user_defined.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/conditionals/command_conditionals_user_defined.pl 15 Sep 2012
18:26:16 -0000 1.1
+++ t/results/conditionals/command_conditionals_user_defined.pl 15 Dec 2012
17:12:57 -0000 1.2
@@ -385,31 +385,80 @@
$result_indices{'command_conditionals_user_defined'} = {
'index_names' => {
'auth' => {
- 'auth' => 0
+ 'contained_indices' => {
+ 'auth' => 1
+ },
+ 'in_code' => 0,
+ 'name' => 'auth',
+ 'prefix' => [
+ 'auth'
+ ]
},
'cp' => {
- 'c' => 0,
- 'cp' => 0
+ 'contained_indices' => {
+ 'cp' => 1
+ },
+ 'in_code' => 0,
+ 'name' => 'cp',
+ 'prefix' => [
+ 'c',
+ 'cp'
+ ]
},
'fn' => {
- 'f' => 1,
+ 'contained_indices' => {
'fn' => 1
},
+ 'in_code' => 1,
+ 'name' => 'fn',
+ 'prefix' => [
+ 'f',
+ 'fn'
+ ]
+ },
'ky' => {
- 'k' => 1,
+ 'contained_indices' => {
'ky' => 1
},
+ 'in_code' => 1,
+ 'name' => 'ky',
+ 'prefix' => [
+ 'k',
+ 'ky'
+ ]
+ },
'pg' => {
- 'p' => 1,
+ 'contained_indices' => {
'pg' => 1
},
+ 'in_code' => 1,
+ 'name' => 'pg',
+ 'prefix' => [
+ 'p',
+ 'pg'
+ ]
+ },
'tp' => {
- 't' => 1,
+ 'contained_indices' => {
'tp' => 1
},
+ 'in_code' => 1,
+ 'name' => 'tp',
+ 'prefix' => [
+ 't',
+ 'tp'
+ ]
+ },
'vr' => {
- 'v' => 1,
+ 'contained_indices' => {
'vr' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'vr',
+ 'prefix' => [
+ 'v',
+ 'vr'
+ ]
}
}
};
Index: t/results/indices/complex_recursive_synindex.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/indices/complex_recursive_synindex.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/indices/complex_recursive_synindex.pl 23 Aug 2012 18:14:45
-0000 1.2
+++ t/results/indices/complex_recursive_synindex.pl 15 Dec 2012 17:12:57
-0000 1.3
@@ -1526,47 +1526,128 @@
$result_indices{'complex_recursive_synindex'} = {
'index_names' => {
'aaa' => {
- 'aaa' => 0
+ 'contained_indices' => {
+ 'aaa' => 1
+ },
+ 'in_code' => 0,
+ 'merged_in' => 'bbb',
+ 'name' => 'aaa',
+ 'prefix' => [
+ 'aaa'
+ ]
},
'bbb' => {
- 'aaa' => 0,
- 'bbb' => 0,
- 'ccc' => 0,
- 'ddd' => 0,
- 'eee' => 0
+ 'contained_indices' => {
+ 'aaa' => 1,
+ 'bbb' => 1,
+ 'ccc' => 1,
+ 'ddd' => 1,
+ 'eee' => 1
+ },
+ 'in_code' => 0,
+ 'name' => 'bbb',
+ 'prefix' => [
+ 'bbb'
+ ]
},
'ccc' => {
- 'ccc' => 0
+ 'contained_indices' => {
+ 'ccc' => 1
+ },
+ 'in_code' => 0,
+ 'merged_in' => 'bbb',
+ 'name' => 'ccc',
+ 'prefix' => [
+ 'ccc'
+ ]
},
'cp' => {
- 'c' => 0,
- 'cp' => 0
+ 'contained_indices' => {
+ 'cp' => 1
+ },
+ 'in_code' => 0,
+ 'name' => 'cp',
+ 'prefix' => [
+ 'c',
+ 'cp'
+ ]
},
'ddd' => {
- 'ddd' => 0
+ 'contained_indices' => {
+ 'ddd' => 1
+ },
+ 'in_code' => 0,
+ 'merged_in' => 'bbb',
+ 'name' => 'ddd',
+ 'prefix' => [
+ 'ddd'
+ ]
},
'eee' => {
- 'eee' => 0
+ 'contained_indices' => {
+ 'eee' => 1
+ },
+ 'in_code' => 0,
+ 'merged_in' => 'bbb',
+ 'name' => 'eee',
+ 'prefix' => [
+ 'eee'
+ ]
},
'fn' => {
- 'f' => 1,
+ 'contained_indices' => {
'fn' => 1
},
+ 'in_code' => 1,
+ 'name' => 'fn',
+ 'prefix' => [
+ 'f',
+ 'fn'
+ ]
+ },
'ky' => {
- 'k' => 1,
+ 'contained_indices' => {
'ky' => 1
},
+ 'in_code' => 1,
+ 'name' => 'ky',
+ 'prefix' => [
+ 'k',
+ 'ky'
+ ]
+ },
'pg' => {
- 'p' => 1,
+ 'contained_indices' => {
'pg' => 1
},
+ 'in_code' => 1,
+ 'name' => 'pg',
+ 'prefix' => [
+ 'p',
+ 'pg'
+ ]
+ },
'tp' => {
- 't' => 1,
+ 'contained_indices' => {
'tp' => 1
},
+ 'in_code' => 1,
+ 'name' => 'tp',
+ 'prefix' => [
+ 't',
+ 'tp'
+ ]
+ },
'vr' => {
- 'v' => 1,
+ 'contained_indices' => {
'vr' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'vr',
+ 'prefix' => [
+ 'v',
+ 'vr'
+ ]
}
},
'merged_indices' => {
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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/indices/def_syn_indices.pl 23 Aug 2012 18:14:45 -0000
1.4
+++ t/results/indices/def_syn_indices.pl 15 Dec 2012 17:12:58 -0000
1.5
@@ -2009,48 +2009,121 @@
$result_indices{'def_syn_indices'} = {
'index_names' => {
'abc' => {
- 'abc' => 0
+ 'contained_indices' => {
+ 'abc' => 1
+ },
+ 'in_code' => 0,
+ 'merged_in' => 'pg',
+ 'name' => 'abc',
+ 'prefix' => [
+ 'abc'
+ ]
},
'codeidx' => {
+ 'contained_indices' => {
'codeidx' => 1
},
+ 'in_code' => 1,
+ 'name' => 'codeidx',
+ 'prefix' => [
+ 'codeidx'
+ ]
+ },
'cp' => {
- 'c' => 0,
- 'cp' => 0
+ 'contained_indices' => {
+ 'cp' => 1
+ },
+ 'in_code' => 1,
+ 'merged_in' => 'fn',
+ 'name' => 'cp',
+ 'prefix' => [
+ 'c',
+ 'cp'
+ ]
},
'defg' => {
- 'abc' => 0,
- 'defg' => 0
+ 'contained_indices' => {
+ 'abc' => 1,
+ 'defg' => 1
+ },
+ 'in_code' => 0,
+ 'merged_in' => 'pg',
+ 'name' => 'defg',
+ 'prefix' => [
+ 'defg'
+ ]
},
'fn' => {
- 'c' => 1,
+ 'contained_indices' => {
'cp' => 1,
- 'f' => 1,
'fn' => 1,
- 'truc' => 0
+ 'truc' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'fn',
+ 'prefix' => [
+ 'f',
+ 'fn'
+ ]
},
'ky' => {
- 'k' => 1,
+ 'contained_indices' => {
'ky' => 1
},
+ 'in_code' => 1,
+ 'merged_in' => 'pg',
+ 'name' => 'ky',
+ 'prefix' => [
+ 'k',
+ 'ky'
+ ]
+ },
'pg' => {
- 'abc' => 0,
- 'defg' => 0,
- 'k' => 1,
+ 'contained_indices' => {
+ 'abc' => 1,
+ 'defg' => 1,
'ky' => 1,
- 'p' => 1,
'pg' => 1
},
+ 'in_code' => 1,
+ 'name' => 'pg',
+ 'prefix' => [
+ 'p',
+ 'pg'
+ ]
+ },
'tp' => {
- 't' => 1,
+ 'contained_indices' => {
'tp' => 1
},
+ 'in_code' => 1,
+ 'name' => 'tp',
+ 'prefix' => [
+ 't',
+ 'tp'
+ ]
+ },
'truc' => {
- 'truc' => 0
+ 'contained_indices' => {
+ 'truc' => 1
+ },
+ 'in_code' => 0,
+ 'merged_in' => 'fn',
+ 'name' => 'truc',
+ 'prefix' => [
+ 'truc'
+ ]
},
'vr' => {
- 'v' => 1,
+ 'contained_indices' => {
'vr' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'vr',
+ 'prefix' => [
+ 'v',
+ 'vr'
+ ]
}
},
'merged_indices' => {
Index: t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl 13 Dec
2012 01:14:19 -0000 1.1
+++ t/results/indices/default_cp_index_and_one_letter_syncodeindex.pl 15 Dec
2012 17:12:58 -0000 1.2
@@ -376,6 +376,76 @@
$result_indices{'default_cp_index_and_one_letter_syncodeindex'} = {
+ 'index_names' => {
+ 'cp' => {
+ 'contained_indices' => {
+ 'cp' => 1
+ },
+ 'in_code' => 1,
+ 'merged_in' => 'fn',
+ 'name' => 'cp',
+ 'prefix' => [
+ 'c',
+ 'cp'
+ ]
+ },
+ 'fn' => {
+ 'contained_indices' => {
+ 'cp' => 1,
+ 'fn' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'fn',
+ 'prefix' => [
+ 'f',
+ 'fn'
+ ]
+ },
+ 'ky' => {
+ 'contained_indices' => {
+ 'ky' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'ky',
+ 'prefix' => [
+ 'k',
+ 'ky'
+ ]
+ },
+ 'pg' => {
+ 'contained_indices' => {
+ 'pg' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'pg',
+ 'prefix' => [
+ 'p',
+ 'pg'
+ ]
+ },
+ 'tp' => {
+ 'contained_indices' => {
+ 'tp' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'tp',
+ 'prefix' => [
+ 't',
+ 'tp'
+ ]
+ },
+ 'vr' => {
+ 'contained_indices' => {
+ 'vr' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'vr',
+ 'prefix' => [
+ 'v',
+ 'vr'
+ ]
+ }
+ },
'merged_indices' => {
'cp' => 'fn'
}
Index: t/results/indices/double_syncodeindex.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/double_syncodeindex.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/indices/double_syncodeindex.pl 23 Aug 2012 18:14:45 -0000
1.4
+++ t/results/indices/double_syncodeindex.pl 15 Dec 2012 17:12:58 -0000
1.5
@@ -486,6 +486,76 @@
$result_indices{'double_syncodeindex'} = {
+ 'index_names' => {
+ 'cp' => {
+ 'contained_indices' => {
+ 'cp' => 1
+ },
+ 'in_code' => 1,
+ 'merged_in' => 'fn',
+ 'name' => 'cp',
+ 'prefix' => [
+ 'c',
+ 'cp'
+ ]
+ },
+ 'fn' => {
+ 'contained_indices' => {
+ 'cp' => 1,
+ 'fn' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'fn',
+ 'prefix' => [
+ 'f',
+ 'fn'
+ ]
+ },
+ 'ky' => {
+ 'contained_indices' => {
+ 'ky' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'ky',
+ 'prefix' => [
+ 'k',
+ 'ky'
+ ]
+ },
+ 'pg' => {
+ 'contained_indices' => {
+ 'pg' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'pg',
+ 'prefix' => [
+ 'p',
+ 'pg'
+ ]
+ },
+ 'tp' => {
+ 'contained_indices' => {
+ 'tp' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'tp',
+ 'prefix' => [
+ 't',
+ 'tp'
+ ]
+ },
+ 'vr' => {
+ 'contained_indices' => {
+ 'vr' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'vr',
+ 'prefix' => [
+ 'v',
+ 'vr'
+ ]
+ }
+ },
'merged_indices' => {
'cp' => 'fn'
}
Index: t/results/indices/print_merged_index.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/print_merged_index.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/indices/print_merged_index.pl 23 Aug 2012 18:14:46 -0000
1.15
+++ t/results/indices/print_merged_index.pl 15 Dec 2012 17:12:58 -0000
1.16
@@ -216,6 +216,76 @@
$result_indices{'print_merged_index'} = {
+ 'index_names' => {
+ 'cp' => {
+ 'contained_indices' => {
+ 'cp' => 1,
+ 'fn' => 1
+ },
+ 'in_code' => 0,
+ 'name' => 'cp',
+ 'prefix' => [
+ 'c',
+ 'cp'
+ ]
+ },
+ 'fn' => {
+ 'contained_indices' => {
+ 'fn' => 1
+ },
+ 'in_code' => 1,
+ 'merged_in' => 'cp',
+ 'name' => 'fn',
+ 'prefix' => [
+ 'f',
+ 'fn'
+ ]
+ },
+ 'ky' => {
+ 'contained_indices' => {
+ 'ky' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'ky',
+ 'prefix' => [
+ 'k',
+ 'ky'
+ ]
+ },
+ 'pg' => {
+ 'contained_indices' => {
+ 'pg' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'pg',
+ 'prefix' => [
+ 'p',
+ 'pg'
+ ]
+ },
+ 'tp' => {
+ 'contained_indices' => {
+ 'tp' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'tp',
+ 'prefix' => [
+ 't',
+ 'tp'
+ ]
+ },
+ 'vr' => {
+ 'contained_indices' => {
+ 'vr' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'vr',
+ 'prefix' => [
+ 'v',
+ 'vr'
+ ]
+ }
+ },
'merged_indices' => {
'fn' => 'cp'
}
Index: t/results/indices/recursive_synindex.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/recursive_synindex.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/indices/recursive_synindex.pl 23 Aug 2012 18:14:47 -0000
1.13
+++ t/results/indices/recursive_synindex.pl 15 Dec 2012 17:12:58 -0000
1.14
@@ -218,35 +218,92 @@
$result_indices{'recursive_synindex'} = {
'index_names' => {
'aaa' => {
- 'aaa' => 0
+ 'contained_indices' => {
+ 'aaa' => 1
+ },
+ 'in_code' => 0,
+ 'merged_in' => 'bbb',
+ 'name' => 'aaa',
+ 'prefix' => [
+ 'aaa'
+ ]
},
'bbb' => {
- 'aaa' => 0,
- 'bbb' => 0
+ 'contained_indices' => {
+ 'aaa' => 1,
+ 'bbb' => 1
+ },
+ 'in_code' => 0,
+ 'name' => 'bbb',
+ 'prefix' => [
+ 'bbb'
+ ]
},
'cp' => {
- 'c' => 0,
- 'cp' => 0
+ 'contained_indices' => {
+ 'cp' => 1
+ },
+ 'in_code' => 0,
+ 'name' => 'cp',
+ 'prefix' => [
+ 'c',
+ 'cp'
+ ]
},
'fn' => {
- 'f' => 1,
+ 'contained_indices' => {
'fn' => 1
},
+ 'in_code' => 1,
+ 'name' => 'fn',
+ 'prefix' => [
+ 'f',
+ 'fn'
+ ]
+ },
'ky' => {
- 'k' => 1,
+ 'contained_indices' => {
'ky' => 1
},
+ 'in_code' => 1,
+ 'name' => 'ky',
+ 'prefix' => [
+ 'k',
+ 'ky'
+ ]
+ },
'pg' => {
- 'p' => 1,
+ 'contained_indices' => {
'pg' => 1
},
+ 'in_code' => 1,
+ 'name' => 'pg',
+ 'prefix' => [
+ 'p',
+ 'pg'
+ ]
+ },
'tp' => {
- 't' => 1,
+ 'contained_indices' => {
'tp' => 1
},
+ 'in_code' => 1,
+ 'name' => 'tp',
+ 'prefix' => [
+ 't',
+ 'tp'
+ ]
+ },
'vr' => {
- 'v' => 1,
+ 'contained_indices' => {
'vr' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'vr',
+ 'prefix' => [
+ 'v',
+ 'vr'
+ ]
}
},
'merged_indices' => {
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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/indices/syncode_index_print_both.pl 23 Aug 2012 18:14:47
-0000 1.16
+++ t/results/indices/syncode_index_print_both.pl 15 Dec 2012 17:12:58
-0000 1.17
@@ -511,6 +511,76 @@
$result_indices{'syncode_index_print_both'} = {
+ 'index_names' => {
+ 'cp' => {
+ 'contained_indices' => {
+ 'cp' => 1,
+ 'fn' => 1
+ },
+ 'in_code' => 0,
+ 'name' => 'cp',
+ 'prefix' => [
+ 'c',
+ 'cp'
+ ]
+ },
+ 'fn' => {
+ 'contained_indices' => {
+ 'fn' => 1
+ },
+ 'in_code' => 1,
+ 'merged_in' => 'cp',
+ 'name' => 'fn',
+ 'prefix' => [
+ 'f',
+ 'fn'
+ ]
+ },
+ 'ky' => {
+ 'contained_indices' => {
+ 'ky' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'ky',
+ 'prefix' => [
+ 'k',
+ 'ky'
+ ]
+ },
+ 'pg' => {
+ 'contained_indices' => {
+ 'pg' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'pg',
+ 'prefix' => [
+ 'p',
+ 'pg'
+ ]
+ },
+ 'tp' => {
+ 'contained_indices' => {
+ 'tp' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'tp',
+ 'prefix' => [
+ 't',
+ 'tp'
+ ]
+ },
+ 'vr' => {
+ 'contained_indices' => {
+ 'vr' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'vr',
+ 'prefix' => [
+ 'v',
+ 'vr'
+ ]
+ }
+ },
'merged_indices' => {
'fn' => 'cp'
}
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.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/indices/syncodeindex_to_plain.pl 23 Aug 2012 18:14:47 -0000
1.4
+++ t/results/indices/syncodeindex_to_plain.pl 15 Dec 2012 17:12:58 -0000
1.5
@@ -533,6 +533,76 @@
$result_indices{'syncodeindex_to_plain'} = {
+ 'index_names' => {
+ 'cp' => {
+ 'contained_indices' => {
+ 'cp' => 1,
+ 'ky' => 1
+ },
+ 'in_code' => 0,
+ 'name' => 'cp',
+ 'prefix' => [
+ 'c',
+ 'cp'
+ ]
+ },
+ 'fn' => {
+ 'contained_indices' => {
+ 'fn' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'fn',
+ 'prefix' => [
+ 'f',
+ 'fn'
+ ]
+ },
+ 'ky' => {
+ 'contained_indices' => {
+ 'ky' => 1
+ },
+ 'in_code' => 1,
+ 'merged_in' => 'cp',
+ 'name' => 'ky',
+ 'prefix' => [
+ 'k',
+ 'ky'
+ ]
+ },
+ 'pg' => {
+ 'contained_indices' => {
+ 'pg' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'pg',
+ 'prefix' => [
+ 'p',
+ 'pg'
+ ]
+ },
+ 'tp' => {
+ 'contained_indices' => {
+ 'tp' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'tp',
+ 'prefix' => [
+ 't',
+ 'tp'
+ ]
+ },
+ 'vr' => {
+ 'contained_indices' => {
+ 'vr' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'vr',
+ 'prefix' => [
+ 'v',
+ 'vr'
+ ]
+ }
+ },
'merged_indices' => {
'ky' => 'cp'
}
Index: t/results/indices/unknown_then_known_index_entry.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/indices/unknown_then_known_index_entry.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/indices/unknown_then_known_index_entry.pl 23 Aug 2012 18:14:49
-0000 1.23
+++ t/results/indices/unknown_then_known_index_entry.pl 15 Dec 2012 17:12:58
-0000 1.24
@@ -171,31 +171,80 @@
$result_indices{'unknown_then_known_index_entry'} = {
'index_names' => {
'cp' => {
- 'c' => 0,
- 'cp' => 0
+ 'contained_indices' => {
+ 'cp' => 1
+ },
+ 'in_code' => 0,
+ 'name' => 'cp',
+ 'prefix' => [
+ 'c',
+ 'cp'
+ ]
},
'fn' => {
- 'f' => 1,
+ 'contained_indices' => {
'fn' => 1
},
+ 'in_code' => 1,
+ 'name' => 'fn',
+ 'prefix' => [
+ 'f',
+ 'fn'
+ ]
+ },
'ky' => {
- 'k' => 1,
+ 'contained_indices' => {
'ky' => 1
},
+ 'in_code' => 1,
+ 'name' => 'ky',
+ 'prefix' => [
+ 'k',
+ 'ky'
+ ]
+ },
'pg' => {
- 'p' => 1,
+ 'contained_indices' => {
'pg' => 1
},
+ 'in_code' => 1,
+ 'name' => 'pg',
+ 'prefix' => [
+ 'p',
+ 'pg'
+ ]
+ },
'some' => {
- 'some' => 0
+ 'contained_indices' => {
+ 'some' => 1
+ },
+ 'in_code' => 0,
+ 'name' => 'some',
+ 'prefix' => [
+ 'some'
+ ]
},
'tp' => {
- 't' => 1,
+ 'contained_indices' => {
'tp' => 1
},
+ 'in_code' => 1,
+ 'name' => 'tp',
+ 'prefix' => [
+ 't',
+ 'tp'
+ ]
+ },
'vr' => {
- 'v' => 1,
+ 'contained_indices' => {
'vr' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'vr',
+ 'prefix' => [
+ 'v',
+ 'vr'
+ ]
}
}
};
Index: t/results/indices/wrong_synindex.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/wrong_synindex.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/indices/wrong_synindex.pl 23 Aug 2012 18:14:50 -0000 1.13
+++ t/results/indices/wrong_synindex.pl 15 Dec 2012 17:12:58 -0000 1.14
@@ -119,31 +119,80 @@
$result_indices{'wrong_synindex'} = {
'index_names' => {
'aaa' => {
- 'aaa' => 0
+ 'contained_indices' => {
+ 'aaa' => 1
+ },
+ 'in_code' => 0,
+ 'name' => 'aaa',
+ 'prefix' => [
+ 'aaa'
+ ]
},
'cp' => {
- 'c' => 0,
- 'cp' => 0
+ 'contained_indices' => {
+ 'cp' => 1
+ },
+ 'in_code' => 0,
+ 'name' => 'cp',
+ 'prefix' => [
+ 'c',
+ 'cp'
+ ]
},
'fn' => {
- 'f' => 1,
+ 'contained_indices' => {
'fn' => 1
},
+ 'in_code' => 1,
+ 'name' => 'fn',
+ 'prefix' => [
+ 'f',
+ 'fn'
+ ]
+ },
'ky' => {
- 'k' => 1,
+ 'contained_indices' => {
'ky' => 1
},
+ 'in_code' => 1,
+ 'name' => 'ky',
+ 'prefix' => [
+ 'k',
+ 'ky'
+ ]
+ },
'pg' => {
- 'p' => 1,
+ 'contained_indices' => {
'pg' => 1
},
+ 'in_code' => 1,
+ 'name' => 'pg',
+ 'prefix' => [
+ 'p',
+ 'pg'
+ ]
+ },
'tp' => {
- 't' => 1,
+ 'contained_indices' => {
'tp' => 1
},
+ 'in_code' => 1,
+ 'name' => 'tp',
+ 'prefix' => [
+ 't',
+ 'tp'
+ ]
+ },
'vr' => {
- 'v' => 1,
+ 'contained_indices' => {
'vr' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'vr',
+ 'prefix' => [
+ 'v',
+ 'vr'
+ ]
}
}
};
Index: t/results/info_tests/colon_in_index_entry.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/info_tests/colon_in_index_entry.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/info_tests/colon_in_index_entry.pl 23 Aug 2012 18:14:50
-0000 1.10
+++ t/results/info_tests/colon_in_index_entry.pl 15 Dec 2012 17:12:58
-0000 1.11
@@ -910,6 +910,76 @@
$result_indices{'colon_in_index_entry'} = {
+ 'index_names' => {
+ 'cp' => {
+ 'contained_indices' => {
+ 'cp' => 1,
+ 'vr' => 1
+ },
+ 'in_code' => 0,
+ 'name' => 'cp',
+ 'prefix' => [
+ 'c',
+ 'cp'
+ ]
+ },
+ 'fn' => {
+ 'contained_indices' => {
+ 'fn' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'fn',
+ 'prefix' => [
+ 'f',
+ 'fn'
+ ]
+ },
+ 'ky' => {
+ 'contained_indices' => {
+ 'ky' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'ky',
+ 'prefix' => [
+ 'k',
+ 'ky'
+ ]
+ },
+ 'pg' => {
+ 'contained_indices' => {
+ 'pg' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'pg',
+ 'prefix' => [
+ 'p',
+ 'pg'
+ ]
+ },
+ 'tp' => {
+ 'contained_indices' => {
+ 'tp' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'tp',
+ 'prefix' => [
+ 't',
+ 'tp'
+ ]
+ },
+ 'vr' => {
+ 'contained_indices' => {
+ 'vr' => 1
+ },
+ 'in_code' => 0,
+ 'merged_in' => 'cp',
+ 'name' => 'vr',
+ 'prefix' => [
+ 'v',
+ 'vr'
+ ]
+ }
+ },
'merged_indices' => {
'vr' => 'cp'
}
Index: t/results/macro/macro_in_index_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_index_commands.pl,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- t/results/macro/macro_in_index_commands.pl 23 Aug 2012 18:15:03 -0000
1.41
+++ t/results/macro/macro_in_index_commands.pl 15 Dec 2012 17:12:58 -0000
1.42
@@ -1362,36 +1362,92 @@
$result_indices{'macro_in_index_commands'} = {
'index_names' => {
'codeidx' => {
+ 'contained_indices' => {
'codeidx' => 1
},
+ 'in_code' => 1,
+ 'name' => 'codeidx',
+ 'prefix' => [
+ 'codeidx'
+ ]
+ },
'cp' => {
- 'c' => 0,
- 'cp' => 0
+ 'contained_indices' => {
+ 'cp' => 1
+ },
+ 'in_code' => 1,
+ 'merged_in' => 'fn',
+ 'name' => 'cp',
+ 'prefix' => [
+ 'c',
+ 'cp'
+ ]
},
'fn' => {
- 'c' => 1,
+ 'contained_indices' => {
'cp' => 1,
- 'f' => 1,
'fn' => 1
},
+ 'in_code' => 1,
+ 'name' => 'fn',
+ 'prefix' => [
+ 'f',
+ 'fn'
+ ]
+ },
'ky' => {
- 'k' => 1,
+ 'contained_indices' => {
'ky' => 1
},
+ 'in_code' => 1,
+ 'name' => 'ky',
+ 'prefix' => [
+ 'k',
+ 'ky'
+ ]
+ },
'pg' => {
- 'p' => 1,
+ 'contained_indices' => {
'pg' => 1
},
+ 'in_code' => 1,
+ 'name' => 'pg',
+ 'prefix' => [
+ 'p',
+ 'pg'
+ ]
+ },
'tp' => {
- 't' => 1,
+ 'contained_indices' => {
'tp' => 1
},
+ 'in_code' => 1,
+ 'name' => 'tp',
+ 'prefix' => [
+ 't',
+ 'tp'
+ ]
+ },
'truc' => {
- 'truc' => 0
+ 'contained_indices' => {
+ 'truc' => 1
+ },
+ 'in_code' => 0,
+ 'name' => 'truc',
+ 'prefix' => [
+ 'truc'
+ ]
},
'vr' => {
- 'v' => 1,
+ 'contained_indices' => {
'vr' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'vr',
+ 'prefix' => [
+ 'v',
+ 'vr'
+ ]
}
},
'merged_indices' => {
Index: t/results/misc_commands/index_entries.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/misc_commands/index_entries.pl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- t/results/misc_commands/index_entries.pl 23 Aug 2012 18:15:10 -0000
1.33
+++ t/results/misc_commands/index_entries.pl 15 Dec 2012 17:12:58 -0000
1.34
@@ -240,31 +240,80 @@
$result_indices{'index_entries'} = {
'index_names' => {
'cp' => {
- 'c' => 0,
- 'cp' => 0
+ 'contained_indices' => {
+ 'cp' => 1
+ },
+ 'in_code' => 0,
+ 'name' => 'cp',
+ 'prefix' => [
+ 'c',
+ 'cp'
+ ]
},
'fn' => {
- 'f' => 1,
+ 'contained_indices' => {
'fn' => 1
},
+ 'in_code' => 1,
+ 'name' => 'fn',
+ 'prefix' => [
+ 'f',
+ 'fn'
+ ]
+ },
'ky' => {
- 'k' => 1,
+ 'contained_indices' => {
'ky' => 1
},
+ 'in_code' => 1,
+ 'name' => 'ky',
+ 'prefix' => [
+ 'k',
+ 'ky'
+ ]
+ },
'pg' => {
- 'p' => 1,
+ 'contained_indices' => {
'pg' => 1
},
+ 'in_code' => 1,
+ 'name' => 'pg',
+ 'prefix' => [
+ 'p',
+ 'pg'
+ ]
+ },
'tp' => {
- 't' => 1,
+ 'contained_indices' => {
'tp' => 1
},
+ 'in_code' => 1,
+ 'name' => 'tp',
+ 'prefix' => [
+ 't',
+ 'tp'
+ ]
+ },
'truc' => {
- 'truc' => 0
+ 'contained_indices' => {
+ 'truc' => 1
+ },
+ 'in_code' => 0,
+ 'name' => 'truc',
+ 'prefix' => [
+ 'truc'
+ ]
},
'vr' => {
- 'v' => 1,
+ 'contained_indices' => {
'vr' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'vr',
+ 'prefix' => [
+ 'v',
+ 'vr'
+ ]
}
}
};
Index: t/results/misc_commands/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/misc_commands/simple.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/misc_commands/simple.pl 23 Aug 2012 18:15:11 -0000 1.21
+++ t/results/misc_commands/simple.pl 15 Dec 2012 17:12:58 -0000 1.22
@@ -63,31 +63,80 @@
$result_indices{'simple'} = {
'index_names' => {
'cp' => {
- 'c' => 0,
- 'cp' => 0
+ 'contained_indices' => {
+ 'cp' => 1
+ },
+ 'in_code' => 0,
+ 'name' => 'cp',
+ 'prefix' => [
+ 'c',
+ 'cp'
+ ]
},
'fn' => {
- 'f' => 1,
+ 'contained_indices' => {
'fn' => 1
},
+ 'in_code' => 1,
+ 'name' => 'fn',
+ 'prefix' => [
+ 'f',
+ 'fn'
+ ]
+ },
'idx' => {
- 'idx' => 0
+ 'contained_indices' => {
+ 'idx' => 1
+ },
+ 'in_code' => 0,
+ 'name' => 'idx',
+ 'prefix' => [
+ 'idx'
+ ]
},
'ky' => {
- 'k' => 1,
+ 'contained_indices' => {
'ky' => 1
},
+ 'in_code' => 1,
+ 'name' => 'ky',
+ 'prefix' => [
+ 'k',
+ 'ky'
+ ]
+ },
'pg' => {
- 'p' => 1,
+ 'contained_indices' => {
'pg' => 1
},
+ 'in_code' => 1,
+ 'name' => 'pg',
+ 'prefix' => [
+ 'p',
+ 'pg'
+ ]
+ },
'tp' => {
- 't' => 1,
+ 'contained_indices' => {
'tp' => 1
},
+ 'in_code' => 1,
+ 'name' => 'tp',
+ 'prefix' => [
+ 't',
+ 'tp'
+ ]
+ },
'vr' => {
- 'v' => 1,
+ 'contained_indices' => {
'vr' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'vr',
+ 'prefix' => [
+ 'v',
+ 'vr'
+ ]
}
}
};
Index: t/results/value/value_in_index_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/value/value_in_index_commands.pl,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- t/results/value/value_in_index_commands.pl 23 Aug 2012 18:15:27 -0000
1.36
+++ t/results/value/value_in_index_commands.pl 15 Dec 2012 17:12:59 -0000
1.37
@@ -1133,36 +1133,92 @@
$result_indices{'value_in_index_commands'} = {
'index_names' => {
'codeidx' => {
+ 'contained_indices' => {
'codeidx' => 1
},
+ 'in_code' => 1,
+ 'name' => 'codeidx',
+ 'prefix' => [
+ 'codeidx'
+ ]
+ },
'cp' => {
- 'c' => 0,
- 'cp' => 0
+ 'contained_indices' => {
+ 'cp' => 1
+ },
+ 'in_code' => 1,
+ 'merged_in' => 'fn',
+ 'name' => 'cp',
+ 'prefix' => [
+ 'c',
+ 'cp'
+ ]
},
'fn' => {
- 'c' => 1,
+ 'contained_indices' => {
'cp' => 1,
- 'f' => 1,
'fn' => 1
},
+ 'in_code' => 1,
+ 'name' => 'fn',
+ 'prefix' => [
+ 'f',
+ 'fn'
+ ]
+ },
'ky' => {
- 'k' => 1,
+ 'contained_indices' => {
'ky' => 1
},
+ 'in_code' => 1,
+ 'name' => 'ky',
+ 'prefix' => [
+ 'k',
+ 'ky'
+ ]
+ },
'pg' => {
- 'p' => 1,
+ 'contained_indices' => {
'pg' => 1
},
+ 'in_code' => 1,
+ 'name' => 'pg',
+ 'prefix' => [
+ 'p',
+ 'pg'
+ ]
+ },
'tp' => {
- 't' => 1,
+ 'contained_indices' => {
'tp' => 1
},
+ 'in_code' => 1,
+ 'name' => 'tp',
+ 'prefix' => [
+ 't',
+ 'tp'
+ ]
+ },
'truc' => {
- 'truc' => 0
+ 'contained_indices' => {
+ 'truc' => 1
+ },
+ 'in_code' => 0,
+ 'name' => 'truc',
+ 'prefix' => [
+ 'truc'
+ ]
},
'vr' => {
- 'v' => 1,
+ 'contained_indices' => {
'vr' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'vr',
+ 'prefix' => [
+ 'v',
+ 'vr'
+ ]
}
},
'merged_indices' => {
Index: t/results/converters_tests/printindex_merged_indices_code_style.pl
===================================================================
RCS file: t/results/converters_tests/printindex_merged_indices_code_style.pl
diff -N t/results/converters_tests/printindex_merged_indices_code_style.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/converters_tests/printindex_merged_indices_code_style.pl 15 Dec
2012 17:12:57 -0000 1.1
@@ -0,0 +1,1136 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'printindex_merged_indices_code_style'} = {
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'text_root'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'Top'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'cp fn'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'synindex',
+ 'extra' => {
+ 'misc_args' => [
+ 'cp',
+ 'fn'
+ ],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'vr fn'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'synindex',
+ 'extra' => {
+ 'misc_args' => [
+ 'vr',
+ 'fn'
+ ],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 5,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'c``b'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'cindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [
+ {}
+ ],
+ 'content_normalized' => [],
+ 'in_code' => 0,
+ 'index_at_command' => 'cindex',
+ 'index_name' => 'cp',
+ 'index_prefix' => 'c',
+ 'index_type_command' => 'cindex',
+ 'key' => 'c"b',
+ 'node' => {},
+ 'number' => 1
+ },
+ 'misc_content' => [],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'index_entry_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'v``j'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'vindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [
+ {}
+ ],
+ 'content_normalized' => [],
+ 'in_code' => 0,
+ 'index_at_command' => 'vindex',
+ 'index_name' => 'vr',
+ 'index_prefix' => 'v',
+ 'index_type_command' => 'vindex',
+ 'key' => 'v"j',
+ 'node' => {},
+ 'number' => 1
+ },
+ 'misc_content' => [],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'index_entry_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'f``g'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'findex',
+ 'extra' => {
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [
+ {}
+ ],
+ 'content_normalized' => [],
+ 'in_code' => 1,
+ 'index_at_command' => 'findex',
+ 'index_name' => 'fn',
+ 'index_prefix' => 'f',
+ 'index_type_command' => 'findex',
+ 'key' => 'f``g',
+ 'node' => {},
+ 'number' => 1
+ },
+ 'misc_content' => [],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'index_entry_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'cdi'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'defcodeindex',
+ 'extra' => {
+ 'misc_args' => [
+ 'cdi'
+ ],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'cdi fn'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'synindex',
+ 'extra' => {
+ 'misc_args' => [
+ 'cdi',
+ 'fn'
+ ],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'cdi``h'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'cdiindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [
+ {}
+ ],
+ 'content_normalized' => [],
+ 'in_code' => 0,
+ 'index_at_command' => 'cdiindex',
+ 'index_name' => 'cdi',
+ 'index_prefix' => 'cdi',
+ 'index_type_command' => 'cdiindex',
+ 'key' => 'cdi"h',
+ 'node' => {},
+ 'number' => 1
+ },
+ 'misc_content' => [],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'index_entry_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'ddi'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'defindex',
+ 'extra' => {
+ 'misc_args' => [
+ 'ddi'
+ ],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'ddi cp'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'syncodeindex',
+ 'extra' => {
+ 'misc_args' => [
+ 'ddi',
+ 'cp'
+ ],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 21,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'ddi``g'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'ddiindex',
+ 'extra' => {
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [
+ {}
+ ],
+ 'content_normalized' => [],
+ 'in_code' => 1,
+ 'index_at_command' => 'ddiindex',
+ 'index_name' => 'ddi',
+ 'index_prefix' => 'ddi',
+ 'index_type_command' => 'ddiindex',
+ 'key' => 'ddi``g',
+ 'node' => {},
+ 'number' => 1
+ },
+ 'misc_content' => [],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'index_entry_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'fn'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'printindex',
+ 'extra' => {
+ 'misc_args' => [
+ 'fn'
+ ],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 25,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top',
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[0]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'};
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[3];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[3]{'extra'}{'spaces_after_command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[4]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'content'};
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'node'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5]{'extra'}{'misc_content'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5]{'extra'}{'index_entry'}{'content'};
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5]{'extra'}{'spaces_after_command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[5]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[6]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'content'};
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'node'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7]{'extra'}{'misc_content'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7]{'extra'}{'index_entry'}{'content'};
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7]{'extra'}{'spaces_after_command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[7]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[8]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9]{'extra'}{'index_entry'}{'content'};
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9]{'extra'}{'index_entry'}{'node'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9]{'extra'}{'misc_content'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9]{'extra'}{'index_entry'}{'content'};
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9]{'extra'}{'spaces_after_command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[9]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[10]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[11];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[11]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[11]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[11]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[11]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[11]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[11]{'args'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[11];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[11]{'extra'}{'spaces_after_command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[11]{'args'}[0]{'contents'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[11]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[12]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[13]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[13];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[13]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[13]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[13]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[13]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[13]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[13]{'args'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[13];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[13]{'extra'}{'spaces_after_command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[13]{'args'}[0]{'contents'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[13]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[14]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15]{'args'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15]{'args'}[0]{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15]{'extra'}{'index_entry'}{'content'};
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15]{'extra'}{'index_entry'}{'node'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15]{'extra'}{'misc_content'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15]{'extra'}{'index_entry'}{'content'};
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15]{'extra'}{'spaces_after_command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15]{'args'}[0]{'contents'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[15]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[16]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[17]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[17];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[17]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[17]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[17]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[17]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[17]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[17]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[17]{'args'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[17];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[17]{'extra'}{'spaces_after_command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[17]{'args'}[0]{'contents'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[17]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[18]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[19]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[19];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[19]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[19]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[19]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[19]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[19]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[19]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[19]{'args'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[19];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[19]{'extra'}{'spaces_after_command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[19]{'args'}[0]{'contents'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[19]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[20]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21]{'args'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21]{'args'}[0]{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21]{'extra'}{'index_entry'}{'content_normalized'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21]{'extra'}{'index_entry'}{'content'};
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21]{'extra'}{'index_entry'}{'node'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21]{'extra'}{'misc_content'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21]{'extra'}{'index_entry'}{'content'};
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21]{'extra'}{'spaces_after_command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21]{'args'}[0]{'contents'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[21]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[22]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[23]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[23];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[23]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[23]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[23]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[23]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[23]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[23]{'args'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[23]{'args'}[0]{'parent'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[23];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[23]{'extra'}{'spaces_after_command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[23]{'args'}[0]{'contents'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'contents'}[23]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'}{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'extra'}{'node_content'};
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'printindex_merged_indices_code_style'}{'contents'}[1]{'parent'}
= $result_trees{'printindex_merged_indices_code_style'};
+
+$result_texis{'printindex_merged_indices_code_style'} = '@node Top
+
address@hidden cp fn
+
address@hidden vr fn
+
address@hidden c``b
+
address@hidden v``j
+
address@hidden f``g
+
address@hidden cdi
+
address@hidden cdi fn
+
address@hidden cdi``h
+
address@hidden ddi
+
address@hidden ddi cp
+
address@hidden ddi``g
+
address@hidden fn
+';
+
+
+$result_texts{'printindex_merged_indices_code_style'} = '
+
+
+
+
+
+
+
+
+
+
+
+';
+
+$result_sectioning{'printindex_merged_indices_code_style'} = {};
+
+$result_nodes{'printindex_merged_indices_code_style'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'node_up' => {
+ 'extra' => {
+ 'manual_content' => [
+ {
+ 'text' => 'dir'
+ }
+ ],
+ 'top_node_up' => {}
+ },
+ 'type' => 'top_node_up'
+ }
+};
+$result_nodes{'printindex_merged_indices_code_style'}{'node_up'}{'extra'}{'top_node_up'}
= $result_nodes{'printindex_merged_indices_code_style'};
+
+$result_menus{'printindex_merged_indices_code_style'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ }
+};
+
+$result_errors{'printindex_merged_indices_code_style'} = [];
+
+
+$result_indices{'printindex_merged_indices_code_style'} = {
+ 'index_names' => {
+ 'cdi' => {
+ 'contained_indices' => {
+ 'cdi' => 1
+ },
+ 'in_code' => 0,
+ 'merged_in' => 'fn',
+ 'name' => 'cdi',
+ 'prefix' => [
+ 'cdi'
+ ]
+ },
+ 'cp' => {
+ 'contained_indices' => {
+ 'cp' => 1
+ },
+ 'in_code' => 0,
+ 'merged_in' => 'fn',
+ 'name' => 'cp',
+ 'prefix' => [
+ 'c',
+ 'cp'
+ ]
+ },
+ 'ddi' => {
+ 'contained_indices' => {
+ 'ddi' => 1
+ },
+ 'in_code' => 1,
+ 'merged_in' => 'fn',
+ 'name' => 'ddi',
+ 'prefix' => [
+ 'ddi'
+ ]
+ },
+ 'fn' => {
+ 'contained_indices' => {
+ 'cdi' => 1,
+ 'cp' => 1,
+ 'ddi' => 1,
+ 'fn' => 1,
+ 'vr' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'fn',
+ 'prefix' => [
+ 'f',
+ 'fn'
+ ]
+ },
+ 'ky' => {
+ 'contained_indices' => {
+ 'ky' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'ky',
+ 'prefix' => [
+ 'k',
+ 'ky'
+ ]
+ },
+ 'pg' => {
+ 'contained_indices' => {
+ 'pg' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'pg',
+ 'prefix' => [
+ 'p',
+ 'pg'
+ ]
+ },
+ 'tp' => {
+ 'contained_indices' => {
+ 'tp' => 1
+ },
+ 'in_code' => 1,
+ 'name' => 'tp',
+ 'prefix' => [
+ 't',
+ 'tp'
+ ]
+ },
+ 'vr' => {
+ 'contained_indices' => {
+ 'vr' => 1
+ },
+ 'in_code' => 0,
+ 'merged_in' => 'fn',
+ 'name' => 'vr',
+ 'prefix' => [
+ 'v',
+ 'vr'
+ ]
+ }
+ },
+ 'merged_indices' => {
+ 'cdi' => 'fn',
+ 'cp' => 'fn',
+ 'ddi' => 'fn',
+ 'vr' => 'fn'
+ }
+};
+
+
+
+$result_converted{'plaintext'}->{'printindex_merged_indices_code_style'} = '*
Menu:
+
+* c"b: Top. (line 0)
+* cdi"h: Top. (line 0)
+* ddi``g: Top. (line 0)
+* f``g: Top. (line 0)
+* v"j: Top. (line 0)
+
+';
+
+
+$result_converted{'html_text'}->{'printindex_merged_indices_code_style'} = '<a
name="Top"></a>
+<h1 class="node-heading">Top</h1>
+
+
+
+<a name="index-c_0060_0060b"></a>
+
+<a name="index-v_0060_0060j"></a>
+
+<a name="index-f_0060_0060g"></a>
+
+
+
+<a name="index-cdi_0060_0060h"></a>
+
+
+
+<a name="index-ddi_0060_0060g"></a>
+
+<table><tr><th valign="top">Jump to: </th><td><a class="summary-letter"
href="#t_h_fn_letter-C"><b>C</b></a>
+
+<a class="summary-letter" href="#t_h_fn_letter-D"><b>D</b></a>
+
+<a class="summary-letter" href="#t_h_fn_letter-F"><b>F</b></a>
+
+<a class="summary-letter" href="#t_h_fn_letter-V"><b>V</b></a>
+
+</td></tr></table>
+<table class="index-fn" border="0">
+<tr><td></td><th align="left">Index Entry</th><td> </td><th align="left">
Section</th></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th><a name="t_h_fn_letter-C">C</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-c_0060_0060b">c“b</a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-cdi_0060_0060h">cdi“h</a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th><a name="t_h_fn_letter-D">D</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-ddi_0060_0060g"><code>ddi``g</code></a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th><a name="t_h_fn_letter-F">F</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-f_0060_0060g"><code>f``g</code></a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+<tr><th><a name="t_h_fn_letter-V">V</a></th><td></td><td></td></tr>
+<tr><td></td><td valign="top"><a
href="#index-v_0060_0060j">v“j</a>:</td><td> </td><td
valign="top"><a href="#Top">Top</a></td></tr>
+<tr><td colspan="4"> <hr></td></tr>
+</table>
+<table><tr><th valign="top">Jump to: </th><td><a class="summary-letter"
href="#t_h_fn_letter-C"><b>C</b></a>
+
+<a class="summary-letter" href="#t_h_fn_letter-D"><b>D</b></a>
+
+<a class="summary-letter" href="#t_h_fn_letter-F"><b>F</b></a>
+
+<a class="summary-letter" href="#t_h_fn_letter-V"><b>V</b></a>
+
+</td></tr></table>
+<hr>
+';
+
+
+$result_converted{'xml'}->{'printindex_merged_indices_code_style'} = '<node
name="Top" spaces=" "><nodename>Top</nodename><nodeup
automatic="on">(dir)</nodeup></node>
+
+<synindex from="cp" to="fn" line=" cp fn"></synindex>
+
+<synindex from="vr" to="fn" line=" vr fn"></synindex>
+
+<cindex index="cp" spaces=" "><indexterm
index="cp">c&textldquo;b</indexterm></cindex>
+
+<vindex index="vr" spaces=" "><indexterm index="vr"
incode="0">v&textldquo;j</indexterm></vindex>
+
+<findex index="fn" spaces=" "><indexterm index="fn">f``g</indexterm></findex>
+
+<defcodeindex value="cdi" line=" cdi"></defcodeindex>
+
+<synindex from="cdi" to="fn" line=" cdi fn"></synindex>
+
+<indexcommand command="cdiindex" index="cdi" spaces=" "><indexterm index="cdi"
incode="0">cdi&textldquo;h</indexterm></indexcommand>
+
+<defindex value="ddi" line=" ddi"></defindex>
+
+<syncodeindex from="ddi" to="cp" line=" ddi cp"></syncodeindex>
+
+<indexcommand command="ddiindex" index="ddi" spaces=" "><indexterm index="ddi"
incode="1">ddi``g</indexterm></indexcommand>
+
+<printindex value="fn" line=" fn"></printindex>
+';
+
+
+$result_converted{'docbook'}->{'printindex_merged_indices_code_style'} =
'<anchor id="Top"/>
+
+
+
+<indexterm role="cp"><primary>c“b</primary></indexterm>
+
+<indexterm role="vr"><primary>v“j</primary></indexterm>
+
+<indexterm role="fn"><primary>f``g</primary></indexterm>
+
+
+
+<indexterm role="cdi"><primary>cdi“h</primary></indexterm>
+
+
+
+<indexterm role="ddi"><primary>ddi``g</primary></indexterm>
+
+<index role="fn"></index>
+';
+
+1;
- texinfo/tp Texinfo/Common.pm Texinfo/Parser.pm ...,
Patrice Dumas <=