improve string

[ikiwiki.git] / IkiWiki / Plugin / htmltidy.pm

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 94263e558284e6c18863799cb83d5a78ba599ca4..0609e72c328e5ea4fc06b945203f51f73e0e6338 100644 (file)
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -13,20 +13,33 @@ use IkiWiki;
 use IPC::Open2;
 
 sub import { #{{{
-       IkiWiki::hook(type => "format", id => "tidy", call => \&format);
+       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 (@) { #{{{
+       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');
+       
        # 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;
+
+       return $params{content} if $sigpipe;
+       $SIG{PIPE}="DEFAULT";
+
+       return $ret;
 } # }}}
 
 1