[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/Texinfo.pm, tp/Texinfo/Convert/TexinfoMarkup.pm, tp/Texinfo/ParserNonXS.pm (_parse_macro_command_line, _close_brace_command) (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/close.c (close_brace_command), tp/Texinfo/XS/parsetexi/convert.c (expand_cmd_args_to_texi), tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command), tp/Texinfo/XS/parsetexi/macro.c (parse_macro_command_line), tp/Texinfo/XS/parsetexi/parser.c (process_remain [...] |
|
Date: |
Thu, 17 Nov 2022 17:39:08 -0500 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new c6430e5852 * tp/Texinfo/Convert/LaTeX.pm,
tp/Texinfo/Convert/Texinfo.pm, tp/Texinfo/Convert/TexinfoMarkup.pm,
tp/Texinfo/ParserNonXS.pm (_parse_macro_command_line, _close_brace_command)
(_process_remaining_on_line), tp/Texinfo/XS/parsetexi/close.c
(close_brace_command), tp/Texinfo/XS/parsetexi/convert.c
(expand_cmd_args_to_texi), tp/Texinfo/XS/parsetexi/handle_commands.c
(handle_line_command), tp/Texinfo/XS/parsetexi/macro.c
(parse_macro_command_line), tp/Texinfo/XS/parsetexi/par [...]
c6430e5852 is described below
commit c6430e585218f6a321d0723c12dd40c1a231b929
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Nov 17 23:38:56 2022 +0100
* tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/Texinfo.pm,
tp/Texinfo/Convert/TexinfoMarkup.pm, tp/Texinfo/ParserNonXS.pm
(_parse_macro_command_line, _close_brace_command)
(_process_remaining_on_line), tp/Texinfo/XS/parsetexi/close.c
(close_brace_command), tp/Texinfo/XS/parsetexi/convert.c
(expand_cmd_args_to_texi), tp/Texinfo/XS/parsetexi/handle_commands.c
(handle_line_command), tp/Texinfo/XS/parsetexi/macro.c
(parse_macro_command_line), tp/Texinfo/XS/parsetexi/parser.c
(process_remaining_on_line), tp/Texinfo/XS/parsetexi/separator.c
(handle_open_brace): move arg_line and @verb delimiter from extra to
info in element.
---
ChangeLog | 14 ++
tp/Texinfo/Convert/LaTeX.pm | 4 +-
tp/Texinfo/Convert/Texinfo.pm | 10 +-
tp/Texinfo/Convert/TexinfoMarkup.pm | 6 +-
tp/Texinfo/ParserNonXS.pm | 55 +++---
tp/Texinfo/XS/parsetexi/close.c | 2 +-
tp/Texinfo/XS/parsetexi/convert.c | 6 +-
tp/Texinfo/XS/parsetexi/handle_commands.c | 2 +-
tp/Texinfo/XS/parsetexi/macro.c | 2 +-
tp/Texinfo/XS/parsetexi/parser.c | 4 +-
tp/Texinfo/XS/parsetexi/separator.c | 4 +-
tp/t/01use.t | 2 +-
tp/t/results/alias/simple.pl | 2 +-
.../command_conditionals_user_defined.pl | 2 +-
tp/t/results/conditionals/comment_on_ifset_line.pl | 6 +-
.../conditionals/consecutive_conditionals.pl | 6 +-
.../conditionals/empty_ifset_in_ifset_set.pl | 6 +-
tp/t/results/conditionals/empty_set_in_ifclear.pl | 6 +-
tp/t/results/conditionals/empty_set_in_ifset.pl | 6 +-
tp/t/results/conditionals/end_ifset_in_format.pl | 8 +-
tp/t/results/conditionals/ifclear_in_ifset_set.pl | 6 +-
tp/t/results/conditionals/macro_in_ifset.pl | 2 +-
tp/t/results/conditionals/macro_in_ifset_set.pl | 16 +-
tp/t/results/conditionals/nested_ifset_ifclear.pl | 50 +++--
.../conditionals/user_defined_txiinternalvalue.pl | 2 +-
.../results/converters_tests/at_commands_in_raw.pl | 2 +-
.../results/converters_tests/inlineifsetifclear.pl | 6 +-
.../converters_tests/spaces_in_empty_node_names.pl | 6 +-
.../converters_tests/spaces_in_node_names.pl | 6 +-
tp/t/results/coverage_braces/empty_commands.pl | 2 +-
tp/t/results/coverage_braces/nested_in_sc.pl | 2 +-
.../one_argument_leading_trailing_spaces.pl | 2 +-
tp/t/results/coverage_braces/test_image.pl | 52 ++---
tp/t/results/coverage_braces/verb_in_xref.pl | 2 +-
tp/t/results/def/omit_def_space.pl | 6 +-
tp/t/results/float/complex_float.pl | 8 +-
.../formats_encodings/at_commands_in_refs.pl | 8 +-
.../at_commands_in_refs_latin1.pl | 8 +-
.../formats_encodings/at_commands_in_refs_utf8.pl | 8 +-
tp/t/results/formatting/texi_bib_example.pl | 26 +--
tp/t/results/formatting/texi_glossary.pl | 46 +++--
tp/t/results/html_tests/documentdescription.pl | 2 +-
tp/t/results/html_tests/itemize_arguments.pl | 6 +-
.../itemize_arguments_enable_encoding.pl | 6 +-
tp/t/results/html_tests/xml_protected_in_verb.pl | 2 +-
tp/t/results/htmlxref/htmlxref.pl | 20 +-
tp/t/results/htmlxref/htmlxref_nodes.pl | 20 +-
tp/t/results/htmlxref/htmlxref_only_mono.pl | 20 +-
tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl | 20 +-
tp/t/results/htmlxref/htmlxref_only_split.pl | 20 +-
tp/t/results/htmlxref/htmlxref_only_split_nodes.pl | 20 +-
tp/t/results/include/cpp_lines.pl | 6 +-
.../macro_and_commands_in_early_commands.pl | 8 +-
.../results/include/macro_definition_in_include.pl | 2 +-
tp/t/results/include/macro_in_early_commands.pl | 12 +-
tp/t/results/include/value_expansion_in_include.pl | 18 +-
.../indices/ignored_sort_char_empty_entries.pl | 6 +-
tp/t/results/indices/transparent_sort_chars.pl | 6 +-
tp/t/results/info_tests/def_in_copying.pl | 2 +-
tp/t/results/info_tests/space_in_setfilename.pl | 2 +-
.../unclosed_verb_end_of_line_on_misc_line.pl | 2 +-
.../invalid_nestings/unclosed_verb_on_misc_line.pl | 2 +-
.../unclosed_verb_on_section_line.pl | 2 +-
tp/t/results/latex_tests/indices.pl | 12 +-
tp/t/results/macro/arg_body_expansion_order.pl | 14 +-
tp/t/results/macro/arg_not_closed.pl | 2 +-
tp/t/results/macro/backslash_in_arg.pl | 2 +-
tp/t/results/macro/bad_argument.pl | 24 ++-
tp/t/results/macro/bad_formal_arg.pl | 20 +-
.../macro/bad_macro_name_with_underscore.pl | 2 +-
tp/t/results/macro/complete_macro_for_end.pl | 2 +-
tp/t/results/macro/complex_argument.pl | 10 +-
tp/t/results/macro/double_macro_definition.pl | 4 +-
tp/t/results/macro/double_recursive_macro_call.pl | 4 +-
tp/t/results/macro/empty_end.pl | 2 +-
tp/t/results/macro/empty_macro_argument.pl | 4 +-
tp/t/results/macro/empty_macro_in_text_no_arg.pl | 4 +-
tp/t/results/macro/empty_macro_no_arg.pl | 2 +-
tp/t/results/macro/expand_two_same.pl | 2 +-
tp/t/results/macro/expansion_order.pl | 4 +-
tp/t/results/macro/form_feeds.pl | 4 +-
tp/t/results/macro/ifclear_in_macro.pl | 2 +-
tp/t/results/macro/ifset_and_end_isef_in_macro.pl | 4 +-
tp/t/results/macro/ifset_in_macro.pl | 2 +-
tp/t/results/macro/ifset_in_macro_set.pl | 2 +-
tp/t/results/macro/ignored_macro_definition.pl | 2 +-
tp/t/results/macro/implicit_quoting_one_arg.pl | 2 +-
tp/t/results/macro/implicit_quoting_recursion.pl | 2 +-
tp/t/results/macro/include_after_empty_line_arg.pl | 2 +-
tp/t/results/macro/leading_spaces_no_ignore.pl | 2 +-
tp/t/results/macro/line_after_recursive_call.pl | 2 +-
tp/t/results/macro/macro_expands_to_empty.pl | 2 +-
tp/t/results/macro/macro_expansion.pl | 2 +-
tp/t/results/macro/macro_for_end.pl | 2 +-
.../macro/macro_for_ignored_line_command.pl | 2 +-
tp/t/results/macro/macro_in_accent.pl | 4 +-
tp/t/results/macro/macro_in_brace_command.pl | 4 +-
tp/t/results/macro/macro_in_end_argument.pl | 2 +-
tp/t/results/macro/macro_in_ifset.pl | 2 +-
tp/t/results/macro/macro_in_ifset_end_in_arg.pl | 2 +-
tp/t/results/macro/macro_in_index_commands.pl | 14 +-
.../macro/macro_in_invalid_documentencoding.pl | 2 +-
tp/t/results/macro/macro_in_macro_arg.pl | 6 +-
tp/t/results/macro/macro_in_macro_arg_simpler.pl | 4 +-
tp/t/results/macro/macro_in_menu.pl | 12 +-
tp/t/results/macro/macro_in_misc_commands.pl | 74 ++++----
tp/t/results/macro/macro_name_with_digit.pl | 4 +-
tp/t/results/macro/macro_name_with_hyphen.pl | 2 +-
tp/t/results/macro/macro_no_arg_bad_expansion.pl | 2 +-
tp/t/results/macro/macro_no_arg_expansion.pl | 2 +-
tp/t/results/macro/macro_no_argument.pl | 4 +-
tp/t/results/macro/macro_not_closed.pl | 2 +-
tp/t/results/macro/macro_one_arg_end_of_file.pl | 2 +-
.../macro_with_error_at_end_line_after_macro.pl | 2 +-
tp/t/results/macro/macro_zero.pl | 2 +-
tp/t/results/macro/nested_macro_call.pl | 4 +-
tp/t/results/macro/no_macrobody.pl | 2 +-
tp/t/results/macro/paragraph_and_macro.pl | 6 +-
tp/t/results/macro/protect_comma_macro_line.pl | 2 +-
tp/t/results/macro/protect_in_body.pl | 2 +-
tp/t/results/macro/protect_in_body_line_arg.pl | 2 +-
tp/t/results/macro/protect_in_body_one_arg.pl | 2 +-
tp/t/results/macro/recursive_call_in_argument.pl | 2 +-
tp/t/results/macro/recursive_call_in_macro.pl | 2 +-
tp/t/results/macro/redefine_texinfo_macro.pl | 2 +-
tp/t/results/macro/simple_imbricated_macro.pl | 6 +-
tp/t/results/macro/space_macro_after_end.pl | 2 +-
.../macro/space_macro_after_end_verbatim.pl | 2 +-
tp/t/results/macro/text_before_after.pl | 2 +-
tp/t/results/macro/too_much_args.pl | 2 +-
tp/t/results/macro/two_macros_on_a_line.pl | 4 +-
tp/t/results/macro/zero_argument.pl | 4 +-
tp/t/results/menu/verb_in_menu_description.pl | 2 +-
tp/t/results/misc_commands/clickstyle.pl | 6 +-
.../codequoteundirected_codequotebacktick.pl | 4 +-
tp/t/results/misc_commands/invalid_clickstyle.pl | 14 +-
tp/t/results/misc_commands/kbdinputstyle.pl | 2 +-
.../misc_commands/kbdinputstyle_in_table.pl | 2 +-
tp/t/results/misc_commands/setfilename.pl | 2 +-
tp/t/results/misc_commands/test_allowcodebreaks.pl | 4 +-
.../plaintext_tests/multiline_verb_after_space.pl | 2 +-
.../plaintext_tests/star_at_command_formatting.pl | 2 +-
tp/t/results/raw/nested_macros.pl | 6 +-
tp/t/results/sectioning/raiselowersections.pl | 12 +-
tp/t/results/value/bad_syntax.pl | 18 +-
tp/t/results/value/comment_on_set_line.pl | 24 ++-
tp/t/results/value/empty_set.pl | 6 +-
tp/t/results/value/empty_value_in_line.pl | 6 +-
tp/t/results/value/ignored_value_definition.pl | 6 +-
tp/t/results/value/not_only_characters.pl | 6 +-
tp/t/results/value/set_form_feed.pl | 18 +-
tp/t/results/value/set_in_item_missing_line.pl | 12 +-
tp/t/results/value/set_on_item_line.pl | 36 ++--
tp/t/results/value/simple.pl | 6 +-
tp/t/results/value/spaces_before_value.pl | 6 +-
tp/t/results/value/value_after_accent.pl | 6 +-
tp/t/results/value/value_after_brace_command.pl | 12 +-
tp/t/results/value/value_in_index_commands.pl | 42 +++--
.../value/value_in_invalid_documentencoding.pl | 6 +-
tp/t/results/value/value_in_misc_commands.pl | 210 ++++++++++++++-------
tp/t/results/value/value_in_node.pl | 12 +-
tp/t/results/value/value_node_directions.pl | 6 +-
tp/t/results/value/value_zero.pl | 6 +-
.../value_and_macro/comma_value_in_macro_arg.pl | 8 +-
tp/t/results/value_and_macro/macro_in_value.pl | 8 +-
.../results/value_and_macro/value_in_macro_body.pl | 8 +-
.../value_and_macro/value_in_macro_formal_arg.pl | 12 +-
tp/t/results/verb/comments.pl | 4 +-
tp/t/results/verb/end_of_line.pl | 2 +-
tp/t/results/verb/multiline.pl | 2 +-
tp/t/results/verb/nested.pl | 2 +-
tp/t/results/verb/simple.pl | 2 +-
.../verb/verb_and_char_end_of_line_not_closed.pl | 2 +-
.../results/verb/verb_at_end_of_line_not_closed.pl | 2 +-
tp/t/results/verb/verb_not_closed.pl | 2 +-
tp/t/results/verb/verb_not_closed_with_char.pl | 2 +-
tp/t/results/xml_tests/commands_and_spaces.pl | 18 +-
tp/t/results/xml_tests/macro_and_args.pl | 8 +-
tp/t/results/xtable/table_nested.pl | 2 +-
179 files changed, 913 insertions(+), 640 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 333c12bbe3..215e8a61ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2022-11-17 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/Texinfo.pm,
+ tp/Texinfo/Convert/TexinfoMarkup.pm, tp/Texinfo/ParserNonXS.pm
+ (_parse_macro_command_line, _close_brace_command)
+ (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/close.c
+ (close_brace_command), tp/Texinfo/XS/parsetexi/convert.c
+ (expand_cmd_args_to_texi), tp/Texinfo/XS/parsetexi/handle_commands.c
+ (handle_line_command), tp/Texinfo/XS/parsetexi/macro.c
+ (parse_macro_command_line), tp/Texinfo/XS/parsetexi/parser.c
+ (process_remaining_on_line), tp/Texinfo/XS/parsetexi/separator.c
+ (handle_open_brace): move arg_line and @verb delimiter from extra to
+ info in element.
+
2022-11-17 Gavin Smith <gavinsmith0123@gmail.com>
* info/t/recode-C-locale.sh: New test.
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index ca51cbd9b0..a2ee12dfd9 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -2614,14 +2614,14 @@ sub _convert($$)
# whether we are in another LaTeX macro would probably be a pain.
# It should be ok, though, as it is described as an error in the manual:
# It is not reliable to use @verb inside other Texinfo constructs
- $result .= "\\verb" .$element->{'extra'}->{'delimiter'};
+ $result .= "\\verb" .$element->{'info'}->{'delimiter'};
push @{$self->{'formatting_context'}->[-1]->{'text_context'}}, 'ctx_raw';
if ($element->{'args'}) {
$result .= _convert($self, $element->{'args'}->[0]);
}
my $old_context = pop
@{$self->{'formatting_context'}->[-1]->{'text_context'}};
die if ($old_context ne 'ctx_raw');
- $result .= $element->{'extra'}->{'delimiter'};
+ $result .= $element->{'info'}->{'delimiter'};
return $result;
} elsif ($cmdname eq 'image') {
if (defined($element->{'args'}->[0])
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index 0acfb339a4..94e22bcd29 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -178,11 +178,11 @@ sub _expand_cmd_args_to_texi($;$) {
$result .= convert_to_texinfo($arg, $expand_replaced);
}
# arg_line set for line_commands with type special
- } elsif (($cmd->{'extra'} or $cmdname eq 'macro' or $cmdname eq 'rmacro')
- and defined($cmd->{'extra'}->{'arg_line'})) {
+ } elsif (($cmd->{'info'} or $cmdname eq 'macro' or $cmdname eq 'rmacro')
+ and defined($cmd->{'info'}->{'arg_line'})) {
$result .= $cmd->{'info'}->{'spaces_before_argument'}
if $cmd->{'info'} and $cmd->{'info'}->{'spaces_before_argument'};
- $result .= $cmd->{'extra'}->{'arg_line'};
+ $result .= $cmd->{'info'}->{'arg_line'};
} elsif (($block_commands{$cmdname} or $cmdname eq 'node')
and defined($cmd->{'args'})) {
$result .= $cmd->{'info'}->{'spaces_before_argument'}
@@ -203,7 +203,7 @@ sub _expand_cmd_args_to_texi($;$) {
or $cmd->{'args'}->[0]->{'type'} eq
'brace_command_context'));
$result .= '{' if ($braces);
if ($cmdname eq 'verb') {
- $result .= $cmd->{'extra'}->{'delimiter'};
+ $result .= $cmd->{'info'}->{'delimiter'};
}
if ($cmd->{'info'}
and $cmd->{'info'}->{'spaces_before_argument'}) {
@@ -222,7 +222,7 @@ sub _expand_cmd_args_to_texi($;$) {
$result .= convert_to_texinfo($arg);
}
if ($cmdname eq 'verb') {
- $result .= $cmd->{'extra'}->{'delimiter'};
+ $result .= $cmd->{'info'}->{'delimiter'};
}
$result .= '}' if ($braces);
} else {
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 58f8af8794..7a4b5eed64 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -488,8 +488,8 @@ sub _arg_line($)
{
my $self = shift;
my $element = shift;
- if ($element->{'extra'} and defined($element->{'extra'}->{'arg_line'})) {
- my $line = $element->{'extra'}->{'arg_line'};
+ if ($element->{'info'} and defined($element->{'info'}->{'arg_line'})) {
+ my $line = $element->{'info'}->{'arg_line'};
chomp($line);
if ($line ne '') {
return ['line', $line];
@@ -1008,7 +1008,7 @@ sub _convert($$;$)
# first argument
my $attribute = [];
if ($element->{'cmdname'} eq 'verb') {
- push @$attribute, ['delimiter', $element->{'extra'}->{'delimiter'}];
+ push @$attribute, ['delimiter', $element->{'info'}->{'delimiter'}];
} elsif ($element->{'cmdname'} eq 'anchor') {
my $anchor_name;
if (defined($element->{'extra'}->{'normalized'})) {
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index b17d0fa4c0..a23aa83ad1 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1250,7 +1250,7 @@ sub _parse_macro_command_line($$$$$;$)
my ($self, $command, $line, $parent, $source_info) = @_;
my $macro = { 'cmdname' => $command, 'parent' => $parent,
- 'extra' => {'arg_line' => $line}, 'source_info' => $source_info
};
+ 'info' => {'arg_line' => $line}, 'source_info' => $source_info
};
# REMACRO
if ($line =~ /^\s+([[:alnum:]][[:alnum:]_-]*)\s*(.*)/) {
my $macro_name = $1;
@@ -1273,7 +1273,7 @@ sub _parse_macro_command_line($$$$$;$)
if ($formal_arg !~ /^[\w\-]+$/) {
$self->_line_error(sprintf(__("bad or empty \@%s formal argument: %s"),
$command, $formal_arg),
$source_info);
- $macro->{'extra'}->{'invalid_syntax'} = 1;
+ $macro->{'extra'} = {'invalid_syntax' => 1};
}
}
# accept an @-command after the arguments in case there is a @c or
@@ -1282,16 +1282,16 @@ sub _parse_macro_command_line($$$$$;$)
$self->_line_error(sprintf(__("bad syntax for \@%s argument: %s"),
$command, $args_def),
$source_info);
- $macro->{'extra'}->{'invalid_syntax'} = 1;
+ $macro->{'extra'} = {'invalid_syntax' => 1};
}
} elsif ($line !~ /\S/) {
$self->_line_error(sprintf(
__("%c%s requires a name"), ord('@'), $command), $source_info);
- $macro->{'extra'}->{'invalid_syntax'} = 1;
+ $macro->{'extra'} = {'invalid_syntax' => 1};
} else {
$self->_line_error(sprintf(
__("bad name for \@%s"), $command), $source_info);
- $macro->{'extra'}->{'invalid_syntax'} = 1;
+ $macro->{'extra'} = {'invalid_syntax' => 1};
}
return $macro;
}
@@ -1398,7 +1398,7 @@ sub _close_brace_command($$$;$$)
$interrupting_command) = @_;
if ($current->{'cmdname'} ne 'verb'
- or $current->{'extra'}->{'delimiter'} eq '') {
+ or $current->{'info'}->{'delimiter'} eq '') {
if (defined($closed_block_command)) {
$self->_command_error($current, $source_info,
__("\@end %s seen before \@%s closing brace"),
@@ -1414,7 +1414,7 @@ sub _close_brace_command($$$;$$)
} else {
$self->_command_error($current, $source_info,
__("\@%s missing closing delimiter sequence: %s}"),
- $current->{'cmdname'}, $current->{'extra'}->{'delimiter'});
+ $current->{'cmdname'}, $current->{'info'}->{'delimiter'});
}
$current = $current->{'parent'};
return $current;
@@ -3978,7 +3978,7 @@ sub _process_remaining_on_line($$$$)
push @{$current->{'contents'}}, { 'cmdname' => $1,
'parent' => $current,
'contents' => [],
- 'extra' => {'arg_line' => $line }};
+ 'info' => {'arg_line' => $line }};
$current = $current->{'contents'}->[-1];
$retval = $GET_A_NEW_LINE;
goto funexit;
@@ -4017,7 +4017,8 @@ sub _process_remaining_on_line($$$$)
"redefining Texinfo language command: \@%s"),
$name), $current->{'source_info'});
}
- if (!$current->{'extra'}->{'invalid_syntax'}) {
+ if (!($current->{'extra'}
+ and $current->{'extra'}->{'invalid_syntax'})) {
$self->{'macros'}->{$name} = {
'element' => $current,
'macrobody' => $macrobody
@@ -4095,19 +4096,19 @@ sub _process_remaining_on_line($$$$)
# in @verb. type should be 'brace_command_arg'
} elsif ($current->{'parent'} and $current->{'parent'}->{'cmdname'}
and $current->{'parent'}->{'cmdname'} eq 'verb') {
- #$current->{'parent'}->{'extra'} = {} if
(!$current->{'parent'}->{'extra'});
+ #$current->{'parent'}->{'info'} = {} if (!$current->{'parent'}->{'info'});
# collect the first character if not already done
- if (!defined($current->{'parent'}->{'extra'}->{'delimiter'})) {
+ if (!defined($current->{'parent'}->{'info'}->{'delimiter'})) {
if ($line =~ /^$/) {
- $current->{'parent'}->{'extra'}->{'delimiter'} = '';
+ $current->{'parent'}->{'info'}->{'delimiter'} = '';
$self->_line_error(sprintf(
__("\@%s without associated character"), 'verb'), $source_info);
} else {
$line =~ s/^(.)//;
- $current->{'parent'}->{'extra'}->{'delimiter'} = $1;
+ $current->{'parent'}->{'info'}->{'delimiter'} = $1;
}
}
- my $char = quotemeta($current->{'parent'}->{'extra'}->{'delimiter'});
+ my $char = quotemeta($current->{'parent'}->{'info'}->{'delimiter'});
if ($line =~ s/^(.*?)$char\}/\}/) {
push @{$current->{'contents'}},
{ 'text' => $1, 'type' => 'raw', 'parent' => $current }
@@ -4805,7 +4806,7 @@ sub _process_remaining_on_line($$$$)
} elsif ($arg_spec eq 'special') {
($args, $has_comment)
= _parse_special_misc_command($self, $line, $command, $source_info);
- $misc->{'extra'} = {'arg_line' => $line};
+ $misc->{'info'} = {'arg_line' => $line};
}
# if using the @set txi* instead of a proper @-command, replace
@@ -6855,7 +6856,7 @@ Is associated to a macro definition element
'args' => [{'text' => 'mymacro', 'type' => 'macro_name'},
{'text' => 'arg', 'type' => 'macro_arg}],
'contents' => [{'text' => "coucou \arg\ after arg\n", 'type' => 'raw'}],
- 'extra' => {'arg_line' => " mymacro{arg}\n", }}
+ 'info' => {'arg_line' => " mymacro{arg}\n", }}
=item merged_indices
@@ -7352,6 +7353,16 @@ and C<@itemx>, in a I<table_term>.
=over
+=item arg_line
+
+The string correspond to the line after the @-command
+for @-commands that have special arguments on their line,
+and for C<@macro> line.
+
+=item delimiter
+
+C<@verb> delimiter is in I<delimiter>.
+
=item flag
C<@value> tree element argument string is in I<flag>. Only for a C<@value>
@@ -7386,12 +7397,6 @@ X<Texinfo tree element extra key>
=over
-=item arg_line
-
-The string correspond to the line after the @-command
-for @-commands that have special arguments on their line,
-and for C<@macro> line.
-
=item index_entry
The index entry information (described in L</index_entries>
@@ -7567,7 +7572,7 @@ I<code> is set depending on the context and
C<@kbdinputstyle>.
=item C<@macro>
I<invalid_syntax> is set if there was an error on the C<@macro>
-line. I<arg_line> holds the line after C<@macro>.
+line. C<info> key hash I<arg_line> holds the line after C<@macro>.
=item C<menu_entry>
@@ -7639,10 +7644,6 @@ The part preceding the command is in I<associated_part>.
If the level of the document was modified by C<@raisections>
or C<@lowersections>, the differential level is in I<sections_level>.
-=item C<@verb>
-
-The delimiter is in I<delimiter>.
-
=back
=head1 SEE ALSO
diff --git a/tp/Texinfo/XS/parsetexi/close.c b/tp/Texinfo/XS/parsetexi/close.c
index 08b2113a08..92aacd8fb6 100644
--- a/tp/Texinfo/XS/parsetexi/close.c
+++ b/tp/Texinfo/XS/parsetexi/close.c
@@ -31,7 +31,7 @@ close_brace_command (ELEMENT *current,
if (current->cmd != CM_verb)
goto yes;
- k = lookup_extra (current, "delimiter");
+ k = lookup_info (current, "delimiter");
if (!k || !*(char *)k->value)
goto yes;
if (0)
diff --git a/tp/Texinfo/XS/parsetexi/convert.c
b/tp/Texinfo/XS/parsetexi/convert.c
index 9f824548d9..9828324348 100644
--- a/tp/Texinfo/XS/parsetexi/convert.c
+++ b/tp/Texinfo/XS/parsetexi/convert.c
@@ -77,7 +77,7 @@ expand_cmd_args_to_texi (ELEMENT *e, TEXT *result)
{
KEY_PAIR *k;
char *s = 0;
- k = lookup_extra (e, "arg_line");
+ k = lookup_info (e, "arg_line");
if (k)
s = (char *)k->value;
if (s)
@@ -99,7 +99,7 @@ expand_cmd_args_to_texi (ELEMENT *e, TEXT *result)
if (e->cmd == CM_verb)
{
- k = lookup_extra (e, "delimiter");
+ k = lookup_info (e, "delimiter");
ADD((char *)k->value);
}
@@ -123,7 +123,7 @@ expand_cmd_args_to_texi (ELEMENT *e, TEXT *result)
if (e->cmd == CM_verb)
{
- k = lookup_extra (e, "delimiter");
+ k = lookup_info (e, "delimiter");
ADD((char *)k->value);
}
diff --git a/tp/Texinfo/XS/parsetexi/handle_commands.c
b/tp/Texinfo/XS/parsetexi/handle_commands.c
index cb675a574e..0f108380e2 100644
--- a/tp/Texinfo/XS/parsetexi/handle_commands.c
+++ b/tp/Texinfo/XS/parsetexi/handle_commands.c
@@ -357,7 +357,7 @@ handle_line_command (ELEMENT *current, char **line_inout,
else /* arg_spec == LINE_special */
{
args = parse_special_misc_command (line, cmd, &has_comment);
- add_extra_string (misc, "arg_line", strdup (line));
+ add_info_string_dup (misc, "arg_line", line);
}
/* Handle @set txicodequoteundirected as an
diff --git a/tp/Texinfo/XS/parsetexi/macro.c b/tp/Texinfo/XS/parsetexi/macro.c
index e2b65432b1..a24bb2fc7f 100644
--- a/tp/Texinfo/XS/parsetexi/macro.c
+++ b/tp/Texinfo/XS/parsetexi/macro.c
@@ -87,7 +87,7 @@ parse_macro_command_line (enum command_id cmd, char
**line_inout,
macro->cmd = cmd;
macro->source_info = current_source_info;
- add_extra_string (macro, "arg_line", strdup (line));
+ add_info_string_dup (macro, "arg_line", line);
/* Note this extra value isn't used much, so it might be possible
to get rid of it. */
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index 957a847046..8f63066e49 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -1118,7 +1118,7 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
e->cmd = cmd;
line = p;
add_to_element_contents (current, e);
- add_extra_string (e, "arg_line", strdup (line));
+ add_info_string_dup (e, "arg_line", line);
current = e;
retval = GET_A_NEW_LINE;
goto funexit;
@@ -1293,7 +1293,7 @@ superfluous_arg:
char *q;
KEY_PAIR *k;
- k = lookup_extra (current->parent, "delimiter");
+ k = lookup_info (current->parent, "delimiter");
c = *(char *)k->value;
if (c)
diff --git a/tp/Texinfo/XS/parsetexi/separator.c
b/tp/Texinfo/XS/parsetexi/separator.c
index dd1c49b60a..ed0c964b9d 100644
--- a/tp/Texinfo/XS/parsetexi/separator.c
+++ b/tp/Texinfo/XS/parsetexi/separator.c
@@ -51,14 +51,14 @@ handle_open_brace (ELEMENT *current, char **line_inout)
if (!*line || *line == '\n')
{
line_error ("@verb without associated character");
- add_extra_string_dup (current->parent, "delimiter", "");
+ add_info_string_dup (current->parent, "delimiter", "");
current->parent->type = 0;
}
else
{
static char c[2];
c[0] = *line++;
- add_extra_string_dup (current->parent, "delimiter", c);
+ add_info_string_dup (current->parent, "delimiter", c);
}
}
else if (command_data(command).data == BRACE_context)
diff --git a/tp/t/01use.t b/tp/t/01use.t
index 1e62f48de5..c63894cd95 100644
--- a/tp/t/01use.t
+++ b/tp/t/01use.t
@@ -63,7 +63,7 @@ $manual_tree = { 'cmdname' => 'multitable',
],
'type' =>
'brace_command_arg',
} ],
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
}
},
diff --git a/tp/t/results/alias/simple.pl b/tp/t/results/alias/simple.pl
index 3b626d2830..28dc86de24 100644
--- a/tp/t/results/alias/simple.pl
+++ b/tp/t/results/alias/simple.pl
@@ -151,7 +151,7 @@ $result_trees{'simple'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '!'
},
'source_info' => {
diff --git a/tp/t/results/conditionals/command_conditionals_user_defined.pl
b/tp/t/results/conditionals/command_conditionals_user_defined.pl
index cc9693e259..dec197c80c 100644
--- a/tp/t/results/conditionals/command_conditionals_user_defined.pl
+++ b/tp/t/results/conditionals/command_conditionals_user_defined.pl
@@ -52,7 +52,7 @@ $result_trees{'command_conditionals_user_defined'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' truc
'
},
diff --git a/tp/t/results/conditionals/comment_on_ifset_line.pl
b/tp/t/results/conditionals/comment_on_ifset_line.pl
index d9cf39d5eb..e247715ec0 100644
--- a/tp/t/results/conditionals/comment_on_ifset_line.pl
+++ b/tp/t/results/conditionals/comment_on_ifset_line.pl
@@ -22,12 +22,14 @@ $result_trees{'comment_on_ifset_line'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' x
-',
'misc_args' => [
'x',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' x
+'
}
},
{
diff --git a/tp/t/results/conditionals/consecutive_conditionals.pl
b/tp/t/results/conditionals/consecutive_conditionals.pl
index c2c4b34309..92429017ca 100644
--- a/tp/t/results/conditionals/consecutive_conditionals.pl
+++ b/tp/t/results/conditionals/consecutive_conditionals.pl
@@ -27,12 +27,14 @@ $result_trees{'consecutive_conditionals'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' b
-',
'misc_args' => [
'b',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' b
+'
}
},
{
diff --git a/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
b/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
index 8eb838f0a1..78b77af72d 100644
--- a/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
+++ b/tp/t/results/conditionals/empty_ifset_in_ifset_set.pl
@@ -27,12 +27,14 @@ $result_trees{'empty_ifset_in_ifset_set'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' notset
-',
'misc_args' => [
'notset',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' notset
+'
}
},
{
diff --git a/tp/t/results/conditionals/empty_set_in_ifclear.pl
b/tp/t/results/conditionals/empty_set_in_ifclear.pl
index e672f5819c..d541cf5aa3 100644
--- a/tp/t/results/conditionals/empty_set_in_ifclear.pl
+++ b/tp/t/results/conditionals/empty_set_in_ifclear.pl
@@ -22,12 +22,14 @@ $result_trees{'empty_set_in_ifclear'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' a
-',
'misc_args' => [
'a',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' a
+'
}
},
{
diff --git a/tp/t/results/conditionals/empty_set_in_ifset.pl
b/tp/t/results/conditionals/empty_set_in_ifset.pl
index 53cde57807..bb2192c6f0 100644
--- a/tp/t/results/conditionals/empty_set_in_ifset.pl
+++ b/tp/t/results/conditionals/empty_set_in_ifset.pl
@@ -22,12 +22,14 @@ $result_trees{'empty_set_in_ifset'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' a
-',
'misc_args' => [
'a',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' a
+'
}
},
{
diff --git a/tp/t/results/conditionals/end_ifset_in_format.pl
b/tp/t/results/conditionals/end_ifset_in_format.pl
index 79947e0468..437e43aa08 100644
--- a/tp/t/results/conditionals/end_ifset_in_format.pl
+++ b/tp/t/results/conditionals/end_ifset_in_format.pl
@@ -27,12 +27,14 @@ $result_trees{'end_ifset_in_format'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' notset
-',
'misc_args' => [
'notset',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' notset
+'
}
},
{
@@ -184,7 +186,7 @@ $result_trees{'end_ifset_in_format'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '%'
},
'source_info' => {
diff --git a/tp/t/results/conditionals/ifclear_in_ifset_set.pl
b/tp/t/results/conditionals/ifclear_in_ifset_set.pl
index fe984c935f..e65c211b08 100644
--- a/tp/t/results/conditionals/ifclear_in_ifset_set.pl
+++ b/tp/t/results/conditionals/ifclear_in_ifset_set.pl
@@ -27,12 +27,14 @@ $result_trees{'ifclear_in_ifset_set'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' a
-',
'misc_args' => [
'a',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' a
+'
}
},
{
diff --git a/tp/t/results/conditionals/macro_in_ifset.pl
b/tp/t/results/conditionals/macro_in_ifset.pl
index d84bc9fce8..8a7dad903b 100644
--- a/tp/t/results/conditionals/macro_in_ifset.pl
+++ b/tp/t/results/conditionals/macro_in_ifset.pl
@@ -57,7 +57,7 @@ $result_trees{'macro_in_ifset'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' truc {}
'
},
diff --git a/tp/t/results/conditionals/macro_in_ifset_set.pl
b/tp/t/results/conditionals/macro_in_ifset_set.pl
index a303f0fccc..e540871956 100644
--- a/tp/t/results/conditionals/macro_in_ifset_set.pl
+++ b/tp/t/results/conditionals/macro_in_ifset_set.pl
@@ -27,12 +27,14 @@ $result_trees{'macro_in_ifset_set'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' a
-',
'misc_args' => [
'a',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' a
+'
}
},
{
@@ -83,7 +85,7 @@ $result_trees{'macro_in_ifset_set'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' truc {}
'
},
@@ -107,11 +109,13 @@ $result_trees{'macro_in_ifset_set'} = {
],
'cmdname' => 'unmacro',
'extra' => {
- 'arg_line' => ' truc
-',
'misc_args' => [
'truc'
]
+ },
+ 'info' => {
+ 'arg_line' => ' truc
+'
}
},
{
@@ -157,7 +161,7 @@ $result_trees{'macro_in_ifset_set'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' truc{}
'
},
diff --git a/tp/t/results/conditionals/nested_ifset_ifclear.pl
b/tp/t/results/conditionals/nested_ifset_ifclear.pl
index 72c8f35e14..8cbac04ada 100644
--- a/tp/t/results/conditionals/nested_ifset_ifclear.pl
+++ b/tp/t/results/conditionals/nested_ifset_ifclear.pl
@@ -92,7 +92,7 @@ $result_trees{'nested_ifset_ifclear'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' conditionals{}
'
},
@@ -120,12 +120,14 @@ $result_trees{'nested_ifset_ifclear'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' somevar
-',
'misc_args' => [
'somevar',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' somevar
+'
}
},
{
@@ -141,12 +143,14 @@ $result_trees{'nested_ifset_ifclear'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' anothervar
-',
'misc_args' => [
'anothervar',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' anothervar
+'
}
},
{
@@ -176,12 +180,14 @@ $result_trees{'nested_ifset_ifclear'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' somevar
-',
'misc_args' => [
'somevar',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' somevar
+'
}
},
{
@@ -193,11 +199,13 @@ $result_trees{'nested_ifset_ifclear'} = {
],
'cmdname' => 'clear',
'extra' => {
- 'arg_line' => ' anothervar
-',
'misc_args' => [
'anothervar'
]
+ },
+ 'info' => {
+ 'arg_line' => ' anothervar
+'
}
},
{
@@ -223,11 +231,13 @@ $result_trees{'nested_ifset_ifclear'} = {
],
'cmdname' => 'clear',
'extra' => {
- 'arg_line' => ' somevar
-',
'misc_args' => [
'somevar'
]
+ },
+ 'info' => {
+ 'arg_line' => ' somevar
+'
}
},
{
@@ -243,12 +253,14 @@ $result_trees{'nested_ifset_ifclear'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' anothervar
-',
'misc_args' => [
'anothervar',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' anothervar
+'
}
},
{
@@ -265,11 +277,13 @@ $result_trees{'nested_ifset_ifclear'} = {
],
'cmdname' => 'clear',
'extra' => {
- 'arg_line' => ' somevar
-',
'misc_args' => [
'somevar'
]
+ },
+ 'info' => {
+ 'arg_line' => ' somevar
+'
}
},
{
@@ -281,11 +295,13 @@ $result_trees{'nested_ifset_ifclear'} = {
],
'cmdname' => 'clear',
'extra' => {
- 'arg_line' => ' anothervar
-',
'misc_args' => [
'anothervar'
]
+ },
+ 'info' => {
+ 'arg_line' => ' anothervar
+'
}
}
],
diff --git a/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
b/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
index b12cba1761..e549acd5d5 100644
--- a/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
+++ b/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
@@ -52,7 +52,7 @@ $result_trees{'user_defined_txiinternalvalue'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' txiinternalvalue
'
},
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 5da6ea79d7..c850d54b31 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -114,7 +114,7 @@ $result_trees{'at_commands_in_raw'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' othermacro{}
'
},
diff --git a/tp/t/results/converters_tests/inlineifsetifclear.pl
b/tp/t/results/converters_tests/inlineifsetifclear.pl
index de332987da..446e3b226c 100644
--- a/tp/t/results/converters_tests/inlineifsetifclear.pl
+++ b/tp/t/results/converters_tests/inlineifsetifclear.pl
@@ -107,12 +107,14 @@ $result_trees{'inlineifsetifclear'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' aaa
-',
'misc_args' => [
'aaa',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' aaa
+'
}
},
{
diff --git a/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
b/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
index e9f745a6da..7c5f07ce99 100644
--- a/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_empty_node_names.pl
@@ -118,7 +118,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -341,7 +341,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -485,7 +485,7 @@ $result_trees{'spaces_in_empty_node_names'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
diff --git a/tp/t/results/converters_tests/spaces_in_node_names.pl
b/tp/t/results/converters_tests/spaces_in_node_names.pl
index a2018720c4..cbe67e0439 100644
--- a/tp/t/results/converters_tests/spaces_in_node_names.pl
+++ b/tp/t/results/converters_tests/spaces_in_node_names.pl
@@ -125,7 +125,7 @@ $result_trees{'spaces_in_node_names'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -366,7 +366,7 @@ $result_trees{'spaces_in_node_names'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -527,7 +527,7 @@ $result_trees{'spaces_in_node_names'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
diff --git a/tp/t/results/coverage_braces/empty_commands.pl
b/tp/t/results/coverage_braces/empty_commands.pl
index a15f296366..75e77927a5 100644
--- a/tp/t/results/coverage_braces/empty_commands.pl
+++ b/tp/t/results/coverage_braces/empty_commands.pl
@@ -149,7 +149,7 @@ $result_trees{'empty_commands'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ';'
},
'source_info' => {
diff --git a/tp/t/results/coverage_braces/nested_in_sc.pl
b/tp/t/results/coverage_braces/nested_in_sc.pl
index b779400939..e81aedccc1 100644
--- a/tp/t/results/coverage_braces/nested_in_sc.pl
+++ b/tp/t/results/coverage_braces/nested_in_sc.pl
@@ -178,7 +178,7 @@ $result_trees{'nested_in_sc'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
diff --git
a/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
b/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
index 5a589b7b53..8380897f14 100644
--- a/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
+++ b/tp/t/results/coverage_braces/one_argument_leading_trailing_spaces.pl
@@ -203,7 +203,7 @@ $result_trees{'one_argument_leading_trailing_spaces'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
diff --git a/tp/t/results/coverage_braces/test_image.pl
b/tp/t/results/coverage_braces/test_image.pl
index e297b45132..4bd02da453 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -62,7 +62,7 @@ $result_trees{'test_image'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' files-char
'
},
@@ -142,7 +142,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -211,7 +211,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -298,7 +298,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -422,7 +422,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -483,7 +483,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -625,7 +625,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -694,7 +694,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -778,7 +778,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -902,7 +902,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -963,7 +963,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1088,7 +1088,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1157,7 +1157,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1239,7 +1239,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1363,7 +1363,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1424,7 +1424,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1567,7 +1567,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1636,7 +1636,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1720,7 +1720,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1844,7 +1844,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1905,7 +1905,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1991,7 +1991,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -2060,7 +2060,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -2144,7 +2144,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -2268,7 +2268,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -2329,7 +2329,7 @@ $result_trees{'test_image'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
diff --git a/tp/t/results/coverage_braces/verb_in_xref.pl
b/tp/t/results/coverage_braces/verb_in_xref.pl
index dd751fc916..6c67b74ae8 100644
--- a/tp/t/results/coverage_braces/verb_in_xref.pl
+++ b/tp/t/results/coverage_braces/verb_in_xref.pl
@@ -74,7 +74,7 @@ $result_trees{'verb_in_xref'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '*'
},
'source_info' => {
diff --git a/tp/t/results/def/omit_def_space.pl
b/tp/t/results/def/omit_def_space.pl
index ce7695fa30..2bd393d63b 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -91,12 +91,14 @@ $result_trees{'omit_def_space'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' txidefnamenospace
-',
'misc_args' => [
'txidefnamenospace',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' txidefnamenospace
+'
}
},
{
diff --git a/tp/t/results/float/complex_float.pl
b/tp/t/results/float/complex_float.pl
index 081495eb67..c6de49b228 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -841,7 +841,7 @@ $result_trees{'complex_float'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '!'
},
'source_info' => {
@@ -1777,7 +1777,7 @@ $result_trees{'complex_float'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '!'
},
'source_info' => {
@@ -2017,7 +2017,7 @@ $result_trees{'complex_float'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '!'
},
'source_info' => {
@@ -3145,7 +3145,7 @@ $result_trees{'complex_float'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '!'
},
'source_info' => {
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs.pl
b/tp/t/results/formats_encodings/at_commands_in_refs.pl
index b564b1604e..d38467528e 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs.pl
@@ -2896,7 +2896,7 @@ $result_trees{'at_commands_in_refs'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '.'
},
'source_info' => {
@@ -9037,7 +9037,7 @@ $result_trees{'at_commands_in_refs'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '.'
},
'source_info' => {
@@ -9095,7 +9095,7 @@ $result_trees{'at_commands_in_refs'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '.'
},
'source_info' => {
@@ -13486,7 +13486,7 @@ $result_trees{'at_commands_in_refs'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '.'
},
'source_info' => {
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
b/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
index cfeaf62dff..b73232d1b7 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs_latin1.pl
@@ -2960,7 +2960,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '.'
},
'source_info' => {
@@ -9101,7 +9101,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '.'
},
'source_info' => {
@@ -9159,7 +9159,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '.'
},
'source_info' => {
@@ -13550,7 +13550,7 @@ $result_trees{'at_commands_in_refs_latin1'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '.'
},
'source_info' => {
diff --git a/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
b/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
index 0cb3ed5da5..9a1c561842 100644
--- a/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
+++ b/tp/t/results/formats_encodings/at_commands_in_refs_utf8.pl
@@ -2960,7 +2960,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '.'
},
'source_info' => {
@@ -9101,7 +9101,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '.'
},
'source_info' => {
@@ -9159,7 +9159,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '.'
},
'source_info' => {
@@ -13550,7 +13550,7 @@ $result_trees{'at_commands_in_refs_utf8'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '.'
},
'source_info' => {
diff --git a/tp/t/results/formatting/texi_bib_example.pl
b/tp/t/results/formatting/texi_bib_example.pl
index a5bccd9793..18a1ef7f55 100644
--- a/tp/t/results/formatting/texi_bib_example.pl
+++ b/tp/t/results/formatting/texi_bib_example.pl
@@ -2659,7 +2659,7 @@ $result_trees{'texi_bib_example'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' mybibsetrefnode{node}
'
},
@@ -2754,7 +2754,7 @@ $result_trees{'texi_bib_example'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' mybibnode{}
'
},
@@ -2873,7 +2873,7 @@ $result_trees{'texi_bib_example'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' mybibusetable{node}
'
},
@@ -2992,7 +2992,7 @@ $result_trees{'texi_bib_example'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' mybibuselist{node}
'
},
@@ -3115,7 +3115,7 @@ $result_trees{'texi_bib_example'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' mybibcite{ref}
'
},
@@ -3181,7 +3181,7 @@ $result_trees{'texi_bib_example'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' mybibmakeref{node, ref}
'
},
@@ -3329,7 +3329,7 @@ $result_trees{'texi_bib_example'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' mybibitem{ref}
'
},
@@ -3373,12 +3373,14 @@ $result_trees{'texi_bib_example'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' mybiblist true
-',
'misc_args' => [
'mybiblist',
'true'
]
+ },
+ 'info' => {
+ 'arg_line' => ' mybiblist true
+'
}
},
{
@@ -3394,12 +3396,14 @@ $result_trees{'texi_bib_example'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' mybibrefnode References
-',
'misc_args' => [
'mybibrefnode',
'References'
]
+ },
+ 'info' => {
+ 'arg_line' => ' mybibrefnode References
+'
}
},
{
diff --git a/tp/t/results/formatting/texi_glossary.pl
b/tp/t/results/formatting/texi_glossary.pl
index 8a243be1f5..9f9d582bd8 100644
--- a/tp/t/results/formatting/texi_glossary.pl
+++ b/tp/t/results/formatting/texi_glossary.pl
@@ -107,7 +107,7 @@ $result_trees{'texi_glossary'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' glossarytext
'
},
@@ -175,7 +175,7 @@ $result_trees{'texi_glossary'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' glossary
'
},
@@ -301,7 +301,7 @@ $result_trees{'texi_glossary'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' glossarytext
'
}
@@ -335,7 +335,7 @@ $result_trees{'texi_glossary'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' expandglossary{glossary}
'
}
@@ -379,7 +379,7 @@ $result_trees{'texi_glossary'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' gentry {id, name, text}
'
},
@@ -614,11 +614,13 @@ $result_trees{'texi_glossary'} = {
],
'cmdname' => 'unmacro',
'extra' => {
- 'arg_line' => ' expandglossary
-',
'misc_args' => [
'expandglossary'
]
+ },
+ 'info' => {
+ 'arg_line' => ' expandglossary
+'
}
},
{
@@ -686,7 +688,7 @@ $result_trees{'texi_glossary'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' glossarytext
'
}
@@ -720,7 +722,7 @@ $result_trees{'texi_glossary'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' expandglossary{glossary}
'
},
@@ -739,11 +741,13 @@ $result_trees{'texi_glossary'} = {
],
'cmdname' => 'unmacro',
'extra' => {
- 'arg_line' => ' glossarytext
-',
'misc_args' => [
'glossarytext'
]
+ },
+ 'info' => {
+ 'arg_line' => ' glossarytext
+'
}
},
{
@@ -799,7 +803,7 @@ $result_trees{'texi_glossary'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' glossarytext
'
},
@@ -884,11 +888,13 @@ $result_trees{'texi_glossary'} = {
],
'cmdname' => 'unmacro',
'extra' => {
- 'arg_line' => ' expandglossary
-',
'misc_args' => [
'expandglossary'
]
+ },
+ 'info' => {
+ 'arg_line' => ' expandglossary
+'
}
},
{
@@ -956,7 +962,7 @@ $result_trees{'texi_glossary'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' glossarytext
'
}
@@ -990,7 +996,7 @@ $result_trees{'texi_glossary'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' expandglossary{glossary}
'
},
@@ -1009,11 +1015,13 @@ $result_trees{'texi_glossary'} = {
],
'cmdname' => 'unmacro',
'extra' => {
- 'arg_line' => ' glossarytext
-',
'misc_args' => [
'glossarytext'
]
+ },
+ 'info' => {
+ 'arg_line' => ' glossarytext
+'
}
},
{
@@ -1069,7 +1077,7 @@ $result_trees{'texi_glossary'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' glossarytext
'
},
diff --git a/tp/t/results/html_tests/documentdescription.pl
b/tp/t/results/html_tests/documentdescription.pl
index b09396c31f..f372979f08 100644
--- a/tp/t/results/html_tests/documentdescription.pl
+++ b/tp/t/results/html_tests/documentdescription.pl
@@ -92,7 +92,7 @@ $result_trees{'documentdescription'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
diff --git a/tp/t/results/html_tests/itemize_arguments.pl
b/tp/t/results/html_tests/itemize_arguments.pl
index b4ac6e0512..fc6590b697 100644
--- a/tp/t/results/html_tests/itemize_arguments.pl
+++ b/tp/t/results/html_tests/itemize_arguments.pl
@@ -3665,12 +3665,14 @@ $result_trees{'itemize_arguments'} = {
],
'cmdname' => 'clickstyle',
'extra' => {
- 'arg_line' => ' @result
-',
'misc_args' => [
'@result'
]
},
+ 'info' => {
+ 'arg_line' => ' @result
+'
+ },
'source_info' => {
'file_name' => '',
'line_nr' => 106,
diff --git a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
index bf7b162c25..8181d470c9 100644
--- a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
+++ b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
@@ -3665,12 +3665,14 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
],
'cmdname' => 'clickstyle',
'extra' => {
- 'arg_line' => ' @result
-',
'misc_args' => [
'@result'
]
},
+ 'info' => {
+ 'arg_line' => ' @result
+'
+ },
'source_info' => {
'file_name' => '',
'line_nr' => 106,
diff --git a/tp/t/results/html_tests/xml_protected_in_verb.pl
b/tp/t/results/html_tests/xml_protected_in_verb.pl
index f7659f6e90..6318f623c7 100644
--- a/tp/t/results/html_tests/xml_protected_in_verb.pl
+++ b/tp/t/results/html_tests/xml_protected_in_verb.pl
@@ -81,7 +81,7 @@ $result_trees{'xml_protected_in_verb'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '.'
},
'source_info' => {
diff --git a/tp/t/results/htmlxref/htmlxref.pl
b/tp/t/results/htmlxref/htmlxref.pl
index f13277d877..6e98eab0cc 100644
--- a/tp/t/results/htmlxref/htmlxref.pl
+++ b/tp/t/results/htmlxref/htmlxref.pl
@@ -272,7 +272,7 @@ $result_trees{'htmlxref'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -420,7 +420,7 @@ $result_trees{'htmlxref'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ';'
},
'source_info' => {
@@ -558,7 +558,7 @@ $result_trees{'htmlxref'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -706,7 +706,7 @@ $result_trees{'htmlxref'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -872,7 +872,7 @@ $result_trees{'htmlxref'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1046,7 +1046,7 @@ $result_trees{'htmlxref'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1318,7 +1318,7 @@ $result_trees{'htmlxref'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1587,7 +1587,7 @@ $result_trees{'htmlxref'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1712,7 +1712,7 @@ $result_trees{'htmlxref'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -2152,7 +2152,7 @@ $result_trees{'htmlxref'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
diff --git a/tp/t/results/htmlxref/htmlxref_nodes.pl
b/tp/t/results/htmlxref/htmlxref_nodes.pl
index d238bfc3db..7e3bc8e2b1 100644
--- a/tp/t/results/htmlxref/htmlxref_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_nodes.pl
@@ -272,7 +272,7 @@ $result_trees{'htmlxref_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -420,7 +420,7 @@ $result_trees{'htmlxref_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ';'
},
'source_info' => {
@@ -558,7 +558,7 @@ $result_trees{'htmlxref_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -706,7 +706,7 @@ $result_trees{'htmlxref_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -872,7 +872,7 @@ $result_trees{'htmlxref_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1046,7 +1046,7 @@ $result_trees{'htmlxref_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1318,7 +1318,7 @@ $result_trees{'htmlxref_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1587,7 +1587,7 @@ $result_trees{'htmlxref_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1712,7 +1712,7 @@ $result_trees{'htmlxref_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -2152,7 +2152,7 @@ $result_trees{'htmlxref_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono.pl
b/tp/t/results/htmlxref/htmlxref_only_mono.pl
index ca19ecac49..d3ea0dfc1d 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono.pl
@@ -272,7 +272,7 @@ $result_trees{'htmlxref_only_mono'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -420,7 +420,7 @@ $result_trees{'htmlxref_only_mono'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ';'
},
'source_info' => {
@@ -558,7 +558,7 @@ $result_trees{'htmlxref_only_mono'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -706,7 +706,7 @@ $result_trees{'htmlxref_only_mono'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -872,7 +872,7 @@ $result_trees{'htmlxref_only_mono'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1046,7 +1046,7 @@ $result_trees{'htmlxref_only_mono'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1318,7 +1318,7 @@ $result_trees{'htmlxref_only_mono'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1587,7 +1587,7 @@ $result_trees{'htmlxref_only_mono'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1712,7 +1712,7 @@ $result_trees{'htmlxref_only_mono'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -2152,7 +2152,7 @@ $result_trees{'htmlxref_only_mono'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
diff --git a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
index 963642b8f3..ff53c228f7 100644
--- a/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_mono_nodes.pl
@@ -272,7 +272,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -420,7 +420,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ';'
},
'source_info' => {
@@ -558,7 +558,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -706,7 +706,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -872,7 +872,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1046,7 +1046,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1318,7 +1318,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1587,7 +1587,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1712,7 +1712,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -2152,7 +2152,7 @@ $result_trees{'htmlxref_only_mono_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
diff --git a/tp/t/results/htmlxref/htmlxref_only_split.pl
b/tp/t/results/htmlxref/htmlxref_only_split.pl
index 751d53f860..44c8fa86f4 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split.pl
@@ -272,7 +272,7 @@ $result_trees{'htmlxref_only_split'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -420,7 +420,7 @@ $result_trees{'htmlxref_only_split'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ';'
},
'source_info' => {
@@ -558,7 +558,7 @@ $result_trees{'htmlxref_only_split'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -706,7 +706,7 @@ $result_trees{'htmlxref_only_split'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -872,7 +872,7 @@ $result_trees{'htmlxref_only_split'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1046,7 +1046,7 @@ $result_trees{'htmlxref_only_split'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1318,7 +1318,7 @@ $result_trees{'htmlxref_only_split'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1587,7 +1587,7 @@ $result_trees{'htmlxref_only_split'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1712,7 +1712,7 @@ $result_trees{'htmlxref_only_split'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -2152,7 +2152,7 @@ $result_trees{'htmlxref_only_split'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
diff --git a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
index ae6be856f8..909800fc16 100644
--- a/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
+++ b/tp/t/results/htmlxref/htmlxref_only_split_nodes.pl
@@ -272,7 +272,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -420,7 +420,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ';'
},
'source_info' => {
@@ -558,7 +558,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -706,7 +706,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -872,7 +872,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1046,7 +1046,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1318,7 +1318,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1587,7 +1587,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -1712,7 +1712,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
@@ -2152,7 +2152,7 @@ $result_trees{'htmlxref_only_split_nodes'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
diff --git a/tp/t/results/include/cpp_lines.pl
b/tp/t/results/include/cpp_lines.pl
index 3470e0c97b..fd6aeda02a 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -247,7 +247,7 @@ $result_trees{'cpp_lines'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macr
'
},
@@ -388,7 +388,7 @@ $result_trees{'cpp_lines'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macrtwo
'
},
@@ -580,7 +580,7 @@ $result_trees{'cpp_lines'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
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 5476fbc2c1..a3bcff2275 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
@@ -52,7 +52,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' begin-file
'
},
@@ -149,7 +149,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' latin1
'
},
@@ -248,7 +248,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' multiinclude
'
},
@@ -370,7 +370,7 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' themacro
'
},
diff --git a/tp/t/results/include/macro_definition_in_include.pl
b/tp/t/results/include/macro_definition_in_include.pl
index dd7e7bc095..702b26bab6 100644
--- a/tp/t/results/include/macro_definition_in_include.pl
+++ b/tp/t/results/include/macro_definition_in_include.pl
@@ -52,7 +52,7 @@ $result_trees{'macro_definition_in_include'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' themacro
'
},
diff --git a/tp/t/results/include/macro_in_early_commands.pl
b/tp/t/results/include/macro_in_early_commands.pl
index 72c5ab065b..500a2e5cf7 100644
--- a/tp/t/results/include/macro_in_early_commands.pl
+++ b/tp/t/results/include/macro_in_early_commands.pl
@@ -52,7 +52,7 @@ $result_trees{'macro_in_early_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' begin-file
'
},
@@ -109,7 +109,7 @@ $result_trees{'macro_in_early_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' end-file-name {ext}
'
},
@@ -200,7 +200,7 @@ $result_trees{'macro_in_early_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' latin1
'
},
@@ -258,7 +258,7 @@ $result_trees{'macro_in_early_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' documentencoding-command
'
},
@@ -356,7 +356,7 @@ $result_trees{'macro_in_early_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' multiinclude
'
},
@@ -478,7 +478,7 @@ $result_trees{'macro_in_early_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' themacro
'
},
diff --git a/tp/t/results/include/value_expansion_in_include.pl
b/tp/t/results/include/value_expansion_in_include.pl
index 7367a3bba8..46e814d015 100644
--- a/tp/t/results/include/value_expansion_in_include.pl
+++ b/tp/t/results/include/value_expansion_in_include.pl
@@ -22,12 +22,14 @@ $result_trees{'value_expansion_in_include'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' testvar incl-incl.txi
-',
'misc_args' => [
'testvar',
'incl-incl.txi'
]
+ },
+ 'info' => {
+ 'arg_line' => ' testvar incl-incl.txi
+'
}
},
{
@@ -64,12 +66,14 @@ $result_trees{'value_expansion_in_include'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' test-var incl-incl.tx
-',
'misc_args' => [
'test-var',
'incl-incl.tx'
]
+ },
+ 'info' => {
+ 'arg_line' => ' test-var incl-incl.tx
+'
}
},
{
@@ -106,12 +110,14 @@ $result_trees{'value_expansion_in_include'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' test_var ncl-incl.tx
-',
'misc_args' => [
'test_var',
'ncl-incl.tx'
]
+ },
+ 'info' => {
+ 'arg_line' => ' test_var ncl-incl.tx
+'
}
},
{
diff --git a/tp/t/results/indices/ignored_sort_char_empty_entries.pl
b/tp/t/results/indices/ignored_sort_char_empty_entries.pl
index 4851b56495..ab71a0d259 100644
--- a/tp/t/results/indices/ignored_sort_char_empty_entries.pl
+++ b/tp/t/results/indices/ignored_sort_char_empty_entries.pl
@@ -24,12 +24,14 @@ $result_trees{'ignored_sort_char_empty_entries'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' txiindexhyphenignore
-',
'misc_args' => [
'txiindexhyphenignore',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' txiindexhyphenignore
+'
}
},
{
diff --git a/tp/t/results/indices/transparent_sort_chars.pl
b/tp/t/results/indices/transparent_sort_chars.pl
index 3a4c384548..d93b3bf959 100644
--- a/tp/t/results/indices/transparent_sort_chars.pl
+++ b/tp/t/results/indices/transparent_sort_chars.pl
@@ -24,12 +24,14 @@ $result_trees{'transparent_sort_chars'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' txiindexhyphenignore
-',
'misc_args' => [
'txiindexhyphenignore',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' txiindexhyphenignore
+'
}
},
{
diff --git a/tp/t/results/info_tests/def_in_copying.pl
b/tp/t/results/info_tests/def_in_copying.pl
index 1f5cd871bc..8fb828aeb7 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -67,7 +67,7 @@ $result_trees{'def_in_copying'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' mymacro
'
},
diff --git a/tp/t/results/info_tests/space_in_setfilename.pl
b/tp/t/results/info_tests/space_in_setfilename.pl
index 4549c27e52..b3cd033d50 100644
--- a/tp/t/results/info_tests/space_in_setfilename.pl
+++ b/tp/t/results/info_tests/space_in_setfilename.pl
@@ -29,7 +29,7 @@ $result_trees{'space_in_setfilename'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
diff --git
a/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl
b/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl
index 8280479309..d6e4c162e4 100644
--- a/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl
+++ b/tp/t/results/invalid_nestings/unclosed_verb_end_of_line_on_misc_line.pl
@@ -30,7 +30,7 @@ $result_trees{'unclosed_verb_end_of_line_on_misc_line'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ''
},
'source_info' => {
diff --git a/tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl
b/tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl
index 7e07655375..beeaa072b4 100644
--- a/tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl
+++ b/tp/t/results/invalid_nestings/unclosed_verb_on_misc_line.pl
@@ -29,7 +29,7 @@ $result_trees{'unclosed_verb_on_misc_line'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => 'f'
},
'source_info' => {
diff --git a/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
b/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
index aa6f84b789..bd8e6ecf7a 100644
--- a/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
+++ b/tp/t/results/invalid_nestings/unclosed_verb_on_section_line.pl
@@ -41,7 +41,7 @@ $result_trees{'unclosed_verb_on_section_line'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => 'T'
},
'source_info' => {
diff --git a/tp/t/results/latex_tests/indices.pl
b/tp/t/results/latex_tests/indices.pl
index 072b8200b8..b6e56d6c0a 100644
--- a/tp/t/results/latex_tests/indices.pl
+++ b/tp/t/results/latex_tests/indices.pl
@@ -34,12 +34,14 @@ $result_trees{'indices'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' txiindexbackslashignore
-',
'misc_args' => [
'txiindexbackslashignore',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' txiindexbackslashignore
+'
}
},
{
@@ -641,11 +643,13 @@ $result_trees{'indices'} = {
],
'cmdname' => 'clear',
'extra' => {
- 'arg_line' => ' txiindexbackslashignore
-',
'misc_args' => [
'txiindexbackslashignore'
]
+ },
+ 'info' => {
+ 'arg_line' => ' txiindexbackslashignore
+'
}
},
{
diff --git a/tp/t/results/macro/arg_body_expansion_order.pl
b/tp/t/results/macro/arg_body_expansion_order.pl
index f6ecaa10e7..14c36a3eec 100644
--- a/tp/t/results/macro/arg_body_expansion_order.pl
+++ b/tp/t/results/macro/arg_body_expansion_order.pl
@@ -57,7 +57,7 @@ $result_trees{'arg_body_expansion_order'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' othermacro
'
},
@@ -127,7 +127,7 @@ $result_trees{'arg_body_expansion_order'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' othermacro
'
}
@@ -166,7 +166,7 @@ $result_trees{'arg_body_expansion_order'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' redefineothermacro {arg}
'
},
@@ -190,11 +190,13 @@ $result_trees{'arg_body_expansion_order'} = {
],
'cmdname' => 'unmacro',
'extra' => {
- 'arg_line' => ' othermacro
-',
'misc_args' => [
'othermacro'
]
+ },
+ 'info' => {
+ 'arg_line' => ' othermacro
+'
}
},
{
@@ -240,7 +242,7 @@ $result_trees{'arg_body_expansion_order'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' othermacro
'
},
diff --git a/tp/t/results/macro/arg_not_closed.pl
b/tp/t/results/macro/arg_not_closed.pl
index 20ebccf906..c4f0d668f7 100644
--- a/tp/t/results/macro/arg_not_closed.pl
+++ b/tp/t/results/macro/arg_not_closed.pl
@@ -56,7 +56,7 @@ $result_trees{'arg_not_closed'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' foo {arg}
'
},
diff --git a/tp/t/results/macro/backslash_in_arg.pl
b/tp/t/results/macro/backslash_in_arg.pl
index c5e98111a9..5d90714a85 100644
--- a/tp/t/results/macro/backslash_in_arg.pl
+++ b/tp/t/results/macro/backslash_in_arg.pl
@@ -79,7 +79,7 @@ $result_trees{'backslash_in_arg'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' funindex {TEXT}
'
},
diff --git a/tp/t/results/macro/bad_argument.pl
b/tp/t/results/macro/bad_argument.pl
index c4df19074f..6052c05259 100644
--- a/tp/t/results/macro/bad_argument.pl
+++ b/tp/t/results/macro/bad_argument.pl
@@ -47,10 +47,12 @@ $result_trees{'bad_argument'} = {
}
],
'extra' => {
- 'arg_line' => '
-',
'invalid_syntax' => 1
},
+ 'info' => {
+ 'arg_line' => '
+'
+ },
'source_info' => {
'file_name' => '',
'line_nr' => 1,
@@ -106,10 +108,12 @@ $result_trees{'bad_argument'} = {
}
],
'extra' => {
- 'arg_line' => ' abar aaa
-',
'invalid_syntax' => 1
},
+ 'info' => {
+ 'arg_line' => ' abar aaa
+'
+ },
'source_info' => {
'file_name' => '',
'line_nr' => 5,
@@ -169,10 +173,12 @@ $result_trees{'bad_argument'} = {
}
],
'extra' => {
- 'arg_line' => ' aftername {ggg} more
-',
'invalid_syntax' => 1
},
+ 'info' => {
+ 'arg_line' => ' aftername {ggg} more
+'
+ },
'source_info' => {
'file_name' => '',
'line_nr' => 9,
@@ -222,10 +228,12 @@ $result_trees{'bad_argument'} = {
}
],
'extra' => {
- 'arg_line' => ' #badname
-',
'invalid_syntax' => 1
},
+ 'info' => {
+ 'arg_line' => ' #badname
+'
+ },
'source_info' => {
'file_name' => '',
'line_nr' => 13,
diff --git a/tp/t/results/macro/bad_formal_arg.pl
b/tp/t/results/macro/bad_formal_arg.pl
index 082a6558d8..746d7d640f 100644
--- a/tp/t/results/macro/bad_formal_arg.pl
+++ b/tp/t/results/macro/bad_formal_arg.pl
@@ -66,10 +66,12 @@ $result_trees{'bad_formal_arg'} = {
}
],
'extra' => {
- 'arg_line' => ' bad { , not_empty}
-',
'invalid_syntax' => 1
},
+ 'info' => {
+ 'arg_line' => ' bad { , not_empty}
+'
+ },
'source_info' => {
'file_name' => '',
'line_nr' => 2,
@@ -133,10 +135,12 @@ $result_trees{'bad_formal_arg'} = {
}
],
'extra' => {
- 'arg_line' => ' badspace{first, in 2arg}
-',
'invalid_syntax' => 1
},
+ 'info' => {
+ 'arg_line' => ' badspace{first, in 2arg}
+'
+ },
'source_info' => {
'file_name' => '',
'line_nr' => 6,
@@ -203,7 +207,7 @@ $result_trees{'bad_formal_arg'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' foo {? aaa}
'
}
@@ -238,10 +242,12 @@ $result_trees{'bad_formal_arg'} = {
}
],
'extra' => {
- 'arg_line' => ' abar {:::}
-',
'invalid_syntax' => 1
},
+ 'info' => {
+ 'arg_line' => ' abar {:::}
+'
+ },
'source_info' => {
'file_name' => '',
'line_nr' => 10,
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 efd36b4384..89f94693c4 100644
--- a/tp/t/results/macro/bad_macro_name_with_underscore.pl
+++ b/tp/t/results/macro/bad_macro_name_with_underscore.pl
@@ -60,7 +60,7 @@ $result_trees{'bad_macro_name_with_underscore'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' the_macro {arg1, arg2}
'
},
diff --git a/tp/t/results/macro/complete_macro_for_end.pl
b/tp/t/results/macro/complete_macro_for_end.pl
index dbcf731157..8acf48e51a 100644
--- a/tp/t/results/macro/complete_macro_for_end.pl
+++ b/tp/t/results/macro/complete_macro_for_end.pl
@@ -52,7 +52,7 @@ $result_trees{'complete_macro_for_end'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' theend
'
},
diff --git a/tp/t/results/macro/complex_argument.pl
b/tp/t/results/macro/complex_argument.pl
index 19dd054839..27e6411bb0 100644
--- a/tp/t/results/macro/complex_argument.pl
+++ b/tp/t/results/macro/complex_argument.pl
@@ -56,7 +56,7 @@ $result_trees{'complex_argument'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macrotwo{arg}
'
},
@@ -129,7 +129,7 @@ $result_trees{'complex_argument'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macrofour {}
'
},
@@ -200,7 +200,7 @@ $result_trees{'complex_argument'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macrothree{text, arg}
'
},
@@ -230,7 +230,7 @@ $result_trees{'complex_argument'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '%'
},
'source_info' => {
@@ -487,7 +487,7 @@ $result_trees{'complex_argument'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macroseven {truc}
'
},
diff --git a/tp/t/results/macro/double_macro_definition.pl
b/tp/t/results/macro/double_macro_definition.pl
index ac1f0d7a48..b901a39a2d 100644
--- a/tp/t/results/macro/double_macro_definition.pl
+++ b/tp/t/results/macro/double_macro_definition.pl
@@ -47,7 +47,7 @@ $result_trees{'double_macro_definition'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' foo
'
},
@@ -100,7 +100,7 @@ $result_trees{'double_macro_definition'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' foo
'
},
diff --git a/tp/t/results/macro/double_recursive_macro_call.pl
b/tp/t/results/macro/double_recursive_macro_call.pl
index 4cb0256d8a..0d6612cf1e 100644
--- a/tp/t/results/macro/double_recursive_macro_call.pl
+++ b/tp/t/results/macro/double_recursive_macro_call.pl
@@ -61,7 +61,7 @@ $result_trees{'double_recursive_macro_call'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macone {arg}
'
},
@@ -123,7 +123,7 @@ $result_trees{'double_recursive_macro_call'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' mactwo{arg}
'
},
diff --git a/tp/t/results/macro/empty_end.pl b/tp/t/results/macro/empty_end.pl
index d5b41576d2..393e48cb31 100644
--- a/tp/t/results/macro/empty_end.pl
+++ b/tp/t/results/macro/empty_end.pl
@@ -52,7 +52,7 @@ $result_trees{'empty_end'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' foo {aaa, }
'
},
diff --git a/tp/t/results/macro/empty_macro_argument.pl
b/tp/t/results/macro/empty_macro_argument.pl
index b7c68c2812..8b93ba7bea 100644
--- a/tp/t/results/macro/empty_macro_argument.pl
+++ b/tp/t/results/macro/empty_macro_argument.pl
@@ -52,7 +52,7 @@ $result_trees{'empty_macro_argument'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' mymacro{}
'
},
@@ -128,7 +128,7 @@ $result_trees{'empty_macro_argument'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' mytwo{arg}
'
},
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 1ebdd0756c..055164353b 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
@@ -47,7 +47,7 @@ $result_trees{'empty_macro_in_text_no_arg'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' texnl{}
'
},
@@ -118,7 +118,7 @@ $result_trees{'empty_macro_in_text_no_arg'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' texnltwo
'
},
diff --git a/tp/t/results/macro/empty_macro_no_arg.pl
b/tp/t/results/macro/empty_macro_no_arg.pl
index 54adebe6db..229b8cf7fc 100644
--- a/tp/t/results/macro/empty_macro_no_arg.pl
+++ b/tp/t/results/macro/empty_macro_no_arg.pl
@@ -47,7 +47,7 @@ $result_trees{'empty_macro_no_arg'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' foo
'
},
diff --git a/tp/t/results/macro/expand_two_same.pl
b/tp/t/results/macro/expand_two_same.pl
index 31e20d4049..acb87ddfab 100644
--- a/tp/t/results/macro/expand_two_same.pl
+++ b/tp/t/results/macro/expand_two_same.pl
@@ -61,7 +61,7 @@ $result_trees{'expand_two_same'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macrotwo { arg }
'
},
diff --git a/tp/t/results/macro/expansion_order.pl
b/tp/t/results/macro/expansion_order.pl
index 11cfaf9ea4..95f36d7196 100644
--- a/tp/t/results/macro/expansion_order.pl
+++ b/tp/t/results/macro/expansion_order.pl
@@ -56,7 +56,7 @@ $result_trees{'expansion_order'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' bidule{arg}
'
},
@@ -119,7 +119,7 @@ $result_trees{'expansion_order'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' machin
'
},
diff --git a/tp/t/results/macro/form_feeds.pl b/tp/t/results/macro/form_feeds.pl
index 5f886704b3..967002b17e 100644
--- a/tp/t/results/macro/form_feeds.pl
+++ b/tp/t/results/macro/form_feeds.pl
@@ -60,7 +60,7 @@ $result_trees{'form_feeds'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' mymacro{a, b}
'
},
@@ -122,7 +122,7 @@ $result_trees{'form_feeds'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' oneargmacro{c}
'
},
diff --git a/tp/t/results/macro/ifclear_in_macro.pl
b/tp/t/results/macro/ifclear_in_macro.pl
index d35ae74dfa..0e244d9c88 100644
--- a/tp/t/results/macro/ifclear_in_macro.pl
+++ b/tp/t/results/macro/ifclear_in_macro.pl
@@ -66,7 +66,7 @@ $result_trees{'ifclear_in_macro'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' note {arg}
'
},
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 27b4124b21..dbad9f912e 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
@@ -52,7 +52,7 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' beginifset {}
'
},
@@ -110,7 +110,7 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' endifset {}
'
},
diff --git a/tp/t/results/macro/ifset_in_macro.pl
b/tp/t/results/macro/ifset_in_macro.pl
index f9bb5e6fc7..9351b36bfe 100644
--- a/tp/t/results/macro/ifset_in_macro.pl
+++ b/tp/t/results/macro/ifset_in_macro.pl
@@ -66,7 +66,7 @@ $result_trees{'ifset_in_macro'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' note {arg}
'
},
diff --git a/tp/t/results/macro/ifset_in_macro_set.pl
b/tp/t/results/macro/ifset_in_macro_set.pl
index b7237893b7..274d856cba 100644
--- a/tp/t/results/macro/ifset_in_macro_set.pl
+++ b/tp/t/results/macro/ifset_in_macro_set.pl
@@ -66,7 +66,7 @@ $result_trees{'ifset_in_macro_set'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' note {arg}
'
},
diff --git a/tp/t/results/macro/ignored_macro_definition.pl
b/tp/t/results/macro/ignored_macro_definition.pl
index 6a449507de..625470e42a 100644
--- a/tp/t/results/macro/ignored_macro_definition.pl
+++ b/tp/t/results/macro/ignored_macro_definition.pl
@@ -52,7 +52,7 @@ $result_trees{'ignored_macro_definition'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' mymacro{}
'
},
diff --git a/tp/t/results/macro/implicit_quoting_one_arg.pl
b/tp/t/results/macro/implicit_quoting_one_arg.pl
index d4e64a3bf3..869aa8839b 100644
--- a/tp/t/results/macro/implicit_quoting_one_arg.pl
+++ b/tp/t/results/macro/implicit_quoting_one_arg.pl
@@ -61,7 +61,7 @@ $result_trees{'implicit_quoting_one_arg'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' FIXAME{a}
'
},
diff --git a/tp/t/results/macro/implicit_quoting_recursion.pl
b/tp/t/results/macro/implicit_quoting_recursion.pl
index 924f8a81af..04ae9a1a4e 100644
--- a/tp/t/results/macro/implicit_quoting_recursion.pl
+++ b/tp/t/results/macro/implicit_quoting_recursion.pl
@@ -60,7 +60,7 @@ $result_trees{'implicit_quoting_recursion'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' cat{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 965ef41ab9..20cf088b4d 100644
--- a/tp/t/results/macro/include_after_empty_line_arg.pl
+++ b/tp/t/results/macro/include_after_empty_line_arg.pl
@@ -56,7 +56,7 @@ $result_trees{'include_after_empty_line_arg'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' mymacro{body}
'
},
diff --git a/tp/t/results/macro/leading_spaces_no_ignore.pl
b/tp/t/results/macro/leading_spaces_no_ignore.pl
index f63bd95a64..65467ecc89 100644
--- a/tp/t/results/macro/leading_spaces_no_ignore.pl
+++ b/tp/t/results/macro/leading_spaces_no_ignore.pl
@@ -57,7 +57,7 @@ $result_trees{'leading_spaces_no_ignore'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' mymacro
'
},
diff --git a/tp/t/results/macro/line_after_recursive_call.pl
b/tp/t/results/macro/line_after_recursive_call.pl
index b9a79a7906..dabd4f4bb4 100644
--- a/tp/t/results/macro/line_after_recursive_call.pl
+++ b/tp/t/results/macro/line_after_recursive_call.pl
@@ -62,7 +62,7 @@ $result_trees{'line_after_recursive_call'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' mac
'
},
diff --git a/tp/t/results/macro/macro_expands_to_empty.pl
b/tp/t/results/macro/macro_expands_to_empty.pl
index 9619d416a9..790d7d0a68 100644
--- a/tp/t/results/macro/macro_expands_to_empty.pl
+++ b/tp/t/results/macro/macro_expands_to_empty.pl
@@ -56,7 +56,7 @@ $result_trees{'macro_expands_to_empty'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' foo {arg}
'
},
diff --git a/tp/t/results/macro/macro_expansion.pl
b/tp/t/results/macro/macro_expansion.pl
index 4230ced21d..a6bbe03d8d 100644
--- a/tp/t/results/macro/macro_expansion.pl
+++ b/tp/t/results/macro/macro_expansion.pl
@@ -80,7 +80,7 @@ $result_trees{'macro_expansion'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macroone {arg1, arg2 }
'
},
diff --git a/tp/t/results/macro/macro_for_end.pl
b/tp/t/results/macro/macro_for_end.pl
index d29e599fbd..f3fd6001e7 100644
--- a/tp/t/results/macro/macro_for_end.pl
+++ b/tp/t/results/macro/macro_for_end.pl
@@ -52,7 +52,7 @@ $result_trees{'macro_for_end'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' myend
'
},
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 f0941a55b4..31d67292c3 100644
--- a/tp/t/results/macro/macro_for_ignored_line_command.pl
+++ b/tp/t/results/macro/macro_for_ignored_line_command.pl
@@ -52,7 +52,7 @@ $result_trees{'macro_for_ignored_line_command'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' pagemacro
'
},
diff --git a/tp/t/results/macro/macro_in_accent.pl
b/tp/t/results/macro/macro_in_accent.pl
index bf204a0b0a..d9798e0e01 100644
--- a/tp/t/results/macro/macro_in_accent.pl
+++ b/tp/t/results/macro/macro_in_accent.pl
@@ -52,7 +52,7 @@ $result_trees{'macro_in_accent'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' aletter
'
},
@@ -110,7 +110,7 @@ $result_trees{'macro_in_accent'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' aspace
'
},
diff --git a/tp/t/results/macro/macro_in_brace_command.pl
b/tp/t/results/macro/macro_in_brace_command.pl
index 6efee5dbbd..7a51299374 100644
--- a/tp/t/results/macro/macro_in_brace_command.pl
+++ b/tp/t/results/macro/macro_in_brace_command.pl
@@ -52,7 +52,7 @@ $result_trees{'macro_in_brace_command'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' foo
'
},
@@ -110,7 +110,7 @@ $result_trees{'macro_in_brace_command'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' abar
'
},
diff --git a/tp/t/results/macro/macro_in_end_argument.pl
b/tp/t/results/macro/macro_in_end_argument.pl
index 1c24f2dc2a..42c1fdbeed 100644
--- a/tp/t/results/macro/macro_in_end_argument.pl
+++ b/tp/t/results/macro/macro_in_end_argument.pl
@@ -52,7 +52,7 @@ $result_trees{'macro_in_end_argument'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' acartouche
'
},
diff --git a/tp/t/results/macro/macro_in_ifset.pl
b/tp/t/results/macro/macro_in_ifset.pl
index f423bc4fb9..584036dc07 100644
--- a/tp/t/results/macro/macro_in_ifset.pl
+++ b/tp/t/results/macro/macro_in_ifset.pl
@@ -56,7 +56,7 @@ $result_trees{'macro_in_ifset'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macroone {arg}
'
},
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 becc4cda21..c706b002fd 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
@@ -56,7 +56,7 @@ $result_trees{'macro_in_ifset_end_in_arg'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macroone {arg}
'
},
diff --git a/tp/t/results/macro/macro_in_index_commands.pl
b/tp/t/results/macro/macro_in_index_commands.pl
index 389f7cddea..3604f95c58 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -52,7 +52,7 @@ $result_trees{'macro_in_index_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' cp
'
},
@@ -105,7 +105,7 @@ $result_trees{'macro_in_index_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' fn
'
},
@@ -158,7 +158,7 @@ $result_trees{'macro_in_index_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' syncodeindexcommand
'
},
@@ -283,7 +283,7 @@ $result_trees{'macro_in_index_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' truc
'
},
@@ -389,7 +389,7 @@ $result_trees{'macro_in_index_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' trucindexcommand
'
},
@@ -447,7 +447,7 @@ $result_trees{'macro_in_index_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' codeidx
'
},
@@ -540,7 +540,7 @@ $result_trees{'macro_in_index_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' defcodeindexentry
'
},
diff --git a/tp/t/results/macro/macro_in_invalid_documentencoding.pl
b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
index e1a995c9f0..0b7a39bfa6 100644
--- a/tp/t/results/macro/macro_in_invalid_documentencoding.pl
+++ b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
@@ -52,7 +52,7 @@ $result_trees{'macro_in_invalid_documentencoding'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' badmacro
'
},
diff --git a/tp/t/results/macro/macro_in_macro_arg.pl
b/tp/t/results/macro/macro_in_macro_arg.pl
index c7b124157d..226d5faefb 100644
--- a/tp/t/results/macro/macro_in_macro_arg.pl
+++ b/tp/t/results/macro/macro_in_macro_arg.pl
@@ -57,7 +57,7 @@ $result_trees{'macro_in_macro_arg'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macroone
'
},
@@ -119,7 +119,7 @@ $result_trees{'macro_in_macro_arg'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macrotwo{arg}
'
},
@@ -190,7 +190,7 @@ $result_trees{'macro_in_macro_arg'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macrothree{text, arg}
'
},
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 453b671329..c9ac66899d 100644
--- a/tp/t/results/macro/macro_in_macro_arg_simpler.pl
+++ b/tp/t/results/macro/macro_in_macro_arg_simpler.pl
@@ -52,7 +52,7 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macrooneone
'
},
@@ -123,7 +123,7 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macrothree{text, arg}
'
},
diff --git a/tp/t/results/macro/macro_in_menu.pl
b/tp/t/results/macro/macro_in_menu.pl
index b82d0aa862..6380b6e2f5 100644
--- a/tp/t/results/macro/macro_in_menu.pl
+++ b/tp/t/results/macro/macro_in_menu.pl
@@ -57,7 +57,7 @@ $result_trees{'macro_in_menu'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' astar
'
},
@@ -115,7 +115,7 @@ $result_trees{'macro_in_menu'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' starspaces
'
},
@@ -173,7 +173,7 @@ $result_trees{'macro_in_menu'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' spaces
'
},
@@ -231,7 +231,7 @@ $result_trees{'macro_in_menu'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' aspace
'
},
@@ -289,7 +289,7 @@ $result_trees{'macro_in_menu'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' twocolon
'
},
@@ -347,7 +347,7 @@ $result_trees{'macro_in_menu'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' acolon
'
},
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl
b/tp/t/results/macro/macro_in_misc_commands.pl
index cec533963c..5441760ba4 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -52,7 +52,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' text
'
},
@@ -110,7 +110,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' Top
'
},
@@ -302,7 +302,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' en
'
},
@@ -355,7 +355,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' documentlanguagecommand
'
},
@@ -500,7 +500,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' pagesizesarg
'
},
@@ -558,7 +558,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' afourpapermacro
'
},
@@ -736,7 +736,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' needarg
'
},
@@ -829,7 +829,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' raisesectionsmacro
'
},
@@ -892,7 +892,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' lowersectionsmacro
'
},
@@ -1045,7 +1045,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' definfoenclosename
'
},
@@ -1172,7 +1172,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' strongmacro
'
},
@@ -1225,7 +1225,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' strongname
'
},
@@ -1421,7 +1421,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' kbdinputstylearg
'
},
@@ -1626,7 +1626,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' asisarg
'
},
@@ -1679,7 +1679,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' zero
'
},
@@ -1732,7 +1732,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' nonearg
'
},
@@ -1785,7 +1785,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' four
'
},
@@ -1838,7 +1838,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' six
'
},
@@ -2081,7 +2081,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' endarg
'
},
@@ -2134,7 +2134,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' separatearg
'
},
@@ -2252,7 +2252,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' onarg
'
},
@@ -2305,7 +2305,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' offarg
'
},
@@ -2439,7 +2439,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' ten
'
},
@@ -2538,7 +2538,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' falsearg
'
},
@@ -2591,7 +2591,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' truearg
'
},
@@ -2714,7 +2714,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' pagemacro
'
},
@@ -2767,7 +2767,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' noindentmacro
'
},
@@ -2820,7 +2820,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' refillmacro
'
},
@@ -3099,7 +3099,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' contentsmacro
'
},
@@ -3193,7 +3193,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' exdentmacro
'
},
@@ -3276,7 +3276,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' two
'
},
@@ -3364,7 +3364,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' resultmacro
'
},
@@ -3388,12 +3388,14 @@ $result_trees{'macro_in_misc_commands'} = {
],
'cmdname' => 'clickstyle',
'extra' => {
- 'arg_line' => ' @resultmacro{}
-',
'misc_args' => [
'@resultmacro'
]
},
+ 'info' => {
+ 'arg_line' => ' @resultmacro{}
+'
+ },
'source_info' => {
'file_name' => '',
'line_nr' => 197,
@@ -3641,7 +3643,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' shortcontentsmacro
'
},
@@ -3714,7 +3716,7 @@ $result_trees{'macro_in_misc_commands'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' byemacro
'
},
diff --git a/tp/t/results/macro/macro_name_with_digit.pl
b/tp/t/results/macro/macro_name_with_digit.pl
index cebf0423cd..4fba4ce36a 100644
--- a/tp/t/results/macro/macro_name_with_digit.pl
+++ b/tp/t/results/macro/macro_name_with_digit.pl
@@ -52,7 +52,7 @@ $result_trees{'macro_name_with_digit'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macro1
'
},
@@ -114,7 +114,7 @@ $result_trees{'macro_name_with_digit'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macro11 {arg}
'
},
diff --git a/tp/t/results/macro/macro_name_with_hyphen.pl
b/tp/t/results/macro/macro_name_with_hyphen.pl
index 38d170f554..e6c0f3c9c7 100644
--- a/tp/t/results/macro/macro_name_with_hyphen.pl
+++ b/tp/t/results/macro/macro_name_with_hyphen.pl
@@ -60,7 +60,7 @@ $result_trees{'macro_name_with_hyphen'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macro-one {arg-one, arg2}
'
},
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 d3b07b3939..010ab8cd35 100644
--- a/tp/t/results/macro/macro_no_arg_bad_expansion.pl
+++ b/tp/t/results/macro/macro_no_arg_bad_expansion.pl
@@ -52,7 +52,7 @@ $result_trees{'macro_no_arg_bad_expansion'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' testone
'
},
diff --git a/tp/t/results/macro/macro_no_arg_expansion.pl
b/tp/t/results/macro/macro_no_arg_expansion.pl
index 679936ec7a..160846e77d 100644
--- a/tp/t/results/macro/macro_no_arg_expansion.pl
+++ b/tp/t/results/macro/macro_no_arg_expansion.pl
@@ -52,7 +52,7 @@ $result_trees{'macro_no_arg_expansion'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' testone
'
},
diff --git a/tp/t/results/macro/macro_no_argument.pl
b/tp/t/results/macro/macro_no_argument.pl
index 860056e431..09579b420d 100644
--- a/tp/t/results/macro/macro_no_argument.pl
+++ b/tp/t/results/macro/macro_no_argument.pl
@@ -12,9 +12,11 @@ $result_trees{'macro_no_argument'} = {
{
'cmdname' => 'macro',
'extra' => {
- 'arg_line' => '',
'invalid_syntax' => 1
},
+ 'info' => {
+ 'arg_line' => ''
+ },
'source_info' => {
'file_name' => '',
'line_nr' => 1,
diff --git a/tp/t/results/macro/macro_not_closed.pl
b/tp/t/results/macro/macro_not_closed.pl
index f3339b587b..a06868d1fe 100644
--- a/tp/t/results/macro/macro_not_closed.pl
+++ b/tp/t/results/macro/macro_not_closed.pl
@@ -24,7 +24,7 @@ $result_trees{'macro_not_closed'} = {
'type' => 'raw'
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' name
'
},
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 ca9bbc3d87..00469247c7 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
@@ -56,7 +56,7 @@ $result_trees{'macro_one_arg_end_of_file'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' onearg{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 cfe5ccaf69..e416a458be 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
@@ -56,7 +56,7 @@ $result_trees{'macro_with_error_at_end_line_after_macro'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' witherror{string}
'
},
diff --git a/tp/t/results/macro/macro_zero.pl b/tp/t/results/macro/macro_zero.pl
index b9d74e1725..4527b79b12 100644
--- a/tp/t/results/macro/macro_zero.pl
+++ b/tp/t/results/macro/macro_zero.pl
@@ -52,7 +52,7 @@ $result_trees{'macro_zero'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' zero
'
},
diff --git a/tp/t/results/macro/nested_macro_call.pl
b/tp/t/results/macro/nested_macro_call.pl
index cfdff1920d..5d2bd667e3 100644
--- a/tp/t/results/macro/nested_macro_call.pl
+++ b/tp/t/results/macro/nested_macro_call.pl
@@ -52,7 +52,7 @@ $result_trees{'nested_macro_call'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' machin{}
'
},
@@ -115,7 +115,7 @@ $result_trees{'nested_macro_call'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' truc{}
'
},
diff --git a/tp/t/results/macro/no_macrobody.pl
b/tp/t/results/macro/no_macrobody.pl
index 4f27e08700..942cc1fa81 100644
--- a/tp/t/results/macro/no_macrobody.pl
+++ b/tp/t/results/macro/no_macrobody.pl
@@ -51,7 +51,7 @@ $result_trees{'no_macrobody'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' nomacrobody {arg}
'
},
diff --git a/tp/t/results/macro/paragraph_and_macro.pl
b/tp/t/results/macro/paragraph_and_macro.pl
index cb5a87439f..9bb4eb348a 100644
--- a/tp/t/results/macro/paragraph_and_macro.pl
+++ b/tp/t/results/macro/paragraph_and_macro.pl
@@ -47,7 +47,7 @@ $result_trees{'paragraph_and_macro'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' aempty
'
},
@@ -105,7 +105,7 @@ $result_trees{'paragraph_and_macro'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' aspace
'
},
@@ -163,7 +163,7 @@ $result_trees{'paragraph_and_macro'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' word
'
},
diff --git a/tp/t/results/macro/protect_comma_macro_line.pl
b/tp/t/results/macro/protect_comma_macro_line.pl
index 7a9a60a4c4..d463c1e311 100644
--- a/tp/t/results/macro/protect_comma_macro_line.pl
+++ b/tp/t/results/macro/protect_comma_macro_line.pl
@@ -71,7 +71,7 @@ $result_trees{'protect_comma_macro_line'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macrotwo { arg }
'
},
diff --git a/tp/t/results/macro/protect_in_body.pl
b/tp/t/results/macro/protect_in_body.pl
index 11b0eefed1..70c83a1813 100644
--- a/tp/t/results/macro/protect_in_body.pl
+++ b/tp/t/results/macro/protect_in_body.pl
@@ -60,7 +60,7 @@ $result_trees{'protect_in_body'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macroone { arg1 , 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 7732d62d81..6d8d22fbd3 100644
--- a/tp/t/results/macro/protect_in_body_line_arg.pl
+++ b/tp/t/results/macro/protect_in_body_line_arg.pl
@@ -60,7 +60,7 @@ $result_trees{'protect_in_body_line_arg'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macroone { arg1 , 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 682a29a410..c822c21869 100644
--- a/tp/t/results/macro/protect_in_body_one_arg.pl
+++ b/tp/t/results/macro/protect_in_body_one_arg.pl
@@ -60,7 +60,7 @@ $result_trees{'protect_in_body_one_arg'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macroone { arg1 , arg2 }
'
},
diff --git a/tp/t/results/macro/recursive_call_in_argument.pl
b/tp/t/results/macro/recursive_call_in_argument.pl
index 3adf718b18..ca6c443e77 100644
--- a/tp/t/results/macro/recursive_call_in_argument.pl
+++ b/tp/t/results/macro/recursive_call_in_argument.pl
@@ -56,7 +56,7 @@ $result_trees{'recursive_call_in_argument'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' anorecurse{arg}
'
},
diff --git a/tp/t/results/macro/recursive_call_in_macro.pl
b/tp/t/results/macro/recursive_call_in_macro.pl
index b4ad300454..3a98faf984 100644
--- a/tp/t/results/macro/recursive_call_in_macro.pl
+++ b/tp/t/results/macro/recursive_call_in_macro.pl
@@ -56,7 +56,7 @@ $result_trees{'recursive_call_in_macro'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' anorecurse{arg}
'
},
diff --git a/tp/t/results/macro/redefine_texinfo_macro.pl
b/tp/t/results/macro/redefine_texinfo_macro.pl
index 127fd9c047..f8b800f965 100644
--- a/tp/t/results/macro/redefine_texinfo_macro.pl
+++ b/tp/t/results/macro/redefine_texinfo_macro.pl
@@ -56,7 +56,7 @@ $result_trees{'redefine_texinfo_macro'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' code{arg}
'
},
diff --git a/tp/t/results/macro/simple_imbricated_macro.pl
b/tp/t/results/macro/simple_imbricated_macro.pl
index 8a8137ca4c..fa8d781617 100644
--- a/tp/t/results/macro/simple_imbricated_macro.pl
+++ b/tp/t/results/macro/simple_imbricated_macro.pl
@@ -60,7 +60,7 @@ $result_trees{'simple_imbricated_macro'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' bidule {}
'
}
@@ -94,7 +94,7 @@ $result_trees{'simple_imbricated_macro'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' truc {}
'
},
@@ -158,7 +158,7 @@ $result_trees{'simple_imbricated_macro'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' bidule {}
'
},
diff --git a/tp/t/results/macro/space_macro_after_end.pl
b/tp/t/results/macro/space_macro_after_end.pl
index 7c52631cea..52d6bcfe07 100644
--- a/tp/t/results/macro/space_macro_after_end.pl
+++ b/tp/t/results/macro/space_macro_after_end.pl
@@ -52,7 +52,7 @@ $result_trees{'space_macro_after_end'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' spaces
'
},
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 d46393864a..ab32deed3d 100644
--- a/tp/t/results/macro/space_macro_after_end_verbatim.pl
+++ b/tp/t/results/macro/space_macro_after_end_verbatim.pl
@@ -52,7 +52,7 @@ $result_trees{'space_macro_after_end_verbatim'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' spaces
'
},
diff --git a/tp/t/results/macro/text_before_after.pl
b/tp/t/results/macro/text_before_after.pl
index 68ec48471d..927b8684c4 100644
--- a/tp/t/results/macro/text_before_after.pl
+++ b/tp/t/results/macro/text_before_after.pl
@@ -57,7 +57,7 @@ $result_trees{'text_before_after'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' mymacro
'
},
diff --git a/tp/t/results/macro/too_much_args.pl
b/tp/t/results/macro/too_much_args.pl
index 4496f3b1d1..d998ac678c 100644
--- a/tp/t/results/macro/too_much_args.pl
+++ b/tp/t/results/macro/too_much_args.pl
@@ -65,7 +65,7 @@ $result_trees{'too_much_args'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' twoargs {first, second}
'
},
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 4e6da213fa..4f9929cd54 100644
--- a/tp/t/results/macro/two_macros_on_a_line.pl
+++ b/tp/t/results/macro/two_macros_on_a_line.pl
@@ -52,7 +52,7 @@ $result_trees{'two_macros_on_a_line'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' mymacro
'
},
@@ -124,7 +124,7 @@ $result_trees{'two_macros_on_a_line'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' mymacrowithargs{arg}
'
},
diff --git a/tp/t/results/macro/zero_argument.pl
b/tp/t/results/macro/zero_argument.pl
index 5b291bdeb2..65a924ad31 100644
--- a/tp/t/results/macro/zero_argument.pl
+++ b/tp/t/results/macro/zero_argument.pl
@@ -52,7 +52,7 @@ $result_trees{'zero_argument'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' foo {}
'
},
@@ -106,7 +106,7 @@ $result_trees{'zero_argument'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' abar
'
},
diff --git a/tp/t/results/menu/verb_in_menu_description.pl
b/tp/t/results/menu/verb_in_menu_description.pl
index 1c96a4ee68..4927d496b3 100644
--- a/tp/t/results/menu/verb_in_menu_description.pl
+++ b/tp/t/results/menu/verb_in_menu_description.pl
@@ -134,7 +134,7 @@ $result_trees{'verb_in_menu_description'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
diff --git a/tp/t/results/misc_commands/clickstyle.pl
b/tp/t/results/misc_commands/clickstyle.pl
index e8881b8811..daffa03b3a 100644
--- a/tp/t/results/misc_commands/clickstyle.pl
+++ b/tp/t/results/misc_commands/clickstyle.pl
@@ -18,12 +18,14 @@ $result_trees{'clickstyle'} = {
],
'cmdname' => 'clickstyle',
'extra' => {
- 'arg_line' => ' @result
-',
'misc_args' => [
'@result'
]
},
+ 'info' => {
+ 'arg_line' => ' @result
+'
+ },
'source_info' => {
'file_name' => '',
'line_nr' => 1,
diff --git
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index d24e957f49..3cf6a0c914 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -79,7 +79,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' quotes
'
},
@@ -217,7 +217,7 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' allquotes
'
},
diff --git a/tp/t/results/misc_commands/invalid_clickstyle.pl
b/tp/t/results/misc_commands/invalid_clickstyle.pl
index 026e93d12d..3b3b5a5cce 100644
--- a/tp/t/results/misc_commands/invalid_clickstyle.pl
+++ b/tp/t/results/misc_commands/invalid_clickstyle.pl
@@ -23,12 +23,14 @@ $result_trees{'invalid_clickstyle'} = {
],
'cmdname' => 'clickstyle',
'extra' => {
- 'arg_line' => ' @result on the same line
-',
'misc_args' => [
'@result'
]
},
+ 'info' => {
+ 'arg_line' => ' @result on the same line
+'
+ },
'source_info' => {
'file_name' => '',
'line_nr' => 2,
@@ -82,12 +84,14 @@ $result_trees{'invalid_clickstyle'} = {
],
'cmdname' => 'clickstyle',
'extra' => {
- 'arg_line' => ' @nocmd
-',
'misc_args' => [
'@nocmd'
]
},
+ 'info' => {
+ 'arg_line' => ' @nocmd
+'
+ },
'source_info' => {
'file_name' => '',
'line_nr' => 6,
@@ -134,7 +138,7 @@ $result_trees{'invalid_clickstyle'} = {
},
{
'cmdname' => 'clickstyle',
- 'extra' => {
+ 'info' => {
'arg_line' => ' something
'
},
diff --git a/tp/t/results/misc_commands/kbdinputstyle.pl
b/tp/t/results/misc_commands/kbdinputstyle.pl
index e30f306866..f7493bbdd0 100644
--- a/tp/t/results/misc_commands/kbdinputstyle.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle.pl
@@ -107,7 +107,7 @@ $result_trees{'kbdinputstyle'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' codekbdmacro
'
},
diff --git a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
index 5347032447..99bd7ad91a 100644
--- a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
@@ -132,7 +132,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' codekbdmacro
'
},
diff --git a/tp/t/results/misc_commands/setfilename.pl
b/tp/t/results/misc_commands/setfilename.pl
index 6268c36b3c..de56b9dd4e 100644
--- a/tp/t/results/misc_commands/setfilename.pl
+++ b/tp/t/results/misc_commands/setfilename.pl
@@ -146,7 +146,7 @@ $result_trees{'setfilename'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ':'
},
'source_info' => {
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index 797e2504c0..42586815e2 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -110,7 +110,7 @@ $result_trees{'test_allowcodebreaks'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' testallowcodebreakspara {nr}
'
},
@@ -183,7 +183,7 @@ $result_trees{'test_allowcodebreaks'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' testallowcodebreaksexample{}
'
},
diff --git a/tp/t/results/plaintext_tests/multiline_verb_after_space.pl
b/tp/t/results/plaintext_tests/multiline_verb_after_space.pl
index cb56c19331..cf2a6a9b5c 100644
--- a/tp/t/results/plaintext_tests/multiline_verb_after_space.pl
+++ b/tp/t/results/plaintext_tests/multiline_verb_after_space.pl
@@ -32,7 +32,7 @@ $result_trees{'multiline_verb_after_space'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '*'
},
'source_info' => {
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 9e923fef3b..43060df6a0 100644
--- a/tp/t/results/plaintext_tests/star_at_command_formatting.pl
+++ b/tp/t/results/plaintext_tests/star_at_command_formatting.pl
@@ -107,7 +107,7 @@ $result_trees{'star_at_command_formatting'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' mymacro
'
},
diff --git a/tp/t/results/raw/nested_macros.pl
b/tp/t/results/raw/nested_macros.pl
index 2a9230529e..83629aefe9 100644
--- a/tp/t/results/raw/nested_macros.pl
+++ b/tp/t/results/raw/nested_macros.pl
@@ -68,7 +68,7 @@ $result_trees{'nested_macros'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' othermacro
'
}
@@ -105,7 +105,7 @@ $result_trees{'nested_macros'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => '
'
}
@@ -139,7 +139,7 @@ $result_trees{'nested_macros'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' truc { arg, ex}
'
},
diff --git a/tp/t/results/sectioning/raiselowersections.pl
b/tp/t/results/sectioning/raiselowersections.pl
index 2e882406fc..895e1498f2 100644
--- a/tp/t/results/sectioning/raiselowersections.pl
+++ b/tp/t/results/sectioning/raiselowersections.pl
@@ -425,12 +425,14 @@ $result_trees{'raiselowersections'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' do-top
-',
'misc_args' => [
'do-top',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' do-top
+'
}
},
{
@@ -938,11 +940,13 @@ $result_trees{'raiselowersections'} = {
],
'cmdname' => 'clear',
'extra' => {
- 'arg_line' => ' do-top
-',
'misc_args' => [
'do-top'
]
+ },
+ 'info' => {
+ 'arg_line' => ' do-top
+'
}
},
{
diff --git a/tp/t/results/value/bad_syntax.pl b/tp/t/results/value/bad_syntax.pl
index 3af5142d2e..e569a47227 100644
--- a/tp/t/results/value/bad_syntax.pl
+++ b/tp/t/results/value/bad_syntax.pl
@@ -16,49 +16,49 @@ $result_trees{'bad_syntax'} = {
},
{
'cmdname' => 'set',
- 'extra' => {
+ 'info' => {
'arg_line' => '
'
}
},
{
'cmdname' => 'set',
- 'extra' => {
+ 'info' => {
'arg_line' => '
'
}
},
{
'cmdname' => 'set',
- 'extra' => {
+ 'info' => {
'arg_line' => ' ?
'
}
},
{
'cmdname' => 'set',
- 'extra' => {
+ 'info' => {
'arg_line' => ' :-/ hey!
'
}
},
{
'cmdname' => 'set',
- 'extra' => {
+ 'info' => {
'arg_line' => ' a@b
'
}
},
{
'cmdname' => 'set',
- 'extra' => {
+ 'info' => {
'arg_line' => ' :-" bad
'
}
},
{
'cmdname' => 'set',
- 'extra' => {
+ 'info' => {
'arg_line' => ' } no
'
}
@@ -70,14 +70,14 @@ $result_trees{'bad_syntax'} = {
},
{
'cmdname' => 'clear',
- 'extra' => {
+ 'info' => {
'arg_line' => ' aaa ggg
'
}
},
{
'cmdname' => 'clear',
- 'extra' => {
+ 'info' => {
'arg_line' => ' and{other
'
}
diff --git a/tp/t/results/value/comment_on_set_line.pl
b/tp/t/results/value/comment_on_set_line.pl
index b2e392b587..c47b0b6038 100644
--- a/tp/t/results/value/comment_on_set_line.pl
+++ b/tp/t/results/value/comment_on_set_line.pl
@@ -22,12 +22,14 @@ $result_trees{'comment_on_set_line'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' x@c
-',
'misc_args' => [
'x',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' x@c
+'
}
},
{
@@ -43,12 +45,14 @@ $result_trees{'comment_on_set_line'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' y @c
-',
'misc_args' => [
'y',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' y @c
+'
}
},
{
@@ -64,12 +68,14 @@ $result_trees{'comment_on_set_line'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' z g@c
-',
'misc_args' => [
'z',
'g'
]
+ },
+ 'info' => {
+ 'arg_line' => ' z g@c
+'
}
},
{
@@ -85,12 +91,14 @@ $result_trees{'comment_on_set_line'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' t a vv @comment@ggg
-',
'misc_args' => [
't',
'a vv'
]
+ },
+ 'info' => {
+ 'arg_line' => ' t a vv @comment@ggg
+'
}
},
{
diff --git a/tp/t/results/value/empty_set.pl b/tp/t/results/value/empty_set.pl
index 67dcc4a70d..385c1e5b3b 100644
--- a/tp/t/results/value/empty_set.pl
+++ b/tp/t/results/value/empty_set.pl
@@ -22,12 +22,14 @@ $result_trees{'empty_set'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' myspace
-',
'misc_args' => [
'myspace',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' myspace
+'
}
},
{
diff --git a/tp/t/results/value/empty_value_in_line.pl
b/tp/t/results/value/empty_value_in_line.pl
index 8be06abb3f..a016225a5d 100644
--- a/tp/t/results/value/empty_value_in_line.pl
+++ b/tp/t/results/value/empty_value_in_line.pl
@@ -22,12 +22,14 @@ $result_trees{'empty_value_in_line'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' myspace
-',
'misc_args' => [
'myspace',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' myspace
+'
}
},
{
diff --git a/tp/t/results/value/ignored_value_definition.pl
b/tp/t/results/value/ignored_value_definition.pl
index 65e3322884..760855108c 100644
--- a/tp/t/results/value/ignored_value_definition.pl
+++ b/tp/t/results/value/ignored_value_definition.pl
@@ -22,12 +22,14 @@ $result_trees{'ignored_value_definition'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' aa outside
-',
'misc_args' => [
'aa',
'outside'
]
+ },
+ 'info' => {
+ 'arg_line' => ' aa outside
+'
}
},
{
diff --git a/tp/t/results/value/not_only_characters.pl
b/tp/t/results/value/not_only_characters.pl
index ca78290926..597a9ffcee 100644
--- a/tp/t/results/value/not_only_characters.pl
+++ b/tp/t/results/value/not_only_characters.pl
@@ -22,12 +22,14 @@ $result_trees{'not_only_characters'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' -e_\'::; hh
-',
'misc_args' => [
'-e_\'::;',
'hh'
]
+ },
+ 'info' => {
+ 'arg_line' => ' -e_\'::; hh
+'
}
},
{
diff --git a/tp/t/results/value/set_form_feed.pl
b/tp/t/results/value/set_form_feed.pl
index db96aa849f..186f2433d9 100644
--- a/tp/t/results/value/set_form_feed.pl
+++ b/tp/t/results/value/set_form_feed.pl
@@ -22,12 +22,14 @@ $result_trees{'set_form_feed'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' gg a\\a\\f\\\\
-',
'misc_args' => [
'gg',
'a\\a\\f\\\\'
]
+ },
+ 'info' => {
+ 'arg_line' => ' gg a\\a\\f\\\\
+'
}
},
{
@@ -43,12 +45,14 @@ $result_trees{'set_form_feed'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' hh
-',
'misc_args' => [
'hh',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' hh
+'
}
},
{
@@ -64,12 +68,14 @@ $result_trees{'set_form_feed'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' ll
-',
'misc_args' => [
'll',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' ll
+'
}
},
{
diff --git a/tp/t/results/value/set_in_item_missing_line.pl
b/tp/t/results/value/set_in_item_missing_line.pl
index 87d5bf9ed4..a88e0ed6aa 100644
--- a/tp/t/results/value/set_in_item_missing_line.pl
+++ b/tp/t/results/value/set_in_item_missing_line.pl
@@ -56,12 +56,14 @@ $result_trees{'set_in_item_missing_line'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' n
-',
'misc_args' => [
'n',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' n
+'
}
}
],
@@ -212,12 +214,14 @@ $result_trees{'set_in_item_missing_line'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' n@c
-',
'misc_args' => [
'n',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' n@c
+'
}
},
{
diff --git a/tp/t/results/value/set_on_item_line.pl
b/tp/t/results/value/set_on_item_line.pl
index 27404aafd9..658fee3407 100644
--- a/tp/t/results/value/set_on_item_line.pl
+++ b/tp/t/results/value/set_on_item_line.pl
@@ -53,12 +53,14 @@ $result_trees{'set_on_item_line'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' a b@c
-',
'misc_args' => [
'a',
'b'
]
+ },
+ 'info' => {
+ 'arg_line' => ' a b@c
+'
}
},
{
@@ -126,12 +128,14 @@ $result_trees{'set_on_item_line'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' j@c
-',
'misc_args' => [
'j',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' j@c
+'
}
},
{
@@ -185,12 +189,14 @@ $result_trees{'set_on_item_line'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' g@c
-',
'misc_args' => [
'g',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' g@c
+'
}
}
],
@@ -303,12 +309,14 @@ $result_trees{'set_on_item_line'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' a b
-',
'misc_args' => [
'a',
'b'
]
+ },
+ 'info' => {
+ 'arg_line' => ' a b
+'
}
}
],
@@ -373,12 +381,14 @@ $result_trees{'set_on_item_line'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' j
-',
'misc_args' => [
'j',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' j
+'
}
}
],
@@ -439,12 +449,14 @@ $result_trees{'set_on_item_line'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' g
-',
'misc_args' => [
'g',
''
]
+ },
+ 'info' => {
+ 'arg_line' => ' g
+'
}
}
],
diff --git a/tp/t/results/value/simple.pl b/tp/t/results/value/simple.pl
index bbc986cfba..20b967289a 100644
--- a/tp/t/results/value/simple.pl
+++ b/tp/t/results/value/simple.pl
@@ -22,12 +22,14 @@ $result_trees{'simple'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' a-_5b the value @b{b} @c comment
-',
'misc_args' => [
'a-_5b',
'the value @b{b}'
]
+ },
+ 'info' => {
+ 'arg_line' => ' a-_5b the value @b{b} @c comment
+'
}
},
{
diff --git a/tp/t/results/value/spaces_before_value.pl
b/tp/t/results/value/spaces_before_value.pl
index 868c293367..a6b7d5d3e0 100644
--- a/tp/t/results/value/spaces_before_value.pl
+++ b/tp/t/results/value/spaces_before_value.pl
@@ -22,12 +22,14 @@ $result_trees{'spaces_before_value'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' var val
-',
'misc_args' => [
'var',
'val'
]
+ },
+ 'info' => {
+ 'arg_line' => ' var val
+'
}
},
{
diff --git a/tp/t/results/value/value_after_accent.pl
b/tp/t/results/value/value_after_accent.pl
index aa2cb276a8..5a3612145d 100644
--- a/tp/t/results/value/value_after_accent.pl
+++ b/tp/t/results/value/value_after_accent.pl
@@ -22,12 +22,14 @@ $result_trees{'value_after_accent'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' a_letter a
-',
'misc_args' => [
'a_letter',
'a'
]
+ },
+ 'info' => {
+ 'arg_line' => ' a_letter a
+'
}
},
{
diff --git a/tp/t/results/value/value_after_brace_command.pl
b/tp/t/results/value/value_after_brace_command.pl
index 80353ae664..7a45840027 100644
--- a/tp/t/results/value/value_after_brace_command.pl
+++ b/tp/t/results/value/value_after_brace_command.pl
@@ -22,12 +22,14 @@ $result_trees{'value_after_brace_command'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' bracedletter {a}
-',
'misc_args' => [
'bracedletter',
'{a}'
]
+ },
+ 'info' => {
+ 'arg_line' => ' bracedletter {a}
+'
}
},
{
@@ -43,12 +45,14 @@ $result_trees{'value_after_brace_command'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' unknowncmd @unknown
-',
'misc_args' => [
'unknowncmd',
'@unknown'
]
+ },
+ 'info' => {
+ 'arg_line' => ' unknowncmd @unknown
+'
}
},
{
diff --git a/tp/t/results/value/value_in_index_commands.pl
b/tp/t/results/value/value_in_index_commands.pl
index fbc2aaa3d9..2ae159e7f7 100644
--- a/tp/t/results/value/value_in_index_commands.pl
+++ b/tp/t/results/value/value_in_index_commands.pl
@@ -22,12 +22,14 @@ $result_trees{'value_in_index_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' cp cp
-',
'misc_args' => [
'cp',
'cp'
]
+ },
+ 'info' => {
+ 'arg_line' => ' cp cp
+'
}
},
{
@@ -43,12 +45,14 @@ $result_trees{'value_in_index_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' fn fn
-',
'misc_args' => [
'fn',
'fn'
]
+ },
+ 'info' => {
+ 'arg_line' => ' fn fn
+'
}
},
{
@@ -64,12 +68,14 @@ $result_trees{'value_in_index_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' syncodeindex_command @syncodeindex
-',
'misc_args' => [
'syncodeindex_command',
'@syncodeindex'
]
+ },
+ 'info' => {
+ 'arg_line' => ' syncodeindex_command @syncodeindex
+'
}
},
{
@@ -157,12 +163,14 @@ $result_trees{'value_in_index_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' truc truc
-',
'misc_args' => [
'truc',
'truc'
]
+ },
+ 'info' => {
+ 'arg_line' => ' truc truc
+'
}
},
{
@@ -231,12 +239,14 @@ $result_trees{'value_in_index_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' trucindex_command @trucindex
-',
'misc_args' => [
'trucindex_command',
'@trucindex'
]
+ },
+ 'info' => {
+ 'arg_line' => ' trucindex_command @trucindex
+'
}
},
{
@@ -257,12 +267,14 @@ $result_trees{'value_in_index_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' codeidx codeidx
-',
'misc_args' => [
'codeidx',
'codeidx'
]
+ },
+ 'info' => {
+ 'arg_line' => ' codeidx codeidx
+'
}
},
{
@@ -318,12 +330,14 @@ $result_trees{'value_in_index_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' defcodeindex_entry a @var{index entry} t@\'e
@^{@dotless{i}}
-',
'misc_args' => [
'defcodeindex_entry',
'a @var{index entry} t@\'e @^{@dotless{i}}'
]
+ },
+ 'info' => {
+ 'arg_line' => ' defcodeindex_entry a @var{index entry} t@\'e
@^{@dotless{i}}
+'
}
},
{
diff --git a/tp/t/results/value/value_in_invalid_documentencoding.pl
b/tp/t/results/value/value_in_invalid_documentencoding.pl
index eb31fbca69..13d05b4754 100644
--- a/tp/t/results/value/value_in_invalid_documentencoding.pl
+++ b/tp/t/results/value/value_in_invalid_documentencoding.pl
@@ -22,12 +22,14 @@ $result_trees{'value_in_invalid_documentencoding'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' badvalue bad
-',
'misc_args' => [
'badvalue',
'bad'
]
+ },
+ 'info' => {
+ 'arg_line' => ' badvalue bad
+'
}
},
{
diff --git a/tp/t/results/value/value_in_misc_commands.pl
b/tp/t/results/value/value_in_misc_commands.pl
index 09ec5f7f0d..c51f41dbaf 100644
--- a/tp/t/results/value/value_in_misc_commands.pl
+++ b/tp/t/results/value/value_in_misc_commands.pl
@@ -22,12 +22,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' text atext
-',
'misc_args' => [
'text',
'atext'
]
+ },
+ 'info' => {
+ 'arg_line' => ' text atext
+'
}
},
{
@@ -182,12 +184,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' pagesizes_arg 200mm,150mm
-',
'misc_args' => [
'pagesizes_arg',
'200mm,150mm'
]
+ },
+ 'info' => {
+ 'arg_line' => ' pagesizes_arg 200mm,150mm
+'
}
},
{
@@ -203,12 +207,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' afourpaper_macro @afourpaper
-',
'misc_args' => [
'afourpaper_macro',
'@afourpaper'
]
+ },
+ 'info' => {
+ 'arg_line' => ' afourpaper_macro @afourpaper
+'
}
},
{
@@ -349,12 +355,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' need_arg 0.1
-',
'misc_args' => [
'need_arg',
'0.1'
]
+ },
+ 'info' => {
+ 'arg_line' => ' need_arg 0.1
+'
}
},
{
@@ -410,12 +418,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' raisesections_macro @raisesections
-',
'misc_args' => [
'raisesections_macro',
'@raisesections'
]
+ },
+ 'info' => {
+ 'arg_line' => ' raisesections_macro @raisesections
+'
}
},
{
@@ -441,12 +451,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' lowersections_macro @lowersections
-',
'misc_args' => [
'lowersections_macro',
'@lowersections'
]
+ },
+ 'info' => {
+ 'arg_line' => ' lowersections_macro @lowersections
+'
}
},
{
@@ -578,12 +590,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' definfoenclose_name phi
-',
'misc_args' => [
'definfoenclose_name',
'phi'
]
+ },
+ 'info' => {
+ 'arg_line' => ' definfoenclose_name phi
+'
}
},
{
@@ -673,12 +687,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' strong_macro @strong
-',
'misc_args' => [
'strong_macro',
'@strong'
]
+ },
+ 'info' => {
+ 'arg_line' => ' strong_macro @strong
+'
}
},
{
@@ -694,12 +710,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' strong_name strong
-',
'misc_args' => [
'strong_name',
'strong'
]
+ },
+ 'info' => {
+ 'arg_line' => ' strong_name strong
+'
}
},
{
@@ -858,12 +876,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' kbdinputstyle_arg code
-',
'misc_args' => [
'kbdinputstyle_arg',
'code'
]
+ },
+ 'info' => {
+ 'arg_line' => ' kbdinputstyle_arg code
+'
}
},
{
@@ -1031,12 +1051,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' asis_arg asis
-',
'misc_args' => [
'asis_arg',
'asis'
]
+ },
+ 'info' => {
+ 'arg_line' => ' asis_arg asis
+'
}
},
{
@@ -1052,12 +1074,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' zero 0
-',
'misc_args' => [
'zero',
'0'
]
+ },
+ 'info' => {
+ 'arg_line' => ' zero 0
+'
}
},
{
@@ -1073,12 +1097,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' none_arg none
-',
'misc_args' => [
'none_arg',
'none'
]
+ },
+ 'info' => {
+ 'arg_line' => ' none_arg none
+'
}
},
{
@@ -1094,12 +1120,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' four 4
-',
'misc_args' => [
'four',
'4'
]
+ },
+ 'info' => {
+ 'arg_line' => ' four 4
+'
}
},
{
@@ -1115,12 +1143,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' six 6
-',
'misc_args' => [
'six',
'6'
]
+ },
+ 'info' => {
+ 'arg_line' => ' six 6
+'
}
},
{
@@ -1326,12 +1356,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' end_arg end
-',
'misc_args' => [
'end_arg',
'end'
]
+ },
+ 'info' => {
+ 'arg_line' => ' end_arg end
+'
}
},
{
@@ -1347,12 +1379,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' separate_arg separate
-',
'misc_args' => [
'separate_arg',
'separate'
]
+ },
+ 'info' => {
+ 'arg_line' => ' separate_arg separate
+'
}
},
{
@@ -1433,12 +1467,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' latin1 ISO-8859-1
-',
'misc_args' => [
'latin1',
'ISO-8859-1'
]
+ },
+ 'info' => {
+ 'arg_line' => ' latin1 ISO-8859-1
+'
}
},
{
@@ -1489,12 +1525,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' en en
-',
'misc_args' => [
'en',
'en'
]
+ },
+ 'info' => {
+ 'arg_line' => ' en en
+'
}
},
{
@@ -1510,12 +1548,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' documentlanguage_command @documentlanguage
-',
'misc_args' => [
'documentlanguage_command',
'@documentlanguage'
]
+ },
+ 'info' => {
+ 'arg_line' => ' documentlanguage_command @documentlanguage
+'
}
},
{
@@ -1623,12 +1663,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' on_arg on
-',
'misc_args' => [
'on_arg',
'on'
]
+ },
+ 'info' => {
+ 'arg_line' => ' on_arg on
+'
}
},
{
@@ -1644,12 +1686,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' off_arg off
-',
'misc_args' => [
'off_arg',
'off'
]
+ },
+ 'info' => {
+ 'arg_line' => ' off_arg off
+'
}
},
{
@@ -1746,12 +1790,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' ten 10
-',
'misc_args' => [
'ten',
'10'
]
+ },
+ 'info' => {
+ 'arg_line' => ' ten 10
+'
}
},
{
@@ -1834,12 +1880,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' false_arg false
-',
'misc_args' => [
'false_arg',
'false'
]
+ },
+ 'info' => {
+ 'arg_line' => ' false_arg false
+'
}
},
{
@@ -1855,12 +1903,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' true_arg true
-',
'misc_args' => [
'true_arg',
'true'
]
+ },
+ 'info' => {
+ 'arg_line' => ' true_arg true
+'
}
},
{
@@ -1946,12 +1996,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' page_macro @page
-',
'misc_args' => [
'page_macro',
'@page'
]
+ },
+ 'info' => {
+ 'arg_line' => ' page_macro @page
+'
}
},
{
@@ -1967,12 +2019,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' noindent_macro @noindent
-',
'misc_args' => [
'noindent_macro',
'@noindent'
]
+ },
+ 'info' => {
+ 'arg_line' => ' noindent_macro @noindent
+'
}
},
{
@@ -1988,12 +2042,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' refill_macro @refill
-',
'misc_args' => [
'refill_macro',
'@refill'
]
+ },
+ 'info' => {
+ 'arg_line' => ' refill_macro @refill
+'
}
},
{
@@ -2160,12 +2216,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' contents_macro @contents
-',
'misc_args' => [
'contents_macro',
'@contents'
]
+ },
+ 'info' => {
+ 'arg_line' => ' contents_macro @contents
+'
}
},
{
@@ -2222,12 +2280,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' exdent_macro @exdent
-',
'misc_args' => [
'exdent_macro',
'@exdent'
]
+ },
+ 'info' => {
+ 'arg_line' => ' exdent_macro @exdent
+'
}
},
{
@@ -2273,12 +2333,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' two 2
-',
'misc_args' => [
'two',
'2'
]
+ },
+ 'info' => {
+ 'arg_line' => ' two 2
+'
}
},
{
@@ -2329,12 +2391,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' result_macro @result
-',
'misc_args' => [
'result_macro',
'@result'
]
+ },
+ 'info' => {
+ 'arg_line' => ' result_macro @result
+'
}
},
{
@@ -2351,12 +2415,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'clickstyle',
'extra' => {
- 'arg_line' => ' @value{result_macro}
-',
'misc_args' => [
'@value'
]
},
+ 'info' => {
+ 'arg_line' => ' @value{result_macro}
+'
+ },
'source_info' => {
'file_name' => '',
'line_nr' => 140,
@@ -2401,12 +2467,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' shortcontents_macro @shortcontents
-',
'misc_args' => [
'shortcontents_macro',
'@shortcontents'
]
+ },
+ 'info' => {
+ 'arg_line' => ' shortcontents_macro @shortcontents
+'
}
},
{
@@ -2442,12 +2510,14 @@ $result_trees{'value_in_misc_commands'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' bye_macro @bye
-',
'misc_args' => [
'bye_macro',
'@bye'
]
+ },
+ 'info' => {
+ 'arg_line' => ' bye_macro @bye
+'
}
},
{
diff --git a/tp/t/results/value/value_in_node.pl
b/tp/t/results/value/value_in_node.pl
index 15f9456807..30cb972ad9 100644
--- a/tp/t/results/value/value_in_node.pl
+++ b/tp/t/results/value/value_in_node.pl
@@ -22,12 +22,14 @@ $result_trees{'value_in_node'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' node1 Node 1
-',
'misc_args' => [
'node1',
'Node 1'
]
+ },
+ 'info' => {
+ 'arg_line' => ' node1 Node 1
+'
}
},
{
@@ -390,12 +392,14 @@ $result_trees{'value_in_node'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' sec1 Section 1.1
-',
'misc_args' => [
'sec1',
'Section 1.1'
]
+ },
+ 'info' => {
+ 'arg_line' => ' sec1 Section 1.1
+'
}
},
{
diff --git a/tp/t/results/value/value_node_directions.pl
b/tp/t/results/value/value_node_directions.pl
index 07a318e281..5932693497 100644
--- a/tp/t/results/value/value_node_directions.pl
+++ b/tp/t/results/value/value_node_directions.pl
@@ -22,12 +22,14 @@ $result_trees{'value_node_directions'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' a--foo bar
-',
'misc_args' => [
'a--foo',
'bar'
]
+ },
+ 'info' => {
+ 'arg_line' => ' a--foo bar
+'
}
},
{
diff --git a/tp/t/results/value/value_zero.pl b/tp/t/results/value/value_zero.pl
index 949b1a7ee5..cc1fd574a4 100644
--- a/tp/t/results/value/value_zero.pl
+++ b/tp/t/results/value/value_zero.pl
@@ -22,12 +22,14 @@ $result_trees{'value_zero'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' zero 0
-',
'misc_args' => [
'zero',
'0'
]
+ },
+ 'info' => {
+ 'arg_line' => ' zero 0
+'
}
},
{
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 9b2773be47..ad775caeb0 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
@@ -22,12 +22,14 @@ $result_trees{'comma_value_in_macro_arg'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' comma ,
-',
'misc_args' => [
'comma',
','
]
+ },
+ 'info' => {
+ 'arg_line' => ' comma ,
+'
}
},
{
@@ -86,7 +88,7 @@ $result_trees{'comma_value_in_macro_arg'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' macro1 { arg1 , 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 4787e75bf6..12d3fb3cc2 100644
--- a/tp/t/results/value_and_macro/macro_in_value.pl
+++ b/tp/t/results/value_and_macro/macro_in_value.pl
@@ -62,7 +62,7 @@ $result_trees{'macro_in_value'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' ab
'
},
@@ -90,12 +90,14 @@ $result_trees{'macro_in_value'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' flagab @ab
-',
'misc_args' => [
'flagab',
'@ab'
]
+ },
+ 'info' => {
+ 'arg_line' => ' flagab @ab
+'
}
},
{
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 f9b0cb8b5e..0f0264ccdc 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
@@ -22,12 +22,14 @@ $result_trees{'value_in_macro_body'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' bodyarg \\arg\\
-',
'misc_args' => [
'bodyarg',
'\\arg\\'
]
+ },
+ 'info' => {
+ 'arg_line' => ' bodyarg \\arg\\
+'
}
},
{
@@ -82,7 +84,7 @@ $result_trees{'value_in_macro_body'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' testvaluebody { arg }
'
},
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 28206da59f..df969f4179 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
@@ -22,12 +22,14 @@ $result_trees{'value_in_macro_formal_arg'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' argument arg
-',
'misc_args' => [
'argument',
'arg'
]
+ },
+ 'info' => {
+ 'arg_line' => ' argument arg
+'
}
},
{
@@ -87,10 +89,12 @@ $result_trees{'value_in_macro_formal_arg'} = {
}
],
'extra' => {
- 'arg_line' => ' testvalue { arg , the@value{argument} }
-',
'invalid_syntax' => 1
},
+ 'info' => {
+ 'arg_line' => ' testvalue { arg , the@value{argument} }
+'
+ },
'source_info' => {
'file_name' => '',
'line_nr' => 3,
diff --git a/tp/t/results/verb/comments.pl b/tp/t/results/verb/comments.pl
index 86caf1205d..d8734d8572 100644
--- a/tp/t/results/verb/comments.pl
+++ b/tp/t/results/verb/comments.pl
@@ -29,7 +29,7 @@ $result_trees{'comments'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => 'a'
},
'source_info' => {
@@ -80,7 +80,7 @@ $result_trees{'comments'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ','
},
'source_info' => {
diff --git a/tp/t/results/verb/end_of_line.pl b/tp/t/results/verb/end_of_line.pl
index 1dc74b06bf..d5a45a339f 100644
--- a/tp/t/results/verb/end_of_line.pl
+++ b/tp/t/results/verb/end_of_line.pl
@@ -42,7 +42,7 @@ $result_trees{'end_of_line'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ''
},
'source_info' => {
diff --git a/tp/t/results/verb/multiline.pl b/tp/t/results/verb/multiline.pl
index 3208fd198e..28d18be846 100644
--- a/tp/t/results/verb/multiline.pl
+++ b/tp/t/results/verb/multiline.pl
@@ -35,7 +35,7 @@ $result_trees{'multiline'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '@'
},
'source_info' => {
diff --git a/tp/t/results/verb/nested.pl b/tp/t/results/verb/nested.pl
index 54defc717b..9a1d189d55 100644
--- a/tp/t/results/verb/nested.pl
+++ b/tp/t/results/verb/nested.pl
@@ -31,7 +31,7 @@ $result_trees{'nested'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '/'
},
'source_info' => {
diff --git a/tp/t/results/verb/simple.pl b/tp/t/results/verb/simple.pl
index 11f9a9c360..c265270cd2 100644
--- a/tp/t/results/verb/simple.pl
+++ b/tp/t/results/verb/simple.pl
@@ -24,7 +24,7 @@ $result_trees{'simple'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '.'
},
'source_info' => {
diff --git a/tp/t/results/verb/verb_and_char_end_of_line_not_closed.pl
b/tp/t/results/verb/verb_and_char_end_of_line_not_closed.pl
index 6a102cba57..fcd87f33b5 100644
--- a/tp/t/results/verb/verb_and_char_end_of_line_not_closed.pl
+++ b/tp/t/results/verb/verb_and_char_end_of_line_not_closed.pl
@@ -38,7 +38,7 @@ $result_trees{'verb_and_char_end_of_line_not_closed'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '*'
},
'source_info' => {
diff --git a/tp/t/results/verb/verb_at_end_of_line_not_closed.pl
b/tp/t/results/verb/verb_at_end_of_line_not_closed.pl
index b299fed19a..fbb4cefab7 100644
--- a/tp/t/results/verb/verb_at_end_of_line_not_closed.pl
+++ b/tp/t/results/verb/verb_at_end_of_line_not_closed.pl
@@ -33,7 +33,7 @@ $result_trees{'verb_at_end_of_line_not_closed'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => ''
},
'source_info' => {
diff --git a/tp/t/results/verb/verb_not_closed.pl
b/tp/t/results/verb/verb_not_closed.pl
index decba3d49a..bab3c9410d 100644
--- a/tp/t/results/verb/verb_not_closed.pl
+++ b/tp/t/results/verb/verb_not_closed.pl
@@ -24,7 +24,7 @@ $result_trees{'verb_not_closed'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '.'
},
'source_info' => {
diff --git a/tp/t/results/verb/verb_not_closed_with_char.pl
b/tp/t/results/verb/verb_not_closed_with_char.pl
index 92f33f2ef8..f0d13b78e0 100644
--- a/tp/t/results/verb/verb_not_closed_with_char.pl
+++ b/tp/t/results/verb/verb_not_closed_with_char.pl
@@ -44,7 +44,7 @@ $result_trees{'verb_not_closed_with_char'} = {
}
],
'cmdname' => 'verb',
- 'extra' => {
+ 'info' => {
'delimiter' => '*'
},
'source_info' => {
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 1fa453caf0..6dcc293037 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -22,12 +22,14 @@ $result_trees{'commands_and_spaces'} = {
],
'cmdname' => 'set',
'extra' => {
- 'arg_line' => ' foo some @value
-',
'misc_args' => [
'foo',
'some @value'
]
+ },
+ 'info' => {
+ 'arg_line' => ' foo some @value
+'
}
},
{
@@ -77,11 +79,13 @@ $result_trees{'commands_and_spaces'} = {
],
'cmdname' => 'unmacro',
'extra' => {
- 'arg_line' => ' ggg
-',
'misc_args' => [
'ggg'
]
+ },
+ 'info' => {
+ 'arg_line' => ' ggg
+'
}
},
{
@@ -98,12 +102,14 @@ $result_trees{'commands_and_spaces'} = {
],
'cmdname' => 'clickstyle',
'extra' => {
- 'arg_line' => ' @arrow
-',
'misc_args' => [
'@arrow'
]
},
+ 'info' => {
+ 'arg_line' => ' @arrow
+'
+ },
'source_info' => {
'file_name' => '',
'line_nr' => 7,
diff --git a/tp/t/results/xml_tests/macro_and_args.pl
b/tp/t/results/xml_tests/macro_and_args.pl
index 5333e5f48c..747e0e3f40 100644
--- a/tp/t/results/xml_tests/macro_and_args.pl
+++ b/tp/t/results/xml_tests/macro_and_args.pl
@@ -55,7 +55,7 @@ $result_trees{'macro_and_args'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' good { aaa, 2b-bb}
'
},
@@ -121,10 +121,12 @@ $result_trees{'macro_and_args'} = {
}
],
'extra' => {
- 'arg_line' => ' bad { ggg"@@^_ ff, nnn_b, ccc v}
-',
'invalid_syntax' => 1
},
+ 'info' => {
+ 'arg_line' => ' bad { ggg"@@^_ ff, nnn_b, ccc v}
+'
+ },
'source_info' => {
'file_name' => '',
'line_nr' => 4,
diff --git a/tp/t/results/xtable/table_nested.pl
b/tp/t/results/xtable/table_nested.pl
index 5ee3aa8fd9..1bf692a2e6 100644
--- a/tp/t/results/xtable/table_nested.pl
+++ b/tp/t/results/xtable/table_nested.pl
@@ -152,7 +152,7 @@ $result_trees{'table_nested'} = {
}
}
],
- 'extra' => {
+ 'info' => {
'arg_line' => ' myvtable
'
},
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/LaTeX.pm, tp/Texinfo/Convert/Texinfo.pm, tp/Texinfo/Convert/TexinfoMarkup.pm, tp/Texinfo/ParserNonXS.pm (_parse_macro_command_line, _close_brace_command) (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/close.c (close_brace_command), tp/Texinfo/XS/parsetexi/convert.c (expand_cmd_args_to_texi), tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command), tp/Texinfo/XS/parsetexi/macro.c (parse_macro_command_line), tp/Texinfo/XS/parsetexi/parser.c (process_remain [...],
Patrice Dumas <=