[8172] don't use block_command_line_contents

[gavinsmith0123]

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

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Convert/DocBook.pm

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-09-15 15:58:33 UTC (rev 8171)
+++ trunk/ChangeLog     2018-09-15 16:28:08 UTC (rev 8172)
@@ -1,5 +1,11 @@
 2018-09-15  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Convert/DocBook.pm (_convert):
+       Do not use the 'block_command_line_contents' array: use the 
+       'args' array directly.
+
+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 

Modified: trunk/tp/Texinfo/Convert/DocBook.pm
===================================================================
--- trunk/tp/Texinfo/Convert/DocBook.pm 2018-09-15 15:58:33 UTC (rev 8171)
+++ trunk/tp/Texinfo/Convert/DocBook.pm 2018-09-15 16:28:08 UTC (rev 8172)
@@ -579,14 +579,11 @@
             and $root->{'parent'}->{'extra'}
             and !($root->{'parent'}->{'extra'}->{'command_as_argument'}
                   and 
$root->{'parent'}->{'extra'}->{'command_as_argument'}->{'cmdname'} eq 'bullet')
-            and $root->{'parent'}->{'extra'}->{'block_command_line_contents'}
-            and 
$root->{'parent'}->{'extra'}->{'block_command_line_contents'}->[0]) {
-       #   $result .= $self->_convert({'contents'
-       # => 
$root->{'parent'}->{'extra'}->{'block_command_line_contents'}->[0]})
-       #     ." ";
-          $self->{'pending_prepend'} = $self->_convert(
-            {'contents' => $root->{'parent'}->{'extra'}
-                           ->{'block_command_line_contents'}->[0]}) . " ";
+            and $root->{'parent'}->{'args'}
+            and $root->{'parent'}->{'args'}->[0]) {
+          $self->{'pending_prepend'}
+            = $self->_convert($root->{'parent'}->{'args'}->[0]);
+          $self->{'pending_prepend'} .= " ";
         }
         push @close_elements, 'listitem';
       } elsif (($root->{'cmdname'} eq 'item' or $root->{'cmdname'} eq 'itemx')
@@ -1256,10 +1253,11 @@
               }
             }
           }
-          if ($root->{'extra'}->{'block_command_line_contents'}
-              and 
defined($root->{'extra'}->{'block_command_line_contents'}->[0])) {
+          if ($root->{'args'} and $root->{'args'}->[0]
+              and $root->{'args'}->[0]->{'contents'}
+              and @{$root->{'args'}->[0]->{'contents'}}) {
             my $quotation_arg_text = Texinfo::Convert::Text::convert(
-                     {'contents' => 
$root->{'extra'}->{'block_command_line_contents'}->[0]},
+                     $root->{'args'}->[0],
                      {Texinfo::Common::_convert_text_options($self)});
             if ($docbook_special_quotations{lc($quotation_arg_text)}) {
               $element = lc($quotation_arg_text);
@@ -1267,7 +1265,7 @@
               $self->{'pending_prepend'} 
                 = $self->_convert($self->gdt('@b{{quotation_arg}:} ',
                               {'quotation_arg' =>
-                    $root->{'extra'}->{'block_command_line_contents'}->[0]}));
+                    $root->{'args'}->[0]->{'contents'}}));
             }
           }
         }