[8117] do not set command extra value for spaces after command

[gavinsmith0123]

Revision: 8117
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8117
Author:   gavin
Date:     2018-08-25 11:59:23 -0400 (Sat, 25 Aug 2018)
Log Message:
-----------
do not set command extra value for spaces after command

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/Texinfo/Structuring.pm

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-08-25 15:35:58 UTC (rev 8116)
+++ trunk/ChangeLog     2018-08-25 15:59:23 UTC (rev 8117)
@@ -1,5 +1,12 @@
 2018-08-25  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Structuring.pm (new_block_command)
+       * tp/Texinfo/Parser.pm (_parse_texi, _end_line):
+       Do not set 'command' extra value on 'empty_line_after_command'
+       or 'empty_spaces_after_command'.
+
+2018-08-25  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Convert/TexinfoXML.pm (_convert): Remove 
        conditional block that checks for a raw formatting command (e.g.
        @html if --html is given to texi2any) that is being expanded.  

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2018-08-25 15:35:58 UTC (rev 8116)
+++ trunk/tp/Texinfo/Parser.pm  2018-08-25 15:59:23 UTC (rev 8117)
@@ -3248,7 +3248,6 @@
           = _close_commands($self, $current, $line_nr, $end_command);
         my $inline_copying;
         if ($closed_command) {
-          $misc_cmd->{'extra'}->{'command'} = $closed_command;
           $closed_command->{'extra'}->{'end_command'} = $misc_cmd;
           _close_command_cleanup($self, $closed_command);
           $end->{'parent'} = $closed_command;
@@ -3427,7 +3426,6 @@
                                     'parent' => $current, 
                                   };
   if (defined($command)) {
-    $current->{'contents'}->[-1]->{'extra'} = {'command' => $command};
     $command->{'extra'}->{'spaces_after_command'} = 
$current->{'contents'}->[-1];
   }
   return $line;
@@ -4359,7 +4357,7 @@
                 = { 'type' => 'empty_spaces_after_command',
                     'text' => ' ',
                     'parent' => $misc_line_args,
-                    'extra' => {'command' => $misc} };
+                  };
               $misc->{'extra'}->{'spaces_after_command'} 
                  = $spaces_after_command;
               $misc_line_args->{'contents'} = [ $spaces_after_command,

Modified: trunk/tp/Texinfo/Structuring.pm
===================================================================
--- trunk/tp/Texinfo/Structuring.pm     2018-08-25 15:35:58 UTC (rev 8116)
+++ trunk/tp/Texinfo/Structuring.pm     2018-08-25 15:59:23 UTC (rev 8117)
@@ -1331,7 +1331,6 @@
   push @{$end->{'args'}->[0]->{'contents'}},
           ({'type' => 'empty_spaces_after_command',
            'text' => ' ',
-           'extra' => {'command' => $end},
            'parent' => $end->{'args'}->[0]},
           {'text' => $command_name, 'parent' => $end->{'args'}->[0]},
           {'type' => 'spaces_at_end', 'text' => "\n", 
@@ -1338,11 +1337,8 @@
            'parent' => $end->{'args'}->[0]});
   my $new_block = {'cmdname' => $command_name, 'parent' => $parent,
                   'extra'=>{'end_command' => $end}};
-  $end->{'extra'}->{'command'} = $new_block;
-  $new_block->{'contents'} = [{'extra' => 
-                                     {'command' => $new_block},
-                              'type' => 'empty_line_after_command',
-                              'text' => "\n"},
+  $new_block->{'contents'} = [{'type' => 'empty_line_after_command',
+                               'text' => "\n"},
                               @$block_contents, $end];
   foreach my $content (@{$new_block->{'contents'}}) {
     $content->{'parent'} = $new_block;