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

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

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 5aa2852de0926e8dd1bd50fe36f6699a5bc1a60d..2ff840ff7b0121b55f7ece7654c579f9fdc7403a 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -19,25 +19,34 @@ sub preprocess (@) { #{{{
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        
-       # Needs to update whenever a page is added or removed, so
-       # register a dependency.
-       add_depends($params{page}, $params{pages});
-       
        # Get all the items to map.
        my @mapitems = ();
-       foreach my $page (keys %links) {
+       foreach my $page (keys %pagesources) {
                if (pagespec_match($page, $params{pages}, location => $params{page})) {
-                       push @mapitems, $page;
+                       push @mapitems, "/".$page;
                }
        }
 
+       # Needs to update whenever a page is added or removed, so
+       # register a dependency.
+       add_depends($params{page}, $params{pages});
+       # Explicitly add all currently shown pages, to detect when pages
+       # are removed.
+       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";
@@ -45,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;
 } # }}}