Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / IkiWiki / Plugin / map.pm

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 6567331fa41dca1ebdfa6895cab386814a8382ae..4a9bf58dbc1a446ae72f37f13089af05fdc7b221 100644 (file)
--- 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) {
                        $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--;
                }
                        }
                        $indent--;
                }


@@ -120,7 +120,7 @@ sub preprocess (@) {
                while ($depth > $indent) {
                        $indent++;
                        if ($indent > 1) {
                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);
                        }
                        if ($depth > $indent) {
                                $p.="/".shift(@bits);


@@ -154,6 +154,8 @@ sub preprocess (@) {
                $indent--;
                $map .= ($spaces x $indent) . "</ul>\n";
        }
                $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;
 }
        $map .= "</div>\n";
        return $map;
 }