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

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/10/01 16:09:09

Modified files:
        tp/Texinfo/Convert: Converter.pm DocBook.pm HTML.pm Plaintext.pm 
                            XML.pm 

Log message:
        More consistency in using _ in front of function names for HTML and
        Converter.
        Better names for Converter functions, especially those that should be
        redefined by converters.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/DocBook.pm?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.163&r2=1.164
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Plaintext.pm?cvsroot=texinfo&r1=1.169&r2=1.170
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/XML.pm?cvsroot=texinfo&r1=1.44&r2=1.45

Patches:
Index: Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- Converter.pm        1 Oct 2011 15:26:11 -0000       1.51
+++ Converter.pm        1 Oct 2011 16:09:08 -0000       1.52
@@ -38,7 +38,6 @@
   'OUTFILE'              => undef,
   'SUBDIR'               => undef,
   'documentlanguage'     => undef,
-
 );
 
 # defaults for all converters.  Maybe more could be added, especially what
@@ -64,24 +63,25 @@
 );
    
 
-sub _defaults($)
+sub converter_defaults($)
 {
   return %defaults;
 }
 
-sub _initialize($)
+sub converter_initialize($)
 {
 }
 
-sub _global_commands($)
+sub converter_global_commands($)
 {
   return ('documentlanguage', 'documentencoding');
 }
 
-sub _initialize_global_command($$$)
-{
-}
 
+# FIXME documentencoding handling is not reverted by resetting
+# a value with set_conf, so _unset_global_multiple_commands won't
+# reverse what _set_global_multiple_commands did through 
+# _informative_command.
 sub _informative_command($$)
 {
   my $self = shift;
@@ -141,7 +141,7 @@
     $conf = shift;
     $name = ref($converter);
   }
