From 937c0742322065452a204069e0ba5abc625ec0c6 Mon Sep 17 00:00:00 2001
From: Per Carlson <per.carlson@ventelo.no>
Date: Thu, 17 Nov 2011 22:59:31 +0100
Subject: Always use true image size

---
 IkiWiki/Plugin/img.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index b98e843d4..a28d6a6d5 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -132,9 +132,9 @@ sub preprocess (@) {
 					$imglink = $file;
 				}
 			}
-			
-			$dwidth = $im->Get("width") unless defined $dwidth;
-			$dheight = $im->Get("height") unless defined $dheight;
+			# always get the true size of the resized image
+			$dwidth  = $im->Get("width"); 
+			$dheight = $im->Get("height");
 		}
 	}
 	else {
-- 
cgit v1.2.3


From 2872e1d738cafcd884f987f0efeea3fa83c4f470 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 17 Nov 2011 18:47:51 -0400
Subject: cleanup now unused setting

---
 IkiWiki/Plugin/img.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index a28d6a6d5..b92e24cc0 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -118,7 +118,6 @@ sub preprocess (@) {
 				error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
 			}
 			else {
-				($dwidth, $dheight)=($w, $h);
 				$r = $im->Resize(geometry => "${w}x${h}");
 				error sprintf(gettext("failed to resize: %s"), $r) if $r;
 
@@ -132,6 +131,7 @@ sub preprocess (@) {
 					$imglink = $file;
 				}
 			}
+
 			# always get the true size of the resized image
 			$dwidth  = $im->Get("width"); 
 			$dheight = $im->Get("height");
-- 
cgit v1.2.3


From 64e09f9968c5db26aef7bfdd70bde7c86c8fa144 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Nov 2011 16:13:16 -0400
Subject: cannot reproduce

---
 IkiWiki/Plugin/highlight.pm                        | 2 +-
 doc/bugs/Running_on_an_alternative_port_fails.mdwn | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm
index 33d136fbf..4e86207f1 100644
--- a/IkiWiki/Plugin/highlight.pm
+++ b/IkiWiki/Plugin/highlight.pm
@@ -52,7 +52,7 @@ sub getsetup () {
 
 sub checkconfig () {
 	eval q{use highlight};
-	if (highlight::DataDir->can('new')){
+	if (highlight::DataDir->can('new')) {
 		$data_dir=new highlight::DataDir();
 		$data_dir->searchDataDir("");
 	} else {
diff --git a/doc/bugs/Running_on_an_alternative_port_fails.mdwn b/doc/bugs/Running_on_an_alternative_port_fails.mdwn
index c6e09171d..8b5fefa91 100644
--- a/doc/bugs/Running_on_an_alternative_port_fails.mdwn
+++ b/doc/bugs/Running_on_an_alternative_port_fails.mdwn
@@ -5,3 +5,12 @@ For example if you run on 'http://my.gear.xxx:8080/' then after clicking login (
  -- fergus
 
 NB: both the 'url' and the 'cgiurl' include the port and removing the port element provides the expected functionality.
+
+> I tried to reproduce this by making my laptop's web server use port
+> 8080. Set up ikiwiki to use that in cgiurl and url, and had
+> no problem with either openid or password auth login.
+> 
+> Ikiwiki has had some changes in this area in the past year; you don't say
+> what version you were using. It could also be a problem with your web
+> server, conceviably, if didn't correctly communicate the port to the cgi
+> program. --[[Joey]]
-- 
cgit v1.2.3


From 41f6363a633cffd002f3af9f8b216f56f8924ecc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 27 Nov 2011 13:19:19 -0400
Subject: editpage: Fix FormattingHelp link on Discussion pages.

In 875d550f1278215e6c87d3b78ff87db24c6d76b3 I for some reason
made $page be changed when creating a discussion page, which
broke the link on the edit page. Changing page seems unnecessary,
so reverted that part of the change.
---
 IkiWiki/Plugin/editpage.pm                                              | 2 +-
 debian/changelog                                                        | 1 +
 ...-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index a5c29a352..54051c58c 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -231,7 +231,7 @@ sub cgi_editpage ($$) {
 					if ! $form->submitted && lc($page) ne $page;
 			}
 			elsif (lc $page eq lc $config{discussionpage}) {
-				@page_locs=$best_loc=$page="$from/".lc($page);
+				@page_locs=$best_loc="$from/".lc($page);
 			}
 			else {
 				my $dir=$from."/";
diff --git a/debian/changelog b/debian/changelog
index 7f6564d7f..52d9ddf3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (3.20111107) UNRELEASED; urgency=low
 
   * img: Bugfix to width/height tags for scaled down image when only
     one dimension was provided. Thanks, Per Carlson.
+  * editpage: Fix FormattingHelp link on Discussion pages.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 17 Nov 2011 18:52:23 -0400
 
diff --git a/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn b/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn
index 0eadc5809..8f87329ae 100644
--- a/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn
+++ b/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn
@@ -1 +1,3 @@
 For an example of what I mean, go to [[TourBusStop]]. Click the Discussion link. Click the <code>FormattingHelp</code> link. You'll be sent to [TourBusStop/ikiwiki/formatting](/TourBusStop/ikiwiki/formatting/) which of course doesn't exist.
+
+> A bug introduced in the last release. [[fixed|done]] --[[Joey]] 
-- 
cgit v1.2.3


From 44863ea2346eea32b3bc8b9b700101bf7ea3b32f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 30 Nov 2011 14:40:27 -0400
Subject: graphviz: Support urls embedded in the graph, by having graphviz
 generate an imagemap.

Also, I let preview mode write real files, rather than using data: uri.
Which is ok these days, since ikiwiki tracks files created during
previewing, and cleans them up later.
---
 IkiWiki/Plugin/graphviz.pm       | 55 ++++++++++++++++++++++------------------
 debian/changelog                 |  2 ++
 doc/ikiwiki/directive/graph.mdwn |  8 ++----
 3 files changed, 34 insertions(+), 31 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index 4ed8b89f1..f01fdca85 100644
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -26,10 +26,13 @@ my %graphviz_programs = (
 	"dot" => 1, "neato" => 1, "fdp" => 1, "twopi" => 1, "circo" => 1
 );
 
+my $graphnum=0;
+
 sub render_graph (\%) {
 	my %params = %{(shift)};
 
-	my $src = "$params{type} g {\n";
+	$graphnum++;
+	my $src = "$params{type} graph$graphnum {\n";
 	$src .= "charset=\"utf-8\";\n";
 	$src .= "ratio=compress;\nsize=\"".($params{width}+0).", ".($params{height}+0)."\";\n"
 		if defined $params{width} and defined $params{height};
@@ -39,48 +42,50 @@ sub render_graph (\%) {
 	# Use the sha1 of the graphviz code as part of its filename.
 	eval q{use Digest::SHA};
 	error($@) if $@;
-	my $dest=$params{page}."/graph-".
-		IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($src)).
-		".png";
+	my $base=$params{page}."/graph-".
+		IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($src));
+	my $dest=$base.".png";
 	will_render($params{page}, $dest);
 
-	if (! -e "$config{destdir}/$dest") {
+	# The imagemap data is stored as a separate file.
+	my $imagemap=$base.".imagemap";
+	will_render($params{page}, $imagemap);
+	
+	my $map;
+	if (! -e "$config{destdir}/$dest" || ! -e "$config{destdir}/$imagemap") {
+		# Use ikiwiki's function to create the image file, this makes
+		# sure needed subdirs are there and does some sanity checking.
+		writefile($dest, $config{destdir}, "");
+		
 		my $pid;
 		my $sigpipe=0;
 		$SIG{PIPE}=sub { $sigpipe=1 };
-		$pid=open2(*IN, *OUT, "$params{prog} -Tpng");
+		$pid=open2(*IN, *OUT, "$params{prog} -Tpng -o '$config{destdir}/$dest' -Tcmapx");
 
 		# open2 doesn't respect "use open ':utf8'"
+		binmode (IN, ':utf8');
 		binmode (OUT, ':utf8');
 
 		print OUT $src;
 		close OUT;
 
-		my $png;
-		{
-			local $/ = undef;
-			$png = <IN>;
-		}
+		local $/ = undef;
+		$map=<IN>;
 		close IN;
+		writefile($imagemap, $config{destdir}, $map);
 
 		waitpid $pid, 0;
 		$SIG{PIPE}="DEFAULT";
-		error gettext("failed to run graphviz") if $sigpipe;
-
-		if (! $params{preview}) {
-			writefile($dest, $config{destdir}, $png, 1);
-		}
-		else {
-			# in preview mode, embed the image in a data uri
-			# to avoid temp file clutter
-			eval q{use MIME::Base64};
-			error($@) if $@;
-			return "<img src=\"data:image/png;base64,".
-				encode_base64($png)."\" />";
-		}
+		error gettext("failed to run graphviz") if ($sigpipe || $?);
+
+	}
+	else {
+		$map=readfile("$config{destdir}/$imagemap");
 	}
 
-	return "<img src=\"".urlto($dest, $params{destpage})."\" />\n";
+	return "<img src=\"".urlto($dest, $params{destpage}).
+		"\" usemap=\"#graph$graphnum\" />\n".
+		$map;
 }
 
 sub graph (@) {
diff --git a/debian/changelog b/debian/changelog
index 73318b269..c77fbbeef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ ikiwiki (3.20111107) UNRELEASED; urgency=low
   * The umask setting can now be set to private, group, or public,
     avoiding the need to enter octal correctly which is particularly
     difficult in yaml setup files. (smcv)
+  * graphviz: Support urls embedded in the graph, by having graphviz
+    generate an imagemap.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 17 Nov 2011 18:52:23 -0400
 
diff --git a/doc/ikiwiki/directive/graph.mdwn b/doc/ikiwiki/directive/graph.mdwn
index 433187268..2828921d7 100644
--- a/doc/ikiwiki/directive/graph.mdwn
+++ b/doc/ikiwiki/directive/graph.mdwn
@@ -1,14 +1,10 @@
 The `graph` directive is supplied by the [[!iki plugins/graphviz desc=graphviz]] plugin.
 
-This directive allows embedding [graphviz](http://www.graphviz.org/) graphs in a
-page.  Example usage:
+This directive allows embedding [graphviz](http://www.graphviz.org/)
+graphs in a page.  Example usage:
 
 	\[[!graph src="a -> b -> c; a -> c;"]]
 
-Note that graphs will only show up in previews if your browser has
-[[!wikipedia data: URI]] support, or if the same graph already exists on that
-page.
-
 The `graph` directive supports the following parameters:
 
 - `src` - The graphviz source to render.
-- 
cgit v1.2.3


From 997116f1602e1c1340d9a9839908f3350e2eb1ca Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 30 Nov 2011 15:03:24 -0400
Subject: store imagemap in %pagestate, rather than a file

Using a file was sorta not right.

Note that when previewing, %pagestate is not saved, so
it has to rebuild the graph every time until that graph is saved;
then previews can use the cached data until the next time the graph
is changed.

Also note that it's stored in the destpage's pagestate. The imagemap
could vary between a page and an inlined page if wikilinks were supported.
---
 IkiWiki/Plugin/graphviz.pm | 50 +++++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index f01fdca85..4268f42ed 100644
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -10,6 +10,7 @@ use IPC::Open2;
 
 sub import {
 	hook(type => "getsetup", id => "graphviz", call => \&getsetup);
+	hook(type => "needsbuild", id => "version", call => \&needsbuild);
 	hook(type => "preprocess", id => "graph", call => \&graph);
 }
 
@@ -26,33 +27,41 @@ my %graphviz_programs = (
 	"dot" => 1, "neato" => 1, "fdp" => 1, "twopi" => 1, "circo" => 1
 );
 
-my $graphnum=0;
+sub needsbuild {
+	my $needsbuild=shift;
+	foreach my $page (keys %pagestate) {
+		if (exists $pagestate{$page}{graph} &&
+		    exists $pagesources{$page} &&
+		    grep { $_ eq $pagesources{$page} } @$needsbuild) {
+			# remove state, will be re-added if
+			# the graph is still there during the rebuild
+			delete $pagestate{$page}{graph};
+		}
+	}       
+	return $needsbuild;
+}
 
 sub render_graph (\%) {
 	my %params = %{(shift)};
-
-	$graphnum++;
-	my $src = "$params{type} graph$graphnum {\n";
-	$src .= "charset=\"utf-8\";\n";
+	
+	my $src = "charset=\"utf-8\";\n";
 	$src .= "ratio=compress;\nsize=\"".($params{width}+0).", ".($params{height}+0)."\";\n"
 		if defined $params{width} and defined $params{height};
 	$src .= $params{src};
 	$src .= "}\n";
-
-	# Use the sha1 of the graphviz code as part of its filename.
+	
+	# Use the sha1 of the graphviz code as part of its filename,
+	# and as a unique identifier for its imagemap.
 	eval q{use Digest::SHA};
 	error($@) if $@;
-	my $base=$params{page}."/graph-".
-		IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($src));
-	my $dest=$base.".png";
+	my $sha=IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($params{type}.$src));
+	$src = "$params{type} graph$sha {\n".$src;
+
+	my $dest=$params{page}."/graph-".$sha.".png";
 	will_render($params{page}, $dest);
 
-	# The imagemap data is stored as a separate file.
-	my $imagemap=$base.".imagemap";
-	will_render($params{page}, $imagemap);
-	
-	my $map;
-	if (! -e "$config{destdir}/$dest" || ! -e "$config{destdir}/$imagemap") {
+	my $map=$pagestate{$params{destpage}}{graph}{$sha};
+	if (! -e "$config{destdir}/$dest" || ! defined $map) {
 		# Use ikiwiki's function to create the image file, this makes
 		# sure needed subdirs are there and does some sanity checking.
 		writefile($dest, $config{destdir}, "");
@@ -70,21 +79,16 @@ sub render_graph (\%) {
 		close OUT;
 
 		local $/ = undef;
-		$map=<IN>;
+		$map=$pagestate{$params{destpage}}{graph}{$sha}=<IN>;
 		close IN;
-		writefile($imagemap, $config{destdir}, $map);
 
 		waitpid $pid, 0;
 		$SIG{PIPE}="DEFAULT";
 		error gettext("failed to run graphviz") if ($sigpipe || $?);
-
-	}
-	else {
-		$map=readfile("$config{destdir}/$imagemap");
 	}
 
 	return "<img src=\"".urlto($dest, $params{destpage}).
-		"\" usemap=\"#graph$graphnum\" />\n".
+		"\" usemap=\"#graph$sha\" />\n".
 		$map;
 }
 
-- 
cgit v1.2.3


From 4cb343f3482edc3786ea46eea7efb7762d349164 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 30 Nov 2011 15:42:42 -0400
Subject: graphviz: Support wikilinks embedded in the graph.

(Sponsored by The TOVA Company.)
---
 IkiWiki/Plugin/graphviz.pm       | 39 +++++++++++++++++++++++++++++++++++++--
 debian/changelog                 |  2 ++
 doc/ikiwiki/directive/graph.mdwn | 13 +++++++++++++
 3 files changed, 52 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index 4268f42ed..0889bc9fc 100644
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -11,7 +11,7 @@ use IPC::Open2;
 sub import {
 	hook(type => "getsetup", id => "graphviz", call => \&getsetup);
 	hook(type => "needsbuild", id => "version", call => \&needsbuild);
-	hook(type => "preprocess", id => "graph", call => \&graph);
+	hook(type => "preprocess", id => "graph", call => \&graph, scan => 1);
 }
 
 sub getsetup () {
@@ -94,7 +94,42 @@ sub render_graph (\%) {
 
 sub graph (@) {
 	my %params=@_;
-	$params{src} = "" unless defined $params{src};
+
+	# Support wikilinks in the graph source.
+	my $src=$params{src};
+	$src="" unless defined $src;
+	$src=IkiWiki::linkify($params{page}, $params{destpage}, $params{src});
+	return unless defined wantarray; # scan mode short-circuit
+	if ($src ne $params{src}) {
+		# linkify makes html links, but graphviz wants plain
+		# urls. This is, frankly a hack: Process source as html,
+		# throw out everything inside tags that is not a href.
+		my $s;
+		my $nested=0;
+		use HTML::Parser;
+		error $@ if $@;
+		my $p=HTML::Parser->new(api_version => 3);
+		$p->handler(start => sub {
+			my %attrs=%{shift()};
+			if (exists $attrs{href}) {
+				$s.="\"$attrs{href}\"";
+			}
+			$nested++;
+		}, "attr");
+		$p->handler(end => sub {
+			$nested--;
+		});
+		$p->handler(default => sub {
+			$s.=join("", @_) unless $nested;
+		}, "text");
+		$p->parse($src);
+		$p->eof;
+		$params{src}=$s;
+	}
+	else {
+		$params{src}=$src;
+	}
+
 	$params{type} = "digraph" unless defined $params{type};
 	$params{prog} = "dot" unless defined $params{prog};
 	error gettext("prog not a valid graphviz program") unless $graphviz_programs{$params{prog}};
diff --git a/debian/changelog b/debian/changelog
index c77fbbeef..885ce971b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ ikiwiki (3.20111107) UNRELEASED; urgency=low
     difficult in yaml setup files. (smcv)
   * graphviz: Support urls embedded in the graph, by having graphviz
     generate an imagemap.
+  * graphviz: Support wikilinks embedded in the graph.
+    (Sponsored by The TOVA Company.)
 
  -- Joey Hess <joeyh@debian.org>  Thu, 17 Nov 2011 18:52:23 -0400
 
diff --git a/doc/ikiwiki/directive/graph.mdwn b/doc/ikiwiki/directive/graph.mdwn
index 2828921d7..6584a2178 100644
--- a/doc/ikiwiki/directive/graph.mdwn
+++ b/doc/ikiwiki/directive/graph.mdwn
@@ -5,6 +5,19 @@ graphs in a page.  Example usage:
 
 	\[[!graph src="a -> b -> c; a -> c;"]]
 
+Nodes on the graph can link to external urls using regular graphviz syntax,
+and a clickable imagemap will be created. As a special extension for
+ikiwiki, [[WikiLinks|ikiwiki/wikilink]] can also be used. For example:
+
+	\[[!graph src=""""
+	google [ href="http://google.com/" ]
+	sandbox [ href=[[SandBox]] ]
+	help [ href=[[ikiwiki/formatting]] ]
+	newpage [ href=[[NewPage]] ]
+	
+	google -> sandbox -> help -> newpage -> help -> google;
+	""""]]
+
 The `graph` directive supports the following parameters:
 
 - `src` - The graphviz source to render.
-- 
cgit v1.2.3


From 6cadcacffd76cf60739372029fb73ff333bdd6e5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 30 Nov 2011 16:25:17 -0400
Subject: apply Postel's law

---
 IkiWiki/Plugin/graphviz.pm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index 0889bc9fc..b9f997e04 100644
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -112,7 +112,15 @@ sub graph (@) {
 		$p->handler(start => sub {
 			my %attrs=%{shift()};
 			if (exists $attrs{href}) {
-				$s.="\"$attrs{href}\"";
+				if ($s=~/href\s*=\s*"$/) {
+					$s.=$attrs{href};
+				}
+				elsif ($s=~/href\s*=\s*$/) {
+					$s.="\"$attrs{href}\"";
+				}
+				else {
+					$s.="href=\"$attrs{href}\"";
+				}
 			}
 			$nested++;
 		}, "attr");
-- 
cgit v1.2.3


From 5333c113d62acd0b82551e499863abaf749a6a1f Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sat, 12 Nov 2011 15:11:02 +0000
Subject: Add path and path_natural sort orders (cherry picked from commit
 272e0b2f17c33c625b494b07f581da400066a216)

---
 IkiWiki.pm                        | 1 +
 IkiWiki/Plugin/sortnaturally.pm   | 5 +++++
 doc/ikiwiki/pagespec/sorting.mdwn | 6 +++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 59fefc699..08e242a1f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2808,6 +2808,7 @@ sub cmp_title {
 	IkiWiki::pagetitle(IkiWiki::basename($b))
 }
 
+sub cmp_path { IkiWiki::pagetitle($a) cmp IkiWiki::pagetitle($b) }
 sub cmp_mtime { $IkiWiki::pagemtime{$b} <=> $IkiWiki::pagemtime{$a} }
 sub cmp_age { $IkiWiki::pagectime{$b} <=> $IkiWiki::pagectime{$a} }
 
diff --git a/IkiWiki/Plugin/sortnaturally.pm b/IkiWiki/Plugin/sortnaturally.pm
index b038b2f9a..108b489f8 100644
--- a/IkiWiki/Plugin/sortnaturally.pm
+++ b/IkiWiki/Plugin/sortnaturally.pm
@@ -30,4 +30,9 @@ sub cmp_title_natural {
 		IkiWiki::pagetitle(IkiWiki::basename($b)))
 }
 
+sub cmp_path_natural {
+	Sort::Naturally::ncmp(IkiWiki::pagetitle($a),
+		IkiWiki::pagetitle($b))
+}
+
 1;
diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
index ccd7f7eaa..0c6cc74c7 100644
--- a/doc/ikiwiki/pagespec/sorting.mdwn
+++ b/doc/ikiwiki/pagespec/sorting.mdwn
@@ -7,10 +7,14 @@ orders can be specified.
 
 * `mtime` - List pages with the most recently modified first.
 
-* `title` - Order by title (page name).
+* `title` - Order by title (page name), e.g. "z/a a/b a/c"
+
+* `path` - Order by page name including parents, e.g. "a/b a/c z/a"
 [[!if test="enabled(sortnaturally)" then="""
 * `title_natural` - Orders by title, but numbers in the title are treated
   as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
+
+* `path_natural` - Like `path`, but numbers in the title are treated as such
 """]]
 [[!if test="enabled(meta)" then="""
 * `meta(title)` - Order according to the `\[[!meta title="foo" sortas="bar"]]`
-- 
cgit v1.2.3


From 7411d1a6ce1dcb5d9f343a4a7a6633d3c30eecbf Mon Sep 17 00:00:00 2001
From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Sat, 24 Dec 2011 00:54:59 +0100
Subject: tag plugin: encode categories using numeric values

This ensures that RSS/Atom feeds produced are valid XML.
---
 IkiWiki/Plugin/tag.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 096c92616..605f41599 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -201,7 +201,7 @@ sub pagetemplate (@) {
 		if (defined $tags && %$tags) {
 			eval q{use HTML::Entities};
 			$template->param(categories =>
-				[map { category => HTML::Entities::encode_entities(tagname($_)) },
+				[map { category => HTML::Entities::encode_entities_numeric(tagname($_)) },
 					sort keys %$tags]);
 		}
 	}
-- 
cgit v1.2.3


From b8bf318b91d4fc4c79a16ba2f3265b4620412d51 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 27 Dec 2011 11:37:28 -0400
Subject: remove x bit from comments.pm

how did that get set?
---
 IkiWiki/Plugin/comments.pm | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 IkiWiki/Plugin/comments.pm

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
old mode 100755
new mode 100644
-- 
cgit v1.2.3


From 9dce803faf4dac9ee9249a108e9054e296e1f741 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 1 Jan 2012 16:56:32 -0400
Subject: discount support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

mdwn: Can use the discount markdown library, via the
Text::Markdown::Discount perl module.

This is preferred if available since it's the fastest currently supported
markdown library, speeding up markdown rendering by a factor of 40.

That is to say, when only rendering a lot of markdown, discount is 40x
faster. When building a ikiwiki site, ikiwiki's other overhead gets in the
way, but I still see significant speedups. Building the ikiwiki docwiki
dropped from 62 to 45 seconds, for example.

However, when multimarkdown is enabled, Text::Markdown::Multimarkdown is
still used.

While discount contains some nonstandard markdown extensions,
including tables and footnotes, AFAICS most of them are not
enabled by default in the perl bindings.

I consider sticking to non-extended markdown a desirable thing, since this
is probably not the last markdown engine. In particular, sundown is waiting
in the wings to get packaged and get a perl binding.

----

Reviewing all the showdown extensions, here are the ones that are enabled:

centered paragraphs:

->centered<-

image sizes: [dust mite](http://dust.mite =150x150)

<style>..</style> blocks are eaten. The perl binding does not provide
access to the gathered CSS. This is not legal html anyway, so unlikely
to cause breakage.
---
 IkiWiki/Plugin/mdwn.pm |  6 ++++++
 debian/changelog       | 11 +++++++++++
 doc/plugins/mdwn.mdwn  |  9 ++++++---
 3 files changed, 23 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index b892eabee..0dc0cc336 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -50,6 +50,12 @@ sub htmlize (@) {
 				}
 			}
 		}
+		if (! defined $markdown_sub) {
+			eval q{use Text::Markdown::Discount};
+			if (! $@) {
+				$markdown_sub=\&Text::Markdown::Discount::markdown;
+			}
+		}
 		if (! defined $markdown_sub) {
 			eval q{use Text::Markdown};
 			if (! $@) {
diff --git a/debian/changelog b/debian/changelog
index 6cd19d7c2..a33b3d1b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ikiwiki (3.20111230) UNRELEASED; urgency=low
+
+  * mdwn: Can use the discount markdown library, via the
+    Text::Markdown::Discount perl module. This is preferred if available
+    since it's the fastest currently supported markdown library, speeding up
+    ikiwiki's rendering by a factor of 40.
+    (However, when multimarkdown is enabled, Text::Markdown::Multimarkdown
+    is still used.)
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 01 Jan 2012 16:22:24 -0400
+
 ikiwiki (3.20111229) unstable; urgency=low
 
   * Consume all stdin when rcs_receive short-circuits,
diff --git a/doc/plugins/mdwn.mdwn b/doc/plugins/mdwn.mdwn
index ce1b6097a..8a7308305 100644
--- a/doc/plugins/mdwn.mdwn
+++ b/doc/plugins/mdwn.mdwn
@@ -8,9 +8,12 @@ This is the standard markup language used by ikiwiki, although some others
 are also available in other plugins.
 
 There are several implementations of markdown support that can be used by
-this plugin. The [original version of
-markdown](http://daringfireball.net/projects/markdown/) can be used, or the
-[[!cpan Text::Markdown]] perl module.
+this plugin. In order of preference:
+
+* [Discount](http://www.pell.portland.or.us/~orc/Code/discount/),
+  via the [[!cpan Text::Markdown::Discount]] perl module.
+* The [[!cpan Text::Markdown]] perl module.
+* The [original version of markdown](http://daringfireball.net/projects/markdown/).
 
 [[!cpan Text::MultiMarkdown]] can be used in order to use tables, footnotes,
 and other new features from the markdown variant called
-- 
cgit v1.2.3


From 12f86df239e8a6c1d554d86b5c56e2b8713f6cd8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 1 Jan 2012 17:24:21 -0400
Subject: workaround a bug in the discount perl binding

Empty input, or input consisting soley of whitespace
caused an uninitialized value warning.
---
 IkiWiki/Plugin/mdwn.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 0dc0cc336..b10d08517 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -53,7 +53,12 @@ sub htmlize (@) {
 		if (! defined $markdown_sub) {
 			eval q{use Text::Markdown::Discount};
 			if (! $@) {
-				$markdown_sub=\&Text::Markdown::Discount::markdown;
+				$markdown_sub=sub {
+					# Workaround for discount binding bug
+					# https://rt.cpan.org/Ticket/Display.html?id=73657
+					return "" if $_[0]=~/^\s*$/;
+					Text::Markdown::Discount::markdown(@_);
+				}
 			}
 		}
 		if (! defined $markdown_sub) {
-- 
cgit v1.2.3


From b38261a03aab649e3b194b7d1983536eee8a3684 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 15 Jan 2012 16:19:22 -0400
Subject: Workaround discount's eliding of <style> blocks.

---
 IkiWiki/Plugin/mdwn.pm | 11 +++++++++--
 debian/changelog       |  3 ++-
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index b10d08517..338468e23 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -54,10 +54,17 @@ sub htmlize (@) {
 			eval q{use Text::Markdown::Discount};
 			if (! $@) {
 				$markdown_sub=sub {
+					my $t=shift;
 					# Workaround for discount binding bug
 					# https://rt.cpan.org/Ticket/Display.html?id=73657
-					return "" if $_[0]=~/^\s*$/;
-					Text::Markdown::Discount::markdown(@_);
+					return "" if $t=~/^\s*$/;
+					# Workaround for discount's eliding
+					# of <style> blocks.
+					# https://rt.cpan.org/Ticket/Display.html?id=74016
+					$t=~s/<style/<elyts/ig;
+					my $r=Text::Markdown::Discount::markdown($t);
+					$r=~s/<elyts/<style/ig;
+					return $r;
 				}
 			}
 		}
diff --git a/debian/changelog b/debian/changelog
index 142ca24ea..e60f87f29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-ikiwiki (3.20120110) UNRELEASED; urgency=low
+ikiwiki (3.20120115) UNRELEASED; urgency=low
 
   * Make backlink(.) work. Thanks, Giuseppe Bilotta.
+  * Workaround discount's eliding of <style> blocks.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 13 Jan 2012 13:43:14 -0400
 
-- 
cgit v1.2.3


From 1572c3c376df36ea09e27a1ea437e3a75cdf0f84 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 15 Jan 2012 16:39:13 -0400
Subject: attachment: Fix utf-8 display bug.

---
 IkiWiki/Plugin/attachment.pm                |  2 ++
 debian/changelog                            |  3 ++-
 doc/bugs/UTF-8_in_attachment_filenames.mdwn | 12 +++++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index fd4096edf..5a180cd5c 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -272,6 +272,7 @@ sub attachments_save {
 	my @attachments;
 	my $dir=attachment_holding_location($form->field('page'));
 	foreach my $filename (glob("$dir/*")) {
+		$filename=Encode::decode_utf8($filename);
 		next unless -f $filename;
 		my $destdir=$config{srcdir}."/".
 			linkpage(IkiWiki::possibly_foolish_untaint(
@@ -345,6 +346,7 @@ sub attachment_list ($) {
 	my $dir=attachment_holding_location($page);
 	my $heldmsg=gettext("this attachment is not yet saved");
 	foreach my $file (glob("$dir/*")) {
+		$file=Encode::decode_utf8($file);
 		next unless -f $file;
 		my $base=IkiWiki::basename($file);
 		my $f=$loc.$base;
diff --git a/debian/changelog b/debian/changelog
index 9c4e83c2f..1eab184f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 ikiwiki (3.20120115) unstable; urgency=low
 
   * Make backlink(.) work. Thanks, Giuseppe Bilotta.
-  * Workaround discount's eliding of <style> blocks.
+  * mdwn: Workaround discount's eliding of <style> blocks.
+  * attachment: Fix utf-8 display bug.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Jan 2012 16:19:25 -0400
 
diff --git a/doc/bugs/UTF-8_in_attachment_filenames.mdwn b/doc/bugs/UTF-8_in_attachment_filenames.mdwn
index 6e79a4e06..07fff88d2 100644
--- a/doc/bugs/UTF-8_in_attachment_filenames.mdwn
+++ b/doc/bugs/UTF-8_in_attachment_filenames.mdwn
@@ -1,4 +1,9 @@
-I have ikiwiki_3.20111229 installed on Debian Squeeze (Perl 5.10.1, UTF-8 locale). The attachment plugin mangles UTF8-encoded attachment filenames if the name contains multibyte characters, e.g. "lää.png" becomes "lää.png". Apparently glob returns byte strings which are subject to implicit upgrading when concatenated with Perl strings. The following patch fixes the problem for me:
+I have ikiwiki_3.20111229 installed on Debian Squeeze (Perl 5.10.1, UTF-8
+locale). The attachment plugin mangles UTF8-encoded attachment filenames if
+the name contains multibyte characters, e.g. "lää.png" becomes "lää.png".
+Apparently glob returns byte strings which are subject to implicit
+upgrading when concatenated with Perl strings. The following patch fixes
+the problem for me:
 
 ----
 
@@ -13,3 +18,8 @@ I have ikiwiki_3.20111229 installed on Debian Squeeze (Perl 5.10.1, UTF-8 locale
      	foreach my $file (glob("$dir/*")) {
     +	    $file = Encode::decode_utf8($file);
      		next unless -f $file;
+
+> Seems it only mangled display of the just-uploaded attachment's filename,
+> the attachment was otherwise saved to disk with a valid UTF-8 name, and
+> doing other stuff with it also was ok. In any case, I applied your patch,
+> thanks. [[done]] --[[Joey]]
-- 
cgit v1.2.3


From 18f35269c26dd23e1c91c5e930ed5d62526b558f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 16 Jan 2012 13:42:30 -0400
Subject: mdwn: Added nodiscount setting, which can be used to avoid using the
 markdown discount engine, when maximum compatability is needed.

---
 IkiWiki/Plugin/mdwn.pm | 10 +++++++++-
 debian/changelog       |  7 +++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 338468e23..3c3fc9579 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -25,6 +25,13 @@ sub getsetup () {
 			safe => 1,
 			rebuild => 1,
 		},
+		nodiscount => {
+			type => "boolean",
+			example => 0,
+			description => "disable use of markdown discount?",
+			safe => 1,
+			rebuild => 1,
+		},
 }
 
 my $markdown_sub;
@@ -50,7 +57,8 @@ sub htmlize (@) {
 				}
 			}
 		}
-		if (! defined $markdown_sub) {
+		if (! defined $markdown_sub &&
+		    exists $config{nodiscount} && ! $config{nodiscount}) {
 			eval q{use Text::Markdown::Discount};
 			if (! $@) {
 				$markdown_sub=sub {
diff --git a/debian/changelog b/debian/changelog
index 1eab184f5..d014abd50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20120116) UNRELEASED; urgency=low
+
+  * mdwn: Added nodiscount setting, which can be used to avoid using the
+    markdown discount engine, when maximum compatability is needed.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 16 Jan 2012 13:41:14 -0400
+
 ikiwiki (3.20120115) unstable; urgency=low
 
   * Make backlink(.) work. Thanks, Giuseppe Bilotta.
-- 
cgit v1.2.3


From 8e99750545596e44e49b665268f861b1272422ed Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Sun, 22 Jan 2012 10:31:49 -0500
Subject: No functional change: sort sub definitions.

In the code:
* general plugin API calls (in plugins/write order),
* VCS plugin API calls (in plugins/write order), then
* internal support routines (in alphabetical order).

In the tests:
* general meta-behavior (in no particular order, yet),
* general plugin API calls (in plugins/write order),
* VCS plugin API calls (in plugins/write order), then
* internal support routines (in semi-logical order).
---
 IkiWiki/Plugin/cvs.pm | 124 +++++++++++----------
 t/cvs.t               | 298 +++++++++++++++++++++++++-------------------------
 2 files changed, 218 insertions(+), 204 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 71566d212..97a568c0e 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -35,10 +35,14 @@ use IkiWiki;
 
 use File::chdir;
 
+
+# GENERAL PLUGIN API CALLS
+
 sub import {
-	hook(type => "genwrapper", id => "cvs", call => \&genwrapper);
 	hook(type => "checkconfig", id => "cvs", call => \&checkconfig);
 	hook(type => "getsetup", id => "cvs", call => \&getsetup);
+	hook(type => "genwrapper", id => "cvs", call => \&genwrapper);
+
 	hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
 	hook(type => "rcs", id => "rcs_prepedit", call => \&rcs_prepedit);
 	hook(type => "rcs", id => "rcs_commit", call => \&rcs_commit);
@@ -52,17 +56,6 @@ sub import {
 	hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime);
 }
 
-sub genwrapper () {
-	return <<EOF;
-	{
-		int j;
-		for (j = 1; j < argc; j++)
-			if (strstr(argv[j], "New directory") != NULL)
-				exit(0);
-	}
-EOF
-}
-
 sub checkconfig () {
 	if (! defined $config{cvspath}) {
 		$config{cvspath}="ikiwiki";
@@ -132,36 +125,19 @@ sub getsetup () {
 		},
 }
 
-sub cvs_info ($$) {
-	my $field=shift;
-	my $file=shift;
-
-	local $CWD = $config{srcdir};
-
-	my $info=`cvs status $file`;
-	my ($ret)=$info=~/^\s*$field:\s*(\S+)/m;
-	return $ret;
+sub genwrapper () {
+	return <<EOF;
+	{
+		int j;
+		for (j = 1; j < argc; j++)
+			if (strstr(argv[j], "New directory") != NULL)
+				exit(0);
+	}
+EOF
 }
 
-sub cvs_runcvs(@) {
-	my @cmd = @_;
-	unshift @cmd, 'cvs', '-Q';
-
-	local $CWD = $config{srcdir};
-
-	open(my $savedout, ">&STDOUT");
-	open(STDOUT, ">", "/dev/null");
-	my $ret = system(@cmd);
-	open(STDOUT, ">&", $savedout);
-
-	return ($ret == 0) ? 1 : 0;
-}
 
-sub cvs_is_controlling {
-	my $dir=shift;
-	$dir=$config{srcdir} unless defined($dir);
-	return (-d "$dir/CVS") ? 1 : 0;
-}
+# VCS PLUGIN API CALLS
 
 sub rcs_update () {
 	return unless cvs_is_controlling;
@@ -183,24 +159,6 @@ sub rcs_prepedit ($) {
 	return defined $rev ? $rev : "";
 }
 
-sub commitmessage (@) {
-	my %params=@_;
-	
-	if (defined $params{session}) {
-		if (defined $params{session}->param("name")) {
-			return "web commit by ".
-				$params{session}->param("name").
-				(length $params{message} ? ": $params{message}" : "");
-		}
-		elsif (defined $params{session}->remote_addr()) {
-			return "web commit from ".
-				$params{session}->remote_addr().
-				(length $params{message} ? ": $params{message}" : "");
-		}
-	}
-	return $params{message};
-}
-
 sub rcs_commit (@) {
 	# Tries to commit the page; returns undef on _success_ and
 	# a version of the page with the rcs's conflict markers on failure.
@@ -493,4 +451,56 @@ sub rcs_getmtime ($) {
 	error "rcs_getmtime is not implemented for cvs\n"; # TODO
 }
 
+
+# INTERNAL SUPPORT ROUTINES
+
+sub commitmessage (@) {
+	my %params=@_;
+
+	if (defined $params{session}) {
+		if (defined $params{session}->param("name")) {
+			return "web commit by ".
+				$params{session}->param("name").
+				(length $params{message} ? ": $params{message}" : "");
+		}
+		elsif (defined $params{session}->remote_addr()) {
+			return "web commit from ".
+				$params{session}->remote_addr().
+				(length $params{message} ? ": $params{message}" : "");
+		}
+	}
+	return $params{message};
+}
+
+sub cvs_info ($$) {
+	my $field=shift;
+	my $file=shift;
+
+	local $CWD = $config{srcdir};
+
+	my $info=`cvs status $file`;
+	my ($ret)=$info=~/^\s*$field:\s*(\S+)/m;
+	return $ret;
+}
+
+sub cvs_is_controlling {
+	my $dir=shift;
+	$dir=$config{srcdir} unless defined($dir);
+	return (-d "$dir/CVS") ? 1 : 0;
+}
+
+sub cvs_runcvs(@) {
+	my @cmd = @_;
+	unshift @cmd, 'cvs', '-Q';
+
+	local $CWD = $config{srcdir};
+
+	open(my $savedout, ">&STDOUT");
+	open(STDOUT, ">", "/dev/null");
+	my $ret = system(@cmd);
+	open(STDOUT, ">&", $savedout);
+
+	return ($ret == 0) ? 1 : 0;
+}
+
 1
diff --git a/t/cvs.t b/t/cvs.t
index cfc33261f..390e9af47 100755
--- a/t/cvs.t
+++ b/t/cvs.t
@@ -7,124 +7,7 @@ use IkiWiki;
 my $default_test_methods = '^test_*';
 my $dir = "/tmp/ikiwiki-test-cvs.$$";
 
-sub _plan_for_test_more {
-	my $can_plan = shift;
-
-	foreach my $program (qw(
-		cvs
-		cvsps
-	)) {
-		my $program_path = `which $program`;
-		chomp $program_path;
-		return plan(skip_all => "$program not available")
-			unless -x $program_path;
-	}
-
-	foreach my $module (qw(
-		File::chdir
-		File::MimeInfo
-		Date::Parse
-		File::Temp
-		File::ReadBackwards
-	)) {
-		eval qq{use $module};
-		return plan(skip_all => "$module not available")
-			if $@;
-	}
-
-	return plan(skip_all => "can't create $dir: $!")
-		unless mkdir($dir);
-	return plan(skip_all => "can't remove $dir: $!")
-		unless rmdir($dir);
-
-	return unless $can_plan;
-
-	return plan(tests => $total_tests);
-}
-
-
-# http://stackoverflow.com/questions/607282/whats-the-best-way-to-discover-all-subroutines-a-perl-module-has
-
-use B qw/svref_2object/;
-
-sub in_package {
-	my ($coderef, $package) = @_;
-	my $cv = svref_2object($coderef);
-	return if not $cv->isa('B::CV') or $cv->GV->isa('B::SPECIAL');
-	return $cv->GV->STASH->NAME eq $package;
-}
-
-sub list_module {
-	my $module = shift;
-	no strict 'refs';
-	return grep {
-		defined &{"$module\::$_"} and in_package(\&{*$_}, $module)
-	} keys %{"$module\::"};
-}
-
-
-# support for xUnit-style testing, a la Test::Class
-
-sub _startup {
-	my $can_plan = shift;
-	_plan_for_test_more($can_plan);
-	_generate_test_config();
-}
-
-sub _shutdown {
-	my $had_plan = shift;
-	done_testing() unless $had_plan;
-}
-
-sub _setup {
-	_generate_test_repo();
-}
-
-sub _teardown {
-	system "rm -rf $dir";
-}
-
-sub _runtests {
-	my @coderefs = (@_);
-	for (@coderefs) {
-		_setup();
-		$_->();
-		_teardown();
-	}
-}
-
-sub _get_matching_test_subs {
-	my $re = shift;
-	no strict 'refs';
-	return map { \&{*$_} } grep { /$re/ } sort(list_module('main'));
-}
-
-sub _generate_test_config {
-	%config = IkiWiki::defaultconfig();
-	$config{rcs} = "cvs";
-	$config{srcdir} = "$dir/src";
-	$config{cvsrepo} = "$dir/repo";
-	$config{cvspath} = "ikiwiki";
-	IkiWiki::loadplugins();
-	IkiWiki::checkconfig();
-}
-
-sub _generate_test_repo {
-	die "can't create $dir: $!"
-		unless mkdir($dir);
-
-	my $cvs = "cvs -d $config{cvsrepo}";
-	my $dn = ">/dev/null";
-	system "$cvs init $dn";
-	system "mkdir $dir/$config{cvspath} $dn";
-	system "cd $dir/$config{cvspath} && "
-		. "$cvs import -m import $config{cvspath} VENDOR RELEASE $dn";
-	system "rm -rf $dir/$config{cvspath} $dn";
-	system "$cvs co -d $config{srcdir} $config{cvspath} $dn";
-}
-
-
-# tests for general meta-behavior:
+# TESTS FOR GENERAL META-BEHAVIOR
 
 sub test_web_add_and_commit {
 	my $message = "Add a page via VCS API";
@@ -205,35 +88,6 @@ sub test_chdir_magic {
 	# when are we bothering with "local $CWD" and when aren't we?
 }
 
-
-# tests for VCS API calls:
-
-sub test_genwrapper {
-	# testable directly? affects rcs_add, but are we exercising this?
-}
-
-sub test_checkconfig {
-	# undef cvspath, expect "ikiwiki"
-	# define cvspath normally, get it back
-	# define cvspath in a subdir, get it back?
-	# define cvspath with extra slashes, get sanitized version back
-	# - yoink test_extra_path_slashes
-	# undef cvs_wrapper, expect $config{wrappers} same size as before
-
-	my $initial_cvspath = $config{cvspath};
-	$config{cvspath} = "/ikiwiki//";
-	IkiWiki::checkconfig();
-	is(
-		$config{cvspath},
-		$initial_cvspath,
-		q{rcs_recentchanges assumes checkconfig has sanitized cvspath},
-	);
-}
-
-sub test_getsetup {
-	# anything worth testing?
-}
-
 sub test_cvs_info {
 	# inspect "Repository revision" (used in code)
 	# inspect "Sticky Options" (used in tests to verify existence of "-kb")
@@ -287,6 +141,38 @@ sub test_cvs_is_controlling {
 	# - else, die
 }
 
+
+# TESTS FOR GENERAL PLUGIN API CALLS
+
+sub test_checkconfig {
+	# undef cvspath, expect "ikiwiki"
+	# define cvspath normally, get it back
+	# define cvspath in a subdir, get it back?
+	# define cvspath with extra slashes, get sanitized version back
+	# - yoink test_extra_path_slashes
+	# undef cvs_wrapper, expect $config{wrappers} same size as before
+
+	my $initial_cvspath = $config{cvspath};
+	$config{cvspath} = "/ikiwiki//";
+	IkiWiki::checkconfig();
+	is(
+		$config{cvspath},
+		$initial_cvspath,
+		q{rcs_recentchanges assumes checkconfig has sanitized cvspath},
+	);
+}
+
+sub test_getsetup {
+	# anything worth testing?
+}
+
+sub test_genwrapper {
+	# testable directly? affects rcs_add, but are we exercising this?
+}
+
+
+# TESTS FOR VCS PLUGIN API CALLS
+
 sub test_rcs_update {
 	# can it assume we're under CVS control? or must it check?
 	# anything else worth testing?
@@ -443,3 +329,121 @@ sub main {
 }
 
 main();
+
+
+# INTERNAL SUPPORT ROUTINES
+
+sub _plan_for_test_more {
+	my $can_plan = shift;
+
+	foreach my $program (qw(
+		cvs
+		cvsps
+	)) {
+		my $program_path = `which $program`;
+		chomp $program_path;
+		return plan(skip_all => "$program not available")
+			unless -x $program_path;
+	}
+
+	foreach my $module (qw(
+		File::chdir
+		File::MimeInfo
+		Date::Parse
+		File::Temp
+		File::ReadBackwards
+	)) {
+		eval qq{use $module};
+		return plan(skip_all => "$module not available")
+			if $@;
+	}
+
+	return plan(skip_all => "can't create $dir: $!")
+		unless mkdir($dir);
+	return plan(skip_all => "can't remove $dir: $!")
+		unless rmdir($dir);
+
+	return unless $can_plan;
+
+	return plan(tests => $total_tests);
+}
+
+# http://stackoverflow.com/questions/607282/whats-the-best-way-to-discover-all-subroutines-a-perl-module-has
+
+use B qw/svref_2object/;
+
+sub in_package {
+	my ($coderef, $package) = @_;
+	my $cv = svref_2object($coderef);
+	return if not $cv->isa('B::CV') or $cv->GV->isa('B::SPECIAL');
+	return $cv->GV->STASH->NAME eq $package;
+}
+
+sub list_module {
+	my $module = shift;
+	no strict 'refs';
+	return grep {
+		defined &{"$module\::$_"} and in_package(\&{*$_}, $module)
+	} keys %{"$module\::"};
+}
+
+
+# support for xUnit-style testing, a la Test::Class
+
+sub _startup {
+	my $can_plan = shift;
+	_plan_for_test_more($can_plan);
+	_generate_test_config();
+}
+
+sub _shutdown {
+	my $had_plan = shift;
+	done_testing() unless $had_plan;
+}
+
+sub _setup {
+	_generate_test_repo();
+}
+
+sub _teardown {
+	system "rm -rf $dir";
+}
+
+sub _runtests {
+	my @coderefs = (@_);
+	for (@coderefs) {
+		_setup();
+		$_->();
+		_teardown();
+	}
+}
+
+sub _get_matching_test_subs {
+	my $re = shift;
+	no strict 'refs';
+	return map { \&{*$_} } grep { /$re/ } sort(list_module('main'));
+}
+
+sub _generate_test_config {
+	%config = IkiWiki::defaultconfig();
+	$config{rcs} = "cvs";
+	$config{srcdir} = "$dir/src";
+	$config{cvsrepo} = "$dir/repo";
+	$config{cvspath} = "ikiwiki";
+	IkiWiki::loadplugins();
+	IkiWiki::checkconfig();
+}
+
+sub _generate_test_repo {
+	die "can't create $dir: $!"
+		unless mkdir($dir);
+
+	my $cvs = "cvs -d $config{cvsrepo}";
+	my $dn = ">/dev/null";
+	system "$cvs init $dn";
+	system "mkdir $dir/$config{cvspath} $dn";
+	system "cd $dir/$config{cvspath} && "
+		. "$cvs import -m import $config{cvspath} VENDOR RELEASE $dn";
+	system "rm -rf $dir/$config{cvspath} $dn";
+	system "$cvs co -d $config{srcdir} $config{cvspath} $dn";
+}
-- 
cgit v1.2.3


From 100a68f4e2f8773a5482186f22545544b20bcfe4 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 23 Jan 2012 18:15:14 -0400
Subject: fix the nodiscount setting

---
 IkiWiki/Plugin/mdwn.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 3c3fc9579..430194bff 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -58,7 +58,7 @@ sub htmlize (@) {
 			}
 		}
 		if (! defined $markdown_sub &&
-		    exists $config{nodiscount} && ! $config{nodiscount}) {
+		    (! exists $config{nodiscount} || ! $config{nodiscount})) {
 			eval q{use Text::Markdown::Discount};
 			if (! $@) {
 				$markdown_sub=sub {
-- 
cgit v1.2.3


From bfda13f16c3a055b30d7e5448dd6640a12898adc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 23 Jan 2012 18:36:33 -0400
Subject: recentchangesdiff: truncate extremely large diffs

A diff was already truncated after 200 lines. But it could still be
arbitrarily enormous, if a spammer or other random noise source likes long
lines. That could use a lot of memory to html encode etc the diff and fill
it into the template. Truncating after 100kb seems sufficient; it allows
for 200 lines of up to 512 characters each.
---
 IkiWiki/Plugin/recentchangesdiff.pm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/recentchangesdiff.pm b/IkiWiki/Plugin/recentchangesdiff.pm
index 71297572d..418822793 100644
--- a/IkiWiki/Plugin/recentchangesdiff.pm
+++ b/IkiWiki/Plugin/recentchangesdiff.pm
@@ -31,13 +31,21 @@ sub pagetemplate (@) {
 		my @lines=IkiWiki::rcs_diff($params{rev}, $maxlines+1);
 		if (@lines) {
 			my $diff;
+			my $trunc=0;
 			if (@lines > $maxlines) {
-				$diff=join("", @lines[0..($maxlines-1)])."\n".
-					gettext("(Diff truncated)");
+				$diff=join("", @lines[0..($maxlines-1)]);
+				$trunc=1;
 			}
 			else {
 				$diff=join("", @lines);
 			}
+			if (length $diff > 102400) {
+				$diff=substr($diff, 0, 10240);
+				$trunc=1;
+			}
+			if ($trunc) {
+				$diff.="\n".gettext("(Diff truncated)");
+			}
 			# escape html
 			$diff = encode_entities($diff);
 			# escape links and preprocessor stuff
-- 
cgit v1.2.3


From 9fd09149a36e13addcb822e41d0309c64a004764 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Thu, 26 Jan 2012 16:55:13 -0500
Subject: Mollify strictures about barewords.

---
 IkiWiki/Plugin/cvs.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 97a568c0e..dafaf13f5 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -140,7 +140,7 @@ EOF
 # VCS PLUGIN API CALLS
 
 sub rcs_update () {
-	return unless cvs_is_controlling;
+	return unless cvs_is_controlling();
 	cvs_runcvs('update', '-dP');
 }
 
@@ -151,7 +151,7 @@ sub rcs_prepedit ($) {
 	# The file is relative to the srcdir.
 	my $file=shift;
 
-	return unless cvs_is_controlling;
+	return unless cvs_is_controlling();
 
 	# For cvs, return the revision of the file when
 	# editing begins.
@@ -165,7 +165,7 @@ sub rcs_commit (@) {
 	# The file is relative to the srcdir.
 	my %params=@_;
 
-	return unless cvs_is_controlling;
+	return unless cvs_is_controlling();
 
 	# Check to see if the page has been changed by someone
 	# else since rcs_prepedit was called.
@@ -241,7 +241,7 @@ sub rcs_remove ($) {
 	# filename is relative to the root of the srcdir
 	my $file=shift;
 
-	return unless cvs_is_controlling;
+	return unless cvs_is_controlling();
 
 	cvs_runcvs('rm', '-f', $file) ||
 		warn("cvs rm $file failed\n");
@@ -251,7 +251,7 @@ sub rcs_rename ($$) {
 	# filenames relative to the root of the srcdir
 	my ($src, $dest)=@_;
 
-	return unless cvs_is_controlling;
+	return unless cvs_is_controlling();
 
 	local $CWD = $config{srcdir};
 
@@ -267,7 +267,7 @@ sub rcs_recentchanges ($) {
 	my $num = shift;
 	my @ret;
 
-	return unless cvs_is_controlling;
+	return unless cvs_is_controlling();
 
 	eval q{use Date::Parse};
 	error($@) if $@;
-- 
cgit v1.2.3


From ac8eab29e8394aca4c0b23a6687ec947ea1ac869 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Thu, 26 Jan 2012 16:57:00 -0500
Subject: Uncomment the CVS keyword substitution mode tests, and make them
 pass:

Extract cvs_keyword_subst_args() and ensure it runs in $config{srcdir}.
Using Perl's -T operator appears to work equally well, perhaps switch?
---
 IkiWiki/Plugin/cvs.pm | 32 ++++++++++++++++++++------------
 t/cvs.t               |  9 +++++----
 2 files changed, 25 insertions(+), 16 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index dafaf13f5..5ce3c5cbe 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -202,15 +202,30 @@ sub rcs_commit_staged (@) {
 	return undef # success
 }
 
+sub cvs_keyword_subst_args ($) {
+	my $file = shift;
+
+	local $CWD = $config{srcdir};
+
+	eval q{use File::MimeInfo};
+	error($@) if $@;
+	my $filemime = File::MimeInfo::default($file);
+	# if (-T $file) {
+
+	if (defined($filemime) && $filemime eq 'text/plain') {
+		return ($file);
+	}
+	else {
+		return ('-kb', $file);
+	}
+}
+
 sub rcs_add ($) {
 	# filename is relative to the root of the srcdir
 	my $file=shift;
 	my $parent=IkiWiki::dirname($file);
 	my @files_to_add = ($file);
 
-	eval q{use File::MimeInfo};
-	error($@) if $@;
-
 	until ((length($parent) == 0) || cvs_is_controlling("$config{srcdir}/$parent")){
 		push @files_to_add, $parent;
 		$parent = IkiWiki::dirname($parent);
@@ -219,15 +234,8 @@ sub rcs_add ($) {
 	while ($file = pop @files_to_add) {
 		if (@files_to_add == 0) {
 			# file
-			my $filemime = File::MimeInfo::default($file);
-			if (defined($filemime) && $filemime eq 'text/plain') {
-				cvs_runcvs('add', $file) ||
-					warn("cvs add $file failed\n");
-			}
-			else {
-				cvs_runcvs('add', '-kb', $file) ||
-					warn("cvs add binary $file failed\n");
-			}
+			cvs_runcvs('add', cvs_keyword_subst_args($file)) ||
+				warn("cvs add $file failed\n");
 		}
 		else {
 			# directory
diff --git a/t/cvs.t b/t/cvs.t
index f29e58a6a..1c20d7741 100755
--- a/t/cvs.t
+++ b/t/cvs.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More; my $total_tests = 37;
+use Test::More; my $total_tests = 40;
 use IkiWiki;
 
 my $default_test_methods = '^test_*';
@@ -163,7 +163,7 @@ sub test_rcs_add {
 		token => "moo",
 	);
 	is_newly_added("test0.mdwn");
-#	is_in_keyword_substitution_mode("test0.mdwn", undef);
+	is_in_keyword_substitution_mode("test0.mdwn", undef);
 	my @changes = IkiWiki::rcs_recentchanges(3);
 	is_total_number_of_changes(\@changes, 1);
 	is_most_recent_change(\@changes, "test0", $message);
@@ -195,7 +195,7 @@ sub test_rcs_add {
 		token => "omo",
 	);
 	is_newly_added("$dir2/test1.mdwn");
-#	is_in_keyword_substitution_mode("$dir2/test1.mdwn", undef);
+	is_in_keyword_substitution_mode("$dir2/test1.mdwn", undef);
 	@changes = IkiWiki::rcs_recentchanges(3);
 	is_total_number_of_changes(\@changes, 2);
 	is_most_recent_change(\@changes, "$dir2/test1", $message);
@@ -233,7 +233,7 @@ sub test_rcs_add {
 	IkiWiki::rcs_add($_) for ($file1, $file2);
 	IkiWiki::rcs_commit_staged(message => $message);
 	is_newly_added($_) for ($file1, $file2);
-#	is_in_keyword_substitution_mode($file1, undef);
+	is_in_keyword_substitution_mode($file1, undef);
 	is_in_keyword_substitution_mode($file2, '-kb');
 	@changes = IkiWiki::rcs_recentchanges(3);
 	is_total_number_of_changes(\@changes, 3);
@@ -499,6 +499,7 @@ sub is_newly_added {
 
 sub is_in_keyword_substitution_mode {
 	my ($file, $mode) = @_;
+	$mode = '(none)' unless defined $mode;
 	is(
 		IkiWiki::Plugin::cvs::cvs_info("Sticky Options", $file),
 		$mode,
-- 
cgit v1.2.3


From d6b7654fcf87186210f02e81468d77643dd0e2e0 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Thu, 26 Jan 2012 17:08:12 -0500
Subject: Move cvs_keyword_subst_args() down with the other internal support
 routines.

---
 IkiWiki/Plugin/cvs.pm | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm
index 5ce3c5cbe..0a6cbfaf6 100644
--- a/IkiWiki/Plugin/cvs.pm
+++ b/IkiWiki/Plugin/cvs.pm
@@ -202,24 +202,6 @@ sub rcs_commit_staged (@) {
 	return undef # success
 }
 
-sub cvs_keyword_subst_args ($) {
-	my $file = shift;
-
-	local $CWD = $config{srcdir};
-
-	eval q{use File::MimeInfo};
-	error($@) if $@;
-	my $filemime = File::MimeInfo::default($file);
-	# if (-T $file) {
-
-	if (defined($filemime) && $filemime eq 'text/plain') {
-		return ($file);
-	}
-	else {
-		return ('-kb', $file);
-	}
-}
-
 sub rcs_add ($) {
 	# filename is relative to the root of the srcdir
 	my $file=shift;
@@ -497,6 +479,24 @@ sub cvs_is_controlling {
 	return (-d "$dir/CVS") ? 1 : 0;
 }
 
+sub cvs_keyword_subst_args ($) {
+	my $file = shift;
+
+	local $CWD = $config{srcdir};
+
+	eval q{use File::MimeInfo};
+	error($@) if $@;
+	my $filemime = File::MimeInfo::default($file);
+	# if (-T $file) {
+
+	if (defined($filemime) && $filemime eq 'text/plain') {
+		return ($file);
+	}
+	else {
+		return ('-kb', $file);
+	}
+}
+
 sub cvs_runcvs(@) {
 	my @cmd = @_;
 	unshift @cmd, 'cvs', '-Q';
-- 
cgit v1.2.3


From a78126c55ecbe014ab2a214f324b32762e6a268d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 30 Jan 2012 15:08:50 -0400
Subject: calendar, prettydate: Fix strftime encoding bug

strftime is a C function, it does not return decoded utf8.
Several places in ikiwiki manually decoded it, but at least two
forgot to.

Also, strftime might not return even encoded utf8, if LC_TIME is set
to a non-utf8 value. Went ahead and supported decoding whatever encoding
it uses.

The remaining direct calls to strftime() are all ones that first set
LC_TIME=C, in order to get times that are not for human display.
---
 IkiWiki.pm                                               | 16 +++++++++++++---
 IkiWiki/Plugin/calendar.pm                               | 15 +++++++--------
 IkiWiki/Plugin/comments.pm                               |  3 +--
 IkiWiki/Plugin/prettydate.pm                             |  4 ++--
 debian/changelog                                         |  1 +
 doc/bugs/Encoding_problem_in_calendar_plugin.mdwn        |  4 ++++
 ...Encoding_problem_in_french_with_ikiwiki-calendar.mdwn |  3 +++
 7 files changed, 31 insertions(+), 15 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index bc56501da..0a788f35b 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -20,7 +20,7 @@ use Exporter q{import};
 our @EXPORT = qw(hook debug error htmlpage template template_depends
 	deptype add_depends pagespec_match pagespec_match_list bestlink
 	htmllink readfile writefile pagetype srcfile pagename
-	displaytime will_render gettext ngettext urlto targetpage
+	displaytime strftime_utf8 will_render gettext ngettext urlto targetpage
 	add_underlay pagetitle titlepage linkpage newpagefile
 	inject add_link add_autofile
 	%config %links %pagestate %wikistate %renderedfiles
@@ -1148,9 +1148,19 @@ sub formattime ($;$) {
 		$format=$config{timeformat};
 	}
 
+	return strftime_utf8($format, localtime($time));
+}
+
+my $strftime_encoding;
+sub strftime_utf8 {
 	# strftime doesn't know about encodings, so make sure
-	# its output is properly treated as utf8
-	return decode_utf8(POSIX::strftime($format, localtime($time)));
+	# its output is properly treated as utf8.
+	# Note that this does not handle utf-8 in the format string.
+	$strftime_encoding = POSIX::setlocale(&POSIX::LC_TIME) =~ m#\.([^@]+)#
+		unless defined $strftime_encoding;
+	$strftime_encoding
+		? Encode::decode($strftime_encoding, POSIX::strftime(@_))
+		: POSIX::strftime(@_);
 }
 
 sub date_3339 ($) {
diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index c7d2b7c01..fc497b3c7 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -22,7 +22,6 @@ use warnings;
 use strict;
 use IkiWiki 3.00;
 use Time::Local;
-use POSIX ();
 
 my $time=time;
 my @now=localtime($time);
@@ -123,10 +122,10 @@ sub format_month (@) {
 	}
 
 	# Find out month names for this, next, and previous months
-	my $monthabbrev=POSIX::strftime("%b", @monthstart);
-	my $monthname=POSIX::strftime("%B", @monthstart);
-	my $pmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$pmonth-1,$pyear-1900)));
-	my $nmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$nmonth-1,$nyear-1900)));
+	my $monthabbrev=strftime_utf8("%b", @monthstart);
+	my $monthname=strftime_utf8("%B", @monthstart);
+	my $pmonthname=strftime_utf8("%B", localtime(timelocal(0,0,0,1,$pmonth-1,$pyear-1900)));
+	my $nmonthname=strftime_utf8("%B", localtime(timelocal(0,0,0,1,$nmonth-1,$nyear-1900)));
 
 	my $archivebase = 'archives';
 	$archivebase = $config{archivebase} if defined $config{archivebase};
@@ -182,7 +181,7 @@ EOF
 	my %dowabbr;
 	for my $dow ($week_start_day..$week_start_day+6) {
 		my @day=localtime(timelocal(0,0,0,$start_day++,$params{month}-1,$params{year}-1900));
-		my $downame = POSIX::strftime("%A", @day);
+		my $downame = strftime_utf8("%A", @day);
 		my $dowabbr = substr($downame, 0, 1);
 		$downame{$dow % 7}=$downame;
 		$dowabbr{$dow % 7}=$dowabbr;
@@ -329,8 +328,8 @@ EOF
 	for (my $month = 1; $month <= 12; $month++) {
 		my @day=localtime(timelocal(0,0,0,15,$month-1,$params{year}-1900));
 		my $murl;
-		my $monthname = POSIX::strftime("%B", @day);
-		my $monthabbr = POSIX::strftime("%b", @day);
+		my $monthname = strftime_utf8("%B", @day);
+		my $monthabbr = strftime_utf8("%b", @day);
 		$calendar.=qq{\t<tr>\n}  if ($month % $params{months_per_row} == 1);
 		my $tag;
 		my $mtag=sprintf("%02d", $month);
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 3ad2a0e13..91a482ed6 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -9,7 +9,6 @@ use warnings;
 use strict;
 use IkiWiki 3.00;
 use Encode;
-use POSIX qw(strftime);
 
 use constant PREVIEW => "Preview";
 use constant POST_COMMENT => "Post comment";
@@ -460,7 +459,7 @@ sub editcomment ($$) {
 	}
 	$content .= " subject=\"$subject\"\n";
 
-	$content .= " date=\"" . decode_utf8(strftime('%Y-%m-%dT%H:%M:%SZ', gmtime)) . "\"\n";
+	$content .= " date=\"" . strftime_utf8('%Y-%m-%dT%H:%M:%SZ', gmtime) . "\"\n";
 
 	my $editcontent = $form->field('editcontent');
 	$editcontent="" if ! defined $editcontent;
diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm
index 82d8a3df3..b0931cb55 100644
--- a/IkiWiki/Plugin/prettydate.pm
+++ b/IkiWiki/Plugin/prettydate.pm
@@ -118,10 +118,10 @@ sub IkiWiki::formattime ($;$) {
 		}
 	}
 
-	$t=~s{\%A-}{my @yest=@t; $yest[6]--; strftime("%A", \@yest)}eg;
+	$t=~s{\%A-}{my @yest=@t; $yest[6]--; strftime_utf8("%A", \@yest)}eg;
 
 	$format=~s/\%X/$t/g;
-	return strftime($format, \@t);
+	return strftime_utf8($format, \@t);
 }
 
 1
diff --git a/debian/changelog b/debian/changelog
index 1765142a4..57fe7861c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ikiwiki (3.20120116) UNRELEASED; urgency=low
   * Switch to YAML::XS to work around insanity in YAML::Mo. Closes: #657533
   * cvs: Ensure non-text files are added in binary mode. (Amitai Schlair)
   * cvs: Various cleanups and testing. (Amitai Schlair)
+  * calendar, prettydate: Fix strftime encoding bug.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 16 Jan 2012 13:41:14 -0400
 
diff --git a/doc/bugs/Encoding_problem_in_calendar_plugin.mdwn b/doc/bugs/Encoding_problem_in_calendar_plugin.mdwn
index 2ccc43c03..80e9f2c82 100644
--- a/doc/bugs/Encoding_problem_in_calendar_plugin.mdwn
+++ b/doc/bugs/Encoding_problem_in_calendar_plugin.mdwn
@@ -11,6 +11,10 @@ The problem is that I do not know Perl, encoding is one of the thing I would be
 Cheers,    
 Louis
 
+> Yes, this seems basically right. I've applied a modified version of this.
+> [[done]]
+> --[[Joey]] 
+
 
     diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
     index c7d2b7c..1345939 100644
diff --git a/doc/forum/Encoding_problem_in_french_with_ikiwiki-calendar.mdwn b/doc/forum/Encoding_problem_in_french_with_ikiwiki-calendar.mdwn
index 7e21644ac..472412de1 100644
--- a/doc/forum/Encoding_problem_in_french_with_ikiwiki-calendar.mdwn
+++ b/doc/forum/Encoding_problem_in_french_with_ikiwiki-calendar.mdwn
@@ -15,3 +15,6 @@ Is someone could test it and verify if it works or not?
 Thanks.
 
 Zut
+
+> This was discussed in [[bugs/Encoding_problem_in_calendar_plugin]]
+> and is now fixed. --[[Joey]] 
-- 
cgit v1.2.3


From c3f9ef82893f9c1eb4e16df6fb93bfc87b02c890 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 2 Feb 2012 22:27:55 -0400
Subject: revert change to prettydate

Its strftime is from Date::Format, doesn't have the problem, and using the
POSIX one breaks its %o.
---
 IkiWiki/Plugin/prettydate.pm | 4 ++--
 debian/changelog             | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm
index b0931cb55..82d8a3df3 100644
--- a/IkiWiki/Plugin/prettydate.pm
+++ b/IkiWiki/Plugin/prettydate.pm
@@ -118,10 +118,10 @@ sub IkiWiki::formattime ($;$) {
 		}
 	}
 
-	$t=~s{\%A-}{my @yest=@t; $yest[6]--; strftime_utf8("%A", \@yest)}eg;
+	$t=~s{\%A-}{my @yest=@t; $yest[6]--; strftime("%A", \@yest)}eg;
 
 	$format=~s/\%X/$t/g;
-	return strftime_utf8($format, \@t);
+	return strftime($format, \@t);
 }
 
 1
diff --git a/debian/changelog b/debian/changelog
index d196b49b9..c8db76966 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,16 @@
-ikiwiki (3.20120116) UNRELEASED; urgency=low
+ikiwiki (3.20120202) unstable; urgency=low
 
   * mdwn: Added nodiscount setting, which can be used to avoid using the
     markdown discount engine, when maximum compatability is needed.
   * Switch to YAML::XS to work around insanity in YAML::Mo. Closes: #657533
   * cvs: Ensure text files are added in non-binary mode. (Amitai Schlair)
   * cvs: Various cleanups and testing. (Amitai Schlair)
-  * calendar, prettydate: Fix strftime encoding bug.
+  * calendar: Fix strftime encoding bug.
   * shortcuts: Fixed a broken shortcut to wikipedia (accidentially
     made into a shortcut to wikiMedia).
   * Various portability improvements. (Amitai Schlair)
 
- -- Joey Hess <joeyh@debian.org>  Mon, 16 Jan 2012 13:41:14 -0400
+ -- Joey Hess <joeyh@debian.org>  Thu, 02 Feb 2012 21:42:40 -0400
 
 ikiwiki (3.20120115) unstable; urgency=low
 
-- 
cgit v1.2.3