[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Thu, 9 May 2024 15:52:51 -0400 (EDT) |
branch: master
commit a4e29af80d9633a5963e335103e3256cb91e856a
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu May 9 21:52:39 2024 +0200
* tp/Texinfo/Convert/LaTeX.pm (%ignored_types, _convert),
tp/Texinfo/Convert/Texinfo.pm (_convert_to_texinfo)
(_expand_cmd_args_to_texi), tp/Texinfo/Convert/TexinfoMarkup.pm
(_convert), tp/Texinfo/ParserNonXS.pm (_end_line_starting_block),
tp/Texinfo/XS/main/convert_to_texinfo.c (expand_cmd_args_to_texi)
(convert_to_texinfo_internal), tp/Texinfo/XS/main/element_types.txt,
tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block): rename
command_as_argument_inserted as command_as_argument and set info
inserted instead. Remove %ignored_types in Texinfo.pm.
* tp/Texinfo/Convert/LaTeX.pm (%ignorable_types): remove unused
variable.
---
ChangeLog | 15 ++++++++++
tp/Texinfo/Convert/LaTeX.pm | 19 +++++-------
tp/Texinfo/Convert/Texinfo.pm | 15 +++-------
tp/Texinfo/Convert/TexinfoMarkup.pm | 9 +++---
tp/Texinfo/ParserNonXS.pm | 6 ++--
tp/Texinfo/XS/main/convert_to_texinfo.c | 6 ++--
tp/Texinfo/XS/main/element_types.c | 1 -
tp/Texinfo/XS/main/element_types.h | 1 -
tp/Texinfo/XS/main/element_types.txt | 1 -
tp/Texinfo/XS/parsetexi/end_line.c | 6 ++--
.../indices_in_begin_tables_lists.pl | 5 +++-
...ces_in_begin_tables_lists_entries_after_item.pl | 5 +++-
.../coverage/formats_only_title_comments.pl | 5 +++-
tp/t/results/coverage/formats_only_titles.pl | 5 +++-
tp/t/results/coverage/formats_titles.pl | 5 +++-
tp/t/results/coverage/item_container.pl | 5 +++-
tp/t/results/html_tests/menu.pl | 30 +++++++++++++++----
tp/t/results/indices/index_special_region.pl | 5 +++-
.../index_special_region_no_insertcopying.pl | 5 +++-
...egion_no_insertcopying_no_titlepage_no_nodes.pl | 5 +++-
...l_region_no_insertcopying_titlepage_no_nodes.pl | 5 +++-
...copying_titlepage_no_nodes_footnotes_default.pl | 5 +++-
.../index_special_region_no_titlepage_no_nodes.pl | 5 +++-
.../index_special_region_titlepage_no_nodes.pl | 5 +++-
..._region_titlepage_no_nodes_footnotes_default.pl | 5 +++-
tp/t/results/indices/index_table.pl | 10 +++++--
.../results/indices/index_table_chapter_no_node.pl | 10 +++++--
.../itemx_in_itemize_enumerate_in_table.pl | 5 +++-
.../invalid_nestings/section_on_itemize_line.pl | 5 +++-
.../invalid_nestings/section_on_xtable_line.pl | 15 ++++++++--
.../itemize/comment_first_on_itemize_line.pl | 5 +++-
tp/t/results/itemize/headitem_itemx_in_itemize.pl | 5 +++-
.../itemize/inter_item_commands_in_itemize.pl | 5 +++-
tp/t/results/itemize/itemize_and_empty_lines.pl | 5 +++-
tp/t/results/itemize/not_closed_item.pl | 5 +++-
tp/t/results/itemize/not_closed_itemize.pl | 5 +++-
tp/t/results/latex_tests/nested_itemize.pl | 20 ++++++++++---
tp/t/results/linemacro/blockitem_no_item.pl | 5 +++-
.../menu/block_commands_in_menu_description.pl | 5 +++-
.../itemize_in_headitem_in_example.pl | 20 ++++++++++---
.../plaintext_tests/long_uref_after_item.pl | 5 +++-
tp/t/results/xml_tests/comments_end_lines.pl | 5 +++-
.../xml_tests/comments_on_block_command_lines.pl | 5 +++-
tp/t/results/xtable/accent_on_table_line.pl | 35 +++++++++++++++++-----
.../xtable/no_arg_brace_command_on_table_line.pl | 5 +++-
tp/t/results/xtable/no_argument_for_table.pl | 5 +++-
46 files changed, 269 insertions(+), 95 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c937f440d0..4ae2d79b87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2024-05-09 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/LaTeX.pm (%ignored_types, _convert),
+ tp/Texinfo/Convert/Texinfo.pm (_convert_to_texinfo)
+ (_expand_cmd_args_to_texi), tp/Texinfo/Convert/TexinfoMarkup.pm
+ (_convert), tp/Texinfo/ParserNonXS.pm (_end_line_starting_block),
+ tp/Texinfo/XS/main/convert_to_texinfo.c (expand_cmd_args_to_texi)
+ (convert_to_texinfo_internal), tp/Texinfo/XS/main/element_types.txt,
+ tp/Texinfo/XS/parsetexi/end_line.c (end_line_starting_block): rename
+ command_as_argument_inserted as command_as_argument and set info
+ inserted instead. Remove %ignored_types in Texinfo.pm.
+
+ * tp/Texinfo/Convert/LaTeX.pm (%ignorable_types): remove unused
+ variable.
+
2024-05-09 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/HTML.pm
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 4817551434..2fb0be8f89 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -553,20 +553,12 @@ foreach my $type ('ignorable_spaces_after_command',
$ignorable_space_types{$type} = 1;
}
-# ignore 'command_as_argument_inserted' in order to use the default
-# setting for @itemize if there is no argument
my %ignored_types;
-foreach my $type ('command_as_argument_inserted',
- 'postamble_after_end', 'preamble_before_beginning',
- 'preamble_before_setfilename', 'command_as_argument_inserted') {
+foreach my $type ('postamble_after_end', 'preamble_before_beginning',
+ 'preamble_before_setfilename') {
$ignored_types{$type} = 1;
}
-my %ignorable_types = %ignorable_space_types;
-foreach my $ignored_type(keys(%ignored_types)) {
- $ignorable_types{$ignored_type} = 1;
-}
-
# The following code is used to define style commands with more
# complex code than a LaTeX command.
#
@@ -2647,7 +2639,12 @@ sub _convert($$)
my $type = $element->{'type'};
my $cmdname = $element->{'cmdname'};
- if ((defined($type) and $self->{'ignored_types'}->{$type})
+ 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 (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 382822a62b..41b0b3a6a2 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -77,12 +77,6 @@ my %def_commands =
%Texinfo::Commands::def_commands;
# used in root_heading_command_to_texinfo
my %sectioning_heading_commands =
%Texinfo::Commands::sectioning_heading_commands;
-my @ignored_types = ('command_as_argument_inserted');
-my %ignored_types;
-for my $a (@ignored_types) {
- $ignored_types{$a} = 1;
-}
-
# This is used if the document is available for XS, but XS is not
# used (most likely $TEXINFO_XS_CONVERT is 0).
sub _convert_tree_with_XS($)
@@ -203,9 +197,8 @@ sub _convert_to_texinfo($)
my $result = '';
return '' if ($element->{'type'}
- and (($ignored_types{$element->{'type'}}
- or ($element->{'info'}
- and $element->{'info'}->{'inserted'}))));
+ and $element->{'info'}
+ and $element->{'info'}->{'inserted'});
if (defined($element->{'text'})) {
$result .= $element->{'text'};
} else {
@@ -288,8 +281,8 @@ sub _expand_cmd_args_to_texi($) {
}
my $arg_nr = 0;
foreach my $arg (@{$cmd->{'args'}}) {
- next if (($arg->{'type'} and $ignored_types{$arg->{'type'}})
- or ($arg->{'info'} and $arg->{'info'}->{'inserted'}));
+ next if ($arg->{'type'} and $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 b4775be8f3..0f16ff2fb8 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -630,12 +630,11 @@ sub _convert($$;$)
[['command', $element->{'extra'}->{'clickstyle'}]]);
}
if ($self->{'itemize_line'} and $element->{'type'}
- and ($element->{'type'} eq 'command_as_argument'
- or $element->{'type'} eq 'command_as_argument_inserted')
+ and $element->{'type'} eq 'command_as_argument'
and !$element->{'args'}) {
my $arguments = [['command', $element->{'cmdname'}]];
push @$arguments, ['automatic', 'on']
- if ($element->{'type'} eq 'command_as_argument_inserted');
+ if ($element->{'info'} and $element->{'info'}->{'inserted'});
return $self->txi_markup_element('formattingcommand', $arguments);
}
return $self->_format_command($element->{'cmdname'});
@@ -1260,8 +1259,8 @@ sub _convert($$;$)
push @$attribute,
(['commandarg', $command_as_arg->{'cmdname'}],
$self->_infoenclose_attribute($command_as_arg));
- if ($command_as_arg->{'type'}
- and $command_as_arg->{'type'} eq 'command_as_argument_inserted') {
+ if ($command_as_arg->{'info'}
+ and $command_as_arg->{'info'}->{'inserted'}) {
push @$attribute, ['automaticcommandarg', 'on'];
}
} elsif ($element->{'extra'}
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 882cff3cb3..1ed493a3dd 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -4249,7 +4249,8 @@ sub _end_line_starting_block($$$)
unshift @{$current->{'args'}}, $block_line_arg;
}
my $inserted = { 'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted',
+ 'type' => 'command_as_argument',
+ 'info' => {'inserted' => 1},
'parent' => $block_line_arg };
unshift @{$block_line_arg->{'contents'}}, $inserted;
$current->{'extra'} = {} if (!$current->{'extra'});
@@ -4259,7 +4260,8 @@ sub _end_line_starting_block($$$)
$current->{'extra'} = {} if (!$current->{'extra'});
if (!$current->{'extra'}->{'command_as_argument'}) {
my $inserted = { 'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted',
+ 'type' => 'command_as_argument',
+ 'info' => {'inserted' => 1},
'parent' => $current };
unshift @{$current->{'args'}}, $inserted;
$current->{'extra'}->{'command_as_argument'} = $inserted;
diff --git a/tp/Texinfo/XS/main/convert_to_texinfo.c
b/tp/Texinfo/XS/main/convert_to_texinfo.c
index 055a15b137..f06272b8c2 100644
--- a/tp/Texinfo/XS/main/convert_to_texinfo.c
+++ b/tp/Texinfo/XS/main/convert_to_texinfo.c
@@ -100,8 +100,7 @@ expand_cmd_args_to_texi (const ELEMENT *e, TEXT *result)
ELEMENT *arg = e->args.list[i];
int status;
int inserted = lookup_info_integer (arg, "inserted", &status);
- if (inserted
- || arg->type == ET_command_as_argument_inserted)
+ if (inserted)
continue;
if (with_commas)
@@ -136,8 +135,7 @@ convert_to_texinfo_internal (const ELEMENT *e, TEXT *result)
int status;
int inserted = lookup_info_integer (e, "inserted", &status);
- if (inserted
- || e->type == ET_command_as_argument_inserted)
+ if (inserted)
{}
else if (e->text.end > 0)
ADD(e->text.text);
diff --git a/tp/Texinfo/XS/main/element_types.c
b/tp/Texinfo/XS/main/element_types.c
index e59025e50f..ab3e60c7ac 100644
--- a/tp/Texinfo/XS/main/element_types.c
+++ b/tp/Texinfo/XS/main/element_types.c
@@ -1,7 +1,6 @@
char *element_type_names[] = {
0,
"command_as_argument",
-"command_as_argument_inserted",
"index_entry_command",
"following_arg",
"space_command_arg",
diff --git a/tp/Texinfo/XS/main/element_types.h
b/tp/Texinfo/XS/main/element_types.h
index e86af29baa..5d0271d15e 100644
--- a/tp/Texinfo/XS/main/element_types.h
+++ b/tp/Texinfo/XS/main/element_types.h
@@ -4,7 +4,6 @@
enum element_type {
ET_NONE,
ET_command_as_argument,
-ET_command_as_argument_inserted,
ET_index_entry_command,
ET_following_arg,
ET_space_command_arg,
diff --git a/tp/Texinfo/XS/main/element_types.txt
b/tp/Texinfo/XS/main/element_types.txt
index 1b4c8dff38..b0c72c636a 100644
--- a/tp/Texinfo/XS/main/element_types.txt
+++ b/tp/Texinfo/XS/main/element_types.txt
@@ -17,7 +17,6 @@
# Types for @-commands
command_as_argument
-command_as_argument_inserted
index_entry_command
following_arg
space_command_arg
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c
b/tp/Texinfo/XS/parsetexi/end_line.c
index 000acbb1ca..c28bc1371c 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -1035,7 +1035,8 @@ end_line_starting_block (ELEMENT *current)
insert_into_args (current, block_line_arg, 0);
}
- e = new_element (ET_command_as_argument_inserted);
+ e = new_element (ET_command_as_argument);
+ add_info_integer (e, "inserted", 1);
e->cmd = CM_bullet;
insert_into_contents (block_line_arg, e, 0);
add_extra_element (current, "command_as_argument", e);
@@ -1045,7 +1046,8 @@ end_line_starting_block (ELEMENT *current)
{
ELEMENT *e;
- e = new_element (ET_command_as_argument_inserted);
+ e = new_element (ET_command_as_argument);
+ add_info_integer (e, "inserted", 1);
e->cmd = CM_asis;
insert_into_args (current, e, 0);
add_extra_element (current, "command_as_argument", e);
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 54c30a848b..b9d56378f1 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
@@ -520,7 +520,10 @@ $result_trees{'indices_in_begin_tables_lists'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ '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 8c917fb8b4..0c34f78a2d 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
@@ -520,7 +520,10 @@
$result_trees{'indices_in_begin_tables_lists_entries_after_item'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ '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 db00796a77..40c30ad2c3 100644
--- a/tp/t/results/coverage/formats_only_title_comments.pl
+++ b/tp/t/results/coverage/formats_only_title_comments.pl
@@ -15,7 +15,10 @@ $result_trees{'formats_only_title_comments'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ '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 32037ff164..238a82462d 100644
--- a/tp/t/results/coverage/formats_only_titles.pl
+++ b/tp/t/results/coverage/formats_only_titles.pl
@@ -15,7 +15,10 @@ $result_trees{'formats_only_titles'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
}
],
'info' => {
diff --git a/tp/t/results/coverage/formats_titles.pl
b/tp/t/results/coverage/formats_titles.pl
index f921ac1b71..57d0f60944 100644
--- a/tp/t/results/coverage/formats_titles.pl
+++ b/tp/t/results/coverage/formats_titles.pl
@@ -15,7 +15,10 @@ $result_trees{'formats_titles'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
}
],
'info' => {
diff --git a/tp/t/results/coverage/item_container.pl
b/tp/t/results/coverage/item_container.pl
index a35cf888a6..c83eeceabf 100644
--- a/tp/t/results/coverage/item_container.pl
+++ b/tp/t/results/coverage/item_container.pl
@@ -208,7 +208,10 @@ $result_trees{'item_container'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
}
],
'info' => {
diff --git a/tp/t/results/html_tests/menu.pl b/tp/t/results/html_tests/menu.pl
index 585dc44286..5d1727b0ac 100644
--- a/tp/t/results/html_tests/menu.pl
+++ b/tp/t/results/html_tests/menu.pl
@@ -129,7 +129,10 @@ $result_trees{'menu'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
}
],
'info' => {
@@ -308,7 +311,10 @@ $result_trees{'menu'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
}
],
'info' => {
@@ -472,7 +478,10 @@ $result_trees{'menu'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
}
],
'info' => {
@@ -809,7 +818,10 @@ $result_trees{'menu'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
}
],
'info' => {
@@ -988,7 +1000,10 @@ $result_trees{'menu'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
}
],
'info' => {
@@ -1152,7 +1167,10 @@ $result_trees{'menu'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ '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 10cef2ef5e..d86806f04b 100644
--- a/tp/t/results/indices/index_special_region.pl
+++ b/tp/t/results/indices/index_special_region.pl
@@ -990,7 +990,10 @@ $result_trees{'index_special_region'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ '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 c38e523c9b..f51608506f 100644
--- a/tp/t/results/indices/index_special_region_no_insertcopying.pl
+++ b/tp/t/results/indices/index_special_region_no_insertcopying.pl
@@ -985,7 +985,10 @@ $result_trees{'index_special_region_no_insertcopying'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ '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 875e9cb15f..ccf841fea9 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
@@ -985,7 +985,10 @@
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ '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 dd75c0d4f6..0adbad490c 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
@@ -985,7 +985,10 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ '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 4187667885..181d67ccc4 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
@@ -985,7 +985,10 @@
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ '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 740845a6be..d39eddff5a 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
@@ -990,7 +990,10 @@
$result_trees{'index_special_region_no_titlepage_no_nodes'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ '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 713a3f2c67..277f9b81aa 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
@@ -990,7 +990,10 @@ $result_trees{'index_special_region_titlepage_no_nodes'} =
{
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ '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 503b8b3e65..802717d411 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
@@ -990,7 +990,10 @@
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ '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 9c429e34f7..b7b8ce3d82 100644
--- a/tp/t/results/indices/index_table.pl
+++ b/tp/t/results/indices/index_table.pl
@@ -453,7 +453,10 @@ $result_trees{'index_table'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
},
{
'contents' => [
@@ -634,7 +637,10 @@ $result_trees{'index_table'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
},
{
'contents' => [
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 d6fbb90aaa..a2f09c3159 100644
--- a/tp/t/results/indices/index_table_chapter_no_node.pl
+++ b/tp/t/results/indices/index_table_chapter_no_node.pl
@@ -453,7 +453,10 @@ $result_trees{'index_table_chapter_no_node'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
},
{
'contents' => [
@@ -634,7 +637,10 @@ $result_trees{'index_table_chapter_no_node'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
},
{
'contents' => [
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 0746bf224b..3554f26242 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
@@ -88,7 +88,10 @@ $result_trees{'itemx_in_itemize_enumerate_in_table'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 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 eae684b72a..8e90f84f8e 100644
--- a/tp/t/results/invalid_nestings/section_on_itemize_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_itemize_line.pl
@@ -154,7 +154,10 @@ $result_trees{'section_on_itemize_line'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ '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 79362f284a..0cfca00cde 100644
--- a/tp/t/results/invalid_nestings/section_on_xtable_line.pl
+++ b/tp/t/results/invalid_nestings/section_on_xtable_line.pl
@@ -13,7 +13,10 @@ $result_trees{'section_on_xtable_line'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
},
{
'type' => 'block_line_arg'
@@ -63,7 +66,10 @@ $result_trees{'section_on_xtable_line'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
},
{
'contents' => [
@@ -207,7 +213,10 @@ $result_trees{'section_on_xtable_line'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
},
{
'contents' => [
diff --git a/tp/t/results/itemize/comment_first_on_itemize_line.pl
b/tp/t/results/itemize/comment_first_on_itemize_line.pl
index 716d5089c0..a7bfd7571a 100644
--- a/tp/t/results/itemize/comment_first_on_itemize_line.pl
+++ b/tp/t/results/itemize/comment_first_on_itemize_line.pl
@@ -15,7 +15,10 @@ $result_trees{'comment_first_on_itemize_line'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ '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 53c53365f7..d8a99e1a9f 100644
--- a/tp/t/results/itemize/headitem_itemx_in_itemize.pl
+++ b/tp/t/results/itemize/headitem_itemx_in_itemize.pl
@@ -15,7 +15,10 @@ $result_trees{'headitem_itemx_in_itemize'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ '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 a458c9a7d5..1cc317271d 100644
--- a/tp/t/results/itemize/inter_item_commands_in_itemize.pl
+++ b/tp/t/results/itemize/inter_item_commands_in_itemize.pl
@@ -490,7 +490,10 @@ $result_trees{'inter_item_commands_in_itemize'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ '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 fe7b241495..a3401a375e 100644
--- a/tp/t/results/itemize/itemize_and_empty_lines.pl
+++ b/tp/t/results/itemize/itemize_and_empty_lines.pl
@@ -437,7 +437,10 @@ $result_trees{'itemize_and_empty_lines'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ '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 f4befa7a60..2b42d38f43 100644
--- a/tp/t/results/itemize/not_closed_item.pl
+++ b/tp/t/results/itemize/not_closed_item.pl
@@ -15,7 +15,10 @@ $result_trees{'not_closed_item'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ '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 d909ff276c..4b686e7dd7 100644
--- a/tp/t/results/itemize/not_closed_itemize.pl
+++ b/tp/t/results/itemize/not_closed_itemize.pl
@@ -15,7 +15,10 @@ $result_trees{'not_closed_itemize'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 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 523573dc51..c3f3660ccb 100644
--- a/tp/t/results/latex_tests/nested_itemize.pl
+++ b/tp/t/results/latex_tests/nested_itemize.pl
@@ -18,7 +18,10 @@ $result_trees{'nested_itemize'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
}
],
'info' => {
@@ -90,7 +93,10 @@ $result_trees{'nested_itemize'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
}
],
'info' => {
@@ -162,7 +168,10 @@ $result_trees{'nested_itemize'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
}
],
'info' => {
@@ -234,7 +243,10 @@ $result_trees{'nested_itemize'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' =>
'command_as_argument_inserted'
+ '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 aa78d20e50..3dda822055 100644
--- a/tp/t/results/linemacro/blockitem_no_item.pl
+++ b/tp/t/results/linemacro/blockitem_no_item.pl
@@ -85,7 +85,10 @@ $result_trees{'blockitem_no_item'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ '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 4dfb31e3d0..6a1d223653 100644
--- a/tp/t/results/menu/block_commands_in_menu_description.pl
+++ b/tp/t/results/menu/block_commands_in_menu_description.pl
@@ -127,7 +127,10 @@ $result_trees{'block_commands_in_menu_description'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ '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 7d865735f3..33cd3988b0 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
@@ -29,7 +29,10 @@ $result_trees{'itemize_in_headitem_in_example'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
}
],
'info' => {
@@ -115,7 +118,10 @@ $result_trees{'itemize_in_headitem_in_example'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
}
],
'info' => {
@@ -220,7 +226,10 @@ $result_trees{'itemize_in_headitem_in_example'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
}
],
'info' => {
@@ -330,7 +339,10 @@ $result_trees{'itemize_in_headitem_in_example'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ '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 f70fb0808c..9e7f51e47b 100644
--- a/tp/t/results/plaintext_tests/long_uref_after_item.pl
+++ b/tp/t/results/plaintext_tests/long_uref_after_item.pl
@@ -15,7 +15,10 @@ $result_trees{'long_uref_after_item'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ '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 cc1470cfd0..edd7fe39ac 100644
--- a/tp/t/results/xml_tests/comments_end_lines.pl
+++ b/tp/t/results/xml_tests/comments_end_lines.pl
@@ -15,7 +15,10 @@ $result_trees{'comments_end_lines'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ '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 e5935562dd..c2a15af55e 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
@@ -15,7 +15,10 @@ $result_trees{'comments_on_block_command_lines'} = {
'contents' => [
{
'cmdname' => 'bullet',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ '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 340aa1724d..0dffd30b3d 100644
--- a/tp/t/results/xtable/accent_on_table_line.pl
+++ b/tp/t/results/xtable/accent_on_table_line.pl
@@ -13,7 +13,10 @@ $result_trees{'accent_on_table_line'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
},
{
'contents' => [
@@ -177,7 +180,10 @@ $result_trees{'accent_on_table_line'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
},
{
'contents' => [
@@ -347,7 +353,10 @@ $result_trees{'accent_on_table_line'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
},
{
'contents' => [
@@ -464,7 +473,10 @@ $result_trees{'accent_on_table_line'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
},
{
'contents' => [
@@ -575,7 +587,10 @@ $result_trees{'accent_on_table_line'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
},
{
'contents' => [
@@ -686,7 +701,10 @@ $result_trees{'accent_on_table_line'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
},
{
'contents' => [
@@ -803,7 +821,10 @@ $result_trees{'accent_on_table_line'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
},
{
'contents' => [
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 a3c134f626..308cf23df7 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
@@ -13,7 +13,10 @@ $result_trees{'no_arg_brace_command_on_table_line'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
},
{
'contents' => [
diff --git a/tp/t/results/xtable/no_argument_for_table.pl
b/tp/t/results/xtable/no_argument_for_table.pl
index e98602af1c..a3c5edd4bd 100644
--- a/tp/t/results/xtable/no_argument_for_table.pl
+++ b/tp/t/results/xtable/no_argument_for_table.pl
@@ -13,7 +13,10 @@ $result_trees{'no_argument_for_table'} = {
'args' => [
{
'cmdname' => 'asis',
- 'type' => 'command_as_argument_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'command_as_argument'
},
{
'info' => {