Merge branch 'master' into autoconfig

Conflicts:

	debian/changelog
	doc/todo/color_plugin.mdwn

5 files changed, 103 insertions, 71 deletions

diff --git a/debian/changelog b/debian/changelog
index e146bf8d4..865544786 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,7 @@ ikiwiki (2.60) UNRELEASED; urgency=low
 
  -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400
 
-ikiwiki (2.55) UNRELEASED; urgency=low
+ikiwiki (2.55) unstable; urgency=low
 
   * remove: New plugin that adds the ability to remove pages via the web.
     (Sponsored by The TOVA Company.)
@@ -48,7 +48,7 @@ ikiwiki (2.55) UNRELEASED; urgency=low
   * toggle: Fix for when html got tidied. Closes: #492529 (Enrico Zini)
   * cutpaste: New plugin by Enrico Zini
 
- -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 27 Jul 2008 11:23:13 -0400
 
 ikiwiki (2.54) unstable; urgency=low
 
diff --git a/doc/download.mdwn b/doc/download.mdwn
index 98defb382..71d333ad4 100644
--- a/doc/download.mdwn
+++ b/doc/download.mdwn
@@ -28,6 +28,8 @@ There is also an unofficial backport of ikiwiki for Ubuntu Hardy, provided by
 [[Paweł_Tęcza|users/ptecza]],
 at [http://gpa.net.icm.edu.pl/ubuntu/](http://gpa.net.icm.edu.pl/ubuntu/index-en.html).
 
+NetBSD pkgsrc has an [ikiwiki package](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/www/ikiwiki/README.html).
+
 FreeBSD has ikiwiki in its
 [ports collection](http://www.freshports.org/www/ikiwiki/).
 
diff --git a/doc/news/version_2.50.mdwn b/doc/news/version_2.50.mdwn
deleted file mode 100644
index 2c26b27da..000000000
--- a/doc/news/version_2.50.mdwn
+++ /dev/null
@@ -1,8 +0,0 @@
-ikiwiki 2.50 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * img: Support captions.
-   * img: Don't generate empty title attributes, etc.
-   * img: Allow setting defaults for class and id too.
-   * ikiwiki-mass-rebuild: Make group list comparison more robust.
-   * search: Work around xapian bug #486138 by only stemming locales
-     in a whitelist."""]]
\ No newline at end of file
diff --git a/doc/news/version_2.55.mdwn b/doc/news/version_2.55.mdwn
new file mode 100644
index 000000000..263c0c162
--- /dev/null
+++ b/doc/news/version_2.55.mdwn
@@ -0,0 +1,33 @@
+ikiwiki 2.55 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * remove: New plugin that adds the ability to remove pages via the web.
+     (Sponsored by The TOVA Company.)
+   * rename: New plugin that adds the ability to rename pages via the web.
+     (Sponsored by The TOVA Company.) (This one's for you, Kyle.)
+   * All rcs backends need to implement rcs\_remove, rcs\_commitstaged,
+     and rcs\_rename. (Done for svn, git).
+   * This version adds renamepage hooks, which can be used to modify page content,
+     including links, during renames.
+   * prefix\_directives enabled in doc wiki, all preprocessor directives
+     converted. (Simon McVittie)
+   * editpage: Don't show attachments link when attachments are disabled.
+   * tag: Allow tagbase to be overridden by starting a tag with "./" or "/".
+     (Simon McVittie)
+   * Really fix bug with links to pages with names containing colons.
+     Previous fix mised a few cases.
+   * Avoid troublesome abs\_path calls in wrapper setup.
+   * Add allow\_symlinks\_before\_srcdir config setting that can be used to avoid
+     a security check that is a good safe default, but problimatic overkill in
+     some situations.
+   * Don't allow uploading an attachment with the same name as an existing
+     page, to avoid confusion.
+   * Split out error messages from editpage.tmpl into several separate
+     templates.
+   * attachment: Do not escape \_ when determining attachment filenames.
+   * Rebuild pages that change their type. (Gabriel McManus)
+   * monotone: Add support for rename, delete, and also diff. (William Uther)
+   * toggle: Fix incompatability between javascript and webkit.
+   * bzr: Add support for rename and delete. (Jelmer Vernooij)
+   * attachment: Use relative paths when inserting links.
+   * toggle: Fix for when html got tidied. Closes: #[492529](http://bugs.debian.org/492529) (Enrico Zini)
+   * cutpaste: New plugin by Enrico Zini"""]]
\ No newline at end of file
diff --git a/doc/todo/color_plugin.mdwn b/doc/todo/color_plugin.mdwn
index ec246f9d6..511851ba3 100644
--- a/doc/todo/color_plugin.mdwn
+++ b/doc/todo/color_plugin.mdwn
@@ -89,12 +89,19 @@ comments are very welcome. --[[Paweł|ptecza]]
 >> I don't like that too, but I didn't have better idea :) Thank you for
 >> the hint! I'll take a look at `toggle` plugin.
 
