X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/0708bb8aecaa6f4edcb60d84ed6555d61f83a2bc..132e41500f54d5e5d92ebf0a53349511e5ade6c3:/IkiWiki/Plugin/htmltidy.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 6c1fba98e..eb8f9d3d3 100644
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -13,11 +13,22 @@ use IkiWiki;
 use IPC::Open2;
 
 sub import { #{{{
-	IkiWiki::hook(type => "format", id => "tidy", call => \&format);
+	IkiWiki::hook(type => "sanitize", id => "tidy", call => \&sanitize);
 } # }}}
 
-sub format ($) { #{{{
-	open2(*IN, *OUT, 'tidy -quiet -asxhtml -indent -utf8 --show-warnings no') or return shift;
+sub sanitize ($) { #{{{
+	my $tries=10;
+	while (1) {
+		eval {
+			open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no');
+		};
+		last unless $@;
+		$tries--;
+		if ($tries < 1) {
+			IkiWiki::debug("failed to run tidy: $@");
+			return shift;
+		}
+	}
 	# open2 doesn't respect "use open ':utf8'"
 	binmode (IN, ':utf8'); 
 	binmode (OUT, ':utf8');