[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/tp TODO Texinfo/Parser.pm Texinfo/Conve...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo/tp TODO Texinfo/Parser.pm Texinfo/Conve... |
|
Date: |
Sun, 06 Feb 2011 16:43:21 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/02/06 16:43:21
Modified files:
tp : TODO
tp/Texinfo : Parser.pm
tp/Texinfo/Convert: Plaintext.pm
tp/t : 22xtable.t
tp/t/results/alias: simple.pl
tp/t/results/coverage: item_container.pl preformatted.pl
table.pl table_command_comment.pl
tp/t/results/float: complex_float.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
style_not_closed_in_table_line.pl
table_in_code.pl
table_not_closed_in_menu_comment.pl
table_not_closed_in_menu_description.pl
tp/t/results/macro: macro_in_brace_command.pl
tp/t/results/test_count: commands.pl
tp/t/results/xtable: headitem_in_table.pl
no_arg_brace_command_on_table_line.pl
Added files:
tp/t/results/xtable: definfoenclose_on_table_line.pl
Log message:
Warn if a command that doesn't accept arguments in brace is
given as a @*table argument.
Give a whole command object as 'command_as_argument'.
Handle @definfoenclose commands as @*table argument.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.191&r2=1.192
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/22xtable.t?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/alias/simple.pl?cvsroot=texinfo&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/item_container.pl?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/preformatted.pl?cvsroot=texinfo&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table.pl?cvsroot=texinfo&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/table_command_comment.pl?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/float/complex_float.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/block_not_matching.pl?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/in_table.pl?cvsroot=texinfo&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/table_in_code.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.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.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/test_count/commands.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/headitem_in_table.pl?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/definfoenclose_on_table_line.pl?cvsroot=texinfo&rev=1.1
Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- TODO 6 Feb 2011 15:05:06 -0000 1.74
+++ TODO 6 Feb 2011 16:43:19 -0000 1.75
@@ -1,3 +1,7 @@
+Before the release, verify that everything on
+https://savannah.gnu.org/bugs/?group=texinfo
+is fixed and tested for.
+
In a first step, close when the the command to be closed is at the
top of the tree, not when it should be closed theoretically.
Then it could be possible to come back to the place where the command
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -b -r1.191 -r1.192
--- Texinfo/Parser.pm 6 Feb 2011 15:24:27 -0000 1.191
+++ Texinfo/Parser.pm 6 Feb 2011 16:43:19 -0000 1.192
@@ -2104,6 +2104,17 @@
'parent' => $current }
]
];
+ } elsif ($item_line_commands{$current->{'cmdname'}}) {
+ if ($current->{'extra'}
+ and $current->{'extra'}->{'command_as_argument'}
+ and
!$brace_commands{$current->{'extra'}->{'command_as_argument'}->{'cmdname'}}
+ and
!$self->{'definfoenclose'}->{$current->{'extra'}->{'command_as_argument'}->{'cmdname'}})
{
+ $self->line_error (sprintf($self->
+ __("Command address@hidden not accepting argument in brace should
not be on address@hidden line"),
+
$current->{'extra'}->{'command_as_argument'}->{'cmdname'},
+ $current->{'cmdname'}),
+ $line_nr);
+ }
}
push @{$current->{'contents'}}, { 'type' => 'before_item',
'contents' => [], 'parent', $current };
@@ -2728,9 +2739,9 @@
$line_nr);
} else {
print STDERR "FOR PARENT
address@hidden>{'parent'}->{'parent'}->{'cmdname'} command_as_argument
$current->{'cmdname'}\n" if ($self->{'DEBUG'});
- $current->{'type'} = 'command_as_argument';
+ $current->{'type'} = 'command_as_argument' if
(!$current->{'type'});
$current->{'parent'}->{'parent'}->{'extra'}->{'command_as_argument'}
- = $current->{'cmdname'};
+ = $current;
}
$current = $current->{'parent'};
# now accent commands
Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- Texinfo/Convert/Plaintext.pm 6 Feb 2011 15:24:27 -0000 1.71
+++ Texinfo/Convert/Plaintext.pm 6 Feb 2011 16:43:20 -0000 1.72
@@ -1567,10 +1567,20 @@
and $root->{'extra'} and $root->{'extra'}->{'misc_content'}) {
my $contents = $root->{'extra'}->{'misc_content'};
if ($root->{'parent'}->{'extra'} and
$root->{'parent'}->{'extra'}->{'command_as_argument'}) {
- $contents = [{'cmdname' =>
$root->{'parent'}->{'extra'}->{'command_as_argument'},
+ my $command_as_argument =
$root->{'parent'}->{'extra'}->{'command_as_argument'};
+ if ($command_as_argument->{'type'} ne 'definfoenclose_command') {
+ $contents = [{'cmdname' => $command_as_argument->{'cmdname'},
'args' => [{'type' => 'brace_command_arg',
'contents' => $contents}]
}];
+ } else {
+ $contents = [{'cmdname' => $command_as_argument->{'cmdname'},
+ 'type' => $command_as_argument->{'type'},
+ 'extra' => $command_as_argument->{'extra'},
+ 'args' => [{'type' => 'brace_command_arg',
+ 'contents' => $contents}]
+ }];
+ }
}
$result = $self->convert_line({'contents' => $contents},
{'indent_level'
Index: t/22xtable.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/22xtable.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/22xtable.t 4 Feb 2011 22:13:13 -0000 1.3
+++ t/22xtable.t 6 Feb 2011 16:43:20 -0000 1.4
@@ -9,6 +9,16 @@
@item no at-command @code{code}
@end table
'],
+['definfoenclose_on_table_line',
+'@definfoenclose phi,:,:
+
address@hidden @phi
address@hidden item
address@hidden item x
+
+table content.
address@hidden table
+']
);
my @test_invalid = (
Index: t/results/alias/simple.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/alias/simple.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/alias/simple.pl 7 Dec 2010 20:34:27 -0000 1.25
+++ t/results/alias/simple.pl 6 Feb 2011 16:43:20 -0000 1.26
@@ -252,7 +252,7 @@
{}
]
],
- 'command_as_argument' => 'code'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -305,6 +305,7 @@
$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]{'extra'}{'command_as_argument'} =
$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/item_container.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/item_container.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- t/results/coverage/item_container.pl 23 Jan 2011 21:18:26 -0000
1.26
+++ t/results/coverage/item_container.pl 6 Feb 2011 16:43:20 -0000
1.27
@@ -158,7 +158,7 @@
{}
]
],
- 'command_as_argument' => 'bullet'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -261,6 +261,7 @@
$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]{'extra'}{'command_as_argument'}
= $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'};
$result_trees{'item_container'}{'contents'}[6]{'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.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- t/results/coverage/preformatted.pl 6 Feb 2011 10:06:59 -0000 1.30
+++ t/results/coverage/preformatted.pl 6 Feb 2011 16:43:20 -0000 1.31
@@ -161,7 +161,7 @@
{}
]
],
- 'command_as_argument' => 'code'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -210,6 +210,7 @@
$result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
$result_trees{'preformatted'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'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]{'extra'}{'command_as_argument'}
=
$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.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- t/results/coverage/table.pl 6 Feb 2011 10:07:00 -0000 1.27
+++ t/results/coverage/table.pl 6 Feb 2011 16:43:20 -0000 1.28
@@ -130,7 +130,7 @@
{}
]
],
- 'command_as_argument' => 'asis'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -409,7 +409,7 @@
{}
]
],
- 'command_as_argument' => 'samp'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -444,6 +444,7 @@
$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]{'extra'}{'command_as_argument'} =
$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'};
@@ -494,6 +495,7 @@
$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]{'extra'}{'command_as_argument'} =
$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.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/coverage/table_command_comment.pl 7 Dec 2010 20:34:27 -0000
1.20
+++ t/results/coverage/table_command_comment.pl 6 Feb 2011 16:43:20 -0000
1.21
@@ -81,7 +81,7 @@
{}
]
],
- 'command_as_argument' => 'code'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -106,6 +106,7 @@
$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]{'extra'}{'command_as_argument'}
=
$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/float/complex_float.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/float/complex_float.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/float/complex_float.pl 6 Feb 2011 10:07:00 -0000 1.5
+++ t/results/float/complex_float.pl 6 Feb 2011 16:43:20 -0000 1.6
@@ -475,7 +475,7 @@
{}
]
],
- 'command_as_argument' => 'emph'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -571,7 +571,7 @@
{}
]
],
- 'command_as_argument' => 'minus'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -1122,7 +1122,7 @@
{}
]
],
- 'command_as_argument' => 'emph'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -1482,7 +1482,7 @@
{}
]
],
- 'command_as_argument' => 'minus'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -2450,7 +2450,7 @@
{}
]
],
- 'command_as_argument' => 'emph'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -2810,7 +2810,7 @@
{}
]
],
- 'command_as_argument' => 'minus'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -3400,6 +3400,7 @@
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[7]{'contents'}[2];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[7]{'contents'}[2]{'parent'}
= $result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[7];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[7]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[7]{'args'}[0]{'contents'}[1];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[7]{'args'}[0]{'contents'}[1];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[7]{'parent'}
= $result_trees{'complex_float'}{'contents'}[2]{'contents'}[8];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[8]{'parent'}
= $result_trees{'complex_float'}{'contents'}[2]{'contents'}[8];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[9]{'parent'}
= $result_trees{'complex_float'}{'contents'}[2]{'contents'}[8];
@@ -3416,6 +3417,7 @@
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[11]{'contents'}[1];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[11]{'contents'}[1]{'parent'}
= $result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[11];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[11]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[11]{'args'}[0]{'contents'}[1];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[11]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[11]{'args'}[0]{'contents'}[1];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[11]{'parent'}
= $result_trees{'complex_float'}{'contents'}[2]{'contents'}[8];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[12]{'parent'}
= $result_trees{'complex_float'}{'contents'}[2]{'contents'}[8];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[13]{'parent'}
= $result_trees{'complex_float'}{'contents'}[2]{'contents'}[8];
@@ -3511,6 +3513,7 @@
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[9]{'contents'}[2];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[9]{'contents'}[2]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[9];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[9]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[1];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[9]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[1];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[9]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[10]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[11]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0];
@@ -3574,6 +3577,7 @@
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[18]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[18]{'contents'}[1];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[18]{'contents'}[1]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[18];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[18]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[18]{'args'}[0]{'contents'}[1];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[18]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[18]{'args'}[0]{'contents'}[1];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[18]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[19]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0]{'contents'}[20]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[8]{'contents'}[18]{'args'}[0];
@@ -3746,6 +3750,7 @@
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[6]{'contents'}[2];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[6]{'contents'}[2]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[6];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[6]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[1];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[6]{'args'}[0]{'contents'}[1];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[6]{'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'}[7]{'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'}[8]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
@@ -3809,6 +3814,7 @@
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[15]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[15]{'contents'}[1];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[15]{'contents'}[1]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[15];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[15]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[1];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[15]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[15]{'args'}[0]{'contents'}[1];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[15]{'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'}[16]{'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'}[17]{'parent'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'args'}[0];
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.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/invalid_nestings/block_not_matching.pl 6 Feb 2011 10:07:00
-0000 1.19
+++ t/results/invalid_nestings/block_not_matching.pl 6 Feb 2011 16:43:20
-0000 1.20
@@ -320,7 +320,7 @@
{}
]
],
- 'command_as_argument' => 'emph'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -531,6 +531,7 @@
$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]{'extra'}{'command_as_argument'}
= $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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/invalid_nestings/formats_not_closed_in_example.pl 30 Jan 2011
17:00:50 -0000 1.16
+++ t/results/invalid_nestings/formats_not_closed_in_example.pl 6 Feb 2011
16:43:20 -0000 1.17
@@ -207,7 +207,7 @@
{}
]
],
- 'command_as_argument' => 'minus'
+ 'command_as_argument' => {}
},
'parent' => {}
}
@@ -256,6 +256,7 @@
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'contents'}[3]{'parent'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3];
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[3]{'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]{'extra'}{'command_as_argument'}
=
$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'};
@@ -289,6 +290,15 @@
$result_errors{'formats_not_closed_in_example'} = [
{
+ 'error_line' => ':3: Command @minus not accepting argument in brace should
not be on @table line
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => 'Command @minus not accepting argument in brace should not be on
@table line',
+ 'type' => 'error'
+ },
+ {
'error_line' => ':13: address@hidden' expected `enumerate\', but saw
`example\'
',
'file_name' => '',
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.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- t/results/invalid_nestings/in_table.pl 7 Dec 2010 20:34:29 -0000
1.23
+++ t/results/invalid_nestings/in_table.pl 6 Feb 2011 16:43:20 -0000
1.24
@@ -51,7 +51,7 @@
{}
]
],
- 'command_as_argument' => 'xref'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -321,7 +321,7 @@
{}
]
],
- 'command_as_argument' => 'code'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -340,6 +340,7 @@
$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]{'extra'}{'command_as_argument'} =
$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'};
@@ -394,6 +395,7 @@
$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]{'extra'}{'command_as_argument'} =
$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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl 23 Jan
2011 21:18:26 -0000 1.15
+++ t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl 6 Feb
2011 16:43:20 -0000 1.16
@@ -198,7 +198,7 @@
{}
]
],
- 'command_as_argument' => 'strong'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -243,6 +243,7 @@
$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]{'extra'}{'command_as_argument'}
=
$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/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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- t/results/invalid_nestings/style_not_closed_in_table_line.pl 7 Dec
2010 20:34:29 -0000 1.14
+++ t/results/invalid_nestings/style_not_closed_in_table_line.pl 6 Feb
2011 16:43:20 -0000 1.15
@@ -140,7 +140,7 @@
{}
]
],
- 'command_as_argument' => 'asis'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -177,6 +177,7 @@
$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]{'extra'}{'command_as_argument'}
=
$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_in_code.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/invalid_nestings/table_in_code.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/invalid_nestings/table_in_code.pl 3 Feb 2011 23:38:02 -0000
1.1
+++ t/results/invalid_nestings/table_in_code.pl 6 Feb 2011 16:43:20 -0000
1.2
@@ -115,7 +115,7 @@
{}
]
],
- 'command_as_argument' => 'emph',
+ 'command_as_argument' => {},
'invalid_nesting' => 1
},
'parent' => {}
@@ -153,6 +153,7 @@
$result_trees{'table_in_code'}{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'table_in_code'}{'contents'}[1]{'contents'}[2];
$result_trees{'table_in_code'}{'contents'}[1]{'contents'}[2]{'parent'} =
$result_trees{'table_in_code'}{'contents'}[1];
$result_trees{'table_in_code'}{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'table_in_code'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'table_in_code'}{'contents'}[1]{'extra'}{'command_as_argument'}
= $result_trees{'table_in_code'}{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'table_in_code'}{'contents'}[1]{'parent'} =
$result_trees{'table_in_code'};
$result_trees{'table_in_code'}{'contents'}[2]{'parent'} =
$result_trees{'table_in_code'};
$result_trees{'table_in_code'}{'contents'}[3]{'parent'} =
$result_trees{'table_in_code'};
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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- t/results/invalid_nestings/table_not_closed_in_menu_comment.pl 2 Feb
2011 22:17:36 -0000 1.16
+++ t/results/invalid_nestings/table_not_closed_in_menu_comment.pl 6 Feb
2011 16:43:20 -0000 1.17
@@ -160,7 +160,7 @@
{}
]
],
- 'command_as_argument' => 'bullet'
+ 'command_as_argument' => {}
},
'parent' => {}
}
@@ -205,6 +205,7 @@
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'parent'}
=
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[2];
$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]{'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]{'extra'}{'command_as_argument'}
=
$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'};
@@ -248,6 +249,15 @@
'type' => 'error continuation'
},
{
+ 'error_line' => ':4: Command @bullet not accepting argument in brace
should not be on @table line
+',
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => '',
+ 'text' => 'Command @bullet not accepting argument in brace should not be
on @table line',
+ 'type' => 'error'
+ },
+ {
'error_line' => ':8: address@hidden' expected `table\', but saw `menu\'
',
'file_name' => '',
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.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- t/results/invalid_nestings/table_not_closed_in_menu_description.pl 7 Dec
2010 20:34:29 -0000 1.15
+++ t/results/invalid_nestings/table_not_closed_in_menu_description.pl 6 Feb
2011 16:43:20 -0000 1.16
@@ -117,7 +117,7 @@
{}
]
],
- 'command_as_argument' => 'minus'
+ 'command_as_argument' => {}
},
'parent' => {}
}
@@ -175,6 +175,7 @@
$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]{'extra'}{'command_as_argument'}
=
$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];
@@ -223,6 +224,15 @@
'type' => 'warning'
},
{
+ 'error_line' => ':2: Command @minus not accepting argument in brace should
not be on @table line
+',
+ 'file_name' => '',
+ 'line_nr' => 2,
+ 'macro' => '',
+ 'text' => 'Command @minus not accepting argument in brace should not be on
@table line',
+ 'type' => 'error'
+ },
+ {
'error_line' => ':5: address@hidden' expected `table\', but saw `menu\'
',
'file_name' => '',
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.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- t/results/macro/macro_in_brace_command.pl 7 Dec 2010 20:34:29 -0000
1.25
+++ t/results/macro/macro_in_brace_command.pl 6 Feb 2011 16:43:21 -0000
1.26
@@ -196,7 +196,7 @@
{}
]
],
- 'command_as_argument' => 'bullet'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -238,6 +238,7 @@
$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]{'extra'}{'command_as_argument'}
=
$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/test_count/commands.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/test_count/commands.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/test_count/commands.pl 6 Feb 2011 10:07:01 -0000 1.5
+++ t/results/test_count/commands.pl 6 Feb 2011 16:43:21 -0000 1.6
@@ -242,7 +242,7 @@
{}
]
],
- 'command_as_argument' => 'samp'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -297,6 +297,7 @@
$result_trees{'commands'}{'contents'}[7]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'commands'}{'contents'}[7]{'contents'}[3];
$result_trees{'commands'}{'contents'}[7]{'contents'}[3]{'parent'} =
$result_trees{'commands'}{'contents'}[7];
$result_trees{'commands'}{'contents'}[7]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'commands'}{'contents'}[7]{'args'}[0]{'contents'}[1];
+$result_trees{'commands'}{'contents'}[7]{'extra'}{'command_as_argument'} =
$result_trees{'commands'}{'contents'}[7]{'args'}[0]{'contents'}[1];
$result_trees{'commands'}{'contents'}[7]{'parent'} = $result_trees{'commands'};
$result_trees{'commands'}{'contents'}[8]{'parent'} = $result_trees{'commands'};
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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- t/results/xtable/headitem_in_table.pl 7 Dec 2010 20:34:33 -0000
1.12
+++ t/results/xtable/headitem_in_table.pl 6 Feb 2011 16:43:21 -0000
1.13
@@ -115,7 +115,7 @@
{}
]
],
- 'command_as_argument' => 'strong'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -147,6 +147,7 @@
$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]{'extra'}{'command_as_argument'}
= $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'};
Index: t/results/xtable/no_arg_brace_command_on_table_line.pl
===================================================================
RCS file:
/sources/texinfo/texinfo/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- t/results/xtable/no_arg_brace_command_on_table_line.pl 4 Feb 2011
22:13:19 -0000 1.1
+++ t/results/xtable/no_arg_brace_command_on_table_line.pl 6 Feb 2011
16:43:21 -0000 1.2
@@ -75,7 +75,7 @@
{}
]
],
- 'command_as_argument' => 'bullet'
+ 'command_as_argument' => {}
},
'parent' => {}
},
@@ -100,6 +100,7 @@
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[1]{'extra'}{'misc_content'}[0]
=
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0];
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[1];
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'parent'} =
$result_trees{'no_arg_brace_command_on_table_line'};
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[1]{'parent'} =
$result_trees{'no_arg_brace_command_on_table_line'};
@@ -112,7 +113,17 @@
$result_texts{'no_arg_brace_command_on_table_line'} = 'item
';
-$result_errors{'no_arg_brace_command_on_table_line'} = [];
+$result_errors{'no_arg_brace_command_on_table_line'} = [
+ {
+ 'error_line' => ':1: Command @bullet not accepting argument in brace
should not be on @table line
+',
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => '',
+ 'text' => 'Command @bullet not accepting argument in brace should not be
on @table line',
+ 'type' => 'error'
+ }
+];
1;
Index: t/results/xtable/definfoenclose_on_table_line.pl
===================================================================
RCS file: t/results/xtable/definfoenclose_on_table_line.pl
diff -N t/results/xtable/definfoenclose_on_table_line.pl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ t/results/xtable/definfoenclose_on_table_line.pl 6 Feb 2011 16:43:21
-0000 1.1
@@ -0,0 +1,259 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors);
+
+$result_trees{'definfoenclose_on_table_line'} = {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'phi,:,:'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'definfoenclose',
+ 'extra' => {
+ 'misc_args' => [
+ 'phi',
+ ':',
+ ':'
+ ]
+ },
+ 'line_nr' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'cmdname' => 'phi',
+ 'extra' => {
+ 'begin' => ':',
+ 'end' => ':'
+ },
+ 'parent' => {},
+ 'type' => 'definfoenclose_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'space_at_end_block_command'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'cmdname' => 'table',
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'before_item'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'item'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'item',
+ 'extra' => {
+ 'misc_content' => [
+ {}
+ ]
+ },
+ 'parent' => {}
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => ' ',
+ 'type' => 'empty_spaces_after_command'
+ },
+ {
+ 'parent' => {},
+ 'text' => 'item x'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'spaces_at_end'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'itemx',
+ 'extra' => {
+ 'misc_content' => [
+ {}
+ ]
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'table content.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'extra' => {
+ 'block_command_line_contents' => [
+ [
+ {}
+ ]
+ ],
+ 'command_as_argument' => {}
+ },
+ 'parent' => {}
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'definfoenclose_on_table_line'}{'contents'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'parent'} =
$result_trees{'definfoenclose_on_table_line'};
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[1]{'parent'} =
$result_trees{'definfoenclose_on_table_line'};
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
= $result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
= $result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'definfoenclose_on_table_line'}{'contents'}[2];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'definfoenclose_on_table_line'}{'contents'}[2];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1]{'extra'}{'misc_content'}[0]
=
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1]{'parent'}
= $result_trees{'definfoenclose_on_table_line'}{'contents'}[2];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
=
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
=
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[2]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[2];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[2]{'extra'}{'misc_content'}[0]
=
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[2]{'parent'}
= $result_trees{'definfoenclose_on_table_line'}{'contents'}[2];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[3]{'parent'}
= $result_trees{'definfoenclose_on_table_line'}{'contents'}[2];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[4];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[4]{'parent'}
= $result_trees{'definfoenclose_on_table_line'}{'contents'}[2];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'parent'} =
$result_trees{'definfoenclose_on_table_line'};
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[3]{'parent'} =
$result_trees{'definfoenclose_on_table_line'};
+
+$result_texis{'definfoenclose_on_table_line'} = '@definfoenclose phi,:,:
+
address@hidden @phi
address@hidden item
address@hidden item x
+
+table content.
address@hidden table
+';
+
+
+$result_texts{'definfoenclose_on_table_line'} = '
+item
+item x
+
+table content.
+';
+
+$result_errors{'definfoenclose_on_table_line'} = [
+ {
+ 'error_line' => ':3: warning: @phi should not appear in @table
+',
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => '',
+ 'text' => '@phi should not appear in @table',
+ 'type' => 'warning'
+ }
+];
+
+
+
+$result_converted{'plaintext'}->{'definfoenclose_on_table_line'} = '
+:item:
+:item x:
+
+ table content.
+';
+
+1;