texinfo/tp/Texinfo/Convert Converter.pm DocBook...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/09/29 14:04:40

Modified files:
        tp/Texinfo/Convert: Converter.pm DocBook.pm Info.pm 

Log message:
        Modules using directly Texinfo::Convert::Text should use it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/DocBook.pm?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Info.pm?cvsroot=texinfo&r1=1.63&r2=1.64

Patches:
Index: Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- Converter.pm        29 Sep 2011 13:57:21 -0000      1.44
+++ Converter.pm        29 Sep 2011 14:04:40 -0000      1.45
@@ -24,6 +24,7 @@
 
 use Texinfo::Report;
 use Texinfo::Common;
+use Texinfo::Convert::Text;
 
 use vars qw(@ISA $VERSION);
 @ISA = qw(Texinfo::Report);

Index: DocBook.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- DocBook.pm  29 Sep 2011 13:57:21 -0000      1.15
+++ DocBook.pm  29 Sep 2011 14:04:40 -0000      1.16
@@ -25,6 +25,7 @@
 use Texinfo::Convert::Converter;
 use Texinfo::Common;
 use Texinfo::Convert::Unicode;
+use Texinfo::Convert::Text;
 # for debugging
 use Texinfo::Convert::Texinfo;
 use Data::Dumper;
@@ -598,14 +599,6 @@
                  or !defined($self->get_conf('NUMBER_SECTIONS')))) {
             # Looking at docbook2html output, Appendix is appended in the 
             # section title, so only the letter is used.
-            #if ($root->{'cmdname'} eq 'appendix' and $root->{'level'} == 1) {
-            #  $label = Texinfo::Convert::Text::convert($self->gdt(
-            #      'Appendix {number}', {'number' => 
-            #                                 {'text' => $root->{'number'}}}),
-            #                            {'converter' => $self});
-            #} else {
-            #  $label = $root->{'number'};
-            #}
             $label = $root->{'number'};
           }
           $attribute = " label=\"$label\"";

Index: Info.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Info.pm,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- Info.pm     29 Sep 2011 13:57:21 -0000      1.63
+++ Info.pm     29 Sep 2011 14:04:40 -0000      1.64
@@ -23,6 +23,7 @@
 use strict;
 
 use Texinfo::Convert::Plaintext;
+use Texinfo::Convert::Text;
 
 require Exporter;
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);