From 63f62ef52059c4acc1306e50dd32671a20bd9d55 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 28 Dec 2007 16:55:20 -0500 Subject: * conditional: Improve regexp testing for simple uses of pagespecs that match only the page using the directive, adding 'included()' and supporting negated pagespecs and added whitespace. --- 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 2a25135fe..57db01054 100644 --- a/IkiWiki/Plugin/conditional.pm +++ b/IkiWiki/Plugin/conditional.pm @@ -24,7 +24,7 @@ sub preprocess_if (@) { #{{{ # An optimisation to avoid needless looping over every page # and adding of dependencies for simple uses of some of the # tests. - $params{test} =~ /^(enabled|sourcepage|destpage)\((.*)\)$/) { + $params{test} =~ /^\s*\!?\s*(enabled|sourcepage|destpage|included)\((.*)\)\s*$/) { add_depends($params{page}, "$params{test} and $params{page}"); $result=pagespec_match($params{page}, $params{test}, location => $params{page}, -- cgit v1.2.3