[7153] remove empty spaces_after_argument extra value

[gavinsmith0123]

Revision: 7153
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7153
Author:   gavin
Date:     2016-05-08 14:24:16 +0000 (Sun, 08 May 2016)
Log Message:
-----------
remove empty spaces_after_argument extra value

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/t/results/multitable/multitable_with_empty_item_tab.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-05-07 19:05:55 UTC (rev 7152)
+++ trunk/ChangeLog     2016-05-08 14:24:16 UTC (rev 7153)
@@ -1,3 +1,10 @@
+2016-05-08  Gavin Smith  <address@hidden>
+
+       * tp/Texinfo/Parser.pm (_abort_empty_line): Remove a 
+       'spaces_after_command' empty extra value, just as an empty
+       'spaces_before_argument' value is removed.  This stops an 
+       'empty_line_after_command' element lingering as an extra value.
+
 2016-05-07  John Collins  <address@hidden>  (tiny change)
 
        * doc/texinfo.tex (\typeout): New macro defined like in LaTeX for

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2016-05-07 19:05:55 UTC (rev 7152)
+++ trunk/tp/Texinfo/Parser.pm  2016-05-08 14:24:16 UTC (rev 7153)
@@ -2210,6 +2210,13 @@
         delete ($current->{'parent'}->{'extra'}->{'spaces_before_argument'});
         delete ($current->{'parent'}->{'extra'})
           if !(keys(%{$current->{'parent'}->{'extra'}}));
+      } elsif ($current->{'extra'} 
+          and $current->{'extra'}->{'spaces_after_command'}
+          and $current->{'extra'}->{'spaces_after_command'} 
+                eq $current->{'contents'}->[-1]) {
+        delete ($current->{'extra'}->{'spaces_after_command'});
+        delete ($current->{'extra'})
+          if !(keys(%{$current->{'extra'}}));
       }
 
       pop @{$current->{'contents'}} 

Modified: trunk/tp/t/results/multitable/multitable_with_empty_item_tab.pl
===================================================================
--- trunk/tp/t/results/multitable/multitable_with_empty_item_tab.pl     
2016-05-07 19:05:55 UTC (rev 7152)
+++ trunk/tp/t/results/multitable/multitable_with_empty_item_tab.pl     
2016-05-08 14:24:16 UTC (rev 7153)
@@ -147,15 +147,7 @@
                   'cmdname' => 'item',
                   'contents' => [],
                   'extra' => {
-                    'cell_number' => 1,
-                    'spaces_after_command' => {
-                      'extra' => {
-                        'command' => {}
-                      },
-                      'parent' => {},
-                      'text' => '',
-                      'type' => 'empty_line_after_command'
-                    }
+                    'cell_number' => 1
                   },
                   'line_nr' => {},
                   'parent' => {}
@@ -164,15 +156,7 @@
                   'cmdname' => 'tab',
                   'contents' => [],
                   'extra' => {
-                    'cell_number' => 2,
-                    'spaces_after_command' => {
-                      'extra' => {
-                        'command' => {}
-                      },
-                      'parent' => {},
-                      'text' => '',
-                      'type' => 'empty_line_after_command'
-                    }
+                    'cell_number' => 2
                   },
                   'line_nr' => {},
                   'parent' => {}
@@ -334,12 +318,8 @@
 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0];
-$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
-$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'extra'}{'spaces_after_command'}{'parent'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0];
 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'line_nr'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}{'extra'}{'command'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'extra'}{'spaces_after_command'}{'parent'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1];
 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'line_nr'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'line_nr'};
 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1];
 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'multitable_with_empty_item_tab'}{'contents'}[0]{'contents'}[0];