[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Remove command_as_argument element type
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: Remove command_as_argument element type |
|
Date: |
Sat, 28 Sep 2024 18:37:58 -0400 |
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 650038c205 Remove command_as_argument element type
650038c205 is described below
commit 650038c20503ded72ff2bea4748c9c78d9df6a3a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Jun 3 17:00:12 2024 +0200
Remove command_as_argument element type
* tp/Texinfo/Convert/Text.pm (_convert): fix parentheses of brace
command argument type test.
* tp/Texinfo/Convert/LaTeX.pm (_convert): determine if a command as
argument is the default for itemize by checking the parents and not
the type.
* tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): determine that the
command_as_argument element by comparing with the itemize parent extra
value instead of using the type.
* tp/Texinfo/Convert/Converter.pm (table_item_content_tree),
tp/Texinfo/Convert/Texinfo.pm (_convert_to_texinfo)
(_expand_cmd_args_to_texi): check that type is set before accessing
and do not access type if not needed.
* tp/Texinfo/ParserNonXS.pm (_end_line_starting_block)
(_register_command_as_argument), tp/Texinfo/XS/main/build_perl_info.c
(element_to_perl_hash), tp/Texinfo/XS/parsetexi/end_line.c
(end_line_starting_block), tp/Texinfo/XS/parsetexi/parser.c
(register_command_as_argument): do not set a special type for the
command_as_argument, and do not set a flag in C.
---
ChangeLog | 27 ++++++++++++++
tp/TODO | 3 --
tp/Texinfo/Convert/Converter.pm | 3 +-
tp/Texinfo/Convert/LaTeX.pm | 11 +++---
tp/Texinfo/Convert/Texinfo.pm | 6 ++--
tp/Texinfo/Convert/TexinfoMarkup.pm | 11 +++---
tp/Texinfo/Convert/Text.pm | 4 +--
tp/Texinfo/ParserNonXS.pm | 8 ++---
tp/Texinfo/XS/main/build_perl_info.c | 6 ----
tp/Texinfo/XS/main/tree_types.h | 1 -
tp/Texinfo/XS/parsetexi/end_line.c | 10 ++----
tp/Texinfo/XS/parsetexi/parser.c | 1 -
.../XS/structuring_transfo/transformations.c | 4 +--
tp/t/results/alias/alias_table_command.pl | 3 +-
tp/t/results/converters_tests/complex_nestings.pl | 3 +-
.../email_table_command_as_argument.pl | 3 +-
.../indices_in_begin_tables_lists.pl | 42 ++++++++--------------
...ces_in_begin_tables_lists_entries_after_item.pl | 42 ++++++++--------------
tp/t/results/converters_tests/line_breaks.pl | 3 +-
.../table_in_display_in_example.pl | 3 +-
.../table_in_example_in_display.pl | 3 +-
.../various_vtable_command_as_argument.pl | 21 ++++-------
.../coverage/formats_only_title_comments.pl | 9 ++---
tp/t/results/coverage/formats_only_titles.pl | 9 ++---
tp/t/results/coverage/formats_titles.pl | 9 ++---
tp/t/results/coverage/item_container.pl | 6 ++--
tp/t/results/coverage/preformatted.pl | 3 +-
.../coverage/punctuation_in_line_commands.pl | 3 +-
tp/t/results/coverage/symbol_after_block.pl | 12 +++----
tp/t/results/coverage/symbol_after_command.pl | 3 +-
tp/t/results/coverage/table.pl | 9 ++---
tp/t/results/coverage/table_command_comment.pl | 3 +-
tp/t/results/float/complex_float.pl | 18 ++++------
tp/t/results/html_tests/anchor_on_vtable_item.pl | 3 +-
..._name_case_insensitive_conflict_redirections.pl | 3 +-
tp/t/results/html_tests/itemize_arguments.pl | 30 ++++++----------
.../itemize_arguments_enable_encoding.pl | 30 ++++++----------
tp/t/results/html_tests/menu.pl | 18 ++++------
.../include/include_in_removed_before_item.pl | 3 +-
tp/t/results/indices/empty_string_index_entry.pl | 3 +-
tp/t/results/indices/ftable_vtable.pl | 6 ++--
tp/t/results/indices/index_special_region.pl | 3 +-
.../index_special_region_no_insertcopying.pl | 3 +-
...egion_no_insertcopying_no_titlepage_no_nodes.pl | 3 +-
...l_region_no_insertcopying_titlepage_no_nodes.pl | 3 +-
...copying_titlepage_no_nodes_footnotes_default.pl | 3 +-
.../index_special_region_no_titlepage_no_nodes.pl | 3 +-
.../index_special_region_titlepage_no_nodes.pl | 3 +-
..._region_titlepage_no_nodes_footnotes_default.pl | 3 +-
tp/t/results/indices/index_table.pl | 12 +++----
.../results/indices/index_table_chapter_no_node.pl | 12 +++----
.../indices/printindex_index_entry_in_copying.pl | 3 +-
...ndex_index_entry_in_copying_no_insertcopying.pl | 3 +-
tp/t/results/info_tests/colon_in_index_entry.pl | 3 +-
tp/t/results/info_tests/test_index.pl | 3 +-
.../results/invalid_nestings/block_not_matching.pl | 6 ++--
tp/t/results/invalid_nestings/center.pl | 9 ++---
.../formats_not_closed_in_example.pl | 3 +-
tp/t/results/invalid_nestings/in_errormsg.pl | 3 +-
tp/t/results/invalid_nestings/in_table.pl | 9 ++---
tp/t/results/invalid_nestings/item_in_ref.pl | 3 +-
.../itemx_in_itemize_enumerate_in_table.pl | 6 ++--
.../section_in_nested_block_commands.pl | 3 +-
tp/t/results/invalid_nestings/section_in_table.pl | 3 +-
.../invalid_nestings/section_on_itemize_line.pl | 6 ++--
.../invalid_nestings/section_on_xtable_line.pl | 15 +++-----
.../style_not_closed_in_table_line.pl | 3 +-
tp/t/results/invalid_nestings/table_in_code.pl | 3 +-
.../table_not_closed_in_menu_comment.pl | 3 +-
.../table_not_closed_in_menu_description.pl | 3 +-
.../results/invalid_nestings/table_on_item_line.pl | 6 ++--
tp/t/results/itemize/asis_as_itemize_argument.pl | 3 +-
.../itemize/comment_first_on_itemize_line.pl | 3 +-
tp/t/results/itemize/empty_accent_argument.pl | 3 +-
tp/t/results/itemize/headitem_itemx_in_itemize.pl | 3 +-
.../itemize/inter_item_commands_in_itemize.pl | 9 ++---
tp/t/results/itemize/itemize_and_empty_lines.pl | 15 +++-----
tp/t/results/itemize/itemize_in_example.pl | 6 ++--
.../itemize/itemize_line_commands_with_brace.pl | 6 ++--
tp/t/results/itemize/not_closed_item.pl | 3 +-
tp/t/results/itemize/not_closed_itemize.pl | 3 +-
tp/t/results/itemize/table_in_itemize.pl | 6 ++--
tp/t/results/itemize/w_argument.pl | 3 +-
tp/t/results/latex_tests/nested_itemize.pl | 12 +++----
tp/t/results/linemacro/blockitem_no_item.pl | 3 +-
.../linemacro/call_macro_in_linemacro_body.pl | 3 +-
.../linemacro/call_macro_in_linemacro_call.pl | 3 +-
tp/t/results/macro/bib_example.pl | 3 +-
tp/t/results/macro/macro_in_brace_command.pl | 3 +-
.../macro_in_empty_table_empty_before_item.pl | 3 +-
.../macro/macro_in_table_empty_before_item.pl | 3 +-
.../menu/block_commands_in_menu_description.pl | 6 ++--
tp/t/results/menu/formats_in_menu.pl | 3 +-
tp/t/results/misc_commands/footnote_in_center.pl | 3 +-
.../misc_commands/kbdinputstyle_in_table.pl | 36 +++++++------------
tp/t/results/paragraph/commands_in_flushright.pl | 3 +-
.../itemize_in_headitem_in_example.pl | 12 +++----
.../plaintext_tests/long_uref_after_item.pl | 3 +-
.../plaintext_tests/tab_in_table_in_example.pl | 3 +-
.../plaintext_tests/xref_quote_long_item.pl | 3 +-
...dex_entries_relate_to_item_no_transformation.pl | 3 +-
.../index_entries_relate_to_item_transformation.pl | 3 +-
tp/t/results/value/set_in_item_missing_line.pl | 6 ++--
tp/t/results/value/set_on_item_line.pl | 6 ++--
tp/t/results/xml_tests/commands_and_spaces.pl | 3 +-
tp/t/results/xml_tests/comments_end_lines.pl | 6 ++--
.../xml_tests/comments_on_block_command_lines.pl | 12 +++----
tp/t/results/xml_tests/image_inline_or_not.pl | 3 +-
tp/t/results/xtable/accent_on_table_line.pl | 27 +++++---------
tp/t/results/xtable/block_commands_in_table.pl | 12 +++----
.../xtable/comment_and_itemx_before_item.pl | 3 +-
tp/t/results/xtable/empty_item_itemx.pl | 3 +-
tp/t/results/xtable/empty_table.pl | 3 +-
tp/t/results/xtable/headitem_in_table.pl | 3 +-
.../xtable/index_command_before_end_table.pl | 3 +-
.../results/xtable/inter_item_commands_in_table.pl | 36 +++++++------------
.../inter_item_commands_in_table_in_example.pl | 3 +-
.../xtable/invalid_command_and_brace_in_table.pl | 3 +-
tp/t/results/xtable/item_index_transformation.pl | 12 +++----
tp/t/results/xtable/itemx_before_item.pl | 3 +-
tp/t/results/xtable/long_item.pl | 3 +-
.../xtable/no_arg_brace_command_on_table_line.pl | 6 ++--
tp/t/results/xtable/no_argument_for_table.pl | 3 +-
tp/t/results/xtable/table_nested.pl | 18 ++++------
tp/t/results/xtable/text_between_item_itemx.pl | 3 +-
tp/t/results/xtable/title_and_itemx_before_item.pl | 3 +-
126 files changed, 320 insertions(+), 579 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bd71360ddf..e735f2e368 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2024-06-03 Patrice Dumas <pertusus@free.fr>
+
+ Remove command_as_argument element type
+
+ * tp/Texinfo/Convert/Text.pm (_convert): fix parentheses of brace
+ command argument type test.
+
+ * tp/Texinfo/Convert/LaTeX.pm (_convert): determine if a command as
+ argument is the default for itemize by checking the parents and not
+ the type.
+
+ * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): determine that the
+ command_as_argument element by comparing with the itemize parent extra
+ value instead of using the type.
+
+ * tp/Texinfo/Convert/Converter.pm (table_item_content_tree),
+ tp/Texinfo/Convert/Texinfo.pm (_convert_to_texinfo)
+ (_expand_cmd_args_to_texi): check that type is set before accessing
+ and do not access type if not needed.
+
+ * tp/Texinfo/ParserNonXS.pm (_end_line_starting_block)
+ (_register_command_as_argument), tp/Texinfo/XS/main/build_perl_info.c
+ (element_to_perl_hash), tp/Texinfo/XS/parsetexi/end_line.c
+ (end_line_starting_block), tp/Texinfo/XS/parsetexi/parser.c
+ (register_command_as_argument): do not set a special type for the
+ command_as_argument, and do not set a flag in C.
+
2024-06-03 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/main/build_perl_info.c (element_to_perl_hash),
diff --git a/tp/TODO b/tp/TODO
index 3b4c55adf1..328640686b 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -10,9 +10,6 @@ This is the todo list for texi2any
Before next release
===================
-make command_as_argument part of info instead of a type in Perl
-
-
Bugs
====
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index bbfbedff73..337648f843 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -1481,7 +1481,8 @@ sub table_item_content_tree($$)
if ($table_command->{'extra'}->{'command_as_argument_kbd_code'}) {
$command->{'extra'} = {'code' => 1};
}
- if ($command_as_argument->{'type'} eq 'definfoenclose_command') {
+ if ($command_as_argument->{'type'}
+ and $command_as_argument->{'type'} eq 'definfoenclose_command') {
$command->{'type'} = $command_as_argument->{'type'};
$command->{'extra'} = {} if (!$command->{'extra'});
$command->{'extra'}->{'begin'} =
$command_as_argument->{'extra'}->{'begin'};
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 1695482f78..5ae001b7ef 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -2639,12 +2639,13 @@ sub _convert($$)
my $type = $element->{'type'};
my $cmdname = $element->{'cmdname'};
- if ((defined($type) and ($self->{'ignored_types'}->{$type}
- # ignore 'command_as_argument' inserted in order to use the default
+ if ((defined($type) and $self->{'ignored_types'}->{$type})
+ # ignore command as argument inserted in order to use the default
# setting for @itemize if there is no argument
- or ($type eq 'command_as_argument'
- and $element->{'info'}
- and $element->{'info'}->{'inserted'})))
+ or ($element->{'info'} and $element->{'info'}->{'inserted'}
+ and $element->{'parent'} and $element->{'parent'}->{'parent'}
+ and $element->{'parent'}->{'parent'}->{'cmdname'}
+ and $element->{'parent'}->{'parent'}->{'cmdname'} eq 'itemize')
or (defined($cmdname)
and ($self->{'ignored_commands'}->{$cmdname}
or ($Texinfo::Commands::brace_commands{$cmdname}
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index 3dccb62e21..83d9cd8a44 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -196,8 +196,7 @@ sub _convert_to_texinfo($)
if (ref($element) ne 'HASH');
my $result = '';
- return '' if ($element->{'type'}
- and $element->{'info'}
+ return '' if ($element->{'info'}
and $element->{'info'}->{'inserted'});
if (defined($element->{'text'})) {
$result .= $element->{'text'};
@@ -282,8 +281,7 @@ sub _expand_cmd_args_to_texi($) {
}
my $arg_nr = 0;
foreach my $arg (@{$cmd->{'args'}}) {
- next if ($arg->{'type'} and $arg->{'info'}
- and $arg->{'info'}->{'inserted'});
+ next if ($arg->{'info'} and $arg->{'info'}->{'inserted'});
if ($with_commas) {
$result .= ',' if ($arg_nr);
$arg_nr++;
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index eaaf13ddd7..a60c8536d2 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -629,8 +629,8 @@ sub _convert($$;$)
return $self->txi_markup_element('click',
[['command', $element->{'extra'}->{'clickstyle'}]]);
}
- if ($self->{'itemize_line'} and $element->{'type'}
- and $element->{'type'} eq 'command_as_argument'
+ if ($self->{'itemize_command_as_argument'}
+ and $element eq $self->{'itemize_command_as_argument'}
and !$element->{'args'}) {
my $arguments = [['command', $element->{'cmdname'}]];
push @$arguments, ['automatic', 'on']
@@ -1255,9 +1255,11 @@ sub _convert($$;$)
}
my $prepended_elements = '';
my $attribute = [];
- $self->{'itemize_line'} = 1 if ($element->{'cmdname'} eq 'itemize');
if ($element->{'extra'} and
$element->{'extra'}->{'command_as_argument'}) {
my $command_as_arg = $element->{'extra'}->{'command_as_argument'};
+ if ($element->{'cmdname'} eq 'itemize') {
+ $self->{'itemize_command_as_argument'} = $command_as_arg;
+ }
push @$attribute,
(['commandarg', $command_as_arg->{'cmdname'}],
$self->_infoenclose_attribute($command_as_arg));
@@ -1481,7 +1483,8 @@ sub _convert($$;$)
}
unshift @close_format_elements, $element->{'cmdname'};
}
- delete $self->{'itemize_line'} if ($self->{'itemize_line'});
+ delete $self->{'itemize_command_as_argument'}
+ if ($self->{'itemize_command_as_argument'});
}
}
if ($element->{'type'}) {
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index 6b0da1b809..f86df9d717 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -585,8 +585,8 @@ sub _convert($$)
return $result;
} elsif ($element->{'args'} and $element->{'args'}->[0]
and (($element->{'args'}->[0]->{'type'}
- and ($element->{'args'}->[0]->{'type'} eq 'brace_command_arg')
- or $element->{'args'}->[0]->{'type'} eq
'brace_command_container')
+ and ($element->{'args'}->[0]->{'type'} eq 'brace_command_arg'
+ or $element->{'args'}->[0]->{'type'} eq
'brace_command_container'))
or ($Texinfo::Commands::math_commands{$element->{'cmdname'}}
and defined($Texinfo::Commands::brace_commands{
$element->{'cmdname'}})))) {
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 2358e4fa31..291b2ecf54 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -4238,6 +4238,7 @@ sub _end_line_starting_block($$$)
my $command_as_argument = $current->{'extra'}->{'command_as_argument'};
# This code checks that the command_as_argument of the @itemize
# is alone on the line, otherwise it is not a command_as_argument.
+ # TODO rewrite without shifting
my @args = @{$current->{'args'}->[0]->{'contents'}};
while (@args) {
my $arg = shift @args;
@@ -4249,7 +4250,6 @@ sub _end_line_starting_block($$$)
and ($arg->{'cmdname'} eq 'c'
or $arg->{'cmdname'} eq 'comment'))
or (defined($arg->{'text'}) and $arg->{'text'} !~ /\S/))) {
- delete $current->{'extra'}->{'command_as_argument'}->{'type'};
delete $current->{'extra'}->{'command_as_argument'};
if (scalar(keys(%{$current->{'extra'}})) == 0) {
delete $current->{'extra'};
@@ -4308,7 +4308,6 @@ sub _end_line_starting_block($$$)
unshift @{$current->{'args'}}, $block_line_arg;
}
my $inserted = { 'cmdname' => 'bullet',
- 'type' => 'command_as_argument',
'info' => {'inserted' => 1},
'parent' => $block_line_arg };
unshift @{$block_line_arg->{'contents'}}, $inserted;
@@ -4319,8 +4318,7 @@ sub _end_line_starting_block($$$)
$current->{'extra'} = {} if (!$current->{'extra'});
if (!$current->{'extra'}->{'command_as_argument'}) {
my $inserted = { 'cmdname' => 'asis',
- 'type' => 'command_as_argument',
- 'info' => {'inserted' => 1},
+ 'info' => {'inserted' => 1},
'parent' => $current };
unshift @{$current->{'args'}}, $inserted;
$current->{'extra'}->{'command_as_argument'} = $inserted;
@@ -4847,7 +4845,6 @@ sub _register_command_as_argument($$)
print STDERR "FOR PARENT \@$cmd_as_arg->{'parent'}->{'parent'}->{'cmdname'}
".
"command_as_argument $cmd_as_arg->{'cmdname'}\n"
if ($self->{'conf'}->{'DEBUG'});
- $cmd_as_arg->{'type'} = 'command_as_argument' if (!$cmd_as_arg->{'type'});
$cmd_as_arg->{'parent'}->{'parent'}->{'extra'} = {}
if (!defined($cmd_as_arg->{'parent'}->{'parent'}->{'extra'}));
$cmd_as_arg->{'parent'}->{'parent'}->{'extra'}->{'command_as_argument'}
@@ -8437,7 +8434,6 @@ C<@table>, C<@vtable> or C<@ftable>. For example in
the element corresponding with bullet has the following keys:
'cmdname' => 'bullet'
- 'type' => 'command_as_argument'
The parent @-command has an entry in C<extra> for the I<command_as_argument>
element:
diff --git a/tp/Texinfo/XS/main/build_perl_info.c
b/tp/Texinfo/XS/main/build_perl_info.c
index 904ba1a171..9c18b1a569 100644
--- a/tp/Texinfo/XS/main/build_perl_info.c
+++ b/tp/Texinfo/XS/main/build_perl_info.c
@@ -631,12 +631,6 @@ element_to_perl_hash (ELEMENT *e, int avoid_recursion)
sv = newSVpv (type_data[e->type].name, 0);
hv_store (e->hv, "type", strlen ("type"), sv, HSH_type);
}
- else if (e->flags & EF_command_as_argument)
- {
- /* TODO put in info in Perl too */
- sv = newSVpv ("command_as_argument", 0);
- hv_store (e->hv, "type", strlen ("type"), sv, HSH_type);
- }
if (e->flags & EF_inserted)
{
diff --git a/tp/Texinfo/XS/main/tree_types.h b/tp/Texinfo/XS/main/tree_types.h
index 3747236fc9..c36cb70714 100644
--- a/tp/Texinfo/XS/main/tree_types.h
+++ b/tp/Texinfo/XS/main/tree_types.h
@@ -343,6 +343,5 @@ typedef struct TREE_ADDED_ELEMENTS {
/* tree element flags */
#define EF_inserted 0x0001
-#define EF_command_as_argument 0x0002
#endif
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c
b/tp/Texinfo/XS/parsetexi/end_line.c
index 454fe36e2e..f18cb66844 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -962,9 +962,6 @@ end_line_starting_block (ELEMENT *current)
command_name(command));
k_command_as_arg->key = "";
k_command_as_arg->type = extra_deleted;
- /* TODO check if not best
- e->flags &= ~EF_command_as_argument;
- */
}
}
}
@@ -998,9 +995,6 @@ end_line_starting_block (ELEMENT *current)
&& !*(f->text->text
+ strspn (f->text->text, whitespace_chars))))
{
- k_command_as_arg->k.element->type = ET_NONE;
- k_command_as_arg->k.element->flags
- &= ~EF_command_as_argument;
k_command_as_arg->key = "";
k_command_as_arg->type = extra_deleted;
k_command_as_arg = 0;
@@ -1066,7 +1060,7 @@ end_line_starting_block (ELEMENT *current)
}
e = new_command_element (ET_brace_noarg_command, CM_bullet);
- e->flags |= EF_inserted | EF_command_as_argument;
+ e->flags |= EF_inserted;
insert_into_contents (block_line_arg, e, 0);
add_extra_element (current, "command_as_argument", e);
}
@@ -1076,7 +1070,7 @@ end_line_starting_block (ELEMENT *current)
ELEMENT *e;
e = new_command_element (ET_brace_command, CM_asis);
- e->flags |= EF_inserted | EF_command_as_argument;
+ e->flags |= EF_inserted;
insert_into_args (current, e, 0);
add_extra_element (current, "command_as_argument", e);
}
diff --git a/tp/Texinfo/XS/parsetexi/parser.c b/tp/Texinfo/XS/parsetexi/parser.c
index fb14425f9f..b123dbbcd0 100644
--- a/tp/Texinfo/XS/parsetexi/parser.c
+++ b/tp/Texinfo/XS/parsetexi/parser.c
@@ -1082,7 +1082,6 @@ register_command_as_argument (ELEMENT *cmd_as_arg)
debug ("FOR PARENT @%s command_as_argument %s",
command_name(cmd_as_arg->parent->parent->cmd),
command_name(cmd_as_arg->cmd));
- cmd_as_arg->flags |= EF_command_as_argument;
add_extra_element (cmd_as_arg->parent->parent,
"command_as_argument", cmd_as_arg);
if (cmd_as_arg->cmd == CM_kbd
diff --git a/tp/Texinfo/XS/structuring_transfo/transformations.c
b/tp/Texinfo/XS/structuring_transfo/transformations.c
index e062c33191..ab48b9d207 100644
--- a/tp/Texinfo/XS/structuring_transfo/transformations.c
+++ b/tp/Texinfo/XS/structuring_transfo/transformations.c
@@ -547,8 +547,8 @@ move_index_entries_after_items_in_tree (ELEMENT *tree)
/* ERROR_MESSAGES is not actually useful, as the code checks that
the new node target label does not exist already.
- FIXME set node_tree to be ELEMENT_LIST? May need to have copy_contents
- return an ELEMENT_LIST
+ node_tree is actually used as an element list, but we use an
+ element to be able to do the transformations in new_node.
*/
ELEMENT *
new_node (ERROR_MESSAGE_LIST *error_messages, ELEMENT *node_tree,
diff --git a/tp/t/results/alias/alias_table_command.pl
b/tp/t/results/alias/alias_table_command.pl
index 0146486b3c..6b4e480c46 100644
--- a/tp/t/results/alias/alias_table_command.pl
+++ b/tp/t/results/alias/alias_table_command.pl
@@ -58,8 +58,7 @@ $result_trees{'alias_table_command'} = {
},
'source_info' => {
'line_nr' => 3
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/converters_tests/complex_nestings.pl
b/tp/t/results/converters_tests/complex_nestings.pl
index cf88e41deb..e886c2b948 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -767,8 +767,7 @@ $result_trees{'complex_nestings'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 18
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/converters_tests/email_table_command_as_argument.pl
b/tp/t/results/converters_tests/email_table_command_as_argument.pl
index ce81d1ca6f..a017b14d83 100644
--- a/tp/t/results/converters_tests/email_table_command_as_argument.pl
+++ b/tp/t/results/converters_tests/email_table_command_as_argument.pl
@@ -17,8 +17,7 @@ $result_trees{'email_table_command_as_argument'} = {
'cmdname' => 'email',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
b/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
index b9d56378f1..f563962a4b 100644
--- a/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
+++ b/tp/t/results/converters_tests/indices_in_begin_tables_lists.pl
@@ -163,8 +163,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 9
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -314,8 +313,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 15
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -522,8 +520,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1524,8 +1521,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 68
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1667,8 +1663,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 74
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1850,8 +1845,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 81
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -2205,8 +2199,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 97
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -2378,8 +2371,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 104
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -2541,8 +2533,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 110
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -2714,8 +2705,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 117
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -2877,8 +2867,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 123
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -3041,8 +3030,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 130
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -3200,8 +3188,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 136
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -3359,8 +3346,7 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 142
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
index 0c34f78a2d..d9cf96ea72 100644
---
a/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
+++
b/tp/t/results/converters_tests/indices_in_begin_tables_lists_entries_after_item.pl
@@ -163,8 +163,7 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 9
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -315,8 +314,7 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 15
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -522,8 +520,7 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1526,8 +1523,7 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 68
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1669,8 +1665,7 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 74
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1852,8 +1847,7 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 81
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -2207,8 +2201,7 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 97
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -2380,8 +2373,7 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 104
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -2543,8 +2535,7 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 110
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -2716,8 +2707,7 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 117
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -2879,8 +2869,7 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 123
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -3043,8 +3032,7 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 130
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -3202,8 +3190,7 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 136
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -3361,8 +3348,7 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'source_info' => {
'file_name' => 'indices_in_begin_tables_lists.texi',
'line_nr' => 142
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/converters_tests/line_breaks.pl
b/tp/t/results/converters_tests/line_breaks.pl
index a27397693b..74f0a4197e 100644
--- a/tp/t/results/converters_tests/line_breaks.pl
+++ b/tp/t/results/converters_tests/line_breaks.pl
@@ -195,8 +195,7 @@ $result_trees{'line_breaks'} = {
'cmdname' => 'strong',
'source_info' => {
'line_nr' => 10
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/converters_tests/table_in_display_in_example.pl
b/tp/t/results/converters_tests/table_in_display_in_example.pl
index f6a2f1e538..6c0295ec4e 100644
--- a/tp/t/results/converters_tests/table_in_display_in_example.pl
+++ b/tp/t/results/converters_tests/table_in_display_in_example.pl
@@ -45,8 +45,7 @@ $result_trees{'table_in_display_in_example'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 3
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/converters_tests/table_in_example_in_display.pl
b/tp/t/results/converters_tests/table_in_example_in_display.pl
index 5471c821b3..a40bcb5357 100644
--- a/tp/t/results/converters_tests/table_in_example_in_display.pl
+++ b/tp/t/results/converters_tests/table_in_example_in_display.pl
@@ -45,8 +45,7 @@ $result_trees{'table_in_example_in_display'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 3
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git
a/tp/t/results/converters_tests/various_vtable_command_as_argument.pl
b/tp/t/results/converters_tests/various_vtable_command_as_argument.pl
index aee0cf777a..8c0cce3710 100644
--- a/tp/t/results/converters_tests/various_vtable_command_as_argument.pl
+++ b/tp/t/results/converters_tests/various_vtable_command_as_argument.pl
@@ -139,8 +139,7 @@ $result_trees{'various_vtable_command_as_argument'} = {
'cmdname' => 'inlineraw',
'source_info' => {
'line_nr' => 7
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -342,8 +341,7 @@ $result_trees{'various_vtable_command_as_argument'} = {
'cmdname' => 'image',
'source_info' => {
'line_nr' => 13
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -491,8 +489,7 @@ $result_trees{'various_vtable_command_as_argument'} = {
'cmdname' => 'footnote',
'source_info' => {
'line_nr' => 18
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -640,8 +637,7 @@ $result_trees{'various_vtable_command_as_argument'} = {
'cmdname' => 'caption',
'source_info' => {
'line_nr' => 23
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -789,8 +785,7 @@ $result_trees{'various_vtable_command_as_argument'} = {
'cmdname' => 'math',
'source_info' => {
'line_nr' => 28
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -964,8 +959,7 @@ $result_trees{'various_vtable_command_as_argument'} = {
'cmdname' => 'anchor',
'source_info' => {
'line_nr' => 33
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1113,8 +1107,7 @@ $result_trees{'various_vtable_command_as_argument'} = {
'cmdname' => 'verb',
'source_info' => {
'line_nr' => 38
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/coverage/formats_only_title_comments.pl
b/tp/t/results/coverage/formats_only_title_comments.pl
index 40c30ad2c3..a98f905339 100644
--- a/tp/t/results/coverage/formats_only_title_comments.pl
+++ b/tp/t/results/coverage/formats_only_title_comments.pl
@@ -17,8 +17,7 @@ $result_trees{'formats_only_title_comments'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -199,8 +198,7 @@ $result_trees{'formats_only_title_comments'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 11
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -294,8 +292,7 @@ $result_trees{'formats_only_title_comments'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 16
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/coverage/formats_only_titles.pl
b/tp/t/results/coverage/formats_only_titles.pl
index 238a82462d..6068d3643b 100644
--- a/tp/t/results/coverage/formats_only_titles.pl
+++ b/tp/t/results/coverage/formats_only_titles.pl
@@ -17,8 +17,7 @@ $result_trees{'formats_only_titles'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -168,8 +167,7 @@ $result_trees{'formats_only_titles'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 9
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -253,8 +251,7 @@ $result_trees{'formats_only_titles'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 13
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/coverage/formats_titles.pl
b/tp/t/results/coverage/formats_titles.pl
index 57d0f60944..e991be852c 100644
--- a/tp/t/results/coverage/formats_titles.pl
+++ b/tp/t/results/coverage/formats_titles.pl
@@ -17,8 +17,7 @@ $result_trees{'formats_titles'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -216,8 +215,7 @@ $result_trees{'formats_titles'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 11
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -338,8 +336,7 @@ $result_trees{'formats_titles'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 16
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/coverage/item_container.pl
b/tp/t/results/coverage/item_container.pl
index c83eeceabf..f6296ef589 100644
--- a/tp/t/results/coverage/item_container.pl
+++ b/tp/t/results/coverage/item_container.pl
@@ -110,8 +110,7 @@ $result_trees{'item_container'} = {
'cmdname' => 'bullet',
'source_info' => {
'line_nr' => 6
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -210,8 +209,7 @@ $result_trees{'item_container'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/coverage/preformatted.pl
b/tp/t/results/coverage/preformatted.pl
index 91c35e6a63..0989610278 100644
--- a/tp/t/results/coverage/preformatted.pl
+++ b/tp/t/results/coverage/preformatted.pl
@@ -108,8 +108,7 @@ $result_trees{'preformatted'} = {
'cmdname' => 'code',
'source_info' => {
'line_nr' => 9
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/coverage/punctuation_in_line_commands.pl
b/tp/t/results/coverage/punctuation_in_line_commands.pl
index a840143e09..cba0e9f6b1 100644
--- a/tp/t/results/coverage/punctuation_in_line_commands.pl
+++ b/tp/t/results/coverage/punctuation_in_line_commands.pl
@@ -81,8 +81,7 @@ $result_trees{'punctuation_in_line_commands'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 5
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/coverage/symbol_after_block.pl
b/tp/t/results/coverage/symbol_after_block.pl
index c4a6176811..2ace51a3f9 100644
--- a/tp/t/results/coverage/symbol_after_block.pl
+++ b/tp/t/results/coverage/symbol_after_block.pl
@@ -298,8 +298,7 @@ $result_trees{'symbol_after_block'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 21
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -420,8 +419,7 @@ $result_trees{'symbol_after_block'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 26
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -559,8 +557,7 @@ $result_trees{'symbol_after_block'} = {
'cmdname' => 'bullet',
'source_info' => {
'line_nr' => 33
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -654,8 +651,7 @@ $result_trees{'symbol_after_block'} = {
'cmdname' => 'bullet',
'source_info' => {
'line_nr' => 37
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/coverage/symbol_after_command.pl
b/tp/t/results/coverage/symbol_after_command.pl
index dd8ce61e47..c3f86f83dc 100644
--- a/tp/t/results/coverage/symbol_after_command.pl
+++ b/tp/t/results/coverage/symbol_after_command.pl
@@ -17,8 +17,7 @@ $result_trees{'symbol_after_command'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/coverage/table.pl b/tp/t/results/coverage/table.pl
index ad17b2dfc6..5b17d2a465 100644
--- a/tp/t/results/coverage/table.pl
+++ b/tp/t/results/coverage/table.pl
@@ -22,8 +22,7 @@ $result_trees{'table'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 2
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -176,8 +175,7 @@ $result_trees{'table'} = {
'cmdname' => 'samp',
'source_info' => {
'line_nr' => 9
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -453,8 +451,7 @@ $result_trees{'table'} = {
'cmdname' => 'strong',
'source_info' => {
'line_nr' => 20
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/coverage/table_command_comment.pl
b/tp/t/results/coverage/table_command_comment.pl
index 8d2d5e5beb..1dc9362b73 100644
--- a/tp/t/results/coverage/table_command_comment.pl
+++ b/tp/t/results/coverage/table_command_comment.pl
@@ -17,8 +17,7 @@ $result_trees{'table_command_comment'} = {
'cmdname' => 'code',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/float/complex_float.pl
b/tp/t/results/float/complex_float.pl
index a8eb172d8f..bd553c5832 100644
--- a/tp/t/results/float/complex_float.pl
+++ b/tp/t/results/float/complex_float.pl
@@ -478,8 +478,7 @@ $result_trees{'complex_float'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 33
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -609,8 +608,7 @@ $result_trees{'complex_float'} = {
'cmdname' => 'minus',
'source_info' => {
'line_nr' => 39
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1116,8 +1114,7 @@ $result_trees{'complex_float'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 60
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1505,8 +1502,7 @@ $result_trees{'complex_float'} = {
'cmdname' => 'minus',
'source_info' => {
'line_nr' => 74
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -2387,8 +2383,7 @@ $result_trees{'complex_float'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 105
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -2776,8 +2771,7 @@ $result_trees{'complex_float'} = {
'cmdname' => 'minus',
'source_info' => {
'line_nr' => 119
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/html_tests/anchor_on_vtable_item.pl
b/tp/t/results/html_tests/anchor_on_vtable_item.pl
index 319f884e30..9ca9828a04 100644
--- a/tp/t/results/html_tests/anchor_on_vtable_item.pl
+++ b/tp/t/results/html_tests/anchor_on_vtable_item.pl
@@ -139,8 +139,7 @@ $result_trees{'anchor_on_vtable_item'} = {
'cmdname' => 'code',
'source_info' => {
'line_nr' => 7
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git
a/tp/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
b/tp/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
index fa1073ce7c..84e0eec84f 100644
---
a/tp/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
+++
b/tp/t/results/html_tests/file_name_case_insensitive_conflict_redirections.pl
@@ -113,8 +113,7 @@
$result_trees{'file_name_case_insensitive_conflict_redirections'} = {
'cmdname' => 'samp',
'source_info' => {
'line_nr' => 6
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/html_tests/itemize_arguments.pl
b/tp/t/results/html_tests/itemize_arguments.pl
index a5a61bb95e..890291f0fa 100644
--- a/tp/t/results/html_tests/itemize_arguments.pl
+++ b/tp/t/results/html_tests/itemize_arguments.pl
@@ -590,8 +590,7 @@ $result_trees{'itemize_arguments'} = {
'cmdname' => 'today',
'source_info' => {
'line_nr' => 26
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -868,8 +867,7 @@ $result_trees{'itemize_arguments'} = {
'cmdname' => 'tie',
'source_info' => {
'line_nr' => 34
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1090,8 +1088,7 @@ $result_trees{'itemize_arguments'} = {
'cmdname' => 'atchar',
'source_info' => {
'line_nr' => 42
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1491,8 +1488,7 @@ $result_trees{'itemize_arguments'} = {
'cmdname' => 'registeredsymbol',
'source_info' => {
'line_nr' => 58
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1718,8 +1714,7 @@ $result_trees{'itemize_arguments'} = {
'cmdname' => 'enddots',
'source_info' => {
'line_nr' => 66
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -3226,8 +3221,7 @@ $result_trees{'itemize_arguments'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 94
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -3343,8 +3337,7 @@ $result_trees{'itemize_arguments'} = {
},
'source_info' => {
'line_nr' => 98
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -3604,8 +3597,7 @@ $result_trees{'itemize_arguments'} = {
},
'source_info' => {
'line_nr' => 108
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -3840,8 +3832,7 @@ $result_trees{'itemize_arguments'} = {
'cmdname' => 'error',
'source_info' => {
'line_nr' => 116
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -4097,8 +4088,7 @@ $result_trees{'itemize_arguments'} = {
'cmdname' => 'error',
'source_info' => {
'line_nr' => 125
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
index 6d17770d78..e086337ddc 100644
--- a/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
+++ b/tp/t/results/html_tests/itemize_arguments_enable_encoding.pl
@@ -590,8 +590,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'cmdname' => 'today',
'source_info' => {
'line_nr' => 26
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -868,8 +867,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'cmdname' => 'tie',
'source_info' => {
'line_nr' => 34
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1090,8 +1088,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'cmdname' => 'atchar',
'source_info' => {
'line_nr' => 42
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1491,8 +1488,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'cmdname' => 'registeredsymbol',
'source_info' => {
'line_nr' => 58
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1718,8 +1714,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'cmdname' => 'enddots',
'source_info' => {
'line_nr' => 66
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -3226,8 +3221,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 94
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -3343,8 +3337,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
},
'source_info' => {
'line_nr' => 98
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -3604,8 +3597,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
},
'source_info' => {
'line_nr' => 108
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -3840,8 +3832,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'cmdname' => 'error',
'source_info' => {
'line_nr' => 116
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -4097,8 +4088,7 @@ $result_trees{'itemize_arguments_enable_encoding'} = {
'cmdname' => 'error',
'source_info' => {
'line_nr' => 125
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/html_tests/menu.pl b/tp/t/results/html_tests/menu.pl
index 387942aba4..419a6fad4c 100644
--- a/tp/t/results/html_tests/menu.pl
+++ b/tp/t/results/html_tests/menu.pl
@@ -131,8 +131,7 @@ $result_trees{'menu'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -313,8 +312,7 @@ $result_trees{'menu'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -480,8 +478,7 @@ $result_trees{'menu'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -820,8 +817,7 @@ $result_trees{'menu'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1002,8 +998,7 @@ $result_trees{'menu'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1169,8 +1164,7 @@ $result_trees{'menu'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/include/include_in_removed_before_item.pl
b/tp/t/results/include/include_in_removed_before_item.pl
index aee44cbc28..f888182f8a 100644
--- a/tp/t/results/include/include_in_removed_before_item.pl
+++ b/tp/t/results/include/include_in_removed_before_item.pl
@@ -17,8 +17,7 @@ $result_trees{'include_in_removed_before_item'} = {
'cmdname' => 'code',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/indices/empty_string_index_entry.pl
b/tp/t/results/indices/empty_string_index_entry.pl
index c0ceb9aeb2..4c4430e1c0 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -127,8 +127,7 @@ $result_trees{'empty_string_index_entry'} = {
'cmdname' => 'code',
'source_info' => {
'line_nr' => 6
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/indices/ftable_vtable.pl
b/tp/t/results/indices/ftable_vtable.pl
index 3528cf793c..fb2be28df1 100644
--- a/tp/t/results/indices/ftable_vtable.pl
+++ b/tp/t/results/indices/ftable_vtable.pl
@@ -88,8 +88,7 @@ $result_trees{'ftable_vtable'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 5
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -295,8 +294,7 @@ $result_trees{'ftable_vtable'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 12
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/indices/index_special_region.pl
b/tp/t/results/indices/index_special_region.pl
index 7596d4f6a1..2500afb2d3 100644
--- a/tp/t/results/indices/index_special_region.pl
+++ b/tp/t/results/indices/index_special_region.pl
@@ -996,8 +996,7 @@ $result_trees{'index_special_region'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'info' => {
diff --git a/tp/t/results/indices/index_special_region_no_insertcopying.pl
b/tp/t/results/indices/index_special_region_no_insertcopying.pl
index 8122b4b1fd..9b8359e2a6 100644
--- a/tp/t/results/indices/index_special_region_no_insertcopying.pl
+++ b/tp/t/results/indices/index_special_region_no_insertcopying.pl
@@ -991,8 +991,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'info' => {
diff --git
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
index 6d463c7d90..37a3d6d848 100644
---
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
+++
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
@@ -991,8 +991,7 @@
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'info' => {
diff --git
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
index 12e626bbec..a50dbff3b3 100644
---
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
+++
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
@@ -991,8 +991,7 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'info' => {
diff --git
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
index 5c34fbe058..d164baa0c1 100644
---
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
+++
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
@@ -991,8 +991,7 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'info' => {
diff --git a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
index f7f89ae54c..e04900f2c9 100644
--- a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
+++ b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
@@ -996,8 +996,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'}
= {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'info' => {
diff --git a/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
b/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
index 5ea9525e9a..a1e80b037b 100644
--- a/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
+++ b/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
@@ -996,8 +996,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'info' => {
diff --git
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
index 771ea835dd..13207d671f 100644
---
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
+++
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
@@ -996,8 +996,7 @@
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'info' => {
diff --git a/tp/t/results/indices/index_table.pl
b/tp/t/results/indices/index_table.pl
index b7b8ce3d82..d06c7e0b70 100644
--- a/tp/t/results/indices/index_table.pl
+++ b/tp/t/results/indices/index_table.pl
@@ -455,8 +455,7 @@ $result_trees{'index_table'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'contents' => [
@@ -465,8 +464,7 @@ $result_trees{'index_table'} = {
'source_info' => {
'file_name' => 'index_table.texi',
'line_nr' => 21
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -639,8 +637,7 @@ $result_trees{'index_table'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'contents' => [
@@ -649,8 +646,7 @@ $result_trees{'index_table'} = {
'source_info' => {
'file_name' => 'index_table.texi',
'line_nr' => 28
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/indices/index_table_chapter_no_node.pl
b/tp/t/results/indices/index_table_chapter_no_node.pl
index a2f09c3159..6fd728af8e 100644
--- a/tp/t/results/indices/index_table_chapter_no_node.pl
+++ b/tp/t/results/indices/index_table_chapter_no_node.pl
@@ -455,8 +455,7 @@ $result_trees{'index_table_chapter_no_node'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'contents' => [
@@ -465,8 +464,7 @@ $result_trees{'index_table_chapter_no_node'} = {
'source_info' => {
'file_name' => 'index_table.texi',
'line_nr' => 21
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -639,8 +637,7 @@ $result_trees{'index_table_chapter_no_node'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'contents' => [
@@ -649,8 +646,7 @@ $result_trees{'index_table_chapter_no_node'} = {
'source_info' => {
'file_name' => 'index_table.texi',
'line_nr' => 28
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/indices/printindex_index_entry_in_copying.pl
b/tp/t/results/indices/printindex_index_entry_in_copying.pl
index 96bd181337..bfba0217d2 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -311,8 +311,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 10
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git
a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
index f0a243768f..65975465e3 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying_no_insertcopying.pl
@@ -311,8 +311,7 @@
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 10
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/info_tests/colon_in_index_entry.pl
b/tp/t/results/info_tests/colon_in_index_entry.pl
index 325b315a38..968a34dab6 100644
--- a/tp/t/results/info_tests/colon_in_index_entry.pl
+++ b/tp/t/results/info_tests/colon_in_index_entry.pl
@@ -121,8 +121,7 @@ $result_trees{'colon_in_index_entry'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 7
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/info_tests/test_index.pl
b/tp/t/results/info_tests/test_index.pl
index a9b54647bf..b792c9d4fa 100644
--- a/tp/t/results/info_tests/test_index.pl
+++ b/tp/t/results/info_tests/test_index.pl
@@ -540,8 +540,7 @@ $result_trees{'test_index'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 17
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/block_not_matching.pl
b/tp/t/results/invalid_nestings/block_not_matching.pl
index 19056f001f..f9cf3817ab 100644
--- a/tp/t/results/invalid_nestings/block_not_matching.pl
+++ b/tp/t/results/invalid_nestings/block_not_matching.pl
@@ -160,8 +160,7 @@ $result_trees{'block_not_matching'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 9
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -252,8 +251,7 @@ $result_trees{'block_not_matching'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 14
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/center.pl
b/tp/t/results/invalid_nestings/center.pl
index 9a94b34cbb..827aa67336 100644
--- a/tp/t/results/invalid_nestings/center.pl
+++ b/tp/t/results/invalid_nestings/center.pl
@@ -455,8 +455,7 @@ $result_trees{'center'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 21
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -565,8 +564,7 @@ $result_trees{'center'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 25
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1130,8 +1128,7 @@ $result_trees{'center'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 45
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
b/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
index 42bfcb2cdc..94c5b062f2 100644
--- a/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
+++ b/tp/t/results/invalid_nestings/formats_not_closed_in_example.pl
@@ -41,8 +41,7 @@ $result_trees{'formats_not_closed_in_example'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 3
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/in_errormsg.pl
b/tp/t/results/invalid_nestings/in_errormsg.pl
index bab523a266..5e4591512a 100644
--- a/tp/t/results/invalid_nestings/in_errormsg.pl
+++ b/tp/t/results/invalid_nestings/in_errormsg.pl
@@ -142,8 +142,7 @@ $result_trees{'in_errormsg'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 6
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/in_table.pl
b/tp/t/results/invalid_nestings/in_table.pl
index 3e230a9db3..b289f2d196 100644
--- a/tp/t/results/invalid_nestings/in_table.pl
+++ b/tp/t/results/invalid_nestings/in_table.pl
@@ -80,8 +80,7 @@ $result_trees{'in_table'} = {
'cmdname' => 'xref',
'source_info' => {
'line_nr' => 5
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -151,8 +150,7 @@ $result_trees{'in_table'} = {
'cmdname' => 'code',
'source_info' => {
'line_nr' => 8
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -585,8 +583,7 @@ $result_trees{'in_table'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 17
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/item_in_ref.pl
b/tp/t/results/invalid_nestings/item_in_ref.pl
index 1d08f73349..580f0c1630 100644
--- a/tp/t/results/invalid_nestings/item_in_ref.pl
+++ b/tp/t/results/invalid_nestings/item_in_ref.pl
@@ -17,8 +17,7 @@ $result_trees{'item_in_ref'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git
a/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
b/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
index 3554f26242..405c4e0148 100644
--- a/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
+++ b/tp/t/results/invalid_nestings/itemx_in_itemize_enumerate_in_table.pl
@@ -17,8 +17,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
'cmdname' => 'strong',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -90,8 +89,7 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
b/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
index ad72cff72b..e81101ce23 100644
--- a/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
+++ b/tp/t/results/invalid_nestings/section_in_nested_block_commands.pl
@@ -17,8 +17,7 @@ $result_trees{'section_in_nested_block_commands'} = {
'cmdname' => 'strong',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/section_in_table.pl
b/tp/t/results/invalid_nestings/section_in_table.pl
index 5f08641f16..c7186b9eba 100644
--- a/tp/t/results/invalid_nestings/section_in_table.pl
+++ b/tp/t/results/invalid_nestings/section_in_table.pl
@@ -17,8 +17,7 @@ $result_trees{'section_in_table'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/section_on_itemize_line.pl
b/tp/t/results/invalid_nestings/section_on_itemize_line.pl
index 8e90f84f8e..384e2496cf 100644
--- a/tp/t/results/invalid_nestings/section_on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_itemize_line.pl
@@ -22,8 +22,7 @@ $result_trees{'section_on_itemize_line'} = {
'cmdname' => 'minus',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -156,8 +155,7 @@ $result_trees{'section_on_itemize_line'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'type' => 'block_line_arg'
diff --git a/tp/t/results/invalid_nestings/section_on_xtable_line.pl
b/tp/t/results/invalid_nestings/section_on_xtable_line.pl
index 0cfca00cde..9a300b7306 100644
--- a/tp/t/results/invalid_nestings/section_on_xtable_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_xtable_line.pl
@@ -15,8 +15,7 @@ $result_trees{'section_on_xtable_line'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'type' => 'block_line_arg'
@@ -68,8 +67,7 @@ $result_trees{'section_on_xtable_line'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'contents' => [
@@ -77,8 +75,7 @@ $result_trees{'section_on_xtable_line'} = {
'cmdname' => 'TeX',
'source_info' => {
'line_nr' => 3
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -147,8 +144,7 @@ $result_trees{'section_on_xtable_line'} = {
'cmdname' => 'code',
'source_info' => {
'line_nr' => 5
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -215,8 +211,7 @@ $result_trees{'section_on_xtable_line'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'contents' => [
diff --git a/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
b/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
index e85544d201..8955e74908 100644
--- a/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
+++ b/tp/t/results/invalid_nestings/style_not_closed_in_table_line.pl
@@ -17,8 +17,7 @@ $result_trees{'style_not_closed_in_table_line'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/table_in_code.pl
b/tp/t/results/invalid_nestings/table_in_code.pl
index 1c031cfbc1..48f961e1bc 100644
--- a/tp/t/results/invalid_nestings/table_in_code.pl
+++ b/tp/t/results/invalid_nestings/table_in_code.pl
@@ -43,8 +43,7 @@ $result_trees{'table_in_code'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 3
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
b/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
index d3e67eb567..3323c4d621 100644
--- a/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
+++ b/tp/t/results/invalid_nestings/table_not_closed_in_menu_comment.pl
@@ -94,8 +94,7 @@ $result_trees{'table_not_closed_in_menu_comment'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 4
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git
a/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
b/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
index 6bf8a99dd1..628774cabe 100644
--- a/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
+++ b/tp/t/results/invalid_nestings/table_not_closed_in_menu_description.pl
@@ -72,8 +72,7 @@ $result_trees{'table_not_closed_in_menu_description'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 2
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/invalid_nestings/table_on_item_line.pl
b/tp/t/results/invalid_nestings/table_on_item_line.pl
index e774372420..2da4ae22ad 100644
--- a/tp/t/results/invalid_nestings/table_on_item_line.pl
+++ b/tp/t/results/invalid_nestings/table_on_item_line.pl
@@ -17,8 +17,7 @@ $result_trees{'table_on_item_line'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -51,8 +50,7 @@ $result_trees{'table_on_item_line'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 2
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/itemize/asis_as_itemize_argument.pl
b/tp/t/results/itemize/asis_as_itemize_argument.pl
index 4c188dc3da..058ba0917b 100644
--- a/tp/t/results/itemize/asis_as_itemize_argument.pl
+++ b/tp/t/results/itemize/asis_as_itemize_argument.pl
@@ -17,8 +17,7 @@ $result_trees{'asis_as_itemize_argument'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/itemize/comment_first_on_itemize_line.pl
b/tp/t/results/itemize/comment_first_on_itemize_line.pl
index a7bfd7571a..a79ad79eb9 100644
--- a/tp/t/results/itemize/comment_first_on_itemize_line.pl
+++ b/tp/t/results/itemize/comment_first_on_itemize_line.pl
@@ -17,8 +17,7 @@ $result_trees{'comment_first_on_itemize_line'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/itemize/empty_accent_argument.pl
b/tp/t/results/itemize/empty_accent_argument.pl
index 9bc9179c05..80b4f7ad48 100644
--- a/tp/t/results/itemize/empty_accent_argument.pl
+++ b/tp/t/results/itemize/empty_accent_argument.pl
@@ -210,8 +210,7 @@ $result_trees{'empty_accent_argument'} = {
'cmdname' => '~',
'source_info' => {
'line_nr' => 9
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/itemize/headitem_itemx_in_itemize.pl
b/tp/t/results/itemize/headitem_itemx_in_itemize.pl
index d8a99e1a9f..62ccf56392 100644
--- a/tp/t/results/itemize/headitem_itemx_in_itemize.pl
+++ b/tp/t/results/itemize/headitem_itemx_in_itemize.pl
@@ -17,8 +17,7 @@ $result_trees{'headitem_itemx_in_itemize'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
index 1cc317271d..d5abb5a7bd 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -144,8 +144,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
'cmdname' => 'minus',
'source_info' => {
'line_nr' => 7
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -290,8 +289,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
'cmdname' => 'bullet',
'source_info' => {
'line_nr' => 13
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -492,8 +490,7 @@ $result_trees{'inter_item_commands_in_itemize'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/itemize/itemize_and_empty_lines.pl
b/tp/t/results/itemize/itemize_and_empty_lines.pl
index a3401a375e..151ca35746 100644
--- a/tp/t/results/itemize/itemize_and_empty_lines.pl
+++ b/tp/t/results/itemize/itemize_and_empty_lines.pl
@@ -439,8 +439,7 @@ $result_trees{'itemize_and_empty_lines'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -888,8 +887,7 @@ $result_trees{'itemize_and_empty_lines'} = {
'cmdname' => 'minus',
'source_info' => {
'line_nr' => 57
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1010,8 +1008,7 @@ $result_trees{'itemize_and_empty_lines'} = {
'cmdname' => 'minus',
'source_info' => {
'line_nr' => 65
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1053,8 +1050,7 @@ $result_trees{'itemize_and_empty_lines'} = {
'cmdname' => 'bullet',
'source_info' => {
'line_nr' => 68
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1217,8 +1213,7 @@ $result_trees{'itemize_and_empty_lines'} = {
'cmdname' => 'bullet',
'source_info' => {
'line_nr' => 75
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/itemize/itemize_in_example.pl
b/tp/t/results/itemize/itemize_in_example.pl
index 4e6b686d86..cefced12bc 100644
--- a/tp/t/results/itemize/itemize_in_example.pl
+++ b/tp/t/results/itemize/itemize_in_example.pl
@@ -31,8 +31,7 @@ $result_trees{'itemize_in_example'} = {
'cmdname' => 'bullet',
'source_info' => {
'line_nr' => 2
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -140,8 +139,7 @@ $result_trees{'itemize_in_example'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 8
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/itemize/itemize_line_commands_with_brace.pl
b/tp/t/results/itemize/itemize_line_commands_with_brace.pl
index 63cab884b0..ac708984a1 100644
--- a/tp/t/results/itemize/itemize_line_commands_with_brace.pl
+++ b/tp/t/results/itemize/itemize_line_commands_with_brace.pl
@@ -22,8 +22,7 @@ $result_trees{'itemize_line_commands_with_brace'} = {
'cmdname' => 'bullet',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -122,8 +121,7 @@ $result_trees{'itemize_line_commands_with_brace'} = {
'cmdname' => 'minus',
'source_info' => {
'line_nr' => 5
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/itemize/not_closed_item.pl
b/tp/t/results/itemize/not_closed_item.pl
index 2b42d38f43..db0a9d1c9b 100644
--- a/tp/t/results/itemize/not_closed_item.pl
+++ b/tp/t/results/itemize/not_closed_item.pl
@@ -17,8 +17,7 @@ $result_trees{'not_closed_item'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/itemize/not_closed_itemize.pl
b/tp/t/results/itemize/not_closed_itemize.pl
index 4b686e7dd7..90fe3ca668 100644
--- a/tp/t/results/itemize/not_closed_itemize.pl
+++ b/tp/t/results/itemize/not_closed_itemize.pl
@@ -17,8 +17,7 @@ $result_trees{'not_closed_itemize'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/itemize/table_in_itemize.pl
b/tp/t/results/itemize/table_in_itemize.pl
index 33a86e8069..5e5602504c 100644
--- a/tp/t/results/itemize/table_in_itemize.pl
+++ b/tp/t/results/itemize/table_in_itemize.pl
@@ -17,8 +17,7 @@ $result_trees{'table_in_itemize'} = {
'cmdname' => 'bullet',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -72,8 +71,7 @@ $result_trees{'table_in_itemize'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 4
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/itemize/w_argument.pl
b/tp/t/results/itemize/w_argument.pl
index daed74a3a0..54464d3ebd 100644
--- a/tp/t/results/itemize/w_argument.pl
+++ b/tp/t/results/itemize/w_argument.pl
@@ -22,8 +22,7 @@ $result_trees{'w_argument'} = {
'cmdname' => 'w',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/latex_tests/nested_itemize.pl
b/tp/t/results/latex_tests/nested_itemize.pl
index c3f3660ccb..cd2320ec28 100644
--- a/tp/t/results/latex_tests/nested_itemize.pl
+++ b/tp/t/results/latex_tests/nested_itemize.pl
@@ -20,8 +20,7 @@ $result_trees{'nested_itemize'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -95,8 +94,7 @@ $result_trees{'nested_itemize'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -170,8 +168,7 @@ $result_trees{'nested_itemize'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -245,8 +242,7 @@ $result_trees{'nested_itemize'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/linemacro/blockitem_no_item.pl
b/tp/t/results/linemacro/blockitem_no_item.pl
index 3dda822055..010990fb24 100644
--- a/tp/t/results/linemacro/blockitem_no_item.pl
+++ b/tp/t/results/linemacro/blockitem_no_item.pl
@@ -87,8 +87,7 @@ $result_trees{'blockitem_no_item'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
b/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
index c9a4d805ae..51c9815a32 100644
--- a/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
+++ b/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
@@ -264,8 +264,7 @@ now second arg: gg '
'source_info' => {
'line_nr' => 14,
'macro' => 'mymacro'
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
b/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
index 6c7d3d25cd..2603ceb2e8 100644
--- a/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
@@ -269,8 +269,7 @@ $result_trees{'call_macro_in_linemacro_call'} = {
'source_info' => {
'line_nr' => 14,
'macro' => 'mymacro'
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/macro/bib_example.pl
b/tp/t/results/macro/bib_example.pl
index 5407fc0092..87541d46b0 100644
--- a/tp/t/results/macro/bib_example.pl
+++ b/tp/t/results/macro/bib_example.pl
@@ -3469,8 +3469,7 @@ $result_trees{'bib_example'} = {
'source_info' => {
'file_name' => 'bib-example.texi',
'line_nr' => 49
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_brace_command.pl
b/tp/t/results/macro/macro_in_brace_command.pl
index 949bc13cd8..cc659846cf 100644
--- a/tp/t/results/macro/macro_in_brace_command.pl
+++ b/tp/t/results/macro/macro_in_brace_command.pl
@@ -133,8 +133,7 @@ $result_trees{'macro_in_brace_command'} = {
'cmdname' => 'bullet',
'source_info' => {
'line_nr' => 9
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
b/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
index cd86ab2dee..327ba21c90 100644
--- a/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
@@ -70,8 +70,7 @@ $result_trees{'macro_in_empty_table_empty_before_item'} = {
'cmdname' => 'code',
'source_info' => {
'line_nr' => 4
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/macro/macro_in_table_empty_before_item.pl
b/tp/t/results/macro/macro_in_table_empty_before_item.pl
index c779f3c4e9..ebbc3d8724 100644
--- a/tp/t/results/macro/macro_in_table_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_table_empty_before_item.pl
@@ -70,8 +70,7 @@ $result_trees{'macro_in_table_empty_before_item'} = {
'cmdname' => 'code',
'source_info' => {
'line_nr' => 4
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/menu/block_commands_in_menu_description.pl
b/tp/t/results/menu/block_commands_in_menu_description.pl
index 6fb5b7e3b5..1666d5084b 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -129,8 +129,7 @@ $result_trees{'block_commands_in_menu_description'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -234,8 +233,7 @@ $result_trees{'block_commands_in_menu_description'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 11
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/menu/formats_in_menu.pl
b/tp/t/results/menu/formats_in_menu.pl
index 706ea54a48..1ad838168e 100644
--- a/tp/t/results/menu/formats_in_menu.pl
+++ b/tp/t/results/menu/formats_in_menu.pl
@@ -98,8 +98,7 @@ $result_trees{'formats_in_menu'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 5
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/misc_commands/footnote_in_center.pl
b/tp/t/results/misc_commands/footnote_in_center.pl
index ad60df7271..93a33faeac 100644
--- a/tp/t/results/misc_commands/footnote_in_center.pl
+++ b/tp/t/results/misc_commands/footnote_in_center.pl
@@ -60,8 +60,7 @@ $result_trees{'footnote_in_center'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 5
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
index 0e9823d9c5..019d1d554a 100644
--- a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
@@ -232,8 +232,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
'source_info' => {
'line_nr' => 25,
'macro' => 'codekbdmacro'
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -353,8 +352,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
'source_info' => {
'line_nr' => 25,
'macro' => 'codekbdmacro'
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -492,8 +490,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
'source_info' => {
'line_nr' => 25,
'macro' => 'codekbdmacro'
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -608,8 +605,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
'source_info' => {
'line_nr' => 25,
'macro' => 'codekbdmacro'
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -842,8 +838,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
'source_info' => {
'line_nr' => 31,
'macro' => 'codekbdmacro'
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -963,8 +958,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
'source_info' => {
'line_nr' => 31,
'macro' => 'codekbdmacro'
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1099,8 +1093,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
'source_info' => {
'line_nr' => 31,
'macro' => 'codekbdmacro'
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1211,8 +1204,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
'source_info' => {
'line_nr' => 31,
'macro' => 'codekbdmacro'
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1441,8 +1433,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
'source_info' => {
'line_nr' => 37,
'macro' => 'codekbdmacro'
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1558,8 +1549,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
'source_info' => {
'line_nr' => 37,
'macro' => 'codekbdmacro'
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1693,8 +1683,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
'source_info' => {
'line_nr' => 37,
'macro' => 'codekbdmacro'
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1805,8 +1794,7 @@ $result_trees{'kbdinputstyle_in_table'} = {
'source_info' => {
'line_nr' => 37,
'macro' => 'codekbdmacro'
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/paragraph/commands_in_flushright.pl
b/tp/t/results/paragraph/commands_in_flushright.pl
index ce85b9b4fd..35cc821337 100644
--- a/tp/t/results/paragraph/commands_in_flushright.pl
+++ b/tp/t/results/paragraph/commands_in_flushright.pl
@@ -282,8 +282,7 @@ $result_trees{'commands_in_flushright'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 17
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
b/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
index 33cd3988b0..0a5be2ede8 100644
--- a/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
+++ b/tp/t/results/plaintext_tests/itemize_in_headitem_in_example.pl
@@ -31,8 +31,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -120,8 +119,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -228,8 +226,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -341,8 +338,7 @@ $result_trees{'itemize_in_headitem_in_example'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/plaintext_tests/long_uref_after_item.pl
b/tp/t/results/plaintext_tests/long_uref_after_item.pl
index 76da92494d..d770745f7e 100644
--- a/tp/t/results/plaintext_tests/long_uref_after_item.pl
+++ b/tp/t/results/plaintext_tests/long_uref_after_item.pl
@@ -17,8 +17,7 @@ $result_trees{'long_uref_after_item'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
b/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
index 027c5d79f8..0b169d583a 100644
--- a/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
+++ b/tp/t/results/plaintext_tests/tab_in_table_in_example.pl
@@ -31,8 +31,7 @@ $result_trees{'tab_in_table_in_example'} = {
'cmdname' => 'code',
'source_info' => {
'line_nr' => 2
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/plaintext_tests/xref_quote_long_item.pl
b/tp/t/results/plaintext_tests/xref_quote_long_item.pl
index 6d46879f67..5faa64a73d 100644
--- a/tp/t/results/plaintext_tests/xref_quote_long_item.pl
+++ b/tp/t/results/plaintext_tests/xref_quote_long_item.pl
@@ -17,8 +17,7 @@ $result_trees{'xref_quote_long_item'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git
a/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
b/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
index 8ab3c85b3e..7381645993 100644
---
a/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
+++
b/tp/t/results/transformations/index_entries_relate_to_item_no_transformation.pl
@@ -164,8 +164,7 @@
$result_trees{'index_entries_relate_to_item_no_transformation'} = {
'source_info' => {
'file_name' => 'index_entries_relate_to_item.texi',
'line_nr' => 9
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git
a/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl
b/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl
index 81843f23b9..28140a1d8a 100644
---
a/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl
+++
b/tp/t/results/transformations/index_entries_relate_to_item_transformation.pl
@@ -164,8 +164,7 @@
$result_trees{'index_entries_relate_to_item_transformation'} = {
'source_info' => {
'file_name' => 'index_entries_relate_to_item.texi',
'line_nr' => 9
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/value/set_in_item_missing_line.pl
b/tp/t/results/value/set_in_item_missing_line.pl
index 1f5b104cc8..7de97683c2 100644
--- a/tp/t/results/value/set_in_item_missing_line.pl
+++ b/tp/t/results/value/set_in_item_missing_line.pl
@@ -17,8 +17,7 @@ $result_trees{'set_in_item_missing_line'} = {
'cmdname' => 'code',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -173,8 +172,7 @@ $result_trees{'set_in_item_missing_line'} = {
'cmdname' => 'code',
'source_info' => {
'line_nr' => 6
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/value/set_on_item_line.pl
b/tp/t/results/value/set_on_item_line.pl
index d90f31c404..887048a3f8 100644
--- a/tp/t/results/value/set_on_item_line.pl
+++ b/tp/t/results/value/set_on_item_line.pl
@@ -17,8 +17,7 @@ $result_trees{'set_on_item_line'} = {
'cmdname' => 'code',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -261,8 +260,7 @@ $result_trees{'set_on_item_line'} = {
'cmdname' => 'code',
'source_info' => {
'line_nr' => 10
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl
b/tp/t/results/xml_tests/commands_and_spaces.pl
index d648f7afae..29ccc894f2 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -1141,8 +1141,7 @@ $result_trees{'commands_and_spaces'} = {
'cmdname' => 'strong',
'source_info' => {
'line_nr' => 54
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/xml_tests/comments_end_lines.pl
b/tp/t/results/xml_tests/comments_end_lines.pl
index edd7fe39ac..b071bf2083 100644
--- a/tp/t/results/xml_tests/comments_end_lines.pl
+++ b/tp/t/results/xml_tests/comments_end_lines.pl
@@ -17,8 +17,7 @@ $result_trees{'comments_end_lines'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -182,8 +181,7 @@ $result_trees{'comments_end_lines'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 8
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/xml_tests/comments_on_block_command_lines.pl
b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
index c2a15af55e..136b8d50ad 100644
--- a/tp/t/results/xml_tests/comments_on_block_command_lines.pl
+++ b/tp/t/results/xml_tests/comments_on_block_command_lines.pl
@@ -17,8 +17,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'cmdname' => 'bullet',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -215,8 +214,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'cmdname' => 'bullet',
'source_info' => {
'line_nr' => 9
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -324,8 +322,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'cmdname' => 'bullet',
'source_info' => {
'line_nr' => 13
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -620,8 +617,7 @@ $result_trees{'comments_on_block_command_lines'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 25
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/xml_tests/image_inline_or_not.pl
b/tp/t/results/xml_tests/image_inline_or_not.pl
index 081ce5bda1..363897c498 100644
--- a/tp/t/results/xml_tests/image_inline_or_not.pl
+++ b/tp/t/results/xml_tests/image_inline_or_not.pl
@@ -425,8 +425,7 @@ $result_trees{'image_inline_or_not'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 24
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/xtable/accent_on_table_line.pl
b/tp/t/results/xtable/accent_on_table_line.pl
index 0dffd30b3d..a5987b64a2 100644
--- a/tp/t/results/xtable/accent_on_table_line.pl
+++ b/tp/t/results/xtable/accent_on_table_line.pl
@@ -15,8 +15,7 @@ $result_trees{'accent_on_table_line'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'contents' => [
@@ -182,8 +181,7 @@ $result_trees{'accent_on_table_line'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'contents' => [
@@ -196,8 +194,7 @@ $result_trees{'accent_on_table_line'} = {
'cmdname' => '~',
'source_info' => {
'line_nr' => 6
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -355,8 +352,7 @@ $result_trees{'accent_on_table_line'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'contents' => [
@@ -475,8 +471,7 @@ $result_trees{'accent_on_table_line'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'contents' => [
@@ -589,8 +584,7 @@ $result_trees{'accent_on_table_line'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'contents' => [
@@ -703,8 +697,7 @@ $result_trees{'accent_on_table_line'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'contents' => [
@@ -717,8 +710,7 @@ $result_trees{'accent_on_table_line'} = {
'cmdname' => 'ringaccent',
'source_info' => {
'line_nr' => 23
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -823,8 +815,7 @@ $result_trees{'accent_on_table_line'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'contents' => [
diff --git a/tp/t/results/xtable/block_commands_in_table.pl
b/tp/t/results/xtable/block_commands_in_table.pl
index 344dd584c6..d394b41b71 100644
--- a/tp/t/results/xtable/block_commands_in_table.pl
+++ b/tp/t/results/xtable/block_commands_in_table.pl
@@ -139,8 +139,7 @@ $result_trees{'block_commands_in_table'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 7
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -673,8 +672,7 @@ $result_trees{'block_commands_in_table'} = {
'cmdname' => 'strong',
'source_info' => {
'line_nr' => 34
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -887,8 +885,7 @@ $result_trees{'block_commands_in_table'} = {
'cmdname' => 'r',
'source_info' => {
'line_nr' => 42
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1079,8 +1076,7 @@ $result_trees{'block_commands_in_table'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 52
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/xtable/comment_and_itemx_before_item.pl
b/tp/t/results/xtable/comment_and_itemx_before_item.pl
index 66216bfce0..325d44a9d8 100644
--- a/tp/t/results/xtable/comment_and_itemx_before_item.pl
+++ b/tp/t/results/xtable/comment_and_itemx_before_item.pl
@@ -17,8 +17,7 @@ $result_trees{'comment_and_itemx_before_item'} = {
'cmdname' => 'code',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/xtable/empty_item_itemx.pl
b/tp/t/results/xtable/empty_item_itemx.pl
index aa998a69a2..ab8a8a979d 100644
--- a/tp/t/results/xtable/empty_item_itemx.pl
+++ b/tp/t/results/xtable/empty_item_itemx.pl
@@ -17,8 +17,7 @@ $result_trees{'empty_item_itemx'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/xtable/empty_table.pl
b/tp/t/results/xtable/empty_table.pl
index a440199122..360caa39fd 100644
--- a/tp/t/results/xtable/empty_table.pl
+++ b/tp/t/results/xtable/empty_table.pl
@@ -17,8 +17,7 @@ $result_trees{'empty_table'} = {
'cmdname' => 'code',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/xtable/headitem_in_table.pl
b/tp/t/results/xtable/headitem_in_table.pl
index efafbdc9cc..83cd4a22cf 100644
--- a/tp/t/results/xtable/headitem_in_table.pl
+++ b/tp/t/results/xtable/headitem_in_table.pl
@@ -17,8 +17,7 @@ $result_trees{'headitem_in_table'} = {
'cmdname' => 'strong',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/xtable/index_command_before_end_table.pl
b/tp/t/results/xtable/index_command_before_end_table.pl
index 49fc5e4785..5f5e0f215b 100644
--- a/tp/t/results/xtable/index_command_before_end_table.pl
+++ b/tp/t/results/xtable/index_command_before_end_table.pl
@@ -22,8 +22,7 @@ $result_trees{'index_command_before_end_table'} = {
'cmdname' => 'code',
'source_info' => {
'line_nr' => 2
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/xtable/inter_item_commands_in_table.pl
b/tp/t/results/xtable/inter_item_commands_in_table.pl
index 17daa7b5e6..e231bf6cbe 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table.pl
@@ -144,8 +144,7 @@ $result_trees{'inter_item_commands_in_table'} = {
'cmdname' => 'code',
'source_info' => {
'line_nr' => 7
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -283,8 +282,7 @@ $result_trees{'inter_item_commands_in_table'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 13
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -461,8 +459,7 @@ $result_trees{'inter_item_commands_in_table'} = {
'cmdname' => 'var',
'source_info' => {
'line_nr' => 20
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -808,8 +805,7 @@ $result_trees{'inter_item_commands_in_table'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 36
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1012,8 +1008,7 @@ $result_trees{'inter_item_commands_in_table'} = {
'cmdname' => 'code',
'source_info' => {
'line_nr' => 43
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1180,8 +1175,7 @@ $result_trees{'inter_item_commands_in_table'} = {
'cmdname' => 'code',
'source_info' => {
'line_nr' => 50
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1338,8 +1332,7 @@ $result_trees{'inter_item_commands_in_table'} = {
'cmdname' => 'samp',
'source_info' => {
'line_nr' => 56
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1506,8 +1499,7 @@ $result_trees{'inter_item_commands_in_table'} = {
'cmdname' => 'samp',
'source_info' => {
'line_nr' => 63
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1664,8 +1656,7 @@ $result_trees{'inter_item_commands_in_table'} = {
'cmdname' => 'samp',
'source_info' => {
'line_nr' => 69
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1823,8 +1814,7 @@ $result_trees{'inter_item_commands_in_table'} = {
'cmdname' => 'samp',
'source_info' => {
'line_nr' => 76
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1977,8 +1967,7 @@ $result_trees{'inter_item_commands_in_table'} = {
'cmdname' => 'samp',
'source_info' => {
'line_nr' => 82
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -2131,8 +2120,7 @@ $result_trees{'inter_item_commands_in_table'} = {
'cmdname' => 'samp',
'source_info' => {
'line_nr' => 88
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
b/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
index 1ca88fb485..0388dbdbe0 100644
--- a/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
+++ b/tp/t/results/xtable/inter_item_commands_in_table_in_example.pl
@@ -34,8 +34,7 @@ $result_trees{'inter_item_commands_in_table_in_example'} = {
'cmdname' => 'var',
'source_info' => {
'line_nr' => 2
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/xtable/invalid_command_and_brace_in_table.pl
b/tp/t/results/xtable/invalid_command_and_brace_in_table.pl
index da32b5f368..51edce25a1 100644
--- a/tp/t/results/xtable/invalid_command_and_brace_in_table.pl
+++ b/tp/t/results/xtable/invalid_command_and_brace_in_table.pl
@@ -17,8 +17,7 @@ $result_trees{'invalid_command_and_brace_in_table'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/xtable/item_index_transformation.pl
b/tp/t/results/xtable/item_index_transformation.pl
index 3d91b2df01..ddb69e4398 100644
--- a/tp/t/results/xtable/item_index_transformation.pl
+++ b/tp/t/results/xtable/item_index_transformation.pl
@@ -73,8 +73,7 @@ $result_trees{'item_index_transformation'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 4
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -414,8 +413,7 @@ $result_trees{'item_index_transformation'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 16
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -719,8 +717,7 @@ $result_trees{'item_index_transformation'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 27
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -997,8 +994,7 @@ $result_trees{'item_index_transformation'} = {
'cmdname' => 'asis',
'source_info' => {
'line_nr' => 37
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/xtable/itemx_before_item.pl
b/tp/t/results/xtable/itemx_before_item.pl
index 1fffef2bfd..8d353fdf93 100644
--- a/tp/t/results/xtable/itemx_before_item.pl
+++ b/tp/t/results/xtable/itemx_before_item.pl
@@ -17,8 +17,7 @@ $result_trees{'itemx_before_item'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/xtable/long_item.pl b/tp/t/results/xtable/long_item.pl
index a151d9201d..84131b2a03 100644
--- a/tp/t/results/xtable/long_item.pl
+++ b/tp/t/results/xtable/long_item.pl
@@ -17,8 +17,7 @@ $result_trees{'long_item'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
b/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
index 308cf23df7..14abf44d2a 100644
--- a/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
+++ b/tp/t/results/xtable/no_arg_brace_command_on_table_line.pl
@@ -15,8 +15,7 @@ $result_trees{'no_arg_brace_command_on_table_line'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'contents' => [
@@ -24,8 +23,7 @@ $result_trees{'no_arg_brace_command_on_table_line'} = {
'cmdname' => 'bullet',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/xtable/no_argument_for_table.pl
b/tp/t/results/xtable/no_argument_for_table.pl
index a3c5edd4bd..ea0190acb3 100644
--- a/tp/t/results/xtable/no_argument_for_table.pl
+++ b/tp/t/results/xtable/no_argument_for_table.pl
@@ -15,8 +15,7 @@ $result_trees{'no_argument_for_table'} = {
'cmdname' => 'asis',
'info' => {
'inserted' => 1
- },
- 'type' => 'command_as_argument'
+ }
},
{
'info' => {
diff --git a/tp/t/results/xtable/table_nested.pl
b/tp/t/results/xtable/table_nested.pl
index e6f5d7ea2a..268f0b85bc 100644
--- a/tp/t/results/xtable/table_nested.pl
+++ b/tp/t/results/xtable/table_nested.pl
@@ -220,8 +220,7 @@ $result_trees{'table_nested'} = {
'source_info' => {
'line_nr' => 27,
'macro' => 'myvtable'
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -517,8 +516,7 @@ $result_trees{'table_nested'} = {
'source_info' => {
'line_nr' => 27,
'macro' => 'myvtable'
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -790,8 +788,7 @@ $result_trees{'table_nested'} = {
'source_info' => {
'line_nr' => 32,
'macro' => 'myvtable'
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1087,8 +1084,7 @@ $result_trees{'table_nested'} = {
'source_info' => {
'line_nr' => 32,
'macro' => 'myvtable'
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1375,8 +1371,7 @@ $result_trees{'table_nested'} = {
'source_info' => {
'line_nr' => 38,
'macro' => 'myvtable'
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
@@ -1672,8 +1667,7 @@ $result_trees{'table_nested'} = {
'source_info' => {
'line_nr' => 38,
'macro' => 'myvtable'
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/xtable/text_between_item_itemx.pl
b/tp/t/results/xtable/text_between_item_itemx.pl
index 79beae11ed..99ca8de9d1 100644
--- a/tp/t/results/xtable/text_between_item_itemx.pl
+++ b/tp/t/results/xtable/text_between_item_itemx.pl
@@ -17,8 +17,7 @@ $result_trees{'text_between_item_itemx'} = {
'cmdname' => 'strong',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
diff --git a/tp/t/results/xtable/title_and_itemx_before_item.pl
b/tp/t/results/xtable/title_and_itemx_before_item.pl
index 0836b21234..50fcadf6bf 100644
--- a/tp/t/results/xtable/title_and_itemx_before_item.pl
+++ b/tp/t/results/xtable/title_and_itemx_before_item.pl
@@ -17,8 +17,7 @@ $result_trees{'title_and_itemx_before_item'} = {
'cmdname' => 'emph',
'source_info' => {
'line_nr' => 1
- },
- 'type' => 'command_as_argument'
+ }
}
],
'info' => {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Remove command_as_argument element type,
Patrice Dumas <=