[8171] don't use block_command_line_contents

[gavinsmith0123]

Revision: 8171
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8171
Author:   gavin
Date:     2018-09-15 11:58:33 -0400 (Sat, 15 Sep 2018)
Log Message:
-----------
don't use block_command_line_contents

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/HTML.pm
    trunk/tp/Texinfo/Convert/Plaintext.pm
    trunk/tp/t/results/float/empty_listoffloats_with_floats.pl
    trunk/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-09-15 15:15:29 UTC (rev 8170)
+++ trunk/ChangeLog     2018-09-15 15:58:33 UTC (rev 8171)
@@ -1,5 +1,12 @@
 2018-09-15  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Convert/Plaintext.pm (_convert)
+       <@quotation, @item, @listoffloats>:
+       Do not use the 'block_command_line_contents' array: use the 
+       'args' array directly.
+
+2018-09-15  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Convert/HTML.pm (_quotation_arg_to_prepend):
        Do not use the 'block_command_line_contents' array: use the 
        'args' array directly.

Modified: trunk/tp/Texinfo/Convert/HTML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/HTML.pm    2018-09-15 15:15:29 UTC (rev 8170)
+++ trunk/tp/Texinfo/Convert/HTML.pm    2018-09-15 15:58:33 UTC (rev 8171)
@@ -3671,10 +3671,11 @@
            or $command->{'parent'}->{'cmdname'} eq 'smallquotation')
       and $command->{'parent'}->{'args'}
       and $command->{'parent'}->{'args'}->[0]
-      and $command->{'parent'}->{'args'}->[0]->{'contents'}} {
+      and $command->{'parent'}->{'args'}->[0]->{'contents'}
+      and @{$command->{'parent'}->{'args'}->[0]->{'contents'}}) {
     return $self->convert_tree($self->gdt('@b{{quotation_arg}:} ',
      {'quotation_arg' => 
-      $command->{'parent'}->{'args'}->[0]->{'contents'}};
+      $command->{'parent'}->{'args'}->[0]->{'contents'}}));
 
   }
   return undef;

Modified: trunk/tp/Texinfo/Convert/Plaintext.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Plaintext.pm       2018-09-15 15:15:29 UTC (rev 
8170)
+++ trunk/tp/Texinfo/Convert/Plaintext.pm       2018-09-15 15:58:33 UTC (rev 
8171)
@@ -2386,9 +2386,11 @@
       }
       if ($command eq 'quotation'
           or $command eq 'smallquotation') {
-        if ($root->{'extra'} and 
$root->{'extra'}->{'block_command_line_contents'}) {
+        if ($root->{'args'} and $root->{'args'}->[0]
+            and $root->{'args'}->[0]->{'contents'}
+            and @{$root->{'args'}->[0]->{'contents'}}) {
           my $prepended = $self->gdt('@b{{quotation_arg}:} ', 
-             {'quotation_arg' => 
$root->{'extra'}->{'block_command_line_contents'}->[0]});
+             {'quotation_arg' => $root->{'args'}->[0]->{'contents'}});
           $prepended->{'type'} = 'frenchspacing';
           $result .= $self->convert_line($prepended);
           $self->{'text_element_context'}->[-1]->{'counter'} += 
@@ -2498,14 +2500,12 @@
                Texinfo::Common::enumerate_item_representation(
                  $root->{'parent'}->{'extra'}->{'enumerate_specification'},
                  $root->{'extra'}->{'item_number'}) . '. '));
-      } elsif ($root->{'parent'}->{'extra'}->{'block_command_line_contents'}) {
+      } elsif ($root->{'parent'}->{'args'}
+          and $root->{'parent'}->{'args'}->[0]) {
         # this is the text prepended to items.
         
-        $result = _convert($self, 
-          {'contents' => 
-             
address@hidden>{'parent'}->{'extra'}->{'block_command_line_contents'}->[0]},
-              { 'text' => ' ' }]
-          });
+        $result = _convert($self, $root->{'parent'}->{'args'}->[0]);
+        $result .= _convert($self, { 'text' => ' ' });
       }
       $result .= _count_added($self, $line->{'container'}, 
                       Texinfo::Convert::Paragraph::end($line->{'container'}));
@@ -2595,10 +2595,10 @@
         $result .= "* Menu:\n\n";
         $lines_count += 2;
         foreach my $float 
(@{$self->{'floats'}->{$root->{'extra'}->{'type'}->{'normalized'}}}) {
-          next if 
(!defined($float->{'extra'}->{'block_command_line_contents'}->[1]));
+          next if !$float->{'args'} or !$float->{'args'}->[1]
+                   or address@hidden>{'args'}->[1]->{'contents'}};
           my $float_label_text = $self->convert_line({'type' => '_code',
-             'contents' 
-                 => $float->{'extra'}->{'block_command_line_contents'}->[1]});
+             'contents' => $float->{'args'}->[1]->{'contents'}});
           my $float_entry = $self->_float_type_number($float);
           my $float_entry_text = ':';
           if (defined($float_entry)) {

Modified: trunk/tp/t/results/float/empty_listoffloats_with_floats.pl
===================================================================
--- trunk/tp/t/results/float/empty_listoffloats_with_floats.pl  2018-09-15 
15:15:29 UTC (rev 8170)
+++ trunk/tp/t/results/float/empty_listoffloats_with_floats.pl  2018-09-15 
15:58:33 UTC (rev 8171)
@@ -301,7 +301,6 @@
         }
       ],
       'extra' => {
-        'block_command_line_contents' => [],
         'end_command' => {},
         'spaces_after_command_elt' => {},
         'type' => {
@@ -412,7 +411,6 @@
         }
       ],
       'extra' => {
-        'block_command_line_contents' => [],
         'caption' => {},
         'end_command' => {},
         'spaces_after_command_elt' => {},

Modified: trunk/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl
===================================================================
--- trunk/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl 
2018-09-15 15:15:29 UTC (rev 8170)
+++ trunk/tp/t/results/quotation/quotation_beginning_and_end_on_line.pl 
2018-09-15 15:58:33 UTC (rev 8171)
@@ -93,7 +93,7 @@
 
 
 
-$result_converted{'plaintext'}->{'quotation_beginning_and_end_on_line'} = '';
+$result_converted{'plaintext'}->{'quotation_beginning_and_end_on_line'} = '    
 in quotation : ';
 
 
 $result_converted{'html_text'}->{'quotation_beginning_and_end_on_line'} = 
'<blockquote>