[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Tue, 24 Dec 2024 09:59:22 -0500 (EST) |
branch: master
commit aa362745f95fa792ca9e71c6c191c1ca5506d723
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Nov 11 15:06:33 2024 +0100
@*macro arguments in 'argument' container in contents instead of args
* tp/Texinfo/ParserNonXS.pm (_parse_macro_command_line)
(_expand_macro_arguments, _expand_linemacro_arguments)
(_lookup_macro_parameter, _expand_macro_body, _handle_macro)
(_process_macro_block_contents), tp/Texinfo/XS/main/element_types.txt
(argument), tp/Texinfo/XS/parsetexi/macro.c (parse_macro_command_line)
(lookup_macro_parameter, expand_macro_arguments)
(expand_linemacro_arguments, expand_macro_body, handle_macro),
tp/Texinfo/XS/parsetexi/parser.c (process_macro_block_contents):
put @*macro commands argument first in contents in a new container
type, argument. Do not use command args anymore.
* tp/Texinfo/Convert/Texinfo.pm (_convert_to_texinfo),
tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
tp/Texinfo/Transformations.pm (_protect_hashchar_at_line_beginning),
tp/Texinfo/XS/main/convert_to_texinfo.c (convert_to_texinfo_internal),
tp/Texinfo/XS/structuring_transfo/transformations.c
(protect_hashchar_at_line_beginning_internal): update for the change
in @*macro arguments.
---
ChangeLog | 23 +
tp/TODO | 4 +
tp/Texinfo/Convert/Texinfo.pm | 5 +-
tp/Texinfo/Convert/TexinfoMarkup.pm | 27 +-
tp/Texinfo/ParserNonXS.pm | 46 +-
tp/Texinfo/Transformations.pm | 2 +
tp/Texinfo/XS/main/convert_to_texinfo.c | 2 +-
tp/Texinfo/XS/main/element_types.c | 1 +
tp/Texinfo/XS/main/element_types.h | 1 +
tp/Texinfo/XS/main/element_types.txt | 1 +
tp/Texinfo/XS/parsetexi/macro.c | 32 +-
tp/Texinfo/XS/parsetexi/parser.c | 7 +-
.../XS/structuring_transfo/transformations.c | 4 +-
tp/t/results/alias/alias_macro_target_removed.pl | 23 +-
tp/t/results/alias/alias_of_macro.pl | 23 +-
tp/t/results/alias/alias_of_macro_before_macro.pl | 23 +-
tp/t/results/alias/texinfo_command_alias.pl | 23 +-
.../alias/texinfo_command_alias_indirect.pl | 23 +-
.../alias/texinfo_command_alias_indirect_before.pl | 23 +-
.../command_conditionals_user_defined.pl | 15 +-
tp/t/results/conditionals/macro_in_ifset.pl | 15 +-
tp/t/results/conditionals/macro_in_ifset_set.pl | 30 +-
tp/t/results/conditionals/nested_ifset_ifclear.pl | 15 +-
.../conditionals/user_defined_txiinternalvalue.pl | 15 +-
.../results/converters_tests/at_commands_in_raw.pl | 15 +-
tp/t/results/coverage_braces/test_image.pl | 15 +-
tp/t/results/include/cpp_lines.pl | 30 +-
.../macro_and_commands_in_early_commands.pl | 60 ++-
.../results/include/macro_definition_in_include.pl | 15 +-
tp/t/results/include/macro_in_early_commands.pl | 98 ++--
tp/t/results/info_tests/def_in_copying.pl | 15 +-
tp/t/results/linemacro/api_doc_with_linemacro.pl | 85 ++--
.../linemacro/arobase_brace_in_linemacro_call.pl | 31 +-
.../linemacro/begin_conditional_in_linemacro.pl | 23 +-
.../linemacro/block_begin_end_in_linemacro_call.pl | 54 ++-
tp/t/results/linemacro/blockitem_no_item.pl | 39 +-
tp/t/results/linemacro/brace_command_not_closed.pl | 39 +-
tp/t/results/linemacro/braces_after_text.pl | 39 +-
.../linemacro/call_macro_in_linemacro_body.pl | 62 +--
.../linemacro/call_macro_in_linemacro_call.pl | 62 +--
.../linemacro/comment_at_end_of_linemacro_call.pl | 31 +-
.../results/linemacro/comment_in_linemacro_call.pl | 31 +-
.../comment_in_one_argument_linemacro_call.pl | 23 +-
.../comment_on_linemacro_call_macro_expansion.pl | 54 ++-
.../comment_on_linemacro_call_out_of_braces.pl | 39 +-
tp/t/results/linemacro/empty_last_argument.pl | 31 +-
.../linemacro/end_conditional_in_linemacro.pl | 23 +-
.../results/linemacro/last_argument_with_braces.pl | 31 +-
tp/t/results/linemacro/missing_formal_arg.pl | 39 +-
tp/t/results/linemacro/nested_linemacro_calls.pl | 70 +--
.../linemacro/newline_and_continuation_in_brace.pl | 39 +-
tp/t/results/linemacro/no_arguments.pl | 15 +-
tp/t/results/linemacro/paragraph_no_paragraph.pl | 39 +-
tp/t/results/linemacro/protected_spaces_on_line.pl | 31 +-
.../protection_of_end_of_line_by_command.pl | 23 +-
.../linemacro/recursive_linemacro_in_body.pl | 31 +-
.../linemacro/recursive_linemacro_in_call.pl | 31 +-
.../linemacro/simple_nested_linemacro_calls.pl | 78 ++--
.../linemacro/spaces_after_command_in_call.pl | 39 +-
...paces_after_macro_linemacro_commands_in_call.pl | 93 ++--
.../spaces_after_unknown_command_in_call.pl | 39 +-
tp/t/results/linemacro/spaces_in_args.pl | 39 +-
tp/t/results/linemacro/spaces_in_call.pl | 39 +-
tp/t/results/linemacro/text_arguments.pl | 39 +-
tp/t/results/linemacro/verb_in_linemacro_call.pl | 47 +-
tp/t/results/linemacro/verb_not_closed.pl | 39 +-
.../verb_with_arobase_in_linemacro_call.pl | 39 +-
.../linemacro/verb_with_brace_in_linemacro_call.pl | 39 +-
tp/t/results/macro/arg_body_expansion_order.pl | 53 ++-
tp/t/results/macro/arg_not_closed.pl | 23 +-
tp/t/results/macro/arobase_brace_in_macro_call.pl | 31 +-
tp/t/results/macro/backslash_in_arg.pl | 23 +-
tp/t/results/macro/bad_argument.pl | 44 +-
tp/t/results/macro/bad_formal_arg.pl | 85 ++--
.../macro/bad_macro_name_with_underscore.pl | 31 +-
tp/t/results/macro/bib_example.pl | 161 ++++---
tp/t/results/macro/bye_in_macro.pl | 15 +-
...losing_brace_in_macro_call_in_ignored_inline.pl | 15 +-
tp/t/results/macro/complete_macro_for_end.pl | 15 +-
tp/t/results/macro/complex_argument.pl | 92 ++--
tp/t/results/macro/cpp_directives_after_macros.pl | 30 +-
tp/t/results/macro/cpp_directives_in_macro.pl | 23 +-
.../macro/cpp_directives_line_value_macro.pl | 53 ++-
.../macro/definfoenclose_replaced_by_macro.pl | 23 +-
tp/t/results/macro/double_macro_definition.pl | 30 +-
tp/t/results/macro/double_recursive_macro_call.pl | 46 +-
tp/t/results/macro/empty_end.pl | 23 +-
tp/t/results/macro/empty_macro_argument.pl | 38 +-
tp/t/results/macro/empty_macro_in_text_no_arg.pl | 30 +-
tp/t/results/macro/empty_macro_no_arg.pl | 15 +-
tp/t/results/macro/expand_two_same.pl | 23 +-
tp/t/results/macro/expansion_order.pl | 38 +-
tp/t/results/macro/form_feeds.pl | 54 ++-
tp/t/results/macro/glossary.pl | 145 +++---
tp/t/results/macro/ifclear_in_macro.pl | 23 +-
tp/t/results/macro/ifset_and_end_isef_in_macro.pl | 30 +-
tp/t/results/macro/ifset_in_macro.pl | 23 +-
tp/t/results/macro/ifset_in_macro_set.pl | 23 +-
tp/t/results/macro/ignored_macro_definition.pl | 15 +-
tp/t/results/macro/implicit_quoting_one_arg.pl | 23 +-
tp/t/results/macro/implicit_quoting_recursion.pl | 31 +-
tp/t/results/macro/include_after_empty_line_arg.pl | 23 +-
tp/t/results/macro/leading_spaces_no_ignore.pl | 15 +-
tp/t/results/macro/line_after_recursive_call.pl | 15 +-
.../macro/line_end_accent_command_macro_call.pl | 30 +-
tp/t/results/macro/macro_after_paragraph.pl | 15 +-
.../macro/macro_alias_definfoenclose_defindex.pl | 92 ++--
.../macro_before_specific_line_command_args.pl | 15 +-
tp/t/results/macro/macro_call_empty_middle_arg.pl | 39 +-
tp/t/results/macro/macro_call_empty_two_arg.pl | 31 +-
.../macro/macro_call_in_ignored_inlinefmtifelse.pl | 15 +-
.../macro/macro_call_in_inlinefmtifelse_format.pl | 15 +-
tp/t/results/macro/macro_call_in_node_manual.pl | 90 ++--
.../macro/macro_end_call_in_ignored_inlinefmt.pl | 15 +-
.../macro_end_call_in_ignored_inlinefmtifelse.pl | 15 +-
...cro_end_call_in_ignored_inlinefmtifelse_else.pl | 15 +-
.../macro/macro_end_call_in_ignored_inlineraw.pl | 15 +-
.../results/macro/macro_end_call_in_ignored_raw.pl | 15 +-
tp/t/results/macro/macro_expands_to_empty.pl | 23 +-
tp/t/results/macro/macro_expansion.pl | 31 +-
.../macro_expansion_end_in_conditional_end.pl | 15 +-
.../macro_expansion_end_in_conditional_line.pl | 15 +-
...macro_expansion_end_in_ignored_ifset_content.pl | 15 +-
..._expansion_end_in_ignored_nested_conditional.pl | 15 +-
..._end_in_ignored_nested_different_conditional.pl | 15 +-
.../macro_expansion_in_multitable_prototype.pl | 38 +-
.../macro/macro_for_dot_in_menu_not_separator.pl | 15 +-
tp/t/results/macro/macro_for_end.pl | 15 +-
.../macro/macro_for_ignored_line_command.pl | 15 +-
tp/t/results/macro/macro_for_verb.pl | 15 +-
...macro_imbricated_with_beginning_command_name.pl | 15 +-
tp/t/results/macro/macro_in_accent.pl | 30 +-
tp/t/results/macro/macro_in_brace_command.pl | 30 +-
tp/t/results/macro/macro_in_def_delimiters.pl | 15 +-
tp/t/results/macro/macro_in_empty_menu_comment.pl | 15 +-
.../macro_in_empty_multitable_empty_before_item.pl | 15 +-
.../macro_in_empty_table_empty_before_item.pl | 15 +-
tp/t/results/macro/macro_in_empty_text.pl | 15 +-
tp/t/results/macro/macro_in_end_argument.pl | 15 +-
tp/t/results/macro/macro_in_ifset.pl | 23 +-
tp/t/results/macro/macro_in_ifset_end_in_arg.pl | 23 +-
tp/t/results/macro/macro_in_index_commands.pl | 105 +++--
.../macro/macro_in_invalid_documentencoding.pl | 15 +-
tp/t/results/macro/macro_in_macro_arg.pl | 69 +--
tp/t/results/macro/macro_in_macro_arg_simpler.pl | 46 +-
tp/t/results/macro/macro_in_menu.pl | 90 ++--
.../macro_in_menu_comment_closed_by_detailmenu.pl | 15 +-
.../macro/macro_in_menu_comment_like_entry.pl | 15 +-
tp/t/results/macro/macro_in_menu_description.pl | 15 +-
tp/t/results/macro/macro_in_misc_commands.pl | 510 ++++++++++++---------
.../macro/macro_in_multitable_empty_before_item.pl | 15 +-
.../macro/macro_in_table_empty_before_item.pl | 15 +-
.../macro_inlineifcond_end_in_empty_ignored.pl | 15 +-
.../macro/macro_inlineifcond_end_in_empty_set.pl | 15 +-
tp/t/results/macro/macro_name_with_digit.pl | 38 +-
tp/t/results/macro/macro_name_with_hyphen.pl | 31 +-
tp/t/results/macro/macro_name_zero.pl | 15 +-
tp/t/results/macro/macro_no_arg_bad_expansion.pl | 15 +-
tp/t/results/macro/macro_no_arg_expansion.pl | 15 +-
tp/t/results/macro/macro_no_argument.pl | 5 +
tp/t/results/macro/macro_not_closed.pl | 15 +-
tp/t/results/macro/macro_one_arg_end_of_file.pl | 23 +-
.../macro/macro_replaced_by_definfoenclose.pl | 23 +-
.../macro_with_error_at_end_line_after_macro.pl | 23 +-
tp/t/results/macro/macro_zero.pl | 15 +-
tp/t/results/macro/nested_macro_call.pl | 30 +-
tp/t/results/macro/no_macrobody.pl | 23 +-
tp/t/results/macro/non_ascii_in_macro_name.pl | 3 +
tp/t/results/macro/paragraph_and_macro.pl | 45 +-
tp/t/results/macro/protect_comma_macro_line.pl | 23 +-
tp/t/results/macro/protect_in_body.pl | 31 +-
tp/t/results/macro/protect_in_body_line_arg.pl | 31 +-
tp/t/results/macro/protect_in_body_one_arg.pl | 31 +-
tp/t/results/macro/recursive_call_in_argument.pl | 23 +-
tp/t/results/macro/recursive_call_in_macro.pl | 23 +-
tp/t/results/macro/recursive_call_in_rmacro.pl | 15 +-
tp/t/results/macro/redefine_texinfo_macro.pl | 23 +-
tp/t/results/macro/simple_imbricated_macro.pl | 30 +-
.../macro/simple_imbricated_macro_rmacro.pl | 30 +-
tp/t/results/macro/space_macro_after_end.pl | 15 +-
.../macro/space_macro_after_end_verbatim.pl | 15 +-
tp/t/results/macro/text_before_after.pl | 15 +-
tp/t/results/macro/too_much_args.pl | 31 +-
tp/t/results/macro/two_macros_on_a_line.pl | 38 +-
.../macro/unpaired_backslash_in_macro_body.pl | 23 +-
.../macro/verb_with_arobase_in_macro_call.pl | 31 +-
.../results/macro/verb_with_brace_in_macro_call.pl | 39 +-
tp/t/results/macro/zero_argument.pl | 30 +-
tp/t/results/macro/zero_argument_comment.pl | 30 +-
.../codequoteundirected_codequotebacktick.pl | 30 +-
tp/t/results/misc_commands/kbdinputstyle.pl | 15 +-
.../misc_commands/kbdinputstyle_in_table.pl | 15 +-
tp/t/results/misc_commands/test_allowcodebreaks.pl | 38 +-
.../indent_before_macro_definition_and_other.pl | 23 +-
.../plaintext_tests/star_at_command_formatting.pl | 15 +-
tp/t/results/raw/nested_macros.pl | 31 +-
.../transformations/protect_colon_source_mark.pl | 23 +-
.../transformations/protect_comma_source_mark.pl | 15 +-
...st_parenthesis_after_parenthesis_source_mark.pl | 15 +-
.../protect_first_parenthesis_source_mark.pl | 15 +-
...otect_hashchar_at_line_beginning_source_mark.pl | 53 ++-
...ct_node_after_label_source_mark_in_protected.pl | 15 +-
.../value_and_macro/comma_value_in_macro_arg.pl | 31 +-
tp/t/results/value_and_macro/macro_in_value.pl | 15 +-
.../results/value_and_macro/value_in_macro_body.pl | 23 +-
.../value_and_macro/value_in_macro_formal_arg.pl | 31 +-
tp/t/results/xml_tests/macro_and_args.pl | 70 +--
tp/t/results/xtable/table_nested.pl | 15 +-
208 files changed, 3856 insertions(+), 2829 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cb5c9a6d08..25b2f9c543 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,29 @@
* tp/Texinfo/Convert/LaTeX.pm (convert_math_to_images): use contents
instead of args for @math.
+2024-11-11 Patrice Dumas <pertusus@free.fr>
+
+ @*macro arguments in 'argument' container in contents instead of args
+
+ * tp/Texinfo/ParserNonXS.pm (_parse_macro_command_line)
+ (_expand_macro_arguments, _expand_linemacro_arguments)
+ (_lookup_macro_parameter, _expand_macro_body, _handle_macro)
+ (_process_macro_block_contents), tp/Texinfo/XS/main/element_types.txt
+ (argument), tp/Texinfo/XS/parsetexi/macro.c (parse_macro_command_line)
+ (lookup_macro_parameter, expand_macro_arguments)
+ (expand_linemacro_arguments, expand_macro_body, handle_macro),
+ tp/Texinfo/XS/parsetexi/parser.c (process_macro_block_contents):
+ put @*macro commands argument first in contents in a new container
+ type, argument. Do not use command args anymore.
+
+ * tp/Texinfo/Convert/Texinfo.pm (_convert_to_texinfo),
+ tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
+ tp/Texinfo/Transformations.pm (_protect_hashchar_at_line_beginning),
+ tp/Texinfo/XS/main/convert_to_texinfo.c (convert_to_texinfo_internal),
+ tp/Texinfo/XS/structuring_transfo/transformations.c
+ (protect_hashchar_at_line_beginning_internal): update for the change
+ in @*macro arguments.
+
2024-11-11 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/main/element_types.txt: remove unused internal type
diff --git a/tp/TODO b/tp/TODO
index fc4324899a..5c5489e675 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -12,6 +12,10 @@ Before next release
Report --number-footnotes not documented in texi2any --help
+tp/Texinfo/XS/main/build_perl_info.c (pass_generic_converter_to_converter_sv):
+fix typo in opened_files key string.
+ "opened_files_hv" -> "opened_files"
+
Bugs
====
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index 3488311dc7..9a3e788c05 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -196,8 +196,9 @@ sub _convert_to_texinfo($)
if (ref($element) ne 'HASH');
my $result = '';
- return '' if ($element->{'info'}
- and $element->{'info'}->{'inserted'});
+ return '' if (($element->{'info'}
+ and $element->{'info'}->{'inserted'})
+ or ($element->{'type'} and $element->{'type'} eq 'argument'));
if (defined($element->{'text'})) {
$result .= $element->{'text'};
} else {
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index fc39fb34cb..2de1d0d2ac 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -1380,18 +1380,20 @@ sub _convert($$;$)
} elsif ($element->{'cmdname'} eq 'macro'
or $element->{'cmdname'} eq 'rmacro'
or $element->{'cmdname'} eq 'linemacro') {
- if (defined($element->{'args'})) {
- my @args = @{$element->{'args'}};
- my $name_arg = shift @args;
- if (defined($name_arg) and defined($name_arg->{'text'})) {
- push @$attribute, ['name', $name_arg->{'text'}];
- }
-
- while (@args) {
- my $formal_arg = shift @args;
- $prepended_elements .= $self->txi_markup_open_element('formalarg')
+ if (defined($element->{'contents'})) {
+ my $macro_definition_arg = $element->{'contents'}->[0];
+ my $macro_args_nr = scalar(@{$macro_definition_arg->{'contents'}});
+ if ($macro_args_nr > 0) {
+ my $name_arg = $macro_definition_arg->{'contents'}->[0];
+ if (defined($name_arg) and defined($name_arg->{'text'})) {
+ push @$attribute, ['name', $name_arg->{'text'}];
+ }
+ for (my $i = 1; $i < $macro_args_nr; $i++) {
+ my $formal_arg = $macro_definition_arg->{'contents'}->[$i];
+ $prepended_elements .=
$self->txi_markup_open_element('formalarg')
.$self->txi_markup_protect_text($formal_arg->{'text'})
.$self->txi_markup_close_element('formalarg');
+ }
}
}
push @$attribute, $self->_arg_line($element);
@@ -1582,8 +1584,9 @@ sub _convert($$;$)
}
if ($element->{'type'}) {
- if ($container_ignored_if_empty{$element->{'type'}}
- and !$element->{'contents'}) {
+ if ($element->{'type'} eq 'argument'
+ or ($container_ignored_if_empty{$element->{'type'}}
+ and !$element->{'contents'})) {
return $result;
}
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 1cacb503aa..05db7c2bde 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1316,6 +1316,9 @@ sub _parse_macro_command_line($$$$$;$)
my $macro = { 'cmdname' => $command, 'parent' => $parent,
'info' => {'arg_line' => $line}, 'source_info' => $source_info
};
+ my $argument = {'type' => 'argument', 'parent' => $macro};
+ $macro->{'contents'} = [$argument];
+
# REMACRO
my $macro_name;
if ($line =~ s/^\s+([[:alnum:]][[:alnum:]_-]*)//) {
@@ -1335,9 +1338,9 @@ sub _parse_macro_command_line($$$$$;$)
print STDERR "MACRO \@$command $macro_name\n"
if ($self->{'conf'}->{'DEBUG'});
- $macro->{'args'} = [
- { 'type' => 'macro_name', 'text' => $macro_name,
- 'parent' => $macro } ];
+ $argument->{'contents'} = [
+ { 'type' => 'macro_name', 'text' => $macro_name,
+ 'parent' => $argument } ];
my $args_def = $line;
$args_def =~ s/^\s*//;
@@ -1348,9 +1351,9 @@ sub _parse_macro_command_line($$$$$;$)
}
foreach my $formal_arg (@args) {
- push @{$macro->{'args'}},
+ push @{$argument->{'contents'}},
{ 'type' => 'macro_arg', 'text' => $formal_arg,
- 'parent' => $macro};
+ 'parent' => $argument};
if ($formal_arg !~ /^[\w\-]+$/) {
$self->_line_error(sprintf(__("bad or empty \@%s formal argument: %s"),
$command, $formal_arg), $source_info);
@@ -2700,8 +2703,9 @@ sub _expand_macro_arguments($$$$$)
'parent' => $argument};
push @{$argument->{'contents'}}, $argument_content;
- my $args_total = scalar(@{$macro->{'args'}}) -1;
- my $name = $macro->{'args'}->[0]->{'text'};
+ my $macro_definition_arg = $macro->{'contents'}->[0];
+ my $args_total = scalar(@{$macro_definition_arg->{'contents'}}) -1;
+ my $name = $macro_definition_arg->{'contents'}->[0]->{'text'};
my $source_info_orig = $source_info;
@@ -2812,8 +2816,9 @@ sub _expand_linemacro_arguments($$$$$)
$current->{'info'} = {} if (!$current->{'info'});
$current->{'info'}->{'spaces_before_argument'} = {'text' => $1};
}
- my $args_total = scalar(@{$macro->{'args'}}) -1;
- my $name = $macro->{'args'}->[0]->{'text'};
+ my $macro_definition_arg = $macro->{'contents'}->[0];
+ my $args_total = scalar(@{$macro_definition_arg->{'contents'}}) -1;
+ my $name = $macro_definition_arg->{'contents'}->[0]->{'text'};
while (1) {
# spaces based on whitespace_chars_except_newline in XS parser
@@ -2944,13 +2949,15 @@ sub _lookup_macro_parameter($$) {
my $macro = shift;
my $name = shift;
- my $args_total = scalar(@{$macro->{'element'}->{'args'}}) -1;
+ my $macro_definition_arg = $macro->{'element'}->{'contents'}->[0];
+ my $args_total = scalar(@{$macro_definition_arg->{'contents'}}) -1;
if ($args_total > 0) {
my $arg_index;
# the first argument is the macro name
for ($arg_index=1; $arg_index<=$args_total; $arg_index++) {
- if (defined($macro->{'element'}->{'args'}->[$arg_index])
- and $macro->{'element'}->{'args'}->[$arg_index]->{'text'} eq $name) {
+ if (defined($macro_definition_arg->{'contents'}->[$arg_index])
+ and $macro_definition_arg->{'contents'}->[$arg_index]->{'text'}
+ eq $name) {
return $arg_index - 1;
}
}
@@ -2982,9 +2989,11 @@ sub _expand_macro_body($$$$) {
$result .= $args->[$formal_arg_index]->{'contents'}->[0]->{'text'};
}
} else {
+ my $macro_definition_arg = $macro->{'element'}->{'contents'}->[0];
$self->_line_error(sprintf(__(
"\\ in \@%s expansion followed `%s' instead of parameter name or \\"),
- $macro->{'element'}->{'args'}->[0]->{'text'}, $arg),
$source_info);
+ $macro_definition_arg->{'contents'}->[0]->{'text'}, $arg),
+ $source_info);
$result .= '\\' . $arg;
}
} else {
@@ -5186,6 +5195,7 @@ sub _handle_macro($$$$$)
my $command = shift;
my $expanded_macro = $self->{'macros'}->{$command}->{'element'};
+ my $macro_definition_arg = $expanded_macro->{'contents'}->[0];
# It is important to check for expansion before the expansion and
# not after, as during the expansion, the text may go past the
@@ -5230,7 +5240,7 @@ sub _handle_macro($$$$$)
= _expand_linemacro_arguments($self, $expanded_macro, $line, $source_info,
$macro_call_element);
} else {
- my $args_number = scalar(@{$expanded_macro->{'args'}}) -1;
+ my $args_number = scalar(@{$macro_definition_arg->{'contents'}}) -1;
if ($line =~ /^\s*{/) { # } macro with args
if ($line =~ s/^(\s+)//) {
my $spaces_element = {'text' => $1};
@@ -5331,7 +5341,7 @@ sub _handle_macro($$$$$)
# Put expansion in front of the current line.
_input_push_text($self, $expanded_macro_text, $source_info->{'line_nr'},
- $expanded_macro->{'args'}->[0]->{'text'});
+ $macro_definition_arg->{'contents'}->[0]->{'text'});
$self->{'input'}->[0]->{'input_source_mark'} = $macro_source_mark;
@@ -6890,8 +6900,10 @@ sub _process_macro_block_contents($$)
__("\@end %s should only appear at the beginning of a line"),
$current->{'cmdname'}), $source_info);
}
- if ($current->{'args'} and $current->{'args'}->[0]) {
- my $name = $current->{'args'}->[0]->{'text'};
+ if ($current->{'contents'} and $current->{'contents'}->[0]
+ and $current->{'contents'}->[0]->{'contents'}
+ and $current->{'contents'}->[0]->{'contents'}->[0]) {
+ my $name = $current->{'contents'}->[0]->{'contents'}->[0]->{'text'};
if (exists($self->{'macros'}->{$name})) {
$self->_line_warn(sprintf(__("macro `%s' previously defined"),
$name), $current->{'source_info'});
diff --git a/tp/Texinfo/Transformations.pm b/tp/Texinfo/Transformations.pm
index a64867c58f..fbbdbf44bb 100644
--- a/tp/Texinfo/Transformations.pm
+++ b/tp/Texinfo/Transformations.pm
@@ -862,6 +862,8 @@ sub _protect_hashchar_at_line_beginning($$$)
if ($parent->{'contents'}->[$i] eq $current) {
# protect if first in container, or if after a newline
if ($i == 0
+ or ($i == 1 and $parent->{'contents'}->[0]->{'type'}
+ and $parent->{'contents'}->[0]->{'type'} eq 'argument')
or ($parent->{'contents'}->[$i-1]->{'text'}
and $parent->{'contents'}->[$i-1]->{'text'} =~ /\n$/)) {
# do not actually protect in raw block command, but warn
diff --git a/tp/Texinfo/XS/main/convert_to_texinfo.c
b/tp/Texinfo/XS/main/convert_to_texinfo.c
index 6b8af001d7..5cba28cedd 100644
--- a/tp/Texinfo/XS/main/convert_to_texinfo.c
+++ b/tp/Texinfo/XS/main/convert_to_texinfo.c
@@ -166,7 +166,7 @@ convert_to_texinfo_internal (const ELEMENT *e, TEXT *result)
{
ELEMENT *elt;
- if (e->flags & EF_inserted)
+ if (e->flags & EF_inserted || e->type == ET_argument)
{}
else if (type_data[e->type].flags & TF_text)
{
diff --git a/tp/Texinfo/XS/main/element_types.c
b/tp/Texinfo/XS/main/element_types.c
index 29ef90556e..b50b3ed22d 100644
--- a/tp/Texinfo/XS/main/element_types.c
+++ b/tp/Texinfo/XS/main/element_types.c
@@ -38,6 +38,7 @@ TYPE_DATA type_data[] = {
{"paragraph", 0, 0},
{"preformatted", 0, 0},
{"rawpreformatted", 0, 0},
+{"argument", 0, 0},
{"brace_container", 0, 0},
{"brace_command_context", 0, 0},
{"brace_arg", 0, 3},
diff --git a/tp/Texinfo/XS/main/element_types.h
b/tp/Texinfo/XS/main/element_types.h
index 315711ba2c..a447457533 100644
--- a/tp/Texinfo/XS/main/element_types.h
+++ b/tp/Texinfo/XS/main/element_types.h
@@ -37,6 +37,7 @@ ET_preamble_before_content,
ET_paragraph,
ET_preformatted,
ET_rawpreformatted,
+ET_argument,
ET_brace_container,
ET_brace_command_context,
ET_brace_arg,
diff --git a/tp/Texinfo/XS/main/element_types.txt
b/tp/Texinfo/XS/main/element_types.txt
index e09d827384..cc0729b9bd 100644
--- a/tp/Texinfo/XS/main/element_types.txt
+++ b/tp/Texinfo/XS/main/element_types.txt
@@ -93,6 +93,7 @@ preformatted
rawpreformatted
# @-commands arguments containers
+argument
brace_container
brace_command_context
# with separate leading spaces in info, and trailing (if not in inline)
diff --git a/tp/Texinfo/XS/parsetexi/macro.c b/tp/Texinfo/XS/parsetexi/macro.c
index 69d5815bd1..0cd92506ff 100644
--- a/tp/Texinfo/XS/parsetexi/macro.c
+++ b/tp/Texinfo/XS/parsetexi/macro.c
@@ -133,7 +133,7 @@ parse_macro_command_line (enum command_id cmd, const char
**line_inout,
{
const char *line = *line_inout;
const char *pline = line;
- ELEMENT *macro, *macro_name;
+ ELEMENT *macro, *macro_name, *argument;
char *name;
const char *args_ptr;
@@ -145,6 +145,9 @@ parse_macro_command_line (enum command_id cmd, const char
**line_inout,
macro->e.c->string_info[sit_arg_line] = strdup (line);
+ argument = new_element (ET_argument);
+ add_to_element_contents (macro, argument);
+
pline += strspn (pline, whitespace_chars);
name = read_command_name (&pline);
@@ -169,7 +172,7 @@ parse_macro_command_line (enum command_id cmd, const char
**line_inout,
macro_name = new_text_element (ET_macro_name);
text_append (macro_name->e.text, name);
free (name);
- add_to_element_args (macro, macro_name);
+ add_to_element_contents (argument, macro_name);
args_ptr = pline;
args_ptr += strspn (args_ptr, whitespace_chars);
@@ -215,7 +218,7 @@ parse_macro_command_line (enum command_id cmd, const char
**line_inout,
line_error ("bad or empty @%s formal argument: ",
command_name(cmd));
arg = new_text_element (ET_macro_arg);
- add_to_element_args (macro, arg);
+ add_to_element_contents (argument, arg);
macro->flags |= EF_invalid_syntax;
}
}
@@ -223,7 +226,7 @@ parse_macro_command_line (enum command_id cmd, const char
**line_inout,
{
arg = new_text_element (ET_macro_arg);
text_append_n (arg->e.text, args_ptr, q2 - args_ptr);
- add_to_element_args (macro, arg);
+ add_to_element_contents (argument, arg);
/* Check the argument name. */
{
@@ -282,11 +285,12 @@ lookup_macro_parameter (const char *name, const ELEMENT
*macro)
size_t i, idx;
/* the args_list pointer is const not the ELEMENT */
ELEMENT *const *args_list;
+ const ELEMENT *macro_definition_arg = macro->e.c->contents.list[0];
/* Find 'arg' in MACRO parameters. */
- args_list = macro->e.c->args.list;
+ args_list = macro_definition_arg->e.c->contents.list;
idx = 0;
- for (i = 0; i < macro->e.c->args.number; i++)
+ for (i = 0; i < macro_definition_arg->e.c->contents.number; i++)
{
if (args_list[i]->type == ET_macro_arg)
{
@@ -313,13 +317,15 @@ expand_macro_arguments (const ELEMENT *macro, const char
**line_inout,
int whitespaces_len;
ELEMENT *argument = new_element (ET_brace_arg);
ELEMENT *argument_content = new_text_element (ET_other_text);
+ ELEMENT *macro_definition_arg;
add_to_element_contents (current, argument);
add_to_element_contents (argument, argument_content);
arg = argument_content->e.text;
+ macro_definition_arg = macro->e.c->contents.list[0];
/* -1 because of the macro name */
- args_total = macro->e.c->args.number - 1;
+ args_total = macro_definition_arg->e.c->contents.number - 1;
/* *pline is '{', advance past the open brace, start at braces_level = 1 */
pline++;
@@ -457,6 +463,7 @@ expand_linemacro_arguments (const ELEMENT *macro, const
char **line_inout,
size_t i;
ELEMENT *argument = new_element (ET_line_arg);
ELEMENT *argument_content = new_text_element (ET_other_text);
+ ELEMENT *macro_definition_arg;
add_to_element_contents (current, argument);
add_to_element_contents (argument, argument_content);
@@ -474,8 +481,9 @@ expand_linemacro_arguments (const ELEMENT *macro, const
char **line_inout,
pline += spaces_nr;
}
+ macro_definition_arg = macro->e.c->contents.list[0];
/* -1 because of the macro name */
- args_total = macro->e.c->args.number - 1;
+ args_total = macro_definition_arg->e.c->contents.number - 1;
while (1)
{
@@ -689,9 +697,11 @@ expand_macro_body (const MACRO *macro_record, const
ELEMENT *arguments,
pos = lookup_macro_parameter (name, macro);
if (pos == 0)
{
+ ELEMENT *macro_definition_arg = macro->e.c->contents.list[0];
line_error ("\\ in @%s expansion followed `%s' instead of "
"parameter name or \\",
- macro->e.c->args.list[0]->e.text->text, name);
+ macro_definition_arg->e.c->contents.list[0]->e.text->text,
+ name);
text_append (expanded, "\\");
text_append (expanded, name);
}
@@ -770,6 +780,7 @@ handle_macro (ELEMENT *current, const char **line_inout,
enum command_id cmd)
const char *line, *p;
MACRO *macro_record;
const ELEMENT *macro;
+ const ELEMENT *macro_definition_arg;
TEXT expanded;
char *expanded_macro_text;
size_t args_number;
@@ -783,6 +794,7 @@ handle_macro (ELEMENT *current, const char **line_inout,
enum command_id cmd)
if (!macro_record)
fatal ("no macro record");
macro = macro_record->element;
+ macro_definition_arg = macro->e.c->contents.list[0];
/* It is important to check for expansion before the expansion and
not after, as during the expansion, the text may go past the
@@ -821,7 +833,7 @@ handle_macro (ELEMENT *current, const char **line_inout,
enum command_id cmd)
else
{
/* Get number of args. - 1 for the macro name. */
- args_number = macro->e.c->args.number - 1;
+ args_number = macro_definition_arg->e.c->contents.number - 1;
p = line + strspn (line, whitespace_chars);
if (*p == '{')
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index d16167f7b3..acd22ba4bb 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -1533,10 +1533,13 @@ process_macro_block_contents (ELEMENT *current, const
char **line_out)
"beginning of a line",
command_name(top_stack_cmd));
}
- if (current->e.c->args.number > 0)
+ if (current->e.c->contents.number > 0
+ && current->e.c->contents.list[0]
+ ->e.c->contents.number > 0)
{
const ELEMENT *macro_name_e
- = args_child_by_index (current, 0);
+ = contents_child_by_index (
+ contents_child_by_index (current, 0), 0);
name = macro_name_e->e.text->text;
existing = lookup_command (name);
diff --git a/tp/Texinfo/XS/structuring_transfo/transformations.c
b/tp/Texinfo/XS/structuring_transfo/transformations.c
index ce610dc9a2..18cb741731 100644
--- a/tp/Texinfo/XS/structuring_transfo/transformations.c
+++ b/tp/Texinfo/XS/structuring_transfo/transformations.c
@@ -1349,7 +1349,9 @@ protect_hashchar_at_line_beginning_internal (const char
*type,
if (parent->e.c->contents.list[i] == current)
{
int do_protect = 0;
- if (i == 0)
+ if (i == 0
+ || (i == 1
+ && parent->e.c->contents.list[0]->type == ET_argument))
do_protect = 1;
else
{
diff --git a/tp/t/results/alias/alias_macro_target_removed.pl
b/tp/t/results/alias/alias_macro_target_removed.pl
index 522ba166de..dcbad98d27 100644
--- a/tp/t/results/alias/alias_macro_target_removed.pl
+++ b/tp/t/results/alias/alias_macro_target_removed.pl
@@ -10,18 +10,21 @@ $result_trees{'alias_macro_target_removed'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mystrong',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mystrong',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '!!\\arg\\!!
',
diff --git a/tp/t/results/alias/alias_of_macro.pl
b/tp/t/results/alias/alias_of_macro.pl
index 884266b203..415906ee79 100644
--- a/tp/t/results/alias/alias_of_macro.pl
+++ b/tp/t/results/alias/alias_of_macro.pl
@@ -10,18 +10,21 @@ $result_trees{'alias_of_macro'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mymacro',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'thearg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymacro',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'thearg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '||\\thearg||
',
diff --git a/tp/t/results/alias/alias_of_macro_before_macro.pl
b/tp/t/results/alias/alias_of_macro_before_macro.pl
index 42d1237775..ce2d368a09 100644
--- a/tp/t/results/alias/alias_of_macro_before_macro.pl
+++ b/tp/t/results/alias/alias_of_macro_before_macro.pl
@@ -48,18 +48,21 @@ $result_trees{'alias_of_macro_before_macro'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'mymacro',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'thearg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymacro',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'thearg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '||\\thearg||
',
diff --git a/tp/t/results/alias/texinfo_command_alias.pl
b/tp/t/results/alias/texinfo_command_alias.pl
index 75f0d35b01..5316930930 100644
--- a/tp/t/results/alias/texinfo_command_alias.pl
+++ b/tp/t/results/alias/texinfo_command_alias.pl
@@ -10,18 +10,21 @@ $result_trees{'texinfo_command_alias'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mystrong',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mystrong',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '!!\\arg\\!!
',
diff --git a/tp/t/results/alias/texinfo_command_alias_indirect.pl
b/tp/t/results/alias/texinfo_command_alias_indirect.pl
index 9ea25eef34..f8dfeb2562 100644
--- a/tp/t/results/alias/texinfo_command_alias_indirect.pl
+++ b/tp/t/results/alias/texinfo_command_alias_indirect.pl
@@ -10,18 +10,21 @@ $result_trees{'texinfo_command_alias_indirect'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mystrong',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mystrong',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '!!\\arg\\!!
',
diff --git a/tp/t/results/alias/texinfo_command_alias_indirect_before.pl
b/tp/t/results/alias/texinfo_command_alias_indirect_before.pl
index 27641512e3..2444ad956c 100644
--- a/tp/t/results/alias/texinfo_command_alias_indirect_before.pl
+++ b/tp/t/results/alias/texinfo_command_alias_indirect_before.pl
@@ -10,18 +10,21 @@ $result_trees{'texinfo_command_alias_indirect_before'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mystrong',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mystrong',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '!!\\arg\\!!
',
diff --git a/tp/t/results/conditionals/command_conditionals_user_defined.pl
b/tp/t/results/conditionals/command_conditionals_user_defined.pl
index 313197b818..c82eef82e3 100644
--- a/tp/t/results/conditionals/command_conditionals_user_defined.pl
+++ b/tp/t/results/conditionals/command_conditionals_user_defined.pl
@@ -10,14 +10,17 @@ $result_trees{'command_conditionals_user_defined'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'truc',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'truc',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'machin
',
diff --git a/tp/t/results/conditionals/macro_in_ifset.pl
b/tp/t/results/conditionals/macro_in_ifset.pl
index 44d7ee3860..18f14eb819 100644
--- a/tp/t/results/conditionals/macro_in_ifset.pl
+++ b/tp/t/results/conditionals/macro_in_ifset.pl
@@ -15,14 +15,17 @@ $result_trees{'macro_in_ifset'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'truc',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'truc',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'truc
',
diff --git a/tp/t/results/conditionals/macro_in_ifset_set.pl
b/tp/t/results/conditionals/macro_in_ifset_set.pl
index fa9a5d3308..87666e1599 100644
--- a/tp/t/results/conditionals/macro_in_ifset_set.pl
+++ b/tp/t/results/conditionals/macro_in_ifset_set.pl
@@ -37,14 +37,17 @@ $result_trees{'macro_in_ifset_set'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'truc',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'truc',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'truc
',
@@ -143,14 +146,17 @@ $result_trees{'macro_in_ifset_set'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'truc',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'truc',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'in ifset
',
diff --git a/tp/t/results/conditionals/nested_ifset_ifclear.pl
b/tp/t/results/conditionals/nested_ifset_ifclear.pl
index d10262cc4d..5957d35bc3 100644
--- a/tp/t/results/conditionals/nested_ifset_ifclear.pl
+++ b/tp/t/results/conditionals/nested_ifset_ifclear.pl
@@ -15,14 +15,17 @@ $result_trees{'nested_ifset_ifclear'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'conditionals',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'conditionals',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@ifset somevar
',
diff --git a/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
b/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
index ceac541e9b..519b8f678e 100644
--- a/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
+++ b/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
@@ -10,14 +10,17 @@ $result_trees{'user_defined_txiinternalvalue'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'txiinternalvalue',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'txiinternalvalue',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'user internalvalue
',
diff --git a/tp/t/results/converters_tests/at_commands_in_raw.pl
b/tp/t/results/converters_tests/at_commands_in_raw.pl
index d053490a9e..b4c4360d8a 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -66,14 +66,17 @@ $result_trees{'at_commands_in_raw'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'othermacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'othermacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'Other macro
',
diff --git a/tp/t/results/coverage_braces/test_image.pl
b/tp/t/results/coverage_braces/test_image.pl
index d0f139ff85..3a456b0a0c 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -10,14 +10,17 @@ $result_trees{'test_image'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'files-char',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'files-char',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@image{f@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}
,,,,.ext@@i--le@/.@. a@@<"%@@@verb{: < & @ % " :}}
',
diff --git a/tp/t/results/include/cpp_lines.pl
b/tp/t/results/include/cpp_lines.pl
index 62a07e461e..521a3a3315 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -245,14 +245,17 @@ $result_trees{'cpp_lines'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'macr',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macr',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '# line 7 "k"
',
@@ -405,14 +408,17 @@ $result_trees{'cpp_lines'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'macrtwo',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macrtwo',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'line before
',
diff --git a/tp/t/results/include/macro_and_commands_in_early_commands.pl
b/tp/t/results/include/macro_and_commands_in_early_commands.pl
index 1b754fe6b0..5be3f3379e 100644
--- a/tp/t/results/include/macro_and_commands_in_early_commands.pl
+++ b/tp/t/results/include/macro_and_commands_in_early_commands.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'begin-file',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'begin-file',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'macro_i--n_pass@@
',
@@ -135,14 +138,17 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'latin1',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'latin1',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'ISO-8859-1@@
',
@@ -258,14 +264,17 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'multiinclude',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'multiinclude',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'macro_included.texi
',
@@ -466,14 +475,17 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'themacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'themacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'in themacro
',
diff --git a/tp/t/results/include/macro_definition_in_include.pl
b/tp/t/results/include/macro_definition_in_include.pl
index b0d5c11f5a..aed9b5455e 100644
--- a/tp/t/results/include/macro_definition_in_include.pl
+++ b/tp/t/results/include/macro_definition_in_include.pl
@@ -50,14 +50,17 @@ $result_trees{'macro_definition_in_include'} = {
'text' => ''
},
{
- 'args' => [
- {
- 'text' => 'themacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'themacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'in themacro
',
diff --git a/tp/t/results/include/macro_in_early_commands.pl
b/tp/t/results/include/macro_in_early_commands.pl
index f716b4c402..8526f2d431 100644
--- a/tp/t/results/include/macro_in_early_commands.pl
+++ b/tp/t/results/include/macro_in_early_commands.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_in_early_commands'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'begin-file',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'begin-file',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'macro_in_pass
',
@@ -63,18 +66,21 @@ $result_trees{'macro_in_early_commands'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'end-file-name',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'ext',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'end-file-name',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'ext',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'texi_commands.\\ext\\
',
@@ -215,14 +221,17 @@ $result_trees{'macro_in_early_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'latin1',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'latin1',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'ISO-8859-1
',
@@ -273,14 +282,17 @@ $result_trees{'macro_in_early_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'documentencoding-command',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'documentencoding-command',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@documentencoding
',
@@ -414,14 +426,17 @@ $result_trees{'macro_in_early_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'multiinclude',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'multiinclude',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'macro_included.texi
',
@@ -622,14 +637,17 @@ $result_trees{'macro_in_early_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'themacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'themacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'in themacro
',
diff --git a/tp/t/results/info_tests/def_in_copying.pl
b/tp/t/results/info_tests/def_in_copying.pl
index d5d0ca472b..7edb08aeec 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -10,14 +10,17 @@ $result_trees{'def_in_copying'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mymacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@deffn aa bb cc
',
diff --git a/tp/t/results/linemacro/api_doc_with_linemacro.pl
b/tp/t/results/linemacro/api_doc_with_linemacro.pl
index 3651bf633b..93b617bcdd 100644
--- a/tp/t/results/linemacro/api_doc_with_linemacro.pl
+++ b/tp/t/results/linemacro/api_doc_with_linemacro.pl
@@ -10,22 +10,25 @@ $result_trees{'api_doc_with_linemacro'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'param',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'param',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'type',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'param',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'param',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'type',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@defline Parameter @var{\\param\\} @code{ : \\type\\}
',
@@ -71,22 +74,25 @@ $result_trees{'api_doc_with_linemacro'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'returns',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'param',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'type',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'returns',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'param',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'type',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@defline {Return Value} @var{\\param\\} @code{ :
\\type\\}
',
@@ -132,18 +138,21 @@ $result_trees{'api_doc_with_linemacro'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'raises',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'exception',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'raises',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'exception',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@defline {Exception} \\exception\\
',
diff --git a/tp/t/results/linemacro/arobase_brace_in_linemacro_call.pl
b/tp/t/results/linemacro/arobase_brace_in_linemacro_call.pl
index 14ad53bc4c..5d513aea91 100644
--- a/tp/t/results/linemacro/arobase_brace_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/arobase_brace_in_linemacro_call.pl
@@ -10,22 +10,25 @@ $result_trees{'arobase_brace_in_linemacro_call'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'simplemac',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg1',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'arg2',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'simplemac',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg1',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'arg2',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'first: \\arg1\\|
',
diff --git a/tp/t/results/linemacro/begin_conditional_in_linemacro.pl
b/tp/t/results/linemacro/begin_conditional_in_linemacro.pl
index d3df43e29d..8030192dcb 100644
--- a/tp/t/results/linemacro/begin_conditional_in_linemacro.pl
+++ b/tp/t/results/linemacro/begin_conditional_in_linemacro.pl
@@ -10,18 +10,21 @@ $result_trees{'begin_conditional_in_linemacro'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'lm',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'lm',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'b \\a\\ a
',
diff --git a/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
b/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
index b7bfe6530b..3d9498b349 100644
--- a/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
@@ -10,18 +10,21 @@ $result_trees{'block_begin_end_in_linemacro_call'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'lm',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'lm',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'b \\a\\ a
',
@@ -612,22 +615,25 @@ args \\e\\|\\f\\|
'
},
{
- 'args' => [
- {
- 'text' => 'mymac',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'e',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'f',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymac',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'e',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'f',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'args \\e\\|\\f\\|
',
diff --git a/tp/t/results/linemacro/blockitem_no_item.pl
b/tp/t/results/linemacro/blockitem_no_item.pl
index dfb9fbeb58..fa3d86efdf 100644
--- a/tp/t/results/linemacro/blockitem_no_item.pl
+++ b/tp/t/results/linemacro/blockitem_no_item.pl
@@ -10,26 +10,29 @@ $result_trees{'blockitem_no_item'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mycommand',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'c',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mycommand',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'c',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\a\\, \\b\\ \\c\\
',
diff --git a/tp/t/results/linemacro/brace_command_not_closed.pl
b/tp/t/results/linemacro/brace_command_not_closed.pl
index 87d930b8a3..58df980006 100644
--- a/tp/t/results/linemacro/brace_command_not_closed.pl
+++ b/tp/t/results/linemacro/brace_command_not_closed.pl
@@ -10,26 +10,29 @@ $result_trees{'brace_command_not_closed'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mycommand',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'c',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mycommand',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'c',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\a\\, \\b\\ \\c\\
',
diff --git a/tp/t/results/linemacro/braces_after_text.pl
b/tp/t/results/linemacro/braces_after_text.pl
index 6ff7c4f8ec..3729345c69 100644
--- a/tp/t/results/linemacro/braces_after_text.pl
+++ b/tp/t/results/linemacro/braces_after_text.pl
@@ -10,26 +10,29 @@ $result_trees{'braces_after_text'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mymacro',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'c',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymacro',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'c',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@defline \\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 8697151513..01a5c3cbe3 100644
--- a/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
+++ b/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
@@ -10,22 +10,25 @@ $result_trees{'call_macro_in_linemacro_body'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'lm',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'lm',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@mymacro{@code{}
',
@@ -86,22 +89,25 @@ $result_trees{'call_macro_in_linemacro_body'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'mymacro',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'c',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'd',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymacro',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'c',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'd',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@table \\c\\
',
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 6ef12f1b7c..abb7bd2ce6 100644
--- a/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
@@ -10,22 +10,25 @@ $result_trees{'call_macro_in_linemacro_call'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'lm',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'lm',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@quotation \\a\\
',
@@ -81,22 +84,25 @@ $result_trees{'call_macro_in_linemacro_call'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'mymacro',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'c',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'd',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymacro',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'c',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'd',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@table \\c\\
',
diff --git a/tp/t/results/linemacro/comment_at_end_of_linemacro_call.pl
b/tp/t/results/linemacro/comment_at_end_of_linemacro_call.pl
index 752687149c..c29357e771 100644
--- a/tp/t/results/linemacro/comment_at_end_of_linemacro_call.pl
+++ b/tp/t/results/linemacro/comment_at_end_of_linemacro_call.pl
@@ -10,22 +10,25 @@ $result_trees{'comment_at_end_of_linemacro_call'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'lm',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'lm',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'c \\a\\ d
',
diff --git a/tp/t/results/linemacro/comment_in_linemacro_call.pl
b/tp/t/results/linemacro/comment_in_linemacro_call.pl
index da6efb0f9e..da8de0c869 100644
--- a/tp/t/results/linemacro/comment_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/comment_in_linemacro_call.pl
@@ -10,22 +10,25 @@ $result_trees{'comment_in_linemacro_call'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'lm',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'lm',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'c \\a\\ d
',
diff --git a/tp/t/results/linemacro/comment_in_one_argument_linemacro_call.pl
b/tp/t/results/linemacro/comment_in_one_argument_linemacro_call.pl
index 19af7b87d8..62eca7ecc1 100644
--- a/tp/t/results/linemacro/comment_in_one_argument_linemacro_call.pl
+++ b/tp/t/results/linemacro/comment_in_one_argument_linemacro_call.pl
@@ -10,18 +10,21 @@ $result_trees{'comment_in_one_argument_linemacro_call'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'lm',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'lm',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'c \\a\\ d
',
diff --git
a/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
b/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
index 3c05683434..dadea173e5 100644
--- a/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
+++ b/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
@@ -10,22 +10,25 @@ $result_trees{'comment_on_linemacro_call_macro_expansion'}
= {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'lm',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'lm',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'first |\\a\\|
',
@@ -81,18 +84,21 @@ $result_trees{'comment_on_linemacro_call_macro_expansion'}
= {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'mymacro',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymacro',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'macro \\a\\ text
',
diff --git a/tp/t/results/linemacro/comment_on_linemacro_call_out_of_braces.pl
b/tp/t/results/linemacro/comment_on_linemacro_call_out_of_braces.pl
index 829ea687bb..ce52a4d1e9 100644
--- a/tp/t/results/linemacro/comment_on_linemacro_call_out_of_braces.pl
+++ b/tp/t/results/linemacro/comment_on_linemacro_call_out_of_braces.pl
@@ -10,26 +10,29 @@ $result_trees{'comment_on_linemacro_call_out_of_braces'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'lm',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'c',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'lm',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'c',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'first |\\a\\|
',
diff --git a/tp/t/results/linemacro/empty_last_argument.pl
b/tp/t/results/linemacro/empty_last_argument.pl
index e66df6971e..56eda72d17 100644
--- a/tp/t/results/linemacro/empty_last_argument.pl
+++ b/tp/t/results/linemacro/empty_last_argument.pl
@@ -42,22 +42,25 @@ $result_trees{'empty_last_argument'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'defbuiltin',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'symbol',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'rest',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'defbuiltin',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'symbol',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'rest',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@BIindex \\symbol\\
',
diff --git a/tp/t/results/linemacro/end_conditional_in_linemacro.pl
b/tp/t/results/linemacro/end_conditional_in_linemacro.pl
index 12e9abfd2d..d69ed357e2 100644
--- a/tp/t/results/linemacro/end_conditional_in_linemacro.pl
+++ b/tp/t/results/linemacro/end_conditional_in_linemacro.pl
@@ -10,18 +10,21 @@ $result_trees{'end_conditional_in_linemacro'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'lm',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'lm',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\a\\
',
diff --git a/tp/t/results/linemacro/last_argument_with_braces.pl
b/tp/t/results/linemacro/last_argument_with_braces.pl
index 09a7ae8652..c6a2aa0f0c 100644
--- a/tp/t/results/linemacro/last_argument_with_braces.pl
+++ b/tp/t/results/linemacro/last_argument_with_braces.pl
@@ -10,22 +10,25 @@ $result_trees{'last_argument_with_braces'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'defbuiltin',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'symbol',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'rest',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'defbuiltin',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'symbol',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'rest',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@defline \\symbol\\ f r
',
diff --git a/tp/t/results/linemacro/missing_formal_arg.pl
b/tp/t/results/linemacro/missing_formal_arg.pl
index 9e156f1bd2..52f44da35b 100644
--- a/tp/t/results/linemacro/missing_formal_arg.pl
+++ b/tp/t/results/linemacro/missing_formal_arg.pl
@@ -10,26 +10,29 @@ $result_trees{'missing_formal_arg'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mymacro',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => '',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymacro',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => '',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\a\\ and \\b\\.
',
diff --git a/tp/t/results/linemacro/nested_linemacro_calls.pl
b/tp/t/results/linemacro/nested_linemacro_calls.pl
index 243f572eef..6c22dfd701 100644
--- a/tp/t/results/linemacro/nested_linemacro_calls.pl
+++ b/tp/t/results/linemacro/nested_linemacro_calls.pl
@@ -10,22 +10,25 @@ $result_trees{'nested_linemacro_calls'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'inside',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'inside',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'inside {\\a\\ operator \\b\\}
',
@@ -76,26 +79,29 @@ $result_trees{'nested_linemacro_calls'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'outside',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'one',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'two',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'three',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'outside',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'one',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'two',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'three',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@defline \\one\\ {\\two\\} \\three\\
',
diff --git a/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
b/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
index 8fc07ff9b4..a95d8e0a97 100644
--- a/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
+++ b/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
@@ -15,26 +15,29 @@ $result_trees{'newline_and_continuation_in_brace'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'mylinecommand',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'first',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'second',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'rest',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mylinecommand',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'first',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'second',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'rest',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@defline category \\first\\ \\second\\ \\rest\\
',
diff --git a/tp/t/results/linemacro/no_arguments.pl
b/tp/t/results/linemacro/no_arguments.pl
index bb6782e220..bd6536b98c 100644
--- a/tp/t/results/linemacro/no_arguments.pl
+++ b/tp/t/results/linemacro/no_arguments.pl
@@ -10,14 +10,17 @@ $result_trees{'no_arguments'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'noarg',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'noarg',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'Body.
',
diff --git a/tp/t/results/linemacro/paragraph_no_paragraph.pl
b/tp/t/results/linemacro/paragraph_no_paragraph.pl
index 2486c71846..2119114f7f 100644
--- a/tp/t/results/linemacro/paragraph_no_paragraph.pl
+++ b/tp/t/results/linemacro/paragraph_no_paragraph.pl
@@ -10,26 +10,29 @@ $result_trees{'paragraph_no_paragraph'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mycommand',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'c',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mycommand',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'c',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\a\\, \\b\\ \\c\\
',
diff --git a/tp/t/results/linemacro/protected_spaces_on_line.pl
b/tp/t/results/linemacro/protected_spaces_on_line.pl
index df2d29a5bc..1504d84584 100644
--- a/tp/t/results/linemacro/protected_spaces_on_line.pl
+++ b/tp/t/results/linemacro/protected_spaces_on_line.pl
@@ -10,22 +10,25 @@ $result_trees{'protected_spaces_on_line'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'test',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'first',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'rest',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'test',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'first',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'rest',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@deffn Function \\first\\ \\rest\\
',
diff --git a/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl
b/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl
index 96019c3d5a..2afa08ac2f 100644
--- a/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl
+++ b/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl
@@ -10,18 +10,21 @@ $result_trees{'protection_of_end_of_line_by_command'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'lm',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'one',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'lm',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'one',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\one\\bullet{}
',
diff --git a/tp/t/results/linemacro/recursive_linemacro_in_body.pl
b/tp/t/results/linemacro/recursive_linemacro_in_body.pl
index 7938b73f9d..99d5bf7e44 100644
--- a/tp/t/results/linemacro/recursive_linemacro_in_body.pl
+++ b/tp/t/results/linemacro/recursive_linemacro_in_body.pl
@@ -10,22 +10,25 @@ $result_trees{'recursive_linemacro_in_body'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'anorecurse',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'other',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'anorecurse',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'other',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@anorecurse {\\arg\\} d \\other\\
',
diff --git a/tp/t/results/linemacro/recursive_linemacro_in_call.pl
b/tp/t/results/linemacro/recursive_linemacro_in_call.pl
index d47588512e..91364b0341 100644
--- a/tp/t/results/linemacro/recursive_linemacro_in_call.pl
+++ b/tp/t/results/linemacro/recursive_linemacro_in_call.pl
@@ -10,22 +10,25 @@ $result_trees{'recursive_linemacro_in_call'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'anorecurse',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'other',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'anorecurse',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'other',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\arg\\ d \\other\\
',
diff --git a/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
b/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
index f54fec6c41..12d89018ed 100644
--- a/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
+++ b/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
@@ -35,26 +35,29 @@ $result_trees{'simple_nested_linemacro_calls'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'inside',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'rest',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'inside',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'rest',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'inside {\\a\\ operator \\b\\} \\rest\\
',
@@ -105,26 +108,29 @@ $result_trees{'simple_nested_linemacro_calls'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'outside',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'one',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'two',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'three',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'outside',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'one',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'two',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'three',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@defline \\one\\ {\\two\\} \\three\\
',
diff --git a/tp/t/results/linemacro/spaces_after_command_in_call.pl
b/tp/t/results/linemacro/spaces_after_command_in_call.pl
index 1b542fee29..e4c0ea8b66 100644
--- a/tp/t/results/linemacro/spaces_after_command_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_command_in_call.pl
@@ -10,26 +10,29 @@ $result_trees{'spaces_after_command_in_call'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mylinecommand',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'first',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'second',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'rest',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mylinecommand',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'first',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'second',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'rest',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@defblock
',
diff --git
a/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl
b/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl
index 54813c0860..3a4c668b2a 100644
--- a/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl
@@ -10,26 +10,29 @@
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mylinecommand',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'first',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'second',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'rest',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mylinecommand',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'first',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'second',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'rest',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@defblock
',
@@ -90,18 +93,21 @@
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'mymac',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg1',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymac',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg1',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@samp{arg1}
',
@@ -152,22 +158,25 @@
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'mylinemac',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'name',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'rest',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mylinemac',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'name',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'rest',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '{\\name\\} \\rest\\
',
diff --git a/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl
b/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl
index 9dd0635867..2816e1e067 100644
--- a/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl
@@ -10,26 +10,29 @@ $result_trees{'spaces_after_unknown_command_in_call'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mylinecommand',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'first',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'second',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'rest',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mylinecommand',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'first',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'second',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'rest',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@defblock
',
diff --git a/tp/t/results/linemacro/spaces_in_args.pl
b/tp/t/results/linemacro/spaces_in_args.pl
index 87ab126529..bcb73e1747 100644
--- a/tp/t/results/linemacro/spaces_in_args.pl
+++ b/tp/t/results/linemacro/spaces_in_args.pl
@@ -10,26 +10,29 @@ $result_trees{'spaces_in_args'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mylinecommand',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'first',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'second',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'rest',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mylinecommand',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'first',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'second',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'rest',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@defblock
',
diff --git a/tp/t/results/linemacro/spaces_in_call.pl
b/tp/t/results/linemacro/spaces_in_call.pl
index cb02c7b20c..3908dbb9ba 100644
--- a/tp/t/results/linemacro/spaces_in_call.pl
+++ b/tp/t/results/linemacro/spaces_in_call.pl
@@ -10,26 +10,29 @@ $result_trees{'spaces_in_call'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mylinecommand',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'first',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'second',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'rest',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mylinecommand',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'first',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'second',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'rest',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@defblock
',
diff --git a/tp/t/results/linemacro/text_arguments.pl
b/tp/t/results/linemacro/text_arguments.pl
index 05bdb28452..55da8310b7 100644
--- a/tp/t/results/linemacro/text_arguments.pl
+++ b/tp/t/results/linemacro/text_arguments.pl
@@ -10,26 +10,29 @@ $result_trees{'text_arguments'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'nospace',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'one',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'two',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'three',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'nospace',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'one',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'two',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'three',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\three\\@bullet{}\\two\\@minus{}\\one\\
',
diff --git a/tp/t/results/linemacro/verb_in_linemacro_call.pl
b/tp/t/results/linemacro/verb_in_linemacro_call.pl
index d2de539be4..c143550612 100644
--- a/tp/t/results/linemacro/verb_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/verb_in_linemacro_call.pl
@@ -10,30 +10,33 @@ $result_trees{'verb_in_linemacro_call'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mycommand',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'c',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'd',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mycommand',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'c',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'd',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'first \\a\\
',
diff --git a/tp/t/results/linemacro/verb_not_closed.pl
b/tp/t/results/linemacro/verb_not_closed.pl
index 3e9a78adda..57b8ac1907 100644
--- a/tp/t/results/linemacro/verb_not_closed.pl
+++ b/tp/t/results/linemacro/verb_not_closed.pl
@@ -10,26 +10,29 @@ $result_trees{'verb_not_closed'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mycommand',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'c',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mycommand',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'c',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\a\\, \\b\\ \\c\\
',
diff --git a/tp/t/results/linemacro/verb_with_arobase_in_linemacro_call.pl
b/tp/t/results/linemacro/verb_with_arobase_in_linemacro_call.pl
index 6bedcd9dd9..f415bd92b2 100644
--- a/tp/t/results/linemacro/verb_with_arobase_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/verb_with_arobase_in_linemacro_call.pl
@@ -10,26 +10,29 @@ $result_trees{'verb_with_arobase_in_linemacro_call'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mycommand',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'c',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mycommand',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'c',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\a\\, \\b\\ \\c\\
',
diff --git a/tp/t/results/linemacro/verb_with_brace_in_linemacro_call.pl
b/tp/t/results/linemacro/verb_with_brace_in_linemacro_call.pl
index 0b2f26dca6..ca2c9d9b9a 100644
--- a/tp/t/results/linemacro/verb_with_brace_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/verb_with_brace_in_linemacro_call.pl
@@ -10,26 +10,29 @@ $result_trees{'verb_with_brace_in_linemacro_call'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mycommand',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'c',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'linemacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mycommand',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'c',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\a\\, \\b\\ \\c\\
',
diff --git a/tp/t/results/macro/arg_body_expansion_order.pl
b/tp/t/results/macro/arg_body_expansion_order.pl
index 37768f757b..fb93df4992 100644
--- a/tp/t/results/macro/arg_body_expansion_order.pl
+++ b/tp/t/results/macro/arg_body_expansion_order.pl
@@ -15,14 +15,17 @@ $result_trees{'arg_body_expansion_order'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'othermacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'othermacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'initial
',
@@ -73,18 +76,21 @@ $result_trees{'arg_body_expansion_order'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'redefineothermacro',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'redefineothermacro',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@unmacro othermacro
',
@@ -192,14 +198,17 @@ $result_trees{'arg_body_expansion_order'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'othermacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'othermacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'different
',
diff --git a/tp/t/results/macro/arg_not_closed.pl
b/tp/t/results/macro/arg_not_closed.pl
index f790cfac81..389dbe3309 100644
--- a/tp/t/results/macro/arg_not_closed.pl
+++ b/tp/t/results/macro/arg_not_closed.pl
@@ -10,18 +10,21 @@ $result_trees{'arg_not_closed'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'foo',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'foo',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'foo
',
diff --git a/tp/t/results/macro/arobase_brace_in_macro_call.pl
b/tp/t/results/macro/arobase_brace_in_macro_call.pl
index 1681f3f790..4efd828389 100644
--- a/tp/t/results/macro/arobase_brace_in_macro_call.pl
+++ b/tp/t/results/macro/arobase_brace_in_macro_call.pl
@@ -10,22 +10,25 @@ $result_trees{'arobase_brace_in_macro_call'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'simplemac',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg1',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'arg2',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'simplemac',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg1',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'arg2',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'first: \\arg1\\|
',
diff --git a/tp/t/results/macro/backslash_in_arg.pl
b/tp/t/results/macro/backslash_in_arg.pl
index 333c7f6e8c..a2771fbe09 100644
--- a/tp/t/results/macro/backslash_in_arg.pl
+++ b/tp/t/results/macro/backslash_in_arg.pl
@@ -66,18 +66,21 @@ $result_trees{'backslash_in_arg'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'funindex',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'TEXT',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'funindex',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'TEXT',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@findex \\TEXT\\
',
diff --git a/tp/t/results/macro/bad_argument.pl
b/tp/t/results/macro/bad_argument.pl
index 91ff0839b4..fe2fdcc81a 100644
--- a/tp/t/results/macro/bad_argument.pl
+++ b/tp/t/results/macro/bad_argument.pl
@@ -12,6 +12,9 @@ $result_trees{'bad_argument'} = {
{
'cmdname' => 'macro',
'contents' => [
+ {
+ 'type' => 'argument'
+ },
{
'text' => 'in macro
',
@@ -65,14 +68,17 @@ $result_trees{'bad_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'abar',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'rmacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'abar',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'in
',
@@ -126,18 +132,21 @@ $result_trees{'bad_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'aftername',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'ggg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'aftername',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'ggg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'in macro
',
@@ -193,6 +202,9 @@ $result_trees{'bad_argument'} = {
{
'cmdname' => 'macro',
'contents' => [
+ {
+ 'type' => 'argument'
+ },
{
'text' => 'in #
',
diff --git a/tp/t/results/macro/bad_formal_arg.pl
b/tp/t/results/macro/bad_formal_arg.pl
index a3e1c55de7..da6f904863 100644
--- a/tp/t/results/macro/bad_formal_arg.pl
+++ b/tp/t/results/macro/bad_formal_arg.pl
@@ -15,22 +15,25 @@ $result_trees{'bad_formal_arg'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'bad',
- 'type' => 'macro_name'
- },
- {
- 'text' => '',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'not_empty',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'bad',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => '',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'not_empty',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'in bad macro
',
@@ -84,22 +87,25 @@ $result_trees{'bad_formal_arg'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'badspace',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'first',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'in 2arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'badspace',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'first',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'in 2arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'bad space
',
@@ -153,18 +159,21 @@ $result_trees{'bad_formal_arg'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'abar',
- 'type' => 'macro_name'
- },
- {
- 'text' => ':::',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'abar',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => ':::',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'in bar
',
diff --git a/tp/t/results/macro/bad_macro_name_with_underscore.pl
b/tp/t/results/macro/bad_macro_name_with_underscore.pl
index 52d1390f74..fdfa0e8d74 100644
--- a/tp/t/results/macro/bad_macro_name_with_underscore.pl
+++ b/tp/t/results/macro/bad_macro_name_with_underscore.pl
@@ -10,22 +10,25 @@ $result_trees{'bad_macro_name_with_underscore'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'the_macro',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg1',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'arg2',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'the_macro',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg1',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'arg2',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'In macro
',
diff --git a/tp/t/results/macro/bib_example.pl
b/tp/t/results/macro/bib_example.pl
index 8266fd6b27..e2f5d6afb8 100644
--- a/tp/t/results/macro/bib_example.pl
+++ b/tp/t/results/macro/bib_example.pl
@@ -1739,18 +1739,21 @@ $result_trees{'bib_example'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'mybibsetrefnode',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'node',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mybibsetrefnode',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'node',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@set mybibrefnode \\node\\
',
@@ -1828,14 +1831,17 @@ $result_trees{'bib_example'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'mybibnode',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mybibnode',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@value{mybibrefnode}
',
@@ -1913,18 +1919,21 @@ $result_trees{'bib_example'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'mybibusetable',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'node',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mybibusetable',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'node',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@set mybibtable true
',
@@ -2022,18 +2031,21 @@ $result_trees{'bib_example'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'mybibuselist',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'node',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mybibuselist',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'node',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@set mybiblist true
',
@@ -2126,18 +2138,21 @@ $result_trees{'bib_example'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'mybibcite',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'ref',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mybibcite',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'ref',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@ifclear mybibrefnode
',
@@ -2225,22 +2240,25 @@ $result_trees{'bib_example'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'mybibmakeref',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'node',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'ref',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mybibmakeref',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'node',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'ref',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '(See item [\\ref\\] in @ref{\\node\\, \\ref\\}.)
',
@@ -2308,18 +2326,21 @@ $result_trees{'bib_example'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'mybibitem',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'ref',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mybibitem',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'ref',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@ifclear mybiblist
',
diff --git a/tp/t/results/macro/bye_in_macro.pl
b/tp/t/results/macro/bye_in_macro.pl
index 36da275d2f..38401158a9 100644
--- a/tp/t/results/macro/bye_in_macro.pl
+++ b/tp/t/results/macro/bye_in_macro.pl
@@ -10,14 +10,17 @@ $result_trees{'bye_in_macro'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'byeinmacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'byeinmacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'Text
',
diff --git
a/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
b/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
index f778deaeff..72668c1a93 100644
--- a/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
+++ b/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
@@ -10,14 +10,17 @@
$result_trees{'closing_brace_in_macro_call_in_ignored_inline'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'closebrace',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'closebrace',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '}
',
diff --git a/tp/t/results/macro/complete_macro_for_end.pl
b/tp/t/results/macro/complete_macro_for_end.pl
index 04602d4a61..7ff9264ce5 100644
--- a/tp/t/results/macro/complete_macro_for_end.pl
+++ b/tp/t/results/macro/complete_macro_for_end.pl
@@ -10,14 +10,17 @@ $result_trees{'complete_macro_for_end'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'theend',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'theend',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@end cartouche
',
diff --git a/tp/t/results/macro/complex_argument.pl
b/tp/t/results/macro/complex_argument.pl
index 4eb27aeaaa..2d5ffef44c 100644
--- a/tp/t/results/macro/complex_argument.pl
+++ b/tp/t/results/macro/complex_argument.pl
@@ -10,18 +10,21 @@ $result_trees{'complex_argument'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'macrotwo',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macrotwo',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'coucou \\arg\\ after arg
',
@@ -72,14 +75,17 @@ $result_trees{'complex_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'macrofour',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macrofour',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '1
',
@@ -145,22 +151,25 @@ $result_trees{'complex_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'macrothree',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'text',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macrothree',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'text',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\text\\
',
@@ -548,18 +557,21 @@ macroseven defined
}
},
{
- 'args' => [
- {
- 'text' => 'macroseven',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'truc',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macroseven',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'truc',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@emph{\\truc\\}
',
diff --git a/tp/t/results/macro/cpp_directives_after_macros.pl
b/tp/t/results/macro/cpp_directives_after_macros.pl
index 361aba99ea..1a41980f2c 100644
--- a/tp/t/results/macro/cpp_directives_after_macros.pl
+++ b/tp/t/results/macro/cpp_directives_after_macros.pl
@@ -22,14 +22,17 @@ $result_trees{'cpp_directives_after_macros'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'noargsspaces',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'noargsspaces',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -82,14 +85,17 @@ $result_trees{'cpp_directives_after_macros'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'emptyexpansion',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'emptyexpansion',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/macro/cpp_directives_in_macro.pl
b/tp/t/results/macro/cpp_directives_in_macro.pl
index 16a13c330f..e1d73b3a87 100644
--- a/tp/t/results/macro/cpp_directives_in_macro.pl
+++ b/tp/t/results/macro/cpp_directives_in_macro.pl
@@ -22,18 +22,21 @@ $result_trees{'cpp_directives_in_macro'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'simplemacro',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'out',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'simplemacro',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'out',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\out\\
',
diff --git a/tp/t/results/macro/cpp_directives_line_value_macro.pl
b/tp/t/results/macro/cpp_directives_line_value_macro.pl
index 1d9a43df8d..5828769e1e 100644
--- a/tp/t/results/macro/cpp_directives_line_value_macro.pl
+++ b/tp/t/results/macro/cpp_directives_line_value_macro.pl
@@ -22,14 +22,17 @@ $result_trees{'cpp_directives_line_value_macro'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'vvv',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'vvv',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '#line 30 "toto"
',
@@ -123,14 +126,17 @@ $result_trees{'cpp_directives_line_value_macro'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'machash',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'machash',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '#
',
@@ -221,18 +227,21 @@ $result_trees{'cpp_directives_line_value_macro'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'numberfileflag',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'numberfileflag',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\arg\\ "titi" 3\\arg\\
',
diff --git a/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
b/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
index 14612e51d5..6a008aa21a 100644
--- a/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
+++ b/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
@@ -49,18 +49,21 @@ $result_trees{'definfoenclose_replaced_by_macro'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'phoo',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'phoo',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '||\\arg\\||
',
diff --git a/tp/t/results/macro/double_macro_definition.pl
b/tp/t/results/macro/double_macro_definition.pl
index ec359f79d1..fbdeb960c3 100644
--- a/tp/t/results/macro/double_macro_definition.pl
+++ b/tp/t/results/macro/double_macro_definition.pl
@@ -10,14 +10,17 @@ $result_trees{'double_macro_definition'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'foo',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'foo',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
@@ -63,14 +66,17 @@ $result_trees{'double_macro_definition'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'foo',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'foo',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/macro/double_recursive_macro_call.pl
b/tp/t/results/macro/double_recursive_macro_call.pl
index b74be3262c..92a4d0cf4b 100644
--- a/tp/t/results/macro/double_recursive_macro_call.pl
+++ b/tp/t/results/macro/double_recursive_macro_call.pl
@@ -15,18 +15,21 @@ $result_trees{'double_recursive_macro_call'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'macone',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macone',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@mactwo{}
',
@@ -77,18 +80,21 @@ $result_trees{'double_recursive_macro_call'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'mactwo',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mactwo',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@macone{}
',
diff --git a/tp/t/results/macro/empty_end.pl b/tp/t/results/macro/empty_end.pl
index 56e4bfd6a7..a76be3a244 100644
--- a/tp/t/results/macro/empty_end.pl
+++ b/tp/t/results/macro/empty_end.pl
@@ -10,18 +10,21 @@ $result_trees{'empty_end'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'foo',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'aaa',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'foo',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'aaa',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'in foo
',
diff --git a/tp/t/results/macro/empty_macro_argument.pl
b/tp/t/results/macro/empty_macro_argument.pl
index 9a08e32d80..e2ee4c649c 100644
--- a/tp/t/results/macro/empty_macro_argument.pl
+++ b/tp/t/results/macro/empty_macro_argument.pl
@@ -10,14 +10,17 @@ $result_trees{'empty_macro_argument'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mymacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'text
',
@@ -195,18 +198,21 @@ $result_trees{'empty_macro_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'mytwo',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mytwo',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'X\\arg\\X
',
diff --git a/tp/t/results/macro/empty_macro_in_text_no_arg.pl
b/tp/t/results/macro/empty_macro_in_text_no_arg.pl
index e751d08dfb..2417e05ecd 100644
--- a/tp/t/results/macro/empty_macro_in_text_no_arg.pl
+++ b/tp/t/results/macro/empty_macro_in_text_no_arg.pl
@@ -10,14 +10,17 @@ $result_trees{'empty_macro_in_text_no_arg'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'texnl',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'texnl',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
@@ -101,14 +104,17 @@ $result_trees{'empty_macro_in_text_no_arg'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'texnltwo',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'texnltwo',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/macro/empty_macro_no_arg.pl
b/tp/t/results/macro/empty_macro_no_arg.pl
index 920a11435d..caa241d1e2 100644
--- a/tp/t/results/macro/empty_macro_no_arg.pl
+++ b/tp/t/results/macro/empty_macro_no_arg.pl
@@ -10,14 +10,17 @@ $result_trees{'empty_macro_no_arg'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'foo',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'foo',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/macro/expand_two_same.pl
b/tp/t/results/macro/expand_two_same.pl
index 05f6fe6d7b..c79f94b37a 100644
--- a/tp/t/results/macro/expand_two_same.pl
+++ b/tp/t/results/macro/expand_two_same.pl
@@ -10,18 +10,21 @@ $result_trees{'expand_two_same'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'macrotwo',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macrotwo',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'With a doubles arg \\arg\\ and re \\arg\\
',
diff --git a/tp/t/results/macro/expansion_order.pl
b/tp/t/results/macro/expansion_order.pl
index f5e4185017..1375cb58c3 100644
--- a/tp/t/results/macro/expansion_order.pl
+++ b/tp/t/results/macro/expansion_order.pl
@@ -10,18 +10,21 @@ $result_trees{'expansion_order'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'bidule',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'bidule',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@machin{}
',
@@ -72,14 +75,17 @@ $result_trees{'expansion_order'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'machin',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'machin',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\\\arg\\\\
',
diff --git a/tp/t/results/macro/form_feeds.pl b/tp/t/results/macro/form_feeds.pl
index 001daf89ca..8fef676ff3 100644
--- a/tp/t/results/macro/form_feeds.pl
+++ b/tp/t/results/macro/form_feeds.pl
@@ -10,22 +10,25 @@ $result_trees{'form_feeds'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mymacro',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymacro',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'f \\a\\ n \\b\\
',
@@ -76,18 +79,21 @@ $result_trees{'form_feeds'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'oneargmacro',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'c',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'oneargmacro',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'c',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'g \\c\\ v
',
diff --git a/tp/t/results/macro/glossary.pl b/tp/t/results/macro/glossary.pl
index 2215953245..e69672cb38 100644
--- a/tp/t/results/macro/glossary.pl
+++ b/tp/t/results/macro/glossary.pl
@@ -68,14 +68,17 @@ $result_trees{'glossary'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'glossarytext',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'glossarytext',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@table @asis
',
@@ -128,14 +131,17 @@ $result_trees{'glossary'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'glossary',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'glossary',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@glossarytext
',
@@ -198,26 +204,29 @@ $result_trees{'glossary'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'gentry',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'id',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'name',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'text',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'gentry',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'id',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'name',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'text',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@ifhtml
',
@@ -749,18 +758,21 @@ $result_trees{'glossary'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'expandglossary',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'glossary',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'expandglossary',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'glossary',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@unmacro glossarytext
',
@@ -874,14 +886,17 @@ $result_trees{'glossary'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'glossarytext',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'glossarytext',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@glossarytext{}
',
@@ -1189,18 +1204,21 @@ $result_trees{'glossary'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'expandglossary',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'glossary',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'expandglossary',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'glossary',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@unmacro glossarytext
',
@@ -1314,14 +1332,17 @@ $result_trees{'glossary'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'glossarytext',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'glossarytext',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@glossarytext{}
',
diff --git a/tp/t/results/macro/ifclear_in_macro.pl
b/tp/t/results/macro/ifclear_in_macro.pl
index a0e5a2c9bc..63f0cf3bc2 100644
--- a/tp/t/results/macro/ifclear_in_macro.pl
+++ b/tp/t/results/macro/ifclear_in_macro.pl
@@ -10,18 +10,21 @@ $result_trees{'ifclear_in_macro'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'note',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'note',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@ifclear notes
',
diff --git a/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
b/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
index 833f278e34..311880c20e 100644
--- a/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
+++ b/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
@@ -10,14 +10,17 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'beginifset',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'beginifset',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@ifset a
',
@@ -68,14 +71,17 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'endifset',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'endifset',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@end ifset
',
diff --git a/tp/t/results/macro/ifset_in_macro.pl
b/tp/t/results/macro/ifset_in_macro.pl
index a40038c2d4..c9970767a9 100644
--- a/tp/t/results/macro/ifset_in_macro.pl
+++ b/tp/t/results/macro/ifset_in_macro.pl
@@ -10,18 +10,21 @@ $result_trees{'ifset_in_macro'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'note',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'note',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@ifset notes
',
diff --git a/tp/t/results/macro/ifset_in_macro_set.pl
b/tp/t/results/macro/ifset_in_macro_set.pl
index de3a8d60b0..87fe749f3b 100644
--- a/tp/t/results/macro/ifset_in_macro_set.pl
+++ b/tp/t/results/macro/ifset_in_macro_set.pl
@@ -10,18 +10,21 @@ $result_trees{'ifset_in_macro_set'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'note',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'note',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@ifset notes
',
diff --git a/tp/t/results/macro/ignored_macro_definition.pl
b/tp/t/results/macro/ignored_macro_definition.pl
index 875a045e59..90a520104c 100644
--- a/tp/t/results/macro/ignored_macro_definition.pl
+++ b/tp/t/results/macro/ignored_macro_definition.pl
@@ -10,14 +10,17 @@ $result_trees{'ignored_macro_definition'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mymacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'outside
',
diff --git a/tp/t/results/macro/implicit_quoting_one_arg.pl
b/tp/t/results/macro/implicit_quoting_one_arg.pl
index 16b42e08d6..ebf79e3e16 100644
--- a/tp/t/results/macro/implicit_quoting_one_arg.pl
+++ b/tp/t/results/macro/implicit_quoting_one_arg.pl
@@ -15,18 +15,21 @@ $result_trees{'implicit_quoting_one_arg'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'FIXAME',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'FIXAME',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@strong{FIXAME: \\a\\}
',
diff --git a/tp/t/results/macro/implicit_quoting_recursion.pl
b/tp/t/results/macro/implicit_quoting_recursion.pl
index ba247df3f4..8d76e9a0dc 100644
--- a/tp/t/results/macro/implicit_quoting_recursion.pl
+++ b/tp/t/results/macro/implicit_quoting_recursion.pl
@@ -10,22 +10,25 @@ $result_trees{'implicit_quoting_recursion'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'cat',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'rmacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'cat',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\a\\\\b\\
',
diff --git a/tp/t/results/macro/include_after_empty_line_arg.pl
b/tp/t/results/macro/include_after_empty_line_arg.pl
index 886774ac5c..eedd903a9a 100644
--- a/tp/t/results/macro/include_after_empty_line_arg.pl
+++ b/tp/t/results/macro/include_after_empty_line_arg.pl
@@ -10,18 +10,21 @@ $result_trees{'include_after_empty_line_arg'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mymacro',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'body',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymacro',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'body',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@code{\\body\\}
',
diff --git a/tp/t/results/macro/leading_spaces_no_ignore.pl
b/tp/t/results/macro/leading_spaces_no_ignore.pl
index a47aef5b66..14deb97c6f 100644
--- a/tp/t/results/macro/leading_spaces_no_ignore.pl
+++ b/tp/t/results/macro/leading_spaces_no_ignore.pl
@@ -10,14 +10,17 @@ $result_trees{'leading_spaces_no_ignore'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mymacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => ' Some here
',
diff --git a/tp/t/results/macro/line_after_recursive_call.pl
b/tp/t/results/macro/line_after_recursive_call.pl
index 3fd1a3ab6d..c6c52119e9 100644
--- a/tp/t/results/macro/line_after_recursive_call.pl
+++ b/tp/t/results/macro/line_after_recursive_call.pl
@@ -10,14 +10,17 @@ $result_trees{'line_after_recursive_call'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mac',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mac',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'ggg
',
diff --git a/tp/t/results/macro/line_end_accent_command_macro_call.pl
b/tp/t/results/macro/line_end_accent_command_macro_call.pl
index 10c3bddc60..fd04fd1274 100644
--- a/tp/t/results/macro/line_end_accent_command_macro_call.pl
+++ b/tp/t/results/macro/line_end_accent_command_macro_call.pl
@@ -10,14 +10,17 @@ $result_trees{'line_end_accent_command_macro_call'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'expand',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'expand',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@center A @ringaccent
',
@@ -153,14 +156,17 @@ $result_trees{'line_end_accent_command_macro_call'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'nospace',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'nospace',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@center B @ringaccent
',
diff --git a/tp/t/results/macro/macro_after_paragraph.pl
b/tp/t/results/macro/macro_after_paragraph.pl
index c6d4488449..f61657b991 100644
--- a/tp/t/results/macro/macro_after_paragraph.pl
+++ b/tp/t/results/macro/macro_after_paragraph.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_after_paragraph'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mymacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
b/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
index db2b1e2cb2..c4adab4e75 100644
--- a/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
+++ b/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
@@ -133,18 +133,21 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'phooindex',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'phooindex',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '||\\arg\\||
',
@@ -516,18 +519,21 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'phooindex',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'phooindex',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '!!\\arg\\!!
',
@@ -692,18 +698,21 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'phooindex',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'phooindex',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '!!\\arg\\!!
',
@@ -1072,18 +1081,21 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'phooindex',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'phooindex',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '%%\\arg\\%%
',
diff --git a/tp/t/results/macro/macro_before_specific_line_command_args.pl
b/tp/t/results/macro/macro_before_specific_line_command_args.pl
index 1dbdf962a7..9ee8a9e71c 100644
--- a/tp/t/results/macro/macro_before_specific_line_command_args.pl
+++ b/tp/t/results/macro/macro_before_specific_line_command_args.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_before_specific_line_command_args'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'cpfn',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'cpfn',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => ' cp fn
',
diff --git a/tp/t/results/macro/macro_call_empty_middle_arg.pl
b/tp/t/results/macro/macro_call_empty_middle_arg.pl
index 626db85c9a..5edf905d8e 100644
--- a/tp/t/results/macro/macro_call_empty_middle_arg.pl
+++ b/tp/t/results/macro/macro_call_empty_middle_arg.pl
@@ -10,26 +10,29 @@ $result_trees{'macro_call_empty_middle_arg'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'threea',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'aa',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'bb',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'cc',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'threea',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'aa',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'bb',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'cc',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'first \\aa\\,
',
diff --git a/tp/t/results/macro/macro_call_empty_two_arg.pl
b/tp/t/results/macro/macro_call_empty_two_arg.pl
index 689eaf3cd8..a4930e214f 100644
--- a/tp/t/results/macro/macro_call_empty_two_arg.pl
+++ b/tp/t/results/macro/macro_call_empty_two_arg.pl
@@ -10,22 +10,25 @@ $result_trees{'macro_call_empty_two_arg'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'twoa',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'aa',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'bb',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'twoa',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'aa',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'bb',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'first \\aa\\,
',
diff --git a/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
b/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
index e5af3081b4..fe2ff34653 100644
--- a/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
+++ b/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_call_in_ignored_inlinefmtifelse'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'commafmt',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'commafmt',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'before comma, after
',
diff --git a/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
b/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
index 0349c60d62..a9c371090b 100644
--- a/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
+++ b/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_call_in_inlinefmtifelse_format'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'inlinefirstarg',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'inlinefirstarg',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'ex, before, after
',
diff --git a/tp/t/results/macro/macro_call_in_node_manual.pl
b/tp/t/results/macro/macro_call_in_node_manual.pl
index d65b2b6251..34fd9b2a89 100644
--- a/tp/t/results/macro/macro_call_in_node_manual.pl
+++ b/tp/t/results/macro/macro_call_in_node_manual.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_call_in_node_manual'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'openbrace',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'openbrace',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '(
',
@@ -68,14 +71,17 @@ $result_trees{'macro_call_in_node_manual'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'openbracetext',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'openbracetext',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '(begin
',
@@ -126,14 +132,17 @@ $result_trees{'macro_call_in_node_manual'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'manualnameend',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'manualnameend',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'last
',
@@ -184,14 +193,17 @@ $result_trees{'macro_call_in_node_manual'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'manualnameendbrace',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'manualnameendbrace',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'last)
',
@@ -242,14 +254,17 @@ $result_trees{'macro_call_in_node_manual'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'manualnameendbracespace',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'manualnameendbracespace',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'last)
',
@@ -300,14 +315,17 @@ $result_trees{'macro_call_in_node_manual'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'manualnameendbracespacetext',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'manualnameendbracespacetext',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'last) mynode
',
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
index d02671db4e..d100d11a9b 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_end_call_in_ignored_inlinefmt'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'startfmt',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'startfmt',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'Para @inlinefmt{tex, inT
',
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
index 83ea70a02d..bd395ef249 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_end_call_in_ignored_inlinefmtifelse'}
= {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'inlinefirstfmt',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'inlinefirstfmt',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'Toto @inlinefmtifelse{tex, before
',
diff --git
a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
index acef75d0d8..26853e704e 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
@@ -10,14 +10,17 @@
$result_trees{'macro_end_call_in_ignored_inlinefmtifelse_else'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'endcallinignoredinlineelse',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'endcallinignoredinlineelse',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'own, ignored
',
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
b/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
index 62cb051be5..c0e7b7e6ce 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_end_call_in_ignored_inlineraw'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'startraw',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'startraw',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'Para @inlineraw{tex, in@something
',
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
b/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
index 83c251abcb..f27af7c3df 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'startraw',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'startraw',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@tex
',
diff --git a/tp/t/results/macro/macro_expands_to_empty.pl
b/tp/t/results/macro/macro_expands_to_empty.pl
index c239bf594c..65fe2ab98c 100644
--- a/tp/t/results/macro/macro_expands_to_empty.pl
+++ b/tp/t/results/macro/macro_expands_to_empty.pl
@@ -10,18 +10,21 @@ $result_trees{'macro_expands_to_empty'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'foo',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'foo',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\arg\\
',
diff --git a/tp/t/results/macro/macro_expansion.pl
b/tp/t/results/macro/macro_expansion.pl
index 410535ea87..0c1c7c60fc 100644
--- a/tp/t/results/macro/macro_expansion.pl
+++ b/tp/t/results/macro/macro_expansion.pl
@@ -15,22 +15,25 @@ $result_trees{'macro_expansion'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'macroone',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg1',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'arg2',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macroone',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg1',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'arg2',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'result of a macro with \\arg1\\ and
',
diff --git a/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
b/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
index 6ad4168f09..88e7a7ec5b 100644
--- a/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_expansion_end_in_conditional_end'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'beginendcond',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'beginendcond',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@ifset flag
',
diff --git a/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
b/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
index 35502fb1f5..65b956efce 100644
--- a/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_expansion_end_in_conditional_line'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'begincond',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'begincond',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@ifset fl
',
diff --git a/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
b/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
index dd8bc0e3a0..6b62559c62 100644
--- a/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
@@ -10,14 +10,17 @@
$result_trees{'macro_expansion_end_in_ignored_ifset_content'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'beginifsetcontent',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'beginifsetcontent',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@ifset a
',
diff --git
a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
index 8d3644813f..0bbfee1e54 100644
--- a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
@@ -10,14 +10,17 @@
$result_trees{'macro_expansion_end_in_ignored_nested_conditional'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'beginnestedcond',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'beginnestedcond',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@ifset a
',
diff --git
a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
index d54df082d3..4e44a05ed0 100644
---
a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
+++
b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
@@ -10,14 +10,17 @@
$result_trees{'macro_expansion_end_in_ignored_nested_different_conditional'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'beginnestedcond',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'beginnestedcond',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@ifset a
',
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 79c092869a..7d7a23edda 100644
--- a/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
+++ b/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'simple',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'simple',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'ab
',
@@ -68,18 +71,21 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'endbrace',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'endbrace',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'c\\arg\\d}
',
diff --git a/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
b/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
index 938febd8d5..83c11a776c 100644
--- a/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
+++ b/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_for_dot_in_menu_not_separator'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'macrodot',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macrodot',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '.
',
diff --git a/tp/t/results/macro/macro_for_end.pl
b/tp/t/results/macro/macro_for_end.pl
index b9f165c22d..24f9eb9551 100644
--- a/tp/t/results/macro/macro_for_end.pl
+++ b/tp/t/results/macro/macro_for_end.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_for_end'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'myend',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'myend',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@end
',
diff --git a/tp/t/results/macro/macro_for_ignored_line_command.pl
b/tp/t/results/macro/macro_for_ignored_line_command.pl
index e6a100ca24..4ea8a06ca6 100644
--- a/tp/t/results/macro/macro_for_ignored_line_command.pl
+++ b/tp/t/results/macro/macro_for_ignored_line_command.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_for_ignored_line_command'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'pagemacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'pagemacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@page
',
diff --git a/tp/t/results/macro/macro_for_verb.pl
b/tp/t/results/macro/macro_for_verb.pl
index def8b2fa7e..c1b4402fe8 100644
--- a/tp/t/results/macro/macro_for_verb.pl
+++ b/tp/t/results/macro/macro_for_verb.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_for_verb'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'verbopen',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'verbopen',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@verb{
',
diff --git a/tp/t/results/macro/macro_imbricated_with_beginning_command_name.pl
b/tp/t/results/macro/macro_imbricated_with_beginning_command_name.pl
index f3e555222e..5502d32e78 100644
--- a/tp/t/results/macro/macro_imbricated_with_beginning_command_name.pl
+++ b/tp/t/results/macro/macro_imbricated_with_beginning_command_name.pl
@@ -10,14 +10,17 @@
$result_trees{'macro_imbricated_with_beginning_command_name'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'foo',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'foo',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/macro/macro_in_accent.pl
b/tp/t/results/macro/macro_in_accent.pl
index 5c767d98f5..d7b95fc62a 100644
--- a/tp/t/results/macro/macro_in_accent.pl
+++ b/tp/t/results/macro/macro_in_accent.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_in_accent'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'aletter',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'aletter',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'a
',
@@ -68,14 +71,17 @@ $result_trees{'macro_in_accent'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'aspace',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'aspace',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/macro/macro_in_brace_command.pl
b/tp/t/results/macro/macro_in_brace_command.pl
index 9d18f516e8..bbded4d7ac 100644
--- a/tp/t/results/macro/macro_in_brace_command.pl
+++ b/tp/t/results/macro/macro_in_brace_command.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_in_brace_command'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'foo',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'foo',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'foo-expansion
',
@@ -68,14 +71,17 @@ $result_trees{'macro_in_brace_command'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'abar',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'abar',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'bar-expansion
',
diff --git a/tp/t/results/macro/macro_in_def_delimiters.pl
b/tp/t/results/macro/macro_in_def_delimiters.pl
index 0cad3403a3..6791a640a0 100644
--- a/tp/t/results/macro/macro_in_def_delimiters.pl
+++ b/tp/t/results/macro/macro_in_def_delimiters.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_in_def_delimiters'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'string',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'string',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'aa(b *c)
',
diff --git a/tp/t/results/macro/macro_in_empty_menu_comment.pl
b/tp/t/results/macro/macro_in_empty_menu_comment.pl
index 116435e13e..6b36145e96 100644
--- a/tp/t/results/macro/macro_in_empty_menu_comment.pl
+++ b/tp/t/results/macro/macro_in_empty_menu_comment.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_in_empty_menu_comment'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'emptystring',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'emptystring',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
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 4d9b2b1471..49c4ebe65b 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
@@ -10,14 +10,17 @@
$result_trees{'macro_in_empty_multitable_empty_before_item'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'emptymacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'emptymacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
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 c95c98853e..67084e6070 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
@@ -10,14 +10,17 @@ $result_trees{'macro_in_empty_table_empty_before_item'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'emptymacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'emptymacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/macro/macro_in_empty_text.pl
b/tp/t/results/macro/macro_in_empty_text.pl
index 53fa383d11..9683fce0a6 100644
--- a/tp/t/results/macro/macro_in_empty_text.pl
+++ b/tp/t/results/macro/macro_in_empty_text.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_in_empty_text'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'emptystring',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'emptystring',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/macro/macro_in_end_argument.pl
b/tp/t/results/macro/macro_in_end_argument.pl
index 08122e439b..9b25502983 100644
--- a/tp/t/results/macro/macro_in_end_argument.pl
+++ b/tp/t/results/macro/macro_in_end_argument.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_in_end_argument'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'acartouche',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'acartouche',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'cartouche
',
diff --git a/tp/t/results/macro/macro_in_ifset.pl
b/tp/t/results/macro/macro_in_ifset.pl
index 4474073758..ffa7473270 100644
--- a/tp/t/results/macro/macro_in_ifset.pl
+++ b/tp/t/results/macro/macro_in_ifset.pl
@@ -10,18 +10,21 @@ $result_trees{'macro_in_ifset'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'macroone',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macroone',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@end ifset
',
diff --git a/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
b/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
index 2f865b3bb9..9ff3448822 100644
--- a/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
+++ b/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
@@ -10,18 +10,21 @@ $result_trees{'macro_in_ifset_end_in_arg'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'macroone',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macroone',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@end ifset
',
diff --git a/tp/t/results/macro/macro_in_index_commands.pl
b/tp/t/results/macro/macro_in_index_commands.pl
index 4e6a254f7a..f5dc765885 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_in_index_commands'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'cp',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'cp',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'cp
',
@@ -63,14 +66,17 @@ $result_trees{'macro_in_index_commands'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'fn',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'fn',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'fn
',
@@ -116,14 +122,17 @@ $result_trees{'macro_in_index_commands'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'syncodeindexcommand',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'syncodeindexcommand',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@syncodeindex
',
@@ -321,14 +330,17 @@ $result_trees{'macro_in_index_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'truc',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'truc',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'truc
',
@@ -456,14 +468,17 @@ $result_trees{'macro_in_index_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'trucindexcommand',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'trucindexcommand',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@trucindex
',
@@ -514,14 +529,17 @@ $result_trees{'macro_in_index_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'codeidx',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'codeidx',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'codeidx
',
@@ -636,14 +654,17 @@ $result_trees{'macro_in_index_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'defcodeindexentry',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'defcodeindexentry',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'a @var{index entry} t@\'e @^{@dotless{i}}
',
diff --git a/tp/t/results/macro/macro_in_invalid_documentencoding.pl
b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
index 2f785c306d..ae8438dbc0 100644
--- a/tp/t/results/macro/macro_in_invalid_documentencoding.pl
+++ b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_in_invalid_documentencoding'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'badmacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'badmacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'badm
',
diff --git a/tp/t/results/macro/macro_in_macro_arg.pl
b/tp/t/results/macro/macro_in_macro_arg.pl
index 3dcda5e408..2a1d0098a6 100644
--- a/tp/t/results/macro/macro_in_macro_arg.pl
+++ b/tp/t/results/macro/macro_in_macro_arg.pl
@@ -15,14 +15,17 @@ $result_trees{'macro_in_macro_arg'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'macroone',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macroone',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'a, @macrotwo
',
@@ -73,18 +76,21 @@ $result_trees{'macro_in_macro_arg'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'macrotwo',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macrotwo',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'hello \\arg\\ after arg
',
@@ -135,22 +141,25 @@ $result_trees{'macro_in_macro_arg'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'macrothree',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'text',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macrothree',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'text',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\text\\
',
diff --git a/tp/t/results/macro/macro_in_macro_arg_simpler.pl
b/tp/t/results/macro/macro_in_macro_arg_simpler.pl
index 09f699409c..b2766a4a42 100644
--- a/tp/t/results/macro/macro_in_macro_arg_simpler.pl
+++ b/tp/t/results/macro/macro_in_macro_arg_simpler.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'macrooneone',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macrooneone',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'a, macro2
',
@@ -68,22 +71,25 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'macrothree',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'text',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macrothree',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'text',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\text\\
',
diff --git a/tp/t/results/macro/macro_in_menu.pl
b/tp/t/results/macro/macro_in_menu.pl
index 267588ba31..5feceb3d53 100644
--- a/tp/t/results/macro/macro_in_menu.pl
+++ b/tp/t/results/macro/macro_in_menu.pl
@@ -15,14 +15,17 @@ $result_trees{'macro_in_menu'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'astar',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'astar',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '*
',
@@ -73,14 +76,17 @@ $result_trees{'macro_in_menu'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'starspaces',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'starspaces',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '*
',
@@ -131,14 +137,17 @@ $result_trees{'macro_in_menu'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'spaces',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'spaces',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -189,14 +198,17 @@ $result_trees{'macro_in_menu'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'aspace',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'aspace',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -247,14 +259,17 @@ $result_trees{'macro_in_menu'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'twocolon',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'twocolon',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '::
',
@@ -305,14 +320,17 @@ $result_trees{'macro_in_menu'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'acolon',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'acolon',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => ':
',
diff --git a/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
b/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
index 3321b9e986..a2fbc4d3bf 100644
--- a/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
+++ b/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_in_menu_comment_closed_by_detailmenu'}
= {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'emptystring',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'emptystring',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
b/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
index e400b09381..bcf05f5712 100644
--- a/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
+++ b/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
@@ -15,14 +15,17 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'emptystring',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'emptystring',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/macro/macro_in_menu_description.pl
b/tp/t/results/macro/macro_in_menu_description.pl
index cbe73b1310..e552c37033 100644
--- a/tp/t/results/macro/macro_in_menu_description.pl
+++ b/tp/t/results/macro/macro_in_menu_description.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_in_menu_description'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'emptystring',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'emptystring',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl
b/tp/t/results/macro/macro_in_misc_commands.pl
index 5fc50faf7b..cc503db5a7 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_in_misc_commands'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'text',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'text',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'atext
',
@@ -68,14 +71,17 @@ $result_trees{'macro_in_misc_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'Top',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'Top',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'Top
',
@@ -322,14 +328,17 @@ $result_trees{'macro_in_misc_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'en',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'en',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'en
',
@@ -375,14 +384,17 @@ $result_trees{'macro_in_misc_commands'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'documentlanguagecommand',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'documentlanguagecommand',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@documentlanguage
',
@@ -578,14 +590,17 @@ $result_trees{'macro_in_misc_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'pagesizesarg',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'pagesizesarg',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '200mm,150mm
',
@@ -636,14 +651,17 @@ $result_trees{'macro_in_misc_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'afourpapermacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'afourpapermacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@afourpaper
',
@@ -947,14 +965,17 @@ $result_trees{'macro_in_misc_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'needarg',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'needarg',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '0.1
',
@@ -1069,14 +1090,17 @@ $result_trees{'macro_in_misc_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'raisesectionsmacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'raisesectionsmacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@raisesections
',
@@ -1155,14 +1179,17 @@ $result_trees{'macro_in_misc_commands'} = {
'cmdname' => 'raisesections'
},
{
- 'args' => [
- {
- 'text' => 'lowersectionsmacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'lowersectionsmacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@lowersections
',
@@ -1334,14 +1361,17 @@ $result_trees{'macro_in_misc_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'definfoenclosename',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'definfoenclosename',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'phi
',
@@ -1491,14 +1521,17 @@ $result_trees{'macro_in_misc_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'strongmacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'strongmacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@strong
',
@@ -1544,14 +1577,17 @@ $result_trees{'macro_in_misc_commands'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'strongname',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'strongname',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'strong
',
@@ -1851,14 +1887,17 @@ $result_trees{'macro_in_misc_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'kbdinputstylearg',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'kbdinputstylearg',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'code
',
@@ -2083,14 +2122,17 @@ $result_trees{'macro_in_misc_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'asisarg',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'asisarg',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'asis
',
@@ -2136,14 +2178,17 @@ $result_trees{'macro_in_misc_commands'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'zero',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'zero',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '0
',
@@ -2189,14 +2234,17 @@ $result_trees{'macro_in_misc_commands'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'nonearg',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'nonearg',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'none
',
@@ -2242,14 +2290,17 @@ $result_trees{'macro_in_misc_commands'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'four',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'four',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '4
',
@@ -2295,14 +2346,17 @@ $result_trees{'macro_in_misc_commands'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'six',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'six',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '6
',
@@ -2712,14 +2766,17 @@ $result_trees{'macro_in_misc_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'endarg',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'endarg',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'end
',
@@ -2765,14 +2822,17 @@ $result_trees{'macro_in_misc_commands'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'separatearg',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'separatearg',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'separate
',
@@ -2941,14 +3001,17 @@ $result_trees{'macro_in_misc_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'onarg',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'onarg',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'on
',
@@ -2994,14 +3057,17 @@ $result_trees{'macro_in_misc_commands'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'offarg',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'offarg',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'off
',
@@ -3180,14 +3246,17 @@ $result_trees{'macro_in_misc_commands'} = {
'cmdname' => 'c'
},
{
- 'args' => [
- {
- 'text' => 'ten',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'ten',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '10
',
@@ -3302,14 +3371,17 @@ $result_trees{'macro_in_misc_commands'} = {
'cmdname' => 'c'
},
{
- 'args' => [
- {
- 'text' => 'falsearg',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'falsearg',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'false
',
@@ -3355,14 +3427,17 @@ $result_trees{'macro_in_misc_commands'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'truearg',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'truearg',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'true
',
@@ -3536,14 +3611,17 @@ $result_trees{'macro_in_misc_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'pagemacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'pagemacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@page
',
@@ -3589,14 +3667,17 @@ $result_trees{'macro_in_misc_commands'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'noindentmacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'noindentmacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@noindent
',
@@ -3642,14 +3723,17 @@ $result_trees{'macro_in_misc_commands'} = {
}
},
{
- 'args' => [
- {
- 'text' => 'refillmacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'refillmacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@refill
',
@@ -4199,14 +4283,17 @@ $result_trees{'macro_in_misc_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'contentsmacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'contentsmacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@contents
',
@@ -4310,14 +4397,17 @@ $result_trees{'macro_in_misc_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'exdentmacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'exdentmacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@exdent
',
@@ -4421,14 +4511,17 @@ $result_trees{'macro_in_misc_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'two',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'two',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '2
',
@@ -4538,14 +4631,17 @@ $result_trees{'macro_in_misc_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'resultmacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'resultmacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@result
',
@@ -4879,14 +4975,17 @@ $result_trees{'macro_in_misc_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'shortcontentsmacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'shortcontentsmacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@shortcontents
',
@@ -4975,14 +5074,17 @@ $result_trees{'macro_in_misc_commands'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'byemacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'byemacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@bye
',
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 1580a88338..310604bd74 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
@@ -10,14 +10,17 @@ $result_trees{'macro_in_multitable_empty_before_item'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'emptymacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'emptymacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
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 f1901564d1..38b16ee2e2 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
@@ -10,14 +10,17 @@ $result_trees{'macro_in_table_empty_before_item'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'emptymacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'emptymacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
b/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
index 1a992a3af6..c1f266d5be 100644
--- a/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
+++ b/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'setargendignored',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'setargendignored',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'ag,
',
diff --git a/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
b/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
index c4e1b5f575..7bf4973b99 100644
--- a/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
+++ b/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'clearargendignored',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'clearargendignored',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'ag,
',
diff --git a/tp/t/results/macro/macro_name_with_digit.pl
b/tp/t/results/macro/macro_name_with_digit.pl
index 6f81cae684..648fdf5853 100644
--- a/tp/t/results/macro/macro_name_with_digit.pl
+++ b/tp/t/results/macro/macro_name_with_digit.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_name_with_digit'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'macro1',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macro1',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'macro1
',
@@ -68,18 +71,21 @@ $result_trees{'macro_name_with_digit'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'macro11',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macro11',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'expand \\arg\\
',
diff --git a/tp/t/results/macro/macro_name_with_hyphen.pl
b/tp/t/results/macro/macro_name_with_hyphen.pl
index 89c80730e2..56a4c3a529 100644
--- a/tp/t/results/macro/macro_name_with_hyphen.pl
+++ b/tp/t/results/macro/macro_name_with_hyphen.pl
@@ -10,22 +10,25 @@ $result_trees{'macro_name_with_hyphen'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'macro-one',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg-one',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'arg2',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macro-one',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg-one',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'arg2',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'This \\arg-one\\ and that \\arg2\\.
',
diff --git a/tp/t/results/macro/macro_name_zero.pl
b/tp/t/results/macro/macro_name_zero.pl
index ca4735d680..9ca1e3f61b 100644
--- a/tp/t/results/macro/macro_name_zero.pl
+++ b/tp/t/results/macro/macro_name_zero.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_name_zero'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => '0',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => '0',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'in macro
',
diff --git a/tp/t/results/macro/macro_no_arg_bad_expansion.pl
b/tp/t/results/macro/macro_no_arg_bad_expansion.pl
index d7559cbc78..aa9efef5b8 100644
--- a/tp/t/results/macro/macro_no_arg_bad_expansion.pl
+++ b/tp/t/results/macro/macro_no_arg_bad_expansion.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_no_arg_bad_expansion'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'testone',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'testone',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'res1
',
diff --git a/tp/t/results/macro/macro_no_arg_expansion.pl
b/tp/t/results/macro/macro_no_arg_expansion.pl
index e3362bb228..2f4d680bff 100644
--- a/tp/t/results/macro/macro_no_arg_expansion.pl
+++ b/tp/t/results/macro/macro_no_arg_expansion.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_no_arg_expansion'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'testone',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'testone',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'res1
',
diff --git a/tp/t/results/macro/macro_no_argument.pl
b/tp/t/results/macro/macro_no_argument.pl
index 5d06f9b40f..55fcb1b93f 100644
--- a/tp/t/results/macro/macro_no_argument.pl
+++ b/tp/t/results/macro/macro_no_argument.pl
@@ -11,6 +11,11 @@ $result_trees{'macro_no_argument'} = {
'contents' => [
{
'cmdname' => 'macro',
+ 'contents' => [
+ {
+ 'type' => 'argument'
+ }
+ ],
'extra' => {
'invalid_syntax' => 1
},
diff --git a/tp/t/results/macro/macro_not_closed.pl
b/tp/t/results/macro/macro_not_closed.pl
index e5525fad37..7bb497000b 100644
--- a/tp/t/results/macro/macro_not_closed.pl
+++ b/tp/t/results/macro/macro_not_closed.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_not_closed'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'name',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'name',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'in macro
',
diff --git a/tp/t/results/macro/macro_one_arg_end_of_file.pl
b/tp/t/results/macro/macro_one_arg_end_of_file.pl
index 90288aa072..c113196b66 100644
--- a/tp/t/results/macro/macro_one_arg_end_of_file.pl
+++ b/tp/t/results/macro/macro_one_arg_end_of_file.pl
@@ -10,18 +10,21 @@ $result_trees{'macro_one_arg_end_of_file'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'onearg',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'onearg',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'Arg \\arg\\.
',
diff --git a/tp/t/results/macro/macro_replaced_by_definfoenclose.pl
b/tp/t/results/macro/macro_replaced_by_definfoenclose.pl
index 1f9e223b17..efb3798a04 100644
--- a/tp/t/results/macro/macro_replaced_by_definfoenclose.pl
+++ b/tp/t/results/macro/macro_replaced_by_definfoenclose.pl
@@ -10,18 +10,21 @@ $result_trees{'macro_replaced_by_definfoenclose'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'phoo',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'phoo',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '||\\arg\\||
',
diff --git a/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
b/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
index aacba5f0f9..d75e533a14 100644
--- a/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
+++ b/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
@@ -10,18 +10,21 @@ $result_trees{'macro_with_error_at_end_line_after_macro'} =
{
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'witherror',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'string',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'witherror',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'string',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@center
',
diff --git a/tp/t/results/macro/macro_zero.pl b/tp/t/results/macro/macro_zero.pl
index 058be0098f..eb6dfdb74b 100644
--- a/tp/t/results/macro/macro_zero.pl
+++ b/tp/t/results/macro/macro_zero.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_zero'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'zero',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'zero',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '0
',
diff --git a/tp/t/results/macro/nested_macro_call.pl
b/tp/t/results/macro/nested_macro_call.pl
index 6fd22310a0..e47fc72b01 100644
--- a/tp/t/results/macro/nested_macro_call.pl
+++ b/tp/t/results/macro/nested_macro_call.pl
@@ -10,14 +10,17 @@ $result_trees{'nested_macro_call'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'machin',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'machin',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '(machin)
',
@@ -68,14 +71,17 @@ $result_trees{'nested_macro_call'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'truc',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'truc',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@machin{}
',
diff --git a/tp/t/results/macro/no_macrobody.pl
b/tp/t/results/macro/no_macrobody.pl
index 78df8a0b98..62b9137cec 100644
--- a/tp/t/results/macro/no_macrobody.pl
+++ b/tp/t/results/macro/no_macrobody.pl
@@ -10,18 +10,21 @@ $result_trees{'no_macrobody'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'nomacrobody',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'nomacrobody',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/macro/non_ascii_in_macro_name.pl
b/tp/t/results/macro/non_ascii_in_macro_name.pl
index 0ad0038cf5..a8394312e0 100644
--- a/tp/t/results/macro/non_ascii_in_macro_name.pl
+++ b/tp/t/results/macro/non_ascii_in_macro_name.pl
@@ -12,6 +12,9 @@ $result_trees{'non_ascii_in_macro_name'} = {
{
'cmdname' => 'macro',
'contents' => [
+ {
+ 'type' => 'argument'
+ },
{
'text' => '(@`{\\a\\})
',
diff --git a/tp/t/results/macro/paragraph_and_macro.pl
b/tp/t/results/macro/paragraph_and_macro.pl
index a772348470..a1eccf7cc1 100644
--- a/tp/t/results/macro/paragraph_and_macro.pl
+++ b/tp/t/results/macro/paragraph_and_macro.pl
@@ -10,14 +10,17 @@ $result_trees{'paragraph_and_macro'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'aempty',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'aempty',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
@@ -63,14 +66,17 @@ $result_trees{'paragraph_and_macro'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'aspace',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'aspace',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
@@ -121,14 +127,17 @@ $result_trees{'paragraph_and_macro'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'word',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'word',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'a word
',
diff --git a/tp/t/results/macro/protect_comma_macro_line.pl
b/tp/t/results/macro/protect_comma_macro_line.pl
index 50794304c0..7415e0a797 100644
--- a/tp/t/results/macro/protect_comma_macro_line.pl
+++ b/tp/t/results/macro/protect_comma_macro_line.pl
@@ -10,18 +10,21 @@ $result_trees{'protect_comma_macro_line'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'macrotwo',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macrotwo',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'we get \\arg\\ and another \\arg\\
',
diff --git a/tp/t/results/macro/protect_in_body.pl
b/tp/t/results/macro/protect_in_body.pl
index b1e5834bf3..2ee942e7c9 100644
--- a/tp/t/results/macro/protect_in_body.pl
+++ b/tp/t/results/macro/protect_in_body.pl
@@ -10,22 +10,25 @@ $result_trees{'protect_in_body'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'macroone',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg1',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'arg2',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macroone',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg1',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'arg2',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'result: @emph{\\arg1\\} protected \\\\ ->
\\\\arg1\\\\ @emph{\\arg2\\}
',
diff --git a/tp/t/results/macro/protect_in_body_line_arg.pl
b/tp/t/results/macro/protect_in_body_line_arg.pl
index a3169321b6..180ff85517 100644
--- a/tp/t/results/macro/protect_in_body_line_arg.pl
+++ b/tp/t/results/macro/protect_in_body_line_arg.pl
@@ -10,22 +10,25 @@ $result_trees{'protect_in_body_line_arg'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'macroone',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg1',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'arg2',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macroone',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg1',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'arg2',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'result: @emph{\\arg1\\} protected \\\\ ->
\\\\arg1\\\\ @emph{\\arg2\\}
',
diff --git a/tp/t/results/macro/protect_in_body_one_arg.pl
b/tp/t/results/macro/protect_in_body_one_arg.pl
index 70ef70b1ff..d8f1cdab81 100644
--- a/tp/t/results/macro/protect_in_body_one_arg.pl
+++ b/tp/t/results/macro/protect_in_body_one_arg.pl
@@ -10,22 +10,25 @@ $result_trees{'protect_in_body_one_arg'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'macroone',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg1',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'arg2',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macroone',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg1',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'arg2',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'result: @emph{\\arg1\\} protected \\\\ ->
\\\\arg1\\\\ @emph{\\arg2\\}
',
diff --git a/tp/t/results/macro/recursive_call_in_argument.pl
b/tp/t/results/macro/recursive_call_in_argument.pl
index 78f1adc2de..04d353ba5d 100644
--- a/tp/t/results/macro/recursive_call_in_argument.pl
+++ b/tp/t/results/macro/recursive_call_in_argument.pl
@@ -10,18 +10,21 @@ $result_trees{'recursive_call_in_argument'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'anorecurse',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'anorecurse',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'a
',
diff --git a/tp/t/results/macro/recursive_call_in_macro.pl
b/tp/t/results/macro/recursive_call_in_macro.pl
index 1ca04d53d7..eec9c4528f 100644
--- a/tp/t/results/macro/recursive_call_in_macro.pl
+++ b/tp/t/results/macro/recursive_call_in_macro.pl
@@ -10,18 +10,21 @@ $result_trees{'recursive_call_in_macro'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'anorecurse',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'anorecurse',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@anorecurse{arg}
',
diff --git a/tp/t/results/macro/recursive_call_in_rmacro.pl
b/tp/t/results/macro/recursive_call_in_rmacro.pl
index baa7b9af77..ae88d36352 100644
--- a/tp/t/results/macro/recursive_call_in_rmacro.pl
+++ b/tp/t/results/macro/recursive_call_in_rmacro.pl
@@ -15,14 +15,17 @@ $result_trees{'recursive_call_in_rmacro'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'rec',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'rmacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'rec',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@rec{}
',
diff --git a/tp/t/results/macro/redefine_texinfo_macro.pl
b/tp/t/results/macro/redefine_texinfo_macro.pl
index c0e7f462a0..19aeb7624a 100644
--- a/tp/t/results/macro/redefine_texinfo_macro.pl
+++ b/tp/t/results/macro/redefine_texinfo_macro.pl
@@ -10,18 +10,21 @@ $result_trees{'redefine_texinfo_macro'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'code',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'code',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@emph{\\arg\\}
',
diff --git a/tp/t/results/macro/simple_imbricated_macro.pl
b/tp/t/results/macro/simple_imbricated_macro.pl
index 8985e9623d..3ad5822972 100644
--- a/tp/t/results/macro/simple_imbricated_macro.pl
+++ b/tp/t/results/macro/simple_imbricated_macro.pl
@@ -10,14 +10,17 @@ $result_trees{'simple_imbricated_macro'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'truc',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'truc',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'truc.
',
@@ -107,14 +110,17 @@ $result_trees{'simple_imbricated_macro'} = {
'
},
{
- 'args' => [
- {
- 'text' => 'bidule',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'bidule',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'bidule.
',
diff --git a/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
b/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
index cd057fd3f8..b2b0953898 100644
--- a/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
+++ b/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
@@ -10,14 +10,17 @@ $result_trees{'simple_imbricated_macro_rmacro'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'truc',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'truc',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'truc.
',
@@ -107,14 +110,17 @@ $result_trees{'simple_imbricated_macro_rmacro'} = {
'
},
{
- 'args' => [
- {
- 'text' => 'bidule',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'rmacro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'bidule',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'bidule.
',
diff --git a/tp/t/results/macro/space_macro_after_end.pl
b/tp/t/results/macro/space_macro_after_end.pl
index 7473b310fa..54aa57afee 100644
--- a/tp/t/results/macro/space_macro_after_end.pl
+++ b/tp/t/results/macro/space_macro_after_end.pl
@@ -10,14 +10,17 @@ $result_trees{'space_macro_after_end'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'spaces',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'spaces',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/macro/space_macro_after_end_verbatim.pl
b/tp/t/results/macro/space_macro_after_end_verbatim.pl
index 043a9ce7f2..5991361ae0 100644
--- a/tp/t/results/macro/space_macro_after_end_verbatim.pl
+++ b/tp/t/results/macro/space_macro_after_end_verbatim.pl
@@ -10,14 +10,17 @@ $result_trees{'space_macro_after_end_verbatim'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'spaces',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'spaces',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/macro/text_before_after.pl
b/tp/t/results/macro/text_before_after.pl
index 07d714ae55..a47ef89dd0 100644
--- a/tp/t/results/macro/text_before_after.pl
+++ b/tp/t/results/macro/text_before_after.pl
@@ -15,14 +15,17 @@ $result_trees{'text_before_after'} = {
'text' => 'before '
},
{
- 'args' => [
- {
- 'text' => 'mymacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'in macro
',
diff --git a/tp/t/results/macro/too_much_args.pl
b/tp/t/results/macro/too_much_args.pl
index 1351843e05..8cc7090c1a 100644
--- a/tp/t/results/macro/too_much_args.pl
+++ b/tp/t/results/macro/too_much_args.pl
@@ -10,22 +10,25 @@ $result_trees{'too_much_args'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'twoargs',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'first',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'second',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'twoargs',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'first',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'second',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'first arg: \\first\\
',
diff --git a/tp/t/results/macro/two_macros_on_a_line.pl
b/tp/t/results/macro/two_macros_on_a_line.pl
index 13f3d0b8fd..1ad12c0977 100644
--- a/tp/t/results/macro/two_macros_on_a_line.pl
+++ b/tp/t/results/macro/two_macros_on_a_line.pl
@@ -10,14 +10,17 @@ $result_trees{'two_macros_on_a_line'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mymacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'in mymacro
',
@@ -68,18 +71,21 @@ $result_trees{'two_macros_on_a_line'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'mymacrowithargs',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymacrowithargs',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'in with args
',
diff --git a/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
b/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
index 31f8729f9a..62c7fa0720 100644
--- a/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
+++ b/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
@@ -10,18 +10,21 @@ $result_trees{'unpaired_backslash_in_macro_body'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mymacro',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymacro',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'In macro \\not arg
',
diff --git a/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
b/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
index 14ea08347c..03260b4221 100644
--- a/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
+++ b/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
@@ -10,22 +10,25 @@ $result_trees{'verb_with_arobase_in_macro_call'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'showarg',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'showarg',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'first: \\a\\
',
diff --git a/tp/t/results/macro/verb_with_brace_in_macro_call.pl
b/tp/t/results/macro/verb_with_brace_in_macro_call.pl
index 0859bfe3f4..e7169a69ac 100644
--- a/tp/t/results/macro/verb_with_brace_in_macro_call.pl
+++ b/tp/t/results/macro/verb_with_brace_in_macro_call.pl
@@ -15,26 +15,29 @@ $result_trees{'verb_with_brace_in_macro_call'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'mycommand',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'a',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'b',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'c',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mycommand',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'a',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'b',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'c',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\a\\|\\b\\|\\c\\
',
diff --git a/tp/t/results/macro/zero_argument.pl
b/tp/t/results/macro/zero_argument.pl
index 0f3b8d4666..25cfaf7611 100644
--- a/tp/t/results/macro/zero_argument.pl
+++ b/tp/t/results/macro/zero_argument.pl
@@ -10,14 +10,17 @@ $result_trees{'zero_argument'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'foo',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'foo',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'in foo
',
@@ -68,14 +71,17 @@ $result_trees{'zero_argument'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'abar',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'abar',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'in bar
',
diff --git a/tp/t/results/macro/zero_argument_comment.pl
b/tp/t/results/macro/zero_argument_comment.pl
index bff49d6ff1..22b324f7c6 100644
--- a/tp/t/results/macro/zero_argument_comment.pl
+++ b/tp/t/results/macro/zero_argument_comment.pl
@@ -10,14 +10,17 @@ $result_trees{'zero_argument_comment'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'foo',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'foo',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'in foo
',
@@ -68,14 +71,17 @@ $result_trees{'zero_argument_comment'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'abar',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'abar',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'in bar
',
diff --git
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index 0b72a4f8a5..5c812dae8d 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -12,14 +12,17 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'quotes',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'quotes',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '``simple-double--three---four----\'\' `simple\'
quotedblleft: @quotedblleft{} @*
',
@@ -95,14 +98,17 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'allquotes',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'allquotes',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@quotes{}
',
diff --git a/tp/t/results/misc_commands/kbdinputstyle.pl
b/tp/t/results/misc_commands/kbdinputstyle.pl
index 1139ab3760..1b663e0818 100644
--- a/tp/t/results/misc_commands/kbdinputstyle.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle.pl
@@ -10,14 +10,17 @@ $result_trees{'kbdinputstyle'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'codekbdmacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'codekbdmacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@code{in code out of example @code{in nested code}}.
',
diff --git a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
index 999e9491b8..c24b33a1f2 100644
--- a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
@@ -10,14 +10,17 @@ $result_trees{'kbdinputstyle_in_table'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'codekbdmacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'codekbdmacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@table @kbd
',
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index 35d4a1eb36..d47030093f 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -71,18 +71,21 @@ $result_trees{'test_allowcodebreaks'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'testallowcodebreakspara',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'nr',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'testallowcodebreakspara',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'nr',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'Out of code --- out-of-code.
',
@@ -158,14 +161,17 @@ $result_trees{'test_allowcodebreaks'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'testallowcodebreaksexample',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'testallowcodebreaksexample',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '
',
diff --git a/tp/t/results/paragraph/indent_before_macro_definition_and_other.pl
b/tp/t/results/paragraph/indent_before_macro_definition_and_other.pl
index a051d3b86d..34468c828c 100644
--- a/tp/t/results/paragraph/indent_before_macro_definition_and_other.pl
+++ b/tp/t/results/paragraph/indent_before_macro_definition_and_other.pl
@@ -297,18 +297,21 @@ $result_trees{'indent_before_macro_definition_and_other'}
= {
'type' => 'index_entry_command'
},
{
- 'args' => [
- {
- 'text' => 'aaa',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'g',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'aaa',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'g',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'll /g/
',
diff --git a/tp/t/results/plaintext_tests/star_at_command_formatting.pl
b/tp/t/results/plaintext_tests/star_at_command_formatting.pl
index 9deaf71ac5..d802aa1405 100644
--- a/tp/t/results/plaintext_tests/star_at_command_formatting.pl
+++ b/tp/t/results/plaintext_tests/star_at_command_formatting.pl
@@ -10,14 +10,17 @@ $result_trees{'star_at_command_formatting'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'mymacro',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'mymacro',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'Some text @*
',
diff --git a/tp/t/results/raw/nested_macros.pl
b/tp/t/results/raw/nested_macros.pl
index 4c3595e158..457c6f1f7d 100644
--- a/tp/t/results/raw/nested_macros.pl
+++ b/tp/t/results/raw/nested_macros.pl
@@ -10,22 +10,25 @@ $result_trees{'nested_macros'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'truc',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'ex',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'truc',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'ex',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'in macro \\arg\\
',
diff --git a/tp/t/results/transformations/protect_colon_source_mark.pl
b/tp/t/results/transformations/protect_colon_source_mark.pl
index 9748ed59c4..5baf5b0c97 100644
--- a/tp/t/results/transformations/protect_colon_source_mark.pl
+++ b/tp/t/results/transformations/protect_colon_source_mark.pl
@@ -10,18 +10,21 @@ $result_trees{'protect_colon_source_mark'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'klm',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'klm',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'some text : \\arg\\ then more
',
diff --git a/tp/t/results/transformations/protect_comma_source_mark.pl
b/tp/t/results/transformations/protect_comma_source_mark.pl
index ab77bded10..140caf96ba 100644
--- a/tp/t/results/transformations/protect_comma_source_mark.pl
+++ b/tp/t/results/transformations/protect_comma_source_mark.pl
@@ -10,14 +10,17 @@ $result_trees{'protect_comma_source_mark'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'vvv',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'vvv',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'some text ,,
',
diff --git
a/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
b/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
index da657131c9..daf299353c 100644
---
a/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
+++
b/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
@@ -10,14 +10,17 @@
$result_trees{'protect_first_parenthesis_after_parenthesis_source_mark'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'vvv',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'vvv',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '(
',
diff --git
a/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
b/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
index 1330e075a8..e70b77ba46 100644
--- a/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
+++ b/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
@@ -10,14 +10,17 @@ $result_trees{'protect_first_parenthesis_source_mark'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'vvv',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'vvv',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '(some text) aa,,
',
diff --git
a/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
b/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
index 5672b03fe3..1521a67e0f 100644
---
a/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
+++
b/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
@@ -22,14 +22,17 @@
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'vvv',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'vvv',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '#line 30 "toto"
',
@@ -136,14 +139,17 @@
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'machash',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'machash',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '#
',
@@ -246,18 +252,21 @@
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'numberfileflag',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'numberfileflag',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '\\arg\\ "titi" 3\\arg\\
',
diff --git
a/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
b/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
index 9590c6598c..048b96591e 100644
---
a/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
+++
b/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
@@ -10,14 +10,17 @@
$result_trees{'protect_node_after_label_source_mark_in_protected'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'vvv',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'vvv',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'some text .,
',
diff --git a/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
b/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
index cf60fa4021..9df2ff5a53 100644
--- a/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
+++ b/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
@@ -32,22 +32,25 @@ $result_trees{'comma_value_in_macro_arg'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'macro1',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg1',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'arg2',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'macro1',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg1',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'arg2',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'result: @emph{\\arg1\\} protected \\\\ ->
\\\\arg1\\\\ @emph{\\arg2\\}
',
diff --git a/tp/t/results/value_and_macro/macro_in_value.pl
b/tp/t/results/value_and_macro/macro_in_value.pl
index 39db050512..d463d3f063 100644
--- a/tp/t/results/value_and_macro/macro_in_value.pl
+++ b/tp/t/results/value_and_macro/macro_in_value.pl
@@ -10,14 +10,17 @@ $result_trees{'macro_in_value'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'ab',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'ab',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'a
',
diff --git a/tp/t/results/value_and_macro/value_in_macro_body.pl
b/tp/t/results/value_and_macro/value_in_macro_body.pl
index fcfbd5674a..3057366dd0 100644
--- a/tp/t/results/value_and_macro/value_in_macro_body.pl
+++ b/tp/t/results/value_and_macro/value_in_macro_body.pl
@@ -32,18 +32,21 @@ $result_trees{'value_in_macro_body'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'testvaluebody',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'testvaluebody',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'result: @emph{\\@value{bodyarg}\\ }
',
diff --git a/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
b/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
index 91baa56293..742a1aa0e8 100644
--- a/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
+++ b/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
@@ -32,22 +32,25 @@ $result_trees{'value_in_macro_formal_arg'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'testvalue',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'arg',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'the@value{argument',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'testvalue',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'arg',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'the@value{argument',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => 'result: @emph{\\arg\\} the \\the\\ thearg \\thearg\\
with value \\the@value{argument}\\
',
diff --git a/tp/t/results/xml_tests/macro_and_args.pl
b/tp/t/results/xml_tests/macro_and_args.pl
index d1a3865bcb..dddb7e6e00 100644
--- a/tp/t/results/xml_tests/macro_and_args.pl
+++ b/tp/t/results/xml_tests/macro_and_args.pl
@@ -10,22 +10,25 @@ $result_trees{'macro_and_args'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'good',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'aaa',
- 'type' => 'macro_arg'
- },
- {
- 'text' => '2b-bb',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'good',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'aaa',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => '2b-bb',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
@@ -71,26 +74,29 @@ $result_trees{'macro_and_args'} = {
'type' => 'empty_line'
},
{
- 'args' => [
- {
- 'text' => 'bad',
- 'type' => 'macro_name'
- },
- {
- 'text' => 'ggg"@@^_ ff',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'nnn_b',
- 'type' => 'macro_arg'
- },
- {
- 'text' => 'ccc v',
- 'type' => 'macro_arg'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'bad',
+ 'type' => 'macro_name'
+ },
+ {
+ 'text' => 'ggg"@@^_ ff',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'nnn_b',
+ 'type' => 'macro_arg'
+ },
+ {
+ 'text' => 'ccc v',
+ 'type' => 'macro_arg'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'args' => [
{
diff --git a/tp/t/results/xtable/table_nested.pl
b/tp/t/results/xtable/table_nested.pl
index 2dc0ca5861..458e74454f 100644
--- a/tp/t/results/xtable/table_nested.pl
+++ b/tp/t/results/xtable/table_nested.pl
@@ -10,14 +10,17 @@ $result_trees{'table_nested'} = {
{
'contents' => [
{
- 'args' => [
- {
- 'text' => 'myvtable',
- 'type' => 'macro_name'
- }
- ],
'cmdname' => 'macro',
'contents' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'myvtable',
+ 'type' => 'macro_name'
+ }
+ ],
+ 'type' => 'argument'
+ },
{
'text' => '@vtable @asis
',