texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[no subject]


From: Patrice Dumas
Date: Tue, 7 May 2024 19:00:33 -0400 (EDT)

branch: master
commit d229d5232bdcd039426584ae57e2c91914b86598
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue May 7 23:54:19 2024 +0200

    * tp/Texinfo/Convert/Texinfo.pm (@ignored_types),
    tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
    tp/Texinfo/ParserNonXS.pm (_parse_def),
    tp/Texinfo/XS/main/convert_to_texinfo.c (expand_cmd_args_to_texi)
    (convert_to_texinfo_internal), tp/Texinfo/XS/main/element_types.txt,
    tp/Texinfo/XS/parsetexi/def.c (parse_def): rename bracketed_inserted
    as def_category_inserted or untranslated_def_category_inserted if
    the category should be translated.
---
 ChangeLog                                          | 11 ++++
 tp/TODO                                            |  3 +-
 tp/Texinfo/Convert/Texinfo.pm                      |  5 +-
 tp/Texinfo/Convert/TexinfoMarkup.pm                |  6 +-
 tp/Texinfo/ParserNonXS.pm                          |  3 +-
 tp/Texinfo/XS/main/convert_to_texinfo.c            |  6 +-
 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                      |  3 +-
 tp/t/results/converters_tests/complex_nestings.pl  |  8 +--
 .../converters_tests/definition_commands.pl        | 68 +++++++++++-----------
 .../converters_tests/test_deftypefnnewline.pl      |  4 +-
 tp/t/results/def/all_commands.pl                   | 24 ++++----
 tp/t/results/def/all_commands_delimiters.pl        |  2 +-
 .../def/all_commands_delimiters_printindex.pl      |  2 +-
 tp/t/results/def/all_commands_printindex.pl        | 24 ++++----
 tp/t/results/def/def_defx_mismatch.pl              |  2 +-
 tp/t/results/def/empty_deftype.pl                  |  8 +--
 tp/t/results/def/not_closed.pl                     |  2 +-
 tp/t/results/def/omit_def_space.pl                 |  4 +-
 .../deftypefnnewline_for_copying_after.pl          |  4 +-
 .../deftypefnnewline_for_copying_before.pl         |  4 +-
 tp/t/results/indices/empty_string_index_entry.pl   |  4 +-
 .../indices/printindex_index_entry_in_copying.pl   |  4 +-
 ...ndex_index_entry_in_copying_no_insertcopying.pl |  4 +-
 .../indices/same_index_entry_merged_indices.pl     |  2 +-
 .../invalid_nestings/def_in_style_command.pl       |  2 +-
 tp/t/results/languages/documentlanguage.pl         |  2 +-
 tp/t/results/languages/documentlanguage_option.pl  |  2 +-
 tp/t/results/languages/documentlanguage_unknown.pl |  2 +-
 .../results/languages/multiple_documentlanguage.pl |  6 +-
 tp/t/results/languages/multiple_in_preamble.pl     |  6 +-
 .../languages/multiple_in_preamble_before_node.pl  |  4 +-
 tp/t/results/languages/multiple_lang_chapters.pl   |  6 +-
 .../languages/multiple_lang_chapters_latex.pl      |  6 +-
 .../languages/multiple_lang_chapters_texi2html.pl  |  6 +-
 tp/t/results/languages/simple_documentlanguage.pl  |  2 +-
 tp/t/results/languages/unknown_region.pl           |  2 +-
 tp/t/results/latex_tests/brace_in_index.pl         |  2 +-
 tp/t/results/preformatted/def_in_example.pl        |  2 +-
 41 files changed, 144 insertions(+), 122 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 20c98f491d..b7512780d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2024-05-07  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/Texinfo.pm (@ignored_types),
+       tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
+       tp/Texinfo/ParserNonXS.pm (_parse_def),
+       tp/Texinfo/XS/main/convert_to_texinfo.c (expand_cmd_args_to_texi)
+       (convert_to_texinfo_internal), tp/Texinfo/XS/main/element_types.txt,
+       tp/Texinfo/XS/parsetexi/def.c (parse_def): rename bracketed_inserted
+       as def_category_inserted or untranslated_def_category_inserted if
+       the category should be translated.
+
 2024-05-07  Patrice Dumas  <pertusus@free.fr>
 
        * doc/texi2any_api.texi (Setting the Context for Conversion):
