X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3a2cb0ecfff65f728569edbdcc4e30f027c36d67..5023f2301d42319cb552102c532452b8fb4744af:/IkiWiki/Plugin/camelcase.pm?ds=inline

diff --git a/IkiWiki/Plugin/camelcase.pm b/IkiWiki/Plugin/camelcase.pm
index 68d399d77..845a516ee 100644
--- a/IkiWiki/Plugin/camelcase.pm
+++ b/IkiWiki/Plugin/camelcase.pm
@@ -4,9 +4,10 @@ package IkiWiki::Plugin::camelcase;
 
 use warnings;
 use strict;
+use IkiWiki 2.00;
 
 sub import { #{{{
-	IkiWiki::hook(type => "filter", id => "camelcase", call => \&filter);
+	hook(type => "filter", id => "camelcase", call => \&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.
-	$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};
 } #}}}