texinfo-commits
[Top][All Lists]
Advanced

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

texinfo/tp Texinfo/Parser.pm t/60macro.t t/80in...


From: Patrice Dumas
Subject: texinfo/tp Texinfo/Parser.pm t/60macro.t t/80in...
Date: Sun, 17 Oct 2010 20:40:53 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/10/17 20:40:53

Modified files:
        tp/Texinfo     : Parser.pm 
        tp/t           : 60macro.t 80include.t 
        tp/t/results/macro: macro_in_misc_commands.pl 
Added files:
        tp/t/include   : address@hidden 
        tp/t/results/include: macro_and_commands_in_early_commands.pl 
                              macro_in_early_commands.pl test_paths.pl 
        tp/t/results/macro: empty_macro.pl empty_macro_in_text_no_arg.pl 

Log message:
        More tests for include and macro.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/60macro.t?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/80include.t?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/include/inc_%64f--ile.texi?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/include/macro_and_commands_in_early_commands.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/include/macro_in_early_commands.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/include/test_paths.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_misc_commands.pl?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/empty_macro.pl?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/empty_macro_in_text_no_arg.pl?cvsroot=texinfo&rev=1.1

Patches:
Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- Texinfo/Parser.pm   17 Oct 2010 19:46:12 -0000      1.78
+++ Texinfo/Parser.pm   17 Oct 2010 20:40:53 -0000      1.79
@@ -1410,7 +1410,7 @@
     chomp($filename);
     my $file;
     if ($filename =~ m,^(/|\./|\.\./),) {
-      $file = $filename if (-e $file and -r $file);
+      $file = $filename if (-e $filename and -r $filename);
     } else {
       foreach my $dir (@{$self->{'include_directories'}}) {
         $file = "$dir/$filename" if (-e "$dir/$filename" and -r 
"$dir/$filename");

Index: t/60macro.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/60macro.t,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- t/60macro.t 17 Oct 2010 19:46:12 -0000      1.21
+++ t/60macro.t 17 Oct 2010 20:40:53 -0000      1.22
@@ -72,6 +72,25 @@
 
 @test1 abc
 '],
+['empty_macro',
+'@macro foo
address@hidden macro
+
address@hidden
+
address@hidden
+'],
+['empty_macro_in_text_no_arg',
+'@macro texnl{}
address@hidden macro
+
+ address@hidden  It.
+
address@hidden texnl2
address@hidden macro
+
+This 2 address@hidden  A.
+'],
 ['macro_one_arg_end_of_file',
 '@macro one-arg{arg}
 Arg \arg\.
@@ -727,11 +746,6 @@
 @footnotestyle @end-arg{}
 @footnotestyle @separate-arg{}
 
address@hidden latin1 
-ISO-8859-1
address@hidden macro
address@hidden @latin1{}
-
 @macro on-arg 
 on
 @end macro

Index: t/80include.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/80include.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- t/80include.t       17 Oct 2010 19:59:32 -0000      1.3
+++ t/80include.t       17 Oct 2010 20:40:53 -0000      1.4
@@ -37,6 +37,76 @@
 test_var include: @include address@hidden
 
 test_var verbatiminclude: @verbatiminclude address@hidden
+'],
+['macro_in_early_commands',
+'@macro begin-file
+macro_in_pass
address@hidden macro
address@hidden end-file-name {ext}
+texi_commands.\ext\
address@hidden macro
+
address@hidden @address@hidden
+
address@hidden latin1 
+ISO-8859-1
address@hidden macro
+
address@hidden documentencoding-command
address@hidden
address@hidden macro
+
address@hidden @latin1{}
+
address@hidden multiinclude
+macro_included.texi
address@hidden inc_file.texi
address@hidden macro
+
address@hidden Top
address@hidden top
+
address@hidden @multiinclude
+
address@hidden
+
address@hidden@}
address@hidden
+'],
+['macro_and_commands_in_early_commands',
+'@macro begin-file
+macro_i--n_pass@@
address@hidden macro
+
address@hidden @begin-file{}texi_commands.info
+
address@hidden latin1 
+ISO-8859-1@@
address@hidden macro
+
address@hidden @latin1{}
+
address@hidden multiinclude
+macro_included.texi
address@hidden inc_@@f--ile.texi
address@hidden macro
+
address@hidden Top
address@hidden top
+
address@hidden @multiinclude
+
address@hidden
+
address@hidden inc_@@f--ile.texi
+'],
+['test_paths',
+'@include inc_file.texi
+
address@hidden ./t/include/inc_file.texi
+
+@@include dot path.
address@hidden ./inc_file.texi 
 ']
 );
 

Index: t/results/macro/macro_in_misc_commands.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/macro/macro_in_misc_commands.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- t/results/macro/macro_in_misc_commands.pl   17 Oct 2010 19:46:12 -0000      
1.6
+++ t/results/macro/macro_in_misc_commands.pl   17 Oct 2010 20:40:53 -0000      
1.7
@@ -1505,65 +1505,6 @@
       'args' => [
         {
           'parent' => {},
-          'text' => 'latin1',
-          'type' => 'macro_name'
-        }
-      ],
-      'cmdname' => 'macro',
-      'contents' => [
-        {
-          'parent' => {},
-          'text' => 'ISO-8859-1
-',
-          'type' => 'raw'
-        }
-      ],
-      'parent' => {},
-      'special' => {
-        'arg_line' => ' latin1 
-',
-        'macrobody' => 'ISO-8859-1
-'
-      }
-    },
-    {
-      'parent' => {},
-      'text' => '
-',
-      'type' => 'empty_line_after_command'
-    },
-    {
-      'args' => [
-        {
-          'contents' => [
-            {
-              'parent' => {},
-              'text' => ' ',
-              'type' => 'empty_spaces_after_command'
-            },
-            {
-              'parent' => {},
-              'text' => 'ISO-8859-1
-'
-            }
-          ],
-          'parent' => {},
-          'type' => 'misc_line_arg'
-        }
-      ],
-      'cmdname' => 'documentencoding',
-      'parent' => {}
-    },
-    {
-      'parent' => {},
-      'text' => '
-',
-      'type' => 'empty_line'
-    },
-    {
-      'args' => [
-        {
-          'parent' => {},
           'text' => 'on-arg',
           'type' => 'macro_name'
         }
@@ -2927,27 +2868,28 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[93]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[93];
 $result_trees{'macro_in_misc_commands'}{'contents'}[93]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[94]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[95]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[95]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[95]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[95]{'args'}[0];
 $result_trees{'macro_in_misc_commands'}{'contents'}[95]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[95];
+$result_trees{'macro_in_misc_commands'}{'contents'}[95]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[95];
 $result_trees{'macro_in_misc_commands'}{'contents'}[95]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[96]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[97]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[97]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[97]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[97]{'args'}[0];
 $result_trees{'macro_in_misc_commands'}{'contents'}[97]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[97];
-$result_trees{'macro_in_misc_commands'}{'contents'}[97]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[97];
 $result_trees{'macro_in_misc_commands'}{'contents'}[97]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[98]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[98]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[98]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[98]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[98]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[98];
 $result_trees{'macro_in_misc_commands'}{'contents'}[98]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[99]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[99];
-$result_trees{'macro_in_misc_commands'}{'contents'}[99]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[99];
 $result_trees{'macro_in_misc_commands'}{'contents'}[99]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[100]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[100];
 $result_trees{'macro_in_misc_commands'}{'contents'}[100]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[101]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[101]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[101]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[101]{'args'}[0];
 $result_trees{'macro_in_misc_commands'}{'contents'}[101]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[101];
+$result_trees{'macro_in_misc_commands'}{'contents'}[101]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[101];
 $result_trees{'macro_in_misc_commands'}{'contents'}[101]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[102]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[102]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[102]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[102]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[102]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[102];
 $result_trees{'macro_in_misc_commands'}{'contents'}[102]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[103]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[103]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[103]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[103]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[103]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[103];
 $result_trees{'macro_in_misc_commands'}{'contents'}[103]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[104]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[104];
 $result_trees{'macro_in_misc_commands'}{'contents'}[104]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
@@ -2955,45 +2897,47 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[105]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[105];
 $result_trees{'macro_in_misc_commands'}{'contents'}[105]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[106]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[107]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[107]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[107]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[107]{'args'}[0];
 $result_trees{'macro_in_misc_commands'}{'contents'}[107]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[107];
+$result_trees{'macro_in_misc_commands'}{'contents'}[107]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[107];
 $result_trees{'macro_in_misc_commands'}{'contents'}[107]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[108]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[108];
 $result_trees{'macro_in_misc_commands'}{'contents'}[108]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[109]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[109]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[109]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[109]{'args'}[0];
 $result_trees{'macro_in_misc_commands'}{'contents'}[109]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[109];
-$result_trees{'macro_in_misc_commands'}{'contents'}[109]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[109];
 $result_trees{'macro_in_misc_commands'}{'contents'}[109]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[110]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[111]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[111]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[111]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[111]{'args'}[0];
 $result_trees{'macro_in_misc_commands'}{'contents'}[111]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[111];
-$result_trees{'macro_in_misc_commands'}{'contents'}[111]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[111];
 $result_trees{'macro_in_misc_commands'}{'contents'}[111]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[112]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[113]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[113]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[113]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[113]{'args'}[0];
 $result_trees{'macro_in_misc_commands'}{'contents'}[113]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[113];
+$result_trees{'macro_in_misc_commands'}{'contents'}[113]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[113];
 $result_trees{'macro_in_misc_commands'}{'contents'}[113]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[114]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[115]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[115]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[115]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[115]{'args'}[0];
 $result_trees{'macro_in_misc_commands'}{'contents'}[115]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[115];
+$result_trees{'macro_in_misc_commands'}{'contents'}[115]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[115];
 $result_trees{'macro_in_misc_commands'}{'contents'}[115]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[116]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[117]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[117];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[117]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[117];
 $result_trees{'macro_in_misc_commands'}{'contents'}[117]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[118]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[119]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[119];
-$result_trees{'macro_in_misc_commands'}{'contents'}[119]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[119];
 $result_trees{'macro_in_misc_commands'}{'contents'}[119]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[120]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[120];
+$result_trees{'macro_in_misc_commands'}{'contents'}[120]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[120];
 $result_trees{'macro_in_misc_commands'}{'contents'}[120]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[121]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[121];
-$result_trees{'macro_in_misc_commands'}{'contents'}[121]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[121];
 $result_trees{'macro_in_misc_commands'}{'contents'}[121]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[122]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[122];
+$result_trees{'macro_in_misc_commands'}{'contents'}[122]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[122];
+$result_trees{'macro_in_misc_commands'}{'contents'}[122]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[122];
+$result_trees{'macro_in_misc_commands'}{'contents'}[122]{'contents'}[3]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[122];
+$result_trees{'macro_in_misc_commands'}{'contents'}[122]{'contents'}[4]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[122];
+$result_trees{'macro_in_misc_commands'}{'contents'}[122]{'contents'}[5]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[122];
+$result_trees{'macro_in_misc_commands'}{'contents'}[122]{'contents'}[6]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[122];
+$result_trees{'macro_in_misc_commands'}{'contents'}[122]{'contents'}[7]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[122];
 $result_trees{'macro_in_misc_commands'}{'contents'}[122]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[123]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[124]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[124];
-$result_trees{'macro_in_misc_commands'}{'contents'}[124]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[124];
 $result_trees{'macro_in_misc_commands'}{'contents'}[124]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[125]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 
$result_trees{'macro_in_misc_commands'}{'contents'}[126]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[126];
@@ -3007,44 +2951,38 @@
 $result_trees{'macro_in_misc_commands'}{'contents'}[126]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[127]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[128]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[129]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[129];
 $result_trees{'macro_in_misc_commands'}{'contents'}[129]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[130]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[130];
-$result_trees{'macro_in_misc_commands'}{'contents'}[130]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[130];
-$result_trees{'macro_in_misc_commands'}{'contents'}[130]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[130];
-$result_trees{'macro_in_misc_commands'}{'contents'}[130]{'contents'}[3]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[130];
-$result_trees{'macro_in_misc_commands'}{'contents'}[130]{'contents'}[4]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[130];
-$result_trees{'macro_in_misc_commands'}{'contents'}[130]{'contents'}[5]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[130];
-$result_trees{'macro_in_misc_commands'}{'contents'}[130]{'contents'}[6]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[130];
-$result_trees{'macro_in_misc_commands'}{'contents'}[130]{'contents'}[7]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[130];
 $result_trees{'macro_in_misc_commands'}{'contents'}[130]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[131]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[131];
+$result_trees{'macro_in_misc_commands'}{'contents'}[131]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[131];
 $result_trees{'macro_in_misc_commands'}{'contents'}[131]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[132]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 
$result_trees{'macro_in_misc_commands'}{'contents'}[133]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[133];
+$result_trees{'macro_in_misc_commands'}{'contents'}[133]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[133];
+$result_trees{'macro_in_misc_commands'}{'contents'}[133]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[133];
+$result_trees{'macro_in_misc_commands'}{'contents'}[133]{'contents'}[3]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[133];
+$result_trees{'macro_in_misc_commands'}{'contents'}[133]{'contents'}[4]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[133];
+$result_trees{'macro_in_misc_commands'}{'contents'}[133]{'contents'}[5]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[133];
+$result_trees{'macro_in_misc_commands'}{'contents'}[133]{'contents'}[6]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[133];
+$result_trees{'macro_in_misc_commands'}{'contents'}[133]{'contents'}[7]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[133];
+$result_trees{'macro_in_misc_commands'}{'contents'}[133]{'contents'}[8]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[133];
 $result_trees{'macro_in_misc_commands'}{'contents'}[133]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[134]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[135]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[135];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[135]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[135];
-$result_trees{'macro_in_misc_commands'}{'contents'}[135]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[135];
 $result_trees{'macro_in_misc_commands'}{'contents'}[135]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[136]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[137]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[137];
-$result_trees{'macro_in_misc_commands'}{'contents'}[137]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[137];
-$result_trees{'macro_in_misc_commands'}{'contents'}[137]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[137];
-$result_trees{'macro_in_misc_commands'}{'contents'}[137]{'contents'}[3]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[137];
-$result_trees{'macro_in_misc_commands'}{'contents'}[137]{'contents'}[4]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[137];
-$result_trees{'macro_in_misc_commands'}{'contents'}[137]{'contents'}[5]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[137];
-$result_trees{'macro_in_misc_commands'}{'contents'}[137]{'contents'}[6]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[137];
-$result_trees{'macro_in_misc_commands'}{'contents'}[137]{'contents'}[7]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[137];
-$result_trees{'macro_in_misc_commands'}{'contents'}[137]{'contents'}[8]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[137];
 $result_trees{'macro_in_misc_commands'}{'contents'}[137]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[138]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[139]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[139];
-$result_trees{'macro_in_misc_commands'}{'contents'}[139]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[139];
 $result_trees{'macro_in_misc_commands'}{'contents'}[139]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[140]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[140];
 $result_trees{'macro_in_misc_commands'}{'contents'}[140]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[141]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[142]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[142];
+$result_trees{'macro_in_misc_commands'}{'contents'}[142]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[142];
 $result_trees{'macro_in_misc_commands'}{'contents'}[142]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[143]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[144]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[144];
 $result_trees{'macro_in_misc_commands'}{'contents'}[144]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[145]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[146]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[146];
@@ -3053,68 +2991,62 @@
 $result_trees{'macro_in_misc_commands'}{'contents'}[147]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[148]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[149]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[150]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[150];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[150]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[150];
 $result_trees{'macro_in_misc_commands'}{'contents'}[150]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[151]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[152]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[152];
+$result_trees{'macro_in_misc_commands'}{'contents'}[152]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[152];
 $result_trees{'macro_in_misc_commands'}{'contents'}[152]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[153]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[154]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[154];
+$result_trees{'macro_in_misc_commands'}{'contents'}[154]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[154]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[154]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[154]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[154]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[154];
 $result_trees{'macro_in_misc_commands'}{'contents'}[154]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[155]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[156]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[156];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[156]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[156];
 $result_trees{'macro_in_misc_commands'}{'contents'}[156]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[157]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[158]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[158]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[158]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[158]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[158]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[158];
 $result_trees{'macro_in_misc_commands'}{'contents'}[158]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[159]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[159];
 $result_trees{'macro_in_misc_commands'}{'contents'}[159]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[160]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[160];
-$result_trees{'macro_in_misc_commands'}{'contents'}[160]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[160];
 $result_trees{'macro_in_misc_commands'}{'contents'}[160]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[161]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[161];
+$result_trees{'macro_in_misc_commands'}{'contents'}[161]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[161]{'contents'}[1];
+$result_trees{'macro_in_misc_commands'}{'contents'}[161]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[161]{'contents'}[1]{'args'}[1];
+$result_trees{'macro_in_misc_commands'}{'contents'}[161]{'contents'}[1]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[161]{'contents'}[1];
+$result_trees{'macro_in_misc_commands'}{'contents'}[161]{'contents'}[1]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[161]{'contents'}[1];
+$result_trees{'macro_in_misc_commands'}{'contents'}[161]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[161]{'contents'}[1]{'args'}[3];
+$result_trees{'macro_in_misc_commands'}{'contents'}[161]{'contents'}[1]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[161]{'contents'}[1];
+$result_trees{'macro_in_misc_commands'}{'contents'}[161]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[161];
 $result_trees{'macro_in_misc_commands'}{'contents'}[161]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[162]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[163]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[163];
 $result_trees{'macro_in_misc_commands'}{'contents'}[163]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[164]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[164]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[164]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[164]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[164]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[164];
 $result_trees{'macro_in_misc_commands'}{'contents'}[164]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[165]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[165];
-$result_trees{'macro_in_misc_commands'}{'contents'}[165]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[165]{'contents'}[1];
-$result_trees{'macro_in_misc_commands'}{'contents'}[165]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[165]{'contents'}[1]{'args'}[1];
-$result_trees{'macro_in_misc_commands'}{'contents'}[165]{'contents'}[1]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[165]{'contents'}[1];
-$result_trees{'macro_in_misc_commands'}{'contents'}[165]{'contents'}[1]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[165]{'contents'}[1];
-$result_trees{'macro_in_misc_commands'}{'contents'}[165]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[165]{'contents'}[1]{'args'}[3];
-$result_trees{'macro_in_misc_commands'}{'contents'}[165]{'contents'}[1]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[165]{'contents'}[1];
-$result_trees{'macro_in_misc_commands'}{'contents'}[165]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[165];
+$result_trees{'macro_in_misc_commands'}{'contents'}[165]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[165]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[165]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[165]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[165]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[165];
 $result_trees{'macro_in_misc_commands'}{'contents'}[165]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[166]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[167]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[168]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[168]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[168]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[168]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[168]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[168];
 $result_trees{'macro_in_misc_commands'}{'contents'}[168]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[169]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[169]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[169]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[169]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[169]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[169];
 $result_trees{'macro_in_misc_commands'}{'contents'}[169]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[170]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[170];
+$result_trees{'macro_in_misc_commands'}{'contents'}[170]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[170];
 $result_trees{'macro_in_misc_commands'}{'contents'}[170]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[171]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[172]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[173]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[174]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[174];
-$result_trees{'macro_in_misc_commands'}{'contents'}[174]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[174];
 $result_trees{'macro_in_misc_commands'}{'contents'}[174]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[175]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[175];
+$result_trees{'macro_in_misc_commands'}{'contents'}[175]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[175];
 $result_trees{'macro_in_misc_commands'}{'contents'}[175]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[176]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[177]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[178]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[179]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[179];
-$result_trees{'macro_in_misc_commands'}{'contents'}[179]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[179];
-$result_trees{'macro_in_misc_commands'}{'contents'}[179]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[180]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[181]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[182]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 
 $result_texis{'macro_in_misc_commands'} = '@macro text 
 atext
@@ -3229,11 +3161,6 @@
 @footnotestyle end
 @footnotestyle separate 
 
address@hidden latin1 
-ISO-8859-1
address@hidden macro
address@hidden ISO-8859-1
-
 @macro on-arg 
 on
 @end macro
@@ -3371,7 +3298,6 @@
 
 
 
-
 @page @noindent @refill  something
 
 noindent at beginning of line

Index: t/include/address@hidden
===================================================================
RCS file: t/include/address@hidden
diff -N t/include/address@hidden
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/include/address@hidden    17 Oct 2010 20:40:53 -0000      1.1
@@ -0,0 +1 @@
+In included file.

Index: t/results/include/macro_and_commands_in_early_commands.pl
===================================================================
RCS file: t/results/include/macro_and_commands_in_early_commands.pl
diff -N t/results/include/macro_and_commands_in_early_commands.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/include/macro_and_commands_in_early_commands.pl   17 Oct 2010 
20:40:53 -0000      1.1
@@ -0,0 +1,455 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors);
+
+$result_trees{'macro_and_commands_in_early_commands'} = {
+  'contents' => [
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'begin-file',
+          'type' => 'macro_name'
+        }
+      ],
+      'cmdname' => 'macro',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'macro_i--n_pass@@
+',
+          'type' => 'raw'
+        }
+      ],
+      'parent' => {},
+      'special' => {
+        'arg_line' => ' begin-file
+',
+        'macrobody' => 'macro_i--n_pass@@
+'
+      }
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line_after_command'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'macro_i--n_pass'
+            },
+            {
+              'cmdname' => '@',
+              'parent' => {}
+            },
+            {
+              'parent' => {},
+              'text' => 'texi_commands.info
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'setfilename',
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'latin1',
+          'type' => 'macro_name'
+        }
+      ],
+      'cmdname' => 'macro',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'ISO-8859-1@@
+',
+          'type' => 'raw'
+        }
+      ],
+      'parent' => {},
+      'special' => {
+        'arg_line' => ' latin1 
+',
+        'macrobody' => 'ISO-8859-1@@
+'
+      }
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line_after_command'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'ISO-8859-1'
+            },
+            {
+              'cmdname' => '@',
+              'parent' => {}
+            },
+            {
+              'parent' => {},
+              'text' => '
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'documentencoding',
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'multiinclude',
+          'type' => 'macro_name'
+        }
+      ],
+      'cmdname' => 'macro',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'macro_included.texi
+',
+          'type' => 'raw'
+        },
+        {
+          'parent' => {},
+          'text' => '@include inc_@@f--ile.texi
+',
+          'type' => 'raw'
+        }
+      ],
+      'parent' => {},
+      'special' => {
+        'arg_line' => ' multiinclude
+',
+        'macrobody' => 'macro_included.texi
address@hidden inc_@@f--ile.texi
+'
+      }
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line_after_command'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'Top
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'node',
+      'parent' => {},
+      'remaining_args' => 4
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'top
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'top',
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'themacro',
+          'type' => 'macro_name'
+        }
+      ],
+      'cmdname' => 'macro',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'in themacro
+',
+          'type' => 'raw'
+        }
+      ],
+      'parent' => {},
+      'special' => {
+        'arg_line' => ' themacro
+',
+        'macrobody' => 'in themacro
+'
+      }
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line_after_command'
+    },
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'In included file.
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'in themacro
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'inc_'
+            },
+            {
+              'cmdname' => '@',
+              'parent' => {}
+            },
+            {
+              'parent' => {},
+              'text' => 'f--ile.texi
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'verbatiminclude',
+      'parent' => {}
+    }
+  ]
+};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[0]{'parent'} 
= $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[1]{'parent'} 
= $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[2]{'parent'} 
= $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[3]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[3]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[3]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[3]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[3]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[3]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[3]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[3]{'args'}[0]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[3];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[3]{'parent'} 
= $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[4]{'parent'} 
= $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[5]{'args'}[0]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[5];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[5]{'contents'}[0]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[5];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[5]{'parent'} 
= $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[6]{'parent'} 
= $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[7]{'parent'} 
= $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[8]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[8]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[8]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[8]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[8]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[8]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[8]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[8]{'args'}[0]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[8];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[8]{'parent'} 
= $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[9]{'parent'} 
= $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[10]{'args'}[0]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[10];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[10]{'contents'}[0]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[10];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[10]{'contents'}[1]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[10];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[10]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[11]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[12]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[13]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[13]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[13]{'args'}[0]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[13];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[13]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[14]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[14]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[14]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[14]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[14]{'args'}[0]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[14];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[14]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[15]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[16]{'args'}[0]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[16];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[16]{'contents'}[0]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[16];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[16]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[17]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[18]{'contents'}[0]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[18];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[18]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[19]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[20]{'contents'}[0]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[20];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[20]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[21]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'};
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[22]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[22]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[22]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[22]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[22]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[22]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[22]{'args'}[0]{'contents'}[3]{'parent'}
 = 
