[7964] revert last change

[gavinsmith0123]

Revision: 7964
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7964
Author:   gavin
Date:     2017-09-22 16:31:11 -0400 (Fri, 22 Sep 2017)
Log Message:
-----------
revert last change

Modified Paths:
--------------
    trunk/tp/Texinfo/MiscXS/misc.c
    trunk/tp/Texinfo/Parser.pm

Modified: trunk/tp/Texinfo/MiscXS/misc.c
===================================================================
--- trunk/tp/Texinfo/MiscXS/misc.c      2017-09-22 20:24:17 UTC (rev 7963)
+++ trunk/tp/Texinfo/MiscXS/misc.c      2017-09-22 20:31:11 UTC (rev 7964)
@@ -153,6 +153,14 @@
           if (svp)
             {
               test_extra = (HV *) SvRV (*svp);
+              key = "spaces_before_argument";
+              svp = hv_fetch (test_extra, key, strlen (key), 0);
+              if (svp)
+                {
+                  if ((HV *) SvRV (*svp) == last_elt)
+                    goto found;
+                }
+
               key = "spaces_after_command";
               svp = hv_fetch (test_extra, key, strlen (key), 0);
               if (svp)

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2017-09-22 20:24:17 UTC (rev 7963)
+++ trunk/tp/Texinfo/Parser.pm  2017-09-22 20:31:11 UTC (rev 7964)
@@ -2126,9 +2126,9 @@
 # consisting only of spaces.  This container is removed here, typically
 # this is called when non-space happens on a line.
 sub _abort_empty_line {
-  my ($self, $current, $additional_spaces) = @_;
+  my ($self, $current, $additional_text) = @_;
 
-  $additional_spaces = '' if (!defined($additional_spaces));
+  $additional_text = '' if (!defined($additional_text));
   if ($current->{'contents'} and @{$current->{'contents'}} 
        and $current->{'contents'}->[-1]->{'type'}
        and ($current->{'contents'}->[-1]->{'type'} eq 'empty_line' 
@@ -2135,14 +2135,12 @@
            or $current->{'contents'}->[-1]->{'type'} eq 
'empty_line_after_command'
            or $current->{'contents'}->[-1]->{'type'} eq 
'empty_spaces_before_argument'
            or $current->{'contents'}->[-1]->{'type'} eq 
'empty_spaces_after_close_brace')) {
-
     print STDERR "ABORT EMPTY "
     .$current->{'contents'}->[-1]->{'type'}
-    ." additional text |$additional_spaces|,"
+    ." additional text |$additional_text|,"
     ." current |$current->{'contents'}->[-1]->{'text'}|\n"
       if ($self->{'DEBUG'});
-
-    $current->{'contents'}->[-1]->{'text'} .= $additional_spaces;
+    $current->{'contents'}->[-1]->{'text'} .= $additional_text;
     # remove empty 'empty*before'.
     if ($current->{'contents'}->[-1]->{'text'} eq '') {
       # as we remove 'empty_spaces_before_argument', 'spaces_before_argument'
@@ -2153,6 +2151,13 @@
                 eq $current->{'contents'}->[-1]) {
         delete ($current->{'extra'}->{'spaces_before_argument'});
         delete ($current->{'extra'}) if !(keys(%{$current->{'extra'}}));
+      } elsif ($current->{'parent'} and $current->{'parent'}->{'extra'} 
+          and $current->{'parent'}->{'extra'}->{'spaces_before_argument'}
+          and $current->{'parent'}->{'extra'}->{'spaces_before_argument'} 
+                eq $current->{'contents'}->[-1]) {
+        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'}