Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/haiku.pm b/IkiWiki/Plugin/haiku.pm
index fe8a782fad2ffdf5c83c4ecb0c86f269195dd2d7..7ce74696ba474aa3e4a75d12f7a2cf3eb49b02cf 100644 (file)
--- a/IkiWiki/Plugin/haiku.pm
+++ b/IkiWiki/Plugin/haiku.pm
@@ -4,18 +4,34 @@ package IkiWiki::Plugin::haiku;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "haiku", call => \&getsetup);

        hook(type => "preprocess", id => "haiku", call => \&preprocess);
        hook(type => "preprocess", id => "haiku", call => \&preprocess);

-} # }}}
+}

 
 

-sub preprocess (@) { #{{{
+sub getsetup {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+                       section => "widget",
+               },
+}
+
+sub preprocess (@) {

        my %params=@_;
 
        my $haiku;
        eval q{use Coy};
        my %params=@_;
 
        my $haiku;
        eval q{use Coy};

-       if ($@ || ! Coy->can("Coy::with_haiku")) {
+       if ($config{deterministic}) {
+               $haiku = "Coy changes often.
+                         For deterministic builds
+                         try this substitute.
+                        ",
+       }
+       elsif ($@ || ! Coy->can("Coy::with_haiku")) {

                my @canned=(
                        "The lack of a Coy:
                         No darting, subtle haiku.
                my @canned=(
                        "The lack of a Coy:
                         No darting, subtle haiku.


@@ -42,9 +58,9 @@ sub preprocess (@) { #{{{
        }
                
        $haiku=~s/^\s+//mg;
        }
                
        $haiku=~s/^\s+//mg;

-       $haiku=~s/\n/<br>\n/mg;
+       $haiku=~s/\n/<br \/>\n/mg;

        
        

-       return "\n\n<blockquote>$haiku</blockquote>\n\n";
-} # }}}
+       return "\n\n<blockquote><p>$haiku</p></blockquote>\n\n";
+}

 
 1
 
 1