[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Tue, 24 Dec 2024 09:59:23 -0500 (EST) |
branch: master
commit 59922b17e7c8ac92c44eb421b5ee09c35a8080c2
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Nov 12 12:13:03 2024 +0100
block commands with items in 'argument' container in contents
* tp/Texinfo/ParserNonXS.pm (_gather_previous_item)
(_close_command_cleanup, _close_command_cleanup, _end_line_misc_line)
(_end_line_starting_block, _parent_of_command_as_argument)
(_register_command_as_argument, _handle_other_command)
(_handle_block_command, _handle_open_brace),
tp/Texinfo/XS/convert/format_html.c (html_convert_itemize_command),
tp/Texinfo/XS/parsetexi/close.c (close_command_cleanup),
tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block)
(end_line_misc_line), tp/Texinfo/XS/parsetexi/handle_commands.c
(handle_other_command, handle_block_command),
tp/Texinfo/XS/parsetexi/multitable.c (gather_previous_item),
tp/Texinfo/XS/parsetexi/parser.c (parent_of_command_as_argument)
(register_command_as_argument), tp/Texinfo/XS/parsetexi/separator.c
(handle_open_brace): put arguments of block commands with items in the
first content in the argument container type, remove args.
* tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/HTML.pm
(_convert_itemize_command), tp/Texinfo/Convert/LaTeX.pm
(_set_environment_options, _convert), tp/Texinfo/Convert/Plaintext.pm
(_convert), tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
tp/Texinfo/Convert/TextContent.pm (%ignored_types, _convert),
tp/init/html32.pm (html32_convert_item_command): update conversion for
change in block commands with items tree.
---
ChangeLog | 36 +-
tp/TODO | 6 +-
tp/Texinfo/Convert/DocBook.pm | 45 +-
tp/Texinfo/Convert/HTML.pm | 6 +-
tp/Texinfo/Convert/LaTeX.pm | 57 +-
tp/Texinfo/Convert/Plaintext.pm | 31 +-
tp/Texinfo/Convert/TexinfoMarkup.pm | 38 +-
tp/Texinfo/Convert/TextContent.pm | 26 +-
tp/Texinfo/ParserNonXS.pm | 154 +-
tp/Texinfo/XS/convert/format_html.c | 4 +-
tp/Texinfo/XS/parsetexi/close.c | 14 +-
tp/Texinfo/XS/parsetexi/end_line.c | 95 +-
tp/Texinfo/XS/parsetexi/handle_commands.c | 5 +-
tp/Texinfo/XS/parsetexi/multitable.c | 4 +-
tp/Texinfo/XS/parsetexi/parser.c | 14 +-
tp/Texinfo/XS/parsetexi/separator.c | 6 +-
tp/init/html32.pm | 6 +-
tp/t/results/alias/alias_table_command.pl | 39 +-
tp/t/results/columnfractions/empty.pl | 35 +-
tp/t/results/columnfractions/empty_comment.pl | 53 +-
tp/t/results/columnfractions/good.pl | 63 +-
tp/t/results/columnfractions/good_comment.pl | 75 +-
tp/t/results/columnfractions/good_space_comment.pl | 79 +-
tp/t/results/columnfractions/invalid.pl | 47 +-
tp/t/results/columnfractions/not_fraction.pl | 47 +-
.../something_before_columnfractions.pl | 67 +-
tp/t/results/columnfractions/wrong_command.pl | 57 +-
tp/t/results/converters_tests/complex_nestings.pl | 37 +-
.../email_table_command_as_argument.pl | 37 +-
.../converters_tests/enumerate_above_ten.pl | 29 +-
.../indices_in_begin_tables_lists.pl | 746 ++++----
...ces_in_begin_tables_lists_entries_after_item.pl | 744 ++++----
tp/t/results/converters_tests/line_breaks.pl | 37 +-
.../converters_tests/multitable_prototypes.pl | 141 +-
.../table_in_display_in_example.pl | 37 +-
.../table_in_example_in_display.pl | 37 +-
.../various_itemize_command_as_argument.pl | 259 +--
.../various_vtable_command_as_argument.pl | 283 ++--
.../coverage/formats_only_title_comments.pl | 217 +--
tp/t/results/coverage/formats_only_titles.pl | 193 ++-
tp/t/results/coverage/formats_titles.pl | 193 ++-
tp/t/results/coverage/item_container.pl | 101 +-
tp/t/results/coverage/multitable.pl | 122 +-
tp/t/results/coverage/preformatted.pl | 37 +-
.../coverage/punctuation_in_line_commands.pl | 37 +-
tp/t/results/coverage/symbol_after_block.pl | 270 +--
tp/t/results/coverage/symbol_after_command.pl | 37 +-
tp/t/results/coverage/table.pl | 119 +-
tp/t/results/coverage/table_command_comment.pl | 45 +-
tp/t/results/float/complex_float.pl | 344 ++--
tp/t/results/formats_encodings/sample_utf8.pl | 23 +-
tp/t/results/html_tests/anchor_on_vtable_item.pl | 39 +-
..._name_case_insensitive_conflict_redirections.pl | 37 +-
tp/t/results/html_tests/fractions_rounding.pl | 65 +-
tp/t/results/html_tests/itemize_arguments.pl | 1792 +++++++++++---------
.../itemize_arguments_enable_encoding.pl | 1792 +++++++++++---------
tp/t/results/html_tests/itemize_tieaccent.pl | 304 ++--
tp/t/results/html_tests/menu.pl | 210 +--
.../verbatim_in_multitable_in_example.pl | 61 +-
.../include/include_in_removed_before_item.pl | 37 +-
tp/t/results/indices/empty_string_index_entry.pl | 39 +-
tp/t/results/indices/ftable_vtable.pl | 82 +-
tp/t/results/indices/index_special_region.pl | 41 +-
.../index_special_region_no_insertcopying.pl | 41 +-
...egion_no_insertcopying_no_titlepage_no_nodes.pl | 41 +-
...l_region_no_insertcopying_titlepage_no_nodes.pl | 41 +-
...copying_titlepage_no_nodes_footnotes_default.pl | 41 +-
.../index_special_region_no_titlepage_no_nodes.pl | 41 +-
.../index_special_region_titlepage_no_nodes.pl | 41 +-
..._region_titlepage_no_nodes_footnotes_default.pl | 41 +-
tp/t/results/indices/index_table.pl | 110 +-
.../results/indices/index_table_chapter_no_node.pl | 110 +-
.../indices/printindex_index_entry_in_copying.pl | 37 +-
...ndex_index_entry_in_copying_no_insertcopying.pl | 37 +-
tp/t/results/info_tests/colon_in_index_entry.pl | 39 +-
.../multitable_anchor_and_index_entry.pl | 126 +-
.../info_tests/nested_multitable_anchor_index.pl | 126 +-
tp/t/results/info_tests/test_index.pl | 41 +-
tp/t/results/info_tests/xref_quote_long_item.pl | 47 +-
tp/t/results/invalid_nestings/bad_tab_nesting.pl | 61 +-
.../results/invalid_nestings/block_not_matching.pl | 74 +-
tp/t/results/invalid_nestings/center.pl | 168 +-
.../invalid_nestings/enumerate_in_style_command.pl | 29 +-
.../formats_not_closed_in_example.pl | 60 +-
tp/t/results/invalid_nestings/in_errormsg.pl | 37 +-
tp/t/results/invalid_nestings/in_table.pl | 117 +-
tp/t/results/invalid_nestings/item_in_ref.pl | 37 +-
.../itemx_in_itemize_enumerate_in_table.pl | 95 +-
.../multitable_in_style_command.pl | 61 +-
.../invalid_nestings/multitable_item_in_index.pl | 61 +-
.../invalid_nestings/on_block_command_line.pl | 81 +-
tp/t/results/invalid_nestings/on_itemize_line.pl | 200 +--
.../section_in_nested_block_commands.pl | 37 +-
tp/t/results/invalid_nestings/section_in_table.pl | 37 +-
.../invalid_nestings/section_on_enumerate_line.pl | 46 +-
.../invalid_nestings/section_on_itemize_line.pl | 118 +-
.../invalid_nestings/section_on_multitable_line.pl | 99 +-
.../invalid_nestings/section_on_xtable_line.pl | 142 +-
.../style_not_closed_in_table_line.pl | 37 +-
tp/t/results/invalid_nestings/tab_in_index.pl | 61 +-
tp/t/results/invalid_nestings/table_in_code.pl | 37 +-
.../table_not_closed_in_menu_comment.pl | 37 +-
.../table_not_closed_in_menu_description.pl | 37 +-
.../results/invalid_nestings/table_on_item_line.pl | 70 +-
tp/t/results/itemize/accent_argument.pl | 121 +-
tp/t/results/itemize/asis_as_itemize_argument.pl | 37 +-
tp/t/results/itemize/bad_enumerate_arguments.pl | 161 +-
.../itemize/comment_first_on_enumerate_line.pl | 33 +-
.../itemize/comment_first_on_itemize_line.pl | 45 +-
tp/t/results/itemize/empty_accent_argument.pl | 150 +-
tp/t/results/itemize/enumerate_and_empty_lines.pl | 46 +-
tp/t/results/itemize/enumerate_argument.pl | 138 +-
tp/t/results/itemize/enumerate_argument_item.pl | 138 +-
tp/t/results/itemize/enumerate_in_example.pl | 23 +-
tp/t/results/itemize/enumerate_letters.pl | 29 +-
tp/t/results/itemize/enumerate_more_letters.pl | 29 +-
.../results/itemize/headitem_itemx_in_enumerate.pl | 23 +-
tp/t/results/itemize/headitem_itemx_in_itemize.pl | 35 +-
.../itemize/inter_item_commands_in_enumerate.pl | 152 +-
.../itemize/inter_item_commands_in_itemize.pl | 117 +-
tp/t/results/itemize/itemize_and_empty_lines.pl | 212 +--
tp/t/results/itemize/itemize_in_example.pl | 175 +-
.../itemize/itemize_line_commands_with_brace.pl | 78 +-
tp/t/results/itemize/itemize_long_item.pl | 29 +-
tp/t/results/itemize/not_closed_item.pl | 35 +-
tp/t/results/itemize/not_closed_itemize.pl | 31 +-
tp/t/results/itemize/table_in_itemize.pl | 74 +-
tp/t/results/itemize/w_argument.pl | 39 +-
tp/t/results/latex_tests/enumerate_arguments.pl | 174 +-
tp/t/results/latex_tests/nested_enumerate.pl | 92 +-
tp/t/results/latex_tests/nested_itemize.pl | 140 +-
tp/t/results/linemacro/blockitem_no_item.pl | 35 +-
.../linemacro/call_macro_in_linemacro_body.pl | 41 +-
.../linemacro/call_macro_in_linemacro_call.pl | 39 +-
tp/t/results/macro/bib_example.pl | 41 +-
.../macro_expansion_in_multitable_prototype.pl | 397 ++---
tp/t/results/macro/macro_in_brace_command.pl | 37 +-
.../macro_in_empty_multitable_empty_before_item.pl | 63 +-
.../macro_in_empty_table_empty_before_item.pl | 37 +-
.../macro/macro_in_multitable_empty_before_item.pl | 63 +-
.../macro/macro_in_table_empty_before_item.pl | 37 +-
.../menu/block_commands_in_menu_description.pl | 72 +-
tp/t/results/menu/formats_in_menu.pl | 37 +-
tp/t/results/menu/submenu_in_example.pl | 23 +-
tp/t/results/misc_commands/footnote_in_center.pl | 37 +-
.../misc_commands/kbdinputstyle_in_table.pl | 504 +++---
tp/t/results/multitable/empty_headitem.pl | 63 +-
tp/t/results/multitable/empty_item_tab.pl | 120 +-
.../multitable/empty_multitable_with_cells.pl | 23 +-
tp/t/results/multitable/fullwidth_in_prototype.pl | 87 +-
.../inter_item_commands_in_multitable.pl | 131 +-
.../multitable/multitable_begin_with_tab.pl | 122 +-
...ultitable_bracketed_no_inter_space_prototype.pl | 55 +-
...titable_bracketed_prototype_empty_not_closed.pl | 31 +-
...bracketed_prototype_empty_not_closed_comment.pl | 31 +-
..._bracketed_prototype_empty_spaces_not_closed.pl | 31 +-
...ed_prototype_empty_spaces_not_closed_comment.pl | 41 +-
.../multitable_bracketed_prototype_not_closed.pl | 35 +-
...table_bracketed_prototype_not_closed_comment.pl | 37 +-
...bracketed_prototype_not_closed_space_comment.pl | 37 +-
.../multitable_empty_bracketed_prototype.pl | 53 +-
tp/t/results/multitable/multitable_figure_space.pl | 61 +-
tp/t/results/multitable/multitable_in_example.pl | 61 +-
tp/t/results/multitable/multitable_not_closed.pl | 57 +-
.../multitable/multitable_not_closed_item.pl | 61 +-
.../multitable/multitable_not_closed_item_tab.pl | 61 +-
.../multitable_one_column_too_much_cells.pl | 35 +-
.../multitable_two_columns_too_much_cells.pl | 61 +-
.../multitable/multitable_with_empty_item_tab.pl | 61 +-
.../results/multitable/not_letters_in_prototype.pl | 29 +-
tp/t/results/multitable/paragraph_in_cells.pl | 61 +-
.../results/multitable/prototype_brace_no_brace.pl | 41 +-
.../multitable/prototype_brace_no_brace_comment.pl | 53 +-
tp/t/results/multitable/prototype_no_brace.pl | 51 +-
tp/t/results/multitable/ref_in_multitable.pl | 69 +-
tp/t/results/multitable/w_in_multitable.pl | 61 +-
tp/t/results/paragraph/commands_in_flushright.pl | 121 +-
.../plaintext_tests/empty_multitable_in_itemize.pl | 52 +-
.../itemize_in_headitem_in_example.pl | 140 +-
.../plaintext_tests/long_uref_after_item.pl | 35 +-
tp/t/results/plaintext_tests/multitable.pl | 279 +--
.../multitable_in_example_extraneous_item_tab.pl | 29 +-
.../multitable_in_example_extraneous_tab.pl | 35 +-
tp/t/results/plaintext_tests/nested_multitable.pl | 126 +-
.../plaintext_tests/tab_in_table_in_example.pl | 37 +-
...dex_entries_relate_to_item_no_transformation.pl | 45 +-
.../index_entries_relate_to_item_transformation.pl | 45 +-
tp/t/results/value/set_in_item_missing_line.pl | 74 +-
tp/t/results/value/set_on_item_line.pl | 74 +-
tp/t/results/xml_tests/commands_and_spaces.pl | 205 +--
tp/t/results/xml_tests/comments_end_lines.pl | 156 +-
.../xml_tests/comments_on_block_command_lines.pl | 477 +++---
tp/t/results/xml_tests/image_inline_or_not.pl | 37 +-
tp/t/results/xtable/accent_on_table_line.pl | 359 ++--
tp/t/results/xtable/block_commands_in_table.pl | 158 +-
.../xtable/comment_and_itemx_before_item.pl | 37 +-
.../results/xtable/definfoenclose_on_table_line.pl | 49 +-
tp/t/results/xtable/empty_item_itemx.pl | 37 +-
tp/t/results/xtable/empty_table.pl | 37 +-
tp/t/results/xtable/headitem_in_table.pl | 37 +-
.../xtable/index_command_before_end_table.pl | 37 +-
.../results/xtable/inter_item_commands_in_table.pl | 482 +++---
.../inter_item_commands_in_table_in_example.pl | 37 +-
.../xtable/invalid_command_and_brace_in_table.pl | 37 +-
tp/t/results/xtable/item_index_transformation.pl | 166 +-
tp/t/results/xtable/itemx_before_item.pl | 37 +-
tp/t/results/xtable/long_item.pl | 37 +-
.../xtable/no_arg_brace_command_on_table_line.pl | 49 +-
tp/t/results/xtable/no_argument_for_table.pl | 39 +-
tp/t/results/xtable/table_nested.pl | 234 +--
tp/t/results/xtable/text_between_item_itemx.pl | 37 +-
tp/t/results/xtable/title_and_itemx_before_item.pl | 37 +-
212 files changed, 11790 insertions(+), 10191 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6f0e4915d6..2f17b55abb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,30 @@
-2024-12-24 Patrice Dumas <pertusus@free.fr>
+2024-11-12 Patrice Dumas <pertusus@free.fr>
- * tp/Texinfo/Convert/LaTeX.pm (convert_math_to_images): use contents
- instead of args for @math.
+ block commands with items in 'argument' container in contents
+
+ * tp/Texinfo/ParserNonXS.pm (_gather_previous_item)
+ (_close_command_cleanup, _close_command_cleanup, _end_line_misc_line)
+ (_end_line_starting_block, _parent_of_command_as_argument)
+ (_register_command_as_argument, _handle_other_command)
+ (_handle_block_command, _handle_open_brace),
+ tp/Texinfo/XS/convert/format_html.c (html_convert_itemize_command),
+ tp/Texinfo/XS/parsetexi/close.c (close_command_cleanup),
+ tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block)
+ (end_line_misc_line), tp/Texinfo/XS/parsetexi/handle_commands.c
+ (handle_other_command, handle_block_command),
+ tp/Texinfo/XS/parsetexi/multitable.c (gather_previous_item),
+ tp/Texinfo/XS/parsetexi/parser.c (parent_of_command_as_argument)
+ (register_command_as_argument), tp/Texinfo/XS/parsetexi/separator.c
+ (handle_open_brace): put arguments of block commands with items in the
+ first content in the argument container type, remove args.
+
+ * tp/Texinfo/Convert/DocBook.pm (_convert), tp/Texinfo/Convert/HTML.pm
+ (_convert_itemize_command), tp/Texinfo/Convert/LaTeX.pm
+ (_set_environment_options, _convert), tp/Texinfo/Convert/Plaintext.pm
+ (_convert), tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
+ tp/Texinfo/Convert/TextContent.pm (%ignored_types, _convert),
+ tp/init/html32.pm (html32_convert_item_command): update conversion for
+ change in block commands with items tree.
2024-11-11 Patrice Dumas <pertusus@free.fr>
@@ -60,6 +83,11 @@
(protect_hashchar_at_line_beginning_internal): update for the change
in @*macro arguments.
+2024-12-24 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/LaTeX.pm (convert_math_to_images): use contents
+ instead of args for @math.
+
2024-11-11 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/main/element_types.txt: remove unused internal type
@@ -146,7 +174,7 @@
* tp/init/documentation_examples.pm
(my_test_documentation_convert_xref_commands), tp/t/01use.t,
tp/t/init/footnote_mark_in_inline_content.pm
- (_texi2any_test_format_single_footnote_in_inline_content): update
+ (_texi2any_test_format_single_footnote_in_inline_content): update
tests init files and manually written tree.
* tp/t/09indices.t: change code order.
diff --git a/tp/TODO b/tp/TODO
index 4097eb166c..d38206c884 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -936,9 +936,9 @@ Decomposition of the time used for the Texinfo manual with
full XS
SUM: 98
-find Texinfo -type f -regex '\.pm' -list
-find Texinfo -type f -name '*.pm' -execdir perl -wpli -e 's/^#no
autovivification qw\(fetch delete exists store strict\);/no autovivification
qw\(fetch delete exists store strict\);/' '{}' ';'
-find Texinfo -type f -name '*.pm' -execdir perl -wpli -e 's/^no
autovivification qw\(fetch delete exists store strict\);/#no autovivification
qw\(fetch delete exists store strict\);/' '{}' ';'
+find tp/Texinfo -type f -regex '\.pm' -list
+find tp/Texinfo -type f -name '*.pm' -execdir perl -wpli -e 's/^#no
autovivification qw\(fetch delete exists store strict\);/no autovivification
qw\(fetch delete exists store strict\);/' '{}' ';'
+find tp/Texinfo -type f -name '*.pm' -execdir perl -wpli -e 's/^no
autovivification qw\(fetch delete exists store strict\);/#no autovivification
qw\(fetch delete exists store strict\);/' '{}' ';'
patch -p1 < build_perl_info_fix_typo.diff
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 9dfd9cb1e9..e5c7fa277d 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -871,10 +871,11 @@ sub _convert($$;$)
and !($element->{'parent'}->{'extra'}
and $element->{'parent'}->{'extra'}->{'command_as_argument'}
and $element->{'parent'}->{'extra'}->{'command_as_argument'}
- ->{'cmdname'} eq
'bullet')
- and $element->{'parent'}->{'args'}) {
+ ->{'cmdname'} eq 'bullet')) {
+ my $argument = $element->{'parent'}->{'contents'}->[0];
+ my $block_line_arg = $argument->{'contents'}->[0];
$self->{'pending_prepend'}
- = _convert($self, $element->{'parent'}->{'args'}->[0]);
+ = _convert($self, $block_line_arg);
$self->{'pending_prepend'} .= " ";
}
push @close_format_elements, 'listitem';
@@ -1647,24 +1648,28 @@ sub _convert($$;$)
if ($element->{'extra'}->{'columnfractions'}) {
@fractions =
@{$element->{'extra'}->{'columnfractions'}->{'extra'}->{'misc_args'}};
$multiply = 100;
- } elsif ($element->{'args'}
- and $element->{'args'}->[0]->{'contents'}) {
- $multiply = 1;
- foreach my $content (@{$element->{'args'}->[0]->{'contents'}}) {
- if ($content->{'type'} and $content->{'type'} eq
'bracketed_arg') {
- my $prototype_text = '';
- if ($content->{'contents'}) {
- Texinfo::Convert::Text::set_options_encoding_if_not_ascii(
- $self, $self->{'convert_text_options'});
- $prototype_text
- = Texinfo::Convert::Text::convert_to_text(
- $content,
- $self->{'convert_text_options'});
- Texinfo::Convert::Text::reset_options_encoding(
- $self->{'convert_text_options'});
+ } else {
+ my $argument = $element->{'contents'}->[0];
+ my $block_line_arg = $argument->{'contents'}->[0];
+ if ($block_line_arg->{'contents'}) {
+ $multiply = 1;
+ foreach my $content (@{$block_line_arg->{'contents'}}) {
+ if ($content->{'type'}
+ and $content->{'type'} eq 'bracketed_arg') {
+ my $prototype_text = '';
+ if ($content->{'contents'}) {
+ Texinfo::Convert::Text::set_options_encoding_if_not_ascii(
+ $self, $self->{'convert_text_options'});
+ $prototype_text
+ = Texinfo::Convert::Text::convert_to_text(
+ $content,
+ $self->{'convert_text_options'});
+ Texinfo::Convert::Text::reset_options_encoding(
+ $self->{'convert_text_options'});
+ }
+ push @fractions,
+ Texinfo::Convert::Unicode::string_width($prototype_text);
}
- push @fractions,
- Texinfo::Convert::Unicode::string_width($prototype_text);
}
}
}
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index d42aac098a..62ba92bb34 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -5539,9 +5539,11 @@ sub _convert_itemize_command($$$$$)
return $self->html_attribute_class('ul', [$cmdname])
.">\n" . $content. "</ul>\n";
} else {
+ my $argument = $command->{'contents'}->[0];
+ my $block_line_arg = $argument->{'contents'}->[0];
my $css_string
- = $self->html_convert_css_string_for_list_mark($command->{'args'}->[0],
- 'itemize arg');
+ = $self->html_convert_css_string_for_list_mark($block_line_arg,
+ 'itemize arg');
if ($css_string ne '') {
return $self->html_attribute_class('ul', [$cmdname])
." style=\"list-style-type: '".
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 43d858868d..d56704425a 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -2395,13 +2395,19 @@ sub _set_environment_options($$$)
# the result with \hbox{} would probably have been the same,
# but using an empty label is more consistent with the Texinfo manual
return {$environment => 'label={}'};
- } elsif ($element->{'args'} and $element->{'args'}->[0]->{'contents'}) {
+ } else {
+ my $argument = $element->{'contents'}->[0];
+ my $block_line_arg = $argument->{'contents'}->[0];
+ my $label_element = $block_line_arg->{'contents'}->[0];
# NOTE when @itemize is in a preformatted environment (@example...),
# we are not in a preformatted type here, such that the conversion
# does not take into account the preformatted environment. Ok or best.
- my $itemize_label = _convert($self, $element->{'args'}->[0]);
- if ($itemize_label ne '') {
- return {$environment => 'label='.$itemize_label};
+ if (!$label_element->{'info'}
+ or !$label_element->{'info'}->{'inserted'}) {
+ my $itemize_label = _convert($self, $block_line_arg);
+ if ($itemize_label ne '') {
+ return {$environment => 'label='.$itemize_label};
+ }
}
}
}
@@ -3888,28 +3894,31 @@ sub _convert($$)
if ($element->{'extra'}->{'columnfractions'}) {
@fractions
= @{$element->{'extra'}->{'columnfractions'}->{'extra'}->{'misc_args'}};
- } elsif ($element->{'args'} and scalar(@{$element->{'args'}})
- and $element->{'args'}->[0]->{'contents'}) {
- my @prototypes_length;
- my $total_length = 0.;
- foreach my $content (@{$element->{'args'}->[0]->{'contents'}}) {
- if ($content->{'type'} and $content->{'type'} eq 'bracketed_arg') {
- my $prototype_text = '';
- if ($content->{'contents'}) {
- $prototype_text
- = Texinfo::Convert::Text::convert_to_text(
- $content,
- $self->{'convert_text_options'});
+ } else {
+ my $argument = $element->{'contents'}->[0];
+ my $block_line_arg = $argument->{'contents'}->[0];
+ if ($block_line_arg->{'contents'}) {
+ my @prototypes_length;
+ my $total_length = 0.;
+ foreach my $content (@{$block_line_arg->{'contents'}}) {
+ if ($content->{'type'} and $content->{'type'} eq
'bracketed_arg') {
+ my $prototype_text = '';
+ if ($content->{'contents'}) {
+ $prototype_text
+ = Texinfo::Convert::Text::convert_to_text(
+ $content,
+ $self->{'convert_text_options'});
+ }
+ my $length
+ = Texinfo::Convert::Unicode::string_width($prototype_text);
+ $total_length += $length;
+ push @prototypes_length, $length;
}
- my $length
- = Texinfo::Convert::Unicode::string_width($prototype_text);
- $total_length += $length;
- push @prototypes_length, $length;
}
- }
- if ($total_length > 0.) {
- foreach my $length (@prototypes_length) {
- push @fractions, $length / $total_length;
+ if ($total_length > 0.) {
+ foreach my $length (@prototypes_length) {
+ push @fractions, $length / $total_length;
+ }
}
}
}
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index d90321e8c4..5f399531fb 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -3475,18 +3475,21 @@ sub _convert($$)
int($fraction
* $self->{'text_element_context'}->[-1]->{'max'} +0.5);
}
- } elsif ($element->{'args'}
- and $element->{'args'}->[0]->{'contents'}) {
- foreach my $content (@{$element->{'args'}->[0]->{'contents'}}) {
- if ($content->{'type'} and $content->{'type'} eq 'bracketed_arg') {
- my $column_size = 0;
- if ($content->{'contents'}) {
- my ($formatted_prototype, $width)
- = $self->convert_line_new_context
- ($content, {'indent_length' => 0});
- $column_size = $width;
+ } else {
+ my $argument = $element->{'contents'}->[0];
+ my $block_line_arg = $argument->{'contents'}->[0];
+ if ($block_line_arg->{'contents'}) {
+ foreach my $content (@{$block_line_arg->{'contents'}}) {
+ if ($content->{'type'} and $content->{'type'} eq
'bracketed_arg') {
+ my $column_size = 0;
+ if ($content->{'contents'}) {
+ my ($formatted_prototype, $width)
+ = $self->convert_line_new_context
+ ($content, {'indent_length' => 0});
+ $column_size = $width;
+ }
+ push @$columnsize, 2+$column_size;
}
- push @$columnsize, 2+$column_size;
}
}
}
@@ -3589,9 +3592,11 @@ sub _convert($$)
$element->{'parent'}->{'extra'}->{'enumerate_specification'},
$element->{'extra'}->{'item_number'}) . '. '),
$line->{'container'});
- } elsif ($element->{'parent'}->{'args'}) {
+ } else {
+ my $argument = $element->{'parent'}->{'contents'}->[0];
+ my $block_line_args = $argument->{'contents'}->[0];
# this is the text prepended to items.
- _convert($self, $element->{'parent'}->{'args'}->[0]);
+ _convert($self, $block_line_args);
_convert($self, { 'text' => ' ' });
}
_stream_output($self,
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index bf4d0cee5b..3c349df6df 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -774,11 +774,11 @@ sub _convert($$;$)
or $element->{'parent'}->{'cmdname'} eq 'enumerate')) {
$result .= $self->txi_markup_open_element('listitem',
[_leading_spaces_arg($element)]);
- if ($element->{'parent'}->{'cmdname'} eq 'itemize'
- and $element->{'parent'}->{'args'}
- and @{$element->{'parent'}->{'args'}}) {
+ if ($element->{'parent'}->{'cmdname'} eq 'itemize') {
+ my $argument = $element->{'parent'}->{'contents'}->[0];
+ my $block_line_arg = $argument->{'contents'}->[0];
$result .= $self->txi_markup_open_element('prepend')
- .$self->_convert($element->{'parent'}->{'args'}->[0])
+ .$self->_convert($block_line_arg)
.$self->txi_markup_close_element('prepend');
}
unshift @close_format_elements, 'listitem';
@@ -1528,18 +1528,18 @@ sub _convert($$;$)
# in that case the end of line is in the columnfractions line
# or in the columnprototypes.
if ($element->{'cmdname'} eq 'multitable') {
- if ($element->{'args'} and $element->{'args'}->[0]
- and $element->{'args'}->[0]->{'contents'}
- and (($element->{'extra'}
- and $element->{'extra'}->{'columnfractions'})
- # case of bogus/empty @columnfractions
- or ($element->{'args'}->[0]->{'contents'}->[0]
- and $element->{'args'}->[0]->{'contents'}
- ->[0]->{'cmdname'}
- and $element->{'args'}->[0]->{'contents'}
+ my $argument = $element->{'contents'}->[0];
+ my $block_line_arg = $argument->{'contents'}->[0];
+ if ($block_line_arg->{'contents'}
+ and (($element->{'extra'}
+ and $element->{'extra'}->{'columnfractions'})
+ # case of bogus/empty @columnfractions
+ or (scalar(@{$block_line_arg->{'contents'}}) > 0
+ and $block_line_arg->{'contents'}->[0]->{'cmdname'}
+ and $block_line_arg->{'contents'}
->[0]->{'cmdname'} eq 'columnfractions'))) {
my $columnfractions_element;
- foreach my $content (@{$element->{'args'}->[0]->{'contents'}})
{
+ foreach my $content (@{$block_line_arg->{'contents'}}) {
if ($content->{'cmdname'}
and $content->{'cmdname'} eq 'columnfractions') {
$columnfractions_element = $content;
@@ -1548,10 +1548,9 @@ sub _convert($$;$)
}
$result
.= _format_columnfractions($self, $columnfractions_element);
- } elsif ($element->{'args'} and scalar(@{$element->{'args'}})
- and $element->{'args'}->[0]->{'contents'}) {
+ } elsif ($block_line_arg->{'contents'}) {
$result .= $self->txi_markup_open_element('columnprototypes');
- foreach my $arg (@{$element->{'args'}->[0]->{'contents'}}) {
+ foreach my $arg (@{$block_line_arg->{'contents'}}) {
if ($arg->{'type'}
and $arg->{'type'} eq 'bracketed_arg') {
my $attributes = [];
@@ -1629,8 +1628,9 @@ sub _convert($$;$)
# @deffn {a b}{c d} h{e f} g h
} elsif ($element->{'type'} eq 'bracketed_arg'
and not ($element->{'parent'}->{'parent'}
- and $element->{'parent'}->{'parent'}->{'cmdname'}
- and $element->{'parent'}->{'parent'}->{'cmdname'}
+ and $element->{'parent'}->{'parent'}->{'parent'}
+ and $element->{'parent'}->{'parent'}->{'parent'}->{'cmdname'}
+ and $element->{'parent'}->{'parent'}->{'parent'}->{'cmdname'}
eq 'multitable')
and (!$element->{'parent'}->{'type'}
or ($element->{'parent'}->{'type'} ne 'def_category'
diff --git a/tp/Texinfo/Convert/TextContent.pm
b/tp/Texinfo/Convert/TextContent.pm
index 3b0de27f40..4f9d5b26fb 100644
--- a/tp/Texinfo/Convert/TextContent.pm
+++ b/tp/Texinfo/Convert/TextContent.pm
@@ -53,7 +53,7 @@ foreach my $type ('ignorable_spaces_after_command',
'postamble_after_end',
'preamble_before_beginning',
'spaces_before_paragraph',
- 'spaces_after_close_brace') {
+ 'spaces_after_close_brace', 'argument') {
$ignored_types{$type} = 1;
}
@@ -173,19 +173,9 @@ sub _convert($$)
}
}
my $result = '';
- if ($element->{'args'}
- and (!$element->{'cmdname'}
- or !$Texinfo::Commands::blockitem_commands{$element->{'cmdname'}}))
{
+ if ($element->{'args'}) {
my $args;
- if ($element->{'cmdname'}
- and $Texinfo::Commands::inline_format_commands{$element->{'cmdname'}})
{
- my @args = @{$element->{'args'}};
- shift @args;
- $args = \@args;
- } else {
- $args = $element->{'args'};
- }
- foreach my $arg (@{$args}) {
+ foreach my $arg (@{$element->{'args'}}) {
$result .= _convert($self, $arg);
if ($arg->{'type'}
and $arg->{'type'} eq 'block_line_arg'
@@ -196,7 +186,15 @@ sub _convert($$)
}
}
if ($element->{'contents'}) {
- foreach my $content (@{$element->{'contents'}}) {
+ my $contents_nr = scalar(@{$element->{'contents'}});
+ my $start = 0;
+ if ($element->{'cmdname'}
+ and $Texinfo::Commands::inline_format_commands{$element->{'cmdname'}})
{
+ # TODO not sure that there is a test for that code
+ $start = 1;
+ }
+ for (my $i = $start; $i < $contents_nr; $i++) {
+ my $content = $element->{'contents'}->[$i];
$result .= _convert($self, $content);
}
}
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index bf89d0fe2f..0433df7529 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1811,25 +1811,27 @@ sub _gather_previous_item($$;$$)
# itemx and put it into the $type.
my $contents_count = scalar(@{$current->{'contents'}});
my $begin;
- for (my $i = $contents_count - 1; $i >= 0; $i--) {
- if ($current->{'contents'}->[$i]->{'cmdname'}
- and ($current->{'contents'}->[$i]->{'cmdname'} eq 'item'
- or ($current->{'contents'}->[$i]->{'cmdname'} eq 'itemx'))) {
- $begin = $i + 1;
+ for (my $position = $contents_count; $position >= 2; $position--) {
+ my $content_element = $current->{'contents'}->[$position - 1];
+ if ($content_element->{'cmdname'}
+ and ($content_element->{'cmdname'} eq 'item'
+ or ($content_element->{'cmdname'} eq 'itemx'))) {
+ $begin = $position;
last;
}
}
- $begin = 0 if !defined($begin);
+ $begin = 1 if !defined($begin);
# Find the end
my $end;
if (defined($next_command)) {
# Don't absorb trailing index entries as they are included with a
# following @item.
- for (my $i = $contents_count - 1; $i >= $begin; $i--) {
- if (!$current->{'contents'}->[$i]->{'type'}
- or $current->{'contents'}->[$i]->{'type'} ne 'index_entry_command') {
- $end = $i + 1;
+ for (my $position = $contents_count; $position >= $begin +1; $position--) {
+ my $content_element = $current->{'contents'}->[$position - 1];
+ if (!$content_element->{'type'}
+ or $content_element->{'type'} ne 'index_entry_command') {
+ $end = $position;
last;
}
}
@@ -2043,7 +2045,7 @@ sub _close_command_cleanup($$) {
and $block_commands{$current->{'cmdname'}} eq 'item_line') {
# At this point the end command hasn't been added to the command contents.
# so checks cannot be done at this point.
- if ($current->{'contents'} and scalar(@{$current->{'contents'}})) {
+ if (scalar(@{$current->{'contents'}}) > 1) {
_gather_previous_item($self, $current);
}
}
@@ -2054,19 +2056,19 @@ sub _close_command_cleanup($$) {
# remove empty before_item.
# warn if not empty before_item, but format is empty
if ($blockitem_commands{$current->{'cmdname'}}) {
- if ($current->{'contents'}
- and $current->{'contents'}->[0]->{'type'}
- and $current->{'contents'}->[0]->{'type'} eq 'before_item') {
- my $before_item = $current->{'contents'}->[0];
+ if (scalar(@{$current->{'contents'}} > 1)
+ and $current->{'contents'}->[1]->{'type'}
+ and $current->{'contents'}->[1]->{'type'} eq 'before_item') {
+ my $before_item = $current->{'contents'}->[1];
if (_is_container_empty($before_item)
and not $before_item->{'source_marks'}) {
# remove empty before_item
- shift @{$current->{'contents'}};
+ splice(@{$current->{'contents'}}, 1, 1);
} else {
# The elements that can appear right in a block item command
# besides before_item are either an @*item or are associated
# with items
- if (scalar(@{$current->{'contents'}}) == 1) {
+ if (scalar(@{$current->{'contents'}}) == 2) {
# no @*item, only before_item. Warn if before_item is not empty
my $empty_before_item = 1;
if ($before_item->{'contents'}) {
@@ -2435,7 +2437,7 @@ sub _item_line_parent($)
{
my $current = shift;
if ($current->{'type'} and $current->{'type'} eq 'before_item'
- and $current->{'parent'}) {
+ and $current->{'parent'}) {
$current = $current->{'parent'};
}
return $current if ($current->{'cmdname'}
@@ -4029,15 +4031,17 @@ sub _end_line_misc_line($$$)
# columnfractions
} elsif ($command eq 'columnfractions') {
# in a multitable, we are in a block_line_arg
- if (!$current->{'parent'} or !$current->{'parent'}->{'cmdname'}
- or $current->{'parent'}->{'cmdname'} ne 'multitable') {
+ if (!$current->{'parent'} or !$current->{'parent'}->{'parent'}
+ or !$current->{'parent'}->{'parent'}->{'cmdname'}
+ or $current->{'parent'}->{'parent'}->{'cmdname'} ne 'multitable') {
$self->_line_error(
sprintf(__("\@%s only meaningful on a \@multitable line"),
$command), $source_info);
} else {
- $current->{'parent'}->{'extra'} = {}
- if (!defined($current->{'parent'}->{'extra'}));
- $current->{'parent'}->{'extra'}->{'columnfractions'} = $misc_cmd;
+ my $command_element = $current->{'parent'}->{'parent'};
+ $command_element->{'extra'} = {}
+ if (!defined($command_element->{'extra'}));
+ $command_element->{'extra'}->{'columnfractions'} = $misc_cmd;
}
} elsif ($root_commands{$data_cmdname}) {
$current = $current->{'contents'}->[-1];
@@ -4211,12 +4215,12 @@ sub _end_line_starting_block($$$)
# @multitable args
if ($command eq 'multitable'
- and $current->{'parent'}->{'extra'}
- and defined($current->{'parent'}->{'extra'}->{'columnfractions'})) {
- my $multitable = $current->{'parent'};
- my $misc_cmd = $current->{'parent'}->{'extra'}->{'columnfractions'};
+ and $current->{'parent'}->{'parent'}
+ and $current->{'parent'}->{'parent'}->{'extra'}
+ and
defined($current->{'parent'}->{'parent'}->{'extra'}->{'columnfractions'})) {
+ my $multitable = $current->{'parent'}->{'parent'};
+ my $misc_cmd = $multitable->{'extra'}->{'columnfractions'};
- $multitable->{'extra'} = {} if (!defined($multitable->{'extra'}));
if ($misc_cmd->{'extra'}
and defined($misc_cmd->{'extra'}->{'misc_args'})) {
$multitable->{'extra'}->{'max_columns'}
@@ -4226,6 +4230,7 @@ sub _end_line_starting_block($$$)
delete $multitable->{'extra'}->{'columnfractions'};
}
} elsif ($command eq 'multitable') {
+ my $multitable = $current->{'parent'}->{'parent'};
# determine max columns based on prototypes
my $max_columns = 0;
if ($current->{'contents'}) {
@@ -4240,15 +4245,14 @@ sub _end_line_starting_block($$$)
if (!$content->{'cmdname'}
or ($content->{'cmdname'} ne 'c'
and $content->{'cmdname'} ne 'comment')) {
- $self->_command_warn($current->{'parent'},
- __("unexpected argument on \@%s line: %s"),
+ $self->_command_warn($multitable,
+ __("unexpected argument on \@%s line: %s"),
$command,
Texinfo::Convert::Texinfo::convert_to_texinfo($content));
}
}
}
}
- my $multitable = $current->{'parent'};
$multitable->{'extra'} = {} if (!$multitable->{'extra'});
$multitable->{'extra'}->{'max_columns'} = $max_columns;
if (!$max_columns) {
@@ -4264,11 +4268,12 @@ sub _end_line_starting_block($$$)
# @float args
if ($command eq 'float') {
- my $float_label_element;
- $float_label_element = $current->{'contents'}->[0]->{'contents'}->[1]
- if (scalar(@{$current->{'contents'}->[0]->{'contents'}} >= 2));
- _check_register_target_element_label($self, $float_label_element,
- $current, $source_info);
+ my $argument = $current->{'contents'}->[0];
+ if (scalar(@{$argument->{'contents'}} >= 2)) {
+ my $float_label_element = $argument->{'contents'}->[1];
+ _check_register_target_element_label($self, $float_label_element,
+ $current, $source_info);
+ }
my $float_type = _parse_float_type($current);
push @{$document->{'listoffloats_list'}->{$float_type}}, $current;
@@ -4282,14 +4287,14 @@ sub _end_line_starting_block($$$)
} elsif ($blockitem_commands{$command}) {
if ($command eq 'enumerate') {
my $spec = '1';
- if ($current->{'args'} and $current->{'args'}->[0]
- and $current->{'args'}->[0]->{'contents'}
- and @{$current->{'args'}->[0]->{'contents'}}) {
- if (scalar(@{$current->{'args'}->[0]->{'contents'}}) > 1) {
+ my $argument = $current->{'contents'}->[0];
+ my $block_line_arg = $argument->{'contents'}->[0];
+ if ($block_line_arg->{'contents'}) {
+ if (scalar(@{$block_line_arg->{'contents'}}) > 1) {
$self->_command_error($current,
__("superfluous argument to \@%s"), $command);
}
- my $arg = $current->{'args'}->[0]->{'contents'}->[0];
+ my $arg = $block_line_arg->{'contents'}->[0];
if (!defined($arg->{'text'})
or $arg->{'text'} !~ /^((\d+)|([[:alpha:]]))$/) {
$self->_command_error($current,
@@ -4303,12 +4308,14 @@ sub _end_line_starting_block($$$)
} elsif ($block_commands{$command} eq 'item_line') {
if (!$current->{'extra'}
or !$current->{'extra'}->{'command_as_argument'}) {
- if ($current->{'args'}->[0]->{'contents'}
- and scalar(@{$current->{'args'}->[0]->{'contents'}})) {
+ my $argument = $current->{'contents'}->[0];
+ my $block_line_arg = $argument->{'contents'}->[0];
+ if ($block_line_arg->{'contents'}
+ and scalar(@{$block_line_arg->{'contents'}})) {
# expand the contents to avoid surrounding spaces
my $texi_arg
= Texinfo::Convert::Texinfo::convert_to_texinfo(
- {'contents' => $current->{'args'}->[0]->{'contents'}});
+ {'contents' => $block_line_arg->{'contents'}});
$self->_command_error($current,
__("bad argument to \@%s: %s"),
$command, $texi_arg);
@@ -4335,7 +4342,8 @@ sub _end_line_starting_block($$$)
# This code checks that the command_as_argument of the @itemize
# is alone on the line, otherwise it is not a command_as_argument.
my $i;
- my $line_arg = $current->{'args'}->[0];
+ my $argument = $current->{'contents'}->[0];
+ my $line_arg = $argument->{'contents'}->[0];
my $contents_nr = scalar(@{$line_arg->{'contents'}});
for ($i = 0; $i < $contents_nr; $i++) {
if ($line_arg->{'contents'}->[$i] eq $command_as_argument) {
@@ -4384,20 +4392,9 @@ sub _end_line_starting_block($$$)
}
}
if ($command eq 'itemize') {
- if (!$current->{'args'}
- or !scalar(@{$current->{'args'}})
- or !$current->{'args'}->[0]->{'contents'}) {
- my $block_line_arg;
- if ($current->{'args'} and $current->{'args'}->[-1]
- and $current->{'args'}->[-1]->{'type'}
- and $current->{'args'}->[-1]->{'type'} eq 'block_line_arg') {
- $block_line_arg = $current->{'args'}->[-1];
- } else {
- $block_line_arg = { 'type' => 'block_line_arg',
- 'parent' => $current,
- 'contents' => [] };
- unshift @{$current->{'args'}}, $block_line_arg;
- }
+ my $argument = $current->{'contents'}->[0];
+ my $block_line_arg = $argument->{'contents'}->[0];
+ if (!$block_line_arg->{'contents'}) {
my $inserted = { 'cmdname' => 'bullet',
'info' => {'inserted' => 1},
'parent' => $block_line_arg };
@@ -4408,10 +4405,12 @@ sub _end_line_starting_block($$$)
} elsif ($block_commands{$command} eq 'item_line') {
$current->{'extra'} = {} if (!$current->{'extra'});
if (!$current->{'extra'}->{'command_as_argument'}) {
+ my $argument = $current->{'contents'}->[0];
+ my $block_line_arg = $argument->{'contents'}->[0];
my $inserted = { 'cmdname' => 'asis',
'info' => {'inserted' => 1},
'parent' => $current };
- unshift @{$current->{'args'}}, $inserted;
+ unshift @{$block_line_arg->{'contents'}}, $inserted;
$current->{'extra'}->{'command_as_argument'} = $inserted;
}
}
@@ -4966,10 +4965,12 @@ sub _parent_of_command_as_argument($)
return ($current and $current->{'type'}
and $current->{'type'} eq 'block_line_arg'
and $current->{'parent'}
- and $current->{'parent'}->{'cmdname'}
- and ($current->{'parent'}->{'cmdname'} eq 'itemize'
- or ($block_commands{$current->{'parent'}->{'cmdname'}}
- and $block_commands{$current->{'parent'}->{'cmdname'}} eq
'item_line'))
+ and $current->{'parent'}->{'parent'}
+ and $current->{'parent'}->{'parent'}->{'cmdname'}
+ and ($current->{'parent'}->{'parent'}->{'cmdname'} eq 'itemize'
+ or ($block_commands{$current->{'parent'}->{'parent'}->{'cmdname'}}
+ and
$block_commands{$current->{'parent'}->{'parent'}->{'cmdname'}}
+ eq
'item_line'))
and scalar(@{$current->{'contents'}}) == 1);
}
@@ -4978,16 +4979,19 @@ sub _register_command_as_argument($$)
{
my $self = shift;
my $cmd_as_arg = shift;
- print STDERR "FOR PARENT \@$cmd_as_arg->{'parent'}->{'parent'}->{'cmdname'}
".
+
+ my $command_element = $cmd_as_arg->{'parent'}->{'parent'}->{'parent'};
+
+ print STDERR "FOR PARENT \@$command_element->{'parent'}->{'cmdname'} ".
"command_as_argument $cmd_as_arg->{'cmdname'}\n"
if ($self->{'conf'}->{'DEBUG'});
- $cmd_as_arg->{'parent'}->{'parent'}->{'extra'} = {}
- if (!defined($cmd_as_arg->{'parent'}->{'parent'}->{'extra'}));
- $cmd_as_arg->{'parent'}->{'parent'}->{'extra'}->{'command_as_argument'}
+ $command_element->{'extra'} = {}
+ if (!defined($command_element->{'extra'}));
+ $command_element->{'extra'}->{'command_as_argument'}
= $cmd_as_arg;
if ($cmd_as_arg->{'cmdname'} eq 'kbd'
- and _kbd_formatted_as_code($self, $cmd_as_arg->{'parent'}->{'parent'})) {
-
$cmd_as_arg->{'parent'}->{'parent'}->{'extra'}->{'command_as_argument_kbd_code'}
= 1;
+ and _kbd_formatted_as_code($self, $command_element)) {
+ $command_element->{'extra'}->{'command_as_argument_kbd_code'} = 1;
}
}
@@ -5665,8 +5669,9 @@ sub _handle_other_command($$$$$)
push @{$parent->{'contents'}}, $row;
# Note that the "row_number" extra value
# isn't actually used anywhere at present.
+ # -2 because of the 'argument'
$row->{'extra'}
- = {'row_number' => scalar(@{$parent->{'contents'}}) - 1};
+ = {'row_number' => scalar(@{$parent->{'contents'}}) - 2};
$command_e = { 'cmdname' => $command,
'parent' => $row,
'contents' => [],
@@ -6188,7 +6193,7 @@ sub _handle_block_command($$$$$)
# bla = block line argument
my $bla_element;
- if ($command eq 'float') {
+ if ($command eq 'float' or $blockitem_commands{$command}) {
my $argument = {'type' => 'argument', 'parent' => $block_line_e};
$block_line_e->{'contents'} = [$argument];
$bla_element = {
@@ -6377,8 +6382,9 @@ sub _handle_open_brace($$$$)
.' '.Texinfo::Common::debug_print_element($current)."\n"
if ($self->{'conf'}->{'DEBUG'});
} elsif ($current->{'parent'}
- and (($current->{'parent'}->{'cmdname'}
- and $current->{'parent'}->{'cmdname'} eq 'multitable')
+ and (($current->{'parent'}->{'parent'}
+ and $current->{'parent'}->{'parent'}->{'cmdname'}
+ and $current->{'parent'}->{'parent'}->{'cmdname'} eq
'multitable')
or ($current->{'parent'}->{'extra'}
and $current->{'parent'}->{'extra'}->{'def_command'}))) {
_abort_empty_line($self, $current);
diff --git a/tp/Texinfo/XS/convert/format_html.c
b/tp/Texinfo/XS/convert/format_html.c
index e5134882b7..76cc6d3f9c 100644
--- a/tp/Texinfo/XS/convert/format_html.c
+++ b/tp/Texinfo/XS/convert/format_html.c
@@ -8747,8 +8747,10 @@ html_convert_itemize_command (CONVERTER *self, const
enum command_id cmd,
if (!selector_style && self->conf->NO_CSS.o.integer <= 0)
{
+ const ELEMENT *argument = element->e.c->contents.list[0];
+ const ELEMENT *block_line_arg = argument->e.c->contents.list[0];
char *css_string
- = html_convert_css_string_for_list_mark (self,
element->e.c->args.list[0],
+ = html_convert_css_string_for_list_mark (self, block_line_arg,
"itemize arg");
if (css_string && strlen (css_string))
{
diff --git a/tp/Texinfo/XS/parsetexi/close.c b/tp/Texinfo/XS/parsetexi/close.c
index 54041b1d7e..d4c66e9633 100644
--- a/tp/Texinfo/XS/parsetexi/close.c
+++ b/tp/Texinfo/XS/parsetexi/close.c
@@ -292,17 +292,17 @@ close_command_cleanup (ELEMENT *current)
|| current->e.c->cmd == CM_ftable
|| current->e.c->cmd == CM_vtable)
{
- if (current->e.c->contents.number > 0)
- gather_previous_item (current, 0);
+ if (current->e.c->contents.number > 1)
+ gather_previous_item (current, CM_NONE);
}
/* Block commands that contain @item's - e.g. @multitable, @table,
@itemize. */
if (command_data(current->e.c->cmd).flags & CF_blockitem
- && current->e.c->contents.number > 0
- && current->e.c->contents.list[0]->type == ET_before_item)
+ && current->e.c->contents.number > 1
+ && current->e.c->contents.list[1]->type == ET_before_item)
{
- ELEMENT *before_item = current->e.c->contents.list[0];
+ const ELEMENT *before_item = current->e.c->contents.list[1];
/* If the ET_before_item is empty, remove it. Note that the
some before_item content could also have been reparented in
@@ -310,7 +310,7 @@ close_command_cleanup (ELEMENT *current)
if (is_container_empty (before_item)
&& !before_item->source_mark_list)
{
- ELEMENT *removed = remove_from_contents (current, 0);
+ ELEMENT *removed = remove_from_contents (current, 1);
destroy_element (removed);
}
else /* Non-empty ET_before_item */
@@ -318,7 +318,7 @@ close_command_cleanup (ELEMENT *current)
/* The elements that can appear right in a block item command
besides before_item are either an @*item or are associated
with items */
- if (current->e.c->contents.number == 1)
+ if (current->e.c->contents.number == 2)
{
/* no @*item, only before_item. Warn if before_item is not empty */
int empty_before_item = 1;
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c
b/tp/Texinfo/XS/parsetexi/end_line.c
index 66d4c707fa..f14ff01052 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -812,20 +812,21 @@ end_line_starting_block (ELEMENT *current)
/* @multitable args */
if (command == CM_multitable
- && (k = lookup_extra (current->parent, AI_key_columnfractions)))
+ && (k = lookup_extra (current->parent->parent, AI_key_columnfractions)))
{
const ELEMENT *misc_cmd = k->k.const_element;
const STRING_LIST *misc_args
= lookup_extra_misc_args (misc_cmd, AI_key_misc_args);
+ ELEMENT *multitable = current->parent->parent;
if (misc_args)
{
- add_extra_integer (current->parent, AI_key_max_columns,
+ add_extra_integer (multitable, AI_key_max_columns,
misc_args->number);
}
else
{
- add_extra_integer (current->parent, AI_key_max_columns, 0);
+ add_extra_integer (multitable, AI_key_max_columns, 0);
k->key = AI_key_none;
k->type = extra_deleted;
}
@@ -836,6 +837,7 @@ end_line_starting_block (ELEMENT *current)
/* NOTE max_columns could overflow, as in general INT_MAX < SIZE_MAX.
We ignore as this would be for unrealistic column numbers */
int max_columns = 0;
+ ELEMENT *multitable = current->parent->parent;
for (i = 0; i < current->e.c->contents.number; i++)
{
@@ -861,19 +863,18 @@ end_line_starting_block (ELEMENT *current)
{
char *texi;
texi = convert_to_texinfo (e);
- command_warn (current->parent,
+ command_warn (multitable,
"unexpected argument on @%s line: %s",
- command_name(current->parent->e.c->cmd),
- texi);
+ command_name(multitable->e.c->cmd), texi);
free (texi);
}
}
}
{
- add_extra_integer (current->parent, AI_key_max_columns, max_columns);
+ add_extra_integer (multitable, AI_key_max_columns, max_columns);
if (max_columns == 0)
- command_warn (current->parent, "empty multitable");
+ command_warn (multitable, "empty multitable");
}
}
@@ -886,14 +887,15 @@ end_line_starting_block (ELEMENT *current)
if (command == CM_float)
{
char *float_type;
- ELEMENT *float_label_element = 0;
+ const ELEMENT *argument = current->e.c->contents.list[0];
+
current->e.c->source_info = current_source_info;
- if (current->e.c->contents.list[0]->e.c->contents.number >= 2)
+ if (argument->e.c->contents.number >= 2)
{
- float_label_element
- = contents_child_by_index (current->e.c->contents.list[0], 1);
+ ELEMENT *float_label_element
+ = contents_child_by_index (argument, 1);
+ check_register_target_element_label (float_label_element, current);
}
- check_register_target_element_label (float_label_element, current);
float_type = parse_float_type (current);
/* add to global 'floats' array */
@@ -908,15 +910,16 @@ end_line_starting_block (ELEMENT *current)
if (command == CM_enumerate)
{
const char *spec = "1";
+ const ELEMENT *argument = current->e.c->contents.list[0];
+ const ELEMENT *block_line_arg = argument->e.c->contents.list[0];
- if (current->e.c->args.number > 0
- && current->e.c->args.list[0]->e.c->contents.number > 0)
+ if (block_line_arg->e.c->contents.number > 0)
{
ELEMENT *g;
- if (current->e.c->args.list[0]->e.c->contents.number > 1)
+ if (block_line_arg->e.c->contents.number > 1)
command_error (current, "superfluous argument to @%s",
command_name(current->e.c->cmd));
- g = current->e.c->args.list[0]->e.c->contents.list[0];
+ g = block_line_arg->e.c->contents.list[0];
/* Check if @enumerate specification is either a single
letter or a string of digits. */
if (g->type == ET_normal_text
@@ -940,14 +943,15 @@ end_line_starting_block (ELEMENT *current)
k_command_as_arg = lookup_extra (current,
AI_key_command_as_argument);
if (!k_command_as_arg)
{
- if (current->e.c->args.number > 0
- && current->e.c->args.list[0]->e.c->contents.number > 0)
+ const ELEMENT *argument = current->e.c->contents.list[0];
+ const ELEMENT *block_line_arg = argument->e.c->contents.list[0];
+ if (block_line_arg->e.c->contents.number > 0)
{
char *texi_arg;
/* expand the contents to avoid surrounding spaces */
texi_arg
- = convert_contents_to_texinfo (current->e.c->args.list[0]);
+ = convert_contents_to_texinfo (block_line_arg);
command_error (current, "bad argument to @%s: %s",
command_name(command), texi_arg);
free (texi_arg);
@@ -983,21 +987,22 @@ end_line_starting_block (ELEMENT *current)
if (k_command_as_arg)
{
size_t i;
- ELEMENT *e = args_child_by_index (current, 0);
- ELEMENT *command_as_arg_e = k_command_as_arg->k.element;
+ const ELEMENT *argument = contents_child_by_index (current, 0);
+ const ELEMENT *line_arg = contents_child_by_index (argument, 0);
+ const ELEMENT *command_as_arg_e = k_command_as_arg->k.element;
- for (i = 0; i < e->e.c->contents.number; i++)
+ for (i = 0; i < line_arg->e.c->contents.number; i++)
{
- if (contents_child_by_index (e, i) == command_as_arg_e)
+ if (contents_child_by_index (line_arg, i) ==
command_as_arg_e)
{
i++;
break;
}
}
- for (; i < e->e.c->contents.number; i++)
+ for (; i < line_arg->e.c->contents.number; i++)
{
int not_command_as_arg = 0;
- ELEMENT *f = contents_child_by_index (e, i);
+ ELEMENT *f = contents_child_by_index (line_arg, i);
if (f->type == ET_normal_text)
{
if (f->e.text->end > 0
@@ -1053,36 +1058,30 @@ end_line_starting_block (ELEMENT *current)
}
/* if no command_as_argument given, default to @bullet for
@itemize, and @asis for @table. */
- if (command == CM_itemize
- && (current->e.c->args.number == 0
- || current->e.c->args.list[0]->e.c->contents.number == 0))
+ if (command == CM_itemize)
{
- ELEMENT *e;
- ELEMENT *block_line_arg;
- if (last_args_child (current)
- && last_args_child (current)->type == ET_block_line_arg)
- {
- block_line_arg = last_args_child (current);
- }
- else
+ const ELEMENT *argument = current->e.c->contents.list[0];
+ ELEMENT *block_line_arg = argument->e.c->contents.list[0];
+
+ if (block_line_arg->e.c->contents.number == 0)
{
- block_line_arg = new_element (ET_block_line_arg);
- insert_into_args (current, block_line_arg, 0);
+ ELEMENT *e
+ = new_command_element (ET_brace_noarg_command, CM_bullet);
+ e->flags |= EF_inserted;
+ insert_into_contents (block_line_arg, e, 0);
+ add_extra_element (current, AI_key_command_as_argument, e);
}
-
- e = new_command_element (ET_brace_noarg_command, CM_bullet);
- e->flags |= EF_inserted;
- insert_into_contents (block_line_arg, e, 0);
- add_extra_element (current, AI_key_command_as_argument, e);
}
else if (command_data(command).data == BLOCK_item_line
&& !lookup_extra_element (current, AI_key_command_as_argument))
{
+ const ELEMENT *argument = current->e.c->contents.list[0];
+ ELEMENT *block_line_arg = argument->e.c->contents.list[0];
ELEMENT *e;
e = new_command_element (ET_brace_command, CM_asis);
e->flags |= EF_inserted;
- insert_into_args (current, e, 0);
+ insert_into_contents (block_line_arg, e, 0);
add_extra_element (current, AI_key_command_as_argument, e);
}
@@ -1787,13 +1786,15 @@ end_line_misc_line (ELEMENT *current)
else if (cmd == CM_columnfractions)
{
/* Check if in multitable. */
- if (!current->parent || current->parent->e.c->cmd != CM_multitable)
+ if (!current->parent || !current->parent->parent
+ || current->parent->parent->e.c->cmd != CM_multitable)
{
line_error ("@columnfractions only meaningful on a @multitable
line");
}
else
{
- add_extra_element (current->parent, AI_key_columnfractions,
misc_cmd);
+ add_extra_element (current->parent->parent,
+ AI_key_columnfractions, misc_cmd);
}
}
else if (command_data(data_cmd).flags & CF_root)
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.c
b/tp/Texinfo/XS/parsetexi/handle_commands.c
index 954607a6b6..d3ca8e7daf 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -486,8 +486,9 @@ handle_other_command (ELEMENT *current, const char
**line_inout,
/* Note that the "row_number" extra value
isn't actually used anywhere at present. */
+ /* -2 because of the 'argument' */
add_extra_integer (row, AI_key_row_number,
- parent->e.c->contents.number - 1);
+ parent->e.c->contents.number - 2);
command_e = new_command_element (ET_container_command, cmd);
add_to_element_contents (row, command_e);
@@ -1152,7 +1153,7 @@ handle_block_command (ELEMENT *current, const char
**line_inout,
add_to_element_contents (current, block);
bla_element = new_element (ET_block_line_arg);
- if (cmd == CM_float)
+ if (cmd == CM_float || command_data(cmd).flags & CF_blockitem)
{
ELEMENT *argument = new_element (ET_argument);
add_to_element_contents (block_line_e, argument);
diff --git a/tp/Texinfo/XS/parsetexi/multitable.c
b/tp/Texinfo/XS/parsetexi/multitable.c
index 9506c51192..c0be7f56a8 100644
--- a/tp/Texinfo/XS/parsetexi/multitable.c
+++ b/tp/Texinfo/XS/parsetexi/multitable.c
@@ -65,7 +65,7 @@ gather_previous_item (ELEMENT *current, enum command_id
next_command)
enum element_type type;
size_t i, contents_count;
size_t position;
- size_t begin_idx = 0;
+ size_t begin_idx = 1;
size_t end_pos, term_begin_idx;
if (last_contents_child (current)
@@ -82,7 +82,7 @@ gather_previous_item (ELEMENT *current, enum command_id
next_command)
/* Starting from the end, collect everything that is not a ET_item
or ET_itemx and put it into the ET_table_definition/ET_inter_item. */
contents_count = current->e.c->contents.number;
- for (position = contents_count; position > 0; position--)
+ for (position = contents_count; position > 1; position--)
{
e = contents_child_by_index (current, position -1);
/* e can be a text element with spaces, mainly empty_line */
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 52dad7666e..c19b083a5a 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -1155,8 +1155,9 @@ int
parent_of_command_as_argument (ELEMENT *current)
{
return current->type == ET_block_line_arg
- && (current->parent->e.c->cmd == CM_itemize
- || command_data(current->parent->e.c->cmd).data == BLOCK_item_line)
+ && current->parent->parent
+ && (current->parent->parent->e.c->cmd == CM_itemize
+ || command_data(current->parent->parent->e.c->cmd).data ==
BLOCK_item_line)
&& (current->e.c->contents.number == 1);
}
@@ -1164,14 +1165,15 @@ parent_of_command_as_argument (ELEMENT *current)
void
register_command_as_argument (ELEMENT *cmd_as_arg)
{
+ ELEMENT *command_element = cmd_as_arg->parent->parent->parent;
debug ("FOR PARENT @%s command_as_argument %s",
- command_name(cmd_as_arg->parent->parent->e.c->cmd),
+ command_name(command_element->e.c->cmd),
command_name(cmd_as_arg->e.c->cmd));
- add_extra_element (cmd_as_arg->parent->parent,
+ add_extra_element (command_element,
AI_key_command_as_argument, cmd_as_arg);
if (cmd_as_arg->e.c->cmd == CM_kbd
- && kbd_formatted_as_code (cmd_as_arg->parent->parent)) {
- cmd_as_arg->parent->parent->flags |= EF_command_as_argument_kbd_code;
+ && kbd_formatted_as_code (command_element)) {
+ command_element->flags |= EF_command_as_argument_kbd_code;
}
}
diff --git a/tp/Texinfo/XS/parsetexi/separator.c
b/tp/Texinfo/XS/parsetexi/separator.c
index c434f714c5..ee1908fc9b 100644
--- a/tp/Texinfo/XS/parsetexi/separator.c
+++ b/tp/Texinfo/XS/parsetexi/separator.c
@@ -201,8 +201,10 @@ handle_open_brace (ELEMENT *current, const char
**line_inout)
counter_value (&count_remaining_args, current->parent) : 0);
debug_parser_print_element (current, 0); debug ("");
}
- else if (current->parent && (current->parent->e.c->cmd == CM_multitable
- || current->parent->flags & EF_def_line))
+ else if (current->parent
+ && ((current->parent->parent
+ && current->parent->parent->e.c->cmd == CM_multitable)
+ || current->parent->flags & EF_def_line))
{
ELEMENT *b, *e;
abort_empty_line (current);
diff --git a/tp/init/html32.pm b/tp/init/html32.pm
index 8575a2cced..751ee75140 100644
--- a/tp/init/html32.pm
+++ b/tp/init/html32.pm
@@ -315,9 +315,11 @@ sub html32_convert_item_command($$$$$)
} else {
# Setting multiple expansion should not be needed, except in
# case of invalid constructs
+ my $argument = $itemize->{'contents'}->[0];
+ my $block_line_arg = $argument->{'contents'}->[0];
$prepend = $self->convert_tree_new_formatting_context(
- $itemize->{'args'}->[0],
- $command->{'cmdname'}, 'item_prepended');
+ $block_line_arg,
+ $command->{'cmdname'}, 'item_prepended');
}
if ($content =~ /\S/) {
return '<li>' . $prepend .' '. $content . '</li>';
diff --git a/tp/t/results/alias/alias_table_command.pl
b/tp/t/results/alias/alias_table_command.pl
index 6b4e480c46..ec12cafef4 100644
--- a/tp/t/results/alias/alias_table_command.pl
+++ b/tp/t/results/alias/alias_table_command.pl
@@ -48,30 +48,33 @@ $result_trees{'alias_table_command'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'info' => {
+ 'alias_of' => 'myalias'
+ },
+ 'source_info' => {
+ 'line_nr' => 3
+ }
+ }
+ ],
'info' => {
- 'alias_of' => 'myalias'
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'source_info' => {
- 'line_nr' => 3
- }
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -158,7 +161,7 @@ $result_trees{'alias_table_command'} = {
],
'type' => 'document_root'
};
-$result_trees{'alias_table_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'alias_table_command'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'alias_table_command'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'alias_table_command'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'alias_table_command'} = '@alias myalias = code
diff --git a/tp/t/results/columnfractions/empty.pl
b/tp/t/results/columnfractions/empty.pl
index 851731cd82..98491b3d1a 100644
--- a/tp/t/results/columnfractions/empty.pl
+++ b/tp/t/results/columnfractions/empty.pl
@@ -10,32 +10,35 @@ $result_trees{'empty'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'args' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'line_arg'
}
- },
- 'type' => 'line_arg'
+ ],
+ 'cmdname' => 'columnfractions',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'source_info' => {
- 'line_nr' => 1
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/columnfractions/empty_comment.pl
b/tp/t/results/columnfractions/empty_comment.pl
index 59c91617b7..2003f33f06 100644
--- a/tp/t/results/columnfractions/empty_comment.pl
+++ b/tp/t/results/columnfractions/empty_comment.pl
@@ -10,43 +10,46 @@ $result_trees{'empty_comment'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
- {
- 'text' => '
+ 'args' => [
+ {
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => '
',
- 'type' => 'rawline_arg'
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
}
- ],
- 'cmdname' => 'c'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'columnfractions',
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 1
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/columnfractions/good.pl
b/tp/t/results/columnfractions/good.pl
index 4b9c680cef..82041347c2 100644
--- a/tp/t/results/columnfractions/good.pl
+++ b/tp/t/results/columnfractions/good.pl
@@ -10,49 +10,52 @@ $result_trees{'good'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '0.4 .6 5.'
+ 'contents' => [
+ {
+ 'text' => '0.4 .6 5.'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.4',
+ '.6',
+ '5.'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.4',
- '.6',
- '5.'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 1
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'args' => [
{
@@ -97,7 +100,7 @@ $result_trees{'good'} = {
],
'type' => 'document_root'
};
-$result_trees{'good'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'good'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'good'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'good'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'good'} = '@multitable @columnfractions 0.4 .6 5.
@end multitable';
diff --git a/tp/t/results/columnfractions/good_comment.pl
b/tp/t/results/columnfractions/good_comment.pl
index dec96db40d..a61fa09d4c 100644
--- a/tp/t/results/columnfractions/good_comment.pl
+++ b/tp/t/results/columnfractions/good_comment.pl
@@ -10,55 +10,58 @@ $result_trees{'good_comment'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '0.4 .6 5.'
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
+ 'contents' => [
{
- 'text' => ' comment
-',
- 'type' => 'rawline_arg'
+ 'text' => '0.4 .6 5.'
}
],
- 'cmdname' => 'c'
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comment
+',
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
+ }
+ },
+ 'type' => 'line_arg'
}
+ ],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.4',
+ '.6',
+ '5.'
+ ]
},
- 'type' => 'line_arg'
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.4',
- '.6',
- '5.'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 1
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'args' => [
{
@@ -103,7 +106,7 @@ $result_trees{'good_comment'} = {
],
'type' => 'document_root'
};
-$result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'good_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'good_comment'} = '@multitable @columnfractions 0.4 .6 5.@c
comment
@end multitable';
diff --git a/tp/t/results/columnfractions/good_space_comment.pl
b/tp/t/results/columnfractions/good_space_comment.pl
index 3ec2fe8952..1e6bbfe181 100644
--- a/tp/t/results/columnfractions/good_space_comment.pl
+++ b/tp/t/results/columnfractions/good_space_comment.pl
@@ -10,57 +10,60 @@ $result_trees{'good_space_comment'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '0 1'
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
+ 'contents' => [
{
- 'text' => ' space comment
-',
- 'type' => 'rawline_arg'
+ 'text' => '0 1'
}
],
- 'cmdname' => 'c'
- },
- 'spaces_after_argument' => {
- 'text' => ' '
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' space comment
+',
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
+ },
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'line_arg'
}
+ ],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0',
+ '1'
+ ]
},
- 'type' => 'line_arg'
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0',
- '1'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 1
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'args' => [
{
@@ -105,7 +108,7 @@ $result_trees{'good_space_comment'} = {
],
'type' => 'document_root'
};
-$result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'good_space_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'good_space_comment'} = '@multitable @columnfractions 0 1 @c
space comment
@end multitable';
diff --git a/tp/t/results/columnfractions/invalid.pl
b/tp/t/results/columnfractions/invalid.pl
index a69775a1dc..90210398f5 100644
--- a/tp/t/results/columnfractions/invalid.pl
+++ b/tp/t/results/columnfractions/invalid.pl
@@ -10,42 +10,45 @@ $result_trees{'invalid'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '2x.2 2.23x'
+ 'contents' => [
+ {
+ 'text' => '2x.2 2.23x'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 1
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/columnfractions/not_fraction.pl
b/tp/t/results/columnfractions/not_fraction.pl
index 57528dba78..30846c658f 100644
--- a/tp/t/results/columnfractions/not_fraction.pl
+++ b/tp/t/results/columnfractions/not_fraction.pl
@@ -10,42 +10,45 @@ $result_trees{'not_fraction'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => 'aaa'
+ 'contents' => [
+ {
+ 'text' => 'aaa'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 1
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/columnfractions/something_before_columnfractions.pl
b/tp/t/results/columnfractions/something_before_columnfractions.pl
index c0359ad614..7c848319ba 100644
--- a/tp/t/results/columnfractions/something_before_columnfractions.pl
+++ b/tp/t/results/columnfractions/something_before_columnfractions.pl
@@ -10,51 +10,54 @@ $result_trees{'something_before_columnfractions'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'aaa '
- },
- {
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'text' => 'aaa '
+ },
+ {
+ 'args' => [
{
- 'text' => '0.3 0.7'
+ 'contents' => [
+ {
+ 'text' => '0.3 0.7'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.3',
+ '0.7'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.3',
- '0.7'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 1
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'args' => [
{
@@ -99,7 +102,7 @@ $result_trees{'something_before_columnfractions'} = {
],
'type' => 'document_root'
};
-$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'something_before_columnfractions'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
$result_texis{'something_before_columnfractions'} = '@multitable aaa
@columnfractions 0.3 0.7
@end multitable';
diff --git a/tp/t/results/columnfractions/wrong_command.pl
b/tp/t/results/columnfractions/wrong_command.pl
index a6f657e6f9..21e446804d 100644
--- a/tp/t/results/columnfractions/wrong_command.pl
+++ b/tp/t/results/columnfractions/wrong_command.pl
@@ -10,55 +10,58 @@ $result_trees{'wrong_command'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'cmdname' => 'b',
'contents' => [
{
+ 'cmdname' => 'b',
'contents' => [
{
- 'text' => '3.4'
+ 'contents' => [
+ {
+ 'text' => '3.4'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'source_info' => {
- 'line_nr' => 1
- }
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 1
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/converters_tests/complex_nestings.pl
b/tp/t/results/converters_tests/complex_nestings.pl
index e7f2745561..7ea6b1ff4a 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -818,27 +818,30 @@ $result_trees{'complex_nestings'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 18
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 18
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1188,7 +1191,7 @@
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'complex_nestings'}{'contents'}[3];
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'complex_nestings'}{'contents'}[3];
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'complex_nestings'}{'contents'}[3];
-$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_nestings'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'complex_nestings'} = '@node Top
@top top
diff --git a/tp/t/results/converters_tests/email_table_command_as_argument.pl
b/tp/t/results/converters_tests/email_table_command_as_argument.pl
index a017b14d83..675e18c111 100644
--- a/tp/t/results/converters_tests/email_table_command_as_argument.pl
+++ b/tp/t/results/converters_tests/email_table_command_as_argument.pl
@@ -10,27 +10,30 @@ $result_trees{'email_table_command_as_argument'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'email',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'email',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -137,7 +140,7 @@ $result_trees{'email_table_command_as_argument'} = {
],
'type' => 'document_root'
};
-$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'email_table_command_as_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'email_table_command_as_argument'} = '@table @email
@item www-discuss@@gnu.org
diff --git a/tp/t/results/converters_tests/enumerate_above_ten.pl
b/tp/t/results/converters_tests/enumerate_above_ten.pl
index 6b2394fdff..58ef4a063f 100644
--- a/tp/t/results/converters_tests/enumerate_above_ten.pl
+++ b/tp/t/results/converters_tests/enumerate_above_ten.pl
@@ -10,24 +10,27 @@ $result_trees{'enumerate_above_ten'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => '14'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '14'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
diff --git a/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
b/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
index f8fa21f7a7..bb3c0cf02a 100644
--- a/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
+++ b/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
@@ -155,28 +155,31 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'minus',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 9
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'minus',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 9
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -305,28 +308,31 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 15
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 15
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -513,27 +519,30 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -666,19 +675,22 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -770,19 +782,22 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -906,19 +921,22 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1037,19 +1055,22 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1168,19 +1189,22 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1303,19 +1327,22 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1513,28 +1540,31 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 68
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 68
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1655,26 +1685,6 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'contents' => [
- {
- 'cmdname' => 'asis',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 74
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
'cmdname' => 'vtable',
'contents' => [
{
@@ -1682,9 +1692,32 @@ $result_trees{'indices_in_begin_tables_lists'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'contents' => [
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 74
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
{
'text' => 'aasis--b'
}
@@ -1837,28 +1870,31 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'ftable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'var',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 81
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'var',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 81
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'ftable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -2191,28 +2227,31 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 97
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 97
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -2363,28 +2402,31 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 104
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 104
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -2525,28 +2567,31 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'samp',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 110
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 110
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -2697,28 +2742,31 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'samp',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 117
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 117
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -2859,28 +2907,31 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'samp',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 123
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 123
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -3022,28 +3073,31 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'samp',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 130
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 130
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -3180,28 +3234,31 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'samp',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 136
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 136
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -3338,28 +3395,31 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'samp',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 142
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 142
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -3781,49 +3841,49 @@ $result_trees{'indices_in_begin_tables_lists'} = {
],
'type' => 'document_root'
};
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[19]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[19]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[15]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[19]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[19]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[25]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[25]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[27]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[27]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[29]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[29]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[31]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[31]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[33]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[33]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[33]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[35]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[35]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[37]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[37]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[37]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'args'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[25]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[25]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[27]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[27]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[29]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[29]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[31]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[31]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[33]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[33]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[35]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[35]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[37]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[37]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'indices_in_begin_tables_lists'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'indices_in_begin_tables_lists'} = '\\input texinfo.tex
diff --git
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
index 908b6c66e8..05e4d65ac5 100644
---
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
+++
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
@@ -155,28 +155,31 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'minus',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 9
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'minus',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 9
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -306,28 +309,31 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 15
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 15
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'type' => 'before_item'
},
@@ -513,27 +519,30 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -667,19 +676,22 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -771,19 +783,22 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -907,19 +922,22 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1039,19 +1057,22 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1170,19 +1191,22 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1306,19 +1330,22 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'type' => 'before_item'
},
@@ -1515,28 +1542,31 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 68
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 68
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1657,26 +1687,6 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'contents' => [
- {
- 'cmdname' => 'asis',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 74
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
'cmdname' => 'vtable',
'contents' => [
{
@@ -1684,9 +1694,32 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'contents' => [
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 74
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
{
'text' => 'aasis--b'
}
@@ -1839,28 +1872,31 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'ftable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'var',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 81
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'var',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 81
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'ftable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -2193,28 +2229,31 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 97
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 97
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -2365,28 +2404,31 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 104
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 104
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -2527,28 +2569,31 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'samp',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 110
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 110
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -2699,28 +2744,31 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'samp',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 117
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 117
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -2861,28 +2909,31 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'samp',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 123
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 123
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -3024,28 +3075,31 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'samp',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 130
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 130
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -3182,28 +3236,31 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'samp',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 136
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 136
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -3340,28 +3397,31 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'samp',
- 'source_info' => {
- 'file_name' => 'indices_in_begin_tables_lists.texi',
- 'line_nr' => 142
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'file_name' => 'indices_in_begin_tables_lists.texi',
+ 'line_nr' => 142
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -3783,49 +3843,49 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
],
'type' => 'document_root'
};
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[15]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[4]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[19]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[19]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[11]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[15]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[2]{'contents'}[3]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[17]{'contents'}[2]{'contents'}[4]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[19]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[19]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[25]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[25]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[27]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[27]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[29]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[29]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[31]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[31]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[33]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[33]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[33]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[35]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[35]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[37]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[37]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[37]{'args'}[0]{'contents'}[0];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
-$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'args'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[25]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[25]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[27]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[27]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[27]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[29]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[29]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[29]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[31]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[31]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[31]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[33]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[33]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[35]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[35]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[37]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[37]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[37]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[3];
+$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'extra'}{'command_as_argument'}
=
$result_trees{'indices_in_begin_tables_lists_entries_after_item'}{'contents'}[4]{'contents'}[39]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'indices_in_begin_tables_lists_entries_after_item'} = '\\input
texinfo.tex
diff --git a/tp/t/results/converters_tests/line_breaks.pl
b/tp/t/results/converters_tests/line_breaks.pl
index 1d2ce52b4d..569133af49 100644
--- a/tp/t/results/converters_tests/line_breaks.pl
+++ b/tp/t/results/converters_tests/line_breaks.pl
@@ -188,27 +188,30 @@ $result_trees{'line_breaks'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'strong',
- 'source_info' => {
- 'line_nr' => 10
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'strong',
+ 'source_info' => {
+ 'line_nr' => 10
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -427,7 +430,7 @@ $result_trees{'line_breaks'} = {
],
'type' => 'document_root'
};
-$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'line_breaks'}{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'line_breaks'} = '@documentdescription
a document @* yes!
diff --git a/tp/t/results/converters_tests/multitable_prototypes.pl
b/tp/t/results/converters_tests/multitable_prototypes.pl
index daed15b097..5a84d8ca31 100644
--- a/tp/t/results/converters_tests/multitable_prototypes.pl
+++ b/tp/t/results/converters_tests/multitable_prototypes.pl
@@ -10,106 +10,109 @@ $result_trees{'multitable_prototypes'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'aa b'
- }
- ],
- 'source_info' => {
- 'line_nr' => 1
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'aa b'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
+ },
{
- 'text' => 'r '
- }
- ],
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 1
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'text' => 'j '
+ 'contents' => [
+ {
+ 'text' => 'r '
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
},
{
- 'cmdname' => 'code',
'contents' => [
{
+ 'text' => 'j '
+ },
+ {
+ 'cmdname' => 'code',
'contents' => [
{
- 'text' => 'some code'
+ 'contents' => [
+ {
+ 'text' => 'some code'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ },
+ {
+ 'text' => ' '
}
],
'source_info' => {
'line_nr' => 1
- }
+ },
+ 'type' => 'bracketed_arg'
},
{
'text' => ' '
- }
- ],
- 'source_info' => {
- 'line_nr' => 1
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'var',
- 'contents' => [
+ },
{
+ 'cmdname' => 'var',
'contents' => [
{
- 'text' => 'cmd'
+ 'contents' => [
+ {
+ 'text' => 'cmd'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ },
+ {
+ 'text' => 'gg hh j'
}
],
- 'source_info' => {
- 'line_nr' => 1
- }
- },
- {
- 'text' => 'gg hh j'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/converters_tests/table_in_display_in_example.pl
b/tp/t/results/converters_tests/table_in_display_in_example.pl
index 6c0295ec4e..1dccb94ea4 100644
--- a/tp/t/results/converters_tests/table_in_display_in_example.pl
+++ b/tp/t/results/converters_tests/table_in_display_in_example.pl
@@ -38,27 +38,30 @@ $result_trees{'table_in_display_in_example'} = {
'cmdname' => 'display',
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 3
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 3
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -229,7 +232,7 @@ $result_trees{'table_in_display_in_example'} = {
],
'type' => 'document_root'
};
-$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'table_in_display_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'table_in_display_in_example'} = '@example
@display
diff --git a/tp/t/results/converters_tests/table_in_example_in_display.pl
b/tp/t/results/converters_tests/table_in_example_in_display.pl
index a40bcb5357..f78579d1d5 100644
--- a/tp/t/results/converters_tests/table_in_example_in_display.pl
+++ b/tp/t/results/converters_tests/table_in_example_in_display.pl
@@ -38,27 +38,30 @@ $result_trees{'table_in_example_in_display'} = {
'cmdname' => 'example',
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 3
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 3
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -229,7 +232,7 @@ $result_trees{'table_in_example_in_display'} = {
],
'type' => 'document_root'
};
-$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'table_in_example_in_display'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'table_in_example_in_display'} = '@display
@example
diff --git
a/tp/t/results/converters_tests/various_itemize_command_as_argument.pl
b/tp/t/results/converters_tests/various_itemize_command_as_argument.pl
index ccc15ab534..b6ee64d298 100644
--- a/tp/t/results/converters_tests/various_itemize_command_as_argument.pl
+++ b/tp/t/results/converters_tests/various_itemize_command_as_argument.pl
@@ -132,27 +132,30 @@ $result_trees{'various_itemize_command_as_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'inlineraw',
- 'source_info' => {
- 'line_nr' => 7
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'inlineraw',
+ 'source_info' => {
+ 'line_nr' => 7
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -226,27 +229,30 @@ $result_trees{'various_itemize_command_as_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'image',
- 'source_info' => {
- 'line_nr' => 11
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'image',
+ 'source_info' => {
+ 'line_nr' => 11
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -344,27 +350,30 @@ $result_trees{'various_itemize_command_as_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'footnote',
- 'source_info' => {
- 'line_nr' => 16
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'footnote',
+ 'source_info' => {
+ 'line_nr' => 16
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -485,27 +494,30 @@ $result_trees{'various_itemize_command_as_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'caption',
- 'source_info' => {
- 'line_nr' => 25
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'caption',
+ 'source_info' => {
+ 'line_nr' => 25
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -579,27 +591,30 @@ $result_trees{'various_itemize_command_as_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'math',
- 'source_info' => {
- 'line_nr' => 29
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'math',
+ 'source_info' => {
+ 'line_nr' => 29
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -735,27 +750,30 @@ $result_trees{'various_itemize_command_as_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'anchor',
- 'source_info' => {
- 'line_nr' => 37
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'anchor',
+ 'source_info' => {
+ 'line_nr' => 37
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -853,27 +871,30 @@ $result_trees{'various_itemize_command_as_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'verb',
- 'source_info' => {
- 'line_nr' => 42
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'verb',
+ 'source_info' => {
+ 'line_nr' => 42
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -962,13 +983,13 @@ $result_trees{'various_itemize_command_as_argument'} = {
],
'type' => 'document_root'
};
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[9]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[11]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[11]{'args'}[0]{'contents'}[0];
-$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[13]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[9]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[11]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[13]{'extra'}{'command_as_argument'}
=
$result_trees{'various_itemize_command_as_argument'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'various_itemize_command_as_argument'} = '@node Top
@top top
diff --git
a/tp/t/results/converters_tests/various_vtable_command_as_argument.pl
b/tp/t/results/converters_tests/various_vtable_command_as_argument.pl
index e9fb68b4e4..f4c5957f9f 100644
--- a/tp/t/results/converters_tests/various_vtable_command_as_argument.pl
+++ b/tp/t/results/converters_tests/various_vtable_command_as_argument.pl
@@ -132,27 +132,30 @@ $result_trees{'various_vtable_command_as_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'inlineraw',
- 'source_info' => {
- 'line_nr' => 7
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'inlineraw',
+ 'source_info' => {
+ 'line_nr' => 7
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -334,27 +337,30 @@ $result_trees{'various_vtable_command_as_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'image',
- 'source_info' => {
- 'line_nr' => 13
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'image',
+ 'source_info' => {
+ 'line_nr' => 13
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -482,27 +488,30 @@ $result_trees{'various_vtable_command_as_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'footnote',
- 'source_info' => {
- 'line_nr' => 18
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'footnote',
+ 'source_info' => {
+ 'line_nr' => 18
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -630,27 +639,30 @@ $result_trees{'various_vtable_command_as_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'caption',
- 'source_info' => {
- 'line_nr' => 23
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'caption',
+ 'source_info' => {
+ 'line_nr' => 23
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -778,27 +790,30 @@ $result_trees{'various_vtable_command_as_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'math',
- 'source_info' => {
- 'line_nr' => 28
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'math',
+ 'source_info' => {
+ 'line_nr' => 28
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -952,27 +967,30 @@ $result_trees{'various_vtable_command_as_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'anchor',
- 'source_info' => {
- 'line_nr' => 33
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'anchor',
+ 'source_info' => {
+ 'line_nr' => 33
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1100,27 +1118,30 @@ $result_trees{'various_vtable_command_as_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'verb',
- 'source_info' => {
- 'line_nr' => 38
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'verb',
+ 'source_info' => {
+ 'line_nr' => 38
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1364,28 +1385,28 @@ $result_trees{'various_vtable_command_as_argument'} = {
],
'type' => 'document_root'
};
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[9]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[11]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[11]{'args'}[0]{'contents'}[0];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
-$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[13]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'contents'}[0];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[9]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[11]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'various_vtable_command_as_argument'}{'contents'}[3];
+$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[13]{'extra'}{'command_as_argument'}
=
$result_trees{'various_vtable_command_as_argument'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'various_vtable_command_as_argument'} = '@node Top
@top top
diff --git a/tp/t/results/coverage/formats_only_title_comments.pl
b/tp/t/results/coverage/formats_only_title_comments.pl
index a98f905339..3c681edff3 100644
--- a/tp/t/results/coverage/formats_only_title_comments.pl
+++ b/tp/t/results/coverage/formats_only_title_comments.pl
@@ -10,27 +10,30 @@ $result_trees{'formats_only_title_comments'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -99,25 +102,28 @@ $result_trees{'formats_only_title_comments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
- {
- 'text' => ' comment on enumerate line
+ 'contents' => [
+ {
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comment on enumerate line
',
- 'type' => 'rawline_arg'
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
}
- ],
- 'cmdname' => 'c'
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -191,27 +197,30 @@ $result_trees{'formats_only_title_comments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 11
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 11
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -285,36 +294,39 @@ $result_trees{'formats_only_title_comments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 16
- }
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
+ 'contents' => [
{
- 'text' => ' comment on vtable line
-',
- 'type' => 'rawline_arg'
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 16
+ }
}
],
- 'cmdname' => 'c'
- },
- 'spaces_after_argument' => {
- 'text' => ' '
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comment on vtable line
+',
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
+ },
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -378,48 +390,51 @@ $result_trees{'formats_only_title_comments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '0.5 0.5'
+ 'contents' => [
+ {
+ 'text' => '0.5 0.5'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.5',
+ '0.5'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 20
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.5',
- '0.5'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 20
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -494,10 +509,10 @@ $result_trees{'formats_only_title_comments'} = {
],
'type' => 'document_root'
};
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[8]{'extra'}{'columnfractions'}
=
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[8]{'extra'}{'columnfractions'}
=
$result_trees{'formats_only_title_comments'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'formats_only_title_comments'} = '@itemize
@c comment itemize
diff --git a/tp/t/results/coverage/formats_only_titles.pl
b/tp/t/results/coverage/formats_only_titles.pl
index 6068d3643b..4e228e8961 100644
--- a/tp/t/results/coverage/formats_only_titles.pl
+++ b/tp/t/results/coverage/formats_only_titles.pl
@@ -10,27 +10,30 @@ $result_trees{'formats_only_titles'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -89,19 +92,22 @@ $result_trees{'formats_only_titles'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -160,27 +166,30 @@ $result_trees{'formats_only_titles'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 9
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 9
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -244,27 +253,30 @@ $result_trees{'formats_only_titles'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 13
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 13
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -328,48 +340,51 @@ $result_trees{'formats_only_titles'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '0.5 0.5'
+ 'contents' => [
+ {
+ 'text' => '0.5 0.5'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.5',
+ '0.5'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 17
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.5',
- '0.5'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 17
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -434,10 +449,10 @@ $result_trees{'formats_only_titles'} = {
],
'type' => 'document_root'
};
-$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[8]{'extra'}{'columnfractions'}
=
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[8]{'extra'}{'columnfractions'}
=
$result_trees{'formats_only_titles'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'formats_only_titles'} = '@itemize
before first itemize
diff --git a/tp/t/results/coverage/formats_titles.pl
b/tp/t/results/coverage/formats_titles.pl
index e991be852c..3d65089ce1 100644
--- a/tp/t/results/coverage/formats_titles.pl
+++ b/tp/t/results/coverage/formats_titles.pl
@@ -10,27 +10,30 @@ $result_trees{'formats_titles'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -113,19 +116,22 @@ $result_trees{'formats_titles'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -208,27 +214,30 @@ $result_trees{'formats_titles'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 11
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 11
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -329,27 +338,30 @@ $result_trees{'formats_titles'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 16
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 16
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -456,48 +468,51 @@ $result_trees{'formats_titles'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '0.5 0.5'
+ 'contents' => [
+ {
+ 'text' => '0.5 0.5'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.5',
+ '0.5'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 21
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.5',
- '0.5'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 21
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -622,10 +637,10 @@ $result_trees{'formats_titles'} = {
],
'type' => 'document_root'
};
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[8]{'extra'}{'columnfractions'}
=
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[8]{'extra'}{'columnfractions'}
=
$result_trees{'formats_titles'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'formats_titles'} = '@itemize
before first itemize
diff --git a/tp/t/results/coverage/item_container.pl
b/tp/t/results/coverage/item_container.pl
index f6296ef589..1efc92afd6 100644
--- a/tp/t/results/coverage/item_container.pl
+++ b/tp/t/results/coverage/item_container.pl
@@ -15,24 +15,27 @@ $result_trees{'item_container'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'text' => '+'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '+'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -103,27 +106,30 @@ $result_trees{'item_container'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
- 'source_info' => {
- 'line_nr' => 6
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'line_nr' => 6
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -202,27 +208,30 @@ $result_trees{'item_container'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -291,8 +300,8 @@ $result_trees{'item_container'} = {
],
'type' => 'document_root'
};
-$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'item_container'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'item_container'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'item_container'} = '
@itemize +
diff --git a/tp/t/results/coverage/multitable.pl
b/tp/t/results/coverage/multitable.pl
index 9f8505a6fd..7891e15c7c 100644
--- a/tp/t/results/coverage/multitable.pl
+++ b/tp/t/results/coverage/multitable.pl
@@ -15,48 +15,51 @@ $result_trees{'multitable'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '0.6 0.4'
+ 'contents' => [
+ {
+ 'text' => '0.6 0.4'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.6',
+ '0.4'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 2
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.6',
- '0.4'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 2
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -359,46 +362,49 @@ $result_trees{'multitable'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'truc'
- }
- ],
- 'source_info' => {
- 'line_nr' => 11
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 11
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
+ },
{
- 'text' => 'bidule'
+ 'contents' => [
+ {
+ 'text' => 'bidule'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 11
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 11
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -508,7 +514,7 @@ $result_trees{'multitable'} = {
],
'type' => 'document_root'
};
-$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'extra'}{'columnfractions'}
=
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'extra'}{'columnfractions'}
=
$result_trees{'multitable'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'multitable'} = '
@multitable @columnfractions 0.6 0.4
diff --git a/tp/t/results/coverage/preformatted.pl
b/tp/t/results/coverage/preformatted.pl
index 0989610278..98075a4655 100644
--- a/tp/t/results/coverage/preformatted.pl
+++ b/tp/t/results/coverage/preformatted.pl
@@ -101,27 +101,30 @@ $result_trees{'preformatted'} = {
'cmdname' => 'format',
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'line_nr' => 9
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'line_nr' => 9
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -268,7 +271,7 @@ $result_trees{'preformatted'} = {
],
'type' => 'document_root'
};
-$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'preformatted'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'preformatted'} = '
@example
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index 0a0f2ffcfe..0de25dc81a 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -74,27 +74,30 @@ $result_trees{'punctuation_in_line_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 5
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 5
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -763,7 +766,7 @@ $result_trees{'punctuation_in_line_commands'} = {
],
'type' => 'document_root'
};
-$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'extra'}{'float'}
= $result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5];
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'float_section'}
= $result_trees{'punctuation_in_line_commands'}{'contents'}[2];
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'extra'}{'shortcaption'}
=
$result_trees{'punctuation_in_line_commands'}{'contents'}[2]{'contents'}[5]{'contents'}[2];
diff --git a/tp/t/results/coverage/symbol_after_block.pl
b/tp/t/results/coverage/symbol_after_block.pl
index 2ace51a3f9..ca4b8039d4 100644
--- a/tp/t/results/coverage/symbol_after_block.pl
+++ b/tp/t/results/coverage/symbol_after_block.pl
@@ -291,27 +291,30 @@ $result_trees{'symbol_after_block'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 21
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 21
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -412,27 +415,30 @@ $result_trees{'symbol_after_block'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 26
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 26
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -550,27 +556,30 @@ $result_trees{'symbol_after_block'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
- 'source_info' => {
- 'line_nr' => 33
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'line_nr' => 33
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -644,27 +653,30 @@ $result_trees{'symbol_after_block'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
- 'source_info' => {
- 'line_nr' => 37
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'line_nr' => 37
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -755,48 +767,51 @@ $result_trees{'symbol_after_block'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '6 7'
+ 'contents' => [
+ {
+ 'text' => '6 7'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '6',
+ '7'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 43
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '6',
- '7'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 43
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -967,48 +982,51 @@ $result_trees{'symbol_after_block'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '6 7'
+ 'contents' => [
+ {
+ 'text' => '6 7'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '6',
+ '7'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 48
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '6',
- '7'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 48
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1468,12 +1486,12 @@ $result_trees{'symbol_after_block'} = {
],
'type' => 'document_root'
};
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[12]{'extra'}{'command_as_argument'}
=
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[14]{'extra'}{'command_as_argument'}
=
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[18]{'extra'}{'command_as_argument'}
=
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[18]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[20]{'extra'}{'command_as_argument'}
=
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[20]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[24]{'extra'}{'columnfractions'}
=
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[24]{'args'}[0]{'contents'}[0];
-$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[26]{'extra'}{'columnfractions'}
=
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[26]{'args'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[12]{'extra'}{'command_as_argument'}
=
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[14]{'extra'}{'command_as_argument'}
=
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[18]{'extra'}{'command_as_argument'}
=
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[20]{'extra'}{'command_as_argument'}
=
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[24]{'extra'}{'columnfractions'}
=
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[24]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[26]{'extra'}{'columnfractions'}
=
$result_trees{'symbol_after_block'}{'contents'}[0]{'contents'}[26]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'symbol_after_block'} = '@html
In html
diff --git a/tp/t/results/coverage/symbol_after_command.pl
b/tp/t/results/coverage/symbol_after_command.pl
index c3f86f83dc..c14a7a3931 100644
--- a/tp/t/results/coverage/symbol_after_command.pl
+++ b/tp/t/results/coverage/symbol_after_command.pl
@@ -10,27 +10,30 @@ $result_trees{'symbol_after_command'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -381,7 +384,7 @@ $result_trees{'symbol_after_command'} = {
],
'type' => 'document_root'
};
-$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'symbol_after_command'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'symbol_after_command'} = '@table @asis
@item. dot
diff --git a/tp/t/results/coverage/table.pl b/tp/t/results/coverage/table.pl
index 5b17d2a465..9a4c393774 100644
--- a/tp/t/results/coverage/table.pl
+++ b/tp/t/results/coverage/table.pl
@@ -15,27 +15,30 @@ $result_trees{'table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 2
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 2
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -168,33 +171,36 @@ $result_trees{'table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'samp',
- 'source_info' => {
- 'line_nr' => 9
- }
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
+ 'contents' => [
{
- 'text' => ' samp
-',
- 'type' => 'rawline_arg'
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'line_nr' => 9
+ }
}
],
- 'cmdname' => 'c'
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' samp
+',
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -444,27 +450,30 @@ $result_trees{'table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'strong',
- 'source_info' => {
- 'line_nr' => 20
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'strong',
+ 'source_info' => {
+ 'line_nr' => 20
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -551,9 +560,9 @@ $result_trees{'table'} = {
],
'type' => 'document_root'
};
-$result_trees{'table'}{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'table'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'table'}{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'table'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'table'}{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'table'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'table'}{'contents'}[0]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'table'}{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'table'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'table'} = '
@table @asis
diff --git a/tp/t/results/coverage/table_command_comment.pl
b/tp/t/results/coverage/table_command_comment.pl
index 1dc9362b73..496831c155 100644
--- a/tp/t/results/coverage/table_command_comment.pl
+++ b/tp/t/results/coverage/table_command_comment.pl
@@ -10,33 +10,36 @@ $result_trees{'table_command_comment'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
+ 'contents' => [
{
- 'text' => ' in comment
-',
- 'type' => 'rawline_arg'
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'cmdname' => 'c'
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' in comment
+',
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -117,7 +120,7 @@ $result_trees{'table_command_comment'} = {
],
'type' => 'document_root'
};
-$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'table_command_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'table_command_comment'} = '@table @code@c in comment
@item item
diff --git a/tp/t/results/float/complex_float.pl
b/tp/t/results/float/complex_float.pl
index df44b0fb75..5f372cd8e3 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -474,27 +474,30 @@ $result_trees{'complex_float'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 33
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 33
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -604,27 +607,30 @@ $result_trees{'complex_float'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'minus',
- 'source_info' => {
- 'line_nr' => 39
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'minus',
+ 'source_info' => {
+ 'line_nr' => 39
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1111,27 +1117,30 @@ $result_trees{'complex_float'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 60
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 60
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1241,46 +1250,49 @@ $result_trees{'complex_float'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'truc'
- }
- ],
- 'source_info' => {
- 'line_nr' => 66
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 66
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
+ },
{
- 'text' => 'bidule'
+ 'contents' => [
+ {
+ 'text' => 'bidule'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 66
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 66
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1499,27 +1511,30 @@ $result_trees{'complex_float'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'minus',
- 'source_info' => {
- 'line_nr' => 74
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'minus',
+ 'source_info' => {
+ 'line_nr' => 74
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -2383,27 +2398,30 @@ $result_trees{'complex_float'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 105
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 105
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -2513,46 +2531,49 @@ $result_trees{'complex_float'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'truc'
- }
- ],
- 'source_info' => {
- 'line_nr' => 111
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 111
+ },
+ 'type' => 'bracketed_arg'
+ },
{
- 'text' => 'bidule'
+ 'text' => ' '
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'bidule'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 111
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 111
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -2771,27 +2792,30 @@ $result_trees{'complex_float'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'minus',
- 'source_info' => {
- 'line_nr' => 119
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'minus',
+ 'source_info' => {
+ 'line_nr' => 119
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -3302,21 +3326,21 @@ $result_trees{'complex_float'} = {
};
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'complex_float'}{'contents'}[1];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[8]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[11]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[11]{'args'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[8]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[11]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[11]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'complex_float'}{'contents'}[1];
-$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[14]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[14]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'contents'}[0];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17]{'extra'}{'float'}
= $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[20]{'extra'}{'float'}
= $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'caption'}
= $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[17];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'float_section'}
= $result_trees{'complex_float'}{'contents'}[2];
$result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'extra'}{'shortcaption'}
= $result_trees{'complex_float'}{'contents'}[2]{'contents'}[7]{'contents'}[20];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[8]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'complex_float'}{'contents'}[3];
-$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[11]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[11]{'args'}[0]{'contents'}[0];
+$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[11]{'extra'}{'command_as_argument'}
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[16]{'contents'}[1]{'contents'}[0]{'contents'}[0];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'float'}
= $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1];
$result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'extra'}{'caption'}
= $result_trees{'complex_float'}{'contents'}[4]{'contents'}[1]{'contents'}[4];
diff --git a/tp/t/results/formats_encodings/sample_utf8.pl
b/tp/t/results/formats_encodings/sample_utf8.pl
index 040ff5e229..32091d1090 100644
--- a/tp/t/results/formats_encodings/sample_utf8.pl
+++ b/tp/t/results/formats_encodings/sample_utf8.pl
@@ -985,19 +985,22 @@ $result_trees{'sample_utf8'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
diff --git a/tp/t/results/html_tests/anchor_on_vtable_item.pl
b/tp/t/results/html_tests/anchor_on_vtable_item.pl
index ebf0cdcdc1..4ee80b8084 100644
--- a/tp/t/results/html_tests/anchor_on_vtable_item.pl
+++ b/tp/t/results/html_tests/anchor_on_vtable_item.pl
@@ -132,27 +132,30 @@ $result_trees{'anchor_on_vtable_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'line_nr' => 7
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'line_nr' => 7
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -590,10 +593,10 @@ $result_trees{'anchor_on_vtable_item'} = {
],
'type' => 'document_root'
};
-$result_trees{'anchor_on_vtable_item'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'anchor_on_vtable_item'}{'contents'}[3];
$result_trees{'anchor_on_vtable_item'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'anchor_on_vtable_item'}{'contents'}[3];
$result_trees{'anchor_on_vtable_item'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'anchor_on_vtable_item'}{'contents'}[3];
-$result_trees{'anchor_on_vtable_item'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'anchor_on_vtable_item'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'anchor_on_vtable_item'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'anchor_on_vtable_item'}{'contents'}[3];
+$result_trees{'anchor_on_vtable_item'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'anchor_on_vtable_item'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'anchor_on_vtable_item'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'anchor_on_vtable_item'}{'contents'}[6]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'anchor_on_vtable_item'} = '@node Top
diff --git
a/tp/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
b/tp/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
index efb5695364..df350091c9 100644
---
a/tp/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
+++
b/tp/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
@@ -106,27 +106,30 @@
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'samp',
- 'source_info' => {
- 'line_nr' => 6
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'line_nr' => 6
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -472,7 +475,7 @@
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
],
'type' => 'document_root'
};
-$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'file_name_case_insensitive_conflict_redirections'}{'contents'}[3]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
diff --git a/tp/t/results/html_tests/fractions_rounding.pl
b/tp/t/results/html_tests/fractions_rounding.pl
index 8e642110c5..39975f58fc 100644
--- a/tp/t/results/html_tests/fractions_rounding.pl
+++ b/tp/t/results/html_tests/fractions_rounding.pl
@@ -10,50 +10,53 @@ $result_trees{'fractions_rounding'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '.19 .30 .29 .22'
+ 'contents' => [
+ {
+ 'text' => '.19 .30 .29 .22'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '.19',
+ '.30',
+ '.29',
+ '.22'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '.19',
- '.30',
- '.29',
- '.22'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 1
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -387,7 +390,7 @@ $result_trees{'fractions_rounding'} = {
],
'type' => 'document_root'
};
-$result_trees{'fractions_rounding'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'fractions_rounding'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'fractions_rounding'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'fractions_rounding'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'fractions_rounding'} = '@multitable @columnfractions .19 .30
.29 .22
@item In contents @tab In contents @tab In
contents @tab Not in contents
diff --git a/tp/t/results/html_tests/itemize_arguments.pl
b/tp/t/results/html_tests/itemize_arguments.pl
index 72d34ca936..96fa3b6cd7 100644
--- a/tp/t/results/html_tests/itemize_arguments.pl
+++ b/tp/t/results/html_tests/itemize_arguments.pl
@@ -23,24 +23,27 @@ $result_trees{'itemize_arguments'} = {
'type' => 'preamble_before_content'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'text' => '---'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '---'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -111,24 +114,27 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'a\'\'b\'c'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'a\'\'b\'c'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -199,37 +205,40 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
'contents' => [
{
+ 'cmdname' => 'code',
'contents' => [
{
- 'text' => 'a\'\'b\'c'
+ 'contents' => [
+ {
+ 'text' => 'a\'\'b\'c'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 10
+ }
}
],
- 'source_info' => {
- 'line_nr' => 10
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -319,24 +328,27 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'a``b`c'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'a``b`c'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -407,24 +419,27 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'a\'"'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'a\'"'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -495,24 +510,27 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'b\\<&'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'b\\<&'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -583,27 +601,30 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'today',
- 'source_info' => {
- 'line_nr' => 26
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'today',
+ 'source_info' => {
+ 'line_nr' => 26
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -691,59 +712,62 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'aa',
'contents' => [
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 30
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'sc',
- 'contents' => [
+ 'cmdname' => 'aa',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 30
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'sc',
'contents' => [
{
- 'cmdname' => 'aa',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'aa',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 30
+ }
}
],
- 'source_info' => {
- 'line_nr' => 30
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 30
+ }
}
],
- 'source_info' => {
- 'line_nr' => 30
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -855,32 +879,35 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'tie',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'tie',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 34
+ }
}
],
- 'source_info' => {
- 'line_nr' => 34
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -968,35 +995,38 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'tie',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'tie',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 38
+ }
+ },
+ {
+ 'text' => ' a'
}
],
- 'source_info' => {
- 'line_nr' => 38
- }
- },
- {
- 'text' => ' a'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1081,27 +1111,30 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'atchar',
- 'source_info' => {
- 'line_nr' => 42
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'atchar',
+ 'source_info' => {
+ 'line_nr' => 42
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1175,35 +1208,38 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'atchar',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'atchar',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 46
+ }
+ },
+ {
+ 'text' => ' a'
}
],
- 'source_info' => {
- 'line_nr' => 46
- }
- },
- {
- 'text' => ' a'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1288,24 +1324,27 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '*'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => '*'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1382,24 +1421,27 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '{'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => '{'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1476,24 +1518,27 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '&'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => '&'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1570,27 +1615,30 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'ampchar',
- 'source_info' => {
- 'line_nr' => 62
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'ampchar',
+ 'source_info' => {
+ 'line_nr' => 62
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1678,27 +1726,30 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '&'
- },
- {
- 'text' => ' a'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => '&'
+ },
+ {
+ 'text' => ' a'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1775,35 +1826,38 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'ampchar',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'ampchar',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 70
+ }
+ },
+ {
+ 'text' => ' a'
}
],
- 'source_info' => {
- 'line_nr' => 70
- }
- },
- {
- 'text' => ' a'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1888,32 +1942,35 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
+ 'cmdname' => 'itemize',
+ 'contents' => [
+ {
'contents' => [
{
- 'cmdname' => 'registeredsymbol',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'registeredsymbol',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 74
+ }
}
],
- 'source_info' => {
- 'line_nr' => 74
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -2001,35 +2058,38 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'registeredsymbol',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'registeredsymbol',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 78
+ }
+ },
+ {
+ 'text' => ' a'
}
],
- 'source_info' => {
- 'line_nr' => 78
- }
- },
- {
- 'text' => ' a'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -2114,32 +2174,35 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'enddots',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'enddots',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 82
+ }
}
],
- 'source_info' => {
- 'line_nr' => 82
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -2227,35 +2290,38 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'enddots',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'enddots',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 86
+ }
+ },
+ {
+ 'text' => ' a'
}
],
- 'source_info' => {
- 'line_nr' => 86
- }
- },
- {
- 'text' => ' a'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -2340,69 +2406,72 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '^',
'contents' => [
{
+ 'cmdname' => '^',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
- }
- ],
- 'source_info' => {
- 'line_nr' => 90
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'sc',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 90
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'sc',
'contents' => [
{
- 'cmdname' => '^',
'contents' => [
{
+ 'cmdname' => '^',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
+ 'source_info' => {
+ 'line_nr' => 90
+ }
}
],
- 'source_info' => {
- 'line_nr' => 90
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 90
+ }
}
],
- 'source_info' => {
- 'line_nr' => 90
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -2524,69 +2593,72 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '^',
'contents' => [
{
+ 'cmdname' => '^',
'contents' => [
{
- 'text' => 'E'
+ 'contents' => [
+ {
+ 'text' => 'E'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
- }
- ],
- 'source_info' => {
- 'line_nr' => 94
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'sc',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 94
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'sc',
'contents' => [
{
- 'cmdname' => '^',
'contents' => [
{
+ 'cmdname' => '^',
'contents' => [
{
- 'text' => 'E'
+ 'contents' => [
+ {
+ 'text' => 'E'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
+ 'source_info' => {
+ 'line_nr' => 94
+ }
}
],
- 'source_info' => {
- 'line_nr' => 94
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 94
+ }
}
],
- 'source_info' => {
- 'line_nr' => 94
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -2708,133 +2780,136 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '~',
'contents' => [
{
+ 'cmdname' => '~',
'contents' => [
{
- 'cmdname' => 'dotless',
'contents' => [
{
+ 'cmdname' => 'dotless',
'contents' => [
{
- 'text' => 'i'
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 98
+ }
}
],
- 'source_info' => {
- 'line_nr' => 98
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 98
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'dotless',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 98
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'dotless',
'contents' => [
{
- 'text' => 'i'
- }
- ],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 98
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'sc',
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 98
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'sc',
'contents' => [
{
- 'cmdname' => '~',
'contents' => [
{
+ 'cmdname' => '~',
'contents' => [
{
- 'cmdname' => 'dotless',
'contents' => [
{
+ 'cmdname' => 'dotless',
'contents' => [
{
- 'text' => 'i'
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 98
+ }
}
],
- 'source_info' => {
- 'line_nr' => 98
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 98
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'dotless',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 98
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'dotless',
'contents' => [
{
- 'text' => 'i'
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 98
+ }
}
],
- 'source_info' => {
- 'line_nr' => 98
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 98
+ }
}
],
- 'source_info' => {
- 'line_nr' => 98
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -3020,133 +3095,136 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'udotaccent',
'contents' => [
{
+ 'cmdname' => 'udotaccent',
'contents' => [
{
- 'text' => 'r'
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 102
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'v',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 102
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'v',
'contents' => [
{
- 'cmdname' => '\'',
'contents' => [
{
+ 'cmdname' => '\'',
'contents' => [
{
- 'text' => 'r'
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 102
+ }
}
],
- 'source_info' => {
- 'line_nr' => 102
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 102
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'sc',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 102
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'sc',
'contents' => [
{
- 'cmdname' => 'udotaccent',
'contents' => [
{
+ 'cmdname' => 'udotaccent',
'contents' => [
{
- 'text' => 'r'
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 102
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'v',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 102
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'v',
'contents' => [
{
- 'cmdname' => '\'',
'contents' => [
{
+ 'cmdname' => '\'',
'contents' => [
{
- 'text' => 'r'
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 102
+ }
}
],
- 'source_info' => {
- 'line_nr' => 102
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 102
+ }
}
],
- 'source_info' => {
- 'line_nr' => 102
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 102
+ }
}
],
- 'source_info' => {
- 'line_nr' => 102
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -3332,124 +3410,127 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '=',
'contents' => [
{
+ 'cmdname' => '=',
'contents' => [
{
- 'cmdname' => ',',
'contents' => [
{
+ 'cmdname' => ',',
'contents' => [
{
- 'cmdname' => '~',
'contents' => [
{
+ 'cmdname' => '~',
'contents' => [
{
- 'text' => 'n'
+ 'contents' => [
+ {
+ 'text' => 'n'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 106
+ }
}
],
- 'source_info' => {
- 'line_nr' => 106
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 106
+ }
}
],
- 'source_info' => {
- 'line_nr' => 106
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 106
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'sc',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 106
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'sc',
'contents' => [
{
- 'text' => ' '
- },
- {
- 'cmdname' => '=',
'contents' => [
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '=',
'contents' => [
{
- 'cmdname' => ',',
'contents' => [
{
+ 'cmdname' => ',',
'contents' => [
{
- 'cmdname' => '~',
'contents' => [
{
+ 'cmdname' => '~',
'contents' => [
{
- 'text' => 'n'
+ 'contents' => [
+ {
+ 'text' => 'n'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 106
+ }
}
],
- 'source_info' => {
- 'line_nr' => 106
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 106
+ }
}
],
- 'source_info' => {
- 'line_nr' => 106
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 106
+ }
}
],
- 'source_info' => {
- 'line_nr' => 106
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 106
+ }
}
],
- 'source_info' => {
- 'line_nr' => 106
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -3626,27 +3707,30 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 110
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 110
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -3734,35 +3818,38 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'click',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'click',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'extra' => {
+ 'clickstyle' => 'arrow'
+ },
+ 'source_info' => {
+ 'line_nr' => 114
+ }
}
],
- 'extra' => {
- 'clickstyle' => 'arrow'
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'source_info' => {
- 'line_nr' => 114
- }
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -3853,38 +3940,41 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'click',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'click',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'extra' => {
+ 'clickstyle' => 'arrow'
+ },
+ 'source_info' => {
+ 'line_nr' => 118
+ }
+ },
+ {
+ 'text' => ' a'
}
],
- 'extra' => {
- 'clickstyle' => 'arrow'
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'source_info' => {
- 'line_nr' => 118
- }
- },
- {
- 'text' => ' a'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -3994,35 +4084,38 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'click',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'click',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'extra' => {
+ 'clickstyle' => 'result'
+ },
+ 'source_info' => {
+ 'line_nr' => 124
+ }
}
],
- 'extra' => {
- 'clickstyle' => 'result'
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'source_info' => {
- 'line_nr' => 124
- }
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -4113,38 +4206,41 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'click',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'click',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'extra' => {
+ 'clickstyle' => 'result'
+ },
+ 'source_info' => {
+ 'line_nr' => 128
+ }
+ },
+ {
+ 'text' => ' a'
}
],
- 'extra' => {
- 'clickstyle' => 'result'
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'source_info' => {
- 'line_nr' => 128
- }
- },
- {
- 'text' => ' a'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -4232,32 +4328,35 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'error',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'error',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 132
+ }
}
],
- 'source_info' => {
- 'line_nr' => 132
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -4345,35 +4444,38 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'error',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'error',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 136
+ }
+ },
+ {
+ 'text' => ' a'
}
],
- 'source_info' => {
- 'line_nr' => 136
- }
- },
- {
- 'text' => ' a'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -4488,32 +4590,35 @@ $result_trees{'itemize_arguments'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'error',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'error',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 141
+ }
}
],
- 'source_info' => {
- 'line_nr' => 141
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -4601,35 +4706,38 @@ $result_trees{'itemize_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'error',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'error',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 145
+ }
+ },
+ {
+ 'text' => ' a'
}
],
- 'source_info' => {
- 'line_nr' => 145
- }
- },
- {
- 'text' => ' a'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -4719,17 +4827,17 @@ $result_trees{'itemize_arguments'} = {
],
'type' => 'document_root'
};
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[14]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[18]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[18]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[22]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[32]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[32]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[38]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[38]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[42]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[42]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[56]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[56]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[58]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[58]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[64]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[64]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[68]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[68]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[73]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[73]{'args'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[14]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[18]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[22]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[32]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[38]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[42]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[56]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[58]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[64]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[68]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[73]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments'}{'contents'}[0]{'contents'}[73]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'itemize_arguments'} = '
@itemize ---
diff --git a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
index 0e5bb0b694..d631b0dc56 100644
--- a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
+++ b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
@@ -23,24 +23,27 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'preamble_before_content'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'text' => '---'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '---'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -111,24 +114,27 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'a\'\'b\'c'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'a\'\'b\'c'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -199,37 +205,40 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
'contents' => [
{
+ 'cmdname' => 'code',
'contents' => [
{
- 'text' => 'a\'\'b\'c'
+ 'contents' => [
+ {
+ 'text' => 'a\'\'b\'c'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 10
+ }
}
],
- 'source_info' => {
- 'line_nr' => 10
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -319,24 +328,27 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'a``b`c'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'a``b`c'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -407,24 +419,27 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'a\'"'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'a\'"'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -495,24 +510,27 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'b\\<&'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'b\\<&'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -583,27 +601,30 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'today',
- 'source_info' => {
- 'line_nr' => 26
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'today',
+ 'source_info' => {
+ 'line_nr' => 26
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -691,59 +712,62 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'aa',
'contents' => [
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 30
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'sc',
- 'contents' => [
+ 'cmdname' => 'aa',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 30
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'sc',
'contents' => [
{
- 'cmdname' => 'aa',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'aa',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 30
+ }
}
],
- 'source_info' => {
- 'line_nr' => 30
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 30
+ }
}
],
- 'source_info' => {
- 'line_nr' => 30
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -855,32 +879,35 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'tie',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'tie',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 34
+ }
}
],
- 'source_info' => {
- 'line_nr' => 34
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -968,35 +995,38 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'tie',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'tie',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 38
+ }
+ },
+ {
+ 'text' => ' a'
}
],
- 'source_info' => {
- 'line_nr' => 38
- }
- },
- {
- 'text' => ' a'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1081,27 +1111,30 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'atchar',
- 'source_info' => {
- 'line_nr' => 42
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'atchar',
+ 'source_info' => {
+ 'line_nr' => 42
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1175,35 +1208,38 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'atchar',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'atchar',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 46
+ }
+ },
+ {
+ 'text' => ' a'
}
],
- 'source_info' => {
- 'line_nr' => 46
- }
- },
- {
- 'text' => ' a'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1288,24 +1324,27 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '*'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => '*'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1382,24 +1421,27 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '{'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => '{'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1476,24 +1518,27 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '&'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => '&'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1570,27 +1615,30 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'ampchar',
- 'source_info' => {
- 'line_nr' => 62
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'ampchar',
+ 'source_info' => {
+ 'line_nr' => 62
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1678,27 +1726,30 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '&'
- },
- {
- 'text' => ' a'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => '&'
+ },
+ {
+ 'text' => ' a'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1775,35 +1826,38 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'ampchar',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'ampchar',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 70
+ }
+ },
+ {
+ 'text' => ' a'
}
],
- 'source_info' => {
- 'line_nr' => 70
- }
- },
- {
- 'text' => ' a'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1888,32 +1942,35 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
+ 'cmdname' => 'itemize',
+ 'contents' => [
+ {
'contents' => [
{
- 'cmdname' => 'registeredsymbol',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'registeredsymbol',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 74
+ }
}
],
- 'source_info' => {
- 'line_nr' => 74
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -2001,35 +2058,38 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'registeredsymbol',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'registeredsymbol',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 78
+ }
+ },
+ {
+ 'text' => ' a'
}
],
- 'source_info' => {
- 'line_nr' => 78
- }
- },
- {
- 'text' => ' a'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -2114,32 +2174,35 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'enddots',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'enddots',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 82
+ }
}
],
- 'source_info' => {
- 'line_nr' => 82
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -2227,35 +2290,38 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'enddots',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'enddots',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 86
+ }
+ },
+ {
+ 'text' => ' a'
}
],
- 'source_info' => {
- 'line_nr' => 86
- }
- },
- {
- 'text' => ' a'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -2340,69 +2406,72 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '^',
'contents' => [
{
+ 'cmdname' => '^',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
- }
- ],
- 'source_info' => {
- 'line_nr' => 90
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'sc',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 90
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'sc',
'contents' => [
{
- 'cmdname' => '^',
'contents' => [
{
+ 'cmdname' => '^',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
+ 'source_info' => {
+ 'line_nr' => 90
+ }
}
],
- 'source_info' => {
- 'line_nr' => 90
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 90
+ }
}
],
- 'source_info' => {
- 'line_nr' => 90
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -2524,69 +2593,72 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '^',
'contents' => [
{
+ 'cmdname' => '^',
'contents' => [
{
- 'text' => 'E'
+ 'contents' => [
+ {
+ 'text' => 'E'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
- }
- ],
- 'source_info' => {
- 'line_nr' => 94
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'sc',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 94
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'sc',
'contents' => [
{
- 'cmdname' => '^',
'contents' => [
{
+ 'cmdname' => '^',
'contents' => [
{
- 'text' => 'E'
+ 'contents' => [
+ {
+ 'text' => 'E'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
+ 'source_info' => {
+ 'line_nr' => 94
+ }
}
],
- 'source_info' => {
- 'line_nr' => 94
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 94
+ }
}
],
- 'source_info' => {
- 'line_nr' => 94
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -2708,133 +2780,136 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '~',
'contents' => [
{
+ 'cmdname' => '~',
'contents' => [
{
- 'cmdname' => 'dotless',
'contents' => [
{
+ 'cmdname' => 'dotless',
'contents' => [
{
- 'text' => 'i'
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 98
+ }
}
],
- 'source_info' => {
- 'line_nr' => 98
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 98
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'dotless',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 98
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'dotless',
'contents' => [
{
- 'text' => 'i'
- }
- ],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 98
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'sc',
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 98
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'sc',
'contents' => [
{
- 'cmdname' => '~',
'contents' => [
{
+ 'cmdname' => '~',
'contents' => [
{
- 'cmdname' => 'dotless',
'contents' => [
{
+ 'cmdname' => 'dotless',
'contents' => [
{
- 'text' => 'i'
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 98
+ }
}
],
- 'source_info' => {
- 'line_nr' => 98
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 98
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'dotless',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 98
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'dotless',
'contents' => [
{
- 'text' => 'i'
+ 'contents' => [
+ {
+ 'text' => 'i'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 98
+ }
}
],
- 'source_info' => {
- 'line_nr' => 98
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 98
+ }
}
],
- 'source_info' => {
- 'line_nr' => 98
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -3020,133 +3095,136 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'udotaccent',
'contents' => [
{
+ 'cmdname' => 'udotaccent',
'contents' => [
{
- 'text' => 'r'
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 102
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'v',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 102
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'v',
'contents' => [
{
- 'cmdname' => '\'',
'contents' => [
{
+ 'cmdname' => '\'',
'contents' => [
{
- 'text' => 'r'
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 102
+ }
}
],
- 'source_info' => {
- 'line_nr' => 102
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 102
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'sc',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 102
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'sc',
'contents' => [
{
- 'cmdname' => 'udotaccent',
'contents' => [
{
+ 'cmdname' => 'udotaccent',
'contents' => [
{
- 'text' => 'r'
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 102
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'v',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 102
+ }
+ },
+ {
+ 'text' => ' '
+ },
{
+ 'cmdname' => 'v',
'contents' => [
{
- 'cmdname' => '\'',
'contents' => [
{
+ 'cmdname' => '\'',
'contents' => [
{
- 'text' => 'r'
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 102
+ }
}
],
- 'source_info' => {
- 'line_nr' => 102
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 102
+ }
}
],
- 'source_info' => {
- 'line_nr' => 102
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 102
+ }
}
],
- 'source_info' => {
- 'line_nr' => 102
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -3332,124 +3410,127 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '=',
'contents' => [
{
+ 'cmdname' => '=',
'contents' => [
{
- 'cmdname' => ',',
'contents' => [
{
+ 'cmdname' => ',',
'contents' => [
{
- 'cmdname' => '~',
'contents' => [
{
+ 'cmdname' => '~',
'contents' => [
{
- 'text' => 'n'
+ 'contents' => [
+ {
+ 'text' => 'n'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 106
+ }
}
],
- 'source_info' => {
- 'line_nr' => 106
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 106
+ }
}
],
- 'source_info' => {
- 'line_nr' => 106
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 106
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'sc',
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 106
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'sc',
'contents' => [
{
- 'text' => ' '
- },
- {
- 'cmdname' => '=',
'contents' => [
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => '=',
'contents' => [
{
- 'cmdname' => ',',
'contents' => [
{
+ 'cmdname' => ',',
'contents' => [
{
- 'cmdname' => '~',
'contents' => [
{
+ 'cmdname' => '~',
'contents' => [
{
- 'text' => 'n'
+ 'contents' => [
+ {
+ 'text' => 'n'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 106
+ }
}
],
- 'source_info' => {
- 'line_nr' => 106
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 106
+ }
}
],
- 'source_info' => {
- 'line_nr' => 106
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 106
+ }
}
],
- 'source_info' => {
- 'line_nr' => 106
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 106
+ }
}
],
- 'source_info' => {
- 'line_nr' => 106
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -3626,27 +3707,30 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 110
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 110
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -3734,35 +3818,38 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'click',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'click',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'extra' => {
+ 'clickstyle' => 'arrow'
+ },
+ 'source_info' => {
+ 'line_nr' => 114
+ }
}
],
- 'extra' => {
- 'clickstyle' => 'arrow'
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'source_info' => {
- 'line_nr' => 114
- }
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -3853,38 +3940,41 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'click',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'click',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'extra' => {
+ 'clickstyle' => 'arrow'
+ },
+ 'source_info' => {
+ 'line_nr' => 118
+ }
+ },
+ {
+ 'text' => ' a'
}
],
- 'extra' => {
- 'clickstyle' => 'arrow'
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'source_info' => {
- 'line_nr' => 118
- }
- },
- {
- 'text' => ' a'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -3994,35 +4084,38 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'click',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'click',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'extra' => {
+ 'clickstyle' => 'result'
+ },
+ 'source_info' => {
+ 'line_nr' => 124
+ }
}
],
- 'extra' => {
- 'clickstyle' => 'result'
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'source_info' => {
- 'line_nr' => 124
- }
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -4113,38 +4206,41 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'click',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'click',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'extra' => {
+ 'clickstyle' => 'result'
+ },
+ 'source_info' => {
+ 'line_nr' => 128
+ }
+ },
+ {
+ 'text' => ' a'
}
],
- 'extra' => {
- 'clickstyle' => 'result'
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'source_info' => {
- 'line_nr' => 128
- }
- },
- {
- 'text' => ' a'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -4232,32 +4328,35 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'error',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'error',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 132
+ }
}
],
- 'source_info' => {
- 'line_nr' => 132
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -4345,35 +4444,38 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'error',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'error',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 136
+ }
+ },
+ {
+ 'text' => ' a'
}
],
- 'source_info' => {
- 'line_nr' => 136
- }
- },
- {
- 'text' => ' a'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -4488,32 +4590,35 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'error',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'error',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 141
+ }
}
],
- 'source_info' => {
- 'line_nr' => 141
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -4601,35 +4706,38 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'error',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'error',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 145
+ }
+ },
+ {
+ 'text' => ' a'
}
],
- 'source_info' => {
- 'line_nr' => 145
- }
- },
- {
- 'text' => ' a'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -4719,17 +4827,17 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
],
'type' => 'document_root'
};
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[14]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[14]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[18]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[18]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[22]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[32]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[32]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[38]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[38]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[42]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[42]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[56]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[56]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[58]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[58]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[64]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[64]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[68]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[68]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[73]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[73]{'args'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[14]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[14]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[18]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[18]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[22]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[32]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[32]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[38]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[38]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[42]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[42]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[56]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[56]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[58]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[58]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[64]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[64]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[68]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[68]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[73]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_arguments_enable_encoding'}{'contents'}[0]{'contents'}[73]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'itemize_arguments_enable_encoding'} = '
@itemize ---
diff --git a/tp/t/results/html_tests/itemize_tieaccent.pl
b/tp/t/results/html_tests/itemize_tieaccent.pl
index 58888662c5..5698eb6c73 100644
--- a/tp/t/results/html_tests/itemize_tieaccent.pl
+++ b/tp/t/results/html_tests/itemize_tieaccent.pl
@@ -13,37 +13,40 @@ $result_trees{'itemize_tieaccent'} = {
'type' => 'preamble_before_content'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'tieaccent',
'contents' => [
{
+ 'cmdname' => 'tieaccent',
'contents' => [
{
- 'text' => 'ab'
+ 'contents' => [
+ {
+ 'text' => 'ab'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -133,61 +136,64 @@ $result_trees{'itemize_tieaccent'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'tieaccent',
'contents' => [
{
+ 'cmdname' => 'tieaccent',
'contents' => [
{
- 'cmdname' => 'aa',
'contents' => [
{
- 'type' => 'brace_container'
- }
- ],
- 'source_info' => {
- 'line_nr' => 5
- }
- },
- {
- 'cmdname' => '^',
- 'contents' => [
+ 'cmdname' => 'aa',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 5
+ }
+ },
{
+ 'cmdname' => '^',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
+ 'source_info' => {
+ 'line_nr' => 5
+ }
}
],
- 'source_info' => {
- 'line_nr' => 5
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 5
+ }
}
],
- 'source_info' => {
- 'line_nr' => 5
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -301,48 +307,51 @@ $result_trees{'itemize_tieaccent'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'tieaccent',
'contents' => [
{
+ 'cmdname' => 'tieaccent',
'contents' => [
{
- 'cmdname' => 'aa',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'aa',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 9
+ }
+ },
+ {
+ 'text' => 'd'
}
],
- 'source_info' => {
- 'line_nr' => 9
- }
- },
- {
- 'text' => 'd'
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 9
+ }
}
],
- 'source_info' => {
- 'line_nr' => 9
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -443,53 +452,56 @@ $result_trees{'itemize_tieaccent'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'tieaccent',
'contents' => [
{
+ 'cmdname' => 'tieaccent',
'contents' => [
{
- 'text' => 'x'
- },
- {
- 'cmdname' => '^',
'contents' => [
{
+ 'text' => 'x'
+ },
+ {
+ 'cmdname' => '^',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
+ 'source_info' => {
+ 'line_nr' => 13
+ }
}
],
- 'source_info' => {
- 'line_nr' => 13
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 13
+ }
}
],
- 'source_info' => {
- 'line_nr' => 13
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -595,37 +607,40 @@ $result_trees{'itemize_tieaccent'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'tieaccent',
'contents' => [
{
+ 'cmdname' => 'tieaccent',
'contents' => [
{
- 'text' => 'g'
+ 'contents' => [
+ {
+ 'text' => 'g'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 17
+ }
}
],
- 'source_info' => {
- 'line_nr' => 17
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -715,50 +730,53 @@ $result_trees{'itemize_tieaccent'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'tieaccent',
'contents' => [
{
+ 'cmdname' => 'tieaccent',
'contents' => [
{
- 'cmdname' => '^',
'contents' => [
{
+ 'cmdname' => '^',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
+ 'source_info' => {
+ 'line_nr' => 21
+ }
}
],
- 'source_info' => {
- 'line_nr' => 21
- }
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 21
+ }
}
],
- 'source_info' => {
- 'line_nr' => 21
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
diff --git a/tp/t/results/html_tests/menu.pl b/tp/t/results/html_tests/menu.pl
index 27087cf234..340eec54a8 100644
--- a/tp/t/results/html_tests/menu.pl
+++ b/tp/t/results/html_tests/menu.pl
@@ -124,27 +124,30 @@ $result_trees{'menu'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -305,27 +308,30 @@ $result_trees{'menu'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -471,27 +477,30 @@ $result_trees{'menu'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -810,27 +819,30 @@ $result_trees{'menu'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -991,27 +1003,30 @@ $result_trees{'menu'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1157,27 +1172,30 @@ $result_trees{'menu'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1520,16 +1538,16 @@ $result_trees{'menu'} = {
'type' => 'document_root'
};
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[1];
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[2]{'contents'}[1]{'contents'}[1];
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[4]{'contents'}[1]{'contents'}[1];
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'menu'}{'contents'}[2]{'contents'}[1]{'contents'}[7]{'contents'}[5]{'contents'}[1]{'contents'}[1];
diff --git a/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
b/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
index ac9b20470b..0d4654df6b 100644
--- a/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
+++ b/tp/t/results/html_tests/verbatim_in_multitable_in_example.pl
@@ -24,48 +24,51 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
'cmdname' => 'example',
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '0.5 0.5'
+ 'contents' => [
+ {
+ 'text' => '0.5 0.5'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.5',
+ '0.5'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 2
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.5',
- '0.5'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 2
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -347,7 +350,7 @@ $result_trees{'verbatim_in_multitable_in_example'} = {
],
'type' => 'document_root'
};
-$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'verbatim_in_multitable_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'verbatim_in_multitable_in_example'} = '@example
@multitable @columnfractions 0.5 0.5
diff --git a/tp/t/results/include/include_in_removed_before_item.pl
b/tp/t/results/include/include_in_removed_before_item.pl
index f888182f8a..2bf8218c91 100644
--- a/tp/t/results/include/include_in_removed_before_item.pl
+++ b/tp/t/results/include/include_in_removed_before_item.pl
@@ -10,27 +10,30 @@ $result_trees{'include_in_removed_before_item'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -181,7 +184,7 @@ $result_trees{'include_in_removed_before_item'} = {
],
'type' => 'document_root'
};
-$result_trees{'include_in_removed_before_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'include_in_removed_before_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'include_in_removed_before_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'include_in_removed_before_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'include_in_removed_before_item'} = '@table @code
@c source mark holder comment
diff --git a/tp/t/results/indices/empty_string_index_entry.pl
b/tp/t/results/indices/empty_string_index_entry.pl
index cae69c2164..39b23d92b1 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -120,27 +120,30 @@ $result_trees{'empty_string_index_entry'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'ftable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'line_nr' => 6
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'line_nr' => 6
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'ftable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -591,8 +594,8 @@ $result_trees{'empty_string_index_entry'} = {
'type' => 'document_root'
};
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'empty_string_index_entry'}{'contents'}[2];
-$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'empty_string_index_entry'}{'contents'}[2];
-$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'empty_string_index_entry'}{'contents'}[2];
+$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'empty_string_index_entry'}{'contents'}[2];
$result_trees{'empty_string_index_entry'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'empty_string_index_entry'}{'contents'}[2];
diff --git a/tp/t/results/indices/ftable_vtable.pl
b/tp/t/results/indices/ftable_vtable.pl
index eaffa0513a..f9cb936d94 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -81,27 +81,30 @@ $result_trees{'ftable_vtable'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'ftable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 5
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 5
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'ftable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -287,27 +290,30 @@ $result_trees{'ftable_vtable'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 12
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 12
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -636,14 +642,14 @@ $result_trees{'ftable_vtable'} = {
],
'type' => 'document_root'
};
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'ftable_vtable'}{'contents'}[2];
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'ftable_vtable'}{'contents'}[2];
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'ftable_vtable'}{'contents'}[2];
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'ftable_vtable'}{'contents'}[2];
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'ftable_vtable'}{'contents'}[2];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'ftable_vtable'}{'contents'}[2];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'ftable_vtable'}{'contents'}[2];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'ftable_vtable'}{'contents'}[2];
-$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'ftable_vtable'}{'contents'}[2];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'ftable_vtable'}{'contents'}[2];
+$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'ftable_vtable'}{'contents'}[2]{'contents'}[5]{'extra'}{'element_node'}
= $result_trees{'ftable_vtable'}{'contents'}[2];
$result_texis{'ftable_vtable'} = '
diff --git a/tp/t/results/indices/index_special_region.pl
b/tp/t/results/indices/index_special_region.pl
index 9055fd4fdd..8b4eb7e5e7 100644
--- a/tp/t/results/indices/index_special_region.pl
+++ b/tp/t/results/indices/index_special_region.pl
@@ -989,25 +989,30 @@ $result_trees{'index_special_region'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'ftable',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'ftable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1668,8 +1673,8 @@ $result_trees{'index_special_region'} = {
'type' => 'document_root'
};
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
= $result_trees{'index_special_region'}{'contents'}[1];
-$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_special_region'}{'contents'}[1];
-$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'args'}[0];
+$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_special_region'}{'contents'}[1];
+$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'index_special_region'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'index_special_region'}{'contents'}[4];
$result_trees{'index_special_region'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
= $result_trees{'index_special_region'}{'contents'}[4];
diff --git a/tp/t/results/indices/index_special_region_no_insertcopying.pl
b/tp/t/results/indices/index_special_region_no_insertcopying.pl
index 0f096473b8..f298c8c68e 100644
--- a/tp/t/results/indices/index_special_region_no_insertcopying.pl
+++ b/tp/t/results/indices/index_special_region_no_insertcopying.pl
@@ -984,25 +984,30 @@ $result_trees{'index_special_region_no_insertcopying'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'ftable',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'ftable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1658,8 +1663,8 @@ $result_trees{'index_special_region_no_insertcopying'} = {
'type' => 'document_root'
};
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
= $result_trees{'index_special_region_no_insertcopying'}{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_special_region_no_insertcopying'}{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[10]{'args'}[0];
+$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_special_region_no_insertcopying'}{'contents'}[1];
+$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'index_special_region_no_insertcopying'}{'contents'}[4];
$result_trees{'index_special_region_no_insertcopying'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
= $result_trees{'index_special_region_no_insertcopying'}{'contents'}[4];
diff --git
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
index 30e36162a8..bf753ba0f1 100644
---
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
+++
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
@@ -984,25 +984,30 @@
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'ftable',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'ftable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1658,8 +1663,8 @@
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
'type' => 'document_root'
};
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
=
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'args'}[0];
+$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[1];
+$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
=
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[4];
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
=
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'}{'contents'}[4];
diff --git
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
index 3a9c24c32a..e201410926 100644
---
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
+++
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
@@ -984,25 +984,30 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'ftable',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'ftable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1658,8 +1663,8 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
'type' => 'document_root'
};
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
=
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'args'}[0];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[1];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
=
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[4];
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
=
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'}{'contents'}[4];
diff --git
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
index 8afba347ec..7e699e5cdd 100644
---
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
+++
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
@@ -984,25 +984,30 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'ftable',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'ftable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1658,8 +1663,8 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
'type' => 'document_root'
};
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
=
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[1];
-$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'args'}[0];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[1];
+$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
=
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
=
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
diff --git a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
index 214ec6ce80..4a2674fe97 100644
--- a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
+++ b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
@@ -989,25 +989,30 @@
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'ftable',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'ftable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1668,8 +1673,8 @@
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
'type' => 'document_root'
};
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
= $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1];
-$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'args'}[0];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[1];
+$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[4];
$result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
= $result_trees{'index_special_region_no_titlepage_no_nodes'}{'contents'}[4];
diff --git a/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
b/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
index 292d8f52f7..f2f8e141b3 100644
--- a/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
+++ b/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
@@ -989,25 +989,30 @@ $result_trees{'index_special_region_titlepage_no_nodes'}
= {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'ftable',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'ftable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1668,8 +1673,8 @@ $result_trees{'index_special_region_titlepage_no_nodes'}
= {
'type' => 'document_root'
};
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
= $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1];
-$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'args'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[1];
+$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4];
$result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
= $result_trees{'index_special_region_titlepage_no_nodes'}{'contents'}[4];
diff --git
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
index dc27083e21..f114ebdecd 100644
---
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
+++
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
@@ -989,25 +989,30 @@
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'ftable',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'ftable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1668,8 +1673,8 @@
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
'type' => 'document_root'
};
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[5]{'extra'}{'element_node'}
=
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1];
-$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'args'}[0];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[1];
+$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[3]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[3]{'extra'}{'element_node'}
=
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[5]{'contents'}[5]{'extra'}{'element_node'}
=
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'}{'contents'}[4];
diff --git a/tp/t/results/indices/index_table.pl
b/tp/t/results/indices/index_table.pl
index d06c7e0b70..f4ae0fb9b7 100644
--- a/tp/t/results/indices/index_table.pl
+++ b/tp/t/results/indices/index_table.pl
@@ -450,34 +450,37 @@ $result_trees{'index_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
- 'source_info' => {
- 'file_name' => 'index_table.texi',
- 'line_nr' => 21
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ },
+ {
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'file_name' => 'index_table.texi',
+ 'line_nr' => 21
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -632,34 +635,37 @@ $result_trees{'index_table'} = {
'type' => 'paragraph'
},
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'ftable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
- 'source_info' => {
- 'file_name' => 'index_table.texi',
- 'line_nr' => 28
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ },
+ {
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'file_name' => 'index_table.texi',
+ 'line_nr' => 28
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'ftable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -6141,13 +6147,13 @@
$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'conte
$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'index_table'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
$result_trees{'index_table'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'index_table'}{'contents'}[3];
$result_trees{'index_table'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'index_table'}{'contents'}[3];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_table'}{'contents'}[3];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'index_table'}{'contents'}[3];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
= $result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'args'}[0];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_table'}{'contents'}[3];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'index_table'}{'contents'}[3];
+$result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_table'}{'contents'}[3];
+$result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'index_table'}{'contents'}[3];
+$result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'index_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_table'}{'contents'}[3];
-$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'extra'}{'command_as_argument'}
= $result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'args'}[0];
+$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'index_table'}{'contents'}[3];
+$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_table'}{'contents'}[3];
+$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'index_table'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'index_table'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'index_table'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'index_table'}{'contents'}[8]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'index_table'}{'contents'}[7];
$result_trees{'index_table'}{'contents'}[8]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'index_table'}{'contents'}[7];
diff --git a/tp/t/results/indices/index_table_chapter_no_node.pl
b/tp/t/results/indices/index_table_chapter_no_node.pl
index 6fd728af8e..49b01b0da9 100644
--- a/tp/t/results/indices/index_table_chapter_no_node.pl
+++ b/tp/t/results/indices/index_table_chapter_no_node.pl
@@ -450,34 +450,37 @@ $result_trees{'index_table_chapter_no_node'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
- 'source_info' => {
- 'file_name' => 'index_table.texi',
- 'line_nr' => 21
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ },
+ {
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'file_name' => 'index_table.texi',
+ 'line_nr' => 21
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -632,34 +635,37 @@ $result_trees{'index_table_chapter_no_node'} = {
'type' => 'paragraph'
},
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'ftable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
- 'source_info' => {
- 'file_name' => 'index_table.texi',
- 'line_nr' => 28
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ },
+ {
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'file_name' => 'index_table.texi',
+ 'line_nr' => 28
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'ftable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -6141,13 +6147,13 @@
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'cont
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'index_table_chapter_no_node'}{'contents'}[2]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0];
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'args'}[0];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
-$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'args'}[0];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_table_chapter_no_node'}{'contents'}[3];
+$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'index_table_chapter_no_node'}{'contents'}[4]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
$result_trees{'index_table_chapter_no_node'}{'contents'}[8]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'index_table_chapter_no_node'}{'contents'}[7];
diff --git a/tp/t/results/indices/printindex_index_entry_in_copying.pl
b/tp/t/results/indices/printindex_index_entry_in_copying.pl
index 576f22dc71..7b3b7f38bd 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -327,27 +327,30 @@ $result_trees{'printindex_index_entry_in_copying'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'ftable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 10
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 10
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'ftable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -879,7 +882,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
],
'type' => 'document_root'
};
-$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'printindex_index_entry_in_copying'}{'contents'}[2]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_texis{'printindex_index_entry_in_copying'} = '@copying
diff --git
a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
index c3fba9e59f..454b3b2769 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
@@ -327,27 +327,30 @@
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'ftable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 10
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 10
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'ftable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -851,7 +854,7 @@
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
],
'type' => 'document_root'
};
-$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_texis{'printindex_index_entry_in_copying_no_insertcopying'} = '@copying
diff --git a/tp/t/results/info_tests/colon_in_index_entry.pl
b/tp/t/results/info_tests/colon_in_index_entry.pl
index 185b259445..e43f64115f 100644
--- a/tp/t/results/info_tests/colon_in_index_entry.pl
+++ b/tp/t/results/info_tests/colon_in_index_entry.pl
@@ -114,27 +114,30 @@ $result_trees{'colon_in_index_entry'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 7
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 7
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -570,8 +573,8 @@ $result_trees{'colon_in_index_entry'} = {
'type' => 'document_root'
};
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'colon_in_index_entry'}{'contents'}[1];
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'colon_in_index_entry'}{'contents'}[1];
-$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'colon_in_index_entry'}{'contents'}[1];
+$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'colon_in_index_entry'}{'contents'}[1];
$result_trees{'colon_in_index_entry'}{'contents'}[1]{'contents'}[7]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'colon_in_index_entry'}{'contents'}[1];
diff --git a/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
b/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
index 05f98fc1f7..6a4424843a 100644
--- a/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
+++ b/tp/t/results/info_tests/multitable_anchor_and_index_entry.pl
@@ -35,48 +35,51 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '0.4 0.6'
+ 'contents' => [
+ {
+ 'text' => '0.4 0.6'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.4',
+ '0.6'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 3
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.4',
- '0.6'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 3
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -405,46 +408,49 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'A'
- }
- ],
- 'source_info' => {
- 'line_nr' => 13
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'A'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 13
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
+ },
{
- 'text' => 'B'
+ 'contents' => [
+ {
+ 'text' => 'B'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 13
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 13
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -862,9 +868,9 @@ $result_trees{'multitable_anchor_and_index_entry'} = {
],
'type' => 'document_root'
};
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'columnfractions'}
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
+$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
+$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'extra'}{'columnfractions'}
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1];
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'multitable_anchor_and_index_entry'}{'contents'}[1]{'contents'}[6]{'contents'}[2]{'contents'}[0]{'contents'}[0];
diff --git a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
index 4a060d31a9..c07c430ec4 100644
--- a/tp/t/results/info_tests/nested_multitable_anchor_index.pl
+++ b/tp/t/results/info_tests/nested_multitable_anchor_index.pl
@@ -35,46 +35,49 @@ $result_trees{'nested_multitable_anchor_index'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'truc AAAA machin'
- }
- ],
- 'source_info' => {
- 'line_nr' => 3
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'truc AAAA machin'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 3
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
+ },
{
- 'text' => 'bidule'
+ 'contents' => [
+ {
+ 'text' => 'bidule'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 3
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 3
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -88,46 +91,49 @@ $result_trees{'nested_multitable_anchor_index'} = {
'type' => 'ignorable_spaces_after_command'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'AAAA'
- }
- ],
- 'source_info' => {
- 'line_nr' => 5
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'AAAA'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 5
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
+ },
{
- 'text' => 'machin'
+ 'contents' => [
+ {
+ 'text' => 'machin'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 5
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 5
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -615,8 +621,8 @@ $result_trees{'nested_multitable_anchor_index'} = {
],
'type' => 'document_root'
};
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
-$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
+$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
+$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'nested_multitable_anchor_index'}{'contents'}[1];
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'nested_multitable_anchor_index'}{'contents'}[1]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0];
diff --git a/tp/t/results/info_tests/test_index.pl
b/tp/t/results/info_tests/test_index.pl
index fdcbda78f8..8109b5c4c1 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -566,27 +566,30 @@ $result_trees{'test_index'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'ftable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 17
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 17
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'ftable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -2903,10 +2906,10 @@
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'extra'
$result_trees{'test_index'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'extra'}{'element_node'}
= $result_trees{'test_index'}{'contents'}[1];
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_index'}{'contents'}[1];
$result_trees{'test_index'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_index'}{'contents'}[1];
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'test_index'}{'contents'}[1];
-$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'test_index'}{'contents'}[1];
+$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'test_index'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'test_index'}{'contents'}[2]{'contents'}[9]{'contents'}[1]{'contents'}[1]{'contents'}[0];
$result_trees{'test_index'}{'contents'}[4]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'test_index'}{'contents'}[3];
diff --git a/tp/t/results/info_tests/xref_quote_long_item.pl
b/tp/t/results/info_tests/xref_quote_long_item.pl
index 84ef1455c2..4a4c2fbbea 100644
--- a/tp/t/results/info_tests/xref_quote_long_item.pl
+++ b/tp/t/results/info_tests/xref_quote_long_item.pl
@@ -10,27 +10,30 @@ $result_trees{'xref_quote_long_item'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -247,12 +250,12 @@ $result_trees{'xref_quote_long_item'} = {
],
'type' => 'document_root'
};
-$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
=
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
-$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
=
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
-$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
=
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4];
-$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[2]
=
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[2];
+$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[3]
=
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3];
+$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[4]
=
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[4];
+$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'xref_quote_long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'xref_quote_long_item'} = '@table @asis
diff --git a/tp/t/results/invalid_nestings/bad_tab_nesting.pl
b/tp/t/results/invalid_nestings/bad_tab_nesting.pl
index 1f7ade4395..0ca6d0aa9c 100644
--- a/tp/t/results/invalid_nestings/bad_tab_nesting.pl
+++ b/tp/t/results/invalid_nestings/bad_tab_nesting.pl
@@ -10,46 +10,49 @@ $result_trees{'bad_tab_nesting'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'truc'
- }
- ],
- 'source_info' => {
- 'line_nr' => 1
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
+ },
{
- 'text' => 'bidule'
+ 'contents' => [
+ {
+ 'text' => 'bidule'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 1
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/invalid_nestings/block_not_matching.pl
b/tp/t/results/invalid_nestings/block_not_matching.pl
index 5edc1fa33f..9cfb836c0c 100644
--- a/tp/t/results/invalid_nestings/block_not_matching.pl
+++ b/tp/t/results/invalid_nestings/block_not_matching.pl
@@ -165,27 +165,30 @@ $result_trees{'block_not_matching'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 9
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 9
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -256,27 +259,30 @@ $result_trees{'block_not_matching'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 14
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 14
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -498,8 +504,8 @@ $result_trees{'block_not_matching'} = {
],
'type' => 'document_root'
};
-$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'block_not_matching'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'block_not_matching'} = '@quotation
A quotation
diff --git a/tp/t/results/invalid_nestings/center.pl
b/tp/t/results/invalid_nestings/center.pl
index a865568d0a..e46cecf507 100644
--- a/tp/t/results/invalid_nestings/center.pl
+++ b/tp/t/results/invalid_nestings/center.pl
@@ -448,27 +448,30 @@ $result_trees{'center'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 21
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 21
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -557,27 +560,30 @@ $result_trees{'center'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 25
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 25
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -896,46 +902,49 @@ $result_trees{'center'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'AAA'
- }
- ],
- 'source_info' => {
- 'line_nr' => 39
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'AAA'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 39
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
+ },
{
- 'text' => 'BBB'
+ 'contents' => [
+ {
+ 'text' => 'BBB'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 39
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 39
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1121,26 +1130,31 @@ $result_trees{'center'} = {
'text' => 'before the table '
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 45
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 45
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'table',
'extra' => {
'command_as_argument' => {}
},
@@ -1208,9 +1222,9 @@ $result_trees{'center'} = {
],
'type' => 'document_root'
};
-$result_trees{'center'}{'contents'}[0]{'contents'}[20]{'extra'}{'command_as_argument'}
=
$result_trees{'center'}{'contents'}[0]{'contents'}[20]{'args'}[0]{'contents'}[0];
-$result_trees{'center'}{'contents'}[0]{'contents'}[22]{'extra'}{'command_as_argument'}
=
$result_trees{'center'}{'contents'}[0]{'contents'}[22]{'args'}[0]{'contents'}[0];
-$result_trees{'center'}{'contents'}[0]{'contents'}[35]{'args'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'center'}{'contents'}[0]{'contents'}[35]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'center'}{'contents'}[0]{'contents'}[20]{'extra'}{'command_as_argument'}
=
$result_trees{'center'}{'contents'}[0]{'contents'}[20]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'center'}{'contents'}[0]{'contents'}[22]{'extra'}{'command_as_argument'}
=
$result_trees{'center'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'center'}{'contents'}[0]{'contents'}[35]{'args'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'center'}{'contents'}[0]{'contents'}[35]{'args'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'center'} = '@center @indent @titlefont{in titlefont} @anchor{in
anchor}@footnote{footnote}
diff --git a/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
b/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
index 45da7d05c7..c3b6b7604b 100644
--- a/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/enumerate_in_style_command.pl
@@ -32,24 +32,27 @@ $result_trees{'enumerate_in_style_command'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => '1'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '1'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
diff --git a/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
b/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
index 94c5b062f2..d40e4c56fc 100644
--- a/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
+++ b/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
@@ -34,27 +34,30 @@ $result_trees{'formats_not_closed_in_example'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 3
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 3
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -110,19 +113,22 @@ $result_trees{'formats_not_closed_in_example'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -259,7 +265,7 @@ $result_trees{'formats_not_closed_in_example'} = {
],
'type' => 'document_root'
};
-$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_not_closed_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'formats_not_closed_in_example'} = '@example
diff --git a/tp/t/results/invalid_nestings/in_errormsg.pl
b/tp/t/results/invalid_nestings/in_errormsg.pl
index bfebb3f312..6083ef71a6 100644
--- a/tp/t/results/invalid_nestings/in_errormsg.pl
+++ b/tp/t/results/invalid_nestings/in_errormsg.pl
@@ -135,27 +135,30 @@ $result_trees{'in_errormsg'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 6
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 6
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -243,7 +246,7 @@ $result_trees{'in_errormsg'} = {
'type' => 'document_root'
};
$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'in_errormsg'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'in_errormsg'} = '
@anchor{in ref}
diff --git a/tp/t/results/invalid_nestings/in_table.pl
b/tp/t/results/invalid_nestings/in_table.pl
index d059a4c210..df1618b540 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -73,27 +73,30 @@ $result_trees{'in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'xref',
- 'source_info' => {
- 'line_nr' => 5
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'xref',
+ 'source_info' => {
+ 'line_nr' => 5
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
@@ -143,27 +146,30 @@ $result_trees{'in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'line_nr' => 8
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'line_nr' => 8
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -576,27 +582,30 @@ $result_trees{'in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 17
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 17
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -942,14 +951,14 @@ $result_trees{'in_table'} = {
],
'type' => 'document_root'
};
-$result_trees{'in_table'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'in_table'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'in_table'}{'contents'}[2];
-$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'in_table'}{'contents'}[2];
-$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'in_table'}{'contents'}[2];
+$result_trees{'in_table'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'in_table'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'in_table'}{'contents'}[2];
+$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'in_table'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'in_table'}{'contents'}[2];
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'in_table'}{'contents'}[2];
-$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'in_table'}{'contents'}[2];
+$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'in_table'}{'contents'}[2];
+$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'in_table'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'in_table'} = '
@node Top
diff --git a/tp/t/results/invalid_nestings/item_in_ref.pl
b/tp/t/results/invalid_nestings/item_in_ref.pl
index 9fe9f616fe..b7a49ac407 100644
--- a/tp/t/results/invalid_nestings/item_in_ref.pl
+++ b/tp/t/results/invalid_nestings/item_in_ref.pl
@@ -10,27 +10,30 @@ $result_trees{'item_in_ref'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -211,7 +214,7 @@ $result_trees{'item_in_ref'} = {
],
'type' => 'document_root'
};
-$result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'item_in_ref'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'item_in_ref'} = '@table @asis
@item first item
diff --git
a/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
b/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
index 405c4e0148..7f357ed49a 100644
--- a/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
+++ b/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
@@ -10,27 +10,30 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'strong',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'strong',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -82,27 +85,30 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -179,19 +185,22 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -322,8 +331,8 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
],
'type' => 'document_root'
};
-$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'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'}[0]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'itemx_in_itemize_enumerate_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'itemx_in_itemize_enumerate_in_table'} = '@table @strong
@item item
diff --git a/tp/t/results/invalid_nestings/multitable_in_style_command.pl
b/tp/t/results/invalid_nestings/multitable_in_style_command.pl
index d1c6b73fbd..9b47383fcf 100644
--- a/tp/t/results/invalid_nestings/multitable_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/multitable_in_style_command.pl
@@ -36,46 +36,49 @@ $result_trees{'multitable_in_style_command'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'truc'
- }
- ],
- 'source_info' => {
- 'line_nr' => 3
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 3
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
+ },
{
- 'text' => 'machin'
+ 'contents' => [
+ {
+ 'text' => 'machin'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 3
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 3
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/invalid_nestings/multitable_item_in_index.pl
b/tp/t/results/invalid_nestings/multitable_item_in_index.pl
index f1097b66d0..61bf4446ed 100644
--- a/tp/t/results/invalid_nestings/multitable_item_in_index.pl
+++ b/tp/t/results/invalid_nestings/multitable_item_in_index.pl
@@ -10,46 +10,49 @@ $result_trees{'multitable_item_in_index'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'aaa'
- }
- ],
- 'source_info' => {
- 'line_nr' => 1
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'aaa'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
+ },
{
- 'text' => 'bbb'
+ 'text' => ' '
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'bbb'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 1
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/invalid_nestings/on_block_command_line.pl
b/tp/t/results/invalid_nestings/on_block_command_line.pl
index 2b48626304..ecda60f7f3 100644
--- a/tp/t/results/invalid_nestings/on_block_command_line.pl
+++ b/tp/t/results/invalid_nestings/on_block_command_line.pl
@@ -10,69 +10,72 @@ $result_trees{'on_block_command_line'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'cmdname' => 'anchor',
'contents' => [
{
+ 'cmdname' => 'anchor',
'contents' => [
{
- 'text' => 'in anchor'
+ 'contents' => [
+ {
+ 'text' => 'in anchor'
+ }
+ ],
+ 'type' => 'brace_arg'
}
],
- 'type' => 'brace_arg'
+ 'extra' => {
+ 'is_target' => 1,
+ 'normalized' => 'in-anchor'
+ },
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'extra' => {
- 'is_target' => 1,
- 'normalized' => 'in-anchor'
- },
'source_info' => {
'line_nr' => 1
- }
- }
- ],
- 'source_info' => {
- 'line_nr' => 1
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'titlefont',
- 'contents' => [
+ },
+ 'type' => 'bracketed_arg'
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'titlefont',
'contents' => [
{
- 'text' => 'in titlefont'
+ 'contents' => [
+ {
+ 'text' => 'in titlefont'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'extra' => {},
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'extra' => {},
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/invalid_nestings/on_itemize_line.pl
b/tp/t/results/invalid_nestings/on_itemize_line.pl
index 34549f4b69..3b8b7fd87d 100644
--- a/tp/t/results/invalid_nestings/on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/on_itemize_line.pl
@@ -10,117 +10,120 @@ $result_trees{'on_itemize_line'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'indent',
- 'source_info' => {
- 'line_nr' => 1
- }
- },
- {
- 'text' => ' ',
- 'type' => 'ignorable_spaces_after_command'
- },
- {
- 'cmdname' => 'titlefont',
'contents' => [
{
+ 'cmdname' => 'indent',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ },
+ {
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'cmdname' => 'titlefont',
'contents' => [
{
- 'text' => 'in titlefont'
+ 'contents' => [
+ {
+ 'text' => 'in titlefont'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
- }
- ],
- 'extra' => {},
- 'source_info' => {
- 'line_nr' => 1
- }
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'anchor',
- 'contents' => [
+ 'extra' => {},
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ },
{
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'anchor',
'contents' => [
{
- 'text' => 'in anchor'
+ 'contents' => [
+ {
+ 'text' => 'in anchor'
+ }
+ ],
+ 'type' => 'brace_arg'
}
],
- 'type' => 'brace_arg'
- }
- ],
- 'extra' => {
- 'is_target' => 1,
- 'normalized' => 'in-anchor'
- },
- 'source_info' => {
- 'line_nr' => 1
- }
- },
- {
- 'cmdname' => 'footnote',
- 'contents' => [
+ 'extra' => {
+ 'is_target' => 1,
+ 'normalized' => 'in-anchor'
+ },
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ },
{
+ 'cmdname' => 'footnote',
'contents' => [
{
'contents' => [
{
- 'text' => 'footnote'
+ 'contents' => [
+ {
+ 'text' => 'footnote'
+ }
+ ],
+ 'type' => 'paragraph'
}
],
- 'type' => 'paragraph'
+ 'type' => 'brace_command_context'
}
],
- 'type' => 'brace_command_context'
- }
- ],
- 'extra' => {},
- 'source_info' => {
- 'line_nr' => 1
- }
- },
- {
- 'text' => ' '
- },
- {
- 'args' => [
+ 'extra' => {},
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ },
{
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'args' => [
{
- 'text' => 'exdent'
+ 'contents' => [
+ {
+ 'text' => 'exdent'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'exdent',
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'cmdname' => 'exdent',
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 1
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -191,31 +194,34 @@ $result_trees{'on_itemize_line'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'on line '
- },
- {
- 'text' => ' ',
- 'type' => 'ignorable_spaces_after_command'
- },
- {
- 'text' => 'in item'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'on line '
+ },
+ {
+ 'text' => ' ',
+ 'type' => 'ignorable_spaces_after_command'
+ },
+ {
+ 'text' => 'in item'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
b/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
index e81101ce23..f964548a62 100644
--- a/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
+++ b/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
@@ -10,27 +10,30 @@ $result_trees{'section_in_nested_block_commands'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'strong',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'strong',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -174,7 +177,7 @@ $result_trees{'section_in_nested_block_commands'} = {
],
'type' => 'document_root'
};
-$result_trees{'section_in_nested_block_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'section_in_nested_block_commands'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'section_in_nested_block_commands'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'section_in_nested_block_commands'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'section_in_nested_block_commands'} = '@table @strong
@item item
diff --git a/tp/t/results/invalid_nestings/section_in_table.pl
b/tp/t/results/invalid_nestings/section_in_table.pl
index c7186b9eba..3d6f7fedb9 100644
--- a/tp/t/results/invalid_nestings/section_in_table.pl
+++ b/tp/t/results/invalid_nestings/section_in_table.pl
@@ -10,27 +10,30 @@ $result_trees{'section_in_table'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -152,7 +155,7 @@ $result_trees{'section_in_table'} = {
],
'type' => 'document_root'
};
-$result_trees{'section_in_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'section_in_table'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'section_in_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'section_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'section_in_table'} = '@table @asis
@item Before
diff --git a/tp/t/results/invalid_nestings/section_on_enumerate_line.pl
b/tp/t/results/invalid_nestings/section_on_enumerate_line.pl
index 4b4a8200a9..b195ca3f56 100644
--- a/tp/t/results/invalid_nestings/section_on_enumerate_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_enumerate_line.pl
@@ -10,22 +10,27 @@ $result_trees{'section_on_enumerate_line'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'something'
+ 'contents' => [
+ {
+ 'text' => 'something'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'block_line_arg'
+ 'type' => 'argument'
}
],
- 'cmdname' => 'enumerate',
'extra' => {
'enumerate_specification' => '1'
},
@@ -66,22 +71,27 @@ $result_trees{'section_on_enumerate_line'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => '4'
+ 'contents' => [
+ {
+ 'text' => '4'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'block_line_arg'
+ 'type' => 'argument'
}
],
- 'cmdname' => 'enumerate',
'extra' => {
'enumerate_specification' => '4'
},
diff --git a/tp/t/results/invalid_nestings/section_on_itemize_line.pl
b/tp/t/results/invalid_nestings/section_on_itemize_line.pl
index 0a38ff797f..9096ae7b36 100644
--- a/tp/t/results/invalid_nestings/section_on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_itemize_line.pl
@@ -10,30 +10,35 @@ $result_trees{'section_on_itemize_line'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'minus',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'minus',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'source_info' => {
- 'line_nr' => 1
- }
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'block_line_arg'
+ 'type' => 'argument'
}
],
- 'cmdname' => 'itemize',
'extra' => {
'command_as_argument' => {}
},
@@ -74,33 +79,38 @@ $result_trees{'section_on_itemize_line'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'minus',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'minus',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 3
+ }
+ },
+ {
+ 'text' => ' aa'
}
],
- 'source_info' => {
- 'line_nr' => 3
- }
- },
- {
- 'text' => ' aa'
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'block_line_arg'
+ 'type' => 'argument'
}
],
- 'cmdname' => 'itemize',
'info' => {
'spaces_before_argument' => {
'text' => ' '
@@ -148,20 +158,25 @@ $result_trees{'section_on_itemize_line'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
- 'info' => {
- 'inserted' => 1
- }
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
+ 'type' => 'argument'
}
],
- 'cmdname' => 'itemize',
'extra' => {
'command_as_argument' => {}
},
@@ -212,25 +227,30 @@ $result_trees{'section_on_itemize_line'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'ringaccent',
- 'info' => {
- 'spaces_after_cmd_before_arg' => {
- 'text' => ' '
+ 'contents' => [
+ {
+ 'cmdname' => 'ringaccent',
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'line_nr' => 7
+ }
}
- },
- 'source_info' => {
- 'line_nr' => 7
- }
+ ],
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
+ 'type' => 'argument'
}
],
- 'cmdname' => 'itemize',
'info' => {
'spaces_before_argument' => {
'text' => ' '
@@ -286,8 +306,8 @@ $result_trees{'section_on_itemize_line'} = {
],
'type' => 'document_root'
};
-$result_trees{'section_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'section_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'section_on_itemize_line'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'section_on_itemize_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'section_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'section_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'section_on_itemize_line'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'section_on_itemize_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'section_on_itemize_line'} = '@itemize @minus{} @section first
diff --git a/tp/t/results/invalid_nestings/section_on_multitable_line.pl
b/tp/t/results/invalid_nestings/section_on_multitable_line.pl
index 219988c796..16eff491f7 100644
--- a/tp/t/results/invalid_nestings/section_on_multitable_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_multitable_line.pl
@@ -10,12 +10,17 @@ $result_trees{'section_on_multitable_line'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
- 'type' => 'block_line_arg'
+ 'contents' => [
+ {
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'multitable',
'extra' => {
'max_columns' => 0
},
@@ -56,35 +61,40 @@ $result_trees{'section_on_multitable_line'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
'contents' => [
{
+ 'cmdname' => 'code',
'contents' => [
{
- 'text' => 'this'
+ 'contents' => [
+ {
+ 'text' => 'this'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 3
+ }
}
],
- 'source_info' => {
- 'line_nr' => 3
- }
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'block_line_arg'
+ 'type' => 'argument'
}
],
- 'cmdname' => 'multitable',
'extra' => {
'max_columns' => 0
},
@@ -135,44 +145,49 @@ $result_trees{'section_on_multitable_line'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'aaa'
- }
- ],
- 'source_info' => {
- 'line_nr' => 5
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'aaa'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 5
+ },
+ 'type' => 'bracketed_arg'
+ },
{
- 'text' => 'bbb'
+ 'text' => ' '
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'bbb'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 5
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 5
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'block_line_arg'
+ 'type' => 'argument'
}
],
- 'cmdname' => 'multitable',
'extra' => {
'max_columns' => 2
},
diff --git a/tp/t/results/invalid_nestings/section_on_xtable_line.pl
b/tp/t/results/invalid_nestings/section_on_xtable_line.pl
index c95e66df39..f674acbe46 100644
--- a/tp/t/results/invalid_nestings/section_on_xtable_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_xtable_line.pl
@@ -10,18 +10,25 @@ $result_trees{'section_on_xtable_line'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
- 'type' => 'block_line_arg'
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
+ 'type' => 'block_line_arg'
+ }
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'vtable',
'extra' => {
'command_as_argument' => {}
},
@@ -62,31 +69,36 @@ $result_trees{'section_on_xtable_line'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'TeX',
- 'source_info' => {
- 'line_nr' => 3
- }
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ },
+ {
+ 'cmdname' => 'TeX',
+ 'source_info' => {
+ 'line_nr' => 3
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'block_line_arg'
+ 'type' => 'argument'
}
],
- 'cmdname' => 'table',
'extra' => {
'command_as_argument' => {}
},
@@ -137,25 +149,30 @@ $result_trees{'section_on_xtable_line'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'line_nr' => 5
- }
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'line_nr' => 5
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => ' '
- }
- },
- 'type' => 'block_line_arg'
+ 'type' => 'argument'
}
],
- 'cmdname' => 'table',
'extra' => {
'command_as_argument' => {}
},
@@ -206,31 +223,36 @@ $result_trees{'section_on_xtable_line'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'ftable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'ringaccent',
- 'info' => {
- 'spaces_after_cmd_before_arg' => {
- 'text' => ' '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ },
+ {
+ 'cmdname' => 'ringaccent',
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'line_nr' => 7
+ }
}
- },
- 'source_info' => {
- 'line_nr' => 7
- }
+ ],
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
+ 'type' => 'argument'
}
],
- 'cmdname' => 'ftable',
'extra' => {
'command_as_argument' => {}
},
@@ -289,10 +311,10 @@ $result_trees{'section_on_xtable_line'} = {
],
'type' => 'document_root'
};
-$result_trees{'section_on_xtable_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'section_on_xtable_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'section_on_xtable_line'}{'contents'}[1]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'section_on_xtable_line'}{'contents'}[1]{'contents'}[1]{'args'}[0];
-$result_trees{'section_on_xtable_line'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'section_on_xtable_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'section_on_xtable_line'}{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'section_on_xtable_line'}{'contents'}[3]{'contents'}[1]{'args'}[0];
+$result_trees{'section_on_xtable_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'section_on_xtable_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'section_on_xtable_line'}{'contents'}[1]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'section_on_xtable_line'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'section_on_xtable_line'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'section_on_xtable_line'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'section_on_xtable_line'}{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'section_on_xtable_line'}{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'section_on_xtable_line'} = '@vtable @section first
diff --git a/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
b/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
index 66f46545fa..f5b287c846 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
@@ -10,27 +10,30 @@ $result_trees{'style_not_closed_in_table_line'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -187,7 +190,7 @@ $result_trees{'style_not_closed_in_table_line'} = {
],
'type' => 'document_root'
};
-$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'style_not_closed_in_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'style_not_closed_in_table_line'} = '@table @asis
@item first item
diff --git a/tp/t/results/invalid_nestings/tab_in_index.pl
b/tp/t/results/invalid_nestings/tab_in_index.pl
index 50adcd70bc..208672a2f1 100644
--- a/tp/t/results/invalid_nestings/tab_in_index.pl
+++ b/tp/t/results/invalid_nestings/tab_in_index.pl
@@ -10,46 +10,49 @@ $result_trees{'tab_in_index'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'one nonlettered character'
- }
- ],
- 'source_info' => {
- 'line_nr' => 1
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'one nonlettered character'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
+ },
{
- 'text' => 'normal text'
+ 'contents' => [
+ {
+ 'text' => 'normal text'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 1
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/invalid_nestings/table_in_code.pl
b/tp/t/results/invalid_nestings/table_in_code.pl
index 5d243998e5..53315224a1 100644
--- a/tp/t/results/invalid_nestings/table_in_code.pl
+++ b/tp/t/results/invalid_nestings/table_in_code.pl
@@ -36,27 +36,30 @@ $result_trees{'table_in_code'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 3
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 3
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -162,7 +165,7 @@ $result_trees{'table_in_code'} = {
],
'type' => 'document_root'
};
-$result_trees{'table_in_code'}{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'table_in_code'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'table_in_code'}{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'table_in_code'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'table_in_code'} = '@code{
in code
diff --git a/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
b/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
index 3323c4d621..deb5cabaea 100644
--- a/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
+++ b/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
@@ -87,27 +87,30 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 4
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 4
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -221,7 +224,7 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
'type' => 'document_root'
};
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'table_not_closed_in_menu_comment'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'table_not_closed_in_menu_comment'} = '@menu
* (manual):: desc
diff --git
a/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
b/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
index 628774cabe..b64f22cb15 100644
--- a/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
+++ b/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
@@ -65,27 +65,30 @@ $result_trees{'table_not_closed_in_menu_description'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 2
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 2
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -201,7 +204,7 @@ $result_trees{'table_not_closed_in_menu_description'} = {
'type' => 'document_root'
};
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'table_not_closed_in_menu_description'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'table_not_closed_in_menu_description'} = '@menu
* (gcc):: text @table @asis
diff --git a/tp/t/results/invalid_nestings/table_on_item_line.pl
b/tp/t/results/invalid_nestings/table_on_item_line.pl
index 2da4ae22ad..d64bdf69dd 100644
--- a/tp/t/results/invalid_nestings/table_on_item_line.pl
+++ b/tp/t/results/invalid_nestings/table_on_item_line.pl
@@ -10,27 +10,30 @@ $result_trees{'table_on_item_line'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -43,26 +46,31 @@ $result_trees{'table_on_item_line'} = {
'text' => 'item '
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 2
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 2
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'table',
'extra' => {
'command_as_argument' => {}
},
@@ -220,8 +228,8 @@ $result_trees{'table_on_item_line'} = {
],
'type' => 'document_root'
};
-$result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'table_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'table_on_item_line'} = '@table @asis
@item item @table @asis
diff --git a/tp/t/results/itemize/accent_argument.pl
b/tp/t/results/itemize/accent_argument.pl
index 8c41e83c9a..5e9595d749 100644
--- a/tp/t/results/itemize/accent_argument.pl
+++ b/tp/t/results/itemize/accent_argument.pl
@@ -10,37 +10,40 @@ $result_trees{'accent_argument'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '~',
'contents' => [
{
+ 'cmdname' => '~',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -111,37 +114,40 @@ $result_trees{'accent_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '~',
'contents' => [
{
+ 'cmdname' => '~',
'contents' => [
{
- 'text' => 'e'
+ 'contents' => [
+ {
+ 'text' => 'e'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 5
+ }
}
],
- 'source_info' => {
- 'line_nr' => 5
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -212,42 +218,45 @@ $result_trees{'accent_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'ringaccent',
'contents' => [
{
+ 'cmdname' => 'ringaccent',
'contents' => [
{
- 'text' => 'a'
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'following_arg'
}
],
- 'type' => 'following_arg'
+ 'info' => {
+ 'spaces_after_cmd_before_arg' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'line_nr' => 9
+ }
}
],
'info' => {
- 'spaces_after_cmd_before_arg' => {
- 'text' => ' '
+ 'spaces_after_argument' => {
+ 'text' => '
+'
}
},
- 'source_info' => {
- 'line_nr' => 9
- }
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
diff --git a/tp/t/results/itemize/asis_as_itemize_argument.pl
b/tp/t/results/itemize/asis_as_itemize_argument.pl
index 058ba0917b..48354edc25 100644
--- a/tp/t/results/itemize/asis_as_itemize_argument.pl
+++ b/tp/t/results/itemize/asis_as_itemize_argument.pl
@@ -10,27 +10,30 @@ $result_trees{'asis_as_itemize_argument'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -104,7 +107,7 @@ $result_trees{'asis_as_itemize_argument'} = {
],
'type' => 'document_root'
};
-$result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'asis_as_itemize_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'asis_as_itemize_argument'} = '@itemize @asis
@item as is
diff --git a/tp/t/results/itemize/bad_enumerate_arguments.pl
b/tp/t/results/itemize/bad_enumerate_arguments.pl
index b2bb5435a5..44a1ddae53 100644
--- a/tp/t/results/itemize/bad_enumerate_arguments.pl
+++ b/tp/t/results/itemize/bad_enumerate_arguments.pl
@@ -10,24 +10,27 @@ $result_trees{'bad_enumerate_arguments'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'a b'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'a b'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
@@ -77,24 +80,27 @@ $result_trees{'bad_enumerate_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => '!'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '!'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
@@ -144,37 +150,40 @@ $result_trees{'bad_enumerate_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
'contents' => [
{
+ 'cmdname' => 'code',
'contents' => [
{
- 'text' => 'a'
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 7
+ }
}
],
- 'source_info' => {
- 'line_nr' => 7
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
@@ -224,27 +233,30 @@ $result_trees{'bad_enumerate_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'a'
- },
- {
- 'cmdname' => '@'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'a'
+ },
+ {
+ 'cmdname' => '@'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
@@ -294,24 +306,27 @@ $result_trees{'bad_enumerate_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'a0'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'a0'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/itemize/comment_first_on_enumerate_line.pl
b/tp/t/results/itemize/comment_first_on_enumerate_line.pl
index c1d73583bc..1fc9565fb9 100644
--- a/tp/t/results/itemize/comment_first_on_enumerate_line.pl
+++ b/tp/t/results/itemize/comment_first_on_enumerate_line.pl
@@ -10,25 +10,28 @@ $result_trees{'comment_first_on_enumerate_line'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
- {
- 'text' => ' comment on enumerate line
+ 'contents' => [
+ {
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comment on enumerate line
',
- 'type' => 'rawline_arg'
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
}
- ],
- 'cmdname' => 'c'
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
diff --git a/tp/t/results/itemize/comment_first_on_itemize_line.pl
b/tp/t/results/itemize/comment_first_on_itemize_line.pl
index a79ad79eb9..9d302cf045 100644
--- a/tp/t/results/itemize/comment_first_on_itemize_line.pl
+++ b/tp/t/results/itemize/comment_first_on_itemize_line.pl
@@ -10,33 +10,36 @@ $result_trees{'comment_first_on_itemize_line'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
- 'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
+ 'contents' => [
{
- 'text' => ' comment on itemize line
-',
- 'type' => 'rawline_arg'
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
}
],
- 'cmdname' => 'c'
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comment on itemize line
+',
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -110,7 +113,7 @@ $result_trees{'comment_first_on_itemize_line'} = {
],
'type' => 'document_root'
};
-$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'comment_first_on_itemize_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'comment_first_on_itemize_line'} = '@itemize @c comment on
itemize line
@item first
diff --git a/tp/t/results/itemize/empty_accent_argument.pl
b/tp/t/results/itemize/empty_accent_argument.pl
index adf89890a2..a312be1eca 100644
--- a/tp/t/results/itemize/empty_accent_argument.pl
+++ b/tp/t/results/itemize/empty_accent_argument.pl
@@ -10,33 +10,36 @@ $result_trees{'empty_accent_argument'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '~',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
+ 'contents' => [
{
- 'text' => '
-',
- 'type' => 'rawline_arg'
+ 'cmdname' => '~',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'cmdname' => 'comment'
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => '
+',
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'comment'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -107,27 +110,30 @@ $result_trees{'empty_accent_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '~',
- 'source_info' => {
- 'line_nr' => 5
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => '~',
+ 'source_info' => {
+ 'line_nr' => 5
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -198,32 +204,35 @@ $result_trees{'empty_accent_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '~',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => '~',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 9
+ }
}
],
- 'source_info' => {
- 'line_nr' => 9
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -294,27 +303,30 @@ $result_trees{'empty_accent_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '~',
- 'source_info' => {
- 'line_nr' => 13
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => '~',
+ 'source_info' => {
+ 'line_nr' => 13
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
diff --git a/tp/t/results/itemize/enumerate_and_empty_lines.pl
b/tp/t/results/itemize/enumerate_and_empty_lines.pl
index 5f51b4d460..d2133e61fd 100644
--- a/tp/t/results/itemize/enumerate_and_empty_lines.pl
+++ b/tp/t/results/itemize/enumerate_and_empty_lines.pl
@@ -10,19 +10,22 @@ $result_trees{'enumerate_and_empty_lines'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -441,19 +444,22 @@ $result_trees{'enumerate_and_empty_lines'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
diff --git a/tp/t/results/itemize/enumerate_argument.pl
b/tp/t/results/itemize/enumerate_argument.pl
index 4c5cda38c2..0c89d95a96 100644
--- a/tp/t/results/itemize/enumerate_argument.pl
+++ b/tp/t/results/itemize/enumerate_argument.pl
@@ -10,24 +10,27 @@ $result_trees{'enumerate_argument'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => '1'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '1'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
@@ -77,30 +80,33 @@ $result_trees{'enumerate_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'A'
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
+ 'contents' => [
{
- 'text' => ' comment
-',
- 'type' => 'rawline_arg'
+ 'text' => 'A'
}
],
- 'cmdname' => 'c'
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comment
+',
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
@@ -150,33 +156,36 @@ $result_trees{'enumerate_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'z'
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
+ 'contents' => [
{
- 'text' => ' comment
-',
- 'type' => 'rawline_arg'
+ 'text' => 'z'
}
],
- 'cmdname' => 'c'
- },
- 'spaces_after_argument' => {
- 'text' => ' '
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comment
+',
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
+ },
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
@@ -226,24 +235,27 @@ $result_trees{'enumerate_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => '0'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '0'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/itemize/enumerate_argument_item.pl
b/tp/t/results/itemize/enumerate_argument_item.pl
index 816b9d1ace..675f8d64e9 100644
--- a/tp/t/results/itemize/enumerate_argument_item.pl
+++ b/tp/t/results/itemize/enumerate_argument_item.pl
@@ -10,24 +10,27 @@ $result_trees{'enumerate_argument_item'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => '1'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '1'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -125,30 +128,33 @@ $result_trees{'enumerate_argument_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'A'
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
+ 'contents' => [
{
- 'text' => ' comment
-',
- 'type' => 'rawline_arg'
+ 'text' => 'A'
}
],
- 'cmdname' => 'c'
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comment
+',
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -246,33 +252,36 @@ $result_trees{'enumerate_argument_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'z'
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
+ 'contents' => [
{
- 'text' => ' comment
-',
- 'type' => 'rawline_arg'
+ 'text' => 'z'
}
],
- 'cmdname' => 'c'
- },
- 'spaces_after_argument' => {
- 'text' => ' '
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comment
+',
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
+ },
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -370,24 +379,27 @@ $result_trees{'enumerate_argument_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => '0'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '0'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
diff --git a/tp/t/results/itemize/enumerate_in_example.pl
b/tp/t/results/itemize/enumerate_in_example.pl
index 776d779e55..5b092c1591 100644
--- a/tp/t/results/itemize/enumerate_in_example.pl
+++ b/tp/t/results/itemize/enumerate_in_example.pl
@@ -29,19 +29,22 @@ $result_trees{'enumerate_in_example'} = {
'cmdname' => 'example',
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
diff --git a/tp/t/results/itemize/enumerate_letters.pl
b/tp/t/results/itemize/enumerate_letters.pl
index c863c57a55..8cb701b4d2 100644
--- a/tp/t/results/itemize/enumerate_letters.pl
+++ b/tp/t/results/itemize/enumerate_letters.pl
@@ -10,24 +10,27 @@ $result_trees{'enumerate_letters'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'c'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'c'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
diff --git a/tp/t/results/itemize/enumerate_more_letters.pl
b/tp/t/results/itemize/enumerate_more_letters.pl
index bac464efcb..91347eb39b 100644
--- a/tp/t/results/itemize/enumerate_more_letters.pl
+++ b/tp/t/results/itemize/enumerate_more_letters.pl
@@ -10,24 +10,27 @@ $result_trees{'enumerate_more_letters'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'c'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'c'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
diff --git a/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
b/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
index 3da58972cf..7d1661b8fe 100644
--- a/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
+++ b/tp/t/results/itemize/headitem_itemx_in_enumerate.pl
@@ -10,19 +10,22 @@ $result_trees{'headitem_itemx_in_enumerate'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
diff --git a/tp/t/results/itemize/headitem_itemx_in_itemize.pl
b/tp/t/results/itemize/headitem_itemx_in_itemize.pl
index 62ccf56392..324464bcd1 100644
--- a/tp/t/results/itemize/headitem_itemx_in_itemize.pl
+++ b/tp/t/results/itemize/headitem_itemx_in_itemize.pl
@@ -10,27 +10,30 @@ $result_trees{'headitem_itemx_in_itemize'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -139,7 +142,7 @@ $result_trees{'headitem_itemx_in_itemize'} = {
],
'type' => 'document_root'
};
-$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'headitem_itemx_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'headitem_itemx_in_itemize'} = '@itemize
@item item
diff --git a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
index fb22356407..d4db499114 100644
--- a/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_enumerate.pl
@@ -137,19 +137,22 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -238,19 +241,22 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -370,19 +376,22 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -497,19 +506,22 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -624,19 +636,22 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -755,19 +770,22 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -974,13 +992,13 @@ $result_trees{'inter_item_commands_in_enumerate'} = {
],
'type' => 'document_root'
};
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_enumerate'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_enumerate'}{'contents'}[3];
$result_texis{'inter_item_commands_in_enumerate'} = '@node Top
@top top
diff --git a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
index fda8e69f99..4aed729303 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -137,27 +137,30 @@ $result_trees{'inter_item_commands_in_itemize'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'minus',
- 'source_info' => {
- 'line_nr' => 7
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'minus',
+ 'source_info' => {
+ 'line_nr' => 7
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -282,27 +285,30 @@ $result_trees{'inter_item_commands_in_itemize'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
- 'source_info' => {
- 'line_nr' => 13
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'line_nr' => 13
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -483,27 +489,30 @@ $result_trees{'inter_item_commands_in_itemize'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -642,13 +651,13 @@ $result_trees{'inter_item_commands_in_itemize'} = {
],
'type' => 'document_root'
};
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_itemize'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_itemize'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'inter_item_commands_in_itemize'} = '@node Top
@top top
diff --git a/tp/t/results/itemize/itemize_and_empty_lines.pl
b/tp/t/results/itemize/itemize_and_empty_lines.pl
index 151ca35746..bb51c604f1 100644
--- a/tp/t/results/itemize/itemize_and_empty_lines.pl
+++ b/tp/t/results/itemize/itemize_and_empty_lines.pl
@@ -10,24 +10,27 @@ $result_trees{'itemize_and_empty_lines'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'youhou'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'youhou'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -432,27 +435,30 @@ $result_trees{'itemize_and_empty_lines'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -880,27 +886,30 @@ $result_trees{'itemize_and_empty_lines'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'minus',
- 'source_info' => {
- 'line_nr' => 57
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'minus',
+ 'source_info' => {
+ 'line_nr' => 57
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1001,27 +1010,30 @@ $result_trees{'itemize_and_empty_lines'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'minus',
- 'source_info' => {
- 'line_nr' => 65
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'minus',
+ 'source_info' => {
+ 'line_nr' => 65
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1043,27 +1055,30 @@ $result_trees{'itemize_and_empty_lines'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
- 'source_info' => {
- 'line_nr' => 68
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'line_nr' => 68
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1206,27 +1221,30 @@ $result_trees{'itemize_and_empty_lines'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
- 'source_info' => {
- 'line_nr' => 75
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'line_nr' => 75
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -1352,11 +1370,11 @@ $result_trees{'itemize_and_empty_lines'} = {
],
'type' => 'document_root'
};
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[13]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0];
+$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[13]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_and_empty_lines'}{'contents'}[0]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'itemize_and_empty_lines'} = '@itemize youhou
@item first item
diff --git a/tp/t/results/itemize/itemize_in_example.pl
b/tp/t/results/itemize/itemize_in_example.pl
index d74aeaac56..7789fbe368 100644
--- a/tp/t/results/itemize/itemize_in_example.pl
+++ b/tp/t/results/itemize/itemize_in_example.pl
@@ -24,27 +24,30 @@ $result_trees{'itemize_in_example'} = {
'cmdname' => 'example',
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
- 'source_info' => {
- 'line_nr' => 2
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'line_nr' => 2
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -132,27 +135,30 @@ $result_trees{'itemize_in_example'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 8
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 8
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -231,24 +237,27 @@ $result_trees{'itemize_in_example'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'text' => '+'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '+'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -324,24 +333,27 @@ $result_trees{'itemize_in_example'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'm--n'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'm--n'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -417,35 +429,38 @@ $result_trees{'itemize_in_example'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 20
+ }
+ },
+ {
+ 'text' => ' a--n itemize line'
}
],
- 'source_info' => {
- 'line_nr' => 20
- }
- },
- {
- 'text' => ' a--n itemize line'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -551,8 +566,8 @@ $result_trees{'itemize_in_example'} = {
],
'type' => 'document_root'
};
-$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'itemize_in_example'} = '@example
@itemize @bullet
diff --git a/tp/t/results/itemize/itemize_line_commands_with_brace.pl
b/tp/t/results/itemize/itemize_line_commands_with_brace.pl
index d5c38f5dff..b1e56270ba 100644
--- a/tp/t/results/itemize/itemize_line_commands_with_brace.pl
+++ b/tp/t/results/itemize/itemize_line_commands_with_brace.pl
@@ -10,32 +10,35 @@ $result_trees{'itemize_line_commands_with_brace'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -109,32 +112,35 @@ $result_trees{'itemize_line_commands_with_brace'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'minus',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'minus',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 5
+ }
}
],
- 'source_info' => {
- 'line_nr' => 5
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -208,8 +214,8 @@ $result_trees{'itemize_line_commands_with_brace'} = {
],
'type' => 'document_root'
};
-$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_line_commands_with_brace'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'itemize_line_commands_with_brace'} = '@itemize @bullet{}
@item bullet
diff --git a/tp/t/results/itemize/itemize_long_item.pl
b/tp/t/results/itemize/itemize_long_item.pl
index c2097be1c7..cfd42d4d30 100644
--- a/tp/t/results/itemize/itemize_long_item.pl
+++ b/tp/t/results/itemize/itemize_long_item.pl
@@ -10,24 +10,27 @@ $result_trees{'itemize_long_item'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'youhou itemize very long item aaaaaaaaaaaaaaaa
bbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccc'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'youhou itemize very long item
aaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccc'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
diff --git a/tp/t/results/itemize/not_closed_item.pl
b/tp/t/results/itemize/not_closed_item.pl
index db0a9d1c9b..bee56df73a 100644
--- a/tp/t/results/itemize/not_closed_item.pl
+++ b/tp/t/results/itemize/not_closed_item.pl
@@ -10,27 +10,30 @@ $result_trees{'not_closed_item'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -69,7 +72,7 @@ $result_trees{'not_closed_item'} = {
],
'type' => 'document_root'
};
-$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'not_closed_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'not_closed_item'} = '@itemize
@item in item
diff --git a/tp/t/results/itemize/not_closed_itemize.pl
b/tp/t/results/itemize/not_closed_itemize.pl
index 90fe3ca668..ec8a75e0d6 100644
--- a/tp/t/results/itemize/not_closed_itemize.pl
+++ b/tp/t/results/itemize/not_closed_itemize.pl
@@ -10,26 +10,31 @@ $result_trees{'not_closed_itemize'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
+ ],
+ 'type' => 'argument'
}
],
- 'cmdname' => 'itemize',
'extra' => {
'command_as_argument' => {}
},
@@ -43,7 +48,7 @@ $result_trees{'not_closed_itemize'} = {
],
'type' => 'document_root'
};
-$result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'not_closed_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'not_closed_itemize'} = '@itemize
';
diff --git a/tp/t/results/itemize/table_in_itemize.pl
b/tp/t/results/itemize/table_in_itemize.pl
index 5e5602504c..25a82e5278 100644
--- a/tp/t/results/itemize/table_in_itemize.pl
+++ b/tp/t/results/itemize/table_in_itemize.pl
@@ -10,27 +10,30 @@ $result_trees{'table_in_itemize'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -64,27 +67,30 @@ $result_trees{'table_in_itemize'} = {
'type' => 'ignorable_spaces_after_command'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 4
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 4
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -333,8 +339,8 @@ $result_trees{'table_in_itemize'} = {
],
'type' => 'document_root'
};
-$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'table_in_itemize'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'table_in_itemize'} = '@itemize @bullet
@item item one
diff --git a/tp/t/results/itemize/w_argument.pl
b/tp/t/results/itemize/w_argument.pl
index 06e0b0d2ff..3e459c27e9 100644
--- a/tp/t/results/itemize/w_argument.pl
+++ b/tp/t/results/itemize/w_argument.pl
@@ -10,32 +10,35 @@ $result_trees{'w_argument'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'w',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'w',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -165,7 +168,7 @@ $result_trees{'w_argument'} = {
],
'type' => 'document_root'
};
-$result_trees{'w_argument'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'w_argument'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'w_argument'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'w_argument'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'w_argument'} = '@itemize @w{}
@item @option{--build=} platform on which the program is compiled,
diff --git a/tp/t/results/latex_tests/enumerate_arguments.pl
b/tp/t/results/latex_tests/enumerate_arguments.pl
index 1eb58545af..9f5e971b83 100644
--- a/tp/t/results/latex_tests/enumerate_arguments.pl
+++ b/tp/t/results/latex_tests/enumerate_arguments.pl
@@ -13,24 +13,27 @@ $result_trees{'enumerate_arguments'} = {
'type' => 'preamble_before_content'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'a'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -128,24 +131,27 @@ $result_trees{'enumerate_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'A'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'A'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -243,24 +249,27 @@ $result_trees{'enumerate_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'c'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'c'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -358,24 +367,27 @@ $result_trees{'enumerate_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'C'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'C'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -473,24 +485,27 @@ $result_trees{'enumerate_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => '1'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '1'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -588,24 +603,27 @@ $result_trees{'enumerate_arguments'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => '3'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '3'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
diff --git a/tp/t/results/latex_tests/nested_enumerate.pl
b/tp/t/results/latex_tests/nested_enumerate.pl
index 18c964eb5a..7d82a0e676 100644
--- a/tp/t/results/latex_tests/nested_enumerate.pl
+++ b/tp/t/results/latex_tests/nested_enumerate.pl
@@ -13,19 +13,22 @@ $result_trees{'nested_enumerate'} = {
'type' => 'preamble_before_content'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -79,19 +82,22 @@ $result_trees{'nested_enumerate'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -145,19 +151,22 @@ $result_trees{'nested_enumerate'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -211,19 +220,22 @@ $result_trees{'nested_enumerate'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/latex_tests/nested_itemize.pl
b/tp/t/results/latex_tests/nested_itemize.pl
index cd2320ec28..dc878008ac 100644
--- a/tp/t/results/latex_tests/nested_itemize.pl
+++ b/tp/t/results/latex_tests/nested_itemize.pl
@@ -13,27 +13,30 @@ $result_trees{'nested_itemize'} = {
'type' => 'preamble_before_content'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -87,27 +90,30 @@ $result_trees{'nested_itemize'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -161,27 +167,30 @@ $result_trees{'nested_itemize'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -235,27 +244,30 @@ $result_trees{'nested_itemize'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -503,10 +515,10 @@ $result_trees{'nested_itemize'} = {
],
'type' => 'document_root'
};
-$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[2]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'nested_itemize'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'nested_itemize'} = '@itemize
@item First level item
diff --git a/tp/t/results/linemacro/blockitem_no_item.pl
b/tp/t/results/linemacro/blockitem_no_item.pl
index fa3d86efdf..61d512ba91 100644
--- a/tp/t/results/linemacro/blockitem_no_item.pl
+++ b/tp/t/results/linemacro/blockitem_no_item.pl
@@ -83,27 +83,30 @@ $result_trees{'blockitem_no_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -231,7 +234,7 @@ $result_trees{'blockitem_no_item'} = {
],
'type' => 'document_root'
};
-$result_trees{'blockitem_no_item'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'blockitem_no_item'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'blockitem_no_item'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'blockitem_no_item'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'blockitem_no_item'} = '@linemacro mycommand {a, b, c}
\\a\\, \\b\\ \\c\\
diff --git a/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
b/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
index 01a5c3cbe3..abe32a34c1 100644
--- a/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
+++ b/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
@@ -257,33 +257,36 @@ now second arg: gg '
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'code',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 14,
+ 'macro' => 'mymacro'
+ }
}
],
- 'source_info' => {
- 'line_nr' => 14,
- 'macro' => 'mymacro'
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -434,7 +437,7 @@ now second arg: gg '
],
'type' => 'document_root'
};
-$result_trees{'call_macro_in_linemacro_body'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'call_macro_in_linemacro_body'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'call_macro_in_linemacro_body'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'call_macro_in_linemacro_body'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'call_macro_in_linemacro_body'} = '@linemacro lm {a, b}
@mymacro{@code{}
diff --git a/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
b/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
index abb7bd2ce6..56ada4f0fc 100644
--- a/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
@@ -267,28 +267,31 @@ $result_trees{'call_macro_in_linemacro_call'} = {
'type' => 'spaces_before_paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 14,
- 'macro' => 'mymacro'
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 14,
+ 'macro' => 'mymacro'
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -473,7 +476,7 @@ $result_trees{'call_macro_in_linemacro_call'} = {
],
'type' => 'document_root'
};
-$result_trees{'call_macro_in_linemacro_call'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'call_macro_in_linemacro_call'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'call_macro_in_linemacro_call'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'call_macro_in_linemacro_call'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'call_macro_in_linemacro_call'} = '@linemacro lm {a, b}
@quotation \\a\\
diff --git a/tp/t/results/macro/bib_example.pl
b/tp/t/results/macro/bib_example.pl
index e2f5d6afb8..cec942b606 100644
--- a/tp/t/results/macro/bib_example.pl
+++ b/tp/t/results/macro/bib_example.pl
@@ -3473,33 +3473,36 @@ $result_trees{'bib_example'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'w',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'w',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'file_name' => 'bib-example.texi',
+ 'line_nr' => 49
+ }
}
],
- 'source_info' => {
- 'file_name' => 'bib-example.texi',
- 'line_nr' => 49
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -3937,7 +3940,7 @@ $result_trees{'bib_example'} = {
$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0];
$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'contents'}[0]{'contents'}[0];
-$result_trees{'bib_example'}{'contents'}[6]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'bib_example'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'bib_example'}{'contents'}[6]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'bib_example'} = '\\input texinfo @c -*-texinfo-*-
@c % Copyright (C) 2004 Aaron S. Hawley
diff --git a/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
b/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
index 7d7a23edda..80d48ef376 100644
--- a/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
+++ b/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
@@ -136,264 +136,267 @@
$result_trees{'macro_expansion_in_multitable_prototype'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'source_marks' => [
- {
- 'counter' => 1,
- 'element' => {
- 'contents' => [
- {
- 'type' => 'brace_arg'
- }
- ],
- 'info' => {
- 'command_name' => 'simple'
- },
- 'type' => 'macro_call'
- },
- 'position' => 2,
- 'sourcemark_type' => 'macro_expansion',
- 'status' => 'start'
- },
- {
- 'counter' => 1,
- 'position' => 4,
- 'sourcemark_type' => 'macro_expansion',
- 'status' => 'end'
- }
- ],
- 'text' => 'h ab i'
- }
- ],
- 'source_info' => {
- 'line_nr' => 9
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
- {
- 'source_marks' => [
+ 'contents' => [
{
- 'counter' => 2,
- 'element' => {
- 'contents' => [
- {
- 'type' => 'brace_arg'
- }
- ],
- 'info' => {
- 'command_name' => 'simple'
+ 'source_marks' => [
+ {
+ 'counter' => 1,
+ 'element' => {
+ 'contents' => [
+ {
+ 'type' => 'brace_arg'
+ }
+ ],
+ 'info' => {
+ 'command_name' => 'simple'
+ },
+ 'type' => 'macro_call'
+ },
+ 'position' => 2,
+ 'sourcemark_type' => 'macro_expansion',
+ 'status' => 'start'
},
- 'type' => 'macro_call'
- },
- 'position' => 2,
- 'sourcemark_type' => 'macro_expansion',
- 'status' => 'start'
- },
- {
- 'counter' => 2,
- 'position' => 4,
- 'sourcemark_type' => 'macro_expansion',
- 'status' => 'end'
+ {
+ 'counter' => 1,
+ 'position' => 4,
+ 'sourcemark_type' => 'macro_expansion',
+ 'status' => 'end'
+ }
+ ],
+ 'text' => 'h ab i'
}
],
- 'text' => 'j ab'
- }
- ],
- 'source_info' => {
- 'line_nr' => 9
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'source_info' => {
+ 'line_nr' => 9
+ },
+ 'type' => 'bracketed_arg'
+ },
{
- 'text' => 'k '
+ 'text' => ' '
},
{
- 'cmdname' => 'emph',
'contents' => [
{
- 'contents' => [
+ 'source_marks' => [
{
- 'text' => 's'
+ 'counter' => 2,
+ 'element' => {
+ 'contents' => [
+ {
+ 'type' => 'brace_arg'
+ }
+ ],
+ 'info' => {
+ 'command_name' => 'simple'
+ },
+ 'type' => 'macro_call'
+ },
+ 'position' => 2,
+ 'sourcemark_type' => 'macro_expansion',
+ 'status' => 'start'
+ },
+ {
+ 'counter' => 2,
+ 'position' => 4,
+ 'sourcemark_type' => 'macro_expansion',
+ 'status' => 'end'
}
],
- 'type' => 'brace_container'
+ 'text' => 'j ab'
}
],
'source_info' => {
'line_nr' => 9
- }
+ },
+ 'type' => 'bracketed_arg'
},
{
- 'source_marks' => [
+ 'text' => ' '
+ },
+ {
+ 'contents' => [
{
- 'counter' => 3,
- 'element' => {
- 'contents' => [
- {
- 'type' => 'brace_arg'
- }
- ],
- 'info' => {
- 'command_name' => 'simple'
- },
- 'type' => 'macro_call'
- },
- 'position' => 1,
- 'sourcemark_type' => 'macro_expansion',
- 'status' => 'start'
+ 'text' => 'k '
},
{
- 'counter' => 3,
- 'position' => 3,
- 'sourcemark_type' => 'macro_expansion',
- 'status' => 'end'
- }
- ],
- 'text' => 'nab'
- }
- ],
- 'source_info' => {
- 'line_nr' => 9
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
- {
- 'source_marks' => [
+ 'cmdname' => 'emph',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 's'
+ }
+ ],
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 9
+ }
+ },
{
- 'counter' => 4,
- 'element' => {
- 'contents' => [
- {
+ 'source_marks' => [
+ {
+ 'counter' => 3,
+ 'element' => {
'contents' => [
{
- 'text' => '@code{l}'
+ 'type' => 'brace_arg'
}
],
- 'type' => 'brace_arg'
- }
- ],
- 'info' => {
- 'command_name' => 'endbrace'
+ 'info' => {
+ 'command_name' => 'simple'
+ },
+ 'type' => 'macro_call'
+ },
+ 'position' => 1,
+ 'sourcemark_type' => 'macro_expansion',
+ 'status' => 'start'
},
- 'type' => 'macro_call'
- },
- 'position' => 2,
- 'sourcemark_type' => 'macro_expansion',
- 'status' => 'start'
+ {
+ 'counter' => 3,
+ 'position' => 3,
+ 'sourcemark_type' => 'macro_expansion',
+ 'status' => 'end'
+ }
+ ],
+ 'text' => 'nab'
}
],
- 'text' => 'g c'
+ 'source_info' => {
+ 'line_nr' => 9
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
},
{
- 'cmdname' => 'code',
'contents' => [
{
+ 'source_marks' => [
+ {
+ 'counter' => 4,
+ 'element' => {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => '@code{l}'
+ }
+ ],
+ 'type' => 'brace_arg'
+ }
+ ],
+ 'info' => {
+ 'command_name' => 'endbrace'
+ },
+ 'type' => 'macro_call'
+ },
+ 'position' => 2,
+ 'sourcemark_type' => 'macro_expansion',
+ 'status' => 'start'
+ }
+ ],
+ 'text' => 'g c'
+ },
+ {
+ 'cmdname' => 'code',
'contents' => [
{
- 'text' => 'l'
+ 'contents' => [
+ {
+ 'text' => 'l'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 9,
+ 'macro' => 'endbrace'
+ }
+ },
+ {
+ 'text' => 'd'
}
],
'source_info' => {
- 'line_nr' => 9,
- 'macro' => 'endbrace'
- }
+ 'line_nr' => 9
+ },
+ 'source_marks' => [
+ {
+ 'counter' => 4,
+ 'sourcemark_type' => 'macro_expansion',
+ 'status' => 'end'
+ }
+ ],
+ 'type' => 'bracketed_arg'
},
{
- 'text' => 'd'
- }
- ],
- 'source_info' => {
- 'line_nr' => 9
- },
- 'source_marks' => [
- {
- 'counter' => 4,
- 'sourcemark_type' => 'macro_expansion',
- 'status' => 'end'
- }
- ],
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'text' => ' '
+ },
{
- 'source_marks' => [
+ 'contents' => [
{
- 'counter' => 5,
- 'element' => {
- 'contents' => [
- {
+ 'source_marks' => [
+ {
+ 'counter' => 5,
+ 'element' => {
'contents' => [
{
- 'text' => 'T'
+ 'contents' => [
+ {
+ 'text' => 'T'
+ }
+ ],
+ 'type' => 'brace_arg'
}
],
- 'type' => 'brace_arg'
- }
- ],
- 'info' => {
- 'command_name' => 'endbrace'
- },
- 'type' => 'macro_call'
- },
- 'position' => 2,
+ 'info' => {
+ 'command_name' => 'endbrace'
+ },
+ 'type' => 'macro_call'
+ },
+ 'position' => 2,
+ 'sourcemark_type' => 'macro_expansion',
+ 'status' => 'start'
+ }
+ ],
+ 'text' => 'h cTd'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 9
+ },
+ 'source_marks' => [
+ {
+ 'counter' => 5,
'sourcemark_type' => 'macro_expansion',
- 'status' => 'start'
+ 'status' => 'end'
}
],
- 'text' => 'h cTd'
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 9
- },
- 'source_marks' => [
- {
- 'counter' => 5,
- 'sourcemark_type' => 'macro_expansion',
- 'status' => 'end'
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
}
- ],
- 'type' => 'bracketed_arg'
+ },
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/macro/macro_in_brace_command.pl
b/tp/t/results/macro/macro_in_brace_command.pl
index bbded4d7ac..b93b359045 100644
--- a/tp/t/results/macro/macro_in_brace_command.pl
+++ b/tp/t/results/macro/macro_in_brace_command.pl
@@ -132,27 +132,30 @@ $result_trees{'macro_in_brace_command'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
- 'source_info' => {
- 'line_nr' => 9
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'line_nr' => 9
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -302,7 +305,7 @@ $result_trees{'macro_in_brace_command'} = {
],
'type' => 'document_root'
};
-$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'macro_in_brace_command'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'macro_in_brace_command'} = '@macro foo
foo-expansion
diff --git a/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
b/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
index 49c4ebe65b..11537e763f 100644
--- a/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
@@ -66,49 +66,52 @@
$result_trees{'macro_in_empty_multitable_empty_before_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '0.4 .6 5.'
+ 'contents' => [
+ {
+ 'text' => '0.4 .6 5.'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.4',
+ '.6',
+ '5.'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 4
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.4',
- '.6',
- '5.'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 4
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'source_marks' => [
{
@@ -185,7 +188,7 @@
$result_trees{'macro_in_empty_multitable_empty_before_item'} = {
],
'type' => 'document_root'
};
-$result_trees{'macro_in_empty_multitable_empty_before_item'}{'contents'}[0]{'contents'}[2]{'extra'}{'columnfractions'}
=
$result_trees{'macro_in_empty_multitable_empty_before_item'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'macro_in_empty_multitable_empty_before_item'}{'contents'}[0]{'contents'}[2]{'extra'}{'columnfractions'}
=
$result_trees{'macro_in_empty_multitable_empty_before_item'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'macro_in_empty_multitable_empty_before_item'} = '@macro
emptymacro
@end macro
diff --git a/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
b/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
index 67084e6070..861d1f1975 100644
--- a/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
@@ -66,27 +66,30 @@ $result_trees{'macro_in_empty_table_empty_before_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'line_nr' => 4
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'line_nr' => 4
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'source_marks' => [
{
@@ -162,7 +165,7 @@ $result_trees{'macro_in_empty_table_empty_before_item'} = {
],
'type' => 'document_root'
};
-$result_trees{'macro_in_empty_table_empty_before_item'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'macro_in_empty_table_empty_before_item'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'macro_in_empty_table_empty_before_item'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'macro_in_empty_table_empty_before_item'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'macro_in_empty_table_empty_before_item'} = '@macro emptymacro
@end macro
diff --git a/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
b/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
index 310604bd74..e6ff762541 100644
--- a/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
@@ -66,49 +66,52 @@ $result_trees{'macro_in_multitable_empty_before_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '0.4 .6 5.'
+ 'contents' => [
+ {
+ 'text' => '0.4 .6 5.'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.4',
+ '.6',
+ '5.'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 4
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.4',
- '.6',
- '5.'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 4
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -250,7 +253,7 @@ $result_trees{'macro_in_multitable_empty_before_item'} = {
],
'type' => 'document_root'
};
-$result_trees{'macro_in_multitable_empty_before_item'}{'contents'}[0]{'contents'}[2]{'extra'}{'columnfractions'}
=
$result_trees{'macro_in_multitable_empty_before_item'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'macro_in_multitable_empty_before_item'}{'contents'}[0]{'contents'}[2]{'extra'}{'columnfractions'}
=
$result_trees{'macro_in_multitable_empty_before_item'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'macro_in_multitable_empty_before_item'} = '@macro emptymacro
@end macro
diff --git a/tp/t/results/macro/macro_in_table_empty_before_item.pl
b/tp/t/results/macro/macro_in_table_empty_before_item.pl
index 38b16ee2e2..623f6ba8d8 100644
--- a/tp/t/results/macro/macro_in_table_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_table_empty_before_item.pl
@@ -66,27 +66,30 @@ $result_trees{'macro_in_table_empty_before_item'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'line_nr' => 4
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'line_nr' => 4
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -204,7 +207,7 @@ $result_trees{'macro_in_table_empty_before_item'} = {
],
'type' => 'document_root'
};
-$result_trees{'macro_in_table_empty_before_item'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'macro_in_table_empty_before_item'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'macro_in_table_empty_before_item'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'macro_in_table_empty_before_item'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'macro_in_table_empty_before_item'} = '@macro emptymacro
@end macro
diff --git a/tp/t/results/menu/block_commands_in_menu_description.pl
b/tp/t/results/menu/block_commands_in_menu_description.pl
index 1744825d8c..e0417e93be 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -122,27 +122,30 @@ $result_trees{'block_commands_in_menu_description'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -226,27 +229,30 @@ $result_trees{'block_commands_in_menu_description'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 11
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 11
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -552,8 +558,8 @@ $result_trees{'block_commands_in_menu_description'} = {
'type' => 'document_root'
};
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'block_commands_in_menu_description'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'block_commands_in_menu_description'} = '@node first
@top top
diff --git a/tp/t/results/menu/formats_in_menu.pl
b/tp/t/results/menu/formats_in_menu.pl
index ebc5295eae..26dd19396a 100644
--- a/tp/t/results/menu/formats_in_menu.pl
+++ b/tp/t/results/menu/formats_in_menu.pl
@@ -91,27 +91,30 @@ $result_trees{'formats_in_menu'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 5
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 5
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -669,7 +672,7 @@ $result_trees{'formats_in_menu'} = {
'type' => 'document_root'
};
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'contents'}[1]{'contents'}[1];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[3]{'contents'}[1]{'contents'}[1];
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'formats_in_menu'}{'contents'}[1]{'contents'}[1]{'contents'}[4]{'contents'}[1]{'contents'}[1];
diff --git a/tp/t/results/menu/submenu_in_example.pl
b/tp/t/results/menu/submenu_in_example.pl
index 6320e4ed2b..ed919978c3 100644
--- a/tp/t/results/menu/submenu_in_example.pl
+++ b/tp/t/results/menu/submenu_in_example.pl
@@ -405,19 +405,22 @@ $result_trees{'submenu_in_example'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
diff --git a/tp/t/results/misc_commands/footnote_in_center.pl
b/tp/t/results/misc_commands/footnote_in_center.pl
index 2d78d4b6cc..7cd7ff175b 100644
--- a/tp/t/results/misc_commands/footnote_in_center.pl
+++ b/tp/t/results/misc_commands/footnote_in_center.pl
@@ -54,27 +54,30 @@ $result_trees{'footnote_in_center'} = {
'cmdname' => 'example',
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 5
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 5
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -242,7 +245,7 @@ $result_trees{'footnote_in_center'} = {
],
'type' => 'document_root'
};
-$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'footnote_in_center'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'footnote_in_center'} = '@center Centered text with a
footnote@footnote{This footnote
shows an important feature of the centered text.
diff --git a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
index c24b33a1f2..1df20d991c 100644
--- a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
@@ -224,31 +224,34 @@ $result_trees{'kbdinputstyle_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'kbd',
- 'extra' => {
- 'code' => 1
+ 'contents' => [
+ {
+ 'cmdname' => 'kbd',
+ 'extra' => {
+ 'code' => 1
+ },
+ 'source_info' => {
+ 'line_nr' => 25,
+ 'macro' => 'codekbdmacro'
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'source_info' => {
- 'line_nr' => 25,
- 'macro' => 'codekbdmacro'
- }
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -339,36 +342,39 @@ $result_trees{'kbdinputstyle_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'kbd',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'kbd',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'extra' => {
+ 'code' => 1
+ },
+ 'source_info' => {
+ 'line_nr' => 25,
+ 'macro' => 'codekbdmacro'
+ }
}
],
- 'extra' => {
- 'code' => 1
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'source_info' => {
- 'line_nr' => 25,
- 'macro' => 'codekbdmacro'
- }
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -482,31 +488,34 @@ $result_trees{'kbdinputstyle_in_table'} = {
'cmdname' => 'example',
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'kbd',
- 'extra' => {
- 'code' => 1
+ 'contents' => [
+ {
+ 'cmdname' => 'kbd',
+ 'extra' => {
+ 'code' => 1
+ },
+ 'source_info' => {
+ 'line_nr' => 25,
+ 'macro' => 'codekbdmacro'
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'source_info' => {
- 'line_nr' => 25,
- 'macro' => 'codekbdmacro'
- }
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -592,36 +601,39 @@ $result_trees{'kbdinputstyle_in_table'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'kbd',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'kbd',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'extra' => {
+ 'code' => 1
+ },
+ 'source_info' => {
+ 'line_nr' => 25,
+ 'macro' => 'codekbdmacro'
+ }
}
],
- 'extra' => {
- 'code' => 1
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'source_info' => {
- 'line_nr' => 25,
- 'macro' => 'codekbdmacro'
- }
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -830,31 +842,34 @@ $result_trees{'kbdinputstyle_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'kbd',
- 'extra' => {
- 'code' => 1
+ 'contents' => [
+ {
+ 'cmdname' => 'kbd',
+ 'extra' => {
+ 'code' => 1
+ },
+ 'source_info' => {
+ 'line_nr' => 31,
+ 'macro' => 'codekbdmacro'
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'source_info' => {
- 'line_nr' => 31,
- 'macro' => 'codekbdmacro'
- }
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -945,36 +960,39 @@ $result_trees{'kbdinputstyle_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'kbd',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'kbd',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'extra' => {
+ 'code' => 1
+ },
+ 'source_info' => {
+ 'line_nr' => 31,
+ 'macro' => 'codekbdmacro'
+ }
}
],
- 'extra' => {
- 'code' => 1
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'source_info' => {
- 'line_nr' => 31,
- 'macro' => 'codekbdmacro'
- }
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1088,28 +1106,31 @@ $result_trees{'kbdinputstyle_in_table'} = {
'cmdname' => 'example',
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'kbd',
- 'source_info' => {
- 'line_nr' => 31,
- 'macro' => 'codekbdmacro'
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'kbd',
+ 'source_info' => {
+ 'line_nr' => 31,
+ 'macro' => 'codekbdmacro'
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1194,33 +1215,36 @@ $result_trees{'kbdinputstyle_in_table'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'kbd',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'kbd',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 31,
+ 'macro' => 'codekbdmacro'
+ }
}
],
- 'source_info' => {
- 'line_nr' => 31,
- 'macro' => 'codekbdmacro'
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1428,28 +1452,31 @@ $result_trees{'kbdinputstyle_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'kbd',
- 'source_info' => {
- 'line_nr' => 37,
- 'macro' => 'codekbdmacro'
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'kbd',
+ 'source_info' => {
+ 'line_nr' => 37,
+ 'macro' => 'codekbdmacro'
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1539,33 +1566,36 @@ $result_trees{'kbdinputstyle_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'kbd',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'kbd',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 37,
+ 'macro' => 'codekbdmacro'
+ }
}
],
- 'source_info' => {
- 'line_nr' => 37,
- 'macro' => 'codekbdmacro'
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1678,28 +1708,31 @@ $result_trees{'kbdinputstyle_in_table'} = {
'cmdname' => 'example',
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'kbd',
- 'source_info' => {
- 'line_nr' => 37,
- 'macro' => 'codekbdmacro'
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'kbd',
+ 'source_info' => {
+ 'line_nr' => 37,
+ 'macro' => 'codekbdmacro'
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1784,33 +1817,36 @@ $result_trees{'kbdinputstyle_in_table'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'kbd',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'kbd',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 37,
+ 'macro' => 'codekbdmacro'
+ }
}
],
- 'source_info' => {
- 'line_nr' => 37,
- 'macro' => 'codekbdmacro'
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1945,18 +1981,18 @@ $result_trees{'kbdinputstyle_in_table'} = {
],
'type' => 'document_root'
};
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[8]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[8]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[17]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[17]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[19]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[19]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[28]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[28]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[30]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[30]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[33]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[33]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[33]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[33]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[8]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[17]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[19]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[22]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[22]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[28]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[28]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[30]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[33]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[33]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[33]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'kbdinputstyle_in_table'}{'contents'}[0]{'contents'}[33]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'kbdinputstyle_in_table'} = '@macro codekbdmacro
@table @kbd
diff --git a/tp/t/results/multitable/empty_headitem.pl
b/tp/t/results/multitable/empty_headitem.pl
index d9444e3738..7a057571c0 100644
--- a/tp/t/results/multitable/empty_headitem.pl
+++ b/tp/t/results/multitable/empty_headitem.pl
@@ -10,49 +10,52 @@ $result_trees{'empty_headitem'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '.1 .1 .1'
+ 'contents' => [
+ {
+ 'text' => '.1 .1 .1'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '.1',
+ '.1',
+ '.1'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '.1',
- '.1',
- '.1'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 1
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -285,7 +288,7 @@ $result_trees{'empty_headitem'} = {
],
'type' => 'document_root'
};
-$result_trees{'empty_headitem'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'empty_headitem'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'empty_headitem'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'empty_headitem'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'empty_headitem'} = '@multitable @columnfractions .1 .1 .1
@headitem @tab Index @tab Value
diff --git a/tp/t/results/multitable/empty_item_tab.pl
b/tp/t/results/multitable/empty_item_tab.pl
index fec676750f..acc1d342f9 100644
--- a/tp/t/results/multitable/empty_item_tab.pl
+++ b/tp/t/results/multitable/empty_item_tab.pl
@@ -10,47 +10,50 @@ $result_trees{'empty_item_tab'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '1.0'
+ 'contents' => [
+ {
+ 'text' => '1.0'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '1.0'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '1.0'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 1
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -215,48 +218,51 @@ $result_trees{'empty_item_tab'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '0.5 0.5'
+ 'contents' => [
+ {
+ 'text' => '0.5 0.5'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.5',
+ '0.5'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 9
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.5',
- '0.5'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 9
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -641,8 +647,8 @@ $result_trees{'empty_item_tab'} = {
],
'type' => 'document_root'
};
-$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'extra'}{'columnfractions'}
=
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'extra'}{'columnfractions'}
=
$result_trees{'empty_item_tab'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'empty_item_tab'} = '@multitable @columnfractions 1.0
@item
diff --git a/tp/t/results/multitable/empty_multitable_with_cells.pl
b/tp/t/results/multitable/empty_multitable_with_cells.pl
index 6728ac6b0c..730c15bbe8 100644
--- a/tp/t/results/multitable/empty_multitable_with_cells.pl
+++ b/tp/t/results/multitable/empty_multitable_with_cells.pl
@@ -10,19 +10,22 @@ $result_trees{'empty_multitable_with_cells'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/multitable/fullwidth_in_prototype.pl
b/tp/t/results/multitable/fullwidth_in_prototype.pl
index 5afd4afdd3..8f771b3565 100644
--- a/tp/t/results/multitable/fullwidth_in_prototype.pl
+++ b/tp/t/results/multitable/fullwidth_in_prototype.pl
@@ -10,60 +10,63 @@ $result_trees{'fullwidth_in_prototype'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => "\x{e9}\x{e9}\x{e9}\x{e9}
\x{e9}\x{e9}\x{e9}\x{e9} \x{e9}\x{e9}\x{e9}\x{e9} \x{e9}\x{e9}\x{e9}\x{e9}"
- }
- ],
- 'source_info' => {
- 'line_nr' => 1
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => "\x{e9}\x{e9}\x{e9}\x{e9}
\x{e9}\x{e9}\x{e9}\x{e9} \x{e9}\x{e9}\x{e9}\x{e9} \x{e9}\x{e9}\x{e9}\x{e9}"
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
+ },
{
- 'text' => 'xxxx xxxx xxxx xxxx'
- }
- ],
- 'source_info' => {
- 'line_nr' => 1
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'text' => ' '
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'xxxx xxxx xxxx xxxx'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
+ },
{
- 'text' => "\x{4eba}\x{4eba} \x{4eba}\x{4eba}
\x{4eba}\x{4eba} \x{4eba}\x{4eba}"
+ 'contents' => [
+ {
+ 'text' => "\x{4eba}\x{4eba} \x{4eba}\x{4eba}
\x{4eba}\x{4eba} \x{4eba}\x{4eba}"
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 1
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/multitable/inter_item_commands_in_multitable.pl
b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
index edb461a3b7..8fe39576b8 100644
--- a/tp/t/results/multitable/inter_item_commands_in_multitable.pl
+++ b/tp/t/results/multitable/inter_item_commands_in_multitable.pl
@@ -10,32 +10,35 @@ $result_trees{'inter_item_commands_in_multitable'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'truc'
+ 'contents' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 1
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -229,48 +232,51 @@ $result_trees{'inter_item_commands_in_multitable'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '0.6 0.4'
+ 'contents' => [
+ {
+ 'text' => '0.6 0.4'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.6',
+ '0.4'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 12
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.6',
- '0.4'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 12
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -573,32 +579,35 @@ $result_trees{'inter_item_commands_in_multitable'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'thing'
+ 'contents' => [
+ {
+ 'text' => 'thing'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 21
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 21
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -739,7 +748,7 @@ $result_trees{'inter_item_commands_in_multitable'} = {
],
'type' => 'document_root'
};
-$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'extra'}{'columnfractions'}
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'extra'}{'columnfractions'}
=
$result_trees{'inter_item_commands_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'inter_item_commands_in_multitable'} = '@multitable {truc}
@c comment before first item
diff --git a/tp/t/results/multitable/multitable_begin_with_tab.pl
b/tp/t/results/multitable/multitable_begin_with_tab.pl
index 8a55714f62..428a7e272d 100644
--- a/tp/t/results/multitable/multitable_begin_with_tab.pl
+++ b/tp/t/results/multitable/multitable_begin_with_tab.pl
@@ -10,46 +10,49 @@ $result_trees{'multitable_begin_with_tab'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'a'
- }
- ],
- 'source_info' => {
- 'line_nr' => 1
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
+ },
{
- 'text' => 'b'
+ 'text' => ' '
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'b'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 1
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -117,46 +120,49 @@ $result_trees{'multitable_begin_with_tab'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'c'
- }
- ],
- 'source_info' => {
- 'line_nr' => 5
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'c'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 5
+ },
+ 'type' => 'bracketed_arg'
+ },
{
- 'text' => 'd'
+ 'text' => ' '
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'd'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 5
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 5
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git
a/tp/t/results/multitable/multitable_bracketed_no_inter_space_prototype.pl
b/tp/t/results/multitable/multitable_bracketed_no_inter_space_prototype.pl
index 0088222e17..47b1e4a318 100644
--- a/tp/t/results/multitable/multitable_bracketed_no_inter_space_prototype.pl
+++ b/tp/t/results/multitable/multitable_bracketed_no_inter_space_prototype.pl
@@ -15,43 +15,46 @@
$result_trees{'multitable_bracketed_no_inter_space_prototype'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'a'
- }
- ],
- 'source_info' => {
- 'line_nr' => 2
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 2
+ },
+ 'type' => 'bracketed_arg'
+ },
{
- 'text' => 'b'
+ 'contents' => [
+ {
+ 'text' => 'b'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 2
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 2
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed.pl
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed.pl
index 4206c6c41b..cac4a501c1 100644
--- a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed.pl
+++ b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed.pl
@@ -15,27 +15,30 @@
$result_trees{'multitable_bracketed_prototype_empty_not_closed'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'source_info' => {
+ 'line_nr' => 2
+ },
+ 'type' => 'bracketed_arg'
}
- },
- 'source_info' => {
- 'line_nr' => 2
- },
- 'type' => 'bracketed_arg'
+ ],
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
index 3327e69366..2a5dbfe605 100644
---
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
+++
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_not_closed_comment.pl
@@ -15,33 +15,36 @@
$result_trees{'multitable_bracketed_prototype_empty_not_closed_comment'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'text' => ' comment
+ 'args' => [
+ {
+ 'text' => ' comment
',
- 'type' => 'rawline_arg'
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'comment'
}
],
- 'cmdname' => 'comment'
+ 'source_info' => {
+ 'line_nr' => 2
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 2
- },
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed.pl
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed.pl
index f6ebcac877..0f2e4cc8cc 100644
---
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed.pl
+++
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed.pl
@@ -15,27 +15,30 @@
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'source_info' => {
+ 'line_nr' => 2
+ },
+ 'type' => 'bracketed_arg'
}
- },
- 'source_info' => {
- 'line_nr' => 2
- },
- 'type' => 'bracketed_arg'
+ ],
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
index b840808a38..614a4e43b6 100644
---
a/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
+++
b/tp/t/results/multitable/multitable_bracketed_prototype_empty_spaces_not_closed_comment.pl
@@ -15,38 +15,41 @@
$result_trees{'multitable_bracketed_prototype_empty_spaces_not_closed_comment'}
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'text' => ' comment
+ 'args' => [
+ {
+ 'text' => ' comment
',
- 'type' => 'rawline_arg'
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'comment'
}
],
- 'cmdname' => 'comment'
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'line_nr' => 2
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 2
- },
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
index 0dcce41a2e..e000c2cf5b 100644
--- a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
+++ b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed.pl
@@ -15,32 +15,35 @@ $result_trees{'multitable_bracketed_prototype_not_closed'}
= {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'a
+ 'contents' => [
+ {
+ 'text' => 'a
'
+ }
+ ],
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'line_nr' => 2
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 2
- },
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl
index 1e012da369..b29b8dca26 100644
---
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl
+++
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_comment.pl
@@ -15,36 +15,39 @@
$result_trees{'multitable_bracketed_prototype_not_closed_comment'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'a'
- },
- {
- 'args' => [
+ 'contents' => [
{
- 'text' => ' comment
+ 'text' => 'a'
+ },
+ {
+ 'args' => [
+ {
+ 'text' => ' comment
',
- 'type' => 'rawline_arg'
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
}
],
- 'cmdname' => 'c'
+ 'source_info' => {
+ 'line_nr' => 2
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 2
- },
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
index 393697ab1d..bf15cbf171 100644
---
a/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
+++
b/tp/t/results/multitable/multitable_bracketed_prototype_not_closed_space_comment.pl
@@ -15,36 +15,39 @@
$result_trees{'multitable_bracketed_prototype_not_closed_space_comment'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'a '
- },
- {
- 'args' => [
+ 'contents' => [
{
- 'text' => ' comment
+ 'text' => 'a '
+ },
+ {
+ 'args' => [
+ {
+ 'text' => ' comment
',
- 'type' => 'rawline_arg'
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
}
],
- 'cmdname' => 'c'
+ 'source_info' => {
+ 'line_nr' => 2
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 2
- },
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
b/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
index 422ef06ab6..65c8bae636 100644
--- a/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
+++ b/tp/t/results/multitable/multitable_empty_bracketed_prototype.pl
@@ -15,41 +15,44 @@ $result_trees{'multitable_empty_bracketed_prototype'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
- {
- 'source_info' => {
- 'line_nr' => 2
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
{
'contents' => [
{
- 'text' => 'a'
+ 'source_info' => {
+ 'line_nr' => 2
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 2
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 2
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/multitable/multitable_figure_space.pl
b/tp/t/results/multitable/multitable_figure_space.pl
index b8cc294e5e..8586831dda 100644
--- a/tp/t/results/multitable/multitable_figure_space.pl
+++ b/tp/t/results/multitable/multitable_figure_space.pl
@@ -10,46 +10,49 @@ $result_trees{'multitable_figure_space'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => '999999999'
- }
- ],
- 'source_info' => {
- 'line_nr' => 1
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => '999999999'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
+ },
{
- 'text' => 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+ 'contents' => [
+ {
+ 'text' =>
'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 1
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/multitable/multitable_in_example.pl
b/tp/t/results/multitable/multitable_in_example.pl
index f35aeaf228..4f4623ae9b 100644
--- a/tp/t/results/multitable/multitable_in_example.pl
+++ b/tp/t/results/multitable/multitable_in_example.pl
@@ -24,46 +24,49 @@ $result_trees{'multitable_in_example'} = {
'cmdname' => 'example',
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'AAA'
- }
- ],
- 'source_info' => {
- 'line_nr' => 2
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'AAA'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 2
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
+ },
{
- 'text' => 'BBB'
+ 'contents' => [
+ {
+ 'text' => 'BBB'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 2
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 2
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/multitable/multitable_not_closed.pl
b/tp/t/results/multitable/multitable_not_closed.pl
index 70cfc0483a..78cd9ad1cc 100644
--- a/tp/t/results/multitable/multitable_not_closed.pl
+++ b/tp/t/results/multitable/multitable_not_closed.pl
@@ -10,45 +10,50 @@ $result_trees{'multitable_not_closed'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'r'
- }
- ],
- 'source_info' => {
- 'line_nr' => 1
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
+ },
{
- 'text' => 't'
+ 'text' => ' '
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 't'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 1
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
+ 'type' => 'argument'
}
],
- 'cmdname' => 'multitable',
'extra' => {
'max_columns' => 2
},
diff --git a/tp/t/results/multitable/multitable_not_closed_item.pl
b/tp/t/results/multitable/multitable_not_closed_item.pl
index dbfd90e98f..f7423a60f3 100644
--- a/tp/t/results/multitable/multitable_not_closed_item.pl
+++ b/tp/t/results/multitable/multitable_not_closed_item.pl
@@ -10,46 +10,49 @@ $result_trees{'multitable_not_closed_item'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'r'
- }
- ],
- 'source_info' => {
- 'line_nr' => 1
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
+ },
{
- 'text' => 't'
+ 'contents' => [
+ {
+ 'text' => 't'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 1
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/multitable/multitable_not_closed_item_tab.pl
b/tp/t/results/multitable/multitable_not_closed_item_tab.pl
index 0a9a9ade7c..ec3af7b9d4 100644
--- a/tp/t/results/multitable/multitable_not_closed_item_tab.pl
+++ b/tp/t/results/multitable/multitable_not_closed_item_tab.pl
@@ -10,46 +10,49 @@ $result_trees{'multitable_not_closed_item_tab'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'r'
- }
- ],
- 'source_info' => {
- 'line_nr' => 1
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'r'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
+ },
{
- 'text' => 't'
+ 'text' => ' '
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 't'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 1
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
b/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
index b18a46abed..b872ea2db0 100644
--- a/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
+++ b/tp/t/results/multitable/multitable_one_column_too_much_cells.pl
@@ -10,32 +10,35 @@ $result_trees{'multitable_one_column_too_much_cells'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'a'
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 1
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl
b/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl
index 4be2b207a9..a3c51ac643 100644
--- a/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl
+++ b/tp/t/results/multitable/multitable_two_columns_too_much_cells.pl
@@ -10,48 +10,51 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '0.4 0.6'
+ 'contents' => [
+ {
+ 'text' => '0.4 0.6'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.4',
+ '0.6'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.4',
- '0.6'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 1
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -297,7 +300,7 @@ $result_trees{'multitable_two_columns_too_much_cells'} = {
],
'type' => 'document_root'
};
-$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'multitable_two_columns_too_much_cells'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'multitable_two_columns_too_much_cells'} = '@multitable
@columnfractions 0.4 0.6
@item first @tab second first out second out third out
diff --git a/tp/t/results/multitable/multitable_with_empty_item_tab.pl
b/tp/t/results/multitable/multitable_with_empty_item_tab.pl
index 2536e3beaa..d4c35772e0 100644
--- a/tp/t/results/multitable/multitable_with_empty_item_tab.pl
+++ b/tp/t/results/multitable/multitable_with_empty_item_tab.pl
@@ -10,48 +10,51 @@ $result_trees{'multitable_with_empty_item_tab'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '0.3 0.7'
+ 'contents' => [
+ {
+ 'text' => '0.3 0.7'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.3',
+ '0.7'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 1
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.3',
- '0.7'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 1
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -242,7 +245,7 @@ $result_trees{'multitable_with_empty_item_tab'} = {
],
'type' => 'document_root'
};
-$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'extra'}{'columnfractions'}
=
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'multitable_with_empty_item_tab'} = '@multitable
@columnfractions 0.3 0.7
@item 1-1 @tab 1-2 @item@tab@item 3-1 @tab 3-2
diff --git a/tp/t/results/multitable/not_letters_in_prototype.pl
b/tp/t/results/multitable/not_letters_in_prototype.pl
index c3dac1c65c..67f42fc95d 100644
--- a/tp/t/results/multitable/not_letters_in_prototype.pl
+++ b/tp/t/results/multitable/not_letters_in_prototype.pl
@@ -10,24 +10,27 @@ $result_trees{'not_letters_in_prototype'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'text' => '1.3 5-6'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => '1.3 5-6'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/multitable/paragraph_in_cells.pl
b/tp/t/results/multitable/paragraph_in_cells.pl
index 496336440c..108e254c83 100644
--- a/tp/t/results/multitable/paragraph_in_cells.pl
+++ b/tp/t/results/multitable/paragraph_in_cells.pl
@@ -10,46 +10,49 @@ $result_trees{'paragraph_in_cells'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'AAA'
- }
- ],
- 'source_info' => {
- 'line_nr' => 1
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'AAA'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
+ },
{
- 'text' => 'BBB'
+ 'contents' => [
+ {
+ 'text' => 'BBB'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 1
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/multitable/prototype_brace_no_brace.pl
b/tp/t/results/multitable/prototype_brace_no_brace.pl
index 133b4beceb..62e009d87d 100644
--- a/tp/t/results/multitable/prototype_brace_no_brace.pl
+++ b/tp/t/results/multitable/prototype_brace_no_brace.pl
@@ -10,35 +10,38 @@ $result_trees{'prototype_brace_no_brace'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'aa'
+ 'contents' => [
+ {
+ 'text' => 'aa'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' bb'
}
],
- 'source_info' => {
- 'line_nr' => 1
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' bb'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
b/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
index 4157c6ed9f..c3aa35535d 100644
--- a/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
+++ b/tp/t/results/multitable/prototype_brace_no_brace_comment.pl
@@ -10,41 +10,44 @@ $result_trees{'prototype_brace_no_brace_comment'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'aa'
+ 'contents' => [
+ {
+ 'text' => 'aa'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' bb'
}
],
- 'source_info' => {
- 'line_nr' => 1
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' bb'
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
- {
- 'text' => ' cc
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' cc
',
- 'type' => 'rawline_arg'
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'comment'
}
- ],
- 'cmdname' => 'comment'
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/multitable/prototype_no_brace.pl
b/tp/t/results/multitable/prototype_no_brace.pl
index cd1d5cb223..89f4f52f9f 100644
--- a/tp/t/results/multitable/prototype_no_brace.pl
+++ b/tp/t/results/multitable/prototype_no_brace.pl
@@ -10,43 +10,46 @@ $result_trees{'prototype_no_brace'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'aa'
- },
- {
- 'cmdname' => 'var',
'contents' => [
{
+ 'text' => 'aa'
+ },
+ {
+ 'cmdname' => 'var',
'contents' => [
{
- 'text' => 'FF'
+ 'contents' => [
+ {
+ 'text' => 'FF'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ },
+ {
+ 'text' => ' b cc'
}
],
- 'source_info' => {
- 'line_nr' => 1
- }
- },
- {
- 'text' => ' b cc'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/multitable/ref_in_multitable.pl
b/tp/t/results/multitable/ref_in_multitable.pl
index 60406012eb..519803b428 100644
--- a/tp/t/results/multitable/ref_in_multitable.pl
+++ b/tp/t/results/multitable/ref_in_multitable.pl
@@ -71,48 +71,51 @@ $result_trees{'ref_in_multitable'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '.35 .65'
+ 'contents' => [
+ {
+ 'text' => '.35 .65'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '.35',
+ '.65'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 6
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '.35',
- '.65'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 6
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -486,11 +489,11 @@ $result_trees{'ref_in_multitable'} = {
};
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'extra'}{'columnfractions'}
=
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'extra'}{'columnfractions'}
=
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'extra'}{'node_content'}{'contents'}[1]
=
$result_trees{'ref_in_multitable'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[1];
diff --git a/tp/t/results/multitable/w_in_multitable.pl
b/tp/t/results/multitable/w_in_multitable.pl
index ac306e2458..e172f4deee 100644
--- a/tp/t/results/multitable/w_in_multitable.pl
+++ b/tp/t/results/multitable/w_in_multitable.pl
@@ -10,46 +10,49 @@ $result_trees{'w_in_multitable'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'aaaaaaaaa'
- }
- ],
- 'source_info' => {
- 'line_nr' => 1
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'aaaaaaaaa'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
+ },
{
- 'text' => 'bbbbbbbbbbb'
+ 'contents' => [
+ {
+ 'text' => 'bbbbbbbbbbb'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 1
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/paragraph/commands_in_flushright.pl
b/tp/t/results/paragraph/commands_in_flushright.pl
index a625427550..b3eccce089 100644
--- a/tp/t/results/paragraph/commands_in_flushright.pl
+++ b/tp/t/results/paragraph/commands_in_flushright.pl
@@ -165,19 +165,22 @@ $result_trees{'commands_in_flushright'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -275,27 +278,30 @@ $result_trees{'commands_in_flushright'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 17
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 17
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -437,48 +443,51 @@ $result_trees{'commands_in_flushright'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '0.5 0.5'
+ 'contents' => [
+ {
+ 'text' => '0.5 0.5'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.5',
+ '0.5'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 25
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.5',
- '0.5'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 25
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1104,8 +1113,8 @@ $result_trees{'commands_in_flushright'} = {
],
'type' => 'document_root'
};
-$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'extra'}{'columnfractions'}
=
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'extra'}{'columnfractions'}
=
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[4]{'extra'}{'float'}
=
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11];
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'extra'}{'caption'}
=
$result_trees{'commands_in_flushright'}{'contents'}[0]{'contents'}[0]{'contents'}[11]{'contents'}[4];
diff --git a/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
b/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
index 1fc306662d..aee1ac74a7 100644
--- a/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
+++ b/tp/t/results/plaintext_tests/empty_multitable_in_itemize.pl
@@ -10,24 +10,27 @@ $result_trees{'empty_multitable_in_itemize'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'a--n itemize line'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'a--n itemize line'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -50,19 +53,22 @@ $result_trees{'empty_multitable_in_itemize'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
b/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
index 0a5be2ede8..9acb87ad6a 100644
--- a/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
+++ b/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
@@ -24,27 +24,30 @@ $result_trees{'itemize_in_headitem_in_example'} = {
'cmdname' => 'example',
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -112,27 +115,30 @@ $result_trees{'itemize_in_headitem_in_example'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -219,27 +225,30 @@ $result_trees{'itemize_in_headitem_in_example'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -331,27 +340,30 @@ $result_trees{'itemize_in_headitem_in_example'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -502,10 +514,10 @@ $result_trees{'itemize_in_headitem_in_example'} = {
],
'type' => 'document_root'
};
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'itemize_in_headitem_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'itemize_in_headitem_in_example'} = '@example
@itemize
diff --git a/tp/t/results/plaintext_tests/long_uref_after_item.pl
b/tp/t/results/plaintext_tests/long_uref_after_item.pl
index 7e0e62d052..3e08ca254e 100644
--- a/tp/t/results/plaintext_tests/long_uref_after_item.pl
+++ b/tp/t/results/plaintext_tests/long_uref_after_item.pl
@@ -10,27 +10,30 @@ $result_trees{'long_uref_after_item'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -116,7 +119,7 @@ $result_trees{'long_uref_after_item'} = {
],
'type' => 'document_root'
};
-$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'long_uref_after_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'long_uref_after_item'} = '@itemize
@item
diff --git a/tp/t/results/plaintext_tests/multitable.pl
b/tp/t/results/plaintext_tests/multitable.pl
index 67aa2241a4..3f4a81aa97 100644
--- a/tp/t/results/plaintext_tests/multitable.pl
+++ b/tp/t/results/plaintext_tests/multitable.pl
@@ -10,46 +10,49 @@ $result_trees{'multitable'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'truc'
- }
- ],
- 'source_info' => {
- 'line_nr' => 1
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
+ },
{
- 'text' => 'bidule'
+ 'text' => ' '
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'bidule'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 1
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 1
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -214,46 +217,49 @@ $result_trees{'multitable'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 't'
- }
- ],
- 'source_info' => {
- 'line_nr' => 6
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 't'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 6
+ },
+ 'type' => 'bracketed_arg'
+ },
{
- 'text' => 'b'
+ 'text' => ' '
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'b'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 6
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 6
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1083,46 +1089,49 @@ $result_trees{'multitable'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'AA'
- }
- ],
- 'source_info' => {
- 'line_nr' => 23
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'AA'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 23
+ },
+ 'type' => 'bracketed_arg'
+ },
{
- 'text' => 'BB'
+ 'text' => ' '
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'BB'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 23
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 23
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1342,32 +1351,35 @@ $result_trees{'multitable'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'A'
+ 'contents' => [
+ {
+ 'text' => 'A'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 29
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 29
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1490,46 +1502,49 @@ $result_trees{'multitable'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'A'
- }
- ],
- 'source_info' => {
- 'line_nr' => 35
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'A'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 35
+ },
+ 'type' => 'bracketed_arg'
+ },
{
- 'text' => 'B'
+ 'text' => ' '
+ },
+ {
+ 'contents' => [
+ {
+ 'text' => 'B'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 35
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 35
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git
a/tp/t/results/plaintext_tests/multitable_in_example_extraneous_item_tab.pl
b/tp/t/results/plaintext_tests/multitable_in_example_extraneous_item_tab.pl
index fbfd7e859b..762a6e7971 100644
--- a/tp/t/results/plaintext_tests/multitable_in_example_extraneous_item_tab.pl
+++ b/tp/t/results/plaintext_tests/multitable_in_example_extraneous_item_tab.pl
@@ -24,24 +24,27 @@ $result_trees{'multitable_in_example_extraneous_item_tab'}
= {
'cmdname' => 'example',
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'a'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git
a/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
b/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
index 65bb175e8e..a617b858ac 100644
--- a/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
+++ b/tp/t/results/plaintext_tests/multitable_in_example_extraneous_tab.pl
@@ -24,32 +24,35 @@ $result_trees{'multitable_in_example_extraneous_tab'} = {
'cmdname' => 'example',
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'a'
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 2
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 2
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/plaintext_tests/nested_multitable.pl
b/tp/t/results/plaintext_tests/nested_multitable.pl
index 12a28b51d5..441af3e7a5 100644
--- a/tp/t/results/plaintext_tests/nested_multitable.pl
+++ b/tp/t/results/plaintext_tests/nested_multitable.pl
@@ -15,52 +15,55 @@ $result_trees{'nested_multitable'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'truc AAAA '
+ 'contents' => [
+ {
+ 'text' => 'truc AAAA '
+ },
+ {
+ 'cmdname' => ' '
+ },
+ {
+ 'text' => ' machin'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 2
+ },
+ 'type' => 'bracketed_arg'
},
{
- 'cmdname' => ' '
+ 'text' => ' '
},
{
- 'text' => ' machin'
+ 'contents' => [
+ {
+ 'text' => 'bidule'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 2
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 2
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
- {
- 'text' => 'bidule'
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
}
- ],
- 'source_info' => {
- 'line_nr' => 2
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -74,46 +77,49 @@ $result_trees{'nested_multitable'} = {
'type' => 'ignorable_spaces_after_command'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'AAAA'
- }
- ],
- 'source_info' => {
- 'line_nr' => 4
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'AAAA'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 4
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
+ },
{
- 'text' => 'machin'
+ 'contents' => [
+ {
+ 'text' => 'machin'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 4
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 4
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'bracketed_arg'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
diff --git a/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
b/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
index 0b169d583a..54e84ba758 100644
--- a/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
+++ b/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
@@ -24,27 +24,30 @@ $result_trees{'tab_in_table_in_example'} = {
'cmdname' => 'example',
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'line_nr' => 2
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'line_nr' => 2
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -211,7 +214,7 @@ $result_trees{'tab_in_table_in_example'} = {
],
'type' => 'document_root'
};
-$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'tab_in_table_in_example'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'tab_in_table_in_example'} = '@example
@table @code
diff --git
a/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
b/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
index 7381645993..f58885c27c 100644
---
a/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
+++
b/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
@@ -156,28 +156,31 @@
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'file_name' => 'index_entries_relate_to_item.texi',
- 'line_nr' => 9
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => 'index_entries_relate_to_item.texi',
+ 'line_nr' => 9
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -594,10 +597,10 @@
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
],
'type' => 'document_root'
};
-$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3];
-$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3];
-$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
=
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3];
-$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
=
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3];
+$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
=
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3];
+$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
=
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[3];
+$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'index_entries_relate_to_item_no_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'index_entries_relate_to_item_no_transformation'} = '\\input
texinfo @c -*-texinfo-*-
diff --git
a/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl
b/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl
index 28140a1d8a..9a7bc55410 100644
---
a/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl
+++
b/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl
@@ -156,28 +156,31 @@
$result_trees{'index_entries_relate_to_item_transformation'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'file_name' => 'index_entries_relate_to_item.texi',
- 'line_nr' => 9
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'file_name' => 'index_entries_relate_to_item.texi',
+ 'line_nr' => 9
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -600,10 +603,10 @@
$result_trees{'index_entries_relate_to_item_transformation'} = {
],
'type' => 'document_root'
};
-$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3];
-$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3];
-$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3];
-$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3];
+$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3];
+$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[3];
+$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'index_entries_relate_to_item_transformation'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'index_entries_relate_to_item_transformation'} = '\\input
texinfo @c -*-texinfo-*-
diff --git a/tp/t/results/value/set_in_item_missing_line.pl
b/tp/t/results/value/set_in_item_missing_line.pl
index 7de97683c2..280a347da4 100644
--- a/tp/t/results/value/set_in_item_missing_line.pl
+++ b/tp/t/results/value/set_in_item_missing_line.pl
@@ -10,27 +10,30 @@ $result_trees{'set_in_item_missing_line'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -165,27 +168,30 @@ $result_trees{'set_in_item_missing_line'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'line_nr' => 6
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'line_nr' => 6
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -320,8 +326,8 @@ $result_trees{'set_in_item_missing_line'} = {
],
'type' => 'document_root'
};
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'set_in_item_missing_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'set_in_item_missing_line'} = '@table @code
@item xx @set n
diff --git a/tp/t/results/value/set_on_item_line.pl
b/tp/t/results/value/set_on_item_line.pl
index bb3ef25853..12f94a324e 100644
--- a/tp/t/results/value/set_on_item_line.pl
+++ b/tp/t/results/value/set_on_item_line.pl
@@ -10,27 +10,30 @@ $result_trees{'set_on_item_line'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -253,27 +256,30 @@ $result_trees{'set_on_item_line'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'line_nr' => 10
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'line_nr' => 10
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -496,8 +502,8 @@ $result_trees{'set_on_item_line'} = {
],
'type' => 'document_root'
};
-$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'set_on_item_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'set_on_item_line'} = '@table @code
@item @set ca b@c
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl
b/tp/t/results/xml_tests/commands_and_spaces.pl
index ebe7dd7b4a..940a1d14ff 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -744,48 +744,51 @@ $result_trees{'commands_and_spaces'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '0.4 0.6'
+ 'contents' => [
+ {
+ 'text' => '0.4 0.6'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.4',
+ '0.6'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 36
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.4',
- '0.6'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 36
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'args' => [
{
@@ -836,73 +839,76 @@ $result_trees{'commands_and_spaces'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'aa b'
- }
- ],
- 'source_info' => {
- 'line_nr' => 39
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'aa b'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 39
+ },
+ 'type' => 'bracketed_arg'
+ },
{
- 'text' => 'r '
- }
- ],
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 39
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'cmdname' => 'var',
- 'contents' => [
+ 'text' => ' '
+ },
{
'contents' => [
{
- 'text' => 'cmd'
+ 'text' => 'r '
}
],
- 'type' => 'brace_container'
+ 'info' => {
+ 'spaces_before_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'source_info' => {
+ 'line_nr' => 39
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
+ },
+ {
+ 'cmdname' => 'var',
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'cmd'
+ }
+ ],
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 39
+ }
+ },
+ {
+ 'text' => 'gg hh j'
}
],
- 'source_info' => {
- 'line_nr' => 39
- }
- },
- {
- 'text' => 'gg hh j'
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
@@ -1137,27 +1143,30 @@ $result_trees{'commands_and_spaces'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'strong',
- 'source_info' => {
- 'line_nr' => 54
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'strong',
+ 'source_info' => {
+ 'line_nr' => 54
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1640,8 +1649,8 @@
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[4]{'extra'}{'float'}
= $result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'extra'}{'caption'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[2];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'extra'}{'shortcaption'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[23]{'contents'}[4];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'extra'}{'columnfractions'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'args'}[0]{'contents'}[0];
-$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[35]{'extra'}{'command_as_argument'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[35]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'extra'}{'columnfractions'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[25]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[35]{'extra'}{'command_as_argument'}
=
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[35]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'commands_and_spaces'}{'contents'}[1]{'contents'}[43]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'commands_and_spaces'}{'contents'}[1];
$result_texis{'commands_and_spaces'} = '@set foo some @value
diff --git a/tp/t/results/xml_tests/comments_end_lines.pl
b/tp/t/results/xml_tests/comments_end_lines.pl
index 18c635d6bd..beefadbfc1 100644
--- a/tp/t/results/xml_tests/comments_end_lines.pl
+++ b/tp/t/results/xml_tests/comments_end_lines.pl
@@ -10,27 +10,30 @@ $result_trees{'comments_end_lines'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -108,19 +111,22 @@ $result_trees{'comments_end_lines'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
@@ -174,27 +180,30 @@ $result_trees{'comments_end_lines'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 8
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 8
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -506,48 +515,51 @@ $result_trees{'comments_end_lines'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '0.4 0.6'
+ 'contents' => [
+ {
+ 'text' => '0.4 0.6'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
+ },
+ 'type' => 'line_arg'
}
],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.4',
+ '0.6'
+ ]
+ },
'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
+ 'spaces_before_argument' => {
+ 'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 24
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.4',
- '0.6'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 24
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -909,9 +921,9 @@ $result_trees{'comments_end_lines'} = {
],
'type' => 'document_root'
};
-$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[12]{'extra'}{'columnfractions'}
=
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[12]{'extra'}{'columnfractions'}
=
$result_trees{'comments_end_lines'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'comments_end_lines'} = '@itemize
@item itemize it
diff --git a/tp/t/results/xml_tests/comments_on_block_command_lines.pl
b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
index ce16db5ce9..c5678f386c 100644
--- a/tp/t/results/xml_tests/comments_on_block_command_lines.pl
+++ b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
@@ -10,33 +10,36 @@ $result_trees{'comments_on_block_command_lines'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
- 'info' => {
- 'inserted' => 1
- }
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
+ 'contents' => [
{
- 'text' => ' comm
-',
- 'type' => 'rawline_arg'
+ 'cmdname' => 'bullet',
+ 'info' => {
+ 'inserted' => 1
+ }
}
],
- 'cmdname' => 'c'
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comm
+',
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -110,33 +113,36 @@ $result_trees{'comments_on_block_command_lines'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'x'
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
+ 'contents' => [
{
- 'text' => ' comm
-',
- 'type' => 'rawline_arg'
+ 'text' => 'x'
}
],
- 'cmdname' => 'c'
- },
- 'spaces_after_argument' => {
- 'text' => ' '
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comm
+',
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
+ },
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -207,36 +213,39 @@ $result_trees{'comments_on_block_command_lines'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
- 'source_info' => {
- 'line_nr' => 9
- }
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
+ 'contents' => [
{
- 'text' => ' comm
-',
- 'type' => 'rawline_arg'
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'line_nr' => 9
+ }
}
],
- 'cmdname' => 'c'
- },
- 'spaces_after_argument' => {
- 'text' => ' '
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comm
+',
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
+ },
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -310,41 +319,44 @@ $result_trees{'comments_on_block_command_lines'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'itemize',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'bullet',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 13
+ }
}
],
- 'source_info' => {
- 'line_nr' => 13
- }
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
- {
- 'text' => ' comm
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comm
',
- 'type' => 'rawline_arg'
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
+ },
+ 'spaces_after_argument' => {
+ 'text' => ' '
}
- ],
- 'cmdname' => 'c'
- },
- 'spaces_after_argument' => {
- 'text' => ' '
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'itemize',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -418,25 +430,28 @@ $result_trees{'comments_on_block_command_lines'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
- {
- 'text' => ' comm
+ 'contents' => [
+ {
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comm
',
- 'type' => 'rawline_arg'
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
}
- ],
- 'cmdname' => 'c'
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -510,33 +525,36 @@ $result_trees{'comments_on_block_command_lines'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'enumerate',
+ 'contents' => [
{
'contents' => [
{
- 'text' => 'a'
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
+ 'contents' => [
{
- 'text' => ' comm
-',
- 'type' => 'rawline_arg'
+ 'text' => 'a'
}
],
- 'cmdname' => 'c'
- },
- 'spaces_after_argument' => {
- 'text' => ' '
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comm
+',
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
+ },
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'enumerate',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'cmdname' => 'item',
'contents' => [
@@ -610,36 +628,39 @@ $result_trees{'comments_on_block_command_lines'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 25
- }
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
+ 'contents' => [
{
- 'text' => ' table
-',
- 'type' => 'rawline_arg'
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 25
+ }
}
],
- 'cmdname' => 'c'
- },
- 'spaces_after_argument' => {
- 'text' => ' '
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' table
+',
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
+ },
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1436,57 +1457,60 @@ $result_trees{'comments_on_block_command_lines'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
- 'args' => [
+ 'contents' => [
{
- 'contents' => [
+ 'args' => [
{
- 'text' => '0.4 0.6'
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
+ 'contents' => [
{
- 'text' => ' comm
-',
- 'type' => 'rawline_arg'
+ 'text' => '0.4 0.6'
}
],
- 'cmdname' => 'c'
- },
- 'spaces_after_argument' => {
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' comm
+',
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
+ },
+ 'spaces_after_argument' => {
+ 'text' => ' '
+ }
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'columnfractions',
+ 'extra' => {
+ 'misc_args' => [
+ '0.4',
+ '0.6'
+ ]
+ },
+ 'info' => {
+ 'spaces_before_argument' => {
'text' => ' '
}
},
- 'type' => 'line_arg'
+ 'source_info' => {
+ 'line_nr' => 61
+ }
}
],
- 'cmdname' => 'columnfractions',
- 'extra' => {
- 'misc_args' => [
- '0.4',
- '0.6'
- ]
- },
- 'info' => {
- 'spaces_before_argument' => {
- 'text' => ' '
- }
- },
- 'source_info' => {
- 'line_nr' => 61
- }
+ 'type' => 'block_line_arg'
}
],
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1597,55 +1621,58 @@ $result_trees{'comments_on_block_command_lines'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'multitable',
+ 'contents' => [
{
'contents' => [
{
'contents' => [
{
- 'text' => 'aaa'
- }
- ],
- 'source_info' => {
- 'line_nr' => 65
- },
- 'type' => 'bracketed_arg'
- },
- {
- 'text' => ' '
- },
- {
- 'contents' => [
+ 'contents' => [
+ {
+ 'text' => 'aaa'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 65
+ },
+ 'type' => 'bracketed_arg'
+ },
+ {
+ 'text' => ' '
+ },
{
- 'text' => 'bbb'
+ 'contents' => [
+ {
+ 'text' => 'bbb'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 65
+ },
+ 'type' => 'bracketed_arg'
}
],
- 'source_info' => {
- 'line_nr' => 65
- },
- 'type' => 'bracketed_arg'
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
- {
- 'text' => ' c
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => ' c
',
- 'type' => 'rawline_arg'
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'c'
+ },
+ 'spaces_after_argument' => {
+ 'text' => ' '
}
- ],
- 'cmdname' => 'c'
- },
- 'spaces_after_argument' => {
- 'text' => ' '
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'multitable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -2006,11 +2033,11 @@ $result_trees{'comments_on_block_command_lines'} = {
],
'type' => 'document_root'
};
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[6]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[12]{'extra'}{'command_as_argument'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[12]{'args'}[0]{'contents'}[0];
-$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[30]{'extra'}{'columnfractions'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[30]{'args'}[0]{'contents'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[12]{'extra'}{'command_as_argument'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[30]{'extra'}{'columnfractions'}
=
$result_trees{'comments_on_block_command_lines'}{'contents'}[0]{'contents'}[30]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'comments_on_block_command_lines'} = '@itemize @c comm
@item itemize it
diff --git a/tp/t/results/xml_tests/image_inline_or_not.pl
b/tp/t/results/xml_tests/image_inline_or_not.pl
index 43b20cb2a8..d7836ddd01 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -418,27 +418,30 @@ $result_trees{'image_inline_or_not'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 24
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 24
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1344,7 +1347,7 @@ $result_trees{'image_inline_or_not'} = {
],
'type' => 'document_root'
};
-$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'args'}[0]{'contents'}[0];
+$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[0]{'contents'}[1]{'contents'}[0];
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[3]{'extra'}{'manual_content'}{'contents'}[0]
=
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[3]{'contents'}[1];
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[3]{'extra'}{'node_content'}{'contents'}[0]
=
$result_trees{'image_inline_or_not'}{'contents'}[2]{'contents'}[12]{'contents'}[1]{'contents'}[3]{'contents'}[3];
diff --git a/tp/t/results/xtable/accent_on_table_line.pl
b/tp/t/results/xtable/accent_on_table_line.pl
index c05ca376ee..fd38daf678 100644
--- a/tp/t/results/xtable/accent_on_table_line.pl
+++ b/tp/t/results/xtable/accent_on_table_line.pl
@@ -10,33 +10,36 @@ $result_trees{'accent_on_table_line'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '~',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ },
+ {
+ 'cmdname' => '~',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -176,38 +179,41 @@ $result_trees{'accent_on_table_line'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '~',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ },
+ {
+ 'cmdname' => '~',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 6
+ }
}
],
- 'source_info' => {
- 'line_nr' => 6
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -347,39 +353,42 @@ $result_trees{'accent_on_table_line'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '~',
- 'source_info' => {
- 'line_nr' => 11
- }
- }
- ],
- 'info' => {
- 'comment_at_end' => {
- 'args' => [
+ 'contents' => [
{
- 'text' => '
-',
- 'type' => 'rawline_arg'
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ },
+ {
+ 'cmdname' => '~',
+ 'source_info' => {
+ 'line_nr' => 11
+ }
}
],
- 'cmdname' => 'comment'
+ 'info' => {
+ 'comment_at_end' => {
+ 'args' => [
+ {
+ 'text' => '
+',
+ 'type' => 'rawline_arg'
+ }
+ ],
+ 'cmdname' => 'comment'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -466,33 +475,36 @@ $result_trees{'accent_on_table_line'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => '~',
- 'source_info' => {
- 'line_nr' => 15
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ },
+ {
+ 'cmdname' => '~',
+ 'source_info' => {
+ 'line_nr' => 15
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -579,33 +591,36 @@ $result_trees{'accent_on_table_line'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'ringaccent',
- 'source_info' => {
- 'line_nr' => 19
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ },
+ {
+ 'cmdname' => 'ringaccent',
+ 'source_info' => {
+ 'line_nr' => 19
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -692,38 +707,41 @@ $result_trees{'accent_on_table_line'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'ringaccent',
'contents' => [
{
- 'type' => 'brace_container'
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ },
+ {
+ 'cmdname' => 'ringaccent',
+ 'contents' => [
+ {
+ 'type' => 'brace_container'
+ }
+ ],
+ 'source_info' => {
+ 'line_nr' => 23
+ }
}
],
- 'source_info' => {
- 'line_nr' => 23
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -810,43 +828,46 @@ $result_trees{'accent_on_table_line'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'ringaccent',
'contents' => [
{
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ },
+ {
+ 'cmdname' => 'ringaccent',
'contents' => [
{
- 'text' => 'a'
+ 'contents' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'type' => 'brace_container'
}
],
- 'type' => 'brace_container'
+ 'source_info' => {
+ 'line_nr' => 27
+ }
}
],
- 'source_info' => {
- 'line_nr' => 27
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -933,13 +954,13 @@ $result_trees{'accent_on_table_line'} = {
],
'type' => 'document_root'
};
-$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2]{'args'}[0];
-$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[4]{'args'}[0];
-$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[6]{'args'}[0];
-$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[8]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[8]{'args'}[0];
-$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[10]{'args'}[0];
-$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[12]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[12]{'args'}[0];
+$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[6]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[6]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[8]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[8]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[10]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[10]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[12]{'extra'}{'command_as_argument'}
=
$result_trees{'accent_on_table_line'}{'contents'}[0]{'contents'}[12]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'accent_on_table_line'} = '@table @~
@item first item
diff --git a/tp/t/results/xtable/block_commands_in_table.pl
b/tp/t/results/xtable/block_commands_in_table.pl
index d394b41b71..87231b648d 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -132,27 +132,30 @@ $result_trees{'block_commands_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 7
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 7
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -665,27 +668,30 @@ $result_trees{'block_commands_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'strong',
- 'source_info' => {
- 'line_nr' => 34
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'strong',
+ 'source_info' => {
+ 'line_nr' => 34
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -878,27 +884,30 @@ $result_trees{'block_commands_in_table'} = {
}
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'r',
- 'source_info' => {
- 'line_nr' => 42
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'r',
+ 'source_info' => {
+ 'line_nr' => 42
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1069,27 +1078,30 @@ $result_trees{'block_commands_in_table'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 52
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 52
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1260,15 +1272,15 @@ $result_trees{'block_commands_in_table'} = {
],
'type' => 'document_root'
};
-$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'block_commands_in_table'}{'contents'}[3];
-$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'block_commands_in_table'}{'contents'}[3];
-$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'block_commands_in_table'}{'contents'}[3];
-$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'block_commands_in_table'}{'contents'}[3];
-$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'block_commands_in_table'}{'contents'}[3];
-$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'block_commands_in_table'}{'contents'}[3];
+$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'block_commands_in_table'}{'contents'}[3];
+$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'block_commands_in_table'}{'contents'}[3];
+$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'block_commands_in_table'}{'contents'}[3];
+$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'block_commands_in_table'}{'contents'}[3];
+$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'block_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'block_commands_in_table'} = '@node Top
@top Element
diff --git a/tp/t/results/xtable/comment_and_itemx_before_item.pl
b/tp/t/results/xtable/comment_and_itemx_before_item.pl
index 325d44a9d8..271a4460d4 100644
--- a/tp/t/results/xtable/comment_and_itemx_before_item.pl
+++ b/tp/t/results/xtable/comment_and_itemx_before_item.pl
@@ -10,27 +10,30 @@ $result_trees{'comment_and_itemx_before_item'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -127,7 +130,7 @@ $result_trees{'comment_and_itemx_before_item'} = {
],
'type' => 'document_root'
};
-$result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'comment_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'comment_and_itemx_before_item'} = '@table @code
@c comment
diff --git a/tp/t/results/xtable/definfoenclose_on_table_line.pl
b/tp/t/results/xtable/definfoenclose_on_table_line.pl
index 176202a30c..ffc85c49d5 100644
--- a/tp/t/results/xtable/definfoenclose_on_table_line.pl
+++ b/tp/t/results/xtable/definfoenclose_on_table_line.pl
@@ -49,35 +49,38 @@ $result_trees{'definfoenclose_on_table_line'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'phi',
- 'extra' => {
- 'begin' => ':',
- 'end' => ':'
- },
+ 'contents' => [
+ {
+ 'cmdname' => 'phi',
+ 'extra' => {
+ 'begin' => ':',
+ 'end' => ':'
+ },
+ 'info' => {
+ 'command_name' => 'phi'
+ },
+ 'source_info' => {
+ 'line_nr' => 3
+ },
+ 'type' => 'definfoenclose_command'
+ }
+ ],
'info' => {
- 'command_name' => 'phi'
- },
- 'source_info' => {
- 'line_nr' => 3
+ 'spaces_after_argument' => {
+ 'text' => '
+'
+ }
},
- 'type' => 'definfoenclose_command'
+ 'type' => 'block_line_arg'
}
],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
-'
- }
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -210,7 +213,7 @@ $result_trees{'definfoenclose_on_table_line'} = {
],
'type' => 'document_root'
};
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'contents'}[2]{'extra'}{'command_as_argument'}
=
$result_trees{'definfoenclose_on_table_line'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'definfoenclose_on_table_line'} = '@definfoenclose phi,:,:
diff --git a/tp/t/results/xtable/empty_item_itemx.pl
b/tp/t/results/xtable/empty_item_itemx.pl
index ab8a8a979d..86fdc48e30 100644
--- a/tp/t/results/xtable/empty_item_itemx.pl
+++ b/tp/t/results/xtable/empty_item_itemx.pl
@@ -10,27 +10,30 @@ $result_trees{'empty_item_itemx'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -267,7 +270,7 @@ $result_trees{'empty_item_itemx'} = {
],
'type' => 'document_root'
};
-$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'empty_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'empty_item_itemx'} = '@vtable @asis
diff --git a/tp/t/results/xtable/empty_table.pl
b/tp/t/results/xtable/empty_table.pl
index 360caa39fd..3f8be7261a 100644
--- a/tp/t/results/xtable/empty_table.pl
+++ b/tp/t/results/xtable/empty_table.pl
@@ -10,27 +10,30 @@ $result_trees{'empty_table'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
@@ -80,7 +83,7 @@ $result_trees{'empty_table'} = {
],
'type' => 'document_root'
};
-$result_trees{'empty_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'empty_table'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'empty_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'empty_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'empty_table'} = '@table @code
@end table
diff --git a/tp/t/results/xtable/headitem_in_table.pl
b/tp/t/results/xtable/headitem_in_table.pl
index 83cd4a22cf..64bed10d83 100644
--- a/tp/t/results/xtable/headitem_in_table.pl
+++ b/tp/t/results/xtable/headitem_in_table.pl
@@ -10,27 +10,30 @@ $result_trees{'headitem_in_table'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'strong',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'strong',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -154,7 +157,7 @@ $result_trees{'headitem_in_table'} = {
],
'type' => 'document_root'
};
-$result_trees{'headitem_in_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'headitem_in_table'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'headitem_in_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'headitem_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'headitem_in_table'} = '@table @strong
headitem in table
diff --git a/tp/t/results/xtable/index_command_before_end_table.pl
b/tp/t/results/xtable/index_command_before_end_table.pl
index 5f5e0f215b..0d1adb3845 100644
--- a/tp/t/results/xtable/index_command_before_end_table.pl
+++ b/tp/t/results/xtable/index_command_before_end_table.pl
@@ -15,27 +15,30 @@ $result_trees{'index_command_before_end_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'line_nr' => 2
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'line_nr' => 2
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -203,7 +206,7 @@ $result_trees{'index_command_before_end_table'} = {
],
'type' => 'document_root'
};
-$result_trees{'index_command_before_end_table'}{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'index_command_before_end_table'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'index_command_before_end_table'}{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'index_command_before_end_table'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'index_command_before_end_table'} = '
@table @code
diff --git a/tp/t/results/xtable/inter_item_commands_in_table.pl
b/tp/t/results/xtable/inter_item_commands_in_table.pl
index e231bf6cbe..d15e43aebe 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -137,27 +137,30 @@ $result_trees{'inter_item_commands_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'line_nr' => 7
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'line_nr' => 7
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -275,27 +278,30 @@ $result_trees{'inter_item_commands_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 13
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 13
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -452,27 +458,30 @@ $result_trees{'inter_item_commands_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'ftable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'var',
- 'source_info' => {
- 'line_nr' => 20
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'var',
+ 'source_info' => {
+ 'line_nr' => 20
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'ftable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -798,27 +807,30 @@ $result_trees{'inter_item_commands_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'ftable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 36
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 36
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'ftable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1001,27 +1013,30 @@ $result_trees{'inter_item_commands_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'line_nr' => 43
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'line_nr' => 43
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1168,27 +1183,30 @@ $result_trees{'inter_item_commands_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'code',
- 'source_info' => {
- 'line_nr' => 50
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'code',
+ 'source_info' => {
+ 'line_nr' => 50
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1325,27 +1343,30 @@ $result_trees{'inter_item_commands_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'samp',
- 'source_info' => {
- 'line_nr' => 56
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'line_nr' => 56
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1492,27 +1513,30 @@ $result_trees{'inter_item_commands_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'samp',
- 'source_info' => {
- 'line_nr' => 63
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'line_nr' => 63
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1649,27 +1673,30 @@ $result_trees{'inter_item_commands_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'samp',
- 'source_info' => {
- 'line_nr' => 69
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'line_nr' => 69
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1807,27 +1834,30 @@ $result_trees{'inter_item_commands_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'samp',
- 'source_info' => {
- 'line_nr' => 76
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'line_nr' => 76
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1960,27 +1990,30 @@ $result_trees{'inter_item_commands_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'samp',
- 'source_info' => {
- 'line_nr' => 82
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'line_nr' => 82
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -2113,27 +2146,30 @@ $result_trees{'inter_item_commands_in_table'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'samp',
- 'source_info' => {
- 'line_nr' => 88
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'samp',
+ 'source_info' => {
+ 'line_nr' => 88
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -2358,39 +2394,39 @@ $result_trees{'inter_item_commands_in_table'} = {
],
'type' => 'document_root'
};
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'args'}[0]{'contents'}[0];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
-$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'args'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[2]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[11]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[13]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[15]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[1]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[17]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[1]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[19]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[21]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[1]{'contents'}[0]{'contents'}[3]{'extra'}{'element_node'}
= $result_trees{'inter_item_commands_in_table'}{'contents'}[3];
+$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table'}{'contents'}[4]{'contents'}[23]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'inter_item_commands_in_table'} = '@node Top
@top top
diff --git a/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
b/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
index 0388dbdbe0..c940a45694 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
@@ -27,27 +27,30 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
'cmdname' => 'example',
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'var',
- 'source_info' => {
- 'line_nr' => 2
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'var',
+ 'source_info' => {
+ 'line_nr' => 2
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -354,7 +357,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
],
'type' => 'document_root'
};
-$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'inter_item_commands_in_table_in_example'}{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'inter_item_commands_in_table_in_example'} = '@example
@table @var
diff --git a/tp/t/results/xtable/invalid_command_and_brace_in_table.pl
b/tp/t/results/xtable/invalid_command_and_brace_in_table.pl
index 51edce25a1..02e2577375 100644
--- a/tp/t/results/xtable/invalid_command_and_brace_in_table.pl
+++ b/tp/t/results/xtable/invalid_command_and_brace_in_table.pl
@@ -10,27 +10,30 @@ $result_trees{'invalid_command_and_brace_in_table'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -106,7 +109,7 @@ $result_trees{'invalid_command_and_brace_in_table'} = {
],
'type' => 'document_root'
};
-$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'invalid_command_and_brace_in_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'invalid_command_and_brace_in_table'} = '@table @asis
,, title
diff --git a/tp/t/results/xtable/item_index_transformation.pl
b/tp/t/results/xtable/item_index_transformation.pl
index ddb69e4398..4355cebedd 100644
--- a/tp/t/results/xtable/item_index_transformation.pl
+++ b/tp/t/results/xtable/item_index_transformation.pl
@@ -66,27 +66,30 @@ $result_trees{'item_index_transformation'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 4
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 4
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -406,27 +409,30 @@ $result_trees{'item_index_transformation'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 16
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 16
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -710,27 +716,30 @@ $result_trees{'item_index_transformation'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 27
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 27
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -987,27 +996,30 @@ $result_trees{'item_index_transformation'} = {
'type' => 'empty_line'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 37
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 37
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1274,19 +1286,19 @@ $result_trees{'item_index_transformation'} = {
],
'type' => 'document_root'
};
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'item_index_transformation'}{'contents'}[1];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'item_index_transformation'}{'contents'}[1];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'item_index_transformation'}{'contents'}[1];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'item_index_transformation'}{'contents'}[1];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'item_index_transformation'}{'contents'}[1];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'item_index_transformation'}{'contents'}[1];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'item_index_transformation'}{'contents'}[1];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[5]{'args'}[0]{'contents'}[0];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'item_index_transformation'}{'contents'}[1];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[7]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'item_index_transformation'}{'contents'}[1];
-$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[7]{'args'}[0]{'contents'}[0];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'item_index_transformation'}{'contents'}[1];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'item_index_transformation'}{'contents'}[1];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'contents'}[2]{'extra'}{'element_node'}
= $result_trees{'item_index_transformation'}{'contents'}[1];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'item_index_transformation'}{'contents'}[1];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'item_index_transformation'}{'contents'}[1];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'item_index_transformation'}{'contents'}[1];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[5]{'contents'}[1]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'item_index_transformation'}{'contents'}[1];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[5]{'extra'}{'command_as_argument'}
=
$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[5]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[0]{'extra'}{'element_node'}
= $result_trees{'item_index_transformation'}{'contents'}[1];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[7]{'contents'}[2]{'contents'}[0]{'contents'}[1]{'extra'}{'element_node'}
= $result_trees{'item_index_transformation'}{'contents'}[1];
+$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[7]{'extra'}{'command_as_argument'}
=
$result_trees{'item_index_transformation'}{'contents'}[2]{'contents'}[7]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'item_index_transformation'} = '@node chap
@chapter Chapter
diff --git a/tp/t/results/xtable/itemx_before_item.pl
b/tp/t/results/xtable/itemx_before_item.pl
index 8d353fdf93..380426b4e2 100644
--- a/tp/t/results/xtable/itemx_before_item.pl
+++ b/tp/t/results/xtable/itemx_before_item.pl
@@ -10,27 +10,30 @@ $result_trees{'itemx_before_item'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -117,7 +120,7 @@ $result_trees{'itemx_before_item'} = {
],
'type' => 'document_root'
};
-$result_trees{'itemx_before_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'itemx_before_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'itemx_before_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'itemx_before_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'itemx_before_item'} = '@table @emph
@itemx in itemx
diff --git a/tp/t/results/xtable/long_item.pl b/tp/t/results/xtable/long_item.pl
index 84131b2a03..ed932d8a86 100644
--- a/tp/t/results/xtable/long_item.pl
+++ b/tp/t/results/xtable/long_item.pl
@@ -10,27 +10,30 @@ $result_trees{'long_item'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -163,7 +166,7 @@ $result_trees{'long_item'} = {
],
'type' => 'document_root'
};
-$result_trees{'long_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'long_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'long_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'long_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'long_item'} = '@table @emph
@item first item aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
aaaaaaaaaaaaaaaaaa
diff --git a/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
b/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
index 14abf44d2a..a2b28666db 100644
--- a/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
+++ b/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
@@ -10,33 +10,36 @@ $result_trees{'no_arg_brace_command_on_table_line'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'bullet',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ },
+ {
+ 'cmdname' => 'bullet',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -123,7 +126,7 @@ $result_trees{'no_arg_brace_command_on_table_line'} = {
],
'type' => 'document_root'
};
-$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'no_arg_brace_command_on_table_line'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'no_arg_brace_command_on_table_line'} = '@table @bullet
@item item
diff --git a/tp/t/results/xtable/no_argument_for_table.pl
b/tp/t/results/xtable/no_argument_for_table.pl
index ea0190acb3..b0e6930052 100644
--- a/tp/t/results/xtable/no_argument_for_table.pl
+++ b/tp/t/results/xtable/no_argument_for_table.pl
@@ -10,25 +10,30 @@ $result_trees{'no_argument_for_table'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'cmdname' => 'asis',
- 'info' => {
- 'inserted' => 1
- }
- },
+ 'cmdname' => 'table',
+ 'contents' => [
{
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'info' => {
+ 'inserted' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -124,7 +129,7 @@ $result_trees{'no_argument_for_table'} = {
],
'type' => 'document_root'
};
-$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'no_argument_for_table'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'no_argument_for_table'} = '@table
@item item
diff --git a/tp/t/results/xtable/table_nested.pl
b/tp/t/results/xtable/table_nested.pl
index 458e74454f..eb99475360 100644
--- a/tp/t/results/xtable/table_nested.pl
+++ b/tp/t/results/xtable/table_nested.pl
@@ -215,28 +215,31 @@ $result_trees{'table_nested'} = {
'text' => ''
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 27,
- 'macro' => 'myvtable'
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 27,
+ 'macro' => 'myvtable'
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -511,28 +514,31 @@ $result_trees{'table_nested'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 27,
- 'macro' => 'myvtable'
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 27,
+ 'macro' => 'myvtable'
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -784,28 +790,31 @@ $result_trees{'table_nested'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 32,
- 'macro' => 'myvtable'
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 32,
+ 'macro' => 'myvtable'
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1080,28 +1089,31 @@ $result_trees{'table_nested'} = {
'type' => 'preformatted'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 32,
- 'macro' => 'myvtable'
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 32,
+ 'macro' => 'myvtable'
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1367,28 +1379,31 @@ $result_trees{'table_nested'} = {
'text' => ''
},
{
- 'args' => [
+ 'cmdname' => 'vtable',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'asis',
- 'source_info' => {
- 'line_nr' => 38,
- 'macro' => 'myvtable'
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'asis',
+ 'source_info' => {
+ 'line_nr' => 38,
+ 'macro' => 'myvtable'
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'vtable',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1663,28 +1678,31 @@ $result_trees{'table_nested'} = {
'type' => 'paragraph'
},
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 38,
- 'macro' => 'myvtable'
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 38,
+ 'macro' => 'myvtable'
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -1927,12 +1945,12 @@ $result_trees{'table_nested'} = {
],
'type' => 'document_root'
};
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[3]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[3]{'extra'}{'command_as_argument'}
=
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[6]{'contents'}[3]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[4]{'extra'}{'command_as_argument'}
=
$result_trees{'table_nested'}{'contents'}[0]{'contents'}[9]{'contents'}[0]{'contents'}[4]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'table_nested'} = '@macro myvtable
@vtable @asis
diff --git a/tp/t/results/xtable/text_between_item_itemx.pl
b/tp/t/results/xtable/text_between_item_itemx.pl
index 99ca8de9d1..36d5e8149a 100644
--- a/tp/t/results/xtable/text_between_item_itemx.pl
+++ b/tp/t/results/xtable/text_between_item_itemx.pl
@@ -10,27 +10,30 @@ $result_trees{'text_between_item_itemx'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'strong',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'strong',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -158,7 +161,7 @@ $result_trees{'text_between_item_itemx'} = {
],
'type' => 'document_root'
};
-$result_trees{'text_between_item_itemx'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'text_between_item_itemx'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'text_between_item_itemx'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'text_between_item_itemx'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'text_between_item_itemx'} = '@table @strong
@item in item
diff --git a/tp/t/results/xtable/title_and_itemx_before_item.pl
b/tp/t/results/xtable/title_and_itemx_before_item.pl
index 50fcadf6bf..1af554dd6b 100644
--- a/tp/t/results/xtable/title_and_itemx_before_item.pl
+++ b/tp/t/results/xtable/title_and_itemx_before_item.pl
@@ -10,27 +10,30 @@ $result_trees{'title_and_itemx_before_item'} = {
{
'contents' => [
{
- 'args' => [
+ 'cmdname' => 'table',
+ 'contents' => [
{
'contents' => [
{
- 'cmdname' => 'emph',
- 'source_info' => {
- 'line_nr' => 1
- }
- }
- ],
- 'info' => {
- 'spaces_after_argument' => {
- 'text' => '
+ 'contents' => [
+ {
+ 'cmdname' => 'emph',
+ 'source_info' => {
+ 'line_nr' => 1
+ }
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => {
+ 'text' => '
'
+ }
+ },
+ 'type' => 'block_line_arg'
}
- },
- 'type' => 'block_line_arg'
- }
- ],
- 'cmdname' => 'table',
- 'contents' => [
+ ],
+ 'type' => 'argument'
+ },
{
'contents' => [
{
@@ -131,7 +134,7 @@ $result_trees{'title_and_itemx_before_item'} = {
],
'type' => 'document_root'
};
-$result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'extra'}{'command_as_argument'}
=
$result_trees{'title_and_itemx_before_item'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0];
$result_texis{'title_and_itemx_before_item'} = '@table @emph
Title