texinfo/tp/Texinfo/Convert HTML.pm

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        11/07/13 22:13:18

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

Log message:
        Use @clickstyle provided command only if it exists.

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

Patches:
Index: HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- HTML.pm     13 Jul 2011 20:58:54 -0000      1.104
+++ HTML.pm     13 Jul 2011 22:13:18 -0000      1.105
@@ -1070,7 +1070,14 @@
 
   if ($cmdname eq 'click' and $command->{'extra'} 
       and exists($command->{'extra'}->{'clickstyle'})) {
-    $cmdname = $command->{'extra'}->{'clickstyle'};
+    my $click_cmdname = $command->{'extra'}->{'clickstyle'};
+    if (($self->in_preformatted() or $self->in_math()
+         and 
$self->{'commands_formatting'}->{'preformatted'}->{$click_cmdname})
+        or ($self->in_string() and 
+            $self->{'commands_formatting'}->{'string'}->{$click_cmdname})
+        or ($self->{'commands_formatting'}->{'normal'}->{$click_cmdname})) {
+      $cmdname = $click_cmdname;
+    }
   }
 
   my $result;