texinfo-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo/tp TODO Texinfo/Parser.pm t/60macro.t t...

From: Patrice Dumas
Subject: texinfo/tp TODO Texinfo/Parser.pm t/60macro.t t...
Date: Sun, 17 Oct 2010 19:46:13 +0000 
CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/10/17 19:46:12

Modified files:
        tp             : TODO 
        tp/Texinfo     : Parser.pm 
        tp/t           : 60macro.t 
        tp/t/results/macro: macro_in_misc_commands.pl 
Added files:
        tp/t/results/macro: macro_for_ignored_line_command.pl 

Log message:
        Simplify and fix handling of misc_commands.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/TODO?cvsroot=texinfo&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/60macro.t?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_in_misc_commands.pl?cvsroot=texinfo&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/macro/macro_for_ignored_line_command.pl?cvsroot=texinfo&rev=1.1

Patches:
Index: TODO
===================================================================
RCS file: /sources/texinfo/texinfo/tp/TODO,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- TODO        17 Oct 2010 17:16:58 -0000      1.21
+++ TODO        17 Oct 2010 19:46:12 -0000      1.22
@@ -22,9 +22,7 @@
 Error message if block or line misc at-command on a 
 block command or misc @-command line
 
-t/results/macro/macro_in_misc_commands.pl
-some spaces are not counted as empty_spaces_after_command.
-
+Texinfo::Convert::Text
 @c in menu lines (and maybe at other places) should be replaced by 
 \n and not eat the end of line.
 

Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- Texinfo/Parser.pm   17 Oct 2010 17:16:58 -0000      1.77
+++ Texinfo/Parser.pm   17 Oct 2010 19:46:12 -0000      1.78
@@ -90,122 +90,122 @@
 # sectioning commands and def* commands are added below.
 # index commands are added dynamically.
 my %misc_commands = (
-  'node' => {'arg' => 'line'}, # special arg
-  'bye' => {'skip' => 'line'}, # no arg
+  'node' => 'line', # special arg
+  'bye' => 'skipline', # no arg
   # set, clear
-  'set' => {'arg' => 'special'}, # special arg
+  'set' => 'special', # special arg
   #'clear' => {'arg' => 1, 'skip' => 'line'}, # special arg
-  'clear' => {'arg' => 'special'}, # special arg
-  'unmacro' => {'arg' => 'special'}, 
+  'clear' => 'special', # special arg
+  'unmacro' => 'special', 
   # comments
-  'comment' => {'arg' => 'lineraw'},
-  'c' => {'arg' => 'lineraw'},
+  'comment' => 'lineraw',
+  'c' => 'lineraw',
   # special
-  'definfoenclose' => {'arg' => 5},
-  'alias' => {'arg' => '3'}, 
+  'definfoenclose' => 5,
+  'alias' => 3, 
   # number of arguments is not known in advance.
-  'columnfractions' => {'arg' => '1'}, 
+  'columnfractions' => 1, 
   # file names
-  'setfilename' => {'arg' => 'line'},
-  'verbatiminclude'=> {'arg' => 'line'},
-  'include'=> {'arg' => 'line'},
-
-  'raisesections' => {'skip' => 'line'},  # no arg
-  'lowersections' => {'skip' => 'line'}, # no arg
-  'contents' => {}, # no arg
-  'shortcontents' => {}, # no arg
-  'summarycontents'=> {}, # no arg
-  'insertcopying'=> {}, # no arg
-  'clickstyle' => {'arg' => 'special'}, # arg should be an @-command
+  'setfilename' => 'line',
+  'verbatiminclude'=> 'line',
+  'include'=> 'line',
+
+  'raisesections' => 'skipline',  # no arg
+  'lowersections' => 'skipline', # no arg
+  'contents' => 'noarg', # no arg
+  'shortcontents' => 'noarg', # no arg
+  'summarycontents'=> 'noarg', # no arg
+  'insertcopying'=> 'noarg', # no arg
+  'clickstyle' => 'special', # arg should be an @-command
   # more relevant in preamble
   #'documentencoding' => {'arg' => 1, 'skip' => 'line'},
-  'documentencoding' => {'arg' => 'line'},
-  'setcontentsaftertitlepage' => {'skip' => 'line'}, # no arg
-  'setshortcontentsaftertitlepage' => {'skip' => 'line'}, # no arg
-  'novalidate' => {'skip' => 'line'}, # no arg
-  'dircategory'=> {'arg' => 'line'}, # line. Position with regard 
+  'documentencoding' => 'line',
+  'setcontentsaftertitlepage' => 'skipline', # no arg
+  'setshortcontentsaftertitlepage' => 'skipline', # no arg
+  'novalidate' => 'skipline', # no arg
+  'dircategory'=> 'line', # line. Position with regard 
                    # with direntry is significant
-  'pagesizes' => {'arg' => 'line'}, # can have 2 args 
+  'pagesizes' => 'line', # can have 2 args 
                            # or one? 200mm,150mm 11.5in
-  'finalout' => {'skip' => 'line'}, # no arg
-  'paragraphindent' => {'arg' => 1}, # arg none asis 
+  'finalout' => 'skipline', # no arg
+  'paragraphindent' =>  1, # arg none asis 
                        # or a number and forbids anything else on the line
-  'firstparagraphindent' => {'arg' => 1}, # none insert
-  'frenchspacing' => {'arg' => 1}, # on off
+  'firstparagraphindent' => 1, # none insert
+  'frenchspacing' => => 1, # on off
                                  # not so sure about 'skip' => 'line'
-  'fonttextsize' => {'arg' => 1}, # 10 11
-  'allowcodebreaks' => {'arg' => 1}, # false or true
-  'exampleindent' => {'arg' => 1}, # asis or a number
-  'footnotestyle'=> {'arg' => 1}, # end and separate
+  'fonttextsize' => 1, # 10 11
+  'allowcodebreaks' => 1, # false or true
+  'exampleindent' => 1, # asis or a number
+  'footnotestyle'=> 1, # end and separate
                            # and nothing else on the line
-  'afourpaper' => {'skip' => 'line'}, # no arg
-  'afivepaper' => {'skip' => 'line'}, # no arg
-  'afourlatex' => {'skip' => 'line'}, # no arg
-  'afourwide' => {'skip' => 'line'}, # no arg
-  'headings'=> {'arg' => 1},
+  'afourpaper' => 'skipline', # no arg
+  'afivepaper' => 'skipline', # no arg
+  'afourlatex' => 'skipline', # no arg
+  'afourwide' => 'skipline', # no arg
+  'headings'=> 1,
               #off on single double singleafter doubleafter
               # interacts with setchapternewpage
-  'setchapternewpage' => {'arg' => 1}, # off on odd
+  'setchapternewpage' => 1, # off on odd
   # FIXME for the following the @this* commands are not defined. Also
   # @value and maybe macro invocations may also be delayed.
-  'everyheading' => {'arg' => 'lineraw'}, # @*heading @*footing use @|
-  'everyfooting' => {'arg' => 'lineraw'}, # + @thispage @thissectionname 
@thissectionnum
-  'evenheading' => {'arg' => 'lineraw'},  # @thissection @thischaptername 
@thischapternum 
-  'evenfooting' => {'arg' => 'lineraw'},  # @thischapter @thistitle @thisfile
-  'oddheading' => {'arg' => 'lineraw'},
-  'oddfooting' => {'arg' => 'lineraw'},
-  'smallbook' => {'skip' => 'line'}, # no arg
-  'syncodeindex' => {'arg' => 2},
+  'everyheading' => 'lineraw', # @*heading @*footing use @|
+  'everyfooting' => 'lineraw', # + @thispage @thissectionname @thissectionnum
+  'evenheading' => 'lineraw',  # @thissection @thischaptername @thischapternum 
+  'evenfooting' => 'lineraw',  # @thischapter @thistitle @thisfile
+  'oddheading' => 'lineraw',
+  'oddfooting' => 'lineraw',
+  'smallbook' => 'skipline', # no arg
+  'syncodeindex' => 2,
                     # args are index identifiers
-  'synindex' => {'arg' => 2},
-  'defindex' => {'arg' => 1}, # one identifier arg
-  'defcodeindex' => {'arg' => 1}, # one identifier arg
+  'synindex' => 2,
+  'defindex' => 1, # one identifier arg
+  'defcodeindex' => 1, # one identifier arg
   #'documentlanguage' => {'skip' => 'line', 'arg' => 1},
-  'documentlanguage' => {'arg' => 'line'},
+  'documentlanguage' => 'line',
                                                  # language code arg
-  'kbdinputstyle' => {'arg' => 1}, # code 
+  'kbdinputstyle' => 1, # code 
                                                   #example distinct
-  'everyheadingmarks' => {'arg' => 1}, # top bottom
-  'everyfootingmarks' => {'arg' => 1},
-  'evenheadingmarks' => {'arg' => 1},
-  'oddheadingmarks' => {'arg' => 1},
-  'evenfootingmarks' => {'arg' => 1},
-  'oddfootingmarks' => {'arg' => 1},
+  'everyheadingmarks' => 1, # top bottom
+  'everyfootingmarks' => 1,
+  'evenheadingmarks' => 1,
+  'oddheadingmarks' => 1,
+  'evenfootingmarks' => 1,
+  'oddfootingmarks' => 1,
   # not valid for info (should be in @iftex)
-  'cropmarks' => {'skip' => 'line'}, # no arg
+  'cropmarks' => 'skipline', # no arg
 
   # formatting
-  'center' => {'arg' => 'line'},
+  'center' => 'line',
   # FIXME, line or arg? Verify the index exists?
-  'printindex' => {'arg' => 'line'},
+  'printindex' => 'line',
   #'printindex' => {'arg' => 1, 'skip' => 'line'},
-  'listoffloats' => {'arg' => 'line'},
+  'listoffloats' => 'line',
   # especially in titlepage
-  'shorttitle' => {'arg' => 'line'},
-  'shorttitlepage' => {'arg' => 'line'},
-  'settitle' => {'arg' => 'line'},
-  'author' => {'arg' => 'line'},
-  'subtitle' => {'arg' => 'line'},
-  'title' => {'arg' => 'line'},
-  'sp' => {'arg' => 1}, # numerical arg
-  'page' => {'skip' => 'line'}, # no arg (pagebreak)
-  'need' => {'arg' => 1}, # one numerical/real arg
+  'shorttitle' => 'line',
+  'shorttitlepage' => 'line',
+  'settitle' => 'line',
+  'author' => 'line',
+  'subtitle' => 'line',
+  'title' => 'line',
+  'sp' => 1, # numerical arg
+  'page' => 'skipline', # no arg (pagebreak)
+  'need' => 1, # one numerical/real arg
   # formatting
-  'noindent' => {'skip' => 'space'}, # no arg
-  'indent' => {'skip' => 'space'},
-  'exdent' => {'skip' => 'space'},
-  'headitem' => {'skip' => 'space'},
-  'item' => {'skip' => 'space'}, # or line, depending on the context
-  'itemx' => {'skip' => 'space'},
-  'tab' => {'skip' => 'space'}, 
+  'noindent' => 'skipspace', # no arg
+  'indent' => 'skipspace',
+  'exdent' => 'skipspace',
+  'headitem' => 'skipspace',
+  'item' => 'skipspace', # or line, depending on the context
+  'itemx' => 'skipspace',
+  'tab' => 'skipspace', 
   # not valid for info (should be in @iftex)
-  'vskip' => {'arg' => 'lineraw'}, # arg line in TeX
+  'vskip' => 'lineraw', # arg line in TeX
   # obsolete @-commands.
-  'refill' => {}, # no arg (obsolete, to be ignored)
+  'refill' => 'noarg', # no arg (obsolete, to be ignored)
   # Remove spaces and end of lines after the 
   # commands? If no, they can lead to empty lines
-  'quote-arg' => {'skip' => 'line'},
-  'allow-recursion' => {'skip' => 'line'},
+  'quote-arg' => 'skipline',
+  'allow-recursion' => 'skipline',
 );
 
 # command with braces. value is the max number of arguments.
