X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/45e2c23e030a6ae60c79c1b97a7a906290f26abe..a5889912b386eaa43774907c3844c90e3e3ca7c8:/IkiWiki/Plugin/toc.pm?ds=inline diff --git a/IkiWiki/Plugin/toc.pm b/IkiWiki/Plugin/toc.pm index bc62f71d6..dff9d9aa5 100644 --- a/IkiWiki/Plugin/toc.pm +++ b/IkiWiki/Plugin/toc.pm @@ -8,22 +8,38 @@ use IkiWiki 2.00; use HTML::Parser; sub import { #{{{ + hook(type => "getsetup", id => "toc", call => \&getsetup); hook(type => "preprocess", id => "toc", call => \&preprocess); hook(type => "format", id => "toc", call => \&format); } # }}} +sub getsetup () { #{{{ + return + plugin => { + safe => 1, + rebuild => undef, + }, +} #}}} + my %tocpages; sub preprocess (@) { #{{{ my %params=@_; - $params{levels}=1 unless exists $params{levels}; + if ($params{page} eq $params{destpage}) { + $params{levels}=1 unless exists $params{levels}; - # It's too early to generate the toc here, so just record the - # info. - $tocpages{$params{destpage}}=\%params; + # It's too early to generate the toc here, so just record the + # info. + $tocpages{$params{destpage}}=\%params; - return "\n
\n"; + return "\n\n"; + } + else { + # Don't generate toc in an inlined page, doesn't work + # right. + return ""; + } } # }}} sub format (@) { #{{{ @@ -79,17 +95,25 @@ sub format (@) { #{{{ } $liststarted=0; } + + $index.=&$indent."\n" unless $liststarted; + $liststarted=0; + $index.=&$indent."