Mark bug "clear: both for .page*?" as [[done]]

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

diff --git a/IkiWiki/Plugin/haiku.pm b/IkiWiki/Plugin/haiku.pm
index e2873ec6f56f7a65cf51f6b23813eed4b3926099..5d5e8d5aaf93089fe84cc3774966f7a914aa516c 100644 (file)
--- a/IkiWiki/Plugin/haiku.pm
+++ b/IkiWiki/Plugin/haiku.pm
@@ -4,11 +4,10 @@ package IkiWiki::Plugin::haiku;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 sub import { #{{{
-       IkiWiki::hook(type => "preprocess", id => "haiku",
-               call => \&preprocess);
+       hook(type => "preprocess", id => "haiku", call => \&preprocess);
 } # }}}
 
 sub preprocess (@) { #{{{
@@ -16,7 +15,7 @@ sub preprocess (@) { #{{{
 
        my $haiku;
        eval q{use Coy};
-       if ($@) {
+       if ($@ || ! Coy->can("Coy::with_haiku")) {
                my @canned=(
                        "The lack of a Coy:
                         No darting, subtle haiku.
@@ -43,9 +42,9 @@ sub preprocess (@) { #{{{
        }
                
        $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