diff --git a/tp/TODO b/tp/TODO
index 17d98724c5..d6f5d635b2 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -35,7 +35,8 @@ Missing documentation
 Tree documentation in ParserNonXS.pm
 ------------------------------------
 
-elided_rawpreformatted, elided_brace_command_arg types.
+elided_rawpreformatted, elided_brace_command_arg, def_category_inserted,
+untranslated_def_category_inserted types.
 
 'comment_at_end' in info hash
 
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index c7c9bb7ee9..716f9627ac 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -77,8 +77,9 @@ 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 = ('spaces_inserted', 'bracketed_inserted',
-'command_as_argument_inserted');
+my @ignored_types = ('command_as_argument_inserted',
+                     'spaces_inserted', 'def_category_inserted',
+                     'untranslated_def_category_inserted');
 my %ignored_types;
 for my $a (@ignored_types) {
   $ignored_types{$a} = 1;
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm 
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index f41b2a3f3a..3437521921 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -1541,8 +1541,10 @@ sub _convert($$;$)
               $format_element = $type;
             }
             if ($arg->{'type'}
-                and ($arg->{'type'} eq 'bracketed_arg'
-                  or ($arg->{'type'} eq 'bracketed_inserted'))) {
+                and
+                ($arg->{'type'} eq 'bracketed_arg'
+                 or ($arg->{'type'} eq 'def_category_inserted')
+                 or ($arg->{'type'} eq 'untranslated_def_category_inserted'))) 
{
               push @$attribute, ['bracketed', 'on'];
               push @$attribute, _leading_trailing_spaces_arg($arg);
             }
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 0893b74745..8510db9a4d 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3292,12 +3292,13 @@ sub _parse_def($$$$)
       ($translation_context, $category) = @$category_translation_context;
     }
 
