Merge branch 'master' into pedigree

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

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index c871e2a4d326c7080bdb5803eb462491a6cdbf79..11f3f0137627643fe285e0464b59b2e0086b3f88 100644 (file)
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::mdwn;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
        hook(type => "htmlize", id => "mdwn", call => \&htmlize);
 
 sub import { #{{{
        hook(type => "htmlize", id => "mdwn", call => \&htmlize);


@@ -17,35 +17,53 @@ sub htmlize (@) { #{{{
 
        if (! defined $markdown_sub) {
                # Markdown is forked and splintered upstream and can be
 
        if (! defined $markdown_sub) {
                # Markdown is forked and splintered upstream and can be

-               # available in a variety of incompatible forms. Support
-               # them all.
+               # available in a variety of forms. Support them all.

                no warnings 'once';
                $blosxom::version="is a proper perl module too much to ask?";
                use warnings 'all';
 
                no warnings 'once';
                $blosxom::version="is a proper perl module too much to ask?";
                use warnings 'all';
 

-               eval q{use Markdown};
-               if (! $@) {
-                       $markdown_sub=\&Markdown::Markdown;
+               if (exists $config{multimarkdown} && $config{multimarkdown}) {
+                       eval q{use Text::MultiMarkdown};
+                       if ($@) {
+                               error(gettext("multimarkdown is enabled, but Text::MultiMarkdown is not installed"));
+                       }
+                       $markdown_sub=sub {
+                               Text::MultiMarkdown::markdown(shift, {use_metadata => 0});
+                       }

                }
                else {
                        eval q{use Text::Markdown};
                        if (! $@) {
                }
                else {
                        eval q{use Text::Markdown};
                        if (! $@) {

-                               $markdown_sub=\&Text::Markdown::Markdown;
+                               if (Text::Markdown->can('markdown')) {
+                                       $markdown_sub=\&Text::Markdown::markdown;
+                               }
+                               else {
+                                       $markdown_sub=\&Text::Markdown::Markdown;
+                               }

                        }
                        else {
                        }
                        else {

-                               do "/usr/bin/markdown" ||
-                                       error("failed to load Markdown.pm perl module ($@) or /usr/bin/markdown ($!)");
-                               $markdown_sub=\&Markdown::Markdown;
+                               eval q{use Markdown};
+                               if (! $@) {
+                                       $markdown_sub=\&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);
                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;
        $content=Encode::decode_utf8($content);
 
        return $content;