Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/creole.pm b/IkiWiki/Plugin/creole.pm
index a259f49ebe386225f982ac30e04d0c3eb5c73015..a1e4b31d326c7d5d9f2480be501a09c1f43e0bbb 100644 (file)
--- a/IkiWiki/Plugin/creole.pm
+++ b/IkiWiki/Plugin/creole.pm
@@ -5,13 +5,23 @@ package IkiWiki::Plugin::creole;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "creole", call => \&getsetup);

        hook(type => "htmlize", id => "creole", call => \&htmlize);
        hook(type => "htmlize", id => "creole", call => \&htmlize);

-} # }}}
+}

 
 

-sub htmlize (@) { #{{{
+sub getsetup {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1, # format plugin
+                       section => "format",
+               },
+}
+
+sub htmlize (@) {

        my %params=@_;
        my $content = $params{content};
 
        my %params=@_;
        my $content = $params{content};
 


@@ -19,10 +29,10 @@ sub htmlize (@) { #{{{
        return $content if $@;
 
        # don't parse WikiLinks, ikiwiki already does
        return $content if $@;
 
        # don't parse WikiLinks, ikiwiki already does

-       creole_link(sub { return shift });

        creole_customlinks();
        creole_customlinks();

+       creole_custombarelinks();

 
        return creole_parse($content);
 
        return creole_parse($content);

-} # }}}
+}

 
 1
 
 1