From: joey Date: Sat, 5 Aug 2006 02:28:04 +0000 (+0000) Subject: * Move tidy back to sanitize hook, found out how to only show body. X-Git-Tag: 1.17~27 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d98b2480f9bef1205bb6014c39e9af22843074d6;p=ikiwiki.git * 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 94263e558..5a6a494ed 100644 --- 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 6947b4717..c57f6b26b 100644 --- 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 Fri, 4 Aug 2006 21:00:05 -0400 + -- Joey Hess Fri, 4 Aug 2006 22:26:43 -0400 ikiwiki (1.16) unstable; urgency=low