diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-31 19:35:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-31 19:35:37 -0400 |
| commit | 041923a89ece8b1ed195cb7b528843c15770ea6f (patch) | |
| tree | d85f7c488c05d8d6983ec1b65b2e427c59cc3acf /doc/todo/color_plugin.mdwn | |
| parent | e12627e0a4c73d4d47ac2f10750defe22b41580e (diff) | |
| parent | 861dea7f1c720ff889ff11ef7b7e925a3c209c5d (diff) | |
| download | ikiwiki-041923a89ece8b1ed195cb7b528843c15770ea6f.tar ikiwiki-041923a89ece8b1ed195cb7b528843c15770ea6f.tar.gz | |
Merge branch 'master' into autoconfig
Conflicts:
IkiWiki/Plugin/git.pm
debian/changelog
po/ikiwiki.pot
Diffstat (limited to 'doc/todo/color_plugin.mdwn')
| -rw-r--r-- | doc/todo/color_plugin.mdwn | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/doc/todo/color_plugin.mdwn b/doc/todo/color_plugin.mdwn index 511851ba3..ebf5b084c 100644 --- a/doc/todo/color_plugin.mdwn +++ b/doc/todo/color_plugin.mdwn @@ -58,6 +58,11 @@ comments are very welcome. --[[Paweł|ptecza]] >> Similar hardcoded method I've found in `img` plugin :) But only one >> argument is not named there (image path). +>>> I think I hadn't realized what you were doing there. The order +>>> for unnamed parameters can in fact be relied on. +>>> +>>> --[[Joey]] + >> Maybe I shouldn't use so simple plugin syntax? For following syntax >> I wouldn't have that problem: @@ -96,6 +101,8 @@ seems to be too enigmatic and it was hard to me to handle unnamed parameters in not hardcoded way. I hope that my changes are acceptable for you. Of course, I'm open for discussion or exchange of ideas :) --[[Paweł|ptecza]] +> One question, why the 2px padding for span.color? --[[Joey]] + --- /dev/null 2008-06-21 02:02:15.000000000 +0200 +++ color.pm 2008-07-27 14:58:12.000000000 +0200 @@ -0,0 +1,69 @@ @@ -146,7 +153,7 @@ Of course, I'm open for discussion or exchange of ideas :) --[[Paweł|ptecza]] + $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; + - + return $content; + + return $content; +} #}}} + +sub preprocess(@) { #{{{ |