texinfo/tp/Texinfo/Convert HTML.pm

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/07/14 07:48:03

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

Log message:
        Handle the effect of kbdinputstyle on kbd.

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

Patches:
Index: HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- HTML.pm     14 Jul 2011 07:42:21 -0000      1.106
+++ HTML.pm     14 Jul 2011 07:48:02 -0000      1.107
@@ -1209,6 +1209,11 @@
     #print STDERR Texinfo::Structuring::_print_current($command);
     return '';
   }
+  # handle the effect of kbdinputstyle
+  if ($cmdname eq 'kbd' and $command->{'extra'} 
+      and $command->{'extra'}->{'code'}) {
+    $cmdname = 'code';
+  }
 
   my $attribute_hash = {};
   if ($self->in_preformatted()) {
@@ -1514,7 +1519,6 @@
   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 '';
   }
@@ -1534,7 +1538,6 @@
   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 '';
   }
@@ -1556,7 +1559,6 @@
   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 '';
   }
@@ -1575,7 +1577,6 @@
   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 '';
   }