X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5a2de27947d084f73fdbbc55028af378f62b42b3..f83d905549ac16a3ae2d50d63d47effb20a68998:/IkiWiki/Plugin/color.pm
diff --git a/IkiWiki/Plugin/color.pm b/IkiWiki/Plugin/color.pm
index b9407ba28..e80130d92 100644
--- a/IkiWiki/Plugin/color.pm
+++ b/IkiWiki/Plugin/color.pm
@@ -18,6 +18,7 @@ sub getsetup () {
plugin => {
safe => 1,
rebuild => undef,
+ section => "widget",
},
}
@@ -37,12 +38,11 @@ sub preserve_style ($$$) {
($background =~ /^[a-z]+$/ || $background =~ /^#[0-9a-f]{3,6}$/));
my $preserved = '';
- $preserved .= '';
+ $preserved .= ''.$text.'';
+ $preserved .= '">'.$text.'';
return $preserved;
@@ -51,8 +51,7 @@ sub preserve_style ($$$) {
sub replace_preserved_style ($) {
my $content = shift;
- $content =~ s!((color: ([a-z]+|\#[0-9a-f]{3,6})?)?((; )?(background-color: ([a-z]+|\#[0-9a-f]{3,6})?)?)?)!!g;
- $content =~ s!!!g;
+ $content =~ s!\s*\s*!!g;
return $content;
}
@@ -60,12 +59,11 @@ sub replace_preserved_style ($) {
sub preprocess (@) {
my %params = @_;
- # Preprocess the text to expand any preprocessor directives
- # embedded inside it.
- $params{text} = IkiWiki::preprocess($params{page}, $params{destpage},
- IkiWiki::filter($params{page}, $params{destpage}, $params{text}));
-
- return preserve_style($params{foreground}, $params{background}, $params{text});
+ return preserve_style($params{foreground}, $params{background},
+ # Preprocess the text to expand any preprocessor directives
+ # embedded inside it.
+ IkiWiki::preprocess($params{page}, $params{destpage},
+ $params{text}));
}
sub format (@) {