mdwn: Added nodiscount setting, which can be used to avoid using the markdown discoun...

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 338468e23b8bb7d0353424c2b849b153b1d75ee4..3c3fc9579fc7fa78959fad3e4ddf7b3bf67ce003 100644 (file)
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -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,7 +57,8 @@ sub htmlize (@) {
                                }
                        }
                }
-               if (! defined $markdown_sub) {
+               if (! defined $markdown_sub &&
+                   exists $config{nodiscount} && ! $config{nodiscount}) {
                        eval q{use Text::Markdown::Discount};
                        if (! $@) {
                                $markdown_sub=sub {

diff --git a/debian/changelog b/debian/changelog
index 1eab184f53c922fcd979af38970bb4bbf1cc82cd..d014abd50e0c4a6cf18dcf8d9fe3c998e0b08b9d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20120116) UNRELEASED; urgency=low
+
+  * mdwn: Added nodiscount setting, which can be used to avoid using the
+    markdown discount engine, when maximum compatability is needed.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 16 Jan 2012 13:41:14 -0400
+
 ikiwiki (3.20120115) unstable; urgency=low
 
   * Make backlink(.) work. Thanks, Giuseppe Bilotta.