X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c1e4bed9d6c57c6c8fd08712ba20f303980b1e69..8d4342183b1c3a96797def6fff96feebacb90db6:/IkiWiki/Plugin/htmltidy.pm

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 19271b136..da77e60f1 100644
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -9,24 +9,48 @@ package IkiWiki::Plugin::htmltidy;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use IPC::Open2;
 
-sub import { #{{{
+sub import {
+	hook(type => "getsetup", id => "tidy", call => \&getsetup);
 	hook(type => "sanitize", id => "tidy", call => \&sanitize);
-} # }}}
+	hook(type => "checkconfig", id => "tidy", call => \&checkconfig);
+}
 
-sub sanitize (@) { #{{{
+sub getsetup () {
+	return
+		plugin => {
+			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');
-	
+	$pid=open2(*IN, *OUT, "$config{htmltidy} 2>/dev/null");
+
 	# open2 doesn't respect "use open ':utf8'"
 	binmode (IN, ':utf8');
-	binmode (OUT, ':utf8'); 
+	binmode (OUT, ':utf8');
 	
 	print OUT $params{content};
 	close OUT;
@@ -37,9 +61,11 @@ sub sanitize (@) { #{{{
 	waitpid $pid, 0;
 
 	$SIG{PIPE}="DEFAULT";
-	return $params{content} if $sigpipe;
+	if ($sigpipe || ! defined $ret) {
+		return gettext("htmltidy failed to parse this html");
+	}
 
 	return $ret;
-} # }}}
+}
 
 1