X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4db4e589e4c73f076b666a77b86743695454a3ce..d09bf0754f650399b7fc7227106f761ddbd24f0d:/IkiWiki/Plugin/mdwn.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm index e142fec46..9158a477b 100644 --- a/IkiWiki/Plugin/mdwn.pm +++ b/IkiWiki/Plugin/mdwn.pm @@ -41,13 +41,22 @@ sub getsetup () { 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; +our $markdown_sub; sub htmlize (@) { my %params=@_; my $content = $params{content}; @@ -68,9 +77,7 @@ sub htmlize (@) { $markdown_sub=sub { my %flags=( use_metadata => 0 ); - if ($config{mdwn_footnotes}) { - $flags{disable_footnotes}=1; - } + $flags{disable_footnotes}=not $config{mdwn_footnotes}; Text::MultiMarkdown::markdown(shift, \%flags); } @@ -80,6 +87,55 @@ sub htmlize (@) { (! exists $config{nodiscount} || ! $config{nodiscount})) { eval q{use Text::Markdown::Discount}; if (! $@) { + my $markdown = \&Text::Markdown::Discount::markdown; + my $always_flags = 0; + + # Disable Pandoc-style % Title, % Author, % Date + # Use the meta plugin instead + $always_flags |= Text::Markdown::Discount::MKD_NOHEADER(); + + # Disable Unicodification of quote marks, em dashes... + # Use the typography plugin instead + $always_flags |= Text::Markdown::Discount::MKD_NOPANTS(); + + # Workaround for discount's eliding of ', 0) !~ '', 0x00400000) =~ m{}) { + $always_flags |= 0x00400000; + } + + # Enable fenced code blocks in libmarkdown >= 2.2.0 + # https://bugs.debian.org/888055 + if (Text::Markdown::Discount->can('MKD_FENCEDCODE')) { + $always_flags |= Text::Markdown::Discount::MKD_FENCEDCODE(); + } + elsif ($markdown->("~~~\nx\n~~~", 0) !~ m{
("~~~\nx\n~~~", 0x02000000) =~ m{