From: Simon McVittie <smcv@debian.org>
Date: Fri, 3 Aug 2012 11:53:25 +0000 (+0100)
Subject: map: postprocess to collapse useless </ul><ul> sequences
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/af8712cfac73d7668e509abf97eeabb5e824c29b

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.
---

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 6567331fa..4a9bf58db 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -103,7 +103,7 @@ sub preprocess (@) {
 			$addparent="";
 			$map .= ($spaces x $indent) . "</li>\n";
 			if ($indent > 1) {
-				$map .= ($spaces x $indent) . "</ul>\n";
+				$map .= ($spaces x $indent) . "</ul><map:collapse>\n";
 			}
 			$indent--;
 		}
@@ -120,7 +120,7 @@ sub preprocess (@) {
 		while ($depth > $indent) {
 			$indent++;
 			if ($indent > 1) {
-				$map .= ($spaces x $indent) . "<ul>\n";
+				$map .= ($spaces x $indent) . "<ul><map:collapse>\n";
 			}
 			if ($depth > $indent) {
 				$p.="/".shift(@bits);
@@ -154,6 +154,8 @@ sub preprocess (@) {
 		$indent--;
 		$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";
 	return $map;
 }