commas

[git.ikiwiki.info.git] / IkiWiki / Plugin / otl.pm
diff --git a/IkiWiki/Plugin/otl.pm b/IkiWiki/Plugin/otl.pm

index 40c52976171f901e05a576ee80e330b8c139b52b..0cd93a3ecc773248e82e9180f7ae8a6c319198fa 100644 (file)
--- a/IkiWiki/Plugin/otl.pm
+++ b/IkiWiki/Plugin/otl.pm
@@ -21,34 +21,40 @@ sub filter (@) { #{{{
                 "smileys/star_on.png", 0);
         my $unchecked=IkiWiki::htmllink($params{page}, $params{page},
                 "smileys/star_off.png", 0);
                 "smileys/star_on.png", 0);
         my $unchecked=IkiWiki::htmllink($params{page}, $params{page},
                 "smileys/star_off.png", 0);
-       $params{content}=~s/^(\s+)\[X\]\s/${1}$checked /mg;
-       $params{content}=~s/^(\s+)\[_\]\s/${1}$unchecked /mg;
+       $params{content}=~s/^(\s*)\[X\]\s/${1}$checked /mg;
+       $params{content}=~s/^(\s*)\[_\]\s/${1}$unchecked /mg;
          
         return $params{content};
  } # }}}
  
          
         return $params{content};
  } # }}}
  
-sub htmlize ($) { #{{{
+sub htmlize (@) { #{{{
+       my %params=@_;
+
         my $tries=10;
         my $tries=10;
+       my $pid;
         while (1) {
                 eval {
         while (1) {
                 eval {
-                       open2(*IN, *OUT, 'otl2html -S /dev/null -T /dev/stdin');
+                       $pid=open2(*IN, *OUT, 'otl2html -S /dev/null -T /dev/stdin');
                 };
                 last unless $@;
                 $tries--;
                 if ($tries < 1) {
                         IkiWiki::debug("failed to run otl2html: $@");
                 };
                 last unless $@;
                 $tries--;
                 if ($tries < 1) {
                         IkiWiki::debug("failed to run otl2html: $@");
-                       return shift;
+                       return $params{content};
                 }
         }
         # open2 doesn't respect "use open ':utf8'"
         binmode (IN, ':utf8'); 
         binmode (OUT, ':utf8'); 
         
                 }
         }
         # open2 doesn't respect "use open ':utf8'"
         binmode (IN, ':utf8'); 
         binmode (OUT, ':utf8'); 
         
-       print OUT shift;
+       print OUT $params{content};
         close OUT;
  
         local $/ = undef;
         my $ret=<IN>;
         close OUT;
  
         local $/ = undef;
         my $ret=<IN>;
+       close IN;
+       waitpid $pid, 0;
+
         $ret=~s/.*<body>//s;
         $ret=~s/<body>.*//s;
         $ret=~s/<div class="Footer">.*//s;
         $ret=~s/.*<body>//s;
         $ret=~s/<body>.*//s;
         $ret=~s/<div class="Footer">.*//s;