X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=IkiWiki%2FPlugin%2Fhtmltidy.pm;h=185d01dd68c54a3db899ee299a7a5552ba62a519;hb=bd48ff734a0e01a6f2c097932f728ccb680702a2;hp=fc0d3b1d68067593851f3da8203ccdfcd87e344e;hpb=4e70f2f0d20bbfc800aafb1b78cc6a41f4617d32;p=ikiwiki.git

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index fc0d3b1d6..185d01dd6 100644
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -23,6 +23,18 @@ 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 (@) {
@@ -31,7 +43,7 @@ sub sanitize (@) {
 	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');
@@ -47,8 +59,7 @@ sub sanitize (@) {
 
 	$SIG{PIPE}="DEFAULT";
 	if ($sigpipe || ! defined $ret) {
-		print STDERR gettext("warning: tidy failed")."\n";
-		return "";
+		return gettext("htmltidy failed to parse this html");
 	}
 
 	return $ret;