X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/48f9d393393709d8e998a9eb8d4095773ab185a1..815c484193385cd8d6dbd77c53d6a9a9a09fde78:/IkiWiki/Plugin/htmltidy.pm

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index ad405dce5..906c677dc 100644
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -5,7 +5,7 @@
 # It is particularly useful when the html plugin is used.
 #
 # by Faidon Liambotis
-package IkiWiki::Plugin::tidy;
+package IkiWiki::Plugin::htmltidy;
 
 use warnings;
 use strict;
@@ -13,20 +13,38 @@ use IkiWiki;
 use IPC::Open2;
 
 sub import { #{{{
-	IkiWiki::hook(type => "sanitize", id => "tidy", call => \&sanitize);
+	hook(type => "sanitize", id => "tidy", call => \&sanitize);
 } # }}}
 
-sub sanitize ($) { #{{{
-	open2(*IN, *OUT, 'tidy -quiet -xml -indent -utf8') or return shift;
+sub sanitize (@) { #{{{
+	my %params=@_;
+
+	my $tries=10;
+	my $pid;
+	while (1) {
+		eval {
+			$pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no');
+		};
+		last unless $@;
+		$tries--;
+		if ($tries < 1) {
+			debug("failed to run tidy: $@");
+			return $params{content};
+		}
+	}
 	# open2 doesn't respect "use open ':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;
+
+	return $ret;
 } # }}}
 
 1