-  my %defaults = $converter->_defaults();
+  my %defaults = $converter->converter_defaults();
   foreach my $key (keys(%all_converters_defaults)) {
     $defaults{$key} = $all_converters_defaults{$key} 
       if (!exists($defaults{$key}));
@@ -170,7 +170,7 @@
 
       $converter->{'floats'} = $floats if ($floats);
       $converter->{'labels'} = $labels if ($labels);
-      foreach my $global_command ($converter->_global_commands()) {
+      foreach my $global_command ($converter->converter_global_commands()) {
         if (defined($converter->{'extra'}->{$global_command})) {
           my $root = $converter->{'extra'}->{$global_command};
           # always set unique commands
@@ -226,7 +226,7 @@
 
   $converter->Texinfo::Report::new();
 
-  $converter->_initialize();
+  $converter->converter_initialize();
 
   return $converter;
 }
@@ -238,7 +238,7 @@
   # FIXME 0 (first) or -1 (last)?
   $multiple_commands_index = 0 if (!defined($multiple_commands_index));
 
-  foreach my $global_command ($self->_global_commands()) {
+  foreach my $global_command ($self->converter_global_commands()) {
     if (defined($self->{'extra'}->{$global_command})
         and ref($self->{'extra'}->{$global_command}) eq 'ARRAY') {
       my $root = 
$self->{'extra'}->{$global_command}->[$multiple_commands_index];
@@ -251,12 +251,13 @@
 }
 
 # Notice that set_conf is used, which means that it is not possible to
-# customize what is done for those commands.
+# customize what is done for those commands.  For documentencoding, for
+# example the values are not reset correctly, see the FIXME above.
 sub _unset_global_multiple_commands($)
 {
   my $self = shift;
 
-  foreach my $global_command ($self->_global_commands()) {
+  foreach my $global_command ($self->converter_global_commands()) {
     if (defined($self->{'extra'}->{$global_command})
         and ref($self->{'extra'}->{$global_command}) eq 'ARRAY') {
       if (exists($self->{'conf_default'}->{$global_command})) {
@@ -321,7 +322,6 @@
 
 my $STDIN_DOCU_NAME = 'stdin';
 
-# This is especially useful for unsplit manuals
 sub _set_outfile($$$)
 {
   my $self = shift;
@@ -473,7 +473,7 @@
   return 1;
 }
 
-sub float_type_number($$)
+sub _float_type_number($$)
 {
   my $self = shift;
   my $float = shift;
@@ -586,8 +586,9 @@
 }
 
 # output fo $fh if defined, otherwise return the text.
-sub _output_text($$)
+sub _output_text($$$)
 {
+  my $self = shift;
   my $text = shift;
   my $fh = shift;
   if ($fh) { 
@@ -598,7 +599,7 @@
   } 
 }   
 
-sub _convert_document_sections($$;$)
+sub convert_document_sections($$;$)
 {
   my $self = shift;
   my $root = shift;
@@ -608,11 +609,11 @@
   my $elements = Texinfo::Structuring::split_by_section($root);
   if ($elements) {
     foreach my $element (@$elements) {
-      $result .= _output_text ($self->_convert($element), $fh);
+      $result .= $self->_output_text ($self->_convert($element), $fh);
     }
     return $result;
   } else {
-    return _output_text ($self->_convert($root), $fh);
+    return $self->_output_text ($self->_convert($root), $fh);
   }
 }
 
@@ -758,7 +759,7 @@
     = $Texinfo::Common::no_brace_commands{$no_brace_command};
 }
 
-sub xml_default_comment($$)
+sub xml_comment($$)
 {
   my $self = shift;
   my $text = shift;
@@ -821,7 +822,7 @@
   return Texinfo::Convert::Text::ascii_accent($text, $command);
 }
 
-sub xml_accent_numeric_entities($$;$)
+sub _xml_accent_numeric_entities($$;$)
 {
   my $text = shift;
   my $command = shift;
@@ -838,7 +839,7 @@
 
   if (!defined($format_accents)) {
     if ($self->get_conf('USE_NUMERIC_ENTITY')) {
-      $format_accents = \&xml_accent_numeric_entities;
+      $format_accents = \&_xml_accent_numeric_entities;
     } else {
       $format_accents = \&xml_accent;
     }

Index: DocBook.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/DocBook.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- DocBook.pm  1 Oct 2011 15:14:22 -0000       1.20
+++ DocBook.pm  1 Oct 2011 16:09:09 -0000       1.21
@@ -189,7 +189,7 @@
   'documentencoding' => 1,
 );
 
-sub _global_commands($)
+sub converter_global_commands($)
 {
   return keys(%docbook_global_commands);
 }
@@ -263,12 +263,12 @@
    'menu_description' => 'literallayout',
 );
 
-sub _defaults($)
+sub converter_defaults($)
 {
   return %defaults;
 }
 
-sub _initialize($)
+sub converter_initialize($)
 {
   my $self = shift;
 
@@ -282,7 +282,7 @@
   my $fh = shift;
 
   $self->_set_global_multiple_commands(-1);
-  return $self->_convert_document_sections($root, $fh);
+  return $self->convert_document_sections($root, $fh);
 }
 
 sub convert_tree($$)
@@ -330,9 +330,9 @@
 '. "<book${id} lang=\"".$self->get_conf('documentlanguage') ."\">\n";
 
   my $result = '';
-  $result .= Texinfo::Convert::Converter::_output_text($header, $fh);
-  $result .= $self->_convert_document_sections($root, $fh);
-  $result .= Texinfo::Convert::Converter::_output_text("</book>\n", $fh);
+  $result .= $self->_output_text($header, $fh);
+  $result .= $self->convert_document_sections($root, $fh);
+  $result .= $self->_output_text("</book>\n", $fh);
   return $result;
 }
 
@@ -654,7 +654,7 @@
         return '';
       } elsif ($type eq 'lineraw') {
         if ($root->{'cmdname'} eq 'c' or $root->{'cmdname'} eq 'comment') {
-          return $self->xml_default_comment($root->{'args'}->[0]->{'text'})
+          return $self->xml_comment($root->{'args'}->[0]->{'text'})
         } else {
           return "";
         }

Index: HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- HTML.pm     1 Oct 2011 15:26:12 -0000       1.163
+++ HTML.pm     1 Oct 2011 16:09:09 -0000       1.164
@@ -485,7 +485,7 @@
         $tree = {'type' => '_code',
                  'contents' => $command->{'extra'}->{'node_content'}};
       } elsif ($command->{'cmdname'} and ($command->{'cmdname'} eq 'float')) {
-        $tree = $self->float_type_number($command); 
+        $tree = $self->_float_type_number($command); 
       } elsif ($command->{'extra'}->{'missing_argument'}) {
         if ($type eq 'tree' or $type eq 'tree_nonumber') {
           return {};
@@ -938,7 +938,7 @@
   $defaults{$buttons} = address@hidden'SECTION_BUTTONS'}}];
 }
 
-sub _defaults($)
+sub converter_defaults($)
 {
   return %defaults;
 }
@@ -1037,7 +1037,7 @@
   $kept_misc_commands{$misc_command} = 1;
 }
 
-sub _global_commands($)
+sub converter_global_commands($)
 {
   return @informative_global_commands;
 }
@@ -1266,7 +1266,7 @@
     if (defined($attribute_hash->{$cmdname}->{'attribute'})) {
       my ($style, $class, $attribute_text)
         = _parse_attribute ($attribute_hash->{$cmdname}->{'attribute'});
-      $text = $self->attribute_class($style, $class) . "$attribute_text>" 
+      $text = $self->_attribute_class($style, $class) . "$attribute_text>" 
               . $text . "</$style>";
     }
     if (defined($attribute_hash->{$cmdname}->{'quote'})) {
@@ -1669,7 +1669,7 @@
 sub _default_comment($$) {
   my $self = shift;
   my $text = shift;
-  return $self->xml_default_comment(' '.$text);
+  return $self->xml_comment(' '.$text);
 }
 
 sub _default_heading_text($$$$$)
@@ -1690,7 +1690,7 @@
   my $align = '';
   $align = ' align="center"' if ($cmdname eq 'centerchap' or $cmdname eq 
'settitle');
   $level = 1 if ($level == 0);
-  my $result = $self->attribute_class ("h$level", $class) 
."$align>$text</h$level>";
+  my $result = $self->_attribute_class("h$level", $class) 
."$align>$text</h$level>";
   # FIXME titlefont appears inline in text, so no end of line is
   # added. The end of line should be added by the user if needed.
   $result .= "\n" unless ($cmdname eq 'titlefont');
@@ -1919,11 +1919,11 @@
   my $first_button = 1;
   my $result = '';
   if ($self->get_conf('HEADER_IN_TABLE')) {
-    $result .= $self->attribute_class('table', 'header')
+    $result .= $self->_attribute_class('table', 'header')
         .' cellpadding="1" cellspacing="1" border="0">'."\n";
     $result .= "<tr>" unless $vertical;
   } else {
-    $result .= $self->attribute_class('div', 'header').">\n<p>\n";
+    $result .= $self->_attribute_class('div', 'header').">\n<p>\n";
   }
   foreach my $button (@$buttons) {
     if ($self->get_conf('HEADER_IN_TABLE')) {
@@ -2142,7 +2142,7 @@
     return $content;
   # FIXME compatibility with texi2html
   } elsif ($cmdname eq 'tex') {
-    return $self->attribute_class('pre', $cmdname).'>' 
+    return $self->_attribute_class('pre', $cmdname).'>' 
           .$self->xml_protect_text($content) . '</pre>';
   }
   $self->line_warn(sprintf($self->__("Raw format %s is not converted"), 
$cmdname),
@@ -2170,7 +2170,7 @@
         return $content."\n";
       }
     } else {
-      return $self->attribute_class('div', 
$cmdname).">\n".$content.'</div>'."\n";
+      return $self->_attribute_class('div', 
$cmdname).">\n".$content.'</div>'."\n";
     }
   } else {
     return '';
@@ -2189,7 +2189,7 @@
   my $command = shift;
   my $content = shift;
 
-  return $self->attribute_class('pre', $cmdname).'>' 
+  return $self->_attribute_class('pre', $cmdname).'>' 
           .$content . '</pre>';
 }
 
@@ -2351,7 +2351,7 @@
       and $self->{'floats'}->{$command->{'extra'}->{'type'}->{'normalized'}}
       and 
@{$self->{'floats'}->{$command->{'extra'}->{'type'}->{'normalized'}}}) { 
    my $listoffloats_name = $command->{'extra'}->{'type'}->{'normalized'};
-   my $result = $self->attribute_class('dl', 'listoffloats').">\n" ;
+   my $result = $self->_attribute_class('dl', 'listoffloats').">\n" ;
    foreach my $float (@{$self->{'floats'}->{$listoffloats_name}}) {
      my $float_href = $self->command_href($float);
      next if (!$float_href);
@@ -2422,12 +2422,12 @@
   my $end_row = '';
   if ($self->_in_preformatted_in_menu()) {
     #my $pre_class = $self->_preformatted_class();
-    #return $self->attribute_class('pre', $pre_class).">".$content."</pre>";
+    #return $self->_attribute_class('pre', $pre_class).">".$content."</pre>";
     
     $begin_row = '<tr><td>';
     $end_row = '</td></tr>';
   }
-  return $self->attribute_class('table', 'menu')
+  return $self->_attribute_class('table', 'menu')
     ." border=\"0\" cellspacing=\"0\">${begin_row}\n"
       . $content . "${end_row}</table>\n";
 }
@@ -2494,7 +2494,7 @@
   if ($caption and !$caption_text) {
     $caption_text = $self->convert_tree ($caption->{'args'}->[0]);
   }
-  return $self->attribute_class('div','float'). '>' .$label."\n".$content.
+  return $self->_attribute_class('div','float'). '>' .$label."\n".$content.
      '</div>' . $prepended_text.$caption_text;
 }
 $default_commands_conversion{'float'} = \&_convert_float_command;
@@ -2519,7 +2519,7 @@
       $attribution .= $self->convert_tree($centered_author);
     }
   }
-  return $self->attribute_class('blockquote', $class).">\n" .$content 
+  return $self->_attribute_class('blockquote', $class).">\n" .$content 
     ."</blockquote>\n" . $attribution;
 }
 $default_commands_conversion{'quotation'} = \&_convert_quotation_command;
