texinfo-commits
[Top][All Lists]
Advanced

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

texinfo/tp Texinfo/Convert/Converter.pm Texinfo...


From: Patrice Dumas
Subject: texinfo/tp Texinfo/Convert/Converter.pm Texinfo...
Date: Sat, 22 Dec 2012 12:18:10 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/12/22 12:18:10

Modified files:
        tp/Texinfo/Convert: Converter.pm DocBook.pm HTML.pm Plaintext.pm 
        tp/t/results/xtable: definfoenclose_on_table_line.pl 

Log message:
        Texinfo/Convert/Converter.pm (_table_item_content_tree): new function
        to factor out the code that put @item(x) contents in the command on
        @table line.  Also avoid using the command_as_argument {extra'} for 
        definfoenclose'd commands.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/DocBook.pm?cvsroot=texinfo&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.269&r2=1.270
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.231&r2=1.232
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/definfoenclose_on_table_line.pl?cvsroot=texinfo&r1=1.20&r2=1.21

Patches:
Index: Texinfo/Convert/Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- Texinfo/Convert/Converter.pm        18 Dec 2012 23:38:29 -0000      1.95
+++ Texinfo/Convert/Converter.pm        22 Dec 2012 12:18:09 -0000      1.96
@@ -763,6 +763,37 @@
   return @result;
 }
 
