|
| From: | Patrice Dumas |
| Date: | Thu, 9 May 2024 17:18:27 -0400 (EDT) |
branch: master
commit 6b5a9a503725bb4b190c022898555806f3968019
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu May 9 23:18:18 2024 +0200
* tp/Texinfo/Convert/HTML.pm
(_convert_untranslated_def_line_arg_type, _convert),
tp/Texinfo/Convert/LaTeX.pm (_convert),
tp/Texinfo/Convert/Plaintext.pm (_convert),
tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
tp/Texinfo/Convert/Text.pm (_convert), tp/Texinfo/ParserNonXS.pm
(_next_bracketed_or_word_agg, _parse_def),
tp/Texinfo/XS/convert/convert_html.c
(convert_untranslated_def_line_arg_type, convert_to_html_internal),
tp/Texinfo/XS/main/convert_to_text.c (convert_to_text_internal),
tp/Texinfo/XS/main/element_types.txt, tp/Texinfo/XS/parsetexi/def.c
(next_bracketed_or_word_agg, parse_def): use def_line_arg for
def_category and untranslated_def_line_arg instead of
untranslated_def_category and put them directly on def line, to get
the same tree as for other def line arguments.
---
ChangeLog | 18 +
tp/Texinfo/Common.pm | 2 +-
tp/Texinfo/Convert/HTML.pm | 8 +-
tp/Texinfo/Convert/LaTeX.pm | 2 +-
tp/Texinfo/Convert/Plaintext.pm | 2 +-
tp/Texinfo/Convert/TexinfoMarkup.pm | 7 +-
tp/Texinfo/Convert/Text.pm | 2 +-
tp/Texinfo/ParserNonXS.pm | 28 +-
tp/Texinfo/XS/convert/convert_html.c | 8 +-
tp/Texinfo/XS/main/convert_to_text.c | 2 +-
tp/Texinfo/XS/main/element_types.c | 3 +-
tp/Texinfo/XS/main/element_types.h | 3 +-
tp/Texinfo/XS/main/element_types.txt | 3 +-
tp/Texinfo/XS/parsetexi/def.c | 17 +-
tp/t/results/converters_tests/complex_nestings.pl | 52 +--
.../converters_tests/definition_commands.pl | 442 +++++++--------------
.../converters_tests/test_deftypefnnewline.pl | 26 +-
tp/t/results/def/all_commands.pl | 156 +++-----
tp/t/results/def/all_commands_delimiters.pl | 13 +-
.../def/all_commands_delimiters_printindex.pl | 13 +-
tp/t/results/def/all_commands_printindex.pl | 156 +++-----
tp/t/results/def/def_defx_mismatch.pl | 13 +-
tp/t/results/def/empty_deftype.pl | 52 +--
tp/t/results/def/not_closed.pl | 13 +-
tp/t/results/def/omit_def_space.pl | 26 +-
.../deftypefnnewline_for_copying_after.pl | 26 +-
.../deftypefnnewline_for_copying_before.pl | 26 +-
tp/t/results/indices/empty_string_index_entry.pl | 26 +-
.../indices/printindex_index_entry_in_copying.pl | 26 +-
...ndex_index_entry_in_copying_no_insertcopying.pl | 26 +-
.../indices/same_index_entry_merged_indices.pl | 13 +-
.../invalid_nestings/def_in_style_command.pl | 13 +-
tp/t/results/languages/documentlanguage.pl | 25 +-
tp/t/results/languages/documentlanguage_option.pl | 25 +-
tp/t/results/languages/documentlanguage_unknown.pl | 25 +-
.../results/languages/multiple_documentlanguage.pl | 75 ++--
tp/t/results/languages/multiple_in_preamble.pl | 75 ++--
.../languages/multiple_in_preamble_before_node.pl | 50 +--
tp/t/results/languages/multiple_lang_chapters.pl | 75 ++--
.../languages/multiple_lang_chapters_latex.pl | 75 ++--
.../languages/multiple_lang_chapters_texi2html.pl | 75 ++--
tp/t/results/languages/simple_documentlanguage.pl | 25 +-
tp/t/results/languages/unknown_region.pl | 25 +-
tp/t/results/latex_tests/brace_in_index.pl | 13 +-
tp/t/results/preformatted/def_in_example.pl | 13 +-
45 files changed, 615 insertions(+), 1184 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4f6c7c47a7..b956765425 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2024-05-09 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Texinfo/Convert/HTML.pm
+ (_convert_untranslated_def_line_arg_type, _convert),
+ tp/Texinfo/Convert/LaTeX.pm (_convert),
+ tp/Texinfo/Convert/Plaintext.pm (_convert),
+ tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
+ tp/Texinfo/Convert/Text.pm (_convert), tp/Texinfo/ParserNonXS.pm
+ (_next_bracketed_or_word_agg, _parse_def),
+ tp/Texinfo/XS/convert/convert_html.c
+ (convert_untranslated_def_line_arg_type, convert_to_html_internal),
+ tp/Texinfo/XS/main/convert_to_text.c (convert_to_text_internal),
+ tp/Texinfo/XS/main/element_types.txt, tp/Texinfo/XS/parsetexi/def.c
+ (next_bracketed_or_word_agg, parse_def): use def_line_arg for
+ def_category and untranslated_def_line_arg instead of
+ untranslated_def_category and put them directly on def line, to get
+ the same tree as for other def line arguments.
+
2024-05-09 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/ParserNonXS.pm (_split_delimiters)
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index fe9e52b69f..1c58406462 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -420,7 +420,7 @@ our %def_map = (
'deftp', [ 'category', 'name', 'argtype' ],
# shortcuts
# The strings are marked to be translated in the parsers in type
- # 'untranslated_def_category_inserted'.
+ # 'untranslated_def_line_arg'.
'defun', {'deffn' => pgdt_context(
'category of functions for @defun',
'Function')},
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 0633b63f8b..4c2fbd92d0 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_type($$$$) {
+sub _convert_untranslated_def_line_arg_type($$$$) {
my $self = shift;
my $type = shift;
my $element = shift;
@@ -7399,8 +7399,8 @@ sub _convert_untranslated_def_category_type($$$$) {
return $result;
}
-$default_types_conversion{'untranslated_def_category'}
- = \&_convert_untranslated_def_category_type;
+$default_types_conversion{'untranslated_def_line_arg'}
+ = \&_convert_untranslated_def_line_arg_type;
sub _convert_row_type($$$$) {
@@ -13713,7 +13713,7 @@ sub _convert($$;$)
"DEFINFOENCLOSE_ARG");
}
} elsif ($element->{'contents'}
- and $type_name ne 'untranslated_def_category') {
+ and $type_name ne 'untranslated_def_line_arg') {
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 2fb0be8f89..37ec0e6be3 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -4291,7 +4291,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') {
+ } elsif ($element->{'type'} eq 'untranslated_def_line_arg') {
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 16769e0798..5b9821729d 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') {
+ } elsif ($type eq 'untranslated_def_line_arg') {
my $tree;
if ($element->{'extra'}
and $element->{'extra'}->{'translation_context'}) {
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 0f16ff2fb8..6cba2272c8 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -1539,12 +1539,7 @@ sub _convert($$;$)
} else {
$format_element = $type;
}
- if ($arg->{'type'}
- and
- ($arg->{'type'} eq 'bracketed_arg'
- # FIXME remove def_category and untranslated_def_category?
- or ($arg->{'type'} eq 'def_category')
- or ($arg->{'type'} eq 'untranslated_def_category'))) {
+ if ($arg->{'type'} and $arg->{'type'} eq 'bracketed_arg') {
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 3a345d23f1..c032abd679 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') {
+ } elsif ($element->{'type'} eq 'untranslated_def_line_arg') {
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 1c658a03ea..b2294f9426 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3256,7 +3256,9 @@ sub _next_bracketed_or_word_agg($$)
if ($num == 1) {
my $element = $current->{'contents'}->[$$index_ref -1];
- if ($element->{'type'} and $element->{'type'} eq 'bracketed_arg') {
+ if ($element->{'type'} and ($element->{'type'} eq 'bracketed_arg'
+ or $element->{'type'} eq 'def_line_arg'
+ or $element->{'type'} eq 'untranslated_def_line_arg')) {
# there is only one bracketed element
return $element;
}
@@ -3288,6 +3290,8 @@ sub _parse_def($$$$)
my $arg_type;
my $arg_types_nr;
+ my $inserted_category = 0;
+
# could have used def_aliases, but use code more similar with the XS parser
if ($def_alias_commands{$command}) {
my $real_command = $def_aliases{$command};
@@ -3302,25 +3306,25 @@ sub _parse_def($$$$)
($translation_context, $category) = @$category_translation_context;
}
- my $inserted_category = { 'type' => 'def_category',
- 'info' => {'inserted' => 1},
- 'parent' => $current };
- my $content = { 'text' => $category, 'parent' => $inserted_category };
+ $inserted_category = 1;
+ my $def_line_arg = {'type' => 'def_line_arg',
+ 'parent' => $current};
+ my $content = { 'text' => $category, 'parent' => $def_line_arg };
# 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';
+ $def_line_arg->{'type'} = 'untranslated_def_line_arg';
$content->{'type'} = 'untranslated';
- $inserted_category->{'extra'}
+ $def_line_arg->{'extra'}
= {'documentlanguage' => $self->{'documentlanguage'}};
if (defined($translation_context)) {
- $inserted_category->{'extra'}->{'translation_context'}
+ $def_line_arg->{'extra'}->{'translation_context'}
= $translation_context;
}
}
- @{$inserted_category->{'contents'}} = ($content);
+ @{$def_line_arg->{'contents'}} = ($content);
- unshift @contents, $inserted_category,
+ unshift @contents, $def_line_arg,
{ 'text' => ' ', 'type' => 'spaces',
'info' => {'inserted' => 1},
'parent' => $current,
@@ -3329,6 +3333,7 @@ sub _parse_def($$$$)
$command = $def_aliases{$command};
}
+
@args = @{$def_map{$command}};
$arg_type = pop @args if ($args[-1] eq 'arg' or $args[-1] eq 'argtype');
# If $arg_type is not set (for @def* commands that are not documented
@@ -3355,6 +3360,9 @@ sub _parse_def($$$$)
last;
}
}
+ if ($inserted_category) {
+ $current->{'contents'}->[0]->{'info'} = {'inserted' => 1};
+ }
foreach my $type (keys(%result)) {
my $element = $result{$type};
diff --git a/tp/Texinfo/XS/convert/convert_html.c
b/tp/Texinfo/XS/convert/convert_html.c
index a249cde05f..e1421c0821 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_type
+convert_untranslated_def_line_arg_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,
- &convert_untranslated_def_category_type},
+ {ET_untranslated_def_line_arg,
+ &convert_untranslated_def_line_arg_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)
+ && type != ET_untranslated_def_line_arg)
{
int content_idx;
text_append (&content_formatted, "");
diff --git a/tp/Texinfo/XS/main/convert_to_text.c
b/tp/Texinfo/XS/main/convert_to_text.c
index 6beb1f8a6f..3b2ccc1a06 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)
+ else if (element->type == ET_untranslated_def_line_arg)
{
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 63a2943fe6..4e96cbd2a2 100644
--- a/tp/Texinfo/XS/main/element_types.c
+++ b/tp/Texinfo/XS/main/element_types.c
@@ -61,8 +61,7 @@ char *element_type_names[] = {
"bracketed_arg",
"bracketed_linemacro_arg",
"def_line_arg",
-"def_category",
-"untranslated_def_category",
+"untranslated_def_line_arg",
"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 f4116932fd..b50ab80be2 100644
--- a/tp/Texinfo/XS/main/element_types.h
+++ b/tp/Texinfo/XS/main/element_types.h
@@ -64,8 +64,7 @@ ET_balanced_braces,
ET_bracketed_arg,
ET_bracketed_linemacro_arg,
ET_def_line_arg,
-ET_def_category,
-ET_untranslated_def_category,
+ET_untranslated_def_line_arg,
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 4d36bd00f8..7ac542d7de 100644
--- a/tp/Texinfo/XS/main/element_types.txt
+++ b/tp/Texinfo/XS/main/element_types.txt
@@ -84,8 +84,7 @@ balanced_braces
bracketed_arg
bracketed_linemacro_arg
def_line_arg
-def_category
-untranslated_def_category
+untranslated_def_line_arg
# for unexpanded parts of conditionals
elided_rawpreformatted
diff --git a/tp/Texinfo/XS/parsetexi/def.c b/tp/Texinfo/XS/parsetexi/def.c
index 9364977394..a572020ed2 100644
--- a/tp/Texinfo/XS/parsetexi/def.c
+++ b/tp/Texinfo/XS/parsetexi/def.c
@@ -131,7 +131,9 @@ next_bracketed_or_word_agg (ELEMENT *current, int *i)
e = current->contents.list[*i - 1];
/* there is only one bracketed element */
- if (e->type == ET_bracketed_arg)
+ if (e->type == ET_bracketed_arg
+ || e->type == ET_def_line_arg
+ || e->type == ET_untranslated_def_line_arg)
return e;
}
@@ -367,6 +369,7 @@ parse_def (enum command_id command, ELEMENT *current)
ELEMENT *e, *e1;
DEF_ARG **result;
char **arguments_list;
+ int inserted_category = 0;
split_def_args (current, contents_idx);
@@ -388,16 +391,15 @@ parse_def (enum command_id command, ELEMENT *current)
category = def_aliases[i].category;
command = def_aliases[i].command;
- /* Used when category text has a space in it. */
- e = new_element (ET_def_category);
- add_info_integer (e, "inserted", 1);
+ inserted_category = 1;
+ e = new_element (ET_def_line_arg);
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;
+ e->type = ET_untranslated_def_line_arg;
e1->type = ET_untranslated;
add_extra_string_dup (e, "documentlanguage",
global_documentlanguage);
@@ -468,6 +470,11 @@ parse_def (enum command_id command, ELEMENT *current)
break;
}
+ if (inserted_category)
+ {
+ add_info_integer (current->contents.list[0], "inserted", 1);
+ }
+
/* Process args */
split_delimiters (current, contents_idx);
diff --git a/tp/t/results/converters_tests/complex_nestings.pl
b/tp/t/results/converters_tests/complex_nestings.pl
index b63f6184e8..51fc7ffca7 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -164,20 +164,15 @@ $result_trees{'complex_nestings'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -311,20 +306,15 @@ $result_trees{'complex_nestings'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -571,20 +561,15 @@ $result_trees{'complex_nestings'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Variable'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Variable'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -676,20 +661,15 @@ $result_trees{'complex_nestings'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Variable'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Variable'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
diff --git a/tp/t/results/converters_tests/definition_commands.pl
b/tp/t/results/converters_tests/definition_commands.pl
index 72d08ec554..6b3de7eb44 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -806,20 +806,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -1007,20 +1002,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -1258,20 +1248,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -1509,20 +1494,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -1760,20 +1740,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -2011,20 +1986,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -2262,20 +2232,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -2552,20 +2517,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -2842,20 +2802,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -3132,20 +3087,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -3422,20 +3372,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -3712,20 +3657,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -4002,20 +3942,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -4292,20 +4227,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -4582,20 +4512,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -4934,20 +4859,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -5039,20 +4959,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -5163,20 +5078,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -5287,20 +5197,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -5411,20 +5316,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -5535,20 +5435,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -5659,20 +5554,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -5796,20 +5686,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -5933,20 +5818,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -6070,20 +5950,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -6207,20 +6082,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -6344,20 +6214,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -6481,20 +6346,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -6618,20 +6478,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -6755,20 +6610,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -7823,20 +7673,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -8873,20 +8718,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -10716,20 +10556,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -10955,20 +10790,15 @@ $result_trees{'definition_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 7f3c5d16c3..069f7e43e3 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -215,20 +215,15 @@ $result_trees{'test_deftypefnnewline'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -1565,20 +1560,15 @@ $result_trees{'test_deftypefnnewline'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
diff --git a/tp/t/results/def/all_commands.pl b/tp/t/results/def/all_commands.pl
index 078c484403..bfd3e62db1 100644
--- a/tp/t/results/def/all_commands.pl
+++ b/tp/t/results/def/all_commands.pl
@@ -2542,20 +2542,15 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -2690,20 +2685,15 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Macro'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Macro'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -2838,20 +2828,15 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -2986,20 +2971,15 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Variable'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Variable'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -3116,20 +3096,15 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Variable'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Variable'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -3282,20 +3257,15 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'User Option'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'User Option'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -3412,20 +3382,15 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -3578,20 +3543,15 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Variable'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Variable'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -3726,20 +3686,15 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Instance Variable'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -3931,20 +3886,15 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Instance Variable'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -4154,20 +4104,15 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Method'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Method'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -4377,20 +4322,15 @@ $result_trees{'all_commands'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Method'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Method'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
diff --git a/tp/t/results/def/all_commands_delimiters.pl
b/tp/t/results/def/all_commands_delimiters.pl
index f4a3411064..cd543b6a93 100644
--- a/tp/t/results/def/all_commands_delimiters.pl
+++ b/tp/t/results/def/all_commands_delimiters.pl
@@ -8463,20 +8463,15 @@ $result_trees{'all_commands_delimiters'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index b02c019705..892319e1c3 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -8545,20 +8545,15 @@ $result_trees{'all_commands_delimiters_printindex'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
diff --git a/tp/t/results/def/all_commands_printindex.pl
b/tp/t/results/def/all_commands_printindex.pl
index faf9357304..0d80f4a894 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -2613,20 +2613,15 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -2762,20 +2757,15 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Macro'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Macro'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -2911,20 +2901,15 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Special Form'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Special Form'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -3060,20 +3045,15 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Variable'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Variable'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -3191,20 +3171,15 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Variable'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Variable'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -3358,20 +3333,15 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'User Option'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'User Option'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -3489,20 +3459,15 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -3656,20 +3621,15 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Variable'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Variable'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -3805,20 +3765,15 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Instance Variable'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -4011,20 +3966,15 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Instance Variable'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -4235,20 +4185,15 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Method'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Method'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -4459,20 +4404,15 @@ $result_trees{'all_commands_printindex'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Method'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Method'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
diff --git a/tp/t/results/def/def_defx_mismatch.pl
b/tp/t/results/def/def_defx_mismatch.pl
index 60108393c4..5df10fc146 100644
--- a/tp/t/results/def/def_defx_mismatch.pl
+++ b/tp/t/results/def/def_defx_mismatch.pl
@@ -19,20 +19,15 @@ $result_trees{'def_defx_mismatch'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
diff --git a/tp/t/results/def/empty_deftype.pl
b/tp/t/results/def/empty_deftype.pl
index 1bbe71e38e..34fbcb1abb 100644
--- a/tp/t/results/def/empty_deftype.pl
+++ b/tp/t/results/def/empty_deftype.pl
@@ -19,20 +19,15 @@ $result_trees{'empty_deftype'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -233,20 +228,15 @@ $result_trees{'empty_deftype'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -431,20 +421,15 @@ $result_trees{'empty_deftype'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Method'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Method'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -720,20 +705,15 @@ $result_trees{'empty_deftype'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Method'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Method'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
diff --git a/tp/t/results/def/not_closed.pl b/tp/t/results/def/not_closed.pl
index 9137616625..f0b1d6176e 100644
--- a/tp/t/results/def/not_closed.pl
+++ b/tp/t/results/def/not_closed.pl
@@ -180,20 +180,15 @@ $result_trees{'not_closed'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Variable'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Variable'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
diff --git a/tp/t/results/def/omit_def_space.pl
b/tp/t/results/def/omit_def_space.pl
index d423c1cc90..99255f6543 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -104,20 +104,15 @@ $result_trees{'omit_def_space'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -231,20 +226,15 @@ $result_trees{'omit_def_space'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
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 e693ba4404..d01b911b19 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -33,20 +33,15 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -434,20 +429,15 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
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 4ca76163f6..69b4a08343 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -75,20 +75,15 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -401,20 +396,15 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
diff --git a/tp/t/results/indices/empty_string_index_entry.pl
b/tp/t/results/indices/empty_string_index_entry.pl
index ec93312d32..720c677f51 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -252,20 +252,15 @@ $result_trees{'empty_string_index_entry'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -364,20 +359,15 @@ $result_trees{'empty_string_index_entry'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
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 c168d87c9b..9edf708ba5 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -81,20 +81,15 @@ $result_trees{'printindex_index_entry_in_copying'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -168,20 +163,15 @@ $result_trees{'printindex_index_entry_in_copying'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
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 ffc9c5d4e8..d3058e4cf3 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
@@ -81,20 +81,15 @@
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
@@ -168,20 +163,15 @@
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
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 6db0dd8c36..1adc2afe5c 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -342,20 +342,15 @@ $result_trees{'same_index_entry_merged_indices'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Variable'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Variable'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
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 9c11e95d32..f401a81944 100644
--- a/tp/t/results/invalid_nestings/def_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/def_in_style_command.pl
@@ -41,20 +41,15 @@ $result_trees{'def_in_style_command'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
diff --git a/tp/t/results/languages/documentlanguage.pl
b/tp/t/results/languages/documentlanguage.pl
index 183ddb001d..250f5a7f95 100644
--- a/tp/t/results/languages/documentlanguage.pl
+++ b/tp/t/results/languages/documentlanguage.pl
@@ -427,26 +427,19 @@ $result_trees{'documentlanguage'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Method',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'pt',
- 'translation_context' => 'category of methods with
data type in object-oriented programming for @deftypemethod'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Method',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'pt',
+ 'translation_context' => 'category of methods with
data type in object-oriented programming for @deftypemethod'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
diff --git a/tp/t/results/languages/documentlanguage_option.pl
b/tp/t/results/languages/documentlanguage_option.pl
index 968196f07b..c30ab63652 100644
--- a/tp/t/results/languages/documentlanguage_option.pl
+++ b/tp/t/results/languages/documentlanguage_option.pl
@@ -427,26 +427,19 @@ $result_trees{'documentlanguage_option'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Method',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'fr',
- 'translation_context' => 'category of methods with
data type in object-oriented programming for @deftypemethod'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Method',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'fr',
+ 'translation_context' => 'category of methods with
data type in object-oriented programming for @deftypemethod'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
diff --git a/tp/t/results/languages/documentlanguage_unknown.pl
b/tp/t/results/languages/documentlanguage_unknown.pl
index 69a08eda92..f7dc96011f 100644
--- a/tp/t/results/languages/documentlanguage_unknown.pl
+++ b/tp/t/results/languages/documentlanguage_unknown.pl
@@ -427,26 +427,19 @@ $result_trees{'documentlanguage_unknown'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Method',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'unknown',
- 'translation_context' => 'category of methods with
data type in object-oriented programming for @deftypemethod'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Method',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'unknown',
+ 'translation_context' => 'category of methods with
data type in object-oriented programming for @deftypemethod'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
diff --git a/tp/t/results/languages/multiple_documentlanguage.pl
b/tp/t/results/languages/multiple_documentlanguage.pl
index 7571cade9d..433cd47c41 100644
--- a/tp/t/results/languages/multiple_documentlanguage.pl
+++ b/tp/t/results/languages/multiple_documentlanguage.pl
@@ -70,26 +70,19 @@ $result_trees{'multiple_documentlanguage'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'fr',
- 'translation_context' => 'category of
instance variables in object-oriented programming for @defivar'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'fr',
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
@@ -474,26 +467,19 @@ $result_trees{'multiple_documentlanguage'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'fr',
- 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'fr',
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
@@ -804,26 +790,19 @@ $result_trees{'multiple_documentlanguage'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'hr',
- 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'hr',
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
diff --git a/tp/t/results/languages/multiple_in_preamble.pl
b/tp/t/results/languages/multiple_in_preamble.pl
index d2057667c6..9b6d510497 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -70,26 +70,19 @@ $result_trees{'multiple_in_preamble'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'fr',
- 'translation_context' => 'category of
instance variables in object-oriented programming for @defivar'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'fr',
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
@@ -508,26 +501,19 @@ $result_trees{'multiple_in_preamble'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'hr',
- 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'hr',
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
@@ -784,26 +770,19 @@ $result_trees{'multiple_in_preamble'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'de',
- 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'de',
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'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 b5fdc28b19..524db5819f 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -70,26 +70,19 @@ $result_trees{'multiple_in_preamble_before_node'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'fr',
- 'translation_context' => 'category of
instance variables in object-oriented programming for @defivar'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'fr',
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
@@ -557,26 +550,19 @@ $result_trees{'multiple_in_preamble_before_node'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'de',
- 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'de',
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl
b/tp/t/results/languages/multiple_lang_chapters.pl
index 60469531b4..3d830be1be 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -708,26 +708,19 @@ $result_trees{'multiple_lang_chapters'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'ja',
- 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'ja',
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
@@ -1058,26 +1051,19 @@ $result_trees{'multiple_lang_chapters'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'en',
- 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'en',
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
@@ -1372,26 +1358,19 @@ $result_trees{'multiple_lang_chapters'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'fr_FR',
- 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'fr_FR',
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index ffaabb7db5..c8425adada 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -708,26 +708,19 @@ $result_trees{'multiple_lang_chapters_latex'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'ja',
- 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'ja',
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
@@ -1058,26 +1051,19 @@ $result_trees{'multiple_lang_chapters_latex'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'en',
- 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'en',
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
@@ -1372,26 +1358,19 @@ $result_trees{'multiple_lang_chapters_latex'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'fr_FR',
- 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'fr_FR',
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index aa34043739..b0188ea450 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -677,26 +677,19 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'ja',
- 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'ja',
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
@@ -1027,26 +1020,19 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'en',
- 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'en',
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
@@ -1341,26 +1327,19 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'fr_FR',
- 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'fr_FR',
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
diff --git a/tp/t/results/languages/simple_documentlanguage.pl
b/tp/t/results/languages/simple_documentlanguage.pl
index 54d133840a..b213fc947d 100644
--- a/tp/t/results/languages/simple_documentlanguage.pl
+++ b/tp/t/results/languages/simple_documentlanguage.pl
@@ -117,26 +117,19 @@ $result_trees{'simple_documentlanguage'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'fr',
- 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'fr',
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
diff --git a/tp/t/results/languages/unknown_region.pl
b/tp/t/results/languages/unknown_region.pl
index 0e1159f70d..f84d507f20 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -117,26 +117,19 @@ $result_trees{'unknown_region'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Instance Variable',
- 'type' => 'untranslated'
- }
- ],
- 'extra' => {
- 'documentlanguage' => 'fr_NOWHERE',
- 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
- },
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'untranslated_def_category'
+ 'text' => 'Instance Variable',
+ 'type' => 'untranslated'
}
],
'extra' => {
- 'def_role' => 'category'
+ 'def_role' => 'category',
+ 'documentlanguage' => 'fr_NOWHERE',
+ 'translation_context' => 'category of instance
variables in object-oriented programming for @defivar'
},
- 'type' => 'def_line_arg'
+ 'info' => {
+ 'inserted' => 1
+ },
+ 'type' => 'untranslated_def_line_arg'
},
{
'extra' => {
diff --git a/tp/t/results/latex_tests/brace_in_index.pl
b/tp/t/results/latex_tests/brace_in_index.pl
index d5d4401f1f..5b346e2b3a 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -276,20 +276,15 @@ $result_trees{'brace_in_index'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
diff --git a/tp/t/results/preformatted/def_in_example.pl
b/tp/t/results/preformatted/def_in_example.pl
index 4203202f46..233394b6ea 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -33,20 +33,15 @@ $result_trees{'def_in_example'} = {
{
'contents' => [
{
- 'contents' => [
- {
- 'text' => 'Function'
- }
- ],
- 'info' => {
- 'inserted' => 1
- },
- 'type' => 'def_category'
+ 'text' => 'Function'
}
],
'extra' => {
'def_role' => 'category'
},
+ 'info' => {
+ 'inserted' => 1
+ },
'type' => 'def_line_arg'
},
{
| [Prev in Thread] | Current Thread | [Next in Thread] |