From b7351daacd0d4a041a51b43d99b7bf589de54f53 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 12:54:13 -0400
Subject: conditional: use yesno

---
 IkiWiki/Plugin/conditional.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin/conditional.pm')

diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index 7445dbdad..7ead701f2 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -29,7 +29,7 @@ sub preprocess_if (@) {
 	}
 
 	my $result=0;
-	if ((exists $params{all} && lc $params{all} eq "no") ||
+	if (! IkiWiki::yesno($params{all}) ||
 		# An optimisation to avoid needless looping over every page
 		# and adding of dependencies for simple uses of some of the
 		# tests.
-- 
cgit v1.2.3


From c7da9911580e9311981758922d354aea03b8074c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 13:02:03 -0400
Subject: indentation

---
 IkiWiki/Plugin/conditional.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'IkiWiki/Plugin/conditional.pm')

diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index 7ead701f2..bc7b8974d 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -30,10 +30,10 @@ sub preprocess_if (@) {
 
 	my $result=0;
 	if (! IkiWiki::yesno($params{all}) ||
-		# An optimisation to avoid needless looping over every page
-		# and adding of dependencies for simple uses of some of the
-		# tests.
-		$params{test} =~ /^([\s\!()]*((enabled|sourcepage|destpage|included)\([^)]*\)|(and|or))[\s\!()]*)+$/) {
+	    # An optimisation to avoid needless looping over every page
+	    # and adding of dependencies for simple uses of some of the
+	    # tests.
+	    $params{test} =~ /^([\s\!()]*((enabled|sourcepage|destpage|included)\([^)]*\)|(and|or))[\s\!()]*)+$/) {
 		add_depends($params{page}, "($params{test}) and $params{page}");
 		$result=pagespec_match($params{page}, $params{test},
 				location => $params{page},
-- 
cgit v1.2.3


From f9f7a6e9f34b120504bb1dc238a3a627e9a8e3dc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 13:07:50 -0400
Subject: conditional: use pagespec_match_list

---
 IkiWiki/Plugin/conditional.pm | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'IkiWiki/Plugin/conditional.pm')

diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index bc7b8974d..aad617812 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -31,8 +31,7 @@ sub preprocess_if (@) {
 	my $result=0;
 	if (! IkiWiki::yesno($params{all}) ||
 	    # An optimisation to avoid needless looping over every page
-	    # and adding of dependencies for simple uses of some of the
-	    # tests.
+	    # for simple uses of some of the tests.
 	    $params{test} =~ /^([\s\!()]*((enabled|sourcepage|destpage|included)\([^)]*\)|(and|or))[\s\!()]*)+$/) {
 		add_depends($params{page}, "($params{test}) and $params{page}");
 		$result=pagespec_match($params{page}, $params{test},
@@ -41,17 +40,12 @@ sub preprocess_if (@) {
 				destpage => $params{destpage});
 	}
 	else {
-		add_depends($params{page}, $params{test});
-
-		foreach my $page (keys %pagesources) {
-			if (pagespec_match($page, $params{test}, 
-					location => $params{page},
-					sourcepage => $params{page},
-					destpage => $params{destpage})) {
-				$result=1;
-				last;
-			}
-		}
+		$result=pagespec_match_list($params{page}, $params{test},
+			# stop after first match
+			num => 1,
+			sourcepage => $params{page},
+			destpage => $params{destpage},
+		);
 	}
 
 	my $ret;
-- 
cgit v1.2.3


From a63929f6cc7778ffc4ba57d784cdf2206ec650c7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 11 Feb 2010 22:24:15 -0500
Subject: Group related plugins into sections in the setup file, and drop
 unused rcs plugins from the setup file.

---
 IkiWiki/Plugin/anonok.pm            |  1 +
 IkiWiki/Plugin/blogspam.pm          |  1 +
 IkiWiki/Plugin/bzr.pm               |  1 +
 IkiWiki/Plugin/conditional.pm       |  1 +
 IkiWiki/Plugin/cvs.pm               |  1 +
 IkiWiki/Plugin/darcs.pm             |  1 +
 IkiWiki/Plugin/editpage.pm          |  1 +
 IkiWiki/Plugin/git.pm               |  1 +
 IkiWiki/Plugin/htmlscrubber.pm      |  1 +
 IkiWiki/Plugin/httpauth.pm          |  1 +
 IkiWiki/Plugin/inline.pm            |  1 +
 IkiWiki/Plugin/link.pm              |  1 +
 IkiWiki/Plugin/lockedit.pm          |  1 +
 IkiWiki/Plugin/mdwn.pm              |  1 +
 IkiWiki/Plugin/mercurial.pm         |  1 +
 IkiWiki/Plugin/meta.pm              |  1 +
 IkiWiki/Plugin/moderatedcomments.pm |  1 +
 IkiWiki/Plugin/monotone.pm          |  1 +
 IkiWiki/Plugin/opendiscussion.pm    |  1 +
 IkiWiki/Plugin/openid.pm            |  1 +
 IkiWiki/Plugin/parentlinks.pm       |  1 +
 IkiWiki/Plugin/passwordauth.pm      |  1 +
 IkiWiki/Plugin/recentchanges.pm     |  1 +
 IkiWiki/Plugin/signinedit.pm        |  1 +
 IkiWiki/Plugin/svn.pm               |  1 +
 IkiWiki/Plugin/tla.pm               |  1 +
 IkiWiki/Setup.pm                    | 32 ++++++++++++++++++++++++++------
 IkiWiki/Setup/Standard.pm           |  8 ++++++++
 debian/changelog                    |  2 ++
 doc/plugins/write.mdwn              | 13 ++++++++-----
 30 files changed, 70 insertions(+), 11 deletions(-)

(limited to 'IkiWiki/Plugin/conditional.pm')

diff --git a/IkiWiki/Plugin/anonok.pm b/IkiWiki/Plugin/anonok.pm
index 243b98920..0e74cbfad 100644
--- a/IkiWiki/Plugin/anonok.pm
+++ b/IkiWiki/Plugin/anonok.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		anonok_pagespec => {
 			type => "pagespec",
diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
index 626c8ec42..c4e5cf390 100644
--- a/IkiWiki/Plugin/blogspam.pm
+++ b/IkiWiki/Plugin/blogspam.pm
@@ -18,6 +18,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		blogspam_pagespec => {
 			type => 'pagespec',
diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm
index 883007367..1ffdc2353 100644
--- a/IkiWiki/Plugin/bzr.pm
+++ b/IkiWiki/Plugin/bzr.pm
@@ -36,6 +36,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		bzr_wrapper => {
 			type => "string",
diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index aad617812..beeddc672 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -16,6 +16,7 @@ sub getsetup {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "core",
 		},
 }
 
diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index f6db8bc98..26a3e9dd2 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -85,6 +85,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		cvsrepo => {
 			type => "string",
diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm
index 0d68f27e5..1c9538e83 100644
--- a/IkiWiki/Plugin/darcs.pm
+++ b/IkiWiki/Plugin/darcs.pm
@@ -92,6 +92,7 @@ sub getsetup() {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		darcs_wrapper => {
 			type => "string",
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 9211cca89..44fe5514a 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -17,6 +17,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "core",
 		},
 }
 
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 1eec6aee6..b02f4a5ed 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -68,6 +68,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		git_wrapper => {
 			type => "string",
diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index a249cdf7a..ee284a45c 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -40,6 +40,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "core",
 		},
 		htmlscrubber_skip => {
 			type => "pagespec",
diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index b2bb2701a..478f67446 100644
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -20,6 +20,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		cgiauthurl => {
 			type => "string",
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 401852513..44919e58c 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -49,6 +49,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "core",
 		},
 		rss => {
 			type => "boolean",
diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm
index 4c1add985..3838aec09 100644
--- a/IkiWiki/Plugin/link.pm
+++ b/IkiWiki/Plugin/link.pm
@@ -20,6 +20,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "core",
 		},
 }
 
diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index 74ddbb153..1466e8337 100644
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		locked_pages => {
 			type => "pagespec",
diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 3de59ef3d..4ddf097ba 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1, # format plugin
+			section => "core",
 		},
 		multimarkdown => {
 			type => "boolean",
diff --git a/IkiWiki/Plugin/mercurial.pm b/IkiWiki/Plugin/mercurial.pm
index 11fdec529..ea00a3364 100644
--- a/IkiWiki/Plugin/mercurial.pm
+++ b/IkiWiki/Plugin/mercurial.pm
@@ -36,6 +36,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		mercurial_wrapper => {
 			type => "string",
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 55c9ddbd1..5f046cb2a 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -20,6 +20,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "core",
 		},
 }
 
diff --git a/IkiWiki/Plugin/moderatedcomments.pm b/IkiWiki/Plugin/moderatedcomments.pm
index 2555927b7..afe1ceedf 100644
--- a/IkiWiki/Plugin/moderatedcomments.pm
+++ b/IkiWiki/Plugin/moderatedcomments.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		moderate_users => {
 			type => 'boolean',
diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm
index 9502804f1..c33cf7e3a 100644
--- a/IkiWiki/Plugin/monotone.pm
+++ b/IkiWiki/Plugin/monotone.pm
@@ -68,6 +68,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		mtn_wrapper => {
 			type => "string",
diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm
index 5a455940b..2805f60ef 100644
--- a/IkiWiki/Plugin/opendiscussion.pm
+++ b/IkiWiki/Plugin/opendiscussion.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 }
 
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 382d8286f..bb99446b4 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -26,6 +26,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		openidsignup => {
 			type => "string",
diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm
index e678a057d..728bbc399 100644
--- a/IkiWiki/Plugin/parentlinks.pm
+++ b/IkiWiki/Plugin/parentlinks.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "core",
 		},
 }
 
diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index c07065b7d..4848b47bb 100644
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -19,6 +19,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		account_creation_password => {
 			type => "string",
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 5c7b71aaa..04219b721 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -22,6 +22,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
+			section => "core",
 		},
 		recentchangespage => {
 			type => "string",
diff --git a/IkiWiki/Plugin/signinedit.pm b/IkiWiki/Plugin/signinedit.pm
index 8b44a68f7..31160c02f 100644
--- a/IkiWiki/Plugin/signinedit.pm
+++ b/IkiWiki/Plugin/signinedit.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 }
 
diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index 06b987f51..7d27ec842 100644
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -44,6 +44,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		svnrepo => {
 			type => "string",
diff --git a/IkiWiki/Plugin/tla.pm b/IkiWiki/Plugin/tla.pm
index f4b20a6ec..16d73b136 100644
--- a/IkiWiki/Plugin/tla.pm
+++ b/IkiWiki/Plugin/tla.pm
@@ -34,6 +34,7 @@ sub getsetup () {
 		plugin => {
 			safe => 0, # rcs plugin
 			rebuild => undef,
+			section => "rcs",
 		},
 		tla_wrapper => {
 			type => "string",
diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 8a25ecc57..b21bd7bfe 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -77,7 +77,6 @@ sub merge ($) {
 sub getsetup () {
 	# Gets all available setup data from all plugins. Returns an
 	# ordered list of [plugin, setup] pairs.
-	my @ret;
 
         # disable logging to syslog while dumping, broken plugins may
 	# whine when loaded
@@ -85,27 +84,48 @@ sub getsetup () {
         $config{syslog}=undef;
 
 	# Load all plugins, so that all setup options are available.
-	my @plugins=grep { $_ ne $config{rcs} } sort(IkiWiki::listplugins());
-	unshift @plugins, $config{rcs} if $config{rcs}; # rcs plugin 1st
+	my @plugins=IkiWiki::listplugins();
 	foreach my $plugin (@plugins) {
 		eval { IkiWiki::loadplugin($plugin) };
 		if (exists $IkiWiki::hooks{checkconfig}{$plugin}{call}) {
 			my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() };
 		}
 	}
-
+	
+	my %sections;
 	foreach my $plugin (@plugins) {
 		if (exists $IkiWiki::hooks{getsetup}{$plugin}{call}) {
 			# use an array rather than a hash, to preserve order
 			my @s=eval { $IkiWiki::hooks{getsetup}{$plugin}{call}->() };
 			next unless @s;
-			push @ret, [ $plugin, \@s ],
+
+			# set default section value (note use of shared
+			# hashref between array and hash)
+			my %s=@s;
+			if (! exists $s{plugin} || ! $s{plugin}->{section}) {
+				$s{plugin}->{section}="misc";
+			}
+
+			# only the selected rcs plugin is included
+			if ($config{rcs} && $plugin eq $config{rcs}) {
+				$s{plugin}->{section}="core";
+			}
+			elsif ($s{plugin}->{section} eq "rcs") {
+				next;
+			}
+
+			push @{$sections{$s{plugin}->{section}}}, [ $plugin, \@s ];
 		}
 	}
 	
         $config{syslog}=$syslog;
 
-	return @ret;
+	return map { sort { $a->[0] cmp $b->[0] } @{$sections{$_}} }
+		sort { # core first, then alphabetical
+			($b eq "core") <=> ($a eq "core")
+			   ||
+			$a cmp $b
+		} keys %sections;
 }
 
 sub dump ($) {
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 951bcfc56..c99dbb620 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -90,10 +90,18 @@ sub gendump ($) {
 	# disable logging to syslog while dumping
 	$config{syslog}=undef;
 
+	my $curr_section;
 	push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
 	foreach my $pair (IkiWiki::Setup::getsetup()) {
 		my $plugin=$pair->[0];
 		my $setup=$pair->[1];
+		my %s=@{$setup};
+		my $section=$s{plugin}->{section};
+		if (! defined $curr_section || $curr_section ne $section) {
+			$curr_section=$section;
+			push @ret, "", "\t#", "\t# $section plugins", "\t#";
+		}
+
 		my @values=dumpvalues(\%setup, @{$setup});
 		if (@values) {
 			push @ret, "", "\t# $plugin plugin", @values;
diff --git a/debian/changelog b/debian/changelog
index d74abd0f9..f24a453c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low
   * httpauth: Add httpauth_pagespec setting that can be used to limit
     pages to only being edited via users authed with httpauth.
   * Allow globs to be used in user() pagespecs.
+  * Group related plugins into sections in the setup file, and drop
+    unused rcs plugins from the setup file.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 26 Jan 2010 22:25:33 -0500
 
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 082f0e38f..68454d56c 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -457,6 +457,12 @@ describing the option. There can also be an item named "plugin", which
 describes the plugin as a whole. For example:
 
                 return
+			plugin => {
+				description => "description of this plugin",
+				safe => 1,
+				rebuild => 1,
+				section => "misc",
+			},
 			option_foo => {
 				type => "boolean",
 				description => "enable foo?",
@@ -471,11 +477,6 @@ describes the plugin as a whole. For example:
 				safe => 1,
 				rebuild => 0,
 			},
-			plugin => {
-				description => "description of this plugin",
-				safe => 1,
-				rebuild => 1,
-			},
 
 * `type` can be "boolean", "string", "integer", "pagespec",
   or "internal" (used for values that are not user-visible). The type is
@@ -496,6 +497,8 @@ describes the plugin as a whole. For example:
   the plugin) will require a wiki rebuild, false if no rebuild is needed,
   and undef if a rebuild could be needed in some circumstances, but is not
   strictly required.
+* `section` can optionally specify which section in the config file
+  the plugin fits in.
 
 ### genwrapper
 
-- 
cgit v1.2.3


From 34fff64e7b56f4f8cd99430f9f927d2a5d1e3619 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Feb 2010 06:35:52 -0500
Subject: setup file ordering

---
 IkiWiki/Plugin/aggregate.pm      | 1 -
 IkiWiki/Plugin/amazon_s3.pm      | 1 -
 IkiWiki/Plugin/autoindex.pm      | 1 -
 IkiWiki/Plugin/calendar.pm       | 1 +
 IkiWiki/Plugin/color.pm          | 1 +
 IkiWiki/Plugin/conditional.pm    | 2 +-
 IkiWiki/Plugin/cutpaste.pm       | 1 +
 IkiWiki/Plugin/date.pm           | 1 +
 IkiWiki/Plugin/format.pm         | 1 +
 IkiWiki/Plugin/fortune.pm        | 1 +
 IkiWiki/Plugin/graphviz.pm       | 1 +
 IkiWiki/Plugin/haiku.pm          | 1 +
 IkiWiki/Plugin/img.pm            | 1 +
 IkiWiki/Plugin/linkmap.pm        | 1 +
 IkiWiki/Plugin/listdirectives.pm | 1 +
 IkiWiki/Plugin/map.pm            | 1 +
 IkiWiki/Plugin/more.pm           | 1 +
 IkiWiki/Plugin/orphans.pm        | 1 +
 IkiWiki/Plugin/pagecount.pm      | 1 +
 IkiWiki/Plugin/pagestats.pm      | 1 +
 IkiWiki/Plugin/pingee.pm         | 1 -
 IkiWiki/Plugin/pinger.pm         | 1 -
 IkiWiki/Plugin/poll.pm           | 1 +
 IkiWiki/Plugin/polygen.pm        | 1 +
 IkiWiki/Plugin/postsparkline.pm  | 1 +
 IkiWiki/Plugin/progress.pm       | 1 +
 IkiWiki/Plugin/recentchanges.pm  | 1 -
 IkiWiki/Plugin/rsync.pm          | 1 -
 IkiWiki/Plugin/shortcut.pm       | 1 +
 IkiWiki/Plugin/sparkline.pm      | 1 +
 IkiWiki/Plugin/table.pm          | 1 +
 IkiWiki/Plugin/template.pm       | 1 +
 IkiWiki/Plugin/testpagespec.pm   | 1 -
 IkiWiki/Plugin/teximg.pm         | 1 +
 IkiWiki/Plugin/toc.pm            | 1 +
 IkiWiki/Plugin/toggle.pm         | 1 +
 IkiWiki/Plugin/underlay.pm       | 1 -
 IkiWiki/Plugin/version.pm        | 1 +
 IkiWiki/Setup.pm                 | 4 +++-
 39 files changed, 32 insertions(+), 11 deletions(-)

(limited to 'IkiWiki/Plugin/conditional.pm')

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index c18d413e6..5a9eb433d 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -43,7 +43,6 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
-			section => "special-purpose",
 		},
 		aggregateinternal => {
 			type => "boolean",
diff --git a/IkiWiki/Plugin/amazon_s3.pm b/IkiWiki/Plugin/amazon_s3.pm
index f2f4dbcf2..cfd8cd347 100644
--- a/IkiWiki/Plugin/amazon_s3.pm
+++ b/IkiWiki/Plugin/amazon_s3.pm
@@ -45,7 +45,6 @@ sub getsetup () {
 		plugin => {
 			safe => 0,
 			rebuild => 0,
-			section => "special-purpose",
 		},
 		amazon_s3_key_id => {
 			type => "string",
diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index e50464dca..555856b11 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -16,7 +16,6 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
-			section => "special-purpose",
 		},
 }
 
diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 2b87451ce..aaee2c610 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -38,6 +38,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 		archivebase => {
 			type => "string",
diff --git a/IkiWiki/Plugin/color.pm b/IkiWiki/Plugin/color.pm
index b9407ba28..d550dd9f4 100644
--- a/IkiWiki/Plugin/color.pm
+++ b/IkiWiki/Plugin/color.pm
@@ -18,6 +18,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index beeddc672..892b1cff9 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -16,7 +16,7 @@ sub getsetup {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
-			section => "core",
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/cutpaste.pm b/IkiWiki/Plugin/cutpaste.pm
index 417442f34..01e9ce043 100644
--- a/IkiWiki/Plugin/cutpaste.pm
+++ b/IkiWiki/Plugin/cutpaste.pm
@@ -19,6 +19,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/date.pm b/IkiWiki/Plugin/date.pm
index 652e6df0a..ea5c9a9c5 100644
--- a/IkiWiki/Plugin/date.pm
+++ b/IkiWiki/Plugin/date.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/format.pm b/IkiWiki/Plugin/format.pm
index c8041209f..d54e71131 100644
--- a/IkiWiki/Plugin/format.pm
+++ b/IkiWiki/Plugin/format.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/fortune.pm b/IkiWiki/Plugin/fortune.pm
index 17e57dea1..f481c7eac 100644
--- a/IkiWiki/Plugin/fortune.pm
+++ b/IkiWiki/Plugin/fortune.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index 32e994d6b..bec122076 100644
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -18,6 +18,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/haiku.pm b/IkiWiki/Plugin/haiku.pm
index 5a062a276..bf23dce67 100644
--- a/IkiWiki/Plugin/haiku.pm
+++ b/IkiWiki/Plugin/haiku.pm
@@ -16,6 +16,7 @@ sub getsetup {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 82db15a7e..f06121578 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -19,6 +19,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 68eb6c8c6..ac26e072e 100644
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm
index 09f08c567..8a67f7160 100644
--- a/IkiWiki/Plugin/listdirectives.pm
+++ b/IkiWiki/Plugin/listdirectives.pm
@@ -19,6 +19,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 		directive_description_dir => {
 			type => "string",
diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 788b96827..ce3ac1d24 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -21,6 +21,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/more.pm b/IkiWiki/Plugin/more.pm
index 77d5fb077..266c8e1d0 100644
--- a/IkiWiki/Plugin/more.pm
+++ b/IkiWiki/Plugin/more.pm
@@ -17,6 +17,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm
index 702943f87..e3cc3c940 100644
--- a/IkiWiki/Plugin/orphans.pm
+++ b/IkiWiki/Plugin/orphans.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index 8d36f057e..dd5de3c83 100644
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -15,6 +15,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index 4313aa271..1c0b46830 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -27,6 +27,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/pingee.pm b/IkiWiki/Plugin/pingee.pm
index aafce9e70..f5386d0ca 100644
--- a/IkiWiki/Plugin/pingee.pm
+++ b/IkiWiki/Plugin/pingee.pm
@@ -15,7 +15,6 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
-			section => "special-purpose",
 		},
 }
 
diff --git a/IkiWiki/Plugin/pinger.pm b/IkiWiki/Plugin/pinger.pm
index a797fc7bd..c20ecb5d4 100644
--- a/IkiWiki/Plugin/pinger.pm
+++ b/IkiWiki/Plugin/pinger.pm
@@ -21,7 +21,6 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
-			section => "special-purpose",
 		},
 		pinger_timeout => {
 			type => "integer",
diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm
index bc1e3501e..6bc4579c2 100644
--- a/IkiWiki/Plugin/poll.pm
+++ b/IkiWiki/Plugin/poll.pm
@@ -17,6 +17,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/polygen.pm b/IkiWiki/Plugin/polygen.pm
index bc21d71c7..78e3611e1 100644
--- a/IkiWiki/Plugin/polygen.pm
+++ b/IkiWiki/Plugin/polygen.pm
@@ -20,6 +20,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/postsparkline.pm b/IkiWiki/Plugin/postsparkline.pm
index 0d5a12e33..2fae9c5fe 100644
--- a/IkiWiki/Plugin/postsparkline.pm
+++ b/IkiWiki/Plugin/postsparkline.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm
index fe64b40b1..d27df5ca8 100644
--- a/IkiWiki/Plugin/progress.pm
+++ b/IkiWiki/Plugin/progress.pm
@@ -18,6 +18,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 04219b721..5c7b71aaa 100644
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -22,7 +22,6 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 1,
-			section => "core",
 		},
 		recentchangespage => {
 			type => "string",
diff --git a/IkiWiki/Plugin/rsync.pm b/IkiWiki/Plugin/rsync.pm
index 8dd983be7..e38801e4a 100644
--- a/IkiWiki/Plugin/rsync.pm
+++ b/IkiWiki/Plugin/rsync.pm
@@ -16,7 +16,6 @@ sub getsetup () {
 		plugin => {
 			safe => 0,
 			rebuild => 0,
-			section => "special-purpose",
 		},
 		rsync_command => {
 			type => "string",
diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm
index 1840a5722..0cedbe447 100644
--- a/IkiWiki/Plugin/shortcut.pm
+++ b/IkiWiki/Plugin/shortcut.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/sparkline.pm b/IkiWiki/Plugin/sparkline.pm
index fb4849492..42665ac63 100644
--- a/IkiWiki/Plugin/sparkline.pm
+++ b/IkiWiki/Plugin/sparkline.pm
@@ -24,6 +24,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm
index 96d63f455..2edd1eacd 100644
--- a/IkiWiki/Plugin/table.pm
+++ b/IkiWiki/Plugin/table.pm
@@ -16,6 +16,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index 39d9667f9..3e024c5f8 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -19,6 +19,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/testpagespec.pm b/IkiWiki/Plugin/testpagespec.pm
index 17a77cb69..440fca33b 100644
--- a/IkiWiki/Plugin/testpagespec.pm
+++ b/IkiWiki/Plugin/testpagespec.pm
@@ -15,7 +15,6 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
-			section => "special-purpose",
 		},
 }
 
diff --git a/IkiWiki/Plugin/teximg.pm b/IkiWiki/Plugin/teximg.pm
index f92ed0132..0aaa79698 100644
--- a/IkiWiki/Plugin/teximg.pm
+++ b/IkiWiki/Plugin/teximg.pm
@@ -31,6 +31,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 		teximg_dvipng => {
 			type => "boolean",
diff --git a/IkiWiki/Plugin/toc.pm b/IkiWiki/Plugin/toc.pm
index b8537d3eb..ac07b9af6 100644
--- a/IkiWiki/Plugin/toc.pm
+++ b/IkiWiki/Plugin/toc.pm
@@ -18,6 +18,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index ef066a42f..f9c899540 100644
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -20,6 +20,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm
index ab74fc37e..116fe7324 100644
--- a/IkiWiki/Plugin/underlay.pm
+++ b/IkiWiki/Plugin/underlay.pm
@@ -18,7 +18,6 @@ sub getsetup () {
 		plugin => {
 			safe => 0,
 			rebuild => undef,
-			section => "special-purpose",
 		},
 		add_underlays => {
 			type => "string",
diff --git a/IkiWiki/Plugin/version.pm b/IkiWiki/Plugin/version.pm
index 587cd55fa..c13643478 100644
--- a/IkiWiki/Plugin/version.pm
+++ b/IkiWiki/Plugin/version.pm
@@ -17,6 +17,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 7a7683fab..a3fd5ce66 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -121,9 +121,11 @@ sub getsetup () {
         $config{syslog}=$syslog;
 
 	return map { sort { $a->[0] cmp $b->[0] } @{$sections{$_}} }
-		sort { # core first, then alphabetical
+		sort { # core first, other last, otherwise alphabetical
 			($b eq "core") <=> ($a eq "core")
 			   ||
+			($a eq "other") <=> ($b eq "other")
+			   ||
 			$a cmp $b
 		} keys %sections;
 }
-- 
cgit v1.2.3


From 50d08bc2aea1d8d52e07ae1750e73b722bd2db24 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Apr 2010 18:18:48 -0400
Subject: conditional: Fix bug that forced "all" mode off by default.

Commit b7351daacd0d4a041a51b43d99b7bf589de54f53 introduced the bug.
---
 IkiWiki/Plugin/conditional.pm | 2 +-
 debian/changelog              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin/conditional.pm')

diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index 892b1cff9..8a5796149 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -30,7 +30,7 @@ sub preprocess_if (@) {
 	}
 
 	my $result=0;
-	if (! IkiWiki::yesno($params{all}) ||
+	if ((exists $params{all} && ! IkiWiki::yesno($params{all})) ||
 	    # An optimisation to avoid needless looping over every page
 	    # for simple uses of some of the tests.
 	    $params{test} =~ /^([\s\!()]*((enabled|sourcepage|destpage|included)\([^)]*\)|(and|or))[\s\!()]*)+$/) {
diff --git a/debian/changelog b/debian/changelog
index c379253d7..dfb94ae22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low
     shown on a page.
   * Enable calendar and sidebar in auto-blog.setup.
   * sidebar: Add global_sidebars setting.
+  * conditional: Fix bug that forced "all" mode off by default.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 04 Apr 2010 12:17:11 -0400
 
-- 
cgit v1.2.3


From 192ce7a238af9021b0fd6dd571f22409af81ebaf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Jul 2010 15:00:51 -0400
Subject: remove unnecessary and troublesome filter calls

This better defines what the filter hook is passed, to only be the raw,
complete text of a page. Not some snippet, or data read in from an
unrelated template.

Several plugins that filtered text that originates from an (already
filtered) page were modified not to do that. Note that this was not
done very consistently before; other plugins that receive text from a
page called preprocess on it w/o first calling filter.

The template plugin gets text from elsewhere, and was also changed not to
filter it. That leads to one known regression -- the embed plugin cannot
be used to embed stuff in templates now. But that plugin is deprecated
anyway.

Later we may want to increase the coverage of what is filtered. Perhaps
a good goal would be to allow writing a filter plugin that filters
out unwanted words, from any input. We're not there yet; not only
does the template plugin load unfiltered text from its templates now,
but so can the table plugin, and other plugins that use templates (like
inline!). I think we can cross that bridge when we come to it. If I wanted
such a censoring plugin, I'd probably make it use a sanitize hook instead,
for the better coverage.

For now I am concentrating on the needs of the two non-deprecated users
of filter. This should fix bugs/po_vs_templates, and it probably fixes
an obscure bug around txt's use of filter for robots.txt.
---
 IkiWiki/Plugin/color.pm       | 11 +++++------
 IkiWiki/Plugin/comments.pm    |  2 --
 IkiWiki/Plugin/conditional.pm |  3 +--
 IkiWiki/Plugin/cutpaste.pm    |  8 ++++----
 IkiWiki/Plugin/more.pm        |  6 +++---
 IkiWiki/Plugin/sidebar.pm     |  3 +--
 IkiWiki/Plugin/template.pm    |  6 ++----
 IkiWiki/Plugin/toggle.pm      |  3 +--
 doc/plugins/write.mdwn        |  4 ++--
 9 files changed, 19 insertions(+), 27 deletions(-)

(limited to 'IkiWiki/Plugin/conditional.pm')

diff --git a/IkiWiki/Plugin/color.pm b/IkiWiki/Plugin/color.pm
index d550dd9f4..9bb2359ce 100644
--- a/IkiWiki/Plugin/color.pm
+++ b/IkiWiki/Plugin/color.pm
@@ -61,12 +61,11 @@ sub replace_preserved_style ($) {
 sub preprocess (@) {
 	my %params = @_;
 
-	# Preprocess the text to expand any preprocessor directives
-	# embedded inside it.
-	$params{text} = IkiWiki::preprocess($params{page}, $params{destpage},
-				IkiWiki::filter($params{page}, $params{destpage}, $params{text}));
-
-	return preserve_style($params{foreground}, $params{background}, $params{text});
+	return preserve_style($params{foreground}, $params{background},
+		# Preprocess the text to expand any preprocessor directives
+		# embedded inside it.
+		IkiWiki::preprocess($params{page}, $params{destpage},
+			$params{text}));
 }
 
 sub format (@) {
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index d34951570..64eb7fb09 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -142,8 +142,6 @@ sub preprocess {
 	}
 	$content =~ s/\\"/"/g;
 
-	$content = IkiWiki::filter($page, $params{destpage}, $content);
-
 	if ($config{comments_allowdirectives}) {
 		$content = IkiWiki::preprocess($page, $params{destpage},
 			$content);
diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
index 8a5796149..026078b3c 100644
--- a/IkiWiki/Plugin/conditional.pm
+++ b/IkiWiki/Plugin/conditional.pm
@@ -59,8 +59,7 @@ sub preprocess_if (@) {
 	else {
 		$ret="";
 	}
-	return IkiWiki::preprocess($params{page}, $params{destpage}, 
-		IkiWiki::filter($params{page}, $params{destpage}, $ret));
+	return IkiWiki::preprocess($params{page}, $params{destpage}, $ret);
 }
 
 package IkiWiki::PageSpec;
diff --git a/IkiWiki/Plugin/cutpaste.pm b/IkiWiki/Plugin/cutpaste.pm
index 01e9ce043..4a8817168 100644
--- a/IkiWiki/Plugin/cutpaste.pm
+++ b/IkiWiki/Plugin/cutpaste.pm
@@ -50,8 +50,8 @@ sub preprocess_copy (@) {
 	$savedtext{$params{page}} = {} if not exists $savedtext{$params{"page"}};
 	$savedtext{$params{page}}->{$params{id}} = $params{text};
 
-	return IkiWiki::preprocess($params{page}, $params{destpage}, 
-		IkiWiki::filter($params{page}, $params{destpage}, $params{text})) if defined wantarray;
+	return IkiWiki::preprocess($params{page}, $params{destpage}, $params{text})
+		if defined wantarray;
 }
 
 sub preprocess_paste (@) {
@@ -70,8 +70,8 @@ sub preprocess_paste (@) {
 		error sprintf(gettext('no text was copied in this page with id %s'), $params{id});
 	}
 
-	return IkiWiki::preprocess($params{page}, $params{destpage}, 
-		IkiWiki::filter($params{page}, $params{destpage}, $savedtext{$params{page}}->{$params{id}}));
+	return IkiWiki::preprocess($params{page}, $params{destpage},
+		$savedtext{$params{page}}->{$params{id}});
 }
 
 1;
diff --git a/IkiWiki/Plugin/more.pm b/IkiWiki/Plugin/more.pm
index 266c8e1d0..80e339a1b 100644
--- a/IkiWiki/Plugin/more.pm
+++ b/IkiWiki/Plugin/more.pm
@@ -33,9 +33,9 @@ sub preprocess (@) {
 				anchor => "more");
 	}
 	else {
-		$params{text}=IkiWiki::preprocess($params{page}, $params{destpage},
-			IkiWiki::filter($params{page}, $params{destpage}, $params{text}));
-		return "<a name=\"more\"></a>\n\n".$params{text};
+		return "<a name=\"more\"></a>\n\n".
+			IkiWiki::preprocess($params{page}, $params{destpage},
+				$params{text});
 	}
 }
 
diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm
index 2d495db2c..c1146b7b4 100644
--- a/IkiWiki/Plugin/sidebar.pm
+++ b/IkiWiki/Plugin/sidebar.pm
@@ -47,8 +47,7 @@ sub preprocess (@) {
 		$pagesidebar{$page}=
 			IkiWiki::htmlize($page, $page, $type,
 			IkiWiki::linkify($page, $page,
-			IkiWiki::preprocess($page, $page,
-			IkiWiki::filter($page, $page, $params{content}))));
+			IkiWiki::preprocess($page, $page, $params{content})));
 	}
 
 	return "";
diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
index b8c2f05b2..db26bfe31 100644
--- a/IkiWiki/Plugin/template.pm
+++ b/IkiWiki/Plugin/template.pm
@@ -53,8 +53,7 @@ sub preprocess (@) {
 
 	foreach my $param (keys %params) {
 		my $value=IkiWiki::preprocess($params{page}, $params{destpage},
-		          IkiWiki::filter($params{page}, $params{destpage},
-		          $params{$param}), $scan);
+		          $params{$param}, $scan);
 		if ($template->query(name => $param)) {
 			my $htmlvalue=IkiWiki::htmlize($params{page}, $params{destpage},
 					pagetype($pagesources{$params{page}}),
@@ -69,8 +68,7 @@ sub preprocess (@) {
 	}
 
 	return IkiWiki::preprocess($params{page}, $params{destpage},
-	       IkiWiki::filter($params{page}, $params{destpage},
-	       $template->output), $scan);
+	       $template->output, $scan);
 }
 
 1
diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index 3319421d9..20967d3fd 100644
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -50,8 +50,7 @@ sub preprocess_toggleable (@) {
 
 	# Preprocess the text to expand any preprocessor directives
 	# embedded inside it.
-	$params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, 
-		IkiWiki::filter($params{page}, $params{destpage}, $params{text}));
+	$params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, $params{text});
 	
 	my $id=genid($params{page}, $params{id});
 	my $class=(lc($params{open}) ne "yes") ? "toggleable" : "toggleable-open";
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index bb8012342..2e3902388 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -198,8 +198,8 @@ value is ignored.
 
 	hook(type => "filter", id => "foo", call => \&filter);
 
-Runs on the raw source of a page, before anything else touches it, and can
-make arbitrary changes. The function is passed named parameters "page",
+Runs on the full raw source of a page, before anything else touches it, and
+can make arbitrary changes. The function is passed named parameters "page",
 "destpage", and "content". It should return the filtered content.
 
 ### preprocess
-- 
cgit v1.2.3