web commit by http://natalian.org/

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

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index a344de0674a8345bffd91a61c4cd0b44ee38994a..ca8898679216684da988bfd2fb08cd14dd04ff51 100644 (file)
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -4,29 +4,47 @@ 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";
+
+               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=&$markdown_sub($content);
        $content=Encode::decode_utf8($content);
        $content=Encode::decode_utf8($content);