* Support htmlize plugins and make mdwn one such plugin, which is enabled by

  default (of course!). Based on a patch by Faidon Liambotis.

2 files changed, 38 insertions, 16 deletions

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
new file mode 100644
index 000000000..a344de067
--- /dev/null
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -0,0 +1,36 @@
+#!/usr/bin/perl
+# Markdown markup language
+package IkiWiki::Plugin::mdwn;
+
+use warnings;
+use strict;
+use IkiWiki;
+
+sub import { #{{{
+	IkiWiki::hook(type => "htmlize", id => "mdwn", call => \&htmlize);
+} # }}}
+
+sub htmlize ($) { #{{{
+	my $content = shift;
+
+	if (! $INC{"/usr/bin/markdown"}) {
+		# Note: a proper perl module is available in Debian
+		# for markdown, but not upstream yet.
+		no warnings 'once';
+		$blosxom::version="is a proper perl module too much to ask?";
+		use warnings 'all';
+		do "/usr/bin/markdown";
+		require Encode;
+	}
+	
+	# Workaround for perl bug (#376329)
+	$content=Encode::encode_utf8($content);
+	$content=Encode::encode_utf8($content);
+	$content=Markdown::Markdown($content);
+	$content=Encode::decode_utf8($content);
+	$content=Encode::decode_utf8($content);
+
+	return $content;
+} # }}}
+
+1
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index ac8f03937..8a4fb89eb 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -25,22 +25,8 @@ sub htmlize ($$) { #{{{
 	my $type=shift;
 	my $content=shift;
 	
-	if (! $INC{"/usr/bin/markdown"}) {
-		# Note: a proper perl module is available in Debian
-		# for markdown, but not upstream yet.
-		no warnings 'once';
-		$blosxom::version="is a proper perl module too much to ask?";
-		use warnings 'all';
-		do "/usr/bin/markdown";
-	}
-	
-	if ($type eq '.mdwn') {
-		# Workaround for perl bug (#376329)
-		$content=Encode::encode_utf8($content);
-		$content=Encode::encode_utf8($content);
-		$content=Markdown::Markdown($content);
-		$content=Encode::decode_utf8($content);
-		$content=Encode::decode_utf8($content);
+	if (exists $hooks{htmlize}{$type}) {
+		$content=$hooks{htmlize}{$type}{call}->($content);
 	}
 	else {
 		error("htmlization of $type not supported");