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

map: postprocess to collapse useless </ul><ul> sequences 

This re-fixes the same bug as 2d5c2f30, but without introducing
malformed HTML in some situations. This is not a very elegant
solution, but it has the advantage of passing more tests.
master
Simon McVittie 2012-08-03 12:53:25 +01:00
parent 12ca01fd5c
commit af8712cfac
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IkiWiki/Plugin/map.pm
View File

@ -103,7 +103,7 @@ sub preprocess (@) {
$addparent=""; $addparent="";
$map .= ($spaces x $indent) . "</li>\n"; $map .= ($spaces x $indent) . "</li>\n";
if ($indent > 1) { if ($indent > 1) {
$map .= ($spaces x $indent) . "</ul>\n"; $map .= ($spaces x $indent) . "</ul><map:collapse>\n";
} }
$indent--; $indent--;
} }
@ -120,7 +120,7 @@ sub preprocess (@) {
while ($depth > $indent) { while ($depth > $indent) {
$indent++; $indent++;
if ($indent > 1) { if ($indent > 1) {
$map .= ($spaces x $indent) . "<ul>\n"; $map .= ($spaces x $indent) . "<ul><map:collapse>\n";
} }
if ($depth > $indent) { if ($depth > $indent) {
$p.="/".shift(@bits); $p.="/".shift(@bits);
@ -154,6 +154,8 @@ sub preprocess (@) {
$indent--; $indent--;
$map .= ($spaces x $indent) . "</ul>\n"; $map .= ($spaces x $indent) . "</ul>\n";
} }
$map =~ s{\n *</ul><map:collapse>\n *<ul><map:collapse>\n}{\n}gs;
$map =~ s{<map:collapse>}{}g;
$map .= "</div>\n"; $map .= "</div>\n";
return $map; return $map;
} }