texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * tp/Texinfo/ParserNonXS.pm (_parse_macro_command


From: Patrice Dumas
Subject: branch master updated: * tp/Texinfo/ParserNonXS.pm (_parse_macro_command_line), tp/Texinfo/XS/parsetexi/macro.c (parse_macro_command_line): do not set info arg_line for @*macro as the information is already in first content argument text content. Make @macro element a block command type in C.
Date: Tue, 24 Dec 2024 10:55:37 -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 7b3831f71a * tp/Texinfo/ParserNonXS.pm (_parse_macro_command_line), 
tp/Texinfo/XS/parsetexi/macro.c (parse_macro_command_line): do not set info 
arg_line for @*macro as the information is already in first content argument 
text content.  Make @macro element a block command type in C.
7b3831f71a is described below

commit 7b3831f71ae31fb6a41c59599e5fd88ac3072e31
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Tue Dec 24 16:55:27 2024 +0100

    * tp/Texinfo/ParserNonXS.pm (_parse_macro_command_line),
    tp/Texinfo/XS/parsetexi/macro.c (parse_macro_command_line): do not set
    info arg_line for @*macro as the information is already in first
    content argument text content.  Make @macro element a block command
    type in C.
    
    * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): get @*macro line
    from text in argument, the first content.
    
    * tp/Texinfo/Convert/Texinfo.pm (_convert_to_texinfo),
    tp/Texinfo/XS/main/convert_to_texinfo.c (convert_to_texinfo_internal):
    handle command with line arguments in first content before line
    commands with arg_line.
---
 ChangeLog                                          |  16 +++
 tp/Texinfo/Convert/Texinfo.pm                      |  17 ++-
 tp/Texinfo/Convert/TexinfoMarkup.pm                |   6 +-
 tp/Texinfo/ParserNonXS.pm                          |   2 +-
 tp/Texinfo/XS/main/convert_to_texinfo.c            |  26 ++--
 tp/Texinfo/XS/parsetexi/macro.c                    |   9 +-
 tp/t/results/alias/alias_macro_target_removed.pl   |   4 -
 tp/t/results/alias/alias_of_macro.pl               |   4 -
 tp/t/results/alias/alias_of_macro_before_macro.pl  |   4 -
 tp/t/results/alias/texinfo_command_alias.pl        |   4 -
 .../alias/texinfo_command_alias_indirect.pl        |   4 -
 .../alias/texinfo_command_alias_indirect_before.pl |   4 -
 .../command_conditionals_user_defined.pl           |   4 -
 tp/t/results/conditionals/macro_in_ifset.pl        |   4 -
 tp/t/results/conditionals/macro_in_ifset_set.pl    |   8 --
 tp/t/results/conditionals/nested_ifset_ifclear.pl  |   4 -
 .../conditionals/user_defined_txiinternalvalue.pl  |   4 -
 .../results/converters_tests/at_commands_in_raw.pl |   4 -
 tp/t/results/coverage_braces/test_image.pl         |   4 -
 tp/t/results/include/cpp_lines.pl                  |   8 --
 .../macro_and_commands_in_early_commands.pl        |  16 ---
 .../results/include/macro_definition_in_include.pl |   4 -
 tp/t/results/include/macro_in_early_commands.pl    |  24 ----
 tp/t/results/info_tests/def_in_copying.pl          |   4 -
 tp/t/results/linemacro/api_doc_with_linemacro.pl   |  12 --
 .../linemacro/arobase_brace_in_linemacro_call.pl   |   4 -
 .../linemacro/begin_conditional_in_linemacro.pl    |   4 -
 .../linemacro/block_begin_end_in_linemacro_call.pl |   8 --
 tp/t/results/linemacro/blockitem_no_item.pl        |   4 -
 tp/t/results/linemacro/brace_command_not_closed.pl |   4 -
 tp/t/results/linemacro/braces_after_text.pl        |   4 -
 .../linemacro/call_macro_in_linemacro_body.pl      |   8 --
 .../linemacro/call_macro_in_linemacro_call.pl      |   8 --
 .../linemacro/comment_at_end_of_linemacro_call.pl  |   4 -
 .../results/linemacro/comment_in_linemacro_call.pl |   4 -
 .../comment_in_one_argument_linemacro_call.pl      |   4 -
 .../comment_on_linemacro_call_macro_expansion.pl   |   8 --
 .../comment_on_linemacro_call_out_of_braces.pl     |   4 -
 tp/t/results/linemacro/empty_last_argument.pl      |   4 -
 .../linemacro/end_conditional_in_linemacro.pl      |   4 -
 .../results/linemacro/last_argument_with_braces.pl |   4 -
 tp/t/results/linemacro/missing_formal_arg.pl       |   4 -
 tp/t/results/linemacro/nested_linemacro_calls.pl   |   8 --
 .../linemacro/newline_and_continuation_in_brace.pl |   4 -
 tp/t/results/linemacro/no_arguments.pl             |   4 -
 tp/t/results/linemacro/paragraph_no_paragraph.pl   |   4 -
 tp/t/results/linemacro/protected_spaces_on_line.pl |   4 -
 .../protection_of_end_of_line_by_command.pl        |   4 -
 .../linemacro/recursive_linemacro_in_body.pl       |   4 -
 .../linemacro/recursive_linemacro_in_call.pl       |   4 -
 .../linemacro/simple_nested_linemacro_calls.pl     |   8 --
 .../linemacro/spaces_after_command_in_call.pl      |   4 -
 ...paces_after_macro_linemacro_commands_in_call.pl |  12 --
 .../spaces_after_unknown_command_in_call.pl        |   4 -
 tp/t/results/linemacro/spaces_in_args.pl           |   4 -
 tp/t/results/linemacro/spaces_in_call.pl           |   4 -
 tp/t/results/linemacro/text_arguments.pl           |   4 -
 tp/t/results/linemacro/verb_in_linemacro_call.pl   |   4 -
 tp/t/results/linemacro/verb_not_closed.pl          |   4 -
 .../verb_with_arobase_in_linemacro_call.pl         |   4 -
 .../linemacro/verb_with_brace_in_linemacro_call.pl |   4 -
 tp/t/results/macro/arg_body_expansion_order.pl     |  12 --
 tp/t/results/macro/arg_not_closed.pl               |   4 -
 tp/t/results/macro/arobase_brace_in_macro_call.pl  |   4 -
 tp/t/results/macro/backslash_in_arg.pl             |   4 -
 tp/t/results/macro/bad_argument.pl                 |  16 ---
 tp/t/results/macro/bad_formal_arg.pl               |  12 --
 .../macro/bad_macro_name_with_underscore.pl        |   4 -
 tp/t/results/macro/bib_example.pl                  |  28 -----
 tp/t/results/macro/bye_in_macro.pl                 |   4 -
 ...losing_brace_in_macro_call_in_ignored_inline.pl |   4 -
 tp/t/results/macro/complete_macro_for_end.pl       |   4 -
 tp/t/results/macro/complex_argument.pl             |  16 ---
 tp/t/results/macro/cpp_directives_after_macros.pl  |   8 --
 tp/t/results/macro/cpp_directives_in_macro.pl      |   4 -
 .../macro/cpp_directives_line_value_macro.pl       |  12 --
 .../macro/definfoenclose_replaced_by_macro.pl      |   4 -
 tp/t/results/macro/double_macro_definition.pl      |   8 --
 tp/t/results/macro/double_recursive_macro_call.pl  |   8 --
 tp/t/results/macro/empty_end.pl                    |   4 -
 tp/t/results/macro/empty_macro_argument.pl         |   8 --
 tp/t/results/macro/empty_macro_in_text_no_arg.pl   |   8 --
 tp/t/results/macro/empty_macro_no_arg.pl           |   4 -
 tp/t/results/macro/expand_two_same.pl              |   4 -
 tp/t/results/macro/expansion_order.pl              |   8 --
 tp/t/results/macro/form_feeds.pl                   |   8 --
 tp/t/results/macro/glossary.pl                     |  28 -----
 tp/t/results/macro/ifclear_in_macro.pl             |   4 -
 tp/t/results/macro/ifset_and_end_isef_in_macro.pl  |   8 --
 tp/t/results/macro/ifset_in_macro.pl               |   4 -
 tp/t/results/macro/ifset_in_macro_set.pl           |   4 -
 tp/t/results/macro/ignored_macro_definition.pl     |   4 -
 tp/t/results/macro/implicit_quoting_one_arg.pl     |   4 -
 tp/t/results/macro/implicit_quoting_recursion.pl   |   4 -
 tp/t/results/macro/include_after_empty_line_arg.pl |   4 -
 tp/t/results/macro/leading_spaces_no_ignore.pl     |   4 -
 tp/t/results/macro/line_after_recursive_call.pl    |   4 -
 .../macro/line_end_accent_command_macro_call.pl    |   8 --
 tp/t/results/macro/macro_after_paragraph.pl        |   4 -
 .../macro/macro_alias_definfoenclose_defindex.pl   |  16 ---
 .../macro_before_specific_line_command_args.pl     |   4 -
 tp/t/results/macro/macro_call_empty_middle_arg.pl  |   4 -
 tp/t/results/macro/macro_call_empty_two_arg.pl     |   4 -
 .../macro/macro_call_in_ignored_inlinefmtifelse.pl |   4 -
 .../macro/macro_call_in_inlinefmtifelse_format.pl  |   4 -
 tp/t/results/macro/macro_call_in_node_manual.pl    |  24 ----
 .../macro/macro_end_call_in_ignored_inlinefmt.pl   |   4 -
 .../macro_end_call_in_ignored_inlinefmtifelse.pl   |   4 -
 ...cro_end_call_in_ignored_inlinefmtifelse_else.pl |   4 -
 .../macro/macro_end_call_in_ignored_inlineraw.pl   |   4 -
 .../results/macro/macro_end_call_in_ignored_raw.pl |   4 -
 tp/t/results/macro/macro_expands_to_empty.pl       |   4 -
 tp/t/results/macro/macro_expansion.pl              |   4 -
 .../macro_expansion_end_in_conditional_end.pl      |   4 -
 .../macro_expansion_end_in_conditional_line.pl     |   4 -
 ...macro_expansion_end_in_ignored_ifset_content.pl |   4 -
 ..._expansion_end_in_ignored_nested_conditional.pl |   4 -
 ..._end_in_ignored_nested_different_conditional.pl |   4 -
 .../macro_expansion_in_multitable_prototype.pl     |   8 --
 .../macro/macro_for_dot_in_menu_not_separator.pl   |   4 -
 tp/t/results/macro/macro_for_end.pl                |   4 -
 .../macro/macro_for_ignored_line_command.pl        |   4 -
 tp/t/results/macro/macro_for_verb.pl               |   4 -
 ...macro_imbricated_with_beginning_command_name.pl |   4 -
 tp/t/results/macro/macro_in_accent.pl              |   8 --
 tp/t/results/macro/macro_in_brace_command.pl       |   8 --
 tp/t/results/macro/macro_in_def_delimiters.pl      |   4 -
 tp/t/results/macro/macro_in_empty_menu_comment.pl  |   4 -
 .../macro_in_empty_multitable_empty_before_item.pl |   4 -
 .../macro_in_empty_table_empty_before_item.pl      |   4 -
 tp/t/results/macro/macro_in_empty_text.pl          |   4 -
 tp/t/results/macro/macro_in_end_argument.pl        |   4 -
 tp/t/results/macro/macro_in_ifset.pl               |   4 -
 tp/t/results/macro/macro_in_ifset_end_in_arg.pl    |   4 -
 tp/t/results/macro/macro_in_index_commands.pl      |  28 -----
 .../macro/macro_in_invalid_documentencoding.pl     |   4 -
 tp/t/results/macro/macro_in_macro_arg.pl           |  12 --
 tp/t/results/macro/macro_in_macro_arg_simpler.pl   |   8 --
 tp/t/results/macro/macro_in_menu.pl                |  24 ----
 .../macro_in_menu_comment_closed_by_detailmenu.pl  |   4 -
 .../macro/macro_in_menu_comment_like_entry.pl      |   4 -
 tp/t/results/macro/macro_in_menu_description.pl    |   4 -
 tp/t/results/macro/macro_in_misc_commands.pl       | 136 ---------------------
 .../macro/macro_in_multitable_empty_before_item.pl |   4 -
 .../macro/macro_in_table_empty_before_item.pl      |   4 -
 .../macro_inlineifcond_end_in_empty_ignored.pl     |   4 -
 .../macro/macro_inlineifcond_end_in_empty_set.pl   |   4 -
 tp/t/results/macro/macro_name_with_digit.pl        |   8 --
 tp/t/results/macro/macro_name_with_hyphen.pl       |   4 -
 tp/t/results/macro/macro_name_zero.pl              |   4 -
 tp/t/results/macro/macro_no_arg_bad_expansion.pl   |   4 -
 tp/t/results/macro/macro_no_arg_expansion.pl       |   4 -
 tp/t/results/macro/macro_no_argument.pl            |   3 -
 tp/t/results/macro/macro_not_closed.pl             |   4 -
 tp/t/results/macro/macro_one_arg_end_of_file.pl    |   4 -
 .../macro/macro_replaced_by_definfoenclose.pl      |   4 -
 .../macro_with_error_at_end_line_after_macro.pl    |   4 -
 tp/t/results/macro/macro_zero.pl                   |   4 -
 tp/t/results/macro/nested_macro_call.pl            |   8 --
 tp/t/results/macro/no_macrobody.pl                 |   4 -
 tp/t/results/macro/non_ascii_in_macro_name.pl      |   4 -
 tp/t/results/macro/paragraph_and_macro.pl          |  12 --
 tp/t/results/macro/protect_comma_macro_line.pl     |   4 -
 tp/t/results/macro/protect_in_body.pl              |   4 -
 tp/t/results/macro/protect_in_body_line_arg.pl     |   4 -
 tp/t/results/macro/protect_in_body_one_arg.pl      |   4 -
 tp/t/results/macro/recursive_call_in_argument.pl   |   4 -
 tp/t/results/macro/recursive_call_in_macro.pl      |   4 -
 tp/t/results/macro/recursive_call_in_rmacro.pl     |   4 -
 tp/t/results/macro/redefine_texinfo_macro.pl       |   4 -
 tp/t/results/macro/simple_imbricated_macro.pl      |   8 --
 .../macro/simple_imbricated_macro_rmacro.pl        |   8 --
 tp/t/results/macro/space_macro_after_end.pl        |   4 -
 .../macro/space_macro_after_end_verbatim.pl        |   4 -
 tp/t/results/macro/text_before_after.pl            |   4 -
 tp/t/results/macro/too_much_args.pl                |   4 -
 tp/t/results/macro/two_macros_on_a_line.pl         |   8 --
 .../macro/unpaired_backslash_in_macro_body.pl      |   4 -
 .../macro/verb_with_arobase_in_macro_call.pl       |   4 -
 .../results/macro/verb_with_brace_in_macro_call.pl |   4 -
 tp/t/results/macro/zero_argument.pl                |   8 --
 tp/t/results/macro/zero_argument_comment.pl        |   8 --
 .../codequoteundirected_codequotebacktick.pl       |   8 --
 tp/t/results/misc_commands/kbdinputstyle.pl        |   4 -
 .../misc_commands/kbdinputstyle_in_table.pl        |   4 -
 tp/t/results/misc_commands/test_allowcodebreaks.pl |   8 --
 .../indent_before_macro_definition_and_other.pl    |   4 -
 .../plaintext_tests/star_at_command_formatting.pl  |   4 -
 tp/t/results/raw/nested_macros.pl                  |   4 -
 .../transformations/protect_colon_source_mark.pl   |   4 -
 .../transformations/protect_comma_source_mark.pl   |   4 -
 ...st_parenthesis_after_parenthesis_source_mark.pl |   4 -
 .../protect_first_parenthesis_source_mark.pl       |   4 -
 ...otect_hashchar_at_line_beginning_source_mark.pl |  12 --
 ...ct_node_after_label_source_mark_in_protected.pl |   4 -
 .../value_and_macro/comma_value_in_macro_arg.pl    |   4 -
 tp/t/results/value_and_macro/macro_in_value.pl     |   4 -
 .../results/value_and_macro/value_in_macro_body.pl |   4 -
 .../value_and_macro/value_in_macro_formal_arg.pl   |   4 -
 tp/t/results/xml_tests/macro_and_args.pl           |   8 --
 tp/t/results/xtable/table_nested.pl                |   4 -
 201 files changed, 45 insertions(+), 1310 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dfb61caafa..505c3e8f7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2024-11-24  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/ParserNonXS.pm (_parse_macro_command_line),
