Merge commit 'remotes/jmtd/friendly_markup_names'

[ikiwiki.git] / IkiWiki / Plugin / textile.pm

diff --git a/IkiWiki/Plugin/textile.pm b/IkiWiki/Plugin/textile.pm
index 5de71bf6eb11aa682dde75eaac98970b4174c9f9..8cc5a7951d3575e67b221ca312993fff158bae20 100644 (file)
--- a/IkiWiki/Plugin/textile.pm
+++ b/IkiWiki/Plugin/textile.pm
@@ -6,19 +6,29 @@ package IkiWiki::Plugin::textile;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
+use Encode;
 
-sub import { #{{{
-       hook(type => "htmlize", id => "txtl", call => \&htmlize);
-} # }}}
+sub import {
+       hook(type => "getsetup", id => "textile", call => \&getsetup);
+       hook(type => "htmlize", id => "txtl", call => \&htmlize, longname => "Textile");
+}
 
-sub htmlize (@) { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1, # format plugin
+               },
+}
+
+sub htmlize (@) {
        my %params=@_;
-       my $content = $params{content};
+       my $content = decode_utf8(encode_utf8($params{content}));
 
        eval q{use Text::Textile};
        return $content if $@;
        return Text::Textile::textile($content);
-} # }}}
+}
 
 1