X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/4895955ceaf264c5f17b10c4009e1ab1afcc55ee..89673afc6b75bdbf1f0f3d98841c6397a89f99c4:/IkiWiki/Plugin/mdwn.pm

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 2274fea72..c087f2b41 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -7,35 +7,44 @@ use strict;
 use IkiWiki;
 
 sub import { #{{{
-	IkiWiki::hook(type => "htmlize", id => "mdwn", call => \&htmlize);
+	hook(type => "htmlize", id => "mdwn", call => \&htmlize);
 } # }}}
 
-my $markdown_loaded=0;
+my $markdown_sub;
 sub htmlize (@) { #{{{
 	my %params=@_;
 	my $content = $params{content};
 
-	if (! $markdown_loaded) {
-		# Note: This hack to make markdown run as a proper perl
-		# module. A proper perl module is available in Debian
-		# for markdown, but not upstream yet.
+	if (! defined $markdown_sub) {
+		# Markdown is forked and splintered upstream and can be
+		# available in a variety of incompatible 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 ($@) {
-			do "/usr/bin/markdown" ||
-				IkiWiki::error("failed to load Markdown.pm perl module ($@) or /usr/bin/markdown ($!)");
+		if (! $@) {
+			$markdown_sub=\&Markdown::Markdown;
+		}
+		else {
+			eval q{use Text::Markdown};
+			if (! $@) {
+				$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;
+			}
 		}
-		$markdown_loaded=1;
 		require Encode;
 	}
 	
 	# Workaround for perl bug (#376329)
 	$content=Encode::encode_utf8($content);
 	$content=Encode::encode_utf8($content);
-	$content=Markdown::Markdown($content);
+	$content=&$markdown_sub($content);
 	$content=Encode::decode_utf8($content);
 	$content=Encode::decode_utf8($content);