X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/3a2cb0ecfff65f728569edbdcc4e30f027c36d67..e610460d9cb460ccf5314a394531eda789c295ec:/IkiWiki/Plugin/camelcase.pm

diff --git a/IkiWiki/Plugin/camelcase.pm b/IkiWiki/Plugin/camelcase.pm
index 68d399d77..0739bb01a 100644
--- a/IkiWiki/Plugin/camelcase.pm
+++ b/IkiWiki/Plugin/camelcase.pm
@@ -4,19 +4,49 @@ package IkiWiki::Plugin::camelcase;
 
 use warnings;
 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 { #{{{
-	IkiWiki::hook(type => "filter", id => "camelcase", call => \&filter);
+	hook(type => "linkify", id => "camelcase", call => \&linkify);
+	hook(type => "scan", id => "camelcase", call => \&scan);
 } # }}}
 
-sub filter (@) { #{{{
+sub linkify (@) { #{{{
 	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#(?<![[|"/>=])\b((?:[A-Z][a-z0-9]\w*){2,})#[[$1]]#g;
+	$params{content}=~s{$link_regexp}{
+		htmllink($page, $destpage, IkiWiki::linkpage($1))
+	}eg;
 
 	return $params{content};
 } #}}}
 
+sub scan (@) { #{{{
+        my %params=@_;
+        my $page=$params{page};
+        my $content=$params{content};
+
+	while ($content =~ /$link_regexp/g) {
+		push @{$links{$page}}, IkiWiki::linkpage($1);
+	}
+}
+
 1