Merge branch 'master' into pedigree

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

diff --git a/IkiWiki/Plugin/haiku.pm b/IkiWiki/Plugin/haiku.pm
index 0e93e9d8d2bccb553fb509cddaa9d11733284506..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 warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

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

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

 } # }}}
 
 sub preprocess (@) { #{{{
 } # }}}
 
 sub preprocess (@) { #{{{


@@ -16,7 +15,7 @@ sub preprocess (@) { #{{{
 
        my $haiku;
        eval q{use Coy};
 
        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.


@@ -35,20 +34,17 @@ sub preprocess (@) { #{{{
                $haiku=$canned[rand @canned];
        }
        else {
                $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;
        }
                
        $haiku=~s/^\s+//mg;
                # trim off other text
                $haiku=~s/\s+-----\n//s;
                $haiku=~s/\s+-----.*//s;
        }
                
        $haiku=~s/^\s+//mg;

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

        
        

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

 } # }}}
 
 1
 } # }}}
 
 1