Merge commit 'upstream/master' into pub/po

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

diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index fe4aee3bbb8393a60941f32bd1092341ec8da230..2ab3e4665fc2c95000f6c22bd14bbc246775ed66 100644 (file)
--- a/IkiWiki/Plugin/listdirectives.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -7,6 +7,7 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
 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);
        hook(type => "getsetup", id => "listdirectives", call => \&getsetup);
        hook(type => "checkconfig", id => "listdirectives", call => \&checkconfig);
        hook(type => "needsbuild", id => "listdirectives", call => \&needsbuild);


@@ -21,33 +22,32 @@ sub getsetup () { #{{{
                },
                directive_description_dir => {
                        type => "string",
                },
                directive_description_dir => {
                        type => "string",

-                       description => "directory in srcdir that contains PreprocessorDirective descriptions",
-                       example => "ikiwiki/plugin",
+                       description => "directory in srcdir that contains directive descriptions",
+                       example => "ikiwiki/directive",

                        safe => 1,
                        rebuild => 1,
                },
 } #}}}
 
 my @fulllist;
                        safe => 1,
                        rebuild => 1,
                },
 } #}}}
 
 my @fulllist;

-my @earlylist;
+my @shortlist;

 my $pluginstring;
 
 sub checkconfig () { #{{{
        if (! defined $config{directive_description_dir}) {
 my $pluginstring;
 
 sub checkconfig () { #{{{
        if (! defined $config{directive_description_dir}) {

-               $config{directive_description_dir} = "ikiwiki/plugin";
+               $config{directive_description_dir} = "ikiwiki/directive";

        }
        else {
        }
        else {

-               $config{directive_description_dir}=~s/\/+$//;
+               $config{directive_description_dir} =~ s/\/+$//;

        }
        }

-
-       @earlylist = sort( keys %{ $IkiWiki::hooks{preprocess} } );

 } #}}}
 
 sub needsbuild (@) { #{{{
        my $needsbuild=shift;
 
 } #}}}
 
 sub needsbuild (@) { #{{{
        my $needsbuild=shift;
 

-       @fulllist = sort( keys %{ $IkiWiki::hooks{preprocess} } );
-       $pluginstring = join (' ', @earlylist) . " : ". join (' ', @fulllist);
+       @fulllist = 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}) {
 
        foreach my $page (keys %pagestate) {
                if (exists $pagestate{$page}{listdirectives}{shown}) {


@@ -76,15 +76,16 @@ sub preprocess (@) { #{{{
                @pluginlist = @fulllist;
        }
        else {
                @pluginlist = @fulllist;
        }
        else {

-               @pluginlist = @earlylist;
+               @pluginlist = @shortlist;

        }
        
        my $result = '<ul class="listdirectives">';
        
        foreach my $plugin (@pluginlist) {
                $result .= '<li class="listdirectives">';
        }
        
        my $result = '<ul class="listdirectives">';
        
        foreach my $plugin (@pluginlist) {
                $result .= '<li class="listdirectives">';

-               $result .= htmllink($params{page}, $params{destpage},
-                       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>';
        }
        
                $result .= '</li>';
        }