+       tp/Texinfo/XS/parsetexi/macro.c (parse_macro_command_line): do not set
+       info arg_line for @*macro as the information is already in first
+       content argument text content.  Make @macro element a block command
+       type in C.
+
+       * tp/Texinfo/Convert/TexinfoMarkup.pm (_convert): get @*macro line
+       from text in argument, the first content.
+
+       * tp/Texinfo/Convert/Texinfo.pm (_convert_to_texinfo),
+       tp/Texinfo/XS/main/convert_to_texinfo.c (convert_to_texinfo_internal):
+       handle command with line arguments in first content before line
+       commands with arg_line.
+
 2024-11-24  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/ParserNonXS.pm (_parse_macro_command_line)
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index 55ef6382ed..9d5002ba99 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -219,6 +219,7 @@ sub _convert_to_texinfo($)
   return '' if (($element->{'info'}
                  and $element->{'info'}->{'inserted'})
                 or ($element->{'type'} and $element->{'type'} eq 'argument'));
+
   if (defined($element->{'text'})) {
     $result .= $element->{'text'};
   } else {
@@ -253,6 +254,12 @@ sub _convert_to_texinfo($)
         # tree, not associated to the command element.
         # item, tab and headitem are nobrace commands with contents
         return $result if (!$element->{'contents'});
+      } elsif ($element->{'contents'}
+          and ($element->{'contents'}->[0]->{'type'}
+               and $element->{'contents'}->[0]->{'type'} eq 'argument')) {
+        # root commands and block commands that are not def commands
+        $result .= $spc_before_arg;
+        $result .= _convert_args($element->{'contents'}->[0]);
      # arg_line set for line_commands with type lineraw that have
      # arguments and for @macro.
      # if there is no arg_line, the end of line is in rawline_arg in contents
@@ -261,9 +268,7 @@ sub _convert_to_texinfo($)
       } elsif ($element->{'info'} and 
defined($element->{'info'}->{'arg_line'})) {
         $result .= $spc_before_arg;
         $result .= $element->{'info'}->{'arg_line'};
-        if (!$block_commands{$cmdname}) {
-          return $result;
-        }
+        return $result;
       } elsif (exists($brace_commands{$cmdname})
                or ($element->{'type'}
                    and $element->{'type'} eq 'definfoenclose_command')) {
@@ -284,12 +289,6 @@ sub _convert_to_texinfo($)
         }
         $result .= '}' if ($braces);
         return $result;
-      } elsif ($element->{'contents'}
-               and ($element->{'contents'}->[0]->{'type'}
-                    and $element->{'contents'}->[0]->{'type'} eq 'argument')) {
-        # root commands and block commands that are not def commands
-        $result .= $spc_before_arg;
-        $result .= _convert_args($element->{'contents'}->[0]);
       } elsif ($line_commands{$data_cmdname}
                or ($element->{'type'}
                    and $element->{'type'} eq 'index_entry_command')) {
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm 
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 607ea719ea..d3f79c1c7e 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -1409,7 +1409,11 @@ sub _convert($$;$)
             }
           }
         }
-        push @$attribute, $self->_arg_line($element);
+        my $line = $element->{'contents'}->[0]->{'contents'}->[0]->{'text'};
+        chomp($line);
+        if ($line ne '') {
+          push @$attribute, ['line', $line];
+        }
       }
       if ($self->{'expanded_formats'}->{$element->{'cmdname'}}) {
         $self->{'document_context'}->[-1]->{'raw'} = 1;
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index e03b32b603..de5b5901e0 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -1315,7 +1315,7 @@ sub _parse_macro_command_line($$$$$;$)
   my ($self, $command, $line, $parent, $source_info) = @_;
 
   my $macro = { 'cmdname' => $command, 'parent' => $parent,
-               'info' => {'arg_line' => $line}, 'source_info' => $source_info 
};
+                'source_info' => $source_info };
   my $argument = {'type' => 'argument', 'parent' => $macro};
   $macro->{'contents'} = [$argument];
   my $macro_line = {'type' => 'macro_line', 'text' => $line,
diff --git a/tp/Texinfo/XS/main/convert_to_texinfo.c 
b/tp/Texinfo/XS/main/convert_to_texinfo.c
index 837793dd70..0dca3e96b3 100644
--- a/tp/Texinfo/XS/main/convert_to_texinfo.c
+++ b/tp/Texinfo/XS/main/convert_to_texinfo.c
@@ -107,6 +107,17 @@ convert_to_texinfo_internal (const ELEMENT *e, TEXT 
*result)
               if (e->e.c->contents.number == 0)
                 return;
             }
+          else if (e->e.c->contents.number > 0
+                   && e->e.c->contents.list[0]->type == ET_argument)
+            {
+           /* root commands and block commands that are not def commands */
+              const ELEMENT *argument = e->e.c->contents.list[0];
+
+              if (spc_before_arg)
+                ADD((char *)spc_before_arg->e.text->text);
+
+              convert_args (argument, result);
+            }
       /* arg_line set for line_commands with type lineraw that have
          arguments and for @macro. */
       /* if there is no arg_line, the end of line is in rawline_arg in contents
@@ -120,9 +131,7 @@ convert_to_texinfo_internal (const ELEMENT *e, TEXT *result)
                 ADD((char *)spc_before_arg->e.text->text);
 
               ADD(arg_line);
-
-              if (!(builtin_command_data[cmd].flags & CF_block))
-                return;
+              return;
             }
           else if (builtin_command_data[cmd].flags & CF_brace
                    || builtin_command_data[cmd].flags & CF_INFOENCLOSE)
@@ -160,17 +169,6 @@ convert_to_texinfo_internal (const ELEMENT *e, TEXT 
*result)
                 ADD("}");
               return;
             }
-          else if (e->e.c->contents.number > 0
-                   && e->e.c->contents.list[0]->type == ET_argument)
-            {
-           /* root commands and block commands that are not def commands */
-              const ELEMENT *argument = e->e.c->contents.list[0];
-
-              if (spc_before_arg)
-                ADD((char *)spc_before_arg->e.text->text);
-
-              convert_args (argument, result);
-            }
           else if (builtin_command_data[cmd].flags & CF_line
                    || e->type == ET_index_entry_command)
             {
diff --git a/tp/Texinfo/XS/parsetexi/macro.c b/tp/Texinfo/XS/parsetexi/macro.c
index a6677bed86..430c9b4e61 100644
--- a/tp/Texinfo/XS/parsetexi/macro.c
+++ b/tp/Texinfo/XS/parsetexi/macro.c
@@ -138,14 +138,11 @@ parse_macro_command_line (enum command_id cmd, const char 
**line_inout,
   const char *args_ptr;
   STRING_LIST *formal_args;
 
- /* TODO not sure about using lineraw_command. There is an arg_line info,
-    which is consistent with lineraw_command, but the *macro are block
-    commands. block_command could be used instead */
-  macro = new_command_element (ET_lineraw_command, cmd);
+  /* NOTE macro element is block command, but it has extra misc_args like
+     lineraw line commands */
+  macro = new_command_element (ET_block_command, cmd);
   macro->e.c->source_info = current_source_info;
 
-  macro->e.c->string_info[sit_arg_line] = strdup (line);
-
   argument = new_element (ET_argument);
   add_to_element_contents (macro, argument);
 
diff --git a/tp/t/results/alias/alias_macro_target_removed.pl 
b/tp/t/results/alias/alias_macro_target_removed.pl
index 2c8c7dc5c1..8134f7d3c2 100644
--- a/tp/t/results/alias/alias_macro_target_removed.pl
+++ b/tp/t/results/alias/alias_macro_target_removed.pl
@@ -64,10 +64,6 @@ $result_trees{'alias_macro_target_removed'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' mystrong {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/alias/alias_of_macro.pl 
b/tp/t/results/alias/alias_of_macro.pl
index a659a413a8..1839f7b146 100644
--- a/tp/t/results/alias/alias_of_macro.pl
+++ b/tp/t/results/alias/alias_of_macro.pl
@@ -64,10 +64,6 @@ $result_trees{'alias_of_macro'} = {
               'thearg'
             ]
           },
-          'info' => {
-            'arg_line' => ' mymacro {thearg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/alias/alias_of_macro_before_macro.pl 
b/tp/t/results/alias/alias_of_macro_before_macro.pl
index 36b62fb779..9ac796e9df 100644
--- a/tp/t/results/alias/alias_of_macro_before_macro.pl
+++ b/tp/t/results/alias/alias_of_macro_before_macro.pl
@@ -102,10 +102,6 @@ $result_trees{'alias_of_macro_before_macro'} = {
               'thearg'
             ]
           },
-          'info' => {
-            'arg_line' => ' mymacro {thearg}
-'
-          },
           'source_info' => {
             'line_nr' => 3
           }
diff --git a/tp/t/results/alias/texinfo_command_alias.pl 
b/tp/t/results/alias/texinfo_command_alias.pl
index 00c90bc736..db514479d6 100644
--- a/tp/t/results/alias/texinfo_command_alias.pl
+++ b/tp/t/results/alias/texinfo_command_alias.pl
@@ -64,10 +64,6 @@ $result_trees{'texinfo_command_alias'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' mystrong {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/alias/texinfo_command_alias_indirect.pl 
b/tp/t/results/alias/texinfo_command_alias_indirect.pl
index bf1e871940..0636809837 100644
--- a/tp/t/results/alias/texinfo_command_alias_indirect.pl
+++ b/tp/t/results/alias/texinfo_command_alias_indirect.pl
@@ -64,10 +64,6 @@ $result_trees{'texinfo_command_alias_indirect'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' mystrong {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/alias/texinfo_command_alias_indirect_before.pl 
b/tp/t/results/alias/texinfo_command_alias_indirect_before.pl
index 3bc710dd9b..dff2c3f1cd 100644
--- a/tp/t/results/alias/texinfo_command_alias_indirect_before.pl
+++ b/tp/t/results/alias/texinfo_command_alias_indirect_before.pl
@@ -64,10 +64,6 @@ $result_trees{'texinfo_command_alias_indirect_before'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' mystrong {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/conditionals/command_conditionals_user_defined.pl 
b/tp/t/results/conditionals/command_conditionals_user_defined.pl
index cc84e4697f..b346ac5a18 100644
--- a/tp/t/results/conditionals/command_conditionals_user_defined.pl
+++ b/tp/t/results/conditionals/command_conditionals_user_defined.pl
@@ -62,10 +62,6 @@ $result_trees{'command_conditionals_user_defined'} = {
             'macro_name' => 'truc',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' truc
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/conditionals/macro_in_ifset.pl 
b/tp/t/results/conditionals/macro_in_ifset.pl
index 703683476e..f858de5b06 100644
--- a/tp/t/results/conditionals/macro_in_ifset.pl
+++ b/tp/t/results/conditionals/macro_in_ifset.pl
@@ -67,10 +67,6 @@ $result_trees{'macro_in_ifset'} = {
             'macro_name' => 'truc',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' truc {}
-'
-          },
           'source_info' => {
             'line_nr' => 2
           }
diff --git a/tp/t/results/conditionals/macro_in_ifset_set.pl 
b/tp/t/results/conditionals/macro_in_ifset_set.pl
index 67ea8259db..1b2691af68 100644
--- a/tp/t/results/conditionals/macro_in_ifset_set.pl
+++ b/tp/t/results/conditionals/macro_in_ifset_set.pl
@@ -89,10 +89,6 @@ $result_trees{'macro_in_ifset_set'} = {
             'macro_name' => 'truc',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' truc {}
-'
-          },
           'source_info' => {
             'line_nr' => 4
           }
@@ -208,10 +204,6 @@ $result_trees{'macro_in_ifset_set'} = {
             'macro_name' => 'truc',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' truc{}
-'
-          },
           'source_info' => {
             'line_nr' => 10
           },
diff --git a/tp/t/results/conditionals/nested_ifset_ifclear.pl 
b/tp/t/results/conditionals/nested_ifset_ifclear.pl
index 3c55b460a0..0f6975ea0a 100644
--- a/tp/t/results/conditionals/nested_ifset_ifclear.pl
+++ b/tp/t/results/conditionals/nested_ifset_ifclear.pl
@@ -102,10 +102,6 @@ $result_trees{'nested_ifset_ifclear'} = {
             'macro_name' => 'conditionals',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' conditionals{}
-'
-          },
           'source_info' => {
             'line_nr' => 2
           }
diff --git a/tp/t/results/conditionals/user_defined_txiinternalvalue.pl 
b/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
index c07a6b8212..f8bb44e0eb 100644
--- a/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
+++ b/tp/t/results/conditionals/user_defined_txiinternalvalue.pl
@@ -62,10 +62,6 @@ $result_trees{'user_defined_txiinternalvalue'} = {
             'macro_name' => 'txiinternalvalue',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' txiinternalvalue
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/converters_tests/at_commands_in_raw.pl 
b/tp/t/results/converters_tests/at_commands_in_raw.pl
index e45af0bd81..41371a6bb2 100644
--- a/tp/t/results/converters_tests/at_commands_in_raw.pl
+++ b/tp/t/results/converters_tests/at_commands_in_raw.pl
@@ -126,10 +126,6 @@ $result_trees{'at_commands_in_raw'} = {
             'macro_name' => 'othermacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' othermacro{}
-'
-          },
           'source_info' => {
             'line_nr' => 4
           }
diff --git a/tp/t/results/coverage_braces/test_image.pl 
b/tp/t/results/coverage_braces/test_image.pl
index 350669bdaa..f03cf5e08f 100644
--- a/tp/t/results/coverage_braces/test_image.pl
+++ b/tp/t/results/coverage_braces/test_image.pl
@@ -72,10 +72,6 @@ $result_trees{'test_image'} = {
             'macro_name' => 'files-char',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' files-char
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/include/cpp_lines.pl 
b/tp/t/results/include/cpp_lines.pl
index b0a0747ce7..5d6c8bfd2e 100644
--- a/tp/t/results/include/cpp_lines.pl
+++ b/tp/t/results/include/cpp_lines.pl
@@ -309,10 +309,6 @@ $result_trees{'cpp_lines'} = {
             'macro_name' => 'macr',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' macr
-'
-          },
           'source_info' => {
             'file_name' => 'g_f',
             'line_nr' => 53
@@ -482,10 +478,6 @@ $result_trees{'cpp_lines'} = {
             'macro_name' => 'macrtwo',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' macrtwo
-'
-          },
           'source_info' => {
             'file_name' => 'g_f',
             'line_nr' => 63
diff --git a/tp/t/results/include/macro_and_commands_in_early_commands.pl 
b/tp/t/results/include/macro_and_commands_in_early_commands.pl
index 34e3322976..0b7b9381f9 100644
--- a/tp/t/results/include/macro_and_commands_in_early_commands.pl
+++ b/tp/t/results/include/macro_and_commands_in_early_commands.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
             'macro_name' => 'begin-file',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' begin-file
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -195,10 +191,6 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
             'macro_name' => 'latin1',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' latin1 
-'
-          },
           'source_info' => {
             'line_nr' => 7
           }
@@ -331,10 +323,6 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
             'macro_name' => 'multiinclude',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' multiinclude
-'
-          },
           'source_info' => {
             'line_nr' => 13
           }
@@ -554,10 +542,6 @@ $result_trees{'macro_and_commands_in_early_commands'} = {
             'macro_name' => 'themacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' themacro
-'
-          },
           'source_info' => {
             'file_name' => 'macro_included.texi',
             'line_nr' => 1
diff --git a/tp/t/results/include/macro_definition_in_include.pl 
b/tp/t/results/include/macro_definition_in_include.pl
index a2cf8d81d0..72614be909 100644
--- a/tp/t/results/include/macro_definition_in_include.pl
+++ b/tp/t/results/include/macro_definition_in_include.pl
@@ -103,10 +103,6 @@ $result_trees{'macro_definition_in_include'} = {
             'macro_name' => 'themacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' themacro
-'
-          },
           'source_info' => {
             'file_name' => 'macro_included.texi',
             'line_nr' => 1
diff --git a/tp/t/results/include/macro_in_early_commands.pl 
b/tp/t/results/include/macro_in_early_commands.pl
index 5151586f41..0b564600b5 100644
--- a/tp/t/results/include/macro_in_early_commands.pl
+++ b/tp/t/results/include/macro_in_early_commands.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_in_early_commands'} = {
             'macro_name' => 'begin-file',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' begin-file
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -125,10 +121,6 @@ $result_trees{'macro_in_early_commands'} = {
               'ext'
             ]
           },
-          'info' => {
-            'arg_line' => ' end-file-name {ext}
-'
-          },
           'source_info' => {
             'line_nr' => 4
           }
@@ -281,10 +273,6 @@ $result_trees{'macro_in_early_commands'} = {
             'macro_name' => 'latin1',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' latin1 
-'
-          },
           'source_info' => {
             'line_nr' => 10
           }
@@ -347,10 +335,6 @@ $result_trees{'macro_in_early_commands'} = {
             'macro_name' => 'documentencoding-command',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' documentencoding-command
-'
-          },
           'source_info' => {
             'line_nr' => 14
           }
@@ -501,10 +485,6 @@ $result_trees{'macro_in_early_commands'} = {
             'macro_name' => 'multiinclude',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' multiinclude
-'
-          },
           'source_info' => {
             'line_nr' => 20
           }
@@ -724,10 +704,6 @@ $result_trees{'macro_in_early_commands'} = {
             'macro_name' => 'themacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' themacro
-'
-          },
           'source_info' => {
             'file_name' => 'macro_included.texi',
             'line_nr' => 1
diff --git a/tp/t/results/info_tests/def_in_copying.pl 
b/tp/t/results/info_tests/def_in_copying.pl
index 34eb2101df..8473d2e5df 100644
--- a/tp/t/results/info_tests/def_in_copying.pl
+++ b/tp/t/results/info_tests/def_in_copying.pl
@@ -77,10 +77,6 @@ $result_trees{'def_in_copying'} = {
             'macro_name' => 'mymacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' mymacro
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/api_doc_with_linemacro.pl 
b/tp/t/results/linemacro/api_doc_with_linemacro.pl
index 8e63215b3e..6e8a336e62 100644
--- a/tp/t/results/linemacro/api_doc_with_linemacro.pl
+++ b/tp/t/results/linemacro/api_doc_with_linemacro.pl
@@ -65,10 +65,6 @@ $result_trees{'api_doc_with_linemacro'} = {
               'type'
             ]
           },
-          'info' => {
-            'arg_line' => ' param {param, type}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -129,10 +125,6 @@ $result_trees{'api_doc_with_linemacro'} = {
               'type'
             ]
           },
-          'info' => {
-            'arg_line' => ' returns {param, type}
-'
-          },
           'source_info' => {
             'line_nr' => 4
           }
@@ -192,10 +184,6 @@ $result_trees{'api_doc_with_linemacro'} = {
               'exception'
             ]
           },
-          'info' => {
-            'arg_line' => ' raises {exception}
-'
-          },
           'source_info' => {
             'line_nr' => 7
           }
diff --git a/tp/t/results/linemacro/arobase_brace_in_linemacro_call.pl 
b/tp/t/results/linemacro/arobase_brace_in_linemacro_call.pl
index 04b645afde..bcdd4d687d 100644
--- a/tp/t/results/linemacro/arobase_brace_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/arobase_brace_in_linemacro_call.pl
@@ -70,10 +70,6 @@ $result_trees{'arobase_brace_in_linemacro_call'} = {
               'arg2'
             ]
           },
-          'info' => {
-            'arg_line' => ' simplemac { arg1 , arg2 }
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/begin_conditional_in_linemacro.pl 
b/tp/t/results/linemacro/begin_conditional_in_linemacro.pl
index 5b2a66ad2d..fe0d95515b 100644
--- a/tp/t/results/linemacro/begin_conditional_in_linemacro.pl
+++ b/tp/t/results/linemacro/begin_conditional_in_linemacro.pl
@@ -64,10 +64,6 @@ $result_trees{'begin_conditional_in_linemacro'} = {
               'a'
             ]
           },
-          'info' => {
-            'arg_line' => ' lm {a}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl 
b/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
index b2f3696a10..568135853d 100644
--- a/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/block_begin_end_in_linemacro_call.pl
@@ -64,10 +64,6 @@ $result_trees{'block_begin_end_in_linemacro_call'} = {
               'a'
             ]
           },
-          'info' => {
-            'arg_line' => ' lm {a}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -707,10 +703,6 @@ args \\e\\|\\f\\|
                   'f'
                 ]
               },
-              'info' => {
-                'arg_line' => ' mymac {e, f}
-'
-              },
               'source_info' => {
                 'line_nr' => 34,
                 'macro' => 'lm'
diff --git a/tp/t/results/linemacro/blockitem_no_item.pl 
b/tp/t/results/linemacro/blockitem_no_item.pl
index 487a2edb9e..33efdb89f5 100644
--- a/tp/t/results/linemacro/blockitem_no_item.pl
+++ b/tp/t/results/linemacro/blockitem_no_item.pl
@@ -66,10 +66,6 @@ $result_trees{'blockitem_no_item'} = {
               'c'
             ]
           },
-          'info' => {
-            'arg_line' => ' mycommand {a, b, c}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/brace_command_not_closed.pl 
b/tp/t/results/linemacro/brace_command_not_closed.pl
index cc5f10c8a2..28bcc11249 100644
--- a/tp/t/results/linemacro/brace_command_not_closed.pl
+++ b/tp/t/results/linemacro/brace_command_not_closed.pl
@@ -66,10 +66,6 @@ $result_trees{'brace_command_not_closed'} = {
               'c'
             ]
           },
-          'info' => {
-            'arg_line' => ' mycommand {a, b, c}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/braces_after_text.pl 
b/tp/t/results/linemacro/braces_after_text.pl
index 2386257a0a..8491372628 100644
--- a/tp/t/results/linemacro/braces_after_text.pl
+++ b/tp/t/results/linemacro/braces_after_text.pl
@@ -66,10 +66,6 @@ $result_trees{'braces_after_text'} = {
               'c'
             ]
           },
-          'info' => {
-            'arg_line' => ' mymacro {a, b, c}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/call_macro_in_linemacro_body.pl 
b/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
index 191ca97bdd..4197da6c9e 100644
--- a/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
+++ b/tp/t/results/linemacro/call_macro_in_linemacro_body.pl
@@ -75,10 +75,6 @@ $result_trees{'call_macro_in_linemacro_body'} = {
               'b'
             ]
           },
-          'info' => {
-            'arg_line' => ' lm {a, b}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -154,10 +150,6 @@ $result_trees{'call_macro_in_linemacro_body'} = {
               'd'
             ]
           },
-          'info' => {
-            'arg_line' => ' mymacro {c, d}
-'
-          },
           'source_info' => {
             'line_nr' => 7
           }
diff --git a/tp/t/results/linemacro/call_macro_in_linemacro_call.pl 
b/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
index 0a558decd7..5e80b8e19d 100644
--- a/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/call_macro_in_linemacro_call.pl
@@ -70,10 +70,6 @@ $result_trees{'call_macro_in_linemacro_call'} = {
               'b'
             ]
           },
-          'info' => {
-            'arg_line' => ' lm {a, b}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -149,10 +145,6 @@ $result_trees{'call_macro_in_linemacro_call'} = {
               'd'
             ]
           },
-          'info' => {
-            'arg_line' => ' mymacro {c, d}
-'
-          },
           'source_info' => {
             'line_nr' => 6
           }
diff --git a/tp/t/results/linemacro/comment_at_end_of_linemacro_call.pl 
b/tp/t/results/linemacro/comment_at_end_of_linemacro_call.pl
index e92de8fbbf..374b7ad7a8 100644
--- a/tp/t/results/linemacro/comment_at_end_of_linemacro_call.pl
+++ b/tp/t/results/linemacro/comment_at_end_of_linemacro_call.pl
@@ -70,10 +70,6 @@ $result_trees{'comment_at_end_of_linemacro_call'} = {
               'b'
             ]
           },
-          'info' => {
-            'arg_line' => ' lm {a, b}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/comment_in_linemacro_call.pl 
b/tp/t/results/linemacro/comment_in_linemacro_call.pl
index 6d26dd4e95..6d9b3547a9 100644
--- a/tp/t/results/linemacro/comment_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/comment_in_linemacro_call.pl
@@ -70,10 +70,6 @@ $result_trees{'comment_in_linemacro_call'} = {
               'b'
             ]
           },
-          'info' => {
-            'arg_line' => ' lm {a, b}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/comment_in_one_argument_linemacro_call.pl 
b/tp/t/results/linemacro/comment_in_one_argument_linemacro_call.pl
index f201f1bf66..6238fe29f9 100644
--- a/tp/t/results/linemacro/comment_in_one_argument_linemacro_call.pl
+++ b/tp/t/results/linemacro/comment_in_one_argument_linemacro_call.pl
@@ -64,10 +64,6 @@ $result_trees{'comment_in_one_argument_linemacro_call'} = {
               'a'
             ]
           },
-          'info' => {
-            'arg_line' => ' lm {a}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git 
a/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl 
b/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
index d78cd98a19..b1b2892282 100644
--- a/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
+++ b/tp/t/results/linemacro/comment_on_linemacro_call_macro_expansion.pl
@@ -70,10 +70,6 @@ $result_trees{'comment_on_linemacro_call_macro_expansion'} = 
{
               'b'
             ]
           },
-          'info' => {
-            'arg_line' => ' lm {a, b}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -143,10 +139,6 @@ $result_trees{'comment_on_linemacro_call_macro_expansion'} 
= {
               'a'
             ]
           },
-          'info' => {
-            'arg_line' => ' mymacro {a}
-'
-          },
           'source_info' => {
             'line_nr' => 6
           }
diff --git a/tp/t/results/linemacro/comment_on_linemacro_call_out_of_braces.pl 
b/tp/t/results/linemacro/comment_on_linemacro_call_out_of_braces.pl
index 06af228298..669940f904 100644
--- a/tp/t/results/linemacro/comment_on_linemacro_call_out_of_braces.pl
+++ b/tp/t/results/linemacro/comment_on_linemacro_call_out_of_braces.pl
@@ -76,10 +76,6 @@ $result_trees{'comment_on_linemacro_call_out_of_braces'} = {
               'c'
             ]
           },
-          'info' => {
-            'arg_line' => ' lm {a, b, c}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/empty_last_argument.pl 
b/tp/t/results/linemacro/empty_last_argument.pl
index a3d2f7461e..ba7d500f05 100644
--- a/tp/t/results/linemacro/empty_last_argument.pl
+++ b/tp/t/results/linemacro/empty_last_argument.pl
@@ -102,10 +102,6 @@ $result_trees{'empty_last_argument'} = {
               'rest'
             ]
           },
-          'info' => {
-            'arg_line' => ' defbuiltin {symbol, rest}
-'
-          },
           'source_info' => {
             'line_nr' => 2
           }
diff --git a/tp/t/results/linemacro/end_conditional_in_linemacro.pl 
b/tp/t/results/linemacro/end_conditional_in_linemacro.pl
index 5bd5294bf9..4c4efae343 100644
--- a/tp/t/results/linemacro/end_conditional_in_linemacro.pl
+++ b/tp/t/results/linemacro/end_conditional_in_linemacro.pl
@@ -64,10 +64,6 @@ $result_trees{'end_conditional_in_linemacro'} = {
               'a'
             ]
           },
