Response to jsewell's bug report.

[git.ikiwiki.info.git] / IkiWiki / Plugin / color.pm

diff --git a/IkiWiki/Plugin/color.pm b/IkiWiki/Plugin/color.pm
index 9bb2359ce6f45f9ba452ad400aa48fc2c204584e..e80130d924c04e7c7e542191d05ca9d32dbbd5d3 100644 (file)
--- a/IkiWiki/Plugin/color.pm
+++ b/IkiWiki/Plugin/color.pm
@@ -38,12 +38,11 @@ sub preserve_style ($$$) {
                                ($background =~ /^[a-z]+$/ || $background =~ /^#[0-9a-f]{3,6}$/));
 
        my $preserved = '';
                                ($background =~ /^[a-z]+$/ || $background =~ /^#[0-9a-f]{3,6}$/));
 
        my $preserved = '';

-       $preserved .= '<span class="color">';
+       $preserved .= '<span class="color"><span value="';

        $preserved .= 'color: '.$foreground if ($foreground);
        $preserved .= '; ' if ($foreground && $background);
        $preserved .= 'background-color: '.$background if ($background);
        $preserved .= 'color: '.$foreground if ($foreground);
        $preserved .= '; ' if ($foreground && $background);
        $preserved .= 'background-color: '.$background if ($background);

-       $preserved .= '</span>';
-       $preserved .= '<span class="colorend">'.$text.'</span>';
+       $preserved .= '"></span>'.$text.'</span>';

        
        return $preserved;
 
        
        return $preserved;
 


@@ -52,8 +51,7 @@ sub preserve_style ($$$) {
 sub replace_preserved_style ($) {
        my $content = shift;
 
 sub replace_preserved_style ($) {
        my $content = shift;
 

-       $content =~ s!<span class="color">((color: ([a-z]+|\#[0-9a-f]{3,6})?)?((; )?(background-color: ([a-z]+|\#[0-9a-f]{3,6})?)?)?)</span>!<span class="color" style="$1">!g;
-       $content =~ s!<span class="colorend">!!g;
+       $content =~ s!<span class="color">\s*<span value="((color: ([a-z]+|\#[0-9a-f]{3,6})?)?((; )?(background-color: ([a-z]+|\#[0-9a-f]{3,6})?)?)?)">\s*</span>!<span class="color" style="$1">!g;

 
        return $content;
 }
 
        return $content;
 }