po plugin: do not allow msgmerge to create backup files

[git.ikiwiki.info.git] / doc / todo / tracking_bugs_with_dependencies.mdwn

diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn
index 5e4bf75e6cf532f0519c781428f1813662604604..3af0458bd25bb403bd5cdf17b00b7aae5fdf5473 100644 (file)
--- a/doc/todo/tracking_bugs_with_dependencies.mdwn
+++ b/doc/todo/tracking_bugs_with_dependencies.mdwn
@@ -126,476 +126,312 @@ The following three inlines work for me with this patch:
 > needing to change the prototype of every pagespec function, since several
 > plugins define them too. --[[Joey]]
 
 > needing to change the prototype of every pagespec function, since several
 > plugins define them too. --[[Joey]]
 

+>> Maybe - it needs more thought.  I also considered it when I was going though changing all those plugins :).
+>> My concern was that `%params` can contain other user-defined parameters,
+>> e.g. `link(target, otherparameter)`, and that means that the specFuncs could be clobbered by a user (or other
+>> weird security hole).  I thought it better to separate it, but I didn't think about it too hard.  I might move it to
+>> the first parameter rather than the second.  Ikiwiki is my first real perl hacking and I'm still discovering
+>> good ways to write things in perl.
+>>
+>>>> `%params` contains the parameters passed to `pagespec_match`, not
+>>>> user-supplied parameters. The user-supplied parameter to a function
+>>>> like `match_glob()` or `match_link()` is passed in the second positional parameter. --[[Joey]]
+
+>>>>> OK.  That seems reasonable then.  The only problem is that my PERLfu is not strong enough to make it
+>>>>> work.  I really have to wonder what substance was influencing the designers of PERL...
+>>>>> I can't figure out how to use the %params.  And I'm pissed off enough with PERL that I'm not going
+>>>>> to try and figure it out any more.  There are two patches below now.  The first one uses an extra
+>>>>> argument and works.  The second one tries to use %params and doesn't - take your pick :-). -- [[Will]]
+
+>> What do you think is best to do about `is_globlist()`?  At the moment it requires that the 'second word', as
+>> delimited by a space and ignoring parens, is 'and' or 'or'.  This doesn't hold in the above example pagespecs (so I just hard wired it to 0 to test my patch).
+>> My thought was just to search for 'and' or 'or' as words anywhere in the pagespec.  Thoughts?
+
+>>> Dunno, we could just finish deprecating it. Or change the regexp to
+>>> skip over spaces in parens. (`/[^\s]+\s+([^)]+)/`) --[[Joey]]
+
+>>>> I think I have a working regexp now.
+
+>> Oh, one more thing.  In pagespec_translate (now pagespec_makeperl), there is a part of the regular expression for `# any other text`.
+>> This contained `()`, which has no effect.  I replaced that with `\(\)`, but that is a change in the definition of pagespecs unrelated to the
+>> rest of this patch. In a related change, commands were not able to contain `)` in their parameters.  I've extended that so the cannot
+>> contain `(` or `)`.  -- [[Will]]
+
+>>> `[^\s()]+` is a character class matching all characters not spaces or
+>>> parens. Since the pervious terminals in the regexp consume most
+>>> occurances of an open paren or close paren, it's unlikely for one to
+>>> get through to that part of the regexp. For example, "foo()" will be
+>>> matched by the command matcher; "(foo)" will be matched by the open
+>>> paren literal terminal. "foo(" and "foo)" can get through to the
+>>> end, and would be matched as a page name, if it didn't exclude parens.
+>>>
+>>> So why exclude them? Well, consider "foo and(bar and baz)". We don't
+>>> want it to match "and(" as a page name!
+>>> 
+>>> Escaping the parens in the character class actually changes nothing; the
+>>> changed character class still matches all characters not spaces or
+>>> parens. (Try it!).
+>>> 
+>>> Re commands containing '(', I don't really see any reason not to
+>>> allow that, unless it breaks something. --[[Joey]]
+
+>>>> Oh, I didn't realise you didn't need to escape parens inside [].  All else I
+>>>> I understood.  I have stopped commands from containing parens because
+>>>> once you allow that then you might have a extra level of depth in the parsing
+>>>> of define() statements. -- [[Will]]
+
+>>> Updated patch.  Moved the specFuncsRef to the front of the arg list.  Still haven't thought through the security implications of
+>>> having it in `%params`.  I've also removed all the debugging `print` statements.  And I've updated the `is_globlist()` function.
+>>> I think this is ready for people other than me to have a play.  It is not well enough tested to commit just yet.
+>>> -- [[Will]]
+
+I've lost track of the indent level, so I'm going back to not indented - I think this is a working [[patch]] taking into
+account all comments above (which doesn't mean it is above reproach :) ).  --[[Will]]
+

 ----
 
 ----
 

-diff --git a/IkiWiki.pm b/IkiWiki.pm
-index e476521..07b71d7 100644
---- a/IkiWiki.pm
-+++ b/IkiWiki.pm
-@@ -1524,7 +1524,7 @@ sub globlist_to_pagespec ($) { #{{{
- 
- sub is_globlist ($) { #{{{
-       my $s=shift;
--      return ( $s =~ /[^\s]+\s+([^\s]+)/ && $1 ne "and" && $1 ne "or" );
-+      return 0; #( $s =~ /[^\s]+\s+([^\s]+)/ && $1 ne "and" && $1 ne "or" );
- } #}}}
- 
- sub safequote ($) { #{{{
-@@ -1605,7 +1605,7 @@ sub pagespec_merge ($$) { #{{{
-       return "($a) or ($b)";
- } #}}}
- 
--sub pagespec_translate ($) { #{{{
-+sub pagespec_makeperl ($) { #{{{
-       my $spec=shift;
- 
-       # Support for old-style GlobLists.
-@@ -1624,9 +1624,11 @@ sub pagespec_translate ($) { #{{{
-               |
-                       \)              # )
-               |
--                      \w+\([^\)]*\)   # command(params)
-+                      define\(\s*~\w+\s*,((\([^\(\)]*\)) | ([^\(\)]+))+\)     # define(~specName, spec) - spec can contain parens 1 deep
-+              |
-+                      \w+\([^\(\)]*\) # command(params) - params cannot contain parens
-               |
--                      [^\s()]+        # any other text
-+                      [^\s\(\)]+      # any other text
-               )
-               \s*             # ignore whitespace
-       }igx) {
-@@ -1640,16 +1642,23 @@ sub pagespec_translate ($) { #{{{
-               elsif ($word eq "(" || $word eq ")" || $word eq "!") {
-                       $code.=' '.$word;
-               }
-+              elsif ($word =~ /^define\(\s*~(\w+)\s*,(.*)\)$/) {
-+                      $code .= " (\$specFuncsRef->{$1}=";
-+                      #$code .= "memoize(";
-+                      $code .= pagespec_makeperl($2);
-+                      #$code .= ")";
-+                      $code .= ") ";
-+              }
-               elsif ($word =~ /^(\w+)\((.*)\)$/) {
-                       if (exists $IkiWiki::PageSpec::{"match_$1"}) {
--                              $code.="IkiWiki::PageSpec::match_$1(\$page, ".safequote($2).", \@_)";
-+                              $code.="IkiWiki::PageSpec::match_$1(\$page, \$specFuncsRef, ".safequote($2).", \@_)";
-                       }
-                       else {
-                               $code.=' 0';
-                       }
-               }
-               else {
--                      $code.=" IkiWiki::PageSpec::match_glob(\$page, ".safequote($word).", \@_)";
-+                      $code.=" IkiWiki::PageSpec::match_glob(\$page, \$specFuncsRef, ".safequote($word).", \@_)";
-               }
-       }
- 
-@@ -1657,8 +1666,18 @@ sub pagespec_translate ($) { #{{{
-               $code=0;
-       }
- 
-+      return 'sub { my $page=shift; my $specFuncsRef=shift; '.$code.' }';
-+} #}}}
-+
-+sub pagespec_translate ($) { #{{{
-+      my $spec=shift;
-+
-+      my $code = pagespec_makeperl($spec);
-+
-+      print "Spec '$spec' led to perl '$code'\n";
-+
-       no warnings;
--      return eval 'sub { my $page=shift; '.$code.' }';
-+      return eval $code;
- } #}}}
- 
- sub pagespec_match ($$;@) { #{{{
-@@ -1673,7 +1692,7 @@ sub pagespec_match ($$;@) { #{{{
- 
-       my $sub=pagespec_translate($spec);
-       return IkiWiki::FailReason->new("syntax error in pagespec \"$spec\"") if $@;
--      return $sub->($page, @params);
-+      return $sub->($page, {}, @params);
- } #}}}
- 
- sub pagespec_valid ($) { #{{{
-@@ -1722,13 +1741,77 @@ sub new { #{{{
- 
- package IkiWiki::PageSpec;
- 
--sub match_glob ($$;@) { #{{{
-+sub check_named_spec($$$;@) {
-+      my $page=shift;
-+      my $specFuncsRef=shift;
-+      my $specName=shift;
-+      my %params=@_;
-+      
-+      return IkiWiki::FailReason->new("Named page spec '$specName' is not valid")
-+              unless (substr($specName, 0, 1) eq '~');
-+      
-+      $specName = substr($specName, 1);
-+      print "Checking pagespec named $specName against page $page\n";
-+      if (exists $specFuncsRef->{$specName}) {
-+              # remove the named spec from the spec refs
-+              # when we recurse to avoid infinite recursion
-+              my $sub = $specFuncsRef->{$specName};
-+              $specFuncsRef->{$specName} = undef;
-+              my $result = $sub->($page, $specFuncsRef, %params);
-+              $specFuncsRef->{$specName} = $sub;
-+              return $result;
-+      } else {
-+              print "Couldn't find pagespec\n";
-+              return IkiWiki::FailReason->new("Page spec $specName does not exist");
-+      }
-+}
-+
-+sub check_named_spec_existential($$$$;@) {
-+      my $page=shift;
-+      my $specFuncsRef=shift;
-+      my $specName=shift;
-+      my $funcref=shift;
-+      my %params=@_;
-+      
-+      return IkiWiki::FailReason->new("Named page spec '$specName' is not valid")
-+              unless (substr($specName, 0, 1) eq '~');
-+      $specName = substr($specName, 1);
-+      
-+      print "Checking (existential) pagespec named $specName against page $page\n";
-+      
-+      if (exists $specFuncsRef->{$specName}) {
-+              # remove the named spec from the spec refs
-+              # when we recurse to avoid infinite recursion
-+              my $sub = $specFuncsRef->{$specName};
-+              $specFuncsRef->{$specName} = undef;
-+              
-+              foreach my $nextpage (keys %IkiWiki::pagesources) {
-+                      print "Checking $nextpage against $specName\n";
-+                      if ($sub->($nextpage, $specFuncsRef, %params)) {
-+                              print "Match!  Checking spec $nextpage against function from original page $page\n";
-+                              my $tempResult = $funcref->($page, $specFuncsRef, $nextpage, %params);
-+                              return $tempResult if ($tempResult);
-+                      }
-+              }
-+              
-+              $specFuncsRef->{$specName} = $sub;
-+              return IkiWiki::FailReason->new("No page in spec $specName was successfully matched");
-+      } else {
-+              print "Couldn't find pagespec\n";
-+              return IkiWiki::FailReason->new("Page spec $specName does not exist");
-+      }
-+}
-+
-+sub match_glob ($$$;@) { #{{{
-       my $page=shift;
-+      my $specFuncsRef=shift;
-       my $glob=shift;
-       my %params=@_;
-       
-       my $from=exists $params{location} ? $params{location} : '';
-       
-+      print "Matching glob $glob \n";
-+      
-       # relative matching
-       if ($glob =~ m!^\./!) {
-               $from=~s#/?[^/]+$##;
-@@ -1736,6 +1819,10 @@ sub match_glob ($$;@) { #{{{
-               $glob="$from/$glob" if length $from;
-       }
- 
-+      if (substr($glob, 0, 1) eq '~') {
-+              return check_named_spec($page, $specFuncsRef, $glob);
-+      }
-+
-       my $regexp=IkiWiki::glob2re($glob);
-       if ($page=~/^$regexp$/i) {
-               if (! IkiWiki::isinternal($page) || $params{internal}) {
-@@ -1750,17 +1837,29 @@ sub match_glob ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_internal ($$;@) { #{{{
--      return match_glob($_[0], $_[1], @_, internal => 1)
-+sub match_internal ($$$;@) { #{{{
-+      my $page=shift;
-+      my $specFuncsRef=shift;
-+      my $glob=shift;
-+
-+      return match_glob($page, $specFuncsRef, $glob, @_, internal => 1)
- } #}}}
- 
--sub match_link ($$;@) { #{{{
-+sub match_link ($$$;@) { #{{{
-       my $page=shift;
--      my $link=lc(shift);
-+      my $specFuncsRef=shift;
-+      my $fulllink=shift;
-+      my $link=lc($fulllink);
-       my %params=@_;
- 
-+      print "Matching link $fulllink \n";
-+      
-       my $from=exists $params{location} ? $params{location} : '';
- 
-+      if (substr($fulllink, 0, 1) eq '~') {
-+              return check_named_spec_existential($page, $specFuncsRef, $fulllink, \&match_link);
-+      }
-+
-       # relative matching
-       if ($link =~ m!^\.! && defined $from) {
-               $from=~s#/?[^/]+$##;
-@@ -1784,12 +1883,16 @@ sub match_link ($$;@) { #{{{
-       return IkiWiki::FailReason->new("$page does not link to $link");
- } #}}}
- 
--sub match_backlink ($$;@) { #{{{
--      return match_link($_[1], $_[0], @_);
-+sub match_backlink ($$$;@) { #{{{
-+      my $page=shift;
-+      my $specFuncsRef=shift;
-+      my $backlink=shift;
-+      return match_link($backlink, $specFuncsRef, $page, @_);
- } #}}}
- 
--sub match_created_before ($$;@) { #{{{
-+sub match_created_before ($$$;@) { #{{{
-       my $page=shift;
-+      my $specFuncsRef=shift;
-       my $testpage=shift;
- 
-       if (exists $IkiWiki::pagectime{$testpage}) {
-@@ -1805,8 +1908,9 @@ sub match_created_before ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_created_after ($$;@) { #{{{
-+sub match_created_after ($$$;@) { #{{{
-       my $page=shift;
-+      my $specFuncsRef=shift;
-       my $testpage=shift;
- 
-       if (exists $IkiWiki::pagectime{$testpage}) {
-@@ -1822,8 +1926,12 @@ sub match_created_after ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_creation_day ($$;@) { #{{{
--      if ((gmtime($IkiWiki::pagectime{shift()}))[3] == shift) {
-+sub match_creation_day ($$$;@) { #{{{
-+      my $page=shift;
-+      shift;
-+      my $time=shift;
-+
-+      if ((gmtime($IkiWiki::pagectime{$page}))[3] == $time) {
-               return IkiWiki::SuccessReason->new('creation_day matched');
-       }
-       else {
-@@ -1831,8 +1939,12 @@ sub match_creation_day ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_creation_month ($$;@) { #{{{
--      if ((gmtime($IkiWiki::pagectime{shift()}))[4] + 1 == shift) {
-+sub match_creation_month ($$$;@) { #{{{
-+      my $page=shift;
-+      shift;
-+      my $time=shift;
-+
-+      if ((gmtime($IkiWiki::pagectime{$page}))[4] + 1 == $time) {
-               return IkiWiki::SuccessReason->new('creation_month matched');
-       }
-       else {
-@@ -1840,8 +1952,12 @@ sub match_creation_month ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_creation_year ($$;@) { #{{{
--      if ((gmtime($IkiWiki::pagectime{shift()}))[5] + 1900 == shift) {
-+sub match_creation_year ($$$;@) { #{{{
-+      my $page=shift;
-+      shift;
-+      my $time=shift;
-+
-+      if ((gmtime($IkiWiki::pagectime{$page}))[5] + 1900 == $time) {
-               return IkiWiki::SuccessReason->new('creation_year matched');
-       }
-       else {
-diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
-index f1f792a..a410e48 100644
---- a/IkiWiki/Plugin/attachment.pm
-+++ b/IkiWiki/Plugin/attachment.pm
-@@ -291,7 +291,8 @@ sub attachment_list ($) { #{{{
- 
- package IkiWiki::PageSpec;
- 
--sub match_user ($$;@) { #{{{
-+sub match_user ($$$;@) { #{{{
-+      shift;
-       shift;
-       my $user=shift;
-       my %params=@_;
-@@ -311,7 +312,8 @@ sub match_user ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_ip ($$;@) { #{{{
-+sub match_ip ($$$;@) { #{{{
-+      shift;
-       shift;
-       my $ip=shift;
-       my %params=@_;
-diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm
-index 7716fce..2110ca0 100644
---- a/IkiWiki/Plugin/conditional.pm
-+++ b/IkiWiki/Plugin/conditional.pm
-@@ -70,7 +70,8 @@ sub preprocess_if (@) { #{{{
- 
- package IkiWiki::PageSpec;
- 
--sub match_enabled ($$;@) { #{{{
-+sub match_enabled ($$$;@) { #{{{
-+      shift;
-       shift;
-       my $plugin=shift;
-       
-@@ -83,13 +84,14 @@ sub match_enabled ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_sourcepage ($$;@) { #{{{
-+sub match_sourcepage ($$$;@) { #{{{
-       shift;
-+      my $specFuncsRef=shift;
-       my $glob=shift;
-       my %params=@_;
- 
-       return IkiWiki::FailReason->new("cannot match sourcepage") unless exists $params{sourcepage};
--      if (match_glob($params{sourcepage}, $glob, @_)) {
-+      if (match_glob($params{sourcepage}, $specFuncsRef, $glob, @_)) {
-               return IkiWiki::SuccessReason->new("sourcepage matches $glob");
-       }
-       else {
-@@ -97,13 +99,14 @@ sub match_sourcepage ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_destpage ($$;@) { #{{{
-+sub match_destpage ($$$;@) { #{{{
-       shift;
-+      my $specFuncsRef=shift;
-       my $glob=shift;
-       my %params=@_;
-       
-       return IkiWiki::FailReason->new("cannot match destpage") unless exists $params{destpage};
--      if (match_glob($params{destpage}, $glob, @_)) {
-+      if (match_glob($params{destpage}, $specFuncsRef, $glob, @_)) {
-               return IkiWiki::SuccessReason->new("destpage matches $glob");
-       }
-       else {
-@@ -111,7 +114,8 @@ sub match_destpage ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_included ($$;@) { #{{{
-+sub match_included ($$$;@) { #{{{
-+      shift;
-       shift;
-       shift;
-       my %params=@_;
-diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
-index 6f71be3..bf472c5 100644
---- a/IkiWiki/Plugin/filecheck.pm
-+++ b/IkiWiki/Plugin/filecheck.pm
-@@ -66,8 +66,9 @@ sub humansize ($) { #{{{
- 
- package IkiWiki::PageSpec;
- 
--sub match_maxsize ($$;@) { #{{{
-+sub match_maxsize ($$$;@) { #{{{
-       my $page=shift;
-+      shift;
-       my $maxsize=eval{IkiWiki::Plugin::attachment::parsesize(shift)};
-       if ($@) {
-               return IkiWiki::FailReason->new("unable to parse maxsize (or number too large)");
-@@ -87,8 +88,9 @@ sub match_maxsize ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_minsize ($$;@) { #{{{
-+sub match_minsize ($$$;@) { #{{{
-       my $page=shift;
-+      shift;
-       my $minsize=eval{IkiWiki::Plugin::attachment::parsesize(shift)};
-       if ($@) {
-               return IkiWiki::FailReason->new("unable to parse minsize (or number too large)");
-@@ -108,8 +110,9 @@ sub match_minsize ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_mimetype ($$;@) { #{{{
-+sub match_mimetype ($$$;@) { #{{{
-       my $page=shift;
-+      shift;
-       my $wanted=shift;
- 
-       my %params=@_;
-@@ -138,8 +141,9 @@ sub match_mimetype ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_virusfree ($$;@) { #{{{
-+sub match_virusfree ($$$;@) { #{{{
-       my $page=shift;
-+      shift;
-       my $wanted=shift;
- 
-       my %params=@_;
-@@ -180,7 +184,7 @@ sub match_virusfree ($$;@) { #{{{
-       }
- } #}}}
- 
--sub match_ispage ($$;@) { #{{{
-+sub match_ispage ($$$;@) { #{{{
-       my $filename=shift;
- 
-       if (defined IkiWiki::pagetype($filename)) {
-diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
-index b2c85c8..1ee6a69 100644
---- a/IkiWiki/Plugin/meta.pm
-+++ b/IkiWiki/Plugin/meta.pm
-@@ -264,6 +264,7 @@ sub pagetemplate (@) { #{{{
- sub match { #{{{
-       my $field=shift;
-       my $page=shift;
-+      shift;
-       
-       # turn glob into a safe regexp
-       my $re=IkiWiki::glob2re(shift);
-@@ -291,23 +292,23 @@ sub match { #{{{
- 
- package IkiWiki::PageSpec;
- 
--sub match_title ($$;@) { #{{{
-+sub match_title ($$$;@) { #{{{
-       IkiWiki::Plugin::meta::match("title", @_);      
- } #}}}
- 
--sub match_author ($$;@) { #{{{
-+sub match_author ($$$;@) { #{{{
-       IkiWiki::Plugin::meta::match("author", @_);
- } #}}}
- 
--sub match_authorurl ($$;@) { #{{{
-+sub match_authorurl ($$$;@) { #{{{
-       IkiWiki::Plugin::meta::match("authorurl", @_);
- } #}}}
- 
--sub match_license ($$;@) { #{{{
-+sub match_license ($$$;@) { #{{{
-       IkiWiki::Plugin::meta::match("license", @_);
- } #}}}
- 
--sub match_copyright ($$;@) { #{{{
-+sub match_copyright ($$$;@) { #{{{
-       IkiWiki::Plugin::meta::match("copyright", @_);
- } #}}}
- 
+    diff --git a/IkiWiki.pm b/IkiWiki.pm
+    index 4e4da11..8b3cdfe 100644
+    --- a/IkiWiki.pm
+    +++ b/IkiWiki.pm
+    @@ -1550,7 +1550,16 @@ sub globlist_to_pagespec ($) { #{{{
+     
+     sub is_globlist ($) { #{{{
+       my $s=shift;
+    -  return ( $s =~ /[^\s]+\s+([^\s]+)/ && $1 ne "and" && $1 ne "or" );
+    +  return ! ($s =~ /
+    +                  (^\s*
+    +                          [^\s(]+         # single item
+    +                                  (\(                     # possibly with parens after it
+    +                                          ([^)]*  # with stuff inside those parens
+    +                                          (\([^)]*\))*)*  # maybe even nested parens
+    +                                  \))?\s*$
+    +                  ) |
+    +                          (\s and \s) | (\s or \s)        # or we find 'and' or 'or' somewhere
+    +                  /xs);
+     } #}}}
+     
+     sub safequote ($) { #{{{
+    @@ -1631,7 +1640,7 @@ sub pagespec_merge ($$) { #{{{
+       return "($a) or ($b)";
+     } #}}}
+     
+    -sub pagespec_translate ($) { #{{{
+    +sub pagespec_makeperl ($) { #{{{
+       my $spec=shift;
+     
+       # Support for old-style GlobLists.
+    @@ -1650,12 +1659,14 @@ sub pagespec_translate ($) { #{{{
+               |
+                       \)              # )
+               |
+    -                  \w+\([^\)]*\)   # command(params)
+    +                  define\(\s*~\w+\s*,((\([^()]*\)) | ([^()]+))+\) # define(~specName, spec) - spec can contain parens 1 deep
+    +          |
+    +                  \w+\([^()]*\)   # command(params) - params cannot contain parens
+               |
+                       [^\s()]+        # any other text
+               )
+               \s*             # ignore whitespace
+    -  }igx) {
+    +  }igxs) {
+               my $word=$1;
+               if (lc $word eq 'and') {
+                       $code.=' &&';
+    @@ -1666,16 +1677,23 @@ sub pagespec_translate ($) { #{{{
+               elsif ($word eq "(" || $word eq ")" || $word eq "!") {
+                       $code.=' '.$word;
+               }
+    -          elsif ($word =~ /^(\w+)\((.*)\)$/) {
+    +          elsif ($word =~ /^define\(\s*~(\w+)\s*,(.*)\)$/s) {
+    +                  $code .= " (\$params{specFuncs}->{$1}=";        # (exists \$params{specFuncs}) && 
+    +                  $code .= "memoize(";
+    +                  $code .= &pagespec_makeperl($2);
+    +                  $code .= ")";
+    +                  $code .= ") ";
+    +          }
+    +          elsif ($word =~ /^(\w+)\((.*)\)$/s) {
+                       if (exists $IkiWiki::PageSpec::{"match_$1"}) {
+    -                          $code.="IkiWiki::PageSpec::match_$1(\$page, ".safequote($2).", \@_)";
+    +                          $code.="IkiWiki::PageSpec::match_$1(\$page, ".safequote($2).", \%params)";
+                       }
+                       else {
+                               $code.=' 0';
+                       }
+               }
+               else {
+    -                  $code.=" IkiWiki::PageSpec::match_glob(\$page, ".safequote($word).", \@_)";
+    +                  $code.=" IkiWiki::PageSpec::match_glob(\$page, ".safequote($word).", \%params)";
+               }
+       }
+     
+    @@ -1683,8 +1701,18 @@ sub pagespec_translate ($) { #{{{
+               $code=0;
+       }
+     
+    +  return 'sub { my $page=shift; my %params = @_; '.$code.' }';
+    +} #}}}
+    +
+    +sub pagespec_translate ($) { #{{{
+    +  my $spec=shift;
+    +
+    +  my $code = pagespec_makeperl($spec);
+    +
+    +  # print STDERR "Spec '$spec' generated code '$code'\n";
+    +
+       no warnings;
+    -  return eval 'sub { my $page=shift; '.$code.' }';
+    +  return eval $code;
+     } #}}}
+     
+     sub pagespec_match ($$;@) { #{{{
+    @@ -1699,7 +1727,7 @@ sub pagespec_match ($$;@) { #{{{
+     
+       my $sub=pagespec_translate($spec);
+       return IkiWiki::FailReason->new("syntax error in pagespec \"$spec\"") if $@;
+    -  return $sub->($page, @params);
+    +  return $sub->($page, @params, specFuncs => {});
+     } #}}}
+     
+     sub pagespec_valid ($) { #{{{
+    @@ -1748,11 +1776,78 @@ sub new { #{{{
+     
+     package IkiWiki::PageSpec;
+     
+    +sub check_named_spec($$;@) {
+    +  my $page=shift;
+    +  my $specName=shift;
+    +  my %params=@_;
+    +  
+    +  error("Unable to find specFuncs in params to check_named_spec()!") unless exists $params{specFuncs};
+    +
+    +  my $specFuncsRef=$params{specFuncs};
+    +  
+    +  return IkiWiki::FailReason->new("Named page spec '$specName' is not valid")
+    +          unless (substr($specName, 0, 1) eq '~');
+    +  
+    +  $specName = substr($specName, 1);
+    +
+    +  if (exists $specFuncsRef->{$specName}) {
+    +          # remove the named spec from the spec refs
+    +          # when we recurse to avoid infinite recursion
+    +          my $sub = $specFuncsRef->{$specName};
+    +          delete $specFuncsRef->{$specName};
+    +          my $result = $sub->($page, %params);
+    +          $specFuncsRef->{$specName} = $sub;
+    +          return $result;
+    +  } else {
+    +          return IkiWiki::FailReason->new("Page spec '$specName' does not exist");
+    +  }
+    +}
+    +
+    +sub check_named_spec_existential($$$;@) {
+    +  my $page=shift;
+    +  my $specName=shift;
+    +  my $funcref=shift;
+    +  my %params=@_;
+    +  
+    +  error("Unable to find specFuncs in params to check_named_spec_existential()!") unless exists $params{specFuncs};
+    +  my $specFuncsRef=$params{specFuncs};
+    +  
+    +  return IkiWiki::FailReason->new("Named page spec '$specName' is not valid")
+    +          unless (substr($specName, 0, 1) eq '~');
+    +  $specName = substr($specName, 1);
+    +  
+    +  if (exists $specFuncsRef->{$specName}) {
+    +          # remove the named spec from the spec refs
+    +          # when we recurse to avoid infinite recursion
+    +          my $sub = $specFuncsRef->{$specName};
+    +          delete $specFuncsRef->{$specName};
+    +          
+    +          foreach my $nextpage (keys %IkiWiki::pagesources) {
+    +                  if ($sub->($nextpage, %params)) {
+    +                          my $tempResult = $funcref->($page, $nextpage, %params);
+    +                          if ($tempResult) {
+    +                                  $specFuncsRef->{$specName} = $sub;
+    +                                  return $tempResult;
+    +                          }
+    +                  }
+    +          }
+    +          
+    +          $specFuncsRef->{$specName} = $sub;
+    +          return IkiWiki::FailReason->new("No page in spec '$specName' was successfully matched");
+    +  } else {
+    +          return IkiWiki::FailReason->new("Named page spec '$specName' does not exist");
+    +  }
+    +}
+    +
+     sub match_glob ($$;@) { #{{{
+       my $page=shift;
+       my $glob=shift;
+       my %params=@_;
+       
+    +  if (substr($glob, 0, 1) eq '~') {
+    +          return check_named_spec($page, $glob, %params);
+    +  }
+    +
+       my $from=exists $params{location} ? $params{location} : '';
+       
+       # relative matching
+    @@ -1782,11 +1877,12 @@ sub match_internal ($$;@) { #{{{
+     
+     sub match_link ($$;@) { #{{{
+       my $page=shift;
+    -  my $link=lc(shift);
+    +  my $fulllink=shift;
+       my %params=@_;
+    +  my $link=lc($fulllink);
+     
+       my $from=exists $params{location} ? $params{location} : '';
+    -
+    +  
+       # relative matching
+       if ($link =~ m!^\.! && defined $from) {
+               $from=~s#/?[^/]+$##;
+    @@ -1804,19 +1900,32 @@ sub match_link ($$;@) { #{{{
+               }
+               else {
+                       return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
+    -                          if match_glob($p, $link, %params);
+    +                          if match_glob($p, $fulllink, %params);
+               }
+       }
+       return IkiWiki::FailReason->new("$page does not link to $link");
+     } #}}}
+     
+     sub match_backlink ($$;@) { #{{{
+    -  return match_link($_[1], $_[0], @_);
+    +  my $page=shift;
+    +  my $backlink=shift;
+    +  my @params=@_;
+    +
+    +  if (substr($backlink, 0, 1) eq '~') {
+    +          return check_named_spec_existential($page, $backlink, \&match_backlink, @params);
+    +  }
+    +
+    +  return match_link($backlink, $page, @params);
+     } #}}}
+     
+     sub match_created_before ($$;@) { #{{{
+       my $page=shift;
+       my $testpage=shift;
+    +  my @params=@_;
+    +
+    +  if (substr($testpage, 0, 1) eq '~') {
+    +          return check_named_spec_existential($page, $testpage, \&match_created_before, @params);
+    +  }
+     
+       if (exists $IkiWiki::pagectime{$testpage}) {
+               if ($IkiWiki::pagectime{$page} < $IkiWiki::pagectime{$testpage}) {
+    @@ -1834,6 +1943,11 @@ sub match_created_before ($$;@) { #{{{
+     sub match_created_after ($$;@) { #{{{
+       my $page=shift;
+       my $testpage=shift;
+    +  my @params=@_;
+    +
+    +  if (substr($testpage, 0, 1) eq '~') {
+    +          return check_named_spec_existential($page, $testpage, \&match_created_after, @params);
+    +  }
+     
+       if (exists $IkiWiki::pagectime{$testpage}) {
+               if ($IkiWiki::pagectime{$page} > $IkiWiki::pagectime{$testpage}) {