Changeset 3396 for trunk/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/TML2HTML.pm

Timestamp:

04/10/09 10:37:08 (3 years ago)

Author:

CrawfordCurrie

Message:

Item1394: fixed colour handling

File:

• trunk/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/TML2HTML.pm (modified) (2 diffs)

trunk/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/TML2HTML.pm

@@ -260 +260 @@
 
     # Handle colour tags specially (hack, hack, hackity-HACK!)
-    my $colourMatch = join( '|', grep( /^[A-Z]/, keys %WC::KNOWN_COLOUR ) );
-    while ( $text =~
-        s#%($colourMatch)%(.*?)%ENDCOLOR%#<font color="\L$1\E">$2</font>#og )
-    {
-    }
+    my $colourMatch = join( '|', grep( /^[A-Z]/, @WC::TML_COLOURS ) );
+    $text =~ s#%($colourMatch)%(.*?)%ENDCOLOR%#
+      _getNamedColour($1, $2)#oge;
 
     # Convert Foswiki tags to spans outside protected text
@@ -508 +506 @@
 }
 
+sub _getNamedColour {
+    my ( $name, $t ) = @_;
+    my $epr = Foswiki::Func::getPreferencesValue($name);
+
+    # Match <font color="x" and style="color:x"
+    if (
+        defined $epr
+        && (   $epr =~ /color=["'](#?\w+)['"]/
+            || $epr =~ /color\s*:\s*(#?\w+)/ )
+      )
+    {
+        return "<span class='WYSIWYG_COLOR' style='color:$1'>$t</span>";
+    }
+
+    # Can't map to a 'real' colour; leave the variables
+    return '%' . $name . '%' . $t . '%ENDCOLOR%';
+}
+
 sub _addClass {
     if ( $_[0] ) {