X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ee1ad53c4c2710aa7ded61bdc56f3a8cce514f22..b34d31142b9fed28ec9cf77fe0c5d9f405d48c84:/IkiWiki/Plugin/otl.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/otl.pm b/IkiWiki/Plugin/otl.pm index 20291d7e5..3801a6ec2 100644 --- a/IkiWiki/Plugin/otl.pm +++ b/IkiWiki/Plugin/otl.pm @@ -4,30 +4,33 @@ package IkiWiki::Plugin::otl; use warnings; use strict; -use IkiWiki 2.00; +use IkiWiki 3.00; +use open qw{:utf8 :std}; -sub import { #{{{ - hook(type => "filter", id => "otl", call => \&filter); +sub import { + hook(type => "getsetup", id => "otl", call => \&getsetup); hook(type => "htmlize", id => "otl", call => \&htmlize); +} -} # }}} +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => 1, # format plugin + section => "format", + }, +} -sub filter (@) { #{{{ +sub htmlize (@) { my %params=@_; - - # Munge up check boxes to look a little bit better. This is a hack. + + # Munge up check boxes to look a little bit better. my $checked=htmllink($params{page}, $params{page}, "smileys/star_on.png", linktext => "[X]"); my $unchecked=htmllink($params{page}, $params{page}, "smileys/star_off.png", linktext => "[_]"); $params{content}=~s/^(\s*)\[X\]\s/${1}$checked /mg; $params{content}=~s/^(\s*)\[_\]\s/${1}$unchecked /mg; - - return $params{content}; -} # }}} - -sub htmlize (@) { #{{{ - my %params=@_; # Can't use open2 since otl2html doesn't play nice with buffering. # Instead, fork off a child process that will run otl2html and feed @@ -85,6 +88,6 @@ sub htmlize (@) { #{{{ $ret=~s/
.*//s; $ret=~s/