X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9f45c3080e893174751b9a4b7fe3e59da611a2ec..cf374e97cf571c847a21efce9c26b01315a054a1:/IkiWiki/Plugin/htmltidy.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm index 0609e72c3..6f3379ef4 100644 --- a/IkiWiki/Plugin/htmltidy.pm +++ b/IkiWiki/Plugin/htmltidy.pm @@ -9,24 +9,33 @@ package IkiWiki::Plugin::htmltidy; use warnings; use strict; -use IkiWiki; +use IkiWiki 3.00; use IPC::Open2; -sub import { #{{{ +sub import { + hook(type => "getsetup", id => "tidy", call => \&getsetup); hook(type => "sanitize", id => "tidy", call => \&sanitize); -} # }}} +} -sub 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; @@ -36,10 +45,10 @@ sub sanitize (@) { #{{{ close IN; waitpid $pid, 0; - return $params{content} if $sigpipe; $SIG{PIPE}="DEFAULT"; + return "" if $sigpipe || ! defined $ret; return $ret; -} # }}} +} 1