[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Thu, 9 May 2024 15:52:50 -0400 (EDT) |
branch: master
commit d1acdcc486dfd0cd34c669227a959f753f1936fa
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu May 9 18:17:30 2024 +0200
* tp/Texinfo/XS/main/extra.c (add_info_integer)
(lookup_key_pair_integer, lookup_extra_integer, lookup_info_integer):
add add_info_integer and lookup_info_integer.
* tp/Texinfo/Convert/Texinfo.pm (@ignored_types, _convert_to_texinfo),
tp/Texinfo/ParserNonXS.pm (_split_def_args)
(_next_bracketed_or_word_agg, _parse_def),
tp/Texinfo/XS/parsetexi/def.c (next_bracketed_or_word_agg),
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/def.c (next_bracketed_or_word_agg)
(split_def_args, parse_def): rename spaces_inserted as spaces and add
the inserted information as an info integer.
---
ChangeLog | 16 ++
tp/Texinfo/Convert/Texinfo.pm | 6 +-
tp/Texinfo/ParserNonXS.pm | 7 +-
tp/Texinfo/XS/main/convert_to_texinfo.c | 8 +-
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/main/extra.c | 33 +++-
tp/Texinfo/XS/main/extra.h | 2 +
tp/Texinfo/XS/parsetexi/def.c | 15 +-
tp/t/results/converters_tests/complex_nestings.pl | 20 ++-
.../converters_tests/definition_commands.pl | 170 ++++++++++++++++-----
.../converters_tests/test_deftypefnnewline.pl | 10 +-
tp/t/results/def/all_commands.pl | 60 ++++++--
tp/t/results/def/all_commands_delimiters.pl | 5 +-
.../def/all_commands_delimiters_printindex.pl | 5 +-
tp/t/results/def/all_commands_printindex.pl | 60 ++++++--
tp/t/results/def/def_defx_mismatch.pl | 5 +-
tp/t/results/def/empty_deftype.pl | 20 ++-
tp/t/results/def/not_closed.pl | 5 +-
tp/t/results/def/omit_def_space.pl | 10 +-
.../deftypefnnewline_for_copying_after.pl | 10 +-
.../deftypefnnewline_for_copying_before.pl | 10 +-
tp/t/results/indices/empty_string_index_entry.pl | 10 +-
.../indices/printindex_index_entry_in_copying.pl | 10 +-
...ndex_index_entry_in_copying_no_insertcopying.pl | 10 +-
.../indices/same_index_entry_merged_indices.pl | 5 +-
.../invalid_nestings/def_in_style_command.pl | 5 +-
tp/t/results/languages/documentlanguage.pl | 5 +-
tp/t/results/languages/documentlanguage_option.pl | 5 +-
tp/t/results/languages/documentlanguage_unknown.pl | 5 +-
.../results/languages/multiple_documentlanguage.pl | 15 +-
tp/t/results/languages/multiple_in_preamble.pl | 15 +-
.../languages/multiple_in_preamble_before_node.pl | 10 +-
tp/t/results/languages/multiple_lang_chapters.pl | 15 +-
.../languages/multiple_lang_chapters_latex.pl | 15 +-
.../languages/multiple_lang_chapters_texi2html.pl | 15 +-
tp/t/results/languages/simple_documentlanguage.pl | 5 +-
tp/t/results/languages/unknown_region.pl | 5 +-
tp/t/results/latex_tests/brace_in_index.pl | 5 +-
tp/t/results/preformatted/def_in_example.pl | 5 +-
41 files changed, 511 insertions(+), 129 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9e6f960b55..f47d110fd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2024-05-09 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/XS/main/extra.c (add_info_integer)
+ (lookup_key_pair_integer, lookup_extra_integer, lookup_info_integer):
+ add add_info_integer and lookup_info_integer.
+
+ * tp/Texinfo/Convert/Texinfo.pm (@ignored_types, _convert_to_texinfo),
+ tp/Texinfo/ParserNonXS.pm (_split_def_args)
+ (_next_bracketed_or_word_agg, _parse_def),
+ tp/Texinfo/XS/parsetexi/def.c (next_bracketed_or_word_agg),
+ 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/def.c (next_bracketed_or_word_agg)
+ (split_def_args, parse_def): rename spaces_inserted as spaces and add
+ the inserted information as an info integer.
+
2024-05-09 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/ParserNonXS.pm (_split_delimiters),
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index 716f9627ac..fad15f6da2 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -78,7 +78,7 @@ my %def_commands =
%Texinfo::Commands::def_commands;
my %sectioning_heading_commands =
%Texinfo::Commands::sectioning_heading_commands;
my @ignored_types = ('command_as_argument_inserted',
- 'spaces_inserted', 'def_category_inserted',
+ 'def_category_inserted',
'untranslated_def_category_inserted');
my %ignored_types;
for my $a (@ignored_types) {
@@ -205,7 +205,9 @@ sub _convert_to_texinfo($)
my $result = '';
return '' if ($element->{'type'}
- and ($ignored_types{$element->{'type'}}));
+ and (($ignored_types{$element->{'type'}}
+ or ($element->{'info'}
+ and $element->{'info'}->{'inserted'}))));
if (defined($element->{'text'})) {
$result .= $element->{'text'};
} else {
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index b038555bdf..860f1e9746 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3179,7 +3179,8 @@ sub _split_def_args
{
my ($self, $root, $current, $source_info) = @_;
- if ($root->{'type'} and $root->{'type'} eq 'spaces_inserted') {
+ if ($root->{'type'} and $root->{'type'} eq 'spaces'
+ and $root->{'info'} and $root->{'info'}->{'inserted'}) {
return $root;
} elsif (defined $root->{'text'}) {
my @elements;
@@ -3240,7 +3241,6 @@ sub _next_bracketed_or_word_agg($$)
}
my $element = $current->{'contents'}->[$$index_ref];
if ($element->{'type'} and ($element->{'type'} eq 'spaces'
- or $element->{'type'} eq 'spaces_inserted'
or $element->{'type'} eq 'delimiter')) {
last if ($num > 0);
@@ -3320,7 +3320,8 @@ sub _parse_def($$$$)
@{$inserted_category->{'contents'}} = ($content);
unshift @contents, $inserted_category,
- { 'text' => ' ', 'type' => 'spaces_inserted',
+ { 'text' => ' ', 'type' => 'spaces',
+ 'info' => {'inserted' => 1},
'parent' => $current,
'extra' => {'def_role' => 'spaces'},
};
diff --git a/tp/Texinfo/XS/main/convert_to_texinfo.c
b/tp/Texinfo/XS/main/convert_to_texinfo.c
index 97d81e24e3..8703b1d5e1 100644
--- a/tp/Texinfo/XS/main/convert_to_texinfo.c
+++ b/tp/Texinfo/XS/main/convert_to_texinfo.c
@@ -98,7 +98,9 @@ expand_cmd_args_to_texi (const ELEMENT *e, TEXT *result)
for (i = 0; i < e->args.number; i++)
{
ELEMENT *arg = e->args.list[i];
- if (arg->type == ET_spaces_inserted
+ int status;
+ int inserted = lookup_info_integer (arg, "inserted", &status);
+ if (inserted
|| arg->type == ET_def_category_inserted
|| arg->type == ET_untranslated_def_category_inserted
|| arg->type == ET_command_as_argument_inserted)
@@ -133,8 +135,10 @@ static void
convert_to_texinfo_internal (const ELEMENT *e, TEXT *result)
{
ELEMENT *elt;
+ int status;
+ int inserted = lookup_info_integer (e, "inserted", &status);
- if (e->type == ET_spaces_inserted
+ if (inserted
|| e->type == ET_def_category_inserted
|| e->type == ET_untranslated_def_category_inserted
|| e->type == ET_command_as_argument_inserted)
diff --git a/tp/Texinfo/XS/main/element_types.c
b/tp/Texinfo/XS/main/element_types.c
index 51b822e0cd..81da654d00 100644
--- a/tp/Texinfo/XS/main/element_types.c
+++ b/tp/Texinfo/XS/main/element_types.c
@@ -17,7 +17,6 @@ char *element_type_names[] = {
"space_at_end_menu_node",
"after_menu_description_line",
"spaces_after_cmd_before_arg",
-"spaces_inserted",
"document_root",
"root_line",
"before_node_section",
diff --git a/tp/Texinfo/XS/main/element_types.h
b/tp/Texinfo/XS/main/element_types.h
index 8b822fd8fb..09a0373217 100644
--- a/tp/Texinfo/XS/main/element_types.h
+++ b/tp/Texinfo/XS/main/element_types.h
@@ -20,7 +20,6 @@ ET_text_before_beginning,
ET_space_at_end_menu_node,
ET_after_menu_description_line,
ET_spaces_after_cmd_before_arg,
-ET_spaces_inserted,
ET_document_root,
ET_root_line,
ET_before_node_section,
diff --git a/tp/Texinfo/XS/main/element_types.txt
b/tp/Texinfo/XS/main/element_types.txt
index 22c9544344..d4549731a3 100644
--- a/tp/Texinfo/XS/main/element_types.txt
+++ b/tp/Texinfo/XS/main/element_types.txt
@@ -35,7 +35,6 @@ text_before_beginning
space_at_end_menu_node
after_menu_description_line
spaces_after_cmd_before_arg
-spaces_inserted
# Other special types
document_root
diff --git a/tp/Texinfo/XS/main/extra.c b/tp/Texinfo/XS/main/extra.c
index 16e06a7d58..69884782a9 100644
--- a/tp/Texinfo/XS/main/extra.c
+++ b/tp/Texinfo/XS/main/extra.c
@@ -55,7 +55,7 @@ get_associated_info_key (ASSOCIATED_INFO *a, const char *key,
return &a->info[i];
}
-/* Add an extra key that is a reference to another element (for example,
+/* Add an extra key that is a reference to another element (for example,
'associated_section' on a node command element. */
/* TODO would be good to have ELEMENT be const */
void
@@ -205,6 +205,13 @@ add_extra_integer (ELEMENT *e, char *key, long value)
k->integer = value;
}
+void
+add_info_integer (ELEMENT *e, char *key, long value)
+{
+ KEY_PAIR *k = get_associated_info_key (&e->info_info, key, extra_integer);
+ k->integer = value;
+}
+
KEY_PAIR *
lookup_associated_info (const ASSOCIATED_INFO *a, const char *key)
{
@@ -269,11 +276,9 @@ lookup_extra (const ELEMENT *e, const char *key)
}
/* *ret is negative if not found or not an integer */
-int
-lookup_extra_integer (const ELEMENT *e, const char *key, int *ret)
+static int
+lookup_key_pair_integer (const KEY_PAIR *k, const char *key, int *ret)
{
- const KEY_PAIR *k;
- k = lookup_associated_info (&e->extra_info, key);
if (!k)
{
*ret = -1;
@@ -291,6 +296,24 @@ lookup_extra_integer (const ELEMENT *e, const char *key,
int *ret)
return k->integer;
}
+/* *ret is negative if not found or not an integer */
+int
+lookup_extra_integer (const ELEMENT *e, const char *key, int *ret)
+{
+ const KEY_PAIR *k;
+ k = lookup_associated_info (&e->extra_info, key);
+ return lookup_key_pair_integer (k, key, ret);
+}
+
+/* *ret is negative if not found or not an integer */
+int
+lookup_info_integer (const ELEMENT *e, const char *key, int *ret)
+{
+ const KEY_PAIR *k;
+ k = lookup_associated_info (&e->info_info, key);
+ return lookup_key_pair_integer (k, key, ret);
+}
+
ELEMENT_LIST *
lookup_extra_contents (const ELEMENT *e, const char *key)
{
diff --git a/tp/Texinfo/XS/main/extra.h b/tp/Texinfo/XS/main/extra.h
index c1cccedb26..1ec9f61cea 100644
--- a/tp/Texinfo/XS/main/extra.h
+++ b/tp/Texinfo/XS/main/extra.h
@@ -30,6 +30,7 @@ void add_extra_misc_args (ELEMENT *e, char *key, ELEMENT
*value);
void add_extra_string (ELEMENT *e, const char *key, char *value);
void add_extra_string_dup (ELEMENT *e, const char *key, const char *value);
void add_extra_integer (ELEMENT *e, char *key, long value);
+void add_info_integer (ELEMENT *e, char *key, long value);
void add_info_string (ELEMENT *e, char *key, char *value);
void add_info_string_dup (ELEMENT *e, const char *key, const char *value);
void add_info_element_oot (ELEMENT *e, char *key, ELEMENT *value);
@@ -44,6 +45,7 @@ ELEMENT *lookup_info_element (const ELEMENT *e, const char
*key);
ELEMENT_LIST *lookup_extra_contents (const ELEMENT *e, const char *key);
const ELEMENT_LIST *lookup_extra_directions (const ELEMENT *e, const char
*key);
int lookup_extra_integer (const ELEMENT *e, const char *key, int *ret);
+int lookup_info_integer (const ELEMENT *e, const char *key, int *ret);
char *lookup_extra_string (const ELEMENT *e, const char *key);
char *lookup_info_string (const ELEMENT *e, const char *key);
diff --git a/tp/Texinfo/XS/parsetexi/def.c b/tp/Texinfo/XS/parsetexi/def.c
index e8a37bb8c0..0231f83c5a 100644
--- a/tp/Texinfo/XS/parsetexi/def.c
+++ b/tp/Texinfo/XS/parsetexi/def.c
@@ -105,7 +105,6 @@ next_bracketed_or_word_agg (ELEMENT *current, int *i)
break;
e = current->contents.list[*i];
if (e->type == ET_spaces
- || e->type == ET_spaces_inserted
|| e->type == ET_delimiter)
{
if (num > 0)
@@ -306,6 +305,14 @@ split_def_args (ELEMENT *current, int starting_idx)
if (e->text.end == 0)
continue;
+ if (e->type == ET_spaces)
+ {
+ int status;
+ int inserted = lookup_info_integer (e, "inserted", &status);
+ if (inserted > 0)
+ continue;
+ }
+
p = e->text.text;
if (e->source_mark_list.number)
@@ -398,9 +405,10 @@ parse_def (enum command_id command, ELEMENT *current)
def_aliases[i].translation_context);
}
- e = new_element (ET_spaces_inserted);
+ e = new_element (ET_spaces);
text_append_n (&e->text, " ", 1);
add_extra_string_dup (e, "def_role", "spaces");
+ add_info_integer (e, "inserted", 1);
insert_into_contents (current, e, contents_idx + 1);
}
@@ -476,8 +484,7 @@ parse_def (enum command_id command, ELEMENT *current)
for (i = contents_idx; i < current->contents.number; i++)
{
e = contents_child_by_index (current, i);
- if (e->type == ET_spaces
- || e->type == ET_spaces_inserted)
+ if (e->type == ET_spaces)
{
continue;
}
diff --git a/tp/t/results/converters_tests/complex_nestings.pl
b/tp/t/results/converters_tests/complex_nestings.pl
index 21859663dc..de0ad468bf 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -181,8 +181,11 @@ $result_trees{'complex_nestings'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -322,8 +325,11 @@ $result_trees{'complex_nestings'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -576,8 +582,11 @@ $result_trees{'complex_nestings'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -675,8 +684,11 @@ $result_trees{'complex_nestings'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/converters_tests/definition_commands.pl
b/tp/t/results/converters_tests/definition_commands.pl
index ade0dca9ad..799f374f9b 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -823,8 +823,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -1018,8 +1021,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -1263,8 +1269,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -1508,8 +1517,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -1753,8 +1765,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -1998,8 +2013,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -2243,8 +2261,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -2527,8 +2548,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -2811,8 +2835,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -3095,8 +3122,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -3379,8 +3409,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -3663,8 +3696,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -3947,8 +3983,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -4231,8 +4270,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -4515,8 +4557,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -4861,8 +4906,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -4960,8 +5008,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -5078,8 +5129,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -5196,8 +5250,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -5314,8 +5371,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -5432,8 +5492,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -5550,8 +5613,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -5681,8 +5747,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -5812,8 +5881,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -5943,8 +6015,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -6074,8 +6149,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -6205,8 +6283,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -6336,8 +6417,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -6467,8 +6551,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -6598,8 +6685,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -7660,8 +7750,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -8704,8 +8797,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -10541,8 +10637,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -10774,8 +10873,11 @@ $result_trees{'definition_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 71499f0602..f1417cfe7a 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -232,8 +232,11 @@ $result_trees{'test_deftypefnnewline'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -1576,8 +1579,11 @@ $result_trees{'test_deftypefnnewline'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/def/all_commands.pl b/tp/t/results/def/all_commands.pl
index 51d24b3654..efdd722864 100644
--- a/tp/t/results/def/all_commands.pl
+++ b/tp/t/results/def/all_commands.pl
@@ -2559,8 +2559,11 @@ $result_trees{'all_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -2701,8 +2704,11 @@ $result_trees{'all_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -2843,8 +2849,11 @@ $result_trees{'all_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -2985,8 +2994,11 @@ $result_trees{'all_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -3109,8 +3121,11 @@ $result_trees{'all_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -3269,8 +3284,11 @@ $result_trees{'all_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -3393,8 +3411,11 @@ $result_trees{'all_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -3553,8 +3574,11 @@ $result_trees{'all_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -3695,8 +3719,11 @@ $result_trees{'all_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -3894,8 +3921,11 @@ $result_trees{'all_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -4111,8 +4141,11 @@ $result_trees{'all_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -4328,8 +4361,11 @@ $result_trees{'all_commands'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/def/all_commands_delimiters.pl
b/tp/t/results/def/all_commands_delimiters.pl
index f2e271aa05..ed45546b27 100644
--- a/tp/t/results/def/all_commands_delimiters.pl
+++ b/tp/t/results/def/all_commands_delimiters.pl
@@ -8480,8 +8480,11 @@ $result_trees{'all_commands_delimiters'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index e89abbde5e..b194b67e75 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -8562,8 +8562,11 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/def/all_commands_printindex.pl
b/tp/t/results/def/all_commands_printindex.pl
index 71844b7623..ea2aa39a92 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -2630,8 +2630,11 @@ $result_trees{'all_commands_printindex'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -2773,8 +2776,11 @@ $result_trees{'all_commands_printindex'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -2916,8 +2922,11 @@ $result_trees{'all_commands_printindex'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -3059,8 +3068,11 @@ $result_trees{'all_commands_printindex'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -3184,8 +3196,11 @@ $result_trees{'all_commands_printindex'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -3345,8 +3360,11 @@ $result_trees{'all_commands_printindex'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -3470,8 +3488,11 @@ $result_trees{'all_commands_printindex'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -3631,8 +3652,11 @@ $result_trees{'all_commands_printindex'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -3774,8 +3798,11 @@ $result_trees{'all_commands_printindex'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -3974,8 +4001,11 @@ $result_trees{'all_commands_printindex'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -4192,8 +4222,11 @@ $result_trees{'all_commands_printindex'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -4410,8 +4443,11 @@ $result_trees{'all_commands_printindex'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/def/def_defx_mismatch.pl
b/tp/t/results/def/def_defx_mismatch.pl
index 33187885f2..abdace1179 100644
--- a/tp/t/results/def/def_defx_mismatch.pl
+++ b/tp/t/results/def/def_defx_mismatch.pl
@@ -36,8 +36,11 @@ $result_trees{'def_defx_mismatch'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/def/empty_deftype.pl
b/tp/t/results/def/empty_deftype.pl
index aad1854c58..9506cc72e2 100644
--- a/tp/t/results/def/empty_deftype.pl
+++ b/tp/t/results/def/empty_deftype.pl
@@ -36,8 +36,11 @@ $result_trees{'empty_deftype'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'extra' => {
@@ -244,8 +247,11 @@ $result_trees{'empty_deftype'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -436,8 +442,11 @@ $result_trees{'empty_deftype'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -719,8 +728,11 @@ $result_trees{'empty_deftype'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/def/not_closed.pl b/tp/t/results/def/not_closed.pl
index f5cec1b9fe..5d3c0be839 100644
--- a/tp/t/results/def/not_closed.pl
+++ b/tp/t/results/def/not_closed.pl
@@ -197,8 +197,11 @@ $result_trees{'not_closed'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/def/omit_def_space.pl
b/tp/t/results/def/omit_def_space.pl
index 5435a02381..92e72dc056 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -121,8 +121,11 @@ $result_trees{'omit_def_space'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -242,8 +245,11 @@ $result_trees{'omit_def_space'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
index 2cfecd22c2..65a106579f 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -50,8 +50,11 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -445,8 +448,11 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
index 3c0288a79b..49cc5015a1 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -92,8 +92,11 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -412,8 +415,11 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/indices/empty_string_index_entry.pl
b/tp/t/results/indices/empty_string_index_entry.pl
index 89a4a49d90..66f29f1425 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -269,8 +269,11 @@ $result_trees{'empty_string_index_entry'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -375,8 +378,11 @@ $result_trees{'empty_string_index_entry'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
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 7eeabfa66d..bff982bd3f 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -98,8 +98,11 @@ $result_trees{'printindex_index_entry_in_copying'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -179,8 +182,11 @@ $result_trees{'printindex_index_entry_in_copying'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
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 1c89e4f913..08d089d5a7 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
@@ -98,8 +98,11 @@
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -179,8 +182,11 @@
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/indices/same_index_entry_merged_indices.pl
b/tp/t/results/indices/same_index_entry_merged_indices.pl
index ae2aae8910..9f88ed143b 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -359,8 +359,11 @@ $result_trees{'same_index_entry_merged_indices'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/invalid_nestings/def_in_style_command.pl
b/tp/t/results/invalid_nestings/def_in_style_command.pl
index de760933a9..96fbc1e8d8 100644
--- a/tp/t/results/invalid_nestings/def_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/def_in_style_command.pl
@@ -58,8 +58,11 @@ $result_trees{'def_in_style_command'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/languages/documentlanguage.pl
b/tp/t/results/languages/documentlanguage.pl
index cb47df612e..2f5288bcca 100644
--- a/tp/t/results/languages/documentlanguage.pl
+++ b/tp/t/results/languages/documentlanguage.pl
@@ -449,8 +449,11 @@ $result_trees{'documentlanguage'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/languages/documentlanguage_option.pl
b/tp/t/results/languages/documentlanguage_option.pl
index ec8f368ae5..000f667814 100644
--- a/tp/t/results/languages/documentlanguage_option.pl
+++ b/tp/t/results/languages/documentlanguage_option.pl
@@ -449,8 +449,11 @@ $result_trees{'documentlanguage_option'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/languages/documentlanguage_unknown.pl
b/tp/t/results/languages/documentlanguage_unknown.pl
index e3d9893188..bbaaa9fd30 100644
--- a/tp/t/results/languages/documentlanguage_unknown.pl
+++ b/tp/t/results/languages/documentlanguage_unknown.pl
@@ -449,8 +449,11 @@ $result_trees{'documentlanguage_unknown'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/languages/multiple_documentlanguage.pl
b/tp/t/results/languages/multiple_documentlanguage.pl
index c65bcf5fec..ff25a4f78a 100644
--- a/tp/t/results/languages/multiple_documentlanguage.pl
+++ b/tp/t/results/languages/multiple_documentlanguage.pl
@@ -92,8 +92,11 @@ $result_trees{'multiple_documentlanguage'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -490,8 +493,11 @@ $result_trees{'multiple_documentlanguage'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -814,8 +820,11 @@ $result_trees{'multiple_documentlanguage'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/languages/multiple_in_preamble.pl
b/tp/t/results/languages/multiple_in_preamble.pl
index eb27556720..3dd2e59306 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -92,8 +92,11 @@ $result_trees{'multiple_in_preamble'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -524,8 +527,11 @@ $result_trees{'multiple_in_preamble'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -794,8 +800,11 @@ $result_trees{'multiple_in_preamble'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/languages/multiple_in_preamble_before_node.pl
b/tp/t/results/languages/multiple_in_preamble_before_node.pl
index 8180fae9e9..a2d65b1d24 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -92,8 +92,11 @@ $result_trees{'multiple_in_preamble_before_node'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -573,8 +576,11 @@ $result_trees{'multiple_in_preamble_before_node'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl
b/tp/t/results/languages/multiple_lang_chapters.pl
index b4a9ee4255..3ebb423abd 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -730,8 +730,11 @@ $result_trees{'multiple_lang_chapters'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -1074,8 +1077,11 @@ $result_trees{'multiple_lang_chapters'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -1382,8 +1388,11 @@ $result_trees{'multiple_lang_chapters'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index 9a5eec4ae5..601f04afb7 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -730,8 +730,11 @@ $result_trees{'multiple_lang_chapters_latex'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -1074,8 +1077,11 @@ $result_trees{'multiple_lang_chapters_latex'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -1382,8 +1388,11 @@ $result_trees{'multiple_lang_chapters_latex'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index 0e914947bd..b6f2aa08a9 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -699,8 +699,11 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -1043,8 +1046,11 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
@@ -1351,8 +1357,11 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/languages/simple_documentlanguage.pl
b/tp/t/results/languages/simple_documentlanguage.pl
index 86299daff2..2d2d416025 100644
--- a/tp/t/results/languages/simple_documentlanguage.pl
+++ b/tp/t/results/languages/simple_documentlanguage.pl
@@ -139,8 +139,11 @@ $result_trees{'simple_documentlanguage'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/languages/unknown_region.pl
b/tp/t/results/languages/unknown_region.pl
index 2579c9a669..6d624f1462 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -139,8 +139,11 @@ $result_trees{'unknown_region'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/latex_tests/brace_in_index.pl
b/tp/t/results/latex_tests/brace_in_index.pl
index e73a9ed1d5..5c0e8ad8fe 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -293,8 +293,11 @@ $result_trees{'brace_in_index'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [
diff --git a/tp/t/results/preformatted/def_in_example.pl
b/tp/t/results/preformatted/def_in_example.pl
index fa6f3e9354..e49712bd93 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -50,8 +50,11 @@ $result_trees{'def_in_example'} = {
'extra' => {
'def_role' => 'spaces'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'text' => ' ',
- 'type' => 'spaces_inserted'
+ 'type' => 'spaces'
},
{
'contents' => [