update info on my split-view setup, and ask for plugin advice

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

diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm
index 51afaec9e7392b3ca15fe6b8c39db5d4b90d88bf..ef01f110702228fb71356d7d76437161f134b156 100644 (file)
--- a/IkiWiki/Plugin/link.pm
+++ b/IkiWiki/Plugin/link.pm
@@ -3,17 +3,31 @@ package IkiWiki::Plugin::link;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 my $link_regexp;
 
 
 my $link_regexp;
 

-sub import { #{{{
+my $email_regexp = qr/^.+@.+\..+$/;
+my $url_regexp = qr/^(?:[^:]+:\/\/|mailto:).*/i;
+
+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,
+                       section => "core",
+               },
+}

 
 

-sub checkconfig () { #{{{
+sub checkconfig () {

        if ($config{prefix_directives}) {
                $link_regexp = qr{
                        \[\[(?=[^!])            # beginning of link
        if ($config{prefix_directives}) {
                $link_regexp = qr{
                        \[\[(?=[^!])            # beginning of link


@@ -46,11 +60,49 @@ sub checkconfig () { #{{{
                        )?                      # optional
 
                        \]\]                    # end of link
                        )?                      # optional
 
                        \]\]                    # end of link

-               }x,
+               }x;
+       }
+}
+
+sub is_externallink ($$;$) {
+       my $page = shift;
+       my $url = shift;
+       my $anchor = shift;
+       
+       if (defined $anchor) {
+               $url.="#".$anchor;
+       }
+
+       return ($url =~ /$url_regexp|$email_regexp/)
+}
+
+sub externallink ($$;$) {
+       my $url = shift;
+       my $anchor = shift;
+       my $pagetitle = shift;
+
+       if (defined $anchor) {
+               $url.="#".$anchor;

        }
        }

-} #}}}

 
 

-sub linkify (@) { #{{{
+       # build pagetitle
+       if (! $pagetitle) {
+               $pagetitle = $url;
+               # use only the email address as title for mailto: urls
+               if ($pagetitle =~ /^mailto:.*/) {
+                       $pagetitle =~ s/^mailto:([^?]+).*/$1/;
+               }
+       }
+
+       if ($url !~ /$url_regexp/) {
+               # handle email addresses (without mailto:)
+               $url = "mailto:" . $url;
+       }
+
+       return "<a href=\"$url\">$pagetitle</a>";
+}
+
+sub linkify (@) {

        my %params=@_;
        my $page=$params{page};
        my $destpage=$params{destpage};
        my %params=@_;
        my $page=$params{page};
        my $destpage=$params{destpage};


@@ -58,50 +110,64 @@ sub linkify (@) { #{{{
        $params{content} =~ s{(\\?)$link_regexp}{
                defined $2
                        ? ( $1 
        $params{content} =~ s{(\\?)$link_regexp}{
                defined $2
                        ? ( $1 

-                               ? "[[$2|$3".($4 ? "#$4" : "")."]]" 
-                               : htmllink($page, $destpage, IkiWiki::linkpage($3),
-                                       anchor => $4, linktext => IkiWiki::pagetitle($2)))
+                               ? "[[$2|$3".(defined $4 ? "#$4" : "")."]]" 
+                               : is_externallink($page, $3, $4)
+                                       ? externallink($3, $4, $2)
+                                       : htmllink($page, $destpage, linkpage($3),
+                                               anchor => $4, linktext => pagetitle($2)))

                        : ( $1 
                        : ( $1 

-                               ? "[[$3".($4 ? "#$4" : "")."]]"
-                               : htmllink($page, $destpage, IkiWiki::linkpage($3),
-                                       anchor => $4))
+                               ? "[[$3".(defined $4 ? "#$4" : "")."]]"
+                               : is_externallink($page, $3, $4)
+                                       ? externallink($3, $4)
+                                       : htmllink($page, $destpage, linkpage($3),
+                                               anchor => $4))

        }eg;
        
        return $params{content};
        }eg;
        
        return $params{content};

-} #}}}
+}

 
 

-sub scan (@) { #{{{
+sub scan (@) {

        my %params=@_;
        my $page=$params{page};
        my $content=$params{content};
 
        while ($content =~ /(?<!\\)$link_regexp/g) {
        my %params=@_;
        my $page=$params{page};
        my $content=$params{content};
 
        while ($content =~ /(?<!\\)$link_regexp/g) {

-               push @{$links{$page}}, IkiWiki::linkpage($2);
+               if (! is_externallink($page, $2, $3)) {
+                       add_link($page, linkpage($2));
+               }

        }
        }

-} # }}}
+}

 
 

-sub renamepage (@) { #{{{
+sub renamepage (@) {

        my %params=@_;
        my $page=$params{page};
        my $old=$params{oldpage};
        my $new=$params{newpage};
 
        $params{content} =~ s{(?<!\\)$link_regexp}{
        my %params=@_;
        my $page=$params{page};
        my $old=$params{oldpage};
        my $new=$params{newpage};
 
        $params{content} =~ s{(?<!\\)$link_regexp}{

-               my $link=$2;
-               if (bestlink($page, $2) eq $old) {
-                       if (index($2, "/") == 0) {
-                               $link="/$new";
-                       }
-                       else {
-                               $link=$new;
+               if (! is_externallink($page, $2, $3)) {
+                       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]));
+                               }
+                               if (index($linktext, "/") == 0) {
+                                       # absolute link
+                                       $link="/$link";
+                               }

                        }
                        }

+                       defined $1
+                               ? ( "[[$1|$link".($3 ? "#$3" : "")."]]" )
+                               : ( "[[$link".   ($3 ? "#$3" : "")."]]" )

                }
                }

-               defined $1
-                       ? ( "[[$1|$link".($3 ? "#$3" : "")."]]" )
-                       : ( "[[$link".   ($3 ? "#$3" : "")."]]" )

        }eg;
 
        return $params{content};
        }eg;
 
        return $params{content};

-} #}}}
+}

 
 1
 
 1