X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d3ca495e61e0e9d66095b1aba2fd1995e564e841..6f858cd59f6bb0734da499b88f385fb6a61ac48e:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 633c51381..36e85d413 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -647,8 +647,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 {
@@ -681,11 +692,12 @@ sub srcfile ($;$) { #{{{
 sub add_underlay ($) { #{{{
 	my $dir=shift;
 
-	if ($dir=~/^\//) {
-		unshift @{$config{underlaydirs}}, $dir;
+	if ($dir !~ /^\//) {
+		$dir="$config{underlaydir}/../$dir";
 	}
-	else {
-		unshift @{$config{underlaydirs}}, "$config{underlaydir}/../$dir";
+
+	if (! grep { $_ eq $dir } @{$config{underlaydirs}}) {
+		unshift @{$config{underlaydirs}}, $dir;
 	}
 
 	return 1;
@@ -795,6 +807,7 @@ sub will_render ($$;$) { #{{{
 sub bestlink ($$) { #{{{
 	my $page=shift;
 	my $link=shift;
+	my $res=undef;
 	
 	my $cwd=$page;
 	if ($link=~s/^\/+//) {
@@ -809,25 +822,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 ($) { #{{{
@@ -915,6 +938,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 !~ /^\//) {