* Add toc (table of contents) plugin.

[ikiwiki.git] / IkiWiki / Plugin / htmltidy.pm

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 6c1fba98e1b98e913ead06258a74ac21050d34de..eb8f9d3d37efb4037d53ee7a23bcae168a5b8826 100644 (file)
--- 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');