# It is particularly useful when the html plugin is used.
#
# by Faidon Liambotis
-package IkiWiki::Plugin::tidy;
+package IkiWiki::Plugin::htmltidy;
use warnings;
use strict;
-use IkiWiki;
+use IkiWiki 2.00;
use IPC::Open2;
sub import { #{{{
- IkiWiki::hook(type => "sanitize", id => "tidy", call => \&sanitize);
+ hook(type => "sanitize", id => "tidy", call => \&sanitize);
} # }}}
-sub sanitize ($) { #{{{
- open2(*IN, *OUT, 'tidy -quiet -xml -indent -utf8') or return shift;
+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 --markup yes');
+
# open2 doesn't respect "use open ':utf8'"
- binmode (IN, ':utf8');
+ binmode (IN, ':utf8');
binmode (OUT, ':utf8');
-
- print OUT shift;
+
+ print OUT $params{content};
close OUT;
local $/ = undef;
- return <IN>;
+ my $ret=<IN>;
+ close IN;
+ waitpid $pid, 0;
+
+ $SIG{PIPE}="DEFAULT";
+ return $params{content} if $sigpipe;
+
+ return $ret;
} # }}}
1