From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 25 Dec 2008 21:36:16 +0000 (-0500)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.00~4^2~15
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/914c839ceb02fdbb36a49aa6548dc95beaf59ea4?ds=inline;hp=-c

Merge branch 'master' into next

Conflicts:

	IkiWiki/Plugin/googlecalendar.pm
---

914c839ceb02fdbb36a49aa6548dc95beaf59ea4
diff --combined IkiWiki/Plugin/camelcase.pm
index bda980d28,f9ee30fe2..74a8397d7
--- a/IkiWiki/Plugin/camelcase.pm
+++ b/IkiWiki/Plugin/camelcase.pm
@@@ -4,7 -4,7 +4,7 @@@ package IkiWiki::Plugin::camelcase
  
  use warnings;
  use strict;
 -use IkiWiki 2.00;
 +use IkiWiki 3.00;
  
  # This regexp is based on the one in Text::WikiFormat.
  my $link_regexp=qr{
@@@ -33,7 -33,14 +33,14 @@@ sub getsetup () 
  		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 (@) {
@@@ -42,7 -49,7 +49,7 @@@
  	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};
@@@ -54,8 -61,13 +61,13 @@@ sub scan (@) 
          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
diff --combined debian/changelog
index ff1c6aa5f,19b8cbdf7..62ff1ba6f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,11 +1,26 @@@
 -ikiwiki (2.72) UNRELEASED; urgency=low
 +ikiwiki (3.00) UNRELEASED; urgency=low
 +
 +  * Remove support for GlobLists.
 +  * Remove support for configuring allowed attachments, locked pages,
 +    and banned users from the admin preferences page. These can only be
 +    controlled via the setup file now.
 +  * ikiwiki-transition moveprefs can be used to move the above
 +    admin preferences into a setup file.
 +  * prefix_directives and aggregate_internal are now turned on by default.
 +  * ikiwiki-transition prefix_directives syntax changed
 +  * googlecalendar: removed this deprecated plugin. Use embed instead.
 +  * Version 3.00 of the plugin API.
 +
 + -- Joey Hess <joeyh@debian.org>  Wed, 24 Dec 2008 19:49:36 -0500
 +
 +ikiwiki (2.72) unstable; urgency=low
  
    * 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.
+   * googlecalendar: Add runtime deprecation warning.
  
 - -- Joey Hess <joeyh@debian.org>  Mon, 22 Dec 2008 19:02:16 -0500
 + -- Joey Hess <joeyh@debian.org>  Wed, 24 Dec 2008 19:49:32 -0500
  
  ikiwiki (2.71) unstable; urgency=low