@@ -293,7 +293,7 @@
   'deftypemethod'
 ) {
   $block_commands{$def_command} = 'def';
-  $misc_commands{$def_command.'x'} = {'arg' => 'line'};
+  $misc_commands{$def_command.'x'} = 'line';
   $def_commands{$def_command} = 1;
   $def_commands{$def_command.'x'} = 1;
 }
@@ -410,7 +410,7 @@
     'chapheading',
     'centerchap'
 ) {
-  $misc_commands{$sectioning_command} = { 'arg' => 'line' };
+  $misc_commands{$sectioning_command} = 'line';
   $root_commands{$sectioning_command} = 1
     unless ($sectioning_command =~ /heading/);
 }
@@ -516,7 +516,7 @@
   $parser->{'misc_commands'} = _deep_copy (\%misc_commands);
   $parser->{'no_paragraph_commands'} = { %default_no_paragraph_commands };
   foreach my $name (@{$parser->{'indices'}}, @default_index_names) {
-    $parser->{'misc_commands'}->{$name.'index'} = { 'arg' => 'line' };
+    $parser->{'misc_commands'}->{$name.'index'} = 'line';
     $parser->{'no_paragraph_commands'}->{$name.'index'} = 1;
   }
   $parser->{'errors_warnings'} = [];
