]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Plugin/haiku.pm
Merge commit 'upstream/master' into pub/master
[git.ikiwiki.info.git] / IkiWiki / Plugin / haiku.pm
index fe8a782fad2ffdf5c83c4ecb0c86f269195dd2d7..eb8b786e826d0071ff41b75f08673c781db0bea6 100644 (file)
@@ -4,12 +4,21 @@ package IkiWiki::Plugin::haiku;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.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 getsetup { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+
 sub preprocess (@) { #{{{
        my %params=@_;
 
 sub preprocess (@) { #{{{
        my %params=@_;
 
@@ -42,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