$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[22]{'args'}[0];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[22]{'args'}[0]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'}{'contents'}[22];
+$result_trees{'macro_and_commands_in_early_commands'}{'contents'}[22]{'parent'}
 = $result_trees{'macro_and_commands_in_early_commands'};
+
+$result_texis{'macro_and_commands_in_early_commands'} = '@macro begin-file
+macro_i--n_pass@@
address@hidden macro
+
address@hidden macro_i--n_pass@@texi_commands.info
+
address@hidden latin1 
+ISO-8859-1@@
address@hidden macro
+
address@hidden ISO-8859-1@@
+
address@hidden multiinclude
+macro_included.texi
address@hidden inc_@@f--ile.texi
address@hidden macro
+
address@hidden Top
address@hidden top
+
address@hidden themacro
+in themacro
address@hidden macro
+In included file.
+
+in themacro
+
address@hidden inc_@@f--ile.texi
+';
+
+
+$result_texts{'macro_and_commands_in_early_commands'} = '
+
+
+
+
+top
+
+In included file.
+
+in themacro
+
+';
+
+$result_errors{'macro_and_commands_in_early_commands'} = [
+  {
+    'error_line' => ':21: warning: @multiinclude defined with zero or more 
than one argument should be invoked with {}
+',
+    'file_name' => '',
+    'line_nr' => 21,
+    'macro' => '',
+    'text' => '@multiinclude defined with zero or more than one argument 
should be invoked with {}',
+    'type' => 'warning'
+  }
+];
+
+

