(no commit message)

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ce8fdd454dacf3af686a3f49953ab0381ba429dc..699ad13dac4183e5d3135e62d6956e6f40c8a731 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -5,26 +5,26 @@ package IkiWiki;
 use warnings;
 use strict;
 use Encode;
 use warnings;
 use strict;
 use Encode;

-use HTML::Entities;

 use URI::Escape q{uri_escape_utf8};
 use POSIX ();
 use Storable;
 use open qw{:utf8 :std};
 
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 use URI::Escape q{uri_escape_utf8};
 use POSIX ();
 use Storable;
 use open qw{:utf8 :std};
 
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase

-           %pagestate %wikistate %renderedfiles %oldrenderedfiles
-           %pagesources %destsources %depends %depends_simple %hooks
-           %forcerebuild %loaded_plugins};
+       %pagestate %wikistate %renderedfiles %oldrenderedfiles
+       %pagesources %destsources %depends %depends_simple @mass_depends 
+       %hooks %forcerebuild %loaded_plugins %typedlinks %oldtypedlinks
+       %autofiles};

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

-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 ngettext urlto targetpage
-                add_underlay pagetitle titlepage linkpage newpagefile
-                inject add_link
-                 %config %links %pagestate %wikistate %renderedfiles
-                 %pagesources %destsources);
+our @EXPORT = qw(hook debug error htmlpage template template_depends
+       deptype add_depends pagespec_match pagespec_match_list bestlink
+       htmllink readfile writefile pagetype srcfile pagename
+       displaytime will_render gettext ngettext urlto targetpage
+       add_underlay pagetitle titlepage linkpage newpagefile
+       inject add_link add_autofile
+       %config %links %pagestate %wikistate %renderedfiles
+       %pagesources %destsources %typedlinks);

 our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
 our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
 our $installdir='/usr'; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
 our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
 our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
 our $installdir='/usr'; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE


@@ -37,6 +37,7 @@ our $DEPEND_LINKS=4;
 # Optimisation.
 use Memoize;
 memoize("abs2rel");
 # Optimisation.
 use Memoize;
 memoize("abs2rel");

+memoize("sortspec_translate");

 memoize("pagespec_translate");
 memoize("template_file");
 
 memoize("pagespec_translate");
 memoize("template_file");
 