-          'info' => {
-            'arg_line' => ' lm {a}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/last_argument_with_braces.pl 
b/tp/t/results/linemacro/last_argument_with_braces.pl
index 1929099ad5..ce2b2357a7 100644
--- a/tp/t/results/linemacro/last_argument_with_braces.pl
+++ b/tp/t/results/linemacro/last_argument_with_braces.pl
@@ -70,10 +70,6 @@ $result_trees{'last_argument_with_braces'} = {
               'rest'
             ]
           },
-          'info' => {
-            'arg_line' => ' defbuiltin {symbol, rest}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/missing_formal_arg.pl 
b/tp/t/results/linemacro/missing_formal_arg.pl
index 130d8c08d5..9cd427b36f 100644
--- a/tp/t/results/linemacro/missing_formal_arg.pl
+++ b/tp/t/results/linemacro/missing_formal_arg.pl
@@ -67,10 +67,6 @@ $result_trees{'missing_formal_arg'} = {
               'b'
             ]
           },
-          'info' => {
-            'arg_line' => ' mymacro {a, , b}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/nested_linemacro_calls.pl 
b/tp/t/results/linemacro/nested_linemacro_calls.pl
index 2cd0070fca..945c2dee9f 100644
--- a/tp/t/results/linemacro/nested_linemacro_calls.pl
+++ b/tp/t/results/linemacro/nested_linemacro_calls.pl
@@ -65,10 +65,6 @@ $result_trees{'nested_linemacro_calls'} = {
               'b'
             ]
           },
-          'info' => {
-            'arg_line' => ' inside {a, b}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -140,10 +136,6 @@ $result_trees{'nested_linemacro_calls'} = {
               'three'
             ]
           },
-          'info' => {
-            'arg_line' => ' outside {one, two, three}
-'
-          },
           'source_info' => {
             'line_nr' => 5
           }
diff --git a/tp/t/results/linemacro/newline_and_continuation_in_brace.pl 
b/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
index b8d33a1b91..017b6d92f5 100644
--- a/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
+++ b/tp/t/results/linemacro/newline_and_continuation_in_brace.pl
@@ -71,10 +71,6 @@ $result_trees{'newline_and_continuation_in_brace'} = {
               'rest'
             ]
           },
-          'info' => {
-            'arg_line' => ' mylinecommand {first, second, rest}
-'
-          },
           'source_info' => {
             'line_nr' => 2
           }
diff --git a/tp/t/results/linemacro/no_arguments.pl 
b/tp/t/results/linemacro/no_arguments.pl
index daeebd6a87..1e468f72ad 100644
--- a/tp/t/results/linemacro/no_arguments.pl
+++ b/tp/t/results/linemacro/no_arguments.pl
@@ -62,10 +62,6 @@ $result_trees{'no_arguments'} = {
             'macro_name' => 'noarg',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' noarg
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/paragraph_no_paragraph.pl 
b/tp/t/results/linemacro/paragraph_no_paragraph.pl
index 38a16695c5..8fb2ceb629 100644
--- a/tp/t/results/linemacro/paragraph_no_paragraph.pl
+++ b/tp/t/results/linemacro/paragraph_no_paragraph.pl
@@ -66,10 +66,6 @@ $result_trees{'paragraph_no_paragraph'} = {
               'c'
             ]
           },
-          'info' => {
-            'arg_line' => ' mycommand {a, b, c}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/protected_spaces_on_line.pl 
b/tp/t/results/linemacro/protected_spaces_on_line.pl
index 94d0959197..79f75d14a1 100644
--- a/tp/t/results/linemacro/protected_spaces_on_line.pl
+++ b/tp/t/results/linemacro/protected_spaces_on_line.pl
@@ -75,10 +75,6 @@ $result_trees{'protected_spaces_on_line'} = {
               'rest'
             ]
           },
-          'info' => {
-            'arg_line' => ' test {first, rest}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl 
b/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl
index 3cc35dafab..2d8af7d974 100644
--- a/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl
+++ b/tp/t/results/linemacro/protection_of_end_of_line_by_command.pl
@@ -64,10 +64,6 @@ $result_trees{'protection_of_end_of_line_by_command'} = {
               'one'
             ]
           },
-          'info' => {
-            'arg_line' => ' lm {one}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/recursive_linemacro_in_body.pl 
b/tp/t/results/linemacro/recursive_linemacro_in_body.pl
index addda88326..92c04610f1 100644
--- a/tp/t/results/linemacro/recursive_linemacro_in_body.pl
+++ b/tp/t/results/linemacro/recursive_linemacro_in_body.pl
@@ -65,10 +65,6 @@ $result_trees{'recursive_linemacro_in_body'} = {
               'other'
             ]
           },
-          'info' => {
-            'arg_line' => ' anorecurse {arg, other}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/recursive_linemacro_in_call.pl 
b/tp/t/results/linemacro/recursive_linemacro_in_call.pl
index 6208d968c9..a7113121bf 100644
--- a/tp/t/results/linemacro/recursive_linemacro_in_call.pl
+++ b/tp/t/results/linemacro/recursive_linemacro_in_call.pl
@@ -65,10 +65,6 @@ $result_trees{'recursive_linemacro_in_call'} = {
               'other'
             ]
           },
-          'info' => {
-            'arg_line' => ' anorecurse {arg, other}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/simple_nested_linemacro_calls.pl 
b/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
index 106719ec7d..21c1ded016 100644
--- a/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
+++ b/tp/t/results/linemacro/simple_nested_linemacro_calls.pl
@@ -94,10 +94,6 @@ $result_trees{'simple_nested_linemacro_calls'} = {
               'rest'
             ]
           },
-          'info' => {
-            'arg_line' => ' inside {a, b, rest}
-'
-          },
           'source_info' => {
             'line_nr' => 3
           }
@@ -169,10 +165,6 @@ $result_trees{'simple_nested_linemacro_calls'} = {
               'three'
             ]
           },
-          'info' => {
-            'arg_line' => ' outside {one, two, three}
-'
-          },
           'source_info' => {
             'line_nr' => 7
           }
diff --git a/tp/t/results/linemacro/spaces_after_command_in_call.pl 
b/tp/t/results/linemacro/spaces_after_command_in_call.pl
index d1343e05f0..ca577617f0 100644
--- a/tp/t/results/linemacro/spaces_after_command_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_command_in_call.pl
@@ -76,10 +76,6 @@ $result_trees{'spaces_after_command_in_call'} = {
               'rest'
             ]
           },
-          'info' => {
-            'arg_line' => ' mylinecommand {first, second, rest}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git 
a/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl 
b/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl
index 3425b0d095..b80d540557 100644
--- a/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_macro_linemacro_commands_in_call.pl
@@ -76,10 +76,6 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
               'rest'
             ]
           },
-          'info' => {
-            'arg_line' => ' mylinecommand {first, second, rest}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -144,10 +140,6 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
               'arg1'
             ]
           },
-          'info' => {
-            'arg_line' => ' mymac {arg1}
-'
-          },
           'source_info' => {
             'line_nr' => 7
           }