+sub _table_item_content_tree($$$)
+{
+  my $self = shift;
+  my $root = shift;
+  my $contents = shift;
+
+  my $converted_tree = {'parent' => $root};
+  my $table_command = $root->{'parent'}->{'parent'}->{'parent'};
+  if ($table_command->{'extra'}
+     and $table_command->{'extra'}->{'command_as_argument'}) {
+    my $command_as_argument
+      = $table_command->{'extra'}->{'command_as_argument'};
+    my $command = {'cmdname' => $command_as_argument->{'cmdname'},
+               'line_nr' => $root->{'line_nr'},
+               'parent' => $converted_tree };
+    if ($command_as_argument->{'type'} eq 'definfoenclose_command') {
+      $command->{'type'} = $command_as_argument->{'type'};
+      $command->{'extra'}->{'begin'} = 
$command_as_argument->{'extra'}->{'begin'};
+      $command->{'extra'}->{'end'} = $command_as_argument->{'extra'}->{'end'};
+    }
+    my $arg = {'type' => 'brace_command_arg',
+               'contents' => $contents,
+               'parent' => $command,};
+    $command->{'args'} = [$arg];
+    $self->Texinfo::Parser::_register_command_arg($arg, 
'brace_command_contents');
+    $contents = [$command];
+  }
+  $converted_tree->{'contents'} = $contents;
+  return $converted_tree;
+}
+
 sub _level_corrected_section($$)
 {
   my $self = shift;

Index: Texinfo/Convert/DocBook.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- Texinfo/Convert/DocBook.pm  18 Dec 2012 23:38:29 -0000      1.57
+++ Texinfo/Convert/DocBook.pm  22 Dec 2012 12:18:09 -0000      1.58
@@ -516,31 +516,9 @@
       } elsif (($root->{'cmdname'} eq 'item' or $root->{'cmdname'} eq 'itemx')
                and $root->{'parent'}->{'type'} 
                and $root->{'parent'}->{'type'} eq 'table_term') {
-        my $converted_tree = {'parent' => $root};
 
-        # begin common with Plaintext.pm
-        my $contents = $root->{'extra'}->{'misc_content'};
-        my $table_command = $root->{'parent'}->{'parent'}->{'parent'};
-        if ($table_command->{'extra'}
-            and $table_command->{'extra'}->{'command_as_argument'}) {
-          my $command_as_argument
-            = $table_command->{'extra'}->{'command_as_argument'};
-          my $command = {'cmdname' => $command_as_argument->{'cmdname'},
-                     'line_nr' => $root->{'line_nr'},
-                     'parent' => $converted_tree };
-          if ($command_as_argument->{'type'} eq 'definfoenclose_command') {
-            $command->{'type'} = $command_as_argument->{'type'};
-            $command->{'extra'} = $command_as_argument->{'extra'};
-          }
-          my $arg = {'type' => 'brace_command_arg',
-                     'contents' => $contents,
-                     'parent' => $command,};
-          $command->{'args'} = [$arg];
-          $self->Texinfo::Parser::_register_command_arg($arg, 
'brace_command_contents');
-          $contents = [$command];
-        }
-        $converted_tree->{'contents'} = $contents;
-        # end common with Plaintext.pm
+        my $converted_tree = $self->_table_item_content_tree($root,
+                                         $root->{'extra'}->{'misc_content'});
 
         $result .= "<term>";
         $result .= $self->_index_entry($root);

Index: Texinfo/Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -b -r1.269 -r1.270
--- Texinfo/Convert/HTML.pm     18 Dec 2012 23:38:29 -0000      1.269
+++ Texinfo/Convert/HTML.pm     22 Dec 2012 12:18:09 -0000      1.270
@@ -2933,26 +2933,8 @@
     # FIXME instead use the code of Plaintext or DocBook.
     my $args = $content;
     if ($args->[0]) {
-      my $tree = $args->[0]->{'tree'};
-      my $table_command = $command->{'parent'}->{'parent'}->{'parent'};
-      if ($table_command->{'extra'} 
-          and $table_command->{'extra'}->{'command_as_argument'}) {
-        my $command_as_argument 
-          = $table_command->{'extra'}->{'command_as_argument'};
-        if ($command_as_argument->{'type'} ne 'definfoenclose_command') {
-          $tree = {'cmdname' => $command_as_argument->{'cmdname'},
-                   'args' => [{'type' => 'brace_command_arg',
-                              'contents' => [$tree]}]
-          };
-        } else {
-          $tree = {'cmdname' => $command_as_argument->{'cmdname'},
-                        'type' => $command_as_argument->{'type'},
-                        'extra' => $command_as_argument->{'extra'},
-                   'args' => [{'type' => 'brace_command_arg',
-                              'contents' => [$tree]}]
-          };
-        }
-      }
+      my $tree = $self->_table_item_content_tree($command,
+                                                [$args->[0]->{'tree'}]);
       my $result = $self->convert_tree ($tree);
       foreach my $command_name (reverse($self->commands_stack())) {
         if ($preformatted_code_commands{$command_name}) {

Index: Texinfo/Convert/Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -b -r1.231 -r1.232
--- Texinfo/Convert/Plaintext.pm        18 Dec 2012 23:38:30 -0000      1.231
+++ Texinfo/Convert/Plaintext.pm        22 Dec 2012 12:18:10 -0000      1.232
@@ -2111,31 +2111,11 @@
             and $root->{'args'}->[0]->{'type'}
             and $root->{'args'}->[0]->{'type'} eq 'misc_line_arg') {
       if ($root->{'extra'} and $root->{'extra'}->{'misc_content'}) {
-        my $converted_tree = {'type' => 'frenchspacing',
-                                 'parent' => $root};
 
-        my $contents = $root->{'extra'}->{'misc_content'};
-        my $table_command = $root->{'parent'}->{'parent'}->{'parent'};
-        if ($table_command->{'extra'} 
-            and $table_command->{'extra'}->{'command_as_argument'}) {
-          my $command_as_argument 
-            = $table_command->{'extra'}->{'command_as_argument'};
-          my $command = {'cmdname' => $command_as_argument->{'cmdname'},
-                     'line_nr' => $root->{'line_nr'},
-                     'parent' => $converted_tree };
-          if ($command_as_argument->{'type'} eq 'definfoenclose_command') {
-            $command->{'type'} = $command_as_argument->{'type'};
-            $command->{'extra'} = $command_as_argument->{'extra'};
-          }
-          my $arg = {'type' => 'brace_command_arg',
-                     'contents' => $contents,
-                     'parent' => $command,};
-          $command->{'args'} = [$arg];
-          $self->Texinfo::Parser::_register_command_arg($arg, 
'brace_command_contents');
-          $contents = [$command];
-        }
-        $converted_tree->{'contents'} = $contents;
+        my $converted_tree = $self->_table_item_content_tree($root,
+                                         $root->{'extra'}->{'misc_content'});
 
+        $converted_tree->{'type'} = 'frenchspacing';
         $result = $self->convert_line($converted_tree,
                     {'indent_level'
                       => $self->{'format_context'}->[-1]->{'indent_level'} 
-1});

Index: t/results/xtable/definfoenclose_on_table_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/xtable/definfoenclose_on_table_line.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- t/results/xtable/definfoenclose_on_table_line.pl    16 Dec 2012 22:14:45 
-0000      1.20
+++ t/results/xtable/definfoenclose_on_table_line.pl    22 Dec 2012 12:18:10 
-0000      1.21
@@ -72,16 +72,54 @@
               'cmdname' => 'phi',
               'extra' => {
                 'begin' => ':',
-                'brace_command_contents' => [
-                  [
+                'end' => ':'
+              },
+              'parent' => {},
+              'type' => 'definfoenclose_command'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'space_at_end_block_command'
+            }
+          ],
+          'parent' => {},
+          'type' => 'block_line_arg'
+        }
+      ],
+      'cmdname' => 'table',
+      'contents' => [
+        {
+          'contents' => [
                     {
-                      'parent' => {
                         'contents' => [
                           {
-                            'extra' => {
-                              'command' => {
                                 'args' => [
-                                  {}
+                    {
+                      'contents' => [
+                        {
+                          'extra' => {
+                            'command' => {}
+                          },
+                          'parent' => {},
+                          'text' => ' ',
+                          'type' => 'empty_spaces_after_command'
+                        },
+                        {
+                          'parent' => {},
+                          'text' => 'item'
+                        },
+                        {
+                          'parent' => {},
+                          'text' => '
+',
+                          'type' => 'spaces_at_end'
+                        }
+                      ],
+                      'parent' => {},
+                      'type' => 'misc_line_arg'
+                    }
                                 ],
                                 'cmdname' => 'item',
                                 'extra' => {
@@ -95,9 +133,8 @@
                                   'line_nr' => 4,
                                   'macro' => ''
                                 },
-                                'parent' => {
-                                  'contents' => [
-                                    {},
+                  'parent' => {}
+                },
                                     {
                                       'args' => [
                                         {
@@ -140,9 +177,9 @@
                                       'parent' => {}
                                     }
                                   ],
-                                  'parent' => {
-                                    'contents' => [
-                                      {},
+              'parent' => {},
+              'type' => 'table_term'
+            },
                                       {
                                         'contents' => [
                                           {
@@ -170,51 +207,6 @@
                                     'parent' => {},
                                     'type' => 'table_entry'
                                   },
-                                  'type' => 'table_term'
-                                }
-                              }
-                            },
-                            'parent' => {},
-                            'text' => ' ',
-                            'type' => 'empty_spaces_after_command'
-                          },
-                          {},
-                          {
-                            'parent' => {},
-                            'text' => '
-',
-                            'type' => 'spaces_at_end'
-                          }
-                        ],
-                        'parent' => {},
-                        'type' => 'misc_line_arg'
-                      },
-                      'text' => 'item'
-                    }
-                  ],
-                  [
-                    {}
-                  ]
-                ],
-                'end' => ':'
-              },
-              'parent' => {},
-              'type' => 'definfoenclose_command'
-            },
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'space_at_end_block_command'
-            }
-          ],
-          'parent' => {},
-          'type' => 'block_line_arg'
-        }
-      ],
-      'cmdname' => 'table',
-      'contents' => [
-        {},
         {
           'args' => [
             {
@@ -287,33 +279,31 @@
 $result_trees{'definfoenclose_on_table_line'}{'contents'}[1]{'parent'} = 
$result_trees{'definfoenclose_on_table_line'};
 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[2];
 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'args'}[0]
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'};
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'extra'}{'misc_content'}[0]
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'extra'}{'spaces_after_command'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[0]
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'};
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'};
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'}{'contents'}[0]
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'};
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'}{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'}{'contents'}[1];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'}{'contents'}[1]{'contents'}[1];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'}{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'}{'contents'}[1];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'}{'contents'}[1]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'};
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'}{'parent'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[2];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'};
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[1]
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[2]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'};
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'};
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[1][0]
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[1];
 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0];
 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0];
 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[2];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0] = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'};
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[2];
 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1]{'args'}[0];



reply via email to

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