* Move tidy back to sanitize hook, found out how to only show body.

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 94263e558284e6c18863799cb83d5a78ba599ca4..5a6a494ed418331c4e07a57864a7df15f45e0d71 100644 (file)
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -13,11 +13,11 @@ 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 --tidy-mark no') or return shift;
+sub sanitize ($) { #{{{
+       open2(*IN, *OUT, 'tidy -quiet -asxhtml -indent -utf8 --show-body-only yes --show-warnings no --tidy-mark no') or return shift;
        # open2 doesn't respect "use open ':utf8'"
        binmode (IN, ':utf8'); 
        binmode (OUT, ':utf8'); 

diff --git a/debian/changelog b/debian/changelog
index 6947b4717b60d86a7979e64ae69ef390a9fa49f5..c57f6b26b7740735269e13f711874a9339a0b5f6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 ikiwiki (1.17) UNRELEASED; urgency=low
 
   * Disable tidy generator tag.
+  * Move tidy back to sanitize hook, found out how to only show body.
 
- -- Joey Hess <joeyh@debian.org>  Fri,  4 Aug 2006 21:00:05 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri,  4 Aug 2006 22:26:43 -0400
 
 ikiwiki (1.16) unstable; urgency=low