Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / doc / todo / color_plugin.mdwn

diff --git a/doc/todo/color_plugin.mdwn b/doc/todo/color_plugin.mdwn
index 64ff46253eae1f8a64f8347e0d5002b844563139..19fba3b3506e82f7e3e5746e68706703cd379fbc 100644 (file)
--- a/doc/todo/color_plugin.mdwn
+++ b/doc/todo/color_plugin.mdwn
@@ -114,6 +114,12 @@ Of course, I'm open for discussion or exchange of ideas :) --[[Paweł|ptecza]]
 >>>> ready for integration (made a few minor changes). Is this GPL 2?
 >>>> --[[Joey]]
 
 >>>> ready for integration (made a few minor changes). Is this GPL 2?
 >>>> --[[Joey]]
 

+>>>>> No problem. I guessed it, because I've not seen your commits
+>>>>> at [[RecentChanges]] page in last days and I subscribe your
+>>>>> [blog](http://kitenet.net/~joey/blog/entry/vacation/) :D
+>>>>> It's GPL-2+ like your Ikiwiki and the most external plugins.
+>>>>> --[[Paweł|ptecza]]
+

        --- /dev/null   2008-06-21 02:02:15.000000000 +0200
        +++ color.pm    2008-07-27 14:58:12.000000000 +0200
        @@ -0,0 +1,69 @@
        --- /dev/null   2008-06-21 02:02:15.000000000 +0200
        +++ color.pm    2008-07-27 14:58:12.000000000 +0200
        @@ -0,0 +1,69 @@


@@ -126,12 +132,12 @@ Of course, I'm open for discussion or exchange of ideas :) --[[Paweł|ptecza]]
        +use strict;
        +use IkiWiki 2.00;
        +
        +use strict;
        +use IkiWiki 2.00;
        +

-       +sub import { #{{{
+       +sub import {

        +       hook(type => "preprocess", id => "color", call => \&preprocess);
        +       hook(type => "format",     id => "color", call => \&format);
        +       hook(type => "preprocess", id => "color", call => \&preprocess);
        +       hook(type => "format",     id => "color", call => \&format);

-       +} #}}}
+       +}

        +
        +

-       +sub preserve_style ($$$) { #{{{
+       +sub preserve_style ($$$) {

        +       my $foreground = shift;
        +       my $background = shift;
        +       my $text       = shift;
        +       my $foreground = shift;
        +       my $background = shift;
        +       my $text       = shift;


@@ -156,18 +162,18 @@ Of course, I'm open for discussion or exchange of ideas :) --[[Paweł|ptecza]]
        +       
        +       return $preserved;
        +
        +       
        +       return $preserved;
        +

-       +} #}}}
+       +}

        +
        +

-       +sub replace_preserved_style ($) { #{{{
+       +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;
        +
        +       return $content;
        +       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;
        +
        +       return $content;

-       +} #}}}
+       +}

        +
        +

-       +sub preprocess (@) { #{{{
+       +sub preprocess (@) {

        +       my %params = @_;
        +
        +       # Preprocess the text to expand any preprocessor directives
        +       my %params = @_;
        +
        +       # Preprocess the text to expand any preprocessor directives


@@ -176,14 +182,14 @@ Of course, I'm open for discussion or exchange of ideas :) --[[Paweł|ptecza]]
        +                               IkiWiki::filter($params{page}, $params{destpage}, $params{text}));
        +
        +       return preserve_style($params{foreground}, $params{background}, $params{text});
        +                               IkiWiki::filter($params{page}, $params{destpage}, $params{text}));
        +
        +       return preserve_style($params{foreground}, $params{background}, $params{text});

-       +} #}}}
+       +}

        +
        +

-       +sub format (@) { #{{{
+       +sub format (@) {

        +       my %params = @_;
        +
        +       $params{content} = replace_preserved_style($params{content});
        +       return $params{content};        
        +       my %params = @_;
        +
        +       $params{content} = replace_preserved_style($params{content});
        +       return $params{content};        

-       +} #}}}
+       +}

        +
        +1
        --- /dev/null   2008-06-21 02:02:15.000000000 +0200
        +
        +1
        --- /dev/null   2008-06-21 02:02:15.000000000 +0200


@@ -221,3 +227,5 @@ Of course, I'm open for discussion or exchange of ideas :) --[[Paweł|ptecza]]
        +span.color {
        +       padding: 2px;
        +}
        +span.color {
        +       padding: 2px;
        +}

+
+[[done]]