@@ -1353,8 +1353,8 @@
     my $misc_cmd = $current;
     my $command = $current->{'cmdname'};
     print STDERR "MISC END address@hidden" if ($self->{'debug'});
-    if ($self->{'misc_commands'}->{$command}->{'arg'}
-        and $self->{'misc_commands'}->{$command}->{'arg'} =~ /^\d$/) {
+    if ($self->{'misc_commands'}->{$command}
+        and $self->{'misc_commands'}->{$command} =~ /^\d$/) {
       my $args = _parse_line_command_args ($self, $current, $line_nr);
       $current->{'special'}->{'misc_args'} = $args if (defined($args));
     }
@@ -1968,10 +1968,41 @@
             $current = _end_block_command($self, $current, $line_nr);
           }
             
-          my ($args, $line_arg, $special);
-          ($line, $args, $line_arg, $special) 
-             = $self->_parse_misc_command($line, $command, $line_nr);
+          # noarg skipline skipspace line lineraw /^\d$/
+          my $arg_spec = $self->{'misc_commands'}->{$command};
 
+          if ($arg_spec eq 'noarg') {
+            push @{$current->{'contents'}}, {'cmdname' => $command,
+                                             'parent' => $current};
+          # all the cases using the raw line
+          } elsif ($arg_spec eq 'skipline' or $arg_spec eq 'lineraw'
+                   or $arg_spec eq 'special') {
+            # complete the line if there was a user macro expansion
+            if ($line !~ /\n/) {
+              my ($new_line, $new_line_nr) = _new_line($text, $line_nr);
+              $line .= $new_line if (defined($new_line));
+            }
+            push @{$current->{'contents'}}, {'cmdname' => $command,
+                                             'parent' => $current};
+            my $args = [];
+            if ($arg_spec eq 'lineraw') {
+              $args = [ $line ];
+            } elsif ($arg_spec eq 'special') {
+              $args 
+                = $self->_parse_special_misc_command($line, $command, 
$line_nr);
+              $current->{'contents'}->[-1]->{'special'}->{'arg_line'} = $line;
+            }
+            foreach my $arg (@$args) {
+              push @{$current->{'contents'}->[-1]->{'args'}},
+                { 'type' => 'misc_arg', 'text' => $arg, 
+                  'parent' => $current->{'contents'}->[-1] };
+            }
+            $current = _end_line($self, $current, $line_nr);
+            last NEXT_LINE if ($command eq 'bye');
+            last;
+          } else {
+            my $line_arg = 0;
+            $line_arg = 1 if ($arg_spec ne 'skipspace');
           if ($command eq 'item' or $command eq 'itemx' 
                or $command eq 'headitem' or $command eq 'tab') {
             my $parent;
@@ -1993,7 +2024,7 @@
                 $current = $parent;
                 push @{$current->{'contents'}}, 
                   { 'cmdname' => $command, 'parent' => $current };
-                $line_arg = $line;
+                  $line_arg = 1;
               } else {
                 $self->_line_error (sprintf($self->__("address@hidden not 
meaningful inside address@hidden' block"), $command, $parent->{'cmdname'}), 
$line_nr);
               }
@@ -2038,10 +2069,9 @@
               $self->_line_error (sprintf($self->__("address@hidden outside of 
table or list"), $command), $line_nr);
             }
           } else {
+
             push @{$current->{'contents'}}, 
               { 'cmdname' => $command, 'parent' => $current };
-            $current->{'contents'}->[-1]->{'special'} = $special 
-                                              if (defined($special));
             # def*x
             if ($def_commands{$command}) {
               my $base_command = $command;
@@ -2053,18 +2083,10 @@
               push @{$self->{'context_stack'}}, 'def';
               $current->{'contents'}->[-1]->{'type'} = 'def_line';
             }
-              
-            foreach my $arg (@$args) {
-              push @{$current->{'contents'}->[-1]->{'args'}},
-                { 'type' => 'misc_arg', 'text' => $arg, 
-                  'parent' => $current->{'contents'}->[-1] };
-            }
           }
-
           # a container for what is on the @-command line, considered to
           # be the @-command argument
-          if (defined($line_arg)) {
-            $line = $line_arg;
+            if ($line_arg) {
             $current = $current->{'contents'}->[-1];
             $current->{'args'} = [ { 'type' => 'misc_line_arg', 
                                      'contents' => [], 
@@ -2074,17 +2096,9 @@
             # be very wise...
             $current->{'remaining_args'} = 4 if ($command eq 'node');
             $current = $current->{'args'}->[-1];
-            $line = _start_empty_line_after_command($line, $current);
-          } elsif ($line eq '') {
-            $current = _end_line($self, $current, $line_nr);
-            last;
-          } elsif ($self->{'misc_commands'}->{$command}->{'skip'} 
-                   and $self->{'misc_commands'}->{$command}->{'skip'} eq 
'space') {
+            }
             $line = _start_empty_line_after_command($line, $current);
           }
-
-          last NEXT_LINE if ($command eq 'bye');
-
         # @-command with matching @end
         } elsif (exists($block_commands{$command})) {
           if ($command eq 'macro' or $command eq 'rmacro') {
@@ -2443,8 +2457,7 @@
     $result .= '}' if ($braces);
   }
   if ($misc_commands{$cmdname}
-      and $misc_commands{$cmdname}->{'skip'}
-      and $misc_commands{$cmdname}->{'skip'} eq 'line') { 
+      and $misc_commands{$cmdname} eq 'skipline') {
     $result .="\n";
   }
   $result .= '{'.$cmd->{'type'}.'}' if ($cmdname eq 'value');
@@ -2454,23 +2467,13 @@
 
 # parse special line @-commands, unmacro, set, clear, clickstyle.
 # Also remove spaces or ignore text, as specified in the misc_commands hash.
-sub _parse_misc_command($$$$)
+sub _parse_special_misc_command($$$$)
 {
   my $self = shift;
   my $line = shift;
   my $command = shift;
   my $line_nr = shift;
   my $args = [];
-  my $line_arg;
-  my $skip_spec = '';
-  my $arg_spec = '';
-  my $special;
-
-  $skip_spec = $self->{'misc_commands'}->{$command}->{'skip'}
-    if (defined($self->{'misc_commands'}->{$command}->{'skip'}));
-  $arg_spec = $self->{'misc_commands'}->{$command}->{'arg'}
-    if (defined($self->{'misc_commands'}->{$command}->{'arg'}));
-#print STDERR "HHHHHHHHH $line $command arg_spec $arg_spec skip_spec 
$skip_spec\n";
 
   if ($command eq 'set') {
     # REVALUE
@@ -2513,23 +2516,10 @@
     } else {
       _line_error ($self, sprintf($self->__("address@hidden should only accept 
a address@hidden as argument, not `%s'"), $command, $line), $line_nr);
     }
-  } elsif ($arg_spec) {
-    if ($arg_spec ne 'lineraw') {
-      $line_arg = $line;
-    }
-    else {
-      $args = [ $line ];
-    }
-    $line = '';
-  } 
-  if ($arg_spec eq 'special') {
-    $special = { 'arg_line' => $line };
-    $line = '';
-  }
-  if ($skip_spec eq 'line') {
-    $line = '';
+  } else {
+    die "Unknown special command $command\n";
   }
-  return ($line, $args, $line_arg, $special);
+  return ($args);
 }
 
 # at the end of a @-command line with arguments, parse the resulting 
@@ -2640,7 +2630,7 @@
                                 __("Reserved index name %s"),$name), $line_nr);
       } else {
         $args = [$name];
-        $self->{'misc_commands'}->{$name.'index'} = { 'arg' => 'line' };
+        $self->{'misc_commands'}->{$name.'index'} = 'line';
         $self->{'no_paragraph_commands'}->{$name.'index'} = 1;
       }
     } else {

Index: t/60macro.t
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/60macro.t,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/60macro.t 16 Oct 2010 13:41:22 -0000      1.20
+++ t/60macro.t 17 Oct 2010 19:46:12 -0000      1.21
@@ -307,6 +307,13 @@
 
 @address@hidden@a-letter{}.
 '],
+['macro_for_ignored_line_command',
+'@macro page-macro
address@hidden
address@hidden macro
+
address@hidden on the line
+'],
 ['two_macros_on_a_line',
 '@macro mymacro
 in mymacro
@@ -760,17 +767,19 @@
 @refill
 @end macro
 
-@@page @page-macro{} @@noindent @noindent-macro{} @@refill @refill-macro{} 
something
+@@page @page-macro{} on page line
+@@noindent @noindent-macro{} @@refill @refill-macro{} something
 
 @noindent-macro{}     noindent at beginning of line
 @noindent-macro{}
 noindent on the preceding line
   @noindent-macro{}    noindent after space at beginning of line
address@hidden         page at beginning of line
address@hidden
address@hidden         page at beginning of line
address@hidden
 After page on its own line.
 
-@@page @page-macro{}   @@noindent @noindent-macro{}    @@refill @refill-macro{}
+@@page @page-macro{}
+two spaces   @@noindent @noindent-macro{}    @@refill @refill-macro{}
 
 @macro contents-macro 
 @contents

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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- t/results/macro/macro_in_misc_commands.pl   17 Oct 2010 10:50:46 -0000      
1.5
+++ t/results/macro/macro_in_misc_commands.pl   17 Oct 2010 19:46:12 -0000      
1.6
@@ -290,12 +290,6 @@
       'parent' => {}
     },
     {
-      'parent' => {},
-      'text' => '
-',
-      'type' => 'empty_line'
-    },
-    {
       'args' => [
         {
           'contents' => [
@@ -458,12 +452,6 @@
       'parent' => {}
     },
     {
-      'parent' => {},
-      'text' => '
-',
-      'type' => 'empty_line'
-    },
-    {
       'args' => [
         {
           'parent' => {},
@@ -505,12 +493,6 @@
       'type' => 'empty_line'
     },
     {
-      'parent' => {},
-      'text' => '
-',
-      'type' => 'empty_line'
-    },
-    {
       'contents' => [
         {
           'cmdname' => '@',
@@ -2028,10 +2010,6 @@
       'parent' => {}
     },
     {
-      'parent' => {},
-      'text' => ' '
-    },
-    {
       'contents' => [
         {
           'cmdname' => '@',
@@ -2047,7 +2025,8 @@
         },
         {
           'parent' => {},
-          'text' => ' '
+          'text' => ' ',
+          'type' => 'empty_spaces_after_command'
         },
         {
           'cmdname' => '@',
@@ -2082,7 +2061,8 @@
     },
     {
       'parent' => {},
-      'text' => '     '
+      'text' => '     ',
+      'type' => 'empty_spaces_after_command'
     },
     {
       'contents' => [
@@ -2094,20 +2074,14 @@
         {
           'cmdname' => 'noindent',
           'parent' => {}
-        }
-      ],
-      'parent' => {},
-      'type' => 'paragraph'
     },
     {
       'parent' => {},
       'text' => '
 ',
-      'type' => 'empty_line'
+          'type' => 'empty_line_after_command'
     },
     {
-      'contents' => [
-        {
           'parent' => {},
           'text' => 'noindent on the preceding line
 '
@@ -2122,7 +2096,12 @@
         },
         {
           'parent' => {},
-          'text' => '    noindent after space at beginning of line
+          'text' => '    ',
+          'type' => 'empty_spaces_after_command'
+        },
+        {
+          'parent' => {},
+          'text' => 'noindent after space at beginning of line
 '
         }
       ],
@@ -2173,12 +2152,12 @@
       'parent' => {}
     },
     {
+      'contents' => [
+        {
       'parent' => {},
-      'text' => '   '
+          'text' => 'two spaces   '
     },
     {
-      'contents' => [
-        {
           'cmdname' => '@',
           'parent' => {}
         },
@@ -2192,7 +2171,8 @@
         },
         {
           'parent' => {},
-          'text' => '    '
+          'text' => '    ',
+          'type' => 'empty_spaces_after_command'
         },
         {
           'cmdname' => '@',
@@ -2205,16 +2185,15 @@
         {
           'cmdname' => 'refill',
           'parent' => {}
-        }
-      ],
-      'parent' => {},
-      'type' => 'paragraph'
     },
     {
       'parent' => {},
       'text' => '
-',
-      'type' => 'empty_line'
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
     },
     {
       'parent' => {},
@@ -2260,8 +2239,7 @@
     {
       'parent' => {},
       'text' => '
-',
-      'type' => 'empty_line'
+'
     },
     {
       'parent' => {},
@@ -2329,12 +2307,6 @@
       'type' => 'empty_line'
     },
     {
-      'parent' => {},
-      'text' => '
-',
-      'type' => 'empty_line'
-    },
-    {
       'args' => [
         {
           'parent' => {},
@@ -2371,7 +2343,8 @@
     },
     {
       'parent' => {},
-      'text' => ' '
+      'text' => ' ',
+      'type' => 'empty_spaces_after_command'
     },
     {
       'contents' => [
@@ -2631,8 +2604,7 @@
     {
       'parent' => {},
       'text' => '
-',
-      'type' => 'empty_line'
+'
     },
     {
       'parent' => {},
@@ -2678,8 +2650,7 @@
     {
       'parent' => {},
       'text' => '
-',
-      'type' => 'empty_line'
+'
     },
     {
       'parent' => {},
@@ -2727,12 +2698,6 @@
     {
       'cmdname' => 'bye',
       'parent' => {}
-    },
-    {
-      'parent' => {},
-      'text' => '
-',
-      'type' => 'empty_line'
     }
   ]
 };
@@ -2781,143 +2746,152 @@
 $result_trees{'macro_in_misc_commands'}{'contents'}[18]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[18];
 $result_trees{'macro_in_misc_commands'}{'contents'}[18]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[19]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[20]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[20]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[20]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[20]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[20]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[20];
 $result_trees{'macro_in_misc_commands'}{'contents'}[20]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[21]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[21]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[21]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[21]{'args'}[0];
 $result_trees{'macro_in_misc_commands'}{'contents'}[21]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[21];
 $result_trees{'macro_in_misc_commands'}{'contents'}[21]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[22]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[22];
 $result_trees{'macro_in_misc_commands'}{'contents'}[22]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[23]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[23];
 $result_trees{'macro_in_misc_commands'}{'contents'}[23]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[24]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[24];
+$result_trees{'macro_in_misc_commands'}{'contents'}[24]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[24];
 $result_trees{'macro_in_misc_commands'}{'contents'}[24]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[25]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[25];
-$result_trees{'macro_in_misc_commands'}{'contents'}[25]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[25];
 $result_trees{'macro_in_misc_commands'}{'contents'}[25]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[26]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[27]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[27]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[27]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[27]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[27]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[27];
 $result_trees{'macro_in_misc_commands'}{'contents'}[27]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[28]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[28]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[28]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[28]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[28]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[28];
 $result_trees{'macro_in_misc_commands'}{'contents'}[28]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[29]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[29];
+$result_trees{'macro_in_misc_commands'}{'contents'}[29]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[29];
 $result_trees{'macro_in_misc_commands'}{'contents'}[29]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[30]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[30];
-$result_trees{'macro_in_misc_commands'}{'contents'}[30]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[30];
 $result_trees{'macro_in_misc_commands'}{'contents'}[30]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[31]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[32]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[32];
+$result_trees{'macro_in_misc_commands'}{'contents'}[32]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[32];
 $result_trees{'macro_in_misc_commands'}{'contents'}[32]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[33]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[34]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[34];
-$result_trees{'macro_in_misc_commands'}{'contents'}[34]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[34];
 $result_trees{'macro_in_misc_commands'}{'contents'}[34]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[35]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[36]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[36];
+$result_trees{'macro_in_misc_commands'}{'contents'}[36]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[36];
+$result_trees{'macro_in_misc_commands'}{'contents'}[36]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[36]{'contents'}[2]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[36]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[36]{'contents'}[2]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[36]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[36]{'contents'}[2];
+$result_trees{'macro_in_misc_commands'}{'contents'}[36]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[36];
 $result_trees{'macro_in_misc_commands'}{'contents'}[36]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[37]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[38]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[38]{'contents'}[0]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[38]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[38]{'contents'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[38]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[38];
+$result_trees{'macro_in_misc_commands'}{'contents'}[38]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[38];
 $result_trees{'macro_in_misc_commands'}{'contents'}[38]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[39]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[39];
-$result_trees{'macro_in_misc_commands'}{'contents'}[39]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[39];
-$result_trees{'macro_in_misc_commands'}{'contents'}[39]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[39]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[39]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[39]{'contents'}[2]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[39]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[39]{'contents'}[2];
-$result_trees{'macro_in_misc_commands'}{'contents'}[39]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[39];
 $result_trees{'macro_in_misc_commands'}{'contents'}[39]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[40]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[40];
+$result_trees{'macro_in_misc_commands'}{'contents'}[40]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[40];
 $result_trees{'macro_in_misc_commands'}{'contents'}[40]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[41]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[41]{'contents'}[0]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[41]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[41]{'contents'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[41]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[41];
-$result_trees{'macro_in_misc_commands'}{'contents'}[41]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[41];
 $result_trees{'macro_in_misc_commands'}{'contents'}[41]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[42]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[42]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[42]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[42]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[42]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[42];
 $result_trees{'macro_in_misc_commands'}{'contents'}[42]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[43]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[43];
-$result_trees{'macro_in_misc_commands'}{'contents'}[43]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[43];
 $result_trees{'macro_in_misc_commands'}{'contents'}[43]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[44]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[44]{'contents'}[0]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[44]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[44]{'contents'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[44]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[44];
+$result_trees{'macro_in_misc_commands'}{'contents'}[44]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[44];
 $result_trees{'macro_in_misc_commands'}{'contents'}[44]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[45]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[45]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[45]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[45]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[45]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[45];
 $result_trees{'macro_in_misc_commands'}{'contents'}[45]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[46]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[46];
+$result_trees{'macro_in_misc_commands'}{'contents'}[46]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[46];
 $result_trees{'macro_in_misc_commands'}{'contents'}[46]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[47]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[47]{'contents'}[0]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[47]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[47]{'contents'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[47]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[47];
-$result_trees{'macro_in_misc_commands'}{'contents'}[47]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[47];
 $result_trees{'macro_in_misc_commands'}{'contents'}[47]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[48]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[48];
+$result_trees{'macro_in_misc_commands'}{'contents'}[48]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[48];
 $result_trees{'macro_in_misc_commands'}{'contents'}[48]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[49]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[49];
-$result_trees{'macro_in_misc_commands'}{'contents'}[49]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[49];
 $result_trees{'macro_in_misc_commands'}{'contents'}[49]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[50]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[51]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[51];
+$result_trees{'macro_in_misc_commands'}{'contents'}[51]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[51]{'contents'}[0]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[51]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[51]{'contents'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[51]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[51];
+$result_trees{'macro_in_misc_commands'}{'contents'}[51]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[51];
 $result_trees{'macro_in_misc_commands'}{'contents'}[51]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[52]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[53]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[53]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[53]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[53]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[53]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[53];
 $result_trees{'macro_in_misc_commands'}{'contents'}[53]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[54]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[54]{'contents'}[0]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[54]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[54]{'contents'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[54]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[54];
-$result_trees{'macro_in_misc_commands'}{'contents'}[54]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[54];
 $result_trees{'macro_in_misc_commands'}{'contents'}[54]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[55]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[55]{'contents'}[0]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[55]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[55]{'contents'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[55]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[55];
+$result_trees{'macro_in_misc_commands'}{'contents'}[55]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[55];
 $result_trees{'macro_in_misc_commands'}{'contents'}[55]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[56]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[56]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[56]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[56]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[56]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[56];
 $result_trees{'macro_in_misc_commands'}{'contents'}[56]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[57]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[57]{'contents'}[0]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[57]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[57]{'contents'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[57]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[57];
+$result_trees{'macro_in_misc_commands'}{'contents'}[57]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[57];
 $result_trees{'macro_in_misc_commands'}{'contents'}[57]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[58]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[58]{'contents'}[0]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[58]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[58]{'contents'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[58]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[58];
-$result_trees{'macro_in_misc_commands'}{'contents'}[58]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[58];
 $result_trees{'macro_in_misc_commands'}{'contents'}[58]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[59]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[59];
+$result_trees{'macro_in_misc_commands'}{'contents'}[59]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[59];
 $result_trees{'macro_in_misc_commands'}{'contents'}[59]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[60]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[60]{'contents'}[0]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[60]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[60]{'contents'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[60]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[60];
-$result_trees{'macro_in_misc_commands'}{'contents'}[60]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[60];
 $result_trees{'macro_in_misc_commands'}{'contents'}[60]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[61]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[61]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[61]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[61]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[61]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[61];
 $result_trees{'macro_in_misc_commands'}{'contents'}[61]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[62]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[62];
-$result_trees{'macro_in_misc_commands'}{'contents'}[62]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[62];
 $result_trees{'macro_in_misc_commands'}{'contents'}[62]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[63]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[63]{'contents'}[0]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[63]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[63]{'contents'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[63]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[63];
+$result_trees{'macro_in_misc_commands'}{'contents'}[63]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[63];
 $result_trees{'macro_in_misc_commands'}{'contents'}[63]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[64]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[64]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[64]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[64]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[64]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[64];
 $result_trees{'macro_in_misc_commands'}{'contents'}[64]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[65]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[65];
+$result_trees{'macro_in_misc_commands'}{'contents'}[65]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[65]{'contents'}[1]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[65]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[65]{'contents'}[1];
+$result_trees{'macro_in_misc_commands'}{'contents'}[65]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[65];
+$result_trees{'macro_in_misc_commands'}{'contents'}[65]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[65];
 $result_trees{'macro_in_misc_commands'}{'contents'}[65]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[66]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[66]{'contents'}[0]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[66]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[66]{'contents'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[66]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[66];
-$result_trees{'macro_in_misc_commands'}{'contents'}[66]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[66];
 $result_trees{'macro_in_misc_commands'}{'contents'}[66]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[67]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[68]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[68];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[68]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[68];
-$result_trees{'macro_in_misc_commands'}{'contents'}[68]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[68]{'contents'}[1]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[68]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[68]{'contents'}[1];
-$result_trees{'macro_in_misc_commands'}{'contents'}[68]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[68];
-$result_trees{'macro_in_misc_commands'}{'contents'}[68]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[68];
 $result_trees{'macro_in_misc_commands'}{'contents'}[68]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[69]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[70]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[70];
+$result_trees{'macro_in_misc_commands'}{'contents'}[70]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[70];
 $result_trees{'macro_in_misc_commands'}{'contents'}[70]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[71]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[71];
-$result_trees{'macro_in_misc_commands'}{'contents'}[71]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[71];
 $result_trees{'macro_in_misc_commands'}{'contents'}[71]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[72]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[72];
+$result_trees{'macro_in_misc_commands'}{'contents'}[72]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[72];
 $result_trees{'macro_in_misc_commands'}{'contents'}[72]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[73]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[73];
-$result_trees{'macro_in_misc_commands'}{'contents'}[73]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[73];
 $result_trees{'macro_in_misc_commands'}{'contents'}[73]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[74]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[74];
+$result_trees{'macro_in_misc_commands'}{'contents'}[74]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[74];
 $result_trees{'macro_in_misc_commands'}{'contents'}[74]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[75]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[75];
-$result_trees{'macro_in_misc_commands'}{'contents'}[75]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[75];
 $result_trees{'macro_in_misc_commands'}{'contents'}[75]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[76]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[76];
+$result_trees{'macro_in_misc_commands'}{'contents'}[76]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[76];
 $result_trees{'macro_in_misc_commands'}{'contents'}[76]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[77]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[77];
-$result_trees{'macro_in_misc_commands'}{'contents'}[77]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[77];
 $result_trees{'macro_in_misc_commands'}{'contents'}[77]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[78]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[79]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[79]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[79]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[79]{'args'}[0];
 $result_trees{'macro_in_misc_commands'}{'contents'}[79]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[79];
-$result_trees{'macro_in_misc_commands'}{'contents'}[79]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[79];
 $result_trees{'macro_in_misc_commands'}{'contents'}[79]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[80]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[80]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[80]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[80]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[80]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[80];
 $result_trees{'macro_in_misc_commands'}{'contents'}[80]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[81]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[81]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[81]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[81]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[81]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[81];
 $result_trees{'macro_in_misc_commands'}{'contents'}[81]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 
$result_trees{'macro_in_misc_commands'}{'contents'}[82]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[82]{'args'}[0];
 
$result_trees{'macro_in_misc_commands'}{'contents'}[82]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[82]{'args'}[0];
@@ -2931,107 +2905,106 @@
 
$result_trees{'macro_in_misc_commands'}{'contents'}[84]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[84]{'args'}[0];
 $result_trees{'macro_in_misc_commands'}{'contents'}[84]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[84];
 $result_trees{'macro_in_misc_commands'}{'contents'}[84]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[85]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[85]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[85]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[85]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[85]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[85];
 $result_trees{'macro_in_misc_commands'}{'contents'}[85]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[86]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[86]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[86]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[86]{'args'}[0];
 $result_trees{'macro_in_misc_commands'}{'contents'}[86]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[86];
+$result_trees{'macro_in_misc_commands'}{'contents'}[86]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[86];
 $result_trees{'macro_in_misc_commands'}{'contents'}[86]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[87]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[87]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[87]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[87]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[87]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[87];
 $result_trees{'macro_in_misc_commands'}{'contents'}[87]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[88]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[88];
+$result_trees{'macro_in_misc_commands'}{'contents'}[88]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[88];
 $result_trees{'macro_in_misc_commands'}{'contents'}[88]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[89]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[89];
-$result_trees{'macro_in_misc_commands'}{'contents'}[89]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[89];
 $result_trees{'macro_in_misc_commands'}{'contents'}[89]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[90]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[90]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[90]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[90]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[90]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[90];
 $result_trees{'macro_in_misc_commands'}{'contents'}[90]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$result_trees{'macro_in_misc_commands'}{'contents'}[91]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[91]{'args'}[0];
+$result_trees{'macro_in_misc_commands'}{'contents'}[91]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[91]{'args'}[0];
 $result_trees{'macro_in_misc_commands'}{'contents'}[91]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[91];
-$result_trees{'macro_in_misc_commands'}{'contents'}[91]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[91];
 $result_trees{'macro_in_misc_commands'}{'contents'}[91]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $result_trees{'macro_in_misc_commands'}{'contents'}[92]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[93]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[93]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[93]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[93]{'args'}[0];
 $result_trees{'macro_in_misc_commands'}{'contents'}[93]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[93];
+$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]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[94]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[94]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[94]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[94]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[94];
 $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]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[96]{'args'}[0]{'parent'} = 
$result_trees{'macro_in_misc_commands'}{'contents'}[96];
-$result_trees{'macro_in_misc_commands'}{'contents'}[96]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[96];
 $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]{'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]{'contents'}[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]{'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]{'contents'}[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]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[104]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[104]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[104]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[104]{'args'}[0];
 $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'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[105]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[105]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[105]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[105]{'args'}[0];
 $result_trees{'macro_in_misc_commands'}{'contents'}[105]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[105];
+$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]{'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]{'contents'}[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]{'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]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[110]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[110]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[110]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[110]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[110];
 $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]{'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]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[112];
-$result_trees{'macro_in_misc_commands'}{'contents'}[112]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[112];
 $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]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[114]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[114];
-$result_trees{'macro_in_misc_commands'}{'contents'}[114]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[114];
 $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]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[116]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[116]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[116]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[116]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[116]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[116];
 $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]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[118]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[118]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[118]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[118]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[118];
 $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]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[120];
-$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]{'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]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[122];
-$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]{'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]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[124];
 
$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];
+$result_trees{'macro_in_misc_commands'}{'contents'}[126]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[126];
+$result_trees{'macro_in_misc_commands'}{'contents'}[126]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[126];
+$result_trees{'macro_in_misc_commands'}{'contents'}[126]{'contents'}[3]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[126];
+$result_trees{'macro_in_misc_commands'}{'contents'}[126]{'contents'}[4]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[126];
+$result_trees{'macro_in_misc_commands'}{'contents'}[126]{'contents'}[5]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[126];
+$result_trees{'macro_in_misc_commands'}{'contents'}[126]{'contents'}[6]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[126];
+$result_trees{'macro_in_misc_commands'}{'contents'}[126]{'contents'}[7]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[126];
 $result_trees{'macro_in_misc_commands'}{'contents'}[126]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[127]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[127];
-$result_trees{'macro_in_misc_commands'}{'contents'}[127]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[127];
 $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]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
@@ -3046,116 +3019,102 @@
 $result_trees{'macro_in_misc_commands'}{'contents'}[130]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $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]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[134]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[134];
-$result_trees{'macro_in_misc_commands'}{'contents'}[134]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[134];
 $result_trees{'macro_in_misc_commands'}{'contents'}[134]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
+$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]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[136];
-$result_trees{'macro_in_misc_commands'}{'contents'}[136]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[136];
-$result_trees{'macro_in_misc_commands'}{'contents'}[136]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[136];
-$result_trees{'macro_in_misc_commands'}{'contents'}[136]{'contents'}[3]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[136];
 $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]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[141]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[141];
-$result_trees{'macro_in_misc_commands'}{'contents'}[141]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[141];
 $result_trees{'macro_in_misc_commands'}{'contents'}[141]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 $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]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[144];
-$result_trees{'macro_in_misc_commands'}{'contents'}[144]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[144];
-$result_trees{'macro_in_misc_commands'}{'contents'}[144]{'contents'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[144];
-$result_trees{'macro_in_misc_commands'}{'contents'}[144]{'contents'}[3]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[144];
-$result_trees{'macro_in_misc_commands'}{'contents'}[144]{'contents'}[4]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[144];
-$result_trees{'macro_in_misc_commands'}{'contents'}[144]{'contents'}[5]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[144];
-$result_trees{'macro_in_misc_commands'}{'contents'}[144]{'contents'}[6]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[144];
+$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];
+$result_trees{'macro_in_misc_commands'}{'contents'}[146]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[146];
 $result_trees{'macro_in_misc_commands'}{'contents'}[146]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[147]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[147];
-$result_trees{'macro_in_misc_commands'}{'contents'}[147]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[147];
 $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]{'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]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[154];
 
$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]{'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]{'contents'}[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]{'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]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[163];
+$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]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$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]{'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]{'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]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[167]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[167]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[167]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[167]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[167];
 $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]{'contents'}[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]{'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]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[172];
 $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]{'contents'}[1]{'args'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[174]{'contents'}[1];
-$result_trees{'macro_in_misc_commands'}{'contents'}[174]{'contents'}[1]{'args'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[174]{'contents'}[1]{'args'}[1];
-$result_trees{'macro_in_misc_commands'}{'contents'}[174]{'contents'}[1]{'args'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[174]{'contents'}[1];
-$result_trees{'macro_in_misc_commands'}{'contents'}[174]{'contents'}[1]{'args'}[2]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[174]{'contents'}[1];
-$result_trees{'macro_in_misc_commands'}{'contents'}[174]{'contents'}[1]{'args'}[3]{'contents'}[0]{'parent'}
 = 
$result_trees{'macro_in_misc_commands'}{'contents'}[174]{'contents'}[1]{'args'}[3];
-$result_trees{'macro_in_misc_commands'}{'contents'}[174]{'contents'}[1]{'args'}[3]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[174]{'contents'}[1];
-$result_trees{'macro_in_misc_commands'}{'contents'}[174]{'contents'}[1]{'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]{'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]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[177]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[177]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[177]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[177]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[177];
 $result_trees{'macro_in_misc_commands'}{'contents'}[177]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[178]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[178]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[178]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[178]{'args'}[0];
-$result_trees{'macro_in_misc_commands'}{'contents'}[178]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[178];
 $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_trees{'macro_in_misc_commands'}{'contents'}[183]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[183];
-$result_trees{'macro_in_misc_commands'}{'contents'}[183]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[183];
-$result_trees{'macro_in_misc_commands'}{'contents'}[183]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[184]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[185]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[186]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[187]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[188]{'args'}[0]{'parent'} 
= $result_trees{'macro_in_misc_commands'}{'contents'}[188];
-$result_trees{'macro_in_misc_commands'}{'contents'}[188]{'contents'}[0]{'parent'}
 = $result_trees{'macro_in_misc_commands'}{'contents'}[188];
-$result_trees{'macro_in_misc_commands'}{'contents'}[188]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[189]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[190]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[191]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
-$result_trees{'macro_in_misc_commands'}{'contents'}[192]{'parent'} = 
$result_trees{'macro_in_misc_commands'};
 
 $result_texis{'macro_in_misc_commands'} = '@macro text 
 atext
@@ -3182,7 +3141,6 @@
 
 @pagesizes 200mm,150mm
 @afourpaper
-
 @headings on line following headings atext
 @oddfooting some text ignored @text{}
 @everyheading on line following everyheading @text{}
@@ -3197,13 +3155,11 @@
 @raisesections
 @end macro
 @raisesections
-
 @macro lowersections-macro 
 @lowersections
 @end macro
 @lowersections
 
-
 @@definfoenclose phoo,//,\\\\  @definfoenclose phoo,//,\\\\
 
 @phoo{bar}
@@ -3314,7 +3270,7 @@
 @end macro
 
 @@page @page
- @@noindent @noindent @@refill @refill something
+@@noindent @noindent @@refill @refill something
 
 @noindent     noindent at beginning of line
 @noindent
@@ -3325,7 +3281,7 @@
 After page on its own line.
 
 @@page @page
-   @@noindent @noindent    @@refill @refill
+two spaces   @@noindent @noindent    @@refill @refill
 
 @macro contents-macro 
 @contents
@@ -3339,7 +3295,6 @@
 @end macro
 @cropmarks
 
-
 @macro exdent-macro 
 @exdent
 @end macro
@@ -3375,7 +3330,6 @@
 @end macro
 
 @bye
-
 ';
 
 
@@ -3391,9 +3345,6 @@
 
 
 
-
-
-
 @definfoenclose phoo,//,\\\\  
 bar
 
@@ -3423,20 +3374,18 @@
 
 @page  @noindent  @refill  something
 
-     noindent at beginning of line
-
+noindent at beginning of line
 noindent on the preceding line
       noindent after space at beginning of line
 After page on its own line.
 
address@hidden    @noindent     @refill 
address@hidden two spaces   @noindent @refill 
 
 
 
 
 
-
- line after exdent
+line after exdent
 
 
 
@@ -3452,7 +3401,6 @@
 
 
 
-
 ';
 
 $result_errors{'macro_in_misc_commands'} = [];

Index: t/results/macro/macro_for_ignored_line_command.pl
===================================================================
RCS file: t/results/macro/macro_for_ignored_line_command.pl
diff -N t/results/macro/macro_for_ignored_line_command.pl
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ t/results/macro/macro_for_ignored_line_command.pl   17 Oct 2010 19:46:12 
-0000      1.1
@@ -0,0 +1,68 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors);
+
+$result_trees{'macro_for_ignored_line_command'} = {
+  'contents' => [
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => 'page-macro',
+          'type' => 'macro_name'
+        }
+      ],
+      'cmdname' => 'macro',
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => '@page
+',
+          'type' => 'raw'
+        }
+      ],
+      'parent' => {},
+      'special' => {
+        'arg_line' => ' page-macro
+',
+        'macrobody' => '@page
+'
+      }
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line_after_command'
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'cmdname' => 'page',
+      'parent' => {}
+    }
+  ]
+};
+$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'macro_for_ignored_line_command'}{'contents'}[0];
+$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'macro_for_ignored_line_command'}{'contents'}[0];
+$result_trees{'macro_for_ignored_line_command'}{'contents'}[0]{'parent'} = 
$result_trees{'macro_for_ignored_line_command'};
+$result_trees{'macro_for_ignored_line_command'}{'contents'}[1]{'parent'} = 
$result_trees{'macro_for_ignored_line_command'};
+$result_trees{'macro_for_ignored_line_command'}{'contents'}[2]{'parent'} = 
$result_trees{'macro_for_ignored_line_command'};
+$result_trees{'macro_for_ignored_line_command'}{'contents'}[3]{'parent'} = 
$result_trees{'macro_for_ignored_line_command'};
+
+$result_texis{'macro_for_ignored_line_command'} = '@macro page-macro
address@hidden
address@hidden macro
+
address@hidden
+';
+
+
+$result_texts{'macro_for_ignored_line_command'} = '
+';
+
+$result_errors{'macro_for_ignored_line_command'} = [];
+
+
reply via email to
[Prev in Thread] Current Thread [Next in Thread]