texinfo/tp Texinfo/Convert/DocBook.pm t/results...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/02/13 22:38:01

Modified files:
        tp/Texinfo/Convert: DocBook.pm 
        tp/t/results/coverage: item_container.pl 

Log message:
        Don't add a bullet in listitem, converters already put one.
        Report from Nikos Mavrogian.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/DocBook.pm?cvsroot=texinfo&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/coverage/item_container.pl?cvsroot=texinfo&r1=1.46&r2=1.47

Patches:
Index: Texinfo/Convert/DocBook.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- Texinfo/Convert/DocBook.pm  27 Jan 2012 00:16:35 -0000      1.42
+++ Texinfo/Convert/DocBook.pm  13 Feb 2012 22:38:01 -0000      1.43
@@ -496,6 +496,8 @@
         $result .= "<listitem>";
         if ($root->{'parent'}->{'cmdname'} eq 'itemize'
             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'

Index: t/results/coverage/item_container.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/t/results/coverage/item_container.pl,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- t/results/coverage/item_container.pl        1 Oct 2011 10:29:26 -0000       
1.46
+++ t/results/coverage/item_container.pl        13 Feb 2012 22:38:01 -0000      
1.47
@@ -512,9 +512,9 @@
 $result_converted{'docbook'}->{'item_container'} = '
 <itemizedlist><listitem><para>+ i&#8211;tem +
 </para></listitem></itemizedlist>
-<itemizedlist><listitem><para>&#8226; b&#8211;ullet
+<itemizedlist><listitem><para>b&#8211;ullet
 </para></listitem></itemizedlist>
-<itemizedlist><listitem><para>&#8226; no itemize argument
+<itemizedlist><listitem><para>no itemize argument
 </para></listitem></itemizedlist>';
 
 1;