camelcase: Add camelcase_ignore setting.

diff --git a/IkiWiki/Plugin/camelcase.pm b/IkiWiki/Plugin/camelcase.pm
index 6c1fafb7bf13c9673940454acb6b8da22f6c2449..f9ee30fe288456666d8008045a589c5db24f3366 100644 (file)
--- a/IkiWiki/Plugin/camelcase.pm
+++ b/IkiWiki/Plugin/camelcase.pm
@@ -33,7 +33,14 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => undef,
                plugin => {
                        safe => 1,
                        rebuild => undef,

-               };
+               },
+               camelcase_ignore => {
+                       type => "string",
+                       example => [],
+                       description => "list of words to not turn into links",
+                       safe => 1,
+                       rebuild => undef, # might change links
+               },

 }
 
 sub linkify (@) {
 }
 
 sub linkify (@) {


@@ -42,7 +49,7 @@ sub linkify (@) {
        my $destpage=$params{destpage};
 
        $params{content}=~s{$link_regexp}{
        my $destpage=$params{destpage};
 
        $params{content}=~s{$link_regexp}{

-               htmllink($page, $destpage, linkpage($1))
+               ignored($1) ? $1 : htmllink($page, $destpage, linkpage($1))

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


@@ -54,8 +61,13 @@ sub scan (@) {
         my $content=$params{content};
 
        while ($content =~ /$link_regexp/g) {
         my $content=$params{content};
 
        while ($content =~ /$link_regexp/g) {

-               push @{$links{$page}}, linkpage($1);
+               push @{$links{$page}}, linkpage($1) unless ignored($1)

        }
 }
 
        }
 }
 

+sub ignored ($) {
+       my $word=lc shift;
+       grep { $word eq lc $_ } @{$config{'camelcase_ignore'}}
+}
+

 1
 1

diff --git a/debian/changelog b/debian/changelog
index 2c8931735b78b1561d723b4718b96fede3e3a1f6..7a8985171eed01c18cd2e2f2dbbe873c395537be 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (2.72) UNRELEASED; urgency=low
 
   * Avoid comments in recentchanges being broken links (smcv)
   * Add deprecation warning for GlobLists, which will stop working in 3.0.
 
   * Avoid comments in recentchanges being broken links (smcv)
   * Add deprecation warning for GlobLists, which will stop working in 3.0.

+  * camelcase: Add camelcase_ignore setting.

 
  -- Joey Hess <joeyh@debian.org>  Mon, 22 Dec 2008 19:02:16 -0500
 
 
  -- Joey Hess <joeyh@debian.org>  Mon, 22 Dec 2008 19:02:16 -0500