[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp TODO Texinfo/Parser.pm Texinfo/Conve...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp TODO Texinfo/Parser.pm Texinfo/Conve... |
|
Date: |
Sat, 08 Sep 2012 21:56:26 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/09/08 21:56:26
Modified files:
tp : TODO
tp/Texinfo : Parser.pm
tp/Texinfo/Convert: XML.pm
tp/t : xml_tests.t
tp/t/results/converters_tests: at_commands_in_refs.pl
things_before_setfilename.pl
things_before_setfilename_no_element.pl
tp/t/results/coverage: commands.pl def.pl multitable.pl
punctuation_in_line_commands.pl table.pl
tp/t/results/def: empty_def_arguments.pl
inter_item_commands_in_def.pl
inter_item_commands_in_def_in_example.pl
leading_space_in_def_arg.pl
space_in_def_for_index.pl
wrong_braces_simple.pl
wrong_braces_with_end_of_lines.pl
tp/t/results/indices: empty_index_entry.pl
tp/t/results/menu: block_commands_in_menu_description.pl
formats_in_menu.pl
tp/t/results/misc_commands: comment_space_command_on_line.pl
tp/t/results/multitable: inter_item_commands_in_multitable.pl
tp/t/results/sectioning: chapter_between_nodes.pl
explicit_node_directions.pl
more_sections_than_nodes.pl
nodes_after_top_before_chapter_nodes.pl
nodes_no_node_top_explicit_directions.pl
part_node_chapter_after_top.pl
section_before_top.pl
tp/t/results/xml_tests: commands_and_spaces.pl
comments_on_misc_command_line.pl
macro_and_args.pl raw.pl
raw_and_comments.pl
tp/t/results/xtable: block_commands_in_table.pl
inter_item_commands_in_table.pl
inter_item_commands_in_table_in_example.pl
table_nested.pl
tp/tests/layout/res_parser/formatting_xml: formatting.xml
Log message:
Keep spaces better, for XML.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.296&r2=1.297
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.393&r2=1.394
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/xml_tests.t?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/things_before_setfilename.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/things_before_setfilename_no_element.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/commands.pl?cvsroot=texinfo&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/def.pl?cvsroot=texinfo&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/multitable.pl?cvsroot=texinfo&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl?cvsroot=texinfo&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table.pl?cvsroot=texinfo&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/empty_def_arguments.pl?cvsroot=texinfo&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/inter_item_commands_in_def.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/inter_item_commands_in_def_in_example.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/leading_space_in_def_arg.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/space_in_def_for_index.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/wrong_braces_simple.pl?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/def/wrong_braces_with_end_of_lines.pl?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/indices/empty_index_entry.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/block_commands_in_menu_description.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/formats_in_menu.pl?cvsroot=texinfo&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl?cvsroot=texinfo&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/inter_item_commands_in_multitable.pl?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/chapter_between_nodes.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/explicit_node_directions.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/more_sections_than_nodes.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl?cvsroot=texinfo&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/section_before_top.pl?cvsroot=texinfo&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/commands_and_spaces.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/comments_on_misc_command_line.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/macro_and_args.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/raw.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/raw_and_comments.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/block_commands_in_table.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/inter_item_commands_in_table.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/table_nested.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml?cvsroot=texinfo&r1=1.12&r2=1.13
Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -b -r1.296 -r1.297
--- TODO 5 Sep 2012 22:15:49 -0000 1.296
+++ TODO 8 Sep 2012 21:56:21 -0000 1.297
@@ -9,6 +9,12 @@
Bugs
====
+In def in 02coverage.t, space at the end of deffnx not kept in XML:
address@hidden Command { log trap1} {}
+
+In texi file generated from xml_tests.t node_no_section, translation
+to XML, @bye lost.
+
Delayed bugs
============
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -b -r1.393 -r1.394
--- Texinfo/Parser.pm 27 Aug 2012 22:04:34 -0000 1.393
+++ Texinfo/Parser.pm 8 Sep 2012 21:56:21 -0000 1.394
@@ -2036,6 +2036,13 @@
print STDERR "ABORT EMPTY additional text |$additional_text|, current
|$current->{'contents'}->[-1]->{'text'}|\n" if ($self->{'DEBUG'});
$current->{'contents'}->[-1]->{'text'} .= $additional_text;
if ($current->{'contents'}->[-1]->{'text'} eq '') {
+ if ($current->{'extra'}
+ and $current->{'extra'}->{'spaces_before_argument'}
+ and $current->{'extra'}->{'spaces_before_argument'}
+ eq $current->{'contents'}->[-1]) {
+ delete ($current->{'extra'}->{'spaces_before_argument'});
+ delete ($current->{'extra'}) if !(keys(%{$current->{'extra'}}));
+ }
pop @{$current->{'contents'}}
} elsif ($current->{'contents'}->[-1]->{'type'} eq 'empty_line') {
# exactly the same condition than to begin a paragraph
@@ -2251,9 +2258,14 @@
#print STDERR "Return bracketed\n";
my $bracketed = shift @{$contents};
$self->_isolate_last_space($bracketed, 'empty_space_at_end_def_bracketed');
- return ($spaces, { 'contents' => $bracketed->{'contents'},
+ my $bracketed_def_content = { 'contents' => $bracketed->{'contents'},
'parent' => $bracketed->{'parent'},
- 'type' => 'bracketed_def_content', });
+ 'type' => 'bracketed_def_content', };
+ if ($bracketed->{'extra'} and
$bracketed->{'extra'}->{'spaces_before_argument'}) {
+ $bracketed_def_content->{'extra'}->{'spaces_before_argument'}
+ = $bracketed->{'extra'}->{'spaces_before_argument'};
+ }
+ return ($spaces, $bracketed_def_content);
} elsif ($contents->[0]->{'cmdname'}) {
#print STDERR "Return command $contents->[0]->{'cmdname'}\n";
return ($spaces, shift @{$contents});
@@ -4724,6 +4736,8 @@
{'type' => 'empty_spaces_before_argument',
'text' => '' };
print STDERR "BRACKETED in def/multitable\n" if ($self->{'DEBUG'});
+ $current->{'extra'}->{'spaces_before_argument'}
+ = $current->{'contents'}->[-1];
# lone braces accepted right in a rawpreformatted
} elsif ($current->{'type'}
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- Texinfo/Convert/XML.pm 5 Sep 2012 22:15:49 -0000 1.80
+++ Texinfo/Convert/XML.pm 8 Sep 2012 21:56:22 -0000 1.81
@@ -111,6 +111,7 @@
'hashchar' => '&hashchar;',
);
+# our because it is used in the xml to texi translator
our %xml_commands_formatting
= %{$Texinfo::Convert::Converter::default_xml_commands_formatting{'normal'}};
@@ -127,7 +128,7 @@
'v' => 'caron',
);
-my %xml_accent_types = (%Texinfo::Convert::Converter::xml_accent_entities,
%xml_accents);
+our %xml_accent_types = (%Texinfo::Convert::Converter::xml_accent_entities,
%xml_accents);
# no entity
my @other_accents = ('dotaccent', 'tieaccent', 'ubaraccent', 'udotaccent');
@@ -160,7 +161,8 @@
= %Texinfo::Convert::Converter::default_args_code_style;
my %regular_font_style_commands =
%Texinfo::Common::regular_font_style_commands;
-my %commands_args_elements = (
+# our because it is used in the xml to texi translator
+our %commands_args_elements = (
'email' => ['emailaddress', 'emailname'],
'uref' => ['urefurl', 'urefdesc', 'urefreplacement'],
'url' => ['urefurl', 'urefdesc', 'urefreplacement'],
@@ -500,6 +502,13 @@
my @node_directions = ('Next', 'Prev', 'Up');
+# not used here, but it is consistent and may be used
+# by XML to Texinfo converters
+$commands_args_elements{'node'} = ['nodename'];
+foreach my $direction (@node_directions) {
+ push @{$commands_args_elements{'node'}}, 'node'.lc($direction);
+}
+
sub _convert($$;$);
sub _convert($$;$)
@@ -668,6 +677,7 @@
$attribute = " command=\"$root->{'cmdname'}\"";
}
$attribute .= "
index=\"$root->{'extra'}->{'index_entry'}->{'index_name'}\"";
+ $attribute .= _leading_spaces($root);
my $end_line;
if ($root->{'args'}->[0]) {
$end_line =
$self->_end_line_or_comment($root->{'args'}->[0]->{'contents'});
@@ -700,18 +710,18 @@
} else {
$nodename = '';
}
- $result .= "<node name=\"$nodename\""._leading_spaces($root)
- .$self->_trailing_spaces_arg($root->{'args'}->[0]).">";
+ $result .= "<node name=\"$nodename\""._leading_spaces($root).">";
push @{$self->{'document_context'}->[-1]->{'monospace'}}, 1;
- $result .= "<nodename>".
+ $result .=
"<nodename".$self->_trailing_spaces_arg($root->{'args'}->[0]).">".
$self->_convert({'contents' =>
$root->{'extra'}->{'node_content'}})
."</nodename>";
# first arg is the node name.
my $direction_index = 1;
+ my $pending_empty_directions = '';
foreach my $direction(@node_directions) {
+ my $element = 'node'.lc($direction);
if ($root->{'node_'.lc($direction)}) {
my $node_direction = $root->{'node_'.lc($direction)};
- my $element = 'node'.lc($direction);
my $node_name = '';
my $attribute = '';
if (!
defined($root->{'extra'}->{'nodes_manuals'}->[$direction_index])) {
@@ -731,7 +741,15 @@
$node_name .=
Texinfo::Common::normalize_top_node_name($self->_convert({
'contents' =>
$node_direction->{'extra'}->{'node_content'}}));
}
- $result .= "<$element${attribute}>$node_name</$element>";
+ $result .=
"$pending_empty_directions<$element${attribute}>$node_name</$element>";
+ $pending_empty_directions = '';
+ } else {
+ if ($root->{'args'}->[$direction_index]) {
+ my $spaces_attribute = $self->_leading_trailing_spaces_arg(
+ $root->{'args'}->[$direction_index]);
+ $pending_empty_directions .= "<$element${spaces_attribute}>".
+ "</$element>";
+ }
}
$direction_index++;
}
@@ -1078,6 +1096,7 @@
if ($prototype->{'type'}
and $prototype->{'type'} eq 'bracketed') {
$attribute = ' bracketed="on"';
+ $attribute .=
_leading_spaces_before_argument($prototype);
} else {
$attribute = '';
}
@@ -1194,6 +1213,7 @@
if ($arg->[1]->{'type'}
and $arg->[1]->{'type'} eq 'bracketed_def_content') {
$attribute .= ' bracketed="on"';
+ $attribute .= _leading_spaces_before_argument($arg->[1]);
}
$result .= "<def$element${attribute}>$content</def$element>";
}
@@ -1277,7 +1297,7 @@
if ($end_command->{'args'}->[0]
and $end_command->{'args'}->[0]->{'contents'});
} else {
- $end_line = "\n";
+ #$end_line = "\n";
}
$result .= $end_line;
}
Index: t/xml_tests.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/xml_tests.t,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/xml_tests.t 3 Sep 2012 21:58:41 -0000 1.13
+++ t/xml_tests.t 8 Sep 2012 21:56:22 -0000 1.14
@@ -166,7 +166,7 @@
@end raggedright @c comm
'],
['comments_on_misc_command_line',
-'@setfilename setfilename name @c setfilename (text)
+'@setfilename comments_on_misc_command_line.info @c setfilename (text)
@definfoenclose phoo,;,: @c definfoenclose (number)
@firstparagraphindent none @c c (number)
@raisesections @c raisesections (skipline)
@@ -184,7 +184,7 @@
Para
@xml
-<in>
+<in />
@end xml
'],
['raw_and_comments',
@@ -194,7 +194,7 @@
Para
@xml @c in xml comment
-<in>
+<in />
@end xml @comment end xml comment
'],
['node_no_section',
@@ -210,7 +210,7 @@
['commands_and_spaces',
'@set foo some @value
address@hidden setfilename name
address@hidden commands_and_spaces.info
@unmacro ggg
@@ -248,7 +248,7 @@
@multitable @columnfractions 0.4 0.6
@end multitable
address@hidden {aa b} @var{cmd}gg hh j
address@hidden {aa b} { r } @var{cmd}gg hh j
@end multitable
@verbatim
@@ -277,6 +277,10 @@
@indicateurl{ http://ggg }
address@hidden { truc } { machin } { bidule } { chose } { arg }
+T
address@hidden deffn
+
'],
['brace_commands_spaces_end_of_lines',
'@image{
Index: t/results/converters_tests/at_commands_in_refs.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/at_commands_in_refs.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/converters_tests/at_commands_in_refs.pl 3 Sep 2012 21:58:41
-0000 1.23
+++ t/results/converters_tests/at_commands_in_refs.pl 8 Sep 2012 21:56:22
-0000 1.24
@@ -22730,7 +22730,7 @@
<chapter spaces=" "><sectiontitle>&result; ° a b <today/>
å</sectiontitle>
</chapter>
-<node
name="_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"
spaces=" " trailingspaces=" "><nodename>Å æ œ Æ
Œ ø Ø ß &lslash; &Lslash; Ð ð Þ
þ</nodename><nodenext automatic="on"><accent type="uml">a</accent>
<accent type="tilde">e</accent> <accent
type="circ"><dotless>i</dotless></accent> <accent type="circ">a</accent>
<accent type="grave">a</accent> <accent type="acute" bracketed="off">e</accent>
<accent type="cedil">c</accent> <accent type="macr">e</accent> <accent
type="ring">e</accent> <accent type="doubleacute">e</accent> <accent
type="ogon">e</accent></nodenext><nodeprev automatic="on">&result; °
a b <today/> å</nodeprev><nodeup automatic="on">Top</nodeup></node>
+<node
name="_00c5-_00e6-_0153-_00c6-_0152-_00f8-_00d8-_00df-_0142-_0141-_00d0-_00f0-_00de-_00fe"
spaces=" "><nodename trailingspaces=" ">Å æ œ Æ
Œ ø Ø ß &lslash; &Lslash; Ð ð Þ
þ</nodename><nodenext automatic="on"><accent type="uml">a</accent>
<accent type="tilde">e</accent> <accent
type="circ"><dotless>i</dotless></accent> <accent type="circ">a</accent>
<accent type="grave">a</accent> <accent type="acute" bracketed="off">e</accent>
<accent type="cedil">c</accent> <accent type="macr">e</accent> <accent
type="ring">e</accent> <accent type="doubleacute">e</accent> <accent
type="ogon">e</accent></nodenext><nodeprev automatic="on">&result; °
a b <today/> å</nodeprev><nodeup automatic="on">Top</nodeup></node>
<chapter spaces=" "><sectiontitle>Å æ œ Æ Œ
ø Ø ß &lslash; &Lslash; Ð ð Þ þ
</sectiontitle>
</chapter>
Index: t/results/converters_tests/things_before_setfilename.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/things_before_setfilename.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/converters_tests/things_before_setfilename.pl 3 Sep 2012
21:58:43 -0000 1.15
+++ t/results/converters_tests/things_before_setfilename.pl 8 Sep 2012
21:56:22 -0000 1.16
@@ -1899,7 +1899,7 @@
<menuentry leadingtext="* "><menunode separator=":: ">An
anchor</menunode><menudescription><pre xml:space="preserve">menu entry pointing
to the anchor.
</pre></menudescription></menuentry></menu>
-<cindex index="cp"><indexterm index="cp">index entry</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">index
entry</indexterm></cindex>
<printindex value="cp" line=" cp"></printindex>
Index: t/results/converters_tests/things_before_setfilename_no_element.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/things_before_setfilename_no_element.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/converters_tests/things_before_setfilename_no_element.pl 3 Sep
2012 21:58:43 -0000 1.15
+++ t/results/converters_tests/things_before_setfilename_no_element.pl 8 Sep
2012 21:56:22 -0000 1.16
@@ -1718,7 +1718,7 @@
<menuentry leadingtext="* "><menunode separator=":: ">An
anchor</menunode><menudescription><pre xml:space="preserve">menu entry pointing
to the anchor.
</pre></menudescription></menuentry></menu>
-<cindex index="cp"><indexterm index="cp">index entry</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">index
entry</indexterm></cindex>
<printindex value="cp" line=" cp"></printindex>
Index: t/results/coverage/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/commands.pl,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- t/results/coverage/commands.pl 27 Aug 2012 22:04:37 -0000 1.57
+++ t/results/coverage/commands.pl 8 Sep 2012 21:56:22 -0000 1.58
@@ -594,7 +594,7 @@
<email><emailaddress>a</emailaddress><emailname spaces="
">b</emailname></email> <code>code --- -- \'\' ``</code>
&textmdash; &textndash; &textrdquo; &textldquo;. <sc>small caps</sc>.
</para>
-<cindex index="cp"><indexterm index="cp">index entry &textldquo;in
text&textrdquo; &latex;</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">index entry &textldquo;in
text&textrdquo; &latex;</indexterm></cindex>
<majorheading spaces=" ">majorheading <b>in b</b></majorheading>
';
Index: t/results/coverage/def.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/def.pl,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- t/results/coverage/def.pl 3 Sep 2012 21:58:43 -0000 1.68
+++ t/results/coverage/def.pl 8 Sep 2012 21:56:22 -0000 1.69
@@ -821,6 +821,9 @@
'text' => 'log trap1'
}
],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 14,
@@ -869,6 +872,9 @@
'name',
{
'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'parent' => {},
'type' => 'bracketed_def_content'
}
@@ -2173,6 +2179,7 @@
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2];
+$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'}
=
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
= $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[4]{'line_nr'}
=
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2]{'line_nr'};
@@ -2180,6 +2187,7 @@
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[5]{'parent'}
= $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'def'}{'contents'}[5]{'contents'}[3];
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'extra'}{'def_args'}[2][1]{'contents'}
=
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'};
+$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'extra'}{'def_args'}[2][1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'extra'}{'def_args'}[2][1]{'parent'}
= $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'extra'}{'def_args'}[4][1]{'contents'}
=
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[4]{'contents'};
$result_trees{'def'}{'contents'}[5]{'contents'}[3]{'extra'}{'def_args'}[4][1]{'parent'}
= $result_trees{'def'}{'contents'}[5]{'contents'}[3]{'args'}[0];
@@ -2631,7 +2639,7 @@
<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
<deffnx spaces=" "><definitionterm><indexterm
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap1</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on"
spaces=" ">log trap1</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2 </deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id <samp>i</samp>
ule</b></indexterm><defcategory>cmde2</defcategory> <deffunction><b>id
<samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
Index: t/results/coverage/multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/multitable.pl,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- t/results/coverage/multitable.pl 3 Sep 2012 21:58:44 -0000 1.58
+++ t/results/coverage/multitable.pl 8 Sep 2012 21:56:23 -0000 1.59
@@ -881,7 +881,7 @@
</para></entry></row></thead><tbody><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces="
"><para>multitable tab
<!-- c comment in multitable -->
</para></entry></row><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item 2 </para></entry><entry command="tab"
spaces=" "><para>multitable tab 2
-<cindex index="cp"><indexterm index="cp">index entry within
multitable</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">index entry within
multitable</indexterm></cindex>
</para></entry></row><row><entry command="item" spaces=" "><para>lone
mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
Index: t/results/coverage/punctuation_in_line_commands.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- t/results/coverage/punctuation_in_line_commands.pl 3 Sep 2012 21:58:44
-0000 1.37
+++ t/results/coverage/punctuation_in_line_commands.pl 8 Sep 2012 21:56:23
-0000 1.38
@@ -1603,7 +1603,7 @@
<listoffloats type="float-type_0021-After-punc" spaces=" ">float type! After
punc</listoffloats>
-<cindex index="cp"><indexterm index="cp">index! After punc</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">index! After
punc</indexterm></cindex>
<heading spaces=" ">heading! After punc</heading>
Index: t/results/coverage/table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/table.pl,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- t/results/coverage/table.pl 3 Sep 2012 21:58:44 -0000 1.62
+++ t/results/coverage/table.pl 8 Sep 2012 21:56:23 -0000 1.63
@@ -853,11 +853,11 @@
<vtable commandarg="samp" spaces=" " endspaces=" "><!-- c samp -->
<beforefirstitem><!-- c after vtable -->
-<cindex index="cp"><indexterm index="cp">index entry</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">index
entry</indexterm></cindex>
</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="samp"><indexterm index="vr">vtable item</indexterm>vtable
item</itemformat></item>
<!-- c after item -->
-<kindex index="ky"><indexterm index="ky">key</indexterm></kindex>
+<kindex index="ky" spaces=" "><indexterm index="ky">key</indexterm></kindex>
<itemx spaces=" "><itemformat command="samp"><indexterm index="vr">itemx
vtable</indexterm>itemx vtable <!-- comment comment in itemx line
--></itemformat></itemx>
</tableterm><tableitem>
</tableitem></tableentry></vtable>
Index: t/results/def/empty_def_arguments.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/empty_def_arguments.pl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- t/results/def/empty_def_arguments.pl 23 Aug 2012 18:14:40 -0000
1.33
+++ t/results/def/empty_def_arguments.pl 8 Sep 2012 21:56:23 -0000
1.34
@@ -460,6 +460,9 @@
'type' => 'empty_spaces_before_argument'
}
],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'line_nr' => {},
'parent' => {},
'type' => 'bracketed'
@@ -496,6 +499,9 @@
'name',
{
'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'parent' => {},
'type' => 'bracketed_def_content'
}
@@ -786,6 +792,7 @@
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0];
+$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]{'line_nr'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0];
@@ -793,6 +800,7 @@
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_args'}[0][1]{'contents'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0]{'contents'};
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_args'}[0][1]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_args'}[2][1]{'contents'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]{'contents'};
+$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_args'}[2][1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_args'}[2][1]{'parent'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'args'}[0];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_args'}[0][1];
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'empty_def_arguments'}{'contents'}[0]{'contents'}[6]{'extra'}{'def_args'}[2][1];
Index: t/results/def/inter_item_commands_in_def.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/def/inter_item_commands_in_def.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/def/inter_item_commands_in_def.pl 23 Aug 2012 18:14:41 -0000
1.18
+++ t/results/def/inter_item_commands_in_def.pl 8 Sep 2012 21:56:23 -0000
1.19
@@ -182,6 +182,9 @@
'text' => 'log trap1'
}
],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 4,
@@ -230,6 +233,9 @@
'name',
{
'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'parent' => {},
'type' => 'bracketed_def_content'
}
@@ -623,6 +629,7 @@
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'}
=
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[4]{'line_nr'}
=
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'line_nr'};
@@ -630,6 +637,7 @@
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[5]{'parent'}
=
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2];
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[2][1]{'contents'}
=
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'};
+$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[2][1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[2][1]{'parent'}
=
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[4][1]{'contents'}
=
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[4]{'contents'};
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'extra'}{'def_args'}[4][1]{'parent'}
=
$result_trees{'inter_item_commands_in_def'}{'contents'}[0]{'contents'}[2]{'args'}[0];
Index: t/results/def/inter_item_commands_in_def_in_example.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/def/inter_item_commands_in_def_in_example.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/def/inter_item_commands_in_def_in_example.pl 23 Aug 2012
18:14:41 -0000 1.6
+++ t/results/def/inter_item_commands_in_def_in_example.pl 8 Sep 2012
21:56:23 -0000 1.7
@@ -200,6 +200,9 @@
'text' => 'log trap1'
}
],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 5,
@@ -248,6 +251,9 @@
'name',
{
'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'parent' => {},
'type' => 'bracketed_def_content'
}
@@ -703,6 +709,7 @@
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2];
+$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'}
=
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[4]{'line_nr'}
=
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'line_nr'};
@@ -710,6 +717,7 @@
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[5]{'parent'}
=
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[2][1]{'contents'}
=
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'};
+$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[2][1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[2][1]{'parent'}
=
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[4][1]{'contents'}
=
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[4]{'contents'};
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'def_args'}[4][1]{'parent'}
=
$result_trees{'inter_item_commands_in_def_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
Index: t/results/def/leading_space_in_def_arg.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/def/leading_space_in_def_arg.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/def/leading_space_in_def_arg.pl 23 Aug 2012 18:14:41 -0000
1.14
+++ t/results/def/leading_space_in_def_arg.pl 8 Sep 2012 21:56:23 -0000
1.15
@@ -37,6 +37,9 @@
'text' => 'name'
}
],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 1,
@@ -74,6 +77,9 @@
'name',
{
'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'parent' => {},
'type' => 'bracketed_def_content'
}
@@ -175,10 +181,12 @@
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'}
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0];
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'}
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
+$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'}
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'leading_space_in_def_arg'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1];
Index: t/results/def/space_in_def_for_index.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/space_in_def_for_index.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/def/space_in_def_for_index.pl 26 Aug 2012 23:00:52 -0000
1.21
+++ t/results/def/space_in_def_for_index.pl 8 Sep 2012 21:56:23 -0000
1.22
@@ -78,6 +78,9 @@
'type' => 'empty_space_at_end_def_bracketed'
}
],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 3,
@@ -106,6 +109,9 @@
'type' => 'empty_space_at_end_def_bracketed'
}
],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'line_nr' => {},
'parent' => {},
'type' => 'bracketed'
@@ -130,6 +136,9 @@
'type' => 'empty_space_at_end_def_bracketed'
}
],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'line_nr' => {},
'parent' => {},
'type' => 'bracketed'
@@ -150,6 +159,9 @@
'category',
{
'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'parent' => {},
'type' => 'bracketed_def_content'
}
@@ -165,6 +177,9 @@
'name',
{
'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'parent' => {},
'type' => 'bracketed_def_content'
}
@@ -180,6 +195,9 @@
'arg',
{
'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'parent' => {},
'type' => 'bracketed_def_content'
}
@@ -478,24 +496,30 @@
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'extra'}{'spaces_before_argument'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[2]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5]{'extra'}{'spaces_before_argument'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
+$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
+$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'contents'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'};
+$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'parent'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'space_in_def_for_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
Index: t/results/def/wrong_braces_simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/def/wrong_braces_simple.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- t/results/def/wrong_braces_simple.pl 23 Aug 2012 18:14:41 -0000
1.31
+++ t/results/def/wrong_braces_simple.pl 8 Sep 2012 21:56:23 -0000
1.32
@@ -391,6 +391,9 @@
'type' => 'empty_spaces_before_argument'
}
],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 7,
@@ -475,6 +478,9 @@
'arg',
{
'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'parent' => {},
'type' => 'bracketed_def_content'
}
@@ -598,6 +604,9 @@
'type' => 'empty_space_at_end_def_bracketed'
}
],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 10,
@@ -682,6 +691,9 @@
'arg',
{
'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'parent' => {},
'type' => 'bracketed_def_content'
}
@@ -1155,6 +1167,9 @@
'type' => 'empty_spaces_before_argument'
}
],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 16,
@@ -1240,6 +1255,9 @@
'arg',
{
'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'parent' => {},
'type' => 'bracketed_def_content'
}
@@ -1306,6 +1324,9 @@
'type' => 'empty_space_at_end_def_bracketed'
}
],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 17,
@@ -1391,6 +1412,9 @@
'arg',
{
'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'parent' => {},
'type' => 'bracketed_def_content'
}
@@ -1525,9 +1549,11 @@
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'wrong_braces_simple'}{'contents'}[4];
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0];
+$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[10][1]{'contents'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
+$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[10][1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[10][1]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'args'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[4]{'contents'}[0]{'extra'}{'def_args'}[2][1];
@@ -1554,9 +1580,11 @@
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[10][1]{'contents'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
+$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[10][1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[10][1]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'args'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[6]{'contents'}[0]{'extra'}{'def_args'}[2][1];
@@ -1613,9 +1641,11 @@
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0];
+$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'extra'}{'def_args'}[10][1]{'contents'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'};
+$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'extra'}{'def_args'}[10][1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'extra'}{'def_args'}[10][1]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'args'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'extra'}{'def_args'}[0][1];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[3]{'extra'}{'def_args'}[2][1];
@@ -1630,9 +1660,11 @@
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'extra'}{'def_args'}[10][1]{'contents'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'contents'};
+$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'extra'}{'def_args'}[10][1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'extra'}{'def_args'}[10][1]{'parent'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'args'}[0];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'extra'}{'def_args'}[0][1];
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'wrong_braces_simple'}{'contents'}[8]{'contents'}[4]{'extra'}{'def_args'}[2][1];
Index: t/results/def/wrong_braces_with_end_of_lines.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/def/wrong_braces_with_end_of_lines.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- t/results/def/wrong_braces_with_end_of_lines.pl 23 Aug 2012 18:14:42
-0000 1.31
+++ t/results/def/wrong_braces_with_end_of_lines.pl 8 Sep 2012 21:56:23
-0000 1.32
@@ -43,6 +43,9 @@
'type' => 'empty_space_at_end_def_bracketed'
}
],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'line_nr' => {
'file_name' => '',
'line_nr' => 1,
@@ -101,6 +104,9 @@
'arg',
{
'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'parent' => {},
'type' => 'bracketed_def_content'
}
@@ -412,9 +418,11 @@
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[2]{'parent'}
=
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'extra'}{'spaces_before_argument'}
=
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0];
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'}
=
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'};
+$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'contents'}[0];
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'}
=
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'wrong_braces_with_end_of_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'def_args'}[2][1];
Index: t/results/indices/empty_index_entry.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/indices/empty_index_entry.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/indices/empty_index_entry.pl 23 Aug 2012 18:14:45 -0000
1.19
+++ t/results/indices/empty_index_entry.pl 8 Sep 2012 21:56:23 -0000
1.20
@@ -83,6 +83,9 @@
'type' => 'empty_spaces_before_argument'
}
],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'line_nr' => {},
'parent' => {},
'type' => 'bracketed'
@@ -118,6 +121,9 @@
'name',
{
'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
'parent' => {},
'type' => 'bracketed_def_content'
}
@@ -265,6 +271,7 @@
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'extra'}{'spaces_before_argument'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[0];
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
@@ -272,6 +279,7 @@
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
+$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[0];
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0];
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[0][1];
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'empty_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_args'}[2][1];
Index: t/results/menu/block_commands_in_menu_description.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/menu/block_commands_in_menu_description.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/menu/block_commands_in_menu_description.pl 3 Sep 2012
21:58:44 -0000 1.10
+++ t/results/menu/block_commands_in_menu_description.pl 8 Sep 2012
21:56:24 -0000 1.11
@@ -1077,7 +1077,6 @@
</pre><verbatim xml:space="preserve">
</verbatim>
-
</menudescription></menuentry></menu>
</top>
';
Index: t/results/menu/formats_in_menu.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/menu/formats_in_menu.pl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- t/results/menu/formats_in_menu.pl 3 Sep 2012 21:58:45 -0000 1.32
+++ t/results/menu/formats_in_menu.pl 8 Sep 2012 21:56:24 -0000 1.33
@@ -1230,7 +1230,6 @@
some @ verb{x atim
* texinfo:: in @ verbatim
</verbatim>
-
<pre xml:space="preserve"></pre></menudescription></menuentry><menuentry
leadingtext="* "><menunode separator="::
">(manual2)</menunode><menudescription><pre xml:space="preserve">%
<html endspaces=" ">
Index: t/results/misc_commands/comment_space_command_on_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- t/results/misc_commands/comment_space_command_on_line.pl 3 Sep 2012
21:58:46 -0000 1.30
+++ t/results/misc_commands/comment_space_command_on_line.pl 8 Sep 2012
21:56:24 -0000 1.31
@@ -1041,7 +1041,7 @@
<frenchspacing value="on" line=" on "></frenchspacing><!-- c comment
frenchspacing -->
-<cindex index="cp"><indexterm index="cp">index entry <spacecmd
type="spc"/></indexterm></cindex><!-- c index entry -->
+<cindex index="cp" spaces=" "><indexterm index="cp">index entry <spacecmd
type="spc"/></indexterm></cindex><!-- c index entry -->
<heading spaces=" ">Heading <spacecmd type="spc"/> </heading><!-- c heading
-->
Index: t/results/multitable/inter_item_commands_in_multitable.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/multitable/inter_item_commands_in_multitable.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- t/results/multitable/inter_item_commands_in_multitable.pl 3 Sep 2012
21:58:46 -0000 1.22
+++ t/results/multitable/inter_item_commands_in_multitable.pl 8 Sep 2012
21:56:24 -0000 1.23
@@ -1314,7 +1314,7 @@
</beforefirstitem><tbody><row><entry command="item" spaces=" "><para>truc
</para>
-<cindex index="cp"><indexterm index="cp">index entry between empty
lines</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">index entry between empty
lines</indexterm></cindex>
</entry></row><row><entry command="item" spaces=" "><para>trouc
<!-- c last comment -->
@@ -1325,13 +1325,13 @@
</para></entry></row></thead><tbody><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces="
"><para>multitable tab
<!-- c comment in multitable -->
</para></entry></row><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item 2 </para></entry><entry command="tab"
spaces=" "><para>multitable tab 2
-<cindex index="cp"><indexterm index="cp">index entry within
multitable</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">index entry within
multitable</indexterm></cindex>
</para></entry></row><row><entry command="item" spaces=" "><para>lone
mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
<multitable spaces=" " endspaces=" "><columnprototypes><columnprototype
bracketed="on">thing</columnprototype></columnprototypes>
<beforefirstitem><para>Title
-<cindex index="cp"><indexterm index="cp">cindex</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">cindex</indexterm></cindex>
</para></beforefirstitem><tbody><row><entry command="item" spaces="
"><para>thing
</para></entry></row></tbody></multitable>
Index: t/results/sectioning/chapter_between_nodes.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/chapter_between_nodes.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/sectioning/chapter_between_nodes.pl 3 Sep 2012 21:58:48
-0000 1.12
+++ t/results/sectioning/chapter_between_nodes.pl 8 Sep 2012 21:56:24
-0000 1.13
@@ -898,7 +898,7 @@
<para>In chapter
</para>
-<node name="section-node" spaces=" "><nodename>section
node</nodename><nodeprev
automatic="on">Top</nodeprev><nodeup>Top</nodeup></node>
+<node name="section-node" spaces=" "><nodename>section
node</nodename><nodenext></nodenext><nodeprev
automatic="on">Top</nodeprev><nodeup>Top</nodeup></node>
<section spaces=" "><sectiontitle>section</sectiontitle>
<para>section.
Index: t/results/sectioning/explicit_node_directions.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/explicit_node_directions.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/sectioning/explicit_node_directions.pl 3 Sep 2012 21:58:48
-0000 1.10
+++ t/results/sectioning/explicit_node_directions.pl 8 Sep 2012 21:56:24
-0000 1.11
@@ -980,7 +980,7 @@
<para>second node
</para>
-<node name="third-node" spaces=" "><nodename>third
node</nodename><nodeprev>second node</nodeprev><nodeup>Top</nodeup></node>
+<node name="third-node" spaces=" "><nodename>third
node</nodename><nodenext></nodenext><nodeprev>second
node</nodeprev><nodeup>Top</nodeup></node>
';
1;
Index: t/results/sectioning/more_sections_than_nodes.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/more_sections_than_nodes.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/sectioning/more_sections_than_nodes.pl 3 Sep 2012 21:58:48
-0000 1.6
+++ t/results/sectioning/more_sections_than_nodes.pl 8 Sep 2012 21:56:24
-0000 1.7
@@ -2131,7 +2131,7 @@
<subsection spaces=" "><sectiontitle>c3 s1 s1</sectiontitle>
</subsection>
-<node name="n-c3-s1-s2" spaces=" "><nodename>n c3 s1 s2</nodename><nodeprev>n
c3</nodeprev><nodeup>Top</nodeup></node>
+<node name="n-c3-s1-s2" spaces=" "><nodename>n c3 s1
s2</nodename><nodenext></nodenext><nodeprev>n
c3</nodeprev><nodeup>Top</nodeup></node>
<subsection spaces=" "><sectiontitle>c3 s1 s2</sectiontitle>
</subsection>
Index: t/results/sectioning/nodes_after_top_before_chapter_nodes.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/sectioning/nodes_after_top_before_chapter_nodes.pl 3 Sep
2012 21:58:48 -0000 1.10
+++ t/results/sectioning/nodes_after_top_before_chapter_nodes.pl 8 Sep
2012 21:56:24 -0000 1.11
@@ -1072,7 +1072,7 @@
<para>second node
</para>
-<node name="third-node" spaces=" "><nodename>third
node</nodename><nodeprev>second node</nodeprev><nodeup>Top</nodeup></node>
+<node name="third-node" spaces=" "><nodename>third
node</nodename><nodenext></nodenext><nodeprev>second
node</nodeprev><nodeup>Top</nodeup></node>
<chapter spaces=" "><sectiontitle>chapter</sectiontitle>
</chapter>
';
Index: t/results/sectioning/nodes_no_node_top_explicit_directions.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/nodes_no_node_top_explicit_directions.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/sectioning/nodes_no_node_top_explicit_directions.pl 3 Sep
2012 21:58:48 -0000 1.9
+++ t/results/sectioning/nodes_no_node_top_explicit_directions.pl 8 Sep
2012 21:56:24 -0000 1.10
@@ -706,14 +706,14 @@
-$result_converted{'xml'}->{'nodes_no_node_top_explicit_directions'} = '<node
name="first" spaces=" "><nodename>first</nodename><nodeup>(dir)</nodeup></node>
+$result_converted{'xml'}->{'nodes_no_node_top_explicit_directions'} = '<node
name="first" spaces="
"><nodename>first</nodename><nodenext></nodenext><nodeprev></nodeprev><nodeup>(dir)</nodeup></node>
<para>first node
</para>
<menu endspaces=" ">
<menuentry leadingtext="* "><menunode separator="::">second
node</menunode><menudescription><pre xml:space="preserve">
</pre></menudescription></menuentry></menu>
-<node name="second-node" spaces=" "><nodename>second
node</nodename><nodeprev>first</nodeprev><nodeup>first</nodeup></node>
+<node name="second-node" spaces=" "><nodename>second
node</nodename><nodenext></nodenext><nodeprev>first</nodeprev><nodeup>first</nodeup></node>
<para>second node
</para>';
Index: t/results/sectioning/part_node_chapter_after_top.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- t/results/sectioning/part_node_chapter_after_top.pl 3 Sep 2012 21:58:49
-0000 1.40
+++ t/results/sectioning/part_node_chapter_after_top.pl 8 Sep 2012 21:56:24
-0000 1.41
@@ -1213,7 +1213,7 @@
<node name="a-node-after-part" spaces=" "><nodename>a node after
part</nodename><nodenext spaces=" ">chapter</nodenext><nodeprev spaces="
">Top</nodeprev><nodeup spaces=" ">Top</nodeup></node>
<para>After a node after part
</para>
-<node name="chapter" spaces=" "><nodename>chapter</nodename><nodenext spaces="
">a node after part</nodenext><nodeup spaces=" ">Top</nodeup></node>
+<node name="chapter" spaces=" "><nodename>chapter</nodename><nodenext spaces="
">a node after part</nodenext><nodeprev></nodeprev><nodeup spaces="
">Top</nodeup></node>
<chapter spaces=" "><sectiontitle>chapter </sectiontitle>
</chapter>
</part>
Index: t/results/sectioning/section_before_top.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/section_before_top.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- t/results/sectioning/section_before_top.pl 3 Sep 2012 21:58:49 -0000
1.31
+++ t/results/sectioning/section_before_top.pl 8 Sep 2012 21:56:25 -0000
1.32
@@ -681,7 +681,7 @@
';
-$result_converted{'xml'}->{'section_before_top'} = '<node name="section-node"
spaces=" "><nodename>section node</nodename><nodeprev
automatic="on">Top</nodeprev><nodeup>Top</nodeup></node>
+$result_converted{'xml'}->{'section_before_top'} = '<node name="section-node"
spaces=" "><nodename>section node</nodename><nodenext></nodenext><nodeprev
automatic="on">Top</nodeprev><nodeup>Top</nodeup></node>
<section spaces=" "><sectiontitle>section </sectiontitle>
</section>
Index: t/results/xml_tests/commands_and_spaces.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xml_tests/commands_and_spaces.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/xml_tests/commands_and_spaces.pl 3 Sep 2012 21:58:49 -0000
1.7
+++ t/results/xml_tests/commands_and_spaces.pl 8 Sep 2012 21:56:25 -0000
1.8
@@ -49,7 +49,7 @@
},
{
'parent' => {},
- 'text' => 'setfilename name'
+ 'text' => 'commands_and_spaces.info'
},
{
'parent' => {},
@@ -65,7 +65,7 @@
'cmdname' => 'setfilename',
'extra' => {
'spaces_after_command' => {},
- 'text_arg' => 'setfilename name'
+ 'text_arg' => 'commands_and_spaces.info'
},
'line_nr' => {
'file_name' => '',
@@ -1118,6 +1118,27 @@
'text' => ' '
},
{
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'r '
+ }
+ ],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
+ 'parent' => {},
+ 'type' => 'bracketed'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
'args' => [
{
'contents' => [
@@ -1195,13 +1216,18 @@
],
'extra' => {
'end_command' => {},
- 'max_columns' => 5,
+ 'max_columns' => 6,
'prototypes' => [
{
'contents' => [],
'parent' => {},
'type' => 'bracketed_multitable_prototype'
},
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'bracketed_multitable_prototype'
+ },
{},
{
'text' => 'gg',
@@ -1228,6 +1254,11 @@
},
{},
{
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
'text' => 'gg',
'type' => 'row_prototype'
},
@@ -1902,6 +1933,352 @@
'text' => '
',
'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'deffn',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'truc'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_space_at_end_def_bracketed'
+ }
+ ],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 70,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'type' => 'bracketed'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'machin'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_space_at_end_def_bracketed'
+ }
+ ],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
+ 'line_nr' => {},
+ 'parent' => {},
+ 'type' => 'bracketed'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'bidule'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_space_at_end_def_bracketed'
+ }
+ ],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
+ 'line_nr' => {},
+ 'parent' => {},
+ 'type' => 'bracketed'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'chose'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_space_at_end_def_bracketed'
+ }
+ ],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
+ 'line_nr' => {},
+ 'parent' => {},
+ 'type' => 'bracketed'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'arg'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_space_at_end_def_bracketed'
+ }
+ ],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
+ 'line_nr' => {},
+ 'parent' => {},
+ 'type' => 'bracketed'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'extra' => {
+ 'def_args' => [
+ [
+ 'category',
+ {
+ 'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
+ 'parent' => {},
+ 'type' => 'bracketed_def_content'
+ }
+ ],
+ [
+ 'spaces',
+ {
+ 'text' => ' ',
+ 'type' => 'spaces'
+ }
+ ],
+ [
+ 'name',
+ {
+ 'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
+ 'parent' => {},
+ 'type' => 'bracketed_def_content'
+ }
+ ],
+ [
+ 'spaces',
+ {
+ 'text' => ' ',
+ 'type' => 'spaces'
+ }
+ ],
+ [
+ 'arg',
+ {
+ 'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
+ 'parent' => {},
+ 'type' => 'bracketed_def_content'
+ }
+ ],
+ [
+ 'spaces',
+ {
+ 'text' => ' ',
+ 'type' => 'spaces'
+ }
+ ],
+ [
+ 'arg',
+ {
+ 'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
+ 'parent' => {},
+ 'type' => 'bracketed_def_content'
+ }
+ ],
+ [
+ 'spaces',
+ {
+ 'text' => ' ',
+ 'type' => 'spaces'
+ }
+ ],
+ [
+ 'arg',
+ {
+ 'contents' => [],
+ 'extra' => {
+ 'spaces_before_argument' => {}
+ },
+ 'parent' => {},
+ 'type' => 'bracketed_def_content'
+ }
+ ]
+ ],
+ 'def_command' => 'deffn',
+ 'def_parsed_hash' => {
+ 'category' => {},
+ 'name' => {}
+ },
+ 'index_entry' => {
+ 'command' => {},
+ 'content' => [
+ {}
+ ],
+ 'content_normalized' => [
+ {}
+ ],
+ 'in_code' => 1,
+ 'index_at_command' => 'deffn',
+ 'index_name' => 'fn',
+ 'index_prefix' => 'f',
+ 'index_type_command' => 'deffn',
+ 'key' => 'machin',
+ 'node' => {},
+ 'number' => 1
+ },
+ 'original_def_cmdname' => 'deffn'
+ },
+ 'line_nr' => {},
+ 'parent' => {},
+ 'type' => 'def_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'T
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'def_item'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'deffn'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'deffn',
+ 'spaces_after_command' => {},
+ 'text_arg' => 'deffn'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 72,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {},
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
}
],
'extra' => {
@@ -2156,10 +2533,14 @@
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[3]{'args'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[3];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[3];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[3]{'extra'}{'spaces_before_argument'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[3]{'contents'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[5]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[5]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[5];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[5]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[6]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'contents'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'contents'}[0]{'args'}[0];
@@ -2172,11 +2553,14 @@
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'end_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'contents'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes'}[0]{'contents'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[1]{'contents'};
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes'}[1]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[3];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[3]{'contents'};
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes'}[2]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[5];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[3];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'prototypes_line'}[5]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[5];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'extra'}{'spaces_after_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'line_nr'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[3]{'line_nr'};
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'line_nr'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'args'}[0]{'contents'}[5]{'line_nr'};
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[27]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[28]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[29];
@@ -2300,6 +2684,77 @@
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'contents'}[1]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[44]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[45]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[3]{'extra'}{'spaces_before_argument'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[3]{'line_nr'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[5]{'extra'}{'spaces_before_argument'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[5]{'line_nr'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[5]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[6]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[7]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[7]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[7]{'extra'}{'spaces_before_argument'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[7]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[7]{'line_nr'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[7]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[9]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[9]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[9];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[9]{'extra'}{'spaces_before_argument'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[9]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[9]{'line_nr'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'contents'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[0][1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'contents'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[2][1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'contents'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'};
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[5]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[4][1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'contents'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[7]{'contents'};
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[7]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[6][1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[8][1]{'contents'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[9]{'contents'};
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[8][1]{'extra'}{'spaces_before_argument'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[9]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[8][1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[0][1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'name'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content'}[0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'content_normalized'}[0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'def_args'}[2][1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'extra'}{'index_entry'}{'node'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'line_nr'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[1]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[1]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[2];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[2]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[2]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[2]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[2];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[2]{'extra'}{'command'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[2]{'extra'}{'spaces_after_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[2]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'extra'}{'end_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[2];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'extra'}{'spaces_after_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'line_nr'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'contents'}[0]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[46]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[47]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'node_content'}[0]
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'node_content'};
$result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[1]{'manual_content'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[1];
@@ -2310,7 +2765,7 @@
$result_texis{'commands_and_spaces'} = '@set foo some @value
address@hidden setfilename name
address@hidden commands_and_spaces.info
@unmacro ggg
@@ -2348,7 +2803,7 @@
@multitable @columnfractions 0.4 0.6
@end multitable
address@hidden {aa b} @var{cmd}gg hh j
address@hidden {aa b} { r } @var{cmd}gg hh j
@end multitable
@verbatim
@@ -2377,6 +2832,10 @@
@indicateurl{ http://ggg }
address@hidden { truc } { machin } { bidule } { chose } { arg }
+T
address@hidden deffn
+
';
@@ -2423,6 +2882,9 @@
http://ggg
+truc: machin bidule chose arg
+T
+
';
$result_sectioning{'commands_and_spaces'} = {};
@@ -2526,14 +2988,14 @@
$result_converted{'xml'}->{'commands_and_spaces'} = '<set name="foo" line="
foo some @value">some @value</set>
-<setfilename file="setfilename name" spaces=" ">setfilename name
</setfilename>
+<setfilename file="commands_and_spaces.info" spaces="
">commands_and_spaces.info </setfilename>
<clickstyle command="arrow" line=" @arrow">@arrow</clickstyle>
<cropmarks line=" after cropmarks."></cropmarks>
-<node name="a" spaces=" " trailingspaces="
"><nodename>a</nodename><nodenext>(b)</nodenext><nodeprev trailingspaces="
">(c)</nodeprev><nodeup spaces=" " trailingspaces=" ">(d)</nodeup></node>
+<node name="a" spaces=" "><nodename trailingspaces="
">a</nodename><nodenext>(b)</nodenext><nodeprev trailingspaces="
">(c)</nodeprev><nodeup spaces=" " trailingspaces=" ">(d)</nodeup></node>
<center spaces=" ">centered </center>
@@ -2563,14 +3025,13 @@
<multitable spaces=" " endspaces=" "><columnfractions line=" 0.4 0.6
"><columnfraction value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
</multitable>
-<multitable spaces=" " endspaces=" "><columnprototypes><columnprototype
bracketed="on">aa b</columnprototype>
<columnprototype><var>cmd</var></columnprototype><columnprototype>gg</columnprototype>
<columnprototype>hh</columnprototype> <columnprototype>j</columnprototype>
</columnprototypes>
+<multitable spaces=" " endspaces=" "><columnprototypes><columnprototype
bracketed="on">aa b</columnprototype> <columnprototype bracketed="on" spaces="
">r </columnprototype>
<columnprototype><var>cmd</var></columnprototype><columnprototype>gg</columnprototype>
<columnprototype>hh</columnprototype> <columnprototype>j</columnprototype>
</columnprototypes>
</multitable>
<verbatim xml:space="preserve">
in verbatim @g
</verbatim>
-
<tex endspaces=" ">
in tex
</tex>
@@ -2593,6 +3054,10 @@
</para>
<para><indicateurl spaces=" ">http://ggg </indicateurl>
</para>
+<deffn spaces=" " endspaces=" "><definitionterm><indexterm index="fn">machin
</indexterm><defcategory bracketed="on" spaces=" ">truc </defcategory>
<deffunction bracketed="on" spaces=" ">machin </deffunction> <defparam
bracketed="on" spaces=" ">bidule </defparam> <defparam bracketed="on" spaces="
">chose </defparam> <defparam bracketed="on" spaces=" ">arg
</defparam></definitionterm>
+<definitionitem><para>T
+</para></definitionitem></deffn>
+
';
1;
Index: t/results/xml_tests/comments_on_misc_command_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xml_tests/comments_on_misc_command_line.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/xml_tests/comments_on_misc_command_line.pl 3 Sep 2012
21:58:50 -0000 1.1
+++ t/results/xml_tests/comments_on_misc_command_line.pl 8 Sep 2012
21:56:25 -0000 1.2
@@ -21,7 +21,7 @@
},
{
'parent' => {},
- 'text' => 'setfilename name'
+ 'text' => 'comments_on_misc_command_line.info'
},
{
'parent' => {},
@@ -48,7 +48,7 @@
'cmdname' => 'setfilename',
'extra' => {
'spaces_after_command' => {},
- 'text_arg' => 'setfilename name'
+ 'text_arg' => 'comments_on_misc_command_line.info'
},
'line_nr' => {
'file_name' => '',
@@ -374,7 +374,7 @@
$result_trees{'comments_on_misc_command_line'}{'contents'}[13]{'contents'}[0]{'parent'}
= $result_trees{'comments_on_misc_command_line'}{'contents'}[13];
$result_trees{'comments_on_misc_command_line'}{'contents'}[13]{'parent'} =
$result_trees{'comments_on_misc_command_line'};
-$result_texis{'comments_on_misc_command_line'} = '@setfilename setfilename
name @c setfilename (text)
+$result_texis{'comments_on_misc_command_line'} = '@setfilename
comments_on_misc_command_line.info @c setfilename (text)
@definfoenclose phoo,;,: @c definfoenclose (number)
@firstparagraphindent none @c c (number)
@raisesections @c raisesections (skipline)
@@ -395,7 +395,7 @@
-$result_converted{'xml'}->{'comments_on_misc_command_line'} = '<setfilename
file="setfilename name" spaces=" ">setfilename name </setfilename><!-- c
setfilename (text) -->
+$result_converted{'xml'}->{'comments_on_misc_command_line'} = '<setfilename
file="comments_on_misc_command_line.info" spaces="
">comments_on_misc_command_line.info </setfilename><!-- c setfilename (text)
-->
<definfoenclose command="phoo" open=";" close=":" line=" phoo,;,:
"></definfoenclose><!-- c definfoenclose (number) -->
<firstparagraphindent value="none" line=" none "></firstparagraphindent><!-- c
c (number) -->
<raisesections line=" @c raisesections (skipline)"></raisesections>
Index: t/results/xml_tests/macro_and_args.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xml_tests/macro_and_args.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/xml_tests/macro_and_args.pl 23 Aug 2012 18:15:28 -0000
1.2
+++ t/results/xml_tests/macro_and_args.pl 8 Sep 2012 21:56:25 -0000
1.3
@@ -168,9 +168,7 @@
$result_converted{'xml'}->{'macro_and_args'} = '<macro name="good" line=" good
{ aaa, 2b-bb}"><formalarg>aaa</formalarg><formalarg>2b-bb</formalarg></macro>
-
<macro name="bad" line=" bad { ggg"@@^_ ff, nnn_b, ccc
v}"><formalarg>ggg"@@^_
ff</formalarg><formalarg>nnn_b</formalarg><formalarg>ccc v</formalarg></macro>
-
';
1;
Index: t/results/xml_tests/raw.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xml_tests/raw.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/xml_tests/raw.pl 3 Sep 2012 21:58:50 -0000 1.6
+++ t/results/xml_tests/raw.pl 8 Sep 2012 21:56:25 -0000 1.7
@@ -112,7 +112,7 @@
'contents' => [
{
'parent' => {},
- 'text' => '<in>
+ 'text' => '<in />
'
}
],
@@ -219,7 +219,7 @@
Para
@xml
-<in>
+<in />
@end xml
';
@@ -237,7 +237,7 @@
</tex>
<para>Para
-<in>
+<in />
</para>';
1;
Index: t/results/xml_tests/raw_and_comments.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xml_tests/raw_and_comments.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/xml_tests/raw_and_comments.pl 3 Sep 2012 21:58:50 -0000
1.1
+++ t/results/xml_tests/raw_and_comments.pl 8 Sep 2012 21:56:25 -0000
1.2
@@ -161,7 +161,7 @@
'contents' => [
{
'parent' => {},
- 'text' => '<in>
+ 'text' => '<in />
'
}
],
@@ -289,7 +289,7 @@
Para
@xml @c in xml comment
-<in>
+<in />
@end xml @comment end xml comment
';
@@ -307,7 +307,7 @@
</tex> <!-- comment other comment -->
<para>Para
-<in>
+<in />
</para>';
1;
Index: t/results/xtable/block_commands_in_table.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xtable/block_commands_in_table.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/xtable/block_commands_in_table.pl 3 Sep 2012 21:58:50 -0000
1.6
+++ t/results/xtable/block_commands_in_table.pl 8 Sep 2012 21:56:25 -0000
1.7
@@ -2273,7 +2273,7 @@
<vtable commandarg="strong" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat
command="strong"><indexterm index="vr">item before ignored
lines</indexterm>item before ignored lines</itemformat></item>
<!-- c comment -->
-<vindex index="vr"><indexterm index="vr">vindex</indexterm></vindex>
+<vindex index="vr" spaces=" "><indexterm index="vr">vindex</indexterm></vindex>
<itemx spaces=" "><itemformat command="strong"><indexterm index="vr">itemx
now</indexterm>itemx now</itemformat></itemx>
</tableterm><tableitem>
<para>Description
Index: t/results/xtable/inter_item_commands_in_table.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xtable/inter_item_commands_in_table.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/xtable/inter_item_commands_in_table.pl 3 Sep 2012 21:58:50
-0000 1.25
+++ t/results/xtable/inter_item_commands_in_table.pl 8 Sep 2012 21:56:25
-0000 1.26
@@ -1914,7 +1914,7 @@
<ftable commandarg="var" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="var"><indexterm
index="fn">a</indexterm>a</itemformat></item>
-<cindex index="cp"><indexterm index="cp">index entry between item and
itemx</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">index entry between item
and itemx</indexterm></cindex>
<!-- c and a comment -->
<!-- comment and another comment -->
<itemx spaces=" "><itemformat command="var"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
@@ -1929,14 +1929,14 @@
</tableitem></tableentry></ftable>
<table commandarg="code" spaces=" " endspaces=" ">
-<beforefirstitem><cindex index="cp"><indexterm index="cp">cindex in
table</indexterm></cindex>
+<beforefirstitem><cindex index="cp" spaces=" "><indexterm index="cp">cindex in
table</indexterm></cindex>
<!-- c comment in table -->
</beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="code">abb</itemformat></item>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></table>
<table commandarg="code" spaces=" " endspaces=" ">
-<beforefirstitem><cindex index="cp"><indexterm index="cp">cindex in
table</indexterm></cindex>
+<beforefirstitem><cindex index="cp" spaces=" "><indexterm index="cp">cindex in
table</indexterm></cindex>
<para>Texte before first item.
</para></beforefirstitem><tableentry><tableterm><item spaces=" "><itemformat
command="code">abb</itemformat></item>
</tableterm></tableentry></table>
Index: t/results/xtable/inter_item_commands_in_table_in_example.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/xtable/inter_item_commands_in_table_in_example.pl 3 Sep 2012
21:58:50 -0000 1.8
+++ t/results/xtable/inter_item_commands_in_table_in_example.pl 8 Sep 2012
21:56:25 -0000 1.9
@@ -634,7 +634,7 @@
$result_converted{'xml'}->{'inter_item_commands_in_table_in_example'} =
'<example endspaces=" ">
<table commandarg="var" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat
command="var">a</itemformat></item>
-<pre xml:space="preserve"><cindex index="cp"><indexterm index="cp">index entry
between item and itemx</indexterm></cindex>
+<pre xml:space="preserve"><cindex index="cp" spaces=" "><indexterm
index="cp">index entry between item and itemx</indexterm></cindex>
<!-- c and a comment -->
<!-- comment and another comment -->
</pre><itemx spaces=" "><itemformat command="var">b</itemformat></itemx>
Index: t/results/xtable/table_nested.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/table_nested.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/xtable/table_nested.pl 3 Sep 2012 21:58:50 -0000 1.23
+++ t/results/xtable/table_nested.pl 8 Sep 2012 21:56:25 -0000 1.24
@@ -3405,7 +3405,6 @@
After table.
</macro>
-
<para>Quotation
</para><quotation endspaces=" ">
<vtable commandarg="asis" spaces=" " endspaces=" ">
Index: tests/layout/res_parser/formatting_xml/formatting.xml
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- tests/layout/res_parser/formatting_xml/formatting.xml 3 Sep 2012
21:58:51 -0000 1.12
+++ tests/layout/res_parser/formatting_xml/formatting.xml 8 Sep 2012
21:56:25 -0000 1.13
@@ -741,7 +741,6 @@
</macro>
-
<copying endspaces=" ">
<para>In copying
</para>
@@ -760,10 +759,10 @@
</para>
<para>&textlsquo;<w></w>&textlsquo;simple-double-<w></w>-three&textmdash;four&textmdash;-&textrsquo;<w></w>&textrsquo;&linebreak;
</para>
-<cindex index="cp"><indexterm index="cp">&textndash;option</indexterm></cindex>
-<cindex index="cp"><indexterm index="cp">&textldquo;</indexterm></cindex>
-<findex index="fn"><indexterm index="fn">&textldquo;</indexterm></findex>
-<findex index="fn"><indexterm
index="fn">&textndash;foption</indexterm></findex>
+<cindex index="cp" spaces=" "><indexterm
index="cp">&textndash;option</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm
index="cp">&textldquo;</indexterm></cindex>
+<findex index="fn" spaces=" "><indexterm
index="fn">&textldquo;</indexterm></findex>
+<findex index="fn" spaces=" "><indexterm
index="fn">&textndash;foption</indexterm></findex>
<para>&arobase;"u <accent type="uml" bracketed="off">u</accent>
&arobase;"{U} <accent type="uml">U</accent>
@@ -1026,7 +1025,7 @@
</para></listitem></itemize>
<itemize spaces=" " endspaces=" "><itemprepend>• a&textndash;n itemize
line</itemprepend>
-<beforefirstitem><cindex index="cp"><indexterm index="cp">index entry within
itemize</indexterm></cindex>
+<beforefirstitem><cindex index="cp" spaces=" "><indexterm index="cp">index
entry within itemize</indexterm></cindex>
</beforefirstitem><listitem spaces=" "><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 1
</para></listitem><listitem spaces=" "><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 2
</para></listitem></itemize>
@@ -1040,7 +1039,7 @@
</para></entry></row></thead><tbody><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces="
"><para>multitable tab
<!-- c comment in multitable -->
</para></entry></row><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item 2 </para></entry><entry command="tab"
spaces=" "><para>multitable tab 2
-<cindex index="cp"><indexterm index="cp">index entry within
multitable</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">index entry within
multitable</indexterm></cindex>
</para></entry></row><row><entry command="item" spaces=" "><para>lone
mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
@@ -1090,10 +1089,10 @@
</para></definitionitem></deffn>
<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
-<cindex index="cp"><indexterm index="cp">index entry within
deffn</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">index entry within
deffn</indexterm></cindex>
<deffnx spaces=" "><definitionterm><indexterm
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap1</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on"
spaces=" ">log trap1</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2 </deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id <samp>i</samp>
ule</b></indexterm><defcategory>cmde2</defcategory> <deffunction><b>id
<samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
@@ -1105,7 +1104,7 @@
<deffnx><definitionterm><indexterm index="fn">machin</indexterm><defcategory
bracketed="on"></defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
<deffnx><definitionterm><indexterm index="fn">bidule
machin</indexterm><defcategory bracketed="on"></defcategory> <deffunction
bracketed="on">bidule machin</deffunction></definitionterm></deffnx>
<deffnx><definitionterm><indexterm index="fn">machin</indexterm><defcategory
bracketed="on">truc</defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory bracketed="on">truc</defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><defcategory bracketed="on">truc</defcategory>
<deffunction bracketed="on" spaces=" "></deffunction></definitionterm></deffnx>
<deffnx><definitionterm><indexterm index="fn">followed</indexterm><defcategory
bracketed="on">truc</defcategory> <deffunction>followed</deffunction>
<defparam>by</defparam> <defparam>a</defparam>
<defparam>comment</defparam></definitionterm></deffnx>
<!-- c comment -->
<deffnx><definitionterm><defcategory
bracketed="on">truc</defcategory></definitionterm></deffnx>
@@ -1278,7 +1277,7 @@
<ftable commandarg="asis" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="fn">a</indexterm>a</itemformat></item>
-<cindex index="cp"><indexterm index="cp">index entry between item and
itemx</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">index entry between item
and itemx</indexterm></cindex>
<itemx spaces=" "><itemformat command="asis"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></ftable>
@@ -1307,7 +1306,6 @@
in verbatim ''
</verbatim>
-
<para> xml para </para> ''
<html endspaces=" ">
@@ -1362,10 +1360,10 @@
</para>
<para>&textlsquo;<w></w>&textlsquo;simple-double-<w></w>-three&textmdash;four&textmdash;-&textrsquo;<w></w>&textrsquo;&linebreak;
</para>
-<cindex index="cp"><indexterm index="cp">&textndash;option</indexterm></cindex>
-<cindex index="cp"><indexterm index="cp">&textldquo;</indexterm></cindex>
-<findex index="fn"><indexterm index="fn">&textldquo;</indexterm></findex>
-<findex index="fn"><indexterm
index="fn">&textndash;foption</indexterm></findex>
+<cindex index="cp" spaces=" "><indexterm
index="cp">&textndash;option</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm
index="cp">&textldquo;</indexterm></cindex>
+<findex index="fn" spaces=" "><indexterm
index="fn">&textldquo;</indexterm></findex>
+<findex index="fn" spaces=" "><indexterm
index="fn">&textndash;foption</indexterm></findex>
<para>&arobase;"u <accent type="uml" bracketed="off">u</accent>
&arobase;"{U} <accent type="uml">U</accent>
@@ -1628,7 +1626,7 @@
</para></listitem></itemize>
<itemize spaces=" " endspaces=" "><itemprepend>• a&textndash;n itemize
line</itemprepend>
-<beforefirstitem><cindex index="cp"><indexterm index="cp">index entry within
itemize</indexterm></cindex>
+<beforefirstitem><cindex index="cp" spaces=" "><indexterm index="cp">index
entry within itemize</indexterm></cindex>
</beforefirstitem><listitem spaces=" "><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 1
</para></listitem><listitem spaces=" "><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 2
</para></listitem></itemize>
@@ -1642,7 +1640,7 @@
</para></entry></row></thead><tbody><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces="
"><para>multitable tab
<!-- c comment in multitable -->
</para></entry></row><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item 2 </para></entry><entry command="tab"
spaces=" "><para>multitable tab 2
-<cindex index="cp"><indexterm index="cp">index entry within
multitable</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">index entry within
multitable</indexterm></cindex>
</para></entry></row><row><entry command="item" spaces=" "><para>lone
mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
@@ -1692,10 +1690,10 @@
</para></definitionitem></deffn>
<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
-<cindex index="cp"><indexterm index="cp">index entry within
deffn</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">index entry within
deffn</indexterm></cindex>
<deffnx spaces=" "><definitionterm><indexterm
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap1</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on"
spaces=" ">log trap1</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2 </deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id <samp>i</samp>
ule</b></indexterm><defcategory>cmde2</defcategory> <deffunction><b>id
<samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
@@ -1707,7 +1705,7 @@
<deffnx><definitionterm><indexterm index="fn">machin</indexterm><defcategory
bracketed="on"></defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
<deffnx><definitionterm><indexterm index="fn">bidule
machin</indexterm><defcategory bracketed="on"></defcategory> <deffunction
bracketed="on">bidule machin</deffunction></definitionterm></deffnx>
<deffnx><definitionterm><indexterm index="fn">machin</indexterm><defcategory
bracketed="on">truc</defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory bracketed="on">truc</defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><defcategory bracketed="on">truc</defcategory>
<deffunction bracketed="on" spaces=" "></deffunction></definitionterm></deffnx>
<deffnx><definitionterm><indexterm index="fn">followed</indexterm><defcategory
bracketed="on">truc</defcategory> <deffunction>followed</deffunction>
<defparam>by</defparam> <defparam>a</defparam>
<defparam>comment</defparam></definitionterm></deffnx>
<!-- c comment -->
<deffnx><definitionterm><defcategory
bracketed="on">truc</defcategory></definitionterm></deffnx>
@@ -1880,7 +1878,7 @@
<ftable commandarg="asis" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="fn">a</indexterm>a</itemformat></item>
-<cindex index="cp"><indexterm index="cp">index entry between item and
itemx</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">index entry between item
and itemx</indexterm></cindex>
<itemx spaces=" "><itemformat command="asis"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></ftable>
@@ -1909,7 +1907,6 @@
in verbatim ''
</verbatim>
-
<para> xml para </para> ''
<html endspaces=" ">
@@ -1964,10 +1961,10 @@
</para>
<para>&textlsquo;<w></w>&textlsquo;simple-double-<w></w>-three&textmdash;four&textmdash;-&textrsquo;<w></w>&textrsquo;&linebreak;
</para>
-<cindex index="cp"><indexterm index="cp">&textndash;option</indexterm></cindex>
-<cindex index="cp"><indexterm index="cp">&textldquo;</indexterm></cindex>
-<findex index="fn"><indexterm index="fn">&textldquo;</indexterm></findex>
-<findex index="fn"><indexterm
index="fn">&textndash;foption</indexterm></findex>
+<cindex index="cp" spaces=" "><indexterm
index="cp">&textndash;option</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm
index="cp">&textldquo;</indexterm></cindex>
+<findex index="fn" spaces=" "><indexterm
index="fn">&textldquo;</indexterm></findex>
+<findex index="fn" spaces=" "><indexterm
index="fn">&textndash;foption</indexterm></findex>
<para>&arobase;"u <accent type="uml" bracketed="off">u</accent>
&arobase;"{U} <accent type="uml">U</accent>
@@ -2230,7 +2227,7 @@
</para></listitem></itemize>
<itemize spaces=" " endspaces=" "><itemprepend>• a&textndash;n itemize
line</itemprepend>
-<beforefirstitem><cindex index="cp"><indexterm index="cp">index entry within
itemize</indexterm></cindex>
+<beforefirstitem><cindex index="cp" spaces=" "><indexterm index="cp">index
entry within itemize</indexterm></cindex>
</beforefirstitem><listitem spaces=" "><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 1
</para></listitem><listitem spaces=" "><prepend>• a&textndash;n itemize
line</prepend><para>i&textndash;tem 2
</para></listitem></itemize>
@@ -2244,7 +2241,7 @@
</para></entry></row></thead><tbody><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item </para></entry><entry command="tab" spaces="
"><para>multitable tab
<!-- c comment in multitable -->
</para></entry></row><row><entry command="item" spaces="
"><para>mu&textndash;ltitable item 2 </para></entry><entry command="tab"
spaces=" "><para>multitable tab 2
-<cindex index="cp"><indexterm index="cp">index entry within
multitable</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">index entry within
multitable</indexterm></cindex>
</para></entry></row><row><entry command="item" spaces=" "><para>lone
mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
@@ -2294,10 +2291,10 @@
</para></definitionitem></deffn>
<deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
-<cindex index="cp"><indexterm index="cp">index entry within
deffn</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">index entry within
deffn</indexterm></cindex>
<deffnx spaces=" "><definitionterm><indexterm
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap1</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on"
spaces=" ">log trap1</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2 </deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id <samp>i</samp>
ule</b></indexterm><defcategory>cmde2</defcategory> <deffunction><b>id
<samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
@@ -2309,7 +2306,7 @@
<deffnx><definitionterm><indexterm index="fn">machin</indexterm><defcategory
bracketed="on"></defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
<deffnx><definitionterm><indexterm index="fn">bidule
machin</indexterm><defcategory bracketed="on"></defcategory> <deffunction
bracketed="on">bidule machin</deffunction></definitionterm></deffnx>
<deffnx><definitionterm><indexterm index="fn">machin</indexterm><defcategory
bracketed="on">truc</defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory bracketed="on">truc</defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><defcategory bracketed="on">truc</defcategory>
<deffunction bracketed="on" spaces=" "></deffunction></definitionterm></deffnx>
<deffnx><definitionterm><indexterm index="fn">followed</indexterm><defcategory
bracketed="on">truc</defcategory> <deffunction>followed</deffunction>
<defparam>by</defparam> <defparam>a</defparam>
<defparam>comment</defparam></definitionterm></deffnx>
<!-- c comment -->
<deffnx><definitionterm><defcategory
bracketed="on">truc</defcategory></definitionterm></deffnx>
@@ -2482,7 +2479,7 @@
<ftable commandarg="asis" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="fn">a</indexterm>a</itemformat></item>
-<cindex index="cp"><indexterm index="cp">index entry between item and
itemx</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">index entry between item
and itemx</indexterm></cindex>
<itemx spaces=" "><itemformat command="asis"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><para>l&textndash;ine
</para></tableitem></tableentry></ftable>
@@ -2511,7 +2508,6 @@
in verbatim ''
</verbatim>
-
<para> xml para </para> ''
<html endspaces=" ">
@@ -2560,10 +2556,10 @@
`<w></w>`simple-double-<w></w>-three---four----'<w></w>'&linebreak;
-<cindex index="cp"><indexterm index="cp">&textndash;option</indexterm></cindex>
-<cindex index="cp"><indexterm index="cp">&textldquo;</indexterm></cindex>
-<findex index="fn"><indexterm index="fn">&textldquo;</indexterm></findex>
-<findex index="fn"><indexterm
index="fn">&textndash;foption</indexterm></findex>
+<cindex index="cp" spaces=" "><indexterm
index="cp">&textndash;option</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm
index="cp">&textldquo;</indexterm></cindex>
+<findex index="fn" spaces=" "><indexterm
index="fn">&textldquo;</indexterm></findex>
+<findex index="fn" spaces=" "><indexterm
index="fn">&textndash;foption</indexterm></findex>
&arobase;"u <accent type="uml" bracketed="off">u</accent>
&arobase;"{U} <accent type="uml">U</accent>
@@ -2826,7 +2822,7 @@
</pre></listitem></itemize>
<pre xml:space="preserve">
</pre><itemize spaces=" " endspaces=" "><itemprepend>• a--n itemize
line</itemprepend>
-<beforefirstitem><pre xml:space="preserve"><cindex index="cp"><indexterm
index="cp">index entry within itemize</indexterm></cindex>
+<beforefirstitem><pre xml:space="preserve"><cindex index="cp" spaces="
"><indexterm index="cp">index entry within itemize</indexterm></cindex>
</pre></beforefirstitem><listitem spaces=" "><prepend>• a--n itemize
line</prepend><pre xml:space="preserve">i--tem 1
</pre></listitem><listitem spaces=" "><prepend>• a--n itemize
line</prepend><pre xml:space="preserve">i--tem 2
</pre></listitem></itemize>
@@ -2840,7 +2836,7 @@
</pre></entry></row></thead><tbody><row><entry command="item" spaces=" "><pre
xml:space="preserve">mu--ltitable item </pre></entry><entry command="tab"
spaces=" "><pre xml:space="preserve">multitable tab
<!-- c comment in multitable -->
</pre></entry></row><row><entry command="item" spaces=" "><pre
xml:space="preserve">mu--ltitable item 2 </pre></entry><entry command="tab"
spaces=" "><pre xml:space="preserve">multitable tab 2
-<cindex index="cp"><indexterm index="cp">index entry within
multitable</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">index entry within
multitable</indexterm></cindex>
</pre></entry></row><row><entry command="item" spaces=" "><pre
xml:space="preserve">lone mu--ltitable item
</pre></entry></row></tbody></multitable>
<pre xml:space="preserve">
@@ -2890,10 +2886,10 @@
</pre></definitionitem></deffn>
<pre xml:space="preserve">
</pre><deffn spaces=" " endspaces=" "><definitionterm><indexterm
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
-<pre xml:space="preserve"><cindex index="cp"><indexterm index="cp">index entry
within deffn</indexterm></cindex>
+<pre xml:space="preserve"><cindex index="cp" spaces=" "><indexterm
index="cp">index entry within deffn</indexterm></cindex>
</pre><deffnx spaces=" "><definitionterm><indexterm
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
-<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction
bracketed="on">log trap1</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm index="fn">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on"
spaces=" ">log trap1</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn">log trap2
</indexterm><defcategory>Command</defcategory> <deffunction bracketed="on">log
trap2 </deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
<deffnx spaces=" "><definitionterm><indexterm index="fn"><b>id <samp>i</samp>
ule</b></indexterm><defcategory>cmde2</defcategory> <deffunction><b>id
<samp>i</samp> ule</b></deffunction>
<defparam>truc</defparam></definitionterm></deffnx>
@@ -2905,7 +2901,7 @@
<deffnx><definitionterm><indexterm index="fn">machin</indexterm><defcategory
bracketed="on"></defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
<deffnx><definitionterm><indexterm index="fn">bidule
machin</indexterm><defcategory bracketed="on"></defcategory> <deffunction
bracketed="on">bidule machin</deffunction></definitionterm></deffnx>
<deffnx><definitionterm><indexterm index="fn">machin</indexterm><defcategory
bracketed="on">truc</defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory bracketed="on">truc</defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><defcategory bracketed="on">truc</defcategory>
<deffunction bracketed="on" spaces=" "></deffunction></definitionterm></deffnx>
<deffnx><definitionterm><indexterm index="fn">followed</indexterm><defcategory
bracketed="on">truc</defcategory> <deffunction>followed</deffunction>
<defparam>by</defparam> <defparam>a</defparam>
<defparam>comment</defparam></definitionterm></deffnx>
<pre xml:space="preserve"><!-- c comment -->
</pre><deffnx><definitionterm><defcategory
bracketed="on">truc</defcategory></definitionterm></deffnx>
@@ -3078,7 +3074,7 @@
<pre xml:space="preserve">
</pre><ftable commandarg="asis" spaces=" " endspaces=" ">
<tableentry><tableterm><item spaces=" "><itemformat command="asis"><indexterm
index="fn">a</indexterm>a</itemformat></item>
-<pre xml:space="preserve"><cindex index="cp"><indexterm index="cp">index entry
between item and itemx</indexterm></cindex>
+<pre xml:space="preserve"><cindex index="cp" spaces=" "><indexterm
index="cp">index entry between item and itemx</indexterm></cindex>
</pre><itemx spaces=" "><itemformat command="asis"><indexterm
index="fn">b</indexterm>b</itemformat></itemx>
</tableterm><tableitem><pre xml:space="preserve">l--ine
</pre></tableitem></tableentry></ftable>
@@ -3106,7 +3102,6 @@
</pre><verbatim xml:space="preserve">
in verbatim ''
</verbatim>
-
<pre xml:space="preserve">
<para> xml para </para> ''
@@ -3139,16 +3134,16 @@
</pre></example>
-<cindex index="cp"><indexterm index="cp">t&textndash;ruc</indexterm></cindex>
-<cindex index="cp"><indexterm index="cp">T&textndash;ruc</indexterm></cindex>
-<cindex index="cp"><indexterm index="cp">.</indexterm></cindex>
-<cindex index="cp"><indexterm index="cp">?</indexterm></cindex>
-<cindex index="cp"><indexterm index="cp">a</indexterm></cindex>
-<findex index="fn"><indexterm index="fn">t&textndash;ruc</indexterm></findex>
-<findex index="fn"><indexterm index="fn">T&textndash;ruc</indexterm></findex>
-<findex index="fn"><indexterm index="fn">.</indexterm></findex>
-<findex index="fn"><indexterm index="fn">?</indexterm></findex>
-<findex index="fn"><indexterm index="fn">a</indexterm></findex>
+<cindex index="cp" spaces=" "><indexterm
index="cp">t&textndash;ruc</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm
index="cp">T&textndash;ruc</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">.</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">?</indexterm></cindex>
+<cindex index="cp" spaces=" "><indexterm index="cp">a</indexterm></cindex>
+<findex index="fn" spaces=" "><indexterm
index="fn">t&textndash;ruc</indexterm></findex>
+<findex index="fn" spaces=" "><indexterm
index="fn">T&textndash;ruc</indexterm></findex>
+<findex index="fn" spaces=" "><indexterm index="fn">.</indexterm></findex>
+<findex index="fn" spaces=" "><indexterm index="fn">?</indexterm></findex>
+<findex index="fn" spaces=" "><indexterm index="fn">a</indexterm></findex>
<para>cp
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp TODO Texinfo/Parser.pm Texinfo/Conve...,
Patrice Dumas <=