[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[8169] use args instead of block_command_line_contents
|
From: |
gavinsmith0123 |
|
Subject: |
[8169] use args instead of block_command_line_contents |
|
Date: |
Sat, 15 Sep 2018 11:08:44 -0400 (EDT) |
Revision: 8169
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8169
Author: gavin
Date: 2018-09-15 11:08:43 -0400 (Sat, 15 Sep 2018)
Log Message:
-----------
use args instead of block_command_line_contents
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Common.pm
trunk/tp/Texinfo/Convert/HTML.pm
trunk/tp/Texinfo/Convert/Texinfo.pm
trunk/tp/Texinfo/Convert/TexinfoXML.pm
trunk/tp/Texinfo/Parser.pm
trunk/tp/t/results/coverage/formats_only_title_comments.pl
trunk/tp/t/results/coverage/formats_only_titles.pl
trunk/tp/t/results/coverage/formats_titles.pl
trunk/tp/t/results/coverage/item_container.pl
trunk/tp/t/results/html_tests/simple_menu.pl
trunk/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
trunk/tp/t/results/itemize/accent_argument.pl
trunk/tp/t/results/itemize/comment_first_on_itemize_line.pl
trunk/tp/t/results/itemize/headitem_itemx_in_itemize.pl
trunk/tp/t/results/itemize/inter_item_commands_in_itemize.pl
trunk/tp/t/results/itemize/itemize_and_empty_lines.pl
trunk/tp/t/results/itemize/not_closed_item.pl
trunk/tp/t/results/itemize/not_closed_itemize.pl
trunk/tp/t/results/menu/block_commands_in_menu_description.pl
trunk/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
trunk/tp/t/results/plaintext_tests/long_uref_after_item.pl
trunk/tp/t/results/xml_tests/comments_end_lines.pl
trunk/tp/t/results/xml_tests/comments_on_block_command_lines.pl
trunk/tp/t/results/xtable/accent_on_table_line.pl
trunk/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
trunk/tp/t/results/xtable/no_argument_for_table.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2018-09-15 14:15:00 UTC (rev 8168)
+++ trunk/ChangeLog 2018-09-15 15:08:43 UTC (rev 8169)
@@ -1,5 +1,23 @@
2018-09-15 Gavin Smith <address@hidden>
+ * tp/Texinfo/Convert/HTML.pm (_convert_item_line_command),
+ * tp/Texinfo/Convert/TexinfoXML.pm (_convert):
+ Do not use the 'block_command_line_contents' array: use the
+ 'args' array directly.
+
+ * tp/Texinfo/Parser.pm (_end_line): Include an inserted
+ 'command_as_argument' element in the 'args' with the type
+ 'command_as_argument_inserted'.
+ * tp/Texinfo/Convert/Texinfo.pm (@ignored_types): Ignore
+ 'command_as_argument_inserted'.
+ (_expand_cmd_args_to_texi): Avoid outputing a comma after an
+ ignored element.
+
+ * tp/Texinfo/Common.pm: Remove mention of
+ 'block_command_line_contents' from a comment.
+
+2018-09-15 Gavin Smith <address@hidden>
+
* tp/Texinfo/Parser.pm (_isolate_last_space): Remove useless
argument. Callers updated.
(module documentation section): Remove mention of
Modified: trunk/tp/Texinfo/Common.pm
===================================================================
--- trunk/tp/Texinfo/Common.pm 2018-09-15 14:15:00 UTC (rev 8168)
+++ trunk/tp/Texinfo/Common.pm 2018-09-15 15:08:43 UTC (rev 8169)
@@ -1780,7 +1780,7 @@
#
# extra that should point to other elements:
# command_as_argument
-# @block_command_line_contents @brace_command_contents @misc_content
end_command
+# @brace_command_contents @misc_content end_command
# associated_section part_associated_section associated_node associated_part
# @prototypes @columnfractions titlepage quotation @author command
# menu_entry_description menu_entry_name
Modified: trunk/tp/Texinfo/Convert/HTML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/HTML.pm 2018-09-15 14:15:00 UTC (rev 8168)
+++ trunk/tp/Texinfo/Convert/HTML.pm 2018-09-15 15:08:43 UTC (rev 8169)
@@ -3065,7 +3065,7 @@
# Setting multiple expansion should not be needed, except in
# case of invalid constructs
$prepend = $self->convert_tree_new_formatting_context(
- {'contents' =>
$itemize->{'extra'}->{'block_command_line_contents'}->[0]},
+ $itemize->{'args'}->[0],
$command->{'cmdname'}, 'item_prepended');
}
if ($content =~ /\S/) {
Modified: trunk/tp/Texinfo/Convert/Texinfo.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Texinfo.pm 2018-09-15 14:15:00 UTC (rev 8168)
+++ trunk/tp/Texinfo/Convert/Texinfo.pm 2018-09-15 15:08:43 UTC (rev 8169)
@@ -54,7 +54,8 @@
my %block_commands = %Texinfo::Common::block_commands;
my %def_commands = %Texinfo::Common::def_commands;
-my @ignored_types = ('spaces_inserted', 'bracketed_inserted');
+my @ignored_types = ('spaces_inserted', 'bracketed_inserted',
+'command_as_argument_inserted');
my %ignored_types;
for my $a (@ignored_types) {
$ignored_types{$a} = 1;
@@ -175,6 +176,7 @@
$result .= $cmd->{'extra'}->{'spaces_before_argument'}
if $cmd->{'extra'} and $cmd->{'extra'}->{'spaces_before_argument'};
foreach my $arg (@{$cmd->{'args'}}) {
+ next if $arg->{'type'} and $ignored_types{$arg->{'type'}};
if ($arg->{'extra'} and $arg->{'extra'}->{'spaces_before_argument'}) {
$result .= $arg->{'extra'}->{'spaces_before_argument'};
}
Modified: trunk/tp/Texinfo/Convert/TexinfoXML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/TexinfoXML.pm 2018-09-15 14:15:00 UTC (rev
8168)
+++ trunk/tp/Texinfo/Convert/TexinfoXML.pm 2018-09-15 15:08:43 UTC (rev
8169)
@@ -786,12 +786,10 @@
or $root->{'parent'}->{'cmdname'} eq 'enumerate')) {
$result .= $self->open_element('listitem', [_leading_spaces($root)]);
if ($root->{'parent'}->{'cmdname'} eq 'itemize'
- and $root->{'parent'}->{'extra'}
- and $root->{'parent'}->{'extra'}->{'block_command_line_contents'}
- and
$root->{'parent'}->{'extra'}->{'block_command_line_contents'}->[0]) {
+ and $root->{'parent'}->{'args'}
+ and @{$root->{'parent'}->{'args'}}) {
$result .= $self->open_element('prepend')
- .$self->_convert({'contents'
- => $root->{'parent'}->{'extra'}->{'block_command_line_contents'}->[0]})
+ .$self->_convert($root->{'parent'}->{'args'}->[0])
.$self->close_element('prepend');
}
unshift @close_elements, 'listitem';
Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm 2018-09-15 14:15:00 UTC (rev 8168)
+++ trunk/tp/Texinfo/Parser.pm 2018-09-15 15:08:43 UTC (rev 8169)
@@ -2985,23 +2985,25 @@
}
if (!$current->{'extra'}->{'block_command_line_contents'}
and $current->{'cmdname'} eq 'itemize') {
+ my $inserted = { 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'type' => 'command_as_argument_inserted',
+ 'parent' => $current };
+ unshift @{$current->{'args'}}, $inserted;
$current->{'extra'}->{'block_command_line_contents'} = [
- [ { 'cmdname' => 'bullet',
- 'contents' => [],
- 'type' => 'command_as_argument',
- 'parent' => $current }
- ]
+ [ $inserted ]
];
$current->{'extra'}->{'command_as_argument'} =
$current->{'extra'}->{'block_command_line_contents'}->[0]->[0];
} elsif ($item_line_commands{$current->{'cmdname'}} and
! $current->{'extra'}->{'command_as_argument'}) {
+ my $inserted = { 'cmdname' => 'asis',
+ 'contents' => [],
+ 'type' => 'command_as_argument_inserted',
+ 'parent' => $current };
+ unshift @{$current->{'args'}}, $inserted;
$current->{'extra'}->{'block_command_line_contents'} = [
- [ { 'cmdname' => 'asis',
- 'contents' => [],
- 'type' => 'command_as_argument',
- 'parent' => $current }
- ]
+ [ $inserted ]
];
$current->{'extra'}->{'command_as_argument'} =
$current->{'extra'}->{'block_command_line_contents'}->[0]->[0];
Modified: trunk/tp/t/results/coverage/formats_only_title_comments.pl
===================================================================
--- trunk/tp/t/results/coverage/formats_only_title_comments.pl 2018-09-15
14:15:00 UTC (rev 8168)
+++ trunk/tp/t/results/coverage/formats_only_title_comments.pl 2018-09-15
15:08:43 UTC (rev 8169)
@@ -8,6 +8,14 @@
$result_trees{'formats_only_title_comments'} = {
'contents' => [
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -88,12 +96,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -567,6 +570,7 @@
],
'type' => 'text_root'
};
+$result_trees{'formats_only_title_comments'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'formats_only_title_comments'}{'contents'}[0];
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'formats_only_title_comments'}{'contents'}[0];
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'formats_only_title_comments'}{'contents'}[0];
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -577,8 +581,8 @@
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2];
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'formats_only_title_comments'}{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'formats_only_title_comments'}{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'formats_only_title_comments'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'formats_only_title_comments'}{'contents'}[0]{'args'}[0];
+$result_trees{'formats_only_title_comments'}{'contents'}[0]{'extra'}{'command_as_argument'}
= $result_trees{'formats_only_title_comments'}{'contents'}[0]{'args'}[0];
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'extra'}{'end_command'}
= $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[2];
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'extra'}{'spaces_after_command_elt'}
= $result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0];
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'parent'} =
$result_trees{'formats_only_title_comments'};
Modified: trunk/tp/t/results/coverage/formats_only_titles.pl
===================================================================
--- trunk/tp/t/results/coverage/formats_only_titles.pl 2018-09-15 14:15:00 UTC
(rev 8168)
+++ trunk/tp/t/results/coverage/formats_only_titles.pl 2018-09-15 15:08:43 UTC
(rev 8169)
@@ -8,6 +8,14 @@
$result_trees{'formats_only_titles'} = {
'contents' => [
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -70,12 +78,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -462,6 +465,7 @@
],
'type' => 'text_root'
};
+$result_trees{'formats_only_titles'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'formats_only_titles'}{'contents'}[0];
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'formats_only_titles'}{'contents'}[0];
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'formats_only_titles'}{'contents'}[0];
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -470,8 +474,8 @@
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2];
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'formats_only_titles'}{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'formats_only_titles'}{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_only_titles'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'formats_only_titles'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'formats_only_titles'}{'contents'}[0]{'args'}[0];
+$result_trees{'formats_only_titles'}{'contents'}[0]{'extra'}{'command_as_argument'}
= $result_trees{'formats_only_titles'}{'contents'}[0]{'args'}[0];
$result_trees{'formats_only_titles'}{'contents'}[0]{'extra'}{'end_command'} =
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[2];
$result_trees{'formats_only_titles'}{'contents'}[0]{'extra'}{'spaces_after_command_elt'}
= $result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0];
$result_trees{'formats_only_titles'}{'contents'}[0]{'parent'} =
$result_trees{'formats_only_titles'};
Modified: trunk/tp/t/results/coverage/formats_titles.pl
===================================================================
--- trunk/tp/t/results/coverage/formats_titles.pl 2018-09-15 14:15:00 UTC
(rev 8168)
+++ trunk/tp/t/results/coverage/formats_titles.pl 2018-09-15 15:08:43 UTC
(rev 8169)
@@ -8,6 +8,14 @@
$result_trees{'formats_titles'} = {
'contents' => [
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -96,12 +104,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -673,6 +676,7 @@
],
'type' => 'text_root'
};
+$result_trees{'formats_titles'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'formats_titles'}{'contents'}[0];
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'formats_titles'}{'contents'}[0];
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'formats_titles'}{'contents'}[0];
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -684,8 +688,8 @@
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[3]{'args'}[0];
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
= $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[3];
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[3]{'parent'} =
$result_trees{'formats_titles'}{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'formats_titles'}{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_titles'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'formats_titles'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'formats_titles'}{'contents'}[0]{'args'}[0];
+$result_trees{'formats_titles'}{'contents'}[0]{'extra'}{'command_as_argument'}
= $result_trees{'formats_titles'}{'contents'}[0]{'args'}[0];
$result_trees{'formats_titles'}{'contents'}[0]{'extra'}{'end_command'} =
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[3];
$result_trees{'formats_titles'}{'contents'}[0]{'extra'}{'spaces_after_command_elt'}
= $result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0];
$result_trees{'formats_titles'}{'contents'}[0]{'parent'} =
$result_trees{'formats_titles'};
Modified: trunk/tp/t/results/coverage/item_container.pl
===================================================================
--- trunk/tp/t/results/coverage/item_container.pl 2018-09-15 14:15:00 UTC
(rev 8168)
+++ trunk/tp/t/results/coverage/item_container.pl 2018-09-15 15:08:43 UTC
(rev 8169)
@@ -228,6 +228,14 @@
'type' => 'empty_line'
},
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -299,12 +307,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -352,6 +355,7 @@
$result_trees{'item_container'}{'contents'}[3]{'line_nr'} =
$result_trees{'item_container'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'item_container'}{'contents'}[3]{'parent'} =
$result_trees{'item_container'};
$result_trees{'item_container'}{'contents'}[4]{'parent'} =
$result_trees{'item_container'};
+$result_trees{'item_container'}{'contents'}[5]{'args'}[0]{'parent'} =
$result_trees{'item_container'}{'contents'}[5];
$result_trees{'item_container'}{'contents'}[5]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'item_container'}{'contents'}[5];
$result_trees{'item_container'}{'contents'}[5]{'contents'}[0]{'parent'} =
$result_trees{'item_container'}{'contents'}[5];
$result_trees{'item_container'}{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'item_container'}{'contents'}[5]{'contents'}[1]{'contents'}[0];
@@ -360,8 +364,8 @@
$result_trees{'item_container'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'item_container'}{'contents'}[5]{'contents'}[2]{'args'}[0];
$result_trees{'item_container'}{'contents'}[5]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'item_container'}{'contents'}[5]{'contents'}[2];
$result_trees{'item_container'}{'contents'}[5]{'contents'}[2]{'parent'} =
$result_trees{'item_container'}{'contents'}[5];
-$result_trees{'item_container'}{'contents'}[5]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'item_container'}{'contents'}[5];
-$result_trees{'item_container'}{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'item_container'}{'contents'}[5]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'item_container'}{'contents'}[5]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'item_container'}{'contents'}[5]{'args'}[0];
+$result_trees{'item_container'}{'contents'}[5]{'extra'}{'command_as_argument'}
= $result_trees{'item_container'}{'contents'}[5]{'args'}[0];
$result_trees{'item_container'}{'contents'}[5]{'extra'}{'end_command'} =
$result_trees{'item_container'}{'contents'}[5]{'contents'}[2];
$result_trees{'item_container'}{'contents'}[5]{'extra'}{'spaces_after_command_elt'}
= $result_trees{'item_container'}{'contents'}[5]{'contents'}[0];
$result_trees{'item_container'}{'contents'}[5]{'parent'} =
$result_trees{'item_container'};
@@ -427,7 +431,7 @@
<para>b&textndash;ullet
</para></listitem></itemize>
-<itemize commandarg="bullet" endspaces=" ">
+<itemize commandarg="bullet" endspaces=" "><itemprepend>•</itemprepend>
<listitem spaces=" "><prepend>•</prepend><para>no itemize argument
</para></listitem></itemize>
';
Modified: trunk/tp/t/results/html_tests/simple_menu.pl
===================================================================
--- trunk/tp/t/results/html_tests/simple_menu.pl 2018-09-15 14:15:00 UTC
(rev 8168)
+++ trunk/tp/t/results/html_tests/simple_menu.pl 2018-09-15 15:08:43 UTC
(rev 8169)
@@ -136,6 +136,14 @@
'type' => 'preformatted'
},
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -207,12 +215,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -348,6 +351,14 @@
{},
{},
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -419,12 +430,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -533,6 +539,14 @@
'type' => 'preformatted'
},
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -604,12 +618,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -887,6 +896,14 @@
'type' => 'preformatted'
},
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -958,12 +975,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -1099,6 +1111,14 @@
{},
{},
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -1170,12 +1190,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -1284,6 +1299,14 @@
'type' => 'preformatted'
},
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -1355,12 +1378,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -1705,6 +1723,7 @@
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[2]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[0]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
@@ -1713,8 +1732,8 @@
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2]{'args'}[0];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'args'}[0];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'args'}[0];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'spaces_after_command_elt'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[0];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1];
@@ -1740,6 +1759,7 @@
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2] =
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[3] =
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[0];
@@ -1748,8 +1768,8 @@
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[2];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[2]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[0];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'args'}[0];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'end_command'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[2];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'extra'}{'spaces_after_command_elt'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[0];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1];
@@ -1768,6 +1788,7 @@
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[3]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[4]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[1]{'contents'}[0];
@@ -1776,8 +1797,8 @@
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[0];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[2];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[2]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'args'}[0];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'end_command'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[2];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'extra'}{'spaces_after_command_elt'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'contents'}[0];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[6]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1];
@@ -1826,6 +1847,7 @@
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'args'}[2]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[0]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[1]{'contents'}[0];
@@ -1834,8 +1856,8 @@
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2]{'args'}[0];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'args'}[0];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'args'}[0];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[2];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'extra'}{'spaces_after_command_elt'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'contents'}[0];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
@@ -1861,6 +1883,7 @@
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[2]
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[1];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[3]
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}{'contents'}[2];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'args'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[1]{'contents'}[0];
@@ -1869,8 +1892,8 @@
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[2]{'args'}[0];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[2];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[2]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'args'}[0];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'args'}[0];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'extra'}{'end_command'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[2];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'extra'}{'spaces_after_command_elt'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'contents'}[0];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[4]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
@@ -1889,6 +1912,7 @@
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[5]{'contents'}[3]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[5];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[5]{'contents'}[4]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[5];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[5]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'args'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[1]{'contents'}[0];
@@ -1897,8 +1921,8 @@
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[2]{'args'}[0];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[2];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[2]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6];
-$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'args'}[0];
+$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'args'}[0];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'extra'}{'end_command'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[2];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'extra'}{'spaces_after_command_elt'}
=
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'contents'}[0];
$result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8]{'contents'}[6]{'parent'}
= $result_trees{'simple_menu'}{'contents'}[2]{'contents'}[1]{'contents'}[8];
Modified:
trunk/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
===================================================================
--- trunk/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
2018-09-15 14:15:00 UTC (rev 8168)
+++ trunk/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
2018-09-15 15:08:43 UTC (rev 8169)
@@ -92,6 +92,14 @@
'type' => 'paragraph'
},
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -159,12 +167,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -332,6 +335,7 @@
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[1];
@@ -341,8 +345,8 @@
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2];
-$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'end_command'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'spaces_after_command_elt'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[0];
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
Modified: trunk/tp/t/results/itemize/accent_argument.pl
===================================================================
--- trunk/tp/t/results/itemize/accent_argument.pl 2018-09-15 14:15:00 UTC
(rev 8168)
+++ trunk/tp/t/results/itemize/accent_argument.pl 2018-09-15 15:08:43 UTC
(rev 8169)
@@ -10,6 +10,12 @@
{
'args' => [
{
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ },
+ {
'contents' => [
{
'cmdname' => '~',
@@ -89,12 +95,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -131,6 +132,12 @@
{
'args' => [
{
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ },
+ {
'contents' => [
{
'cmdname' => '~',
@@ -214,12 +221,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -232,8 +234,9 @@
],
'type' => 'text_root'
};
-$result_trees{'accent_argument'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[0]{'args'}[0];
$result_trees{'accent_argument'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'accent_argument'}{'contents'}[0];
+$result_trees{'accent_argument'}{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[0]{'args'}[1];
+$result_trees{'accent_argument'}{'contents'}[0]{'args'}[1]{'parent'} =
$result_trees{'accent_argument'}{'contents'}[0];
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0];
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'accent_argument'}{'contents'}[0];
@@ -240,16 +243,17 @@
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'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]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[0];
-$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'accent_argument'}{'contents'}[0]{'args'}[0];
+$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'command_as_argument'}
= $result_trees{'accent_argument'}{'contents'}[0]{'args'}[0];
$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'comment_at_end'};
-$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
= $result_trees{'accent_argument'}{'contents'}[0]{'args'}[0];
+$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
= $result_trees{'accent_argument'}{'contents'}[0]{'args'}[1];
$result_trees{'accent_argument'}{'contents'}[0]{'extra'}{'end_command'} =
$result_trees{'accent_argument'}{'contents'}[0]{'contents'}[1];
-$result_trees{'accent_argument'}{'contents'}[0]{'line_nr'} =
$result_trees{'accent_argument'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'accent_argument'}{'contents'}[0]{'line_nr'} =
$result_trees{'accent_argument'}{'contents'}[0]{'args'}[1]{'contents'}[0]{'line_nr'};
$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]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[2]{'args'}[0];
$result_trees{'accent_argument'}{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'accent_argument'}{'contents'}[2];
+$result_trees{'accent_argument'}{'contents'}[2]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[2]{'args'}[1];
+$result_trees{'accent_argument'}{'contents'}[2]{'args'}[1]{'parent'} =
$result_trees{'accent_argument'}{'contents'}[2];
$result_trees{'accent_argument'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'accent_argument'}{'contents'}[2]{'contents'}[0]{'contents'}[0];
$result_trees{'accent_argument'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[2]{'contents'}[0];
$result_trees{'accent_argument'}{'contents'}[2]{'contents'}[0]{'parent'} =
$result_trees{'accent_argument'}{'contents'}[2];
@@ -256,10 +260,10 @@
$result_trees{'accent_argument'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[2]{'contents'}[1]{'args'}[0];
$result_trees{'accent_argument'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[2]{'contents'}[1];
$result_trees{'accent_argument'}{'contents'}[2]{'contents'}[1]{'parent'} =
$result_trees{'accent_argument'}{'contents'}[2];
-$result_trees{'accent_argument'}{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'accent_argument'}{'contents'}[2];
-$result_trees{'accent_argument'}{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_argument'}{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'accent_argument'}{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'accent_argument'}{'contents'}[2]{'args'}[0];
+$result_trees{'accent_argument'}{'contents'}[2]{'extra'}{'command_as_argument'}
= $result_trees{'accent_argument'}{'contents'}[2]{'args'}[0];
$result_trees{'accent_argument'}{'contents'}[2]{'extra'}{'end_command'} =
$result_trees{'accent_argument'}{'contents'}[2]{'contents'}[1];
-$result_trees{'accent_argument'}{'contents'}[2]{'line_nr'} =
$result_trees{'accent_argument'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'accent_argument'}{'contents'}[2]{'line_nr'} =
$result_trees{'accent_argument'}{'contents'}[2]{'args'}[1]{'contents'}[0]{'line_nr'};
$result_trees{'accent_argument'}{'contents'}[2]{'parent'} =
$result_trees{'accent_argument'};
$result_texis{'accent_argument'} = '@itemize @address@hidden
Modified: trunk/tp/t/results/itemize/comment_first_on_itemize_line.pl
===================================================================
--- trunk/tp/t/results/itemize/comment_first_on_itemize_line.pl 2018-09-15
14:15:00 UTC (rev 8168)
+++ trunk/tp/t/results/itemize/comment_first_on_itemize_line.pl 2018-09-15
15:08:43 UTC (rev 8169)
@@ -10,8 +10,14 @@
{
'args' => [
{
+ 'cmdname' => 'bullet',
'contents' => [],
'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ },
+ {
+ 'contents' => [],
+ 'parent' => {},
'type' => 'block_line_arg'
}
],
@@ -77,12 +83,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -118,6 +119,7 @@
'type' => 'text_root'
};
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'comment_first_on_itemize_line'}{'contents'}[0];
+$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'comment_first_on_itemize_line'}{'contents'}[0];
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0];
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'comment_first_on_itemize_line'}{'contents'}[0];
@@ -124,10 +126,10 @@
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
= $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[1];
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'comment_first_on_itemize_line'}{'contents'}[0];
-$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'comment_first_on_itemize_line'}{'contents'}[0];
-$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'args'}[0];
+$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'extra'}{'command_as_argument'}
= $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'args'}[0];
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
=
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'extra'}{'comment_at_end'};
-$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
= $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'args'}[0];
+$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
= $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'args'}[1];
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'extra'}{'end_command'}
= $result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[1];
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'parent'} =
$result_trees{'comment_first_on_itemize_line'};
Modified: trunk/tp/t/results/itemize/headitem_itemx_in_itemize.pl
===================================================================
--- trunk/tp/t/results/itemize/headitem_itemx_in_itemize.pl 2018-09-15
14:15:00 UTC (rev 8168)
+++ trunk/tp/t/results/itemize/headitem_itemx_in_itemize.pl 2018-09-15
15:08:43 UTC (rev 8169)
@@ -8,6 +8,14 @@
$result_trees{'headitem_itemx_in_itemize'} = {
'contents' => [
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -111,12 +119,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -133,6 +136,7 @@
],
'type' => 'text_root'
};
+$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0];
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0];
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0];
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -147,8 +151,8 @@
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[2];
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0];
-$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0];
-$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'args'}[0];
+$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'extra'}{'command_as_argument'}
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'args'}[0];
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'extra'}{'end_command'}
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[2];
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'extra'}{'spaces_after_command_elt'}
= $result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0];
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'parent'} =
$result_trees{'headitem_itemx_in_itemize'};
Modified: trunk/tp/t/results/itemize/inter_item_commands_in_itemize.pl
===================================================================
--- trunk/tp/t/results/itemize/inter_item_commands_in_itemize.pl
2018-09-15 14:15:00 UTC (rev 8168)
+++ trunk/tp/t/results/itemize/inter_item_commands_in_itemize.pl
2018-09-15 15:08:43 UTC (rev 8169)
@@ -403,6 +403,14 @@
'type' => 'empty_line'
},
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -552,12 +560,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -635,6 +638,7 @@
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[2]{'line_nr'} =
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'line_nr'};
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[2]{'parent'} =
$result_trees{'inter_item_commands_in_itemize'};
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[3]{'parent'} =
$result_trees{'inter_item_commands_in_itemize'};
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'inter_item_commands_in_itemize'}{'contents'}[4];
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'inter_item_commands_in_itemize'}{'contents'}[4];
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[0]{'parent'}
= $result_trees{'inter_item_commands_in_itemize'}{'contents'}[4];
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
@@ -655,8 +659,8 @@
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'args'}[0];
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3];
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'parent'}
= $result_trees{'inter_item_commands_in_itemize'}{'contents'}[4];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'inter_item_commands_in_itemize'}{'contents'}[4];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'args'}[0];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'extra'}{'command_as_argument'}
= $result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'args'}[0];
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'extra'}{'end_command'}
=
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3];
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'extra'}{'spaces_after_command_elt'}
=
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[0];
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'parent'} =
$result_trees{'inter_item_commands_in_itemize'};
Modified: trunk/tp/t/results/itemize/itemize_and_empty_lines.pl
===================================================================
--- trunk/tp/t/results/itemize/itemize_and_empty_lines.pl 2018-09-15
14:15:00 UTC (rev 8168)
+++ trunk/tp/t/results/itemize/itemize_and_empty_lines.pl 2018-09-15
15:08:43 UTC (rev 8169)
@@ -508,6 +508,14 @@
'type' => 'empty_line'
},
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -1005,12 +1013,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -1633,6 +1636,7 @@
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'extra'}{'end_command'}
= $result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[5];
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'parent'} =
$result_trees{'itemize_and_empty_lines'};
$result_trees{'itemize_and_empty_lines'}{'contents'}[1]{'parent'} =
$result_trees{'itemize_and_empty_lines'};
+$result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'itemize_and_empty_lines'}{'contents'}[2];
$result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'itemize_and_empty_lines'}{'contents'}[2];
$result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'contents'}[0]{'parent'}
= $result_trees{'itemize_and_empty_lines'}{'contents'}[2];
$result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'contents'}[1]{'contents'}[0];
@@ -1709,8 +1713,8 @@
$result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'contents'}[7]{'args'}[0];
$result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'parent'}
= $result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'contents'}[7];
$result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'contents'}[7]{'parent'}
= $result_trees{'itemize_and_empty_lines'}{'contents'}[2];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'itemize_and_empty_lines'}{'contents'}[2];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'args'}[0];
+$result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'extra'}{'command_as_argument'}
= $result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'args'}[0];
$result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'extra'}{'end_command'}
= $result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'contents'}[7];
$result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'extra'}{'spaces_after_command_elt'}
= $result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'contents'}[0];
$result_trees{'itemize_and_empty_lines'}{'contents'}[2]{'parent'} =
$result_trees{'itemize_and_empty_lines'};
Modified: trunk/tp/t/results/itemize/not_closed_item.pl
===================================================================
--- trunk/tp/t/results/itemize/not_closed_item.pl 2018-09-15 14:15:00 UTC
(rev 8168)
+++ trunk/tp/t/results/itemize/not_closed_item.pl 2018-09-15 15:08:43 UTC
(rev 8169)
@@ -8,6 +8,14 @@
$result_trees{'not_closed_item'} = {
'contents' => [
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -49,12 +57,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -70,13 +73,14 @@
],
'type' => 'text_root'
};
+$result_trees{'not_closed_item'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'not_closed_item'}{'contents'}[0];
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'not_closed_item'}{'contents'}[0];
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'not_closed_item'}{'contents'}[0];
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[1];
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[1]{'parent'} =
$result_trees{'not_closed_item'}{'contents'}[0];
-$result_trees{'not_closed_item'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'not_closed_item'}{'contents'}[0];
-$result_trees{'not_closed_item'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'not_closed_item'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'not_closed_item'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'not_closed_item'}{'contents'}[0]{'args'}[0];
+$result_trees{'not_closed_item'}{'contents'}[0]{'extra'}{'command_as_argument'}
= $result_trees{'not_closed_item'}{'contents'}[0]{'args'}[0];
$result_trees{'not_closed_item'}{'contents'}[0]{'extra'}{'spaces_after_command_elt'}
= $result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0];
$result_trees{'not_closed_item'}{'contents'}[0]{'parent'} =
$result_trees{'not_closed_item'};
Modified: trunk/tp/t/results/itemize/not_closed_itemize.pl
===================================================================
--- trunk/tp/t/results/itemize/not_closed_itemize.pl 2018-09-15 14:15:00 UTC
(rev 8168)
+++ trunk/tp/t/results/itemize/not_closed_itemize.pl 2018-09-15 15:08:43 UTC
(rev 8169)
@@ -8,6 +8,14 @@
$result_trees{'not_closed_itemize'} = {
'contents' => [
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -23,12 +31,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -44,10 +47,11 @@
],
'type' => 'text_root'
};
+$result_trees{'not_closed_itemize'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'not_closed_itemize'}{'contents'}[0];
$result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'not_closed_itemize'}{'contents'}[0];
$result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'not_closed_itemize'}{'contents'}[0];
-$result_trees{'not_closed_itemize'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'not_closed_itemize'}{'contents'}[0];
-$result_trees{'not_closed_itemize'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'not_closed_itemize'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'not_closed_itemize'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'not_closed_itemize'}{'contents'}[0]{'args'}[0];
+$result_trees{'not_closed_itemize'}{'contents'}[0]{'extra'}{'command_as_argument'}
= $result_trees{'not_closed_itemize'}{'contents'}[0]{'args'}[0];
$result_trees{'not_closed_itemize'}{'contents'}[0]{'extra'}{'spaces_after_command_elt'}
= $result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0];
$result_trees{'not_closed_itemize'}{'contents'}[0]{'parent'} =
$result_trees{'not_closed_itemize'};
Modified: trunk/tp/t/results/menu/block_commands_in_menu_description.pl
===================================================================
--- trunk/tp/t/results/menu/block_commands_in_menu_description.pl
2018-09-15 14:15:00 UTC (rev 8168)
+++ trunk/tp/t/results/menu/block_commands_in_menu_description.pl
2018-09-15 15:08:43 UTC (rev 8169)
@@ -124,6 +124,14 @@
'type' => 'preformatted'
},
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -219,12 +227,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -617,6 +620,7 @@
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[2]{'parent'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1];
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0];
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
+$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1];
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1];
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1];
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0];
@@ -629,8 +633,8 @@
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0];
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[3];
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[3]{'parent'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1];
-$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'args'}[0];
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[3];
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'extra'}{'spaces_after_command_elt'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'contents'}[0];
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3]{'contents'}[1]{'parent'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
@@ -944,7 +948,7 @@
<menu endspaces=" ">
<menuentry leadingtext="* "><menunode
separator="::">(manual)</menunode><menudescription><pre xml:space="preserve">
-</pre><itemize commandarg="bullet" endspaces=" ">
+</pre><itemize commandarg="bullet" endspaces="
"><itemprepend>•</itemprepend>
<beforefirstitem><pre xml:space="preserve">
</pre></beforefirstitem><listitem spaces=" "><prepend>•</prepend><pre
xml:space="preserve">in item
Modified: trunk/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
===================================================================
--- trunk/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
2018-09-15 14:15:00 UTC (rev 8168)
+++ trunk/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
2018-09-15 15:08:43 UTC (rev 8169)
@@ -20,6 +20,14 @@
'type' => 'empty_line_after_command'
},
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -87,12 +95,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -119,6 +122,14 @@
'type' => 'preformatted'
},
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -206,12 +217,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -238,6 +244,14 @@
'type' => 'preformatted'
},
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -331,12 +345,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -363,6 +372,14 @@
'type' => 'preformatted'
},
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -476,12 +493,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -554,6 +566,7 @@
};
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'itemize_in_headitem_in_example'}{'contents'}[0];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'itemize_in_headitem_in_example'}{'contents'}[0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0];
@@ -563,13 +576,14 @@
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1];
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1];
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'end_command'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[2];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command_elt'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'itemize_in_headitem_in_example'}{'contents'}[0];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[2];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'itemize_in_headitem_in_example'}{'contents'}[0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0];
@@ -581,13 +595,14 @@
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'contents'}[2];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'contents'}[2]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3];
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3];
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'args'}[0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'args'}[0];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'extra'}{'end_command'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'contents'}[2];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'extra'}{'spaces_after_command_elt'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'contents'}[0];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[3]{'parent'}
= $result_trees{'itemize_in_headitem_in_example'}{'contents'}[0];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[4];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[4]{'parent'}
= $result_trees{'itemize_in_headitem_in_example'}{'contents'}[0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'contents'}[1]{'contents'}[0];
@@ -600,13 +615,14 @@
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'contents'}[3];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'contents'}[3]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5];
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5];
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'args'}[0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'args'}[0];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'extra'}{'end_command'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'contents'}[3];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'extra'}{'spaces_after_command_elt'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'contents'}[0];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[5]{'parent'}
= $result_trees{'itemize_in_headitem_in_example'}{'contents'}[0];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[6];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[6]{'parent'}
= $result_trees{'itemize_in_headitem_in_example'}{'contents'}[0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'extra'}{'command'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'contents'}[1]{'contents'}[0];
@@ -621,8 +637,8 @@
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'contents'}[3]{'args'}[0];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'contents'}[3]{'args'}[0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'contents'}[3];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'contents'}[3]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7];
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7];
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'extra'}{'block_command_line_contents'}[0][0]
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'args'}[0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'args'}[0];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'extra'}{'end_command'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'contents'}[3];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'extra'}{'spaces_after_command_elt'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'contents'}[0];
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[7]{'parent'}
= $result_trees{'itemize_in_headitem_in_example'}{'contents'}[0];
Modified: trunk/tp/t/results/plaintext_tests/long_uref_after_item.pl
===================================================================
--- trunk/tp/t/results/plaintext_tests/long_uref_after_item.pl 2018-09-15
14:15:00 UTC (rev 8168)
+++ trunk/tp/t/results/plaintext_tests/long_uref_after_item.pl 2018-09-15
15:08:43 UTC (rev 8169)
@@ -8,6 +8,14 @@
$result_trees{'long_uref_after_item'} = {
'contents' => [
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -110,12 +118,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -132,6 +135,7 @@
],
'type' => 'text_root'
};
+$result_trees{'long_uref_after_item'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'long_uref_after_item'}{'contents'}[0];
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'long_uref_after_item'}{'contents'}[0];
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'long_uref_after_item'}{'contents'}[0];
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[1];
@@ -146,8 +150,8 @@
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[2];
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'long_uref_after_item'}{'contents'}[0];
-$result_trees{'long_uref_after_item'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'long_uref_after_item'}{'contents'}[0];
-$result_trees{'long_uref_after_item'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'long_uref_after_item'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'long_uref_after_item'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'long_uref_after_item'}{'contents'}[0]{'args'}[0];
+$result_trees{'long_uref_after_item'}{'contents'}[0]{'extra'}{'command_as_argument'}
= $result_trees{'long_uref_after_item'}{'contents'}[0]{'args'}[0];
$result_trees{'long_uref_after_item'}{'contents'}[0]{'extra'}{'end_command'} =
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[2];
$result_trees{'long_uref_after_item'}{'contents'}[0]{'extra'}{'spaces_after_command_elt'}
= $result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0];
$result_trees{'long_uref_after_item'}{'contents'}[0]{'parent'} =
$result_trees{'long_uref_after_item'};
Modified: trunk/tp/t/results/xml_tests/comments_end_lines.pl
===================================================================
--- trunk/tp/t/results/xml_tests/comments_end_lines.pl 2018-09-15 14:15:00 UTC
(rev 8168)
+++ trunk/tp/t/results/xml_tests/comments_end_lines.pl 2018-09-15 15:08:43 UTC
(rev 8169)
@@ -8,6 +8,14 @@
$result_trees{'comments_end_lines'} = {
'contents' => [
{
+ 'args' => [
+ {
+ 'cmdname' => 'bullet',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'itemize',
'contents' => [
{
@@ -96,12 +104,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -1064,6 +1067,7 @@
],
'type' => 'text_root'
};
+$result_trees{'comments_end_lines'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'comments_end_lines'}{'contents'}[0];
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'comments_end_lines'}{'contents'}[0];
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'comments_end_lines'}{'contents'}[0];
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[1]{'contents'}[0];
@@ -1074,8 +1078,8 @@
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
=
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'comment_at_end'};
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'comment_at_end'}{'parent'}
= $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2]{'parent'} =
$result_trees{'comments_end_lines'}{'contents'}[0];
-$result_trees{'comments_end_lines'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'comments_end_lines'}{'contents'}[0];
-$result_trees{'comments_end_lines'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'comments_end_lines'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'comments_end_lines'}{'contents'}[0]{'args'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'extra'}{'command_as_argument'}
= $result_trees{'comments_end_lines'}{'contents'}[0]{'args'}[0];
$result_trees{'comments_end_lines'}{'contents'}[0]{'extra'}{'end_command'} =
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[2];
$result_trees{'comments_end_lines'}{'contents'}[0]{'extra'}{'spaces_after_command_elt'}
= $result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0];
$result_trees{'comments_end_lines'}{'contents'}[0]{'parent'} =
$result_trees{'comments_end_lines'};
@@ -1321,7 +1325,7 @@
-$result_converted{'xml'}->{'comments_end_lines'} = '<itemize
commandarg="bullet" endspaces=" ">
+$result_converted{'xml'}->{'comments_end_lines'} = '<itemize
commandarg="bullet" endspaces=" "><itemprepend>•</itemprepend>
<listitem spaces=" "><prepend>•</prepend><para>itemize it
</para></listitem></itemize> <!-- c comment itemize -->
Modified: trunk/tp/t/results/xml_tests/comments_on_block_command_lines.pl
===================================================================
--- trunk/tp/t/results/xml_tests/comments_on_block_command_lines.pl
2018-09-15 14:15:00 UTC (rev 8168)
+++ trunk/tp/t/results/xml_tests/comments_on_block_command_lines.pl
2018-09-15 15:08:43 UTC (rev 8169)
@@ -10,8 +10,14 @@
{
'args' => [
{
+ 'cmdname' => 'bullet',
'contents' => [],
'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ },
+ {
+ 'contents' => [],
+ 'parent' => {},
'type' => 'block_line_arg'
}
],
@@ -77,12 +83,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'bullet',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -1851,6 +1852,7 @@
'type' => 'text_root'
};
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0];
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
@@ -1857,10 +1859,10 @@
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[1];
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'args'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'extra'}{'command_as_argument'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'args'}[0];
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'extra'}{'comment_at_end'}{'args'}[0]{'parent'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'extra'}{'comment_at_end'};
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'args'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'extra'}{'comment_at_end'}{'parent'}
= $result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'args'}[1];
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'extra'}{'end_command'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[1];
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'parent'} =
$result_trees{'comments_on_block_command_lines'};
$result_trees{'comments_on_block_command_lines'}{'contents'}[1]{'parent'} =
$result_trees{'comments_on_block_command_lines'};
@@ -2239,8 +2241,7 @@
-$result_converted{'xml'}->{'comments_on_block_command_lines'} = '<itemize
commandarg="bullet" spaces=" " endspaces=" "><!-- c comm -->
-<listitem spaces=" "><prepend>•</prepend><para>itemize it
+$result_converted{'xml'}->{'comments_on_block_command_lines'} = '<itemize
commandarg="bullet" spaces=" " endspaces="
"><itemprepend>•</itemprepend><listitem spaces="
"><prepend>•</prepend><para>itemize it
</para></listitem></itemize>
<itemize spaces=" " endspaces=" "><itemprepend>x </itemprepend><!-- c comm -->
Modified: trunk/tp/t/results/xtable/accent_on_table_line.pl
===================================================================
--- trunk/tp/t/results/xtable/accent_on_table_line.pl 2018-09-15 14:15:00 UTC
(rev 8168)
+++ trunk/tp/t/results/xtable/accent_on_table_line.pl 2018-09-15 15:08:43 UTC
(rev 8169)
@@ -10,6 +10,12 @@
{
'args' => [
{
+ 'cmdname' => 'asis',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ },
+ {
'contents' => [
{
'cmdname' => '~',
@@ -172,12 +178,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'asis',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -190,8 +191,9 @@
],
'type' => 'text_root'
};
-$result_trees{'accent_on_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'accent_on_table_line'}{'contents'}[0]{'args'}[0];
$result_trees{'accent_on_table_line'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'accent_on_table_line'}{'contents'}[0];
+$result_trees{'accent_on_table_line'}{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
= $result_trees{'accent_on_table_line'}{'contents'}[0]{'args'}[1];
+$result_trees{'accent_on_table_line'}{'contents'}[0]{'args'}[1]{'parent'} =
$result_trees{'accent_on_table_line'}{'contents'}[0];
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -212,10 +214,10 @@
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2];
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'accent_on_table_line'}{'contents'}[0];
-$result_trees{'accent_on_table_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'accent_on_table_line'}{'contents'}[0];
-$result_trees{'accent_on_table_line'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'accent_on_table_line'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'accent_on_table_line'}{'contents'}[0]{'args'}[0];
+$result_trees{'accent_on_table_line'}{'contents'}[0]{'extra'}{'command_as_argument'}
= $result_trees{'accent_on_table_line'}{'contents'}[0]{'args'}[0];
$result_trees{'accent_on_table_line'}{'contents'}[0]{'extra'}{'end_command'} =
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2];
-$result_trees{'accent_on_table_line'}{'contents'}[0]{'line_nr'} =
$result_trees{'accent_on_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'accent_on_table_line'}{'contents'}[0]{'line_nr'} =
$result_trees{'accent_on_table_line'}{'contents'}[0]{'args'}[1]{'contents'}[0]{'line_nr'};
$result_trees{'accent_on_table_line'}{'contents'}[0]{'parent'} =
$result_trees{'accent_on_table_line'};
$result_texis{'accent_on_table_line'} = '@table @~
Modified: trunk/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
===================================================================
--- trunk/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
2018-09-15 14:15:00 UTC (rev 8168)
+++ trunk/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
2018-09-15 15:08:43 UTC (rev 8169)
@@ -10,6 +10,12 @@
{
'args' => [
{
+ 'cmdname' => 'asis',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ },
+ {
'contents' => [
{
'cmdname' => 'bullet',
@@ -110,12 +116,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'asis',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -128,8 +129,9 @@
],
'type' => 'text_root'
};
-$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'args'}[0];
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0];
+$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'args'}[1]{'contents'}[0]{'parent'}
=
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'args'}[1];
+$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'args'}[1]{'parent'}
= $result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0];
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
=
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
@@ -139,10 +141,10 @@
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[1]{'args'}[0];
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
=
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[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]{'parent'}
= $result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0];
-$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]{'extra'}{'block_command_line_contents'}[0][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];
+$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];
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'extra'}{'end_command'}
=
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[1];
-$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'line_nr'}
=
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'line_nr'};
+$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'line_nr'}
=
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'args'}[1]{'contents'}[0]{'line_nr'};
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'parent'} =
$result_trees{'no_arg_brace_command_on_table_line'};
$result_texis{'no_arg_brace_command_on_table_line'} = '@table @bullet
Modified: trunk/tp/t/results/xtable/no_argument_for_table.pl
===================================================================
--- trunk/tp/t/results/xtable/no_argument_for_table.pl 2018-09-15 14:15:00 UTC
(rev 8168)
+++ trunk/tp/t/results/xtable/no_argument_for_table.pl 2018-09-15 15:08:43 UTC
(rev 8169)
@@ -8,6 +8,14 @@
$result_trees{'no_argument_for_table'} = {
'contents' => [
{
+ 'args' => [
+ {
+ 'cmdname' => 'asis',
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'command_as_argument_inserted'
+ }
+ ],
'cmdname' => 'table',
'contents' => [
{
@@ -113,12 +121,7 @@
'extra' => {
'block_command_line_contents' => [
[
- {
- 'cmdname' => 'asis',
- 'contents' => [],
- 'parent' => {},
- 'type' => 'command_as_argument'
- }
+ {}
]
],
'command_as_argument' => {},
@@ -135,6 +138,7 @@
],
'type' => 'text_root'
};
+$result_trees{'no_argument_for_table'}{'contents'}[0]{'args'}[0]{'parent'} =
$result_trees{'no_argument_for_table'}{'contents'}[0];
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'no_argument_for_table'}{'contents'}[0];
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'no_argument_for_table'}{'contents'}[0];
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0];
@@ -149,8 +153,8 @@
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[2]{'args'}[0];
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[2];
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[2]{'parent'}
= $result_trees{'no_argument_for_table'}{'contents'}[0];
-$result_trees{'no_argument_for_table'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]{'parent'}
= $result_trees{'no_argument_for_table'}{'contents'}[0];
-$result_trees{'no_argument_for_table'}{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'no_argument_for_table'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0];
+$result_trees{'no_argument_for_table'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0]
= $result_trees{'no_argument_for_table'}{'contents'}[0]{'args'}[0];
+$result_trees{'no_argument_for_table'}{'contents'}[0]{'extra'}{'command_as_argument'}
= $result_trees{'no_argument_for_table'}{'contents'}[0]{'args'}[0];
$result_trees{'no_argument_for_table'}{'contents'}[0]{'extra'}{'end_command'}
= $result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[2];
$result_trees{'no_argument_for_table'}{'contents'}[0]{'extra'}{'spaces_after_command_elt'}
= $result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[0];
$result_trees{'no_argument_for_table'}{'contents'}[0]{'parent'} =
$result_trees{'no_argument_for_table'};
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [8169] use args instead of block_command_line_contents,
gavinsmith0123 <=