[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 5887348bdbe972cbe94616528106d9be65cb53cc
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu May 9 19:08:36 2024 +0200
* tp/Texinfo/Convert/HTML.pm
(_convert_untranslated_def_category_type, _convert),
tp/Texinfo/Convert/LaTeX.pm (_convert),
tp/Texinfo/Convert/Plaintext.pm (_convert),
tp/Texinfo/Convert/Texinfo.pm (@ignored_types)
(_expand_cmd_args_to_texi), tp/Texinfo/Convert/TexinfoMarkup.pm
(_convert), tp/Texinfo/Convert/Text.pm (_convert),
tp/Texinfo/ParserNonXS.pm (_parse_def),
tp/Texinfo/XS/convert/convert_html.c
(convert_untranslated_def_category_type)
(types_internal_conversion_table, convert_to_html_internal),
tp/Texinfo/XS/main/convert_to_texinfo.c (expand_cmd_args_to_texi)
(convert_to_texinfo_internal), tp/Texinfo/XS/main/convert_to_text.c
(convert_to_text_internal), tp/Texinfo/XS/main/element_types.c
(convert_to_text_internal), tp/Texinfo/XS/main/element_types.txt,
tp/Texinfo/XS/parsetexi/def.c (parse_def): rename
def_category_inserted as def_category and
untranslated_def_category_inserted as untranslated_def_category
and add the inserted information as an info integer.
---
ChangeLog | 22 +++
tp/Texinfo/Convert/HTML.pm | 8 +-
tp/Texinfo/Convert/LaTeX.pm | 2 +-
tp/Texinfo/Convert/Plaintext.pm | 2 +-
tp/Texinfo/Convert/Texinfo.pm | 7 +-
tp/Texinfo/Convert/TexinfoMarkup.pm | 5 +-
tp/Texinfo/Convert/Text.pm | 2 +-
tp/Texinfo/ParserNonXS.pm | 7 +-
tp/Texinfo/XS/convert/convert_html.c | 8 +-
tp/Texinfo/XS/main/convert_to_texinfo.c | 4 -
tp/Texinfo/XS/main/convert_to_text.c | 2 +-
tp/Texinfo/XS/main/element_types.c | 4 +-
tp/Texinfo/XS/main/element_types.h | 4 +-
tp/Texinfo/XS/main/element_types.txt | 4 +-
tp/Texinfo/XS/parsetexi/def.c | 5 +-
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 +-
46 files changed, 493 insertions(+), 143 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f47d110fd4..c937f440d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2024-05-09 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/HTML.pm
+ (_convert_untranslated_def_category_type, _convert),
+ tp/Texinfo/Convert/LaTeX.pm (_convert),
+ tp/Texinfo/Convert/Plaintext.pm (_convert),
+ tp/Texinfo/Convert/Texinfo.pm (@ignored_types)
+ (_expand_cmd_args_to_texi), tp/Texinfo/Convert/TexinfoMarkup.pm
+ (_convert), tp/Texinfo/Convert/Text.pm (_convert),
+ tp/Texinfo/ParserNonXS.pm (_parse_def),
+ tp/Texinfo/XS/convert/convert_html.c
+ (convert_untranslated_def_category_type)
+ (types_internal_conversion_table, convert_to_html_internal),
+ tp/Texinfo/XS/main/convert_to_texinfo.c (expand_cmd_args_to_texi)
+ (convert_to_texinfo_internal), tp/Texinfo/XS/main/convert_to_text.c
+ (convert_to_text_internal), tp/Texinfo/XS/main/element_types.c
+ (convert_to_text_internal), tp/Texinfo/XS/main/element_types.txt,
+ tp/Texinfo/XS/parsetexi/def.c (parse_def): rename
+ def_category_inserted as def_category and
+ untranslated_def_category_inserted as untranslated_def_category
+ and add the inserted information as an info integer.
+
2024-05-09 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/XS/main/extra.c (add_info_integer)
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index ae6bf711b9..0633b63f8b 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -7379,7 +7379,7 @@ sub _simplify_text_for_comparison($)
return $text;
}
-sub _convert_untranslated_def_category_inserted_type($$$$) {
+sub _convert_untranslated_def_category_type($$$$) {
my $self = shift;
my $type = shift;
my $element = shift;
@@ -7399,8 +7399,8 @@ sub
_convert_untranslated_def_category_inserted_type($$$$) {
return $result;
}
-$default_types_conversion{'untranslated_def_category_inserted'}
- = \&_convert_untranslated_def_category_inserted_type;
+$default_types_conversion{'untranslated_def_category'}
+ = \&_convert_untranslated_def_category_type;
sub _convert_row_type($$$$) {
@@ -13713,7 +13713,7 @@ sub _convert($$;$)
"DEFINFOENCLOSE_ARG");
}
} elsif ($element->{'contents'}
- and $type_name ne 'untranslated_def_category_inserted') {
+ and $type_name ne 'untranslated_def_category') {
my $content_idx = 0;
foreach my $content (@{$element->{'contents'}}) {
$content_formatted
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index c1129d1a48..4817551434 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -4294,7 +4294,7 @@ sub _convert($$)
$result .= _open_preformatted($self, $element);
} elsif ($element->{'type'} eq '_dot_not_end_sentence') {
$self->{'formatting_context'}->[-1]->{'dot_not_end_sentence'} += 1;
- } elsif ($element->{'type'} eq 'untranslated_def_category_inserted') {
+ } elsif ($element->{'type'} eq 'untranslated_def_category') {
my $tree;
if ($element->{'extra'}
and $element->{'extra'}->{'translation_context'}) {
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 0e15452585..16769e0798 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -4039,7 +4039,7 @@ sub _convert($$)
_open_code($formatter);
} elsif ($type eq '_stop_upper_case') {
push @{$formatter->{'upper_case_stack'}}, {};
- } elsif ($type eq 'untranslated_def_category_inserted') {
+ } elsif ($type eq 'untranslated_def_category') {
my $tree;
if ($element->{'extra'}
and $element->{'extra'}->{'translation_context'}) {
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index fad15f6da2..382822a62b 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -77,9 +77,7 @@ 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',
- 'def_category_inserted',
- 'untranslated_def_category_inserted');
+my @ignored_types = ('command_as_argument_inserted');
my %ignored_types;
for my $a (@ignored_types) {
$ignored_types{$a} = 1;
@@ -290,7 +288,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'}};
+ next if (($arg->{'type'} and $ignored_types{$arg->{'type'}})
+ or ($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 3437521921..b4775be8f3 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -1543,8 +1543,9 @@ sub _convert($$;$)
if ($arg->{'type'}
and
($arg->{'type'} eq 'bracketed_arg'
- or ($arg->{'type'} eq 'def_category_inserted')
- or ($arg->{'type'} eq 'untranslated_def_category_inserted')))
{
+ # FIXME remove def_category and untranslated_def_category?
+ or ($arg->{'type'} eq 'def_category')
+ or ($arg->{'type'} eq 'untranslated_def_category'))) {
push @$attribute, ['bracketed', 'on'];
push @$attribute, _leading_trailing_spaces_arg($arg);
}
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index bd30a0c544..3a345d23f1 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -698,7 +698,7 @@ sub _convert($$)
$result = _convert($options, $converted_element);
$options->{'_code_state'}--;
}
- } elsif ($element->{'type'} eq 'untranslated_def_category_inserted') {
+ } elsif ($element->{'type'} eq 'untranslated_def_category') {
my $tree;
my $category_text = $element->{'contents'}->[0]->{'text'};
my $translation_context;
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 860f1e9746..882cff3cb3 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3302,13 +3302,14 @@ sub _parse_def($$$$)
($translation_context, $category) = @$category_translation_context;
}
- my $inserted_category = { 'type' => 'def_category_inserted',
- 'parent' => $current };
+ my $inserted_category = { 'type' => 'def_category',
+ 'info' => {'inserted' => 1},
+ 'parent' => $current };
my $content = { 'text' => $category, 'parent' => $inserted_category };
# the category string is an english string (such as Function). If
# documentlanguage is set it needs to be translated during the conversion.
if (defined($self->{'documentlanguage'})) {
- $inserted_category->{'type'} = 'untranslated_def_category_inserted';
+ $inserted_category->{'type'} = 'untranslated_def_category';
$content->{'type'} = 'untranslated';
$inserted_category->{'extra'}
= {'documentlanguage' => $self->{'documentlanguage'}};
diff --git a/tp/Texinfo/XS/convert/convert_html.c
b/tp/Texinfo/XS/convert/convert_html.c
index 0f3746b2fa..a249cde05f 100644
--- a/tp/Texinfo/XS/convert/convert_html.c
+++ b/tp/Texinfo/XS/convert/convert_html.c
@@ -14172,7 +14172,7 @@ convert_definfoenclose_type (CONVERTER *self, const
enum element_type type,
}
void
-convert_untranslated_def_category_inserted_type
+convert_untranslated_def_category_type
(CONVERTER *self, const enum element_type type,
const ELEMENT *element, const char *content,
TEXT *result)
@@ -15239,8 +15239,8 @@ static const TYPE_INTERNAL_CONVERSION
types_internal_conversion_table[] = {
{ET_row, &convert_row_type},
{ET_table_term, &convert_table_term_type},
{ET_text, &convert_text},
- {ET_untranslated_def_category_inserted,
- &convert_untranslated_def_category_inserted_type},
+ {ET_untranslated_def_category,
+ &convert_untranslated_def_category_type},
{0, 0},
};
@@ -18417,7 +18417,7 @@ convert_to_html_internal (CONVERTER *self, const
ELEMENT *element,
}
}
else if (element->contents.number > 0
- && type != ET_untranslated_def_category_inserted)
+ && type != ET_untranslated_def_category)
{
int content_idx;
text_append (&content_formatted, "");
diff --git a/tp/Texinfo/XS/main/convert_to_texinfo.c
b/tp/Texinfo/XS/main/convert_to_texinfo.c
index 8703b1d5e1..055a15b137 100644
--- a/tp/Texinfo/XS/main/convert_to_texinfo.c
+++ b/tp/Texinfo/XS/main/convert_to_texinfo.c
@@ -101,8 +101,6 @@ expand_cmd_args_to_texi (const ELEMENT *e, TEXT *result)
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)
continue;
@@ -139,8 +137,6 @@ convert_to_texinfo_internal (const ELEMENT *e, TEXT *result)
int inserted = lookup_info_integer (e, "inserted", &status);
if (inserted
- || e->type == ET_def_category_inserted
- || e->type == ET_untranslated_def_category_inserted
|| e->type == ET_command_as_argument_inserted)
{}
else if (e->text.end > 0)
diff --git a/tp/Texinfo/XS/main/convert_to_text.c
b/tp/Texinfo/XS/main/convert_to_text.c
index 9a485ed44c..6beb1f8a6f 100644
--- a/tp/Texinfo/XS/main/convert_to_text.c
+++ b/tp/Texinfo/XS/main/convert_to_text.c
@@ -976,7 +976,7 @@ convert_to_text_internal (const ELEMENT *element,
TEXT_OPTIONS *text_options,
}
destroy_parsed_def (parsed_def);
}
- else if (element->type == ET_untranslated_def_category_inserted)
+ else if (element->type == ET_untranslated_def_category)
{
ELEMENT *tree = 0;
const char *category_text = element->contents.list[0]->text.text;
diff --git a/tp/Texinfo/XS/main/element_types.c
b/tp/Texinfo/XS/main/element_types.c
index 81da654d00..e59025e50f 100644
--- a/tp/Texinfo/XS/main/element_types.c
+++ b/tp/Texinfo/XS/main/element_types.c
@@ -62,8 +62,8 @@ char *element_type_names[] = {
"bracketed_arg",
"bracketed_linemacro_arg",
"def_aggregate",
-"def_category_inserted",
-"untranslated_def_category_inserted",
+"def_category",
+"untranslated_def_category",
"elided_rawpreformatted",
"elided_brace_command_arg",
"delimiter",
diff --git a/tp/Texinfo/XS/main/element_types.h
b/tp/Texinfo/XS/main/element_types.h
index 09a0373217..e86af29baa 100644
--- a/tp/Texinfo/XS/main/element_types.h
+++ b/tp/Texinfo/XS/main/element_types.h
@@ -65,8 +65,8 @@ ET_balanced_braces,
ET_bracketed_arg,
ET_bracketed_linemacro_arg,
ET_def_aggregate,
-ET_def_category_inserted,
-ET_untranslated_def_category_inserted,
+ET_def_category,
+ET_untranslated_def_category,
ET_elided_rawpreformatted,
ET_elided_brace_command_arg,
ET_delimiter,
diff --git a/tp/Texinfo/XS/main/element_types.txt
b/tp/Texinfo/XS/main/element_types.txt
index d4549731a3..1b4c8dff38 100644
--- a/tp/Texinfo/XS/main/element_types.txt
+++ b/tp/Texinfo/XS/main/element_types.txt
@@ -85,8 +85,8 @@ balanced_braces
bracketed_arg
bracketed_linemacro_arg
def_aggregate
-def_category_inserted
-untranslated_def_category_inserted
+def_category
+untranslated_def_category
# for unexpanded parts of conditionals
elided_rawpreformatted
diff --git a/tp/Texinfo/XS/parsetexi/def.c b/tp/Texinfo/XS/parsetexi/def.c
index 0231f83c5a..d44acf9219 100644
--- a/tp/Texinfo/XS/parsetexi/def.c
+++ b/tp/Texinfo/XS/parsetexi/def.c
@@ -389,14 +389,15 @@ parse_def (enum command_id command, ELEMENT *current)
command = def_aliases[i].command;
/* Used when category text has a space in it. */
- e = new_element (ET_def_category_inserted);
+ e = new_element (ET_def_category);
+ add_info_integer (e, "inserted", 1);
insert_into_contents (current, e, contents_idx);
e1 = new_element (ET_NONE);
text_append_n (&e1->text, category, strlen (category));
add_to_element_contents (e, e1);
if (global_documentlanguage && *global_documentlanguage)
{
- e->type = ET_untranslated_def_category_inserted;
+ e->type = ET_untranslated_def_category;
e1->type = ET_untranslated;
add_extra_string_dup (e, "documentlanguage",
global_documentlanguage);
diff --git a/tp/t/results/converters_tests/complex_nestings.pl
b/tp/t/results/converters_tests/complex_nestings.pl
index de0ad468bf..4adf7a42d1 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -169,7 +169,10 @@ $result_trees{'complex_nestings'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -313,7 +316,10 @@ $result_trees{'complex_nestings'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -570,7 +576,10 @@ $result_trees{'complex_nestings'} = {
'text' => 'Variable'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -672,7 +681,10 @@ $result_trees{'complex_nestings'} = {
'text' => 'Variable'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
diff --git a/tp/t/results/converters_tests/definition_commands.pl
b/tp/t/results/converters_tests/definition_commands.pl
index 799f374f9b..87a7f7c030 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -811,7 +811,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -1009,7 +1012,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -1257,7 +1263,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -1505,7 +1514,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -1753,7 +1765,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -2001,7 +2016,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -2249,7 +2267,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -2536,7 +2557,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -2823,7 +2847,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -3110,7 +3137,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -3397,7 +3427,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -3684,7 +3717,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -3971,7 +4007,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -4258,7 +4297,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -4545,7 +4587,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -4894,7 +4939,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -4996,7 +5044,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -5117,7 +5168,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -5238,7 +5292,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -5359,7 +5416,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -5480,7 +5540,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -5601,7 +5664,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -5735,7 +5801,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -5869,7 +5938,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -6003,7 +6075,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -6137,7 +6212,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -6271,7 +6349,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -6405,7 +6486,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -6539,7 +6623,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -6673,7 +6760,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -7738,7 +7828,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -8785,7 +8878,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -10625,7 +10721,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -10861,7 +10960,10 @@ $result_trees{'definition_commands'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index f1417cfe7a..f64c7892ef 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -220,7 +220,10 @@ $result_trees{'test_deftypefnnewline'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -1567,7 +1570,10 @@ $result_trees{'test_deftypefnnewline'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
diff --git a/tp/t/results/def/all_commands.pl b/tp/t/results/def/all_commands.pl
index efdd722864..96938749dc 100644
--- a/tp/t/results/def/all_commands.pl
+++ b/tp/t/results/def/all_commands.pl
@@ -2547,7 +2547,10 @@ $result_trees{'all_commands'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -2692,7 +2695,10 @@ $result_trees{'all_commands'} = {
'text' => 'Macro'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -2837,7 +2843,10 @@ $result_trees{'all_commands'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -2982,7 +2991,10 @@ $result_trees{'all_commands'} = {
'text' => 'Variable'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -3109,7 +3121,10 @@ $result_trees{'all_commands'} = {
'text' => 'Variable'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -3272,7 +3287,10 @@ $result_trees{'all_commands'} = {
'text' => 'User Option'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -3399,7 +3417,10 @@ $result_trees{'all_commands'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -3562,7 +3583,10 @@ $result_trees{'all_commands'} = {
'text' => 'Variable'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -3707,7 +3731,10 @@ $result_trees{'all_commands'} = {
'text' => 'Instance Variable'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -3909,7 +3936,10 @@ $result_trees{'all_commands'} = {
'text' => 'Instance Variable'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -4129,7 +4159,10 @@ $result_trees{'all_commands'} = {
'text' => 'Method'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -4349,7 +4382,10 @@ $result_trees{'all_commands'} = {
'text' => 'Method'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
diff --git a/tp/t/results/def/all_commands_delimiters.pl
b/tp/t/results/def/all_commands_delimiters.pl
index ed45546b27..b5e0b66a3e 100644
--- a/tp/t/results/def/all_commands_delimiters.pl
+++ b/tp/t/results/def/all_commands_delimiters.pl
@@ -8468,7 +8468,10 @@ $result_trees{'all_commands_delimiters'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index b194b67e75..44d65a877a 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -8550,7 +8550,10 @@ $result_trees{'all_commands_delimiters_printindex'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
diff --git a/tp/t/results/def/all_commands_printindex.pl
b/tp/t/results/def/all_commands_printindex.pl
index ea2aa39a92..9048adf90a 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -2618,7 +2618,10 @@ $result_trees{'all_commands_printindex'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -2764,7 +2767,10 @@ $result_trees{'all_commands_printindex'} = {
'text' => 'Macro'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -2910,7 +2916,10 @@ $result_trees{'all_commands_printindex'} = {
'text' => 'Special Form'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -3056,7 +3065,10 @@ $result_trees{'all_commands_printindex'} = {
'text' => 'Variable'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -3184,7 +3196,10 @@ $result_trees{'all_commands_printindex'} = {
'text' => 'Variable'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -3348,7 +3363,10 @@ $result_trees{'all_commands_printindex'} = {
'text' => 'User Option'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -3476,7 +3494,10 @@ $result_trees{'all_commands_printindex'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -3640,7 +3661,10 @@ $result_trees{'all_commands_printindex'} = {
'text' => 'Variable'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -3786,7 +3810,10 @@ $result_trees{'all_commands_printindex'} = {
'text' => 'Instance Variable'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -3989,7 +4016,10 @@ $result_trees{'all_commands_printindex'} = {
'text' => 'Instance Variable'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -4210,7 +4240,10 @@ $result_trees{'all_commands_printindex'} = {
'text' => 'Method'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -4431,7 +4464,10 @@ $result_trees{'all_commands_printindex'} = {
'text' => 'Method'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
diff --git a/tp/t/results/def/def_defx_mismatch.pl
b/tp/t/results/def/def_defx_mismatch.pl
index abdace1179..e8b3888b37 100644
--- a/tp/t/results/def/def_defx_mismatch.pl
+++ b/tp/t/results/def/def_defx_mismatch.pl
@@ -24,7 +24,10 @@ $result_trees{'def_defx_mismatch'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
diff --git a/tp/t/results/def/empty_deftype.pl
b/tp/t/results/def/empty_deftype.pl
index 9506cc72e2..ee5504c0ac 100644
--- a/tp/t/results/def/empty_deftype.pl
+++ b/tp/t/results/def/empty_deftype.pl
@@ -24,7 +24,10 @@ $result_trees{'empty_deftype'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -235,7 +238,10 @@ $result_trees{'empty_deftype'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -430,7 +436,10 @@ $result_trees{'empty_deftype'} = {
'text' => 'Method'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -716,7 +725,10 @@ $result_trees{'empty_deftype'} = {
'text' => 'Method'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
diff --git a/tp/t/results/def/not_closed.pl b/tp/t/results/def/not_closed.pl
index 5d3c0be839..a28021c0b2 100644
--- a/tp/t/results/def/not_closed.pl
+++ b/tp/t/results/def/not_closed.pl
@@ -185,7 +185,10 @@ $result_trees{'not_closed'} = {
'text' => 'Variable'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
diff --git a/tp/t/results/def/omit_def_space.pl
b/tp/t/results/def/omit_def_space.pl
index 92e72dc056..ad0b229c59 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -109,7 +109,10 @@ $result_trees{'omit_def_space'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -233,7 +236,10 @@ $result_trees{'omit_def_space'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
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 65a106579f..cae6477e7b 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -38,7 +38,10 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -436,7 +439,10 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
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 49cc5015a1..69f69b4034 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -80,7 +80,10 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -403,7 +406,10 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
diff --git a/tp/t/results/indices/empty_string_index_entry.pl
b/tp/t/results/indices/empty_string_index_entry.pl
index 66f29f1425..a105ccb871 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -257,7 +257,10 @@ $result_trees{'empty_string_index_entry'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -366,7 +369,10 @@ $result_trees{'empty_string_index_entry'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
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 bff982bd3f..a7d8ccdaff 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -86,7 +86,10 @@ $result_trees{'printindex_index_entry_in_copying'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -170,7 +173,10 @@ $result_trees{'printindex_index_entry_in_copying'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
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 08d089d5a7..d1a76cc4db 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
@@ -86,7 +86,10 @@
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
@@ -170,7 +173,10 @@
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
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 9f88ed143b..070592b683 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -347,7 +347,10 @@ $result_trees{'same_index_entry_merged_indices'} = {
'text' => 'Variable'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
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 96fbc1e8d8..13cfc91025 100644
--- a/tp/t/results/invalid_nestings/def_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/def_in_style_command.pl
@@ -46,7 +46,10 @@ $result_trees{'def_in_style_command'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
diff --git a/tp/t/results/languages/documentlanguage.pl
b/tp/t/results/languages/documentlanguage.pl
index 2f5288bcca..2a12c1e531 100644
--- a/tp/t/results/languages/documentlanguage.pl
+++ b/tp/t/results/languages/documentlanguage.pl
@@ -437,7 +437,10 @@ $result_trees{'documentlanguage'} = {
'documentlanguage' => 'pt',
'translation_context' => 'category of methods with
data type in object-oriented programming for @deftypemethod'
},
- 'type' => 'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
diff --git a/tp/t/results/languages/documentlanguage_option.pl
b/tp/t/results/languages/documentlanguage_option.pl
index 000f667814..8da6aeca27 100644
--- a/tp/t/results/languages/documentlanguage_option.pl
+++ b/tp/t/results/languages/documentlanguage_option.pl
@@ -437,7 +437,10 @@ $result_trees{'documentlanguage_option'} = {
'documentlanguage' => 'fr',
'translation_context' => 'category of methods with
data type in object-oriented programming for @deftypemethod'
},
- 'type' => 'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
diff --git a/tp/t/results/languages/documentlanguage_unknown.pl
b/tp/t/results/languages/documentlanguage_unknown.pl
index bbaaa9fd30..97ee40e01e 100644
--- a/tp/t/results/languages/documentlanguage_unknown.pl
+++ b/tp/t/results/languages/documentlanguage_unknown.pl
@@ -437,7 +437,10 @@ $result_trees{'documentlanguage_unknown'} = {
'documentlanguage' => 'unknown',
'translation_context' => 'category of methods with
data type in object-oriented programming for @deftypemethod'
},
- 'type' => 'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
diff --git a/tp/t/results/languages/multiple_documentlanguage.pl
b/tp/t/results/languages/multiple_documentlanguage.pl
index ff25a4f78a..1a8625859f 100644
--- a/tp/t/results/languages/multiple_documentlanguage.pl
+++ b/tp/t/results/languages/multiple_documentlanguage.pl
@@ -80,7 +80,10 @@ $result_trees{'multiple_documentlanguage'} = {
'documentlanguage' => 'fr',
'translation_context' => 'category of
instance variables in object-oriented programming for @defivar'
},
- 'type' =>
'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
@@ -481,7 +484,10 @@ $result_trees{'multiple_documentlanguage'} = {
'documentlanguage' => 'fr',
'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
@@ -808,7 +814,10 @@ $result_trees{'multiple_documentlanguage'} = {
'documentlanguage' => 'hr',
'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
diff --git a/tp/t/results/languages/multiple_in_preamble.pl
b/tp/t/results/languages/multiple_in_preamble.pl
index 3dd2e59306..d3bff51fc3 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -80,7 +80,10 @@ $result_trees{'multiple_in_preamble'} = {
'documentlanguage' => 'fr',
'translation_context' => 'category of
instance variables in object-oriented programming for @defivar'
},
- 'type' =>
'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
@@ -515,7 +518,10 @@ $result_trees{'multiple_in_preamble'} = {
'documentlanguage' => 'hr',
'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
@@ -788,7 +794,10 @@ $result_trees{'multiple_in_preamble'} = {
'documentlanguage' => 'de',
'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
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 a2d65b1d24..00eb45f400 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -80,7 +80,10 @@ $result_trees{'multiple_in_preamble_before_node'} = {
'documentlanguage' => 'fr',
'translation_context' => 'category of
instance variables in object-oriented programming for @defivar'
},
- 'type' =>
'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
@@ -564,7 +567,10 @@ $result_trees{'multiple_in_preamble_before_node'} = {
'documentlanguage' => 'de',
'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl
b/tp/t/results/languages/multiple_lang_chapters.pl
index 3ebb423abd..c0d3a7c3a6 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -718,7 +718,10 @@ $result_trees{'multiple_lang_chapters'} = {
'documentlanguage' => 'ja',
'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
@@ -1065,7 +1068,10 @@ $result_trees{'multiple_lang_chapters'} = {
'documentlanguage' => 'en',
'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
@@ -1376,7 +1382,10 @@ $result_trees{'multiple_lang_chapters'} = {
'documentlanguage' => 'fr_FR',
'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index 601f04afb7..b58a60a382 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -718,7 +718,10 @@ $result_trees{'multiple_lang_chapters_latex'} = {
'documentlanguage' => 'ja',
'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
@@ -1065,7 +1068,10 @@ $result_trees{'multiple_lang_chapters_latex'} = {
'documentlanguage' => 'en',
'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
@@ -1376,7 +1382,10 @@ $result_trees{'multiple_lang_chapters_latex'} = {
'documentlanguage' => 'fr_FR',
'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index b6f2aa08a9..665bc98730 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -687,7 +687,10 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
'documentlanguage' => 'ja',
'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
@@ -1034,7 +1037,10 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
'documentlanguage' => 'en',
'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
@@ -1345,7 +1351,10 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
'documentlanguage' => 'fr_FR',
'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
diff --git a/tp/t/results/languages/simple_documentlanguage.pl
b/tp/t/results/languages/simple_documentlanguage.pl
index 2d2d416025..02db6b8c86 100644
--- a/tp/t/results/languages/simple_documentlanguage.pl
+++ b/tp/t/results/languages/simple_documentlanguage.pl
@@ -127,7 +127,10 @@ $result_trees{'simple_documentlanguage'} = {
'documentlanguage' => 'fr',
'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
diff --git a/tp/t/results/languages/unknown_region.pl
b/tp/t/results/languages/unknown_region.pl
index 6d624f1462..07b674d0da 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -127,7 +127,10 @@ $result_trees{'unknown_region'} = {
'documentlanguage' => 'fr_NOWHERE',
'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'untranslated_def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_category'
}
],
'extra' => {
diff --git a/tp/t/results/latex_tests/brace_in_index.pl
b/tp/t/results/latex_tests/brace_in_index.pl
index 5c0e8ad8fe..5e93f4af0d 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -281,7 +281,10 @@ $result_trees{'brace_in_index'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {
diff --git a/tp/t/results/preformatted/def_in_example.pl
b/tp/t/results/preformatted/def_in_example.pl
index e49712bd93..f8e9dce9e4 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -38,7 +38,10 @@ $result_trees{'def_in_example'} = {
'text' => 'Function'
}
],
- 'type' => 'def_category_inserted'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'def_category'
}
],
'extra' => {