@@ -2533,7 +2533,7 @@
   my $content = shift;
 
   if ($content =~ /\S/) {
-    return $self->attribute_class('table', 'cartouche')
+    return $self->_attribute_class('table', 'cartouche')
        ." border=\"1\"><tr><td>\n". $content ."</td></tr></table>\n";
   }
   return '';
@@ -2552,7 +2552,7 @@
      and $command->{'extra'}->{'command_as_argument'}->{'cmdname'} eq 
'bullet') {
     return "<ul>\n" . $content. "</ul>\n";
   } else {
-    return $self->attribute_class('ul',$NO_BULLET_LIST_CLASS).">\n" 
+    return $self->_attribute_class('ul',$NO_BULLET_LIST_CLASS).">\n" 
             . $content . "</ul>\n";
   }
 }
@@ -2994,7 +2994,7 @@
     }
     $letter_id{$letter} = $identifier;
     
-    my $summary_letter_link = $self->attribute_class('a', 'summary-letter') 
+    my $summary_letter_link = $self->_attribute_class('a', 'summary-letter') 
        ." 
href=\"#$identifier\"><b>".$self->xml_protect_text($letter).'</b></a>';
     if ($is_symbol) {
       push @non_alpha, $summary_letter_link;
@@ -3021,7 +3021,7 @@
   $result .= $summary;
 
   # now format the index entries
-  $result .= $self->attribute_class('table', "index-$index_name")
+  $result .= $self->_attribute_class('table', "index-$index_name")
     ." border=\"0\">\n" . "<tr><td></td><th align=\"left\">"
     . $self->convert_tree($self->gdt('Index Entry'))
     . "</th><td>&nbsp;</td><th align=\"left\"> "
@@ -3294,7 +3294,7 @@
       and !$self->_in_preformatted_in_menu()) {
     return $content;
   }
