X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2b9ce0129bc61177e976caf432af9b4406ab2f3f..58c77a01f79efaa5692fd30231695c6f8775a7d9:/IkiWiki/Plugin/mdwn.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm index 1520b3eec..6c1d2ef3c 100644 --- a/IkiWiki/Plugin/mdwn.pm +++ b/IkiWiki/Plugin/mdwn.pm @@ -7,9 +7,25 @@ use strict; use IkiWiki 2.00; sub import { #{{{ + hook(type => "getsetup", id => "mdwn", call => \&getsetup); hook(type => "htmlize", id => "mdwn", call => \&htmlize); } # }}} +sub getsetup () { #{{{ + return + plugin => { + safe => 1, + rebuild => 1, # format plugin + }, + multimarkdown => { + type => "boolean", + example => 0, + description => "enable multimarkdown features?", + safe => 1, + rebuild => 1, + }, +} #}}} + my $markdown_sub; sub htmlize (@) { #{{{ my %params=@_; @@ -17,32 +33,46 @@ sub htmlize (@) { #{{{ 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")); + } + $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 (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; } - my $oneline = $content !~ /\n/; - # Workaround for perl bug (#376329) $content=Encode::encode_utf8($content); eval {$content=&$markdown_sub($content)}; @@ -52,13 +82,6 @@ sub htmlize (@) { #{{{ } $content=Encode::decode_utf8($content); - if ($oneline) { - # hack to get rid of enclosing junk added by markdown - $content=~s!^
!!; - $content=~s!
$!!; - chomp $content; - } - return $content; } # }}}