X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4956623ee6b95c9fc62d8af39d9236ddeb6de8c5..f768b6bf16e043b41d4503f3ab0758d975994b12:/IkiWiki/Plugin/listdirectives.pm diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm index fe4aee3bb..835e25388 100644 --- a/IkiWiki/Plugin/listdirectives.pm +++ b/IkiWiki/Plugin/listdirectives.pm @@ -4,50 +4,51 @@ 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, rebuild => undef, + section => "widget", }, 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; -my @earlylist; +my @shortlist; my $pluginstring; -sub checkconfig () { #{{{ +sub checkconfig () { if (! defined $config{directive_description_dir}) { - $config{directive_description_dir} = "ikiwiki/plugin"; + $config{directive_description_dir} = "ikiwiki/directive"; } else { - $config{directive_description_dir}=~s/\/+$//; + $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}) { @@ -63,9 +64,11 @@ sub needsbuild (@) { #{{{ } } } -} # }}} -sub preprocess (@) { #{{{ + return $needsbuild; +} + +sub preprocess (@) { my %params=@_; $pagestate{$params{destpage}}{listdirectives}{shown}=$pluginstring; @@ -76,21 +79,22 @@ sub preprocess (@) { #{{{ @pluginlist = @fulllist; } else { - @pluginlist = @earlylist; + @pluginlist = @shortlist; } my $result = '