[8170] don't use block_command_line_contents

[gavinsmith0123]

Revision: 8170
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8170
Author:   gavin
Date:     2018-09-15 11:15:29 -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/tests/layout/res_parser/formatting_xml/formatting.xml

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-09-15 15:08:43 UTC (rev 8169)
+++ trunk/ChangeLog     2018-09-15 15:15:29 UTC (rev 8170)
@@ -1,5 +1,11 @@
 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.
+
+2018-09-15  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Convert/HTML.pm (_convert_item_line_command),
        * tp/Texinfo/Convert/TexinfoXML.pm (_convert):
        Do not use the 'block_command_line_contents' array: use the 

Modified: trunk/tp/Texinfo/Convert/HTML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/HTML.pm    2018-09-15 15:08:43 UTC (rev 8169)
+++ trunk/tp/Texinfo/Convert/HTML.pm    2018-09-15 15:15:29 UTC (rev 8170)
@@ -3669,11 +3669,12 @@
   if ($command->{'parent'} and $command->{'parent'}->{'cmdname'}
       and ($command->{'parent'}->{'cmdname'} eq 'quotation'
            or $command->{'parent'}->{'cmdname'} eq 'smallquotation')
-      and $command->{'parent'}->{'extra'}
-      and $command->{'parent'}->{'extra'}->{'block_command_line_contents'}) {
+      and $command->{'parent'}->{'args'}
+      and $command->{'parent'}->{'args'}->[0]
+      and $command->{'parent'}->{'args'}->[0]->{'contents'}} {
     return $self->convert_tree($self->gdt('@b{{quotation_arg}:} ',
      {'quotation_arg' => 
-       
$command->{'parent'}->{'extra'}->{'block_command_line_contents'}->[0]}));
+      $command->{'parent'}->{'args'}->[0]->{'contents'}};
 
   }
   return undef;

Modified: trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml      
2018-09-15 15:08:43 UTC (rev 8169)
+++ trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml      
2018-09-15 15:15:29 UTC (rev 8170)
@@ -1018,7 +1018,7 @@
 </quotation>
 
 
-<itemize commandarg="bullet" endspaces=" ">
+<itemize commandarg="bullet" endspaces=" "><itemprepend>&bullet;</itemprepend>
 <listitem spaces=" "><prepend>&bullet;</prepend><para>i&textndash;temize
 </para></listitem></itemize>
 
@@ -1618,7 +1618,7 @@
 </quotation>
 
 
-<itemize commandarg="bullet" endspaces=" ">
+<itemize commandarg="bullet" endspaces=" "><itemprepend>&bullet;</itemprepend>
 <listitem spaces=" "><prepend>&bullet;</prepend><para>i&textndash;temize
 </para></listitem></itemize>
 
@@ -2218,7 +2218,7 @@
 </quotation>
 
 
-<itemize commandarg="bullet" endspaces=" ">
+<itemize commandarg="bullet" endspaces=" "><itemprepend>&bullet;</itemprepend>
 <listitem spaces=" "><prepend>&bullet;</prepend><para>i&textndash;temize
 </para></listitem></itemize>
 
@@ -2812,7 +2812,7 @@
 </quotation>
 <pre xml:space="preserve">
 
-</pre><itemize commandarg="bullet" endspaces=" ">
+</pre><itemize commandarg="bullet" endspaces=" 
"><itemprepend>&bullet;</itemprepend>
 <listitem spaces=" "><prepend>&bullet;</prepend><pre 
xml:space="preserve">i--temize
 </pre></listitem></itemize>
 <pre xml:space="preserve">