Merge commit 'upstream/master' into prv/po

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

diff --git a/IkiWiki/Plugin/toc.pm b/IkiWiki/Plugin/toc.pm
index 639cae4a90e88d437824f51689824fa1b30e95ca..a585564e74761045ee8e178b6dd8262ede94ee97 100644 (file)
--- a/IkiWiki/Plugin/toc.pm
+++ b/IkiWiki/Plugin/toc.pm
@@ -4,17 +4,26 @@ package IkiWiki::Plugin::toc;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 use HTML::Parser;
 
 use HTML::Parser;
 

-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "toc", call => \&getsetup);

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

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

 
 my %tocpages;
 
 
 my %tocpages;
 

-sub preprocess (@) { #{{{
+sub preprocess (@) {

        my %params=@_;
 
        if ($params{page} eq $params{destpage}) {
        my %params=@_;
 
        if ($params{page} eq $params{destpage}) {


@@ -31,9 +40,9 @@ sub preprocess (@) { #{{{
                # right.
                return "";
        }
                # right.
                return "";
        }

-} # }}}
+}

 
 

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

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