Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/haiku.pm b/IkiWiki/Plugin/haiku.pm
index e2873ec6f56f7a65cf51f6b23813eed4b3926099..eb8b786e826d0071ff41b75f08673c781db0bea6 100644 (file)
--- a/IkiWiki/Plugin/haiku.pm
+++ b/IkiWiki/Plugin/haiku.pm
@@ -4,19 +4,27 @@ package IkiWiki::Plugin::haiku;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
 
 sub import { #{{{

-       IkiWiki::hook(type => "preprocess", id => "haiku",
-               call => \&preprocess);
+       hook(type => "getsetup", id => "haiku", call => \&getsetup);
+       hook(type => "preprocess", id => "haiku", call => \&preprocess);

 } # }}}
 
 } # }}}
 

+sub getsetup { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+

 sub preprocess (@) { #{{{
        my %params=@_;
 
        my $haiku;
        eval q{use Coy};
 sub preprocess (@) { #{{{
        my %params=@_;
 
        my $haiku;
        eval q{use Coy};

-       if ($@) {
+       if ($@ || ! 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.


@@ -43,9 +51,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