X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8eb65c1ef1800d1b63a0f6b27b8623a1ce0469ab..812f775e0a3cd953782edcbe8a0eb727752df03f:/IkiWiki/Plugin/listdirectives.pm

diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index a5498a20a..2ab3e4665 100644
--- a/IkiWiki/Plugin/listdirectives.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -7,6 +7,7 @@ use strict;
 use IkiWiki 2.00;
 
 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);
@@ -29,7 +30,7 @@ sub getsetup () { #{{{
 } #}}}
 
 my @fulllist;
-my @earlylist;
+my @shortlist;
 my $pluginstring;
 
 sub checkconfig () { #{{{
@@ -39,15 +40,14 @@ sub checkconfig () { #{{{
 	else {
 		$config{directive_description_dir} =~ s/\/+$//;
 	}
-
-	@earlylist = sort keys %{$IkiWiki::hooks{preprocess}};
 } #}}}
 
 sub needsbuild (@) { #{{{
 	my $needsbuild=shift;
 
 	@fulllist = sort keys %{$IkiWiki::hooks{preprocess}};
-	$pluginstring = join(' ', @earlylist) . " : " . join(' ', @fulllist);
+	@shortlist = grep { ! $IkiWiki::hooks{preprocess}{$_}{shortcut} } @fulllist;
+	$pluginstring = join(' ', @shortlist) . " : " . join(' ', @fulllist);
 
 	foreach my $page (keys %pagestate) {
 		if (exists $pagestate{$page}{listdirectives}{shown}) {
@@ -76,14 +76,14 @@ 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);
+		my $link=linkpage($config{directive_description_dir}."/".$plugin);
 		add_depends($params{page}, $link);
 		$result .= htmllink($params{page}, $params{destpage}, $link);
 		$result .= '</li>';