Merge branch 'master' into dependency-types

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

diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index 6f8ddb06af86faa60a0b028db8f0f1bf7626ae15..4023ed7d75fd4b2582b7fe00265a5ac6a449619c 100644 (file)
--- a/IkiWiki/Plugin/listdirectives.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -4,17 +4,17 @@ package IkiWiki::Plugin::listdirectives;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
-sub import { #{{{
+sub import {
        add_underlay("directives");
        hook(type => "getsetup", id => "listdirectives", call => \&getsetup);
        hook(type => "checkconfig", id => "listdirectives", call => \&checkconfig);
        hook(type => "needsbuild", id => "listdirectives", call => \&needsbuild);
        hook(type => "preprocess", id => "listdirectives", call => \&preprocess);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
        return
                plugin => {
                        safe => 1,
@@ -27,28 +27,27 @@ sub getsetup () { #{{{
                        safe => 1,
                        rebuild => 1,
                },
-} #}}}
+}
 
 my @fulllist;
-my @earlylist;
+my @shortlist;
 my $pluginstring;
 
-sub checkconfig () { #{{{
+sub checkconfig () {
        if (! defined $config{directive_description_dir}) {
                $config{directive_description_dir} = "ikiwiki/directive";
        }
        else {
                $config{directive_description_dir} =~ s/\/+$//;
        }
+}
 
-       @earlylist = sort keys %{$IkiWiki::hooks{preprocess}};
-} #}}}
-
-sub needsbuild (@) { #{{{
+sub needsbuild (@) {
        my $needsbuild=shift;
 
-       @fulllist = sort keys %{$IkiWiki::hooks{preprocess}};
-       $pluginstring = join(' ', @earlylist) . " : " . join(' ', @fulllist);
+       @fulllist = grep { ! /^_/ } sort keys %{$IkiWiki::hooks{preprocess}};
+       @shortlist = grep { ! $IkiWiki::hooks{preprocess}{$_}{shortcut} } @fulllist;
+       $pluginstring = join(' ', @shortlist) . " : " . join(' ', @fulllist);
 
        foreach my $page (keys %pagestate) {
                if (exists $pagestate{$page}{listdirectives}{shown}) {
@@ -64,9 +63,9 @@ sub needsbuild (@) { #{{{
                        }
                }
        }
-} # }}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
        my %params=@_;
        
        $pagestate{$params{destpage}}{listdirectives}{shown}=$pluginstring;
@@ -77,15 +76,15 @@ sub preprocess (@) { #{{{
                @pluginlist = @fulllist;
        }
        else {
-               @pluginlist = @earlylist;
+               @pluginlist = @shortlist;
        }
        
        my $result = '<ul class="listdirectives">';
        
        foreach my $plugin (@pluginlist) {
                $result .= '<li class="listdirectives">';
-               my $link=IkiWiki::linkpage($config{directive_description_dir}."/".$plugin);
-               add_depends($params{page}, $link);
+               my $link=linkpage($config{directive_description_dir}."/".$plugin);
+               add_depends($params{page}, $link, presence => 1);
                $result .= htmllink($params{page}, $params{destpage}, $link);
                $result .= '</li>';
        }
@@ -93,6 +92,6 @@ sub preprocess (@) { #{{{
        $result .= "</ul>";
 
        return $result;
-} # }}}
+}
 
 1