rename plugin

I don't want to be stuck renameing it later if preprocessor directives are
turned into postprocessor directives. Also, "directives" is shorter and
clearer than "preprocessors".

diff --git a/IkiWiki/Plugin/listpreprocessors.pm b/IkiWiki/Plugin/listdirectives.pm
similarity index 51%
rename from IkiWiki/Plugin/listpreprocessors.pm
rename to IkiWiki/Plugin/listdirectives.pm
index ca58ef1a136654423aa985dced6b5f0fd21de73c..fe4aee3bbb8393a60941f32bd1092341ec8da230 100644 (file)
--- a/IkiWiki/Plugin/listpreprocessors.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -1,16 +1,16 @@
 #!/usr/bin/perl
-# Ikiwiki listpreprocessors plugin.
-package IkiWiki::Plugin::listpreprocessors;
+# Ikiwiki listdirectives plugin.
+package IkiWiki::Plugin::listdirectives;
 
 use warnings;
 use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
-       hook(type => "getsetup", id => "listpreprocessors", call => \&getsetup);
-       hook(type => "checkconfig", id => "listpreprocessors", call => \&checkconfig);
-       hook(type => "needsbuild", id => "listpreprocessors", call => \&needsbuild);
-       hook(type => "preprocess", id => "listpreprocessors", call => \&preprocess);
+       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 () { #{{{
@@ -19,9 +19,9 @@ sub getsetup () { #{{{
                        safe => 1,
                        rebuild => undef,
                },
-               preprocessor_description_dir => {
+               directive_description_dir => {
                        type => "string",
-                       description => "directory in srcdir that contains preprocessor descriptions",
+                       description => "directory in srcdir that contains PreprocessorDirective descriptions",
                        example => "ikiwiki/plugin",
                        safe => 1,
                        rebuild => 1,
@@ -33,11 +33,11 @@ my @earlylist;
 my $pluginstring;
 
 sub checkconfig () { #{{{
-       if (! defined $config{preprocessor_description_dir}) {
-               $config{preprocessor_description_dir} = "ikiwiki/plugin";
+       if (! defined $config{directive_description_dir}) {
+               $config{directive_description_dir} = "ikiwiki/plugin";
        }
        else {
-               $config{preprocessor_description_dir}=~s/\/+$//;
+               $config{directive_description_dir}=~s/\/+$//;
        }
 
        @earlylist = sort( keys %{ $IkiWiki::hooks{preprocess} } );
@@ -50,16 +50,16 @@ sub needsbuild (@) { #{{{
        $pluginstring = join (' ', @earlylist) . " : ". join (' ', @fulllist);
 
        foreach my $page (keys %pagestate) {
-               if (exists $pagestate{$page}{listpreprocessors}{shown}) {
-                       if ($pagestate{$page}{listpreprocessors}{shown} ne $pluginstring) {
+               if (exists $pagestate{$page}{listdirectives}{shown}) {
+                       if ($pagestate{$page}{listdirectives}{shown} ne $pluginstring) {
                                push @$needsbuild, $pagesources{$page};
                        }
                        if (exists $pagesources{$page} &&
                            grep { $_ eq $pagesources{$page} } @$needsbuild) {
                                # remove state, will be re-added if
-                               # the [[!listpreprocessors]] is still there during the
+                               # the [[!listdirectives]] is still there during the
                                # rebuild
-                               delete $pagestate{$page}{listpreprocessors}{shown};
+                               delete $pagestate{$page}{listdirectives}{shown};
                        }
                }
        }
@@ -68,7 +68,7 @@ sub needsbuild (@) { #{{{
 sub preprocess (@) { #{{{
        my %params=@_;
        
-       $pagestate{$params{destpage}}{listpreprocessors}{shown}=$pluginstring;
+       $pagestate{$params{destpage}}{listdirectives}{shown}=$pluginstring;
        
        my @pluginlist;
        
@@ -79,12 +79,12 @@ sub preprocess (@) { #{{{
                @pluginlist = @earlylist;
        }
        
-       my $result = '<ul class="listpreprocessors">';
+       my $result = '<ul class="listdirectives">';
        
        foreach my $plugin (@pluginlist) {
-               $result .= '<li class="listpreprocessors">';
+               $result .= '<li class="listdirectives">';
                $result .= htmllink($params{page}, $params{destpage},
-                       IkiWiki::linkpage($config{preprocessor_description_dir}."/".$plugin));
+                       IkiWiki::linkpage($config{directive_description_dir}."/".$plugin));
                $result .= '</li>';
        }
        

diff --git a/debian/copyright b/debian/copyright
index e7d1760ea6f05674b86ef24c390ea5c74bab95fd..b6c95ba990d66777cc6aad74c60e105341a429d4 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,7 +24,7 @@ Files: mercurial.pm
 Copyright: © 2006 Emanuele Aina
 License: GPL-2+
 
-Files: monotone.pm, listpreprocessors.pm
+Files: monotone.pm, listdirectives.pm
 Copyright: © 2007 William Uther
 License: GPL-2+