texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/Convert/Texinfo.pm (convert_to_texin


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/Convert/Texinfo.pm (convert_to_texinfo), tp/Texinfo/Convert/TexinfoMarkup.pm (_convert), tp/Texinfo/ParserNonXS.pm (_split_def_args, _parse_def) (_end_line_def_line), tp/Texinfo/XS/parsetexi/convert.c (convert_to_texinfo_internal), tp/Texinfo/XS/parsetexi/def.c (next_bracketed_or_word_agg, split_delimiters), tp/Texinfo/XS/parsetexi/element_types.txt, tp/Texinfo/XS/parsetexi/end_line.c (end_line_def_line): rename bracketed_def_content as bracketed_arg.
Date: Fri, 10 Mar 2023 13:55:17 -0500

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 99941efbe3 * tp/Texinfo/Convert/Texinfo.pm (convert_to_texinfo), 
tp/Texinfo/Convert/TexinfoMarkup.pm (_convert), tp/Texinfo/ParserNonXS.pm 
(_split_def_args, _parse_def) (_end_line_def_line), 
tp/Texinfo/XS/parsetexi/convert.c (convert_to_texinfo_internal), 
tp/Texinfo/XS/parsetexi/def.c (next_bracketed_or_word_agg, split_delimiters), 
tp/Texinfo/XS/parsetexi/element_types.txt, tp/Texinfo/XS/parsetexi/end_line.c 
(end_line_def_line): rename bracketed_def_content as bracketed_arg.
99941efbe3 is described below

commit 99941efbe3fe8aed799727b04cb8f184aeed0556
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Mar 10 19:55:03 2023 +0100

    * tp/Texinfo/Convert/Texinfo.pm (convert_to_texinfo),
    tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
    tp/Texinfo/ParserNonXS.pm (_split_def_args, _parse_def)
    (_end_line_def_line), tp/Texinfo/XS/parsetexi/convert.c
    (convert_to_texinfo_internal), tp/Texinfo/XS/parsetexi/def.c
    (next_bracketed_or_word_agg, split_delimiters),
    tp/Texinfo/XS/parsetexi/element_types.txt,
    tp/Texinfo/XS/parsetexi/end_line.c (end_line_def_line): rename
    bracketed_def_content as bracketed_arg.
---
 ChangeLog                                          | 12 ++++
 tp/Texinfo/Convert/Texinfo.pm                      |  4 +-
 tp/Texinfo/Convert/TexinfoMarkup.pm                |  2 +-
 tp/Texinfo/ParserNonXS.pm                          | 12 ++--
 tp/Texinfo/XS/parsetexi/convert.c                  |  4 +-
 tp/Texinfo/XS/parsetexi/def.c                      |  6 +-
 tp/Texinfo/XS/parsetexi/element_types.c            |  2 +-
 tp/Texinfo/XS/parsetexi/element_types.h            |  2 +-
 tp/Texinfo/XS/parsetexi/element_types.txt          |  2 +-
 tp/Texinfo/XS/parsetexi/end_line.c                 |  4 +-
 tp/t/results/converters_tests/complex_nestings.pl  | 12 ++--
 .../converters_tests/definition_commands.pl        | 70 +++++++++---------
 tp/t/results/converters_tests/form_feeds.pl        | 20 +++---
 .../converters_tests/frenchspacing_and_code.pl     | 28 ++++----
 tp/t/results/coverage/def.pl                       | 32 ++++-----
 tp/t/results/def/all_commands_delimiters.pl        | 82 +++++++++++-----------
 .../def/all_commands_delimiters_printindex.pl      | 82 +++++++++++-----------
 tp/t/results/def/ampchar.pl                        |  2 +-
 tp/t/results/def/def_defx_mismatch.pl              |  6 +-
 tp/t/results/def/def_groupings_args.pl             |  2 +-
 tp/t/results/def/defx_after_comment.pl             |  2 +-
 tp/t/results/def/defx_after_comment_in_example.pl  |  2 +-
 tp/t/results/def/defx_after_empty_line.pl          |  2 +-
 .../def/defx_after_empty_line_in_example.pl        |  2 +-
 tp/t/results/def/defx_after_paragraph_end.pl       |  2 +-
 .../def/defx_after_preformatted_with_text.pl       |  2 +-
 tp/t/results/def/defx_after_text.pl                |  2 +-
 tp/t/results/def/defx_in_example.pl                |  2 +-
 tp/t/results/def/empty_def_arguments.pl            | 16 ++---
 tp/t/results/def/empty_deftype.pl                  |  4 +-
 tp/t/results/def/empty_deftypeop_name.pl           |  2 +-
 tp/t/results/def/end_of_lines_protected.pl         |  4 +-
 .../def/end_of_lines_protected_in_footnote.pl      |  4 +-
 .../def/end_of_lines_protected_non_ascii.pl        |  4 +-
 tp/t/results/def/inter_item_commands_in_def.pl     |  4 +-
 .../def/inter_item_commands_in_def_in_example.pl   |  4 +-
 tp/t/results/def/leading_space_in_def_arg.pl       |  2 +-
 tp/t/results/def/no_category_or_no_name.pl         |  2 +-
 tp/t/results/def/ref_in_def.pl                     |  4 +-
 tp/t/results/def/space_in_def_for_index.pl         | 10 +--
 tp/t/results/def/wrong_braces_simple.pl            |  8 +--
 tp/t/results/def/wrong_braces_with_end_of_lines.pl |  2 +-
 tp/t/results/indices/empty_index_entry.pl          |  4 +-
 tp/t/results/indices/empty_string_index_entry.pl   | 12 ++--
 tp/t/results/indices/index_special_region.pl       | 10 +--
 .../index_special_region_no_insertcopying.pl       | 10 +--
 ...egion_no_insertcopying_no_titlepage_no_nodes.pl | 10 +--
 ...l_region_no_insertcopying_titlepage_no_nodes.pl | 10 +--
 ...copying_titlepage_no_nodes_footnotes_default.pl | 10 +--
 .../index_special_region_no_titlepage_no_nodes.pl  | 10 +--
 .../index_special_region_titlepage_no_nodes.pl     | 10 +--
 ..._region_titlepage_no_nodes_footnotes_default.pl | 10 +--
 tp/t/results/info_tests/colon_in_index_entry.pl    |  8 +--
 .../results/invalid_nestings/block_not_matching.pl |  2 +-
 tp/t/results/invalid_nestings/on_def_line.pl       |  4 +-
 tp/t/results/xml_tests/commands_and_spaces.pl      | 10 +--
 56 files changed, 302 insertions(+), 290 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a3c2ff171c..66e6e6d61d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2023-03-10  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/Texinfo.pm (convert_to_texinfo),
+       tp/Texinfo/Convert/TexinfoMarkup.pm (_convert),
+       tp/Texinfo/ParserNonXS.pm (_split_def_args, _parse_def)
+       (_end_line_def_line), tp/Texinfo/XS/parsetexi/convert.c
+       (convert_to_texinfo_internal), tp/Texinfo/XS/parsetexi/def.c
+       (next_bracketed_or_word_agg, split_delimiters),
+       tp/Texinfo/XS/parsetexi/element_types.txt,
+       tp/Texinfo/XS/parsetexi/end_line.c (end_line_def_line): rename
+       bracketed_def_content as bracketed_arg.
+
 2023-03-10  Patrice Dumas  <pertusus@free.fr>
 
        No capitalization of @sc argument in node name normalization
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index 7effc3ccbc..a310d29dbf 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -131,7 +131,7 @@ sub convert_to_texinfo($)
     }
     if ($element->{'type'}
         and ($element->{'type'} eq 'bracketed'
-             or $element->{'type'} eq 'bracketed_def_content')) {
+             or $element->{'type'} eq 'bracketed_arg')) {
       $result .= '{';
       if ($element->{'info'}
           and $element->{'info'}->{'spaces_before_argument'}) {
@@ -151,7 +151,7 @@ sub convert_to_texinfo($)
     }
     $result .= '}' if ($element->{'type'}
                        and ($element->{'type'} eq 'bracketed'
-                            or $element->{'type'} eq 'bracketed_def_content'));
+                            or $element->{'type'} eq 'bracketed_arg'));
   }
   return $result;
 }
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm 
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 9656cab057..520201541e 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -1525,7 +1525,7 @@ sub _convert($$;$)
               $format_element = $type;
             }
             if ($arg->{'type'}
-                and ($arg->{'type'} eq 'bracketed_def_content'
+                and ($arg->{'type'} eq 'bracketed_arg'
                   or ($arg->{'type'} eq 'bracketed_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 740780aa0d..b3a52e771d 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -2952,7 +2952,7 @@ sub _split_def_args
     return @elements;
   } elsif ($root->{'type'} and $root->{'type'} eq 'bracketed') {
     _isolate_last_space($self, $root);
-    $root->{'type'} = 'bracketed_def_content';
+    $root->{'type'} = 'bracketed_arg';
   }
   return $root;
 }
@@ -3018,7 +3018,7 @@ sub _parse_def($$$$)
     if ( $token->{'type'}
         and ($token->{'type'} eq 'spaces'
                or $token->{'type'} eq 'spaces_inserted'
-               or $token->{'type'} eq 'bracketed_def_content'
+               or $token->{'type'} eq 'bracketed_arg'
                or $token->{'type'} eq 'bracketed_inserted'
                or $token->{'type'} eq 'delimiter')) {
       # we create a {'contents' =>} only if there is more than one
@@ -3049,7 +3049,7 @@ sub _parse_def($$$$)
       }
     }
 
-    if ($token->{'type'} and ($token->{'type'} eq 'bracketed_def_content'
+    if ($token->{'type'} and ($token->{'type'} eq 'bracketed_arg'
                                 or $token->{'type'} eq 'bracketed_inserted')) {
       $result{$arg} = $token;
       shift @contents;
@@ -3653,7 +3653,7 @@ sub _end_line_def_line($$$)
       $index_entry = $name_element
        # empty bracketed
         unless ($name_element->{'type'}
-                and $name_element->{'type'} eq 'bracketed_def_content'
+                and $name_element->{'type'} eq 'bracketed_arg'
                 and (!$name_element->{'contents'}
                      or (!scalar(@{$name_element->{'contents'}}))
                      or (scalar(@{$name_element->{'contents'}}) == 1
@@ -8260,9 +8260,9 @@ are present as elements in the tree.
 This a special type containing content in brackets in the context
 where they are valid, in C<@math>.
 
-=item bracketed_def_content
+=item bracketed_arg
 
-Content in brackets on definition command lines.
+Bracketed argument.  On definition command lines.
 
 =item def_aggregate
 
diff --git a/tp/Texinfo/XS/parsetexi/convert.c 
b/tp/Texinfo/XS/parsetexi/convert.c
index 9d0e13d9e4..29c2e99900 100644
--- a/tp/Texinfo/XS/parsetexi/convert.c
+++ b/tp/Texinfo/XS/parsetexi/convert.c
@@ -176,7 +176,7 @@ convert_to_texinfo_internal (ELEMENT *e, TEXT *result)
         }
 
       if (e->type == ET_bracketed
-          || e->type == ET_bracketed_def_content)
+          || e->type == ET_bracketed_arg)
         {
           KEY_PAIR *k;
           ADD("{");
@@ -200,7 +200,7 @@ convert_to_texinfo_internal (ELEMENT *e, TEXT *result)
         convert_to_texinfo_internal ((ELEMENT *)k->value, result);
 
       if (e->type == ET_bracketed
-          || e->type == ET_bracketed_def_content)
+          || e->type == ET_bracketed_arg)
         ADD("}");
     }
 
diff --git a/tp/Texinfo/XS/parsetexi/def.c b/tp/Texinfo/XS/parsetexi/def.c
index 19134a38c9..47bd9e8d83 100644
--- a/tp/Texinfo/XS/parsetexi/def.c
+++ b/tp/Texinfo/XS/parsetexi/def.c
@@ -95,7 +95,7 @@ next_bracketed_or_word_agg (ELEMENT *current, int *i)
               continue;
             }
         }
-      if (e->type == ET_bracketed_def_content
+      if (e->type == ET_bracketed_arg
           || e->type == ET_bracketed_inserted)
         {
           if (num > 0)
@@ -223,7 +223,7 @@ split_delimiters (ELEMENT *current, int starting_idx)
 
 /* Divide any text elements into separate elements, separating whitespace
    and non-whitespace.  Change ET_bracketed elements to 
-   ET_bracketed_def_content. */
+   ET_bracketed_arg. */
 static void
 split_def_args (ELEMENT *current, int starting_idx)
 {
@@ -242,7 +242,7 @@ split_def_args (ELEMENT *current, int starting_idx)
       if (e->type == ET_bracketed)
         {
           isolate_last_space (e);
-          e->type = ET_bracketed_def_content;
+          e->type = ET_bracketed_arg;
           continue;
         }
 
diff --git a/tp/Texinfo/XS/parsetexi/element_types.c 
b/tp/Texinfo/XS/parsetexi/element_types.c
index 7f59e5dcc4..62c790e9f9 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.c
+++ b/tp/Texinfo/XS/parsetexi/element_types.c
@@ -58,7 +58,7 @@ char *element_type_names[] = {
 "multitable_body",
 "row",
 "bracketed",
-"bracketed_def_content",
+"bracketed_arg",
 "def_aggregate",
 "bracketed_inserted",
 "elided_rawpreformatted",
diff --git a/tp/Texinfo/XS/parsetexi/element_types.h 
b/tp/Texinfo/XS/parsetexi/element_types.h
index 9e7c92f5db..e0eec5ce4f 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.h
+++ b/tp/Texinfo/XS/parsetexi/element_types.h
@@ -61,7 +61,7 @@ ET_multitable_head,
 ET_multitable_body,
 ET_row,
 ET_bracketed,
-ET_bracketed_def_content,
+ET_bracketed_arg,
 ET_def_aggregate,
 ET_bracketed_inserted,
 ET_elided_rawpreformatted,
diff --git a/tp/Texinfo/XS/parsetexi/element_types.txt 
b/tp/Texinfo/XS/parsetexi/element_types.txt
index c000908fbb..bbcdc9a330 100644
--- a/tp/Texinfo/XS/parsetexi/element_types.txt
+++ b/tp/Texinfo/XS/parsetexi/element_types.txt
@@ -81,7 +81,7 @@ multitable_head
 multitable_body
 row
 bracketed
-bracketed_def_content
+bracketed_arg
 def_aggregate
 bracketed_inserted
 
diff --git a/tp/Texinfo/XS/parsetexi/end_line.c 
b/tp/Texinfo/XS/parsetexi/end_line.c
index 7676480501..83bc522cfa 100644
--- a/tp/Texinfo/XS/parsetexi/end_line.c
+++ b/tp/Texinfo/XS/parsetexi/end_line.c
@@ -666,8 +666,8 @@ end_line_def_line (ELEMENT *current)
       if (def_info->name)
         {
           char *t;
-          /* Set index_entry unless an empty ET_bracketed_def_content. */
-          if (def_info->name->type == ET_bracketed_def_content
+          /* Set index_entry unless an empty ET_bracketed_arg. */
+          if (def_info->name->type == ET_bracketed_arg
               && (def_info->name->contents.number == 0
                   || (def_info->name->contents.number == 1
                       && (t = def_info->name->contents.list[0]->text.text)
diff --git a/tp/t/results/converters_tests/complex_nestings.pl 
b/tp/t/results/converters_tests/complex_nestings.pl
index 9f87792b54..5e85cf0bac 100644
--- a/tp/t/results/converters_tests/complex_nestings.pl
+++ b/tp/t/results/converters_tests/complex_nestings.pl
@@ -197,7 +197,7 @@ $result_trees{'complex_nestings'} = {
                             'line_nr' => 9,
                             'macro' => ''
                           },
-                          'type' => 'bracketed_def_content'
+                          'type' => 'bracketed_arg'
                         },
                         {
                           'extra' => {
@@ -326,7 +326,7 @@ $result_trees{'complex_nestings'} = {
                             'line_nr' => 10,
                             'macro' => ''
                           },
-                          'type' => 'bracketed_def_content'
+                          'type' => 'bracketed_arg'
                         },
                         {
                           'extra' => {
@@ -410,7 +410,7 @@ $result_trees{'complex_nestings'} = {
                                     'line_nr' => 11,
                                     'macro' => ''
                                   },
-                                  'type' => 'bracketed_def_content'
+                                  'type' => 'bracketed_arg'
                                 },
                                 {
                                   'extra' => {
@@ -433,7 +433,7 @@ $result_trees{'complex_nestings'} = {
                                     'line_nr' => 11,
                                     'macro' => ''
                                   },
-                                  'type' => 'bracketed_def_content'
+                                  'type' => 'bracketed_arg'
                                 },
                                 {
                                   'extra' => {
@@ -555,7 +555,7 @@ $result_trees{'complex_nestings'} = {
                                             'line_nr' => 12,
                                             'macro' => ''
                                           },
-                                          'type' => 'bracketed_def_content'
+                                          'type' => 'bracketed_arg'
                                         },
                                         {
                                           'extra' => {
@@ -648,7 +648,7 @@ $result_trees{'complex_nestings'} = {
                                             'line_nr' => 14,
                                             'macro' => ''
                                           },
-                                          'type' => 'bracketed_def_content'
+                                          'type' => 'bracketed_arg'
                                         },
                                         {
                                           'extra' => {
diff --git a/tp/t/results/converters_tests/definition_commands.pl 
b/tp/t/results/converters_tests/definition_commands.pl
index a0cb0fc790..54ae6edb4f 100644
--- a/tp/t/results/converters_tests/definition_commands.pl
+++ b/tp/t/results/converters_tests/definition_commands.pl
@@ -8288,7 +8288,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 70,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -8585,7 +8585,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 74,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -8936,7 +8936,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 79,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -9088,7 +9088,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 83,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -9299,7 +9299,7 @@ $result_trees{'definition_commands'} = {
                             'line_nr' => 88,
                             'macro' => ''
                           },
-                          'type' => 'bracketed_def_content'
+                          'type' => 'bracketed_arg'
                         },
                         {
                           'extra' => {
@@ -10516,7 +10516,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 106,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -10719,7 +10719,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 107,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -10956,7 +10956,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 108,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -11193,7 +11193,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 109,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -11430,7 +11430,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 110,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -11667,7 +11667,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 111,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -11904,7 +11904,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 112,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -12171,7 +12171,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 113,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -12438,7 +12438,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 114,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -12705,7 +12705,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 115,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -12972,7 +12972,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 116,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -13239,7 +13239,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 117,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -13506,7 +13506,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 118,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -13773,7 +13773,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 119,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -14040,7 +14040,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 120,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -14373,7 +14373,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 124,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -14576,7 +14576,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 125,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -14800,7 +14800,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 126,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -15024,7 +15024,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 127,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -15248,7 +15248,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 128,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -15472,7 +15472,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 129,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -15696,7 +15696,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 130,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -15935,7 +15935,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 131,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -16174,7 +16174,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 132,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -16413,7 +16413,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 133,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -16652,7 +16652,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 134,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -16891,7 +16891,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 135,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -17130,7 +17130,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 136,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -17369,7 +17369,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 137,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -17608,7 +17608,7 @@ $result_trees{'definition_commands'} = {
                         'line_nr' => 138,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/converters_tests/form_feeds.pl 
b/tp/t/results/converters_tests/form_feeds.pl
index 62559cade8..a52e365ad6 100644
--- a/tp/t/results/converters_tests/form_feeds.pl
+++ b/tp/t/results/converters_tests/form_feeds.pl
@@ -464,7 +464,7 @@ $result_trees{'form_feeds'} = {
                         'line_nr' => 28,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -495,7 +495,7 @@ $result_trees{'form_feeds'} = {
                         'line_nr' => 28,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -526,7 +526,7 @@ $result_trees{'form_feeds'} = {
                         'line_nr' => 28,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -557,7 +557,7 @@ $result_trees{'form_feeds'} = {
                         'line_nr' => 28,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -588,7 +588,7 @@ $result_trees{'form_feeds'} = {
                         'line_nr' => 28,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -643,7 +643,7 @@ $result_trees{'form_feeds'} = {
                         'line_nr' => 29,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -674,7 +674,7 @@ $result_trees{'form_feeds'} = {
                         'line_nr' => 29,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -705,7 +705,7 @@ $result_trees{'form_feeds'} = {
                         'line_nr' => 29,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -736,7 +736,7 @@ $result_trees{'form_feeds'} = {
                         'line_nr' => 29,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -767,7 +767,7 @@ $result_trees{'form_feeds'} = {
                         'line_nr' => 29,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
diff --git a/tp/t/results/converters_tests/frenchspacing_and_code.pl 
b/tp/t/results/converters_tests/frenchspacing_and_code.pl
index 699e3c22ea..9b146f90a9 100644
--- a/tp/t/results/converters_tests/frenchspacing_and_code.pl
+++ b/tp/t/results/converters_tests/frenchspacing_and_code.pl
@@ -315,7 +315,7 @@ $result_trees{'frenchspacing_and_code'} = {
                         'line_nr' => 18,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -338,7 +338,7 @@ $result_trees{'frenchspacing_and_code'} = {
                         'line_nr' => 18,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -361,7 +361,7 @@ $result_trees{'frenchspacing_and_code'} = {
                         'line_nr' => 18,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -384,7 +384,7 @@ $result_trees{'frenchspacing_and_code'} = {
                         'line_nr' => 18,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -609,7 +609,7 @@ $result_trees{'frenchspacing_and_code'} = {
                         'line_nr' => 22,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -632,7 +632,7 @@ $result_trees{'frenchspacing_and_code'} = {
                         'line_nr' => 22,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -655,7 +655,7 @@ $result_trees{'frenchspacing_and_code'} = {
                         'line_nr' => 22,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1096,7 +1096,7 @@ $result_trees{'frenchspacing_and_code'} = {
                         'line_nr' => 38,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1119,7 +1119,7 @@ $result_trees{'frenchspacing_and_code'} = {
                         'line_nr' => 38,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1142,7 +1142,7 @@ $result_trees{'frenchspacing_and_code'} = {
                         'line_nr' => 38,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1165,7 +1165,7 @@ $result_trees{'frenchspacing_and_code'} = {
                         'line_nr' => 38,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1390,7 +1390,7 @@ $result_trees{'frenchspacing_and_code'} = {
                         'line_nr' => 42,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1413,7 +1413,7 @@ $result_trees{'frenchspacing_and_code'} = {
                         'line_nr' => 42,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1436,7 +1436,7 @@ $result_trees{'frenchspacing_and_code'} = {
                         'line_nr' => 42,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/coverage/def.pl b/tp/t/results/coverage/def.pl
index 81f2f58c31..9b907f066d 100644
--- a/tp/t/results/coverage/def.pl
+++ b/tp/t/results/coverage/def.pl
@@ -35,7 +35,7 @@ $result_trees{'def'} = {
                         'line_nr' => 2,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -476,7 +476,7 @@ $result_trees{'def'} = {
                         'line_nr' => 12,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -507,7 +507,7 @@ $result_trees{'def'} = {
                         'line_nr' => 12,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -572,7 +572,7 @@ $result_trees{'def'} = {
                         'line_nr' => 13,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -590,7 +590,7 @@ $result_trees{'def'} = {
                         'line_nr' => 13,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -660,7 +660,7 @@ $result_trees{'def'} = {
                         'line_nr' => 14,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -678,7 +678,7 @@ $result_trees{'def'} = {
                         'line_nr' => 14,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -748,7 +748,7 @@ $result_trees{'def'} = {
                         'line_nr' => 15,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -766,7 +766,7 @@ $result_trees{'def'} = {
                         'line_nr' => 15,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -1000,7 +1000,7 @@ $result_trees{'def'} = {
                         'line_nr' => 18,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1055,7 +1055,7 @@ $result_trees{'def'} = {
                         'line_nr' => 19,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1078,7 +1078,7 @@ $result_trees{'def'} = {
                         'line_nr' => 19,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -1125,7 +1125,7 @@ $result_trees{'def'} = {
                         'line_nr' => 20,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1185,7 +1185,7 @@ $result_trees{'def'} = {
                         'line_nr' => 21,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1304,7 +1304,7 @@ $result_trees{'def'} = {
                         'line_nr' => 23,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1423,7 +1423,7 @@ $result_trees{'def'} = {
                         'line_nr' => 25,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/all_commands_delimiters.pl 
b/tp/t/results/def/all_commands_delimiters.pl
index ed758aa43c..b1a32ffa42 100644
--- a/tp/t/results/def/all_commands_delimiters.pl
+++ b/tp/t/results/def/all_commands_delimiters.pl
@@ -99,7 +99,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 1,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -122,7 +122,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 1,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -288,7 +288,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 2,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -486,7 +486,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 5,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -509,7 +509,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 5,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -675,7 +675,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 6,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -847,7 +847,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 9,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1074,7 +1074,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 12,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1286,7 +1286,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 13,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1372,7 +1372,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 13,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1569,7 +1569,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 16,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1618,7 +1618,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 16,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -2023,7 +2023,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 23,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -2215,7 +2215,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 24,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -2387,7 +2387,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 27,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -2592,7 +2592,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 28,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -2764,7 +2764,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 31,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -2956,7 +2956,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 32,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -3128,7 +3128,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 35,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -3348,7 +3348,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 36,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -3719,7 +3719,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 40,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -4118,7 +4118,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 44,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -4505,7 +4505,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 50,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -4556,7 +4556,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 50,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -4710,7 +4710,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 53,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -4761,7 +4761,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 53,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -5285,7 +5285,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 62,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -5336,7 +5336,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 62,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -5490,7 +5490,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 65,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -5541,7 +5541,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 65,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -6065,7 +6065,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 74,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -6116,7 +6116,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 74,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -6270,7 +6270,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 77,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -6321,7 +6321,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 77,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -6886,7 +6886,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 86,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -11111,7 +11111,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 146,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -11134,7 +11134,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 146,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -11157,7 +11157,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 146,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -11367,7 +11367,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 149,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -11390,7 +11390,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 149,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -11413,7 +11413,7 @@ $result_trees{'all_commands_delimiters'} = {
                         'line_nr' => 149,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/all_commands_delimiters_printindex.pl 
b/tp/t/results/def/all_commands_delimiters_printindex.pl
index f335627cfb..fa9746d6a0 100644
--- a/tp/t/results/def/all_commands_delimiters_printindex.pl
+++ b/tp/t/results/def/all_commands_delimiters_printindex.pl
@@ -156,7 +156,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 4,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -179,7 +179,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 4,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -345,7 +345,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 5,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -544,7 +544,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 8,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -567,7 +567,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 8,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -733,7 +733,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 9,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -906,7 +906,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 12,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1134,7 +1134,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 15,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1346,7 +1346,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 16,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1432,7 +1432,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 16,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1630,7 +1630,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 19,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1679,7 +1679,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 19,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -2086,7 +2086,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 26,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -2278,7 +2278,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 27,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -2451,7 +2451,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 30,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -2656,7 +2656,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 31,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -2829,7 +2829,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 34,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -3021,7 +3021,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 35,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -3194,7 +3194,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 38,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -3414,7 +3414,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 39,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -3786,7 +3786,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 43,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -4186,7 +4186,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 47,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -4575,7 +4575,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 53,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -4626,7 +4626,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 53,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -4781,7 +4781,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 56,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -4832,7 +4832,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 56,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -5359,7 +5359,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 65,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -5410,7 +5410,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 65,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -5565,7 +5565,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 68,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -5616,7 +5616,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 68,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -6143,7 +6143,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 77,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -6194,7 +6194,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 77,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -6349,7 +6349,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 80,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -6400,7 +6400,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 80,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -6968,7 +6968,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 89,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -11213,7 +11213,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 149,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -11236,7 +11236,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 149,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -11259,7 +11259,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 149,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -11470,7 +11470,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 152,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -11493,7 +11493,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 152,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -11516,7 +11516,7 @@ $result_trees{'all_commands_delimiters_printindex'} = {
                         'line_nr' => 152,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/ampchar.pl b/tp/t/results/def/ampchar.pl
index b0c8cc101f..2614f637b6 100644
--- a/tp/t/results/def/ampchar.pl
+++ b/tp/t/results/def/ampchar.pl
@@ -30,7 +30,7 @@ $result_trees{'ampchar'} = {
                         'line_nr' => 1,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/def_defx_mismatch.pl 
b/tp/t/results/def/def_defx_mismatch.pl
index 1877eedcbf..90f3f7f090 100644
--- a/tp/t/results/def/def_defx_mismatch.pl
+++ b/tp/t/results/def/def_defx_mismatch.pl
@@ -48,7 +48,7 @@ $result_trees{'def_defx_mismatch'} = {
                         'line_nr' => 1,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -158,7 +158,7 @@ $result_trees{'def_defx_mismatch'} = {
                         'line_nr' => 2,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -181,7 +181,7 @@ $result_trees{'def_defx_mismatch'} = {
                         'line_nr' => 2,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/def_groupings_args.pl 
b/tp/t/results/def/def_groupings_args.pl
index 1ab5fe0e94..d77d4d1584 100644
--- a/tp/t/results/def/def_groupings_args.pl
+++ b/tp/t/results/def/def_groupings_args.pl
@@ -317,7 +317,7 @@ $result_trees{'def_groupings_args'} = {
                         'line_nr' => 7,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/defx_after_comment.pl 
b/tp/t/results/def/defx_after_comment.pl
index d11ef6d888..05fc977d16 100644
--- a/tp/t/results/def/defx_after_comment.pl
+++ b/tp/t/results/def/defx_after_comment.pl
@@ -135,7 +135,7 @@ $result_trees{'defx_after_comment'} = {
                         'line_nr' => 3,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/defx_after_comment_in_example.pl 
b/tp/t/results/def/defx_after_comment_in_example.pl
index b4525443e2..61958bf4da 100644
--- a/tp/t/results/def/defx_after_comment_in_example.pl
+++ b/tp/t/results/def/defx_after_comment_in_example.pl
@@ -154,7 +154,7 @@ $result_trees{'defx_after_comment_in_example'} = {
                             'line_nr' => 4,
                             'macro' => ''
                           },
-                          'type' => 'bracketed_def_content'
+                          'type' => 'bracketed_arg'
                         },
                         {
                           'extra' => {
diff --git a/tp/t/results/def/defx_after_empty_line.pl 
b/tp/t/results/def/defx_after_empty_line.pl
index 8b21b99598..343e31b456 100644
--- a/tp/t/results/def/defx_after_empty_line.pl
+++ b/tp/t/results/def/defx_after_empty_line.pl
@@ -130,7 +130,7 @@ $result_trees{'defx_after_empty_line'} = {
                         'line_nr' => 3,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/defx_after_empty_line_in_example.pl 
b/tp/t/results/def/defx_after_empty_line_in_example.pl
index f515a7903f..78bad06c5f 100644
--- a/tp/t/results/def/defx_after_empty_line_in_example.pl
+++ b/tp/t/results/def/defx_after_empty_line_in_example.pl
@@ -174,7 +174,7 @@ $result_trees{'defx_after_empty_line_in_example'} = {
                             'line_nr' => 7,
                             'macro' => ''
                           },
-                          'type' => 'bracketed_def_content'
+                          'type' => 'bracketed_arg'
                         },
                         {
                           'extra' => {
diff --git a/tp/t/results/def/defx_after_paragraph_end.pl 
b/tp/t/results/def/defx_after_paragraph_end.pl
index a9609cf917..116ca6fe4e 100644
--- a/tp/t/results/def/defx_after_paragraph_end.pl
+++ b/tp/t/results/def/defx_after_paragraph_end.pl
@@ -139,7 +139,7 @@ $result_trees{'defx_after_paragraph_end'} = {
                         'line_nr' => 4,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/defx_after_preformatted_with_text.pl 
b/tp/t/results/def/defx_after_preformatted_with_text.pl
index c6c18d98d8..aefb32fc07 100644
--- a/tp/t/results/def/defx_after_preformatted_with_text.pl
+++ b/tp/t/results/def/defx_after_preformatted_with_text.pl
@@ -153,7 +153,7 @@ $result_trees{'defx_after_preformatted_with_text'} = {
                             'line_nr' => 5,
                             'macro' => ''
                           },
-                          'type' => 'bracketed_def_content'
+                          'type' => 'bracketed_arg'
                         },
                         {
                           'extra' => {
diff --git a/tp/t/results/def/defx_after_text.pl 
b/tp/t/results/def/defx_after_text.pl
index 18c33a9b99..e6596e7baf 100644
--- a/tp/t/results/def/defx_after_text.pl
+++ b/tp/t/results/def/defx_after_text.pl
@@ -134,7 +134,7 @@ $result_trees{'defx_after_text'} = {
                         'line_nr' => 3,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/defx_in_example.pl 
b/tp/t/results/def/defx_in_example.pl
index bb526f2b5c..15d90fe96c 100644
--- a/tp/t/results/def/defx_in_example.pl
+++ b/tp/t/results/def/defx_in_example.pl
@@ -134,7 +134,7 @@ $result_trees{'defx_in_example'} = {
                             'line_nr' => 3,
                             'macro' => ''
                           },
-                          'type' => 'bracketed_def_content'
+                          'type' => 'bracketed_arg'
                         },
                         {
                           'extra' => {
diff --git a/tp/t/results/def/empty_def_arguments.pl 
b/tp/t/results/def/empty_def_arguments.pl
index 4008a2d867..4a01d5bef8 100644
--- a/tp/t/results/def/empty_def_arguments.pl
+++ b/tp/t/results/def/empty_def_arguments.pl
@@ -249,7 +249,7 @@ $result_trees{'empty_def_arguments'} = {
                         'line_nr' => 5,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -267,7 +267,7 @@ $result_trees{'empty_def_arguments'} = {
                         'line_nr' => 5,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -309,7 +309,7 @@ $result_trees{'empty_def_arguments'} = {
                         'line_nr' => 6,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -351,7 +351,7 @@ $result_trees{'empty_def_arguments'} = {
                         'line_nr' => 7,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -374,7 +374,7 @@ $result_trees{'empty_def_arguments'} = {
                         'line_nr' => 7,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -416,7 +416,7 @@ $result_trees{'empty_def_arguments'} = {
                         'line_nr' => 8,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -453,7 +453,7 @@ $result_trees{'empty_def_arguments'} = {
                         'line_nr' => 9,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -471,7 +471,7 @@ $result_trees{'empty_def_arguments'} = {
                         'line_nr' => 9,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
diff --git a/tp/t/results/def/empty_deftype.pl 
b/tp/t/results/def/empty_deftype.pl
index 44eb3fb020..e302a09ce8 100644
--- a/tp/t/results/def/empty_deftype.pl
+++ b/tp/t/results/def/empty_deftype.pl
@@ -43,7 +43,7 @@ $result_trees{'empty_deftype'} = {
                         'line_nr' => 1,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -420,7 +420,7 @@ $result_trees{'empty_deftype'} = {
                         'line_nr' => 9,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/empty_deftypeop_name.pl 
b/tp/t/results/def/empty_deftypeop_name.pl
index b5f6b0cbdd..0e96af4e32 100644
--- a/tp/t/results/def/empty_deftypeop_name.pl
+++ b/tp/t/results/def/empty_deftypeop_name.pl
@@ -84,7 +84,7 @@ $result_trees{'empty_deftypeop_name'} = {
                         'line_nr' => 1,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/end_of_lines_protected.pl 
b/tp/t/results/def/end_of_lines_protected.pl
index 419e034307..4b8d0c7faf 100644
--- a/tp/t/results/def/end_of_lines_protected.pl
+++ b/tp/t/results/def/end_of_lines_protected.pl
@@ -96,7 +96,7 @@ $result_trees{'end_of_lines_protected'} = {
                         'line_nr' => 2,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -177,7 +177,7 @@ $result_trees{'end_of_lines_protected'} = {
                         'line_nr' => 4,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
diff --git a/tp/t/results/def/end_of_lines_protected_in_footnote.pl 
b/tp/t/results/def/end_of_lines_protected_in_footnote.pl
index 680869c63f..124cfe4a69 100644
--- a/tp/t/results/def/end_of_lines_protected_in_footnote.pl
+++ b/tp/t/results/def/end_of_lines_protected_in_footnote.pl
@@ -115,7 +115,7 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                                     'line_nr' => 3,
                                     'macro' => ''
                                   },
-                                  'type' => 'bracketed_def_content'
+                                  'type' => 'bracketed_arg'
                                 },
                                 {
                                   'extra' => {
@@ -196,7 +196,7 @@ $result_trees{'end_of_lines_protected_in_footnote'} = {
                                     'line_nr' => 5,
                                     'macro' => ''
                                   },
-                                  'type' => 'bracketed_def_content'
+                                  'type' => 'bracketed_arg'
                                 }
                               ],
                               'info' => {
diff --git a/tp/t/results/def/end_of_lines_protected_non_ascii.pl 
b/tp/t/results/def/end_of_lines_protected_non_ascii.pl
index a812c22625..0659a6326b 100644
--- a/tp/t/results/def/end_of_lines_protected_non_ascii.pl
+++ b/tp/t/results/def/end_of_lines_protected_non_ascii.pl
@@ -110,7 +110,7 @@ $result_trees{'end_of_lines_protected_non_ascii'} = {
                         'line_nr' => 3,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -191,7 +191,7 @@ $result_trees{'end_of_lines_protected_non_ascii'} = {
                         'line_nr' => 5,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
diff --git a/tp/t/results/def/inter_item_commands_in_def.pl 
b/tp/t/results/def/inter_item_commands_in_def.pl
index a101277d85..8bc080a08a 100644
--- a/tp/t/results/def/inter_item_commands_in_def.pl
+++ b/tp/t/results/def/inter_item_commands_in_def.pl
@@ -158,7 +158,7 @@ $result_trees{'inter_item_commands_in_def'} = {
                         'line_nr' => 4,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -176,7 +176,7 @@ $result_trees{'inter_item_commands_in_def'} = {
                         'line_nr' => 4,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
diff --git a/tp/t/results/def/inter_item_commands_in_def_in_example.pl 
b/tp/t/results/def/inter_item_commands_in_def_in_example.pl
index 36150e6ee3..34080f6f8a 100644
--- a/tp/t/results/def/inter_item_commands_in_def_in_example.pl
+++ b/tp/t/results/def/inter_item_commands_in_def_in_example.pl
@@ -177,7 +177,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                             'line_nr' => 5,
                             'macro' => ''
                           },
-                          'type' => 'bracketed_def_content'
+                          'type' => 'bracketed_arg'
                         },
                         {
                           'extra' => {
@@ -195,7 +195,7 @@ $result_trees{'inter_item_commands_in_def_in_example'} = {
                             'line_nr' => 5,
                             'macro' => ''
                           },
-                          'type' => 'bracketed_def_content'
+                          'type' => 'bracketed_arg'
                         }
                       ],
                       'info' => {
diff --git a/tp/t/results/def/leading_space_in_def_arg.pl 
b/tp/t/results/def/leading_space_in_def_arg.pl
index 8df515545e..ff04e38741 100644
--- a/tp/t/results/def/leading_space_in_def_arg.pl
+++ b/tp/t/results/def/leading_space_in_def_arg.pl
@@ -48,7 +48,7 @@ $result_trees{'leading_space_in_def_arg'} = {
                         'line_nr' => 1,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/no_category_or_no_name.pl 
b/tp/t/results/def/no_category_or_no_name.pl
index 25ab4e122b..116f0aeda4 100644
--- a/tp/t/results/def/no_category_or_no_name.pl
+++ b/tp/t/results/def/no_category_or_no_name.pl
@@ -114,7 +114,7 @@ $result_trees{'no_category_or_no_name'} = {
                         'line_nr' => 5,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
diff --git a/tp/t/results/def/ref_in_def.pl b/tp/t/results/def/ref_in_def.pl
index 81266bdf62..276daf478f 100644
--- a/tp/t/results/def/ref_in_def.pl
+++ b/tp/t/results/def/ref_in_def.pl
@@ -151,7 +151,7 @@ $result_trees{'ref_in_def'} = {
                         'line_nr' => 4,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -355,7 +355,7 @@ $result_trees{'ref_in_def'} = {
                         'line_nr' => 5,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/space_in_def_for_index.pl 
b/tp/t/results/def/space_in_def_for_index.pl
index 3f82623e52..6f88bddb72 100644
--- a/tp/t/results/def/space_in_def_for_index.pl
+++ b/tp/t/results/def/space_in_def_for_index.pl
@@ -95,7 +95,7 @@ $result_trees{'space_in_def_for_index'} = {
                         'line_nr' => 4,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -126,7 +126,7 @@ $result_trees{'space_in_def_for_index'} = {
                         'line_nr' => 4,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -157,7 +157,7 @@ $result_trees{'space_in_def_for_index'} = {
                         'line_nr' => 4,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -217,7 +217,7 @@ $result_trees{'space_in_def_for_index'} = {
                         'line_nr' => 5,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -240,7 +240,7 @@ $result_trees{'space_in_def_for_index'} = {
                         'line_nr' => 5,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/def/wrong_braces_simple.pl 
b/tp/t/results/def/wrong_braces_simple.pl
index b3e16ade8c..670b09b7de 100644
--- a/tp/t/results/def/wrong_braces_simple.pl
+++ b/tp/t/results/def/wrong_braces_simple.pl
@@ -389,7 +389,7 @@ $result_trees{'wrong_braces_simple'} = {
                         'line_nr' => 7,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'type' => 'block_line_arg'
@@ -555,7 +555,7 @@ $result_trees{'wrong_braces_simple'} = {
                         'line_nr' => 10,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'type' => 'block_line_arg'
@@ -1002,7 +1002,7 @@ $result_trees{'wrong_braces_simple'} = {
                         'line_nr' => 16,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'type' => 'line_arg'
@@ -1122,7 +1122,7 @@ $result_trees{'wrong_braces_simple'} = {
                         'line_nr' => 17,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'type' => 'line_arg'
diff --git a/tp/t/results/def/wrong_braces_with_end_of_lines.pl 
b/tp/t/results/def/wrong_braces_with_end_of_lines.pl
index f45585887c..a761dc1d0c 100644
--- a/tp/t/results/def/wrong_braces_with_end_of_lines.pl
+++ b/tp/t/results/def/wrong_braces_with_end_of_lines.pl
@@ -85,7 +85,7 @@ $result_trees{'wrong_braces_with_end_of_lines'} = {
                         'line_nr' => 1,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'type' => 'block_line_arg'
diff --git a/tp/t/results/indices/empty_index_entry.pl 
b/tp/t/results/indices/empty_index_entry.pl
index 70498cd6e7..20b7bd688e 100644
--- a/tp/t/results/indices/empty_index_entry.pl
+++ b/tp/t/results/indices/empty_index_entry.pl
@@ -95,7 +95,7 @@ $result_trees{'empty_index_entry'} = {
                         'line_nr' => 5,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -118,7 +118,7 @@ $result_trees{'empty_index_entry'} = {
                         'line_nr' => 5,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
diff --git a/tp/t/results/indices/empty_string_index_entry.pl 
b/tp/t/results/indices/empty_string_index_entry.pl
index 1d79622481..ef69ddb0af 100644
--- a/tp/t/results/indices/empty_string_index_entry.pl
+++ b/tp/t/results/indices/empty_string_index_entry.pl
@@ -306,7 +306,7 @@ $result_trees{'empty_string_index_entry'} = {
                         'line_nr' => 10,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -324,7 +324,7 @@ $result_trees{'empty_string_index_entry'} = {
                         'line_nr' => 10,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -342,7 +342,7 @@ $result_trees{'empty_string_index_entry'} = {
                         'line_nr' => 10,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -417,7 +417,7 @@ $result_trees{'empty_string_index_entry'} = {
                         'line_nr' => 11,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -435,7 +435,7 @@ $result_trees{'empty_string_index_entry'} = {
                         'line_nr' => 11,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -453,7 +453,7 @@ $result_trees{'empty_string_index_entry'} = {
                         'line_nr' => 11,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
diff --git a/tp/t/results/indices/index_special_region.pl 
b/tp/t/results/indices/index_special_region.pl
index 94ca89ea8c..06313e781a 100644
--- a/tp/t/results/indices/index_special_region.pl
+++ b/tp/t/results/indices/index_special_region.pl
@@ -815,7 +815,7 @@ $result_trees{'index_special_region'} = {
                         'line_nr' => 45,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -838,7 +838,7 @@ $result_trees{'index_special_region'} = {
                         'line_nr' => 45,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -879,7 +879,7 @@ $result_trees{'index_special_region'} = {
                         'line_nr' => 46,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -916,7 +916,7 @@ $result_trees{'index_special_region'} = {
                         'line_nr' => 47,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -934,7 +934,7 @@ $result_trees{'index_special_region'} = {
                         'line_nr' => 47,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
diff --git a/tp/t/results/indices/index_special_region_no_insertcopying.pl 
b/tp/t/results/indices/index_special_region_no_insertcopying.pl
index a47dd36201..15f6b49c0f 100644
--- a/tp/t/results/indices/index_special_region_no_insertcopying.pl
+++ b/tp/t/results/indices/index_special_region_no_insertcopying.pl
@@ -810,7 +810,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                         'line_nr' => 45,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -833,7 +833,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                         'line_nr' => 45,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -874,7 +874,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                         'line_nr' => 46,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -911,7 +911,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                         'line_nr' => 47,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -929,7 +929,7 @@ $result_trees{'index_special_region_no_insertcopying'} = {
                         'line_nr' => 47,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
 
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
index f027b8c71c..57a00480db 100644
--- 
a/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
+++ 
b/tp/t/results/indices/index_special_region_no_insertcopying_no_titlepage_no_nodes.pl
@@ -810,7 +810,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                         'line_nr' => 45,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -833,7 +833,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                         'line_nr' => 45,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -874,7 +874,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                         'line_nr' => 46,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -911,7 +911,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                         'line_nr' => 47,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -929,7 +929,7 @@ 
$result_trees{'index_special_region_no_insertcopying_no_titlepage_no_nodes'} = {
                         'line_nr' => 47,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
index acc1410b66..be64f9bafd 100644
--- 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
+++ 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes.pl
@@ -810,7 +810,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                         'line_nr' => 45,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -833,7 +833,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                         'line_nr' => 45,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -874,7 +874,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                         'line_nr' => 46,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -911,7 +911,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                         'line_nr' => 47,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -929,7 +929,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes'} = {
                         'line_nr' => 47,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
diff --git 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
index c3a836e514..570b9b79b6 100644
--- 
a/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
+++ 
b/tp/t/results/indices/index_special_region_no_insertcopying_titlepage_no_nodes_footnotes_default.pl
@@ -810,7 +810,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                         'line_nr' => 45,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -833,7 +833,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                         'line_nr' => 45,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -874,7 +874,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                         'line_nr' => 46,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -911,7 +911,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                         'line_nr' => 47,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -929,7 +929,7 @@ 
$result_trees{'index_special_region_no_insertcopying_titlepage_no_nodes_footnote
                         'line_nr' => 47,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
diff --git a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl 
b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
index e5d35783e1..4bdf42f1ff 100644
--- a/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
+++ b/tp/t/results/indices/index_special_region_no_titlepage_no_nodes.pl
@@ -815,7 +815,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                         'line_nr' => 45,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -838,7 +838,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                         'line_nr' => 45,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -879,7 +879,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                         'line_nr' => 46,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -916,7 +916,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                         'line_nr' => 47,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -934,7 +934,7 @@ $result_trees{'index_special_region_no_titlepage_no_nodes'} 
= {
                         'line_nr' => 47,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
diff --git a/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
index 8b6b32e619..d90197820a 100644
--- a/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
+++ b/tp/t/results/indices/index_special_region_titlepage_no_nodes.pl
@@ -815,7 +815,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                         'line_nr' => 45,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -838,7 +838,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                         'line_nr' => 45,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -879,7 +879,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                         'line_nr' => 46,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -916,7 +916,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                         'line_nr' => 47,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -934,7 +934,7 @@ $result_trees{'index_special_region_titlepage_no_nodes'} = {
                         'line_nr' => 47,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
diff --git 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
index e0e5660c54..99bae3fd8f 100644
--- 
a/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
+++ 
b/tp/t/results/indices/index_special_region_titlepage_no_nodes_footnotes_default.pl
@@ -815,7 +815,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                         'line_nr' => 45,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -838,7 +838,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                         'line_nr' => 45,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -879,7 +879,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                         'line_nr' => 46,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
@@ -916,7 +916,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                         'line_nr' => 47,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -934,7 +934,7 @@ 
$result_trees{'index_special_region_titlepage_no_nodes_footnotes_default'} = {
                         'line_nr' => 47,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {
diff --git a/tp/t/results/info_tests/colon_in_index_entry.pl 
b/tp/t/results/info_tests/colon_in_index_entry.pl
index e6c1a90ebd..f903860593 100644
--- a/tp/t/results/info_tests/colon_in_index_entry.pl
+++ b/tp/t/results/info_tests/colon_in_index_entry.pl
@@ -260,7 +260,7 @@ $result_trees{'colon_in_index_entry'} = {
                         'line_nr' => 11,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -283,7 +283,7 @@ $result_trees{'colon_in_index_entry'} = {
                         'line_nr' => 11,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -356,7 +356,7 @@ $result_trees{'colon_in_index_entry'} = {
                         'line_nr' => 12,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -379,7 +379,7 @@ $result_trees{'colon_in_index_entry'} = {
                         'line_nr' => 12,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/invalid_nestings/block_not_matching.pl 
b/tp/t/results/invalid_nestings/block_not_matching.pl
index eed42adef5..64b6ce85e4 100644
--- a/tp/t/results/invalid_nestings/block_not_matching.pl
+++ b/tp/t/results/invalid_nestings/block_not_matching.pl
@@ -65,7 +65,7 @@ $result_trees{'block_not_matching'} = {
                         'line_nr' => 5,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/invalid_nestings/on_def_line.pl 
b/tp/t/results/invalid_nestings/on_def_line.pl
index 29e3e9d12e..a14aa7ca6b 100644
--- a/tp/t/results/invalid_nestings/on_def_line.pl
+++ b/tp/t/results/invalid_nestings/on_def_line.pl
@@ -48,7 +48,7 @@ $result_trees{'on_def_line'} = {
                         'line_nr' => 1,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -206,7 +206,7 @@ $result_trees{'on_def_line'} = {
                         'line_nr' => 2,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
diff --git a/tp/t/results/xml_tests/commands_and_spaces.pl 
b/tp/t/results/xml_tests/commands_and_spaces.pl
index 8e83fd78d6..04195e947e 100644
--- a/tp/t/results/xml_tests/commands_and_spaces.pl
+++ b/tp/t/results/xml_tests/commands_and_spaces.pl
@@ -1449,7 +1449,7 @@ $result_trees{'commands_and_spaces'} = {
                         'line_nr' => 64,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1480,7 +1480,7 @@ $result_trees{'commands_and_spaces'} = {
                         'line_nr' => 64,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1511,7 +1511,7 @@ $result_trees{'commands_and_spaces'} = {
                         'line_nr' => 64,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1542,7 +1542,7 @@ $result_trees{'commands_and_spaces'} = {
                         'line_nr' => 64,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     },
                     {
                       'extra' => {
@@ -1573,7 +1573,7 @@ $result_trees{'commands_and_spaces'} = {
                         'line_nr' => 64,
                         'macro' => ''
                       },
-                      'type' => 'bracketed_def_content'
+                      'type' => 'bracketed_arg'
                     }
                   ],
                   'info' => {



reply via email to

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