mdwn: Restore historical behaviour

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

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index aeb3a3fd7f6aabf72a01248e45036da01257a1d5..66116ae014f7a94cd8bda230514258bbb75acf42 100644 (file)
--- 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,26 @@ sub getsetup () {
                        safe => 1,
                        rebuild => 1,
                },
+               mdwn_footnotes => {
+                       type => "boolean",
+                       example => 1,
+                       description => "enable footnotes in Markdown (where supported)?",
+                       safe => 1,
+                       rebuild => 1,
+               },
+               mdwn_alpha_lists => {
+                       type => "boolean",
+                       example => 0,
+                       description => "interpret line like 'A. First item' as ordered list when using Discount?",
+                       advanced => 1,
+                       safe => 1,
+                       rebuild => 1,
+               },
+}
+
+sub checkconfig () {
+       $config{mdwn_footnotes} = 1 unless defined $config{mdwn_footnotes};
+       $config{mdwn_alpha_lists} = 0 unless defined $config{mdwn_alpha_lists};
 }
 
 my $markdown_sub;
@@ -54,7 +75,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 +106,14 @@ sub htmlize (@) {
                                        # Use the typography plugin instead
                                        $flags |= Text::Markdown::Discount::MKD_NOPANTS();
 
+                                       if ($config{mdwn_footnotes}) {
+                                               $flags |= Text::Markdown::Discount::MKD_EXTRA_FOOTNOTE();
+                                       }
+
+                                       unless ($config{mdwn_alpha_lists}) {
+                                               $flags |= Text::Markdown::Discount::MKD_NOALPHALIST();
+                                       }
+
                                        # Workaround for discount's eliding
                                        # of <style> blocks.
                                        # https://rt.cpan.org/Ticket/Display.html?id=74016
@@ -90,6 +125,31 @@ sub htmlize (@) {
                                                $flags |= 0x00400000;
                                        }
 
+                                       # Enable fenced code blocks in libmarkdown >= 2.2.0
+                                       # https://bugs.debian.org/888055
+                                       if (Text::Markdown::Discount->can("MKD_FENCEDCODE")) {
+                                               $flags |= Text::Markdown::Discount::MKD_FENCEDCODE();
+                                       }
+                                       else {
+                                               $flags |= 0x02000000;
+                                       }
+
+                                       # PHP Markdown Extra-style term\n: definition -> <dl>
+                                       if (Text::Markdown::Discount->can("MKD_DLEXTRA")) {
+                                               $flags |= Text::Markdown::Discount::MKD_DLEXTRA();
+                                       }
+                                       else {
+                                               $flags |= 0x01000000;
+                                       }
+
+                                       # Allow dashes and underscores in tag names
+                                       if (Text::Markdown::Discount->can("MKD_GITHUBTAGS")) {
+                                               $flags |= Text::Markdown::Discount::MKD_GITHUBTAGS();
+                                       }
+                                       else {
+                                               $flags |= 0x08000000;
+                                       }
+
                                        return Text::Markdown::Discount::markdown($t, $flags);
                                }
                        }