X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/a63929f6cc7778ffc4ba57d784cdf2206ec650c7..1d6eb13e2b3b7cf60f26ae4c5b631b0e65e34c5f:/IkiWiki/Plugin/mdwn.pm

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 4ddf097ba..430194bff 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -16,7 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
-			section => "core",
+			section => "format",
 		},
 		multimarkdown => {
 			type => "boolean",
@@ -25,6 +25,13 @@ sub getsetup () {
 			safe => 1,
 			rebuild => 1,
 		},
+		nodiscount => {
+			type => "boolean",
+			example => 0,
+			description => "disable use of markdown discount?",
+			safe => 1,
+			rebuild => 1,
+		},
 }
 
 my $markdown_sub;
@@ -50,6 +57,25 @@ sub htmlize (@) {
 				}
 			}
 		}
+		if (! defined $markdown_sub &&
+		    (! exists $config{nodiscount} || ! $config{nodiscount})) {
+			eval q{use Text::Markdown::Discount};
+			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*$/;
+					# 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);
+					$r=~s/<elyts/<style/ig;
+					return $r;
+				}
+			}
+		}
 		if (! defined $markdown_sub) {
 			eval q{use Text::Markdown};
 			if (! $@) {