@@ -213,10 +205,6 @@ 
$result_trees{'spaces_after_macro_linemacro_commands_in_call'} = {
               'rest'
             ]
           },
-          'info' => {
-            'arg_line' => ' mylinemac {name, rest}
-'
-          },
           'source_info' => {
             'line_nr' => 11
           }
diff --git a/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl 
b/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl
index 77fefe61fb..795cac30cb 100644
--- a/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl
+++ b/tp/t/results/linemacro/spaces_after_unknown_command_in_call.pl
@@ -76,10 +76,6 @@ $result_trees{'spaces_after_unknown_command_in_call'} = {
               'rest'
             ]
           },
-          'info' => {
-            'arg_line' => ' mylinecommand {first, second, rest}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/spaces_in_args.pl 
b/tp/t/results/linemacro/spaces_in_args.pl
index 7dc5a6bc8d..603417ce35 100644
--- a/tp/t/results/linemacro/spaces_in_args.pl
+++ b/tp/t/results/linemacro/spaces_in_args.pl
@@ -76,10 +76,6 @@ $result_trees{'spaces_in_args'} = {
               'rest'
             ]
           },
-          'info' => {
-            'arg_line' => ' mylinecommand {first, second, rest}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/spaces_in_call.pl 
b/tp/t/results/linemacro/spaces_in_call.pl
index 808b2d242c..4ba1810f6d 100644
--- a/tp/t/results/linemacro/spaces_in_call.pl
+++ b/tp/t/results/linemacro/spaces_in_call.pl
@@ -76,10 +76,6 @@ $result_trees{'spaces_in_call'} = {
               'rest'
             ]
           },
-          'info' => {
-            'arg_line' => ' mylinecommand {first, second, rest}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/text_arguments.pl 
b/tp/t/results/linemacro/text_arguments.pl
index 27ea93b247..2565b40bd3 100644
--- a/tp/t/results/linemacro/text_arguments.pl
+++ b/tp/t/results/linemacro/text_arguments.pl
@@ -66,10 +66,6 @@ $result_trees{'text_arguments'} = {
               'three'
             ]
           },
-          'info' => {
-            'arg_line' => ' nospace{one, two, three}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/verb_in_linemacro_call.pl 
b/tp/t/results/linemacro/verb_in_linemacro_call.pl
index 19b8d54ee5..18d7d89650 100644
--- a/tp/t/results/linemacro/verb_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/verb_in_linemacro_call.pl
@@ -82,10 +82,6 @@ $result_trees{'verb_in_linemacro_call'} = {
               'd'
             ]
           },
-          'info' => {
-            'arg_line' => ' mycommand {a, b, c, d}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/verb_not_closed.pl 
b/tp/t/results/linemacro/verb_not_closed.pl
index 583994f7f6..dbb5056035 100644
--- a/tp/t/results/linemacro/verb_not_closed.pl
+++ b/tp/t/results/linemacro/verb_not_closed.pl
@@ -66,10 +66,6 @@ $result_trees{'verb_not_closed'} = {
               'c'
             ]
           },
-          'info' => {
-            'arg_line' => ' mycommand {a, b, c}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/verb_with_arobase_in_linemacro_call.pl 
b/tp/t/results/linemacro/verb_with_arobase_in_linemacro_call.pl
index fe0737ae23..dd6d0a2c98 100644
--- a/tp/t/results/linemacro/verb_with_arobase_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/verb_with_arobase_in_linemacro_call.pl
@@ -66,10 +66,6 @@ $result_trees{'verb_with_arobase_in_linemacro_call'} = {
               'c'
             ]
           },
-          'info' => {
-            'arg_line' => ' mycommand {a, b, c}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/linemacro/verb_with_brace_in_linemacro_call.pl 
b/tp/t/results/linemacro/verb_with_brace_in_linemacro_call.pl
index 859e7ebb44..aacd97934a 100644
--- a/tp/t/results/linemacro/verb_with_brace_in_linemacro_call.pl
+++ b/tp/t/results/linemacro/verb_with_brace_in_linemacro_call.pl
@@ -66,10 +66,6 @@ $result_trees{'verb_with_brace_in_linemacro_call'} = {
               'c'
             ]
           },
