diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 8037db773..2ff840ff7 100644
--- 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 = "
\n";
- $map .= "
\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.="
\n";
+ }
while ($depth < $indent) {
$indent--;
$map.="\n";
@@ -48,19 +54,25 @@ sub preprocess (@) { #{{{
while ($depth > $indent) {
$indent++;
$map.="
\n";
- $openli=0;
+ if ($depth > $indent) {
+ $map .= "- \n";
+ $openli=1;
+ }
+ else {
+ $openli=0;
+ }
}
$map .= "
\n" if $openli;
$map .= "- "
.htmllink($params{page}, $params{destpage}, $item)
."\n";
$openli=1;
+ $parent=$item;
}
while ($indent > 0) {
$indent--;
$map.="
\n";
}
- $map .= "\n";
$map .= "
\n";
return $map;
} # }}}
diff --git a/debian/changelog b/debian/changelog
index fa7951c71..3041fad45 100644
--- 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 Thu, 20 Sep 2007 15:21:29 -0400
+ -- Joey Hess 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 f7ff2dd31..444de431b 100644
--- 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 `` has an empty parent `- `, 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 711618f15..f5b77b266 100644
--- 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 \n"
"Language-Team: LANGUAGE \n"