Merge commit 'origin/master' into prv/po

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index bab7b707aa6c485338fb3b863760e8019cd65e1c..90fedca4f5dfb5614c229be58f453ea83307ea28 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -655,8 +655,19 @@ sub newpagefile ($$) { #{{{
 sub targetpage ($$) { #{{{
        my $page=shift;
        my $ext=shift;
-       
-       if (! $config{usedirs} || $page eq 'index') {
+
+       my $targetpage='';
+       run_hooks(targetpage => sub {
+               $targetpage=shift->(
+                       page => $page,
+                       ext => $ext,
+               );
+       });
+
+       if (defined $targetpage && (length($targetpage) > 0)) {
+               return $targetpage;
+       }
+       elsif (! $config{usedirs} || $page eq 'index') {
                return $page.".".$ext;
        }
        else {
@@ -804,6 +815,7 @@ sub will_render ($$;$) { #{{{
 sub bestlink ($$) { #{{{
        my $page=shift;
        my $link=shift;
+       my $res=undef;
        
        my $cwd=$page;
        if ($link=~s/^\/+//) {
@@ -818,25 +830,35 @@ sub bestlink ($$) { #{{{
                $l.=$link;
 
                if (exists $links{$l}) {
-                       return $l;
+                       $res=$l;
                }
                elsif (exists $pagecase{lc $l}) {
-                       return $pagecase{lc $l};
+                       $res=$pagecase{lc $l};
                }
-       } while $cwd=~s{/?[^/]+$}{};
+       } while ($cwd=~s{/?[^/]+$}{} && ! defined $res);
 
-       if (length $config{userdir}) {
+       if (! defined $res && length $config{userdir}) {
                my $l = "$config{userdir}/".lc($link);
                if (exists $links{$l}) {
-                       return $l;
+                       $res=$l;
                }
                elsif (exists $pagecase{lc $l}) {
-                       return $pagecase{lc $l};
+                       $res=$pagecase{lc $l};
                }
        }
 
-       #print STDERR "warning: page $page, broken link: $link\n";
-       return "";
+       if (defined $res) {
+               run_hooks(tweakbestlink => sub {
+                       $res=shift->(
+                               page => $page,
+                               link => $res);
+               });
+               return $res;
+       }
+       else {
+               #print STDERR "warning: page $page, broken link: $link\n";
+               return "";
+       }
 } #}}}
 
 sub isinlinableimage ($) { #{{{
@@ -931,6 +953,10 @@ sub beautify_urlpath ($) { #{{{
                $url =~ s!/index.$config{htmlext}$!/!;
        }
 
+       run_hooks(tweakurlpath => sub {
+               $url=shift->(url => $url);
+       });
+
        # Ensure url is not an empty link, and
        # if it's relative, make that explicit to avoid colon confusion.
        if ($url !~ /^\//) {