[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm Texinfo/Convert/Co...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Parser.pm Texinfo/Convert/Co... |
|
Date: |
Sun, 26 Aug 2012 14:16:00 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 12/08/26 14:15:59
Modified files:
tp/Texinfo : Parser.pm
tp/Texinfo/Convert: Converter.pm XML.pm
tp/t : test_sort.t xml_tests.t
tp/t/results/converters_tests: accent.pl accentenc.pl
at_commands_in_refs.pl
complex_nestings.pl
documentencoding_utf8_and_insertions.pl
inline.pl inline_expand_tex.pl
no_documentencoding_and_insertions.pl
ref_error_formatting.pl
ref_in_sectioning.pl
refs_formatting.pl
some_at_commands_in_ref_nodes.pl
sp_in_example.pl
test_deftypefnnewline.pl
test_sp.pl
things_before_setfilename.pl
things_before_setfilename_no_element.pl
top_in_ref.pl weird_accents.pl
weird_accents_disable_encoding.pl
tp/t/results/coverage: block_commands.pl commands.pl def.pl
lettered_accent_and_spaces.pl
multitable.pl
punctuation_in_line_commands.pl
quotation_author.pl test_errormsg.pl
unknown_accents.pl
tp/t/results/float: complex_float.pl
tp/t/results/info_tests: multitable_anchor_and_index_entry.pl
nested_multitable_anchor_index.pl
tp/t/results/invalid_nestings: bad_tab_nesting.pl center.pl
multitable_in_style_command.pl
multitable_item_in_index.pl
on_block_command_line.pl
tab_in_index.pl
tp/t/results/menu: inlineraw_in_menu_description.pl
tp/t/results/misc_commands: comment_space_command_on_line.pl
definfoenclose_with_empty_arg.pl
tp/t/results/multitable: empty_item_tab.pl
empty_multitable_with_cells.pl
inter_item_commands_in_multitable.pl
multitable_begin_with_tab.pl
multitable_in_example.pl
multitable_not_closed.pl
multitable_not_closed_item.pl
multitable_not_closed_item_tab.pl
multitable_one_column_too_much_cells.pl
multitable_with_empty_item_tab.pl
paragraph_in_cells.pl
prototype_brace_no_brace.pl
prototype_brace_no_brace_comment.pl
prototype_no_brace.pl
w_in_multitable.pl
tp/t/results/plaintext_tests: empty_multitable_in_itemize.pl
multitable.pl nested_multitable.pl
tp/t/results/sectioning: double_node_anchor_float.pl
explicit_node_directions.pl
more_sections_than_nodes.pl
nodes_after_top_before_chapter_nodes.pl
part_node_before_top.pl
part_node_chapter_after_top.pl
two_nodes_between_chapters.pl
tp/t/results/test_count: multitable.pl
tp/t/results/xml_tests: commands_and_spaces.pl
comments_on_block_command_lines.pl
tp/t/results/xtable: definfoenclose_on_table_line.pl
tp/tests/layout/res_parser/formatting_xml: formatting.xml
Added files:
tp/t : collect_spaces.t
Log message:
Add more information to the XML output, leading and trailing spaces in
commands, bracketed information, original line for special line
commands.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.390&r2=1.391
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.84&r2=1.85
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/test_sort.t?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/xml_tests.t?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/collect_spaces.t?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/accent.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/accentenc.pl?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.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/complex_nestings.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/documentencoding_utf8_and_insertions.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/inline.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/inline_expand_tex.pl?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/ref_error_formatting.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/ref_in_sectioning.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/refs_formatting.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/sp_in_example.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/test_deftypefnnewline.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/test_sp.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/things_before_setfilename.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/things_before_setfilename_no_element.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/top_in_ref.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/weird_accents.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/converters_tests/weird_accents_disable_encoding.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/block_commands.pl?cvsroot=texinfo&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/commands.pl?cvsroot=texinfo&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/def.pl?cvsroot=texinfo&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/lettered_accent_and_spaces.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/multitable.pl?cvsroot=texinfo&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/punctuation_in_line_commands.pl?cvsroot=texinfo&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/quotation_author.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/test_errormsg.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/unknown_accents.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/complex_float.pl?cvsroot=texinfo&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/info_tests/nested_multitable_anchor_index.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/bad_tab_nesting.pl?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/center.pl?cvsroot=texinfo&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/multitable_in_style_command.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/multitable_item_in_index.pl?cvsroot=texinfo&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/on_block_command_line.pl?cvsroot=texinfo&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/tab_in_index.pl?cvsroot=texinfo&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/menu/inlineraw_in_menu_description.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/comment_space_command_on_line.pl?cvsroot=texinfo&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/empty_item_tab.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/empty_multitable_with_cells.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/inter_item_commands_in_multitable.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/multitable_begin_with_tab.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/multitable_in_example.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/multitable_not_closed.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/multitable_not_closed_item.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/multitable_not_closed_item_tab.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/multitable_one_column_too_much_cells.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/multitable_with_empty_item_tab.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/paragraph_in_cells.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/prototype_brace_no_brace.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/prototype_brace_no_brace_comment.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/prototype_no_brace.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/multitable/w_in_multitable.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/multitable.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/plaintext_tests/nested_multitable.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl?cvsroot=texinfo&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/explicit_node_directions.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/more_sections_than_nodes.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/nodes_after_top_before_chapter_nodes.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_before_top.pl?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/part_node_chapter_after_top.pl?cvsroot=texinfo&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/two_nodes_between_chapters.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/test_count/multitable.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/commands_and_spaces.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xml_tests/comments_on_block_command_lines.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/definfoenclose_on_table_line.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/layout/res_parser/formatting_xml/formatting.xml?cvsroot=texinfo&r1=1.7&r2=1.8
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -b -r1.390 -r1.391
--- Texinfo/Parser.pm 24 Aug 2012 20:42:54 -0000 1.390
+++ Texinfo/Parser.pm 26 Aug 2012 14:15:01 -0000 1.391
@@ -2765,19 +2765,32 @@
and $current->{'parent'}->{'cmdname'} eq 'multitable') {
# parse the prototypes and put them in a special arg
my @prototype_row;
+ # do the same but keeping spaces information
+ my @prototype_line;
foreach my $content (@{$current->{'contents'}}) {
if ($content->{'type'} and $content->{'type'} eq 'bracketed') {
push @prototype_row, { 'contents' => $content->{'contents'},
'parent' => $content->{'parent'},
'type' => 'bracketed_multitable_prototype'};
+ push @prototype_line, $content;
} elsif ($content->{'text'}) {
if ($content->{'text'} =~ /\S/) {
- foreach my $prototype(split /\s+/, $content->{'text'}) {
+ foreach my $prototype (split /\s+/, $content->{'text'}) {
push @prototype_row, { 'text' => $prototype,
'type' => 'row_prototype' } unless ($prototype eq
'');
}
}
+ foreach my $prototype_or_space (split /\b/, $content->{'text'}) {
+ if ($prototype_or_space =~ /\S/) {
+ push @prototype_line, {'text' => $prototype_or_space,
+ 'type' => 'row_prototype' };
+ } elsif ($prototype_or_space =~ /\s/) {
+ push @prototype_line, {'text' => $prototype_or_space,
+ 'type' => 'prototype_space' };
+ }
+ }
} else {
+ # FIXME could this happen? Should be a debug message?
if (!$content->{'cmdname'}) {
$self->_command_warn($current, $line_nr,
$self->__("Unexpected argument on address@hidden line: %s"),
@@ -2787,6 +2800,7 @@
or $content->{'cmdname'} eq 'comment') {
} else {
push @prototype_row, $content;
+ push @prototype_line, $content;
}
}
}
@@ -2798,6 +2812,7 @@
$self->__("empty multitable"));
}
$multitable->{'extra'}->{'prototypes'} = address@hidden;
+ $multitable->{'extra'}->{'prototypes_line'} = address@hidden;
} else {
$self->_isolate_last_space($current, 'space_at_end_block_command');
@@ -6321,6 +6336,11 @@
textual arguments as arguments, like C<@everyheadingmarks>,
C<@frenchspacing>, C<@alias>, C<@synindex>, C<@columnfractions>.
+=item spaces_after_command
+
+For @-commands followed by spaces, a reference to the corresponding
+text element.
+
=item spaces
For accent commands consisting in letter only, like C<@ringaccent>
@@ -6440,8 +6460,10 @@
The key I<max_columns> holds the maximal number of columns. If there
are prototypes on the line they are in the array associated with
-I<prototypes>. If there is a C<@columnfractions> as argument, then
-the I<columnfractions> key is associated with the array of columnfractions
+I<prototypes>. In that case, I<prototypes_line> also holds this
+information, and, in addition, keeps spaces with type C<prototype_space>.
+If there is a C<@columnfractions> as argument, then the
+I<columnfractions> key is associated with the array of columnfractions
arguments, holding all the column fractions.
=item C<@enumerate>
Index: Texinfo/Convert/Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- Texinfo/Convert/Converter.pm 3 Aug 2012 23:52:23 -0000 1.84
+++ Texinfo/Convert/Converter.pm 26 Aug 2012 14:15:04 -0000 1.85
@@ -535,33 +535,6 @@
warn "You found a bug: $message\n\n".$additional_information;
}
-sub output($$)
-{
- my $self = shift;
- my $root = shift;
-
- $self->_set_outfile();
- return undef unless $self->_create_destination_directory();
-
- my $fh;
- if (! $self->{'output_file'} eq '') {
- $fh = $self->Texinfo::Common::open_out ($self->{'output_file'});
- if (!$fh) {
- $self->document_error(sprintf($self->__("Could not open %s for writing:
%s"),
- $self->{'output_file'}, $!));
- return undef;
- }
- }
-
- $self->_set_global_multiple_commands(-1);
-
- if ($self->get_conf('USE_NODES')) {
- return $self->convert_document_nodes($root, $fh);
- } else {
- return $self->convert_document_sections($root, $fh);
- }
-}
-
# This is not used as code, but used to mark months as strings to be
# translated
if (0) {
@@ -681,6 +654,7 @@
my @contents = @{$contents_possible_comment->{'contents'}};
$comment = pop @contents;
$tree = {'contents' => address@hidden;
+ # FIXME why this selection, and not everything?
foreach my $key ('extra', 'type', 'cmdname', 'parent', 'line_nr') {
$tree->{$key} = $contents_possible_comment->{$key}
if (exists($contents_possible_comment->{$key}));
@@ -711,6 +685,40 @@
return ($converted, $end_line);
}
+sub _collect_leading_trailing_spaces_arg($$)
+{
+ my $self = shift;
+ my $arg = shift;
+ #print STDERR "$arg->{'type'}: @{$arg->{'contents'}}\n";
+ my @result;
+ if ($arg->{'contents'} and $arg->{'contents'}->[0]
+ and defined($arg->{'contents'}->[0]->{'text'})
+ and $arg->{'contents'}->[0]->{'text'} !~ /\S/
+ and defined($arg->{'contents'}->[0]->{'type'})) {
+ #print STDERR "$arg->{'contents'}->[0]->{'type'}\n";
+ warn "Unknown leading space type $arg->{'contents'}->[0]->{'type'}\n"
+ if ($arg->{'contents'}->[0]->{'type'} ne 'empty_spaces_after_command'
+ and $arg->{'contents'}->[0]->{'type'} ne
'empty_spaces_before_argument'
+ # FIXME should we really catch this too?
+ and $arg->{'contents'}->[0]->{'type'} ne 'empty_line_after_command'
+ );
+ $result[0] = $arg->{'contents'}->[0]->{'text'};
+ return @result if (scalar(@{$arg->{'contents'}}) == 1);
+ }
+ if ($arg->{'contents'} and $arg->{'contents'}->[-1]
+ and defined($arg->{'contents'}->[-1]->{'text'})
+ and $arg->{'contents'}->[-1]->{'text'} !~ /\S/
+ and defined($arg->{'contents'}->[-1]->{'type'})) {
+ #print STDERR "$arg->{'contents'}->[-1]->{'type'}\n";
+ warn "Unknown trailing space type $arg->{'contents'}->[-1]->{'type'}\n"
+ if ($arg->{'contents'}->[-1]->{'type'} ne 'spaces_at_end'
+ and $arg->{'contents'}->[-1]->{'type'} ne
'space_at_end_block_command'
+ );
+ $result[1] = $arg->{'contents'}->[-1]->{'text'};
+ }
+ return @result;
+}
+
sub _level_corrected_section($$)
{
my $self = shift;
@@ -726,6 +734,34 @@
return $command;
}
+# generic output method
+sub output($$)
+{
+ my $self = shift;
+ my $root = shift;
+
+ $self->_set_outfile();
+ return undef unless $self->_create_destination_directory();
+
+ my $fh;
+ if (! $self->{'output_file'} eq '') {
+ $fh = $self->Texinfo::Common::open_out ($self->{'output_file'});
+ if (!$fh) {
+ $self->document_error(sprintf($self->__("Could not open %s for writing:
%s"),
+ $self->{'output_file'}, $!));
+ return undef;
+ }
+ }
+
+ $self->_set_global_multiple_commands(-1);
+
+ if ($self->get_conf('USE_NODES')) {
+ return $self->convert_document_nodes($root, $fh);
+ } else {
+ return $self->convert_document_sections($root, $fh);
+ }
+}
+
# output fo $fh if defined, otherwise return the text.
sub _output_text($$$)
{
@@ -778,7 +814,7 @@
return $self->_convert_document_elements($root, $elements, $fh);
}
-
+# if in this container, we are 'inline', within a running text
my @inline_types = ('def_line', 'paragraph', 'preformatted',
'misc_command_arg', 'misc_line_arg', 'block_line_arg',
'menu_entry_name', 'menu_entry_node');
@@ -791,6 +827,8 @@
my %not_inline_commands = (%Texinfo::Common::root_commands,
%Texinfo::Common::block_commands, %Texinfo::Common::context_brace_command);
+# Return 1 if inline in a running text, 0 if right in top-level or block
+# environment, and undef otherwise.
sub _inline_or_block($$)
{
my $self = shift;
@@ -798,13 +836,14 @@
if ($current->{'type'} and $inline_types{$current->{'type'}}) {
return 1;
} elsif ($current->{'cmdname'}
- and $not_inline_commands{$current->{'cmdname'}}) {
+ and exists($not_inline_commands{$current->{'cmdname'}})) {
return 0;
} else {
return undef;
}
}
+# return true if in running text context
sub _is_inline($$)
{
my $self = shift;
@@ -817,6 +856,7 @@
return 0;
}
+# return true if container or parent may hold running text
sub _in_inline($$)
{
my $self = shift;
@@ -845,6 +885,103 @@
$default_args_code_style{$ref_cmd} = [1, undef, undef, 1];
}
+sub convert_accents($$$;$)
+{
+ my $self = shift;
+ my $accent = shift;
+ my $format_accents = shift;
+ my $in_upper_case = shift;
+
+ my ($contents, $stack)
+ = Texinfo::Common::find_innermost_accent_contents($accent);
+ my $result = $self->convert_tree({'contents' => $contents});
+
+ my $encoded;
+ if ($self->get_conf('ENABLE_ENCODING')) {
+ $encoded = Texinfo::Convert::Unicode::encoded_accents($result, $stack,
+ $self->{'encoding_name'},
+ $format_accents,
+ $in_upper_case);
+ }
+ if (!defined($encoded)) {
+ foreach my $accent_command (reverse(@$stack)) {
+ $result = &$format_accents ($result, $accent_command,
+ $in_upper_case);
+ }
+ return $result;
+ } else {
+ return $encoded;
+ }
+}
+
+# This method allows to count words in elements and returns an array
+# and a text already formatted.
+sub sort_element_counts($$;$$)
+{
+ my $converter = shift;
+ my $tree = shift;
+ my $use_sections = shift;
+ my $count_words = shift;
+
+ my $elements;
+ if ($use_sections) {
+ $elements = Texinfo::Structuring::split_by_section($tree);
+ } else {
+ $elements = Texinfo::Structuring::split_by_node($tree);
+ }
+
+ if (!$elements) {
+ @$elements = ($tree);
+ } elsif (scalar(@$elements) >= 1
+ and (!$elements->[0]->{'extra'}->{'node'}
+ and !$elements->[0]->{'extra'}->{'section'})) {
+ shift @$elements;
+ }
+
+ my $max_count = 0;
+ my @name_counts_array;
+ foreach my $element (@$elements) {
+ my $name = 'UNNAMED element';
+ if ($element->{'extra'}
+ and ($element->{'extra'}->{'node'} or
$element->{'extra'}->{'section'})) {
+ my $command = $element->{'extra'}->{'element_command'};
+ if ($command->{'cmdname'} eq 'node') {
+ $name = Texinfo::Convert::Texinfo::convert({'contents'
+ => $command->{'extra'}->{'nodes_manuals'}->[0]->{'node_content'}});
+ } else {
+ $name = "address@hidden>{'cmdname'}"
+ .Texinfo::Convert::Texinfo::convert($command->{'args'}->[0]);
+ }
+ }
+ chomp($name);
+ my $count;
+ my $element_content = $converter->convert_tree($element);
+ if ($count_words) {
+ my @res = split /\W+/, $element_content;
+ $count = scalar(@res);
+ } else {
+ my @res = split /^/, $element_content;
+ $count = scalar(@res);
+ }
+ push @name_counts_array, [$count, $name];
+ if ($count > $max_count) {
+ $max_count = $count;
+ }
+ }
+
+ my @sorted_name_counts_array = sort {$a->[0] <=> $b->[0]} @name_counts_array;
+ @sorted_name_counts_array = reverse(@sorted_name_counts_array);
+
+ my $max_length = length($max_count);
+ my $result = '';
+ foreach my $sorted_count (@sorted_name_counts_array) {
+ $result .= sprintf("%${max_length}d $sorted_count->[1]\n",
$sorted_count->[0]);
+ }
+ return (address@hidden, $result);
+}
+
+# XML related methods and variables that may be used in different
+# XML Converters.
sub xml_protect_text($$)
{
my $self = shift;
@@ -1014,99 +1151,6 @@
return $self->convert_accents($accent, $format_accents, $in_upper_case);
}
-sub convert_accents($$$;$)
-{
- my $self = shift;
- my $accent = shift;
- my $format_accents = shift;
- my $in_upper_case = shift;
-
- my ($contents, $stack)
- = Texinfo::Common::find_innermost_accent_contents($accent);
- my $result = $self->convert_tree({'contents' => $contents});
-
- my $encoded;
- if ($self->get_conf('ENABLE_ENCODING')) {
- $encoded = Texinfo::Convert::Unicode::encoded_accents($result, $stack,
- $self->{'encoding_name'},
- $format_accents,
- $in_upper_case);
- }
- if (!defined($encoded)) {
- foreach my $accent_command (reverse(@$stack)) {
- $result = &$format_accents ($result, $accent_command,
- $in_upper_case);
- }
- return $result;
- } else {
- return $encoded;
- }
-}
-
-sub sort_element_counts($$;$$)
-{
- my $converter = shift;
- my $tree = shift;
- my $use_sections = shift;
- my $count_words = shift;
-
- my $elements;
- if ($use_sections) {
- $elements = Texinfo::Structuring::split_by_section($tree);
- } else {
- $elements = Texinfo::Structuring::split_by_node($tree);
- }
-
- if (!$elements) {
- @$elements = ($tree);
- } elsif (scalar(@$elements) >= 1
- and (!$elements->[0]->{'extra'}->{'node'}
- and !$elements->[0]->{'extra'}->{'section'})) {
- shift @$elements;
- }
-
- my $max_count = 0;
- my @name_counts_array;
- foreach my $element (@$elements) {
- my $name = 'UNNAMED element';
- if ($element->{'extra'}
- and ($element->{'extra'}->{'node'} or
$element->{'extra'}->{'section'})) {
- my $command = $element->{'extra'}->{'element_command'};
- if ($command->{'cmdname'} eq 'node') {
- $name = Texinfo::Convert::Texinfo::convert({'contents'
- => $command->{'extra'}->{'nodes_manuals'}->[0]->{'node_content'}});
- } else {
- $name = "address@hidden>{'cmdname'}"
- .Texinfo::Convert::Texinfo::convert($command->{'args'}->[0]);
- }
- }
- chomp($name);
- my $count;
- my $element_content = $converter->convert_tree($element);
- if ($count_words) {
- my @res = split /\W+/, $element_content;
- $count = scalar(@res);
- } else {
- my @res = split /^/, $element_content;
- $count = scalar(@res);
- }
- push @name_counts_array, [$count, $name];
- if ($count > $max_count) {
- $max_count = $count;
- }
- }
-
- my @sorted_name_counts_array = sort {$a->[0] <=> $b->[0]} @name_counts_array;
- @sorted_name_counts_array = reverse(@sorted_name_counts_array);
-
- my $max_length = length($max_count);
- my $result = '';
- foreach my $sorted_count (@sorted_name_counts_array) {
- $result .= sprintf("%${max_length}d $sorted_count->[1]\n",
$sorted_count->[0]);
- }
- return (address@hidden, $result);
-}
-
1;
__END__
Index: Texinfo/Convert/XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- Texinfo/Convert/XML.pm 24 Aug 2012 23:03:49 -0000 1.71
+++ Texinfo/Convert/XML.pm 26 Aug 2012 14:15:04 -0000 1.72
@@ -216,7 +216,7 @@
'empty_spaces_before_argument',
#'empty_spaces_before_paragraph',
#'empty_spaces_after_close_brace',
- 'empty_space_at_end_def_bracketed',
+ #'empty_space_at_end_def_bracketed',
'menu_entry_separator',
'menu_entry_leading_text',
) {
@@ -338,13 +338,15 @@
return $attribute;
}
-sub _texinfo_xml_accent($$;$)
+sub _texinfo_xml_accent($$;$$)
{
my $text = shift;
my $root = shift;
my $in_upper_case = shift;
+ my $attributes = shift;
+ $attributes = '' if (!defined($attributes));
- my $result = "<accent type=\"$xml_accent_types{$root->{'cmdname'}}\">";
+ my $result = "<accent
type=\"$xml_accent_types{$root->{'cmdname'}}\"${attributes}>";
$result .= $text;
$result .= '</accent>';
return $result;
@@ -392,6 +394,69 @@
return '';
}
+sub _trailing_spaces_arg($$)
+{
+ my $self = shift;
+ my $root = shift;
+
+ my @spaces = $self->_collect_leading_trailing_spaces_arg($root);
+ if (defined($spaces[1])) {
+ chomp($spaces[1]);
+ if ($spaces[1] ne '') {
+ return " trailingspaces=\"$spaces[1]\"";
+ }
+ }
+ return '';
+}
+
+sub _leading_spaces_arg($$)
+{
+ my $self = shift;
+ my $root = shift;
+
+ my $result = '';
+ my @spaces = $self->_collect_leading_trailing_spaces_arg($root);
+ if (defined($spaces[0]) and $spaces[0] ne '') {
+ $result .= " spaces=\"$spaces[0]\"";
+ }
+ return $result;
+}
+
+sub _leading_trailing_spaces_arg($$)
+{
+ my $self = shift;
+ my $root = shift;
+
+ my $result = '';
+ my @spaces = $self->_collect_leading_trailing_spaces_arg($root);
+ if (defined($spaces[0]) and $spaces[0] ne '') {
+ $result .= " spaces=\"$spaces[0]\"";
+ }
+ if (defined($spaces[1])) {
+ chomp($spaces[1]);
+ if ($spaces[1] ne '') {
+ $result .= " trailingspaces=\"$spaces[1]\"";
+ }
+ }
+ return $result;
+}
+
+sub _texinfo_line($$)
+{
+ my $self = shift;
+ my $root = shift;
+
+ my ($comment, $tree) = Texinfo::Convert::Converter::_tree_without_comment(
+ $root);
+ my $line = Texinfo::Convert::Texinfo::convert($tree);
+ chomp($line);
+ if ($line ne '') {
+ return ' line="'.$self->xml_protect_text($line).'"';
+ } else {
+ return '';
+ }
+}
+
my @node_directions = ('Next', 'Prev', 'Up');
sub _convert($$;$);
@@ -457,12 +522,19 @@
if ($self->get_conf('ENABLE_ENCODING')) {
return $self->convert_accents($root, \&_texinfo_xml_accent);
} else {
+ my $attributes = '';
if (!$root->{'args'}) {
$result = '';
} else {
$result = $self->_convert($root->{'args'}->[0]);
+ if ($root->{'extra'} and $root->{'extra'}->{'spaces'}) {
+ $attributes .= " spaces=\"$root->{'extra'}->{'spaces'}\"";
+ }
+ if ($root->{'args'}->[0]->{'type'} eq 'following_arg') {
+ $attributes .= ' bracketed="off"';
}
- return _texinfo_xml_accent($result, $root);
+ }
+ return _texinfo_xml_accent($result, $root, undef, $attributes);
}
} elsif ($root->{'cmdname'} eq 'item' or $root->{'cmdname'} eq 'itemx'
or $root->{'cmdname'} eq 'headitem' or $root->{'cmdname'} eq
'tab') {
@@ -581,7 +653,8 @@
} else {
$nodename = '';
}
- $result .= "<node name=\"$nodename\""._leading_spaces($root).">";
+ $result .= "<node name=\"$nodename\""._leading_spaces($root)
+ .$self->_trailing_spaces_arg($root->{'args'}->[0]).">";
push @{$self->{'document_context'}->[-1]->{'monospace'}}, 1;
$result .= "<nodename>".
$self->_convert({'contents' =>
$root->{'extra'}->{'node_content'}})
@@ -597,6 +670,10 @@
if (!
defined($root->{'extra'}->{'nodes_manuals'}->[$direction_index])) {
$attribute = ' automatic="on"';
}
+ if ($root->{'args'}->[$direction_index]) {
+ $attribute .= $self->_leading_trailing_spaces_arg(
+ $root->{'args'}->[$direction_index]);
+ }
if ($node_direction->{'extra'}->{'manual_content'}) {
$node_name .= $self->_convert({
'contents' => [{'text' => '('},
@@ -730,7 +807,9 @@
}
my $end_line;
if ($root->{'args'}->[0]) {
- $end_line =
$self->_end_line_or_comment($root->{'args'}->[0]->{'contents'})
+ $end_line = $self->_end_line_or_comment(
+ $root->{'args'}->[0]->{'contents'});
+ $attribute .= $self->_texinfo_line($root->{'args'}->[0]);
} else {
$end_line = "\n";
}
@@ -808,10 +887,15 @@
$in_monospace_not_normal
if (defined($in_monospace_not_normal));
my $arg = $self->_convert($root->{'args'}->[$arg_index]);
- if (!defined($command) or $arg ne '') {
+ if ($arg_index > 0) {
+ $attribute .=
+ $self->_leading_spaces_arg($root->{'args'}->[$arg_index]);
+ }
+ if (!defined($command) or $arg ne '' or $attribute ne '') {
# ${attribute} is only set for @verb
$result .= "<$element${attribute}>$arg</$element>";
}
+ $attribute = '';
pop @{$self->{'document_context'}->[-1]->{'monospace'}}
if (defined($in_monospace_not_normal));
} else {
@@ -877,7 +961,8 @@
if ($self->{'expanded_formats_hash'}->{$root->{'cmdname'}}) {
$self->{'document_context'}->[-1]->{'raw'} = 1;
} else {
- $result .=
"<$root->{'cmdname'}${attribute}"._leading_spaces($root).">${prepended_elements}";
+ $result .= "<$root->{'cmdname'}${attribute}"._leading_spaces($root)
+ .">${prepended_elements}";
my $end_line = '';
if ($root->{'args'}) {
if ($commands_args_elements{$root->{'cmdname'}}) {
@@ -898,8 +983,13 @@
} else {
$arg = $self->_convert($root->{'args'}->[$arg_index]);
}
- if ($arg ne '') {
- $result .= "<$element>$arg</$element>";
+ my $spaces = '';
+ if ($arg_index != 0) {
+ $spaces = $self->_leading_spaces_arg(
+ $root->{'args'}->[$arg_index]);
+ }
+ if ($arg ne '' or $spaces ne '') {
+ $result .= "<$element${spaces}>$arg</$element>";
}
pop @{$self->{'document_context'}->[-1]->{'monospace'}}
if ($in_code);
@@ -911,17 +1001,43 @@
} else {
my $contents_possible_comment;
if ($root->{'cmdname'} eq 'multitable' and $root->{'extra'}) {
- if ($root->{'extra'}->{'prototypes'}) {
+ if ($root->{'extra'}->{'prototypes_line'}) {
$result .= "<columnprototypes>";
- foreach my $prototype (@{$root->{'extra'}->{'prototypes'}}) {
- $result .= "<columnprototype>".$self->_convert($prototype)
- ."</columnprototype>";
+ my $first_proto = 1;
+ foreach my $prototype
(@{$root->{'extra'}->{'prototypes_line'}}) {
+ if ($prototype->{'text'} and $prototype->{'text'} !~ /\S/) {
+ if (!$first_proto) {
+ my $spaces = $prototype->{'text'};
+ chomp($spaces);
+ $result .= $spaces;
+ }
+ } else {
+ my $attribute;
+ if ($prototype->{'type'}
+ and $prototype->{'type'} eq 'bracketed') {
+ $attribute = ' bracketed="on"';
+ } else {
+ $attribute = '';
+ }
+ $result .= "<columnprototype${attribute}>".
+ $self->_convert($prototype)."</columnprototype>";
+ }
+ $first_proto = 0;
}
$result .= "</columnprototypes>";
$contents_possible_comment
= $root->{'args'}->[-1]->{'contents'};
} elsif ($root->{'extra'}->{'columnfractions'}) {
- $result .= "<columnfractions>";
+ my $cmd;
+ foreach my $content (@{$root->{'args'}->[0]->{'contents'}}) {
+ if ($content->{'cmdname'}
+ and $content->{'cmdname'} eq 'columnfractions') {
+ $cmd = $content;
+ last;
+ }
+ }
+ my $attribute = $self->_texinfo_line($cmd->{'args'}->[0]);
+ $result .= "<columnfractions${attribute}>";
foreach my $fraction
(@{$root->{'extra'}->{'columnfractions'}}) {
$result .= "<columnfraction
value=\"$fraction\"></columnfraction>";
}
@@ -941,8 +1057,6 @@
}
}
$result .= $end_line;
- #chomp($result);
- #$result .= "\n";
unshift @close_elements, $root->{'cmdname'};
}
}
@@ -959,7 +1073,7 @@
}
if ($root->{'type'} eq 'def_line') {
if ($root->{'cmdname'}) {
- $result .= "<$root->{'cmdname'}>";
+ $result .= "<$root->{'cmdname'}"._leading_spaces($root).">";
}
$result .= "<definitionterm>";
$result .= $self->_index_entry($root);
@@ -996,6 +1110,10 @@
} else {
$element = $type;
}
+ if ($arg->[1]->{'type'}
+ and $arg->[1]->{'type'} eq 'bracketed_def_content') {
+ $attribute .= ' bracketed="on"';
+ }
$result .= "<def$element${attribute}>$content</def$element>";
}
}
Index: t/test_sort.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/test_sort.t,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/test_sort.t 12 Oct 2011 23:52:21 -0000 1.11
+++ t/test_sort.t 26 Aug 2012 14:15:06 -0000 1.12
@@ -50,7 +50,7 @@
push @entries, $entry->{'key'};
}
-#Â e is before E because they are equal and e appears before E in the document
+# e is before E because they are equal and e appears before E in the document
my @entries_ref = ('!', '"', 'aaaaaaaaaaaa', 'e', 'E', 'e~', 'l');
cmp_deeply (address@hidden, address@hidden, 'sorted index entries');
Index: t/xml_tests.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/xml_tests.t,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/xml_tests.t 24 Aug 2012 23:03:49 -0000 1.7
+++ t/xml_tests.t 26 Aug 2012 14:15:07 -0000 1.8
@@ -149,6 +149,29 @@
@clickstyle @arrow
@cropmarks after cropmarks.
+
address@hidden a ,(b),(c) , (d)
+
address@hidden a ,b,c , d,e }
+
address@hidden a ,b
+,c , d,e }
+
address@hidden Note
+Q
address@hidden quotation
+
address@hidden ff , b
+f
address@hidden In caption }j.
address@hidden g.
+
address@hidden @columnfractions 0.4 0.6
address@hidden multitable
+
address@hidden {aa b} @var{cmd}gg hh j
address@hidden multitable
+
'],
);
Index: t/results/converters_tests/accent.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/converters_tests/accent.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/converters_tests/accent.pl 24 Aug 2012 16:43:17 -0000
1.12
+++ t/results/converters_tests/accent.pl 26 Aug 2012 14:15:08 -0000
1.13
@@ -3135,47 +3135,47 @@
$result_converted{'xml'}->{'accent'} = '<node name="Top" spaces="
"><nodename>Top</nodename><nodeup automatic="on">(dir)</nodeup></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
-<para>should be e&textlsquo;: <accent type="grave">e</accent> <accent
type="grave">e</accent>
+<para>should be e&textlsquo;: <accent type="grave">e</accent> <accent
type="grave" bracketed="off">e</accent>
</para>
-<para>should be e&textrsquo;: <accent type="acute">e</accent> <accent
type="acute">e</accent>
+<para>should be e&textrsquo;: <accent type="acute">e</accent> <accent
type="acute" bracketed="off">e</accent>
</para>
-<para>should be e^: <accent type="circ">e</accent> <accent
type="circ">e</accent>
+<para>should be e^: <accent type="circ">e</accent> <accent type="circ"
bracketed="off">e</accent>
</para>
-<para>should be u": <accent type="uml">u</accent> <accent
type="uml">u</accent>
+<para>should be u": <accent type="uml">u</accent> <accent type="uml"
bracketed="off">u</accent>
</para>
-<para>should be i&textlsquo;: <accent type="grave">i</accent> <accent
type="grave">i</accent>
+<para>should be i&textlsquo;: <accent type="grave">i</accent> <accent
type="grave" bracketed="off">i</accent>
</para>
-<para>should be i&textrsquo;: <accent type="acute">i</accent> <accent
type="acute">i</accent>
+<para>should be i&textrsquo;: <accent type="acute">i</accent> <accent
type="acute" bracketed="off">i</accent>
</para>
-<para>should be i^: <accent type="circ">i</accent> <accent
type="circ">i</accent>
+<para>should be i^: <accent type="circ">i</accent> <accent type="circ"
bracketed="off">i</accent>
</para>
-<para>should be u": <accent type="uml">u</accent> <accent
type="uml">u</accent>
+<para>should be u": <accent type="uml">u</accent> <accent type="uml"
bracketed="off">u</accent>
</para>
-<para>should be c,: <accent type="cedil">c</accent> <accent
type="cedil">c</accent>
+<para>should be c,: <accent type="cedil">c</accent> <accent type="cedil"
bracketed="off">c</accent>
</para>
-<para>should be n~: <accent type="tilde">n</accent> <accent
type="tilde">n</accent>
+<para>should be n~: <accent type="tilde">n</accent> <accent type="tilde"
bracketed="off">n</accent>
</para>
-<para>should be e=: <accent type="macr">e</accent> <accent
type="macr">e</accent>
+<para>should be e=: <accent type="macr">e</accent> <accent type="macr"
bracketed="off">e</accent>
</para>
-<para>should be e<w>&textrsquo;</w>&textrsquo;: <accent
type="doubleacute">e</accent> <accent type="doubleacute">e</accent>
+<para>should be e<w>&textrsquo;</w>&textrsquo;: <accent
type="doubleacute">e</accent> <accent type="doubleacute" spaces=" ">e</accent>
</para>
-<para>should be e.: <accent type="dotaccent">e</accent> <accent
type="dotaccent">e</accent>
+<para>should be e.: <accent type="dotaccent">e</accent> <accent
type="dotaccent" spaces=" ">e</accent>
</para>
-<para>should be e*: <accent type="ring">e</accent> <accent
type="ring">e</accent>
+<para>should be e*: <accent type="ring">e</accent> <accent type="ring"
spaces=" ">e</accent>
</para>
<para>should be ee[: <accent type="tieaccent">ee</accent>
</para>
-<para>should be e(: <accent type="breve">e</accent> <accent
type="breve">e</accent>
+<para>should be e(: <accent type="breve">e</accent> <accent type="breve"
spaces=" ">e</accent>
</para>
-<para>should be e_: <accent type="ubaraccent">e</accent> <accent
type="ubaraccent">e</accent>
+<para>should be e_: <accent type="ubaraccent">e</accent> <accent
type="ubaraccent" spaces=" ">e</accent>
</para>
-<para>should be .e: <accent type="udotaccent">e</accent> <accent
type="udotaccent">e</accent>
+<para>should be .e: <accent type="udotaccent">e</accent> <accent
type="udotaccent" spaces=" ">e</accent>
</para>
-<para>should be e<: <accent type="caron">e</accent> <accent
type="caron">e</accent>
+<para>should be e<: <accent type="caron">e</accent> <accent type="caron"
spaces=" ">e</accent>
</para>
-<para>should be a; : <accent type="ogon">a</accent> <accent
type="ogon">a</accent>
+<para>should be a; : <accent type="ogon">a</accent> <accent type="ogon"
spaces=" ">a</accent>
</para>
-<para>should be e; : <accent type="ogon">e</accent> <accent
type="ogon">e</accent>
+<para>should be e; : <accent type="ogon">e</accent> <accent type="ogon"
spaces=" ">e</accent>
</para>
<para>upside down: ¿ ¡
</para>
Index: t/results/converters_tests/accentenc.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/converters_tests/accentenc.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/converters_tests/accentenc.pl 24 Aug 2012 16:43:17 -0000
1.13
+++ t/results/converters_tests/accentenc.pl 26 Aug 2012 14:15:09 -0000
1.14
@@ -3197,47 +3197,47 @@
<node name="Top" spaces=" "><nodename>Top</nodename><nodeup
automatic="on">(dir)</nodeup></node>
<top spaces=" "><sectiontitle>top</sectiontitle>
-<para>should be e&textlsquo;: <accent type="grave">e</accent> <accent
type="grave">e</accent>
+<para>should be e&textlsquo;: <accent type="grave">e</accent> <accent
type="grave" bracketed="off">e</accent>
</para>
-<para>should be e&textrsquo;: <accent type="acute">e</accent> <accent
type="acute">e</accent>
+<para>should be e&textrsquo;: <accent type="acute">e</accent> <accent
type="acute" bracketed="off">e</accent>
</para>
-<para>should be e^: <accent type="circ">e</accent> <accent
type="circ">e</accent>
+<para>should be e^: <accent type="circ">e</accent> <accent type="circ"
bracketed="off">e</accent>
</para>
-<para>should be u": <accent type="uml">u</accent> <accent
type="uml">u</accent>
+<para>should be u": <accent type="uml">u</accent> <accent type="uml"
bracketed="off">u</accent>
</para>
-<para>should be i&textlsquo;: <accent type="grave">i</accent> <accent
type="grave">i</accent>
+<para>should be i&textlsquo;: <accent type="grave">i</accent> <accent
type="grave" bracketed="off">i</accent>
</para>
-<para>should be i&textrsquo;: <accent type="acute">i</accent> <accent
type="acute">i</accent>
+<para>should be i&textrsquo;: <accent type="acute">i</accent> <accent
type="acute" bracketed="off">i</accent>
</para>
-<para>should be i^: <accent type="circ">i</accent> <accent
type="circ">i</accent>
+<para>should be i^: <accent type="circ">i</accent> <accent type="circ"
bracketed="off">i</accent>
</para>
-<para>should be u": <accent type="uml">u</accent> <accent
type="uml">u</accent>
+<para>should be u": <accent type="uml">u</accent> <accent type="uml"
bracketed="off">u</accent>
</para>
-<para>should be c,: <accent type="cedil">c</accent> <accent
type="cedil">c</accent>
+<para>should be c,: <accent type="cedil">c</accent> <accent type="cedil"
bracketed="off">c</accent>
</para>
-<para>should be n~: <accent type="tilde">n</accent> <accent
type="tilde">n</accent>
+<para>should be n~: <accent type="tilde">n</accent> <accent type="tilde"
bracketed="off">n</accent>
</para>
-<para>should be e=: <accent type="macr">e</accent> <accent
type="macr">e</accent>
+<para>should be e=: <accent type="macr">e</accent> <accent type="macr"
bracketed="off">e</accent>
</para>
-<para>should be e<w>&textrsquo;</w>&textrsquo;: <accent
type="doubleacute">e</accent> <accent type="doubleacute">e</accent>
+<para>should be e<w>&textrsquo;</w>&textrsquo;: <accent
type="doubleacute">e</accent> <accent type="doubleacute" spaces=" ">e</accent>
</para>
-<para>should be e.: <accent type="dotaccent">e</accent> <accent
type="dotaccent">e</accent>
+<para>should be e.: <accent type="dotaccent">e</accent> <accent
type="dotaccent" spaces=" ">e</accent>
</para>
-<para>should be e*: <accent type="ring">e</accent> <accent
type="ring">e</accent>
+<para>should be e*: <accent type="ring">e</accent> <accent type="ring"
spaces=" ">e</accent>
</para>
<para>should be ee[: <accent type="tieaccent">ee</accent>
</para>
-<para>should be e(: <accent type="breve">e</accent> <accent
type="breve">e</accent>
+<para>should be e(: <accent type="breve">e</accent> <accent type="breve"
spaces=" ">e</accent>
</para>
-<para>should be e_: <accent type="ubaraccent">e</accent> <accent
type="ubaraccent">e</accent>
+<para>should be e_: <accent type="ubaraccent">e</accent> <accent
type="ubaraccent" spaces=" ">e</accent>
</para>
-<para>should be .e: <accent type="udotaccent">e</accent> <accent
type="udotaccent">e</accent>
+<para>should be .e: <accent type="udotaccent">e</accent> <accent
type="udotaccent" spaces=" ">e</accent>
</para>
-<para>should be e<: <accent type="caron">e</accent> <accent
type="caron">e</accent>
+<para>should be e<: <accent type="caron">e</accent> <accent type="caron"
spaces=" ">e</accent>
</para>
-<para>should be a; : <accent type="ogon">a</accent> <accent
type="ogon">a</accent>
+<para>should be a; : <accent type="ogon">a</accent> <accent type="ogon"
spaces=" ">a</accent>
</para>
-<para>should be e; : <accent type="ogon">e</accent> <accent
type="ogon">e</accent>
+<para>should be e; : <accent type="ogon">e</accent> <accent type="ogon"
spaces=" ">e</accent>
</para>
<para>upside down: ¿ ¡
</para>
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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/converters_tests/at_commands_in_refs.pl 24 Aug 2012 20:42:54
-0000 1.18
+++ t/results/converters_tests/at_commands_in_refs.pl 26 Aug 2012 14:15:10
-0000 1.19
@@ -22334,15 +22334,15 @@
</pre></menudescription></menuentry><menuentry><menunode>ª º &point;
£ &printglyph; ¿ ®istered;</menunode><menudescription><pre
xml:space="preserve">
</pre></menudescription></menuentry><menuentry><menunode>&result; °
a b <today/> å</menunode><menudescription><pre xml:space="preserve">
</pre></menudescription></menuentry><menuentry><menunode>Å æ
œ Æ Œ ø Ø ß &lslash; &Lslash; Ð ð
Þ þ</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><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">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></menunode><menudescription><pre xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode><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></menunode><menudescription><pre xml:space="preserve">
</pre></menudescription></menuentry><menuentry><menunode><accent
type="dotaccent">e</accent> <accent type="breve">e</accent> <accent
type="ubaraccent">e</accent> <accent type="udotaccent">e</accent> <accent
type="caron">e</accent> <dotless>j</dotless> <accent
type="tieaccent">ee</accent></menunode><menudescription><pre
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><dotless>i</dotless>
<accent type="grave"><accent type="macr">E</accent></accent> <accent
type="cedil"><accent
type="acute">C</accent></accent></menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode><dotless>i</dotless>
<accent type="grave"><accent type="macr" bracketed="off">E</accent></accent>
<accent type="cedil"><accent type="acute"
bracketed="off">C</accent></accent></menunode><menudescription><pre
xml:space="preserve">
</pre></menudescription></menuentry><menuentry><menunode>“ ”
‘ ’ „ ‚</menunode><menudescription><pre
xml:space="preserve">
</pre></menudescription></menuentry><menuentry><menunode>« »
« » ‹ ›</menunode><menudescription><pre
xml:space="preserve">
</pre></menudescription></menuentry><menuentry><menunode>`` \'\' --- -- `
\'</menunode><menudescription><pre xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><acronym><acronymword>AAA</acronymword><acronymdesc>fff</acronymdesc></acronym>
<acronym><acronymword>AAA</acronymword></acronym>
<acronym><acronymword>BBB</acronymword></acronym></menunode><menudescription><pre
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><abbr><abbrword>CCC</abbrword><abbrdesc>rrr</abbrdesc></abbr>
<abbr><abbrword>CCC</abbrword></abbr>
<abbr><abbrword>DDD</abbrword></abbr></menunode><menudescription><pre
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><email><emailaddress>someone&arobase;somewher</emailaddress><emailname>the
someone</emailname></email>
<email><emailaddress>no_explain&arobase;there</emailaddress></email></menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode><acronym><acronymword>AAA</acronymword><acronymdesc
spaces=" ">fff</acronymdesc></acronym>
<acronym><acronymword>AAA</acronymword></acronym>
<acronym><acronymword>BBB</acronymword></acronym></menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode><abbr><abbrword>CCC</abbrword><abbrdesc
spaces=" ">rrr</abbrdesc></abbr> <abbr><abbrword>CCC</abbrword></abbr>
<abbr><abbrword>DDD</abbrword></abbr></menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode><email><emailaddress>someone&arobase;somewher</emailaddress><emailname
spaces=" ">the someone</emailname></email>
<email><emailaddress>no_explain&arobase;there</emailaddress></email></menunode><menudescription><pre
xml:space="preserve">
</pre></menudescription></menuentry><menuentry><menunode><image
where="inline"><imagefile>f--ile1</imagefile></image> <image
where="inline"><imagefile>f--ile</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension>e--xt</imageextension></image></menunode><menudescription><pre
xml:space="preserve">
</pre></menudescription></menuentry><menuentry><menunode><verb delimiter=".">
@ {} . </verb></menunode><menudescription><pre xml:space="preserve">
</pre></menudescription></menuentry><menuentry><menunode><cite>cite
<asis>asis</asis></cite> <w>in &arobase;w <b>b</b></w> <r>in r</r> <sc>sc</sc>
<strong>str</strong> <t>t</t> <var>var</var> <dfn>dfn</dfn>
<i>i</i></menunode><menudescription><pre xml:space="preserve">
@@ -22350,7 +22350,7 @@
</pre></menudescription></menuentry><menuentry><menunode>8.27<dmn>in</dmn></menunode><menudescription><pre
xml:space="preserve">
</pre></menudescription></menuentry><menuentry><menunode><sansserif>sansserif</sansserif>
<slanted>slanted</slanted></menunode><menudescription><pre
xml:space="preserve">
</pre></menudescription></menuentry><menuentry><menunode><indicateurl>indicateurl</indicateurl></menunode><menudescription><pre
xml:space="preserve">
-</pre></menudescription></menuentry><menuentry><menunode><url><urefurl>http://somewhere_aaa</urefurl></url>
<url><urefurl>url</urefurl><urefdesc>text</urefdesc></url>
<uref><urefurl>/man.cgi/1/ls</urefurl><urefreplacement>ls</urefreplacement></uref></menunode><menudescription><pre
xml:space="preserve">
+</pre></menudescription></menuentry><menuentry><menunode><url><urefurl>http://somewhere_aaa</urefurl></url>
<url><urefurl>url</urefurl><urefdesc spaces=" ">text</urefdesc></url>
<uref><urefurl>/man.cgi/1/ls</urefurl><urefreplacement>ls</urefreplacement></uref></menunode><menudescription><pre
xml:space="preserve">
</pre></menudescription></menuentry></menu>
</top>
@@ -22386,23 +22386,23 @@
<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=" "><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">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=" " 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>
<chapter spaces=" "><sectiontitle>Å æ œ Æ Œ
ø Ø ß &lslash; &Lslash; Ð ð Þ þ
</sectiontitle>
</chapter>
-<node
name="_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119"
spaces=" "><nodename><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">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></nodename><nodenext automatic="on"><accent
type="dotaccent">e</accent> <accent type="breve">e</accent> <accent
type="ubaraccent">e</accent> <accent type="udotaccent">e</accent> <accent
type="caron">e</accent> <dotless>j</dotless> <accent
type="tieaccent">ee</accent></nodenext><nodeprev automatic="on">Å æ
œ Æ Œ ø Ø ß &lslash; &Lslash; Ð ð
Þ þ</nodeprev><nodeup automatic="on">Top</nodeup></node>
-<chapter spaces=" "><sectiontitle><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">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></sectiontitle>
+<node
name="_00e4-_1ebd-_00ee-_00e2-_00e0-_00e9-_00e7-_0113-e_030a-e_030b-_0119"
spaces=" "><nodename><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></nodename><nodenext automatic="on"><accent
type="dotaccent">e</accent> <accent type="breve">e</accent> <accent
type="ubaraccent">e</accent> <accent type="udotaccent">e</accent> <accent
type="caron">e</accent> <dotless>j</dotless> <accent
type="tieaccent">ee</accent></nodenext><nodeprev automatic="on">Å æ
œ Æ Œ ø Ø ß &lslash; &Lslash; Ð ð
Þ þ</nodeprev><nodeup automatic="on">Top</nodeup></node>
+<chapter spaces=" "><sectiontitle><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></sectiontitle>
</chapter>
-<node name="_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361" spaces="
"><nodename><accent type="dotaccent">e</accent> <accent type="breve">e</accent>
<accent type="ubaraccent">e</accent> <accent type="udotaccent">e</accent>
<accent type="caron">e</accent> <dotless>j</dotless> <accent
type="tieaccent">ee</accent></nodename><nodenext
automatic="on"><dotless>i</dotless> <accent type="grave"><accent
type="macr">E</accent></accent> <accent type="cedil"><accent
type="acute">C</accent></accent></nodenext><nodeprev 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">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></nodeprev><nodeup automatic="on">Top</nodeup></node>
+<node name="_0117-_0115-e_0332-_1eb9-_011b-j-ee_0361" spaces="
"><nodename><accent type="dotaccent">e</accent> <accent type="breve">e</accent>
<accent type="ubaraccent">e</accent> <accent type="udotaccent">e</accent>
<accent type="caron">e</accent> <dotless>j</dotless> <accent
type="tieaccent">ee</accent></nodename><nodenext
automatic="on"><dotless>i</dotless> <accent type="grave"><accent type="macr"
bracketed="off">E</accent></accent> <accent type="cedil"><accent type="acute"
bracketed="off">C</accent></accent></nodenext><nodeprev 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></nodeprev><nodeup automatic="on">Top</nodeup></node>
<chapter spaces=" "><sectiontitle><accent type="dotaccent">e</accent> <accent
type="breve">e</accent> <accent type="ubaraccent">e</accent> <accent
type="udotaccent">e</accent> <accent type="caron">e</accent>
<dotless>j</dotless> <accent type="tieaccent">ee</accent></sectiontitle>
</chapter>
-<node name="_0131-_1e14-_1e08" spaces=" "><nodename><dotless>i</dotless>
<accent type="grave"><accent type="macr">E</accent></accent> <accent
type="cedil"><accent type="acute">C</accent></accent></nodename><nodenext
automatic="on">“ ” ‘ ’ „
‚</nodenext><nodeprev automatic="on"><accent type="dotaccent">e</accent>
<accent type="breve">e</accent> <accent type="ubaraccent">e</accent> <accent
type="udotaccent">e</accent> <accent type="caron">e</accent>
<dotless>j</dotless> <accent type="tieaccent">ee</accent></nodeprev><nodeup
automatic="on">Top</nodeup></node>
-<chapter spaces=" "><sectiontitle><dotless>i</dotless> <accent
type="grave"><accent type="macr">E</accent></accent> <accent
type="cedil"><accent type="acute">C</accent></accent></sectiontitle>
+<node name="_0131-_1e14-_1e08" spaces=" "><nodename><dotless>i</dotless>
<accent type="grave"><accent type="macr" bracketed="off">E</accent></accent>
<accent type="cedil"><accent type="acute"
bracketed="off">C</accent></accent></nodename><nodenext automatic="on">“
” ‘ ’ „ ‚</nodenext><nodeprev
automatic="on"><accent type="dotaccent">e</accent> <accent
type="breve">e</accent> <accent type="ubaraccent">e</accent> <accent
type="udotaccent">e</accent> <accent type="caron">e</accent>
<dotless>j</dotless> <accent type="tieaccent">ee</accent></nodeprev><nodeup
automatic="on">Top</nodeup></node>
+<chapter spaces=" "><sectiontitle><dotless>i</dotless> <accent
type="grave"><accent type="macr" bracketed="off">E</accent></accent> <accent
type="cedil"><accent type="acute"
bracketed="off">C</accent></accent></sectiontitle>
</chapter>
-<node name="_201c-_201d-_2018-_2019-_201e-_201a" spaces=" "><nodename>“
” ‘ ’ „ ‚</nodename><nodenext
automatic="on">« » « » ‹
›</nodenext><nodeprev automatic="on"><dotless>i</dotless> <accent
type="grave"><accent type="macr">E</accent></accent> <accent
type="cedil"><accent type="acute">C</accent></accent></nodeprev><nodeup
automatic="on">Top</nodeup></node>
+<node name="_201c-_201d-_2018-_2019-_201e-_201a" spaces=" "><nodename>“
” ‘ ’ „ ‚</nodename><nodenext
automatic="on">« » « » ‹
›</nodenext><nodeprev automatic="on"><dotless>i</dotless> <accent
type="grave"><accent type="macr" bracketed="off">E</accent></accent> <accent
type="cedil"><accent type="acute"
bracketed="off">C</accent></accent></nodeprev><nodeup
automatic="on">Top</nodeup></node>
<chapter spaces=" "><sectiontitle>“ ” ‘ ’ „
‚</sectiontitle>
</chapter>
@@ -22410,23 +22410,23 @@
<chapter spaces=" "><sectiontitle>« » « » ‹
›</sectiontitle>
</chapter>
-<node name="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027"
spaces=" "><nodename>`` \'\' --- -- ` \'</nodename><nodenext
automatic="on"><acronym><acronymword>AAA</acronymword><acronymdesc>fff</acronymdesc></acronym>
<acronym><acronymword>AAA</acronymword></acronym>
<acronym><acronymword>BBB</acronymword></acronym></nodenext><nodeprev
automatic="on">« » « » ‹
›</nodeprev><nodeup automatic="on">Top</nodeup></node>
+<node name="_0060_0060-_0027_0027-_002d_002d_002d-_002d_002d-_0060-_0027"
spaces=" "><nodename>`` \'\' --- -- ` \'</nodename><nodenext
automatic="on"><acronym><acronymword>AAA</acronymword><acronymdesc spaces="
">fff</acronymdesc></acronym> <acronym><acronymword>AAA</acronymword></acronym>
<acronym><acronymword>BBB</acronymword></acronym></nodenext><nodeprev
automatic="on">« » « » ‹
›</nodeprev><nodeup automatic="on">Top</nodeup></node>
<chapter spaces=" "><sectiontitle>&textldquo; &textrdquo; &textmdash;
&textndash; &textlsquo; &textrsquo;</sectiontitle>
</chapter>
-<node name="AAA-AAA-BBB" spaces="
"><nodename><acronym><acronymword>AAA</acronymword><acronymdesc>fff</acronymdesc></acronym>
<acronym><acronymword>AAA</acronymword></acronym>
<acronym><acronymword>BBB</acronymword></acronym></nodename><nodenext
automatic="on"><abbr><abbrword>CCC</abbrword><abbrdesc>rrr</abbrdesc></abbr>
<abbr><abbrword>CCC</abbrword></abbr>
<abbr><abbrword>DDD</abbrword></abbr></nodenext><nodeprev automatic="on">``
\'\' --- -- ` \'</nodeprev><nodeup automatic="on">Top</nodeup></node>
-<chapter spaces="
"><sectiontitle><acronym><acronymword>AAA</acronymword><acronymdesc>fff</acronymdesc></acronym>
<acronym><acronymword>AAA</acronymword></acronym>
<acronym><acronymword>BBB</acronymword></acronym></sectiontitle>
+<node name="AAA-AAA-BBB" spaces="
"><nodename><acronym><acronymword>AAA</acronymword><acronymdesc spaces="
">fff</acronymdesc></acronym> <acronym><acronymword>AAA</acronymword></acronym>
<acronym><acronymword>BBB</acronymword></acronym></nodename><nodenext
automatic="on"><abbr><abbrword>CCC</abbrword><abbrdesc spaces="
">rrr</abbrdesc></abbr> <abbr><abbrword>CCC</abbrword></abbr>
<abbr><abbrword>DDD</abbrword></abbr></nodenext><nodeprev automatic="on">``
\'\' --- -- ` \'</nodeprev><nodeup automatic="on">Top</nodeup></node>
+<chapter spaces="
"><sectiontitle><acronym><acronymword>AAA</acronymword><acronymdesc spaces="
">fff</acronymdesc></acronym> <acronym><acronymword>AAA</acronymword></acronym>
<acronym><acronymword>BBB</acronymword></acronym></sectiontitle>
</chapter>
-<node name="CCC-CCC-DDD" spaces="
"><nodename><abbr><abbrword>CCC</abbrword><abbrdesc>rrr</abbrdesc></abbr>
<abbr><abbrword>CCC</abbrword></abbr>
<abbr><abbrword>DDD</abbrword></abbr></nodename><nodenext
automatic="on"><email><emailaddress>someone&arobase;somewher</emailaddress><emailname>the
someone</emailname></email>
<email><emailaddress>no_explain&arobase;there</emailaddress></email></nodenext><nodeprev
automatic="on"><acronym><acronymword>AAA</acronymword><acronymdesc>fff</acronymdesc></acronym>
<acronym><acronymword>AAA</acronymword></acronym>
<acronym><acronymword>BBB</acronymword></acronym></nodeprev><nodeup
automatic="on">Top</nodeup></node>
-<chapter spaces="
"><sectiontitle><abbr><abbrword>CCC</abbrword><abbrdesc>rrr</abbrdesc></abbr>
<abbr><abbrword>CCC</abbrword></abbr>
<abbr><abbrword>DDD</abbrword></abbr></sectiontitle>
+<node name="CCC-CCC-DDD" spaces="
"><nodename><abbr><abbrword>CCC</abbrword><abbrdesc spaces="
">rrr</abbrdesc></abbr> <abbr><abbrword>CCC</abbrword></abbr>
<abbr><abbrword>DDD</abbrword></abbr></nodename><nodenext
automatic="on"><email><emailaddress>someone&arobase;somewher</emailaddress><emailname
spaces=" ">the someone</emailname></email>
<email><emailaddress>no_explain&arobase;there</emailaddress></email></nodenext><nodeprev
automatic="on"><acronym><acronymword>AAA</acronymword><acronymdesc spaces="
">fff</acronymdesc></acronym> <acronym><acronymword>AAA</acronymword></acronym>
<acronym><acronymword>BBB</acronymword></acronym></nodeprev><nodeup
automatic="on">Top</nodeup></node>
+<chapter spaces=" "><sectiontitle><abbr><abbrword>CCC</abbrword><abbrdesc
spaces=" ">rrr</abbrdesc></abbr> <abbr><abbrword>CCC</abbrword></abbr>
<abbr><abbrword>DDD</abbrword></abbr></sectiontitle>
</chapter>
-<node name="someone_0040somewher-no_005fexplain_0040there" spaces="
"><nodename><email><emailaddress>someone&arobase;somewher</emailaddress><emailname>the
someone</emailname></email>
<email><emailaddress>no_explain&arobase;there</emailaddress></email></nodename><nodenext
automatic="on"><image where="inline"><imagefile>f--ile1</imagefile></image>
<image
where="inline"><imagefile>f--ile</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension>e--xt</imageextension></image></nodenext><nodeprev
automatic="on"><abbr><abbrword>CCC</abbrword><abbrdesc>rrr</abbrdesc></abbr>
<abbr><abbrword>CCC</abbrword></abbr>
<abbr><abbrword>DDD</abbrword></abbr></nodeprev><nodeup
automatic="on">Top</nodeup></node>
-<chapter spaces="
"><sectiontitle><email><emailaddress>someone&arobase;somewher</emailaddress><emailname>the
someone</emailname></email>
<email><emailaddress>no_explain&arobase;there</emailaddress></email></sectiontitle>
+<node name="someone_0040somewher-no_005fexplain_0040there" spaces="
"><nodename><email><emailaddress>someone&arobase;somewher</emailaddress><emailname
spaces=" ">the someone</emailname></email>
<email><emailaddress>no_explain&arobase;there</emailaddress></email></nodename><nodenext
automatic="on"><image where="inline"><imagefile>f--ile1</imagefile></image>
<image
where="inline"><imagefile>f--ile</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension>e--xt</imageextension></image></nodenext><nodeprev
automatic="on"><abbr><abbrword>CCC</abbrword><abbrdesc spaces="
">rrr</abbrdesc></abbr> <abbr><abbrword>CCC</abbrword></abbr>
<abbr><abbrword>DDD</abbrword></abbr></nodeprev><nodeup
automatic="on">Top</nodeup></node>
+<chapter spaces="
"><sectiontitle><email><emailaddress>someone&arobase;somewher</emailaddress><emailname
spaces=" ">the someone</emailname></email>
<email><emailaddress>no_explain&arobase;there</emailaddress></email></sectiontitle>
</chapter>
-<node name="f_002d_002dile1-f_002d_002dile" spaces=" "><nodename><image
where="inline"><imagefile>f--ile1</imagefile></image> <image
where="inline"><imagefile>f--ile</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension>e--xt</imageextension></image></nodename><nodenext
automatic="on"><verb delimiter="."> @ {} . </verb></nodenext><nodeprev
automatic="on"><email><emailaddress>someone&arobase;somewher</emailaddress><emailname>the
someone</emailname></email>
<email><emailaddress>no_explain&arobase;there</emailaddress></email></nodeprev><nodeup
automatic="on">Top</nodeup></node>
+<node name="f_002d_002dile1-f_002d_002dile" spaces=" "><nodename><image
where="inline"><imagefile>f--ile1</imagefile></image> <image
where="inline"><imagefile>f--ile</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension>e--xt</imageextension></image></nodename><nodenext
automatic="on"><verb delimiter="."> @ {} . </verb></nodenext><nodeprev
automatic="on"><email><emailaddress>someone&arobase;somewher</emailaddress><emailname
spaces=" ">the someone</emailname></email>
<email><emailaddress>no_explain&arobase;there</emailaddress></email></nodeprev><nodeup
automatic="on">Top</nodeup></node>
<chapter spaces=" "><sectiontitle><image
where="inline"><imagefile>f--ile1</imagefile></image> <image
where="inline"><imagefile>f--ile</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension>e--xt</imageextension></image></sectiontitle>
</chapter>
@@ -22450,12 +22450,12 @@
<chapter spaces=" "><sectiontitle><sansserif>sansserif</sansserif>
<slanted>slanted</slanted></sectiontitle>
</chapter>
-<node name="indicateurl" spaces="
"><nodename><indicateurl>indicateurl</indicateurl></nodename><nodenext
automatic="on"><url><urefurl>http://somewhere_aaa</urefurl></url>
<url><urefurl>url</urefurl><urefdesc>text</urefdesc></url>
<uref><urefurl>/man.cgi/1/ls</urefurl><urefreplacement>ls</urefreplacement></uref></nodenext><nodeprev
automatic="on"><sansserif>sansserif</sansserif>
<slanted>slanted</slanted></nodeprev><nodeup automatic="on">Top</nodeup></node>
+<node name="indicateurl" spaces="
"><nodename><indicateurl>indicateurl</indicateurl></nodename><nodenext
automatic="on"><url><urefurl>http://somewhere_aaa</urefurl></url>
<url><urefurl>url</urefurl><urefdesc spaces=" ">text</urefdesc></url>
<uref><urefurl>/man.cgi/1/ls</urefurl><urefreplacement>ls</urefreplacement></uref></nodenext><nodeprev
automatic="on"><sansserif>sansserif</sansserif>
<slanted>slanted</slanted></nodeprev><nodeup automatic="on">Top</nodeup></node>
<chapter spaces="
"><sectiontitle><indicateurl>indicateurl</indicateurl></sectiontitle>
</chapter>
-<node
name="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"
spaces=" "><nodename><url><urefurl>http://somewhere_aaa</urefurl></url>
<url><urefurl>url</urefurl><urefdesc>text</urefdesc></url>
<uref><urefurl>/man.cgi/1/ls</urefurl><urefreplacement>ls</urefreplacement></uref></nodename><nodeprev
automatic="on"><indicateurl>indicateurl</indicateurl></nodeprev><nodeup
automatic="on">Top</nodeup></node>
-<chapter spaces="
"><sectiontitle><url><urefurl>http://somewhere_aaa</urefurl></url>
<url><urefurl>url</urefurl><urefdesc>text</urefdesc></url>
<uref><urefurl>/man.cgi/1/ls</urefurl><urefreplacement>ls</urefreplacement></uref></sectiontitle>
+<node
name="http_003a_002f_002fsomewhere_005faaa-url-_002fman_002ecgi_002f1_002fls"
spaces=" "><nodename><url><urefurl>http://somewhere_aaa</urefurl></url>
<url><urefurl>url</urefurl><urefdesc spaces=" ">text</urefdesc></url>
<uref><urefurl>/man.cgi/1/ls</urefurl><urefreplacement>ls</urefreplacement></uref></nodename><nodeprev
automatic="on"><indicateurl>indicateurl</indicateurl></nodeprev><nodeup
automatic="on">Top</nodeup></node>
+<chapter spaces="
"><sectiontitle><url><urefurl>http://somewhere_aaa</urefurl></url>
<url><urefurl>url</urefurl><urefdesc spaces=" ">text</urefdesc></url>
<uref><urefurl>/man.cgi/1/ls</urefurl><urefreplacement>ls</urefreplacement></uref></sectiontitle>
<para><ref><xrefnodename>&hyphenbreak; { }</xrefnodename></ref>
</para>
@@ -22469,15 +22469,15 @@
<para><ref><xrefnodename>ª º &point; £ &printglyph; ¿
®istered;</xrefnodename></ref>
<ref><xrefnodename>&result; ° a b <today/>
å</xrefnodename></ref>
<ref><xrefnodename>Å æ œ Æ Œ ø Ø
ß &lslash; &Lslash; Ð ð Þ þ</xrefnodename></ref>
-<ref><xrefnodename><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">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></xrefnodename></ref>
+<ref><xrefnodename><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></xrefnodename></ref>
<ref><xrefnodename><accent type="dotaccent">e</accent> <accent
type="breve">e</accent> <accent type="ubaraccent">e</accent> <accent
type="udotaccent">e</accent> <accent type="caron">e</accent>
<dotless>j</dotless> <accent type="tieaccent">ee</accent></xrefnodename></ref>
-<ref><xrefnodename><dotless>i</dotless> <accent type="grave"><accent
type="macr">E</accent></accent> <accent type="cedil"><accent
type="acute">C</accent></accent></xrefnodename></ref>
+<ref><xrefnodename><dotless>i</dotless> <accent type="grave"><accent
type="macr" bracketed="off">E</accent></accent> <accent type="cedil"><accent
type="acute" bracketed="off">C</accent></accent></xrefnodename></ref>
<ref><xrefnodename>“ ” ‘ ’ „
‚</xrefnodename></ref>
<ref><xrefnodename>« » « » ‹
›</xrefnodename></ref>
<ref><xrefnodename>`` \'\' --- -- ` \'</xrefnodename></ref>
-<ref><xrefnodename><acronym><acronymword>AAA</acronymword><acronymdesc>fff</acronymdesc></acronym>
<acronym><acronymword>AAA</acronymword></acronym>
<acronym><acronymword>BBB</acronymword></acronym></xrefnodename></ref>
-<ref><xrefnodename><abbr><abbrword>CCC</abbrword><abbrdesc>rrr</abbrdesc></abbr>
<abbr><abbrword>CCC</abbrword></abbr>
<abbr><abbrword>DDD</abbrword></abbr></xrefnodename></ref>
-<ref><xrefnodename><email><emailaddress>someone&arobase;somewher</emailaddress><emailname>the
someone</emailname></email>
<email><emailaddress>no_explain&arobase;there</emailaddress></email></xrefnodename></ref>
+<ref><xrefnodename><acronym><acronymword>AAA</acronymword><acronymdesc
spaces=" ">fff</acronymdesc></acronym>
<acronym><acronymword>AAA</acronymword></acronym>
<acronym><acronymword>BBB</acronymword></acronym></xrefnodename></ref>
+<ref><xrefnodename><abbr><abbrword>CCC</abbrword><abbrdesc spaces="
">rrr</abbrdesc></abbr> <abbr><abbrword>CCC</abbrword></abbr>
<abbr><abbrword>DDD</abbrword></abbr></xrefnodename></ref>
+<ref><xrefnodename><email><emailaddress>someone&arobase;somewher</emailaddress><emailname
spaces=" ">the someone</emailname></email>
<email><emailaddress>no_explain&arobase;there</emailaddress></email></xrefnodename></ref>
<ref><xrefnodename><image
where="inline"><imagefile>f--ile1</imagefile></image> <image
where="inline"><imagefile>f--ile</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension>e--xt</imageextension></image></xrefnodename></ref>
<ref><xrefnodename><verb delimiter="."> @ {} . </verb></xrefnodename></ref>
<ref><xrefnodename><cite>cite <asis>asis</asis></cite> <w>in &arobase;w
<b>b</b></w> <r>in r</r> <sc>sc</sc> <strong>str</strong> <t>t</t>
<var>var</var> <dfn>dfn</dfn> <i>i</i></xrefnodename></ref>
@@ -22485,7 +22485,7 @@
<ref><xrefnodename>8.27<dmn>in</dmn></xrefnodename></ref>
<ref><xrefnodename><sansserif>sansserif</sansserif>
<slanted>slanted</slanted></xrefnodename></ref>
<ref><xrefnodename><indicateurl>indicateurl</indicateurl></xrefnodename></ref>
-<ref><xrefnodename><url><urefurl>http://somewhere_aaa</urefurl></url>
<url><urefurl>url</urefurl><urefdesc>text</urefdesc></url>
<uref><urefurl>/man.cgi/1/ls</urefurl><urefreplacement>ls</urefreplacement></uref></xrefnodename></ref>
+<ref><xrefnodename><url><urefurl>http://somewhere_aaa</urefurl></url>
<url><urefurl>url</urefurl><urefdesc spaces=" ">text</urefdesc></url>
<uref><urefurl>/man.cgi/1/ls</urefurl><urefreplacement>ls</urefreplacement></uref></xrefnodename></ref>
</para>
</chapter>
<bye></bye>
Index: t/results/converters_tests/complex_nestings.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/complex_nestings.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/converters_tests/complex_nestings.pl 24 Aug 2012 16:43:18
-0000 1.4
+++ t/results/converters_tests/complex_nestings.pl 26 Aug 2012 14:15:11
-0000 1.5
@@ -1619,12 +1619,12 @@
<example>
<pre xml:space="preserve">deffs
-</pre><defun spaces=" "><definitionterm><indexterm index="fn">my
def</indexterm><defcategory automatic="on">Function</defcategory>
<deffunction>my def</deffunction> <defparam>args</defparam>
<defparam><var>arg</var></defparam> <defparam>&dots;</defparam></definitionterm>
-<defunx><definitionterm><indexterm index="fn">other
def</indexterm><defcategory automatic="on">Function</defcategory>
<deffunction>other def</deffunction> <defparam>no</defparam>
<defparam>args</defparam></definitionterm></defunx>
-<definitionitem><deffn spaces=" "><definitionterm><indexterm
index="fn">name</indexterm><defcategory>type</defcategory>
<deffunction>name</deffunction> <defparam>and</defparam>
<defparam>now</defparam> <defparam>the</defparam>
<defparam>args</defparam></definitionterm>
-<definitionitem><defvar spaces=" "><definitionterm><indexterm
index="vr">variables</indexterm><defcategory
automatic="on">Variable</defcategory> <defvariable>variables</defvariable>
<defparam>variable-name</defparam></definitionterm>
+</pre><defun spaces=" "><definitionterm><indexterm index="fn">my
def</indexterm><defcategory automatic="on">Function</defcategory> <deffunction
bracketed="on">my def</deffunction> <defparam>args</defparam>
<defparam><var>arg</var></defparam> <defparam>&dots;</defparam></definitionterm>
+<defunx spaces=" "><definitionterm><indexterm index="fn">other
def</indexterm><defcategory automatic="on">Function</defcategory> <deffunction
bracketed="on">other def</deffunction> <defparam>no</defparam>
<defparam>args</defparam></definitionterm></defunx>
+<definitionitem><deffn spaces=" "><definitionterm><indexterm
index="fn">name</indexterm><defcategory bracketed="on">type</defcategory>
<deffunction bracketed="on">name</deffunction> <defparam>and</defparam>
<defparam>now</defparam> <defparam>the</defparam>
<defparam>args</defparam></definitionterm>
+<definitionitem><defvar spaces=" "><definitionterm><indexterm
index="vr">variables</indexterm><defcategory
automatic="on">Variable</defcategory> <defvariable
bracketed="on">variables</defvariable>
<defparam>variable-name</defparam></definitionterm>
<pre xml:space="preserve">
-</pre><defvarx><definitionterm><indexterm index="vr">variables
too</indexterm><defcategory automatic="on">Variable</defcategory>
<defvariable>variables too</defvariable>
<defparam>other-variable</defparam></definitionterm></defvarx>
+</pre><defvarx spaces=" "><definitionterm><indexterm index="vr">variables
too</indexterm><defcategory automatic="on">Variable</defcategory> <defvariable
bracketed="on">variables too</defvariable>
<defparam>other-variable</defparam></definitionterm></defvarx>
<definitionitem><pre xml:space="preserve">THis is the defvar
A table within the def
Index: t/results/converters_tests/documentencoding_utf8_and_insertions.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/documentencoding_utf8_and_insertions.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/converters_tests/documentencoding_utf8_and_insertions.pl 24 Aug
2012 16:43:18 -0000 1.6
+++ t/results/converters_tests/documentencoding_utf8_and_insertions.pl 26 Aug
2012 14:15:11 -0000 1.7
@@ -322,10 +322,10 @@
$result_converted{'xml'}->{'documentencoding_utf8_and_insertions'} =
'<documentencoding encoding="utf-8" spaces=" ">utf-8</documentencoding>
-<para>&textndash; &textmdash; &textrdquo; &textldquo; &textlsquo; &textrsquo;
<code>in code</code>. <accent type="tilde">e</accent>.
+<para>&textndash; &textmdash; &textrdquo; &textldquo; &textlsquo; &textrsquo;
<code>in code</code>. <accent type="tilde" bracketed="off">e</accent>.
</para>
<example>
-<pre xml:space="preserve">-- --- \'\' `` ` \' <code>in code</code>. <accent
type="tilde">e</accent>.
+<pre xml:space="preserve">-- --- \'\' `` ` \' <code>in code</code>. <accent
type="tilde" bracketed="off">e</accent>.
</pre></example>
';
Index: t/results/converters_tests/inline.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/converters_tests/inline.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/converters_tests/inline.pl 5 Jan 2012 21:03:57 -0000
1.1
+++ t/results/converters_tests/inline.pl 26 Aug 2012 14:15:12 -0000
1.2
@@ -824,18 +824,18 @@
$result_converted{'xml'}->{'inline'} = '
-<para><inlinefmt><inlinefmtformat>html</inlinefmtformat><inlinefmtcontent><blink>html</blink>
&textldquo;</inlinefmtcontent></inlinefmt>,
-<inlinefmt><inlinefmtformat>plaintext</inlinefmtformat><inlinefmtcontent>plaintext
&textldquo;</inlinefmtcontent></inlinefmt>,
+<para><inlinefmt><inlinefmtformat>html</inlinefmtformat><inlinefmtcontent
spaces=" "><blink>html</blink>
&textldquo;</inlinefmtcontent></inlinefmt>,
+<inlinefmt><inlinefmtformat>plaintext</inlinefmtformat><inlinefmtcontent
spaces=" ">plaintext &textldquo;</inlinefmtcontent></inlinefmt>,
<para>xml</para> &textldquo;,
-<inlinefmt><inlinefmtformat>docbook</inlinefmtformat><inlinefmtcontent><emphasis>docbook</emphasis>
&textldquo;</inlinefmtcontent></inlinefmt>,
-<inlinefmt><inlinefmtformat>tex</inlinefmtformat><inlinefmtcontent>$\\underlinea
< b <code>tex \\hbox code </code></inlinefmtcontent></inlinefmt>$
&textldquo;
+<inlinefmt><inlinefmtformat>docbook</inlinefmtformat><inlinefmtcontent
spaces=" "><emphasis>docbook</emphasis>
&textldquo;</inlinefmtcontent></inlinefmt>,
+<inlinefmt><inlinefmtformat>tex</inlinefmtformat><inlinefmtcontent spaces="
">$\\underlinea < b <code>tex \\hbox code
</code></inlinefmtcontent></inlinefmt>$ &textldquo;
</para>
-<para><inlineraw><inlinerawformat>html</inlinerawformat><inlinerawcontent>raw
<blink>html</blink> &textldquo;</inlinerawcontent></inlineraw>,
-<inlineraw><inlinerawformat>plaintext</inlinerawformat><inlinerawcontent>raw
plaintext &textldquo;</inlinerawcontent></inlineraw>,
+<para><inlineraw><inlinerawformat>html</inlinerawformat><inlinerawcontent
spaces=" ">raw <blink>html</blink>
&textldquo;</inlinerawcontent></inlineraw>,
+<inlineraw><inlinerawformat>plaintext</inlinerawformat><inlinerawcontent
spaces=" ">raw plaintext &textldquo;</inlinerawcontent></inlineraw>,
raw <para>xml</para> ``,
-<inlineraw><inlinerawformat>docbook</inlinerawformat><inlinerawcontent>raw
<emphasis>docbook</emphasis>
&textldquo;</inlinerawcontent></inlineraw>,
-<inlineraw><inlinerawformat>tex</inlinerawformat><inlinerawcontent>raw
$\\underline{a < b <code>tex \\hbox{ code }</code>}$
&textldquo;</inlinerawcontent></inlineraw>
+<inlineraw><inlinerawformat>docbook</inlinerawformat><inlinerawcontent
spaces=" ">raw <emphasis>docbook</emphasis>
&textldquo;</inlinerawcontent></inlineraw>,
+<inlineraw><inlinerawformat>tex</inlinerawformat><inlinerawcontent spaces="
">raw $\\underline{a < b <code>tex \\hbox{ code }</code>}$
&textldquo;</inlinerawcontent></inlineraw>
</para>';
Index: t/results/converters_tests/inline_expand_tex.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/inline_expand_tex.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- t/results/converters_tests/inline_expand_tex.pl 24 Jan 2012 22:16:57
-0000 1.2
+++ t/results/converters_tests/inline_expand_tex.pl 26 Aug 2012 14:15:12
-0000 1.3
@@ -824,17 +824,17 @@
$result_converted{'xml'}->{'inline_expand_tex'} = '
-<para><inlinefmt><inlinefmtformat>html</inlinefmtformat><inlinefmtcontent><blink>html</blink>
&textldquo;</inlinefmtcontent></inlinefmt>,
-<inlinefmt><inlinefmtformat>plaintext</inlinefmtformat><inlinefmtcontent>plaintext
&textldquo;</inlinefmtcontent></inlinefmt>,
-<inlinefmt><inlinefmtformat>xml</inlinefmtformat><inlinefmtcontent><para>xml</para>
&textldquo;</inlinefmtcontent></inlinefmt>,
-<inlinefmt><inlinefmtformat>docbook</inlinefmtformat><inlinefmtcontent><emphasis>docbook</emphasis>
&textldquo;</inlinefmtcontent></inlinefmt>,
+<para><inlinefmt><inlinefmtformat>html</inlinefmtformat><inlinefmtcontent
spaces=" "><blink>html</blink>
&textldquo;</inlinefmtcontent></inlinefmt>,
+<inlinefmt><inlinefmtformat>plaintext</inlinefmtformat><inlinefmtcontent
spaces=" ">plaintext &textldquo;</inlinefmtcontent></inlinefmt>,
+<inlinefmt><inlinefmtformat>xml</inlinefmtformat><inlinefmtcontent spaces="
"><para>xml</para> &textldquo;</inlinefmtcontent></inlinefmt>,
+<inlinefmt><inlinefmtformat>docbook</inlinefmtformat><inlinefmtcontent
spaces=" "><emphasis>docbook</emphasis>
&textldquo;</inlinefmtcontent></inlinefmt>,
$\\underlinea < b <code>tex \\hbox code </code>$ &textldquo;
</para>
-<para><inlineraw><inlinerawformat>html</inlinerawformat><inlinerawcontent>raw
<blink>html</blink> &textldquo;</inlinerawcontent></inlineraw>,
-<inlineraw><inlinerawformat>plaintext</inlinerawformat><inlinerawcontent>raw
plaintext &textldquo;</inlinerawcontent></inlineraw>,
-<inlineraw><inlinerawformat>xml</inlinerawformat><inlinerawcontent>raw
<para>xml</para> &textldquo;</inlinerawcontent></inlineraw>,
-<inlineraw><inlinerawformat>docbook</inlinerawformat><inlinerawcontent>raw
<emphasis>docbook</emphasis>
&textldquo;</inlinerawcontent></inlineraw>,
+<para><inlineraw><inlinerawformat>html</inlinerawformat><inlinerawcontent
spaces=" ">raw <blink>html</blink>
&textldquo;</inlinerawcontent></inlineraw>,
+<inlineraw><inlinerawformat>plaintext</inlinerawformat><inlinerawcontent
spaces=" ">raw plaintext &textldquo;</inlinerawcontent></inlineraw>,
+<inlineraw><inlinerawformat>xml</inlinerawformat><inlinerawcontent spaces="
">raw <para>xml</para> &textldquo;</inlinerawcontent></inlineraw>,
+<inlineraw><inlinerawformat>docbook</inlinerawformat><inlinerawcontent
spaces=" ">raw <emphasis>docbook</emphasis>
&textldquo;</inlinerawcontent></inlineraw>,
raw $\\underline{a < b <code>tex \\hbox{ code }</code>}$ ``
</para>';
Index: t/results/converters_tests/no_documentencoding_and_insertions.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/no_documentencoding_and_insertions.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/converters_tests/no_documentencoding_and_insertions.pl 23 Aug
2012 18:14:34 -0000 1.6
+++ t/results/converters_tests/no_documentencoding_and_insertions.pl 26 Aug
2012 14:15:13 -0000 1.7
@@ -272,10 +272,10 @@
$result_converted{'xml'}->{'no_documentencoding_and_insertions'} = '
-<para>&textndash; &textmdash; &textrdquo; &textldquo; &textlsquo; &textrsquo;
<code>in code</code>. <accent type="tilde">e</accent>.
+<para>&textndash; &textmdash; &textrdquo; &textldquo; &textlsquo; &textrsquo;
<code>in code</code>. <accent type="tilde" bracketed="off">e</accent>.
</para>
<example>
-<pre xml:space="preserve">-- --- \'\' `` ` \' <code>in code</code>. <accent
type="tilde">e</accent>.
+<pre xml:space="preserve">-- --- \'\' `` ` \' <code>in code</code>. <accent
type="tilde" bracketed="off">e</accent>.
</pre></example>
';
Index: t/results/converters_tests/ref_error_formatting.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/ref_error_formatting.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/converters_tests/ref_error_formatting.pl 24 Jan 2012 22:16:58
-0000 1.10
+++ t/results/converters_tests/ref_error_formatting.pl 26 Aug 2012 14:15:14
-0000 1.11
@@ -4848,30 +4848,30 @@
<code>&arobase;ref{node,cross ref name,,,manual}</code>
<ref><xrefnodename>node</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
<code>&arobase;ref{node,cross ref name,title,file name}</code>
<ref><xrefnodename>node</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{node,cross ref name,title,,manual}</code>
<ref><xrefnodename>node</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{node,cross ref name,title, file name,
manual}</code> <ref><xrefnodename>node</xrefnodename><xrefinfoname>cross
ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{node,cross ref name,title, file name,
manual}</code> <ref><xrefnodename>node</xrefnodename><xrefinfoname>cross
ref name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{node,,title,file name}</code>
<ref><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{node,,title,,manual}</code>
<ref><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{node,,title, file name, manual}</code>
<ref><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{node,,title, file name, manual}</code>
<ref><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{node,,,file name,manual}</code>
<ref><xrefnodename>node</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
<code>&arobase;ref{,cross ref name,title,}</code>
<ref><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc></ref>
<code>&arobase;ref{,cross ref name,,file name}</code>
<ref><xrefinfoname>cross ref name</xrefinfoname><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{,cross ref name,,,manual}</code>
<ref><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
<code>&arobase;ref{,cross ref name,title,file name}</code>
<ref><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{,cross ref name,title,,manual}</code>
<ref><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{,cross ref name,title, file name,
manual}</code> <ref><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{,cross ref name,title, file name,
manual}</code> <ref><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{,,title,file name}</code>
<ref><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{,,title,,manual}</code>
<ref><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{,,title, file name, manual}</code>
<ref><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{,,title, file name, manual}</code>
<ref><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></ref>
<code>&arobase;ref{,,,file name,manual}</code>
<ref><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
</para>
<para><code>&arobase;inforef{,cross ref name }</code>
<inforef><inforefrefname>cross ref name </inforefrefname></inforef>
<code>&arobase;inforef{,,file name}</code>
<inforef><inforefinfoname>file name</inforefinfoname></inforef>
-<code>&arobase;inforef{,cross ref name, file name}</code>
<inforef><inforefrefname>cross ref name</inforefrefname><inforefinfoname>file
name</inforefinfoname></inforef>
+<code>&arobase;inforef{,cross ref name, file name}</code>
<inforef><inforefrefname>cross ref name</inforefrefname><inforefinfoname
spaces=" ">file name</inforefinfoname></inforef>
<code>&arobase;inforef{}</code> <inforef></inforef>
</para>
-<para><code>&arobase;inforef{node, cross ref name, file
name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname>cross ref
name</inforefrefname><inforefinfoname>file name</inforefinfoname></inforef>
+<para><code>&arobase;inforef{node, cross ref name, file
name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
<code>&arobase;inforef{node}</code>
<inforef><inforefnodename>node</inforefnodename></inforef>
-<code>&arobase;inforef{node, cross ref name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname>cross ref
name</inforefrefname></inforef>
+<code>&arobase;inforef{node, cross ref name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
<code>&arobase;inforef{node,,file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
</para>';
Index: t/results/converters_tests/ref_in_sectioning.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/ref_in_sectioning.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/converters_tests/ref_in_sectioning.pl 24 Aug 2012 20:42:55
-0000 1.9
+++ t/results/converters_tests/ref_in_sectioning.pl 26 Aug 2012 14:15:14
-0000 1.10
@@ -3153,7 +3153,7 @@
$result_converted{'xml'}->{'ref_in_sectioning'} = '<contents></contents>
<node name="Top" spaces=" "><nodename>Top</nodename><nodenext
automatic="on">node</nodenext><nodeup automatic="on">(dir)</nodeup></node>
-<top spaces=" "><sectiontitle>for example
<ref><xrefnodename>node</xrefnodename></ref>
(<pxref><xrefnodename>node</xrefnodename></pxref>)
(<pxref><xrefnodename>Top</xrefnodename><xrefinfofile>file</xrefinfofile><xrefprintedname>Manual</xrefprintedname></pxref>)</sectiontitle>
+<top spaces=" "><sectiontitle>for example
<ref><xrefnodename>node</xrefnodename></ref>
(<pxref><xrefnodename>node</xrefnodename></pxref>)
(<pxref><xrefnodename>Top</xrefnodename><xrefinfofile spaces="
">file</xrefinfofile><xrefprintedname spaces="
">Manual</xrefprintedname></pxref>)</sectiontitle>
<menu>
<menuentry><menunode>node</menunode><menudescription><pre xml:space="preserve">
@@ -3162,40 +3162,40 @@
</top>
<node name="node" spaces=" "><nodename>node</nodename><nodenext
automatic="on">chap</nodenext><nodeprev automatic="on">Top</nodeprev><nodeup
automatic="on">Top</nodeup></node>
-<chapter spaces="
"><sectiontitle><xref><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>Manual</xrefprintedname></xref>.</sectiontitle>
+<chapter spaces="
"><sectiontitle><xref><xrefnodename>node</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">Manual</xrefprintedname></xref>.</sectiontitle>
</chapter>
<node name="chap" spaces=" "><nodename>chap</nodename><nodeprev
automatic="on">node</nodeprev><nodeup automatic="on">Top</nodeup></node>
<chapter spaces=" "><sectiontitle><ref><xrefnodename>node</xrefnodename></ref>
just node</sectiontitle>
-<section spaces="
"><sectiontitle><ref><xrefnodename>node</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref> node, crossref arg2</sectiontitle>
+<section spaces="
"><sectiontitle><ref><xrefnodename>node</xrefnodename><xrefinfoname spaces="
">cross ref name</xrefinfoname></ref> node, crossref arg2</sectiontitle>
</section>
-<section spaces="
"><sectiontitle><ref><xrefnodename><code>node</code></xrefnodename><xrefprinteddesc><samp>title</samp></xrefprinteddesc></ref>
code node, samptitle arg3</sectiontitle>
+<section spaces="
"><sectiontitle><ref><xrefnodename><code>node</code></xrefnodename><xrefprinteddesc
spaces=" "><samp>title</samp></xrefprinteddesc></ref> code node, samptitle
arg3</sectiontitle>
</section>
-<section spaces="
"><sectiontitle><ref><xrefnodename><code>node</code></xrefnodename><xrefinfofile>file
name</xrefinfofile></ref> code node, file name</sectiontitle>
+<section spaces="
"><sectiontitle><ref><xrefnodename><code>node</code></xrefnodename><xrefinfofile
spaces=" ">file name</xrefinfofile></ref> code node, file name</sectiontitle>
</section>
-<section spaces="
"><sectiontitle><ref><xrefnodename>node</xrefnodename><xrefprintedname>Manual
</xrefprintedname></ref> node and manual</sectiontitle>
+<section spaces="
"><sectiontitle><ref><xrefnodename>node</xrefnodename><xrefprintedname spaces="
">Manual </xrefprintedname></ref> node and manual</sectiontitle>
</section>
-<section spaces="
"><sectiontitle><ref><xrefnodename>Top</xrefnodename><xrefprintedname>Manual
</xrefprintedname></ref> Top and manual</sectiontitle>
+<section spaces="
"><sectiontitle><ref><xrefnodename>Top</xrefnodename><xrefprintedname spaces="
">Manual </xrefprintedname></ref> Top and manual</sectiontitle>
</section>
-<section spaces=" "><sectiontitle><ref><xrefprintedname>Manual
</xrefprintedname></ref> no node just manual</sectiontitle>
+<section spaces=" "><sectiontitle><ref><xrefprintedname spaces=" ">Manual
</xrefprintedname></ref> no node just manual</sectiontitle>
</section>
-<section spaces=" "><sectiontitle><ref><xrefinfofile>file
name</xrefinfofile></ref> no node just file name</sectiontitle>
+<section spaces=" "><sectiontitle><ref><xrefinfofile spaces=" ">file
name</xrefinfofile></ref> no node just file name</sectiontitle>
</section>
-<section spaces="
"><sectiontitle><inforef><inforefnodename>a</inforefnodename><inforefrefname>b</inforefrefname><inforefinfoname>c</inforefinfoname></inforef>
inforef a b c </sectiontitle>
+<section spaces="
"><sectiontitle><inforef><inforefnodename>a</inforefnodename><inforefrefname
spaces=" ">b</inforefrefname><inforefinfoname spaces="
">c</inforefinfoname></inforef> inforef a b c </sectiontitle>
</section>
-<section spaces=" "><sectiontitle>(<pxref><xrefnodename>Top
</xrefnodename><xrefinfofile>file name </xrefinfofile></pxref>) pxref Top file
name, spaces</sectiontitle>
+<section spaces=" "><sectiontitle>(<pxref><xrefnodename>Top
</xrefnodename><xrefinfofile spaces=" ">file name </xrefinfofile></pxref>)
pxref Top file name, spaces</sectiontitle>
</section>
-<section spaces=" "><sectiontitle>(<pxref><xrefinfofile>file name
</xrefinfofile></pxref>) pxref file name only, spaces</sectiontitle>
+<section spaces=" "><sectiontitle>(<pxref><xrefinfofile spaces=" ">file name
</xrefinfofile></pxref>) pxref file name only, spaces</sectiontitle>
</section>
<section spaces="
"><sectiontitle><xref><xrefnodename>Top</xrefnodename><xrefinfofile>filename</xrefinfofile></xref>,
xref Top filename only, no spaces</sectiontitle>
Index: t/results/converters_tests/refs_formatting.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/refs_formatting.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/converters_tests/refs_formatting.pl 24 Aug 2012 16:43:18
-0000 1.10
+++ t/results/converters_tests/refs_formatting.pl 26 Aug 2012 14:15:15
-0000 1.11
@@ -4795,10 +4795,10 @@
<code>&arobase;ref{chapter,cross ref name,,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
<code>&arobase;ref{chapter,cross ref name,title,file
name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{chapter,cross ref name,title,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{chapter,,title,file name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{chapter,,title,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,,title, file name, manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,,title, file name, manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{chapter,,,file name,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
</para>
<para><code>&arobase;ref{(pman)anode,cross ref name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
@@ -4810,15 +4810,15 @@
<code>&arobase;ref{(pman)anode,cross ref name,,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
<code>&arobase;ref{(pman)anode,cross ref name,title,file
name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{(pman)anode,cross ref
name,title,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{(pman)anode,,title,file name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{(pman)anode,,title,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,,title, file name, manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,,title, file name, manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{(pman)anode,,,file name,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
</para>
-<para><code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname>cross ref
name</inforefrefname><inforefinfoname>file name</inforefinfoname></inforef>
+<para><code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
<code>&arobase;inforef{chapter}</code>
<inforef><inforefnodename>chapter</inforefnodename></inforef>
-<code>&arobase;inforef{chapter, cross ref name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname>cross ref
name</inforefrefname></inforef>
+<code>&arobase;inforef{chapter, cross ref name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
<code>&arobase;inforef{chapter,,file name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
</para></chapter>
';
Index: t/results/converters_tests/some_at_commands_in_ref_nodes.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/some_at_commands_in_ref_nodes.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/converters_tests/some_at_commands_in_ref_nodes.pl 24 Aug 2012
16:43:18 -0000 1.4
+++ t/results/converters_tests/some_at_commands_in_ref_nodes.pl 26 Aug 2012
14:15:16 -0000 1.5
@@ -1767,18 +1767,18 @@
$result_converted{'xml'}->{'some_at_commands_in_ref_nodes'} = '
-<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">A
<sc>sc <accent type="tilde">n</accent> å &tex;</sc> node <accent
type="uml">i</accent> <accent type="uml"><dotless>i</dotless></accent> <accent
type="grave"><accent type="macr">E</accent></accent> &lslash; <accent
type="cedil"><accent type="acute">C</accent></accent> ¡</nodenext><nodeup
automatic="on">(dir)</nodeup></node>
+<node name="Top" spaces=" "><nodename>Top</nodename><nodenext automatic="on">A
<sc>sc <accent type="tilde" bracketed="off">n</accent> å &tex;</sc> node
<accent type="uml" bracketed="off">i</accent> <accent
type="uml"><dotless>i</dotless></accent> <accent type="grave"><accent
type="macr" bracketed="off">E</accent></accent> &lslash; <accent
type="cedil"><accent type="acute" bracketed="off">C</accent></accent>
¡</nodenext><nodeup automatic="on">(dir)</nodeup></node>
<top spaces=" "><sectiontitle>Top</sectiontitle>
<menu>
-<menuentry><menunode>A <sc>sc <accent type="tilde">n</accent> å
&tex;</sc> node <accent type="uml">i</accent> <accent
type="uml"><dotless>i</dotless></accent> <accent type="grave"><accent
type="macr">E</accent></accent> &lslash; <accent type="cedil"><accent
type="acute">C</accent></accent> ¡</menunode><menudescription><pre
xml:space="preserve">
+<menuentry><menunode>A <sc>sc <accent type="tilde" bracketed="off">n</accent>
å &tex;</sc> node <accent type="uml" bracketed="off">i</accent> <accent
type="uml"><dotless>i</dotless></accent> <accent type="grave"><accent
type="macr" bracketed="off">E</accent></accent> &lslash; <accent
type="cedil"><accent type="acute" bracketed="off">C</accent></accent>
¡</menunode><menudescription><pre xml:space="preserve">
</pre></menudescription></menuentry></menu>
</top>
-<node name="A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1"
spaces=" "><nodename>A <sc>sc <accent type="tilde">n</accent> å
&tex;</sc> node <accent type="uml">i</accent> <accent
type="uml"><dotless>i</dotless></accent> <accent type="grave"><accent
type="macr">E</accent></accent> &lslash; <accent type="cedil"><accent
type="acute">C</accent></accent> ¡</nodename><nodeprev
automatic="on">Top</nodeprev><nodeup automatic="on">Top</nodeup></node>
-<chapter spaces=" "><sectiontitle>A <sc>sc</sc> node <accent
type="uml">i</accent> <accent type="uml"><dotless>i</dotless></accent> <accent
type="grave"><accent type="macr">E</accent></accent> &lslash; <accent
type="cedil"><accent type="acute">C</accent></accent> ¡</sectiontitle>
+<node name="A-SC-_00d1-_00c5-TeX-node-_00ef-_00ef-_1e14-_0142-_1e08-_00a1"
spaces=" "><nodename>A <sc>sc <accent type="tilde" bracketed="off">n</accent>
å &tex;</sc> node <accent type="uml" bracketed="off">i</accent> <accent
type="uml"><dotless>i</dotless></accent> <accent type="grave"><accent
type="macr" bracketed="off">E</accent></accent> &lslash; <accent
type="cedil"><accent type="acute" bracketed="off">C</accent></accent>
¡</nodename><nodeprev automatic="on">Top</nodeprev><nodeup
automatic="on">Top</nodeup></node>
+<chapter spaces=" "><sectiontitle>A <sc>sc</sc> node <accent type="uml"
bracketed="off">i</accent> <accent type="uml"><dotless>i</dotless></accent>
<accent type="grave"><accent type="macr" bracketed="off">E</accent></accent>
&lslash; <accent type="cedil"><accent type="acute"
bracketed="off">C</accent></accent> ¡</sectiontitle>
-<para>see <ref><xrefnodename>a <strong>strong</strong> ref with
<sc>sc</sc>, a i trema <accent type="uml">i</accent>, a dotless i
trema <accent type="uml"><dotless>i</dotless></accent> <accent
type="grave"><accent type="macr">E</accent></accent> and exclamdown
¡</xrefnodename><xrefinfofile>manual</xrefinfofile></ref>.
+<para>see <ref><xrefnodename>a <strong>strong</strong> ref with
<sc>sc</sc>, a i trema <accent type="uml"
bracketed="off">i</accent>, a dotless i trema <accent
type="uml"><dotless>i</dotless></accent> <accent type="grave"><accent
type="macr" bracketed="off">E</accent></accent> and exclamdown
¡</xrefnodename><xrefinfofile>manual</xrefinfofile></ref>.
</para></chapter>
';
Index: t/results/converters_tests/sp_in_example.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/sp_in_example.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/converters_tests/sp_in_example.pl 23 Aug 2012 18:14:35 -0000
1.4
+++ t/results/converters_tests/sp_in_example.pl 26 Aug 2012 14:15:16 -0000
1.5
@@ -507,21 +507,21 @@
$result_converted{'xml'}->{'sp_in_example'} = '<example>
<pre xml:space="preserve">Para
-<sp value="1"></sp>
+<sp value="1" line=" 1"></sp>
other para
Now lone &arobase;sp:
-<sp value="1"></sp>
+<sp value="1" line=" 1"></sp>
-<sp value="2"></sp>
+<sp value="2" line=" 2"></sp>
Para after sp
A
-<sp value="2"></sp>
+<sp value="2" line=" 2"></sp>
B
sp after para
-<sp value="1"></sp>
+<sp value="1" line=" 1"></sp>
</pre></example>
';
Index: t/results/converters_tests/test_deftypefnnewline.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/test_deftypefnnewline.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/converters_tests/test_deftypefnnewline.pl 24 Aug 2012 16:43:18
-0000 1.6
+++ t/results/converters_tests/test_deftypefnnewline.pl 26 Aug 2012 14:15:17
-0000 1.7
@@ -1072,7 +1072,7 @@
$result_converted{'xml'}->{'test_deftypefnnewline'} = '
-<deftypefnnewline value="on"></deftypefnnewline>
+<deftypefnnewline value="on" line=" on"></deftypefnnewline>
<node name="Top" spaces=" "><nodename>Top</nodename><nodeup
automatic="on">(dir)</nodeup></node>
<deftypefun spaces=" "><definitionterm><indexterm
index="fn">name</indexterm><defcategory automatic="on">Function</defcategory>
<deftype>data-type</deftype> <deffunction>name</deffunction>
<defparamtype>arguments...</defparamtype></definitionterm>
@@ -1083,7 +1083,7 @@
<definitionitem><para>fff
</para></definitionitem></deffn>
-<deftypefnnewline value="off"></deftypefnnewline>
+<deftypefnnewline value="off" line=" off"></deftypefnnewline>
<deftypefun spaces=" "><definitionterm><indexterm
index="fn">name2</indexterm><defcategory automatic="on">Function</defcategory>
<deftype>data-type2</deftype> <deffunction>name2</deffunction>
<defparamtype>arguments2...</defparamtype></definitionterm>
<definitionitem><para>aaa2
Index: t/results/converters_tests/test_sp.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/converters_tests/test_sp.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/converters_tests/test_sp.pl 23 Aug 2012 18:14:35 -0000
1.4
+++ t/results/converters_tests/test_sp.pl 26 Aug 2012 14:15:20 -0000
1.5
@@ -457,21 +457,21 @@
$result_converted{'xml'}->{'test_sp'} = '<para>Para
-</para><sp value="1"></sp>
+</para><sp value="1" line=" 1"></sp>
<para>other para
Now lone &arobase;sp:
</para>
-<sp value="1"></sp>
+<sp value="1" line=" 1"></sp>
-<sp value="2"></sp>
+<sp value="2" line=" 2"></sp>
<para>Para after sp
</para>
<para>A
-</para><sp value="2"></sp>
+</para><sp value="2" line=" 2"></sp>
<para>B
</para>
<para>sp after para
-</para><sp value="1"></sp>
+</para><sp value="1" line=" 1"></sp>
';
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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/converters_tests/things_before_setfilename.pl 24 Aug 2012
20:42:56 -0000 1.10
+++ t/results/converters_tests/things_before_setfilename.pl 26 Aug 2012
14:15:20 -0000 1.11
@@ -1830,14 +1830,14 @@
<ref><xrefnodename>An anchor</xrefnodename></ref>
</para></footnote>
</para>
-<float name="float-anchor" type="" spaces=" "><floatname>float
anchor</floatname>
+<float name="float-anchor" type="" spaces=" "><floatname spaces=" ">float
anchor</floatname>
<para>In float
</para></float>
<para>Ref to float
<ref><xrefnodename>float anchor</xrefnodename></ref>.
</para>
-<float name="ta" type="Text" spaces="
"><floattype>Text</floattype><floatname>ta</floatname>
+<float name="ta" type="Text" spaces=" "><floattype>Text</floattype><floatname
spaces=" ">ta</floatname>
<para>In float
</para>
<caption><para>ta caption</para></caption>
@@ -1851,7 +1851,7 @@
<cindex index="cp"><indexterm index="cp">index entry</indexterm></cindex>
-<printindex value="cp"></printindex>
+<printindex value="cp" line=" cp"></printindex>
<listoffloats type="Text" spaces=" ">Text</listoffloats>
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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/converters_tests/things_before_setfilename_no_element.pl 24 Aug
2012 20:42:56 -0000 1.10
+++ t/results/converters_tests/things_before_setfilename_no_element.pl 26 Aug
2012 14:15:21 -0000 1.11
@@ -1649,14 +1649,14 @@
<ref><xrefnodename>An anchor</xrefnodename></ref>
</para></footnote>
</para>
-<float name="float-anchor" type="" spaces=" "><floatname>float
anchor</floatname>
+<float name="float-anchor" type="" spaces=" "><floatname spaces=" ">float
anchor</floatname>
<para>In float
</para></float>
<para>Ref to float
<ref><xrefnodename>float anchor</xrefnodename></ref>.
</para>
-<float name="ta" type="Text" spaces="
"><floattype>Text</floattype><floatname>ta</floatname>
+<float name="ta" type="Text" spaces=" "><floattype>Text</floattype><floatname
spaces=" ">ta</floatname>
<para>In float
</para>
<caption><para>ta caption</para></caption>
@@ -1670,7 +1670,7 @@
<cindex index="cp"><indexterm index="cp">index entry</indexterm></cindex>
-<printindex value="cp"></printindex>
+<printindex value="cp" line=" cp"></printindex>
<listoffloats type="Text" spaces=" ">Text</listoffloats>
Index: t/results/converters_tests/top_in_ref.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/converters_tests/top_in_ref.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/converters_tests/top_in_ref.pl 24 Aug 2012 16:43:19 -0000
1.4
+++ t/results/converters_tests/top_in_ref.pl 26 Aug 2012 14:15:21 -0000
1.5
@@ -4719,10 +4719,10 @@
<code>&arobase;ref{Top,cross ref name,,,manual}</code>
<ref><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
<code>&arobase;ref{Top,cross ref name,title,file name}</code>
<ref><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{Top,cross ref name,title,,manual}</code>
<ref><xrefnodename>Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{Top,cross ref name,title, file name,
manual}</code> <ref><xrefnodename>Top</xrefnodename><xrefinfoname>cross
ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{Top,cross ref name,title, file name,
manual}</code> <ref><xrefnodename>Top</xrefnodename><xrefinfoname>cross
ref name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{Top,,title,file name}</code>
<ref><xrefnodename>Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{Top,,title,,manual}</code>
<ref><xrefnodename>Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{Top,,title, file name, manual}</code>
<ref><xrefnodename>Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{Top,,title, file name, manual}</code>
<ref><xrefnodename>Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{Top,,,file name,manual}</code>
<ref><xrefnodename>Top</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
</para>
<para><code>&arobase;ref{(pman)Top,cross ref name}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
@@ -4734,15 +4734,15 @@
<code>&arobase;ref{(pman)Top,cross ref name,,,manual}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
<code>&arobase;ref{(pman)Top,cross ref name,title,file
name}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{(pman)Top,cross ref
name,title,,manual}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)Top,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)Top,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{(pman)Top,,title,file name}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{(pman)Top,,title,,manual}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)Top,,title, file name, manual}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)Top,,title, file name, manual}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{(pman)Top,,,file name,manual}</code>
<ref><xrefnodename>(pman)Top</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
</para>
-<para><code>&arobase;inforef{Top, cross ref name, file
name}</code>
<inforef><inforefnodename>Top</inforefnodename><inforefrefname>cross ref
name</inforefrefname><inforefinfoname>file name</inforefinfoname></inforef>
+<para><code>&arobase;inforef{Top, cross ref name, file
name}</code>
<inforef><inforefnodename>Top</inforefnodename><inforefrefname spaces=" ">cross
ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
<code>&arobase;inforef{Top}</code>
<inforef><inforefnodename>Top</inforefnodename></inforef>
-<code>&arobase;inforef{Top, cross ref name}</code>
<inforef><inforefnodename>Top</inforefnodename><inforefrefname>cross ref
name</inforefrefname></inforef>
+<code>&arobase;inforef{Top, cross ref name}</code>
<inforef><inforefnodename>Top</inforefnodename><inforefrefname spaces=" ">cross
ref name</inforefrefname></inforef>
<code>&arobase;inforef{Top,,file name}</code>
<inforef><inforefnodename>Top</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
</para>';
Index: t/results/converters_tests/weird_accents.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/weird_accents.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/converters_tests/weird_accents.pl 24 Aug 2012 16:43:19 -0000
1.9
+++ t/results/converters_tests/weird_accents.pl 26 Aug 2012 14:15:22 -0000
1.10
@@ -689,7 +689,7 @@
</para>
<para><accent type="macr"><accent type="ubaraccent">a</accent></accent>
</para>
-<para><accent type="circ"><accent type="udotaccent"><accent
type="grave">r</accent></accent></accent>
+<para><accent type="circ"><accent type="udotaccent"><accent type="grave"
bracketed="off">r</accent></accent></accent>
</para>
<para><accent type="macr"><accent type="acute"><accent
type="grave">r</accent></accent></accent>
</para></top>
Index: t/results/converters_tests/weird_accents_disable_encoding.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/converters_tests/weird_accents_disable_encoding.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/converters_tests/weird_accents_disable_encoding.pl 24 Aug
2012 16:43:19 -0000 1.9
+++ t/results/converters_tests/weird_accents_disable_encoding.pl 26 Aug
2012 14:15:23 -0000 1.10
@@ -689,7 +689,7 @@
</para>
<para><accent type="macr"><accent type="ubaraccent">a</accent></accent>
</para>
-<para><accent type="circ"><accent type="udotaccent"><accent
type="grave">r</accent></accent></accent>
+<para><accent type="circ"><accent type="udotaccent"><accent type="grave"
bracketed="off">r</accent></accent></accent>
</para>
<para><accent type="macr"><accent type="acute"><accent
type="grave">r</accent></accent></accent>
</para></top>
Index: t/results/coverage/block_commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/block_commands.pl,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- t/results/coverage/block_commands.pl 24 Aug 2012 16:43:19 -0000
1.48
+++ t/results/coverage/block_commands.pl 26 Aug 2012 14:15:23 -0000
1.49
@@ -580,7 +580,7 @@
<para>in quotation
</para></quotation>
-<float name="b-float" type="a-float" spaces=" "><floattype>a
float</floattype><floatname>b float</floatname>
+<float name="b-float" type="a-float" spaces=" "><floattype>a
float</floattype><floatname spaces=" ">b float</floatname>
<para>In float
</para>
Index: t/results/coverage/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/commands.pl,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- t/results/coverage/commands.pl 24 Aug 2012 16:43:19 -0000 1.55
+++ t/results/coverage/commands.pl 26 Aug 2012 14:15:24 -0000 1.56
@@ -585,9 +585,9 @@
';
-$result_converted{'xml'}->{'commands'} = '<para>&arobase; &tex; <spacecmd
type="nl"/><accent type="uml">e</accent> <accent
type="circ"><dotless>i</dotless></accent> <accent type="tilde">a</accent>
<accent type="ring">a</accent>
+$result_converted{'xml'}->{'commands'} = '<para>&arobase; &tex; <spacecmd
type="nl"/><accent type="uml" bracketed="off">e</accent> <accent
type="circ"><dotless>i</dotless></accent> <accent type="tilde">a</accent>
<accent type="ring" spaces=" ">a</accent>
<clicksequence>File <click command="arrow"/> Open</clicksequence>&eosperiod;
-<email><emailaddress>a</emailaddress><emailname>b</emailname></email>
<code>code --- -- \'\' ``</code>
+<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>
Index: t/results/coverage/def.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/def.pl,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- t/results/coverage/def.pl 24 Aug 2012 16:43:19 -0000 1.66
+++ t/results/coverage/def.pl 26 Aug 2012 14:15:24 -0000 1.67
@@ -2620,7 +2620,7 @@
$result_converted{'xml'}->{'def'} = '
-<deffn spaces=" "><definitionterm><indexterm
index="fn">d--effn_name</indexterm><defcategory>c--ategory</defcategory>
<deffunction>d--effn_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
+<deffn spaces=" "><definitionterm><indexterm
index="fn">d--effn_name</indexterm><defcategory
bracketed="on">c--ategory</defcategory> <deffunction>d--effn_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
<definitionitem><para>d&textndash;effn
</para></definitionitem></deffn>
@@ -2629,20 +2629,20 @@
</para></definitionitem></deffn>
<deffn spaces=" "><definitionterm><indexterm
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
-<deffnx><definitionterm><indexterm
index="fn">truc</indexterm><defcategory>cmde</defcategory>
<deffunction>truc</deffunction> <defparam></defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">log
trap</indexterm><defcategory>Command</defcategory> <deffunction>log
trap</deffunction> <defparam></defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction>log
trap1</deffunction> <defparam></defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">log
trap2</indexterm><defcategory>Command</defcategory> <deffunction>log
trap2</deffunction> <defparam></defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
-<deffnx><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>
-<deffnx><definitionterm><indexterm
index="fn">machin</indexterm><defcategory></defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">bidule
machin</indexterm><defcategory></defcategory> <deffunction>bidule
machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">machin</indexterm><defcategory>truc</defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">followed</indexterm><defcategory>truc</defcategory>
<deffunction>followed</deffunction> <defparam>by</defparam>
<defparam>a</defparam> <defparam>comment</defparam></definitionterm></deffnx>
+<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 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>
+<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 spaces=" "><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><indexterm
index="fn">after</indexterm><defcategory>truc</defcategory>
<deffunction>after</deffunction> <defparam>a</defparam>
<defparam>deff</defparam> <defparam>item</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm
index="fn">after</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>after</deffunction> <defparam>a</defparam>
<defparam>deff</defparam> <defparam>item</defparam></definitionterm></deffnx>
<!-- c comment -->
-<deffnx><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory>truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
<definitionitem><para>Various deff lines
</para></definitionitem></deffn>
';
Index: t/results/coverage/lettered_accent_and_spaces.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/lettered_accent_and_spaces.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/coverage/lettered_accent_and_spaces.pl 30 Oct 2011 00:51:17
-0000 1.12
+++ t/results/coverage/lettered_accent_and_spaces.pl 26 Aug 2012 14:15:25
-0000 1.13
@@ -65,7 +65,7 @@
</p>';
-$result_converted{'xml'}->{'lettered_accent_and_spaces'} = '<para><accent
type="ring">a</accent>
+$result_converted{'xml'}->{'lettered_accent_and_spaces'} = '<para><accent
type="ring" spaces=" ">a</accent>
</para>';
Index: t/results/coverage/multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/multitable.pl,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- t/results/coverage/multitable.pl 24 Aug 2012 16:43:20 -0000 1.55
+++ t/results/coverage/multitable.pl 26 Aug 2012 14:15:25 -0000 1.56
@@ -651,6 +651,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -789,6 +806,8 @@
$result_trees{'multitable'}{'contents'}[3]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable'}{'contents'}[3]{'args'}[0];
$result_trees{'multitable'}{'contents'}[3]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable'}{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable'}{'contents'}[3]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable'}{'contents'}[3]{'args'}[0];
+$result_trees{'multitable'}{'contents'}[3]{'extra'}{'prototypes_line'}[1] =
$result_trees{'multitable'}{'contents'}[3]{'args'}[0]{'contents'}[1];
+$result_trees{'multitable'}{'contents'}[3]{'extra'}{'prototypes_line'}[3] =
$result_trees{'multitable'}{'contents'}[3]{'args'}[0]{'contents'}[3];
$result_trees{'multitable'}{'contents'}[3]{'extra'}{'spaces_after_command'} =
$result_trees{'multitable'}{'contents'}[3]{'args'}[0]{'contents'}[0];
$result_trees{'multitable'}{'contents'}[3]{'parent'} =
$result_trees{'multitable'};
@@ -857,7 +876,7 @@
$result_converted{'xml'}->{'multitable'} = '
-<multitable spaces=" "><columnfractions><columnfraction
value="0.6"></columnfraction><columnfraction
value="0.4"></columnfraction></columnfractions>
+<multitable spaces=" "><columnfractions line=" 0.6 0.4"><columnfraction
value="0.6"></columnfraction><columnfraction
value="0.4"></columnfraction></columnfractions>
<thead><row><entry command="headitem"><para>mu&textndash;ltitable headitem
</para></entry><entry command="tab"><para>another tab
</para></entry></row></thead><tbody><row><entry
command="item"><para>mu&textndash;ltitable item </para></entry><entry
command="tab"><para>multitable tab
<!-- c comment in multitable -->
@@ -866,7 +885,7 @@
</para></entry></row><row><entry command="item"><para>lone
mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
-<multitable spaces="
"><columnprototypes><columnprototype>truc</columnprototype><columnprototype>bidule</columnprototype></columnprototypes>
+<multitable spaces=" "><columnprototypes><columnprototype
bracketed="on">truc</columnprototype> <columnprototype
bracketed="on">bidule</columnprototype></columnprototypes>
<tbody><row><entry command="item"><para>truc </para></entry><entry
command="tab"><para>bidule
</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.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- t/results/coverage/punctuation_in_line_commands.pl 24 Aug 2012 20:42:56
-0000 1.33
+++ t/results/coverage/punctuation_in_line_commands.pl 26 Aug 2012 14:15:26
-0000 1.34
@@ -1567,12 +1567,12 @@
</para><exdent spaces=" ">exdent quotation! After punc</exdent>
</quotation>
-<float name="float-label_0021-After-punc" type="float-type_0021-After-punc"
spaces=" "><floattype>float type! After punc</floattype><floatname>float label!
After punc</floatname>
+<float name="float-label_0021-After-punc" type="float-type_0021-After-punc"
spaces=" "><floattype>float type! After punc</floattype><floatname spaces="
">float label! After punc</floatname>
<para>In float
</para><shortcaption><para>shortcaption! After punc</para></shortcaption>
</float>
-<float name="label-with-caption" type="float-type_0021-After-punc" spaces="
"><floattype>float type! After punc</floattype><floatname>label with
caption</floatname>
+<float name="label-with-caption" type="float-type_0021-After-punc" spaces="
"><floattype>float type! After punc</floattype><floatname spaces=" ">label with
caption</floatname>
<para>In float with caption.
</para><caption><para>caption! After punc</para></caption>
</float>
@@ -1587,7 +1587,7 @@
<center spaces=" ">center! After punc</center>
-<printindex value="cp"></printindex>
+<printindex value="cp" line=" cp"></printindex>
<contents></contents>
Index: t/results/coverage/quotation_author.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/quotation_author.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/coverage/quotation_author.pl 24 Aug 2012 16:43:20 -0000
1.18
+++ t/results/coverage/quotation_author.pl 26 Aug 2012 14:15:26 -0000
1.19
@@ -301,7 +301,7 @@
<author spaces=" ">First Author</author>
<para>quotation
-<author spaces=" ">S<accent type="tilde">e</accent>cond author</author>
+<author spaces=" ">S<accent type="tilde" bracketed="off">e</accent>cond
author</author>
quotation continues.
</para>
</quotation>
Index: t/results/coverage/test_errormsg.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/test_errormsg.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/coverage/test_errormsg.pl 22 Dec 2011 10:54:41 -0000 1.1
+++ t/results/coverage/test_errormsg.pl 26 Aug 2012 14:15:27 -0000 1.2
@@ -148,7 +148,7 @@
$result_converted{'xml'}->{'test_errormsg'} = '<para>Some text
-<errormsg>Text <accent type="tilde">e</accent> <code>code</code></errormsg>
+<errormsg>Text <accent type="tilde" bracketed="off">e</accent>
<code>code</code></errormsg>
</para>';
Index: t/results/coverage/unknown_accents.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/unknown_accents.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/coverage/unknown_accents.pl 14 Jan 2012 01:11:31 -0000
1.1
+++ t/results/coverage/unknown_accents.pl 26 Aug 2012 14:15:28 -0000
1.2
@@ -770,19 +770,19 @@
</p>';
-$result_converted{'xml'}->{'unknown_accents'} = '<para><accent
type="uml">X</accent> <accent type="uml">x</accent> <accent
type="uml">Q</accent> <accent type="uml">Y</accent>
+$result_converted{'xml'}->{'unknown_accents'} = '<para><accent type="uml"
bracketed="off">X</accent> <accent type="uml" bracketed="off">x</accent>
<accent type="uml" bracketed="off">Q</accent> <accent type="uml"
bracketed="off">Y</accent>
</para>
-<para><accent type="acute">z</accent> <accent type="acute">q</accent> <accent
type="acute">r</accent>
-<accent type="acute">Z</accent> <accent type="acute">Q</accent> <accent
type="acute">R</accent>
+<para><accent type="acute" bracketed="off">z</accent> <accent type="acute"
bracketed="off">q</accent> <accent type="acute" bracketed="off">r</accent>
+<accent type="acute" bracketed="off">Z</accent> <accent type="acute"
bracketed="off">Q</accent> <accent type="acute" bracketed="off">R</accent>
</para>
<para><accent type="cedil">H</accent> <accent type="cedil">h</accent>
</para>
-<para><accent type="circ">z</accent> <accent type="circ">r</accent> <accent
type="circ">t</accent> <accent type="circ">k</accent>
-<accent type="circ">Z</accent> <accent type="circ">R</accent> <accent
type="circ">T</accent> <accent type="circ">K</accent>
+<para><accent type="circ" bracketed="off">z</accent> <accent type="circ"
bracketed="off">r</accent> <accent type="circ" bracketed="off">t</accent>
<accent type="circ" bracketed="off">k</accent>
+<accent type="circ" bracketed="off">Z</accent> <accent type="circ"
bracketed="off">R</accent> <accent type="circ" bracketed="off">T</accent>
<accent type="circ" bracketed="off">K</accent>
</para>
-<para><accent type="grave">z</accent> <accent type="grave">m</accent> <accent
type="grave">p</accent>
+<para><accent type="grave" bracketed="off">z</accent> <accent type="grave"
bracketed="off">m</accent> <accent type="grave" bracketed="off">p</accent>
</para>
-<para><accent type="tilde">Z</accent> <accent type="tilde">s</accent>
+<para><accent type="tilde" bracketed="off">Z</accent> <accent type="tilde"
bracketed="off">s</accent>
</para>';
Index: t/results/float/complex_float.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/complex_float.pl,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- t/results/float/complex_float.pl 23 Aug 2012 18:14:42 -0000 1.44
+++ t/results/float/complex_float.pl 26 Aug 2012 14:15:31 -0000 1.45
@@ -1733,6 +1733,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -3386,6 +3403,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -4499,6 +4533,8 @@
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'extra'}{'prototypes'}[0]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'extra'}{'prototypes'}[1]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[1];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[3];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'extra'}{'spaces_after_command'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[11]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[12]{'contents'}[0]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[16]{'args'}[0]{'contents'}[12];
@@ -4824,6 +4860,8 @@
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'extra'}{'prototypes'}[0]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'extra'}{'prototypes'}[1]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[1];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[3];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'extra'}{'spaces_after_command'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[8]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[9]{'contents'}[0]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[9];
Index: t/results/info_tests/multitable_anchor_and_index_entry.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/info_tests/multitable_anchor_and_index_entry.pl 23 Aug 2012
18:14:51 -0000 1.18
+++ t/results/info_tests/multitable_anchor_and_index_entry.pl 26 Aug 2012
14:15:32 -0000 1.19
@@ -1001,6 +1001,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -1354,6 +1371,8 @@
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes'}[0]{'parent'}
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0];
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes'}[1]{'parent'}
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0];
+$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[1];
+$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[3];
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'spaces_after_command'}
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[4]{'parent'}
= $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
Index: t/results/info_tests/nested_multitable_anchor_index.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/info_tests/nested_multitable_anchor_index.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/info_tests/nested_multitable_anchor_index.pl 23 Aug 2012
18:14:51 -0000 1.17
+++ t/results/info_tests/nested_multitable_anchor_index.pl 26 Aug 2012
14:15:32 -0000 1.18
@@ -382,6 +382,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -670,6 +687,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -917,6 +951,8 @@
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'parent'}
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'parent'}
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
@@ -975,6 +1011,8 @@
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'prototypes'}[0]{'parent'}
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0];
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'prototypes'}[1]{'parent'}
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[3];
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
Index: t/results/invalid_nestings/bad_tab_nesting.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/bad_tab_nesting.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- t/results/invalid_nestings/bad_tab_nesting.pl 23 Aug 2012 18:14:53
-0000 1.24
+++ t/results/invalid_nestings/bad_tab_nesting.pl 26 Aug 2012 14:15:33
-0000 1.25
@@ -209,6 +209,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -260,6 +277,8 @@
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'bad_tab_nesting'}{'contents'}[0]{'args'}[0];
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'bad_tab_nesting'}{'contents'}[0]{'args'}[0];
+$result_trees{'bad_tab_nesting'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
= $result_trees{'bad_tab_nesting'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'bad_tab_nesting'}{'contents'}[0]{'extra'}{'prototypes_line'}[3]
= $result_trees{'bad_tab_nesting'}{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'extra'}{'spaces_after_command'}
= $result_trees{'bad_tab_nesting'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'bad_tab_nesting'}{'contents'}[0]{'parent'} =
$result_trees{'bad_tab_nesting'};
Index: t/results/invalid_nestings/center.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/invalid_nestings/center.pl,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- t/results/invalid_nestings/center.pl 23 Aug 2012 18:14:53 -0000
1.49
+++ t/results/invalid_nestings/center.pl 26 Aug 2012 14:15:33 -0000
1.50
@@ -1588,6 +1588,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -2077,6 +2094,8 @@
$result_trees{'center'}{'contents'}[33]{'extra'}{'prototypes'}[0]{'parent'} =
$result_trees{'center'}{'contents'}[33]{'args'}[0];
$result_trees{'center'}{'contents'}[33]{'extra'}{'prototypes'}[1]{'contents'}
= $result_trees{'center'}{'contents'}[33]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'center'}{'contents'}[33]{'extra'}{'prototypes'}[1]{'parent'} =
$result_trees{'center'}{'contents'}[33]{'args'}[0];
+$result_trees{'center'}{'contents'}[33]{'extra'}{'prototypes_line'}[1] =
$result_trees{'center'}{'contents'}[33]{'args'}[0]{'contents'}[1];
+$result_trees{'center'}{'contents'}[33]{'extra'}{'prototypes_line'}[3] =
$result_trees{'center'}{'contents'}[33]{'args'}[0]{'contents'}[3];
$result_trees{'center'}{'contents'}[33]{'extra'}{'spaces_after_command'} =
$result_trees{'center'}{'contents'}[33]{'args'}[0]{'contents'}[0];
$result_trees{'center'}{'contents'}[33]{'parent'} = $result_trees{'center'};
$result_trees{'center'}{'contents'}[34]{'parent'} = $result_trees{'center'};
Index: t/results/invalid_nestings/multitable_in_style_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/multitable_in_style_command.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/invalid_nestings/multitable_in_style_command.pl 23 Aug 2012
18:14:55 -0000 1.8
+++ t/results/invalid_nestings/multitable_in_style_command.pl 26 Aug 2012
14:15:34 -0000 1.9
@@ -225,6 +225,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -279,6 +296,8 @@
$result_trees{'multitable_in_style_command'}{'contents'}[1]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable_in_style_command'}{'contents'}[1]{'args'}[0];
$result_trees{'multitable_in_style_command'}{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable_in_style_command'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable_in_style_command'}{'contents'}[1]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable_in_style_command'}{'contents'}[1]{'args'}[0];
+$result_trees{'multitable_in_style_command'}{'contents'}[1]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'multitable_in_style_command'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'multitable_in_style_command'}{'contents'}[1]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'multitable_in_style_command'}{'contents'}[1]{'args'}[0]{'contents'}[3];
$result_trees{'multitable_in_style_command'}{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'multitable_in_style_command'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_in_style_command'}{'contents'}[1]{'parent'} =
$result_trees{'multitable_in_style_command'};
Index: t/results/invalid_nestings/multitable_item_in_index.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/multitable_item_in_index.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- t/results/invalid_nestings/multitable_item_in_index.pl 23 Aug 2012
18:14:55 -0000 1.29
+++ t/results/invalid_nestings/multitable_item_in_index.pl 26 Aug 2012
14:15:34 -0000 1.30
@@ -181,6 +181,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -229,6 +246,8 @@
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable_item_in_index'}{'contents'}[0]{'args'}[0];
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable_item_in_index'}{'contents'}[0]{'args'}[0];
+$result_trees{'multitable_item_in_index'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'multitable_item_in_index'}{'contents'}[0]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_item_in_index'}{'contents'}[0]{'parent'} =
$result_trees{'multitable_item_in_index'};
Index: t/results/invalid_nestings/on_block_command_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/on_block_command_line.pl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- t/results/invalid_nestings/on_block_command_line.pl 23 Aug 2012 18:14:56
-0000 1.33
+++ t/results/invalid_nestings/on_block_command_line.pl 26 Aug 2012 14:15:35
-0000 1.34
@@ -221,6 +221,23 @@
},
{}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {},
@@ -506,6 +523,8 @@
$result_trees{'on_block_command_line'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}
=
$result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
$result_trees{'on_block_command_line'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0];
$result_trees{'on_block_command_line'}{'contents'}[0]{'extra'}{'prototypes'}[1]
=
$result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'on_block_command_line'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'on_block_command_line'}{'contents'}[0]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'on_block_command_line'}{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'on_block_command_line'}{'contents'}[0]{'line_nr'} =
$result_trees{'on_block_command_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'};
$result_trees{'on_block_command_line'}{'contents'}[0]{'parent'} =
$result_trees{'on_block_command_line'};
Index: t/results/invalid_nestings/tab_in_index.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/tab_in_index.pl,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- t/results/invalid_nestings/tab_in_index.pl 23 Aug 2012 18:14:57 -0000
1.32
+++ t/results/invalid_nestings/tab_in_index.pl 26 Aug 2012 14:15:36 -0000
1.33
@@ -258,6 +258,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -322,6 +339,8 @@
$result_trees{'tab_in_index'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'tab_in_index'}{'contents'}[0]{'args'}[0];
$result_trees{'tab_in_index'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'tab_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'tab_in_index'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'tab_in_index'}{'contents'}[0]{'args'}[0];
+$result_trees{'tab_in_index'}{'contents'}[0]{'extra'}{'prototypes_line'}[1] =
$result_trees{'tab_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'tab_in_index'}{'contents'}[0]{'extra'}{'prototypes_line'}[3] =
$result_trees{'tab_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'tab_in_index'}{'contents'}[0]{'extra'}{'spaces_after_command'}
= $result_trees{'tab_in_index'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'tab_in_index'}{'contents'}[0]{'parent'} =
$result_trees{'tab_in_index'};
Index: t/results/menu/inlineraw_in_menu_description.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/menu/inlineraw_in_menu_description.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/menu/inlineraw_in_menu_description.pl 24 Aug 2012 16:43:21
-0000 1.6
+++ t/results/menu/inlineraw_in_menu_description.pl 26 Aug 2012 14:15:37
-0000 1.7
@@ -572,7 +572,7 @@
<menu>
<menuentry><menunode>(manual)</menunode><menudescription><pre
xml:space="preserve">
-<inlineraw><inlinerawformat>html</inlinerawformat><inlinerawcontent>in inline
raw
+<inlineraw><inlinerawformat>html</inlinerawformat><inlinerawcontent spaces="
">in inline raw
end inlineraw</inlinerawcontent></inlineraw>
</pre></menudescription></menuentry><menucomment><pre xml:space="preserve">
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.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- t/results/misc_commands/comment_space_command_on_line.pl 24 Aug 2012
20:42:58 -0000 1.28
+++ t/results/misc_commands/comment_space_command_on_line.pl 26 Aug 2012
14:15:37 -0000 1.29
@@ -1039,15 +1039,15 @@
<node name="Top" spaces=" "><nodename>Top</nodename><nodeup
automatic="on">(dir)</nodeup></node><!-- comment @node Top -->
<top spaces=" "><sectiontitle>top element<spacecmd type="spc"/>
</sectiontitle><!-- comment @top -->
-<frenchspacing value="on"></frenchspacing><!-- c comment frenchspacing -->
+<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 -->
<heading spaces=" ">Heading <spacecmd type="spc"/> </heading><!-- c heading
-->
-<printindex value="cp"></printindex><!-- c printindex -->
+<printindex value="cp" line=" cp "></printindex><!-- c printindex -->
-<float name="label" type="Text" spaces="
"><floattype>Text</floattype><floatname>label</floatname>
+<float name="label" type="Text" spaces="
"><floattype>Text</floattype><floatname spaces=" ">label</floatname>
<para>float
</para></float><!-- c end -->
Index: t/results/misc_commands/definfoenclose_with_empty_arg.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/misc_commands/definfoenclose_with_empty_arg.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/misc_commands/definfoenclose_with_empty_arg.pl 23 Aug 2012
18:15:10 -0000 1.3
+++ t/results/misc_commands/definfoenclose_with_empty_arg.pl 26 Aug 2012
14:15:38 -0000 1.4
@@ -156,7 +156,7 @@
$result_converted{'xml'}->{'definfoenclose_with_empty_arg'} = '
-<definfoenclose command="headword" open="" close=":"></definfoenclose>
+<definfoenclose command="headword" open="" close=":" line=" headword, ,
:"></definfoenclose>
<para>My <infoenclose command="headword" begin=""
end=":">something</infoenclose>.
</para>
Index: t/results/multitable/empty_item_tab.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/multitable/empty_item_tab.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/multitable/empty_item_tab.pl 24 Aug 2012 16:43:22 -0000
1.9
+++ t/results/multitable/empty_item_tab.pl 26 Aug 2012 14:15:39 -0000
1.10
@@ -1066,7 +1066,7 @@
';
-$result_converted{'xml'}->{'empty_item_tab'} = '<multitable spaces="
"><columnfractions><columnfraction
value="1.0"></columnfraction></columnfractions>
+$result_converted{'xml'}->{'empty_item_tab'} = '<multitable spaces="
"><columnfractions line=" 1.0"><columnfraction
value="1.0"></columnfraction></columnfractions>
<tbody><row><entry command="item">
</entry></row><row><entry command="item">
@@ -1074,7 +1074,7 @@
</para></entry></row><row><entry command="item">
</entry></row></tbody></multitable>
-<multitable spaces=" "><columnfractions><columnfraction
value="0.5"></columnfraction><columnfraction
value="0.5"></columnfraction></columnfractions>
+<multitable spaces=" "><columnfractions line=" 0.5 0.5"><columnfraction
value="0.5"></columnfraction><columnfraction
value="0.5"></columnfraction></columnfractions>
<tbody><row><entry command="item">
</entry></row><row><entry command="item">
Index: t/results/multitable/empty_multitable_with_cells.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/multitable/empty_multitable_with_cells.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/multitable/empty_multitable_with_cells.pl 23 Aug 2012 18:15:11
-0000 1.16
+++ t/results/multitable/empty_multitable_with_cells.pl 26 Aug 2012 14:15:39
-0000 1.17
@@ -145,6 +145,13 @@
'end_command' => {},
'max_columns' => 0,
'prototypes' => [],
+ 'prototypes_line' => [
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
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.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/multitable/inter_item_commands_in_multitable.pl 24 Aug 2012
16:43:22 -0000 1.19
+++ t/results/multitable/inter_item_commands_in_multitable.pl 26 Aug 2012
14:15:40 -0000 1.20
@@ -287,6 +287,18 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -963,6 +975,18 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -1032,6 +1056,7 @@
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'extra'}{'end_command'}
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2];
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'args'}[0];
+$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'parent'} =
$result_trees{'inter_item_commands_in_multitable'};
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[1]{'parent'} =
$result_trees{'inter_item_commands_in_multitable'};
@@ -1162,6 +1187,7 @@
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'extra'}{'end_command'}
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'contents'}[2];
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'extra'}{'prototypes'}[0]{'contents'}
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'contents'};
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'args'}[0];
+$result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'args'}[0]{'contents'}[1];
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'extra'}{'spaces_after_command'}
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'args'}[0]{'contents'}[0];
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[4]{'parent'} =
$result_trees{'inter_item_commands_in_multitable'};
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[5]{'parent'} =
$result_trees{'inter_item_commands_in_multitable'};
@@ -1283,7 +1309,7 @@
';
-$result_converted{'xml'}->{'inter_item_commands_in_multitable'} = '<multitable
spaces="
"><columnprototypes><columnprototype>truc</columnprototype></columnprototypes>
+$result_converted{'xml'}->{'inter_item_commands_in_multitable'} = '<multitable
spaces=" "><columnprototypes><columnprototype
bracketed="on">truc</columnprototype></columnprototypes>
<beforefirstitem><!-- c comment before first item -->
</beforefirstitem><tbody><row><entry command="item"><para>truc
@@ -1294,7 +1320,7 @@
<!-- c last comment -->
</para></entry></row></tbody></multitable>
-<multitable spaces=" "><columnfractions><columnfraction
value="0.6"></columnfraction><columnfraction
value="0.4"></columnfraction></columnfractions>
+<multitable spaces=" "><columnfractions line=" 0.6 0.4"><columnfraction
value="0.6"></columnfraction><columnfraction
value="0.4"></columnfraction></columnfractions>
<thead><row><entry command="headitem"><para>mu&textndash;ltitable headitem
</para></entry><entry command="tab"><para>another tab
</para></entry></row></thead><tbody><row><entry
command="item"><para>mu&textndash;ltitable item </para></entry><entry
command="tab"><para>multitable tab
<!-- c comment in multitable -->
@@ -1303,7 +1329,7 @@
</para></entry></row><row><entry command="item"><para>lone
mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
-<multitable spaces="
"><columnprototypes><columnprototype>thing</columnprototype></columnprototypes>
+<multitable spaces=" "><columnprototypes><columnprototype
bracketed="on">thing</columnprototype></columnprototypes>
<beforefirstitem><para>Title
<cindex index="cp"><indexterm index="cp">cindex</indexterm></cindex>
</para></beforefirstitem><tbody><row><entry command="item"><para>thing
Index: t/results/multitable/multitable_begin_with_tab.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/multitable/multitable_begin_with_tab.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/multitable/multitable_begin_with_tab.pl 23 Aug 2012 18:15:11
-0000 1.20
+++ t/results/multitable/multitable_begin_with_tab.pl 26 Aug 2012 14:15:40
-0000 1.21
@@ -137,6 +137,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -331,6 +348,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -369,6 +403,8 @@
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'args'}[0];
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'args'}[0];
+$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_begin_with_tab'}{'contents'}[0]{'parent'} =
$result_trees{'multitable_begin_with_tab'};
$result_trees{'multitable_begin_with_tab'}{'contents'}[1]{'parent'} =
$result_trees{'multitable_begin_with_tab'};
@@ -406,6 +442,8 @@
$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'args'}[0];
$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'args'}[0];
+$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'args'}[0]{'contents'}[3];
$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'extra'}{'spaces_after_command'}
=
$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_begin_with_tab'}{'contents'}[2]{'parent'} =
$result_trees{'multitable_begin_with_tab'};
Index: t/results/multitable/multitable_in_example.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/multitable/multitable_in_example.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/multitable/multitable_in_example.pl 24 Aug 2012 16:43:22
-0000 1.15
+++ t/results/multitable/multitable_in_example.pl 26 Aug 2012 14:15:41
-0000 1.16
@@ -307,6 +307,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -423,6 +440,8 @@
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'parent'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'multitable_in_example'}{'contents'}[0];
$result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'multitable_in_example'}{'contents'}[0]{'contents'}[2];
@@ -486,7 +505,7 @@
$result_converted{'xml'}->{'multitable_in_example'} = '<example>
-<multitable spaces="
"><columnprototypes><columnprototype>AAA</columnprototype><columnprototype>BBB</columnprototype></columnprototypes>
+<multitable spaces=" "><columnprototypes><columnprototype
bracketed="on">AAA</columnprototype> <columnprototype
bracketed="on">BBB</columnprototype></columnprototypes>
<tbody><row><entry command="item"><pre xml:space="preserve">truc
</pre></entry><entry command="tab"><pre xml:space="preserve">bidule example
</pre></entry></row><row><entry command="item"><pre xml:space="preserve">begin
item example
Index: t/results/multitable/multitable_not_closed.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/multitable/multitable_not_closed.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/multitable/multitable_not_closed.pl 23 Aug 2012 18:15:11
-0000 1.18
+++ t/results/multitable/multitable_not_closed.pl 26 Aug 2012 14:15:42
-0000 1.19
@@ -69,6 +69,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -94,6 +111,8 @@
$result_trees{'multitable_not_closed'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable_not_closed'}{'contents'}[0]{'args'}[0];
$result_trees{'multitable_not_closed'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable_not_closed'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable_not_closed'}{'contents'}[0]{'args'}[0];
+$result_trees{'multitable_not_closed'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'multitable_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'multitable_not_closed'}{'contents'}[0]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'multitable_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'multitable_not_closed'}{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'multitable_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_not_closed'}{'contents'}[0]{'parent'} =
$result_trees{'multitable_not_closed'};
Index: t/results/multitable/multitable_not_closed_item.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/multitable/multitable_not_closed_item.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/multitable/multitable_not_closed_item.pl 23 Aug 2012 18:15:11
-0000 1.21
+++ t/results/multitable/multitable_not_closed_item.pl 26 Aug 2012 14:15:43
-0000 1.22
@@ -119,6 +119,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -152,6 +169,8 @@
$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable_not_closed_item'}{'contents'}[0]{'args'}[0];
$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable_not_closed_item'}{'contents'}[0]{'args'}[0];
+$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_not_closed_item'}{'contents'}[0]{'parent'} =
$result_trees{'multitable_not_closed_item'};
Index: t/results/multitable/multitable_not_closed_item_tab.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/multitable/multitable_not_closed_item_tab.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/multitable/multitable_not_closed_item_tab.pl 23 Aug 2012
18:15:11 -0000 1.21
+++ t/results/multitable/multitable_not_closed_item_tab.pl 26 Aug 2012
14:15:43 -0000 1.22
@@ -148,6 +148,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -188,6 +205,8 @@
$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'args'}[0];
$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'args'}[0];
+$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_not_closed_item_tab'}{'contents'}[0]{'parent'} =
$result_trees{'multitable_not_closed_item_tab'};
Index: t/results/multitable/multitable_one_column_too_much_cells.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/multitable/multitable_one_column_too_much_cells.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/multitable/multitable_one_column_too_much_cells.pl 23 Aug
2012 18:15:12 -0000 1.20
+++ t/results/multitable/multitable_one_column_too_much_cells.pl 26 Aug
2012 14:15:44 -0000 1.21
@@ -397,6 +397,18 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -476,6 +488,7 @@
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'extra'}{'end_command'}
=
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'contents'}[1];
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}
=
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
=
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'args'}[0];
+$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'multitable_one_column_too_much_cells'}{'contents'}[0]{'parent'}
= $result_trees{'multitable_one_column_too_much_cells'};
Index: t/results/multitable/multitable_with_empty_item_tab.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/multitable/multitable_with_empty_item_tab.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/multitable/multitable_with_empty_item_tab.pl 24 Aug 2012
16:43:22 -0000 1.3
+++ t/results/multitable/multitable_with_empty_item_tab.pl 26 Aug 2012
14:15:44 -0000 1.4
@@ -399,7 +399,7 @@
';
-$result_converted{'xml'}->{'multitable_with_empty_item_tab'} = '<multitable
spaces=" "><columnfractions><columnfraction
value="0.3"></columnfraction><columnfraction
value="0.7"></columnfraction></columnfractions>
+$result_converted{'xml'}->{'multitable_with_empty_item_tab'} = '<multitable
spaces=" "><columnfractions line=" 0.3 0.7"><columnfraction
value="0.3"></columnfraction><columnfraction
value="0.7"></columnfraction></columnfractions>
<tbody><row><entry command="item"><para>1-1 </para></entry><entry
command="tab"><para>1-2 </para></entry></row><row><entry
command="item"></entry><entry command="tab"></entry></row><row><entry
command="item"><para>3-1 </para></entry><entry command="tab"><para>3-2
</para></entry></row></tbody></multitable>
';
Index: t/results/multitable/paragraph_in_cells.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/multitable/paragraph_in_cells.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/multitable/paragraph_in_cells.pl 24 Aug 2012 16:43:22 -0000
1.14
+++ t/results/multitable/paragraph_in_cells.pl 26 Aug 2012 14:15:45 -0000
1.15
@@ -301,6 +301,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -369,6 +386,8 @@
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'paragraph_in_cells'}{'contents'}[0]{'args'}[0];
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'paragraph_in_cells'}{'contents'}[0]{'args'}[0];
+$result_trees{'paragraph_in_cells'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
= $result_trees{'paragraph_in_cells'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'paragraph_in_cells'}{'contents'}[0]{'extra'}{'prototypes_line'}[3]
= $result_trees{'paragraph_in_cells'}{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'extra'}{'spaces_after_command'}
= $result_trees{'paragraph_in_cells'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'paragraph_in_cells'}{'contents'}[0]{'parent'} =
$result_trees{'paragraph_in_cells'};
@@ -423,7 +442,7 @@
';
-$result_converted{'xml'}->{'paragraph_in_cells'} = '<multitable spaces="
"><columnprototypes><columnprototype>AAA</columnprototype><columnprototype>BBB</columnprototype></columnprototypes>
+$result_converted{'xml'}->{'paragraph_in_cells'} = '<multitable spaces="
"><columnprototypes><columnprototype bracketed="on">AAA</columnprototype>
<columnprototype bracketed="on">BBB</columnprototype></columnprototypes>
<tbody><row><entry command="item"><para>truc </para></entry><entry
command="tab"><para>bidule
</para></entry></row><row><entry command="item"><para>begin item
</para>
Index: t/results/multitable/prototype_brace_no_brace.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/multitable/prototype_brace_no_brace.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/multitable/prototype_brace_no_brace.pl 24 Aug 2012 16:43:22
-0000 1.4
+++ t/results/multitable/prototype_brace_no_brace.pl 26 Aug 2012 14:15:46
-0000 1.5
@@ -97,6 +97,26 @@
'type' => 'row_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {
+ 'text' => 'bb',
+ 'type' => 'row_prototype'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -126,6 +146,7 @@
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'extra'}{'end_command'}
= $result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'contents'}[0];
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}
=
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'args'}[0];
+$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'prototype_brace_no_brace'}{'contents'}[0]{'parent'} =
$result_trees{'prototype_brace_no_brace'};
@@ -146,7 +167,7 @@
$result_converted{'html_text'}->{'prototype_brace_no_brace'} = '';
-$result_converted{'xml'}->{'prototype_brace_no_brace'} = '<multitable spaces="
"><columnprototypes><columnprototype>aa</columnprototype><columnprototype>bb</columnprototype></columnprototypes>
+$result_converted{'xml'}->{'prototype_brace_no_brace'} = '<multitable spaces="
"><columnprototypes><columnprototype bracketed="on">aa</columnprototype>
<columnprototype>bb</columnprototype></columnprototypes>
</multitable>
';
Index: t/results/multitable/prototype_brace_no_brace_comment.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/multitable/prototype_brace_no_brace_comment.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/multitable/prototype_brace_no_brace_comment.pl 24 Aug 2012
16:43:22 -0000 1.5
+++ t/results/multitable/prototype_brace_no_brace_comment.pl 26 Aug 2012
14:15:47 -0000 1.6
@@ -108,6 +108,21 @@
'type' => 'row_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {
+ 'text' => 'bb',
+ 'type' => 'row_prototype'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -139,6 +154,7 @@
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'extra'}{'end_command'}
=
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'contents'}[0];
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'contents'}
=
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'};
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0];
+$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'prototype_brace_no_brace_comment'}{'contents'}[0]{'parent'} =
$result_trees{'prototype_brace_no_brace_comment'};
@@ -159,7 +175,7 @@
$result_converted{'html_text'}->{'prototype_brace_no_brace_comment'} = '';
-$result_converted{'xml'}->{'prototype_brace_no_brace_comment'} = '<multitable
spaces="
"><columnprototypes><columnprototype>aa</columnprototype><columnprototype>bb</columnprototype></columnprototypes><!--
comment cc -->
+$result_converted{'xml'}->{'prototype_brace_no_brace_comment'} = '<multitable
spaces=" "><columnprototypes><columnprototype
bracketed="on">aa</columnprototype>
<columnprototype>bb</columnprototype></columnprototypes><!-- comment cc -->
</multitable>
';
Index: t/results/multitable/prototype_no_brace.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/multitable/prototype_no_brace.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/multitable/prototype_no_brace.pl 24 Aug 2012 16:43:22 -0000
1.4
+++ t/results/multitable/prototype_no_brace.pl 26 Aug 2012 14:15:47 -0000
1.5
@@ -117,6 +117,38 @@
'type' => 'row_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {
+ 'text' => 'aa',
+ 'type' => 'row_prototype'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'row_prototype'
+ },
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {
+ 'text' => 'cc',
+ 'type' => 'row_prototype'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {},
@@ -143,6 +175,7 @@
$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'prototype_no_brace'}{'contents'}[0];
$result_trees{'prototype_no_brace'}{'contents'}[0]{'extra'}{'end_command'} =
$result_trees{'prototype_no_brace'}{'contents'}[0]{'contents'}[0];
$result_trees{'prototype_no_brace'}{'contents'}[0]{'extra'}{'prototypes'}[1] =
$result_trees{'prototype_no_brace'}{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'prototype_no_brace'}{'contents'}[0]{'extra'}{'prototypes_line'}[2]
= $result_trees{'prototype_no_brace'}{'contents'}[0]{'args'}[0]{'contents'}[2];
$result_trees{'prototype_no_brace'}{'contents'}[0]{'extra'}{'spaces_after_command'}
= $result_trees{'prototype_no_brace'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'prototype_no_brace'}{'contents'}[0]{'line_nr'} =
$result_trees{'prototype_no_brace'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'line_nr'};
$result_trees{'prototype_no_brace'}{'contents'}[0]{'parent'} =
$result_trees{'prototype_no_brace'};
@@ -164,7 +197,7 @@
$result_converted{'html_text'}->{'prototype_no_brace'} = '';
-$result_converted{'xml'}->{'prototype_no_brace'} = '<multitable spaces="
"><columnprototypes><columnprototype>aa</columnprototype><columnprototype><var>FF</var></columnprototype><columnprototype>b</columnprototype><columnprototype>cc</columnprototype></columnprototypes>
+$result_converted{'xml'}->{'prototype_no_brace'} = '<multitable spaces="
"><columnprototypes><columnprototype>aa</columnprototype><columnprototype><var>FF</var></columnprototype>
<columnprototype>b</columnprototype>
<columnprototype>cc</columnprototype></columnprototypes>
</multitable>
';
Index: t/results/multitable/w_in_multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/multitable/w_in_multitable.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/multitable/w_in_multitable.pl 24 Aug 2012 16:43:22 -0000
1.13
+++ t/results/multitable/w_in_multitable.pl 26 Aug 2012 14:15:48 -0000
1.14
@@ -218,6 +218,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -271,6 +288,8 @@
$result_trees{'w_in_multitable'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'w_in_multitable'}{'contents'}[0]{'args'}[0];
$result_trees{'w_in_multitable'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'w_in_multitable'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'w_in_multitable'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'w_in_multitable'}{'contents'}[0]{'args'}[0];
+$result_trees{'w_in_multitable'}{'contents'}[0]{'extra'}{'prototypes_line'}[1]
= $result_trees{'w_in_multitable'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'w_in_multitable'}{'contents'}[0]{'extra'}{'prototypes_line'}[3]
= $result_trees{'w_in_multitable'}{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'w_in_multitable'}{'contents'}[0]{'extra'}{'spaces_after_command'}
= $result_trees{'w_in_multitable'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'w_in_multitable'}{'contents'}[0]{'parent'} =
$result_trees{'w_in_multitable'};
@@ -301,7 +320,7 @@
';
-$result_converted{'xml'}->{'w_in_multitable'} = '<multitable spaces="
"><columnprototypes><columnprototype>aaaaaaaaa</columnprototype><columnprototype>bbbbbbbbbbb</columnprototype></columnprototypes>
+$result_converted{'xml'}->{'w_in_multitable'} = '<multitable spaces="
"><columnprototypes><columnprototype bracketed="on">aaaaaaaaa</columnprototype>
<columnprototype bracketed="on">bbbbbbbbbbb</columnprototype></columnprototypes>
<tbody><row><entry command="item"><para><w>aaaaaaaa
bbbbbbbbbb</w>
</para></entry><entry command="tab"><para>gg
Index: t/results/plaintext_tests/empty_multitable_in_itemize.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/plaintext_tests/empty_multitable_in_itemize.pl 23 Aug 2012
18:15:13 -0000 1.9
+++ t/results/plaintext_tests/empty_multitable_in_itemize.pl 26 Aug 2012
14:15:48 -0000 1.10
@@ -122,6 +122,13 @@
'end_command' => {},
'max_columns' => 0,
'prototypes' => [],
+ 'prototypes_line' => [
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
Index: t/results/plaintext_tests/multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/plaintext_tests/multitable.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/plaintext_tests/multitable.pl 23 Aug 2012 18:15:14 -0000
1.10
+++ t/results/plaintext_tests/multitable.pl 26 Aug 2012 14:15:49 -0000
1.11
@@ -262,6 +262,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -1402,6 +1419,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -1744,6 +1778,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -1942,6 +1993,18 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -2232,6 +2295,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -2295,6 +2375,8 @@
$result_trees{'multitable'}{'contents'}[0]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable'}{'contents'}[0]{'args'}[0];
$result_trees{'multitable'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable'}{'contents'}[0]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable'}{'contents'}[0]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable'}{'contents'}[0]{'args'}[0];
+$result_trees{'multitable'}{'contents'}[0]{'extra'}{'prototypes_line'}[1] =
$result_trees{'multitable'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'multitable'}{'contents'}[0]{'extra'}{'prototypes_line'}[3] =
$result_trees{'multitable'}{'contents'}[0]{'args'}[0]{'contents'}[3];
$result_trees{'multitable'}{'contents'}[0]{'extra'}{'spaces_after_command'} =
$result_trees{'multitable'}{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_trees{'multitable'}{'contents'}[0]{'parent'} =
$result_trees{'multitable'};
$result_trees{'multitable'}{'contents'}[1]{'parent'} =
$result_trees{'multitable'};
@@ -2518,6 +2600,8 @@
$result_trees{'multitable'}{'contents'}[2]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable'}{'contents'}[2]{'args'}[0];
$result_trees{'multitable'}{'contents'}[2]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable'}{'contents'}[2]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable'}{'contents'}[2]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable'}{'contents'}[2]{'args'}[0];
+$result_trees{'multitable'}{'contents'}[2]{'extra'}{'prototypes_line'}[1] =
$result_trees{'multitable'}{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'multitable'}{'contents'}[2]{'extra'}{'prototypes_line'}[3] =
$result_trees{'multitable'}{'contents'}[2]{'args'}[0]{'contents'}[3];
$result_trees{'multitable'}{'contents'}[2]{'extra'}{'spaces_after_command'} =
$result_trees{'multitable'}{'contents'}[2]{'args'}[0]{'contents'}[0];
$result_trees{'multitable'}{'contents'}[2]{'parent'} =
$result_trees{'multitable'};
$result_trees{'multitable'}{'contents'}[3]{'parent'} =
$result_trees{'multitable'};
@@ -2586,6 +2670,8 @@
$result_trees{'multitable'}{'contents'}[4]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable'}{'contents'}[4]{'args'}[0];
$result_trees{'multitable'}{'contents'}[4]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable'}{'contents'}[4]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable'}{'contents'}[4]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable'}{'contents'}[4]{'args'}[0];
+$result_trees{'multitable'}{'contents'}[4]{'extra'}{'prototypes_line'}[1] =
$result_trees{'multitable'}{'contents'}[4]{'args'}[0]{'contents'}[1];
+$result_trees{'multitable'}{'contents'}[4]{'extra'}{'prototypes_line'}[3] =
$result_trees{'multitable'}{'contents'}[4]{'args'}[0]{'contents'}[3];
$result_trees{'multitable'}{'contents'}[4]{'extra'}{'spaces_after_command'} =
$result_trees{'multitable'}{'contents'}[4]{'args'}[0]{'contents'}[0];
$result_trees{'multitable'}{'contents'}[4]{'parent'} =
$result_trees{'multitable'};
$result_trees{'multitable'}{'contents'}[5]{'parent'} =
$result_trees{'multitable'};
@@ -2622,6 +2708,7 @@
$result_trees{'multitable'}{'contents'}[6]{'extra'}{'end_command'} =
$result_trees{'multitable'}{'contents'}[6]{'contents'}[1];
$result_trees{'multitable'}{'contents'}[6]{'extra'}{'prototypes'}[0]{'contents'}
=
$result_trees{'multitable'}{'contents'}[6]{'args'}[0]{'contents'}[1]{'contents'};
$result_trees{'multitable'}{'contents'}[6]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable'}{'contents'}[6]{'args'}[0];
+$result_trees{'multitable'}{'contents'}[6]{'extra'}{'prototypes_line'}[1] =
$result_trees{'multitable'}{'contents'}[6]{'args'}[0]{'contents'}[1];
$result_trees{'multitable'}{'contents'}[6]{'extra'}{'spaces_after_command'} =
$result_trees{'multitable'}{'contents'}[6]{'args'}[0]{'contents'}[0];
$result_trees{'multitable'}{'contents'}[6]{'parent'} =
$result_trees{'multitable'};
$result_trees{'multitable'}{'contents'}[7]{'parent'} =
$result_trees{'multitable'};
@@ -2676,6 +2763,8 @@
$result_trees{'multitable'}{'contents'}[8]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'multitable'}{'contents'}[8]{'args'}[0];
$result_trees{'multitable'}{'contents'}[8]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'multitable'}{'contents'}[8]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'multitable'}{'contents'}[8]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable'}{'contents'}[8]{'args'}[0];
+$result_trees{'multitable'}{'contents'}[8]{'extra'}{'prototypes_line'}[1] =
$result_trees{'multitable'}{'contents'}[8]{'args'}[0]{'contents'}[1];
+$result_trees{'multitable'}{'contents'}[8]{'extra'}{'prototypes_line'}[3] =
$result_trees{'multitable'}{'contents'}[8]{'args'}[0]{'contents'}[3];
$result_trees{'multitable'}{'contents'}[8]{'extra'}{'spaces_after_command'} =
$result_trees{'multitable'}{'contents'}[8]{'args'}[0]{'contents'}[0];
$result_trees{'multitable'}{'contents'}[8]{'parent'} =
$result_trees{'multitable'};
Index: t/results/plaintext_tests/nested_multitable.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/plaintext_tests/nested_multitable.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/plaintext_tests/nested_multitable.pl 23 Aug 2012 18:15:14
-0000 1.11
+++ t/results/plaintext_tests/nested_multitable.pl 26 Aug 2012 14:15:50
-0000 1.12
@@ -268,6 +268,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -468,6 +485,23 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -531,6 +565,8 @@
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[0]{'parent'}
=
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes'}[1]{'parent'}
=
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[3];
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'nested_multitable'}{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
@@ -571,6 +607,8 @@
$result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0];
$result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0];
+$result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes_line'}[1]
= $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'prototypes_line'}[3]
= $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0]{'contents'}[3];
$result_trees{'nested_multitable'}{'contents'}[1]{'extra'}{'spaces_after_command'}
= $result_trees{'nested_multitable'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'nested_multitable'}{'contents'}[1]{'parent'} =
$result_trees{'nested_multitable'};
Index: t/results/sectioning/double_node_anchor_float.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- t/results/sectioning/double_node_anchor_float.pl 24 Aug 2012 16:43:23
-0000 1.36
+++ t/results/sectioning/double_node_anchor_float.pl 26 Aug 2012 14:15:51
-0000 1.37
@@ -1158,13 +1158,13 @@
<node name="" spaces=" "><nodename></nodename></node>
-<float type="Text" spaces="
"><floattype>Text</floattype><floatname>node1</floatname>
+<float type="Text" spaces=" "><floattype>Text</floattype><floatname spaces="
">node1</floatname>
</float>
-<float type="Text" spaces="
"><floattype>Text</floattype><floatname>anchor1</floatname>
+<float type="Text" spaces=" "><floattype>Text</floattype><floatname spaces="
">anchor1</floatname>
</float>
-<float name="float1" type="Text" spaces="
"><floattype>Text</floattype><floatname>float1</floatname>
+<float name="float1" type="Text" spaces="
"><floattype>Text</floattype><floatname spaces=" ">float1</floatname>
</float>
<node name="" spaces=" "><nodename></nodename></node>
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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/sectioning/explicit_node_directions.pl 24 Aug 2012 16:43:23
-0000 1.6
+++ t/results/sectioning/explicit_node_directions.pl 26 Aug 2012 14:15:52
-0000 1.7
@@ -976,7 +976,7 @@
</pre></menudescription></menuentry><menuentry><menunode>third
node</menunode><menudescription><pre xml:space="preserve">
</pre></menudescription></menuentry></menu>
-<node name="second-node" spaces=" "><nodename>second
node</nodename><nodenext>third
node</nodenext><nodeprev>Top</nodeprev><nodeup>Top</nodeup></node>
+<node name="second-node" spaces=" "><nodename>second node</nodename><nodenext
spaces=" ">third
node</nodenext><nodeprev>Top</nodeprev><nodeup>Top</nodeup></node>
<para>second node
</para>
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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/sectioning/more_sections_than_nodes.pl 24 Aug 2012 16:43:23
-0000 1.3
+++ t/results/sectioning/more_sections_than_nodes.pl 26 Aug 2012 14:15:52
-0000 1.4
@@ -2106,7 +2106,7 @@
</section>
</chapter>
-<node name="n-c3" spaces=" "><nodename>n c3</nodename><nodenext>n c3 s1
s2</nodenext><nodeprev>n c2</nodeprev><nodeup>Top</nodeup></node>
+<node name="n-c3" spaces=" "><nodename>n c3</nodename><nodenext spaces=" ">n
c3 s1 s2</nodenext><nodeprev spaces=" ">n c2</nodeprev><nodeup spaces="
">Top</nodeup></node>
<chapter spaces=" "><sectiontitle>c3</sectiontitle>
<menu>
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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/sectioning/nodes_after_top_before_chapter_nodes.pl 24 Aug
2012 16:43:24 -0000 1.6
+++ t/results/sectioning/nodes_after_top_before_chapter_nodes.pl 26 Aug
2012 14:15:53 -0000 1.7
@@ -1068,7 +1068,7 @@
</pre></menudescription></menuentry><menuentry><menunode>third
node</menunode><menudescription><pre xml:space="preserve">
</pre></menudescription></menuentry></menu>
-<node name="second-node" spaces=" "><nodename>second
node</nodename><nodenext>third
node</nodenext><nodeprev>Top</nodeprev><nodeup>Top</nodeup></node>
+<node name="second-node" spaces=" "><nodename>second node</nodename><nodenext
spaces=" ">third
node</nodenext><nodeprev>Top</nodeprev><nodeup>Top</nodeup></node>
<para>second node
</para>
Index: t/results/sectioning/part_node_before_top.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/part_node_before_top.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- t/results/sectioning/part_node_before_top.pl 24 Aug 2012 16:43:24
-0000 1.26
+++ t/results/sectioning/part_node_before_top.pl 26 Aug 2012 14:15:53
-0000 1.27
@@ -813,7 +813,7 @@
';
-$result_converted{'xml'}->{'part_node_before_top'} = '<node
name="part-node-before-top" spaces=" "><nodename>part node before
top</nodename><nodenext>Top</nodenext><nodeprev
automatic="on">Top</nodeprev><nodeup>Top</nodeup></node>
+$result_converted{'xml'}->{'part_node_before_top'} = '<node
name="part-node-before-top" spaces=" "><nodename>part node before
top</nodename><nodenext spaces=" ">Top</nodenext><nodeprev
automatic="on">Top</nodeprev><nodeup>Top</nodeup></node>
<part spaces=" "><sectiontitle>part</sectiontitle>
</part>
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.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- t/results/sectioning/part_node_chapter_after_top.pl 24 Aug 2012 16:43:24
-0000 1.36
+++ t/results/sectioning/part_node_chapter_after_top.pl 26 Aug 2012 14:15:54
-0000 1.37
@@ -1210,10 +1210,10 @@
</top>
<part spaces=" "><sectiontitle>part</sectiontitle>
-<node name="a-node-after-part" spaces=" "><nodename>a node after
part</nodename><nodenext>chapter</nodenext><nodeprev>Top</nodeprev><nodeup>Top</nodeup></node>
+<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>a node
after part</nodenext><nodeup>Top</nodeup></node>
+<node name="chapter" spaces=" "><nodename>chapter</nodename><nodenext spaces="
">a node after part</nodenext><nodeup spaces=" ">Top</nodeup></node>
<chapter spaces=" "><sectiontitle>chapter </sectiontitle>
</chapter>
</part>
Index: t/results/sectioning/two_nodes_between_chapters.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/sectioning/two_nodes_between_chapters.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/sectioning/two_nodes_between_chapters.pl 24 Aug 2012 16:43:25
-0000 1.14
+++ t/results/sectioning/two_nodes_between_chapters.pl 26 Aug 2012 14:15:55
-0000 1.15
@@ -1367,7 +1367,7 @@
</pre></menudescription></menuentry></menu>
</top>
-<node name="chapter-1" spaces=" "><nodename>chapter
1</nodename><nodenext>Top</nodenext><nodeprev>node between
chapters</nodeprev><nodeup>Top</nodeup></node>
+<node name="chapter-1" spaces=" "><nodename>chapter 1</nodename><nodenext
spaces=" ">Top</nodenext><nodeprev spaces=" ">node between
chapters</nodeprev><nodeup spaces=" ">Top</nodeup></node>
<chapter spaces=" "><sectiontitle>chapter c1</sectiontitle>
<node name="node-between-chapters" spaces=" "><nodename>node between
chapters</nodename><nodenext automatic="on">chapter 2</nodenext><nodeprev
automatic="on">chapter 1</nodeprev><nodeup automatic="on">Top</nodeup></node>
Index: t/results/test_count/multitable.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/test_count/multitable.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/test_count/multitable.pl 23 Aug 2012 18:15:27 -0000 1.16
+++ t/results/test_count/multitable.pl 26 Aug 2012 14:15:56 -0000 1.17
@@ -367,6 +367,28 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -450,6 +472,9 @@
$result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'multitable'}{'contents'}[1]{'args'}[0];
$result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes'}[2]{'contents'}
=
$result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[5]{'contents'};
$result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes'}[2]{'parent'}
= $result_trees{'multitable'}{'contents'}[1]{'args'}[0];
+$result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes_line'}[1] =
$result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes_line'}[3] =
$result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[3];
+$result_trees{'multitable'}{'contents'}[1]{'extra'}{'prototypes_line'}[5] =
$result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[5];
$result_trees{'multitable'}{'contents'}[1]{'extra'}{'spaces_after_command'} =
$result_trees{'multitable'}{'contents'}[1]{'args'}[0]{'contents'}[0];
$result_trees{'multitable'}{'contents'}[1]{'parent'} =
$result_trees{'multitable'};
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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/xml_tests/commands_and_spaces.pl 24 Aug 2012 23:03:49 -0000
1.1
+++ t/results/xml_tests/commands_and_spaces.pl 26 Aug 2012 14:15:57 -0000
1.2
@@ -8,6 +8,8 @@
$result_trees{'commands_and_spaces'} = {
'contents' => [
{
+ 'contents' => [
+ {
'args' => [
{
'parent' => {},
@@ -91,48 +93,1322 @@
],
'cmdname' => 'cropmarks',
'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
}
],
+ 'parent' => {},
'type' => 'text_root'
-};
-$result_trees{'commands_and_spaces'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[0]{'args'}[1]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[0]{'parent'} =
$result_trees{'commands_and_spaces'};
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'parent'} =
$result_trees{'commands_and_spaces'};
-$result_trees{'commands_and_spaces'}{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[2];
-$result_trees{'commands_and_spaces'}{'contents'}[2]{'parent'} =
$result_trees{'commands_and_spaces'};
-$result_trees{'commands_and_spaces'}{'contents'}[3]{'parent'} =
$result_trees{'commands_and_spaces'};
-$result_trees{'commands_and_spaces'}{'contents'}[4]{'args'}[0]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[4];
-$result_trees{'commands_and_spaces'}{'contents'}[4]{'parent'} =
$result_trees{'commands_and_spaces'};
-$result_trees{'commands_and_spaces'}{'contents'}[5]{'parent'} =
$result_trees{'commands_and_spaces'};
-$result_trees{'commands_and_spaces'}{'contents'}[6]{'args'}[0]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[6];
-$result_trees{'commands_and_spaces'}{'contents'}[6]{'parent'} =
$result_trees{'commands_and_spaces'};
-
-$result_texis{'commands_and_spaces'} = '@set foo some @value
-
address@hidden ggg
-
address@hidden @arrow
-
address@hidden after cropmarks.
-';
-
-
-$result_texts{'commands_and_spaces'} = '
-
-
-';
-
-$result_errors{'commands_and_spaces'} = [];
-
-
-
-$result_converted{'xml'}->{'commands_and_spaces'} = '<set name="foo" line="
foo some @value">some @value</set>
-
-
-<clickstyle command="arrow" line=" @arrow">@arrow</clickstyle>
-
-<cropmarks line=" after cropmarks."></cropmarks>
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'a'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '(b)'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '(c)'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => '(d)'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'a'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'b'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'c'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'd'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'e'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'image',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ],
+ [
+ {}
+ ],
+ [
+ {}
+ ],
+ [
+ {}
+ ],
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'a'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'b'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'c'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'd'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'e'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'image',
+ 'contents' => [],
+ 'extra' => {
+ 'brace_command_contents' => [
+ [
+ {}
+ ],
+ [
+ {}
+ ],
+ [
+ {}
+ ],
+ [
+ {}
+ ],
+ [
+ {}
+ ]
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'Note'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'quotation',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Q
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'quotation'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'quotation',
+ 'spaces_after_command' => {},
+ 'text_arg' => 'quotation'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 18,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'end_command' => {},
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 16,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'ff'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'b'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'float',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'f
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_before_argument'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'In caption '
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_context'
+ }
+ ],
+ 'cmdname' => 'caption',
+ 'contents' => [],
+ 'extra' => {
+ 'float' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 22,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'j.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Short'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_context'
+ }
+ ],
+ 'cmdname' => 'shortcaption',
+ 'contents' => [],
+ 'extra' => {
+ 'float' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' g.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '0.4 0.6'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.4',
+ '0.6'
+ ],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 25,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'multitable',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'multitable'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'multitable',
+ 'spaces_after_command' => {},
+ 'text_arg' => 'multitable'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 26,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'columnfractions' => [],
+ 'end_command' => {},
+ 'max_columns' => 2,
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'aa b'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'bracketed'
+ },
+ {
+ 'parent' => {},
+ 'text' => ' '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'cmd'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'var',
+ 'contents' => [],
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 28,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => 'gg hh j
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'multitable',
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'multitable'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command' => {},
+ 'command_argument' => 'multitable',
+ 'spaces_after_command' => {},
+ 'text_arg' => 'multitable'
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 29,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {},
+ 'max_columns' => 5,
+ 'prototypes' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'bracketed_multitable_prototype'
+ },
+ {},
+ {
+ 'text' => 'gg',
+ 'type' => 'row_prototype'
+ },
+ {
+ 'text' => 'hh',
+ 'type' => 'row_prototype'
+ },
+ {
+ 'text' => 'j',
+ 'type' => 'row_prototype'
+ }
+ ],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => 'gg',
+ 'type' => 'row_prototype'
+ },
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {
+ 'text' => 'hh',
+ 'type' => 'row_prototype'
+ },
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {
+ 'text' => 'j',
+ 'type' => 'row_prototype'
+ },
+ {
+ 'text' => '
+',
+ 'type' => 'prototype_space'
+ }
+ ],
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {},
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ],
+ [
+ {}
+ ]
+ ],
+ 'caption' => {},
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'b',
+ 'shortcaption' => {},
+ 'spaces_after_command' => {},
+ 'type' => {
+ 'content' => [
+ {}
+ ],
+ 'normalized' => 'ff'
+ }
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ },
+ 'number' => 1,
+ 'parent' => {}
+ }
+ ],
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [],
+ 'normalized' => 'a'
+ },
+ {
+ 'manual_content' => [
+ {
+ 'parent' => {},
+ 'text' => 'b'
+ }
+ ]
+ },
+ {
+ 'manual_content' => [
+ {
+ 'parent' => {},
+ 'text' => 'c'
+ }
+ ]
+ },
+ {
+ 'manual_content' => [
+ {
+ 'parent' => {},
+ 'text' => 'd'
+ }
+ ]
+ }
+ ],
+ 'normalized' => 'a',
+ 'spaces_after_command' => {}
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'commands_and_spaces'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[0]{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[0]{'contents'}[2];
+$result_trees{'commands_and_spaces'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[0]{'contents'}[4];
+$result_trees{'commands_and_spaces'}{'contents'}[0]{'contents'}[4]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[0]{'contents'}[5]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[0]{'contents'}[6];
+$result_trees{'commands_and_spaces'}{'contents'}[0]{'contents'}[6]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[0]{'contents'}[7]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[0]{'parent'} =
$result_trees{'commands_and_spaces'};
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[1]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[2];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[2];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[2]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[3];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[3]{'contents'}[2]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[3];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[3]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[2];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[2];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[3];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[3]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[4]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[4];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[4]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[4];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[4]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'extra'}{'brace_command_contents'}[2][0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[2]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'extra'}{'brace_command_contents'}[3][0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'extra'}{'brace_command_contents'}[4][0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'args'}[4]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[2];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[2];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[2]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[3];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[3]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[4]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[4];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[4]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[4];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[4]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'extra'}{'brace_command_contents'}[0][0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'extra'}{'brace_command_contents'}[1][0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[1]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'extra'}{'brace_command_contents'}[2][0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[2]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'extra'}{'brace_command_contents'}[3][0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[3]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'extra'}{'brace_command_contents'}[4][0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'args'}[4]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[4]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[5]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[6]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'command'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'extra'}{'end_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'extra'}{'spaces_after_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[7]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[8]{'parent'} =
$result_trees{'commands_and_spaces'}{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'args'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'args'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'args'}[1]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'extra'}{'float'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[1]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[2];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[2]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[3]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[3]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[3];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[3]{'extra'}{'float'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[3]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[4]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[4];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[4]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[5]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'extra'}{'columnfractions'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[1]{'extra'}{'misc_args'};
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'extra'}{'end_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'extra'}{'spaces_after_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'line_nr'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'args'}[0]{'contents'}[1]{'line_nr'};
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[6]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[7]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[3];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[4]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'contents'}[0]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'contents'}[0]{'extra'}{'spaces_after_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'contents'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'extra'}{'end_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'extra'}{'prototypes'}[0]{'contents'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[1]{'contents'};
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'extra'}{'prototypes'}[0]{'parent'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'extra'}{'prototypes'}[1]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[3];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[3];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'extra'}{'spaces_after_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'line_nr'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'args'}[0]{'contents'}[3]{'line_nr'};
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[8]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[9]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'extra'}{'block_command_line_contents'}[1][0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'extra'}{'caption'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'extra'}{'node_content'}[0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'args'}[1]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'extra'}{'shortcaption'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'contents'}[3];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'extra'}{'spaces_after_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'extra'}{'type'}{'content'}[0]
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'args'}[0]{'contents'}[1];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[9]{'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];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[2]{'manual_content'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[2];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'nodes_manuals'}[3]{'manual_content'}[0]{'parent'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[3];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'extra'}{'spaces_after_command'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'parent'} =
$result_trees{'commands_and_spaces'};
+
+$result_texis{'commands_and_spaces'} = '@set foo some @value
+
address@hidden ggg
+
address@hidden @arrow
+
address@hidden after cropmarks.
+
address@hidden a ,(b),(c) , (d)
+
address@hidden a ,b,c , d,e }
+
address@hidden a ,b
+,c , d,e }
+
address@hidden Note
+Q
address@hidden quotation
+
address@hidden ff , b
+f
address@hidden In caption }j.
address@hidden g.
+
address@hidden @columnfractions 0.4 0.6
address@hidden multitable
+
address@hidden {aa b} @var{cmd}gg hh j
address@hidden multitable
+
+';
+
+
+$result_texts{'commands_and_spaces'} = '
+
+
+
+
+a
+
+a
+
+Note
+Q
+
+ff, b
+f
+j.
+ g.
+
+
+
+';
+
+$result_sectioning{'commands_and_spaces'} = {};
+
+$result_nodes{'commands_and_spaces'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'a'
+ },
+ 'node_next' => {
+ 'extra' => {
+ 'manual_content' => [
+ {
+ 'text' => 'b'
+ }
+ ]
+ }
+ },
+ 'node_prev' => {
+ 'extra' => {
+ 'manual_content' => [
+ {
+ 'text' => 'c'
+ }
+ ]
+ }
+ },
+ 'node_up' => {
+ 'extra' => {
+ 'manual_content' => [
+ {
+ 'text' => 'd'
+ }
+ ]
+ }
+ }
+};
+
+$result_menus{'commands_and_spaces'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'a'
+ }
+};
+
+$result_errors{'commands_and_spaces'} = [
+ {
+ 'error_line' => ':30: No matching address@hidden float\'
+',
+ 'file_name' => '',
+ 'line_nr' => 30,
+ 'macro' => '',
+ 'text' => 'No matching address@hidden float\'',
+ 'type' => 'error'
+ }
+];
+
+
+$result_floats{'commands_and_spaces'} = {
+ 'ff' => [
+ {
+ 'cmdname' => 'float',
+ 'extra' => {
+ 'caption' => {
+ 'cmdname' => 'caption',
+ 'extra' => {
+ 'float' => {}
+ }
+ },
+ 'normalized' => 'b',
+ 'shortcaption' => {
+ 'cmdname' => 'shortcaption',
+ 'extra' => {
+ 'float' => {}
+ }
+ },
+ 'type' => {
+ 'content' => [
+ {
+ 'text' => 'ff'
+ }
+ ],
+ 'normalized' => 'ff'
+ }
+ },
+ 'number' => 1
+ }
+ ]
+};
+$result_floats{'commands_and_spaces'}{'ff'}[0]{'extra'}{'caption'}{'extra'}{'float'}
= $result_floats{'commands_and_spaces'}{'ff'}[0];
+$result_floats{'commands_and_spaces'}{'ff'}[0]{'extra'}{'shortcaption'}{'extra'}{'float'}
= $result_floats{'commands_and_spaces'}{'ff'}[0];
+
+
+
+$result_converted{'xml'}->{'commands_and_spaces'} = '<set name="foo" line="
foo some @value">some @value</set>
+
+
+<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>
+
+<image><imagefile>a </imagefile><imagewidth>b</imagewidth><imageheight>c
</imageheight><alttext spaces=" ">d</alttext><imageextension>e
</imageextension></image>
+
+<image><imagefile>a </imagefile><imagewidth>b
+</imagewidth><imageheight>c </imageheight><alttext spaces="
">d</alttext><imageextension>e </imageextension></image>
+
+<quotation spaces=" "><quotationtype>Note </quotationtype>
+<para>Q
+</para></quotation>
+
+<float name="b" type="ff" spaces=" "><floattype>ff </floattype><floatname
spaces=" ">b </floatname>
+<para>f
+</para><caption><para>In caption </para></caption><para>j.
+</para><shortcaption><para>Short</para></shortcaption><para> g.
+</para>
+<multitable spaces=" "><columnfractions line=" 0.4 0.6 "><columnfraction
value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
+</multitable>
+
+<multitable spaces=" "><columnprototypes><columnprototype bracketed="on">aa
b</columnprototype>
<columnprototype><var>cmd</var></columnprototype><columnprototype>gg</columnprototype>
<columnprototype>hh</columnprototype> <columnprototype>j</columnprototype>
</columnprototypes>
+</multitable>
+
+</float>
';
1;
Index: t/results/xml_tests/comments_on_block_command_lines.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xml_tests/comments_on_block_command_lines.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/xml_tests/comments_on_block_command_lines.pl 24 Aug 2012
16:43:25 -0000 1.12
+++ t/results/xml_tests/comments_on_block_command_lines.pl 26 Aug 2012
14:15:57 -0000 1.13
@@ -1661,6 +1661,22 @@
'type' => 'bracketed_multitable_prototype'
}
],
+ 'prototypes_line' => [
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ },
+ {},
+ {
+ 'text' => ' ',
+ 'type' => 'prototype_space'
+ }
+ ],
'spaces_after_command' => {}
},
'line_nr' => {
@@ -2337,6 +2353,8 @@
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'extra'}{'prototypes'}[0]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0];
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'extra'}{'prototypes'}[1]{'contents'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[3]{'contents'};
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'extra'}{'prototypes'}[1]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'extra'}{'prototypes_line'}[1]
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[1];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'extra'}{'prototypes_line'}[3]
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[3];
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'extra'}{'spaces_after_command'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'args'}[0]{'contents'}[0];
$result_trees{'comments_on_block_command_lines'}{'contents'}[22]{'parent'} =
$result_trees{'comments_on_block_command_lines'};
$result_trees{'comments_on_block_command_lines'}{'contents'}[23]{'parent'} =
$result_trees{'comments_on_block_command_lines'};
@@ -2577,11 +2595,11 @@
<pre xml:space="preserve">in ex
</pre></example>
-<multitable spaces=" "><columnfractions><columnfraction
value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions><!-- c comm -->
+<multitable spaces=" "><columnfractions line=" 0.4 0.6 "><columnfraction
value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions><!-- c comm -->
<tbody><row><entry command="item"><para>a </para></entry><entry
command="tab"><para>b
</para></entry></row></tbody></multitable>
-<multitable spaces="
"><columnprototypes><columnprototype>aaa</columnprototype><columnprototype>bbb</columnprototype></columnprototypes><!--
c c -->
+<multitable spaces=" "><columnprototypes><columnprototype
bracketed="on">aaa</columnprototype> <columnprototype
bracketed="on">bbb</columnprototype> </columnprototypes><!-- c c -->
<tbody><row><entry command="item"><para>aaa </para></entry><entry
command="tab"><para>bbb
</para></entry></row></tbody></multitable>
Index: t/results/xtable/definfoenclose_on_table_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xtable/definfoenclose_on_table_line.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/xtable/definfoenclose_on_table_line.pl 24 Aug 2012 16:43:26
-0000 1.16
+++ t/results/xtable/definfoenclose_on_table_line.pl 26 Aug 2012 14:15:58
-0000 1.17
@@ -368,7 +368,7 @@
';
-$result_converted{'xml'}->{'definfoenclose_on_table_line'} = '<definfoenclose
command="phi" open=":" close=":"></definfoenclose>
+$result_converted{'xml'}->{'definfoenclose_on_table_line'} = '<definfoenclose
command="phi" open=":" close=":" line=" phi,:,:"></definfoenclose>
<table commandarg="phi" begin=":" end=":" spaces=" ">
<tableentry><tableterm><item><itemformat command="phi" begin=":"
end=":">item</itemformat></item>
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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- tests/layout/res_parser/formatting_xml/formatting.xml 24 Aug 2012
16:43:26 -0000 1.7
+++ tests/layout/res_parser/formatting_xml/formatting.xml 26 Aug 2012
14:15:58 -0000 1.8
@@ -765,22 +765,22 @@
<findex index="fn"><indexterm index="fn">&textldquo;</indexterm></findex>
<findex index="fn"><indexterm
index="fn">&textndash;foption</indexterm></findex>
-<para>&arobase;"u <accent type="uml">u</accent>
+<para>&arobase;"u <accent type="uml" bracketed="off">u</accent>
&arobase;"{U} <accent type="uml">U</accent>
-&arobase;~n <accent type="tilde">n</accent>
-&arobase;^a <accent type="circ">a</accent>
-&arobase;&textrsquo;e <accent type="acute">e</accent>
-&arobase;=o <accent type="macr">o</accent>
-&arobase;&textlsquo;i <accent type="grave">i</accent>
+&arobase;~n <accent type="tilde" bracketed="off">n</accent>
+&arobase;^a <accent type="circ" bracketed="off">a</accent>
+&arobase;&textrsquo;e <accent type="acute" bracketed="off">e</accent>
+&arobase;=o <accent type="macr" bracketed="off">o</accent>
+&arobase;&textlsquo;i <accent type="grave" bracketed="off">i</accent>
&arobase;&textrsquo;{e} <accent type="acute">e</accent>
&arobase;&textrsquo;{&arobase;dotless{i}} <accent
type="acute"><dotless>i</dotless></accent>
&arobase;dotless{i} <dotless>i</dotless>
&arobase;dotless{j} <dotless>j</dotless>
-&arobase;&textlsquo;{&arobase;=E} <accent type="grave"><accent
type="macr">E</accent></accent>
+&arobase;&textlsquo;{&arobase;=E} <accent type="grave"><accent
type="macr" bracketed="off">E</accent></accent>
&arobase;l{} &lslash;
-&arobase;,{&arobase;&textrsquo;C} <accent type="cedil"><accent
type="acute">C</accent></accent>
-&arobase;,c <accent type="cedil">c</accent>
-&arobase;,c&arobase;"u <accent type="cedil">c</accent><accent
type="uml">u</accent> &linebreak;
+&arobase;,{&arobase;&textrsquo;C} <accent type="cedil"><accent
type="acute" bracketed="off">C</accent></accent>
+&arobase;,c <accent type="cedil" bracketed="off">c</accent>
+&arobase;,c&arobase;"u <accent type="cedil"
bracketed="off">c</accent><accent type="uml" bracketed="off">u</accent>
&linebreak;
</para>
<para>&arobase;* &linebreak;
&arobase; followed by a space
@@ -862,8 +862,8 @@
</para>
<para><code>&arobase;acronym{--a,an accronym}</code>
<acronym><acronymword>&textndash;a</acronymword><acronymdesc>an
accronym</acronymdesc></acronym>
<code>&arobase;acronym{--a}</code>
<acronym><acronymword>&textndash;a</acronymword></acronym>
-<code>&arobase;abbr{&arobase;'E--. &arobase;comma{}A.,
&arobase;'Etude Autonome }</code> <abbr><abbrword><accent
type="acute">E</accent>&textndash;. ,A.</abbrword><abbrdesc><accent
type="acute">E</accent>tude Autonome </abbrdesc></abbr>
-<code>&arobase;abbr{&arobase;'E--.
&arobase;comma{}A.}</code> <abbr><abbrword><accent
type="acute">E</accent>&textndash;. ,A.</abbrword></abbr>
+<code>&arobase;abbr{&arobase;'E--. &arobase;comma{}A.,
&arobase;'Etude Autonome }</code> <abbr><abbrword><accent type="acute"
bracketed="off">E</accent>&textndash;. ,A.</abbrword><abbrdesc spaces="
"><accent type="acute" bracketed="off">E</accent>tude Autonome
</abbrdesc></abbr>
+<code>&arobase;abbr{&arobase;'E--.
&arobase;comma{}A.}</code> <abbr><abbrword><accent
type="acute" bracketed="off">E</accent>&textndash;. ,A.</abbrword></abbr>
<code>&arobase;asis{--a}</code> <asis>&textndash;a</asis>
<code>&arobase;b{--a}</code> <b>&textndash;a</b>
<code>&arobase;cite{--a}</code> <cite>&textndash;a</cite>
@@ -936,13 +936,13 @@
<code>&arobase;image{f-ile,aze,,a--lt}</code> <image
where="inline"><imagefile>f-ile</imagefile><imagewidth>aze</imagewidth><alttext>a&textndash;lt</alttext></image>
<code>&arobase;image{&arobase;file{f--ile}&arobase;&arobase;&arobase;.,aze,az,alt,&arobase;file{file
ext} e--xt&arobase;}</code> <image
where="inline"><imagefile><file>f--ile</file>&arobase;&eosperiod;</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension><file>file
ext</file> e--xt}</imageextension></image>
</para>
-<sp value="2"></sp>
+<sp value="2" line=" 2"></sp>
<para><code>&arobase;clicksequence{click &arobase;click{}
A}</code> <clicksequence>click <click command="arrow"/> A</clicksequence>
-<clickstyle command="result">@result</clickstyle>
+<clickstyle command="result" line=" @result">@result</clickstyle>
After clickstyle &result;
<code>&arobase;clicksequence{click &arobase;click{}
A}</code> <clicksequence>click <click command="result"/>
A</clicksequence>
-<clickstyle command="arrow">@arrow</clickstyle>
+<clickstyle command="arrow" line=" @arrow">@arrow</clickstyle>
</para>
<quotation>
<para>A quot&textmdash;ation
@@ -972,8 +972,8 @@
<para>a Warning.
</para></quotation>
-<quotation spaces=" "><quotationtype>something <accent type="acute">e</accent>
&tex;</quotationtype>
-<para>The something <accent type="acute">e</accent> &tex; is here.
+<quotation spaces=" "><quotationtype>something <accent type="acute"
bracketed="off">e</accent> &tex;</quotationtype>
+<para>The something <accent type="acute" bracketed="off">e</accent> &tex; is
here.
</para></quotation>
<quotation spaces=" "><quotationtype>&arobase; at the end of line <spacecmd
type="nl"/></quotationtype><para>A &arobase; at the end of the
&arobase;quotation line.
@@ -1035,7 +1035,7 @@
<listitem><para>e&textndash;numerate
</para></listitem></enumerate>
-<multitable spaces=" "><columnfractions><columnfraction
value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
+<multitable spaces=" "><columnfractions line=" 0.4 0.6 "><columnfraction
value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
<thead><row><entry command="headitem"><para>mu&textndash;ltitable headitem
</para></entry><entry command="tab"><para>another tab
</para></entry></row></thead><tbody><row><entry
command="item"><para>mu&textndash;ltitable item </para></entry><entry
command="tab"><para>multitable tab
<!-- c comment in multitable -->
@@ -1044,7 +1044,7 @@
</para></entry></row><row><entry command="item"><para>lone
mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
-<multitable spaces="
"><columnprototypes><columnprototype>truc</columnprototype><columnprototype>bidule</columnprototype></columnprototypes>
+<multitable spaces=" "><columnprototypes><columnprototype
bracketed="on">truc</columnprototype> <columnprototype
bracketed="on">bidule</columnprototype></columnprototypes>
<tbody><row><entry command="item"><para>truc </para></entry><entry
command="tab"><para>bidule
</para></entry></row></tbody></multitable>
@@ -1091,27 +1091,27 @@
<deffn spaces=" "><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>
-<deffnx><definitionterm><indexterm
index="fn">truc</indexterm><defcategory>cmde</defcategory>
<deffunction>truc</deffunction> <defparam></defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">log
trap</indexterm><defcategory>Command</defcategory> <deffunction>log
trap</deffunction> <defparam></defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction>log
trap1</deffunction> <defparam></defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">log
trap2</indexterm><defcategory>Command</defcategory> <deffunction>log
trap2</deffunction> <defparam></defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
-<deffnx><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>
-<deffnx><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory></definitionterm></deffnx>
+<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 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>
+<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory></definitionterm></deffnx>
<deffnx><definitionterm></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory></defcategory>
<deffunction></deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory></defcategory></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">machin</indexterm><defcategory></defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">bidule
machin</indexterm><defcategory></defcategory> <deffunction>bidule
machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">machin</indexterm><defcategory>truc</defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory>truc</defcategory>
<deffunction></deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">followed</indexterm><defcategory>truc</defcategory>
<deffunction>followed</deffunction> <defparam>by</defparam>
<defparam>a</defparam> <defparam>comment</defparam></definitionterm></deffnx>
+<deffnx spaces="
"><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><defcategory bracketed="on"></defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><defcategory
bracketed="on"></defcategory></definitionterm></deffnx>
+<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><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>truc</defcategory></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory></defcategory>
<deffunction></deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">a</indexterm><defcategory>truc</defcategory>
<deffunction>a</deffunction> <defparam>b</defparam> <defparam>c</defparam>
<defparam>d</defparam> <defparam>e</defparam> <defparam><b>f g</b></defparam>
<defparam>h i</defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory>truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
+<deffnx><definitionterm><defcategory
bracketed="on">truc</defcategory></definitionterm></deffnx>
+<deffnx><definitionterm><defcategory bracketed="on"></defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm
index="fn">a</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>a</deffunction> <defparam>b</defparam> <defparam>c</defparam>
<defparam>d</defparam> <defparam>e</defparam> <defparam><b>f g</b></defparam>
<defparam bracketed="on">h i</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
</deffn>
<deffn spaces=" "><definitionterm><indexterm
index="fn">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction></definitionterm>
@@ -1119,11 +1119,11 @@
<deffn spaces=" "><definitionterm><indexterm
index="fn">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction> <defparam>with</defparam>
<defparam>deffnx</defparam></definitionterm>
<!-- c comment between deffn and deffnx -->
-<deffnx><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory>empty</defcategory>
<deffunction>deffnx</deffunction></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory>empty</defcategory>
<deffunction>deffnx</deffunction></definitionterm></deffnx>
</deffn>
<deffn spaces=" "><definitionterm><indexterm
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
-<deffnx><definitionterm><indexterm
index="fn">truc</indexterm><defcategory>cmde</defcategory>
<deffunction>truc</deffunction> <defparam></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<definitionitem><!-- c comment -->
<para>text in def item for second def item
</para></definitionitem></deffn>
@@ -1164,7 +1164,7 @@
<definitionitem><para>d&textndash;efmac
</para></definitionitem></defmac>
-<defspec spaces=" "><definitionterm><indexterm
index="fn">d&textndash;efspec_name</indexterm><defcategory
automatic="on">Special Form</defcategory>
<deffunction>d--efspec_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
+<defspec spaces=" "><definitionterm><indexterm
index="fn">d&textndash;efspec_name</indexterm><defcategory automatic="on"
bracketed="on">Special Form</defcategory>
<deffunction>d--efspec_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
<definitionitem><para>d&textndash;efspec
</para></definitionitem></defspec>
@@ -1172,7 +1172,7 @@
<definitionitem><para>d&textndash;efvar
</para></definitionitem></defvar>
-<defopt spaces=" "><definitionterm><indexterm
index="vr">d&textndash;efopt_name</indexterm><defcategory automatic="on">User
Option</defcategory> <defvariable>d--efopt_name</defvariable></definitionterm>
+<defopt spaces=" "><definitionterm><indexterm
index="vr">d&textndash;efopt_name</indexterm><defcategory automatic="on"
bracketed="on">User Option</defcategory>
<defvariable>d--efopt_name</defvariable></definitionterm>
<definitionitem><para>d&textndash;efopt
</para></definitionitem></defopt>
@@ -1184,11 +1184,11 @@
<definitionitem><para>d&textndash;eftypevar
</para></definitionitem></deftypevar>
-<defivar spaces=" "><definitionterm><indexterm
index="vr">d&textndash;efivar_name of c&textndash;lass</indexterm><defcategory
automatic="on">Instance Variable</defcategory> <defclass>c--lass</defclass>
<defclassvar>d--efivar_name</defclassvar></definitionterm>
+<defivar spaces=" "><definitionterm><indexterm
index="vr">d&textndash;efivar_name of c&textndash;lass</indexterm><defcategory
automatic="on" bracketed="on">Instance Variable</defcategory>
<defclass>c--lass</defclass>
<defclassvar>d--efivar_name</defclassvar></definitionterm>
<definitionitem><para>d&textndash;efivar
</para></definitionitem></defivar>
-<deftypeivar spaces=" "><definitionterm><indexterm
index="vr">d&textndash;eftypeivar_name of
c&textndash;lass</indexterm><defcategory automatic="on">Instance
Variable</defcategory> <defclass>c--lass</defclass> <deftype>t--ype</deftype>
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
+<deftypeivar spaces=" "><definitionterm><indexterm
index="vr">d&textndash;eftypeivar_name of
c&textndash;lass</indexterm><defcategory automatic="on" bracketed="on">Instance
Variable</defcategory> <defclass>c--lass</defclass> <deftype>t--ype</deftype>
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
<definitionitem><para>d&textndash;eftypeivar
</para></definitionitem></deftypeivar>
@@ -1200,10 +1200,10 @@
<definitionitem><para>d&textndash;eftypemethod
</para></definitionitem></deftypemethod>
-<para><code>&arobase;xref{c---hapter&arobase;&arobase;, cross r---ef
name&arobase;&arobase;, t---itle&arobase;&arobase;, file
n---ame&arobase;&arobase;, ma---nual&arobase;&arobase;}</code>
<xref><xrefnodename>c---hapter&arobase;</xrefnodename><xrefinfoname>cross
r&textmdash;ef
name&arobase;</xrefinfoname><xrefprinteddesc>t&textmdash;itle&arobase;</xrefprinteddesc><xrefinfofile>file
n---ame&arobase;</xrefinfofile><xrefprintedname>ma&textmdash;nual&arobase;</xrefprintedname></xref>.
-<code>&arobase;ref{chapter, cross ref name, title, file name,
manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;pxref{chapter, cross ref name, title, file name,
manual}</code>
<pxref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></pxref>
-<code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname>cross ref
name</inforefrefname><inforefinfoname>file name</inforefinfoname></inforef>
+<para><code>&arobase;xref{c---hapter&arobase;&arobase;, cross r---ef
name&arobase;&arobase;, t---itle&arobase;&arobase;, file
n---ame&arobase;&arobase;, ma---nual&arobase;&arobase;}</code>
<xref><xrefnodename>c---hapter&arobase;</xrefnodename><xrefinfoname spaces="
">cross r&textmdash;ef name&arobase;</xrefinfoname><xrefprinteddesc spaces="
">t&textmdash;itle&arobase;</xrefprinteddesc><xrefinfofile spaces=" ">file
n---ame&arobase;</xrefinfofile><xrefprintedname spaces="
">ma&textmdash;nual&arobase;</xrefprintedname></xref>.
+<code>&arobase;ref{chapter, cross ref name, title, file name,
manual}</code> <ref><xrefnodename>chapter</xrefnodename><xrefinfoname
spaces=" ">cross ref name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></ref>
+<code>&arobase;pxref{chapter, cross ref name, title, file name,
manual}</code> <pxref><xrefnodename>chapter</xrefnodename><xrefinfoname
spaces=" ">cross ref name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></pxref>
+<code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
</para>
<para><code>&arobase;ref{chapter}</code>
<ref><xrefnodename>chapter</xrefnodename></ref>
<code>&arobase;xref{chapter}</code>
<xref><xrefnodename>chapter</xrefnodename></xref>.
@@ -1212,8 +1212,8 @@
</para>
<para><code>&arobase;ref{s--ect&arobase;comma{}ion, a
&arobase;comma{} in cross
ref, a comma&arobase;comma{} in title, a
comma&arobase;comma{} in file, a &arobase;comma{}
in manual name }</code>
-<ref><xrefnodename>s--ect,ion</xrefnodename><xrefinfoname>a , in
cross
-ref</xrefinfoname><xrefprinteddesc>a comma, in
title</xrefprinteddesc><xrefinfofile>a comma, in
file</xrefinfofile><xrefprintedname>a , in manual name
</xrefprintedname></ref>
+<ref><xrefnodename>s--ect,ion</xrefnodename><xrefinfoname spaces=" ">a
, in cross
+ref</xrefinfoname><xrefprinteddesc spaces=" ">a comma, in
title</xrefprinteddesc><xrefinfofile spaces=" ">a comma, in
file</xrefinfofile><xrefprintedname spaces=" ">a , in manual name
</xrefprintedname></ref>
</para>
<para><code>&arobase;ref{chapter,cross ref name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
<code>&arobase;ref{chapter,,title}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
@@ -1224,10 +1224,10 @@
<code>&arobase;ref{chapter,cross ref name,,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
<code>&arobase;ref{chapter,cross ref name,title,file
name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{chapter,cross ref name,title,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{chapter,,title,file name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{chapter,,title,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,,title, file name, manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,,title, file name, manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{chapter,,,file name,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
</para>
@@ -1240,27 +1240,27 @@
<code>&arobase;ref{(pman)anode,cross ref name,,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
<code>&arobase;ref{(pman)anode,cross ref name,title,file
name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{(pman)anode,cross ref
name,title,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{(pman)anode,,title,file name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{(pman)anode,,title,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,,title, file name, manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,,title, file name, manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{(pman)anode,,,file name,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
</para>
-<para><code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname>cross ref
name</inforefrefname><inforefinfoname>file name</inforefinfoname></inforef>
+<para><code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
<code>&arobase;inforef{chapter}</code>
<inforef><inforefnodename>chapter</inforefnodename></inforef>
-<code>&arobase;inforef{chapter, cross ref name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname>cross ref
name</inforefrefname></inforef>
+<code>&arobase;inforef{chapter, cross ref name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
<code>&arobase;inforef{chapter,,file name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{node, cross ref name, file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname>cross ref
name</inforefrefname><inforefinfoname>file name</inforefinfoname></inforef>
+<code>&arobase;inforef{node, cross ref name, file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
<code>&arobase;inforef{node}</code>
<inforef><inforefnodename>node</inforefnodename></inforef>
-<code>&arobase;inforef{node, cross ref name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname>cross ref
name</inforefrefname></inforef>
+<code>&arobase;inforef{node, cross ref name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
<code>&arobase;inforef{node,,file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{chapter, cross ref name, file name, spurious
arg}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname>cross ref
name</inforefrefname><inforefinfoname>file name, spurious
arg</inforefinfoname></inforef>
+<code>&arobase;inforef{chapter, cross ref name, file name, spurious
arg}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file name,
spurious arg</inforefinfoname></inforef>
</para>
<para><code>&arobase;inforef{s--ect&arobase;comma{}ion, a
&arobase;comma{} in cross
ref, a comma&arobase;comma{} in file}</code>
-<inforef><inforefnodename>s--ect,ion</inforefnodename><inforefrefname>a
, in cross
-ref</inforefrefname><inforefinfoname>a comma, in
file</inforefinfoname></inforef>
+<inforef><inforefnodename>s--ect,ion</inforefnodename><inforefrefname
spaces=" ">a , in cross
+ref</inforefrefname><inforefinfoname spaces=" ">a comma, in
file</inforefinfoname></inforef>
</para>
<table commandarg="asis" spaces=" ">
@@ -1343,7 +1343,7 @@
<title spaces=" ">title &textndash;a</title>
<subtitle spaces=" ">formatting subtitle &textndash;a</subtitle>
<subtitle spaces=" ">subtitle 2 &textndash;a</subtitle>
-<author spaces=" ">author1 &textndash;a with accents in name T<accent
type="acute">e</accent><accent type="cedil">c</accent>a</author>
+<author spaces=" ">author1 &textndash;a with accents in name T<accent
type="acute" bracketed="off">e</accent><accent type="cedil"
bracketed="off">c</accent>a</author>
<author spaces=" ">author2 &textndash;a</author>
<para>In titlepage
</para>
@@ -1367,22 +1367,22 @@
<findex index="fn"><indexterm index="fn">&textldquo;</indexterm></findex>
<findex index="fn"><indexterm
index="fn">&textndash;foption</indexterm></findex>
-<para>&arobase;"u <accent type="uml">u</accent>
+<para>&arobase;"u <accent type="uml" bracketed="off">u</accent>
&arobase;"{U} <accent type="uml">U</accent>
-&arobase;~n <accent type="tilde">n</accent>
-&arobase;^a <accent type="circ">a</accent>
-&arobase;&textrsquo;e <accent type="acute">e</accent>
-&arobase;=o <accent type="macr">o</accent>
-&arobase;&textlsquo;i <accent type="grave">i</accent>
+&arobase;~n <accent type="tilde" bracketed="off">n</accent>
+&arobase;^a <accent type="circ" bracketed="off">a</accent>
+&arobase;&textrsquo;e <accent type="acute" bracketed="off">e</accent>
+&arobase;=o <accent type="macr" bracketed="off">o</accent>
+&arobase;&textlsquo;i <accent type="grave" bracketed="off">i</accent>
&arobase;&textrsquo;{e} <accent type="acute">e</accent>
&arobase;&textrsquo;{&arobase;dotless{i}} <accent
type="acute"><dotless>i</dotless></accent>
&arobase;dotless{i} <dotless>i</dotless>
&arobase;dotless{j} <dotless>j</dotless>
-&arobase;&textlsquo;{&arobase;=E} <accent type="grave"><accent
type="macr">E</accent></accent>
+&arobase;&textlsquo;{&arobase;=E} <accent type="grave"><accent
type="macr" bracketed="off">E</accent></accent>
&arobase;l{} &lslash;
-&arobase;,{&arobase;&textrsquo;C} <accent type="cedil"><accent
type="acute">C</accent></accent>
-&arobase;,c <accent type="cedil">c</accent>
-&arobase;,c&arobase;"u <accent type="cedil">c</accent><accent
type="uml">u</accent> &linebreak;
+&arobase;,{&arobase;&textrsquo;C} <accent type="cedil"><accent
type="acute" bracketed="off">C</accent></accent>
+&arobase;,c <accent type="cedil" bracketed="off">c</accent>
+&arobase;,c&arobase;"u <accent type="cedil"
bracketed="off">c</accent><accent type="uml" bracketed="off">u</accent>
&linebreak;
</para>
<para>&arobase;* &linebreak;
&arobase; followed by a space
@@ -1464,8 +1464,8 @@
</para>
<para><code>&arobase;acronym{--a,an accronym}</code>
<acronym><acronymword>&textndash;a</acronymword><acronymdesc>an
accronym</acronymdesc></acronym>
<code>&arobase;acronym{--a}</code>
<acronym><acronymword>&textndash;a</acronymword></acronym>
-<code>&arobase;abbr{&arobase;'E--. &arobase;comma{}A.,
&arobase;'Etude Autonome }</code> <abbr><abbrword><accent
type="acute">E</accent>&textndash;. ,A.</abbrword><abbrdesc><accent
type="acute">E</accent>tude Autonome </abbrdesc></abbr>
-<code>&arobase;abbr{&arobase;'E--.
&arobase;comma{}A.}</code> <abbr><abbrword><accent
type="acute">E</accent>&textndash;. ,A.</abbrword></abbr>
+<code>&arobase;abbr{&arobase;'E--. &arobase;comma{}A.,
&arobase;'Etude Autonome }</code> <abbr><abbrword><accent type="acute"
bracketed="off">E</accent>&textndash;. ,A.</abbrword><abbrdesc spaces="
"><accent type="acute" bracketed="off">E</accent>tude Autonome
</abbrdesc></abbr>
+<code>&arobase;abbr{&arobase;'E--.
&arobase;comma{}A.}</code> <abbr><abbrword><accent
type="acute" bracketed="off">E</accent>&textndash;. ,A.</abbrword></abbr>
<code>&arobase;asis{--a}</code> <asis>&textndash;a</asis>
<code>&arobase;b{--a}</code> <b>&textndash;a</b>
<code>&arobase;cite{--a}</code> <cite>&textndash;a</cite>
@@ -1538,13 +1538,13 @@
<code>&arobase;image{f-ile,aze,,a--lt}</code> <image
where="inline"><imagefile>f-ile</imagefile><imagewidth>aze</imagewidth><alttext>a&textndash;lt</alttext></image>
<code>&arobase;image{&arobase;file{f--ile}&arobase;&arobase;&arobase;.,aze,az,alt,&arobase;file{file
ext} e--xt&arobase;}</code> <image
where="inline"><imagefile><file>f--ile</file>&arobase;&eosperiod;</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension><file>file
ext</file> e--xt}</imageextension></image>
</para>
-<sp value="2"></sp>
+<sp value="2" line=" 2"></sp>
<para><code>&arobase;clicksequence{click &arobase;click{}
A}</code> <clicksequence>click <click command="arrow"/> A</clicksequence>
-<clickstyle command="result">@result</clickstyle>
+<clickstyle command="result" line=" @result">@result</clickstyle>
After clickstyle &result;
<code>&arobase;clicksequence{click &arobase;click{}
A}</code> <clicksequence>click <click command="result"/>
A</clicksequence>
-<clickstyle command="arrow">@arrow</clickstyle>
+<clickstyle command="arrow" line=" @arrow">@arrow</clickstyle>
</para>
<quotation>
<para>A quot&textmdash;ation
@@ -1574,8 +1574,8 @@
<para>a Warning.
</para></quotation>
-<quotation spaces=" "><quotationtype>something <accent type="acute">e</accent>
&tex;</quotationtype>
-<para>The something <accent type="acute">e</accent> &tex; is here.
+<quotation spaces=" "><quotationtype>something <accent type="acute"
bracketed="off">e</accent> &tex;</quotationtype>
+<para>The something <accent type="acute" bracketed="off">e</accent> &tex; is
here.
</para></quotation>
<quotation spaces=" "><quotationtype>&arobase; at the end of line <spacecmd
type="nl"/></quotationtype><para>A &arobase; at the end of the
&arobase;quotation line.
@@ -1637,7 +1637,7 @@
<listitem><para>e&textndash;numerate
</para></listitem></enumerate>
-<multitable spaces=" "><columnfractions><columnfraction
value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
+<multitable spaces=" "><columnfractions line=" 0.4 0.6 "><columnfraction
value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
<thead><row><entry command="headitem"><para>mu&textndash;ltitable headitem
</para></entry><entry command="tab"><para>another tab
</para></entry></row></thead><tbody><row><entry
command="item"><para>mu&textndash;ltitable item </para></entry><entry
command="tab"><para>multitable tab
<!-- c comment in multitable -->
@@ -1646,7 +1646,7 @@
</para></entry></row><row><entry command="item"><para>lone
mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
-<multitable spaces="
"><columnprototypes><columnprototype>truc</columnprototype><columnprototype>bidule</columnprototype></columnprototypes>
+<multitable spaces=" "><columnprototypes><columnprototype
bracketed="on">truc</columnprototype> <columnprototype
bracketed="on">bidule</columnprototype></columnprototypes>
<tbody><row><entry command="item"><para>truc </para></entry><entry
command="tab"><para>bidule
</para></entry></row></tbody></multitable>
@@ -1693,27 +1693,27 @@
<deffn spaces=" "><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>
-<deffnx><definitionterm><indexterm
index="fn">truc</indexterm><defcategory>cmde</defcategory>
<deffunction>truc</deffunction> <defparam></defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">log
trap</indexterm><defcategory>Command</defcategory> <deffunction>log
trap</deffunction> <defparam></defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction>log
trap1</deffunction> <defparam></defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">log
trap2</indexterm><defcategory>Command</defcategory> <deffunction>log
trap2</deffunction> <defparam></defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
-<deffnx><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>
-<deffnx><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory></definitionterm></deffnx>
+<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 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>
+<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory></definitionterm></deffnx>
<deffnx><definitionterm></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory></defcategory>
<deffunction></deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory></defcategory></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">machin</indexterm><defcategory></defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">bidule
machin</indexterm><defcategory></defcategory> <deffunction>bidule
machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">machin</indexterm><defcategory>truc</defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory>truc</defcategory>
<deffunction></deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">followed</indexterm><defcategory>truc</defcategory>
<deffunction>followed</deffunction> <defparam>by</defparam>
<defparam>a</defparam> <defparam>comment</defparam></definitionterm></deffnx>
+<deffnx spaces="
"><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><defcategory bracketed="on"></defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><defcategory
bracketed="on"></defcategory></definitionterm></deffnx>
+<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><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>truc</defcategory></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory></defcategory>
<deffunction></deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">a</indexterm><defcategory>truc</defcategory>
<deffunction>a</deffunction> <defparam>b</defparam> <defparam>c</defparam>
<defparam>d</defparam> <defparam>e</defparam> <defparam><b>f g</b></defparam>
<defparam>h i</defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory>truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
+<deffnx><definitionterm><defcategory
bracketed="on">truc</defcategory></definitionterm></deffnx>
+<deffnx><definitionterm><defcategory bracketed="on"></defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm
index="fn">a</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>a</deffunction> <defparam>b</defparam> <defparam>c</defparam>
<defparam>d</defparam> <defparam>e</defparam> <defparam><b>f g</b></defparam>
<defparam bracketed="on">h i</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
</deffn>
<deffn spaces=" "><definitionterm><indexterm
index="fn">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction></definitionterm>
@@ -1721,11 +1721,11 @@
<deffn spaces=" "><definitionterm><indexterm
index="fn">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction> <defparam>with</defparam>
<defparam>deffnx</defparam></definitionterm>
<!-- c comment between deffn and deffnx -->
-<deffnx><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory>empty</defcategory>
<deffunction>deffnx</deffunction></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory>empty</defcategory>
<deffunction>deffnx</deffunction></definitionterm></deffnx>
</deffn>
<deffn spaces=" "><definitionterm><indexterm
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
-<deffnx><definitionterm><indexterm
index="fn">truc</indexterm><defcategory>cmde</defcategory>
<deffunction>truc</deffunction> <defparam></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<definitionitem><!-- c comment -->
<para>text in def item for second def item
</para></definitionitem></deffn>
@@ -1766,7 +1766,7 @@
<definitionitem><para>d&textndash;efmac
</para></definitionitem></defmac>
-<defspec spaces=" "><definitionterm><indexterm
index="fn">d&textndash;efspec_name</indexterm><defcategory
automatic="on">Special Form</defcategory>
<deffunction>d--efspec_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
+<defspec spaces=" "><definitionterm><indexterm
index="fn">d&textndash;efspec_name</indexterm><defcategory automatic="on"
bracketed="on">Special Form</defcategory>
<deffunction>d--efspec_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
<definitionitem><para>d&textndash;efspec
</para></definitionitem></defspec>
@@ -1774,7 +1774,7 @@
<definitionitem><para>d&textndash;efvar
</para></definitionitem></defvar>
-<defopt spaces=" "><definitionterm><indexterm
index="vr">d&textndash;efopt_name</indexterm><defcategory automatic="on">User
Option</defcategory> <defvariable>d--efopt_name</defvariable></definitionterm>
+<defopt spaces=" "><definitionterm><indexterm
index="vr">d&textndash;efopt_name</indexterm><defcategory automatic="on"
bracketed="on">User Option</defcategory>
<defvariable>d--efopt_name</defvariable></definitionterm>
<definitionitem><para>d&textndash;efopt
</para></definitionitem></defopt>
@@ -1786,11 +1786,11 @@
<definitionitem><para>d&textndash;eftypevar
</para></definitionitem></deftypevar>
-<defivar spaces=" "><definitionterm><indexterm
index="vr">d&textndash;efivar_name of c&textndash;lass</indexterm><defcategory
automatic="on">Instance Variable</defcategory> <defclass>c--lass</defclass>
<defclassvar>d--efivar_name</defclassvar></definitionterm>
+<defivar spaces=" "><definitionterm><indexterm
index="vr">d&textndash;efivar_name of c&textndash;lass</indexterm><defcategory
automatic="on" bracketed="on">Instance Variable</defcategory>
<defclass>c--lass</defclass>
<defclassvar>d--efivar_name</defclassvar></definitionterm>
<definitionitem><para>d&textndash;efivar
</para></definitionitem></defivar>
-<deftypeivar spaces=" "><definitionterm><indexterm
index="vr">d&textndash;eftypeivar_name of
c&textndash;lass</indexterm><defcategory automatic="on">Instance
Variable</defcategory> <defclass>c--lass</defclass> <deftype>t--ype</deftype>
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
+<deftypeivar spaces=" "><definitionterm><indexterm
index="vr">d&textndash;eftypeivar_name of
c&textndash;lass</indexterm><defcategory automatic="on" bracketed="on">Instance
Variable</defcategory> <defclass>c--lass</defclass> <deftype>t--ype</deftype>
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
<definitionitem><para>d&textndash;eftypeivar
</para></definitionitem></deftypeivar>
@@ -1802,10 +1802,10 @@
<definitionitem><para>d&textndash;eftypemethod
</para></definitionitem></deftypemethod>
-<para><code>&arobase;xref{c---hapter&arobase;&arobase;, cross r---ef
name&arobase;&arobase;, t---itle&arobase;&arobase;, file
n---ame&arobase;&arobase;, ma---nual&arobase;&arobase;}</code>
<xref><xrefnodename>c---hapter&arobase;</xrefnodename><xrefinfoname>cross
r&textmdash;ef
name&arobase;</xrefinfoname><xrefprinteddesc>t&textmdash;itle&arobase;</xrefprinteddesc><xrefinfofile>file
n---ame&arobase;</xrefinfofile><xrefprintedname>ma&textmdash;nual&arobase;</xrefprintedname></xref>.
-<code>&arobase;ref{chapter, cross ref name, title, file name,
manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;pxref{chapter, cross ref name, title, file name,
manual}</code>
<pxref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></pxref>
-<code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname>cross ref
name</inforefrefname><inforefinfoname>file name</inforefinfoname></inforef>
+<para><code>&arobase;xref{c---hapter&arobase;&arobase;, cross r---ef
name&arobase;&arobase;, t---itle&arobase;&arobase;, file
n---ame&arobase;&arobase;, ma---nual&arobase;&arobase;}</code>
<xref><xrefnodename>c---hapter&arobase;</xrefnodename><xrefinfoname spaces="
">cross r&textmdash;ef name&arobase;</xrefinfoname><xrefprinteddesc spaces="
">t&textmdash;itle&arobase;</xrefprinteddesc><xrefinfofile spaces=" ">file
n---ame&arobase;</xrefinfofile><xrefprintedname spaces="
">ma&textmdash;nual&arobase;</xrefprintedname></xref>.
+<code>&arobase;ref{chapter, cross ref name, title, file name,
manual}</code> <ref><xrefnodename>chapter</xrefnodename><xrefinfoname
spaces=" ">cross ref name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></ref>
+<code>&arobase;pxref{chapter, cross ref name, title, file name,
manual}</code> <pxref><xrefnodename>chapter</xrefnodename><xrefinfoname
spaces=" ">cross ref name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></pxref>
+<code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
</para>
<para><code>&arobase;ref{chapter}</code>
<ref><xrefnodename>chapter</xrefnodename></ref>
<code>&arobase;xref{chapter}</code>
<xref><xrefnodename>chapter</xrefnodename></xref>.
@@ -1814,8 +1814,8 @@
</para>
<para><code>&arobase;ref{s--ect&arobase;comma{}ion, a
&arobase;comma{} in cross
ref, a comma&arobase;comma{} in title, a
comma&arobase;comma{} in file, a &arobase;comma{}
in manual name }</code>
-<ref><xrefnodename>s--ect,ion</xrefnodename><xrefinfoname>a , in
cross
-ref</xrefinfoname><xrefprinteddesc>a comma, in
title</xrefprinteddesc><xrefinfofile>a comma, in
file</xrefinfofile><xrefprintedname>a , in manual name
</xrefprintedname></ref>
+<ref><xrefnodename>s--ect,ion</xrefnodename><xrefinfoname spaces=" ">a
, in cross
+ref</xrefinfoname><xrefprinteddesc spaces=" ">a comma, in
title</xrefprinteddesc><xrefinfofile spaces=" ">a comma, in
file</xrefinfofile><xrefprintedname spaces=" ">a , in manual name
</xrefprintedname></ref>
</para>
<para><code>&arobase;ref{chapter,cross ref name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
<code>&arobase;ref{chapter,,title}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
@@ -1826,10 +1826,10 @@
<code>&arobase;ref{chapter,cross ref name,,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
<code>&arobase;ref{chapter,cross ref name,title,file
name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{chapter,cross ref name,title,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{chapter,,title,file name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{chapter,,title,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,,title, file name, manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,,title, file name, manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{chapter,,,file name,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
</para>
@@ -1842,27 +1842,27 @@
<code>&arobase;ref{(pman)anode,cross ref name,,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
<code>&arobase;ref{(pman)anode,cross ref name,title,file
name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{(pman)anode,cross ref
name,title,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{(pman)anode,,title,file name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{(pman)anode,,title,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,,title, file name, manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,,title, file name, manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{(pman)anode,,,file name,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
</para>
-<para><code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname>cross ref
name</inforefrefname><inforefinfoname>file name</inforefinfoname></inforef>
+<para><code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
<code>&arobase;inforef{chapter}</code>
<inforef><inforefnodename>chapter</inforefnodename></inforef>
-<code>&arobase;inforef{chapter, cross ref name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname>cross ref
name</inforefrefname></inforef>
+<code>&arobase;inforef{chapter, cross ref name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
<code>&arobase;inforef{chapter,,file name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{node, cross ref name, file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname>cross ref
name</inforefrefname><inforefinfoname>file name</inforefinfoname></inforef>
+<code>&arobase;inforef{node, cross ref name, file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
<code>&arobase;inforef{node}</code>
<inforef><inforefnodename>node</inforefnodename></inforef>
-<code>&arobase;inforef{node, cross ref name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname>cross ref
name</inforefrefname></inforef>
+<code>&arobase;inforef{node, cross ref name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
<code>&arobase;inforef{node,,file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{chapter, cross ref name, file name, spurious
arg}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname>cross ref
name</inforefrefname><inforefinfoname>file name, spurious
arg</inforefinfoname></inforef>
+<code>&arobase;inforef{chapter, cross ref name, file name, spurious
arg}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file name,
spurious arg</inforefinfoname></inforef>
</para>
<para><code>&arobase;inforef{s--ect&arobase;comma{}ion, a
&arobase;comma{} in cross
ref, a comma&arobase;comma{} in file}</code>
-<inforef><inforefnodename>s--ect,ion</inforefnodename><inforefrefname>a
, in cross
-ref</inforefrefname><inforefinfoname>a comma, in
file</inforefinfoname></inforef>
+<inforef><inforefnodename>s--ect,ion</inforefnodename><inforefrefname
spaces=" ">a , in cross
+ref</inforefrefname><inforefinfoname spaces=" ">a comma, in
file</inforefinfoname></inforef>
</para>
<table commandarg="asis" spaces=" ">
@@ -1969,22 +1969,22 @@
<findex index="fn"><indexterm index="fn">&textldquo;</indexterm></findex>
<findex index="fn"><indexterm
index="fn">&textndash;foption</indexterm></findex>
-<para>&arobase;"u <accent type="uml">u</accent>
+<para>&arobase;"u <accent type="uml" bracketed="off">u</accent>
&arobase;"{U} <accent type="uml">U</accent>
-&arobase;~n <accent type="tilde">n</accent>
-&arobase;^a <accent type="circ">a</accent>
-&arobase;&textrsquo;e <accent type="acute">e</accent>
-&arobase;=o <accent type="macr">o</accent>
-&arobase;&textlsquo;i <accent type="grave">i</accent>
+&arobase;~n <accent type="tilde" bracketed="off">n</accent>
+&arobase;^a <accent type="circ" bracketed="off">a</accent>
+&arobase;&textrsquo;e <accent type="acute" bracketed="off">e</accent>
+&arobase;=o <accent type="macr" bracketed="off">o</accent>
+&arobase;&textlsquo;i <accent type="grave" bracketed="off">i</accent>
&arobase;&textrsquo;{e} <accent type="acute">e</accent>
&arobase;&textrsquo;{&arobase;dotless{i}} <accent
type="acute"><dotless>i</dotless></accent>
&arobase;dotless{i} <dotless>i</dotless>
&arobase;dotless{j} <dotless>j</dotless>
-&arobase;&textlsquo;{&arobase;=E} <accent type="grave"><accent
type="macr">E</accent></accent>
+&arobase;&textlsquo;{&arobase;=E} <accent type="grave"><accent
type="macr" bracketed="off">E</accent></accent>
&arobase;l{} &lslash;
-&arobase;,{&arobase;&textrsquo;C} <accent type="cedil"><accent
type="acute">C</accent></accent>
-&arobase;,c <accent type="cedil">c</accent>
-&arobase;,c&arobase;"u <accent type="cedil">c</accent><accent
type="uml">u</accent> &linebreak;
+&arobase;,{&arobase;&textrsquo;C} <accent type="cedil"><accent
type="acute" bracketed="off">C</accent></accent>
+&arobase;,c <accent type="cedil" bracketed="off">c</accent>
+&arobase;,c&arobase;"u <accent type="cedil"
bracketed="off">c</accent><accent type="uml" bracketed="off">u</accent>
&linebreak;
</para>
<para>&arobase;* &linebreak;
&arobase; followed by a space
@@ -2066,8 +2066,8 @@
</para>
<para><code>&arobase;acronym{--a,an accronym}</code>
<acronym><acronymword>&textndash;a</acronymword><acronymdesc>an
accronym</acronymdesc></acronym>
<code>&arobase;acronym{--a}</code>
<acronym><acronymword>&textndash;a</acronymword></acronym>
-<code>&arobase;abbr{&arobase;'E--. &arobase;comma{}A.,
&arobase;'Etude Autonome }</code> <abbr><abbrword><accent
type="acute">E</accent>&textndash;. ,A.</abbrword><abbrdesc><accent
type="acute">E</accent>tude Autonome </abbrdesc></abbr>
-<code>&arobase;abbr{&arobase;'E--.
&arobase;comma{}A.}</code> <abbr><abbrword><accent
type="acute">E</accent>&textndash;. ,A.</abbrword></abbr>
+<code>&arobase;abbr{&arobase;'E--. &arobase;comma{}A.,
&arobase;'Etude Autonome }</code> <abbr><abbrword><accent type="acute"
bracketed="off">E</accent>&textndash;. ,A.</abbrword><abbrdesc spaces="
"><accent type="acute" bracketed="off">E</accent>tude Autonome
</abbrdesc></abbr>
+<code>&arobase;abbr{&arobase;'E--.
&arobase;comma{}A.}</code> <abbr><abbrword><accent
type="acute" bracketed="off">E</accent>&textndash;. ,A.</abbrword></abbr>
<code>&arobase;asis{--a}</code> <asis>&textndash;a</asis>
<code>&arobase;b{--a}</code> <b>&textndash;a</b>
<code>&arobase;cite{--a}</code> <cite>&textndash;a</cite>
@@ -2140,13 +2140,13 @@
<code>&arobase;image{f-ile,aze,,a--lt}</code> <image
where="inline"><imagefile>f-ile</imagefile><imagewidth>aze</imagewidth><alttext>a&textndash;lt</alttext></image>
<code>&arobase;image{&arobase;file{f--ile}&arobase;&arobase;&arobase;.,aze,az,alt,&arobase;file{file
ext} e--xt&arobase;}</code> <image
where="inline"><imagefile><file>f--ile</file>&arobase;&eosperiod;</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension><file>file
ext</file> e--xt}</imageextension></image>
</para>
-<sp value="2"></sp>
+<sp value="2" line=" 2"></sp>
<para><code>&arobase;clicksequence{click &arobase;click{}
A}</code> <clicksequence>click <click command="arrow"/> A</clicksequence>
-<clickstyle command="result">@result</clickstyle>
+<clickstyle command="result" line=" @result">@result</clickstyle>
After clickstyle &result;
<code>&arobase;clicksequence{click &arobase;click{}
A}</code> <clicksequence>click <click command="result"/>
A</clicksequence>
-<clickstyle command="arrow">@arrow</clickstyle>
+<clickstyle command="arrow" line=" @arrow">@arrow</clickstyle>
</para>
<quotation>
<para>A quot&textmdash;ation
@@ -2176,8 +2176,8 @@
<para>a Warning.
</para></quotation>
-<quotation spaces=" "><quotationtype>something <accent type="acute">e</accent>
&tex;</quotationtype>
-<para>The something <accent type="acute">e</accent> &tex; is here.
+<quotation spaces=" "><quotationtype>something <accent type="acute"
bracketed="off">e</accent> &tex;</quotationtype>
+<para>The something <accent type="acute" bracketed="off">e</accent> &tex; is
here.
</para></quotation>
<quotation spaces=" "><quotationtype>&arobase; at the end of line <spacecmd
type="nl"/></quotationtype><para>A &arobase; at the end of the
&arobase;quotation line.
@@ -2239,7 +2239,7 @@
<listitem><para>e&textndash;numerate
</para></listitem></enumerate>
-<multitable spaces=" "><columnfractions><columnfraction
value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
+<multitable spaces=" "><columnfractions line=" 0.4 0.6 "><columnfraction
value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
<thead><row><entry command="headitem"><para>mu&textndash;ltitable headitem
</para></entry><entry command="tab"><para>another tab
</para></entry></row></thead><tbody><row><entry
command="item"><para>mu&textndash;ltitable item </para></entry><entry
command="tab"><para>multitable tab
<!-- c comment in multitable -->
@@ -2248,7 +2248,7 @@
</para></entry></row><row><entry command="item"><para>lone
mu&textndash;ltitable item
</para></entry></row></tbody></multitable>
-<multitable spaces="
"><columnprototypes><columnprototype>truc</columnprototype><columnprototype>bidule</columnprototype></columnprototypes>
+<multitable spaces=" "><columnprototypes><columnprototype
bracketed="on">truc</columnprototype> <columnprototype
bracketed="on">bidule</columnprototype></columnprototypes>
<tbody><row><entry command="item"><para>truc </para></entry><entry
command="tab"><para>bidule
</para></entry></row></tbody></multitable>
@@ -2295,27 +2295,27 @@
<deffn spaces=" "><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>
-<deffnx><definitionterm><indexterm
index="fn">truc</indexterm><defcategory>cmde</defcategory>
<deffunction>truc</deffunction> <defparam></defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">log
trap</indexterm><defcategory>Command</defcategory> <deffunction>log
trap</deffunction> <defparam></defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction>log
trap1</deffunction> <defparam></defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">log
trap2</indexterm><defcategory>Command</defcategory> <deffunction>log
trap2</deffunction> <defparam></defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
-<deffnx><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>
-<deffnx><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory></definitionterm></deffnx>
+<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 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>
+<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory></definitionterm></deffnx>
<deffnx><definitionterm></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory></defcategory>
<deffunction></deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory></defcategory></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">machin</indexterm><defcategory></defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">bidule
machin</indexterm><defcategory></defcategory> <deffunction>bidule
machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">machin</indexterm><defcategory>truc</defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory>truc</defcategory>
<deffunction></deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">followed</indexterm><defcategory>truc</defcategory>
<deffunction>followed</deffunction> <defparam>by</defparam>
<defparam>a</defparam> <defparam>comment</defparam></definitionterm></deffnx>
+<deffnx spaces="
"><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><defcategory bracketed="on"></defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><defcategory
bracketed="on"></defcategory></definitionterm></deffnx>
+<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><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>truc</defcategory></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory></defcategory>
<deffunction></deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">a</indexterm><defcategory>truc</defcategory>
<deffunction>a</deffunction> <defparam>b</defparam> <defparam>c</defparam>
<defparam>d</defparam> <defparam>e</defparam> <defparam><b>f g</b></defparam>
<defparam>h i</defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory>truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
+<deffnx><definitionterm><defcategory
bracketed="on">truc</defcategory></definitionterm></deffnx>
+<deffnx><definitionterm><defcategory bracketed="on"></defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm
index="fn">a</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>a</deffunction> <defparam>b</defparam> <defparam>c</defparam>
<defparam>d</defparam> <defparam>e</defparam> <defparam><b>f g</b></defparam>
<defparam bracketed="on">h i</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
</deffn>
<deffn spaces=" "><definitionterm><indexterm
index="fn">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction></definitionterm>
@@ -2323,11 +2323,11 @@
<deffn spaces=" "><definitionterm><indexterm
index="fn">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction> <defparam>with</defparam>
<defparam>deffnx</defparam></definitionterm>
<!-- c comment between deffn and deffnx -->
-<deffnx><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory>empty</defcategory>
<deffunction>deffnx</deffunction></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory>empty</defcategory>
<deffunction>deffnx</deffunction></definitionterm></deffnx>
</deffn>
<deffn spaces=" "><definitionterm><indexterm
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
-<deffnx><definitionterm><indexterm
index="fn">truc</indexterm><defcategory>cmde</defcategory>
<deffunction>truc</deffunction> <defparam></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<definitionitem><!-- c comment -->
<para>text in def item for second def item
</para></definitionitem></deffn>
@@ -2368,7 +2368,7 @@
<definitionitem><para>d&textndash;efmac
</para></definitionitem></defmac>
-<defspec spaces=" "><definitionterm><indexterm
index="fn">d&textndash;efspec_name</indexterm><defcategory
automatic="on">Special Form</defcategory>
<deffunction>d--efspec_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
+<defspec spaces=" "><definitionterm><indexterm
index="fn">d&textndash;efspec_name</indexterm><defcategory automatic="on"
bracketed="on">Special Form</defcategory>
<deffunction>d--efspec_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
<definitionitem><para>d&textndash;efspec
</para></definitionitem></defspec>
@@ -2376,7 +2376,7 @@
<definitionitem><para>d&textndash;efvar
</para></definitionitem></defvar>
-<defopt spaces=" "><definitionterm><indexterm
index="vr">d&textndash;efopt_name</indexterm><defcategory automatic="on">User
Option</defcategory> <defvariable>d--efopt_name</defvariable></definitionterm>
+<defopt spaces=" "><definitionterm><indexterm
index="vr">d&textndash;efopt_name</indexterm><defcategory automatic="on"
bracketed="on">User Option</defcategory>
<defvariable>d--efopt_name</defvariable></definitionterm>
<definitionitem><para>d&textndash;efopt
</para></definitionitem></defopt>
@@ -2388,11 +2388,11 @@
<definitionitem><para>d&textndash;eftypevar
</para></definitionitem></deftypevar>
-<defivar spaces=" "><definitionterm><indexterm
index="vr">d&textndash;efivar_name of c&textndash;lass</indexterm><defcategory
automatic="on">Instance Variable</defcategory> <defclass>c--lass</defclass>
<defclassvar>d--efivar_name</defclassvar></definitionterm>
+<defivar spaces=" "><definitionterm><indexterm
index="vr">d&textndash;efivar_name of c&textndash;lass</indexterm><defcategory
automatic="on" bracketed="on">Instance Variable</defcategory>
<defclass>c--lass</defclass>
<defclassvar>d--efivar_name</defclassvar></definitionterm>
<definitionitem><para>d&textndash;efivar
</para></definitionitem></defivar>
-<deftypeivar spaces=" "><definitionterm><indexterm
index="vr">d&textndash;eftypeivar_name of
c&textndash;lass</indexterm><defcategory automatic="on">Instance
Variable</defcategory> <defclass>c--lass</defclass> <deftype>t--ype</deftype>
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
+<deftypeivar spaces=" "><definitionterm><indexterm
index="vr">d&textndash;eftypeivar_name of
c&textndash;lass</indexterm><defcategory automatic="on" bracketed="on">Instance
Variable</defcategory> <defclass>c--lass</defclass> <deftype>t--ype</deftype>
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
<definitionitem><para>d&textndash;eftypeivar
</para></definitionitem></deftypeivar>
@@ -2404,10 +2404,10 @@
<definitionitem><para>d&textndash;eftypemethod
</para></definitionitem></deftypemethod>
-<para><code>&arobase;xref{c---hapter&arobase;&arobase;, cross r---ef
name&arobase;&arobase;, t---itle&arobase;&arobase;, file
n---ame&arobase;&arobase;, ma---nual&arobase;&arobase;}</code>
<xref><xrefnodename>c---hapter&arobase;</xrefnodename><xrefinfoname>cross
r&textmdash;ef
name&arobase;</xrefinfoname><xrefprinteddesc>t&textmdash;itle&arobase;</xrefprinteddesc><xrefinfofile>file
n---ame&arobase;</xrefinfofile><xrefprintedname>ma&textmdash;nual&arobase;</xrefprintedname></xref>.
-<code>&arobase;ref{chapter, cross ref name, title, file name,
manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;pxref{chapter, cross ref name, title, file name,
manual}</code>
<pxref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></pxref>
-<code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname>cross ref
name</inforefrefname><inforefinfoname>file name</inforefinfoname></inforef>
+<para><code>&arobase;xref{c---hapter&arobase;&arobase;, cross r---ef
name&arobase;&arobase;, t---itle&arobase;&arobase;, file
n---ame&arobase;&arobase;, ma---nual&arobase;&arobase;}</code>
<xref><xrefnodename>c---hapter&arobase;</xrefnodename><xrefinfoname spaces="
">cross r&textmdash;ef name&arobase;</xrefinfoname><xrefprinteddesc spaces="
">t&textmdash;itle&arobase;</xrefprinteddesc><xrefinfofile spaces=" ">file
n---ame&arobase;</xrefinfofile><xrefprintedname spaces="
">ma&textmdash;nual&arobase;</xrefprintedname></xref>.
+<code>&arobase;ref{chapter, cross ref name, title, file name,
manual}</code> <ref><xrefnodename>chapter</xrefnodename><xrefinfoname
spaces=" ">cross ref name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></ref>
+<code>&arobase;pxref{chapter, cross ref name, title, file name,
manual}</code> <pxref><xrefnodename>chapter</xrefnodename><xrefinfoname
spaces=" ">cross ref name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></pxref>
+<code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
</para>
<para><code>&arobase;ref{chapter}</code>
<ref><xrefnodename>chapter</xrefnodename></ref>
<code>&arobase;xref{chapter}</code>
<xref><xrefnodename>chapter</xrefnodename></xref>.
@@ -2416,8 +2416,8 @@
</para>
<para><code>&arobase;ref{s--ect&arobase;comma{}ion, a
&arobase;comma{} in cross
ref, a comma&arobase;comma{} in title, a
comma&arobase;comma{} in file, a &arobase;comma{}
in manual name }</code>
-<ref><xrefnodename>s--ect,ion</xrefnodename><xrefinfoname>a , in
cross
-ref</xrefinfoname><xrefprinteddesc>a comma, in
title</xrefprinteddesc><xrefinfofile>a comma, in
file</xrefinfofile><xrefprintedname>a , in manual name
</xrefprintedname></ref>
+<ref><xrefnodename>s--ect,ion</xrefnodename><xrefinfoname spaces=" ">a
, in cross
+ref</xrefinfoname><xrefprinteddesc spaces=" ">a comma, in
title</xrefprinteddesc><xrefinfofile spaces=" ">a comma, in
file</xrefinfofile><xrefprintedname spaces=" ">a , in manual name
</xrefprintedname></ref>
</para>
<para><code>&arobase;ref{chapter,cross ref name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
<code>&arobase;ref{chapter,,title}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
@@ -2428,10 +2428,10 @@
<code>&arobase;ref{chapter,cross ref name,,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
<code>&arobase;ref{chapter,cross ref name,title,file
name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{chapter,cross ref name,title,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{chapter,,title,file name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{chapter,,title,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,,title, file name, manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,,title, file name, manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{chapter,,,file name,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
</para>
@@ -2444,27 +2444,27 @@
<code>&arobase;ref{(pman)anode,cross ref name,,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
<code>&arobase;ref{(pman)anode,cross ref name,title,file
name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{(pman)anode,cross ref
name,title,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{(pman)anode,,title,file name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{(pman)anode,,title,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,,title, file name, manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,,title, file name, manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{(pman)anode,,,file name,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
</para>
-<para><code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname>cross ref
name</inforefrefname><inforefinfoname>file name</inforefinfoname></inforef>
+<para><code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
<code>&arobase;inforef{chapter}</code>
<inforef><inforefnodename>chapter</inforefnodename></inforef>
-<code>&arobase;inforef{chapter, cross ref name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname>cross ref
name</inforefrefname></inforef>
+<code>&arobase;inforef{chapter, cross ref name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
<code>&arobase;inforef{chapter,,file name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{node, cross ref name, file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname>cross ref
name</inforefrefname><inforefinfoname>file name</inforefinfoname></inforef>
+<code>&arobase;inforef{node, cross ref name, file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
<code>&arobase;inforef{node}</code>
<inforef><inforefnodename>node</inforefnodename></inforef>
-<code>&arobase;inforef{node, cross ref name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname>cross ref
name</inforefrefname></inforef>
+<code>&arobase;inforef{node, cross ref name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
<code>&arobase;inforef{node,,file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{chapter, cross ref name, file name, spurious
arg}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname>cross ref
name</inforefrefname><inforefinfoname>file name, spurious
arg</inforefinfoname></inforef>
+<code>&arobase;inforef{chapter, cross ref name, file name, spurious
arg}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file name,
spurious arg</inforefinfoname></inforef>
</para>
<para><code>&arobase;inforef{s--ect&arobase;comma{}ion, a
&arobase;comma{} in cross
ref, a comma&arobase;comma{} in file}</code>
-<inforef><inforefnodename>s--ect,ion</inforefnodename><inforefrefname>a
, in cross
-ref</inforefrefname><inforefinfoname>a comma, in
file</inforefinfoname></inforef>
+<inforef><inforefnodename>s--ect,ion</inforefnodename><inforefrefname
spaces=" ">a , in cross
+ref</inforefrefname><inforefinfoname spaces=" ">a comma, in
file</inforefinfoname></inforef>
</para>
<table commandarg="asis" spaces=" ">
@@ -2565,22 +2565,22 @@
<findex index="fn"><indexterm index="fn">&textldquo;</indexterm></findex>
<findex index="fn"><indexterm
index="fn">&textndash;foption</indexterm></findex>
-&arobase;"u <accent type="uml">u</accent>
+&arobase;"u <accent type="uml" bracketed="off">u</accent>
&arobase;"{U} <accent type="uml">U</accent>
-&arobase;~n <accent type="tilde">n</accent>
-&arobase;^a <accent type="circ">a</accent>
-&arobase;'e <accent type="acute">e</accent>
-&arobase;=o <accent type="macr">o</accent>
-&arobase;`i <accent type="grave">i</accent>
+&arobase;~n <accent type="tilde" bracketed="off">n</accent>
+&arobase;^a <accent type="circ" bracketed="off">a</accent>
+&arobase;'e <accent type="acute" bracketed="off">e</accent>
+&arobase;=o <accent type="macr" bracketed="off">o</accent>
+&arobase;`i <accent type="grave" bracketed="off">i</accent>
&arobase;'{e} <accent type="acute">e</accent>
&arobase;'{&arobase;dotless{i}} <accent
type="acute"><dotless>i</dotless></accent>
&arobase;dotless{i} <dotless>i</dotless>
&arobase;dotless{j} <dotless>j</dotless>
-&arobase;`{&arobase;=E} <accent type="grave"><accent
type="macr">E</accent></accent>
+&arobase;`{&arobase;=E} <accent type="grave"><accent type="macr"
bracketed="off">E</accent></accent>
&arobase;l{} &lslash;
-&arobase;,{&arobase;'C} <accent type="cedil"><accent
type="acute">C</accent></accent>
-&arobase;,c <accent type="cedil">c</accent>
-&arobase;,c&arobase;"u <accent type="cedil">c</accent><accent
type="uml">u</accent> &linebreak;
+&arobase;,{&arobase;'C} <accent type="cedil"><accent
type="acute" bracketed="off">C</accent></accent>
+&arobase;,c <accent type="cedil" bracketed="off">c</accent>
+&arobase;,c&arobase;"u <accent type="cedil"
bracketed="off">c</accent><accent type="uml" bracketed="off">u</accent>
&linebreak;
&arobase;* &linebreak;
&arobase; followed by a space
@@ -2662,8 +2662,8 @@
<code>&arobase;acronym{--a,an accronym}</code>
<acronym><acronymword>--a</acronymword><acronymdesc>an
accronym</acronymdesc></acronym>
<code>&arobase;acronym{--a}</code>
<acronym><acronymword>--a</acronymword></acronym>
-<code>&arobase;abbr{&arobase;'E--. &arobase;comma{}A.,
&arobase;'Etude Autonome }</code> <abbr><abbrword><accent
type="acute">E</accent>--. ,A.</abbrword><abbrdesc><accent
type="acute">E</accent>tude Autonome </abbrdesc></abbr>
-<code>&arobase;abbr{&arobase;'E--.
&arobase;comma{}A.}</code> <abbr><abbrword><accent
type="acute">E</accent>--. ,A.</abbrword></abbr>
+<code>&arobase;abbr{&arobase;'E--. &arobase;comma{}A.,
&arobase;'Etude Autonome }</code> <abbr><abbrword><accent type="acute"
bracketed="off">E</accent>--. ,A.</abbrword><abbrdesc spaces=" "><accent
type="acute" bracketed="off">E</accent>tude Autonome </abbrdesc></abbr>
+<code>&arobase;abbr{&arobase;'E--.
&arobase;comma{}A.}</code> <abbr><abbrword><accent
type="acute" bracketed="off">E</accent>--. ,A.</abbrword></abbr>
<code>&arobase;asis{--a}</code> <asis>--a</asis>
<code>&arobase;b{--a}</code> <b>&textndash;a</b>
<code>&arobase;cite{--a}</code> <cite>--a</cite>
@@ -2736,13 +2736,13 @@
<code>&arobase;image{f-ile,aze,,a--lt}</code> <image
where="inline"><imagefile>f-ile</imagefile><imagewidth>aze</imagewidth><alttext>a--lt</alttext></image>
<code>&arobase;image{&arobase;file{f--ile}&arobase;&arobase;&arobase;.,aze,az,alt,&arobase;file{file
ext} e--xt&arobase;}</code> <image
where="inline"><imagefile><file>f--ile</file>&arobase;&eosperiod;</imagefile><imagewidth>aze</imagewidth><imageheight>az</imageheight><alttext>alt</alttext><imageextension><file>file
ext</file> e--xt}</imageextension></image>
-<sp value="2"></sp>
+<sp value="2" line=" 2"></sp>
<code>&arobase;clicksequence{click &arobase;click{}
A}</code> <clicksequence>click <click command="arrow"/> A</clicksequence>
-<clickstyle command="result">@result</clickstyle>
+<clickstyle command="result" line=" @result">@result</clickstyle>
After clickstyle &result;
<code>&arobase;clicksequence{click &arobase;click{}
A}</code> <clicksequence>click <click command="result"/>
A</clicksequence>
-<clickstyle command="arrow">@arrow</clickstyle>
+<clickstyle command="arrow" line=" @arrow">@arrow</clickstyle>
</pre><quotation>
<pre xml:space="preserve">A quot---ation
@@ -2772,8 +2772,8 @@
<pre xml:space="preserve">a Warning.
</pre></quotation>
<pre xml:space="preserve">
-</pre><quotation spaces=" "><quotationtype>something <accent
type="acute">e</accent> &tex;</quotationtype>
-<pre xml:space="preserve">The something <accent type="acute">e</accent> &tex;
is here.
+</pre><quotation spaces=" "><quotationtype>something <accent type="acute"
bracketed="off">e</accent> &tex;</quotationtype>
+<pre xml:space="preserve">The something <accent type="acute"
bracketed="off">e</accent> &tex; is here.
</pre></quotation>
<pre xml:space="preserve">
</pre><quotation spaces=" "><quotationtype>&arobase; at the end of line
<spacecmd type="nl"/></quotationtype><pre xml:space="preserve">A &arobase; at
the end of the &arobase;quotation line.
@@ -2835,7 +2835,7 @@
<listitem><pre xml:space="preserve">e--numerate
</pre></listitem></enumerate>
<pre xml:space="preserve">
-</pre><multitable spaces=" "><columnfractions><columnfraction
value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
+</pre><multitable spaces=" "><columnfractions line=" 0.4 0.6 "><columnfraction
value="0.4"></columnfraction><columnfraction
value="0.6"></columnfraction></columnfractions>
<thead><row><entry command="headitem"><pre xml:space="preserve">mu--ltitable
headitem </pre></entry><entry command="tab"><pre xml:space="preserve">another
tab
</pre></entry></row></thead><tbody><row><entry command="item"><pre
xml:space="preserve">mu--ltitable item </pre></entry><entry command="tab"><pre
xml:space="preserve">multitable tab
<!-- c comment in multitable -->
@@ -2844,7 +2844,7 @@
</pre></entry></row><row><entry command="item"><pre xml:space="preserve">lone
mu--ltitable item
</pre></entry></row></tbody></multitable>
<pre xml:space="preserve">
-</pre><multitable spaces="
"><columnprototypes><columnprototype>truc</columnprototype><columnprototype>bidule</columnprototype></columnprototypes>
+</pre><multitable spaces=" "><columnprototypes><columnprototype
bracketed="on">truc</columnprototype> <columnprototype
bracketed="on">bidule</columnprototype></columnprototypes>
<tbody><row><entry command="item"><pre xml:space="preserve">truc
</pre></entry><entry command="tab"><pre xml:space="preserve">bidule
</pre></entry></row></tbody></multitable>
<pre xml:space="preserve">
@@ -2891,27 +2891,27 @@
<pre xml:space="preserve">
</pre><deffn spaces=" "><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><deffnx><definitionterm><indexterm
index="fn">truc</indexterm><defcategory>cmde</defcategory>
<deffunction>truc</deffunction> <defparam></defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">log
trap</indexterm><defcategory>Command</defcategory> <deffunction>log
trap</deffunction> <defparam></defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">log
trap1</indexterm><defcategory>Command</defcategory> <deffunction>log
trap1</deffunction> <defparam></defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">log
trap2</indexterm><defcategory>Command</defcategory> <deffunction>log
trap2</deffunction> <defparam></defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn"><b>id
ule</b></indexterm><defcategory>cmde</defcategory> <deffunction><b>id
ule</b></deffunction> <defparam>truc</defparam></definitionterm></deffnx>
-<deffnx><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>
-<deffnx><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory></definitionterm></deffnx>
+</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 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>
+<deffnx spaces=" "><definitionterm><defcategory><b>id <samp>i</samp>
ule</b></defcategory></definitionterm></deffnx>
<deffnx><definitionterm></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory></defcategory>
<deffunction></deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory></defcategory></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">machin</indexterm><defcategory></defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm index="fn">bidule
machin</indexterm><defcategory></defcategory> <deffunction>bidule
machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">machin</indexterm><defcategory>truc</defcategory>
<deffunction>machin</deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory>truc</defcategory>
<deffunction></deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">followed</indexterm><defcategory>truc</defcategory>
<deffunction>followed</deffunction> <defparam>by</defparam>
<defparam>a</defparam> <defparam>comment</defparam></definitionterm></deffnx>
+<deffnx spaces="
"><definitionterm><defcategory>aaa</defcategory></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><defcategory bracketed="on"></defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
+<deffnx><definitionterm><defcategory
bracketed="on"></defcategory></definitionterm></deffnx>
+<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><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>truc</defcategory></definitionterm></deffnx>
-<deffnx><definitionterm><defcategory></defcategory>
<deffunction></deffunction></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">a</indexterm><defcategory>truc</defcategory>
<deffunction>a</deffunction> <defparam>b</defparam> <defparam>c</defparam>
<defparam>d</defparam> <defparam>e</defparam> <defparam><b>f g</b></defparam>
<defparam>h i</defparam></definitionterm></deffnx>
-<deffnx><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory>truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
+</pre><deffnx><definitionterm><defcategory
bracketed="on">truc</defcategory></definitionterm></deffnx>
+<deffnx><definitionterm><defcategory bracketed="on"></defcategory>
<deffunction bracketed="on"></deffunction></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm
index="fn">a</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>a</deffunction> <defparam>b</defparam> <defparam>c</defparam>
<defparam>d</defparam> <defparam>e</defparam> <defparam><b>f g</b></defparam>
<defparam bracketed="on">h i</defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory bracketed="on">truc</defcategory>
<deffunction>deffnx</deffunction> <defparam>before</defparam>
<defparam>end</defparam> <defparam>deffn</defparam></definitionterm></deffnx>
</deffn>
<pre xml:space="preserve">
</pre><deffn spaces=" "><definitionterm><indexterm
index="fn">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction></definitionterm>
@@ -2919,11 +2919,11 @@
<pre xml:space="preserve">
</pre><deffn spaces=" "><definitionterm><indexterm
index="fn">deffn</indexterm><defcategory>empty</defcategory>
<deffunction>deffn</deffunction> <defparam>with</defparam>
<defparam>deffnx</defparam></definitionterm>
<pre xml:space="preserve"><!-- c comment between deffn and deffnx -->
-</pre><deffnx><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory>empty</defcategory>
<deffunction>deffnx</deffunction></definitionterm></deffnx>
+</pre><deffnx spaces=" "><definitionterm><indexterm
index="fn">deffnx</indexterm><defcategory>empty</defcategory>
<deffunction>deffnx</deffunction></definitionterm></deffnx>
</deffn>
<pre xml:space="preserve">
</pre><deffn spaces=" "><definitionterm><indexterm
index="fn"><var>i</var></indexterm><defcategory>fset</defcategory>
<deffunction><var>i</var></deffunction> <defparam>a</defparam>
<defparam>g</defparam></definitionterm>
-<deffnx><definitionterm><indexterm
index="fn">truc</indexterm><defcategory>cmde</defcategory>
<deffunction>truc</deffunction> <defparam></defparam></definitionterm></deffnx>
+<deffnx spaces=" "><definitionterm><indexterm
index="fn">truc</indexterm><defcategory bracketed="on">cmde</defcategory>
<deffunction>truc</deffunction> <defparam
bracketed="on"></defparam></definitionterm></deffnx>
<definitionitem><pre xml:space="preserve"><!-- c comment -->
text in def item for second def item
</pre></definitionitem></deffn>
@@ -2964,7 +2964,7 @@
<definitionitem><pre xml:space="preserve">d--efmac
</pre></definitionitem></defmac>
<pre xml:space="preserve">
-</pre><defspec spaces=" "><definitionterm><indexterm
index="fn">d&textndash;efspec_name</indexterm><defcategory
automatic="on">Special Form</defcategory>
<deffunction>d--efspec_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
+</pre><defspec spaces=" "><definitionterm><indexterm
index="fn">d&textndash;efspec_name</indexterm><defcategory automatic="on"
bracketed="on">Special Form</defcategory>
<deffunction>d--efspec_name</deffunction>
<defparam>a--rguments...</defparam></definitionterm>
<definitionitem><pre xml:space="preserve">d--efspec
</pre></definitionitem></defspec>
<pre xml:space="preserve">
@@ -2972,7 +2972,7 @@
<definitionitem><pre xml:space="preserve">d--efvar
</pre></definitionitem></defvar>
<pre xml:space="preserve">
-</pre><defopt spaces=" "><definitionterm><indexterm
index="vr">d&textndash;efopt_name</indexterm><defcategory automatic="on">User
Option</defcategory> <defvariable>d--efopt_name</defvariable></definitionterm>
+</pre><defopt spaces=" "><definitionterm><indexterm
index="vr">d&textndash;efopt_name</indexterm><defcategory automatic="on"
bracketed="on">User Option</defcategory>
<defvariable>d--efopt_name</defvariable></definitionterm>
<definitionitem><pre xml:space="preserve">d--efopt
</pre></definitionitem></defopt>
<pre xml:space="preserve">
@@ -2984,11 +2984,11 @@
<definitionitem><pre xml:space="preserve">d--eftypevar
</pre></definitionitem></deftypevar>
<pre xml:space="preserve">
-</pre><defivar spaces=" "><definitionterm><indexterm
index="vr">d&textndash;efivar_name of c&textndash;lass</indexterm><defcategory
automatic="on">Instance Variable</defcategory> <defclass>c--lass</defclass>
<defclassvar>d--efivar_name</defclassvar></definitionterm>
+</pre><defivar spaces=" "><definitionterm><indexterm
index="vr">d&textndash;efivar_name of c&textndash;lass</indexterm><defcategory
automatic="on" bracketed="on">Instance Variable</defcategory>
<defclass>c--lass</defclass>
<defclassvar>d--efivar_name</defclassvar></definitionterm>
<definitionitem><pre xml:space="preserve">d--efivar
</pre></definitionitem></defivar>
<pre xml:space="preserve">
-</pre><deftypeivar spaces=" "><definitionterm><indexterm
index="vr">d&textndash;eftypeivar_name of
c&textndash;lass</indexterm><defcategory automatic="on">Instance
Variable</defcategory> <defclass>c--lass</defclass> <deftype>t--ype</deftype>
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
+</pre><deftypeivar spaces=" "><definitionterm><indexterm
index="vr">d&textndash;eftypeivar_name of
c&textndash;lass</indexterm><defcategory automatic="on" bracketed="on">Instance
Variable</defcategory> <defclass>c--lass</defclass> <deftype>t--ype</deftype>
<defclassvar>d--eftypeivar_name</defclassvar></definitionterm>
<definitionitem><pre xml:space="preserve">d--eftypeivar
</pre></definitionitem></deftypeivar>
<pre xml:space="preserve">
@@ -3000,10 +3000,10 @@
<definitionitem><pre xml:space="preserve">d--eftypemethod
</pre></definitionitem></deftypemethod>
<pre xml:space="preserve">
-<code>&arobase;xref{c---hapter&arobase;&arobase;, cross r---ef
name&arobase;&arobase;, t---itle&arobase;&arobase;, file
n---ame&arobase;&arobase;, ma---nual&arobase;&arobase;}</code>
<xref><xrefnodename>c---hapter&arobase;</xrefnodename><xrefinfoname>cross
r---ef
name&arobase;</xrefinfoname><xrefprinteddesc>t---itle&arobase;</xrefprinteddesc><xrefinfofile>file
n---ame&arobase;</xrefinfofile><xrefprintedname>ma---nual&arobase;</xrefprintedname></xref>.
-<code>&arobase;ref{chapter, cross ref name, title, file name,
manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;pxref{chapter, cross ref name, title, file name,
manual}</code>
<pxref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></pxref>
-<code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname>cross ref
name</inforefrefname><inforefinfoname>file name</inforefinfoname></inforef>
+<code>&arobase;xref{c---hapter&arobase;&arobase;, cross r---ef
name&arobase;&arobase;, t---itle&arobase;&arobase;, file
n---ame&arobase;&arobase;, ma---nual&arobase;&arobase;}</code>
<xref><xrefnodename>c---hapter&arobase;</xrefnodename><xrefinfoname spaces="
">cross r---ef name&arobase;</xrefinfoname><xrefprinteddesc spaces="
">t---itle&arobase;</xrefprinteddesc><xrefinfofile spaces=" ">file
n---ame&arobase;</xrefinfofile><xrefprintedname spaces="
">ma---nual&arobase;</xrefprintedname></xref>.
+<code>&arobase;ref{chapter, cross ref name, title, file name,
manual}</code> <ref><xrefnodename>chapter</xrefnodename><xrefinfoname
spaces=" ">cross ref name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></ref>
+<code>&arobase;pxref{chapter, cross ref name, title, file name,
manual}</code> <pxref><xrefnodename>chapter</xrefnodename><xrefinfoname
spaces=" ">cross ref name</xrefinfoname><xrefprinteddesc spaces="
">title</xrefprinteddesc><xrefinfofile spaces=" ">file
name</xrefinfofile><xrefprintedname spaces=" ">manual</xrefprintedname></pxref>
+<code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
<code>&arobase;ref{chapter}</code>
<ref><xrefnodename>chapter</xrefnodename></ref>
<code>&arobase;xref{chapter}</code>
<xref><xrefnodename>chapter</xrefnodename></xref>.
@@ -3012,8 +3012,8 @@
<code>&arobase;ref{s--ect&arobase;comma{}ion, a
&arobase;comma{} in cross
ref, a comma&arobase;comma{} in title, a
comma&arobase;comma{} in file, a &arobase;comma{}
in manual name }</code>
-<ref><xrefnodename>s--ect,ion</xrefnodename><xrefinfoname>a , in
cross
-ref</xrefinfoname><xrefprinteddesc>a comma, in
title</xrefprinteddesc><xrefinfofile>a comma, in
file</xrefinfofile><xrefprintedname>a , in manual name
</xrefprintedname></ref>
+<ref><xrefnodename>s--ect,ion</xrefnodename><xrefinfoname spaces=" ">a
, in cross
+ref</xrefinfoname><xrefprinteddesc spaces=" ">a comma, in
title</xrefprinteddesc><xrefinfofile spaces=" ">a comma, in
file</xrefinfofile><xrefprintedname spaces=" ">a , in manual name
</xrefprintedname></ref>
<code>&arobase;ref{chapter,cross ref name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname></ref>
<code>&arobase;ref{chapter,,title}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc></ref>
@@ -3024,10 +3024,10 @@
<code>&arobase;ref{chapter,cross ref name,,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
<code>&arobase;ref{chapter,cross ref name,title,file
name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{chapter,cross ref name,title,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{chapter,,title,file name}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{chapter,,title,,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{chapter,,title, file name, manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{chapter,,title, file name, manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{chapter,,,file name,manual}</code>
<ref><xrefnodename>chapter</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
@@ -3040,27 +3040,27 @@
<code>&arobase;ref{(pman)anode,cross ref name,,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprintedname>manual</xrefprintedname></ref>
<code>&arobase;ref{(pman)anode,cross ref name,title,file
name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{(pman)anode,cross ref
name,title,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,cross ref name,title, file name,
manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfoname>cross ref
name</xrefinfoname><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{(pman)anode,,title,file name}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile></ref>
<code>&arobase;ref{(pman)anode,,title,,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;ref{(pman)anode,,title, file name, manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
+<code>&arobase;ref{(pman)anode,,title, file name, manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefprinteddesc>title</xrefprinteddesc><xrefinfofile
spaces=" ">file name</xrefinfofile><xrefprintedname spaces="
">manual</xrefprintedname></ref>
<code>&arobase;ref{(pman)anode,,,file name,manual}</code>
<ref><xrefnodename>(pman)anode</xrefnodename><xrefinfofile>file
name</xrefinfofile><xrefprintedname>manual</xrefprintedname></ref>
-<code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname>cross ref
name</inforefrefname><inforefinfoname>file name</inforefinfoname></inforef>
+<code>&arobase;inforef{chapter, cross ref name, file
name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
<code>&arobase;inforef{chapter}</code>
<inforef><inforefnodename>chapter</inforefnodename></inforef>
-<code>&arobase;inforef{chapter, cross ref name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname>cross ref
name</inforefrefname></inforef>
+<code>&arobase;inforef{chapter, cross ref name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
<code>&arobase;inforef{chapter,,file name}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{node, cross ref name, file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname>cross ref
name</inforefrefname><inforefinfoname>file name</inforefinfoname></inforef>
+<code>&arobase;inforef{node, cross ref name, file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file
name</inforefinfoname></inforef>
<code>&arobase;inforef{node}</code>
<inforef><inforefnodename>node</inforefnodename></inforef>
-<code>&arobase;inforef{node, cross ref name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname>cross ref
name</inforefrefname></inforef>
+<code>&arobase;inforef{node, cross ref name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname></inforef>
<code>&arobase;inforef{node,,file name}</code>
<inforef><inforefnodename>node</inforefnodename><inforefinfoname>file
name</inforefinfoname></inforef>
-<code>&arobase;inforef{chapter, cross ref name, file name, spurious
arg}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname>cross ref
name</inforefrefname><inforefinfoname>file name, spurious
arg</inforefinfoname></inforef>
+<code>&arobase;inforef{chapter, cross ref name, file name, spurious
arg}</code>
<inforef><inforefnodename>chapter</inforefnodename><inforefrefname spaces="
">cross ref name</inforefrefname><inforefinfoname spaces=" ">file name,
spurious arg</inforefinfoname></inforef>
<code>&arobase;inforef{s--ect&arobase;comma{}ion, a
&arobase;comma{} in cross
ref, a comma&arobase;comma{} in file}</code>
-<inforef><inforefnodename>s--ect,ion</inforefnodename><inforefrefname>a
, in cross
-ref</inforefrefname><inforefinfoname>a comma, in
file</inforefinfoname></inforef>
+<inforef><inforefnodename>s--ect,ion</inforefnodename><inforefrefname
spaces=" ">a , in cross
+ref</inforefrefname><inforefinfoname spaces=" ">a comma, in
file</inforefinfoname></inforef>
</pre><table commandarg="asis" spaces=" ">
@@ -3152,22 +3152,22 @@
<para>cp
-</para><printindex value="cp"></printindex>
+</para><printindex value="cp" line=" cp"></printindex>
<para>fn
-</para><printindex value="fn"></printindex>
+</para><printindex value="fn" line=" fn"></printindex>
<para>vr
-</para><printindex value="vr"></printindex>
+</para><printindex value="vr" line=" vr"></printindex>
<para>ky
-</para><printindex value="ky"></printindex>
+</para><printindex value="ky" line=" ky"></printindex>
<para>pg
-</para><printindex value="pg"></printindex>
+</para><printindex value="pg" line=" pg"></printindex>
<para>tp
-</para><printindex value="tp"></printindex>
+</para><printindex value="tp" line=" tp"></printindex>
@@ -3225,8 +3225,8 @@
<node name="chapter2" spaces=" "><nodename>chapter2</nodename><nodeprev
automatic="on">chapter</nodeprev><nodeup automatic="on">Top</nodeup></node>
<centerchap spaces=" "><sectiontitle>chapter 2</sectiontitle>
-<printindex value="cp"></printindex>
-<printindex value="fn"></printindex>
+<printindex value="cp" line=" cp"></printindex>
+<printindex value="fn" line=" fn"></printindex>
<contents></contents>
<shortcontents></shortcontents>
Index: t/collect_spaces.t
===================================================================
RCS file: t/collect_spaces.t
diff -N t/collect_spaces.t
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/collect_spaces.t 26 Aug 2012 14:15:04 -0000 1.1
@@ -0,0 +1,110 @@
+use strict;
+
+use Test::More;
+BEGIN { plan tests => 15 };
+use lib 'maintain/lib/Unicode-EastAsianWidth/lib/';
+use lib 'maintain/lib/libintl-perl/lib/';
+use lib 'maintain/lib/Text-Unidecode/lib/';
+use Texinfo::Parser;
+use Texinfo::Convert::Converter;
+
+sub _find_first_command($;$);
+
+sub _find_first_command($;$)
+{
+ my $root = shift;
+ my $command_name = shift;
+ if (defined($root->{'cmdname'})
+ and (!defined($command_name) or $command_name eq $root->{'cmdname'})) {
+ return $root;
+ }
+ if ($root->{'args'}) {
+ foreach my $content (@{$root->{'args'}}) {
+ my $first_command = _find_first_command($content, $command_name);
+ return $first_command if (defined($first_command));
+ }
+ }
+ if ($root->{'contents'}) {
+ foreach my $content (@{$root->{'contents'}}) {
+ my $first_command = _find_first_command($content, $command_name);
+ return $first_command if (defined($first_command));
+ }
+ }
+ return undef;
+}
+
+sub run_test($$$;$)
+{
+ my $in = shift;
+ my $out = shift;
+ my $name = shift;
+ my $command_name = shift;
+
+ my $tree = Texinfo::Parser::parse_texi_text (undef, $in);
+ my $root = _find_first_command($tree, $command_name);
+ #print STDERR Texinfo::Common::_print_current($root);
+ my $result = "$root->{'cmdname'}";
+ foreach my $arg (@{$root->{'args'}}) {
+ my @arg_spaces
+ = Texinfo::Convert::Converter::_collect_leading_trailing_spaces_arg(undef,
+ $arg);
+ @arg_spaces = map {if (defined($_)) {$_} else {''}} @arg_spaces;
+ $result .= '|' . join(',', @arg_spaces);
+ }
+ $result .= "|";
+ if (!defined($out)) {
+ print STDERR "$name:\n$result\n";
+ } else {
+ is ($result, $out, $name);
+ }
+}
+
+# no type for spaces in style commands
+run_test ('@code{ av }', 'code||', 'style command');
+run_test ('@code{ }', 'code||', 'empty style command');
+# item in itemize has not arg, only contents
+run_test ('@itemize
address@hidden
+in item
address@hidden itemize
+', 'item|', 'space end line in item', 'item');
+run_test ('@itemize
address@hidden in item
address@hidden itemize
+', 'item|', 'space in item', 'item');
+
+run_test ('@image{ a ,b,c , d,e }', 'image| , ||, | |, |', 'image');
+run_test ("address@hidden a ,b,c , d \n", 'node| , ||, | ,
+|', 'node');
+run_test ('@image{ a ,b
+,c , d,e }', 'image| , |,
+|, | |, |', 'image with end of line');
+run_test ('@image{ a ,b
+,c , d,e }', 'image| , |,
+|, | |, |', 'image with space end of line');
+run_test ('@image{ a ,b
+ ,c , d,e }', 'image| , |, |, | |, |', 'image with space end of line space');
+run_test ('@table @asis
address@hidden iem arg
+T
address@hidden table', 'item| ,
+|', 'table item', 'item');
+run_test ('@table @asis
address@hidden
+T
address@hidden table', 'item|
+|', 'space empty table item', 'item');
+run_test ('@table @asis
address@hidden
+T
address@hidden table', 'item|
+|', 'empty table item', 'item');
+run_test ('@multitable {a} {b}
address@hidden multitable', 'multitable| |', 'multitable');
+run_test ('@multitable @columnfractions 0.3 0.4 0.2
address@hidden multitable', 'columnfractions| ,
+|', 'multitable columnfractions', 'columnfractions');
+run_test ('@quotation gg
+Q
address@hidden quotation', 'quotation| ,
+|', 'quotation');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/tp Texinfo/Parser.pm Texinfo/Convert/Co...,
Patrice Dumas <=