minor: a link to describe the format

[git.ikiwiki.info.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 66fea4369b1326903f0bce26ed019a288e12788e..3430c57420df18fc02ea6bca88229534d5b59d15 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -13,26 +13,32 @@ use open qw{:utf8 :std};
 
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
            %pagestate %wikistate %renderedfiles %oldrenderedfiles
 
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
            %pagestate %wikistate %renderedfiles %oldrenderedfiles

-           %pagesources %destsources %depends %hooks %forcerebuild
-           $gettext_obj %loaded_plugins};
+           %pagesources %destsources %depends %depends_simple %hooks
+           %forcerebuild %loaded_plugins};

 
 use Exporter q{import};
 
 use Exporter q{import};

-our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
-                 bestlink htmllink readfile writefile pagetype srcfile pagename
-                 displaytime will_render gettext urlto targetpage
+our @EXPORT = qw(hook debug error template htmlpage deptype
+                 add_depends pagespec_match pagespec_match_list bestlink
+                htmllink readfile writefile pagetype srcfile pagename
+                displaytime will_render gettext urlto targetpage

                 add_underlay pagetitle titlepage linkpage newpagefile
                 add_underlay pagetitle titlepage linkpage newpagefile

-                inject
+                inject add_link

                  %config %links %pagestate %wikistate %renderedfiles
                  %pagesources %destsources);
 our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
 our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
                  %config %links %pagestate %wikistate %renderedfiles
                  %pagesources %destsources);
 our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
 our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE

-our $installdir=''; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
+our $installdir='/usr'; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
+
+# Page dependency types.
+our $DEPEND_CONTENT=1;
+our $DEPEND_PRESENCE=2;
+our $DEPEND_LINKS=4;

 
 # Optimisation.
 use Memoize;
 memoize("abs2rel");
 memoize("pagespec_translate");
 
 # Optimisation.
 use Memoize;
 memoize("abs2rel");
 memoize("pagespec_translate");

