(no commit message)

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 91d2e6082a9291a24ffd17681bb8fc2b00470c2f..699ad13dac4183e5d3135e62d6956e6f40c8a731 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -5,36 +5,43 @@ 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 URI::Escape q{uri_escape_utf8};

-use POSIX;
+use POSIX ();

 use Storable;
 use open qw{:utf8 :std};
 
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 use Storable;
 use open qw{:utf8 :std};
 
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase

-           %pagestate %wikistate %renderedfiles %oldrenderedfiles
-           %pagesources %destsources %depends %hooks %forcerebuild
-           $gettext_obj %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 add_depends pagespec_match
-                 bestlink htmllink readfile writefile pagetype srcfile pagename
-                 displaytime will_render gettext urlto targetpage
-                add_underlay pagetitle titlepage linkpage newpagefile
-                inject
-                 %config %links %pagestate %wikistate %renderedfiles
-                 %pagesources %destsources);
-our $VERSION = 2.00; # plugin interface version, next is ikiwiki version
+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 $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE

-my $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");
 
 # Optimisation.
 use Memoize;
 memoize("abs2rel");

+memoize("sortspec_translate");

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

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

 
 

-sub getsetup () { #{{{
+sub getsetup () {

        wikiname => {
                type => "string",
                default => "wiki",
        wikiname => {
                type => "string",
                default => "wiki",


@@ -100,7 +107,7 @@ sub getsetup () { #{{{
                type => "string",
                default => '',
                example => "/var/www/wiki/ikiwiki.cgi",
                type => "string",
                default => '',
                example => "/var/www/wiki/ikiwiki.cgi",

-               description => "cgi wrapper to generate",
+               description => "filename of cgi wrapper to generate",

                safe => 0, # file
                rebuild => 0,
        },
                safe => 0, # file
                rebuild => 0,
        },


@@ -144,7 +151,7 @@ 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,


@@ -157,6 +164,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 => [],


@@ -174,7 +188,7 @@ sub getsetup () { #{{{
        verbose => {
                type => "boolean",
                example => 1,
        verbose => {
                type => "boolean",
                example => 1,

-               description => "display verbose messages when building?",
+               description => "display verbose messages?",

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


@@ -194,7 +208,7 @@ sub getsetup () { #{{{
        },
        prefix_directives => {
                type => "boolean",
        },
        prefix_directives => {
                type => "boolean",

-               default => 0,
+               default => 1,

                description => "use '!'-prefixed preprocessor directives?",
                safe => 0, # changing requires manual transition
                rebuild => 1,
                description => "use '!'-prefixed preprocessor directives?",
                safe => 0, # changing requires manual transition
                rebuild => 1,


@@ -213,6 +227,21 @@ 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,
+       },
+       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,


@@ -277,13 +306,20 @@ sub getsetup () { #{{{
        },
        umask => {
                type => "integer",
        },
        umask => {
                type => "integer",

-               description => "",

                example => "022",
                description => "force ikiwiki to use a particular umask",
                advanced => 1,
                safe => 0, # paranoia
                rebuild => 0,
        },
                example => "022",
                description => "force ikiwiki to use a particular umask",
                advanced => 1,
                safe => 0, # paranoia
                rebuild => 0,
        },

+       wrappergroup => {
+               type => "string",
+               example => "ikiwiki",
+               description => "group for wrappers to run in",
+               advanced => 1,
+               safe => 0, # paranoia
+               rebuild => 0,
+       },

        libdir => {
                type => "string",
                default => "",
        libdir => {
                type => "string",
                default => "",


@@ -300,22 +336,31 @@ sub getsetup () { #{{{
                safe => 0, # paranoia
                rebuild => 0,
        },
                safe => 0, # paranoia
                rebuild => 0,
        },

+       include => {
+               type => "string",
+               default => undef,
+               example => '^\.htaccess$',
+               description => "regexp of normally excluded files to include",
+               advanced => 1,
+               safe => 0, # regexp
+               rebuild => 1,
+       },

        exclude => {
                type => "string",
                default => undef,
        exclude => {
                type => "string",
                default => undef,

-               example => '\.wav$',
-               description => "regexp of source files to ignore",
+               example => '^(*\.private|Makefile)$',
+               description => "regexp of files that should be skipped",

                advanced => 1,
                safe => 0, # regexp
                rebuild => 1,
        },
        wiki_file_prune_regexps => {
                type => "internal",
                advanced => 1,
                safe => 0, # regexp
                rebuild => 1,
        },
        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/\.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,


@@ -335,7 +380,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,


@@ -375,6 +420,13 @@ sub getsetup () { #{{{
                safe => 0,
                rebuild => 0,
        },
                safe => 0,
                rebuild => 0,
        },

+       clean => {
+               type => "internal",
+               default => 0,
+               description => "running in clean mode",
+               safe => 0,
+               rebuild => 0,
+       },

        refresh => {
                type => "internal",
                default => 0,
        refresh => {
                type => "internal",
                default => 0,


@@ -389,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,
        },


@@ -403,6 +454,13 @@ sub getsetup () { #{{{
                safe => 0,
                rebuild => 0,
        },
                safe => 0,
                rebuild => 0,
        },

+       wikistatedir => {
+               type => "internal",
+               default => undef,
+               description => "path to the .ikiwiki directory holding ikiwiki state",
+               safe => 0,
+               rebuild => 0,
+       },

        setupfile => {
                type => "internal",
                default => undef,
        setupfile => {
                type => "internal",
                default => undef,


@@ -410,6 +468,13 @@ sub getsetup () { #{{{
                safe => 0,
                rebuild => 0,
        },
                safe => 0,
                rebuild => 0,
        },

+       setuptype => {
+               type => "internal",
+               default => "Standard",
+               description => "perl class to use to dump setup file",
+               safe => 0,
+               rebuild => 0,
+       },

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


@@ -417,9 +482,9 @@ sub getsetup () { #{{{
                safe => 0,
                rebuild => 0,
        },
                safe => 0,
                rebuild => 0,
        },

-} #}}}
+}

 
 

-sub defaultconfig () { #{{{
+sub defaultconfig () {

        my %s=getsetup();
        my @ret;
        foreach my $key (keys %s) {
        my %s=getsetup();
        my @ret;
        foreach my $key (keys %s) {


@@ -427,9 +492,9 @@ sub defaultconfig () { #{{{
        }
        use Data::Dumper;
        return @ret;
        }
        use Data::Dumper;
        return @ret;

-} #}}}
+}

 
 

-sub checkconfig () { #{{{
+sub checkconfig () {

        # locale stuff; avoid LC_ALL since it overrides everything
        if (defined $ENV{LC_ALL}) {
                $ENV{LANG} = $ENV{LC_ALL};
        # locale stuff; avoid LC_ALL since it overrides everything
        if (defined $ENV{LC_ALL}) {
                $ENV{LANG} = $ENV{LC_ALL};


@@ -438,7 +503,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();

                }
        }
                
                }
        }
                


@@ -467,7 +532,7 @@ sub checkconfig () { #{{{
        }
        
        $config{wikistatedir}="$config{srcdir}/.ikiwiki"
        }
        
        $config{wikistatedir}="$config{srcdir}/.ikiwiki"

-               unless exists $config{wikistatedir};
+               unless exists $config{wikistatedir} && defined $config{wikistatedir};

 
        if (defined $config{umask}) {
                umask(possibly_foolish_untaint($config{umask}));
 
        if (defined $config{umask}) {
                umask(possibly_foolish_untaint($config{umask}));


@@ -476,9 +541,9 @@ sub checkconfig () { #{{{
        run_hooks(checkconfig => sub { shift->() });
 
        return 1;
        run_hooks(checkconfig => sub { shift->() });
 
        return 1;

-} #}}}
+}

 
 

-sub listplugins () { #{{{
+sub listplugins () {

        my %ret;
 
        foreach my $dir (@INC, $config{libdir}) {
        my %ret;
 
        foreach my $dir (@INC, $config{libdir}) {


@@ -496,9 +561,9 @@ sub listplugins () { #{{{
        }
 
        return keys %ret;
        }
 
        return keys %ret;

-} #}}}
+}

 
 

-sub loadplugins () { #{{{
+sub loadplugins () {

        if (defined $config{libdir} && length $config{libdir}) {
                unshift @INC, possibly_foolish_untaint($config{libdir});
        }
        if (defined $config{libdir} && length $config{libdir}) {
                unshift @INC, possibly_foolish_untaint($config{libdir});
        }


@@ -508,26 +573,26 @@ 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();
        }
 
        return 1;
                        foreach grep /^-/, @ARGV;
                usage();
        }
 
        return 1;

-} #}}}
+}

 
 

-sub loadplugin ($) { #{{{
+sub loadplugin ($) {

        my $plugin=shift;
 
        return if grep { $_ eq $plugin} @{$config{disable_plugins}};
        my $plugin=shift;
 
        return if grep { $_ eq $plugin} @{$config{disable_plugins}};


@@ -553,9 +618,9 @@ sub loadplugin ($) { #{{{
        }
        $loaded_plugins{$plugin}=1;
        return 1;
        }
        $loaded_plugins{$plugin}=1;
        return 1;

-} #}}}
+}

 
 

-sub error ($;$) { #{{{
+sub error ($;$) {

        my $message=shift;
        my $cleaner=shift;
        log_message('err' => $message) if $config{syslog};
        my $message=shift;
        my $cleaner=shift;
        log_message('err' => $message) if $config{syslog};


@@ -563,15 +628,15 @@ sub error ($;$) { #{{{
                $cleaner->();
        }
        die $message."\n";
                $cleaner->();
        }
        die $message."\n";

-} #}}}
+}

 
 

-sub debug ($) { #{{{
+sub debug ($) {

        return unless $config{verbose};
        return log_message(debug => @_);
        return unless $config{verbose};
        return log_message(debug => @_);

-} #}}}
+}

 
 my $log_open=0;
 
 my $log_open=0;

-sub log_message ($$) { #{{{
+sub log_message ($$) {

        my $type=shift;
 
        if ($config{syslog}) {
        my $type=shift;
 
        if ($config{syslog}) {


@@ -591,56 +656,71 @@ sub log_message ($$) { #{{{
        else {
                return print STDERR "@_\n";
        }
        else {
                return print STDERR "@_\n";
        }

-} #}}}
+}

 
 

-sub possibly_foolish_untaint ($) { #{{{
+sub possibly_foolish_untaint ($) {

        my $tainted=shift;
        my ($untainted)=$tainted=~/(.*)/s;
        return $untainted;
        my $tainted=shift;
        my ($untainted)=$tainted=~/(.*)/s;
        return $untainted;

-} #}}}
+}

 
 

-sub basename ($) { #{{{
+sub basename ($) {

        my $file=shift;
 
        $file=~s!.*/+!!;
        return $file;
        my $file=shift;
 
        $file=~s!.*/+!!;
        return $file;

-} #}}}
+}

 
 

-sub dirname ($) { #{{{
+sub dirname ($) {

        my $file=shift;
 
        $file=~s!/*[^/]+$!!;
        return $file;
        my $file=shift;
 
        $file=~s!/*[^/]+$!!;
        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 ($) { #{{{
+sub pagename ($) {

        my $file=shift;
 
        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;

-} #}}}
+}

 
 

-sub newpagefile ($$) { #{{{
+sub newpagefile ($$) {

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


@@ -650,27 +730,31 @@ sub newpagefile ($$) { #{{{
        else {
                return $page."/index.".$type;
        }
        else {
                return $page."/index.".$type;
        }

-} #}}}
+}

 
 

-sub targetpage ($$) { #{{{
+sub targetpage ($$;$) {

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

+       my $filename=shift;

        
        

-       if (! $config{usedirs} || $page eq 'index') {
+       if (defined $filename) {
+               return $page."/".$filename.".".$ext;
+       }
+       elsif (! $config{usedirs} || $page eq 'index') {

                return $page.".".$ext;
        }
        else {
                return $page."/index.".$ext;
        }
                return $page.".".$ext;
        }
        else {
                return $page."/index.".$ext;
        }

-} #}}}
+}

 
 

-sub htmlpage ($) { #{{{
+sub htmlpage ($) {

        my $page=shift;
        
        return targetpage($page, $config{htmlext});
        my $page=shift;
        
        return targetpage($page, $config{htmlext});

-} #}}}
+}

 
 

-sub srcfile_stat { #{{{
+sub srcfile_stat {

        my $file=shift;
        my $nothrow=shift;
 
        my $file=shift;
        my $nothrow=shift;
 


@@ -680,17 +764,17 @@ sub srcfile_stat { #{{{
        }
        error("internal error: $file cannot be found in $config{srcdir} or underlay") unless $nothrow;
        return;
        }
        error("internal error: $file cannot be found in $config{srcdir} or underlay") unless $nothrow;
        return;

-} #}}}
+}

 
 

-sub srcfile ($;$) { #{{{
+sub srcfile ($;$) {

        return (srcfile_stat(@_))[0];
        return (srcfile_stat(@_))[0];

-} #}}}
+}

 
 

-sub add_underlay ($) { #{{{
+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}}) {


@@ -698,9 +782,9 @@ sub add_underlay ($) { #{{{
        }
 
        return 1;
        }
 
        return 1;

-} #}}}
+}

 
 

-sub readfile ($;$$) { #{{{
+sub readfile ($;$$) {

        my $file=shift;
        my $binary=shift;
        my $wantfd=shift;
        my $file=shift;
        my $binary=shift;
        my $wantfd=shift;


@@ -714,11 +798,15 @@ sub readfile ($;$$) { #{{{
        binmode($in) if ($binary);
        return \*$in if $wantfd;
        my $ret=<$in>;
        binmode($in) if ($binary);
        return \*$in if $wantfd;
        my $ret=<$in>;

+       # check for invalid utf-8, and toss it back to avoid crashes
+       if (! utf8::valid($ret)) {
+               $ret=encode_utf8($ret);
+       }

        close $in || error("failed to read $file: $!");
        return $ret;
        close $in || error("failed to read $file: $!");
        return $ret;

-} #}}}
+}

 
 

-sub prep_writefile ($$) { #{{{
+sub prep_writefile ($$) {

        my $file=shift;
        my $destdir=shift;
        
        my $file=shift;
        my $destdir=shift;
        


@@ -742,9 +830,9 @@ sub prep_writefile ($$) { #{{{
        }
 
        return 1;
        }
 
        return 1;

-} #}}}
+}

 
 

-sub writefile ($$$;$$) { #{{{
+sub writefile ($$$;$$) {

        my $file=shift; # can include subdirs
        my $destdir=shift; # directory to put file in
        my $content=shift;
        my $file=shift; # can include subdirs
        my $destdir=shift; # directory to put file in
        my $content=shift;


@@ -772,10 +860,10 @@ sub writefile ($$$;$$) { #{{{
                error("failed renaming $newfile to $destdir/$file: $!", $cleanup);
 
        return 1;
                error("failed renaming $newfile to $destdir/$file: $!", $cleanup);
 
        return 1;

-} #}}}
+}

 
 my %cleared;
 
 my %cleared;

-sub will_render ($$;$) { #{{{
+sub will_render ($$;$) {

        my $page=shift;
        my $dest=shift;
        my $clear=shift;
        my $page=shift;
        my $dest=shift;
        my $clear=shift;


@@ -799,9 +887,9 @@ sub will_render ($$;$) { #{{{
        $destsources{$dest}=$page;
 
        return 1;
        $destsources{$dest}=$page;
 
        return 1;

-} #}}}
+}

 
 

-sub bestlink ($$) { #{{{
+sub bestlink ($$) {

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


@@ -817,7 +905,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}) {


@@ -827,7 +915,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}) {


@@ -837,15 +925,15 @@ sub bestlink ($$) { #{{{
 
        #print STDERR "warning: page $page, broken link: $link\n";
        return "";
 
        #print STDERR "warning: page $page, broken link: $link\n";
        return "";

-} #}}}
+}

 
 

-sub isinlinableimage ($) { #{{{
+sub isinlinableimage ($) {

        my $file=shift;
        
        return $file =~ /\.(png|gif|jpg|jpeg)$/i;
        my $file=shift;
        
        return $file =~ /\.(png|gif|jpg|jpeg)$/i;

-} #}}}
+}

 
 

-sub pagetitle ($;$) { #{{{
+sub pagetitle ($;$) {

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


@@ -857,31 +945,36 @@ sub pagetitle ($;$) { #{{{
        }
 
        return $page;
        }
 
        return $page;

-} #}}}
+}

 
 

-sub titlepage ($) { #{{{
+sub titlepage ($) {

        my $title=shift;
        # support use w/o %config set
        my $chars = defined $config{wiki_file_chars} ? $config{wiki_file_chars} : "-[:alnum:]+/.:_";
        $title=~s/([^$chars]|_)/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
        return $title;
        my $title=shift;
        # support use w/o %config set
        my $chars = defined $config{wiki_file_chars} ? $config{wiki_file_chars} : "-[:alnum:]+/.:_";
        $title=~s/([^$chars]|_)/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
        return $title;

-} #}}}
+}

 
 

-sub linkpage ($) { #{{{
+sub linkpage ($) {

        my $link=shift;
        my $chars = defined $config{wiki_file_chars} ? $config{wiki_file_chars} : "-[:alnum:]+/.:_";
        $link=~s/([^$chars])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
        return $link;
        my $link=shift;
        my $chars = defined $config{wiki_file_chars} ? $config{wiki_file_chars} : "-[:alnum:]+/.:_";
        $link=~s/([^$chars])/$1 eq ' ' ? '_' : "__".ord($1)."__"/eg;
        return $link;

-} #}}}
+}

 
 

-sub cgiurl (@) { #{{{
+sub cgiurl (@) {

        my %params=@_;
 
        my %params=@_;
 

-       return $config{cgiurl}."?".
+       my $cgiurl=$config{cgiurl};
+       if (exists $params{cgiurl}) {
+               $cgiurl=$params{cgiurl};
+               delete $params{cgiurl};
+       }
+       return $cgiurl."?".

                join("&amp;", map $_."=".uri_escape_utf8($params{$_}), keys %params);
                join("&amp;", map $_."=".uri_escape_utf8($params{$_}), keys %params);

-} #}}}
+}

 
 

-sub baseurl (;$) { #{{{
+sub baseurl (;$) {

        my $page=shift;
 
        return "$config{url}/" if ! defined $page;
        my $page=shift;
 
        return "$config{url}/" if ! defined $page;


@@ -890,9 +983,9 @@ sub baseurl (;$) { #{{{
        $page=~s/[^\/]+$//;
        $page=~s/[^\/]+\//..\//g;
        return $page;
        $page=~s/[^\/]+$//;
        $page=~s/[^\/]+\//..\//g;
        return $page;

-} #}}}
+}

 
 

-sub abs2rel ($$) { #{{{
+sub abs2rel ($$) {

        # Work around very innefficient behavior in File::Spec if abs2rel
        # is passed two relative paths. It's much faster if paths are
        # absolute! (Debian bug #376658; fixed in debian unstable now)
        # Work around very innefficient behavior in File::Spec if abs2rel
        # is passed two relative paths. It's much faster if paths are
        # absolute! (Debian bug #376658; fixed in debian unstable now)


@@ -903,15 +996,23 @@ sub abs2rel ($$) { #{{{
        my $ret=File::Spec->abs2rel($path, $base);
        $ret=~s/^// if defined $ret;
        return $ret;
        my $ret=File::Spec->abs2rel($path, $base);
        $ret=~s/^// if defined $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 ($;$) {

        # Plugins can override this function to format the time.
        my $time=shift;
        my $format=shift;
        # Plugins can override this function to format the time.
        my $time=shift;
        my $format=shift;


@@ -922,25 +1023,35 @@ sub formattime ($;$) { #{{{
        # strftime doesn't know about encodings, so make sure
        # its output is properly treated as utf8
        return decode_utf8(POSIX::strftime($format, localtime($time)));
        # strftime doesn't know about encodings, so make sure
        # its output is properly treated as utf8
        return decode_utf8(POSIX::strftime($format, localtime($time)));

-} #}}}
+}
+
+sub date_3339 ($) {
+       my $time=shift;

 
 

-sub beautify_urlpath ($) { #{{{
+       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;
 
        my $url=shift;
 

-       if ($config{usedirs}) {
-               $url =~ s!/index.$config{htmlext}$!/!;
+       # Ensure url is not an empty link, and if necessary,
+       # add ./ to avoid colon confusion.
+       if ($url !~ /^\// && $url !~ /^\.\.?\//) {
+               $url="./$url";

        }
 
        }
 

-       # Ensure url is not an empty link, and
-       # if it's relative, make that explicit to avoid colon confusion.
-       if ($url !~ /^\//) {
-               $url="./$url";
+       if ($config{usedirs}) {
+               $url =~ s!/index.$config{htmlext}$!/!;

        }
 
        return $url;
        }
 
        return $url;

-} #}}}
+}

 
 

-sub urlto ($$;$) { #{{{
+sub urlto ($$;$) {

        my $to=shift;
        my $from=shift;
        my $absolute=shift;
        my $to=shift;
        my $from=shift;
        my $absolute=shift;


@@ -960,9 +1071,9 @@ sub urlto ($$;$) { #{{{
        my $link = abs2rel($to, dirname(htmlpage($from)));
 
        return beautify_urlpath($link);
        my $link = abs2rel($to, dirname(htmlpage($from)));
 
        return beautify_urlpath($link);

-} #}}}
+}

 
 

-sub htmllink ($$$;@) { #{{{
+sub htmllink ($$$;@) {

        my $lpage=shift; # the page doing the linking
        my $page=shift; # the page that will contain the link (different for inline)
        my $link=shift;
        my $lpage=shift; # the page doing the linking
        my $page=shift; # the page that will contain the link (different for inline)
        my $link=shift;


@@ -994,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>"

                }
        }
        
                }
        }
        


@@ -1017,41 +1130,62 @@ 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 userlink ($) { #{{{
+sub userpage ($) {

        my $user=shift;
        my $user=shift;

+       return length $config{userdir} ? "$config{userdir}/$user" : $user;
+}

 
 

-       my $oiduser=eval { openiduser($user) };
-       if (defined $oiduser) {
-               return "<a href=\"$user\">$oiduser</a>";
-       }
-       else {
+sub openiduser ($) {
+       my $user=shift;
+
+       if ($user =~ m!^https?://! &&
+           eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) {
+               my $display;
+
+               if (Net::OpenID::VerifiedIdentity->can("DisplayOfURL")) {
+                       $display = Net::OpenID::VerifiedIdentity::DisplayOfURL($user);
+               }
+               else {
+                       # backcompat with old version
+                       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 $@;
                eval q{use CGI 'escapeHTML'};
                error($@) if $@;

-
-               return htmllink("", "", escapeHTML(
-                       length $config{userdir} ? $config{userdir}."/".$user : $user
-               ), noimageinline => 1);
+               return escapeHTML($display);

        }
        }

-} #}}}
+       return;
+}

 
 

-sub htmlize ($$$$) { #{{{
+sub htmlize ($$$$) {

        my $page=shift;
        my $destpage=shift;
        my $type=shift;
        my $content=shift;
        
        my $oneline = $content !~ /\n/;
        my $page=shift;
        my $destpage=shift;
        my $type=shift;
        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,


@@ -1072,16 +1206,15 @@ 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;

-} #}}}
+}

 
 

-sub linkify ($$$) { #{{{
+sub linkify ($$$) {

        my $page=shift;
        my $destpage=shift;
        my $content=shift;
        my $page=shift;
        my $destpage=shift;
        my $content=shift;


@@ -1095,11 +1228,11 @@ sub linkify ($$$) { #{{{
        });
        
        return $content;
        });
        
        return $content;

-} #}}}
+}

 
 our %preprocessing;
 our $preprocess_preview=0;
 
 our %preprocessing;
 our $preprocess_preview=0;

-sub preprocess ($$$;$$) { #{{{
+sub preprocess ($$$;$$) {

        my $page=shift; # the page the data comes from
        my $destpage=shift; # the page the data will appear in (different for inline)
        my $content=shift;
        my $page=shift; # the page the data comes from
        my $destpage=shift; # the page the data will appear in (different for inline)
        my $content=shift;


@@ -1130,7 +1263,7 @@ sub preprocess ($$$;$$) { #{{{
                                (?:
                                        """(.*?)"""     # 2: triple-quoted value
                                |
                                (?:
                                        """(.*?)"""     # 2: triple-quoted value
                                |

-                                       "([^"]+)"       # 3: single-quoted value
+                                       "([^"]*?)"      # 3: single-quoted value

                                |
                                        (\S+)           # 4: unquoted value
                                )
                                |
                                        (\S+)           # 4: unquoted value
                                )


@@ -1177,9 +1310,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 {


@@ -1215,9 +1349,9 @@ sub preprocess ($$$;$$) { #{{{
                                        (?:
                                                """.*?"""       # triple-quoted value
                                                |
                                        (?:
                                                """.*?"""       # triple-quoted value
                                                |

-                                               "[^"]+"         # single-quoted value
+                                               "[^"]*?"        # single-quoted value

                                                |
                                                |

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

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


@@ -1238,9 +1372,9 @@ sub preprocess ($$$;$$) { #{{{
                                        (?:
                                                """.*?"""       # triple-quoted value
                                                |
                                        (?:
                                                """.*?"""       # triple-quoted value
                                                |

-                                               "[^"]+"         # single-quoted value
+                                               "[^"]*?"        # single-quoted value

                                                |
                                                |

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

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


@@ -1252,9 +1386,9 @@ sub preprocess ($$$;$$) { #{{{
 
        $content =~ s{$regex}{$handle->($1, $2, $3, $4)}eg;
        return $content;
 
        $content =~ s{$regex}{$handle->($1, $2, $3, $4)}eg;
        return $content;

-} #}}}
+}

 
 

-sub filter ($$$) { #{{{
+sub filter ($$$) {

        my $page=shift;
        my $destpage=shift;
        my $content=shift;
        my $page=shift;
        my $destpage=shift;
        my $content=shift;


@@ -1265,16 +1399,75 @@ 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;
+       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{$line};
+               }
+               $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;
 
 
 my $wikilock;
 

-sub lockwiki (;$) { #{{{
-       my $wait=@_ ? shift : 1;
+sub lockwiki () {

        # Take an exclusive lock on the wiki to prevent multiple concurrent
        # run issues. The lock will be dropped on program exit.
        if (! -d $config{wikistatedir}) {
        # Take an exclusive lock on the wiki to prevent multiple concurrent
        # run issues. The lock will be dropped on program exit.
        if (! -d $config{wikistatedir}) {


@@ -1282,32 +1475,21 @@ sub lockwiki (;$) { #{{{
        }
        open($wikilock, '>', "$config{wikistatedir}/lockfile") ||
                error ("cannot write to $config{wikistatedir}/lockfile: $!");
        }
        open($wikilock, '>', "$config{wikistatedir}/lockfile") ||
                error ("cannot write to $config{wikistatedir}/lockfile: $!");

-       if (! flock($wikilock, 2 | 4)) { # LOCK_EX | LOCK_NB
-               if ($wait) {
-                       debug("wiki seems to be locked, waiting for lock");
-                       my $wait=600; # arbitrary, but don't hang forever to 
-                                     # prevent process pileup
-                       for (1..$wait) {
-                               return if flock($wikilock, 2 | 4);
-                               sleep 1;
-                       }
-                       error("wiki is locked; waited $wait seconds without lock being freed (possible stuck process or stale lock?)");
-               }
-               else {
-                       return 0;
-               }
+       if (! flock($wikilock, 2)) { # LOCK_EX
+               error("failed to get lock");

        }
        return 1;
        }
        return 1;

-} #}}}
+}

 
 

-sub unlockwiki () { #{{{
+sub unlockwiki () {
+       POSIX::close($ENV{IKIWIKI_CGILOCK_FD}) if exists $ENV{IKIWIKI_CGILOCK_FD};

        return close($wikilock) if $wikilock;
        return;
        return close($wikilock) if $wikilock;
        return;

-} #}}}
+}

 
 my $commitlock;
 
 
 my $commitlock;
 

-sub commit_hook_enabled () { #{{{
+sub commit_hook_enabled () {

        open($commitlock, '+>', "$config{wikistatedir}/commitlock") ||
                error("cannot write to $config{wikistatedir}/commitlock: $!");
        if (! flock($commitlock, 1 | 4)) { # LOCK_SH | LOCK_NB to test
        open($commitlock, '+>', "$config{wikistatedir}/commitlock") ||
                error("cannot write to $config{wikistatedir}/commitlock: $!");
        if (! flock($commitlock, 1 | 4)) { # LOCK_SH | LOCK_NB to test


@@ -1316,27 +1498,28 @@ sub commit_hook_enabled () { #{{{
        }
        close($commitlock) || error("failed closing commitlock: $!");
        return 1;
        }
        close($commitlock) || error("failed closing commitlock: $!");
        return 1;

-} #}}}
+}

 
 

-sub disable_commit_hook () { #{{{
+sub disable_commit_hook () {

        open($commitlock, '>', "$config{wikistatedir}/commitlock") ||
                error("cannot write to $config{wikistatedir}/commitlock: $!");
        if (! flock($commitlock, 2)) { # LOCK_EX
                error("failed to get commit lock");
        }
        return 1;
        open($commitlock, '>', "$config{wikistatedir}/commitlock") ||
                error("cannot write to $config{wikistatedir}/commitlock: $!");
        if (! flock($commitlock, 2)) { # LOCK_EX
                error("failed to get commit lock");
        }
        return 1;

-} #}}}
+}

 
 

-sub enable_commit_hook () { #{{{
+sub enable_commit_hook () {

        return close($commitlock) if $commitlock;
        return;
        return close($commitlock) if $commitlock;
        return;

-} #}}}
+}

 
 

-sub loadindex () { #{{{
+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=%typedlinks=%oldtypedlinks=();

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


@@ -1345,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;
                }
        }


@@ -1368,20 +1552,48 @@ 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}) {
                                $links{$page}=$d->{links};
                                $oldlinks{$page}=[@{$d->{links}}];
                        }
                        $pagemtime{$page}=$d->{mtime};
                        $renderedfiles{$page}=$d->{dest};
                        if (exists $d->{links} && ref $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}) {
                                $pagestate{$page}=$d->{state};
                        }
                                $depends{$page}=$d->{depends};
                        }
                        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}}];
        }


@@ -1392,9 +1604,9 @@ sub loadindex () { #{{{
                $destsources{$_}=$page foreach @{$renderedfiles{$page}};
        }
        return close($in);
                $destsources{$_}=$page foreach @{$renderedfiles{$page}};
        }
        return close($in);

-} #}}}
+}

 
 

-sub saveindex () { #{{{
+sub saveindex () {

        run_hooks(savestate => sub { shift->() });
 
        my %hookids;
        run_hooks(savestate => sub { shift->() });
 
        my %hookids;


@@ -1426,6 +1638,14 @@ 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 $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}}) {


@@ -1450,63 +1670,119 @@ sub saveindex () { #{{{
                error("failed renaming $newfile to $config{wikistatedir}/indexdb", $cleanup);
        
        return 1;
                error("failed renaming $newfile to $config{wikistatedir}/indexdb", $cleanup);
        
        return 1;

-} #}}}
+}

 
 

-sub template_file ($) { #{{{
-       my $template=shift;
+sub template_file ($) {
+       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}, "$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;
-} #}}}

 
 

-sub template_params (@) { #{{{
-       my $filename=template_file(shift);
+       return;
+}

 
 

-       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;

 
 

-sub template ($;@) { #{{{

        require HTML::Template;
        require HTML::Template;

-       return HTML::Template->new(template_params(@_));
-} #}}}
+       return HTML::Template->new(@opts);
+}

 
 

-sub misctemplate ($$;@) { #{{{
+sub template ($;@) {
+       template_depends(shift, undef, @_);
+}
+
+sub misctemplate ($$;@) {

        my $title=shift;
        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;

 
 

-sub hook (@) { # {{{
+       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=@_;
        
        if (! exists $param{type} || ! ref $param{call} || ! exists $param{id}) {
        my %param=@_;
        
        if (! exists $param{type} || ! ref $param{call} || ! exists $param{id}) {


@@ -1517,168 +1793,198 @@ sub hook (@) { # {{{
        
        $hooks{$param{type}}{$param{id}}=\%param;
        return 1;
        
        $hooks{$param{type}}{$param{id}}=\%param;
        return 1;

-} # }}}
+}

 
 

-sub run_hooks ($$) { # {{{
+sub run_hooks ($$) {

        # Calls the given sub for each hook of the given type,
        # passing it the hook function to call.
        my $type=shift;
        my $sub=shift;
 
        if (exists $hooks{$type}) {
        # Calls the given sub for each hook of the given type,
        # passing it the hook function to call.
        my $type=shift;
        my $sub=shift;
 
        if (exists $hooks{$type}) {

-               my @deferred;
+               my (@first, @middle, @last);

                foreach my $id (keys %{$hooks{$type}}) {
                foreach my $id (keys %{$hooks{$type}}) {

-                       if ($hooks{$type}{$id}{last}) {
-                               push @deferred, $id;
-                               next;
+                       if ($hooks{$type}{$id}{first}) {
+                               push @first, $id;
+                       }
+                       elsif ($hooks{$type}{$id}{last}) {
+                               push @last, $id;
+                       }
+                       else {
+                               push @middle, $id;

                        }
                        }

-                       $sub->($hooks{$type}{$id}{call});

                }
                }

-               foreach my $id (@deferred) {
+               foreach my $id (@first, @middle, @last) {

                        $sub->($hooks{$type}{$id}{call});
                }
        }
 
        return 1;
                        $sub->($hooks{$type}{$id}{call});
                }
        }
 
        return 1;

-} #}}}
+}

 
 

-sub rcs_update () { #{{{
+sub rcs_update () {

        $hooks{rcs}{rcs_update}{call}->(@_);
        $hooks{rcs}{rcs_update}{call}->(@_);

-} #}}}
+}

 
 

-sub rcs_prepedit ($) { #{{{
+sub rcs_prepedit ($) {

        $hooks{rcs}{rcs_prepedit}{call}->(@_);
        $hooks{rcs}{rcs_prepedit}{call}->(@_);

-} #}}}
+}

 
 

-sub rcs_commit ($$$;$$) { #{{{
+sub rcs_commit ($$$;$$) {

        $hooks{rcs}{rcs_commit}{call}->(@_);
        $hooks{rcs}{rcs_commit}{call}->(@_);

-} #}}}
+}

 
 

-sub rcs_commit_staged ($$$) { #{{{
+sub rcs_commit_staged ($$$) {

        $hooks{rcs}{rcs_commit_staged}{call}->(@_);
        $hooks{rcs}{rcs_commit_staged}{call}->(@_);

-} #}}}
+}

 
 

-sub rcs_add ($) { #{{{
+sub rcs_add ($) {

        $hooks{rcs}{rcs_add}{call}->(@_);
        $hooks{rcs}{rcs_add}{call}->(@_);

-} #}}}
+}

 
 

-sub rcs_remove ($) { #{{{
+sub rcs_remove ($) {

        $hooks{rcs}{rcs_remove}{call}->(@_);
        $hooks{rcs}{rcs_remove}{call}->(@_);

-} #}}}
+}

 
 

-sub rcs_rename ($$) { #{{{
+sub rcs_rename ($$) {

        $hooks{rcs}{rcs_rename}{call}->(@_);
        $hooks{rcs}{rcs_rename}{call}->(@_);

-} #}}}
+}

 
 

-sub rcs_recentchanges ($) { #{{{
+sub rcs_recentchanges ($) {

        $hooks{rcs}{rcs_recentchanges}{call}->(@_);
        $hooks{rcs}{rcs_recentchanges}{call}->(@_);

-} #}}}
+}

 
 

-sub rcs_diff ($) { #{{{
+sub rcs_diff ($) {

        $hooks{rcs}{rcs_diff}{call}->(@_);
        $hooks{rcs}{rcs_diff}{call}->(@_);

-} #}}}
+}

 
 

-sub rcs_getctime ($) { #{{{
+sub rcs_getctime ($) {

        $hooks{rcs}{rcs_getctime}{call}->(@_);
        $hooks{rcs}{rcs_getctime}{call}->(@_);

-} #}}}
+}

 
 

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

 
 

-sub globlist_to_pagespec ($) { #{{{
-       my @globlist=split(' ', shift);
+sub rcs_receive () {
+       $hooks{rcs}{rcs_receive}{call}->();
+}

 
 

-       my (@spec, @skip);
-       foreach my $glob (@globlist) {
-               if ($glob=~/^!(.*)/) {
-                       push @skip, $glob;
-               }
-               else {
-                       push @spec, $glob;
+sub add_depends ($$;$) {
+       my $page=shift;
+       my $pagespec=shift;
+       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 unless defined $sub;
+       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) {
+                       next unless $r || $static || $k eq $page;
+                       $depends_simple{$page}{lc $k} |= $i->{$k};

                }
                }

+               last if $static;

        }
 
        }
 

-       my $spec=join(' or ', @spec);
-       if (@skip) {
-               my $skip=join(' and ', @skip);
-               if (length $spec) {
-                       $spec="$skip and ($spec)";
+       $depends{$page}{$pagespec} |= $deptype;
+       return 1;
+}
+
+sub deptype (@) {
+       my $deptype=0;
+       foreach my $type (@_) {
+               if ($type eq 'presence') {
+                       $deptype |= $DEPEND_PRESENCE;

                }
                }

-               else {
-                       $spec=$skip;
+               elsif ($type eq 'links') { 
+                       $deptype |= $DEPEND_LINKS;
+               }
+               elsif ($type eq 'content') {
+                       $deptype |= $DEPEND_CONTENT;

                }
        }
                }
        }

-       return $spec;
-} #}}}
-
-sub is_globlist ($) { #{{{
-       my $s=shift;
-       return ( $s =~ /[^\s]+\s+([^\s]+)/ && $1 ne "and" && $1 ne "or" );
-} #}}}
+       return $deptype;
+}

 
 

-sub safequote ($) { #{{{
-       my $s=shift;
-       $s=~s/[{}]//g;
-       return "q{$s}";
-} #}}}
-
-sub add_depends ($$) { #{{{
-       my $page=shift;
-       my $pagespec=shift;
-       
-       return unless pagespec_valid($pagespec);
+my $file_prune_regexp;
+sub file_pruned ($) {
+       my $file=shift;

 
 

-       if (! exists $depends{$page}) {
-               $depends{$page}=$pagespec;
-       }
-       else {
-               $depends{$page}=pagespec_merge($depends{$page}, $pagespec);
+       if (defined $config{include} && length $config{include}) {
+               return 0 if $file =~ m/$config{include}/;

        }
 
        }
 

-       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/+##;
-
-       my $regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')';
-       return $file =~ m/$regexp/ && $file ne $base;
-} #}}}
+       if (! defined $file_prune_regexp) {
+               $file_prune_regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')';
+               $file_prune_regexp=qr/$file_prune_regexp/;
+       }
+       return $file =~ m/$file_prune_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.
+       my $gettext_obj;
+       my $getobj;

        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) {
+               $getobj=sub {

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

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

        }
        }

-} #}}}

 
 

-sub yesno ($) { #{{{
+       no warnings 'redefine';
+       *gettext=sub {
+               $getobj->() if $getobj;
+               if ($gettext_obj) {
+                       $gettext_obj->get(shift);
+               }
+               else {
+                       return shift;
+               }
+       };
+       *ngettext=sub {
+               $getobj->() if $getobj;
+               if ($gettext_obj) {
+                       $gettext_obj->nget(@_);
+               }
+               else {
+                       return ($_[2] == 1 ? $_[0] : $_[1])
+               }
+       };
+}
+
+sub gettext {
+       define_gettext();
+       gettext(@_);
+}
+
+sub ngettext {
+       define_gettext();
+       ngettext(@_);
+}
+
+sub yesno ($) {

        my $val=shift;
 
        my $val=shift;
 

-       return (defined $val && lc($val) eq gettext("yes"));
-} #}}}
+       return (defined $val && (lc($val) eq gettext("yes") || lc($val) eq "yes" || $val eq "1"));
+}

 
 

-sub inject { #{{{
+sub inject {

        # Injects a new function into the symbol table to replace an
        # exported function.
        my %params=@_;
        # Injects a new function into the symbol table to replace an
        # exported function.
        my %params=@_;


@@ -1701,35 +2007,101 @@ sub inject { #{{{
        }
        use strict;
        use warnings;
        }
        use strict;
        use warnings;

-} #}}}
+}

 
 

-sub pagespec_merge ($$) { #{{{
-       my $a=shift;
-       my $b=shift;
+sub add_link ($$;$) {
+       my $page=shift;
+       my $link=shift;
+       my $type=shift;
+
+       push @{$links{$page}}, $link
+               unless grep { $_ eq $link } @{$links{$page}};
+
+       if (defined $type) {
+               $typedlinks{$page}{$type}{$link} = 1;
+       }
+}

 
 

-       return $a if $a eq $b;
+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));
+               }

 
 

-        # Support for old-style GlobLists.
-        if (is_globlist($a)) {
-                $a=globlist_to_pagespec($a);
-        }
-        if (is_globlist($b)) {
-                $b=globlist_to_pagespec($b);
-        }
+               if (length $code) {
+                       $code .= " || ";
+               }

 
 

-       return "($a) or ($b)";
-} #}}}
+               if ($negated) {
+                       $code .= "-";
+               }

 
 

-sub pagespec_translate ($) { #{{{
-       my $spec=shift;
+               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 };
+       }

 
 

-       # Support for old-style GlobLists.
-       if (is_globlist($spec)) {
-               $spec=globlist_to_pagespec($spec);
+       if ($reverse) {
+               $code="-($code)";

        }
 
        }
 

+       no warnings;
+       return eval 'sub { '.$code.' }';
+}
+
+sub pagespec_translate ($) {
+       my $spec=shift;
+

        # 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


@@ -1744,39 +2116,42 @@ 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.=' 0';
+                               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], \@_)";

                }
        }
 
        if (! length $code) {
                }
        }
 
        if (! length $code) {

-               $code=0;
+               $code="IkiWiki::FailReason->new('empty pagespec')";

        }
 
        no warnings;
        return eval 'sub { my $page=shift; '.$code.' }';
        }
 
        no warnings;
        return eval 'sub { my $page=shift; '.$code.' }';

-} #}}}
+}

 
 

-sub pagespec_match ($$;@) { #{{{
+sub pagespec_match ($$;@) {

        my $page=shift;
        my $spec=shift;
        my @params=@_;
        my $page=shift;
        my $spec=shift;
        my @params=@_;


@@ -1787,69 +2162,192 @@ sub pagespec_match ($$;@) { #{{{
        }
 
        my $sub=pagespec_translate($spec);
        }
 
        my $sub=pagespec_translate($spec);

-       return IkiWiki::FailReason->new("syntax error in pagespec \"$spec\"") if $@;
+       return IkiWiki::ErrorReason->new("syntax error in pagespec \"$spec\"")
+               if ! defined $sub;

        return $sub->($page, @params);
        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 $sort=sortspec_translate($params{sort}, $params{reverse})
+               if defined $params{sort};

 
 

-sub pagespec_valid ($) { #{{{
+       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;
+       }
+       
+       # 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}};
+       
+       # 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 $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");
+               unless ($r || $r->influences_static) {
+                       $r->remove_influence($p);
+               }
+               $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};
+       }
+
+       # 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;
 
        my $spec=shift;
 

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

 
 

-sub glob2re ($) { #{{{
+sub glob2re ($) {

        my $re=quotemeta(shift);
        $re=~s/\\\*/.*/g;
        $re=~s/\\\?/./g;
        return $re;
        my $re=quotemeta(shift);
        $re=~s/\\\*/.*/g;
        $re=~s/\\\?/./g;
        return $re;

-} #}}}
+}

 
 package IkiWiki::FailReason;
 
 
 package IkiWiki::FailReason;
 

-use overload ( #{{{
-       '""'    => sub { ${$_[0]} },
+use overload (
+       '""'    => 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;
 
 
 package IkiWiki::SuccessReason;
 

-use overload ( #{{{
-       '""'    => sub { ${$_[0]} },
+use overload (
+       '""'    => 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,
        fallback => 1,

-); #}}}
+);

 
 

-sub new { #{{{
+sub new {

        my $class = shift;
        my $value = shift;
        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]={};
+       }
+}
+
+sub remove_influence {
+       my $this=shift;
+       my $torm=shift;
+
+       delete $this->[1]{$torm};
+}
+
+package IkiWiki::ErrorReason;
+
+our @ISA = 'IkiWiki::FailReason';

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

-sub match_glob ($$;@) { #{{{
+sub derel ($$) {
+       my $path=shift;
+       my $from=shift;
+
+       if ($path =~ m!^\./!) {
+               $from=~s#/?[^/]+$## if defined $from;
+               $path=~s#^\./##;
+               $path="$from/$path" if defined $from && length $from;
+       }
+
+       return $path;
+}
+
+sub match_glob ($$;@) {

        my $page=shift;
        my $glob=shift;
        my %params=@_;
        
        my $page=shift;
        my $glob=shift;
        my %params=@_;
        

-       my $from=exists $params{location} ? $params{location} : '';
-       
-       # relative matching
-       if ($glob =~ m!^\./!) {
-               $from=~s#/?[^/]+$##;
-               $glob=~s#^\./##;
-               $glob="$from/$glob" if length $from;
-       }
+       $glob=derel($glob, $params{location});

 
        my $regexp=IkiWiki::glob2re($glob);
        if ($page=~/^$regexp$/i) {
 
        my $regexp=IkiWiki::glob2re($glob);
        if ($page=~/^$regexp$/i) {


@@ -1863,117 +2361,146 @@ sub match_glob ($$;@) { #{{{
        else {
                return IkiWiki::FailReason->new("$glob does not match $page");
        }
        else {
                return IkiWiki::FailReason->new("$glob does not match $page");
        }

-} #}}}
+}

 
 

-sub match_internal ($$;@) { #{{{
-       return match_glob($_[0], $_[1], @_, internal => 1)
-} #}}}
+sub match_internal ($$;@) {
+       return match_glob(shift, shift, @_, internal => 1)
+}

 
 

-sub match_link ($$;@) { #{{{
+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 ($$;@) {

        my $page=shift;
        my $link=lc(shift);
        my %params=@_;
 
        my $page=shift;
        my $link=lc(shift);
        my %params=@_;
 

+       $link=derel($link, $params{location});

        my $from=exists $params{location} ? $params{location} : '';
        my $from=exists $params{location} ? $params{location} : '';

-
-       # relative matching
-       if ($link =~ m!^\.! && defined $from) {
-               $from=~s#/?[^/]+$##;
-               $link=~s#^\./##;
-               $link="$from/$link" if length $from;
+       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") unless $links && @{$links};
+       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) {
        my $bestlink = IkiWiki::bestlink($from, $link);
        foreach my $p (@{$links}) {
                if (length $bestlink) {

-                       return IkiWiki::SuccessReason->new("$page links to $link")
-                               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")
-                               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/^\///;
+                       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");
-} #}}}
+       return IkiWiki::FailReason->new("$page does not link to $link$qualifier", $page => $IkiWiki::DEPEND_LINKS, "" => 1);
+}

 
 

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

 
 

-sub match_created_before ($$;@) { #{{{
+sub match_created_before ($$;@) {

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

+       my %params=@_;
+       
+       $testpage=derel($testpage, $params{location});

 
        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);

        }
        }

-} #}}}
+}

 
 

-sub match_created_after ($$;@) { #{{{
+sub match_created_after ($$;@) {

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

+       my %params=@_;
+       
+       $testpage=derel($testpage, $params{location});

 
        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);

        }
        }

-} #}}}
+}

 
 

-sub match_creation_day ($$;@) { #{{{
+sub match_creation_day ($$;@) {

        if ((gmtime($IkiWiki::pagectime{shift()}))[3] == shift) {
                return IkiWiki::SuccessReason->new('creation_day matched');
        }
        else {
                return IkiWiki::FailReason->new('creation_day did not match');
        }
        if ((gmtime($IkiWiki::pagectime{shift()}))[3] == shift) {
                return IkiWiki::SuccessReason->new('creation_day matched');
        }
        else {
                return IkiWiki::FailReason->new('creation_day did not match');
        }

-} #}}}
+}

 
 

-sub match_creation_month ($$;@) { #{{{
+sub match_creation_month ($$;@) {

        if ((gmtime($IkiWiki::pagectime{shift()}))[4] + 1 == shift) {
                return IkiWiki::SuccessReason->new('creation_month matched');
        }
        else {
                return IkiWiki::FailReason->new('creation_month did not match');
        }
        if ((gmtime($IkiWiki::pagectime{shift()}))[4] + 1 == shift) {
                return IkiWiki::SuccessReason->new('creation_month matched');
        }
        else {
                return IkiWiki::FailReason->new('creation_month did not match');
        }

-} #}}}
+}

 
 

-sub match_creation_year ($$;@) { #{{{
+sub match_creation_year ($$;@) {

        if ((gmtime($IkiWiki::pagectime{shift()}))[5] + 1900 == shift) {
                return IkiWiki::SuccessReason->new('creation_year matched');
        }
        else {
                return IkiWiki::FailReason->new('creation_year did not match');
        }
        if ((gmtime($IkiWiki::pagectime{shift()}))[5] + 1900 == shift) {
                return IkiWiki::SuccessReason->new('creation_year matched');
        }
        else {
                return IkiWiki::FailReason->new('creation_year did not match');
        }

-} #}}}
+}

 
 

-sub match_user ($$;@) { #{{{
+sub match_user ($$;@) {

        shift;
        my $user=shift;
        my %params=@_;
        
        shift;
        my $user=shift;
        my %params=@_;
        

+       my $regexp=IkiWiki::glob2re($user);
+       

        if (! exists $params{user}) {
        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} && $params{user}=~/^$regexp$/i) {

                return IkiWiki::SuccessReason->new("user is $user");
        }
        elsif (! defined $params{user}) {
                return IkiWiki::SuccessReason->new("user is $user");
        }
        elsif (! defined $params{user}) {


@@ -1982,15 +2509,15 @@ sub match_user ($$;@) { #{{{
        else {
                return IkiWiki::FailReason->new("user is $params{user}, not $user");
        }
        else {
                return IkiWiki::FailReason->new("user is $params{user}, not $user");
        }

-} #}}}
+}

 
 

-sub match_admin ($$;@) { #{{{
+sub match_admin ($$;@) {

        shift;
        shift;
        my %params=@_;
        
        if (! exists $params{user}) {
        shift;
        shift;
        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})) {


@@ -2002,15 +2529,15 @@ sub match_admin ($$;@) { #{{{
        else {
                return IkiWiki::FailReason->new("user is not an admin");
        }
        else {
                return IkiWiki::FailReason->new("user is not an admin");
        }

-} #}}}
+}

 
 

-sub match_ip ($$;@) { #{{{
+sub match_ip ($$;@) {

        shift;
        my $ip=shift;
        my %params=@_;
        
        if (! exists $params{ip}) {
        shift;
        my $ip=shift;
        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) {


@@ -2019,6 +2546,24 @@ sub match_ip ($$;@) { #{{{
        else {
                return IkiWiki::FailReason->new("IP is $params{ip}, not $ip");
        }
        else {
                return IkiWiki::FailReason->new("IP is $params{ip}, not $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