Merge branch 'master' into sipb

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

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index ca8898679216684da988bfd2fb08cd14dd04ff51..68765c6b8c0c71fb4a1d75992a51290522134d90 100644 (file)
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -4,51 +4,88 @@ package IkiWiki::Plugin::mdwn;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
-sub import { #{{{
-       hook(type => "htmlize", id => "mdwn", call => \&htmlize);
-} # }}}
+sub import {
+       hook(type => "getsetup", id => "mdwn", call => \&getsetup);
+       hook(type => "htmlize", id => "mdwn", call => \&htmlize, longname => "Markdown");
+}
+
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1, # format plugin
+                       section => "format",
+               },
+               multimarkdown => {
+                       type => "boolean",
+                       example => 0,
+                       description => "enable multimarkdown features?",
+                       safe => 1,
+                       rebuild => 1,
+               },
+}
 
 my $markdown_sub;
-sub htmlize (@) { #{{{
+sub htmlize (@) {
        my %params=@_;
        my $content = $params{content};
 
        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';
 
-               eval q{use Markdown};
-               if (! $@) {
-                       $markdown_sub=\&Markdown::Markdown;
+               if (exists $config{multimarkdown} && $config{multimarkdown}) {
+                       eval q{use Text::MultiMarkdown};
+                       if ($@) {
+                               debug(gettext("multimarkdown is enabled, but Text::MultiMarkdown is not installed"));
+                       }
+                       else {
+                               $markdown_sub=sub {
+                                       Text::MultiMarkdown::markdown(shift, {use_metadata => 0});
+                               }
+                       }
                }
-               else {
+               if (! defined $markdown_sub) {
                        eval q{use Text::Markdown};
-                       if (! $@) {
-                               $markdown_sub=\&Text::Markdown::Markdown;
+                       if (1) {#! $@) {  # Text::Markdown throws this but works.  Shrug.
+                               if (Text::Markdown->can('markdown')) {
+                                       $markdown_sub=\&Text::Markdown::markdown;
+                               }
+                               else {
+                                       $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;
+                               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);
-       $content=Encode::encode_utf8($content);
-       $content=&$markdown_sub($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;
-} # }}}
+}
 
 1