X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9f45c3080e893174751b9a4b7fe3e59da611a2ec..219afc3f9c646f323c9a51744b6fba43f04786db:/IkiWiki/Plugin/htmltidy.pm?ds=inline diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm index 0609e72c3..d9aaba4ca 100644 --- a/IkiWiki/Plugin/htmltidy.pm +++ b/IkiWiki/Plugin/htmltidy.pm @@ -9,20 +9,29 @@ package IkiWiki::Plugin::htmltidy; use warnings; use strict; -use IkiWiki; +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'); # open2 doesn't respect "use open ':utf8'" binmode (IN, ':utf8'); @@ -36,8 +45,8 @@ sub sanitize (@) { #{{{ close IN; waitpid $pid, 0; - return $params{content} if $sigpipe; $SIG{PIPE}="DEFAULT"; + return $params{content} if $sigpipe; return $ret; } # }}}