Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/camelcase.pm b/IkiWiki/Plugin/camelcase.pm
index dc89f1b90ec8c039a6ce3adbe8ee03cb60ae30df..7881becd5a1174f3539a93385d415a906574ada7 100644 (file)
--- a/IkiWiki/Plugin/camelcase.pm
+++ b/IkiWiki/Plugin/camelcase.pm
@@ -6,31 +6,56 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 
 use strict;
 use IkiWiki 2.00;
 

+# This regexp is based on the one in Text::WikiFormat.
+my $link_regexp=qr{
+       (?<![^A-Za-z0-9\s])     # try to avoid expanding non-links with a
+                               # zero width negative lookbehind for
+                               # characters that suggest it's not a link
+       \b                      # word boundry
+       (
+               (?:
+                       [A-Z]           # Uppercase start
+                       [a-z0-9]        # followed by lowercase
+                       \w*             # and rest of word
+               )
+               {2,}                    # repeated twice
+       )
+}x;
+

 sub import { #{{{
 sub import { #{{{

-       hook(type => "filter", id => "camelcase", call => \&filter);
+       hook(type => "getsetup", id => "camelcase", call => \&getsetup);
+       hook(type => "linkify", id => "camelcase", call => \&linkify);
+       hook(type => "scan", id => "camelcase", call => \&scan);

 } # }}}
 
 } # }}}
 

-sub filter (@) { #{{{
+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               };
+} #}}}
+
+sub linkify (@) { #{{{

        my %params=@_;
        my %params=@_;

+       my $page=$params{page};
+       my $destpage=$params{destpage};

 
 

-       # Make CamelCase links work by promoting them to fullfledged
-       # WikiLinks. This regexp is based on the one in Text::WikiFormat.
-       $params{content}=~s{
-               (?<![[|"/>=])   # try to avoid expanding non-links
-                               # with a zero width negative lookbehind for
-                               # characters that suggest it's not a link
-               \b              # word boundry
-               (
-                       (?:
-                               [A-Z]           # Uppercase start
-                               [a-z0-9]        # followed by lowercase
-                               \w*             # and rest of word
-                       )
-                       {2,}                    # repeated twice
-               )
-       }{[[$1]]}gx;
+       $params{content}=~s{$link_regexp}{
+               htmllink($page, $destpage, linkpage($1))
+       }eg;

 
        return $params{content};
 } #}}}
 
 
        return $params{content};
 } #}}}
 

+sub scan (@) { #{{{
+        my %params=@_;
+        my $page=$params{page};
+        my $content=$params{content};
+
+       while ($content =~ /$link_regexp/g) {
+               push @{$links{$page}}, linkpage($1);
+       }
+}
+

 1
 1