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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 633c51381..e75175a8d 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;
@@ -915,6 +927,10 @@ sub beautify_urlpath ($) { #{{{
 		$url =~ s!/index.$config{htmlext}$!/!;
 	}
 
+	run_hooks(urlpath => 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 !~ /^\//) {