* map: Render empty nodes on the way to subpages whose parent pages

  are not included in the map.
* map: Fix valid html issue.

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 8037db7735b85f674229773a6c6a6fada54351b2..2ff840ff7b0121b55f7ece7654c579f9fdc7403a 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -35,12 +35,18 @@ sub preprocess (@) { #{{{
        add_depends($params{page}, join(" or ", @mapitems));
 
        # Create the map.
+       my $parent="";
        my $indent=0;
        my $openli=0;
        my $map = "<div class='map'>\n";
-       $map .= "<ul>\n";
        foreach my $item (sort @mapitems) {
                my $depth = ($item =~ tr/\//\//);
+               my $baseitem=IkiWiki::dirname($item);
+               while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E/) {
+                       $parent=IkiWiki::dirname($parent);
+                       $indent--;
+                       $map.="</li></ul>\n";
+               }
                while ($depth < $indent) {
                        $indent--;
                        $map.="</li></ul>\n";
@@ -48,19 +54,25 @@ sub preprocess (@) { #{{{
                while ($depth > $indent) {
                        $indent++;
                        $map.="<ul>\n";
-                       $openli=0;
+                       if ($depth > $indent) {
+                               $map .= "<li>\n";
+                               $openli=1;
+                       }
+                       else {
+                               $openli=0;
+                       }
                }
                $map .= "</li>\n" if $openli;
                $map .= "<li>"
                        .htmllink($params{page}, $params{destpage}, $item)
                        ."\n";
                $openli=1;
+               $parent=$item;
        }
        while ($indent > 0) {
                $indent--;
                $map.="</li></ul>\n";
        }
-       $map .= "</li></ul>\n";
        $map .= "</div>\n";
        return $map;
 } # }}}

diff --git a/debian/changelog b/debian/changelog
index fa7951c71fd607b5aa070316fc606723babec5e0..3041fad45cd1152b0729cd721fad2e5db4379652 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,11 @@ ikiwiki (2.9) UNRELEASED; urgency=low
     Closes: #443344
   * map: Fully specify paths to links to avoid issues when the bestlink
     didn't point to the correct page.
+  * map: Render empty nodes on the way to subpages whose parent pages
+    are not included in the map.
+  * map: Fix valid html issue.
 
- -- Joey Hess <joeyh@debian.org>  Thu, 20 Sep 2007 15:21:29 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri, 21 Sep 2007 13:28:32 -0400
 
 ikiwiki (2.8) unstable; urgency=low
 

diff --git a/doc/bugs/Map_sorts_subtags_under_a_different_tag.mdwn b/doc/bugs/Map_sorts_subtags_under_a_different_tag.mdwn
index f7ff2dd3140f1ae2d59593d8b602dc08d1fb4139..444de431b8bbf58229defab80485b973f69303d1 100644 (file)
--- a/doc/bugs/Map_sorts_subtags_under_a_different_tag.mdwn
+++ b/doc/bugs/Map_sorts_subtags_under_a_different_tag.mdwn
@@ -45,3 +45,5 @@ So it's not that the `<ul>` has an empty parent `<li>`, the three tags are
 *really* children of `active`.
 
 This really blows my mind. :)
+
+Rendering issue. [[fixed|done]] --[[Joey]]

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 711618f155aea06cc8b1069ff77713c20cae354f..f5b77b2664d324ed4e09d7a811169252dd53c732 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-20 15:21-0400\n"
+"POT-Creation-Date: 2007-09-21 13:25-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"