-    my $bracketed = { 'type' => 'bracketed_inserted',
+    my $bracketed = { 'type' => 'def_category_inserted',
                       'parent' => $current };
     my $content = { 'text' => $category, 'parent' => $bracketed };
     # 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'})) {
+      $bracketed->{'type'} = 'untranslated_def_category_inserted';
       $content->{'type'} = 'untranslated';
       $content->{'extra'} = {'documentlanguage' => 
$self->{'documentlanguage'}};
       if (defined($translation_context)) {
diff --git a/tp/Texinfo/XS/main/convert_to_texinfo.c 
b/tp/Texinfo/XS/main/convert_to_texinfo.c
index 2ca05cb732..97d81e24e3 100644
--- a/tp/Texinfo/XS/main/convert_to_texinfo.c
+++ b/tp/Texinfo/XS/main/convert_to_texinfo.c
@@ -99,7 +99,8 @@ expand_cmd_args_to_texi (const ELEMENT *e, TEXT *result)
         {
           ELEMENT *arg = e->args.list[i];
           if (arg->type == ET_spaces_inserted
-              || arg->type == ET_bracketed_inserted
+              || arg->type == ET_def_category_inserted
+              || arg->type == ET_untranslated_def_category_inserted
               || arg->type == ET_command_as_argument_inserted)
             continue;
 
@@ -134,7 +135,8 @@ convert_to_texinfo_internal (const ELEMENT *e, TEXT *result)
   ELEMENT *elt;
 
   if (e->type == ET_spaces_inserted
-      || e->type == ET_bracketed_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/element_types.c 
b/tp/Texinfo/XS/main/element_types.c
index eeddd181e8..51b822e0cd 100644
--- a/tp/Texinfo/XS/main/element_types.c
+++ b/tp/Texinfo/XS/main/element_types.c
@@ -63,7 +63,8 @@ char *element_type_names[] = {
 "bracketed_arg",
 "bracketed_linemacro_arg",
 "def_aggregate",
-"bracketed_inserted",
+"def_category_inserted",
+"untranslated_def_category_inserted",
 "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 34d664c4fa..8b822fd8fb 100644
--- a/tp/Texinfo/XS/main/element_types.h
+++ b/tp/Texinfo/XS/main/element_types.h
@@ -66,7 +66,8 @@ ET_balanced_braces,
 ET_bracketed_arg,
 ET_bracketed_linemacro_arg,
 ET_def_aggregate,
-ET_bracketed_inserted,
+ET_def_category_inserted,
+ET_untranslated_def_category_inserted,
 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 4805e3edde..22c9544344 100644
--- a/tp/Texinfo/XS/main/element_types.txt
+++ b/tp/Texinfo/XS/main/element_types.txt
@@ -86,7 +86,8 @@ balanced_braces
 bracketed_arg
 bracketed_linemacro_arg
 def_aggregate
-bracketed_inserted
+def_category_inserted
+untranslated_def_category_inserted
 
 # for unexpanded parts of conditionals
 elided_rawpreformatted
diff --git a/tp/Texinfo/XS/parsetexi/def.c b/tp/Texinfo/XS/parsetexi/def.c
index bc4336fa13..d1d29d3f61 100644
--- a/tp/Texinfo/XS/parsetexi/def.c
+++ b/tp/Texinfo/XS/parsetexi/def.c
@@ -363,13 +363,14 @@ 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_bracketed_inserted);
+      e = new_element (ET_def_category_inserted);
       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;
           e1->type = ET_untranslated;
           add_extra_string_dup (e1, "documentlanguage",
                                 global_documentlanguage);
diff --git a/tp/t/results/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index 09e06dd0b6..70b0c601e7 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -170,7 +170,7 @@ $result_trees{'complex_nestings'} = {
                           'extra' => {
                             'def_role' => 'category'
                           },
-                          'type' => 'bracketed_inserted'
+                          'type' => 'def_category_inserted'
                         },
                         {
                           'extra' => {
@@ -291,7 +291,7 @@ $result_trees{'complex_nestings'} = {
                           'extra' => {
                             'def_role' => 'category'
                           },
-                          'type' => 'bracketed_inserted'
+                          'type' => 'def_category_inserted'
                         },
                         {
                           'extra' => {
@@ -510,7 +510,7 @@ $result_trees{'complex_nestings'} = {
                                           'extra' => {
                                             'def_role' => 'category'
                                           },
-                                          'type' => 'bracketed_inserted'
+                                          'type' => 'def_category_inserted'
                                         },
                                         {
                                           'extra' => {
@@ -599,7 +599,7 @@ $result_trees{'complex_nestings'} = {
                                           'extra' => {
                                             'def_role' => 'category'
                                           },
-                                          'type' => 'bracketed_inserted'
+                                          'type' => 'def_category_inserted'
                                         },
                                         {
                                           'extra' => {
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index 8f13c5e745..090e5dd82a 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -752,7 +752,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -912,7 +912,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -1107,7 +1107,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -1302,7 +1302,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -1497,7 +1497,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -1692,7 +1692,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -1887,7 +1887,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -2121,7 +2121,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -2355,7 +2355,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -2589,7 +2589,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -2823,7 +2823,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -3057,7 +3057,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -3291,7 +3291,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -3525,7 +3525,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -3759,7 +3759,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -4055,7 +4055,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -4134,7 +4134,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -4232,7 +4232,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -4330,7 +4330,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -4428,7 +4428,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -4526,7 +4526,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -4624,7 +4624,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -4735,7 +4735,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -4846,7 +4846,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -4957,7 +4957,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -5068,7 +5068,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -5179,7 +5179,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -5290,7 +5290,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -5401,7 +5401,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -5512,7 +5512,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -6514,7 +6514,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -7428,7 +7428,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -9085,7 +9085,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -9293,7 +9293,7 @@ $result_trees{'definition_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/converters_tests/test_deftypefnnewline.pl 
b/tp/t/results/converters_tests/test_deftypefnnewline.pl
index 416374e0d5..64af0a7904 100644
--- a/tp/t/results/converters_tests/test_deftypefnnewline.pl
+++ b/tp/t/results/converters_tests/test_deftypefnnewline.pl
@@ -221,7 +221,7 @@ $result_trees{'test_deftypefnnewline'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -1350,7 +1350,7 @@ $result_trees{'test_deftypefnnewline'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/all_commands.pl b/tp/t/results/def/all_commands.pl
index 1a64477e2d..56bb883b48 100644
--- a/tp/t/results/def/all_commands.pl
+++ b/tp/t/results/def/all_commands.pl
@@ -2168,7 +2168,7 @@ $result_trees{'all_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -2295,7 +2295,7 @@ $result_trees{'all_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -2422,7 +2422,7 @@ $result_trees{'all_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -2549,7 +2549,7 @@ $result_trees{'all_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -2663,7 +2663,7 @@ $result_trees{'all_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -2803,7 +2803,7 @@ $result_trees{'all_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -2917,7 +2917,7 @@ $result_trees{'all_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -3057,7 +3057,7 @@ $result_trees{'all_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -3184,7 +3184,7 @@ $result_trees{'all_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -3348,7 +3348,7 @@ $result_trees{'all_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -3525,7 +3525,7 @@ $result_trees{'all_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -3702,7 +3702,7 @@ $result_trees{'all_commands'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/all_commands_delimiters.pl 
b/tp/t/results/def/all_commands_delimiters.pl
index 31293aa5e3..90b9ac895e 100644
--- a/tp/t/results/def/all_commands_delimiters.pl
+++ b/tp/t/results/def/all_commands_delimiters.pl
@@ -7209,7 +7209,7 @@ $result_trees{'all_commands_delimiters'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index 87af4b26a1..0832bf1f20 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -7291,7 +7291,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/all_commands_printindex.pl 
b/tp/t/results/def/all_commands_printindex.pl
index 47b2e86a31..e16aeae0b2 100644
--- a/tp/t/results/def/all_commands_printindex.pl
+++ b/tp/t/results/def/all_commands_printindex.pl
@@ -2239,7 +2239,7 @@ $result_trees{'all_commands_printindex'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -2367,7 +2367,7 @@ $result_trees{'all_commands_printindex'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -2495,7 +2495,7 @@ $result_trees{'all_commands_printindex'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -2623,7 +2623,7 @@ $result_trees{'all_commands_printindex'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -2738,7 +2738,7 @@ $result_trees{'all_commands_printindex'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -2879,7 +2879,7 @@ $result_trees{'all_commands_printindex'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -2994,7 +2994,7 @@ $result_trees{'all_commands_printindex'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -3135,7 +3135,7 @@ $result_trees{'all_commands_printindex'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -3263,7 +3263,7 @@ $result_trees{'all_commands_printindex'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -3428,7 +3428,7 @@ $result_trees{'all_commands_printindex'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -3606,7 +3606,7 @@ $result_trees{'all_commands_printindex'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -3784,7 +3784,7 @@ $result_trees{'all_commands_printindex'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/def_defx_mismatch.pl 
b/tp/t/results/def/def_defx_mismatch.pl
index f261df59ac..406e6b3573 100644
--- a/tp/t/results/def/def_defx_mismatch.pl
+++ b/tp/t/results/def/def_defx_mismatch.pl
@@ -25,7 +25,7 @@ $result_trees{'def_defx_mismatch'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/empty_deftype.pl 
b/tp/t/results/def/empty_deftype.pl
index ac73428075..7d4c72eac3 100644
--- a/tp/t/results/def/empty_deftype.pl
+++ b/tp/t/results/def/empty_deftype.pl
@@ -25,7 +25,7 @@ $result_trees{'empty_deftype'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -208,7 +208,7 @@ $result_trees{'empty_deftype'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -375,7 +375,7 @@ $result_trees{'empty_deftype'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -608,7 +608,7 @@ $result_trees{'empty_deftype'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/not_closed.pl b/tp/t/results/def/not_closed.pl
index 883669f219..51ebbe5bd3 100644
--- a/tp/t/results/def/not_closed.pl
+++ b/tp/t/results/def/not_closed.pl
@@ -156,7 +156,7 @@ $result_trees{'not_closed'} = {
                               'extra' => {
                                 'def_role' => 'category'
                               },
-                              'type' => 'bracketed_inserted'
+                              'type' => 'def_category_inserted'
                             },
                             {
                               'extra' => {
diff --git a/tp/t/results/def/omit_def_space.pl 
b/tp/t/results/def/omit_def_space.pl
index 525c7ca975..99147f7ee0 100644
--- a/tp/t/results/def/omit_def_space.pl
+++ b/tp/t/results/def/omit_def_space.pl
@@ -110,7 +110,7 @@ $result_trees{'omit_def_space'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -211,7 +211,7 @@ $result_trees{'omit_def_space'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       '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 b2571011e5..9255b38bbc 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_after.pl
@@ -39,7 +39,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                           'extra' => {
                             'def_role' => 'category'
                           },
-                          'type' => 'bracketed_inserted'
+                          'type' => 'def_category_inserted'
                         },
                         {
                           'extra' => {
@@ -414,7 +414,7 @@ $result_trees{'deftypefnnewline_for_copying_after'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       '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 5777182a1c..ecf6cae6bd 100644
--- a/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
+++ b/tp/t/results/html_tests/deftypefnnewline_for_copying_before.pl
@@ -81,7 +81,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                           'extra' => {
                             'def_role' => 'category'
                           },
-                          'type' => 'bracketed_inserted'
+                          'type' => 'def_category_inserted'
                         },
                         {
                           'extra' => {
@@ -381,7 +381,7 @@ $result_trees{'deftypefnnewline_for_copying_before'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index ecd8bc84ea..e96f77c97e 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -258,7 +258,7 @@ $result_trees{'empty_string_index_entry'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -359,7 +359,7 @@ $result_trees{'empty_string_index_entry'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       '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 cd774752e7..879d589ae4 100644
--- a/tp/t/results/indices/printindex_index_entry_in_copying.pl
+++ b/tp/t/results/indices/printindex_index_entry_in_copying.pl
@@ -87,7 +87,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                               'extra' => {
                                 'def_role' => 'category'
                               },
-                              'type' => 'bracketed_inserted'
+                              'type' => 'def_category_inserted'
                             },
                             {
                               'extra' => {
@@ -153,7 +153,7 @@ $result_trees{'printindex_index_entry_in_copying'} = {
                               'extra' => {
                                 'def_role' => 'category'
                               },
-                              'type' => 'bracketed_inserted'
+                              'type' => 'def_category_inserted'
                             },
                             {
                               '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 44ec1f409d..f0e335b482 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
@@ -87,7 +87,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                               'extra' => {
                                 'def_role' => 'category'
                               },
-                              'type' => 'bracketed_inserted'
+                              'type' => 'def_category_inserted'
                             },
                             {
                               'extra' => {
@@ -153,7 +153,7 @@ 
$result_trees{'printindex_index_entry_in_copying_no_insertcopying'} = {
                               'extra' => {
                                 'def_role' => 'category'
                               },
-                              'type' => 'bracketed_inserted'
+                              'type' => 'def_category_inserted'
                             },
                             {
                               '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 4f54f40a61..ae67989e51 100644
--- a/tp/t/results/indices/same_index_entry_merged_indices.pl
+++ b/tp/t/results/indices/same_index_entry_merged_indices.pl
@@ -333,7 +333,7 @@ $result_trees{'same_index_entry_merged_indices'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       '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 bf36e1e8de..f7c4b70888 100644
--- a/tp/t/results/invalid_nestings/def_in_style_command.pl
+++ b/tp/t/results/invalid_nestings/def_in_style_command.pl
@@ -47,7 +47,7 @@ $result_trees{'def_in_style_command'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/languages/documentlanguage.pl 
b/tp/t/results/languages/documentlanguage.pl
index 71fa0aaf44..f824bad53b 100644
--- a/tp/t/results/languages/documentlanguage.pl
+++ b/tp/t/results/languages/documentlanguage.pl
@@ -438,7 +438,7 @@ $result_trees{'documentlanguage'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'untranslated_def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/languages/documentlanguage_option.pl 
b/tp/t/results/languages/documentlanguage_option.pl
index 385660c725..423c99c5fd 100644
--- a/tp/t/results/languages/documentlanguage_option.pl
+++ b/tp/t/results/languages/documentlanguage_option.pl
@@ -438,7 +438,7 @@ $result_trees{'documentlanguage_option'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'untranslated_def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/languages/documentlanguage_unknown.pl 
b/tp/t/results/languages/documentlanguage_unknown.pl
index 608d8d0198..5508cba638 100644
--- a/tp/t/results/languages/documentlanguage_unknown.pl
+++ b/tp/t/results/languages/documentlanguage_unknown.pl
@@ -438,7 +438,7 @@ $result_trees{'documentlanguage_unknown'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'untranslated_def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/languages/multiple_documentlanguage.pl 
b/tp/t/results/languages/multiple_documentlanguage.pl
index 78421b5db8..23758c7f06 100644
--- a/tp/t/results/languages/multiple_documentlanguage.pl
+++ b/tp/t/results/languages/multiple_documentlanguage.pl
@@ -81,7 +81,7 @@ $result_trees{'multiple_documentlanguage'} = {
                               'extra' => {
                                 'def_role' => 'category'
                               },
-                              'type' => 'bracketed_inserted'
+                              'type' => 'untranslated_def_category_inserted'
                             },
                             {
                               'extra' => {
@@ -439,7 +439,7 @@ $result_trees{'multiple_documentlanguage'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'untranslated_def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -723,7 +723,7 @@ $result_trees{'multiple_documentlanguage'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'untranslated_def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/languages/multiple_in_preamble.pl 
b/tp/t/results/languages/multiple_in_preamble.pl
index 5c90bb9fa7..6323a94f7f 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -81,7 +81,7 @@ $result_trees{'multiple_in_preamble'} = {
                               'extra' => {
                                 'def_role' => 'category'
                               },
-                              'type' => 'bracketed_inserted'
+                              'type' => 'untranslated_def_category_inserted'
                             },
                             {
                               'extra' => {
@@ -473,7 +473,7 @@ $result_trees{'multiple_in_preamble'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'untranslated_def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -703,7 +703,7 @@ $result_trees{'multiple_in_preamble'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'untranslated_def_category_inserted'
                     },
                     {
                       '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 eddced67ec..6da9ef434b 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -81,7 +81,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                               'extra' => {
                                 'def_role' => 'category'
                               },
-                              'type' => 'bracketed_inserted'
+                              'type' => 'untranslated_def_category_inserted'
                             },
                             {
                               'extra' => {
@@ -522,7 +522,7 @@ $result_trees{'multiple_in_preamble_before_node'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'untranslated_def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/languages/multiple_lang_chapters.pl 
b/tp/t/results/languages/multiple_lang_chapters.pl
index 812248a7b0..c990a3f688 100644
--- a/tp/t/results/languages/multiple_lang_chapters.pl
+++ b/tp/t/results/languages/multiple_lang_chapters.pl
@@ -719,7 +719,7 @@ $result_trees{'multiple_lang_chapters'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'untranslated_def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -1023,7 +1023,7 @@ $result_trees{'multiple_lang_chapters'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'untranslated_def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -1291,7 +1291,7 @@ $result_trees{'multiple_lang_chapters'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'untranslated_def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/languages/multiple_lang_chapters_latex.pl 
b/tp/t/results/languages/multiple_lang_chapters_latex.pl
index 99033fb0d8..e614837a42 100644
--- a/tp/t/results/languages/multiple_lang_chapters_latex.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_latex.pl
@@ -719,7 +719,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'untranslated_def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -1023,7 +1023,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'untranslated_def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -1291,7 +1291,7 @@ $result_trees{'multiple_lang_chapters_latex'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'untranslated_def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl 
b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
index 33f3577565..9506b4aa06 100644
--- a/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
+++ b/tp/t/results/languages/multiple_lang_chapters_texi2html.pl
@@ -688,7 +688,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'untranslated_def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -992,7 +992,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'untranslated_def_category_inserted'
                     },
                     {
                       'extra' => {
@@ -1260,7 +1260,7 @@ $result_trees{'multiple_lang_chapters_texi2html'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'untranslated_def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/languages/simple_documentlanguage.pl 
b/tp/t/results/languages/simple_documentlanguage.pl
index b95f316665..132d6d5783 100644
--- a/tp/t/results/languages/simple_documentlanguage.pl
+++ b/tp/t/results/languages/simple_documentlanguage.pl
@@ -128,7 +128,7 @@ $result_trees{'simple_documentlanguage'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'untranslated_def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/languages/unknown_region.pl 
b/tp/t/results/languages/unknown_region.pl
index 7f0f895695..fe103a507e 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -128,7 +128,7 @@ $result_trees{'unknown_region'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'untranslated_def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/latex_tests/brace_in_index.pl 
b/tp/t/results/latex_tests/brace_in_index.pl
index f3a69c0d05..9761c13c57 100644
--- a/tp/t/results/latex_tests/brace_in_index.pl
+++ b/tp/t/results/latex_tests/brace_in_index.pl
@@ -282,7 +282,7 @@ $result_trees{'brace_in_index'} = {
                       'extra' => {
                         'def_role' => 'category'
                       },
-                      'type' => 'bracketed_inserted'
+                      'type' => 'def_category_inserted'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/preformatted/def_in_example.pl 
b/tp/t/results/preformatted/def_in_example.pl
index 68aff8e80a..2571e6f8f0 100644
--- a/tp/t/results/preformatted/def_in_example.pl
+++ b/tp/t/results/preformatted/def_in_example.pl
@@ -39,7 +39,7 @@ $result_trees{'def_in_example'} = {
                           'extra' => {
                             'def_role' => 'category'
                           },
-                          'type' => 'bracketed_inserted'
+                          'type' => 'def_category_inserted'
                         },
                         {
                           'extra' => {



reply via email to

[Prev in Thread] Current Thread [Next in Thread]