[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm Texinfo/Convert/No...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Parser.pm Texinfo/Convert/No... |
|
Date: |
Fri, 29 Oct 2010 19:31:16 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/10/29 19:31:16
Modified files:
tp/Texinfo : Parser.pm
tp/Texinfo/Convert: NodeNameNormalization.pm
tp/t/results/alias: simple.pl
tp/t/results/coverage: block_commands.pl item_container.pl
preformatted.pl table.pl
tp/t/results/coverage_braces: caption_not_closed.pl
tp/t/results/invalid_nestings: block_not_matching.pl
formats_not_closed_in_example.pl
in_table.pl
itemx_in_itemize_enumerate_in_table.pl
on_block_command_line.pl
on_itemize_line.pl
style_not_closed_in_table_line.pl
table_not_closed_in_menu_comment.pl
table_not_closed_in_menu_description.pl
tp/t/results/itemize: accent_argument.pl w_argument.pl
tp/t/results/macro: macro_in_brace_command.pl
tp/t/results/xtable: headitem_in_table.pl
Log message:
Parse float line and normalize float arguments.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.120&r2=1.121
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/NodeNameNormalization.pm?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/alias/simple.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/block_commands.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/item_container.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/preformatted.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/caption_not_closed.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/block_not_matching.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/in_table.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/on_block_command_line.pl?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/on_itemize_line.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/accent_argument.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/w_argument.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_brace_command.pl?cvsroot=texinfo&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/headitem_in_table.pl?cvsroot=texinfo&r1=1.3&r2=1.4
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- Texinfo/Parser.pm 29 Oct 2010 07:31:05 -0000 1.120
+++ Texinfo/Parser.pm 29 Oct 2010 19:31:15 -0000 1.121
@@ -1829,7 +1829,7 @@
print STDERR "BUG: $context in block_line_arg ne line\n"
if ($context ne 'line');
# @multitable args
- if ($current->{'parent'} and $current->{'parent'}->{'cmdname'}
+ if ($current->{'parent'}->{'cmdname'}
and $current->{'parent'}->{'cmdname'} eq 'multitable') {
# parse the prototypes and put them in a special arg
my @prototype_row;
@@ -1864,6 +1864,32 @@
}
$multitable->{'extra'}->{'prototypes'} = address@hidden;
+ } else {
+ $self->_isolate_last_space($current, 'space_at_end_block_command');
+ }
+ # @float args
+ if ($current->{'parent'}->{'cmdname'}
+ and $current->{'parent'}->{'cmdname'} eq 'float') {
+ my $float = $current->{'parent'};
+ $float->{'line_nr'} = $line_nr;
+ if (@{$float->{'args'}}) {
+ if ($float->{'args'}->[1]) {
+ my $float_label = _parse_node_manual($float->{'args'}->[1]);
+ _check_internal_node($self, $float_label, $float->{'args'}->[1],
+ $line_nr);
+ if (defined($float_label) and $float_label->{'node_content'}
+ and $float_label->{'normalized'} =~ /\S/) {
+ $float->{'special'}->{'label'} = $float_label;
+ }
+ }
+ my @type_contents = @{$float->{'args'}->[0]->{'contents'}};
+ _trim_spaces_comment_from_content(address@hidden);
+ if (@type_contents) {
+ $float->{'special'}->{'type'}->{'normalized'}
+ = Texinfo::Convert::NodeNameNormalization::convert({'contents' =>
address@hidden);
+ $float->{'special'}->{'type'}->{'content'} = address@hidden;
+ }
+ }
}
$current = $current->{'parent'};
delete $current->{'remaining_args'};
@@ -2085,17 +2111,26 @@
}
}
-sub _check_node_label($$$$$)
+sub _check_internal_node ($$$$)
{
my $self = shift;
my $parsed_node = shift;
my $node = shift;
- my $command = shift;
my $line_nr = shift;
if ($parsed_node and $parsed_node->{'manual_content'}) {
_line_error ($self, sprintf($self->__("Syntax for an external node used
for `%s'"),
tree_to_texi($node)), $line_nr)
}
+}
+
+sub _check_node_label($$$$$)
+{
+ my $self = shift;
+ my $parsed_node = shift;
+ my $node = shift;
+ my $command = shift;
+ my $line_nr = shift;
+ _check_internal_node($self, $parsed_node, $node, $line_nr);
return _check_empty_node($self, $parsed_node, $command, $line_nr);
}
@@ -3212,7 +3247,8 @@
pop @$contents;
}
if (@$contents and $contents->[-1]->{'type'}
- and $contents->[-1]->{'type'} eq 'spaces_at_end') {
+ and ($contents->[-1]->{'type'} eq 'spaces_at_end'
+ or $contents->[-1]->{'type'} eq 'space_at_end_block_command')) {
pop @$contents;
}
}
Index: Texinfo/Convert/NodeNameNormalization.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/NodeNameNormalization.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Texinfo/Convert/NodeNameNormalization.pm 29 Oct 2010 07:31:06 -0000
1.1
+++ Texinfo/Convert/NodeNameNormalization.pm 29 Oct 2010 19:31:16 -0000
1.2
@@ -77,7 +77,8 @@
my %ignored_types;
foreach my $type ('empty_line_after_command',
'empty_spaces_after_command', 'spaces_at_end',
- 'empty_spaces_before_argument', 'space_at_end_menu_node') {
+ 'empty_spaces_before_argument', 'space_at_end_menu_node',
+ 'space_at_end_block_command') {
$ignored_types{$type} = 1;
}
Index: t/results/alias/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/alias/simple.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/alias/simple.pl 29 Oct 2010 07:11:56 -0000 1.16
+++ t/results/alias/simple.pl 29 Oct 2010 19:31:16 -0000 1.17
@@ -196,7 +196,8 @@
{
'parent' => {},
'text' => '
-'
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
Index: t/results/coverage/block_commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/block_commands.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/coverage/block_commands.pl 29 Oct 2010 07:11:57 -0000
1.13
+++ t/results/coverage/block_commands.pl 29 Oct 2010 19:31:16 -0000
1.14
@@ -54,8 +54,13 @@
},
{
'parent' => {},
- 'text' => 'warning
-'
+ 'text' => 'warning'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
@@ -115,8 +120,13 @@
},
{
'parent' => {},
- 'text' => 'b float
-'
+ 'text' => 'b float'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
@@ -194,7 +204,26 @@
'
}
],
- 'parent' => {}
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 10,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'special' => {
+ 'label' => {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'b-float'
+ },
+ 'type' => {
+ 'content' => [
+ {}
+ ],
+ 'normalized' => 'a-float'
+ }
+ }
},
{
'parent' => {},
@@ -214,6 +243,7 @@
$result_trees{'block_commands'}{'contents'}[3]{'parent'} =
$result_trees{'block_commands'};
$result_trees{'block_commands'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'block_commands'}{'contents'}[4]{'args'}[0];
$result_trees{'block_commands'}{'contents'}[4]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'block_commands'}{'contents'}[4]{'args'}[0];
+$result_trees{'block_commands'}{'contents'}[4]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'block_commands'}{'contents'}[4]{'args'}[0];
$result_trees{'block_commands'}{'contents'}[4]{'args'}[0]{'parent'} =
$result_trees{'block_commands'}{'contents'}[4];
$result_trees{'block_commands'}{'contents'}[4]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'block_commands'}{'contents'}[4]{'contents'}[0];
$result_trees{'block_commands'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'block_commands'}{'contents'}[4];
@@ -224,6 +254,7 @@
$result_trees{'block_commands'}{'contents'}[7]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'block_commands'}{'contents'}[7]{'args'}[0];
$result_trees{'block_commands'}{'contents'}[7]{'args'}[0]{'parent'} =
$result_trees{'block_commands'}{'contents'}[7];
$result_trees{'block_commands'}{'contents'}[7]{'args'}[1]{'contents'}[1]{'parent'}
= $result_trees{'block_commands'}{'contents'}[7]{'args'}[1];
+$result_trees{'block_commands'}{'contents'}[7]{'args'}[1]{'contents'}[2]{'parent'}
= $result_trees{'block_commands'}{'contents'}[7]{'args'}[1];
$result_trees{'block_commands'}{'contents'}[7]{'args'}[1]{'parent'} =
$result_trees{'block_commands'}{'contents'}[7];
$result_trees{'block_commands'}{'contents'}[7]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'block_commands'}{'contents'}[7]{'contents'}[0];
$result_trees{'block_commands'}{'contents'}[7]{'contents'}[0]{'parent'} =
$result_trees{'block_commands'}{'contents'}[7];
@@ -238,6 +269,8 @@
$result_trees{'block_commands'}{'contents'}[7]{'contents'}[3]{'parent'} =
$result_trees{'block_commands'}{'contents'}[7];
$result_trees{'block_commands'}{'contents'}[7]{'contents'}[4]{'parent'} =
$result_trees{'block_commands'}{'contents'}[7];
$result_trees{'block_commands'}{'contents'}[7]{'parent'} =
$result_trees{'block_commands'};
+$result_trees{'block_commands'}{'contents'}[7]{'special'}{'label'}{'node_content'}[0]
= $result_trees{'block_commands'}{'contents'}[7]{'args'}[1]{'contents'}[1];
+$result_trees{'block_commands'}{'contents'}[7]{'special'}{'type'}{'content'}[0]
= $result_trees{'block_commands'}{'contents'}[7]{'args'}[0]{'contents'}[1];
$result_trees{'block_commands'}{'contents'}[8]{'parent'} =
$result_trees{'block_commands'};
$result_texis{'block_commands'} = '
Index: t/results/coverage/item_container.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/item_container.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/coverage/item_container.pl 29 Oct 2010 07:11:57 -0000
1.12
+++ t/results/coverage/item_container.pl 29 Oct 2010 19:31:16 -0000
1.13
@@ -19,8 +19,13 @@
},
{
'parent' => {},
- 'text' => '+
-'
+ 'text' => '+'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
@@ -88,7 +93,8 @@
{
'parent' => {},
'text' => '
-'
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
@@ -144,6 +150,7 @@
$result_trees{'item_container'}{'contents'}[0]{'parent'} =
$result_trees{'item_container'};
$result_trees{'item_container'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'item_container'}{'contents'}[1]{'args'}[0];
$result_trees{'item_container'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'item_container'}{'contents'}[1]{'args'}[0];
+$result_trees{'item_container'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'item_container'}{'contents'}[1]{'args'}[0];
$result_trees{'item_container'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'item_container'}{'contents'}[1];
$result_trees{'item_container'}{'contents'}[1]{'contents'}[0]{'parent'} =
$result_trees{'item_container'}{'contents'}[1];
$result_trees{'item_container'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'item_container'}{'contents'}[1]{'contents'}[1];
Index: t/results/coverage/preformatted.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/preformatted.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/coverage/preformatted.pl 29 Oct 2010 07:11:57 -0000 1.13
+++ t/results/coverage/preformatted.pl 29 Oct 2010 19:31:16 -0000 1.14
@@ -74,7 +74,8 @@
{
'parent' => {},
'text' => '
-'
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
Index: t/results/coverage/table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/table.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/coverage/table.pl 29 Oct 2010 07:11:57 -0000 1.13
+++ t/results/coverage/table.pl 29 Oct 2010 19:31:16 -0000 1.14
@@ -25,7 +25,8 @@
{
'parent' => {},
'text' => '
-'
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
Index: t/results/coverage_braces/caption_not_closed.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage_braces/caption_not_closed.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/coverage_braces/caption_not_closed.pl 29 Oct 2010 07:11:57
-0000 1.4
+++ t/results/coverage_braces/caption_not_closed.pl 29 Oct 2010 19:31:16
-0000 1.5
@@ -13,8 +13,13 @@
},
{
'parent' => {},
- 'text' => 'Text
-'
+ 'text' => 'Text'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
@@ -98,7 +103,20 @@
'parent' => {}
}
],
- 'parent' => {}
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {},
+ 'special' => {
+ 'type' => {
+ 'content' => [
+ {}
+ ],
+ 'normalized' => 'Text'
+ }
+ }
},
{
'parent' => {},
@@ -117,6 +135,7 @@
};
$result_trees{'caption_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'caption_not_closed'}{'contents'}[0]{'args'}[0];
$result_trees{'caption_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'caption_not_closed'}{'contents'}[0]{'args'}[0];
+$result_trees{'caption_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'caption_not_closed'}{'contents'}[0]{'args'}[0];
$result_trees{'caption_not_closed'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'caption_not_closed'}{'contents'}[0];
$result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'caption_not_closed'}{'contents'}[0];
$result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
@@ -133,6 +152,7 @@
$result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[1];
$result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'caption_not_closed'}{'contents'}[0];
$result_trees{'caption_not_closed'}{'contents'}[0]{'parent'} =
$result_trees{'caption_not_closed'};
+$result_trees{'caption_not_closed'}{'contents'}[0]{'special'}{'type'}{'content'}[0]
= $result_trees{'caption_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'caption_not_closed'}{'contents'}[1]{'parent'} =
$result_trees{'caption_not_closed'};
$result_trees{'caption_not_closed'}{'contents'}[2]{'parent'} =
$result_trees{'caption_not_closed'};
Index: t/results/invalid_nestings/block_not_matching.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/block_not_matching.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/invalid_nestings/block_not_matching.pl 29 Oct 2010 07:11:58
-0000 1.5
+++ t/results/invalid_nestings/block_not_matching.pl 29 Oct 2010 19:31:16
-0000 1.6
@@ -217,7 +217,8 @@
{
'parent' => {},
'text' => '
-'
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
Index: t/results/invalid_nestings/formats_not_closed_in_example.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/invalid_nestings/formats_not_closed_in_example.pl 29 Oct 2010
07:11:58 -0000 1.3
+++ t/results/invalid_nestings/formats_not_closed_in_example.pl 29 Oct 2010
19:31:16 -0000 1.4
@@ -34,7 +34,8 @@
{
'parent' => {},
'text' => '
-'
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
Index: t/results/invalid_nestings/in_table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/invalid_nestings/in_table.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/invalid_nestings/in_table.pl 29 Oct 2010 07:11:58 -0000
1.7
+++ t/results/invalid_nestings/in_table.pl 29 Oct 2010 19:31:16 -0000
1.8
@@ -19,7 +19,8 @@
{
'parent' => {},
'text' => '
-'
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
@@ -65,7 +66,8 @@
{
'parent' => {},
'text' => '
-'
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
Index: t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl 29 Oct
2010 07:11:58 -0000 1.3
+++ t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl 29 Oct
2010 19:31:16 -0000 1.4
@@ -19,7 +19,8 @@
{
'parent' => {},
'text' => '
-'
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- t/results/invalid_nestings/on_block_command_line.pl 29 Oct 2010 07:11:58
-0000 1.7
+++ t/results/invalid_nestings/on_block_command_line.pl 29 Oct 2010 19:31:16
-0000 1.8
@@ -242,8 +242,13 @@
},
{
'parent' => {},
- 'text' => 'exdent
-'
+ 'text' => 'exdent'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
@@ -306,6 +311,7 @@
$result_trees{'on_block_command_line'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'parent'}
= $result_trees{'on_block_command_line'}{'contents'}[3]{'args'}[0];
$result_trees{'on_block_command_line'}{'contents'}[3]{'args'}[0]{'contents'}[9]{'parent'}
= $result_trees{'on_block_command_line'}{'contents'}[3]{'args'}[0];
$result_trees{'on_block_command_line'}{'contents'}[3]{'args'}[0]{'contents'}[10]{'parent'}
= $result_trees{'on_block_command_line'}{'contents'}[3]{'args'}[0];
+$result_trees{'on_block_command_line'}{'contents'}[3]{'args'}[0]{'contents'}[11]{'parent'}
= $result_trees{'on_block_command_line'}{'contents'}[3]{'args'}[0];
$result_trees{'on_block_command_line'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'on_block_command_line'}{'contents'}[3];
$result_trees{'on_block_command_line'}{'contents'}[3]{'parent'} =
$result_trees{'on_block_command_line'};
$result_trees{'on_block_command_line'}{'contents'}[4]{'parent'} =
$result_trees{'on_block_command_line'};
Index: t/results/invalid_nestings/on_itemize_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/on_itemize_line.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/invalid_nestings/on_itemize_line.pl 29 Oct 2010 07:11:58
-0000 1.6
+++ t/results/invalid_nestings/on_itemize_line.pl 29 Oct 2010 19:31:16
-0000 1.7
@@ -105,8 +105,13 @@
},
{
'parent' => {},
- 'text' => 'exdent
-'
+ 'text' => 'exdent'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
@@ -177,8 +182,13 @@
},
{
'parent' => {},
- 'text' => 'in item
-'
+ 'text' => 'in item'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
@@ -223,6 +233,7 @@
$result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[8]{'parent'}
= $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0];
$result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[9]{'parent'}
= $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0];
$result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[10]{'parent'}
= $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0];
+$result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[11]{'parent'}
= $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0];
$result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'on_itemize_line'}{'contents'}[0];
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'on_itemize_line'}{'contents'}[0];
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[1];
@@ -236,6 +247,7 @@
$result_trees{'on_itemize_line'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'on_itemize_line'}{'contents'}[3]{'args'}[0];
$result_trees{'on_itemize_line'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'on_itemize_line'}{'contents'}[3]{'args'}[0];
$result_trees{'on_itemize_line'}{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
= $result_trees{'on_itemize_line'}{'contents'}[3]{'args'}[0];
+$result_trees{'on_itemize_line'}{'contents'}[3]{'args'}[0]{'contents'}[4]{'parent'}
= $result_trees{'on_itemize_line'}{'contents'}[3]{'args'}[0];
$result_trees{'on_itemize_line'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'on_itemize_line'}{'contents'}[3];
$result_trees{'on_itemize_line'}{'contents'}[3]{'contents'}[0]{'parent'} =
$result_trees{'on_itemize_line'}{'contents'}[3];
$result_trees{'on_itemize_line'}{'contents'}[3]{'parent'} =
$result_trees{'on_itemize_line'};
Index: t/results/invalid_nestings/style_not_closed_in_table_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/invalid_nestings/style_not_closed_in_table_line.pl 29 Oct
2010 07:11:59 -0000 1.4
+++ t/results/invalid_nestings/style_not_closed_in_table_line.pl 29 Oct
2010 19:31:16 -0000 1.5
@@ -19,7 +19,8 @@
{
'parent' => {},
'text' => '
-'
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
Index: t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/invalid_nestings/table_not_closed_in_menu_comment.pl 29 Oct
2010 07:11:59 -0000 1.4
+++ t/results/invalid_nestings/table_not_closed_in_menu_comment.pl 29 Oct
2010 19:31:16 -0000 1.5
@@ -83,7 +83,8 @@
{
'parent' => {},
'text' => '
-'
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
Index: t/results/invalid_nestings/table_not_closed_in_menu_description.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- t/results/invalid_nestings/table_not_closed_in_menu_description.pl 29 Oct
2010 07:11:59 -0000 1.4
+++ t/results/invalid_nestings/table_not_closed_in_menu_description.pl 29 Oct
2010 19:31:16 -0000 1.5
@@ -56,7 +56,8 @@
{
'parent' => {},
'text' => '
-'
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
Index: t/results/itemize/accent_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/accent_argument.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/itemize/accent_argument.pl 29 Oct 2010 07:11:59 -0000
1.11
+++ t/results/itemize/accent_argument.pl 29 Oct 2010 19:31:16 -0000
1.12
@@ -94,7 +94,8 @@
{
'parent' => {},
'text' => '
-'
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
Index: t/results/itemize/w_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/w_argument.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/itemize/w_argument.pl 29 Oct 2010 07:11:59 -0000 1.11
+++ t/results/itemize/w_argument.pl 29 Oct 2010 19:31:16 -0000 1.12
@@ -26,7 +26,8 @@
{
'parent' => {},
'text' => '
-'
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
Index: t/results/macro/macro_in_brace_command.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_brace_command.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- t/results/macro/macro_in_brace_command.pl 29 Oct 2010 07:11:59 -0000
1.13
+++ t/results/macro/macro_in_brace_command.pl 29 Oct 2010 19:31:16 -0000
1.14
@@ -93,7 +93,8 @@
{
'parent' => {},
'text' => '
-'
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},
Index: t/results/xtable/headitem_in_table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/xtable/headitem_in_table.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/results/xtable/headitem_in_table.pl 29 Oct 2010 07:12:02 -0000
1.3
+++ t/results/xtable/headitem_in_table.pl 29 Oct 2010 19:31:16 -0000
1.4
@@ -19,7 +19,8 @@
{
'parent' => {},
'text' => '
-'
+',
+ 'type' => 'space_at_end_block_command'
}
],
'parent' => {},