X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0217eebf4901860dd04cbf22ee0d81b69b1396a0..740c909abbe97151f14768de9476505c1f06badd:/IkiWiki/Plugin/mdwn.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm index cabf44aa5..9158a477b 100644 --- a/IkiWiki/Plugin/mdwn.pm +++ b/IkiWiki/Plugin/mdwn.pm @@ -4,40 +4,183 @@ package IkiWiki::Plugin::mdwn; use warnings; use strict; -use IkiWiki 2.00; +use IkiWiki 3.00; -sub import { #{{{ - hook(type => "htmlize", id => "mdwn", call => \&htmlize); -} # }}} +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); +} -my $markdown_sub; -sub htmlize (@) { #{{{ +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => 1, # format plugin + section => "format", + }, + multimarkdown => { + type => "boolean", + example => 0, + description => "enable multimarkdown features?", + safe => 1, + rebuild => 1, + }, + nodiscount => { + type => "boolean", + example => 0, + description => "disable use of markdown discount?", + 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}; +} + +our $markdown_sub; +sub htmlize (@) { my %params=@_; my $content = $params{content}; if (! defined $markdown_sub) { # Markdown is forked and splintered upstream and can be - # available in a variety of incompatible forms. Support - # them all. + # available in a variety of forms. Support them all. no warnings 'once'; $blosxom::version="is a proper perl module too much to ask?"; use warnings 'all'; - eval q{use Markdown}; - if (! $@) { - $markdown_sub=\&Markdown::Markdown; + if (exists $config{multimarkdown} && $config{multimarkdown}) { + eval q{use Text::MultiMarkdown}; + if ($@) { + debug(gettext("multimarkdown is enabled, but Text::MultiMarkdown is not installed")); + } + else { + $markdown_sub=sub { + my %flags=( use_metadata => 0 ); + + $flags{disable_footnotes}=not $config{mdwn_footnotes}; + + Text::MultiMarkdown::markdown(shift, \%flags); + } + } + } + if (! defined $markdown_sub && + (! 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{
+ if (Text::Markdown::Discount->can('MKD_DLEXTRA')) { + $always_flags |= Text::Markdown::Discount::MKD_DLEXTRA(); + } + elsif ($markdown->("term\n: def\n", 0) !~ m{
} && + $markdown->("term\n: def\n", 0x01000000) =~ m{
}) { + $always_flags |= 0x01000000; + } + + # Allow dashes and underscores in tag names + if (Text::Markdown::Discount->can('MKD_GITHUBTAGS')) { + $always_flags |= Text::Markdown::Discount::MKD_GITHUBTAGS(); + } + elsif ($markdown->('', 0) !~ m{('', 0x08000000) =~ m{can('markdown')) { + $markdown_sub=\&Text::Markdown::markdown; + } + else { + $markdown_sub=\&Text::Markdown::Markdown; + } } else { - do "/usr/bin/markdown" || - error(sprintf(gettext("failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"), $@, $!)); - $markdown_sub=\&Markdown::Markdown; + eval q{use Markdown}; + if (! $@) { + $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, $!)); + $markdown_sub=\&Markdown::Markdown; + } } } + require Encode; } @@ -51,6 +194,6 @@ sub htmlize (@) { #{{{ $content=Encode::decode_utf8($content); return $content; -} # }}} +} 1