X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/48f9d393393709d8e998a9eb8d4095773ab185a1..24359d670d8572630f5a447b8f46e955c1fb3fa4:/IkiWiki/Plugin/htmltidy.pm diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm index ad405dce5..eb8f9d3d3 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; @@ -17,11 +17,22 @@ sub import { #{{{ } # }}} sub sanitize ($) { #{{{ - open2(*IN, *OUT, 'tidy -quiet -xml -indent -utf8') or return shift; + 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'); - + print OUT shift; close OUT;