texinfo/tp/Texinfo/Convert HTML.pm

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/06/05 14:11:36

Modified files:
        tp/Texinfo/Convert: HTML.pm 

Log message:
        Convert @indicateurl.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.84&r2=1.85

Patches:
Index: HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- HTML.pm     5 Jun 2011 14:03:48 -0000       1.84
+++ HTML.pm     5 Jun 2011 14:11:36 -0000       1.85
@@ -1132,9 +1132,6 @@
 delete $style_commands_formatting{'preformatted'}->{'sc'}->{'attribute'};
 delete $style_commands_formatting{'preformatted'}->{'sc'};
 
-#      'key',        {'begin' => '&lt;', 'end' => '&gt;'},
-#      'indicateurl', {'begin' => '&lt;<code>', 'end' => '</code>&gt;'},
-
 sub _parse_attribute($)
 {
   my $element = shift;
@@ -1423,6 +1420,7 @@
   $default_commands_conversion{$command} = \&_convert_accent_command;
 }
 
+# key is formatted as code since indicateurl is in code_style_commands
 sub _convert_key_command($$$$)
 {
   my $self = shift;
@@ -1442,6 +1440,29 @@
 
 $default_commands_conversion{'key'} = \&_convert_key_command;
 
+# argument is formatted as code since indicateurl is in code_style_commands
+sub _convert_indicateurl_command($$$$)
+{
+  my $self = shift;
+  my $cmdname = shift;
+  my $command = shift;
+  my $args = shift;
+
+  my $text = $args->[0]->{'normal'};
+  if (!defined($text)) {
+    # happens with bogus @-commands without argument, like @strong something
+    #cluck "text not defined in _convert_style_command";
+    #print STDERR Texinfo::Structuring::_print_current($command);
+    return '';
+  }
+  return $self->xml_protect_text('<').'<code>' .$text 
+                    .'</code>'.$self->xml_protect_text('>');
+}
+
+$default_commands_conversion{'indicateurl'} = \&_convert_indicateurl_command;
+
+
+
 sub _convert_ctrl_command($$$$)
 {
   my $self = shift;