X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0f22d66c965d7f2a3e4698de7ddf992efebf6c42..e82c6b1908b21b5e4246767d6a87fe46245e5e29:/IkiWiki/Plugin/wikitext.pm diff --git a/IkiWiki/Plugin/wikitext.pm b/IkiWiki/Plugin/wikitext.pm index 310b86724..c47ccb7b1 100644 --- a/IkiWiki/Plugin/wikitext.pm +++ b/IkiWiki/Plugin/wikitext.pm @@ -4,26 +4,28 @@ package IkiWiki::Plugin::wikitext; use warnings; use strict; -use Text::WikiFormat; +use IkiWiki 2.00; sub import { #{{{ - IkiWiki::hook(type => "filter", id => "wiki", call => \&filter); - IkiWiki::hook(type => "htmlize", id => "wiki", call => \&htmlize); + hook(type => "getsetup", id => "wiki", call => \&getsetup); + hook(type => "htmlize", id => "wiki", call => \&htmlize); } # }}} -sub filter (@) { #{{{ - my %params=@_; - - # Make CamelCase links work by promoting them to fullfledged - # WikiLinks. This regexp is based on the one in Text::WikiFormat. - $params{content}=~s#(?=])\b((?:[A-Z][a-z0-9]\w*){2,})#[[$1]]#g; - - return $params{content}; +sub getsetup () { #{{{ + return + plugin => { + safe => 0, # format plugin + rebuild => undef, + }, } #}}} -sub htmlize ($) { #{{{ - my $content = shift; +sub htmlize (@) { #{{{ + my %params=@_; + my $content = $params{content}; + + eval q{use Text::WikiFormat}; + return $content if $@; return Text::WikiFormat::format($content, undef, { implicit_links => 0 }); } # }}}