load all plugins when generating setup

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

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index b08d78d76dc6752ee37012bb3df707eba7faefc4..5b6a843e7ae2680d654317fc35368190c2d9d087 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -25,8 +25,14 @@ sub preprocess (@) { #{{{
        my %mapitems;
        foreach my $page (keys %pagesources) {
                if (pagespec_match($page, $params{pages}, location => $params{page})) {
-                       $mapitems{$page}=1;
-
+                       if (exists $params{show} && 
+                           exists $pagestate{$page} &&
+                           exists $pagestate{$page}{meta}{$params{show}}) {
+                               $mapitems{$page}=$pagestate{$page}{meta}{$params{show}};
+                       }
+                       else {
+                               $mapitems{$page}='';
+                       }
                        # Check for a common prefix.
                        if (! defined $common_prefix) {
                                $common_prefix=$page;
@@ -37,6 +43,9 @@ sub preprocess (@) { #{{{
                                my @b=split(/\//, $common_prefix);
                                $common_prefix="";
                                while (@a && @b && $a[0] eq $b[0]) {
+                                       if (length $common_prefix) {
+                                               $common_prefix.="/";
+                                       }
                                        $common_prefix.=shift(@a);
                                        shift @b;
                                }
@@ -50,8 +59,9 @@ sub preprocess (@) { #{{{
                $common_prefix=IkiWiki::dirname($common_prefix);
        }
 
-       # Needs to update whenever a page is added or removed, so
-       # register a dependency.
+       # Needs to update whenever a page is added or removed (or in some
+       # cases, when its content changes, if show=title), so register a
+       # dependency.
        add_depends($params{page}, $params{pages});
        # Explicitly add all currently shown pages, to detect when pages
        # are removed.
@@ -64,6 +74,7 @@ sub preprocess (@) { #{{{
        my $dummy=0;
        my $map = "<div class='map'>\n<ul>\n";
        foreach my $item (sort keys %mapitems) {
+               my @linktext = (length $mapitems{$item} ? (linktext => $mapitems{$item}) : ());
                $item=~s/^\Q$common_prefix\E\///
                        if defined $common_prefix && length $common_prefix;
                my $depth = ($item =~ tr/\//\//) + 1;
@@ -97,7 +108,9 @@ sub preprocess (@) { #{{{
                                $dummy=1;
                                $p.="/".shift(@bits);
                                $map .= "<li>"
-                                       .htmllink($params{page}, $params{destpage}, $p, class => "mapparent")
+                                       .htmllink($params{page}, $params{destpage},
+                                                $p, class => "mapparent",
+                                                noimageinline => 1)
                                        ."\n";
                                $openli=1;
                        }
@@ -108,7 +121,9 @@ sub preprocess (@) { #{{{
                $map .= "</li>\n" if $openli;
                $map .= "<li>"
                        .htmllink($params{page}, $params{destpage}, 
-                               "/".$common_prefix."/".$item, class => "mapitem")
+                               "/".$common_prefix."/".$item,
+                               @linktext,
+                               class => "mapitem", noimageinline => 1)
                        ."\n";
                $openli=1;
                $parent=$item;