* Change formbuilder hook to not be responsible for displaying a form,

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

diff --git a/IkiWiki/Plugin/camelcase.pm b/IkiWiki/Plugin/camelcase.pm
index 68d399d77698bb5be52ba48cd3ddaab21bb5b964..845a516ee5e0d02d4080e08fab386d009db31c52 100644 (file)
--- a/IkiWiki/Plugin/camelcase.pm
+++ b/IkiWiki/Plugin/camelcase.pm
@@ -4,9 +4,10 @@ package IkiWiki::Plugin::camelcase;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

+use IkiWiki 2.00;

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

-       IkiWiki::hook(type => "filter", id => "camelcase", call => \&filter);
+       hook(type => "filter", id => "camelcase", call => \&filter);

 } # }}}
 
 sub filter (@) { #{{{
 } # }}}
 
 sub filter (@) { #{{{


@@ -14,7 +15,21 @@ sub filter (@) { #{{{
 
        # Make CamelCase links work by promoting them to fullfledged
        # WikiLinks. This regexp is based on the one in Text::WikiFormat.
 
        # Make CamelCase links work by promoting them to fullfledged
        # WikiLinks. This regexp is based on the one in Text::WikiFormat.

-       $params{content}=~s#(?<![[|"/>=])\b((?:[A-Z][a-z0-9]\w*){2,})#[[$1]]#g;
+       $params{content}=~s{
+               (?<![^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
+               )
+       }{[[$1]]}gx;

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