-          'info' => {
-            'arg_line' => ' mycommand {a, b, c}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/arg_body_expansion_order.pl 
b/tp/t/results/macro/arg_body_expansion_order.pl
index 7a02c5c2cb..3c0a21fdf4 100644
--- a/tp/t/results/macro/arg_body_expansion_order.pl
+++ b/tp/t/results/macro/arg_body_expansion_order.pl
@@ -67,10 +67,6 @@ $result_trees{'arg_body_expansion_order'} = {
             'macro_name' => 'othermacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' othermacro
-'
-          },
           'source_info' => {
             'line_nr' => 2
           }
@@ -155,10 +151,6 @@ $result_trees{'arg_body_expansion_order'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' redefineothermacro {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 6
           }
@@ -259,10 +251,6 @@ $result_trees{'arg_body_expansion_order'} = {
             'macro_name' => 'othermacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' othermacro
-'
-          },
           'source_info' => {
             'line_nr' => 14,
             'macro' => 'redefineothermacro'
diff --git a/tp/t/results/macro/arg_not_closed.pl 
b/tp/t/results/macro/arg_not_closed.pl
index d14a8599f7..2365c531b3 100644
--- a/tp/t/results/macro/arg_not_closed.pl
+++ b/tp/t/results/macro/arg_not_closed.pl
@@ -64,10 +64,6 @@ $result_trees{'arg_not_closed'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' foo {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/arobase_brace_in_macro_call.pl 
b/tp/t/results/macro/arobase_brace_in_macro_call.pl
index 0c30a3b017..46e5b9dd8a 100644
--- a/tp/t/results/macro/arobase_brace_in_macro_call.pl
+++ b/tp/t/results/macro/arobase_brace_in_macro_call.pl
@@ -70,10 +70,6 @@ $result_trees{'arobase_brace_in_macro_call'} = {
               'arg2'
             ]
           },
-          'info' => {
-            'arg_line' => ' simplemac { arg1 , arg2 }
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/backslash_in_arg.pl 
b/tp/t/results/macro/backslash_in_arg.pl
index c26fa1a580..dcb4847216 100644
--- a/tp/t/results/macro/backslash_in_arg.pl
+++ b/tp/t/results/macro/backslash_in_arg.pl
@@ -128,10 +128,6 @@ $result_trees{'backslash_in_arg'} = {
               'TEXT'
             ]
           },
-          'info' => {
-            'arg_line' => ' funindex {TEXT}
-'
-          },
           'source_info' => {
             'line_nr' => 4
           }
diff --git a/tp/t/results/macro/bad_argument.pl 
b/tp/t/results/macro/bad_argument.pl
index f8ad34100e..b1f4e91b8c 100644
--- a/tp/t/results/macro/bad_argument.pl
+++ b/tp/t/results/macro/bad_argument.pl
@@ -61,10 +61,6 @@ $result_trees{'bad_argument'} = {
           'extra' => {
             'invalid_syntax' => 1
           },
-          'info' => {
-            'arg_line' => '
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -128,10 +124,6 @@ $result_trees{'bad_argument'} = {
             'macro_name' => 'abar',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' abar aaa
-'
-          },
           'source_info' => {
             'line_nr' => 5
           }
@@ -197,10 +189,6 @@ $result_trees{'bad_argument'} = {
               'ggg'
             ]
           },
-          'info' => {
-            'arg_line' => ' aftername {ggg} more  
-'
-          },
           'source_info' => {
             'line_nr' => 9
           }
@@ -262,10 +250,6 @@ $result_trees{'bad_argument'} = {
           'extra' => {
             'invalid_syntax' => 1
           },
-          'info' => {
-            'arg_line' => ' #badname
-'
-          },
           'source_info' => {
             'line_nr' => 13
           }
diff --git a/tp/t/results/macro/bad_formal_arg.pl 
b/tp/t/results/macro/bad_formal_arg.pl
index 097c179dc2..8cde694d3f 100644
--- a/tp/t/results/macro/bad_formal_arg.pl
+++ b/tp/t/results/macro/bad_formal_arg.pl
@@ -71,10 +71,6 @@ $result_trees{'bad_formal_arg'} = {
               'not_empty'
             ]
           },
-          'info' => {
-            'arg_line' => ' bad  { , not_empty}
-'
-          },
           'source_info' => {
             'line_nr' => 2
           }
@@ -141,10 +137,6 @@ $result_trees{'bad_formal_arg'} = {
               'in 2arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' badspace{first, in 2arg}
-'
-          },
           'source_info' => {
             'line_nr' => 6
           }
@@ -225,10 +217,6 @@ $result_trees{'bad_formal_arg'} = {
               ':::'
             ]
           },
-          'info' => {
-            'arg_line' => ' abar {:::}
-'
-          },
           'source_info' => {
             'line_nr' => 10
           }
diff --git a/tp/t/results/macro/bad_macro_name_with_underscore.pl 
b/tp/t/results/macro/bad_macro_name_with_underscore.pl
index a435afc07f..d151678fcb 100644
--- a/tp/t/results/macro/bad_macro_name_with_underscore.pl
+++ b/tp/t/results/macro/bad_macro_name_with_underscore.pl
@@ -65,10 +65,6 @@ $result_trees{'bad_macro_name_with_underscore'} = {
               'arg2'
             ]
           },
-          'info' => {
-            'arg_line' => ' the_macro {arg1, arg2}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/bib_example.pl 
b/tp/t/results/macro/bib_example.pl
index b041ae5d0c..70d46def3e 100644
--- a/tp/t/results/macro/bib_example.pl
+++ b/tp/t/results/macro/bib_example.pl
@@ -1794,10 +1794,6 @@ $result_trees{'bib_example'} = {
                   'node'
                 ]
               },
-              'info' => {
-                'arg_line' => ' mybibsetrefnode{node}
-'
-              },
               'source_info' => {
                 'file_name' => 'my-bib-macros.texi',
                 'line_nr' => 162
@@ -1887,10 +1883,6 @@ $result_trees{'bib_example'} = {
                 'macro_name' => 'mybibnode',
                 'misc_args' => []
               },
-              'info' => {
-                'arg_line' => ' mybibnode{}
-'
-              },
               'source_info' => {
                 'file_name' => 'my-bib-macros.texi',
                 'line_nr' => 169
@@ -2002,10 +1994,6 @@ $result_trees{'bib_example'} = {
                   'node'
                 ]
               },
-              'info' => {
-                'arg_line' => ' mybibusetable{node}
-'
-              },
               'source_info' => {
                 'file_name' => 'my-bib-macros.texi',
                 'line_nr' => 176
@@ -2117,10 +2105,6 @@ $result_trees{'bib_example'} = {
                   'node'
                 ]
               },
-              'info' => {
-                'arg_line' => ' mybibuselist{node}
-'
-              },
               'source_info' => {
                 'file_name' => 'my-bib-macros.texi',
                 'line_nr' => 187
@@ -2242,10 +2226,6 @@ $result_trees{'bib_example'} = {
                   'ref'
                 ]
               },
-              'info' => {
-                'arg_line' => ' mybibcite{ref}
-'
-              },
               'source_info' => {
                 'file_name' => 'my-bib-macros.texi',
                 'line_nr' => 198
@@ -2313,10 +2293,6 @@ $result_trees{'bib_example'} = {
                   'ref'
                 ]
               },
-              'info' => {
-                'arg_line' => ' mybibmakeref{node, ref}
-'
-              },
               'source_info' => {
                 'file_name' => 'my-bib-macros.texi',
                 'line_nr' => 209
@@ -2463,10 +2439,6 @@ $result_trees{'bib_example'} = {
                   'ref'
                 ]
               },
-              'info' => {
-                'arg_line' => ' mybibitem{ref}
-'
-              },
               'source_info' => {
                 'file_name' => 'my-bib-macros.texi',
                 'line_nr' => 215
diff --git a/tp/t/results/macro/bye_in_macro.pl 
b/tp/t/results/macro/bye_in_macro.pl
index a7049703bb..c72b2422b5 100644
--- a/tp/t/results/macro/bye_in_macro.pl
+++ b/tp/t/results/macro/bye_in_macro.pl
@@ -77,10 +77,6 @@ $result_trees{'bye_in_macro'} = {
             'macro_name' => 'byeinmacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' byeinmacro
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git 
a/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl 
b/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
index d63b9b4b25..03a280eaf8 100644
--- a/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
+++ b/tp/t/results/macro/closing_brace_in_macro_call_in_ignored_inline.pl
@@ -62,10 +62,6 @@ 
$result_trees{'closing_brace_in_macro_call_in_ignored_inline'} = {
             'macro_name' => 'closebrace',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' closebrace
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/complete_macro_for_end.pl 
b/tp/t/results/macro/complete_macro_for_end.pl
index c3100dc55e..734c45e159 100644
--- a/tp/t/results/macro/complete_macro_for_end.pl
+++ b/tp/t/results/macro/complete_macro_for_end.pl
@@ -62,10 +62,6 @@ $result_trees{'complete_macro_for_end'} = {
             'macro_name' => 'theend',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' theend
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/complex_argument.pl 
b/tp/t/results/macro/complex_argument.pl
index 26132725de..3d79eb34c0 100644
--- a/tp/t/results/macro/complex_argument.pl
+++ b/tp/t/results/macro/complex_argument.pl
@@ -64,10 +64,6 @@ $result_trees{'complex_argument'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' macrotwo{arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -145,10 +141,6 @@ $result_trees{'complex_argument'} = {
             'macro_name' => 'macrofour',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' macrofour {}
-'
-          },
           'source_info' => {
             'line_nr' => 5
           }
@@ -219,10 +211,6 @@ $result_trees{'complex_argument'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' macrothree{text, arg}
-'
-          },
           'source_info' => {
             'line_nr' => 12
           }
@@ -626,10 +614,6 @@ macroseven defined
               'truc'
             ]
           },
-          'info' => {
-            'arg_line' => ' macroseven {truc}
-'
-          },
           'source_info' => {
             'line_nr' => 38,
             'macro' => 'macrothree'
diff --git a/tp/t/results/macro/cpp_directives_after_macros.pl 
b/tp/t/results/macro/cpp_directives_after_macros.pl
index 759da7c842..a7d0aea40f 100644
--- a/tp/t/results/macro/cpp_directives_after_macros.pl
+++ b/tp/t/results/macro/cpp_directives_after_macros.pl
@@ -75,10 +75,6 @@ $result_trees{'cpp_directives_after_macros'} = {
                 'macro_name' => 'noargsspaces',
                 'misc_args' => []
               },
-              'info' => {
-                'arg_line' => ' noargsspaces
-'
-              },
               'source_info' => {
                 'file_name' => 'cpp_directives_after_macros.texi',
                 'line_nr' => 2
@@ -143,10 +139,6 @@ $result_trees{'cpp_directives_after_macros'} = {
                 'macro_name' => 'emptyexpansion',
                 'misc_args' => []
               },
-              'info' => {
-                'arg_line' => ' emptyexpansion
-'
-              },
               'source_info' => {
                 'file_name' => 'cpp_directives_after_macros.texi',
                 'line_nr' => 6
diff --git a/tp/t/results/macro/cpp_directives_in_macro.pl 
b/tp/t/results/macro/cpp_directives_in_macro.pl
index 0fa05aa505..4f2df51b34 100644
--- a/tp/t/results/macro/cpp_directives_in_macro.pl
+++ b/tp/t/results/macro/cpp_directives_in_macro.pl
@@ -77,10 +77,6 @@ $result_trees{'cpp_directives_in_macro'} = {
                   'out'
                 ]
               },
-              'info' => {
-                'arg_line' => ' simplemacro{out}
-'
-              },
               'source_info' => {
                 'file_name' => 'cpp_directives_in_macro.texi',
                 'line_nr' => 2
diff --git a/tp/t/results/macro/cpp_directives_line_value_macro.pl 
b/tp/t/results/macro/cpp_directives_line_value_macro.pl
index 827df57107..79aedbec4d 100644
--- a/tp/t/results/macro/cpp_directives_line_value_macro.pl
+++ b/tp/t/results/macro/cpp_directives_line_value_macro.pl
@@ -75,10 +75,6 @@ $result_trees{'cpp_directives_line_value_macro'} = {
                 'macro_name' => 'vvv',
                 'misc_args' => []
               },
-              'info' => {
-                'arg_line' => ' vvv {}
-'
-              },
               'source_info' => {
                 'file_name' => 'cpp_directives_line_value_macro.texi',
                 'line_nr' => 2
@@ -184,10 +180,6 @@ $result_trees{'cpp_directives_line_value_macro'} = {
             'macro_name' => 'machash',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' machash {}
-'
-          },
           'source_info' => {
             'file_name' => 'cpp_directives_line_value_macro.texi',
             'line_nr' => 8
@@ -292,10 +284,6 @@ $result_trees{'cpp_directives_line_value_macro'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' numberfileflag {arg}
-'
-          },
           'source_info' => {
             'file_name' => 'cpp_directives_line_value_macro.texi',
             'line_nr' => 14
diff --git a/tp/t/results/macro/definfoenclose_replaced_by_macro.pl 
b/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
index 7d8afbaa82..79a5e5d188 100644
--- a/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
+++ b/tp/t/results/macro/definfoenclose_replaced_by_macro.pl
@@ -103,10 +103,6 @@ $result_trees{'definfoenclose_replaced_by_macro'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' phoo {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 3
           }
diff --git a/tp/t/results/macro/double_macro_definition.pl 
b/tp/t/results/macro/double_macro_definition.pl
index df91823168..e05654cacb 100644
--- a/tp/t/results/macro/double_macro_definition.pl
+++ b/tp/t/results/macro/double_macro_definition.pl
@@ -57,10 +57,6 @@ $result_trees{'double_macro_definition'} = {
             'macro_name' => 'foo',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' foo
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -118,10 +114,6 @@ $result_trees{'double_macro_definition'} = {
             'macro_name' => 'foo',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' foo
-'
-          },
           'source_info' => {
             'line_nr' => 4
           }
diff --git a/tp/t/results/macro/double_recursive_macro_call.pl 
b/tp/t/results/macro/double_recursive_macro_call.pl
index ebad5630dd..f9103c83d8 100644
--- a/tp/t/results/macro/double_recursive_macro_call.pl
+++ b/tp/t/results/macro/double_recursive_macro_call.pl
@@ -69,10 +69,6 @@ $result_trees{'double_recursive_macro_call'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' macone {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 2
           }
@@ -137,10 +133,6 @@ $result_trees{'double_recursive_macro_call'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' mactwo{arg}
-'
-          },
           'source_info' => {
             'line_nr' => 6
           }
diff --git a/tp/t/results/macro/empty_end.pl b/tp/t/results/macro/empty_end.pl
index 31530e7adf..2a2caf9931 100644
--- a/tp/t/results/macro/empty_end.pl
+++ b/tp/t/results/macro/empty_end.pl
@@ -58,10 +58,6 @@ $result_trees{'empty_end'} = {
               'aaa'
             ]
           },
-          'info' => {
-            'arg_line' => ' foo {aaa, }
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/empty_macro_argument.pl 
b/tp/t/results/macro/empty_macro_argument.pl
index 9efd27493c..5bf10a2a5e 100644
--- a/tp/t/results/macro/empty_macro_argument.pl
+++ b/tp/t/results/macro/empty_macro_argument.pl
@@ -62,10 +62,6 @@ $result_trees{'empty_macro_argument'} = {
             'macro_name' => 'mymacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' mymacro{}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -257,10 +253,6 @@ $result_trees{'empty_macro_argument'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' mytwo{arg}
-'
-          },
           'source_info' => {
             'line_nr' => 7
           }
diff --git a/tp/t/results/macro/empty_macro_in_text_no_arg.pl 
b/tp/t/results/macro/empty_macro_in_text_no_arg.pl
index c644fd81bb..156c180acd 100644
--- a/tp/t/results/macro/empty_macro_in_text_no_arg.pl
+++ b/tp/t/results/macro/empty_macro_in_text_no_arg.pl
@@ -57,10 +57,6 @@ $result_trees{'empty_macro_in_text_no_arg'} = {
             'macro_name' => 'texnl',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' texnl{}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -156,10 +152,6 @@ $result_trees{'empty_macro_in_text_no_arg'} = {
             'macro_name' => 'texnltwo',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' texnltwo
-'
-          },
           'source_info' => {
             'line_nr' => 6
           }
diff --git a/tp/t/results/macro/empty_macro_no_arg.pl 
b/tp/t/results/macro/empty_macro_no_arg.pl
index 81f4084859..4218546b4b 100644
--- a/tp/t/results/macro/empty_macro_no_arg.pl
+++ b/tp/t/results/macro/empty_macro_no_arg.pl
@@ -57,10 +57,6 @@ $result_trees{'empty_macro_no_arg'} = {
             'macro_name' => 'foo',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' foo
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/expand_two_same.pl 
b/tp/t/results/macro/expand_two_same.pl
index e9e1eefe1a..4574207452 100644
--- a/tp/t/results/macro/expand_two_same.pl
+++ b/tp/t/results/macro/expand_two_same.pl
@@ -69,10 +69,6 @@ $result_trees{'expand_two_same'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' macrotwo { arg }
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/expansion_order.pl 
b/tp/t/results/macro/expansion_order.pl
index d7417635cc..5abffc090f 100644
--- a/tp/t/results/macro/expansion_order.pl
+++ b/tp/t/results/macro/expansion_order.pl
@@ -64,10 +64,6 @@ $result_trees{'expansion_order'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' bidule{arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -135,10 +131,6 @@ $result_trees{'expansion_order'} = {
             'macro_name' => 'machin',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' machin
-'
-          },
           'source_info' => {
             'line_nr' => 5
           }
diff --git a/tp/t/results/macro/form_feeds.pl b/tp/t/results/macro/form_feeds.pl
index 61499ea617..fe720fd225 100644
--- a/tp/t/results/macro/form_feeds.pl
+++ b/tp/t/results/macro/form_feeds.pl
@@ -65,10 +65,6 @@ $result_trees{'form_feeds'} = {
               'b'
             ]
           },
-          'info' => {
-            'arg_line' => ' mymacro{a, b}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -133,10 +129,6 @@ $result_trees{'form_feeds'} = {
               'c'
             ]
           },
-          'info' => {
-            'arg_line' => ' oneargmacro{c}
-'
-          },
           'source_info' => {
             'line_nr' => 5
           }
diff --git a/tp/t/results/macro/glossary.pl b/tp/t/results/macro/glossary.pl
index 7c82c05b72..3061a48e3e 100644
--- a/tp/t/results/macro/glossary.pl
+++ b/tp/t/results/macro/glossary.pl
@@ -121,10 +121,6 @@ $result_trees{'glossary'} = {
                 'macro_name' => 'glossarytext',
                 'misc_args' => []
               },
-              'info' => {
-                'arg_line' => ' glossarytext
-'
-              },
               'source_info' => {
                 'file_name' => 'glossary.texi',
                 'line_nr' => 5
@@ -199,10 +195,6 @@ $result_trees{'glossary'} = {
                 'macro_name' => 'glossary',
                 'misc_args' => []
               },
-              'info' => {
-                'arg_line' => ' glossary
-'
-              },
               'source_info' => {
                 'file_name' => 'glossary.texi',
                 'line_nr' => 9
@@ -351,10 +343,6 @@ $result_trees{'glossary'} = {
                   'text'
                 ]
               },
-              'info' => {
-                'arg_line' => ' gentry {id, name, text}
-'
-              },
               'source_info' => {
                 'file_name' => 'glossary.texi',
                 'line_nr' => 15
@@ -865,10 +853,6 @@ $result_trees{'glossary'} = {
                   'glossary'
                 ]
               },
-              'info' => {
-                'arg_line' => ' expandglossary{glossary}
-'
-              },
               'source_info' => {
                 'file_name' => 'glossary.texi',
                 'line_nr' => 42,
@@ -987,10 +971,6 @@ $result_trees{'glossary'} = {
                 'macro_name' => 'glossarytext',
                 'misc_args' => []
               },
-              'info' => {
-                'arg_line' => ' glossarytext
-'
-              },
               'source_info' => {
                 'file_name' => 'glossary.texi',
                 'line_nr' => 42,
@@ -1327,10 +1307,6 @@ $result_trees{'glossary'} = {
                   'glossary'
                 ]
               },
-              'info' => {
-                'arg_line' => ' expandglossary{glossary}
-'
-              },
               'source_info' => {
                 'file_name' => 'glossary.texi',
                 'line_nr' => 43,
@@ -1449,10 +1425,6 @@ $result_trees{'glossary'} = {
                 'macro_name' => 'glossarytext',
                 'misc_args' => []
               },
-              'info' => {
-                'arg_line' => ' glossarytext
-'
-              },
               'source_info' => {
                 'file_name' => 'glossary.texi',
                 'line_nr' => 43,
diff --git a/tp/t/results/macro/ifclear_in_macro.pl 
b/tp/t/results/macro/ifclear_in_macro.pl
index 030cc32d46..bca68bee95 100644
--- a/tp/t/results/macro/ifclear_in_macro.pl
+++ b/tp/t/results/macro/ifclear_in_macro.pl
@@ -74,10 +74,6 @@ $result_trees{'ifclear_in_macro'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' note {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/ifset_and_end_isef_in_macro.pl 
b/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
index c0419c73fc..bdcb339867 100644
--- a/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
+++ b/tp/t/results/macro/ifset_and_end_isef_in_macro.pl
@@ -62,10 +62,6 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
             'macro_name' => 'beginifset',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' beginifset {}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -128,10 +124,6 @@ $result_trees{'ifset_and_end_isef_in_macro'} = {
             'macro_name' => 'endifset',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' endifset {}
-'
-          },
           'source_info' => {
             'line_nr' => 5
           }
diff --git a/tp/t/results/macro/ifset_in_macro.pl 
b/tp/t/results/macro/ifset_in_macro.pl
index d877aa8106..ed48e66877 100644
--- a/tp/t/results/macro/ifset_in_macro.pl
+++ b/tp/t/results/macro/ifset_in_macro.pl
@@ -74,10 +74,6 @@ $result_trees{'ifset_in_macro'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' note {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/ifset_in_macro_set.pl 
b/tp/t/results/macro/ifset_in_macro_set.pl
index 7bc892018f..47277bb2f7 100644
--- a/tp/t/results/macro/ifset_in_macro_set.pl
+++ b/tp/t/results/macro/ifset_in_macro_set.pl
@@ -74,10 +74,6 @@ $result_trees{'ifset_in_macro_set'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' note {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/ignored_macro_definition.pl 
b/tp/t/results/macro/ignored_macro_definition.pl
index dc3c694095..7153ff35b7 100644
--- a/tp/t/results/macro/ignored_macro_definition.pl
+++ b/tp/t/results/macro/ignored_macro_definition.pl
@@ -62,10 +62,6 @@ $result_trees{'ignored_macro_definition'} = {
             'macro_name' => 'mymacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' mymacro{}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/implicit_quoting_one_arg.pl 
b/tp/t/results/macro/implicit_quoting_one_arg.pl
index ff17dddb48..5775d69bf2 100644
--- a/tp/t/results/macro/implicit_quoting_one_arg.pl
+++ b/tp/t/results/macro/implicit_quoting_one_arg.pl
@@ -69,10 +69,6 @@ $result_trees{'implicit_quoting_one_arg'} = {
               'a'
             ]
           },
-          'info' => {
-            'arg_line' => ' FIXAME{a}
-'
-          },
           'source_info' => {
             'line_nr' => 2
           }
diff --git a/tp/t/results/macro/implicit_quoting_recursion.pl 
b/tp/t/results/macro/implicit_quoting_recursion.pl
index 00b5a45905..13acbb4ede 100644
--- a/tp/t/results/macro/implicit_quoting_recursion.pl
+++ b/tp/t/results/macro/implicit_quoting_recursion.pl
@@ -65,10 +65,6 @@ $result_trees{'implicit_quoting_recursion'} = {
               'b'
             ]
           },
-          'info' => {
-            'arg_line' => ' cat{a,b}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/include_after_empty_line_arg.pl 
b/tp/t/results/macro/include_after_empty_line_arg.pl
index c9d99084dd..2f05ca7f06 100644
--- a/tp/t/results/macro/include_after_empty_line_arg.pl
+++ b/tp/t/results/macro/include_after_empty_line_arg.pl
@@ -64,10 +64,6 @@ $result_trees{'include_after_empty_line_arg'} = {
               'body'
             ]
           },
-          'info' => {
-            'arg_line' => ' mymacro{body}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/leading_spaces_no_ignore.pl 
b/tp/t/results/macro/leading_spaces_no_ignore.pl
index 0af9be9ed6..4c4cfa4662 100644
--- a/tp/t/results/macro/leading_spaces_no_ignore.pl
+++ b/tp/t/results/macro/leading_spaces_no_ignore.pl
@@ -67,10 +67,6 @@ $result_trees{'leading_spaces_no_ignore'} = {
             'macro_name' => 'mymacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' mymacro
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/line_after_recursive_call.pl 
b/tp/t/results/macro/line_after_recursive_call.pl
index 36be4eed32..a685cb521c 100644
--- a/tp/t/results/macro/line_after_recursive_call.pl
+++ b/tp/t/results/macro/line_after_recursive_call.pl
@@ -72,10 +72,6 @@ $result_trees{'line_after_recursive_call'} = {
             'macro_name' => 'mac',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' mac
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/line_end_accent_command_macro_call.pl 
b/tp/t/results/macro/line_end_accent_command_macro_call.pl
index 16c092558b..2377f536a3 100644
--- a/tp/t/results/macro/line_end_accent_command_macro_call.pl
+++ b/tp/t/results/macro/line_end_accent_command_macro_call.pl
@@ -62,10 +62,6 @@ $result_trees{'line_end_accent_command_macro_call'} = {
             'macro_name' => 'expand',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' expand {}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -213,10 +209,6 @@ $result_trees{'line_end_accent_command_macro_call'} = {
             'macro_name' => 'nospace',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' nospace {}
-'
-          },
           'source_info' => {
             'line_nr' => 8
           }
diff --git a/tp/t/results/macro/macro_after_paragraph.pl 
b/tp/t/results/macro/macro_after_paragraph.pl
index 0118ccd101..c114c6e3a8 100644
--- a/tp/t/results/macro/macro_after_paragraph.pl
+++ b/tp/t/results/macro/macro_after_paragraph.pl
@@ -67,10 +67,6 @@ $result_trees{'macro_after_paragraph'} = {
             'macro_name' => 'mymacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' mymacro
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl 
b/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
index 195a1b24ed..7aca790af5 100644
--- a/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
+++ b/tp/t/results/macro/macro_alias_definfoenclose_defindex.pl
@@ -203,10 +203,6 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' phooindex {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 7
           }
@@ -592,10 +588,6 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' phooindex {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 24
           }
@@ -774,10 +766,6 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' phooindex {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 32
           }
@@ -1160,10 +1148,6 @@ $result_trees{'macro_alias_definfoenclose_defindex'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' phooindex {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 49
           }
diff --git a/tp/t/results/macro/macro_before_specific_line_command_args.pl 
b/tp/t/results/macro/macro_before_specific_line_command_args.pl
index 243a39895b..09009f48d0 100644
--- a/tp/t/results/macro/macro_before_specific_line_command_args.pl
+++ b/tp/t/results/macro/macro_before_specific_line_command_args.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_before_specific_line_command_args'} = {
             'macro_name' => 'cpfn',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' cpfn
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_call_empty_middle_arg.pl 
b/tp/t/results/macro/macro_call_empty_middle_arg.pl
index 4eb7f369f6..ccc96a6328 100644
--- a/tp/t/results/macro/macro_call_empty_middle_arg.pl
+++ b/tp/t/results/macro/macro_call_empty_middle_arg.pl
@@ -76,10 +76,6 @@ $result_trees{'macro_call_empty_middle_arg'} = {
               'cc'
             ]
           },
-          'info' => {
-            'arg_line' => ' threea {aa, bb, cc}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_call_empty_two_arg.pl 
b/tp/t/results/macro/macro_call_empty_two_arg.pl
index 423ce945e2..f33073b007 100644
--- a/tp/t/results/macro/macro_call_empty_two_arg.pl
+++ b/tp/t/results/macro/macro_call_empty_two_arg.pl
@@ -70,10 +70,6 @@ $result_trees{'macro_call_empty_two_arg'} = {
               'bb'
             ]
           },
-          'info' => {
-            'arg_line' => ' twoa {aa, bb}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl 
b/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
index f3ca4f9594..29e7e443d7 100644
--- a/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
+++ b/tp/t/results/macro/macro_call_in_ignored_inlinefmtifelse.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_call_in_ignored_inlinefmtifelse'} = {
             'macro_name' => 'commafmt',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' commafmt
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl 
b/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
index 7c98eaedb2..47eb4acde8 100644
--- a/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
+++ b/tp/t/results/macro/macro_call_in_inlinefmtifelse_format.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_call_in_inlinefmtifelse_format'} = {
             'macro_name' => 'inlinefirstarg',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' inlinefirstarg
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_call_in_node_manual.pl 
b/tp/t/results/macro/macro_call_in_node_manual.pl
index 6d61b0a1e7..63312e7c8e 100644
--- a/tp/t/results/macro/macro_call_in_node_manual.pl
+++ b/tp/t/results/macro/macro_call_in_node_manual.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_call_in_node_manual'} = {
             'macro_name' => 'openbrace',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' openbrace
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -128,10 +124,6 @@ $result_trees{'macro_call_in_node_manual'} = {
             'macro_name' => 'openbracetext',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' openbracetext
-'
-          },
           'source_info' => {
             'line_nr' => 5
           }
@@ -194,10 +186,6 @@ $result_trees{'macro_call_in_node_manual'} = {
             'macro_name' => 'manualnameend',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' manualnameend
-'
-          },
           'source_info' => {
             'line_nr' => 9
           }
@@ -260,10 +248,6 @@ $result_trees{'macro_call_in_node_manual'} = {
             'macro_name' => 'manualnameendbrace',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' manualnameendbrace
-'
-          },
           'source_info' => {
             'line_nr' => 13
           }
@@ -326,10 +310,6 @@ $result_trees{'macro_call_in_node_manual'} = {
             'macro_name' => 'manualnameendbracespace',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' manualnameendbracespace
-'
-          },
           'source_info' => {
             'line_nr' => 17
           }
@@ -392,10 +372,6 @@ $result_trees{'macro_call_in_node_manual'} = {
             'macro_name' => 'manualnameendbracespacetext',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' manualnameendbracespacetext
-'
-          },
           'source_info' => {
             'line_nr' => 21
           }
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl 
b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
index b9c6f8dd7a..761175a492 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmt.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_end_call_in_ignored_inlinefmt'} = {
             'macro_name' => 'startfmt',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' startfmt
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl 
b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
index acd666c39d..b0af8d38e8 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_end_call_in_ignored_inlinefmtifelse'} = 
{
             'macro_name' => 'inlinefirstfmt',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' inlinefirstfmt
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git 
a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl 
b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
index c2bd163a97..f1f63e9eec 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlinefmtifelse_else.pl
@@ -62,10 +62,6 @@ 
$result_trees{'macro_end_call_in_ignored_inlinefmtifelse_else'} = {
             'macro_name' => 'endcallinignoredinlineelse',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' endcallinignoredinlineelse
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl 
b/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
index ea5418ba78..d1f2586478 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_inlineraw.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_end_call_in_ignored_inlineraw'} = {
             'macro_name' => 'startraw',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' startraw
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_end_call_in_ignored_raw.pl 
b/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
index baa8996ee7..bbd81f95d5 100644
--- a/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
+++ b/tp/t/results/macro/macro_end_call_in_ignored_raw.pl
@@ -67,10 +67,6 @@ $result_trees{'macro_end_call_in_ignored_raw'} = {
             'macro_name' => 'startraw',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' startraw
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_expands_to_empty.pl 
b/tp/t/results/macro/macro_expands_to_empty.pl
index cb6fbdf298..1734aa01a7 100644
--- a/tp/t/results/macro/macro_expands_to_empty.pl
+++ b/tp/t/results/macro/macro_expands_to_empty.pl
@@ -64,10 +64,6 @@ $result_trees{'macro_expands_to_empty'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' foo {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_expansion.pl 
b/tp/t/results/macro/macro_expansion.pl
index 0f5957f622..472ab9ce94 100644
--- a/tp/t/results/macro/macro_expansion.pl
+++ b/tp/t/results/macro/macro_expansion.pl
@@ -85,10 +85,6 @@ $result_trees{'macro_expansion'} = {
               'arg2'
             ]
           },
-          'info' => {
-            'arg_line' => ' macroone {arg1, arg2 }
-'
-          },
           'source_info' => {
             'line_nr' => 2
           }
diff --git a/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl 
b/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
index 9088eb1556..2d033a5b41 100644
--- a/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_conditional_end.pl
@@ -72,10 +72,6 @@ $result_trees{'macro_expansion_end_in_conditional_end'} = {
             'macro_name' => 'beginendcond',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' beginendcond
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl 
b/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
index fb47af0772..f5e34623ba 100644
--- a/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_conditional_line.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_expansion_end_in_conditional_line'} = {
             'macro_name' => 'begincond',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' begincond
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl 
b/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
index 781da94052..8403d89cc5 100644
--- a/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_ignored_ifset_content.pl
@@ -67,10 +67,6 @@ 
$result_trees{'macro_expansion_end_in_ignored_ifset_content'} = {
             'macro_name' => 'beginifsetcontent',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' beginifsetcontent
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git 
a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl 
b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
index 1e2dfa60ba..4589749303 100644
--- a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
+++ b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_conditional.pl
@@ -72,10 +72,6 @@ 
$result_trees{'macro_expansion_end_in_ignored_nested_conditional'} = {
             'macro_name' => 'beginnestedcond',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' beginnestedcond
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git 
a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
 
b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
index 0eee3da488..bda55c928d 100644
--- 
a/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
+++ 
b/tp/t/results/macro/macro_expansion_end_in_ignored_nested_different_conditional.pl
@@ -72,10 +72,6 @@ 
$result_trees{'macro_expansion_end_in_ignored_nested_different_conditional'} = {
             'macro_name' => 'beginnestedcond',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' beginnestedcond
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl 
b/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
index 9c44674123..664b901463 100644
--- a/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
+++ b/tp/t/results/macro/macro_expansion_in_multitable_prototype.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = {
             'macro_name' => 'simple',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' simple
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -130,10 +126,6 @@ $result_trees{'macro_expansion_in_multitable_prototype'} = 
{
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' endbrace {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 5
           }
diff --git a/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl 
b/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
index 18228853f3..a03b136129 100644
--- a/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
+++ b/tp/t/results/macro/macro_for_dot_in_menu_not_separator.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_for_dot_in_menu_not_separator'} = {
             'macro_name' => 'macrodot',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' macrodot
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_for_end.pl 
b/tp/t/results/macro/macro_for_end.pl
index e7398ec9b8..26f5a8975e 100644
--- a/tp/t/results/macro/macro_for_end.pl
+++ b/tp/t/results/macro/macro_for_end.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_for_end'} = {
             'macro_name' => 'myend',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' myend
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_for_ignored_line_command.pl 
b/tp/t/results/macro/macro_for_ignored_line_command.pl
index 879bc2e3b7..014645c714 100644
--- a/tp/t/results/macro/macro_for_ignored_line_command.pl
+++ b/tp/t/results/macro/macro_for_ignored_line_command.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_for_ignored_line_command'} = {
             'macro_name' => 'pagemacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' pagemacro
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_for_verb.pl 
b/tp/t/results/macro/macro_for_verb.pl
index 66ea45df3f..6ebe920e96 100644
--- a/tp/t/results/macro/macro_for_verb.pl
+++ b/tp/t/results/macro/macro_for_verb.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_for_verb'} = {
             'macro_name' => 'verbopen',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' verbopen {}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_imbricated_with_beginning_command_name.pl 
b/tp/t/results/macro/macro_imbricated_with_beginning_command_name.pl
index 3a61ea95d6..be2dcaab0d 100644
--- a/tp/t/results/macro/macro_imbricated_with_beginning_command_name.pl
+++ b/tp/t/results/macro/macro_imbricated_with_beginning_command_name.pl
@@ -72,10 +72,6 @@ 
$result_trees{'macro_imbricated_with_beginning_command_name'} = {
             'macro_name' => 'foo',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' foo
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_in_accent.pl 
b/tp/t/results/macro/macro_in_accent.pl
index 2154108231..f8aaef665b 100644
--- a/tp/t/results/macro/macro_in_accent.pl
+++ b/tp/t/results/macro/macro_in_accent.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_in_accent'} = {
             'macro_name' => 'aletter',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' aletter
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -128,10 +124,6 @@ $result_trees{'macro_in_accent'} = {
             'macro_name' => 'aspace',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' aspace
-'
-          },
           'source_info' => {
             'line_nr' => 5
           }
diff --git a/tp/t/results/macro/macro_in_brace_command.pl 
b/tp/t/results/macro/macro_in_brace_command.pl
index ebbc45eb62..14186aa091 100644
--- a/tp/t/results/macro/macro_in_brace_command.pl
+++ b/tp/t/results/macro/macro_in_brace_command.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_in_brace_command'} = {
             'macro_name' => 'foo',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' foo
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -128,10 +124,6 @@ $result_trees{'macro_in_brace_command'} = {
             'macro_name' => 'abar',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' abar
-'
-          },
           'source_info' => {
             'line_nr' => 5
           }
diff --git a/tp/t/results/macro/macro_in_def_delimiters.pl 
b/tp/t/results/macro/macro_in_def_delimiters.pl
index 51a91c2f61..8622baf26f 100644
--- a/tp/t/results/macro/macro_in_def_delimiters.pl
+++ b/tp/t/results/macro/macro_in_def_delimiters.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_in_def_delimiters'} = {
             'macro_name' => 'string',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' string
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_in_empty_menu_comment.pl 
b/tp/t/results/macro/macro_in_empty_menu_comment.pl
index 7d5f8c5c9a..93eed0d936 100644
--- a/tp/t/results/macro/macro_in_empty_menu_comment.pl
+++ b/tp/t/results/macro/macro_in_empty_menu_comment.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_in_empty_menu_comment'} = {
             'macro_name' => 'emptystring',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' emptystring
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl 
b/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
index b9d7202dc6..6c6b194a6c 100644
--- a/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_empty_multitable_empty_before_item.pl
@@ -57,10 +57,6 @@ $result_trees{'macro_in_empty_multitable_empty_before_item'} 
= {
             'macro_name' => 'emptymacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' emptymacro
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl 
b/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
index fc5d6bfb62..c028066223 100644
--- a/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_empty_table_empty_before_item.pl
@@ -57,10 +57,6 @@ $result_trees{'macro_in_empty_table_empty_before_item'} = {
             'macro_name' => 'emptymacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' emptymacro
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_in_empty_text.pl 
b/tp/t/results/macro/macro_in_empty_text.pl
index 2e2ffabc6b..3e90b5f4cb 100644
--- a/tp/t/results/macro/macro_in_empty_text.pl
+++ b/tp/t/results/macro/macro_in_empty_text.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_in_empty_text'} = {
             'macro_name' => 'emptystring',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' emptystring
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_in_end_argument.pl 
b/tp/t/results/macro/macro_in_end_argument.pl
index c81728ae00..5212377198 100644
--- a/tp/t/results/macro/macro_in_end_argument.pl
+++ b/tp/t/results/macro/macro_in_end_argument.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_in_end_argument'} = {
             'macro_name' => 'acartouche',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' acartouche
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_in_ifset.pl 
b/tp/t/results/macro/macro_in_ifset.pl
index a5fdcaae3b..05efd63427 100644
--- a/tp/t/results/macro/macro_in_ifset.pl
+++ b/tp/t/results/macro/macro_in_ifset.pl
@@ -64,10 +64,6 @@ $result_trees{'macro_in_ifset'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' macroone {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_in_ifset_end_in_arg.pl 
b/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
index c4185ae8f9..b13fe52356 100644
--- a/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
+++ b/tp/t/results/macro/macro_in_ifset_end_in_arg.pl
@@ -64,10 +64,6 @@ $result_trees{'macro_in_ifset_end_in_arg'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' macroone {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_in_index_commands.pl 
b/tp/t/results/macro/macro_in_index_commands.pl
index 8909083186..3cbb0e6157 100644
--- a/tp/t/results/macro/macro_in_index_commands.pl
+++ b/tp/t/results/macro/macro_in_index_commands.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_in_index_commands'} = {
             'macro_name' => 'cp',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' cp
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -123,10 +119,6 @@ $result_trees{'macro_in_index_commands'} = {
             'macro_name' => 'fn',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' fn 
-'
-          },
           'source_info' => {
             'line_nr' => 4
           }
@@ -184,10 +176,6 @@ $result_trees{'macro_in_index_commands'} = {
             'macro_name' => 'syncodeindexcommand',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' syncodeindexcommand 
-'
-          },
           'source_info' => {
             'line_nr' => 7
           }
@@ -397,10 +385,6 @@ $result_trees{'macro_in_index_commands'} = {
             'macro_name' => 'truc',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' truc 
-'
-          },
           'source_info' => {
             'line_nr' => 14
           }
@@ -540,10 +524,6 @@ $result_trees{'macro_in_index_commands'} = {
             'macro_name' => 'trucindexcommand',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' trucindexcommand 
-'
-          },
           'source_info' => {
             'line_nr' => 22
           }
@@ -606,10 +586,6 @@ $result_trees{'macro_in_index_commands'} = {
             'macro_name' => 'codeidx',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' codeidx 
-'
-          },
           'source_info' => {
             'line_nr' => 26
           }
@@ -736,10 +712,6 @@ $result_trees{'macro_in_index_commands'} = {
             'macro_name' => 'defcodeindexentry',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' defcodeindexentry 
-'
-          },
           'source_info' => {
             'line_nr' => 32
           }
diff --git a/tp/t/results/macro/macro_in_invalid_documentencoding.pl 
b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
index 8c41f56223..b8f199db16 100644
--- a/tp/t/results/macro/macro_in_invalid_documentencoding.pl
+++ b/tp/t/results/macro/macro_in_invalid_documentencoding.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_in_invalid_documentencoding'} = {
             'macro_name' => 'badmacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' badmacro
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_in_macro_arg.pl 
b/tp/t/results/macro/macro_in_macro_arg.pl
index 865a5accf2..27ecbe5c3b 100644
--- a/tp/t/results/macro/macro_in_macro_arg.pl
+++ b/tp/t/results/macro/macro_in_macro_arg.pl
@@ -67,10 +67,6 @@ $result_trees{'macro_in_macro_arg'} = {
             'macro_name' => 'macroone',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' macroone
-'
-          },
           'source_info' => {
             'line_nr' => 2
           }
@@ -135,10 +131,6 @@ $result_trees{'macro_in_macro_arg'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' macrotwo{arg}
-'
-          },
           'source_info' => {
             'line_nr' => 6
           }
@@ -209,10 +201,6 @@ $result_trees{'macro_in_macro_arg'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' macrothree{text, arg}
-'
-          },
           'source_info' => {
             'line_nr' => 10
           }
diff --git a/tp/t/results/macro/macro_in_macro_arg_simpler.pl 
b/tp/t/results/macro/macro_in_macro_arg_simpler.pl
index f94aacdeb5..7829f1b1b2 100644
--- a/tp/t/results/macro/macro_in_macro_arg_simpler.pl
+++ b/tp/t/results/macro/macro_in_macro_arg_simpler.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
             'macro_name' => 'macrooneone',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' macrooneone
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -136,10 +132,6 @@ $result_trees{'macro_in_macro_arg_simpler'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' macrothree{text, arg}
-'
-          },
           'source_info' => {
             'line_nr' => 5
           }
diff --git a/tp/t/results/macro/macro_in_menu.pl 
b/tp/t/results/macro/macro_in_menu.pl
index e275ac993d..365fd7c784 100644
--- a/tp/t/results/macro/macro_in_menu.pl
+++ b/tp/t/results/macro/macro_in_menu.pl
@@ -67,10 +67,6 @@ $result_trees{'macro_in_menu'} = {
             'macro_name' => 'astar',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' astar
-'
-          },
           'source_info' => {
             'line_nr' => 2
           }
@@ -133,10 +129,6 @@ $result_trees{'macro_in_menu'} = {
             'macro_name' => 'starspaces',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' starspaces
-'
-          },
           'source_info' => {
             'line_nr' => 6
           }
@@ -199,10 +191,6 @@ $result_trees{'macro_in_menu'} = {
             'macro_name' => 'spaces',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' spaces
-'
-          },
           'source_info' => {
             'line_nr' => 10
           }
@@ -265,10 +253,6 @@ $result_trees{'macro_in_menu'} = {
             'macro_name' => 'aspace',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' aspace
-'
-          },
           'source_info' => {
             'line_nr' => 14
           }
@@ -331,10 +315,6 @@ $result_trees{'macro_in_menu'} = {
             'macro_name' => 'twocolon',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' twocolon
-'
-          },
           'source_info' => {
             'line_nr' => 18
           }
@@ -397,10 +377,6 @@ $result_trees{'macro_in_menu'} = {
             'macro_name' => 'acolon',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' acolon
-'
-          },
           'source_info' => {
             'line_nr' => 22
           }
diff --git a/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl 
b/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
index a435056244..3ee5c33e3b 100644
--- a/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
+++ b/tp/t/results/macro/macro_in_menu_comment_closed_by_detailmenu.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_in_menu_comment_closed_by_detailmenu'} 
= {
             'macro_name' => 'emptystring',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' emptystring
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_in_menu_comment_like_entry.pl 
b/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
index f7ce7fe7d1..4c85dc79af 100644
--- a/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
+++ b/tp/t/results/macro/macro_in_menu_comment_like_entry.pl
@@ -67,10 +67,6 @@ $result_trees{'macro_in_menu_comment_like_entry'} = {
             'macro_name' => 'emptystring',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' emptystring
-'
-          },
           'source_info' => {
             'line_nr' => 2
           }
diff --git a/tp/t/results/macro/macro_in_menu_description.pl 
b/tp/t/results/macro/macro_in_menu_description.pl
index b478e6339d..57d35d6b76 100644
--- a/tp/t/results/macro/macro_in_menu_description.pl
+++ b/tp/t/results/macro/macro_in_menu_description.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_in_menu_description'} = {
             'macro_name' => 'emptystring',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' emptystring
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_in_misc_commands.pl 
b/tp/t/results/macro/macro_in_misc_commands.pl
index 83c4d6b86f..b4d124a242 100644
--- a/tp/t/results/macro/macro_in_misc_commands.pl
+++ b/tp/t/results/macro/macro_in_misc_commands.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'text',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' text 
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -128,10 +124,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'Top',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' Top
-'
-          },
           'source_info' => {
             'line_nr' => 5
           }
@@ -398,10 +390,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'en',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' en 
-'
-          },
           'source_info' => {
             'line_nr' => 16
           }
@@ -459,10 +447,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'documentlanguagecommand',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' documentlanguagecommand 
-'
-          },
           'source_info' => {
             'line_nr' => 19
           }
@@ -670,10 +654,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'pagesizesarg',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' pagesizesarg
-'
-          },
           'source_info' => {
             'line_nr' => 29
           }
@@ -736,10 +716,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'afourpapermacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' afourpapermacro 
-'
-          },
           'source_info' => {
             'line_nr' => 33
           }
@@ -1055,10 +1031,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'needarg',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' needarg
-'
-          },
           'source_info' => {
             'line_nr' => 43
           }
@@ -1185,10 +1157,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'raisesectionsmacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' raisesectionsmacro 
-'
-          },
           'source_info' => {
             'line_nr' => 49
           },
@@ -1279,10 +1247,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'lowersectionsmacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' lowersectionsmacro 
-'
-          },
           'source_info' => {
             'line_nr' => 53
           },
@@ -1466,10 +1430,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'definfoenclosename',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' definfoenclosename 
-'
-          },
           'source_info' => {
             'line_nr' => 62
           }
@@ -1631,10 +1591,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'strongmacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' strongmacro 
-'
-          },
           'source_info' => {
             'line_nr' => 69
           }
@@ -1692,10 +1648,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'strongname',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' strongname 
-'
-          },
           'source_info' => {
             'line_nr' => 72
           }
@@ -2007,10 +1959,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'kbdinputstylearg',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' kbdinputstylearg 
-'
-          },
           'source_info' => {
             'line_nr' => 84
           }
@@ -2250,10 +2198,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'asisarg',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' asisarg 
-'
-          },
           'source_info' => {
             'line_nr' => 95
           }
@@ -2311,10 +2255,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'zero',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' zero 
-'
-          },
           'source_info' => {
             'line_nr' => 98
           }
@@ -2372,10 +2312,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'nonearg',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' nonearg 
-'
-          },
           'source_info' => {
             'line_nr' => 101
           }
@@ -2433,10 +2369,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'four',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' four 
-'
-          },
           'source_info' => {
             'line_nr' => 104
           }
@@ -2494,10 +2426,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'six',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' six 
-'
-          },
           'source_info' => {
             'line_nr' => 107
           }
@@ -2919,10 +2847,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'endarg',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' endarg 
-'
-          },
           'source_info' => {
             'line_nr' => 118
           }
@@ -2980,10 +2904,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'separatearg',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' separatearg 
-'
-          },
           'source_info' => {
             'line_nr' => 121
           }
@@ -3164,10 +3084,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'onarg',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' onarg 
-'
-          },
           'source_info' => {
             'line_nr' => 127
           }
@@ -3225,10 +3141,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'offarg',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' offarg 
-'
-          },
           'source_info' => {
             'line_nr' => 130
           }
@@ -3419,10 +3331,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'ten',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' ten 
-'
-          },
           'source_info' => {
             'line_nr' => 137
           }
@@ -3549,10 +3457,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'falsearg',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' falsearg 
-'
-          },
           'source_info' => {
             'line_nr' => 142
           }
@@ -3610,10 +3514,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'truearg',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' truearg
-'
-          },
           'source_info' => {
             'line_nr' => 145
           }
@@ -3799,10 +3699,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'pagemacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' pagemacro 
-'
-          },
           'source_info' => {
             'line_nr' => 152
           }
@@ -3860,10 +3756,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'noindentmacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' noindentmacro 
-'
-          },
           'source_info' => {
             'line_nr' => 155
           }
@@ -3921,10 +3813,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'refillmacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' refillmacro 
-'
-          },
           'source_info' => {
             'line_nr' => 158
           }
@@ -4486,10 +4374,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'contentsmacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' contentsmacro 
-'
-          },
           'source_info' => {
             'line_nr' => 176
           },
@@ -4605,10 +4489,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'exdentmacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' exdentmacro 
-'
-          },
           'source_info' => {
             'line_nr' => 183
           },
@@ -4724,10 +4604,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'two',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' two 
-'
-          },
           'source_info' => {
             'line_nr' => 188
           }
@@ -4849,10 +4725,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'resultmacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' resultmacro 
-'
-          },
           'source_info' => {
             'line_nr' => 193
           }
@@ -5209,10 +5081,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'shortcontentsmacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' shortcontentsmacro 
-'
-          },
           'source_info' => {
             'line_nr' => 208
           },
