[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp Texinfo/Parser.pm t/test_utils.pl t/...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp Texinfo/Parser.pm t/test_utils.pl t/... |
|
Date: |
Wed, 10 Nov 2010 18:21:22 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 10/11/10 18:21:22
Modified files:
tp/Texinfo : Parser.pm
tp/t : test_utils.pl
tp/t/results/alias: simple.pl
tp/t/results/coverage: block_commands.pl item_container.pl
preformatted.pl table.pl
table_command_comment.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/sectioning: double_node_anchor_float.pl
tp/t/results/xtable: headitem_in_table.pl
Log message:
Collect block line command arguments contents.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.145&r2=1.146
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/test_utils.pl?cvsroot=texinfo&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/alias/simple.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/block_commands.pl?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/item_container.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/preformatted.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table_command_comment.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage_braces/caption_not_closed.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/block_not_matching.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/in_table.pl?cvsroot=texinfo&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/on_block_command_line.pl?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/on_itemize_line.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/accent_argument.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/itemize/w_argument.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_brace_command.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/sectioning/double_node_anchor_float.pl?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/headitem_in_table.pl?cvsroot=texinfo&r1=1.8&r2=1.9
Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -b -r1.145 -r1.146
--- Texinfo/Parser.pm 9 Nov 2010 23:02:46 -0000 1.145
+++ Texinfo/Parser.pm 10 Nov 2010 18:21:20 -0000 1.146
@@ -1470,6 +1470,27 @@
$current->{'extra'}->{'index_entry'} = $index_entry;
}
+sub _remove_empty_content_arguments($)
+{
+ my $current = shift;
+ my $type;
+ if ($current->{'extra'}) {
+ if ($current->{'extra'}->{'block_command_line_contents'}) {
+ $type = 'block_command_line_contents';
+ } elsif ($current->{'extra'}->{'brace_command_contents'}) {
+ $type = 'brace_command_contents';
+ }
+ }
+ if ($type) {
+ while (@{$current->{'extra'}->{$type}}
+ and not defined($current->{'extra'}->{$type}->[-1])) {
+ pop @{$current->{'extra'}->{$type}};
+ }
+ delete $current->{'extra'}->{$type} if
(address@hidden>{'extra'}->{$type}});
+ delete $current->{'extra'} if (!keys(%{$current->{'extra'}}));
+ }
+}
+
# close constructs and do stuff at end of line (or end of the document)
sub _end_line($$$);
sub _end_line($$$)
@@ -1644,6 +1665,7 @@
} else {
$self->_isolate_last_space($current, 'space_at_end_block_command');
+ $self->_register_command_arg($current, 'block_command_line_contents');
}
# @float args
if ($current->{'parent'}->{'cmdname'}
@@ -1684,6 +1706,9 @@
unshift @{$current->{'contents'}}, $empty_text;
delete $current->{'args'};
}
+ # Additionally, remove empty arguments as far as possible
+ _remove_empty_content_arguments($current);
+
if ($current->{'cmdname'}
and $block_item_commands{$current->{'cmdname'}}) {
push @{$current->{'contents'}}, { 'type' => 'before_item',
@@ -1970,17 +1995,17 @@
$current->{'line_nr'} = $line_nr;
}
-sub _register_brace_command_arg($$)
+sub _register_command_arg($$$)
{
my $self = shift;
my $current = shift;
- $self->_isolate_last_space($current);
+ my $type = shift;
my @contents = @{$current->{'contents'}};
_trim_spaces_comment_from_content(address@hidden);
if (scalar(@contents)) {
- push @{$current->{'parent'}->{'extra'}->{'brace_command_contents'}},
address@hidden;
+ push @{$current->{'parent'}->{'extra'}->{$type}}, address@hidden;
} else {
- push @{$current->{'parent'}->{'extra'}->{'brace_command_contents'}}, undef;
+ push @{$current->{'parent'}->{'extra'}->{$type}}, undef;
}
}
@@ -3011,7 +3036,10 @@
and ($brace_commands{$current->{'parent'}->{'cmdname'}} > 1
or $simple_text_commands{$current->{'parent'}->{'cmdname'}})
and $current->{'parent'}->{'cmdname'} ne 'math') {
- $self->_register_brace_command_arg($current);
+ $self->_isolate_last_space($current);
+ $self->_register_command_arg($current, 'brace_command_contents');
+ # Remove empty arguments, as far as possible
+ _remove_empty_content_arguments($current);
}
print STDERR "CLOSING address@hidden>{'parent'}->{'cmdname'}\n" if
($self->{'debug'});
delete $current->{'parent'}->{'remaining_args'};
@@ -3050,9 +3078,13 @@
if ($brace_commands{$current->{'parent'}->{'cmdname'}}
and ($brace_commands{$current->{'parent'}->{'cmdname'}} > 1
or $simple_text_commands{$current->{'parent'}->{'cmdname'}}))
{
- $self->_register_brace_command_arg($current);
+ $self->_isolate_last_space($current);
+ $self->_register_command_arg($current, 'brace_command_contents');
} else {
$self->_isolate_last_space($current);
+ if (exists $block_commands{$current->{'parent'}->{'cmdname'}}) {
+ $self->_register_command_arg($current,
'block_command_line_contents');
+ }
}
my $type = $current->{'type'};
$current = $current->{'parent'};
Index: t/test_utils.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/test_utils.pl,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- t/test_utils.pl 6 Nov 2010 00:41:28 -0000 1.46
+++ t/test_utils.pl 10 Nov 2010 18:21:21 -0000 1.47
@@ -104,7 +104,8 @@
}
my @contents_keys = ('contents', 'args', 'parent', 'line_nr', 'node_content',
- 'nodes_manuals', 'misc_content', 'invalid_nesting');
+ 'nodes_manuals', 'misc_content', 'invalid_nesting',
+ 'block_command_line_contents');
my @menus_keys = ('menu_next', 'menu_up', 'menu_prev', 'menu_up_hash');
my @sections_keys = ('section_next', 'section_prev', 'section_up',
'section_childs', 'associated_node');
Index: t/results/alias/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/alias/simple.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/alias/simple.pl 1 Nov 2010 09:00:31 -0000 1.21
+++ t/results/alias/simple.pl 10 Nov 2010 18:21:21 -0000 1.22
@@ -246,6 +246,13 @@
'parent' => {}
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -296,6 +303,7 @@
$result_trees{'simple'}{'contents'}[8]{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'simple'}{'contents'}[8]{'contents'}[1];
$result_trees{'simple'}{'contents'}[8]{'contents'}[1]{'extra'}{'misc_content'}[0]
=
$result_trees{'simple'}{'contents'}[8]{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'simple'}{'contents'}[8]{'contents'}[1]{'parent'} =
$result_trees{'simple'}{'contents'}[8];
+$result_trees{'simple'}{'contents'}[8]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'simple'}{'contents'}[8]{'args'}[0]{'contents'}[1];
$result_trees{'simple'}{'contents'}[8]{'parent'} = $result_trees{'simple'};
$result_trees{'simple'}{'contents'}[9]{'parent'} = $result_trees{'simple'};
Index: t/results/coverage/block_commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/block_commands.pl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/results/coverage/block_commands.pl 1 Nov 2010 09:09:20 -0000
1.21
+++ t/results/coverage/block_commands.pl 10 Nov 2010 18:21:21 -0000
1.22
@@ -83,6 +83,13 @@
'type' => 'paragraph'
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -210,6 +217,14 @@
}
],
'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ],
+ [
+ {}
+ ]
+ ],
'caption' => {},
'node_content' => [
{}
@@ -251,6 +266,7 @@
$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];
+$result_trees{'block_commands'}{'contents'}[4]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'block_commands'}{'contents'}[4]{'args'}[0]{'contents'}[1];
$result_trees{'block_commands'}{'contents'}[4]{'parent'} =
$result_trees{'block_commands'};
$result_trees{'block_commands'}{'contents'}[5]{'parent'} =
$result_trees{'block_commands'};
$result_trees{'block_commands'}{'contents'}[6]{'parent'} =
$result_trees{'block_commands'};
@@ -273,6 +289,8 @@
$result_trees{'block_commands'}{'contents'}[7]{'contents'}[3]{'extra'}{'float'}
= $result_trees{'block_commands'}{'contents'}[7];
$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]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'block_commands'}{'contents'}[7]{'args'}[0]{'contents'}[1];
+$result_trees{'block_commands'}{'contents'}[7]{'extra'}{'block_command_line_contents'}[1][0]
= $result_trees{'block_commands'}{'contents'}[7]{'args'}[1]{'contents'}[1];
$result_trees{'block_commands'}{'contents'}[7]{'extra'}{'caption'} =
$result_trees{'block_commands'}{'contents'}[7]{'contents'}[3];
$result_trees{'block_commands'}{'contents'}[7]{'extra'}{'node_content'}[0] =
$result_trees{'block_commands'}{'contents'}[7]{'args'}[1]{'contents'}[1];
$result_trees{'block_commands'}{'contents'}[7]{'extra'}{'type'}{'content'}[0]
= $result_trees{'block_commands'}{'contents'}[7]{'args'}[0]{'contents'}[1];
Index: t/results/coverage/item_container.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/item_container.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/coverage/item_container.pl 1 Nov 2010 09:01:02 -0000
1.16
+++ t/results/coverage/item_container.pl 10 Nov 2010 18:21:21 -0000
1.17
@@ -64,6 +64,13 @@
'parent' => {}
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -138,6 +145,13 @@
'parent' => {}
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -159,6 +173,7 @@
$result_trees{'item_container'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'item_container'}{'contents'}[1]{'contents'}[1]{'contents'}[1];
$result_trees{'item_container'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'item_container'}{'contents'}[1]{'contents'}[1];
$result_trees{'item_container'}{'contents'}[1]{'contents'}[1]{'parent'} =
$result_trees{'item_container'}{'contents'}[1];
+$result_trees{'item_container'}{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'item_container'}{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'item_container'}{'contents'}[1]{'parent'} =
$result_trees{'item_container'};
$result_trees{'item_container'}{'contents'}[2]{'parent'} =
$result_trees{'item_container'};
$result_trees{'item_container'}{'contents'}[3]{'parent'} =
$result_trees{'item_container'};
@@ -172,6 +187,7 @@
$result_trees{'item_container'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'item_container'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
$result_trees{'item_container'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'item_container'}{'contents'}[4]{'contents'}[1];
$result_trees{'item_container'}{'contents'}[4]{'contents'}[1]{'parent'} =
$result_trees{'item_container'}{'contents'}[4];
+$result_trees{'item_container'}{'contents'}[4]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'item_container'}{'contents'}[4]{'args'}[0]{'contents'}[1];
$result_trees{'item_container'}{'contents'}[4]{'parent'} =
$result_trees{'item_container'};
$result_trees{'item_container'}{'contents'}[5]{'parent'} =
$result_trees{'item_container'};
Index: t/results/coverage/preformatted.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/preformatted.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/coverage/preformatted.pl 1 Nov 2010 09:01:02 -0000 1.19
+++ t/results/coverage/preformatted.pl 10 Nov 2010 18:21:21 -0000 1.20
@@ -142,6 +142,13 @@
'
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -186,6 +193,7 @@
$result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'preformatted'}{'contents'}[4]{'contents'}[1];
$result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'preformatted'}{'contents'}[4]{'contents'}[1];
$result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'preformatted'}{'contents'}[4]{'contents'}[1];
+$result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'parent'} =
$result_trees{'preformatted'}{'contents'}[4];
$result_trees{'preformatted'}{'contents'}[4]{'contents'}[2]{'parent'} =
$result_trees{'preformatted'}{'contents'}[4];
$result_trees{'preformatted'}{'contents'}[4]{'parent'} =
$result_trees{'preformatted'};
Index: t/results/coverage/table.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/table.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/coverage/table.pl 1 Nov 2010 09:01:02 -0000 1.19
+++ t/results/coverage/table.pl 10 Nov 2010 18:21:21 -0000 1.20
@@ -124,6 +124,13 @@
'type' => 'paragraph'
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -391,6 +398,13 @@
'type' => 'empty_line'
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -423,6 +437,7 @@
$result_trees{'table'}{'contents'}[1]{'contents'}[3]{'parent'} =
$result_trees{'table'}{'contents'}[1];
$result_trees{'table'}{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'table'}{'contents'}[1]{'contents'}[4];
$result_trees{'table'}{'contents'}[1]{'contents'}[4]{'parent'} =
$result_trees{'table'}{'contents'}[1];
+$result_trees{'table'}{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'table'}{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'table'}{'contents'}[1]{'parent'} = $result_trees{'table'};
$result_trees{'table'}{'contents'}[2]{'parent'} = $result_trees{'table'};
$result_trees{'table'}{'contents'}[3]{'parent'} = $result_trees{'table'};
@@ -472,6 +487,7 @@
$result_trees{'table'}{'contents'}[4]{'contents'}[4]{'extra'}{'misc_content'}
=
$result_trees{'table'}{'contents'}[4]{'contents'}[4]{'extra'}{'index_entry'}{'content'};
$result_trees{'table'}{'contents'}[4]{'contents'}[4]{'parent'} =
$result_trees{'table'}{'contents'}[4];
$result_trees{'table'}{'contents'}[4]{'contents'}[5]{'parent'} =
$result_trees{'table'}{'contents'}[4];
+$result_trees{'table'}{'contents'}[4]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'table'}{'contents'}[4]{'args'}[0]{'contents'}[1];
$result_trees{'table'}{'contents'}[4]{'parent'} = $result_trees{'table'};
$result_trees{'table'}{'contents'}[5]{'parent'} = $result_trees{'table'};
Index: t/results/coverage/table_command_comment.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/coverage/table_command_comment.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/coverage/table_command_comment.pl 1 Nov 2010 09:01:02 -0000
1.15
+++ t/results/coverage/table_command_comment.pl 10 Nov 2010 18:21:21 -0000
1.16
@@ -75,6 +75,13 @@
'parent' => {}
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -97,6 +104,7 @@
$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[1];
$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[1]{'extra'}{'misc_content'}[0]
=
$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'table_command_comment'}{'contents'}[0];
+$result_trees{'table_command_comment'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'table_command_comment'}{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'table_command_comment'}{'contents'}[0]{'parent'} =
$result_trees{'table_command_comment'};
$result_trees{'table_command_comment'}{'contents'}[1]{'parent'} =
$result_trees{'table_command_comment'};
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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/coverage_braces/caption_not_closed.pl 1 Nov 2010 09:09:20
-0000 1.11
+++ t/results/coverage_braces/caption_not_closed.pl 10 Nov 2010 18:21:21
-0000 1.12
@@ -109,6 +109,11 @@
}
],
'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
'caption' => {},
'type' => {
'content' => [
@@ -158,6 +163,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]{'extra'}{'float'}
= $result_trees{'caption_not_closed'}{'contents'}[0];
$result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'caption_not_closed'}{'contents'}[0];
+$result_trees{'caption_not_closed'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'caption_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'caption_not_closed'}{'contents'}[0]{'extra'}{'caption'} =
$result_trees{'caption_not_closed'}{'contents'}[0]{'contents'}[1];
$result_trees{'caption_not_closed'}{'contents'}[0]{'extra'}{'type'}{'content'}[0]
= $result_trees{'caption_not_closed'}{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'caption_not_closed'}{'contents'}[0]{'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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/invalid_nestings/block_not_matching.pl 1 Nov 2010 09:01:06
-0000 1.11
+++ t/results/invalid_nestings/block_not_matching.pl 10 Nov 2010 18:21:21
-0000 1.12
@@ -297,6 +297,13 @@
'parent' => {}
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -501,6 +508,7 @@
$result_trees{'block_not_matching'}{'contents'}[9]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'block_not_matching'}{'contents'}[9]{'contents'}[2];
$result_trees{'block_not_matching'}{'contents'}[9]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'block_not_matching'}{'contents'}[9]{'contents'}[2];
$result_trees{'block_not_matching'}{'contents'}[9]{'contents'}[2]{'parent'} =
$result_trees{'block_not_matching'}{'contents'}[9];
+$result_trees{'block_not_matching'}{'contents'}[9]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'block_not_matching'}{'contents'}[9]{'args'}[0]{'contents'}[1];
$result_trees{'block_not_matching'}{'contents'}[9]{'parent'} =
$result_trees{'block_not_matching'};
$result_trees{'block_not_matching'}{'contents'}[10]{'parent'} =
$result_trees{'block_not_matching'};
$result_trees{'block_not_matching'}{'contents'}[11]{'parent'} =
$result_trees{'block_not_matching'};
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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/invalid_nestings/formats_not_closed_in_example.pl 1 Nov 2010
09:01:06 -0000 1.8
+++ t/results/invalid_nestings/formats_not_closed_in_example.pl 10 Nov 2010
18:21:21 -0000 1.9
@@ -162,6 +162,13 @@
'parent' => {}
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
}
],
@@ -203,6 +210,7 @@
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[3]{'contents'}[2]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[3];
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'contents'}[3]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5];
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[5]{'parent'}
= $result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2];
+$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[1];
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'formats_not_closed_in_example'}{'contents'}[0];
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'parent'} =
$result_trees{'formats_not_closed_in_example'};
$result_trees{'formats_not_closed_in_example'}{'contents'}[1]{'parent'} =
$result_trees{'formats_not_closed_in_example'};
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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- t/results/invalid_nestings/in_table.pl 9 Nov 2010 23:02:46 -0000
1.18
+++ t/results/invalid_nestings/in_table.pl 10 Nov 2010 18:21:21 -0000
1.19
@@ -40,6 +40,13 @@
'type' => 'before_item'
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -295,6 +302,13 @@
'type' => 'paragraph'
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -311,6 +325,7 @@
$result_trees{'in_table'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} =
$result_trees{'in_table'}{'contents'}[0]{'args'}[0];
$result_trees{'in_table'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'in_table'}{'contents'}[0];
$result_trees{'in_table'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'in_table'}{'contents'}[0];
+$result_trees{'in_table'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'in_table'}{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'in_table'}{'contents'}[0]{'parent'} = $result_trees{'in_table'};
$result_trees{'in_table'}{'contents'}[1]{'parent'} = $result_trees{'in_table'};
$result_trees{'in_table'}{'contents'}[2]{'parent'} = $result_trees{'in_table'};
@@ -362,6 +377,7 @@
$result_trees{'in_table'}{'contents'}[3]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'in_table'}{'contents'}[3]{'contents'}[2];
$result_trees{'in_table'}{'contents'}[3]{'contents'}[2]{'contents'}[2]{'parent'}
= $result_trees{'in_table'}{'contents'}[3]{'contents'}[2];
$result_trees{'in_table'}{'contents'}[3]{'contents'}[2]{'parent'} =
$result_trees{'in_table'}{'contents'}[3];
+$result_trees{'in_table'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'in_table'}{'contents'}[3]{'args'}[0]{'contents'}[1];
$result_trees{'in_table'}{'contents'}[3]{'parent'} = $result_trees{'in_table'};
$result_trees{'in_table'}{'contents'}[4]{'parent'} = $result_trees{'in_table'};
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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl 1 Nov
2010 09:01:06 -0000 1.8
+++ t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl 10 Nov
2010 18:21:21 -0000 1.9
@@ -178,6 +178,13 @@
'type' => 'empty_line'
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -219,6 +226,7 @@
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[7]{'parent'}
= $result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[8]{'parent'}
= $result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[9]{'parent'}
= $result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0];
+$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'parent'}
= $result_trees{'itemx_in_itemize_enumerate_in_table'};
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[1]{'parent'}
= $result_trees{'itemx_in_itemize_enumerate_in_table'};
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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- t/results/invalid_nestings/on_block_command_line.pl 9 Nov 2010 23:02:46
-0000 1.17
+++ t/results/invalid_nestings/on_block_command_line.pl 10 Nov 2010 18:21:21
-0000 1.18
@@ -326,6 +326,20 @@
],
'cmdname' => 'quotation',
'contents' => [],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {},
+ {},
+ {},
+ {},
+ {},
+ {},
+ {},
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -392,6 +406,14 @@
$result_trees{'on_block_command_line'}{'contents'}[3]{'args'}[0]{'contents'}[8]{'line_nr'}
=
$result_trees{'on_block_command_line'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'line_nr'};
$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]{'parent'} =
$result_trees{'on_block_command_line'}{'contents'}[3];
+$result_trees{'on_block_command_line'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'on_block_command_line'}{'contents'}[3]{'args'}[0]{'contents'}[1];
+$result_trees{'on_block_command_line'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][1]
=
$result_trees{'on_block_command_line'}{'contents'}[3]{'args'}[0]{'contents'}[2];
+$result_trees{'on_block_command_line'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][2]
=
$result_trees{'on_block_command_line'}{'contents'}[3]{'args'}[0]{'contents'}[3];
+$result_trees{'on_block_command_line'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][3]
=
$result_trees{'on_block_command_line'}{'contents'}[3]{'args'}[0]{'contents'}[4];
+$result_trees{'on_block_command_line'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][4]
=
$result_trees{'on_block_command_line'}{'contents'}[3]{'args'}[0]{'contents'}[5];
+$result_trees{'on_block_command_line'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][5]
=
$result_trees{'on_block_command_line'}{'contents'}[3]{'args'}[0]{'contents'}[6];
+$result_trees{'on_block_command_line'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][6]
=
$result_trees{'on_block_command_line'}{'contents'}[3]{'args'}[0]{'contents'}[7];
+$result_trees{'on_block_command_line'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][7]
=
$result_trees{'on_block_command_line'}{'contents'}[3]{'args'}[0]{'contents'}[8];
$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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/invalid_nestings/on_itemize_line.pl 9 Nov 2010 23:02:46
-0000 1.16
+++ t/results/invalid_nestings/on_itemize_line.pl 10 Nov 2010 18:21:21
-0000 1.17
@@ -189,6 +189,20 @@
'parent' => {}
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {},
+ {},
+ {},
+ {},
+ {},
+ {},
+ {},
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -244,6 +258,15 @@
'type' => 'before_item'
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {},
+ {},
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -287,6 +310,14 @@
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[1];
$result_trees{'on_itemize_line'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'on_itemize_line'}{'contents'}[0];
+$result_trees{'on_itemize_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'on_itemize_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][1]
= $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[2];
+$result_trees{'on_itemize_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][2]
= $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[3];
+$result_trees{'on_itemize_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][3]
= $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[4];
+$result_trees{'on_itemize_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][4]
= $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[5];
+$result_trees{'on_itemize_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][5]
= $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[6];
+$result_trees{'on_itemize_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][6]
= $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[7];
+$result_trees{'on_itemize_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][7]
= $result_trees{'on_itemize_line'}{'contents'}[0]{'args'}[0]{'contents'}[8];
$result_trees{'on_itemize_line'}{'contents'}[0]{'parent'} =
$result_trees{'on_itemize_line'};
$result_trees{'on_itemize_line'}{'contents'}[1]{'parent'} =
$result_trees{'on_itemize_line'};
$result_trees{'on_itemize_line'}{'contents'}[2]{'parent'} =
$result_trees{'on_itemize_line'};
@@ -297,6 +328,9 @@
$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]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'on_itemize_line'}{'contents'}[3]{'args'}[0]{'contents'}[1];
+$result_trees{'on_itemize_line'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][1]
= $result_trees{'on_itemize_line'}{'contents'}[3]{'args'}[0]{'contents'}[2];
+$result_trees{'on_itemize_line'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][2]
= $result_trees{'on_itemize_line'}{'contents'}[3]{'args'}[0]{'contents'}[3];
$result_trees{'on_itemize_line'}{'contents'}[3]{'parent'} =
$result_trees{'on_itemize_line'};
$result_trees{'on_itemize_line'}{'contents'}[4]{'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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- t/results/invalid_nestings/style_not_closed_in_table_line.pl 1 Nov
2010 11:40:46 -0000 1.10
+++ t/results/invalid_nestings/style_not_closed_in_table_line.pl 10 Nov
2010 18:21:21 -0000 1.11
@@ -134,6 +134,13 @@
'parent' => {}
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -168,6 +175,7 @@
$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'contents'}[3];
$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'contents'}[3]{'extra'}{'misc_content'}[0]
=
$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[1];
$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'style_not_closed_in_table_line'}{'contents'}[0];
+$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'parent'} =
$result_trees{'style_not_closed_in_table_line'};
$result_trees{'style_not_closed_in_table_line'}{'contents'}[1]{'parent'} =
$result_trees{'style_not_closed_in_table_line'};
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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/invalid_nestings/table_not_closed_in_menu_comment.pl 1 Nov
2010 09:01:07 -0000 1.11
+++ t/results/invalid_nestings/table_not_closed_in_menu_comment.pl 10 Nov
2010 18:21:21 -0000 1.12
@@ -148,6 +148,13 @@
'
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
}
],
@@ -189,6 +196,7 @@
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[3]{'parent'}
=
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3];
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0];
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'parent'} =
$result_trees{'table_not_closed_in_menu_comment'};
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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- t/results/invalid_nestings/table_not_closed_in_menu_description.pl 1 Nov
2010 09:01:07 -0000 1.11
+++ t/results/invalid_nestings/table_not_closed_in_menu_description.pl 10 Nov
2010 18:21:21 -0000 1.12
@@ -111,6 +111,13 @@
'
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
}
],
@@ -166,6 +173,7 @@
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'misc_content'}[0]
=
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1];
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1];
+$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'}
=
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3];
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[3]{'parent'}
=
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1];
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'extra'}{'menu_entry_node'}{'manual_content'}[0]{'parent'}
=
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[1]{'args'}[1];
Index: t/results/itemize/accent_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/accent_argument.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/itemize/accent_argument.pl 1 Nov 2010 09:01:07 -0000
1.15
+++ t/results/itemize/accent_argument.pl 10 Nov 2010 18:21:21 -0000
1.16
@@ -65,6 +65,13 @@
'parent' => {}
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -134,6 +141,13 @@
'parent' => {}
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -155,6 +169,7 @@
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[1]{'contents'}[1];
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[0]{'contents'}[1];
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'accent_argument'}{'contents'}[0];
+$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'accent_argument'}{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'accent_argument'}{'contents'}[0]{'parent'} =
$result_trees{'accent_argument'};
$result_trees{'accent_argument'}{'contents'}[1]{'parent'} =
$result_trees{'accent_argument'};
$result_trees{'accent_argument'}{'contents'}[2]{'parent'} =
$result_trees{'accent_argument'};
@@ -167,6 +182,7 @@
$result_trees{'accent_argument'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'accent_argument'}{'contents'}[3]{'contents'}[1]{'contents'}[1];
$result_trees{'accent_argument'}{'contents'}[3]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[3]{'contents'}[1];
$result_trees{'accent_argument'}{'contents'}[3]{'contents'}[1]{'parent'} =
$result_trees{'accent_argument'}{'contents'}[3];
+$result_trees{'accent_argument'}{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'accent_argument'}{'contents'}[3]{'args'}[0]{'contents'}[1];
$result_trees{'accent_argument'}{'contents'}[3]{'parent'} =
$result_trees{'accent_argument'};
$result_trees{'accent_argument'}{'contents'}[4]{'parent'} =
$result_trees{'accent_argument'};
Index: t/results/itemize/w_argument.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/itemize/w_argument.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/itemize/w_argument.pl 1 Nov 2010 09:01:07 -0000 1.15
+++ t/results/itemize/w_argument.pl 10 Nov 2010 18:21:21 -0000 1.16
@@ -122,6 +122,13 @@
'parent' => {}
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -153,6 +160,7 @@
$result_trees{'w_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'w_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1];
$result_trees{'w_argument'}{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'w_argument'}{'contents'}[0]{'contents'}[2];
$result_trees{'w_argument'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'w_argument'}{'contents'}[0];
+$result_trees{'w_argument'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'w_argument'}{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'w_argument'}{'contents'}[0]{'parent'} =
$result_trees{'w_argument'};
$result_trees{'w_argument'}{'contents'}[1]{'parent'} =
$result_trees{'w_argument'};
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.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/macro/macro_in_brace_command.pl 9 Nov 2010 23:02:46 -0000
1.19
+++ t/results/macro/macro_in_brace_command.pl 10 Nov 2010 18:21:21 -0000
1.20
@@ -182,6 +182,13 @@
'parent' => {}
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -221,6 +228,7 @@
$result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[1]{'contents'}[1];
$result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[1];
$result_trees{'macro_in_brace_command'}{'contents'}[6]{'contents'}[1]{'parent'}
= $result_trees{'macro_in_brace_command'}{'contents'}[6];
+$result_trees{'macro_in_brace_command'}{'contents'}[6]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'macro_in_brace_command'}{'contents'}[6]{'args'}[0]{'contents'}[1];
$result_trees{'macro_in_brace_command'}{'contents'}[6]{'parent'} =
$result_trees{'macro_in_brace_command'};
$result_trees{'macro_in_brace_command'}{'contents'}[7]{'parent'} =
$result_trees{'macro_in_brace_command'};
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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- t/results/sectioning/double_node_anchor_float.pl 9 Nov 2010 23:02:47
-0000 1.9
+++ t/results/sectioning/double_node_anchor_float.pl 10 Nov 2010 18:21:22
-0000 1.10
@@ -279,6 +279,14 @@
'cmdname' => 'float',
'contents' => [],
'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ],
+ [
+ {}
+ ]
+ ],
'type' => {
'content' => [
{}
@@ -346,6 +354,14 @@
'cmdname' => 'float',
'contents' => [],
'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ],
+ [
+ {}
+ ]
+ ],
'type' => {
'content' => [
{}
@@ -413,6 +429,14 @@
'cmdname' => 'float',
'contents' => [],
'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ],
+ [
+ {}
+ ]
+ ],
'node_content' => [
{}
],
@@ -548,6 +572,8 @@
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'args'}[1];
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'args'}[1];
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'args'}[1]{'parent'}
= $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1];
+$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'extra'}{'block_command_line_contents'}[1][0]
=
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'args'}[1]{'contents'}[1];
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'extra'}{'type'}{'content'}[0]
=
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'double_node_anchor_float'}{'contents'}[3];
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[2]{'parent'}
= $result_trees{'double_node_anchor_float'}{'contents'}[3];
@@ -558,6 +584,8 @@
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[4]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[4]{'args'}[1];
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[4]{'args'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[4]{'args'}[1];
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[4]{'args'}[1]{'parent'}
= $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[4];
+$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[4]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[1];
+$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[4]{'extra'}{'block_command_line_contents'}[1][0]
=
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[4]{'args'}[1]{'contents'}[1];
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[4]{'extra'}{'type'}{'content'}[0]
=
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[1];
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[4]{'parent'}
= $result_trees{'double_node_anchor_float'}{'contents'}[3];
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[5]{'parent'}
= $result_trees{'double_node_anchor_float'}{'contents'}[3];
@@ -568,6 +596,8 @@
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[7]{'args'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[7]{'args'}[1];
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[7]{'args'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[7]{'args'}[1];
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[7]{'args'}[1]{'parent'}
= $result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[7];
+$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[7]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[7]{'args'}[0]{'contents'}[1];
+$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[7]{'extra'}{'block_command_line_contents'}[1][0]
=
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[7]{'args'}[1]{'contents'}[1];
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[7]{'extra'}{'node_content'}[0]
=
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[7]{'args'}[1]{'contents'}[1];
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[7]{'extra'}{'type'}{'content'}[0]
=
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[7]{'args'}[0]{'contents'}[1];
$result_trees{'double_node_anchor_float'}{'contents'}[3]{'contents'}[7]{'parent'}
= $result_trees{'double_node_anchor_float'}{'contents'}[3];
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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- t/results/xtable/headitem_in_table.pl 1 Nov 2010 09:01:15 -0000
1.8
+++ t/results/xtable/headitem_in_table.pl 10 Nov 2010 18:21:22 -0000
1.9
@@ -109,6 +109,13 @@
'parent' => {}
}
],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ]
+ },
'parent' => {}
},
{
@@ -138,6 +145,7 @@
$result_trees{'headitem_in_table'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'headitem_in_table'}{'contents'}[0]{'contents'}[1];
$result_trees{'headitem_in_table'}{'contents'}[0]{'contents'}[1]{'extra'}{'misc_content'}[0]
=
$result_trees{'headitem_in_table'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'headitem_in_table'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'headitem_in_table'}{'contents'}[0];
+$result_trees{'headitem_in_table'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'headitem_in_table'}{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'headitem_in_table'}{'contents'}[0]{'parent'} =
$result_trees{'headitem_in_table'};
$result_trees{'headitem_in_table'}{'contents'}[1]{'parent'} =
$result_trees{'headitem_in_table'};