[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Texinfo/Convert/HTML.pm (%default_commands_a
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Texinfo/Convert/HTML.pm (%default_commands_args) (_convert_value_command), tp/Texinfo/Convert/LaTeX.pm (_convert), tp/Texinfo/Convert/Plaintext.pm (_convert), tp/Texinfo/Convert/Texinfo.pm (_expand_cmd_args_to_texi), tp/Texinfo/Convert/TexinfoMarkup.pm (_convert), tp/Texinfo/ParserNonXS.pm (_new_value_element) (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/parser.c (new_value_element, process_remaining_on_line): use the same structure for txiinternalvalue, a value not expanded [...] |
|
Date: |
Tue, 07 Feb 2023 12:14:40 -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 44320d879b * tp/Texinfo/Convert/HTML.pm (%default_commands_args)
(_convert_value_command), tp/Texinfo/Convert/LaTeX.pm (_convert),
tp/Texinfo/Convert/Plaintext.pm (_convert), tp/Texinfo/Convert/Texinfo.pm
(_expand_cmd_args_to_texi), tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
tp/Texinfo/ParserNonXS.pm (_new_value_element) (_process_remaining_on_line),
tp/Texinfo/XS/parsetexi/parser.c (new_value_element,
process_remaining_on_line): use the same structure for txiinternalvalue, [...]
44320d879b is described below
commit 44320d879b14cbbfd9cf7024a08a2c4551fd5faa
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Feb 7 18:14:29 2023 +0100
* tp/Texinfo/Convert/HTML.pm (%default_commands_args)
(_convert_value_command), tp/Texinfo/Convert/LaTeX.pm (_convert),
tp/Texinfo/Convert/Plaintext.pm (_convert),
tp/Texinfo/Convert/Texinfo.pm (_expand_cmd_args_to_texi),
tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
tp/Texinfo/ParserNonXS.pm (_new_value_element)
(_process_remaining_on_line), tp/Texinfo/XS/parsetexi/parser.c
(new_value_element, process_remaining_on_line): use the same structure
for txiinternalvalue, a value not expanded in tree and value expansion
source mark element, setup by calling new_value_element(). Update
formatting in converters.
---
ChangeLog | 14 +
tp/Texinfo/Convert/HTML.pm | 3 +-
tp/Texinfo/Convert/LaTeX.pm | 2 +-
tp/Texinfo/Convert/Plaintext.pm | 2 +-
tp/Texinfo/Convert/Texinfo.pm | 8 +-
tp/Texinfo/Convert/TexinfoMarkup.pm | 3 +
tp/Texinfo/ParserNonXS.pm | 50 +-
tp/Texinfo/XS/parsetexi/parser.c | 35 +-
tp/t/results/conditionals/empty_set_in_ifset.pl | 12 +-
.../results/converters_tests/at_commands_in_raw.pl | 10 +-
tp/t/results/converters_tests/unknown_value.pl | 10 +-
.../manual_simple_latin1_with_error.pl | 10 +-
.../manual_simple_utf8_with_error.pl | 10 +-
tp/t/results/include/value_expansion_in_include.pl | 72 +-
tp/t/results/macro/bib_example.pl | 36 +-
tp/t/results/value/bad_syntax.pl | 10 +-
tp/t/results/value/comment_on_set_line.pl | 48 +-
tp/t/results/value/empty_set.pl | 12 +-
tp/t/results/value/empty_value_in_line.pl | 12 +-
tp/t/results/value/ignored_value_definition.pl | 12 +-
tp/t/results/value/not_only_characters.pl | 12 +-
tp/t/results/value/recursive_expansion_in_set.pl | 1200 ++++++++++++++++----
tp/t/results/value/set_flag_command_equivalent.pl | 12 +-
tp/t/results/value/set_form_feed.pl | 36 +-
tp/t/results/value/simple.pl | 12 +-
tp/t/results/value/spaces_before_value.pl | 12 +-
tp/t/results/value/value_after_accent.pl | 24 +-
tp/t/results/value/value_after_brace_command.pl | 72 +-
tp/t/results/value/value_in_index_commands.pl | 100 +-
.../value/value_in_invalid_documentencoding.pl | 12 +-
tp/t/results/value/value_in_misc_commands.pl | 494 ++++++--
tp/t/results/value/value_in_node.pl | 48 +-
tp/t/results/value/value_node_directions.pl | 60 +-
tp/t/results/value/value_zero.pl | 12 +-
.../value_and_macro/comma_value_in_macro_arg.pl | 12 +-
tp/t/results/value_and_macro/macro_in_value.pl | 12 +-
.../results/value_and_macro/value_in_macro_body.pl | 12 +-
37 files changed, 2084 insertions(+), 429 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ed82429354..e2f18810be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2023-02-07 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/HTML.pm (%default_commands_args)
+ (_convert_value_command), tp/Texinfo/Convert/LaTeX.pm (_convert),
+ tp/Texinfo/Convert/Plaintext.pm (_convert),
+ tp/Texinfo/Convert/Texinfo.pm (_expand_cmd_args_to_texi),
+ tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
+ tp/Texinfo/ParserNonXS.pm (_new_value_element)
+ (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/parser.c
+ (new_value_element, process_remaining_on_line): use the same structure
+ for txiinternalvalue, a value not expanded in tree and value expansion
+ source mark element, setup by calling new_value_element(). Update
+ formatting in converters.
+
2023-02-07 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/ParserNonXS.pm (_transfer_source_marks, _close_container)
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 8e18f2d189..9e1442f603 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -2482,6 +2482,7 @@ my %default_commands_args = (
'inlineifset' => [['monospacetext'],['normal']],
'item' => [[]],
'itemx' => [[]],
+ 'value' => [['monospacestring']],
);
foreach my $explained_command (keys(%explained_commands)) {
@@ -2971,7 +2972,7 @@ sub _convert_value_command($$$$)
my $args = shift;
return $self->convert_tree($self->gdt('@{No value for `{value}\'@}',
- {'value' => $command->{'info'}->{'flag'}}));
+ {'value' =>
$args->[0]->{'monospacestring'}}));
}
$default_commands_conversion{'value'} = \&_convert_value_command;
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 63cd7a4d88..91370f0ba8 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -3507,7 +3507,7 @@ sub _convert($$)
return $result;
} elsif ($cmdname eq 'value') {
my $expansion = $self->gdt('@{No value for `{value}\'@}',
- {'value' => $element->{'info'}->{'flag'}});
+ {'value' => $element->{'args'}->[0]});
$expansion = {'type' => 'paragraph',
'contents' => [$expansion]};
$result .= _convert($self, $expansion);
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index d76a805e4a..8e71af12c1 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -2496,7 +2496,7 @@ sub _convert($$)
return $result;
} elsif ($command eq 'value') {
my $expansion = $self->gdt('@{No value for `{value}\'@}',
- {'value' => $element->{'info'}->{'flag'}});
+ {'value' => $element->{'args'}->[0]});
if ($formatter->{'_top_formatter'}) {
$expansion = {'type' => 'paragraph',
'contents' => [$expansion]};
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index 3e8c18cf2f..b4c0d0e527 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -166,9 +166,10 @@ sub _expand_cmd_args_to_texi($) {
} elsif ($cmd->{'args'}) {
my $braces;
$braces = 1 if (scalar(@{$cmd->{'args'}})
- and $cmd->{'args'}->[0]->{'type'}
- and ($cmd->{'args'}->[0]->{'type'} eq 'brace_command_arg'
- or $cmd->{'args'}->[0]->{'type'} eq
'brace_command_context'));
+ and ($cmd->{'args'}->[0]->{'type'}
+ and ($cmd->{'args'}->[0]->{'type'} eq
'brace_command_arg'
+ or $cmd->{'args'}->[0]->{'type'} eq
'brace_command_context'))
+ or $cmdname eq 'value');
$result .= '{' if ($braces);
if ($cmdname eq 'verb') {
$result .= $cmd->{'info'}->{'delimiter'};
@@ -205,7 +206,6 @@ sub _expand_cmd_args_to_texi($) {
$result .= $cmd->{'info'}->{'spaces_before_argument'}->{'text'}
if $cmd->{'info'} and $cmd->{'info'}->{'spaces_before_argument'};
}
- $result .= '{'.$cmd->{'info'}->{'flag'}.'}' if ($cmdname eq 'value');
return $result;
}
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index d189859bbd..ff6372da11 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -1053,6 +1053,9 @@ sub _convert($$;$)
pop @{$self->{'document_context'}};
}
return $command_result;
+ } elsif ($element->{'cmdname'} eq 'value') {
+ # value in tree corresponds to an unknown flag, ignored here
+ return '';
}
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index cb36767113..f9ef597467 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -4498,6 +4498,25 @@ sub _setup_document_root_and_before_node_section()
return ($document_root, $before_node_section);
}
+sub _new_value_element($$;$)
+{
+ my $command = shift;
+ my $flag = shift;
+ my $current = shift;
+
+ my $value_elt = { 'cmdname' => $command,
+ 'args' => [] };
+ $value_elt->{'parent'} = $current if (defined($current));
+ # Add a 'brace_command_arg' container? On the one hand it is
+ # not usefull, as there is no contents, only a flag, on the
+ # other end, it is different from other similar commands, like 'U'.
+ # Beware that it is also used for txiinternalvalue, which for
+ # now requires that structure, but it could easily be changed too.
+ push @{$value_elt->{'args'}}, {'text' => $flag,
+ 'parent' => $value_elt};
+ return $value_elt;
+}
+
sub _handle_macro($$$$$)
{
my $self = shift;
@@ -4879,9 +4898,13 @@ sub _process_remaining_on_line($$$$)
_input_push_text($self, $remaining_line, $source_info->{'line_nr'},
$source_info->{'macro'});
_input_push_text($self, $self->{'values'}->{$value},
- $source_info->{'line_nr'}, $source_info->{'macro'},
$value);
+ $source_info->{'line_nr'},
+ $source_info->{'macro'}, $value);
+ my $sm_value_element = _new_value_element($command, $value);
my $value_source_mark = {'sourcemark_type' => 'value_expansion',
- 'status' => 'start', 'line' => $value};
+ 'status' => 'start',
+ 'line' => $self->{'values'}->{$value},
+ 'element' => $sm_value_element};
_register_source_mark($self, $current, $value_source_mark);
$self->{'input'}->[0]->{'input_source_mark'} = $value_source_mark;
$line = '';
@@ -5159,9 +5182,8 @@ sub _process_remaining_on_line($$$$)
_abort_empty_line($self, $current);
# caller should expand something along
# gdt($self, '@{No value for `{value}\'@}', {'value' => $value});
- push @{$current->{'contents'}}, { 'cmdname' => $command,
- 'info' => {'flag' => $value},
- 'parent' => $current };
+ my $new_element = _new_value_element($command, $value, $current);
+ push @{$current->{'contents'}}, $new_element;
$self->_line_warn(
sprintf(__("undefined flag: %s"), $value), $source_info);
# expansion of value already done above
@@ -5170,12 +5192,7 @@ sub _process_remaining_on_line($$$$)
} else {
# txiinternalvalue
_abort_empty_line($self, $current);
- my $new_element = { 'cmdname' => $command,
- 'args' => [],
- 'parent' => $current };
- # type misc_arg?
- push @{$new_element->{'args'}}, {'text' => $value,
- 'parent' => $new_element};
+ my $new_element = _new_value_element($command, $value, $current);
push @{$current->{'contents'}}, $new_element;
}
} else {
@@ -7823,6 +7840,11 @@ leads to
'args' => [{'type' => 'brace_command_arg',
'contents' => [{'text' => 'in code'}]}]}
+As an exception, C<@value> flag argument is directly in the I<args> array
+reference, not in a I<brace_command_arg> container. Note that only C<@value>
+commands that are not expanded because there is no corresponding value set
+are present as elements in the tree.
+
=item bracketed
This a special type containing content in brackets in the context
@@ -7980,12 +8002,6 @@ and for C<@macro> line.
C<@verb> delimiter is in I<delimiter>.
-=item flag
-
-C<@value> tree element argument string is in I<flag>. Only for a C<@value>
-command that is not expanded because there is no corresponding value set, as
-only those are present in the tree.
-
=item spaces_after_argument
A reference to spaces after @-command arguments before a comma, a closing
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index b6875ba6a9..85bb1b85c8 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -992,6 +992,20 @@ register_command_as_argument (ELEMENT *cmd_as_arg)
}
}
+ELEMENT *
+new_value_element (enum command_id cmd, char *flag)
+{
+ ELEMENT *value_elt = new_element (ET_NONE);
+ ELEMENT *value_arg = new_element (ET_NONE);
+
+ value_elt->cmd = cmd;
+
+ text_append (&value_arg->text, flag);
+ add_to_element_args (value_elt, value_arg);
+
+ return value_elt;
+}
+
/* Check if line is "@end ..." for current command. If so, advance LINE. */
int
is_end_current_command (ELEMENT *current, char **line,
@@ -1673,6 +1687,7 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
if (value)
{
SOURCE_MARK *value_source_mark;
+ ELEMENT *sm_value_element;
remaining_line++; /* past '}' */
if (conf.max_macro_call_nesting
@@ -1693,13 +1708,16 @@ process_remaining_on_line (ELEMENT **current_inout,
char **line_inout)
input_push_text (strdup (value),
current_source_info.line_nr,
current_source_info.macro,
- strdup(flag));
+ strdup (flag));
value_source_mark
= new_source_mark (SM_type_value_expansion);
value_source_mark->status = SM_status_start;
- value_source_mark->line = strdup(flag);
- register_source_mark(current, value_source_mark);
+ value_source_mark->line = strdup(value);
+ sm_value_element = new_value_element (cmd, flag);
+ value_source_mark->element = sm_value_element;
+
+ register_source_mark (current, value_source_mark);
set_input_source_mark (value_source_mark);
value_expansion_nr++;
@@ -1947,10 +1965,8 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
line_warn ("undefined flag: %s", flag);
abort_empty_line (¤t, NULL);
- value_elt = new_element (ET_NONE);
- value_elt->cmd = CM_value;
- add_info_string_dup (value_elt, "flag", flag);
+ value_elt = new_value_element (cmd, flag);
add_to_element_contents (current, value_elt);
line++; /* past '}' */
@@ -1970,14 +1986,9 @@ process_remaining_on_line (ELEMENT **current_inout, char
**line_inout)
ELEMENT *txiinternalvalue_elt, *txiinternalvalue_arg;
abort_empty_line (¤t, NULL);
- txiinternalvalue_elt = new_element (ET_NONE);
- txiinternalvalue_elt->cmd = CM_txiinternalvalue;
- /* FIXME or ET_misc_arg? */
- txiinternalvalue_arg = new_element (ET_NONE);
+ txiinternalvalue_elt = new_value_element (cmd, flag);
- text_append (&txiinternalvalue_arg->text, flag);
- add_to_element_args (txiinternalvalue_elt,
txiinternalvalue_arg);
add_to_element_contents (current, txiinternalvalue_elt);
diff --git a/tp/t/results/conditionals/empty_set_in_ifset.pl
b/tp/t/results/conditionals/empty_set_in_ifset.pl
index c56ac10e19..258431e46c 100644
--- a/tp/t/results/conditionals/empty_set_in_ifset.pl
+++ b/tp/t/results/conditionals/empty_set_in_ifset.pl
@@ -43,14 +43,22 @@ $result_trees{'empty_set_in_ifset'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'a',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'a'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '',
'position' => 13,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 1,
- 'line' => 'a',
+ 'line' => '',
'position' => 13,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
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 99d90754f3..0cf8f4e152 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -464,10 +464,12 @@ $result_trees{'at_commands_in_raw'} = {
'type' => 'empty_line'
},
{
- 'cmdname' => 'value',
- 'info' => {
- 'flag' => 'flag'
- }
+ 'args' => [
+ {
+ 'text' => 'flag'
+ }
+ ],
+ 'cmdname' => 'value'
},
{
'contents' => [
diff --git a/tp/t/results/converters_tests/unknown_value.pl
b/tp/t/results/converters_tests/unknown_value.pl
index 789fcc3d13..65f0157117 100644
--- a/tp/t/results/converters_tests/unknown_value.pl
+++ b/tp/t/results/converters_tests/unknown_value.pl
@@ -10,10 +10,12 @@ $result_trees{'unknown_value'} = {
{
'contents' => [
{
- 'cmdname' => 'value',
- 'info' => {
- 'flag' => 'unknown'
- }
+ 'args' => [
+ {
+ 'text' => 'unknown'
+ }
+ ],
+ 'cmdname' => 'value'
}
],
'type' => 'before_node_section'
diff --git a/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl
b/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl
index b7a13c9a77..14e94f4b6c 100644
--- a/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl
+++ b/tp/t/results/formats_encodings/manual_simple_latin1_with_error.pl
@@ -269,10 +269,12 @@ $result_trees{'manual_simple_latin1_with_error'} = {
'type' => 'empty_line'
},
{
- 'cmdname' => 'value',
- 'info' => {
- 'flag' => "non_conn\x{f9}e"
- }
+ 'args' => [
+ {
+ 'text' => "non_conn\x{f9}e"
+ }
+ ],
+ 'cmdname' => 'value'
},
{
'text' => '
diff --git a/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl
b/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl
index 434e995a28..40e6d86a4c 100644
--- a/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl
+++ b/tp/t/results/formats_encodings/manual_simple_utf8_with_error.pl
@@ -229,10 +229,12 @@ $result_trees{'manual_simple_utf8_with_error'} = {
'type' => 'empty_line'
},
{
- 'cmdname' => 'value',
- 'info' => {
- 'flag' => "non_conn\x{f9}e"
- }
+ 'args' => [
+ {
+ 'text' => "non_conn\x{f9}e"
+ }
+ ],
+ 'cmdname' => 'value'
},
{
'text' => '
diff --git a/tp/t/results/include/value_expansion_in_include.pl
b/tp/t/results/include/value_expansion_in_include.pl
index 83479e689b..d8e64409a4 100644
--- a/tp/t/results/include/value_expansion_in_include.pl
+++ b/tp/t/results/include/value_expansion_in_include.pl
@@ -171,7 +171,7 @@ $result_trees{'value_expansion_in_include'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'testvar',
+ 'line' => 'incl-incl.txi',
'position' => 13,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -198,7 +198,15 @@ $result_trees{'value_expansion_in_include'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'testvar',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'testvar'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'incl-incl.txi',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -274,7 +282,7 @@ $result_trees{'value_expansion_in_include'} = {
'source_marks' => [
{
'counter' => 2,
- 'line' => 'testvar',
+ 'line' => 'incl-incl.txi',
'position' => 13,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -302,7 +310,15 @@ $result_trees{'value_expansion_in_include'} = {
'source_marks' => [
{
'counter' => 2,
- 'line' => 'testvar',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'testvar'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'incl-incl.txi',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -341,7 +357,7 @@ $result_trees{'value_expansion_in_include'} = {
'source_marks' => [
{
'counter' => 3,
- 'line' => 'test-var',
+ 'line' => 'incl-incl.tx',
'position' => 12,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -368,7 +384,15 @@ $result_trees{'value_expansion_in_include'} = {
'source_marks' => [
{
'counter' => 3,
- 'line' => 'test-var',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'test-var'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'incl-incl.tx',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -444,7 +468,7 @@ $result_trees{'value_expansion_in_include'} = {
'source_marks' => [
{
'counter' => 4,
- 'line' => 'test-var',
+ 'line' => 'incl-incl.tx',
'position' => 12,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -472,7 +496,15 @@ $result_trees{'value_expansion_in_include'} = {
'source_marks' => [
{
'counter' => 4,
- 'line' => 'test-var',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'test-var'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'incl-incl.tx',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -511,14 +543,22 @@ $result_trees{'value_expansion_in_include'} = {
'source_marks' => [
{
'counter' => 5,
- 'line' => 'test_var',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'test_var'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'ncl-incl.tx',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 5,
- 'line' => 'test_var',
+ 'line' => 'ncl-incl.tx',
'position' => 12,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -612,14 +652,22 @@ $result_trees{'value_expansion_in_include'} = {
'source_marks' => [
{
'counter' => 6,
- 'line' => 'test_var',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'test_var'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'ncl-incl.tx',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 6,
- 'line' => 'test_var',
+ 'line' => 'ncl-incl.tx',
'position' => 12,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
diff --git a/tp/t/results/macro/bib_example.pl
b/tp/t/results/macro/bib_example.pl
index 5a0d165c26..4ba24daa96 100644
--- a/tp/t/results/macro/bib_example.pl
+++ b/tp/t/results/macro/bib_example.pl
@@ -3674,13 +3674,21 @@ $result_trees{'bib_example'} = {
},
{
'counter' => 1,
- 'line' => 'mybibrefnode',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'mybibrefnode'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'References',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 1,
- 'line' => 'mybibrefnode',
+ 'line' => 'References',
'position' => 10,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -3962,7 +3970,15 @@ $result_trees{'bib_example'} = {
},
{
'counter' => 2,
- 'line' => 'mybibrefnode',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'mybibrefnode'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'References',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
}
@@ -3973,7 +3989,7 @@ $result_trees{'bib_example'} = {
'source_marks' => [
{
'counter' => 2,
- 'line' => 'mybibrefnode',
+ 'line' => 'References',
'position' => 10,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -4014,7 +4030,7 @@ $result_trees{'bib_example'} = {
'source_marks' => [
{
'counter' => 3,
- 'line' => 'mybibrefnode',
+ 'line' => 'References',
'position' => 10,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -4075,7 +4091,15 @@ $result_trees{'bib_example'} = {
},
{
'counter' => 3,
- 'line' => 'mybibrefnode',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'mybibrefnode'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'References',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
diff --git a/tp/t/results/value/bad_syntax.pl b/tp/t/results/value/bad_syntax.pl
index e569a47227..597ad6214b 100644
--- a/tp/t/results/value/bad_syntax.pl
+++ b/tp/t/results/value/bad_syntax.pl
@@ -102,10 +102,12 @@ $result_trees{'bad_syntax'} = {
'type' => 'empty_line'
},
{
- 'cmdname' => 'value',
- 'info' => {
- 'flag' => 'unknown'
- }
+ 'args' => [
+ {
+ 'text' => 'unknown'
+ }
+ ],
+ 'cmdname' => 'value'
},
{
'text' => '
diff --git a/tp/t/results/value/comment_on_set_line.pl
b/tp/t/results/value/comment_on_set_line.pl
index fe386180b6..d35cdc9b93 100644
--- a/tp/t/results/value/comment_on_set_line.pl
+++ b/tp/t/results/value/comment_on_set_line.pl
@@ -112,56 +112,88 @@ $result_trees{'comment_on_set_line'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'x',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'x'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 1,
- 'line' => 'x',
+ 'line' => '',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 2,
- 'line' => 'y',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'y'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '',
'position' => 5,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 2,
- 'line' => 'y',
+ 'line' => '',
'position' => 5,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 3,
- 'line' => 'z',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'z'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'g',
'position' => 9,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 3,
- 'line' => 'z',
+ 'line' => 'g',
'position' => 10,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 4,
- 'line' => 't',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 't'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'a vv',
'position' => 14,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 4,
- 'line' => 't',
+ 'line' => 'a vv',
'position' => 18,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
diff --git a/tp/t/results/value/empty_set.pl b/tp/t/results/value/empty_set.pl
index 8c7e3b0c7c..6347a53b41 100644
--- a/tp/t/results/value/empty_set.pl
+++ b/tp/t/results/value/empty_set.pl
@@ -43,14 +43,22 @@ $result_trees{'empty_set'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'myspace',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'myspace'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '',
'position' => 2,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 1,
- 'line' => 'myspace',
+ 'line' => '',
'position' => 2,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
diff --git a/tp/t/results/value/empty_value_in_line.pl
b/tp/t/results/value/empty_value_in_line.pl
index 1dfd0141b8..f6fd175f05 100644
--- a/tp/t/results/value/empty_value_in_line.pl
+++ b/tp/t/results/value/empty_value_in_line.pl
@@ -50,13 +50,21 @@ $result_trees{'empty_value_in_line'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'myspace',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'myspace'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 1,
- 'line' => 'myspace',
+ 'line' => '',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
diff --git a/tp/t/results/value/ignored_value_definition.pl
b/tp/t/results/value/ignored_value_definition.pl
index cc503dc679..02004f93b5 100644
--- a/tp/t/results/value/ignored_value_definition.pl
+++ b/tp/t/results/value/ignored_value_definition.pl
@@ -74,7 +74,15 @@ $result_trees{'ignored_value_definition'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'aa',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'aa'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'outside',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -90,7 +98,7 @@ $result_trees{'ignored_value_definition'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'aa',
+ 'line' => 'outside',
'position' => 7,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
diff --git a/tp/t/results/value/not_only_characters.pl
b/tp/t/results/value/not_only_characters.pl
index 8144b0bfc9..06fe88b0eb 100644
--- a/tp/t/results/value/not_only_characters.pl
+++ b/tp/t/results/value/not_only_characters.pl
@@ -43,14 +43,22 @@ $result_trees{'not_only_characters'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => '-e_\'::;',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => '-e_\'::;'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'hh',
'position' => 4,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 1,
- 'line' => '-e_\'::;',
+ 'line' => 'hh',
'position' => 6,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
diff --git a/tp/t/results/value/recursive_expansion_in_set.pl
b/tp/t/results/value/recursive_expansion_in_set.pl
index de894083ce..6b304ce714 100644
--- a/tp/t/results/value/recursive_expansion_in_set.pl
+++ b/tp/t/results/value/recursive_expansion_in_set.pl
@@ -36,1201 +36,2001 @@ $result_trees{'recursive_expansion_in_set'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 2,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 3,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 4,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 5,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 6,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 7,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 8,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 9,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 10,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 11,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 12,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 13,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 14,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 15,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 16,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 17,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 18,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 19,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 20,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 21,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 22,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 23,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 24,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 25,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 26,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 27,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 28,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 29,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 30,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 31,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 32,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 33,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 34,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 35,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 36,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 37,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 38,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 39,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 40,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 41,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 42,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 43,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 44,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 45,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 46,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 47,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 48,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 49,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 50,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 51,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 52,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 53,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 54,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 55,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 56,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 57,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 58,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 59,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 60,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 61,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 62,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 63,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 64,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 65,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 66,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 67,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 68,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 69,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 70,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 71,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 72,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 73,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 74,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 75,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 76,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 77,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 78,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 79,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 80,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 81,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 82,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 83,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 84,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 85,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 86,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 87,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 88,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 89,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 90,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 91,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 92,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 93,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 94,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 95,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 96,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 97,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 98,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 99,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 100,
- 'line' => 'V',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'V'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 100,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 99,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 98,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 97,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 96,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 95,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 94,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 93,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 92,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 91,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 90,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 89,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 88,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 87,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 86,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 85,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 84,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 83,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 82,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 81,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 80,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 79,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 78,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 77,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 76,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 75,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 74,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 73,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 72,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 71,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 70,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 69,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 68,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 67,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 66,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 65,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 64,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 63,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 62,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 61,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 60,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 59,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 58,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 57,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 56,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 55,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 54,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 53,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 52,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 51,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 50,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 49,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 48,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 47,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 46,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 45,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 44,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 43,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 42,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 41,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 40,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 39,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 38,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 37,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 36,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 35,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 34,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 33,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 32,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 31,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 30,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 29,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 28,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 27,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 26,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 25,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 24,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 23,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 22,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 21,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 20,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 19,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 18,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 17,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 16,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 15,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 14,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 13,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 12,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 11,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 10,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 9,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 8,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 7,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 6,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 5,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 4,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 3,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 2,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 1,
- 'line' => 'V',
+ 'line' => '@value{V}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
diff --git a/tp/t/results/value/set_flag_command_equivalent.pl
b/tp/t/results/value/set_flag_command_equivalent.pl
index 9a10c847c9..67fe6baf89 100644
--- a/tp/t/results/value/set_flag_command_equivalent.pl
+++ b/tp/t/results/value/set_flag_command_equivalent.pl
@@ -47,14 +47,22 @@ $result_trees{'set_flag_command_equivalent'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'txicodequoteundirected',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'txicodequoteundirected'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 1,
- 'line' => 'txicodequoteundirected',
+ 'line' => '',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
diff --git a/tp/t/results/value/set_form_feed.pl
b/tp/t/results/value/set_form_feed.pl
index a43e6e8af2..2131eba275 100644
--- a/tp/t/results/value/set_form_feed.pl
+++ b/tp/t/results/value/set_form_feed.pl
@@ -93,41 +93,65 @@ $result_trees{'set_form_feed'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'gg',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'gg'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'a\\a\\f\\\\',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 1,
- 'line' => 'gg',
+ 'line' => 'a\\a\\f\\\\',
'position' => 7,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 2,
- 'line' => 'hh',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'hh'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '',
'position' => 9,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 2,
- 'line' => 'hh',
+ 'line' => '',
'position' => 9,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 3,
- 'line' => 'll',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'll'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '',
'position' => 11,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 3,
- 'line' => 'll',
+ 'line' => '',
'position' => 11,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
diff --git a/tp/t/results/value/simple.pl b/tp/t/results/value/simple.pl
index f1e587ee50..dca0de9770 100644
--- a/tp/t/results/value/simple.pl
+++ b/tp/t/results/value/simple.pl
@@ -36,7 +36,15 @@ $result_trees{'simple'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'a-_5b',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'a-_5b'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'the value @b{b}',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -71,7 +79,7 @@ $result_trees{'simple'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'a-_5b',
+ 'line' => 'the value @b{b}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
diff --git a/tp/t/results/value/spaces_before_value.pl
b/tp/t/results/value/spaces_before_value.pl
index 0511ed35b8..f403437142 100644
--- a/tp/t/results/value/spaces_before_value.pl
+++ b/tp/t/results/value/spaces_before_value.pl
@@ -36,7 +36,15 @@ $result_trees{'spaces_before_value'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'var',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'var'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'val',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -52,7 +60,7 @@ $result_trees{'spaces_before_value'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'var',
+ 'line' => 'val',
'position' => 3,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
diff --git a/tp/t/results/value/value_after_accent.pl
b/tp/t/results/value/value_after_accent.pl
index 88407f5b79..6f5435cb30 100644
--- a/tp/t/results/value/value_after_accent.pl
+++ b/tp/t/results/value/value_after_accent.pl
@@ -45,7 +45,15 @@ $result_trees{'value_after_accent'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'a_letter',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'a_letter'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'a',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
}
@@ -65,7 +73,7 @@ $result_trees{'value_after_accent'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'a_letter',
+ 'line' => 'a',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
@@ -86,7 +94,15 @@ $result_trees{'value_after_accent'} = {
'source_marks' => [
{
'counter' => 2,
- 'line' => 'a_letter',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'a_letter'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'a',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
}
@@ -103,7 +119,7 @@ $result_trees{'value_after_accent'} = {
'source_marks' => [
{
'counter' => 2,
- 'line' => 'a_letter',
+ 'line' => 'a',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
diff --git a/tp/t/results/value/value_after_brace_command.pl
b/tp/t/results/value/value_after_brace_command.pl
index 713f103530..f489c173f9 100644
--- a/tp/t/results/value/value_after_brace_command.pl
+++ b/tp/t/results/value/value_after_brace_command.pl
@@ -79,7 +79,15 @@ $result_trees{'value_after_brace_command'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'bracedletter',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'bracedletter'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '{a}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
}
@@ -98,7 +106,7 @@ $result_trees{'value_after_brace_command'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'bracedletter',
+ 'line' => '{a}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
@@ -115,7 +123,15 @@ $result_trees{'value_after_brace_command'} = {
'source_marks' => [
{
'counter' => 2,
- 'line' => 'unknowncmd',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'unknowncmd'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@unknown',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
}
@@ -134,7 +150,7 @@ $result_trees{'value_after_brace_command'} = {
'source_marks' => [
{
'counter' => 2,
- 'line' => 'unknowncmd',
+ 'line' => '@unknown',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
@@ -161,7 +177,15 @@ $result_trees{'value_after_brace_command'} = {
'source_marks' => [
{
'counter' => 3,
- 'line' => 'bracedletter',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'bracedletter'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '{a}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
}
@@ -180,7 +204,7 @@ $result_trees{'value_after_brace_command'} = {
'source_marks' => [
{
'counter' => 3,
- 'line' => 'bracedletter',
+ 'line' => '{a}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
@@ -197,7 +221,15 @@ $result_trees{'value_after_brace_command'} = {
'source_marks' => [
{
'counter' => 4,
- 'line' => 'unknowncmd',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'unknowncmd'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@unknown',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
}
@@ -216,7 +248,7 @@ $result_trees{'value_after_brace_command'} = {
'source_marks' => [
{
'counter' => 4,
- 'line' => 'unknowncmd',
+ 'line' => '@unknown',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
@@ -243,7 +275,15 @@ $result_trees{'value_after_brace_command'} = {
'source_marks' => [
{
'counter' => 5,
- 'line' => 'bracedletter',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'bracedletter'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '{a}',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
}
@@ -262,7 +302,7 @@ $result_trees{'value_after_brace_command'} = {
'source_marks' => [
{
'counter' => 5,
- 'line' => 'bracedletter',
+ 'line' => '{a}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
@@ -279,7 +319,15 @@ $result_trees{'value_after_brace_command'} = {
'source_marks' => [
{
'counter' => 6,
- 'line' => 'unknowncmd',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'unknowncmd'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@unknown',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
}
@@ -298,7 +346,7 @@ $result_trees{'value_after_brace_command'} = {
'source_marks' => [
{
'counter' => 6,
- 'line' => 'unknowncmd',
+ 'line' => '@unknown',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
diff --git a/tp/t/results/value/value_in_index_commands.pl
b/tp/t/results/value/value_in_index_commands.pl
index 18001dd131..f7e491092f 100644
--- a/tp/t/results/value/value_in_index_commands.pl
+++ b/tp/t/results/value/value_in_index_commands.pl
@@ -98,6 +98,14 @@ $result_trees{'value_in_index_commands'} = {
},
{
'counter' => 2,
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'fn'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
'line' => 'fn',
'position' => 3,
'sourcemark_type' => 'value_expansion',
@@ -135,6 +143,14 @@ $result_trees{'value_in_index_commands'} = {
'source_marks' => [
{
'counter' => 1,
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'cp'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
'line' => 'cp',
'position' => 1,
'sourcemark_type' => 'value_expansion',
@@ -152,7 +168,15 @@ $result_trees{'value_in_index_commands'} = {
'source_marks' => [
{
'counter' => 3,
- 'line' => 'syncodeindex_command',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'syncodeindex_command'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@syncodeindex',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
}
@@ -187,7 +211,7 @@ $result_trees{'value_in_index_commands'} = {
'source_marks' => [
{
'counter' => 3,
- 'line' => 'syncodeindex_command',
+ 'line' => '@syncodeindex',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
@@ -277,6 +301,14 @@ $result_trees{'value_in_index_commands'} = {
'source_marks' => [
{
'counter' => 4,
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
'line' => 'truc',
'position' => 1,
'sourcemark_type' => 'value_expansion',
@@ -397,6 +429,14 @@ $result_trees{'value_in_index_commands'} = {
'source_marks' => [
{
'counter' => 5,
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'codeidx'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
'line' => 'codeidx',
'position' => 1,
'sourcemark_type' => 'value_expansion',
@@ -471,7 +511,15 @@ $result_trees{'value_in_index_commands'} = {
'source_marks' => [
{
'counter' => 6,
- 'line' => 'trucindex_command',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'trucindex_command'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@trucindex',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -518,7 +566,7 @@ $result_trees{'value_in_index_commands'} = {
'source_marks' => [
{
'counter' => 6,
- 'line' => 'trucindex_command',
+ 'line' => '@trucindex',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
@@ -622,7 +670,7 @@ $result_trees{'value_in_index_commands'} = {
'source_marks' => [
{
'counter' => 7,
- 'line' => 'defcodeindex_entry',
+ 'line' => 'a @var{index entry} t@\'e @^{@dotless{i}}',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
@@ -658,7 +706,15 @@ $result_trees{'value_in_index_commands'} = {
'source_marks' => [
{
'counter' => 7,
- 'line' => 'defcodeindex_entry',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'defcodeindex_entry'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'a @var{index entry} t@\'e @^{@dotless{i}}',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -725,6 +781,14 @@ $result_trees{'value_in_index_commands'} = {
'source_marks' => [
{
'counter' => 8,
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
'line' => 'truc',
'position' => 1,
'sourcemark_type' => 'value_expansion',
@@ -749,6 +813,14 @@ $result_trees{'value_in_index_commands'} = {
'source_marks' => [
{
'counter' => 9,
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'codeidx'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
'line' => 'codeidx',
'position' => 7,
'sourcemark_type' => 'value_expansion',
@@ -852,6 +924,14 @@ $result_trees{'value_in_index_commands'} = {
'source_marks' => [
{
'counter' => 10,
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'truc'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
'line' => 'truc',
'position' => 1,
'sourcemark_type' => 'value_expansion',
@@ -918,6 +998,14 @@ $result_trees{'value_in_index_commands'} = {
'source_marks' => [
{
'counter' => 11,
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'cp'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
'line' => 'cp',
'position' => 1,
'sourcemark_type' => 'value_expansion',
diff --git a/tp/t/results/value/value_in_invalid_documentencoding.pl
b/tp/t/results/value/value_in_invalid_documentencoding.pl
index 85d0fed974..249720557a 100644
--- a/tp/t/results/value/value_in_invalid_documentencoding.pl
+++ b/tp/t/results/value/value_in_invalid_documentencoding.pl
@@ -40,7 +40,7 @@ $result_trees{'value_in_invalid_documentencoding'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'badvalue',
+ 'line' => 'bad',
'position' => 3,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -67,7 +67,15 @@ $result_trees{'value_in_invalid_documentencoding'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'badvalue',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'badvalue'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'bad',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
diff --git a/tp/t/results/value/value_in_misc_commands.pl
b/tp/t/results/value/value_in_misc_commands.pl
index fcce22ce6e..437f8a827f 100644
--- a/tp/t/results/value/value_in_misc_commands.pl
+++ b/tp/t/results/value/value_in_misc_commands.pl
@@ -91,14 +91,22 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'text',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'text'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'atext',
'position' => 4,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 1,
- 'line' => 'text',
+ 'line' => 'atext',
'position' => 9,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -126,14 +134,22 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 2,
- 'line' => 'text',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'text'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'atext',
'position' => 14,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 2,
- 'line' => 'text',
+ 'line' => 'atext',
'position' => 19,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -272,7 +288,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 3,
- 'line' => 'pagesizes_arg',
+ 'line' => '200mm,150mm',
'position' => 11,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -296,7 +312,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 3,
- 'line' => 'pagesizes_arg',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'pagesizes_arg'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '200mm,150mm',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -313,7 +337,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 4,
- 'line' => 'afourpaper_macro',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'afourpaper_macro'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@afourpaper',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
}
@@ -342,14 +374,22 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 5,
- 'line' => 'text',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'text'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'atext',
'position' => 27,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 5,
- 'line' => 'text',
+ 'line' => 'atext',
'position' => 32,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -387,14 +427,22 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 6,
- 'line' => 'text',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'text'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'atext',
'position' => 18,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 6,
- 'line' => 'text',
+ 'line' => 'atext',
'position' => 23,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -432,14 +480,22 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 7,
- 'line' => 'text',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'text'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'atext',
'position' => 31,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 7,
- 'line' => 'text',
+ 'line' => 'atext',
'position' => 36,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -510,7 +566,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 8,
- 'line' => 'need_arg',
+ 'line' => '0.1',
'position' => 3,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -539,7 +595,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 8,
- 'line' => 'need_arg',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'need_arg'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '0.1',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -584,7 +648,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 9,
- 'line' => 'raisesections_macro',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'raisesections_macro'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@raisesections',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
}
@@ -625,7 +697,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 10,
- 'line' => 'lowersections_macro',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'lowersections_macro'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@lowersections',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
}
@@ -782,7 +862,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 11,
- 'line' => 'definfoenclose_name',
+ 'line' => 'phi',
'position' => 3,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -813,7 +893,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 11,
- 'line' => 'definfoenclose_name',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'definfoenclose_name'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'phi',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -920,7 +1008,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 12,
- 'line' => 'strong_macro',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'strong_macro'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@strong',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -949,7 +1045,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 12,
- 'line' => 'strong_macro',
+ 'line' => '@strong',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
@@ -983,21 +1079,29 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 13,
- 'line' => 'strong_name',
+ 'line' => 'strong',
'position' => 6,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
},
{
'counter' => 14,
- 'line' => 'strong_name',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'strong_name'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'strong',
'position' => 8,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 14,
- 'line' => 'strong_name',
+ 'line' => 'strong',
'position' => 14,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -1028,7 +1132,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 13,
- 'line' => 'strong_name',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'strong_name'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'strong',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -1047,7 +1159,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 15,
- 'line' => 'strong_macro',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'strong_macro'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@strong',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -1076,7 +1196,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 15,
- 'line' => 'strong_macro',
+ 'line' => '@strong',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
@@ -1170,7 +1290,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 16,
- 'line' => 'kbdinputstyle_arg',
+ 'line' => 'code',
'position' => 4,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -1199,7 +1319,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 16,
- 'line' => 'kbdinputstyle_arg',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'kbdinputstyle_arg'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'code',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -1470,7 +1598,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 17,
- 'line' => 'asis_arg',
+ 'line' => 'asis',
'position' => 4,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -1499,7 +1627,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 17,
- 'line' => 'asis_arg',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'asis_arg'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'asis',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -1522,7 +1658,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 18,
- 'line' => 'zero',
+ 'line' => '0',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -1551,7 +1687,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 18,
- 'line' => 'zero',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'zero'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '0',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -1574,7 +1718,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 19,
- 'line' => 'none_arg',
+ 'line' => 'none',
'position' => 4,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -1603,7 +1747,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 19,
- 'line' => 'none_arg',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'none_arg'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'none',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -1626,7 +1778,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 20,
- 'line' => 'four',
+ 'line' => '4',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -1655,7 +1807,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 20,
- 'line' => 'four',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'four'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '4',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -1678,7 +1838,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 21,
- 'line' => 'none_arg',
+ 'line' => 'none',
'position' => 4,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -1707,7 +1867,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 21,
- 'line' => 'none_arg',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'none_arg'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'none',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -1730,7 +1898,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 22,
- 'line' => 'six',
+ 'line' => '6',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -1759,7 +1927,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 22,
- 'line' => 'six',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'six'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '6',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -1833,7 +2009,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 23,
- 'line' => 'end_arg',
+ 'line' => 'end',
'position' => 3,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -1862,7 +2038,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 23,
- 'line' => 'end_arg',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'end_arg'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'end',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -1885,7 +2069,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 24,
- 'line' => 'separate_arg',
+ 'line' => 'separate',
'position' => 8,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -1914,7 +2098,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 24,
- 'line' => 'separate_arg',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'separate_arg'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'separate',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -1965,7 +2157,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 25,
- 'line' => 'latin1',
+ 'line' => 'ISO-8859-1',
'position' => 10,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -1994,7 +2186,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 25,
- 'line' => 'latin1',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'latin1'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'ISO-8859-1',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -2105,6 +2305,14 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 26,
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'en'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
'line' => 'en',
'position' => 2,
'sourcemark_type' => 'value_expansion',
@@ -2134,7 +2342,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 27,
- 'line' => 'documentlanguage_command',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'documentlanguage_command'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@documentlanguage',
'position' => 29,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -2169,7 +2385,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 27,
- 'line' => 'documentlanguage_command',
+ 'line' => '@documentlanguage',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
@@ -2249,7 +2465,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 28,
- 'line' => 'on_arg',
+ 'line' => 'on',
'position' => 2,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -2278,7 +2494,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 28,
- 'line' => 'on_arg',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'on_arg'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'on',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -2301,7 +2525,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 29,
- 'line' => 'off_arg',
+ 'line' => 'off',
'position' => 3,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -2330,7 +2554,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 29,
- 'line' => 'off_arg',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'off_arg'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'off',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -2397,7 +2629,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 30,
- 'line' => 'ten',
+ 'line' => '10',
'position' => 2,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -2426,7 +2658,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 30,
- 'line' => 'ten',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'ten'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '10',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -2532,7 +2772,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 31,
- 'line' => 'false_arg',
+ 'line' => 'false',
'position' => 5,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -2561,7 +2801,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 31,
- 'line' => 'false_arg',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'false_arg'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'false',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -2589,7 +2837,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 32,
- 'line' => 'true_arg',
+ 'line' => 'true',
'position' => 4,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -2618,7 +2866,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 32,
- 'line' => 'true_arg',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'true_arg'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'true',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -2721,7 +2977,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 33,
- 'line' => 'page_macro',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'page_macro'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@page',
'position' => 5,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -2746,7 +3010,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 34,
- 'line' => 'noindent_macro',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'noindent_macro'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@noindent',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -2768,7 +3040,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 34,
- 'line' => 'noindent_macro',
+ 'line' => '@noindent',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
@@ -2782,7 +3054,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 35,
- 'line' => 'noindent_macro',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'noindent_macro'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@noindent',
'position' => 30,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -2803,7 +3083,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 35,
- 'line' => 'noindent_macro',
+ 'line' => '@noindent',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
@@ -2820,7 +3100,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 36,
- 'line' => 'noindent_macro',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'noindent_macro'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@noindent',
'position' => 2,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -2840,7 +3128,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 36,
- 'line' => 'noindent_macro',
+ 'line' => '@noindent',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
@@ -2901,7 +3189,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 37,
- 'line' => 'page_macro',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'page_macro'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@page',
'position' => 5,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -2952,7 +3248,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 38,
- 'line' => 'contents_macro',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'contents_macro'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@contents',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
}
@@ -3024,7 +3328,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 39,
- 'line' => 'exdent_macro',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'exdent_macro'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@exdent',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
}
@@ -3053,7 +3365,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 39,
- 'line' => 'exdent_macro',
+ 'line' => '@exdent',
'sourcemark_type' => 'value_expansion',
'status' => 'end'
}
@@ -3103,7 +3415,7 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 40,
- 'line' => 'two',
+ 'line' => '2',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -3132,7 +3444,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 40,
- 'line' => 'two',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'two'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '2',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -3207,7 +3527,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 41,
- 'line' => 'contents_macro',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'contents_macro'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@contents',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -3262,7 +3590,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 42,
- 'line' => 'shortcontents_macro',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'shortcontents_macro'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@shortcontents',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
}
@@ -3315,7 +3651,15 @@ $result_trees{'value_in_misc_commands'} = {
'source_marks' => [
{
'counter' => 43,
- 'line' => 'bye_macro',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'bye_macro'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@bye',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
diff --git a/tp/t/results/value/value_in_node.pl
b/tp/t/results/value/value_in_node.pl
index f51e8dcbbd..4fa0d359ad 100644
--- a/tp/t/results/value/value_in_node.pl
+++ b/tp/t/results/value/value_in_node.pl
@@ -203,13 +203,21 @@ $result_trees{'value_in_node'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'node1',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'node1'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'Node 1',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 1,
- 'line' => 'node1',
+ 'line' => 'Node 1',
'position' => 6,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -324,7 +332,7 @@ $result_trees{'value_in_node'} = {
'source_marks' => [
{
'counter' => 2,
- 'line' => 'node1',
+ 'line' => 'Node 1',
'position' => 6,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -402,7 +410,15 @@ $result_trees{'value_in_node'} = {
'source_marks' => [
{
'counter' => 2,
- 'line' => 'node1',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'node1'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'Node 1',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -495,13 +511,21 @@ $result_trees{'value_in_node'} = {
'source_marks' => [
{
'counter' => 3,
- 'line' => 'sec1',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'sec1'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'Section 1.1',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 3,
- 'line' => 'sec1',
+ 'line' => 'Section 1.1',
'position' => 11,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -669,7 +693,15 @@ $result_trees{'value_in_node'} = {
'source_marks' => [
{
'counter' => 4,
- 'line' => 'node1',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'node1'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'Node 1',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
}
@@ -680,7 +712,7 @@ $result_trees{'value_in_node'} = {
'source_marks' => [
{
'counter' => 4,
- 'line' => 'node1',
+ 'line' => 'Node 1',
'position' => 6,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
diff --git a/tp/t/results/value/value_node_directions.pl
b/tp/t/results/value/value_node_directions.pl
index 2a56b29e0e..b00cb34d1f 100644
--- a/tp/t/results/value/value_node_directions.pl
+++ b/tp/t/results/value/value_node_directions.pl
@@ -56,7 +56,7 @@ $result_trees{'value_node_directions'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'a--foo',
+ 'line' => 'bar',
'position' => 3,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -70,7 +70,15 @@ $result_trees{'value_node_directions'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'a--foo',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'a--foo'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'bar',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -174,14 +182,22 @@ $result_trees{'value_node_directions'} = {
'source_marks' => [
{
'counter' => 2,
- 'line' => 'a--foo',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'a--foo'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'bar',
'position' => 4,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 2,
- 'line' => 'a--foo',
+ 'line' => 'bar',
'position' => 7,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -205,7 +221,15 @@ $result_trees{'value_node_directions'} = {
'source_marks' => [
{
'counter' => 3,
- 'line' => 'a--foo',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'a--foo'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'bar',
'sourcemark_type' => 'value_expansion',
'status' => 'start'
}
@@ -218,7 +242,7 @@ $result_trees{'value_node_directions'} = {
'source_marks' => [
{
'counter' => 3,
- 'line' => 'a--foo',
+ 'line' => 'bar',
'position' => 3,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -256,7 +280,7 @@ $result_trees{'value_node_directions'} = {
'source_marks' => [
{
'counter' => 4,
- 'line' => 'a--foo',
+ 'line' => 'bar',
'position' => 3,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -354,7 +378,15 @@ $result_trees{'value_node_directions'} = {
'source_marks' => [
{
'counter' => 4,
- 'line' => 'a--foo',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'a--foo'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'bar',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -430,7 +462,7 @@ $result_trees{'value_node_directions'} = {
'source_marks' => [
{
'counter' => 5,
- 'line' => 'a--foo',
+ 'line' => 'bar',
'position' => 3,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
@@ -444,7 +476,15 @@ $result_trees{'value_node_directions'} = {
'source_marks' => [
{
'counter' => 5,
- 'line' => 'a--foo',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'a--foo'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => 'bar',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
diff --git a/tp/t/results/value/value_zero.pl b/tp/t/results/value/value_zero.pl
index ff827826d4..c3e0a92bcc 100644
--- a/tp/t/results/value/value_zero.pl
+++ b/tp/t/results/value/value_zero.pl
@@ -38,7 +38,15 @@ $result_trees{'value_zero'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'zero',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'zero'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '0',
'position' => 6,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -51,7 +59,7 @@ $result_trees{'value_zero'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'zero',
+ 'line' => '0',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
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 da367b2083..c71bd3502f 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
@@ -139,14 +139,22 @@ $result_trees{'comma_value_in_macro_arg'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'comma',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'comma'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => ',',
'position' => 5,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 1,
- 'line' => 'comma',
+ 'line' => ',',
'position' => 6,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
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 fb47107d8b..4955f5db5a 100644
--- a/tp/t/results/value_and_macro/macro_in_value.pl
+++ b/tp/t/results/value_and_macro/macro_in_value.pl
@@ -115,7 +115,15 @@ $result_trees{'macro_in_value'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'flagab',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'flagab'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '@ab',
'position' => 8,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
@@ -156,7 +164,7 @@ $result_trees{'macro_in_value'} = {
},
{
'counter' => 1,
- 'line' => 'flagab',
+ 'line' => '@ab',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
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 a34593c5fe..115384c70d 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
@@ -135,14 +135,22 @@ $result_trees{'value_in_macro_body'} = {
'source_marks' => [
{
'counter' => 1,
- 'line' => 'bodyarg',
+ 'element' => {
+ 'args' => [
+ {
+ 'text' => 'bodyarg'
+ }
+ ],
+ 'cmdname' => 'value'
+ },
+ 'line' => '\\arg\\',
'position' => 1,
'sourcemark_type' => 'value_expansion',
'status' => 'start'
},
{
'counter' => 1,
- 'line' => 'bodyarg',
+ 'line' => '\\arg\\',
'position' => 6,
'sourcemark_type' => 'value_expansion',
'status' => 'end'
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Texinfo/Convert/HTML.pm (%default_commands_args) (_convert_value_command), tp/Texinfo/Convert/LaTeX.pm (_convert), tp/Texinfo/Convert/Plaintext.pm (_convert), tp/Texinfo/Convert/Texinfo.pm (_expand_cmd_args_to_texi), tp/Texinfo/Convert/TexinfoMarkup.pm (_convert), tp/Texinfo/ParserNonXS.pm (_new_value_element) (_process_remaining_on_line), tp/Texinfo/XS/parsetexi/parser.c (new_value_element, process_remaining_on_line): use the same structure for txiinternalvalue, a value not expanded [...],
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/Texinfo/ParserNonXS.pm (_transfer_source_marks, _close_container) (_close_command_cleanup, _merge_text, _end_line): test only existence of source_marks key, if it exists it is necessarily non-empty.
- Next by Date:
branch master updated: * tp/Texinfo/ParserNonXS.pm (_next_text), tp/Texinfo/XS/parsetexi/input.c (next_text): reuse input source mark for delcomment. Do not pass line from input source mark to the other source marks.
- Previous by thread:
branch master updated: * tp/Texinfo/ParserNonXS.pm (_transfer_source_marks, _close_container) (_close_command_cleanup, _merge_text, _end_line): test only existence of source_marks key, if it exists it is necessarily non-empty.
- Next by thread:
branch master updated: * tp/Texinfo/ParserNonXS.pm (_next_text), tp/Texinfo/XS/parsetexi/input.c (next_text): reuse input source mark for delcomment. Do not pass line from input source mark to the other source marks.
- Index(es):