X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/acaee3d0bce78b6e6d8989821150d28a87026ff0..9b474c2d488839ceec3637c3089eede45a715948:/IkiWiki/Plugin/htmltidy.pm

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index fa08e4ef5..9ba5e9592 100644
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -9,24 +9,46 @@ package IkiWiki::Plugin::htmltidy;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 use IPC::Open2;
 
 sub import { #{{{
-	IkiWiki::hook(type => "sanitize", id => "tidy", call => \&sanitize);
+	hook(type => "getsetup", id => "tidy", call => \&getsetup);
+	hook(type => "sanitize", id => "tidy", call => \&sanitize);
 } # }}}
 
-sub sanitize ($) { #{{{
-	open2(*IN, *OUT, 'tidy -quiet -xml -indent -utf8') or return shift;
+sub getsetup () { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+} #}}}
+
+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 2>/dev/null');
+
 	# open2 doesn't respect "use open ':utf8'"
-	binmode (IN, ':utf8'); 
-	binmode (OUT, ':utf8'); 
+	binmode (IN, ':utf8');
+	binmode (OUT, ':utf8');
 	
-	print OUT shift;
+	print OUT $params{content};
 	close OUT;
 
 	local $/ = undef;
-	return <IN>;
+	my $ret=<IN>;
+	close IN;
+	waitpid $pid, 0;
+
+	$SIG{PIPE}="DEFAULT";
+	return "" if $sigpipe || ! defined $ret;
+
+	return $ret;
 } # }}}
 
 1