-	--- /dev/null	2008-07-24 09:38:19.000000000 +0200
-	+++ color.pm	2008-07-25 14:43:15.000000000 +0200
-	@@ -0,0 +1,75 @@
+---
+
+And here is RC2 of that plugin. I've changed a plugin syntax, because the old
+seems to be too enigmatic and it was hard to me to handle unnamed parameters
+in not hardcoded way. I hope that my changes are acceptable for you.
+Of course, I'm open for discussion or exchange of ideas :) --[[Paweł|ptecza]]
+
+	--- /dev/null	2008-06-21 02:02:15.000000000 +0200
+	+++ color.pm	2008-07-27 14:58:12.000000000 +0200
+	@@ -0,0 +1,69 @@
 	+#!/usr/bin/perl
 	+# Ikiwiki text colouring plugin
-	+# Paweł Tęcza <ptecza@net.icm.edu.pl>
+	+# Paweł‚ Tęcza <ptecza@net.icm.edu.pl>
 	+package IkiWiki::Plugin::color;
 	+
 	+use warnings;
@@ -103,98 +110,96 @@ comments are very welcome. --[[Paweł|ptecza]]
 	+
 	+sub import { #{{{
 	+	hook(type => "preprocess", id => "color", call => \&preprocess);
-	+	hook(type => "sanitize",   id => "color", call => \&sanitize);
+	+	hook(type => "format",     id => "color", call => \&format);
 	+} #}}}
 	+