Index: t/results/include/macro_in_early_commands.pl
===================================================================
RCS file: t/results/include/macro_in_early_commands.pl
diff -N t/results/include/macro_in_early_commands.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/include/macro_in_early_commands.pl        17 Oct 2010 20:40:53 
-0000      1.1
@@ -0,0 +1,544 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors);
+
+$result_trees{'macro_in_early_commands'} = {
+  'contents' => [
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'begin-file',
+          'type' => 'macro_name'
+        }
+      ],
+      'cmdname' => 'macro',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'macro_in_pass
+',
+          'type' => 'raw'
+        }
+      ],
+      'parent' => {},
+      'special' => {
+        'arg_line' => ' begin-file
+',
+        'macrobody' => 'macro_in_pass
+'
+      }
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line_after_command'
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'end-file-name',
+          'type' => 'macro_name'
+        },
+        {
+          'parent' => {},
+          'text' => 'ext',
+          'type' => 'macro_arg'
+        }
+      ],
+      'cmdname' => 'macro',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'texi_commands.\\ext\\
+',
+          'type' => 'raw'
+        }
+      ],
+      'parent' => {},
+      'special' => {
+        'arg_line' => ' end-file-name {ext}
+',
+        'args_index' => {
+          'ext' => 0
+        },
+        'macrobody' => 'texi_commands.\\ext\\
+'
+      }
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line_after_command'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'macro_in_passtexi_commands.info
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'setfilename',
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'latin1',
+          'type' => 'macro_name'
+        }
+      ],
+      'cmdname' => 'macro',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'ISO-8859-1
+',
+          'type' => 'raw'
+        }
+      ],
+      'parent' => {},
+      'special' => {
+        'arg_line' => ' latin1 
+',
+        'macrobody' => 'ISO-8859-1
+'
+      }
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line_after_command'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'documentencoding-command',
+          'type' => 'macro_name'
+        }
+      ],
+      'cmdname' => 'macro',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => '@documentencoding
+',
+          'type' => 'raw'
+        }
+      ],
+      'parent' => {},
+      'special' => {
+        'arg_line' => ' documentencoding-command
+',
+        'macrobody' => '@documentencoding
+'
+      }
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line_after_command'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'ISO-8859-1
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'documentencoding',
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'multiinclude',
+          'type' => 'macro_name'
+        }
+      ],
+      'cmdname' => 'macro',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'macro_included.texi
+',
+          'type' => 'raw'
+        },
+        {
+          'parent' => {},
+          'text' => '@include inc_file.texi
+',
+          'type' => 'raw'
+        }
+      ],
+      'parent' => {},
+      'special' => {
+        'arg_line' => ' multiinclude
+',
+        'macrobody' => 'macro_included.texi
address@hidden inc_file.texi
+'
+      }
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line_after_command'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'Top
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'node',
+      'parent' => {},
+      'remaining_args' => 4
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => ' ',
+              'type' => 'empty_spaces_after_command'
+            },
+            {
+              'parent' => {},
+              'text' => 'top
+'
+            }
+          ],
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'top',
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'themacro',
+          'type' => 'macro_name'
+        }
+      ],
+      'cmdname' => 'macro',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'in themacro
+',
+          'type' => 'raw'
+        }
+      ],
+      'parent' => {},
+      'special' => {
+        'arg_line' => ' themacro
+',
+        'macrobody' => 'in themacro
+'
+      }
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line_after_command'
+    },
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'In included file.
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'in themacro
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'macro_in_pass_texi_commands'
+        },
+        {
+          'cmdname' => '{',
+          'parent' => {}
+        },
+        {
+          'parent' => {},
+          'text' => 'info'
+        },
+        {
+          'cmdname' => '}',
+          'parent' => {}
+        },
+        {
+          'parent' => {},
+          'text' => '
+'
+        },
+        {
+          'parent' => {},
+          'text' => 'texi_commands.info
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    }
+  ]
+};
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_early_commands'}{'contents'}[0];
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[0];
+$result_trees{'macro_in_early_commands'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[2]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_early_commands'}{'contents'}[2];
+$result_trees{'macro_in_early_commands'}{'contents'}[2]{'args'}[1]{'parent'} = 
$result_trees{'macro_in_early_commands'}{'contents'}[2];
+$result_trees{'macro_in_early_commands'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[2];
+$result_trees{'macro_in_early_commands'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[4]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[5]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[5]{'args'}[0];
+$result_trees{'macro_in_early_commands'}{'contents'}[5]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[5]{'args'}[0];
+$result_trees{'macro_in_early_commands'}{'contents'}[5]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_early_commands'}{'contents'}[5];
+$result_trees{'macro_in_early_commands'}{'contents'}[5]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[6]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[7]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_early_commands'}{'contents'}[7];
+$result_trees{'macro_in_early_commands'}{'contents'}[7]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[7];
+$result_trees{'macro_in_early_commands'}{'contents'}[7]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[8]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[9]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[10]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_early_commands'}{'contents'}[10];
+$result_trees{'macro_in_early_commands'}{'contents'}[10]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[10];
+$result_trees{'macro_in_early_commands'}{'contents'}[10]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[11]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[12]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[13]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[13]{'args'}[0];
+$result_trees{'macro_in_early_commands'}{'contents'}[13]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[13]{'args'}[0];
+$result_trees{'macro_in_early_commands'}{'contents'}[13]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_early_commands'}{'contents'}[13];
+$result_trees{'macro_in_early_commands'}{'contents'}[13]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[14]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[15]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_early_commands'}{'contents'}[15];
+$result_trees{'macro_in_early_commands'}{'contents'}[15]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[15];
+$result_trees{'macro_in_early_commands'}{'contents'}[15]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[15];
+$result_trees{'macro_in_early_commands'}{'contents'}[15]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[16]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[17]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[18]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[18]{'args'}[0];
+$result_trees{'macro_in_early_commands'}{'contents'}[18]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[18]{'args'}[0];
+$result_trees{'macro_in_early_commands'}{'contents'}[18]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_early_commands'}{'contents'}[18];
+$result_trees{'macro_in_early_commands'}{'contents'}[18]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[19]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[19]{'args'}[0];
+$result_trees{'macro_in_early_commands'}{'contents'}[19]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[19]{'args'}[0];
+$result_trees{'macro_in_early_commands'}{'contents'}[19]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_early_commands'}{'contents'}[19];
+$result_trees{'macro_in_early_commands'}{'contents'}[19]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[20]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[21]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_early_commands'}{'contents'}[21];
+$result_trees{'macro_in_early_commands'}{'contents'}[21]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[21];
+$result_trees{'macro_in_early_commands'}{'contents'}[21]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[22]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[23]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[23];
+$result_trees{'macro_in_early_commands'}{'contents'}[23]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[24]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[25]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[25];
+$result_trees{'macro_in_early_commands'}{'contents'}[25]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[26]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+$result_trees{'macro_in_early_commands'}{'contents'}[27]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[27];
+$result_trees{'macro_in_early_commands'}{'contents'}[27]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[27];
+$result_trees{'macro_in_early_commands'}{'contents'}[27]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[27];
+$result_trees{'macro_in_early_commands'}{'contents'}[27]{'contents'}[3]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[27];
+$result_trees{'macro_in_early_commands'}{'contents'}[27]{'contents'}[4]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[27];
+$result_trees{'macro_in_early_commands'}{'contents'}[27]{'contents'}[5]{'parent'}
 = $result_trees{'macro_in_early_commands'}{'contents'}[27];
+$result_trees{'macro_in_early_commands'}{'contents'}[27]{'parent'} = 
$result_trees{'macro_in_early_commands'};
+
+$result_texis{'macro_in_early_commands'} = '@macro begin-file
+macro_in_pass
address@hidden macro
address@hidden end-file-name {ext}
+texi_commands.\\ext\\
address@hidden macro
+
address@hidden macro_in_passtexi_commands.info
+
address@hidden latin1 
+ISO-8859-1
address@hidden macro
+
address@hidden documentencoding-command
address@hidden
address@hidden macro
+
address@hidden ISO-8859-1
+
address@hidden multiinclude
+macro_included.texi
address@hidden inc_file.texi
address@hidden macro
+
address@hidden Top
address@hidden top
+
address@hidden themacro
+in themacro
address@hidden macro
+In included file.
+
+in themacro
+
address@hidden@}
+texi_commands.info
+';
+
+
+$result_texts{'macro_in_early_commands'} = '
+
+
+
+
+
+top
+
+In included file.
+
+in themacro
+
+macro_in_pass_texi_commands{info}
+texi_commands.info
+';
+
+$result_errors{'macro_in_early_commands'} = [
+  {
+    'error_line' => ':18: warning: @documentencoding-command defined with zero 
or more than one argument should be invoked with {}
+',
+    'file_name' => '',
+    'line_nr' => 18,
+    'macro' => '',
+    'text' => '@documentencoding-command defined with zero or more than one 
argument should be invoked with {}',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':28: warning: @multiinclude defined with zero or more 
than one argument should be invoked with {}
+',
+    'file_name' => '',
+    'line_nr' => 28,
+    'macro' => '',
+    'text' => '@multiinclude defined with zero or more than one argument 
should be invoked with {}',
+    'type' => 'warning'
+  }
+];
+
+

Index: t/results/include/test_paths.pl
===================================================================
RCS file: t/results/include/test_paths.pl
diff -N t/results/include/test_paths.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/include/test_paths.pl     17 Oct 2010 20:40:53 -0000      1.1
@@ -0,0 +1,120 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors);
+
+$result_trees{'test_paths'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'In included file.
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'In included file.
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'contents' => [
+        {
+          'cmdname' => '@',
+          'parent' => {}
+        },
+        {
+          'parent' => {},
+          'text' => 'include dot path.
+'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => ' ',
+                  'type' => 'empty_spaces_after_command'
+                },
+                {
+                  'parent' => {},
+                  'text' => './inc_file.texi 
+'
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'include',
+          'parent' => {}
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    }
+  ]
+};
+$result_trees{'test_paths'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'test_paths'}{'contents'}[0];
+$result_trees{'test_paths'}{'contents'}[0]{'parent'} = 
$result_trees{'test_paths'};
+$result_trees{'test_paths'}{'contents'}[1]{'parent'} = 
$result_trees{'test_paths'};
+$result_trees{'test_paths'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'test_paths'}{'contents'}[2];
+$result_trees{'test_paths'}{'contents'}[2]{'parent'} = 
$result_trees{'test_paths'};
+$result_trees{'test_paths'}{'contents'}[3]{'parent'} = 
$result_trees{'test_paths'};
+$result_trees{'test_paths'}{'contents'}[4]{'contents'}[0]{'parent'} = 
$result_trees{'test_paths'}{'contents'}[4];
+$result_trees{'test_paths'}{'contents'}[4]{'contents'}[1]{'parent'} = 
$result_trees{'test_paths'}{'contents'}[4];
+$result_trees{'test_paths'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'test_paths'}{'contents'}[4]{'contents'}[2]{'args'}[0];
+$result_trees{'test_paths'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'test_paths'}{'contents'}[4]{'contents'}[2]{'args'}[0];
+$result_trees{'test_paths'}{'contents'}[4]{'contents'}[2]{'args'}[0]{'parent'} 
= $result_trees{'test_paths'}{'contents'}[4]{'contents'}[2];
+$result_trees{'test_paths'}{'contents'}[4]{'contents'}[2]{'parent'} = 
$result_trees{'test_paths'}{'contents'}[4];
+$result_trees{'test_paths'}{'contents'}[4]{'parent'} = 
$result_trees{'test_paths'};
+
+$result_texis{'test_paths'} = 'In included file.
+
+In included file.
+
+@@include dot path.
address@hidden ./inc_file.texi 
+';
+
+
+$result_texts{'test_paths'} = 'In included file.
+
+In included file.
+
address@hidden dot path.
+';
+
+$result_errors{'test_paths'} = [
+  {
+    'error_line' => ':6: @include: Cannot find ./inc_file.texi 
+',
+    'file_name' => '',
+    'line_nr' => 6,
+    'macro' => '',
+    'text' => '@include: Cannot find ./inc_file.texi ',
+    'type' => 'error'
+  }
+];
+
+

Index: t/results/macro/empty_macro.pl
===================================================================
RCS file: t/results/macro/empty_macro.pl
diff -N t/results/macro/empty_macro.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/macro/empty_macro.pl      17 Oct 2010 20:40:53 -0000      1.1
@@ -0,0 +1,89 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors);
+
+$result_trees{'empty_macro'} = {
+  'contents' => [
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'foo',
+          'type' => 'macro_name'
+        }
+      ],
+      'cmdname' => 'macro',
+      'contents' => [],
+      'parent' => {},
+      'special' => {
+        'arg_line' => ' foo
+',
+        'macrobody' => ''
+      }
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line_after_command'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    }
+  ]
+};
+$result_trees{'empty_macro'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'empty_macro'}{'contents'}[0];
+$result_trees{'empty_macro'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_macro'};
+$result_trees{'empty_macro'}{'contents'}[1]{'parent'} = 
$result_trees{'empty_macro'};
+$result_trees{'empty_macro'}{'contents'}[2]{'parent'} = 
$result_trees{'empty_macro'};
+$result_trees{'empty_macro'}{'contents'}[3]{'parent'} = 
$result_trees{'empty_macro'};
+$result_trees{'empty_macro'}{'contents'}[4]{'parent'} = 
$result_trees{'empty_macro'};
+$result_trees{'empty_macro'}{'contents'}[5]{'parent'} = 
$result_trees{'empty_macro'};
+
+$result_texis{'empty_macro'} = '@macro foo
address@hidden macro
+
+
+
+
+';
+
+
+$result_texts{'empty_macro'} = '
+
+
+
+';
+
+$result_errors{'empty_macro'} = [
+  {
+    'error_line' => ':4: warning: @foo defined with zero or more than one 
argument should be invoked with {}
+',
+    'file_name' => '',
+    'line_nr' => 4,
+    'macro' => '',
+    'text' => '@foo defined with zero or more than one argument should be 
invoked with {}',
+    'type' => 'warning'
+  }
+];
+
+

Index: t/results/macro/empty_macro_in_text_no_arg.pl
===================================================================
RCS file: t/results/macro/empty_macro_in_text_no_arg.pl
diff -N t/results/macro/empty_macro_in_text_no_arg.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/macro/empty_macro_in_text_no_arg.pl       17 Oct 2010 20:40:53 
-0000      1.1
@@ -0,0 +1,152 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors);
+
+$result_trees{'empty_macro_in_text_no_arg'} = {
+  'contents' => [
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'texnl',
+          'type' => 'macro_name'
+        }
+      ],
+      'cmdname' => 'macro',
+      'contents' => [],
+      'parent' => {},
+      'special' => {
+        'arg_line' => ' texnl{}
+',
+        'macrobody' => ''
+      }
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line_after_command'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'parent' => {},
+      'text' => ' '
+    },
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'This.  It.
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'texnl2',
+          'type' => 'macro_name'
+        }
+      ],
+      'cmdname' => 'macro',
+      'contents' => [],
+      'parent' => {},
+      'special' => {
+        'arg_line' => ' texnl2
+',
+        'macrobody' => ''
+      }
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line_after_command'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'This 2 see.  A.
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    }
+  ]
+};
+$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0];
+$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[0]{'parent'} = 
$result_trees{'empty_macro_in_text_no_arg'};
+$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[1]{'parent'} = 
$result_trees{'empty_macro_in_text_no_arg'};
+$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[2]{'parent'} = 
$result_trees{'empty_macro_in_text_no_arg'};
+$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[3]{'parent'} = 
$result_trees{'empty_macro_in_text_no_arg'};
+$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[4]{'contents'}[0]{'parent'}
 = $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[4];
