web commit by http://dmarti.myopenid.com/

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

diff --git a/IkiWiki/Plugin/haiku.pm b/IkiWiki/Plugin/haiku.pm
index 0e93e9d8d2bccb553fb509cddaa9d11733284506..fe8a782fad2ffdf5c83c4ecb0c86f269195dd2d7 100644 (file)
--- a/IkiWiki/Plugin/haiku.pm
+++ b/IkiWiki/Plugin/haiku.pm
@@ -7,8 +7,7 @@ use strict;
 use IkiWiki;
 
 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.
@@ -35,11 +34,8 @@ sub preprocess (@) { #{{{
                $haiku=$canned[rand @canned];
        }
        else {
-               # Coy is rather strange, so the best way to get a haiku
-               # out of it is to die..
-               eval {die exists $params{hint} ? $params{hint} : $params{page}};
-               $haiku=$@;
-
+               $haiku=Coy::with_haiku($params{hint} ? $params{hint} : $params{page});
+               
                # trim off other text
                $haiku=~s/\s+-----\n//s;
                $haiku=~s/\s+-----.*//s;
@@ -48,7 +44,7 @@ sub preprocess (@) { #{{{
        $haiku=~s/^\s+//mg;
        $haiku=~s/\n/<br>\n/mg;
        
-       return $haiku
+       return "\n\n<blockquote>$haiku</blockquote>\n\n";
 } # }}}
 
 1