-	+sub preserve_style(@) { #{{{
-	+	my ($colors, $text) = @_;
-	+	$colors = '' unless $colors;	# foreground and background colors
-	+	$text   = '' unless $text;	# text
-	+	
-	+	# Check colors
-	+	my ($color1, $color2) = ();
-	+	$colors = lc($colors);	# Regexps on lower case strings are simpler
-	+	if ($colors =~ /,/) {
-	+		# Probably defined both foreground and background color
-	+		($color1, $color2) = ($colors =~ /(.*),(.*)/);
-	+	}
-	+	else {
-	+		# Probably defined only foreground color
-	+		($color1, $color2) = ($colors, '');
-	+	}
-	+	
+	+sub preserve_style($$$) { #{{{
+	+	my $foreground = shift;
+	+	my $background = shift;
+	+	my $text       = shift;
+	+
+	+	$foreground = defined $foreground ? lc($foreground) : '';
+	+	$background = defined $background ? lc($background) : '';
+	+	$text       = '' unless (defined $text);
+	+
 	+	# Validate colors. Only color name or color code are valid.
-	+	my ($fg, $bg) = ();
-	+	$fg = $color1 if ($color1 &&
-	+			 ($color1 =~ /^[a-z]+$/ || $color1 =~ /^#[0-9a-f]{3,6}$/));
-	+	$bg = $color2 if ($color2 &&
-	+			 ($color2 =~ /^[a-z]+$/ || $color2 =~ /^#[0-9a-f]{3,6}$/));
+	+	$foreground = '' unless ($foreground &&
+	+				($foreground =~ /^[a-z]+$/ || $foreground =~ /^#[0-9a-f]{3,6}$/));
+	+	$background = '' unless ($background &&
+	+				($background =~ /^[a-z]+$/ || $background =~ /^#[0-9a-f]{3,6}$/));
 	+
 	+	my $preserved = '';
-	+	if ($fg || $bg) {
-	+		$preserved .= 'COLORS {';
-	+		$preserved .= 'color: '.$fg if ($fg);
-	+		$preserved .= '; ' if ($fg && $bg);
-	+		$preserved .= 'background-color: '.$bg if ($bg);
-	+		$preserved .= '} SROLOC;TEXT {'.$text.'} TXET';
-	+	}
+	+	$preserved .= '<span class="color">';
+	+	$preserved .= 'color: '.$foreground if ($foreground);
+	+	$preserved .= '; ' if ($foreground && $background);
+	+	$preserved .= 'background-color: '.$background if ($background);
+	+	$preserved .= '</span>';
+	+	$preserved .= '<span class="colorend">'.$text.'</span>';
 	+	
 	+	return $preserved;
 	+
 	+} #}}}
 	+
-	+sub replace_preserved_style(@) { #{{{
+	+sub replace_preserved_style($) { #{{{
 	+	my $content = shift;
 	+
-	+	if ($content) {
-	+		$content =~ s/COLORS {/<span style="/;
-	+		$content =~ s/} SROLOC;TEXT {/">/;
-	+		$content =~ s/} TXET/<\/span>/;
-	+	}
+	+	$content =~ s!<span class="color">((color: ([a-z]+|\#[0-9a-f]{3,6})?)?((; )?(background-color: ([a-z]+|\#[0-9a-f]{3,6})?)?)?)</span>!<span class="color" style="$1">!g;
+	+	$content =~ s!<span class="colorend">!!g;
 	+
 	+	return $content; 
 	+} #}}}
 	+
-	+sub preprocess (@) { #{{{
-	+	return preserve_style($_[0], $_[2]);
+	+sub preprocess(@) { #{{{
+	+	my %params = @_;
+	+
+	+	# Preprocess the text to expand any preprocessor directives
+	+	# embedded inside it.
+	+	$params{text} = IkiWiki::preprocess($params{page}, $params{destpage},
+	+				IkiWiki::filter($params{page}, $params{destpage}, $params{text}));
+	+
+	+	return preserve_style($params{foreground}, $params{background}, $params{text});
 	+} #}}}
 	+
-	+sub sanitize (@) { #{{{
+	+sub format(@) { #{{{
 	+	my %params = @_;
-	+	
-	+	return replace_preserved_style($params{content})
-	+		if (exists $params{content})
+	+
+	+	$params{content} = replace_preserved_style($params{content});
+	+	return $params{content};	
 	+} #}}}
 	+
 	+1
-	--- /dev/null	2008-07-24 09:38:19.000000000 +0200
-	+++ color.mdwn	2008-07-25 14:50:19.000000000 +0200
-	@@ -0,0 +1,31 @@
-	+\[[!template id=plugin name=color core=0 author="[[Paweł Tęcza|ptecza]]"]]
+	--- /dev/null	2008-06-21 02:02:15.000000000 +0200
+	+++ color.mdwn	2008-07-27 15:04:42.000000000 +0200
+	@@ -0,0 +1,25 @@
+	+\[[!template id=plugin name=color core=0 author="[[ptecza]]"]]
 	+
 	+This plugin can be used to color a piece of text on Ikiwiki page.
 	+It's possible setting foreground and/or background color of the text.
 	+
-	+The plugin syntax is very simple. You only need to type name (e.g. `white`)
-	+or HTML code of colors (e.g. `#ffffff`) and a text you want to color.
-	+The colors should by separated using a comma character.
+	+You can use name (e.g. `white`) or HTML code of colors (e.g. `#ffffff`)
+	+to define colors. 
 	+
 	+Below are a few examples:
 	+
-	+    \[[!color white,#ff0000 "White text on red background"]]
+	+    \[[!color foreground=white background=#ff0000 text="White text on red background"]]
 	+
 	+Foreground color is defined as a word, background color is defined as HTML
 	+color code.
 	+
-	+    \[[!color white "White text on default color background"]]
-	+
-	+Foreground color is default color if only one color was typed and a comma
-	+character is missing.
-	+
-	+    \[[!color white, "White text on default color background"]]
+	+    \[[!color foreground=white text="White text on default color background"]]
 	+
 	+Background color is missing, so the text is displayed on default background.
 	+
-	+    \[[!color ,#ff0000 "Default color text on red background"]]
+	+    \[[!color background=#ff0000 text="Default color text on red background"]]
 	+
 	+Foreground is missing, so the text has default color.
+	--- style.css-orig	2008-07-27 15:12:39.000000000 +0200
+	+++ style.css	2008-07-27 15:15:06.000000000 +0200
+	@@ -333,3 +333,7 @@
+	 	background: #eee; 
+	 	color: black !important;
+	 }
+	+
+	+span.color {
+	+	padding: 2px;
+	+}