-memoize("file_pruned");
+memoize("template_file");

 
 sub getsetup () {
        wikiname => {
 
 sub getsetup () {
        wikiname => {


@@ -149,6 +155,13 @@ sub getsetup () {
                safe => 0, # path
                rebuild => 1,
        },
                safe => 0, # path
                rebuild => 1,
        },

+       templatedirs => {
+               type => "internal",
+               default => [],
+               description => "additional directories containing template files",
+               safe => 0,
+               rebuild => 0,
+       },

        underlaydir => {
                type => "string",
                default => "$installdir/share/ikiwiki/basewiki",
        underlaydir => {
                type => "string",
                default => "$installdir/share/ikiwiki/basewiki",


@@ -157,6 +170,13 @@ sub getsetup () {
                safe => 0, # path
                rebuild => 0,
        },
                safe => 0, # path
                rebuild => 0,
        },

+       underlaydirbase => {
+               type => "internal",
+               default => "$installdir/share/ikiwiki",
+               description => "parent directory containing additional underlays",
+               safe => 0,
+               rebuild => 0,
+       },

        wrappers => {
                type => "internal",
                default => [],
        wrappers => {
                type => "internal",
                default => [],


@@ -213,6 +233,13 @@ sub getsetup () {
                safe => 1,
                rebuild => 1,
        },
                safe => 1,
                rebuild => 1,
        },

+       discussionpage => {
+               type => "string",
+               default => gettext("Discussion"),
+               description => "name of Discussion pages",
+               safe => 1,
+               rebuild => 1,
+       },

        sslcookie => {
                type => "boolean",
                default => 0,
        sslcookie => {
                type => "boolean",
                default => 0,


@@ -321,8 +348,8 @@ sub getsetup () {
                default => [qr/(^|\/)\.\.(\/|$)/, qr/^\./, qr/\/\./,
                        qr/\.x?html?$/, qr/\.ikiwiki-new$/,
                        qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//,
                default => [qr/(^|\/)\.\.(\/|$)/, qr/^\./, qr/\/\./,
                        qr/\.x?html?$/, qr/\.ikiwiki-new$/,
                        qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//,

-                       qr/(^|\/)_MTN\//,
-                       qr/\.dpkg-tmp$/],
+                       qr/(^|\/)_MTN\//, qr/(^|\/)_darcs\//,
+                       qr/(^|\/)CVS\//, qr/\.dpkg-tmp$/],

                description => "regexps of source files to ignore",
                safe => 0,
                rebuild => 1,
                description => "regexps of source files to ignore",
                safe => 0,
                rebuild => 1,


@@ -342,7 +369,7 @@ sub getsetup () {
        },
        web_commit_regexp => {
                type => "internal",
        },
        web_commit_regexp => {
                type => "internal",

-               default => qr/^web commit (by (.*?(?=: |$))|from (\d+\.\d+\.\d+\.\d+)):?(.*)/,
+               default => qr/^web commit (by (.*?(?=: |$))|from ([0-9a-fA-F:.]+[0-9a-fA-F])):?(.*)/,

                description => "regexp to parse web commits from logs",
                safe => 0,
                rebuild => 0,
                description => "regexp to parse web commits from logs",
                safe => 0,
                rebuild => 0,


@@ -452,7 +479,7 @@ sub checkconfig () {
        if (defined $config{locale}) {
                if (POSIX::setlocale(&POSIX::LC_ALL, $config{locale})) {
                        $ENV{LANG}=$config{locale};
        if (defined $config{locale}) {
                if (POSIX::setlocale(&POSIX::LC_ALL, $config{locale})) {
                        $ENV{LANG}=$config{locale};

-                       $gettext_obj=undef;
+                       define_gettext();

                }
        }
                
                }
        }
                


@@ -522,18 +549,18 @@ sub loadplugins () {
        }
        
        if ($config{rcs}) {
        }
        
        if ($config{rcs}) {

-               if (exists $IkiWiki::hooks{rcs}) {
+               if (exists $hooks{rcs}) {

                        error(gettext("cannot use multiple rcs plugins"));
                }
                loadplugin($config{rcs});
        }
                        error(gettext("cannot use multiple rcs plugins"));
                }
                loadplugin($config{rcs});
        }

-       if (! exists $IkiWiki::hooks{rcs}) {
+       if (! exists $hooks{rcs}) {

                loadplugin("norcs");
        }
 
        run_hooks(getopt => sub { shift->() });
        if (grep /^-/, @ARGV) {
                loadplugin("norcs");
        }
 
        run_hooks(getopt => sub { shift->() });
        if (grep /^-/, @ARGV) {

-               print STDERR "Unknown option: $_\n"
+               print STDERR "Unknown option (or missing parameter): $_\n"

                        foreach grep /^-/, @ARGV;
                usage();
        }
                        foreach grep /^-/, @ARGV;
                usage();
        }


@@ -627,30 +654,45 @@ sub dirname ($) {
        return $file;
 }
 
        return $file;
 }
 

-sub pagetype ($) {
+sub isinternal ($) {

        my $page=shift;
        my $page=shift;

+       return exists $pagesources{$page} &&
+               $pagesources{$page} =~ /\._([^.]+)$/;
+}
+
+sub pagetype ($) {
+       my $file=shift;

        
        

-       if ($page =~ /\.([^.]+)$/) {
+       if ($file =~ /\.([^.]+)$/) {

                return $1 if exists $hooks{htmlize}{$1};
        }
                return $1 if exists $hooks{htmlize}{$1};
        }

+       my $base=basename($file);
+       if (exists $hooks{htmlize}{$base} &&
+           $hooks{htmlize}{$base}{noextension}) {
+               return $base;
+       }

        return;
 }
 
        return;
 }
 

-sub isinternal ($) {
-       my $page=shift;
-       return exists $pagesources{$page} &&
-               $pagesources{$page} =~ /\._([^.]+)$/;
-}
+my %pagename_cache;

 
 sub pagename ($) {
        my $file=shift;
 
 
 sub pagename ($) {
        my $file=shift;
 

+       if (exists $pagename_cache{$file}) {
+               return $pagename_cache{$file};
+       }
+

        my $type=pagetype($file);
        my $page=$file;
        my $type=pagetype($file);
        my $page=$file;

-       $page=~s/\Q.$type\E*$// if defined $type && !$hooks{htmlize}{$type}{keepextension};
+       $page=~s/\Q.$type\E*$//
+               if defined $type && !$hooks{htmlize}{$type}{keepextension}
+                       && !$hooks{htmlize}{$type}{noextension};

        if ($config{indexpages} && $page=~/(.*)\/index$/) {
                $page=$1;
        }
        if ($config{indexpages} && $page=~/(.*)\/index$/) {
                $page=$1;
        }

+
+       $pagename_cache{$file} = $page;

        return $page;
 }
 
        return $page;
 }
 


@@ -708,7 +750,7 @@ sub add_underlay ($) {
        my $dir=shift;
 
        if ($dir !~ /^\//) {
        my $dir=shift;
 
        if ($dir !~ /^\//) {

-               $dir="$config{underlaydir}/../$dir";
+               $dir="$config{underlaydirbase}/$dir";

        }
 
        if (! grep { $_ eq $dir } @{$config{underlaydirs}}) {
        }
 
        if (! grep { $_ eq $dir } @{$config{underlaydirs}}) {


@@ -839,7 +881,7 @@ sub bestlink ($$) {
                $l.="/" if length $l;
                $l.=$link;
 
                $l.="/" if length $l;
                $l.=$link;
 

-               if (exists $links{$l}) {
+               if (exists $pagesources{$l}) {

                        return $l;
                }
                elsif (exists $pagecase{lc $l}) {
                        return $l;
                }
                elsif (exists $pagecase{lc $l}) {


@@ -849,7 +891,7 @@ sub bestlink ($$) {
 
        if (length $config{userdir}) {
                my $l = "$config{userdir}/".lc($link);
 
        if (length $config{userdir}) {
                my $l = "$config{userdir}/".lc($link);

-               if (exists $links{$l}) {
+               if (exists $pagesources{$l}) {

                        return $l;
                }
                elsif (exists $pagecase{lc $l}) {
                        return $l;
                }
                elsif (exists $pagecase{lc $l}) {


@@ -1039,16 +1081,50 @@ sub htmllink ($$$;@) {
        }
 
        my @attrs;
        }
 
        my @attrs;

-       if (defined $opts{rel}) {
-               push @attrs, ' rel="'.$opts{rel}.'"';
-       }
-       if (defined $opts{class}) {
-               push @attrs, ' class="'.$opts{class}.'"';
+       foreach my $attr (qw{rel class title}) {
+               if (defined $opts{$attr}) {
+                       push @attrs, " $attr=\"$opts{$attr}\"";
+               }

        }
 
        return "<a href=\"$bestlink\"@attrs>$linktext</a>";
 }
 
        }
 
        return "<a href=\"$bestlink\"@attrs>$linktext</a>";
 }
 

+sub openiduser ($) {
+       my $user=shift;
+
+       if ($user =~ m!^https?://! &&
+           eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) {
+               my $display;
+
+               if (Net::OpenID::VerifiedIdentity->can("DisplayOfURL")) {
+                       # this works in at least 2.x
+                       $display = Net::OpenID::VerifiedIdentity::DisplayOfURL($user);
+               }
+               else {
+                       # this only works in 1.x
+                       my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user);
+                       $display=$oid->display;
+               }
+
+               # Convert "user.somehost.com" to "user [somehost.com]"
+               # (also "user.somehost.co.uk")
+               if ($display !~ /\[/) {
+                       $display=~s/^([-a-zA-Z0-9]+?)\.([-.a-zA-Z0-9]+\.[a-z]+)$/$1 [$2]/;
+               }
+               # Convert "http://somehost.com/user" to "user [somehost.com]".
+               # (also "https://somehost.com/user/")
+               if ($display !~ /\[/) {
+                       $display=~s/^https?:\/\/(.+)\/([^\/]+)\/?$/$2 [$1]/;
+               }
+               $display=~s!^https?://!!; # make sure this is removed
+               eval q{use CGI 'escapeHTML'};
+               error($@) if $@;
+               return escapeHTML($display);
+       }
+       return;
+}
+

 sub userlink ($) {
        my $user=shift;
 
 sub userlink ($) {
        my $user=shift;
 


@@ -1199,9 +1275,10 @@ sub preprocess ($$$;$$) {
                                        );
                                };
                                if ($@) {
                                        );
                                };
                                if ($@) {

-                                       chomp $@;
+                                       my $error=$@;
+                                       chomp $error;

                                        $ret="[[!$command <span class=\"error\">".
                                        $ret="[[!$command <span class=\"error\">".

-                                               gettext("Error").": $@"."</span>]]";
+                                               gettext("Error").": $error"."</span>]]";

                                }
                        }
                        else {
                                }
                        }
                        else {


@@ -1239,7 +1316,7 @@ sub preprocess ($$$;$$) {
                                                |
                                                "[^"]+"         # single-quoted value
                                                |
                                                |
                                                "[^"]+"         # single-quoted value
                                                |

-                                               [^\s\]]+        # unquoted value
+                                               [^"\s\]]+       # unquoted value

                                        )
                                        \s*                     # whitespace or end
                                                                # of directive
                                        )
                                        \s*                     # whitespace or end
                                                                # of directive


@@ -1262,7 +1339,7 @@ sub preprocess ($$$;$$) {
                                                |
                                                "[^"]+"         # single-quoted value
                                                |
                                                |
                                                "[^"]+"         # single-quoted value
                                                |

-                                               [^\s\]]+        # unquoted value
+                                               [^"\s\]]+       # unquoted value

                                        )
                                        \s*                     # whitespace or end
                                                                # of directive
                                        )
                                        \s*                     # whitespace or end
                                                                # of directive


@@ -1293,6 +1370,70 @@ sub indexlink () {
        return "<a href=\"$config{url}\">$config{wikiname}</a>";
 }
 
        return "<a href=\"$config{url}\">$config{wikiname}</a>";
 }
 

+sub check_canedit ($$$;$) {
+       my $page=shift;
+       my $q=shift;
+       my $session=shift;
+       my $nonfatal=shift;
+       
+       my $canedit;
+       run_hooks(canedit => sub {
+               return if defined $canedit;
+               my $ret=shift->($page, $q, $session);
+               if (defined $ret) {
+                       if ($ret eq "") {
+                               $canedit=1;
+                       }
+                       elsif (ref $ret eq 'CODE') {
+                               $ret->() unless $nonfatal;
+                               $canedit=0;
+                       }
+                       elsif (defined $ret) {
+                               error($ret) unless $nonfatal;
+                               $canedit=0;
+                       }
+               }
+       });
+       return defined $canedit ? $canedit : 1;
+}
+
+sub check_content (@) {
+       my %params=@_;
+       
+       return 1 if ! exists $hooks{checkcontent}; # optimisation
+
+       if (exists $pagesources{$params{page}}) {
+               my @diff;
+               my %old=map { $_ => 1 }
+                       split("\n", readfile(srcfile($pagesources{$params{page}})));
+               foreach my $line (split("\n", $params{content})) {
+                       push @diff, $line if ! exists $old{$_};
+               }
+               $params{diff}=join("\n", @diff);
+       }
+
+       my $ok;
+       run_hooks(checkcontent => sub {
+               return if defined $ok;
+               my $ret=shift->(%params);
+               if (defined $ret) {
+                       if ($ret eq "") {
+                               $ok=1;
+                       }
+                       elsif (ref $ret eq 'CODE') {
+                               $ret->() unless $params{nonfatal};
+                               $ok=0;
+                       }
+                       elsif (defined $ret) {
+                               error($ret) unless $params{nonfatal};
+                               $ok=0;
+                       }
+               }
+
+       });
+       return defined $ok ? $ok : 1;
+}
+

 my $wikilock;
 
 sub lockwiki () {
 my $wikilock;
 
 sub lockwiki () {


@@ -1346,7 +1487,8 @@ sub loadindex () {
        %oldrenderedfiles=%pagectime=();
        if (! $config{rebuild}) {
                %pagesources=%pagemtime=%oldlinks=%links=%depends=
        %oldrenderedfiles=%pagectime=();
        if (! $config{rebuild}) {
                %pagesources=%pagemtime=%oldlinks=%links=%depends=

-               %destsources=%renderedfiles=%pagecase=%pagestate=();
+               %destsources=%renderedfiles=%pagecase=%pagestate=
+               %depends_simple=();

        }
        my $in;
        if (! open ($in, "<", "$config{wikistatedir}/indexdb")) {
        }
        my $in;
        if (! open ($in, "<", "$config{wikistatedir}/indexdb")) {


@@ -1386,7 +1528,27 @@ sub loadindex () {
                                $links{$page}=$d->{links};
                                $oldlinks{$page}=[@{$d->{links}}];
                        }
                                $links{$page}=$d->{links};
                                $oldlinks{$page}=[@{$d->{links}}];
                        }

-                       if (exists $d->{depends}) {
+                       if (ref $d->{depends_simple} eq 'ARRAY') {
+                               # old format
+                               $depends_simple{$page}={
+                                       map { $_ => 1 } @{$d->{depends_simple}}
+                               };
+                       }
+                       elsif (exists $d->{depends_simple}) {
+                               $depends_simple{$page}=$d->{depends_simple};
+                       }
+                       if (exists $d->{dependslist}) {
+                               # old format
+                               $depends{$page}={
+                                       map { $_ => $DEPEND_CONTENT }
+                                               @{$d->{dependslist}}
+                               };
+                       }
+                       elsif (exists $d->{depends} && ! ref $d->{depends}) {
+                               # old format
+                               $depends{$page}={$d->{depends} => $DEPEND_CONTENT };
+                       }
+                       elsif (exists $d->{depends}) {

                                $depends{$page}=$d->{depends};
                        }
                        if (exists $d->{state}) {
                                $depends{$page}=$d->{depends};
                        }
                        if (exists $d->{state}) {


@@ -1436,6 +1598,10 @@ sub saveindex () {
                        $index{page}{$src}{depends} = $depends{$page};
                }
 
                        $index{page}{$src}{depends} = $depends{$page};
                }
 

+               if (exists $depends_simple{$page}) {
+                       $index{page}{$src}{depends_simple} = $depends_simple{$page};
+               }
+

                if (exists $pagestate{$page}) {
                        foreach my $id (@hookids) {
                                foreach my $key (keys %{$pagestate{$page}{$id}}) {
                if (exists $pagestate{$page}) {
                        foreach my $id (@hookids) {
                                foreach my $key (keys %{$pagestate{$page}{$id}}) {


@@ -1465,7 +1631,8 @@ sub saveindex () {
 sub template_file ($) {
        my $template=shift;
 
 sub template_file ($) {
        my $template=shift;
 

-       foreach my $dir ($config{templatedir}, "$installdir/share/ikiwiki/templates") {
+       foreach my $dir ($config{templatedir}, @{$config{templatedirs}},
+                        "$installdir/share/ikiwiki/templates") {

                return "$dir/$template" if -e "$dir/$template";
        }
        return;
                return "$dir/$template" if -e "$dir/$template";
        }
        return;


@@ -1600,61 +1767,95 @@ sub rcs_receive () {
        $hooks{rcs}{rcs_receive}{call}->();
 }
 
        $hooks{rcs}{rcs_receive}{call}->();
 }
 

-sub safequote ($) {
-       my $s=shift;
-       $s=~s/[{}]//g;
-       return "q{$s}";
-}
-
-sub add_depends ($$) {
+sub add_depends ($$;$) {

        my $page=shift;
        my $pagespec=shift;
        my $page=shift;
        my $pagespec=shift;

-       
-       return unless pagespec_valid($pagespec);
-
-       if (! exists $depends{$page}) {
-               $depends{$page}=$pagespec;
-       }
-       else {
-               $depends{$page}=pagespec_merge($depends{$page}, $pagespec);
+       my $deptype=shift || $DEPEND_CONTENT;
+
+       # Is the pagespec a simple page name?
+       if ($pagespec =~ /$config{wiki_file_regexp}/ &&
+           $pagespec !~ /[\s*?()!]/) {
+               $depends_simple{$page}{lc $pagespec} |= $deptype;
+               return 1;
+       }
+
+       # Add explicit dependencies for influences.
+       my $sub=pagespec_translate($pagespec);
+       return if $@;
+       foreach my $p (keys %pagesources) {
+               my $r=$sub->($p, location => $page);
+               my $i=$r->influences;
+               foreach my $k (keys %$i) {
+                       $depends_simple{$page}{lc $k} |= $i->{$k};
+               }
+               last if $r->influences_static;

        }
 
        }
 

+       $depends{$page}{$pagespec} |= $deptype;

        return 1;
 }
 
        return 1;
 }
 

-sub file_pruned ($$) {
-       require File::Spec;
-       my $file=File::Spec->canonpath(shift);
-       my $base=File::Spec->canonpath(shift);
-       $file =~ s#^\Q$base\E/+##;
+sub deptype (@) {
+       my $deptype=0;
+       foreach my $type (@_) {
+               if ($type eq 'presence') {
+                       $deptype |= $DEPEND_PRESENCE;
+               }
+               elsif ($type eq 'links') { 
+                       $deptype |= $DEPEND_LINKS;
+               }
+               elsif ($type eq 'content') {
+                       $deptype |= $DEPEND_CONTENT;
+               }
+       }
+       return $deptype;
+}
+
+sub file_pruned ($;$) {
+       my $file=shift;
+       if (@_) {
+               require File::Spec;
+               $file=File::Spec->canonpath($file);
+               my $base=File::Spec->canonpath(shift);
+               return if $file eq $base;
+               $file =~ s#^\Q$base\E/+##;
+       }

 
        my $regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')';
 
        my $regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')';

-       return $file =~ m/$regexp/ && $file ne $base;
+       return $file =~ m/$regexp/;

 }
 
 }
 

-sub gettext {
-       # Only use gettext in the rare cases it's needed.
+sub define_gettext () {
+       # If translation is needed, redefine the gettext function to do it.
+       # Otherwise, it becomes a quick no-op.
+       no warnings 'redefine';

        if ((exists $ENV{LANG} && length $ENV{LANG}) ||
            (exists $ENV{LC_ALL} && length $ENV{LC_ALL}) ||
            (exists $ENV{LC_MESSAGES} && length $ENV{LC_MESSAGES})) {
        if ((exists $ENV{LANG} && length $ENV{LANG}) ||
            (exists $ENV{LC_ALL} && length $ENV{LC_ALL}) ||
            (exists $ENV{LC_MESSAGES} && length $ENV{LC_MESSAGES})) {

-               if (! $gettext_obj) {
-                       $gettext_obj=eval q{
+               *gettext=sub {
+                       my $gettext_obj=eval q{

                                use Locale::gettext q{textdomain};
                                Locale::gettext->domain('ikiwiki')
                        };
                                use Locale::gettext q{textdomain};
                                Locale::gettext->domain('ikiwiki')
                        };

-                       if ($@) {
-                               print STDERR "$@";
-                               $gettext_obj=undef;
+
+                       if ($gettext_obj) {
+                               $gettext_obj->get(shift);
+                       }
+                       else {

                                return shift;
                        }
                                return shift;
                        }

-               }
-               return $gettext_obj->get(shift);
+               };

        }
        else {
        }
        else {

-               return shift;
+               *gettext=sub { return shift };

        }
 }
 
        }
 }
 

+sub gettext {
+       define_gettext();
+       gettext(@_);
+}
+

 sub yesno ($) {
        my $val=shift;
 
 sub yesno ($) {
        my $val=shift;
 


@@ -1686,12 +1887,12 @@ sub inject {
        use warnings;
 }
 
        use warnings;
 }
 

-sub pagespec_merge ($$) {
-       my $a=shift;
-       my $b=shift;
+sub add_link ($$) {
+       my $page=shift;
+       my $link=shift;

 
 

-       return $a if $a eq $b;
-       return "($a) or ($b)";
+       push @{$links{$page}}, $link
+               unless grep { $_ eq $link } @{$links{$page}};

 }
 
 sub pagespec_translate ($) {
 }
 
 sub pagespec_translate ($) {


@@ -1699,6 +1900,7 @@ sub pagespec_translate ($) {
 
        # Convert spec to perl code.
        my $code="";
 
        # Convert spec to perl code.
        my $code="";

+       my @data;

        while ($spec=~m{
                \s*             # ignore whitespace
                (               # 1: match a single word
        while ($spec=~m{
                \s*             # ignore whitespace
                (               # 1: match a single word


@@ -1713,27 +1915,30 @@ sub pagespec_translate ($) {
                        [^\s()]+        # any other text
                )
                \s*             # ignore whitespace
                        [^\s()]+        # any other text
                )
                \s*             # ignore whitespace

-       }igx) {
+       }gx) {

                my $word=$1;
                if (lc $word eq 'and') {
                my $word=$1;
                if (lc $word eq 'and') {

-                       $code.=' &&';
+                       $code.=' &';

                }
                elsif (lc $word eq 'or') {
                }
                elsif (lc $word eq 'or') {

-                       $code.=' ||';
+                       $code.=' |';

                }
                elsif ($word eq "(" || $word eq ")" || $word eq "!") {
                        $code.=' '.$word;
                }
                elsif ($word =~ /^(\w+)\((.*)\)$/) {
                        if (exists $IkiWiki::PageSpec::{"match_$1"}) {
                }
                elsif ($word eq "(" || $word eq ")" || $word eq "!") {
                        $code.=' '.$word;
                }
                elsif ($word =~ /^(\w+)\((.*)\)$/) {
                        if (exists $IkiWiki::PageSpec::{"match_$1"}) {

-                               $code.="IkiWiki::PageSpec::match_$1(\$page, ".safequote($2).", \@_)";
+                               push @data, $2;
+                               $code.="IkiWiki::PageSpec::match_$1(\$page, \$data[$#data], \@_)";

                        }
                        else {
                        }
                        else {

-                               $code.="IkiWiki::FailReason->new(".safequote(qq{unknown function in pagespec "$word"}).")";
+                               push @data, qq{unknown function in pagespec "$word"};
+                               $code.="IkiWiki::ErrorReason->new(\$data[$#data])";

                        }
                }
                else {
                        }
                }
                else {

-                       $code.=" IkiWiki::PageSpec::match_glob(\$page, ".safequote($word).", \@_)";
+                       push @data, $word;
+                       $code.=" IkiWiki::PageSpec::match_glob(\$page, \$data[$#data], \@_)";

                }
        }
 
                }
        }
 


@@ -1756,11 +1961,95 @@ sub pagespec_match ($$;@) {
        }
 
        my $sub=pagespec_translate($spec);
        }
 
        my $sub=pagespec_translate($spec);

-       return IkiWiki::FailReason->new("syntax error in pagespec \"$spec\"")
+       return IkiWiki::ErrorReason->new("syntax error in pagespec \"$spec\"")

                if $@ || ! defined $sub;
        return $sub->($page, @params);
 }
 
                if $@ || ! defined $sub;
        return $sub->($page, @params);
 }
 

+sub pagespec_match_list ($$;@) {
+       my $page=shift;
+       my $pagespec=shift;
+       my %params=@_;
+
+       # Backwards compatability with old calling convention.
+       if (ref $page) {
+               print STDERR "warning: a plugin (".caller().") is using pagespec_match_list in an obsolete way, and needs to be updated\n";
+               $params{list}=$page;
+               $page=$params{location}; # ugh!
+       }
+
+       my $sub=pagespec_translate($pagespec);
+       error "syntax error in pagespec \"$pagespec\""
+               if $@ || ! defined $sub;
+
+       my @candidates;
+       if (exists $params{list}) {
+               @candidates=exists $params{filter}
+                       ? grep { ! $params{filter}->($_) } @{$params{list}}
+                       : @{$params{list}};
+       }
+       else {
+               @candidates=exists $params{filter}
+                       ? grep { ! $params{filter}->($_) } keys %pagesources
+                       : keys %pagesources;
+       }
+
+       if (defined $params{sort}) {
+               my $f;
+               if ($params{sort} eq 'title') {
+                       $f=sub { pagetitle(basename($a)) cmp pagetitle(basename($b)) };
+               }
+               elsif ($params{sort} eq 'title_natural') {
+                       eval q{use Sort::Naturally};
+                       if ($@) {
+                               error(gettext("Sort::Naturally needed for title_natural sort"));
+                       }
+                       $f=sub { Sort::Naturally::ncmp(pagetitle(basename($a)), pagetitle(basename($b))) };
+                }
+               elsif ($params{sort} eq 'mtime') {
+                       $f=sub { $pagemtime{$b} <=> $pagemtime{$a} };
+               }
+               elsif ($params{sort} eq 'age') {
+                       $f=sub { $pagectime{$b} <=> $pagectime{$a} };
+               }
+               else {
+                       error sprintf(gettext("unknown sort type %s"), $params{sort});
+               }
+               @candidates = sort { &$f } @candidates;
+       }
+
+       @candidates=reverse(@candidates) if $params{reverse};
+       
+       $depends{$page}{$pagespec} |= ($params{deptype} || $DEPEND_CONTENT);
+       
+       # clear params, remainder is passed to pagespec
+       my $num=$params{num};
+       delete @params{qw{num deptype reverse sort filter list}};
+       
+       my @matches;
+       my $firstfail;
+       my $count=0;
+       my $accum=IkiWiki::SuccessReason->new();
+       foreach my $p (@candidates) {
+               my $r=$sub->($p, %params, location => $page);
+               error(sprintf(gettext("cannot match pages: %s"), $r))
+                       if $r->isa("IkiWiki::ErrorReason");
+               $accum |= $r;
+               if ($r) {
+                       push @matches, $p;
+                       last if defined $num && ++$count == $num;
+               }
+       }
+
+       # Add simple dependencies for accumulated influences.
+       my $i=$accum->influences;
+       foreach my $k (keys %$i) {
+               $depends_simple{$page}{lc $k} |= $i->{$k};
+       }
+
+       return @matches;
+}
+

 sub pagespec_valid ($) {
        my $spec=shift;
 
 sub pagespec_valid ($) {
        my $spec=shift;
 


@@ -1778,32 +2067,65 @@ sub glob2re ($) {
 package IkiWiki::FailReason;
 
 use overload (
 package IkiWiki::FailReason;
 
 use overload (

-       '""'    => sub { ${$_[0]} },
+       '""'    => sub { $_[0][0] },

        '0+'    => sub { 0 },
        '!'     => sub { bless $_[0], 'IkiWiki::SuccessReason'},
        '0+'    => sub { 0 },
        '!'     => sub { bless $_[0], 'IkiWiki::SuccessReason'},

+       '&'     => sub { $_[0]->merge_influences($_[1], 1); $_[0] },
+       '|'     => sub { $_[1]->merge_influences($_[0]); $_[1] },

        fallback => 1,
 );
 
        fallback => 1,
 );
 

-sub new {
-       my $class = shift;
-       my $value = shift;
-       return bless \$value, $class;
-}
+our @ISA = 'IkiWiki::SuccessReason';

 
 package IkiWiki::SuccessReason;
 
 use overload (
 
 package IkiWiki::SuccessReason;
 
 use overload (

-       '""'    => sub { ${$_[0]} },
+       '""'    => sub { $_[0][0] },

        '0+'    => sub { 1 },
        '!'     => sub { bless $_[0], 'IkiWiki::FailReason'},
        '0+'    => sub { 1 },
        '!'     => sub { bless $_[0], 'IkiWiki::FailReason'},

+       '&'     => sub { $_[1]->merge_influences($_[0], 1); $_[1] },
+       '|'     => sub { $_[0]->merge_influences($_[1]); $_[0] },

        fallback => 1,
 );
 
 sub new {
        my $class = shift;
        my $value = shift;
        fallback => 1,
 );
 
 sub new {
        my $class = shift;
        my $value = shift;

-       return bless \$value, $class;
-};
+       return bless [$value, {@_}], $class;
+}
+
+sub influences {
+       my $this=shift;
+       $this->[1]={@_} if @_;
+       my %i=%{$this->[1]};
+       delete $i{""};
+       return \%i;
+}
+
+sub influences_static {
+       return ! $_[0][1]->{""};
+}
+
+sub merge_influences {
+       my $this=shift;
+       my $other=shift;
+       my $anded=shift;
+
+       if (! $anded || (($this || %{$this->[1]}) &&
+                       ($other || %{$other->[1]}))) {
+               foreach my $influence (keys %{$other->[1]}) {
+                       $this->[1]{$influence} |= $other->[1]{$influence};
+               }
+       }
+       else {
+               # influence blocker
+               $this->[1]={};
+       }
+}
+
+package IkiWiki::ErrorReason;
+
+our @ISA = 'IkiWiki::FailReason';

 
 package IkiWiki::PageSpec;
 
 
 package IkiWiki::PageSpec;
 


@@ -1854,27 +2176,30 @@ sub match_link ($$;@) {
        my $from=exists $params{location} ? $params{location} : '';
 
        my $links = $IkiWiki::links{$page};
        my $from=exists $params{location} ? $params{location} : '';
 
        my $links = $IkiWiki::links{$page};

-       return IkiWiki::FailReason->new("$page has no links") unless $links && @{$links};
+       return IkiWiki::FailReason->new("$page has no links", "" => 1)
+               unless $links && @{$links};

        my $bestlink = IkiWiki::bestlink($from, $link);
        foreach my $p (@{$links}) {
                if (length $bestlink) {
        my $bestlink = IkiWiki::bestlink($from, $link);
        foreach my $p (@{$links}) {
                if (length $bestlink) {

-                       return IkiWiki::SuccessReason->new("$page links to $link")
+                       return IkiWiki::SuccessReason->new("$page links to $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)

                                if $bestlink eq IkiWiki::bestlink($page, $p);
                }
                else {
                                if $bestlink eq IkiWiki::bestlink($page, $p);
                }
                else {

-                       return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
+                       return IkiWiki::SuccessReason->new("$page links to page $p matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)

                                if match_glob($p, $link, %params);
                                if match_glob($p, $link, %params);

-                       $p=~s/^\///;
+                       my ($p_rel)=$p=~/^\/?(.*)/;

                        $link=~s/^\///;
                        $link=~s/^\///;

-                       return IkiWiki::SuccessReason->new("$page links to page $p matching $link")
-                               if match_glob($p, $link, %params);
+                       return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
+                               if match_glob($p_rel, $link, %params);

                }
        }
                }
        }

-       return IkiWiki::FailReason->new("$page does not link to $link");
+       return IkiWiki::FailReason->new("$page does not link to $link", "" => 1);

 }
 
 sub match_backlink ($$;@) {
 }
 
 sub match_backlink ($$;@) {

-       return match_link($_[1], $_[0], @_);
+       my $ret=match_link($_[1], $_[0], @_);
+       $ret->influences($_[1] => $IkiWiki::DEPEND_LINKS);
+       return $ret;

 }
 
 sub match_created_before ($$;@) {
 }
 
 sub match_created_before ($$;@) {


@@ -1886,14 +2211,14 @@ sub match_created_before ($$;@) {
 
        if (exists $IkiWiki::pagectime{$testpage}) {
                if ($IkiWiki::pagectime{$page} < $IkiWiki::pagectime{$testpage}) {
 
        if (exists $IkiWiki::pagectime{$testpage}) {
                if ($IkiWiki::pagectime{$page} < $IkiWiki::pagectime{$testpage}) {

-                       return IkiWiki::SuccessReason->new("$page created before $testpage");
+                       return IkiWiki::SuccessReason->new("$page created before $testpage", $testpage => $IkiWiki::DEPEND_PRESENCE);

                }
                else {
                }
                else {

-                       return IkiWiki::FailReason->new("$page not created before $testpage");
+                       return IkiWiki::FailReason->new("$page not created before $testpage", $testpage => $IkiWiki::DEPEND_PRESENCE);

                }
        }
        else {
                }
        }
        else {

-               return IkiWiki::FailReason->new("$testpage has no ctime");
+               return IkiWiki::ErrorReason->new("$testpage does not exist", $testpage => $IkiWiki::DEPEND_PRESENCE);

        }
 }
 
        }
 }
 


@@ -1906,14 +2231,14 @@ sub match_created_after ($$;@) {
 
        if (exists $IkiWiki::pagectime{$testpage}) {
                if ($IkiWiki::pagectime{$page} > $IkiWiki::pagectime{$testpage}) {
 
        if (exists $IkiWiki::pagectime{$testpage}) {
                if ($IkiWiki::pagectime{$page} > $IkiWiki::pagectime{$testpage}) {

-                       return IkiWiki::SuccessReason->new("$page created after $testpage");
+                       return IkiWiki::SuccessReason->new("$page created after $testpage", $testpage => $IkiWiki::DEPEND_PRESENCE);

                }
                else {
                }
                else {

-                       return IkiWiki::FailReason->new("$page not created after $testpage");
+                       return IkiWiki::FailReason->new("$page not created after $testpage", $testpage => $IkiWiki::DEPEND_PRESENCE);

                }
        }
        else {
                }
        }
        else {

-               return IkiWiki::FailReason->new("$testpage has no ctime");
+               return IkiWiki::ErrorReason->new("$testpage does not exist", $testpage => $IkiWiki::DEPEND_PRESENCE);

        }
 }
 
        }
 }
 


@@ -1950,7 +2275,7 @@ sub match_user ($$;@) {
        my %params=@_;
        
        if (! exists $params{user}) {
        my %params=@_;
        
        if (! exists $params{user}) {

-               return IkiWiki::FailReason->new("no user specified");
+               return IkiWiki::ErrorReason->new("no user specified");

        }
 
        if (defined $params{user} && lc $params{user} eq lc $user) {
        }
 
        if (defined $params{user} && lc $params{user} eq lc $user) {


@@ -1970,7 +2295,7 @@ sub match_admin ($$;@) {
        my %params=@_;
        
        if (! exists $params{user}) {
        my %params=@_;
        
        if (! exists $params{user}) {

-               return IkiWiki::FailReason->new("no user specified");
+               return IkiWiki::ErrorReason->new("no user specified");

        }
 
        if (defined $params{user} && IkiWiki::is_admin($params{user})) {
        }
 
        if (defined $params{user} && IkiWiki::is_admin($params{user})) {


@@ -1990,7 +2315,7 @@ sub match_ip ($$;@) {
        my %params=@_;
        
        if (! exists $params{ip}) {
        my %params=@_;
        
        if (! exists $params{ip}) {

-               return IkiWiki::FailReason->new("no IP specified");
+               return IkiWiki::ErrorReason->new("no IP specified");

        }
 
        if (defined $params{ip} && lc $params{ip} eq lc $ip) {
        }
 
        if (defined $params{ip} && lc $params{ip} eq lc $ip) {