X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c1e4bed9d6c57c6c8fd08712ba20f303980b1e69..9b474c2d488839ceec3637c3089eede45a715948:/IkiWiki/Plugin/htmltidy.pm diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm index 19271b136..9ba5e9592 100644 --- a/IkiWiki/Plugin/htmltidy.pm +++ b/IkiWiki/Plugin/htmltidy.pm @@ -13,20 +13,29 @@ use IkiWiki 2.00; use IPC::Open2; sub import { #{{{ + hook(type => "getsetup", id => "tidy", call => \&getsetup); hook(type => "sanitize", id => "tidy", call => \&sanitize); } # }}} +sub getsetup () { #{{{ + return + plugin => { + safe => 1, + rebuild => undef, + }, +} #}}} + sub sanitize (@) { #{{{ my %params=@_; my $pid; my $sigpipe=0; $SIG{PIPE}=sub { $sigpipe=1 }; - $pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no'); - + $pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no --markup yes 2>/dev/null'); + # open2 doesn't respect "use open ':utf8'" binmode (IN, ':utf8'); - binmode (OUT, ':utf8'); + binmode (OUT, ':utf8'); print OUT $params{content}; close OUT; @@ -37,7 +46,7 @@ sub sanitize (@) { #{{{ waitpid $pid, 0; $SIG{PIPE}="DEFAULT"; - return $params{content} if $sigpipe; + return "" if $sigpipe || ! defined $ret; return $ret; } # }}}