X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fba4a198b58bdfb33590bda5eaf89bf96ed60099..3316f9cc737c091ff79270f75fc30dd349616b12:/IkiWiki/Plugin/mdwn.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 11f3f0137..0e134c822 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -4,14 +4,30 @@ package IkiWiki::Plugin::mdwn;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
-sub import { #{{{
+sub import {
+	hook(type => "getsetup", id => "mdwn", call => \&getsetup);
 	hook(type => "htmlize", id => "mdwn", call => \&htmlize);
-} # }}}
+}
+
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 1, # format plugin
+		},
+		multimarkdown => {
+			type => "boolean",
+			example => 0,
+			description => "enable multimarkdown features?",
+			safe => 1,
+			rebuild => 1,
+		},
+}
 
 my $markdown_sub;
-sub htmlize (@) { #{{{
+sub htmlize (@) {
 	my %params=@_;
 	my $content = $params{content};
 
@@ -25,13 +41,13 @@ sub htmlize (@) { #{{{
 		if (exists $config{multimarkdown} && $config{multimarkdown}) {
 			eval q{use Text::MultiMarkdown};
 			if ($@) {
-				error(gettext("multimarkdown is enabled, but Text::MultiMarkdown is not installed"));
+				debug(gettext("multimarkdown is enabled, but Text::MultiMarkdown is not installed"));
 			}
 			$markdown_sub=sub {
 				Text::MultiMarkdown::markdown(shift, {use_metadata => 0});
 			}
 		}
-		else {
+		if (! defined $markdown_sub) {
 			eval q{use Text::Markdown};
 			if (! $@) {
 				if (Text::Markdown->can('markdown')) {
@@ -67,6 +83,6 @@ sub htmlize (@) { #{{{
 	$content=Encode::decode_utf8($content);
 
 	return $content;
-} # }}}
+}
 
 1