X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/119e3e209dc2be25920d89e470a1e8d7b5d98f7b..ceffae8af1c797a715ad8bc375ee3f233703b03d:/IkiWiki/Plugin/mdwn.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm index c1f978ad3..254ab51d0 100644 --- a/IkiWiki/Plugin/mdwn.pm +++ b/IkiWiki/Plugin/mdwn.pm @@ -4,30 +4,50 @@ package IkiWiki::Plugin::mdwn; use warnings; use strict; -use IkiWiki; +use IkiWiki 2.00; sub import { #{{{ - IkiWiki::hook(type => "htmlize", id => "mdwn", call => \&htmlize); + hook(type => "htmlize", id => "mdwn", call => \&htmlize); } # }}} -sub htmlize ($) { #{{{ - my $content = shift; +my $markdown_sub; +sub htmlize (@) { #{{{ + my %params=@_; + my $content = $params{content}; - if (! $INC{"/usr/bin/markdown"}) { - # Note: a proper perl module is available in Debian - # for markdown, but not upstream yet. + if (! defined $markdown_sub) { + # Markdown is forked and splintered upstream and can be + # available in a variety of incompatible forms. Support + # them all. no warnings 'once'; $blosxom::version="is a proper perl module too much to ask?"; use warnings 'all'; - do "/usr/bin/markdown" || IkiWiki::error("failed to load /usr/bin/markdown: $!"); + + eval q{use Markdown}; + if (! $@) { + $markdown_sub=\&Markdown::Markdown; + } + else { + eval q{use Text::Markdown}; + if (! $@) { + $markdown_sub=\&Text::Markdown::Markdown; + } + else { + do "/usr/bin/markdown" || + error(sprintf(gettext("failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"), $@, $!)); + $markdown_sub=\&Markdown::Markdown; + } + } require Encode; } # Workaround for perl bug (#376329) $content=Encode::encode_utf8($content); - $content=Encode::encode_utf8($content); - $content=Markdown::Markdown($content); - $content=Encode::decode_utf8($content); + eval {$content=&$markdown_sub($content)}; + if ($@) { + eval {$content=&$markdown_sub($content)}; + print STDERR $@ if $@; + } $content=Encode::decode_utf8($content); return $content;