* aggregate: Only save state if it was already loaded. This didn't used to

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

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 0fc077f5ec1cc1a30eaffba1ce8d323cccf160cf..254ab51d03b078afbbeed1727fdb56b18a6c1a1c 100644 (file)
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -4,42 +4,50 @@ 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);
 } # }}}
 

-my $markdown_loaded=0;
+my $markdown_sub;

 sub htmlize (@) { #{{{
        my %params=@_;
        my $content = $params{content};
 
 sub htmlize (@) { #{{{
        my %params=@_;
        my $content = $params{content};
 

-       if (! $markdown_loaded) {
-               # Note: This hack to make markdown run as a proper perl
-               # module. 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';
 
                eval q{use Markdown};
                no warnings 'once';
                $blosxom::version="is a proper perl module too much to ask?";
                use warnings 'all';
 
                eval q{use Markdown};

-               if ($@) {
+               if (! $@) {
+                       $markdown_sub=\&Markdown::Markdown;
+               }
+               else {

                        eval q{use Text::Markdown};
                        eval q{use Text::Markdown};

-                       if ($@) {
+                       if (! $@) {
+                               $markdown_sub=\&Text::Markdown::Markdown;
+                       }
+                       else {

                                do "/usr/bin/markdown" ||
                                do "/usr/bin/markdown" ||

-                                       error("failed to load Markdown.pm perl module ($@) or /usr/bin/markdown ($!)");
+                                       error(sprintf(gettext("failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"), $@, $!));
+                               $markdown_sub=\&Markdown::Markdown;

                        }
                }
                        }
                }

-               $markdown_loaded=1;

                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;