po(formbuilder_setup): remove the rename/remove buttons on slave pages

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

diff --git a/IkiWiki/Plugin/toc.pm b/IkiWiki/Plugin/toc.pm
index 070c07b0e96093b4c82c3bb9e6c8751dcb7ed414..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};
        


@@ -86,17 +95,25 @@ sub format (@) { #{{{
                                }
                                $liststarted=0;
                        }
                                }
                                $liststarted=0;
                        }

+                               
+                       $index.=&$indent."</li>\n" unless $liststarted;
+                       $liststarted=0;
+                       $index.=&$indent."<li class=\"L$curlevel\">".
+                               "<a href=\"#$anchor\">";

        
                        $p->handler(text => sub {
                                $page.=join("", @_);
        
                        $p->handler(text => sub {
                                $page.=join("", @_);

-                               $index.=&$indent."</li>\n" unless $liststarted;
-                               $liststarted=0;
-                               $index.=&$indent."<li class=\"L$curlevel\">".
-                                       "<a href=\"#$anchor\">".
-                                       join("", @_).
-                                       "</a>\n";
-                               $p->handler(text => undef);
+                               $index.=join("", @_);

                        }, "dtext");
                        }, "dtext");

+                       $p->handler(end => sub {
+                               my $tagname=shift;
+                               if ($tagname =~ /^h(\d+)$/i) {
+                                       $p->handler(text => undef);
+                                       $p->handler(end => undef);
+                                       $index.="</a>\n";
+                               }
+                               $page.=join("", @_);
+                       }, "tagname, text");

                }
                else {
                        $page.=$text;
                }
                else {
                        $page.=$text;