@@ -5313,10 +5181,6 @@ $result_trees{'macro_in_misc_commands'} = {
             'macro_name' => 'byemacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' byemacro
-'
-          },
           'source_info' => {
             'line_nr' => 213
           }
diff --git a/tp/t/results/macro/macro_in_multitable_empty_before_item.pl 
b/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
index ebd8988d10..4eb937df3a 100644
--- a/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_multitable_empty_before_item.pl
@@ -57,10 +57,6 @@ $result_trees{'macro_in_multitable_empty_before_item'} = {
             'macro_name' => 'emptymacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' emptymacro
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_in_table_empty_before_item.pl 
b/tp/t/results/macro/macro_in_table_empty_before_item.pl
index 9f3c84113f..258dc47461 100644
--- a/tp/t/results/macro/macro_in_table_empty_before_item.pl
+++ b/tp/t/results/macro/macro_in_table_empty_before_item.pl
@@ -57,10 +57,6 @@ $result_trees{'macro_in_table_empty_before_item'} = {
             'macro_name' => 'emptymacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' emptymacro
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl 
b/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
index fd98329484..ea41671fd1 100644
--- a/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
+++ b/tp/t/results/macro/macro_inlineifcond_end_in_empty_ignored.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_inlineifcond_end_in_empty_ignored'} = {
             'macro_name' => 'setargendignored',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' setargendignored
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl 
b/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
index 7b59628bb5..3f723c47e5 100644
--- a/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
+++ b/tp/t/results/macro/macro_inlineifcond_end_in_empty_set.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_inlineifcond_end_in_empty_set'} = {
             'macro_name' => 'clearargendignored',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' clearargendignored
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_name_with_digit.pl 
b/tp/t/results/macro/macro_name_with_digit.pl
index 5ddf35274f..277db13453 100644
--- a/tp/t/results/macro/macro_name_with_digit.pl
+++ b/tp/t/results/macro/macro_name_with_digit.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_name_with_digit'} = {
             'macro_name' => 'macro1',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' macro1
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -130,10 +126,6 @@ $result_trees{'macro_name_with_digit'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' macro11 {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 5
           }
diff --git a/tp/t/results/macro/macro_name_with_hyphen.pl 
b/tp/t/results/macro/macro_name_with_hyphen.pl
index 4bd2781922..3e11366ce3 100644
--- a/tp/t/results/macro/macro_name_with_hyphen.pl
+++ b/tp/t/results/macro/macro_name_with_hyphen.pl
@@ -65,10 +65,6 @@ $result_trees{'macro_name_with_hyphen'} = {
               'arg2'
             ]
           },
-          'info' => {
-            'arg_line' => ' macro-one {arg-one, arg2}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_name_zero.pl 
b/tp/t/results/macro/macro_name_zero.pl
index e438977dea..4274727457 100644
--- a/tp/t/results/macro/macro_name_zero.pl
+++ b/tp/t/results/macro/macro_name_zero.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_name_zero'} = {
             'macro_name' => '0',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' 0
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_no_arg_bad_expansion.pl 
b/tp/t/results/macro/macro_no_arg_bad_expansion.pl
index 66610a7662..8e5396a300 100644
--- a/tp/t/results/macro/macro_no_arg_bad_expansion.pl
+++ b/tp/t/results/macro/macro_no_arg_bad_expansion.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_no_arg_bad_expansion'} = {
             'macro_name' => 'testone',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' testone
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_no_arg_expansion.pl 
b/tp/t/results/macro/macro_no_arg_expansion.pl
index 657474d6bf..512a091ff9 100644
--- a/tp/t/results/macro/macro_no_arg_expansion.pl
+++ b/tp/t/results/macro/macro_no_arg_expansion.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_no_arg_expansion'} = {
             'macro_name' => 'testone',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' testone
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_no_argument.pl 
b/tp/t/results/macro/macro_no_argument.pl
index 9ca920785c..9708a425c8 100644
--- a/tp/t/results/macro/macro_no_argument.pl
+++ b/tp/t/results/macro/macro_no_argument.pl
@@ -25,9 +25,6 @@ $result_trees{'macro_no_argument'} = {
           'extra' => {
             'invalid_syntax' => 1
           },
-          'info' => {
-            'arg_line' => ''
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_not_closed.pl 
b/tp/t/results/macro/macro_not_closed.pl
index 676d3fb2d9..c07ce9bcf9 100644
--- a/tp/t/results/macro/macro_not_closed.pl
+++ b/tp/t/results/macro/macro_not_closed.pl
@@ -32,10 +32,6 @@ $result_trees{'macro_not_closed'} = {
             'macro_name' => 'name',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' name
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_one_arg_end_of_file.pl 
b/tp/t/results/macro/macro_one_arg_end_of_file.pl
index e10b2d29d5..b4bd6e6469 100644
--- a/tp/t/results/macro/macro_one_arg_end_of_file.pl
+++ b/tp/t/results/macro/macro_one_arg_end_of_file.pl
@@ -64,10 +64,6 @@ $result_trees{'macro_one_arg_end_of_file'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' onearg{arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_replaced_by_definfoenclose.pl 
b/tp/t/results/macro/macro_replaced_by_definfoenclose.pl
index 196a65dab9..a70c1de3e9 100644
--- a/tp/t/results/macro/macro_replaced_by_definfoenclose.pl
+++ b/tp/t/results/macro/macro_replaced_by_definfoenclose.pl
@@ -64,10 +64,6 @@ $result_trees{'macro_replaced_by_definfoenclose'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' phoo {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl 
b/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
index 4a15ff98cc..0b35471c16 100644
--- a/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
+++ b/tp/t/results/macro/macro_with_error_at_end_line_after_macro.pl
@@ -64,10 +64,6 @@ $result_trees{'macro_with_error_at_end_line_after_macro'} = {
               'string'
             ]
           },
-          'info' => {
-            'arg_line' => ' witherror{string}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/macro_zero.pl b/tp/t/results/macro/macro_zero.pl
index 473adfb37b..1544b5ba1a 100644
--- a/tp/t/results/macro/macro_zero.pl
+++ b/tp/t/results/macro/macro_zero.pl
@@ -62,10 +62,6 @@ $result_trees{'macro_zero'} = {
             'macro_name' => 'zero',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' zero
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/nested_macro_call.pl 
b/tp/t/results/macro/nested_macro_call.pl
index feed6c4654..99a7093852 100644
--- a/tp/t/results/macro/nested_macro_call.pl
+++ b/tp/t/results/macro/nested_macro_call.pl
@@ -62,10 +62,6 @@ $result_trees{'nested_macro_call'} = {
             'macro_name' => 'machin',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' machin{}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -133,10 +129,6 @@ $result_trees{'nested_macro_call'} = {
             'macro_name' => 'truc',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' truc{}
-'
-          },
           'source_info' => {
             'line_nr' => 5
           }
diff --git a/tp/t/results/macro/no_macrobody.pl 
b/tp/t/results/macro/no_macrobody.pl
index bb85fededa..ea4eb64fbf 100644
--- a/tp/t/results/macro/no_macrobody.pl
+++ b/tp/t/results/macro/no_macrobody.pl
@@ -59,10 +59,6 @@ $result_trees{'no_macrobody'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' nomacrobody {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/non_ascii_in_macro_name.pl 
b/tp/t/results/macro/non_ascii_in_macro_name.pl
index 79e2e0f14c..456ac8413e 100644
--- a/tp/t/results/macro/non_ascii_in_macro_name.pl
+++ b/tp/t/results/macro/non_ascii_in_macro_name.pl
@@ -61,10 +61,6 @@ $result_trees{'non_ascii_in_macro_name'} = {
           'extra' => {
             'invalid_syntax' => 1
           },
-          'info' => {
-            'arg_line' => " parenbr\x{e8}ve {a}
-"
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/paragraph_and_macro.pl 
b/tp/t/results/macro/paragraph_and_macro.pl
index 68f89d97ae..92a472aa73 100644
--- a/tp/t/results/macro/paragraph_and_macro.pl
+++ b/tp/t/results/macro/paragraph_and_macro.pl
@@ -57,10 +57,6 @@ $result_trees{'paragraph_and_macro'} = {
             'macro_name' => 'aempty',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' aempty
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -123,10 +119,6 @@ $result_trees{'paragraph_and_macro'} = {
             'macro_name' => 'aspace',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' aspace
-'
-          },
           'source_info' => {
             'line_nr' => 4
           }
@@ -189,10 +181,6 @@ $result_trees{'paragraph_and_macro'} = {
             'macro_name' => 'word',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' word
-'
-          },
           'source_info' => {
             'line_nr' => 8
           }
diff --git a/tp/t/results/macro/protect_comma_macro_line.pl 
b/tp/t/results/macro/protect_comma_macro_line.pl
index 9f853ea615..dfd699e1e1 100644
--- a/tp/t/results/macro/protect_comma_macro_line.pl
+++ b/tp/t/results/macro/protect_comma_macro_line.pl
@@ -79,10 +79,6 @@ $result_trees{'protect_comma_macro_line'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' macrotwo { arg }
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/protect_in_body.pl 
b/tp/t/results/macro/protect_in_body.pl
index e74a6fe381..0805114a99 100644
--- a/tp/t/results/macro/protect_in_body.pl
+++ b/tp/t/results/macro/protect_in_body.pl
@@ -65,10 +65,6 @@ $result_trees{'protect_in_body'} = {
               'arg2'
             ]
           },
-          'info' => {
-            'arg_line' => ' macroone { arg1 , arg2 }
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/protect_in_body_line_arg.pl 
b/tp/t/results/macro/protect_in_body_line_arg.pl
index 3bd60d7c1f..0a3c6f4b8b 100644
--- a/tp/t/results/macro/protect_in_body_line_arg.pl
+++ b/tp/t/results/macro/protect_in_body_line_arg.pl
@@ -65,10 +65,6 @@ $result_trees{'protect_in_body_line_arg'} = {
               'arg2'
             ]
           },
-          'info' => {
-            'arg_line' => ' macroone { arg1 , arg2 }
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/protect_in_body_one_arg.pl 
b/tp/t/results/macro/protect_in_body_one_arg.pl
index a1cd85ca17..93f48b70cd 100644
--- a/tp/t/results/macro/protect_in_body_one_arg.pl
+++ b/tp/t/results/macro/protect_in_body_one_arg.pl
@@ -65,10 +65,6 @@ $result_trees{'protect_in_body_one_arg'} = {
               'arg2'
             ]
           },
-          'info' => {
-            'arg_line' => ' macroone { arg1 , arg2 }
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/recursive_call_in_argument.pl 
b/tp/t/results/macro/recursive_call_in_argument.pl
index 355beb5962..d3b846fd9a 100644
--- a/tp/t/results/macro/recursive_call_in_argument.pl
+++ b/tp/t/results/macro/recursive_call_in_argument.pl
@@ -64,10 +64,6 @@ $result_trees{'recursive_call_in_argument'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' anorecurse{arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/recursive_call_in_macro.pl 
b/tp/t/results/macro/recursive_call_in_macro.pl
index ee68d14b71..3d7758f9a2 100644
--- a/tp/t/results/macro/recursive_call_in_macro.pl
+++ b/tp/t/results/macro/recursive_call_in_macro.pl
@@ -64,10 +64,6 @@ $result_trees{'recursive_call_in_macro'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' anorecurse{arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/recursive_call_in_rmacro.pl 
b/tp/t/results/macro/recursive_call_in_rmacro.pl
index 798db8db1c..289d8cb037 100644
--- a/tp/t/results/macro/recursive_call_in_rmacro.pl
+++ b/tp/t/results/macro/recursive_call_in_rmacro.pl
@@ -67,10 +67,6 @@ $result_trees{'recursive_call_in_rmacro'} = {
             'macro_name' => 'rec',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' rec
-'
-          },
           'source_info' => {
             'line_nr' => 2
           }
diff --git a/tp/t/results/macro/redefine_texinfo_macro.pl 
b/tp/t/results/macro/redefine_texinfo_macro.pl
index 2de836644e..957ce885bb 100644
--- a/tp/t/results/macro/redefine_texinfo_macro.pl
+++ b/tp/t/results/macro/redefine_texinfo_macro.pl
@@ -64,10 +64,6 @@ $result_trees{'redefine_texinfo_macro'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' code{arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/simple_imbricated_macro.pl 
b/tp/t/results/macro/simple_imbricated_macro.pl
index f6fc881531..88d09bcba1 100644
--- a/tp/t/results/macro/simple_imbricated_macro.pl
+++ b/tp/t/results/macro/simple_imbricated_macro.pl
@@ -77,10 +77,6 @@ $result_trees{'simple_imbricated_macro'} = {
             'macro_name' => 'truc',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' truc {}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -176,10 +172,6 @@ $result_trees{'simple_imbricated_macro'} = {
                 'macro_name' => 'bidule',
                 'misc_args' => []
               },
-              'info' => {
-                'arg_line' => ' bidule {}
-'
-              },
               'source_info' => {
                 'line_nr' => 8,
                 'macro' => 'truc'
diff --git a/tp/t/results/macro/simple_imbricated_macro_rmacro.pl 
b/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
index b7f7779d00..1ef50791f6 100644
--- a/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
+++ b/tp/t/results/macro/simple_imbricated_macro_rmacro.pl
@@ -77,10 +77,6 @@ $result_trees{'simple_imbricated_macro_rmacro'} = {
             'macro_name' => 'truc',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' truc {}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -176,10 +172,6 @@ $result_trees{'simple_imbricated_macro_rmacro'} = {
                 'macro_name' => 'bidule',
                 'misc_args' => []
               },
-              'info' => {
-                'arg_line' => ' bidule {}
-'
-              },
               'source_info' => {
                 'line_nr' => 8,
                 'macro' => 'truc'
diff --git a/tp/t/results/macro/space_macro_after_end.pl 
b/tp/t/results/macro/space_macro_after_end.pl
index 89f4984135..9051f93f6f 100644
--- a/tp/t/results/macro/space_macro_after_end.pl
+++ b/tp/t/results/macro/space_macro_after_end.pl
@@ -62,10 +62,6 @@ $result_trees{'space_macro_after_end'} = {
             'macro_name' => 'spaces',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' spaces
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/space_macro_after_end_verbatim.pl 
b/tp/t/results/macro/space_macro_after_end_verbatim.pl
index 82abaa7ca9..8e135c2c0c 100644
--- a/tp/t/results/macro/space_macro_after_end_verbatim.pl
+++ b/tp/t/results/macro/space_macro_after_end_verbatim.pl
@@ -62,10 +62,6 @@ $result_trees{'space_macro_after_end_verbatim'} = {
             'macro_name' => 'spaces',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' spaces
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/text_before_after.pl 
b/tp/t/results/macro/text_before_after.pl
index 76da124749..d5740c9a39 100644
--- a/tp/t/results/macro/text_before_after.pl
+++ b/tp/t/results/macro/text_before_after.pl
@@ -67,10 +67,6 @@ $result_trees{'text_before_after'} = {
                 'macro_name' => 'mymacro',
                 'misc_args' => []
               },
-              'info' => {
-                'arg_line' => ' mymacro
-'
-              },
               'source_info' => {
                 'line_nr' => 1
               }
diff --git a/tp/t/results/macro/too_much_args.pl 
b/tp/t/results/macro/too_much_args.pl
index 36e379a231..557a78a7c2 100644
--- a/tp/t/results/macro/too_much_args.pl
+++ b/tp/t/results/macro/too_much_args.pl
@@ -70,10 +70,6 @@ $result_trees{'too_much_args'} = {
               'second'
             ]
           },
-          'info' => {
-            'arg_line' => ' twoargs {first, second}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/two_macros_on_a_line.pl 
b/tp/t/results/macro/two_macros_on_a_line.pl
index d71cd00551..345e79b4ce 100644
--- a/tp/t/results/macro/two_macros_on_a_line.pl
+++ b/tp/t/results/macro/two_macros_on_a_line.pl
@@ -62,10 +62,6 @@ $result_trees{'two_macros_on_a_line'} = {
             'macro_name' => 'mymacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' mymacro
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -140,10 +136,6 @@ $result_trees{'two_macros_on_a_line'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' mymacrowithargs{arg}
-'
-          },
           'source_info' => {
             'line_nr' => 5
           }
diff --git a/tp/t/results/macro/unpaired_backslash_in_macro_body.pl 
b/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
index 8c784c5ed0..de9de61aee 100644
--- a/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
+++ b/tp/t/results/macro/unpaired_backslash_in_macro_body.pl
@@ -69,10 +69,6 @@ $result_trees{'unpaired_backslash_in_macro_body'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' mymacro {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/verb_with_arobase_in_macro_call.pl 
b/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
index 8bb5f3f40e..60e84b694c 100644
--- a/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
+++ b/tp/t/results/macro/verb_with_arobase_in_macro_call.pl
@@ -70,10 +70,6 @@ $result_trees{'verb_with_arobase_in_macro_call'} = {
               'b'
             ]
           },
-          'info' => {
-            'arg_line' => ' showarg {a, b}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/macro/verb_with_brace_in_macro_call.pl 
b/tp/t/results/macro/verb_with_brace_in_macro_call.pl
index 3a58bdba81..bc84259ed5 100644
--- a/tp/t/results/macro/verb_with_brace_in_macro_call.pl
+++ b/tp/t/results/macro/verb_with_brace_in_macro_call.pl
@@ -71,10 +71,6 @@ $result_trees{'verb_with_brace_in_macro_call'} = {
               'c'
             ]
           },
-          'info' => {
-            'arg_line' => ' mycommand {a, b, c}
-'
-          },
           'source_info' => {
             'line_nr' => 2
           }
diff --git a/tp/t/results/macro/zero_argument.pl 
b/tp/t/results/macro/zero_argument.pl
index 409198cc52..79db1709dc 100644
--- a/tp/t/results/macro/zero_argument.pl
+++ b/tp/t/results/macro/zero_argument.pl
@@ -62,10 +62,6 @@ $result_trees{'zero_argument'} = {
             'macro_name' => 'foo',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' foo {}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -122,10 +118,6 @@ $result_trees{'zero_argument'} = {
             'macro_name' => 'abar',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' abar
-'
-          },
           'source_info' => {
             'line_nr' => 5
           }
diff --git a/tp/t/results/macro/zero_argument_comment.pl 
b/tp/t/results/macro/zero_argument_comment.pl
index 9bf3b6e2c2..47fc39154c 100644
--- a/tp/t/results/macro/zero_argument_comment.pl
+++ b/tp/t/results/macro/zero_argument_comment.pl
@@ -62,10 +62,6 @@ $result_trees{'zero_argument_comment'} = {
             'macro_name' => 'foo',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' foo {}@c foo c
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -122,10 +118,6 @@ $result_trees{'zero_argument_comment'} = {
             'macro_name' => 'abar',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' abar@comment bar comment
-'
-          },
           'source_info' => {
             'line_nr' => 5
           }
diff --git 
a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl 
b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
index d679a504e8..b404efdac5 100644
--- a/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
+++ b/tp/t/results/misc_commands/codequoteundirected_codequotebacktick.pl
@@ -89,10 +89,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                 'macro_name' => 'quotes',
                 'misc_args' => []
               },
-              'info' => {
-                'arg_line' => ' quotes
-'
-              },
               'source_info' => {
                 'line_nr' => 1
               }
@@ -235,10 +231,6 @@ $result_trees{'codequoteundirected_codequotebacktick'} = {
                 'macro_name' => 'allquotes',
                 'misc_args' => []
               },
-              'info' => {
-                'arg_line' => ' allquotes
-'
-              },
               'source_info' => {
                 'line_nr' => 10
               }
diff --git a/tp/t/results/misc_commands/kbdinputstyle.pl 
b/tp/t/results/misc_commands/kbdinputstyle.pl
index db6d0a6185..33e3f290e3 100644
--- a/tp/t/results/misc_commands/kbdinputstyle.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle.pl
@@ -117,10 +117,6 @@ $result_trees{'kbdinputstyle'} = {
             'macro_name' => 'codekbdmacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' codekbdmacro
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl 
b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
index 51093280f6..c384a28472 100644
--- a/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
+++ b/tp/t/results/misc_commands/kbdinputstyle_in_table.pl
@@ -142,10 +142,6 @@ $result_trees{'kbdinputstyle_in_table'} = {
             'macro_name' => 'codekbdmacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' codekbdmacro
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/misc_commands/test_allowcodebreaks.pl 
b/tp/t/results/misc_commands/test_allowcodebreaks.pl
index 7b711fda7b..c078eb1551 100644
--- a/tp/t/results/misc_commands/test_allowcodebreaks.pl
+++ b/tp/t/results/misc_commands/test_allowcodebreaks.pl
@@ -158,10 +158,6 @@ $result_trees{'test_allowcodebreaks'} = {
               'nr'
             ]
           },
-          'info' => {
-            'arg_line' => ' testallowcodebreakspara {nr}
-'
-          },
           'source_info' => {
             'line_nr' => 4
           }
@@ -239,10 +235,6 @@ $result_trees{'test_allowcodebreaks'} = {
             'macro_name' => 'testallowcodebreaksexample',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' testallowcodebreaksexample{}
-'
-          },
           'source_info' => {
             'line_nr' => 13
           }
diff --git a/tp/t/results/paragraph/indent_before_macro_definition_and_other.pl 
b/tp/t/results/paragraph/indent_before_macro_definition_and_other.pl
index 9dfe9e7801..307cef569a 100644
--- a/tp/t/results/paragraph/indent_before_macro_definition_and_other.pl
+++ b/tp/t/results/paragraph/indent_before_macro_definition_and_other.pl
@@ -357,10 +357,6 @@ $result_trees{'indent_before_macro_definition_and_other'} 
= {
               'g'
             ]
           },
-          'info' => {
-            'arg_line' => ' aaa {g}
-'
-          },
           'source_info' => {
             'line_nr' => 15
           }
diff --git a/tp/t/results/plaintext_tests/star_at_command_formatting.pl 
b/tp/t/results/plaintext_tests/star_at_command_formatting.pl
index 00eb468aab..0967d485da 100644
--- a/tp/t/results/plaintext_tests/star_at_command_formatting.pl
+++ b/tp/t/results/plaintext_tests/star_at_command_formatting.pl
@@ -117,10 +117,6 @@ $result_trees{'star_at_command_formatting'} = {
             'macro_name' => 'mymacro',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' mymacro
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/raw/nested_macros.pl 
b/tp/t/results/raw/nested_macros.pl
index be2b141a92..11f83a7223 100644
--- a/tp/t/results/raw/nested_macros.pl
+++ b/tp/t/results/raw/nested_macros.pl
@@ -90,10 +90,6 @@ $result_trees{'nested_macros'} = {
               'ex'
             ]
           },
-          'info' => {
-            'arg_line' => ' truc   { arg,  ex}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/transformations/protect_colon_source_mark.pl 
b/tp/t/results/transformations/protect_colon_source_mark.pl
index fe307e7153..b0984a0096 100644
--- a/tp/t/results/transformations/protect_colon_source_mark.pl
+++ b/tp/t/results/transformations/protect_colon_source_mark.pl
@@ -64,10 +64,6 @@ $result_trees{'protect_colon_source_mark'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' klm {arg}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/transformations/protect_comma_source_mark.pl 
b/tp/t/results/transformations/protect_comma_source_mark.pl
index 4af1714f7f..d7e72e40d5 100644
--- a/tp/t/results/transformations/protect_comma_source_mark.pl
+++ b/tp/t/results/transformations/protect_comma_source_mark.pl
@@ -62,10 +62,6 @@ $result_trees{'protect_comma_source_mark'} = {
             'macro_name' => 'vvv',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' vvv {}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git 
a/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
 
b/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
index d44c0006fb..3ce3392626 100644
--- 
a/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
+++ 
b/tp/t/results/transformations/protect_first_parenthesis_after_parenthesis_source_mark.pl
@@ -62,10 +62,6 @@ 
$result_trees{'protect_first_parenthesis_after_parenthesis_source_mark'} = {
             'macro_name' => 'vvv',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' vvv {}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git 
a/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl 
b/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
index 0efcf844c0..9bea87f84c 100644
--- a/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
+++ b/tp/t/results/transformations/protect_first_parenthesis_source_mark.pl
@@ -62,10 +62,6 @@ $result_trees{'protect_first_parenthesis_source_mark'} = {
             'macro_name' => 'vvv',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' vvv {}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git 
a/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
 
b/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
index 31821e588e..27ffaedc26 100644
--- 
a/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
+++ 
b/tp/t/results/transformations/protect_hashchar_at_line_beginning_source_mark.pl
@@ -75,10 +75,6 @@ 
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
                 'macro_name' => 'vvv',
                 'misc_args' => []
               },
-              'info' => {
-                'arg_line' => ' vvv {}
-'
-              },
               'source_info' => {
                 'file_name' => 'cpp_directives_line_value_macro.texi',
                 'line_nr' => 2
@@ -197,10 +193,6 @@ 
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
             'macro_name' => 'machash',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' machash {}
-'
-          },
           'source_info' => {
             'file_name' => 'cpp_directives_line_value_macro.texi',
             'line_nr' => 8
@@ -317,10 +309,6 @@ 
$result_trees{'protect_hashchar_at_line_beginning_source_mark'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' numberfileflag {arg}
-'
-          },
           'source_info' => {
             'file_name' => 'cpp_directives_line_value_macro.texi',
             'line_nr' => 14
diff --git 
a/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
 
b/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
index 926deb5048..85053f8171 100644
--- 
a/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
+++ 
b/tp/t/results/transformations/protect_node_after_label_source_mark_in_protected.pl
@@ -62,10 +62,6 @@ 
$result_trees{'protect_node_after_label_source_mark_in_protected'} = {
             'macro_name' => 'vvv',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' vvv {}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl 
b/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
index 704fd425df..5e9b8d1764 100644
--- a/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
+++ b/tp/t/results/value_and_macro/comma_value_in_macro_arg.pl
@@ -87,10 +87,6 @@ $result_trees{'comma_value_in_macro_arg'} = {
               'arg2'
             ]
           },
-          'info' => {
-            'arg_line' => ' macro1 { arg1 , arg2 }
-'
-          },
           'source_info' => {
             'line_nr' => 3
           }
diff --git a/tp/t/results/value_and_macro/macro_in_value.pl 
b/tp/t/results/value_and_macro/macro_in_value.pl
index acc15abad5..20d384d3b5 100644
--- a/tp/t/results/value_and_macro/macro_in_value.pl
+++ b/tp/t/results/value_and_macro/macro_in_value.pl
@@ -72,10 +72,6 @@ $result_trees{'macro_in_value'} = {
             'macro_name' => 'ab',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' ab
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
diff --git a/tp/t/results/value_and_macro/value_in_macro_body.pl 
b/tp/t/results/value_and_macro/value_in_macro_body.pl
index 04b592d798..77ab4c01f9 100644
--- a/tp/t/results/value_and_macro/value_in_macro_body.pl
+++ b/tp/t/results/value_and_macro/value_in_macro_body.pl
@@ -86,10 +86,6 @@ $result_trees{'value_in_macro_body'} = {
               'arg'
             ]
           },
-          'info' => {
-            'arg_line' => ' testvaluebody { arg }
-'
-          },
           'source_info' => {
             'line_nr' => 3
           }
diff --git a/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl 
b/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
index 35115cba0b..b1bf9a8daa 100644
--- a/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
+++ b/tp/t/results/value_and_macro/value_in_macro_formal_arg.pl
@@ -88,10 +88,6 @@ $result_trees{'value_in_macro_formal_arg'} = {
               'the@value{argument'
             ]
           },
-          'info' => {
-            'arg_line' => ' testvalue { arg , the@value{argument} }
-'
-          },
           'source_info' => {
             'line_nr' => 3
           }
diff --git a/tp/t/results/xml_tests/macro_and_args.pl 
b/tp/t/results/xml_tests/macro_and_args.pl
index ee27c5d0e8..96b7df8881 100644
--- a/tp/t/results/xml_tests/macro_and_args.pl
+++ b/tp/t/results/xml_tests/macro_and_args.pl
@@ -60,10 +60,6 @@ $result_trees{'macro_and_args'} = {
               '2b-bb'
             ]
           },
-          'info' => {
-            'arg_line' => ' good { aaa, 2b-bb}
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }
@@ -126,10 +122,6 @@ $result_trees{'macro_and_args'} = {
               'ccc v'
             ]
           },
-          'info' => {
-            'arg_line' => ' bad { ggg"@@^_ ff, nnn_b, ccc v}
-'
-          },
           'source_info' => {
             'line_nr' => 4
           }
diff --git a/tp/t/results/xtable/table_nested.pl 
b/tp/t/results/xtable/table_nested.pl
index 9ba23f78e0..14b5bdd292 100644
--- a/tp/t/results/xtable/table_nested.pl
+++ b/tp/t/results/xtable/table_nested.pl
@@ -162,10 +162,6 @@ $result_trees{'table_nested'} = {
             'macro_name' => 'myvtable',
             'misc_args' => []
           },
-          'info' => {
-            'arg_line' => ' myvtable
-'
-          },
           'source_info' => {
             'line_nr' => 1
           }



reply via email to

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