X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=IkiWiki%2FPlugin%2Fhtmltidy.pm;h=da77e60f1cb6198278e87897522fd74b553f95e9;hb=1ce0d17dc758c4025d2e2eea79a691a8dbb90414;hp=6f3379ef457bddb7387c8485427ec88d51f5b0c5;hpb=70dc0355bd547158ae29381f77eb6d809e0fefaa;p=ikiwiki.git

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 6f3379ef4..da77e60f1 100644
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -15,6 +15,7 @@ use IPC::Open2;
 sub import {
 	hook(type => "getsetup", id => "tidy", call => \&getsetup);
 	hook(type => "sanitize", id => "tidy", call => \&sanitize);
+	hook(type => "checkconfig", id => "tidy", call => \&checkconfig);
 }
 
 sub getsetup () {
@@ -23,15 +24,29 @@ sub getsetup () {
 			safe => 1,
 			rebuild => undef,
 		},
+		htmltidy => {
+			type => "string",
+			description => "tidy command line",
+			safe => 0, # path
+			rebuild => undef,
+		},
+}
+
+sub checkconfig () {
+	if (! defined $config{htmltidy}) {
+		$config{htmltidy}="tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no --markup yes";
+	}
 }
 
 sub sanitize (@) {
 	my %params=@_;
 
+	return $params{content} unless defined $config{htmltidy};
+
 	my $pid;
 	my $sigpipe=0;
 	$SIG{PIPE}=sub { $sigpipe=1 };
-	$pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no --markup yes 2>/dev/null');
+	$pid=open2(*IN, *OUT, "$config{htmltidy} 2>/dev/null");
 
 	# open2 doesn't respect "use open ':utf8'"
 	binmode (IN, ':utf8');
@@ -46,7 +61,9 @@ sub sanitize (@) {
 	waitpid $pid, 0;
 
 	$SIG{PIPE}="DEFAULT";
-	return "" if $sigpipe || ! defined $ret;
+	if ($sigpipe || ! defined $ret) {
+		return gettext("htmltidy failed to parse this html");
+	}
 
 	return $ret;
 }