Merge branch 'css'

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

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 94263e558284e6c18863799cb83d5a78ba599ca4..9591fbe04b3d7a9ef5a0718fc3bc8ff36b1741a3 100644 (file)
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -9,24 +9,37 @@ package IkiWiki::Plugin::htmltidy;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 use IPC::Open2;
 
 sub import { #{{{
 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 --markup yes');
+       

        # open2 doesn't respect "use open ':utf8'"
        # open2 doesn't respect "use open ':utf8'"

-       binmode (IN, ':utf8'); 
+       binmode (IN, ':utf8');

        binmode (OUT, ':utf8'); 
        
        binmode (OUT, ':utf8'); 
        

-       print OUT shift;
+       print OUT $params{content};

        close OUT;
 
        local $/ = undef;
        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
 } # }}}
 
 1