urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* toc: Handle html elements embedded inside a header, rather than 

stopping collecting the header text at the first element.
master
Joey Hess 2007-11-23 11:40:02 -05:00
parent e72825619d
commit c9c0f271b6
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
IkiWiki/Plugin/toc.pm
View File

@ -86,17 +86,25 @@ sub format (@) { #{{{
}
$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("", @_);
$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");
$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;

2
debian/changelog vendored
View File

@ -24,6 +24,8 @@ ikiwiki (2.13) UNRELEASED; urgency=low
directories, to improve browsing of file:// urls.
Patch by Daniel Burrows. Closes: #451728
* Allow html5 video and audio tags and their attributes in the htmlscrubber.
* toc: Handle html elements embedded inside a header, rather than
stopping collecting the header text at the first element.
-- Joey Hess <joeyh@debian.org> Sat, 17 Nov 2007 19:56:46 -0500