X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/0f22d66c965d7f2a3e4698de7ddf992efebf6c42..5608aa078e5a11ff6fbe1adda65a209017b0b630:/IkiWiki/Plugin/wikitext.pm diff --git a/IkiWiki/Plugin/wikitext.pm b/IkiWiki/Plugin/wikitext.pm index 310b86724..586be0874 100644 --- a/IkiWiki/Plugin/wikitext.pm +++ b/IkiWiki/Plugin/wikitext.pm @@ -4,26 +4,18 @@ package IkiWiki::Plugin::wikitext; use warnings; use strict; -use Text::WikiFormat; +use IkiWiki; sub import { #{{{ - IkiWiki::hook(type => "filter", id => "wiki", call => \&filter); - IkiWiki::hook(type => "htmlize", id => "wiki", call => \&htmlize); + hook(type => "htmlize", id => "wiki", call => \&htmlize); } # }}} -sub filter (@) { #{{{ +sub htmlize (@) { #{{{ my %params=@_; + my $content = $params{content}; - # 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 htmlize ($) { #{{{ - my $content = shift; - + eval q{use Text::WikiFormat}; + return $content if $@; return Text::WikiFormat::format($content, undef, { implicit_links => 0 }); } # }}}