From 4db4e589e4c73f076b666a77b86743695454a3ce Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 14 May 2017 18:16:53 +0100 Subject: mdwn: Enable footnotes by default when using Discount A new mdwn_footnotes option can be used to disable footnotes in MultiMarkdown and Discount. --- IkiWiki/Plugin/mdwn.pm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'IkiWiki') diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm index aeb3a3fd7..e142fec46 100644 --- a/IkiWiki/Plugin/mdwn.pm +++ b/IkiWiki/Plugin/mdwn.pm @@ -7,6 +7,7 @@ use strict; use IkiWiki 3.00; sub import { + hook(type => "checkconfig", id => "mdwn", call => \&checkconfig); hook(type => "getsetup", id => "mdwn", call => \&getsetup); hook(type => "htmlize", id => "mdwn", call => \&htmlize, longname => "Markdown"); hook(type => "htmlize", id => "md", call => \&htmlize, longname => "Markdown (popular file extension)", nocreate => 1); @@ -33,6 +34,17 @@ sub getsetup () { safe => 1, rebuild => 1, }, + mdwn_footnotes => { + type => "boolean", + example => 1, + description => "enable footnotes in Markdown (where supported)?", + safe => 1, + rebuild => 1, + }, +} + +sub checkconfig () { + $config{mdwn_footnotes} = 1 unless defined $config{mdwn_footnotes}; } my $markdown_sub; @@ -54,7 +66,13 @@ sub htmlize (@) { } else { $markdown_sub=sub { - Text::MultiMarkdown::markdown(shift, {use_metadata => 0}); + my %flags=( use_metadata => 0 ); + + if ($config{mdwn_footnotes}) { + $flags{disable_footnotes}=1; + } + + Text::MultiMarkdown::markdown(shift, \%flags); } } } @@ -79,6 +97,10 @@ sub htmlize (@) { # Use the typography plugin instead $flags |= Text::Markdown::Discount::MKD_NOPANTS(); + if ($config{mdwn_footnotes}) { + $flags |= Text::Markdown::Discount::MKD_EXTRA_FOOTNOTE(); + } + # Workaround for discount's eliding # of