Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proposed reworking; requesting smcv take another look
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
toc.pm
diff --git
a/IkiWiki/Plugin/toc.pm
b/IkiWiki/Plugin/toc.pm
index a585564e74761045ee8e178b6dd8262ede94ee97..4d29e704050f65dd8d22b57f655a1a2b70e19a57 100644
(file)
--- a/
IkiWiki/Plugin/toc.pm
+++ b/
IkiWiki/Plugin/toc.pm
@@
-18,6
+18,7
@@
sub getsetup () {
plugin => {
safe => 1,
rebuild => undef,
plugin => {
safe => 1,
rebuild => undef,
+ section => "widget",
},
}
},
}
@@
-53,24
+54,32
@@
sub format (@) {
my $page="";
my $index="";
my %anchors;
my $page="";
my $index="";
my %anchors;
- my $
curlevel
;
- my $
startlevel=0
;
+ my $
startlevel=($params{startlevel} ? $params{startlevel} : 0)
;
+ my $
curlevel=$startlevel-1
;
my $liststarted=0;
my $indent=sub { "\t" x $curlevel };
$p->handler(start => sub {
my $liststarted=0;
my $indent=sub { "\t" x $curlevel };
$p->handler(start => sub {
- my $tagname=shift;
- my $text=shift;
+ my ($tagname, $text, $attr) = @_;
if ($tagname =~ /^h(\d+)$/i) {
my $level=$1;
my $anchor="index".++$anchors{$level}."h$level";
$page.="$text<a name=\"$anchor\"></a>";
if ($tagname =~ /^h(\d+)$/i) {
my $level=$1;
my $anchor="index".++$anchors{$level}."h$level";
$page.="$text<a name=\"$anchor\"></a>";
-
- # Take the first header level seen as the topmost level,
+ # if the heading already has a unique ID, use that instead in TOC
+ if ($attr->{id}) {
+ $anchor = $attr->{id};
+ }
+
+ # Unless we're given startlevel as a parameter,
+ # take the first header level seen as the topmost level,
# even if there are higher levels seen later on.
if (! $startlevel) {
$startlevel=$level;
$curlevel=$startlevel-1;
}
# even if there are higher levels seen later on.
if (! $startlevel) {
$startlevel=$level;
$curlevel=$startlevel-1;
}
+ elsif (defined $params{startlevel} &&
+ $level < $params{startlevel}) {
+ return;
+ }
elsif ($level < $startlevel) {
$level=$startlevel;
}
elsif ($level < $startlevel) {
$level=$startlevel;
}
@@
-118,7
+127,7
@@
sub format (@) {
else {
$page.=$text;
}
else {
$page.=$text;
}
- }, "tagname, text");
+ }, "tagname, text
, attr
");
$p->handler(default => sub { $page.=join("", @_) }, "text");
$p->parse($content);
$p->eof;
$p->handler(default => sub { $page.=join("", @_) }, "text");
$p->parse($content);
$p->eof;