X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/903213e63fd6c409046f66e73881aba33c3926de..c321f5406b29e29b6ff61ab9e291a24d68e9d824:/IkiWiki/Plugin/htmltidy.pm?ds=inline

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index d9aaba4ca..185d01dd6 100644
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -9,33 +9,45 @@ 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);
-} # }}}
+}
 
-sub getsetup () { #{{{
+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 (@) { #{{{
+sub sanitize (@) {
 	my %params=@_;
 
 	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');
-	
+	$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;
@@ -46,9 +58,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