X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4895955ceaf264c5f17b10c4009e1ab1afcc55ee..a4a1b8e6532b38cc3d045647b568cb2e6d737524:/IkiWiki/Plugin/toc.pm?ds=inline diff --git a/IkiWiki/Plugin/toc.pm b/IkiWiki/Plugin/toc.pm index 063e66f3b..dff9d9aa5 100644 --- a/IkiWiki/Plugin/toc.pm +++ b/IkiWiki/Plugin/toc.pm @@ -4,28 +4,42 @@ package IkiWiki::Plugin::toc; use warnings; use strict; -use IkiWiki; +use IkiWiki 2.00; use HTML::Parser; sub import { #{{{ - IkiWiki::hook(type => "preprocess", id => "toc", - call => \&preprocess); - IkiWiki::hook(type => "format", id => "toc", - call => \&format); + 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 (@) { #{{{ @@ -49,7 +63,7 @@ sub format (@) { #{{{ if ($tagname =~ /^h(\d+)$/i) { my $level=$1; my $anchor="index".++$anchors{$level}."h$level"; - $page.="$text"; + $page.="$text"; # Take the first header level seen as the topmost level, # even if there are higher levels seen later on. @@ -81,17 +95,25 @@ sub format (@) { #{{{ } $liststarted=0; } + + $index.=&$indent."\n" unless $liststarted; + $liststarted=0; + $index.=&$indent."