Merge commit 'origin/master'

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

diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm
index 51afaec9e7392b3ca15fe6b8c39db5d4b90d88bf..0638d4bddd0b1d82bd54714601f80d9582d18918 100644 (file)
--- a/IkiWiki/Plugin/link.pm
+++ b/IkiWiki/Plugin/link.pm
@@ -8,11 +8,21 @@ use IkiWiki 2.00;
 my $link_regexp;
 
 sub import { #{{{
 my $link_regexp;
 
 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 => "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 getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },
+} #}}}
+

 sub checkconfig () { #{{{
        if ($config{prefix_directives}) {
                $link_regexp = qr{
 sub checkconfig () { #{{{
        if ($config{prefix_directives}) {
                $link_regexp = qr{


@@ -59,11 +69,11 @@ sub linkify (@) { #{{{
                defined $2
                        ? ( $1 
                                ? "[[$2|$3".($4 ? "#$4" : "")."]]" 
                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" : "")."]]"
                        : ( $1 
                                ? "[[$3".($4 ? "#$4" : "")."]]"

-                               : htmllink($page, $destpage, IkiWiki::linkpage($3),
+                               : htmllink($page, $destpage, linkpage($3),

                                        anchor => $4))
        }eg;
        
                                        anchor => $4))
        }eg;
        


@@ -76,7 +86,7 @@ sub scan (@) { #{{{
        my $content=$params{content};
 
        while ($content =~ /(?<!\\)$link_regexp/g) {
        my $content=$params{content};
 
        while ($content =~ /(?<!\\)$link_regexp/g) {

-               push @{$links{$page}}, IkiWiki::linkpage($2);
+               push @{$links{$page}}, linkpage($2);

        }
 } # }}}
 
        }
 } # }}}
 


@@ -87,13 +97,19 @@ sub renamepage (@) { #{{{
        my $new=$params{newpage};
 
        $params{content} =~ s{(?<!\\)$link_regexp}{
        my $new=$params{newpage};
 
        $params{content} =~ s{(?<!\\)$link_regexp}{

-               my $link=$2;
-               if (bestlink($page, $2) eq $old) {
-                       if (index($2, "/") == 0) {
-                               $link="/$new";
+               my $linktext=$2;
+               my $link=$linktext;
+               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);
+                               $link=join("/", @bits[0..$#bits-1], ucfirst($bits[$#bits]));

                        }
                        }

-                       else {
-                               $link=$new;
+                       if (index($linktext, "/") == 0) {
+                               # absolute link
+                               $link="/$link";

                        }
                }
                defined $1
                        }
                }
                defined $1