+$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[4]{'parent'} = 
$result_trees{'empty_macro_in_text_no_arg'};
+$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[5]{'parent'} = 
$result_trees{'empty_macro_in_text_no_arg'};
+$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6]{'args'}[0]{'parent'}
 = $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6];
+$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[6]{'parent'} = 
$result_trees{'empty_macro_in_text_no_arg'};
+$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[7]{'parent'} = 
$result_trees{'empty_macro_in_text_no_arg'};
+$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[8]{'parent'} = 
$result_trees{'empty_macro_in_text_no_arg'};
+$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[9]{'contents'}[0]{'parent'}
 = $result_trees{'empty_macro_in_text_no_arg'}{'contents'}[9];
+$result_trees{'empty_macro_in_text_no_arg'}{'contents'}[9]{'parent'} = 
$result_trees{'empty_macro_in_text_no_arg'};
+
+$result_texis{'empty_macro_in_text_no_arg'} = '@macro texnl{}
address@hidden macro
+
+ This.  It.
+
address@hidden texnl2
address@hidden macro
+
+This 2 see.  A.
+';
+
+
+$result_texts{'empty_macro_in_text_no_arg'} = '
+ This.  It.
+
+
+This 2 see.  A.
+';
+
+$result_errors{'empty_macro_in_text_no_arg'} = [
+  {
+    'error_line' => ':4: warning: @texnl defined with zero or more than one 
argument should be invoked with {}
+',
+    'file_name' => '',
+    'line_nr' => 4,
+    'macro' => '',
+    'text' => '@texnl defined with zero or more than one argument should be 
invoked with {}',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => ':9: warning: @texnl2 defined with zero or more than one 
argument should be invoked with {}
+',
+    'file_name' => '',
+    'line_nr' => 9,
+    'macro' => '',
+    'text' => '@texnl2 defined with zero or more than one argument should be 
invoked with {}',
+    'type' => 'warning'
+  }
+];
+
+



reply via email to

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