Merge branch 'master' into pedigree

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

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 2ff840ff7b0121b55f7ece7654c579f9fdc7403a..5b6a843e7ae2680d654317fc35368190c2d9d087 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -19,43 +19,99 @@ sub preprocess (@) { #{{{
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        

+       my $common_prefix;
+

        # Get all the items to map.
        # Get all the items to map.

-       my @mapitems = ();
+       my %mapitems;

        foreach my $page (keys %pagesources) {
                if (pagespec_match($page, $params{pages}, location => $params{page})) {
        foreach my $page (keys %pagesources) {
                if (pagespec_match($page, $params{pages}, location => $params{page})) {

-                       push @mapitems, "/".$page;
+                       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;
+                       }
+                       elsif (length $common_prefix &&
+                              $page !~ /^\Q$common_prefix\E(\/|$)/) {
+                               my @a=split(/\//, $page);
+                               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;
+                               }
+                       }

                }
        }
                }
        }

+       
+       # Common prefix should not be a page in the map.
+       while (defined $common_prefix && length $common_prefix &&
+              exists $mapitems{$common_prefix}) {
+               $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.
        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));
+       add_depends($params{page}, join(" or ", keys %mapitems));

 
        # Create the map.
        my $parent="";
        my $indent=0;
        my $openli=0;
 
        # Create the map.
        my $parent="";
        my $indent=0;
        my $openli=0;

-       my $map = "<div class='map'>\n";
-       foreach my $item (sort @mapitems) {
-               my $depth = ($item =~ tr/\//\//);
+       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;

                my $baseitem=IkiWiki::dirname($item);
                my $baseitem=IkiWiki::dirname($item);

-               while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E/) {
+               while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E(\/|$)/) {

                        $parent=IkiWiki::dirname($parent);
                        $parent=IkiWiki::dirname($parent);

+                       last if !$dummy && length $parent && $baseitem =~ /^\Q$parent\E(\/|$)/;

                        $indent--;
                        $indent--;

-                       $map.="</li></ul>\n";
+                       $map .= "</li>\n";
+                       if ($indent > 0) {
+                               $map .= "</ul>\n";
+                       }

                }
                }

+               $dummy=0;

                while ($depth < $indent) {
                        $indent--;
                while ($depth < $indent) {
                        $indent--;

-                       $map.="</li></ul>\n";
+                       $map .= "</li>\n";
+                       if ($indent > 0) {
+                               $map .= "</ul>\n";
+                       }

                }
                }

+               my @bits=split("/", $item);
+               my $p="";
+               $p.="/".shift(@bits) for 1..$indent;

                while ($depth > $indent) {
                        $indent++;
                while ($depth > $indent) {
                        $indent++;

-                       $map.="<ul>\n";
+                       if ($indent > 1) {
+                               $map .= "<ul>\n";
+                       }

                        if ($depth > $indent) {
                        if ($depth > $indent) {

-                               $map .= "<li>\n";
+                               $dummy=1;
+                               $p.="/".shift(@bits);
+                               $map .= "<li>"
+                                       .htmllink($params{page}, $params{destpage},
+                                                $p, class => "mapparent",
+                                                noimageinline => 1)
+                                       ."\n";

                                $openli=1;
                        }
                        else {
                                $openli=1;
                        }
                        else {


@@ -64,14 +120,17 @@ sub preprocess (@) { #{{{
                }
                $map .= "</li>\n" if $openli;
                $map .= "<li>"
                }
                $map .= "</li>\n" if $openli;
                $map .= "<li>"

-                       .htmllink($params{page}, $params{destpage}, $item)
+                       .htmllink($params{page}, $params{destpage}, 
+                               "/".$common_prefix."/".$item,
+                               @linktext,
+                               class => "mapitem", noimageinline => 1)

                        ."\n";
                $openli=1;
                $parent=$item;
        }
        while ($indent > 0) {
                $indent--;
                        ."\n";
                $openli=1;
                $parent=$item;
        }
        while ($indent > 0) {
                $indent--;

-               $map.="</li></ul>\n";
+               $map .= "</li>\n</ul>\n";

        }
        $map .= "</div>\n";
        return $map;
        }
        $map .= "</div>\n";
        return $map;