* Atom feed support based on a patch by Clint Adams.

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

diff --git a/IkiWiki/Plugin/toc.pm b/IkiWiki/Plugin/toc.pm
index c36ce289368c945eff3f3e94164bfc004e2b5235..279eef00837a66c901056096c89af1c1180e6a42 100644 (file)
--- a/IkiWiki/Plugin/toc.pm
+++ b/IkiWiki/Plugin/toc.pm
@@ -8,13 +8,11 @@ use IkiWiki;
 use HTML::Parser;
 
 sub import { #{{{
-       IkiWiki::hook(type => "preprocess", id => "toc",
-               call => \&preprocess);
-       IkiWiki::hook(type => "format", id => "toc",
-               call => \&format);
+       hook(type => "preprocess", id => "toc", call => \&preprocess);
+       hook(type => "format", id => "toc", call => \&format);
 } # }}}
 
-my @tocs;
+my %tocpages;
 
 sub preprocess (@) { #{{{
        my %params=@_;
@@ -23,17 +21,17 @@ sub preprocess (@) { #{{{
 
        # It's too early to generate the toc here, so just record the
        # info.
-       push @tocs, \%params;
+       $tocpages{$params{destpage}}=\%params;
 
-       return "\n[[toc $#tocs]]\n";
+       return "\n<div class=\"toc\"></div>\n";
 } # }}}
 
-sub format ($) { #{{{
-       my $content=shift;
+sub format (@) { #{{{
+       my %params=@_;
+       my $content=$params{content};
        
-       return $content unless @tocs && $content=~/\[\[toc (\d+)\]\]/ && $#tocs >= $1;
-       my $id=$1;
-       my %params=%{$tocs[$id]};
+       return $content unless exists $tocpages{$params{page}};
+       %params=%{$tocpages{$params{page}}};
 
        my $p=HTML::Parser->new(api_version => 3);
        my $page="";
@@ -107,9 +105,7 @@ sub format ($) { #{{{
                $index.=&$indent."</ol>\n";
        }
 
-       # Ignore cruft around the toc marker, probably <p> tags added by
-       # markdown which shouldn't appear in a list anyway.
-       $page=~s/\n.*\[\[toc $id\]\].*\n/$index/;
+       $page=~s/(<div class=\"toc\">)/$1\n$index/;
        return $page;
 }