X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4918c164e863a637445516c88fcd3efe6ae5262e..f1f6973d2d05e2cfc7f463df8568de07314e1720:/IkiWiki/Plugin/link.pm

diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm
index 515a62bce..3838aec09 100644
--- a/IkiWiki/Plugin/link.pm
+++ b/IkiWiki/Plugin/link.pm
@@ -3,18 +3,28 @@ package IkiWiki::Plugin::link;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my $link_regexp;
 
-sub import { #{{{
+sub import {
+	hook(type => "getsetup", id => "link", call => \&getsetup);
 	hook(type => "checkconfig", id => "link", call => \&checkconfig);
 	hook(type => "linkify", id => "link", call => \&linkify);
 	hook(type => "scan", id => "link", call => \&scan);
 	hook(type => "renamepage", id => "link", call => \&renamepage);
-} # }}}
+}
 
-sub checkconfig () { #{{{
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 1,
+			section => "core",
+		},
+}
+
+sub checkconfig () {
 	if ($config{prefix_directives}) {
 		$link_regexp = qr{
 			\[\[(?=[^!])            # beginning of link
@@ -49,9 +59,9 @@ sub checkconfig () { #{{{
 			\]\]                    # end of link
 		}x,
 	}
-} #}}}
+}
 
-sub linkify (@) { #{{{
+sub linkify (@) {
 	my %params=@_;
 	my $page=$params{page};
 	my $destpage=$params{destpage};
@@ -60,28 +70,28 @@ sub linkify (@) { #{{{
 		defined $2
 			? ( $1 
 				? "[[$2|$3".($4 ? "#$4" : "")."]]" 
-				: htmllink($page, $destpage, IkiWiki::linkpage($3),
-					anchor => $4, linktext => IkiWiki::pagetitle($2)))
+				: htmllink($page, $destpage, linkpage($3),
+					anchor => $4, linktext => pagetitle($2)))
 			: ( $1 
 				? "[[$3".($4 ? "#$4" : "")."]]"
-				: htmllink($page, $destpage, IkiWiki::linkpage($3),
+				: htmllink($page, $destpage, linkpage($3),
 					anchor => $4))
 	}eg;
 	
 	return $params{content};
-} #}}}
+}
 
-sub scan (@) { #{{{
+sub scan (@) {
 	my %params=@_;
 	my $page=$params{page};
 	my $content=$params{content};
 
 	while ($content =~ /(?<!\\)$link_regexp/g) {
-		push @{$links{$page}}, IkiWiki::linkpage($2);
+		add_link($page, linkpage($2));
 	}
-} # }}}
+}
 
-sub renamepage (@) { #{{{
+sub renamepage (@) {
 	my %params=@_;
 	my $page=$params{page};
 	my $old=$params{oldpage};
@@ -90,8 +100,9 @@ sub renamepage (@) { #{{{
 	$params{content} =~ s{(?<!\\)$link_regexp}{
 		my $linktext=$2;
 		my $link=$linktext;
-		if (bestlink($page, $2) eq $old) {
-			$link=$new;
+		if (bestlink($page, linkpage($linktext)) eq $old) {
+			$link=pagetitle($new, 1);
+			$link=~s/ /_/g;
 			if ($linktext =~ m/.*\/*?[A-Z]/) {
 				# preserve leading cap of last component
 				my @bits=split("/", $link);
@@ -108,6 +119,6 @@ sub renamepage (@) { #{{{
 	}eg;
 
 	return $params{content};
-} #}}}
+}
 
 1