-  my $result = $self->attribute_class('pre', $pre_class).">".$content."</pre>";
+  my $result = $self->_attribute_class('pre', 
$pre_class).">".$content."</pre>";
 
   # this may happen with empty lines between a def* and def*x.
   if ($command->{'parent'}->{'cmdname'} 
@@ -3379,7 +3379,7 @@
       $text =~ s/\x{1F}/--/g;
     }
   }
-  $text = $self->protect_space_codebreak($text);
+  $text = $self->_protect_space_codebreak($text);
   return $text;
 }
 
@@ -3488,7 +3488,7 @@
 
     if (!$self->get_conf('SIMPLE_MENU')) {
       my $pre_class = $self->_preformatted_class();
-      $result = $self->attribute_class('pre', $pre_class).">".$result."</pre>";
+      $result = $self->_attribute_class('pre', 
$pre_class).">".$result."</pre>";
     }
     return $result;
   }
@@ -3963,7 +3963,7 @@
   return 1 if ($text =~ /^&/ and $text =~ /;$/);
 }
 
-sub _initialize($)
+sub converter_initialize($)
 {
   my $self = shift;
 
@@ -5069,7 +5069,10 @@
   }
 }
 
-sub htmlxref($$)
+# TODO this encapsulates some information.
+# The encapsulation and API should be more consistent for
+# the overall module.
+sub _htmlxref($$)
 {
   my $self = shift;
   my $file = shift;
@@ -5116,7 +5119,7 @@
     $document_split = 'mono' if (!$document_split);
     my $split_found;
     my $href;
-    my $htmlxref_info = $self->htmlxref($manual_base);
+    my $htmlxref_info = $self->_htmlxref($manual_base);
     if ($htmlxref_info) {
       foreach my $split_ordered (@{$htmlxref_entries{$document_split}}) {
         if (defined($htmlxref_info->{$split_ordered})) {
@@ -5311,12 +5314,12 @@
   $ul_class = $NO_BULLET_LIST_CLASS if ($self->get_conf('NUMBER_SECTIONS'));
 
   my $result = '';
-  $result .= $self->attribute_class('div', $cmdname).">\n";
+  $result .= $self->_attribute_class('div', $cmdname).">\n";
 
   my $toplevel_contents;
   if (@{$section_root->{'section_childs'}} > 1) { 
   #    or $section_root->{'section_childs'}->[0]->{'cmdname'} ne 'top') {
-    $result .= $self->attribute_class('ul', $ul_class) .">\n";
+    $result .= $self->_attribute_class('ul', $ul_class) .">\n";
     $toplevel_contents = 1;
   }
   foreach my $top_section (@{$section_root->{'section_childs'}}) {
@@ -5361,7 +5364,7 @@
         # no indenting for shortcontents
         $result .= "\n". ' ' x (2*($section->{'level'} - $root_level))
           if ($contents);
-        $result .= $self->attribute_class('ul', $ul_class) .">\n";
+        $result .= $self->_attribute_class('ul', $ul_class) .">\n";
         $section = $section->{'section_childs'}->[0];
       } elsif ($section->{'section_next'} and $section->{'cmdname'} ne 'top') {
         $result .= "</li>\n";
@@ -5570,14 +5573,6 @@
   return $result;
 }
 
-# FIXME is it usefull/used?
-sub convert_translation($$$)
-{
-  my $self = shift;
-  my $text = shift;
-  return $self->convert_tree($self->gdt($text));
-}
-
 sub _default_node_redirection_page($$)
 {
   my $self = shift;
@@ -5625,7 +5620,7 @@
 {
   my $self = shift;
   return '' if (!$foot_lines);
-  my $result = $self->attribute_class('div', 'footnote').">\n";
+  my $result = $self->_attribute_class('div', 'footnote').">\n";
   $result .= $self->get_conf('DEFAULT_RULE') . "\n" 
      if (defined($self->get_conf('DEFAULT_RULE')) 
          and $self->get_conf('DEFAULT_RULE') ne '');
@@ -5781,19 +5776,6 @@
   return $result;
 }
 
-# output fo $fh if defined, otherwise return the text.
-sub _output_text($$)
-{
-  my $text = shift;
-  my $fh = shift;
-  if ($fh) {
-    print $fh $text;
-    return '';
-  } else {
-    return $text;
-  }
-}
-
 sub output($$)
 {
   my $self = shift;
@@ -5974,17 +5956,17 @@
     }
     $self->{'current_filename'} = $self->{'output_filename'};
     my $header = &{$self->{'begin_file'}}($self, $self->{'output_filename'}, 
undef);
-    $output .= _output_text($header, $fh);
+    $output .= $self->_output_text($header, $fh);
     if ($elements and @$elements) {
       foreach my $element (@$elements) {
         my $element_text = $self->_convert($element);
-        $output .= _output_text($element_text, $fh);
+        $output .= $self->_output_text($element_text, $fh);
       }
     } else {
-      $output .= _output_text($self->_print_title(), $fh);
-      $output .= _output_text($self->_convert($root), $fh);
+      $output .= $self->_output_text($self->_print_title(), $fh);
+      $output .= $self->_output_text($self->_convert($root), $fh);
     }
-    $output .= _output_text(&{$self->{'end_file'}}($self), $fh);
+    $output .= $self->_output_text(&{$self->{'end_file'}}($self), $fh);
     return $output if ($self->get_conf('OUTFILE') eq '');
   } else {
     # output with pages
@@ -6200,7 +6182,7 @@
   return $content_formatted;
 }
 
-sub attribute_class($$$)
+sub _attribute_class($$$)
 {
   my $self = shift;
   my $element = shift;
@@ -6218,7 +6200,7 @@
   return "<$element class=\"$class\"$style";
 }
 
-sub protect_space_codebreak($$)
+sub _protect_space_codebreak($$)
 {
   my $self = shift;
   my $text = shift;
@@ -6233,7 +6215,7 @@
     my $class = 'nolinebreak';
     $class = 'nocodebreak' if ($self->in_code() 
                            and $self->get_conf('allowcodebreaks') eq 'false');
-    my $open = $self->attribute_class('span', $class).'>';
+    my $open = $self->_attribute_class('span', $class).'>';
     # protect spaces in the html leading attribute in case we are in 'w'
     $open =~ s/ /\x{1F}/g if ($in_w);
     # special span to avoid breaking at _-

Index: Plaintext.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Plaintext.pm,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -b -r1.169 -r1.170
--- Plaintext.pm        1 Oct 2011 15:26:12 -0000       1.169
+++ Plaintext.pm        1 Oct 2011 16:09:09 -0000       1.170
@@ -313,17 +313,17 @@
  'summarycontents' => 1,
 );
 
-sub _defaults($)
+sub converter_defaults($)
 {
   return %defaults;
 }
 
-sub _global_commands($)
+sub converter_global_commands($)
 {
   return @informative_global_commands;
 }
 
-sub _initialize($)
+sub converter_initialize($)
 {
   my $self = shift;
 
@@ -1386,7 +1386,7 @@
             and $root->{'extra'}->{'label'}->{'cmdname'} eq 'float') {
           my $float = $root->{'extra'}->{'label'};
 
-          my $name = $self->float_type_number($float);;
+          my $name = $self->_float_type_number($float);;
           $args[1] = $name->{'contents'};
         }
         if ($command eq 'inforef' and scalar(@args) == 3) {

Index: XML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/XML.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- XML.pm      29 Sep 2011 20:01:39 -0000      1.44
+++ XML.pm      1 Oct 2011 16:09:09 -0000       1.45
@@ -238,12 +238,12 @@
   'xml' => 1,
 );
 
-sub _defaults($)
+sub converter_defaults($)
 {
   return %defaults;
 }
 
-sub _initialize($)
+sub converter_initialize($)
 {
   my $self = shift;
 
@@ -280,9 +280,9 @@
   }
 
   my $result = '';
-  $result .= Texinfo::Convert::Converter::_output_text($header, $fh);
-  $result .= $self->_convert_document_sections($root, $fh);
-  $result .= Texinfo::Convert::Converter::_output_text("</texinfo>\n", $fh);
+  $result .= $self->_output_text($header, $fh);
+  $result .= $self->convert_document_sections($root, $fh);
+  $result .= $self->_output_text("</texinfo>\n", $fh);
 
   return $result;
 }
@@ -337,7 +337,7 @@
   my $root = shift;
   my $fh = shift;
   
-  return $self->_convert_document_sections($root, $fh);
+  return $self->convert_document_sections($root, $fh);
 }
 
 sub convert_tree($$)
@@ -620,7 +620,7 @@
         }
       } elsif ($type eq 'lineraw') {
         if ($root->{'cmdname'} eq 'c' or $root->{'cmdname'} eq 'comment') {
-          return $self->xml_default_comment($root->{'args'}->[0]->{'text'})
+          return $self->xml_comment($root->{'args'}->[0]->{'text'})
         } else {
           my $value = '';
           if ($root->{'args'} and $root->{'args'}->[0]