diff options
author | Simon McVittie <smcv@debian.org> | 2017-05-14 17:34:12 +0100 |
---|---|---|
committer | Simon McVittie <smcv@debian.org> | 2017-05-14 17:34:12 +0100 |
commit | 5d65c1ad2c1d4a39dcb8c36d6ae6e4d458ed829f (patch) | |
tree | 55081c290ab4b3cde5dfd4a643a1cae418bb540c | |
parent | 60cb2ac458dc8dea3b6a72abe52dcb1cd05617a4 (diff) | |
download | ikiwiki-5d65c1ad2c1d4a39dcb8c36d6ae6e4d458ed829f.tar ikiwiki-5d65c1ad2c1d4a39dcb8c36d6ae6e4d458ed829f.tar.gz |
mdwn: Make flags passed to libdiscount explicit
The Perl binding defaults to MKD_NOHEADER|MKD_NOPANTS anyway, but
making them explicit means we can use other flags of our choice,
and makes it easier to justify why those flags are appropriate.
-rw-r--r-- | IkiWiki/Plugin/mdwn.pm | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm index daf9d592e..436f2461d 100644 --- a/IkiWiki/Plugin/mdwn.pm +++ b/IkiWiki/Plugin/mdwn.pm @@ -64,14 +64,26 @@ sub htmlize (@) { if (! $@) { $markdown_sub=sub { my $t=shift; + # Workaround for discount binding bug # https://rt.cpan.org/Ticket/Display.html?id=73657 return "" if $t=~/^\s*$/; + + my $flags=0; + + # Disable Pandoc-style % Title, % Author, % Date + # Use the meta plugin instead + $flags |= Text::Markdown::Discount::MKD_NOHEADER(); + + # Disable Unicodification of quote marks, em dashes... + # Use the typography plugin instead + $flags |= Text::Markdown::Discount::MKD_NOPANTS(); + # 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); + my $r=Text::Markdown::Discount::markdown($t, $flags); $r=~s/<elyts/<style/ig; return $r; } |