From: W. Trevor King <wking@drexel.edu>
Date: Tue, 5 Oct 2010 17:31:30 +0000 (-0400)
Subject: Make it easy to select a Markdown executible.
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=9f8946cfba15f54ac64a614d81e6889ca3e905e2;hp=97b2345f8cb2ee013a5ecee259cd897f210aa9c1

Make it easy to select a Markdown executible.

For example, if you want to use a local version of Markdown to work
around bugs in your system's version.

The latest version of Gruber's Markdown seems to be:
  http://daringfireball.net/projects/downloads/Markdown_1.0.2b8.tbz
Release note:
  http://six.pairlist.net/pipermail/markdown-discuss/2007-May/000615.html
Debian experimental is using this 1.0.2b8 version:
  http://packages.debian.org/search?keywords=markdown

There are many other implementations as well, and most seem to support
the
  /path/to/markdown SOURCE
syntax, printing the marked up XHTML to stdout.  This patch makes it
easy to drop in any executable you wish.
---

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index b892eabee..dc5d8f01a 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -25,9 +25,23 @@ sub getsetup () {
 			safe => 1,
 			rebuild => 1,
 		},
+		markdown_path => {
+			type => "string",
+			example => 0,
+			description => "path to an external markdown binary",
+			safe => 0,
+			rebuild => undef,
+		},
+}
+
+sub checkconfig () {
+	if (! defined $config{markdown_path}) {
+		$config{markdown_path}="/usr/bin/markdown";
+	}
 }
 
 my $markdown_sub;
+my $tempdir;
 sub htmlize (@) {
 	my %params=@_;
 	my $content = $params{content};
@@ -38,13 +52,33 @@ sub htmlize (@) {
 		no warnings 'once';
 		$blosxom::version="is a proper perl module too much to ask?";
 		use warnings 'all';
-
-		if (exists $config{multimarkdown} && $config{multimarkdown}) {
+	
+		if ($config{markdown_path}) {
+                        eval q{use File::Temp};
+                        if ($@) {
+                                debug(gettext("markdown_path is set, but File::Temp is not installed"));
+                        }
+			else {
+				debug("Markdown: $config{markdown_path}");
+				$tempdir=File::Temp::tempdir( CLEANUP => 1 );
+				$markdown_sub=sub {
+					my $content=shift;
+					my $fh;
+					my $filename;
+					($fh, $filename) = File::Temp::tempfile( DIR => $tempdir );
+					print $fh "$content\n";
+					close($fh);
+					$content = `$config{markdown_path} $filename`;
+					return $content;
+				}
+			}
+		} elsif (exists $config{multimarkdown} && $config{multimarkdown}) {
 			eval q{use Text::MultiMarkdown};
 			if ($@) {
 				debug(gettext("multimarkdown is enabled, but Text::MultiMarkdown is not installed"));
 			}
 			else {
+				debug("Markdown: Text::MultiMarkdown::markdown()");
 				$markdown_sub=sub {
 					Text::MultiMarkdown::markdown(shift, {use_metadata => 0});
 				}
@@ -54,21 +88,22 @@ sub htmlize (@) {
 			eval q{use Text::Markdown};
 			if (! $@) {
 				if (Text::Markdown->can('markdown')) {
+					debug("Markdown: Text::Markdown::markdown()");
 					$markdown_sub=\&Text::Markdown::markdown;
 				}
 				else {
+					debug("Markdown: Text::Markdown::Markdown()");
 					$markdown_sub=\&Text::Markdown::Markdown;
 				}
 			}
 			else {
 				eval q{use Markdown};
 				if (! $@) {
+					debug("Markdown: Markdown::Markdown()");
 					$markdown_sub=\&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;
+					error(sprintf(gettext("failed to load Markdown.pm perl module (%s) or $config{markdown_path} (%s)"), $@, $!));
 				}
 			}
 		}