@@ -150,18 +151,11 @@ sub getsetup () {
        templatedir => {
                type => "string",
                default => "$installdir/share/ikiwiki/templates",
        templatedir => {
                type => "string",
                default => "$installdir/share/ikiwiki/templates",

-               description => "location of template files",
+               description => "additional directory to search for template files",

                advanced => 1,
                safe => 0, # path
                rebuild => 1,
        },
                advanced => 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",


@@ -240,6 +234,14 @@ sub getsetup () {
                safe => 1,
                rebuild => 1,
        },
                safe => 1,
                rebuild => 1,
        },

+       html5 => {
+               type => "boolean",
+               default => 0,
+               description => "generate HTML5? (experimental)",
+               advanced => 1,
+               safe => 1,
+               rebuild => 1,
+       },

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


@@ -354,7 +356,7 @@ sub getsetup () {
        },
        wiki_file_prune_regexps => {
                type => "internal",
        },
        wiki_file_prune_regexps => {
                type => "internal",

-               default => [qr/(^|\/)\.\.(\/|$)/, qr/^\./, qr/\/\./,
+               default => [qr/(^|\/)\.\.(\/|$)/, qr/^\//, qr/^\./, qr/\/\./,

                        qr/\.x?html?$/, qr/\.ikiwiki-new$/,
                        qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//,
                        qr/(^|\/)_MTN\//, qr/(^|\/)_darcs\//,
                        qr/\.x?html?$/, qr/\.ikiwiki-new$/,
                        qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//,
                        qr/(^|\/)_MTN\//, qr/(^|\/)_darcs\//,


@@ -439,10 +441,9 @@ sub getsetup () {
                safe => 0,
                rebuild => 0,
        },
                safe => 0,
                rebuild => 0,
        },

-       getctime => {
+       gettime => {

                type => "internal",
                type => "internal",

-               default => 0,
-               description => "running in getctime mode",
+               description => "running in gettime mode",

                safe => 0,
                rebuild => 0,
        },
                safe => 0,
                rebuild => 0,
        },


@@ -997,10 +998,18 @@ sub abs2rel ($$) {
        return $ret;
 }
 
        return $ret;
 }
 

-sub displaytime ($;$) {
+sub displaytime ($;$$) {

        # Plugins can override this function to mark up the time to
        # display.
        # Plugins can override this function to mark up the time to
        # display.

-       return '<span class="date">'.formattime(@_).'</span>';
+       my $time=formattime($_[0], $_[1]);
+       if ($config{html5}) {
+               return '<time datetime="'.date_3339($_[0]).'"'.
+                       ($_[2] ? ' pubdate="pubdate"' : '').
+                       '>'.$time.'</time>';
+       }
+       else {
+               return '<span class="date">'.$time.'</span>';
+       }

 }
 
 sub formattime ($;$) {
 }
 
 sub formattime ($;$) {


@@ -1016,6 +1025,16 @@ sub formattime ($;$) {
        return decode_utf8(POSIX::strftime($format, localtime($time)));
 }
 
        return decode_utf8(POSIX::strftime($format, localtime($time)));
 }
 

+sub date_3339 ($) {
+       my $time=shift;
+
+       my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
+       POSIX::setlocale(&POSIX::LC_TIME, "C");
+       my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", gmtime($time));
+       POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
+       return $ret;
+}
+

 sub beautify_urlpath ($) {
        my $url=shift;
 
 sub beautify_urlpath ($) {
        my $url=shift;
 


@@ -1086,14 +1105,16 @@ sub htmllink ($$$;@) {
                $bestlink=htmlpage($bestlink);
 
                if (! $destsources{$bestlink}) {
                $bestlink=htmlpage($bestlink);
 
                if (! $destsources{$bestlink}) {

-                       return $linktext unless length $config{cgiurl};
-                       return "<span class=\"createlink\"><a href=\"".
-                               cgiurl(
-                                       do => "create",
-                                       page => lc($link),
-                                       from => $lpage
-                               ).
-                               "\" rel=\"nofollow\">?</a>$linktext</span>"
+                       my $cgilink = "";
+                       if (length $config{cgiurl}) {
+                               $cgilink = "<a href=\"".
+                                       cgiurl(
+                                               do => "create",
+                                               page => lc($link),
+                                               from => $lpage
+                                       )."\" rel=\"nofollow\">?</a>";
+                       }
+                       return "<span class=\"createlink\">$cgilink$linktext</span>"

                }
        }
        
                }
        }
        


@@ -1164,7 +1185,7 @@ sub htmlize ($$$$) {
        my $content=shift;
        
        my $oneline = $content !~ /\n/;
        my $content=shift;
        
        my $oneline = $content !~ /\n/;

-
+       

        if (exists $hooks{htmlize}{$type}) {
                $content=$hooks{htmlize}{$type}{call}->(
                        page => $page,
        if (exists $hooks{htmlize}{$type}) {
                $content=$hooks{htmlize}{$type}{call}->(
                        page => $page,


@@ -1185,10 +1206,9 @@ sub htmlize ($$$$) {
        
        if ($oneline) {
                # hack to get rid of enclosing junk added by markdown
        
        if ($oneline) {
                # hack to get rid of enclosing junk added by markdown

-               # and other htmlizers
+               # and other htmlizers/sanitizers

                $content=~s/^<p>//i;
                $content=~s/^<p>//i;

-               $content=~s/<\/p>$//i;
-               chomp $content;
+               $content=~s/<\/p>\n*$//i;

        }
 
        return $content;
        }
 
        return $content;


@@ -1381,10 +1401,6 @@ sub filter ($$$) {
        return $content;
 }
 
        return $content;
 }
 

-sub indexlink () {
-       return "<a href=\"$config{url}\">$config{wikiname}</a>";
-}
-

 sub check_canedit ($$$;$) {
        my $page=shift;
        my $q=shift;
 sub check_canedit ($$$;$) {
        my $page=shift;
        my $q=shift;


@@ -1503,7 +1519,7 @@ sub loadindex () {
        if (! $config{rebuild}) {
                %pagesources=%pagemtime=%oldlinks=%links=%depends=
                %destsources=%renderedfiles=%pagecase=%pagestate=
        if (! $config{rebuild}) {
                %pagesources=%pagemtime=%oldlinks=%links=%depends=
                %destsources=%renderedfiles=%pagecase=%pagestate=

-               %depends_simple=();
+               %depends_simple=%typedlinks=%oldtypedlinks=();

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


@@ -1512,6 +1528,7 @@ sub loadindex () {
                        open ($in, "<", "$config{wikistatedir}/indexdb") || return;
                }
                else {
                        open ($in, "<", "$config{wikistatedir}/indexdb") || return;
                }
                else {

+                       $config{gettime}=1; # first build

                        return;
                }
        }
                        return;
                }
        }


@@ -1535,8 +1552,8 @@ sub loadindex () {
                my $d=$pages->{$src};
                my $page=pagename($src);
                $pagectime{$page}=$d->{ctime};
                my $d=$pages->{$src};
                my $page=pagename($src);
                $pagectime{$page}=$d->{ctime};

+               $pagesources{$page}=$src;

                if (! $config{rebuild}) {
                if (! $config{rebuild}) {

-                       $pagesources{$page}=$src;

                        $pagemtime{$page}=$d->{mtime};
                        $renderedfiles{$page}=$d->{dest};
                        if (exists $d->{links} && ref $d->{links}) {
                        $pagemtime{$page}=$d->{mtime};
                        $renderedfiles{$page}=$d->{dest};
                        if (exists $d->{links} && ref $d->{links}) {


@@ -1569,6 +1586,14 @@ sub loadindex () {
                        if (exists $d->{state}) {
                                $pagestate{$page}=$d->{state};
                        }
                        if (exists $d->{state}) {
                                $pagestate{$page}=$d->{state};
                        }

+                       if (exists $d->{typedlinks}) {
+                               $typedlinks{$page}=$d->{typedlinks};
+
+                               while (my ($type, $links) = each %{$typedlinks{$page}}) {
+                                       next unless %$links;
+                                       $oldtypedlinks{$page}{$type} = {%$links};
+                               }
+                       }

                }
                $oldrenderedfiles{$page}=[@{$d->{dest}}];
        }
                }
                $oldrenderedfiles{$page}=[@{$d->{dest}}];
        }


@@ -1617,6 +1642,10 @@ sub saveindex () {
                        $index{page}{$src}{depends_simple} = $depends_simple{$page};
                }
 
                        $index{page}{$src}{depends_simple} = $depends_simple{$page};
                }
 

+               if (exists $typedlinks{$page} && %{$typedlinks{$page}}) {
+                       $index{page}{$src}{typedlinks} = $typedlinks{$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}}) {


@@ -1644,60 +1673,115 @@ sub saveindex () {
 }
 
 sub template_file ($) {
 }
 
 sub template_file ($) {

-       my $template=shift;
+       my $name=shift;
+       
+       my $tpage=($name =~ s/^\///) ? $name : "templates/$name";
+       if ($name !~ /\.tmpl$/ && exists $pagesources{$tpage}) {
+               $tpage=$pagesources{$tpage};
+               $name.=".tmpl";
+       }

 
 

-       foreach my $dir ($config{templatedir}, @{$config{templatedirs}},
-                        "$installdir/share/ikiwiki/templates") {
-               return "$dir/$template" if -e "$dir/$template";
+       my $template=srcfile($tpage, 1);
+       if (defined $template) {
+               return $template, $tpage, 1 if wantarray;
+               return $template;
+       }
+       else {
+               $name=~s:/::; # avoid path traversal
+               foreach my $dir ($config{templatedir},
+                                "$installdir/share/ikiwiki/templates") {
+                       if (-e "$dir/$name") {
+                               $template="$dir/$name";
+                               last;
+                       }
+               }
+               if (defined $template) {        
+                       return $template, $tpage if wantarray;
+                       return $template;
+               }

        }
        }

+

        return;
 }
 
        return;
 }
 

-sub template_params (@) {
-       my $filename=template_file(shift);
-
-       if (! defined $filename) {
-               return if wantarray;
-               return "";
+sub template_depends ($$;@) {
+       my $name=shift;
+       my $page=shift;
+       
+       my ($filename, $tpage, $untrusted)=template_file($name);
+       if (defined $page && defined $tpage) {
+               add_depends($page, $tpage);

        }
 
        }
 

-       my @ret=(
+       return unless defined $filename;
+
+       my @opts=(

                filter => sub {
                        my $text_ref = shift;
                        ${$text_ref} = decode_utf8(${$text_ref});
                },
                filter => sub {
                        my $text_ref = shift;
                        ${$text_ref} = decode_utf8(${$text_ref});
                },

-               filename => $filename,

                loop_context_vars => 1,
                die_on_bad_params => 0,
                loop_context_vars => 1,
                die_on_bad_params => 0,

-               @_
+               filename => $filename,
+               @_,
+               ($untrusted ? (no_includes => 1) : ()),

        );
        );

-       return wantarray ? @ret : {@ret};
+       return @opts if wantarray;
+
+       require HTML::Template;
+       return HTML::Template->new(@opts);

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

-       require HTML::Template;
-       return HTML::Template->new(template_params(@_));
+       template_depends(shift, undef, @_);

 }
 
 sub misctemplate ($$;@) {
        my $title=shift;
 }
 
 sub misctemplate ($$;@) {
        my $title=shift;

-       my $pagebody=shift;
+       my $content=shift;

        
        

-       my $template=template("misc.tmpl");
+       my $template=template("page.tmpl");
+
+       run_hooks(pagetemplate => sub {
+               shift->(page => "", destpage => "", template => $template);
+       });
+       templateactions($template, "");
+

        $template->param(
        $template->param(

+               dynamic => 1,

                title => $title,
                title => $title,

-               indexlink => indexlink(),

                wikiname => $config{wikiname},
                wikiname => $config{wikiname},

-               pagebody => $pagebody,
+               content => $content,

                baseurl => baseurl(),
                baseurl => baseurl(),

+               html5 => $config{html5},

                @_,
        );
                @_,
        );

-       run_hooks(pagetemplate => sub {
-               shift->(page => "", destpage => "", template => $template);
-       });
+       

        return $template->output;
 }
 
        return $template->output;
 }
 

+sub templateactions ($$) {
+       my $template=shift;
+       my $page=shift;
+
+       my $have_actions=0;
+       my @actions;
+       run_hooks(pageactions => sub {
+               push @actions, map { { action => $_ } } 
+                       grep { defined } shift->(page => $page);
+       });
+       $template->param(actions => \@actions);
+
+       if ($config{cgiurl} && exists $hooks{auth}) {
+               $template->param(prefsurl => cgiurl(do => "prefs"));
+               $have_actions=1;
+       }
+
+       if ($have_actions || @actions) {
+               $template->param(have_actions => 1);
+       }
+}
+

 sub hook (@) {
        my %param=@_;
        
 sub hook (@) {
        my %param=@_;
        


@@ -1778,6 +1862,10 @@ sub rcs_getctime ($) {
        $hooks{rcs}{rcs_getctime}{call}->(@_);
 }
 
        $hooks{rcs}{rcs_getctime}{call}->(@_);
 }
 

+sub rcs_getmtime ($) {
+       $hooks{rcs}{rcs_getmtime}{call}->(@_);
+}
+

 sub rcs_receive () {
        $hooks{rcs}{rcs_receive}{call}->();
 }
 sub rcs_receive () {
        $hooks{rcs}{rcs_receive}{call}->();
 }


@@ -1796,14 +1884,16 @@ sub add_depends ($$;$) {
 
        # Add explicit dependencies for influences.
        my $sub=pagespec_translate($pagespec);
 
        # Add explicit dependencies for influences.
        my $sub=pagespec_translate($pagespec);

-       return if $@;
+       return unless defined $sub;

        foreach my $p (keys %pagesources) {
                my $r=$sub->($p, location => $page);
                my $i=$r->influences;
        foreach my $p (keys %pagesources) {
                my $r=$sub->($p, location => $page);
                my $i=$r->influences;

+               my $static=$r->influences_static;

                foreach my $k (keys %$i) {
                foreach my $k (keys %$i) {

+                       next unless $r || $static || $k eq $page;

                        $depends_simple{$page}{lc $k} |= $i->{$k};
                }
                        $depends_simple{$page}{lc $k} |= $i->{$k};
                }

-               last if $r->influences_static;
+               last if $static;

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


@@ -1827,15 +1917,8 @@ sub deptype (@) {
 }
 
 my $file_prune_regexp;
 }
 
 my $file_prune_regexp;

-sub file_pruned ($;$) {
+sub file_pruned ($) {

        my $file=shift;
        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/+##;
-       }

 
        if (defined $config{include} && length $config{include}) {
                return 0 if $file =~ m/$config{include}/;
 
        if (defined $config{include} && length $config{include}) {
                return 0 if $file =~ m/$config{include}/;


@@ -1874,7 +1957,7 @@ sub define_gettext () {
                        return shift;
                }
        };
                        return shift;
                }
        };

-       *ngettext=sub {
+       *ngettext=sub {

                $getobj->() if $getobj;
                if ($gettext_obj) {
                        $gettext_obj->nget(@_);
                $getobj->() if $getobj;
                if ($gettext_obj) {
                        $gettext_obj->nget(@_);


@@ -1926,12 +2009,91 @@ sub inject {
        use warnings;
 }
 
        use warnings;
 }
 

-sub add_link ($$) {
+sub add_link ($$;$) {

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

+       my $type=shift;

 
        push @{$links{$page}}, $link
                unless grep { $_ eq $link } @{$links{$page}};
 
        push @{$links{$page}}, $link
                unless grep { $_ eq $link } @{$links{$page}};

+
+       if (defined $type) {
+               $typedlinks{$page}{$type}{$link} = 1;
+       }
+}
+
+sub add_autofile ($$$) {
+       my $file=shift;
+       my $plugin=shift;
+       my $generator=shift;
+       
+       $autofiles{$file}{plugin}=$plugin;
+       $autofiles{$file}{generator}=$generator;
+}
+
+sub sortspec_translate ($$) {
+       my $spec = shift;
+       my $reverse = shift;
+
+       my $code = "";
+       my @data;
+       while ($spec =~ m{
+               \s*
+               (-?)            # group 1: perhaps negated
+               \s*
+               (               # group 2: a word
+                       \w+\([^\)]*\)   # command(params)
+                       |
+                       [^\s]+          # or anything else
+               )
+               \s*
+       }gx) {
+               my $negated = $1;
+               my $word = $2;
+               my $params = undef;
+
+               if ($word =~ m/^(\w+)\((.*)\)$/) {
+                       # command with parameters
+                       $params = $2;
+                       $word = $1;
+               }
+               elsif ($word !~ m/^\w+$/) {
+                       error(sprintf(gettext("invalid sort type %s"), $word));
+               }
+
+               if (length $code) {
+                       $code .= " || ";
+               }
+
+               if ($negated) {
+                       $code .= "-";
+               }
+
+               if (exists $IkiWiki::SortSpec::{"cmp_$word"}) {
+                       if (defined $params) {
+                               push @data, $params;
+                               $code .= "IkiWiki::SortSpec::cmp_$word(\$data[$#data])";
+                       }
+                       else {
+                               $code .= "IkiWiki::SortSpec::cmp_$word(undef)";
+                       }
+               }
+               else {
+                       error(sprintf(gettext("unknown sort type %s"), $word));
+               }
+       }
+
+       if (! length $code) {
+               # undefined sorting method... sort arbitrarily
+               return sub { 0 };
+       }
+
+       if ($reverse) {
+               $code="-($code)";
+       }
+
+       no warnings;
+       return eval 'sub { '.$code.' }';

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


@@ -2001,68 +2163,10 @@ sub pagespec_match ($$;@) {
 
        my $sub=pagespec_translate($spec);
        return IkiWiki::ErrorReason->new("syntax error in pagespec \"$spec\"")
 
        my $sub=pagespec_translate($spec);
        return IkiWiki::ErrorReason->new("syntax error in pagespec \"$spec\"")

-               if $@ || ! defined $sub;
+               if ! defined $sub;

        return $sub->($page, @params);
 }
 
        return $sub->($page, @params);
 }
 

-sub get_sort_function {
-       my $method = $_[0];
-
-       if ($method =~ m/\s/) {
-               my @methods = map { get_sort_function($_) } split(' ', $method);
-
-               return sub {
-                       foreach my $method (@methods) {
-                               my $answer = $method->($_[0], $_[1]);
-                               return $answer if $answer;
-                       }
-
-                       return 0;
-               };
-       }
-
-       my $sense = 1;
-
-       if ($method =~ s/^-//) {
-               $sense = -1;
-       }
-
-       my $token = $method;
-       my $parameter = undef;
-
-       if ($method =~ m/^(\w+)\((.*)\)$/) {
-               $token = $1;
-               $parameter = $2;
-       }
-
-       if (exists $hooks{sort}{$token}{call}) {
-               my $callback = $hooks{sort}{$token}{call};
-               return sub { $sense * $callback->($_[0], $_[1], $parameter) };
-       }
-
-       if ($method eq 'title') {
-               return sub { $sense * (pagetitle(basename($_[0])) cmp pagetitle(basename($_[1]))) };
-       }
-
-       if ($method eq 'title_natural') {
-               eval q{use Sort::Naturally};
-               if ($@) {
-                       error(gettext("Sort::Naturally needed for title_natural sort"));
-               }
-               return sub { $sense * Sort::Naturally::ncmp(pagetitle(basename($_[0])), pagetitle(basename($_[1]))) };
-       }
-
-       if ($method eq 'mtime') {
-               return sub { $sense * ($pagemtime{$_[1]} <=> $pagemtime{$_[0]}) };
-       }
-
-       if ($method eq 'age') {
-               return sub { $sense * ($pagectime{$_[1]} <=> $pagectime{$_[0]}) };
-       }
-
-       error sprintf(gettext("unknown sort type %s"), $method);
-}
-

 sub pagespec_match_list ($$;@) {
        my $page=shift;
        my $pagespec=shift;
 sub pagespec_match_list ($$;@) {
        my $page=shift;
        my $pagespec=shift;


@@ -2077,7 +2181,9 @@ sub pagespec_match_list ($$;@) {
 
        my $sub=pagespec_translate($pagespec);
        error "syntax error in pagespec \"$pagespec\""
 
        my $sub=pagespec_translate($pagespec);
        error "syntax error in pagespec \"$pagespec\""

-               if $@ || ! defined $sub;
+               if ! defined $sub;
+       my $sort=sortspec_translate($params{sort}, $params{reverse})
+               if defined $params{sort};

 
        my @candidates;
        if (exists $params{list}) {
 
        my @candidates;
        if (exists $params{list}) {


@@ -2090,21 +2196,19 @@ sub pagespec_match_list ($$;@) {
                        ? grep { ! $params{filter}->($_) } keys %pagesources
                        : keys %pagesources;
        }
                        ? grep { ! $params{filter}->($_) } keys %pagesources
                        : keys %pagesources;
        }

-
-       if (defined $params{sort}) {
-               my $f = get_sort_function($params{sort});
-
-               @candidates = sort { $f->($a, $b) } @candidates;
-       }
-
-       @candidates=reverse(@candidates) if $params{reverse};
-       
-       $depends{$page}{$pagespec} |= ($params{deptype} || $DEPEND_CONTENT);

        
        # clear params, remainder is passed to pagespec
        
        # clear params, remainder is passed to pagespec

+       $depends{$page}{$pagespec} |= ($params{deptype} || $DEPEND_CONTENT);

        my $num=$params{num};
        delete @params{qw{num deptype reverse sort filter list}};
        
        my $num=$params{num};
        delete @params{qw{num deptype reverse sort filter list}};
        

+       # when only the top matches will be returned, it's efficient to
+       # sort before matching to pagespec,
+       if (defined $num && defined $sort) {
+               @candidates=IkiWiki::SortSpec::sort_pages(
+                       $sort, @candidates);
+       }
+       

        my @matches;
        my $firstfail;
        my $count=0;
        my @matches;
        my $firstfail;
        my $count=0;


@@ -2113,6 +2217,9 @@ sub pagespec_match_list ($$;@) {
                my $r=$sub->($p, %params, location => $page);
                error(sprintf(gettext("cannot match pages: %s"), $r))
                        if $r->isa("IkiWiki::ErrorReason");
                my $r=$sub->($p, %params, location => $page);
                error(sprintf(gettext("cannot match pages: %s"), $r))
                        if $r->isa("IkiWiki::ErrorReason");

+               unless ($r || $r->influences_static) {
+                       $r->remove_influence($p);
+               }

                $accum |= $r;
                if ($r) {
                        push @matches, $p;
                $accum |= $r;
                if ($r) {
                        push @matches, $p;


@@ -2126,14 +2233,21 @@ sub pagespec_match_list ($$;@) {
                $depends_simple{$page}{lc $k} |= $i->{$k};
        }
 
                $depends_simple{$page}{lc $k} |= $i->{$k};
        }
 

-       return @matches;
+       # when all matches will be returned, it's efficient to
+       # sort after matching
+       if (! defined $num && defined $sort) {
+               return IkiWiki::SortSpec::sort_pages(
+                       $sort, @matches);
+       }
+       else {
+               return @matches;
+       }

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

-       my $sub=pagespec_translate($spec);
-       return ! $@;
+       return defined pagespec_translate($spec);

 }
 
 sub glob2re ($) {
 }
 
 sub glob2re ($) {


@@ -2191,7 +2305,7 @@ sub merge_influences {
        my $anded=shift;
 
        if (! $anded || (($this || %{$this->[1]}) &&
        my $anded=shift;
 
        if (! $anded || (($this || %{$this->[1]}) &&

-                       ($other || %{$other->[1]}))) {
+                        ($other || %{$other->[1]}))) {

                foreach my $influence (keys %{$other->[1]}) {
                        $this->[1]{$influence} |= $other->[1]{$influence};
                }
                foreach my $influence (keys %{$other->[1]}) {
                        $this->[1]{$influence} |= $other->[1]{$influence};
                }


@@ -2202,6 +2316,13 @@ sub merge_influences {
        }
 }
 
        }
 }
 

+sub remove_influence {
+       my $this=shift;
+       my $torm=shift;
+
+       delete $this->[1]{$torm};
+}
+

 package IkiWiki::ErrorReason;
 
 our @ISA = 'IkiWiki::FailReason';
 package IkiWiki::ErrorReason;
 
 our @ISA = 'IkiWiki::FailReason';


@@ -2215,7 +2336,7 @@ sub derel ($$) {
        if ($path =~ m!^\./!) {
                $from=~s#/?[^/]+$## if defined $from;
                $path=~s#^\./##;
        if ($path =~ m!^\./!) {
                $from=~s#/?[^/]+$## if defined $from;
                $path=~s#^\./##;

-               $path="$from/$path" if length $from;
+               $path="$from/$path" if defined $from && length $from;

        }
 
        return $path;
        }
 
        return $path;


@@ -2243,7 +2364,19 @@ sub match_glob ($$;@) {
 }
 
 sub match_internal ($$;@) {
 }
 
 sub match_internal ($$;@) {

-       return match_glob($_[0], $_[1], @_, internal => 1)
+       return match_glob(shift, shift, @_, internal => 1)
+}
+
+sub match_page ($$;@) {
+       my $page=shift;
+       my $match=match_glob($page, shift, @_);
+       if ($match && ! (exists $IkiWiki::pagesources{$page}
+           && defined IkiWiki::pagetype($IkiWiki::pagesources{$page}))) {
+               return IkiWiki::FailReason->new("$page is not a page");
+       }
+       else {
+               return $match;
+       }

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


@@ -2253,26 +2386,34 @@ sub match_link ($$;@) {
 
        $link=derel($link, $params{location});
        my $from=exists $params{location} ? $params{location} : '';
 
        $link=derel($link, $params{location});
        my $from=exists $params{location} ? $params{location} : '';

+       my $linktype=$params{linktype};
+       my $qualifier='';
+       if (defined $linktype) {
+               $qualifier=" with type $linktype";
+       }

 
        my $links = $IkiWiki::links{$page};
 
        my $links = $IkiWiki::links{$page};

-       return IkiWiki::FailReason->new("$page has no links", "" => 1)
+       return IkiWiki::FailReason->new("$page has no links", $page => $IkiWiki::DEPEND_LINKS, "" => 1)

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

-                       return IkiWiki::SuccessReason->new("$page links to $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
-                               if $bestlink eq IkiWiki::bestlink($page, $p);
+                       if ((!defined $linktype || exists $IkiWiki::typedlinks{$page}{$linktype}{$p}) && $bestlink eq IkiWiki::bestlink($page, $p)) {
+                               return IkiWiki::SuccessReason->new("$page links to $link$qualifier", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
+                       }

                }
                else {
                }
                else {

-                       return IkiWiki::SuccessReason->new("$page links to page $p matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
-                               if match_glob($p, $link, %params);
+                       if ((!defined $linktype || exists $IkiWiki::typedlinks{$page}{$linktype}{$p}) && match_glob($p, $link, %params)) {
+                               return IkiWiki::SuccessReason->new("$page links to page $p$qualifier, matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
+                       }

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

-                       return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
-                               if match_glob($p_rel, $link, %params);
+                       if ((!defined $linktype || exists $IkiWiki::typedlinks{$page}{$linktype}{$p_rel}) && match_glob($p_rel, $link, %params)) {
+                               return IkiWiki::SuccessReason->new("$page links to page $p_rel$qualifier, matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
+                       }

                }
        }
                }
        }

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

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


@@ -2407,4 +2548,22 @@ sub match_ip ($$;@) {
        }
 }
 
        }
 }
 

+package IkiWiki::SortSpec;
+
+# This is in the SortSpec namespace so that the $a and $b that sort() uses
+# are easily available in this namespace, for cmp functions to use them.
+sub sort_pages {
+       my $f=shift;
+       sort $f @_
+}
+
+sub cmp_title {
+       IkiWiki::pagetitle(IkiWiki::basename($a))
+       cmp
+       IkiWiki::pagetitle(IkiWiki::basename($b))
+}
+
+sub cmp_mtime { $IkiWiki::pagemtime{$b} <=> $IkiWiki::pagemtime{$a} }
+sub cmp_age { $IkiWiki::pagectime{$b} <=> $IkiWiki::pagectime{$a} }
+

 1
 1