X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9dce803faf4dac9ee9249a108e9054e296e1f741..08fd2e0806076803a354cd2ce167ba6f875358d5:/IkiWiki/Plugin/mdwn.pm?ds=inline diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm index 0dc0cc336..014e78eea 100644 --- a/IkiWiki/Plugin/mdwn.pm +++ b/IkiWiki/Plugin/mdwn.pm @@ -25,6 +25,13 @@ sub getsetup () { safe => 1, rebuild => 1, }, + nodiscount => { + type => "boolean", + example => 0, + description => "disable use of markdown discount?", + safe => 1, + rebuild => 1, + }, } my $markdown_sub; @@ -50,10 +57,23 @@ sub htmlize (@) { } } } - if (! defined $markdown_sub) { + if (! defined $markdown_sub && + (! exists $config{nodiscount} || ! $config{nodiscount})) { eval q{use Text::Markdown::Discount}; if (! $@) { - $markdown_sub=\&Text::Markdown::Discount::markdown; + $markdown_sub=sub { + my $t=shift; + # Workaround for discount binding bug + # https://rt.cpan.org/Ticket/Display.html?id=73657 + return "" if $t=~/^\s*$/; + # Workaround for discount's eliding + # of <style> blocks. + # https://rt.cpan.org/Ticket/Display.html?id=74016 + $t=~s/<style/<elyts/ig; + my $r=Text::Markdown::Discount::markdown($t); + $r=~s/<elyts/<style/ig; + return $r; + } } } if (! defined $markdown_sub) { @@ -72,8 +92,9 @@ sub htmlize (@) { $markdown_sub=\&Markdown::Markdown; } else { + my $error = $@; do "/usr/bin/markdown" || - error(sprintf(gettext("failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"), $@, $!)); + error(sprintf(gettext("failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"), $error, $!)); $markdown_sub=\&Markdown::Markdown; } }