Merge commit 'origin'

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

diff --git a/IkiWiki/Plugin/toc.pm b/IkiWiki/Plugin/toc.pm
index 5380dd9658d5ecbfa71b335edd7830628c83a88b..dff9d9aa5356e5928de0a9ddd654217f2165af84 100644 (file)
--- a/IkiWiki/Plugin/toc.pm
+++ b/IkiWiki/Plugin/toc.pm
@@ -8,10 +8,19 @@ use IkiWiki 2.00;
 use HTML::Parser;
 
 sub import { #{{{
 use HTML::Parser;
 
 sub import { #{{{

+       hook(type => "getsetup", id => "toc", call => \&getsetup);

        hook(type => "preprocess", id => "toc", call => \&preprocess);
        hook(type => "preprocess", id => "toc", call => \&preprocess);

-       hook(type => "sanitize", id => "toc", call => \&sanitize);
+       hook(type => "format", id => "toc", call => \&format);

 } # }}}
 
 } # }}}
 

+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+

 my %tocpages;
 
 sub preprocess (@) { #{{{
 my %tocpages;
 
 sub preprocess (@) { #{{{


@@ -33,7 +42,7 @@ sub preprocess (@) { #{{{
        }
 } # }}}
 
        }
 } # }}}
 

-sub sanitize (@) { #{{{
+sub format (@) { #{{{

        my %params=@_;
        my $content=$params{content};
        
        my %params=@_;
        my $content=$params{content};