From f35d35abe36166893f68061a1fcb2a26bc056fbc Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Sat, 30 Jan 2010 18:22:32 +0100
Subject: Automatically create tag pages,

if "tag_autocreate=1" is set in the configuration. The pages will be created in
tagbase, if and only if they do not exist in the srcdir yet. Tag pages will be create from
"autotag.tmpl".

At this stage a second refresh is needed for the tag pages to be rendered.

Add autotag.tmpl template.
---
 IkiWiki/Plugin/tag.pm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index cdcfaf536..6c43a053d 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -36,6 +36,13 @@ sub getsetup () {
 			safe => 1,
 			rebuild => 1,
 		},
+		tag_autocreate => {
+			type => "boolean",
+			example => 0,
+			description => "Autocreate new tag pages",
+			safe => 1,
+			rebuild => 1,
+		},
 }
 
 sub tagpage ($) {
@@ -59,6 +66,21 @@ sub taglink ($$$;@) {
 	return htmllink($page, $destpage, tagpage($tag), %opts);
 }
 
+sub gentag ($) {
+	my $tag=shift;
+	if (defined $config{tag_autocreate} && $config{tag_autocreate}) {
+		my $tagfile = newpagefile(tagpage($tag), $config{default_pageext});
+		$tagfile=~s/^\///;
+		return if (srcfile($tagfile,1));
+
+		debug(sprintf(gettext("creating tag page %s"), $tag));
+
+		my $template=template("autotag.tmpl");
+		$template->param(tag => $tag);
+		writefile($tagfile, $config{srcdir}, $template->output);
+	}
+}
+
 sub preprocess_tag (@) {
 	if (! @_) {
 		return "";
@@ -72,6 +94,10 @@ sub preprocess_tag (@) {
 	foreach my $tag (keys %params) {
 		$tag=linkpage($tag);
 		$tags{$page}{$tag}=1;
+
+		# add tagpage if necessary
+		gentag($tag);
+
 		# hidden WikiLink
 		add_link($page, tagpage($tag));
 	}
-- 
cgit v1.2.3


From a8d313aba1094fc6d976c9ba3d09f58b768435c5 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Sun, 31 Jan 2010 01:12:20 +0100
Subject: Use add_autofile() in tag.pm

to make the automatically created tagpages render.
---
 IkiWiki/Plugin/tag.pm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 6c43a053d..90833fd9c 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -78,6 +78,8 @@ sub gentag ($) {
 		my $template=template("autotag.tmpl");
 		$template->param(tag => $tag);
 		writefile($tagfile, $config{srcdir}, $template->output);
+
+		IkiWiki::add_autofile("$config{srcdir}/$tagfile");
 	}
 }
 
-- 
cgit v1.2.3


From 25741100b0a0d81ae5113dfabe5a1ed84cdf8746 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Tue, 2 Feb 2010 12:12:23 +0100
Subject: Export add_autofile() for use in Plugins.

---
 IkiWiki.pm            | 2 +-
 IkiWiki/Plugin/tag.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ad9fb7c79..7d7f430b3 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -23,7 +23,7 @@ our @EXPORT = qw(hook debug error template htmlpage deptype
 		 htmllink readfile writefile pagetype srcfile pagename
 		 displaytime will_render gettext urlto targetpage
 		 add_underlay pagetitle titlepage linkpage newpagefile
-		 inject add_link
+		 inject add_link add_autofile
                  %config %links %pagestate %wikistate %renderedfiles
                  %pagesources %destsources);
 our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 90833fd9c..c0b7feb23 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -79,7 +79,7 @@ sub gentag ($) {
 		$template->param(tag => $tag);
 		writefile($tagfile, $config{srcdir}, $template->output);
 
-		IkiWiki::add_autofile("$config{srcdir}/$tagfile");
+		add_autofile("$config{srcdir}/$tagfile");
 	}
 }
 
-- 
cgit v1.2.3


From a358d74bef51dae31332ff27e897fe04834571e6 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Wed, 3 Feb 2010 04:29:10 +0100
Subject: Check for existence off srcfile in add_autofile

add_autofile has to have checks, whether to create the file, anyway, so this
will make things more consistent.

Correcter check for the result of verify_src_file().

Cosmetic rename of a variable $addfile to $autofile.
---
 IkiWiki.pm            | 11 ++++++++---
 IkiWiki/Plugin/tag.pm |  5 ++---
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 90e623330..56c491339 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1897,9 +1897,14 @@ sub add_link ($$) {
 }
 
 sub add_autofile ($) {
-	my $addfile=shift;
-	my ($file,$page) = verify_src_file($addfile,$config{srcdir});
-	if ($page) {
+	my $autofile=shift;
+
+	if (srcfile($autofile, 1)) {
+		return 0;
+	}
+
+	my ($file, $page) = verify_src_file("$config{srcdir}/$autofile", $config{srcdir});
+	if (defined $file) {
 		push @autofiles, $file;
 	}
 }
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index c0b7feb23..c6c99ae45 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -71,15 +71,14 @@ sub gentag ($) {
 	if (defined $config{tag_autocreate} && $config{tag_autocreate}) {
 		my $tagfile = newpagefile(tagpage($tag), $config{default_pageext});
 		$tagfile=~s/^\///;
-		return if (srcfile($tagfile,1));
+
+		return if (! add_autofile($tagfile));
 
 		debug(sprintf(gettext("creating tag page %s"), $tag));
 
 		my $template=template("autotag.tmpl");
 		$template->param(tag => $tag);
 		writefile($tagfile, $config{srcdir}, $template->output);
-
-		add_autofile("$config{srcdir}/$tagfile");
 	}
 }
 
-- 
cgit v1.2.3


From 981400177d68a279f485727be3f013e68f0bf691 Mon Sep 17 00:00:00 2001
From: David Riebenbauer <davrieb@liegesta.at>
Date: Sat, 3 Apr 2010 21:10:16 +0200
Subject: Make sure deleted tag pages don't get recreated.

The reason to do this is basically a user interaction design decision.

It is achieved by adding an entry, associated to the creating plugin, to
%pagestate. To find out if files were deleted a new global hash %del_hash is
%introduced.
---
 IkiWiki.pm            | 19 +++++++++++++++----
 IkiWiki/Plugin/tag.pm |  2 +-
 IkiWiki/Render.pm     |  5 ++++-
 3 files changed, 20 insertions(+), 6 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 1770703a5..966a3bbc6 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -14,7 +14,7 @@ use open qw{:utf8 :std};
 use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 	    %pagestate %wikistate %renderedfiles %oldrenderedfiles
 	    %pagesources %destsources %depends %depends_simple %hooks
-	    %forcerebuild %loaded_plugins @autofiles};
+	    %forcerebuild %loaded_plugins %autofiles %del_hash};
 
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage deptype
@@ -1895,17 +1895,28 @@ sub add_link ($$) {
 		unless grep { $_ eq $link } @{$links{$page}};
 }
 
-sub add_autofile ($) {
+sub add_autofile ($$) {
 	my $autofile=shift;
+	my $plugin=shift;
 
 	if (srcfile($autofile, 1)) {
 		return 0;
 	}
 
 	my ($file, $page) = verify_src_file("$config{srcdir}/$autofile", $config{srcdir});
-	if (defined $file) {
-		push @autofiles, $file;
+
+	if ((!defined $file) ||
+	(exists $pagestate{$page}{$plugin}{autofile_deleted})) {
+		return 0;
+	}
+
+	if (exists $del_hash{$file}) {
+		$pagestate{$page}{$plugin}{autofile_deleted}=1;
+		return 0;
 	}
+
+	$autofiles{$file}=$plugin;
+	return 1;
 }
 
 sub pagespec_translate ($) {
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index c6c99ae45..fdd63d637 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -72,7 +72,7 @@ sub gentag ($) {
 		my $tagfile = newpagefile(tagpage($tag), $config{default_pageext});
 		$tagfile=~s/^\///;
 
-		return if (! add_autofile($tagfile));
+		return if (! add_autofile($tagfile, "tag"));
 
 		debug(sprintf(gettext("creating tag page %s"), $tag));
 
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index fc71c8919..0c21455fb 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -637,12 +637,14 @@ sub refresh () {
 	my ($changed, $internal_changed)=find_changed($files);
 	run_hooks(needsbuild => sub { shift->($changed) });
 	my $oldlink_targets=calculate_old_links($changed, $del);
+	%del_hash = map { $_ => 1 } @{$del};
 
 	foreach my $file (@$changed) {
 		scan($file);
 	}
 
-	while (my $autofile = shift (@autofiles)) {
+	while (my $autofile = shift @{[keys %autofiles]}) {
+		my $plugin=$autofiles{$autofile};
 		my $page=pagename($autofile);
 		if ($pages->{$page}) {
 			debug(sprintf(gettext("%s has multiple possible source pages"), $page));
@@ -654,6 +656,7 @@ sub refresh () {
 		push @{$changed}, $autofile if find_changed([$autofile]);
 
 		scan($autofile);
+		delete $autofiles{$autofile};
 	}
 
 	calculate_links();
-- 
cgit v1.2.3


From b7d50abc0f3dbe99d2a3664c12ea95d24bfcf04b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 13:35:15 -0400
Subject: refactor autofiles

Made add_autofile take a generator function, and just register the
autofile, for later possible creation. The testing is moved into Render,
which allows cleaning up some stuff.
---
 IkiWiki.pm            | 35 ++++++++++------------------------
 IkiWiki/Plugin/tag.pm | 12 ++++++------
 IkiWiki/Render.pm     | 52 +++++++++++++++++++++++++++++++++++++--------------
 3 files changed, 54 insertions(+), 45 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 3812961dc..c22c75df8 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -15,7 +15,7 @@ use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 	%pagestate %wikistate %renderedfiles %oldrenderedfiles
 	%pagesources %destsources %depends %depends_simple %hooks
 	%forcerebuild %loaded_plugins %typedlinks %oldtypedlinks
-	%autofiles %del_hash};
+	%autofiles};
 
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage deptype
@@ -1956,6 +1956,15 @@ sub add_link ($$;$) {
 	}
 }
 
+sub add_autofile ($$$) {
+	my $file=shift;
+	my $plugin=shift;
+	my $generator=shift;
+	
+	$autofiles{$file}{plugin}=$plugin;
+	$autofiles{$file}{generator}=$generator;
+}
+
 sub sortspec_translate ($$) {
 	my $spec = shift;
 	my $reverse = shift;
@@ -2021,30 +2030,6 @@ sub sortspec_translate ($$) {
 	return eval 'sub { '.$code.' }';
 }
 
-sub add_autofile ($$) {
-	my $autofile=shift;
-	my $plugin=shift;
-
-	if (srcfile($autofile, 1)) {
-		return 0;
-	}
-
-	my ($file, $page) = verify_src_file("$config{srcdir}/$autofile", $config{srcdir});
-
-	if ((!defined $file) ||
-	(exists $pagestate{$page}{$plugin}{autofile_deleted})) {
-		return 0;
-	}
-
-	if (exists $del_hash{$file}) {
-		$pagestate{$page}{$plugin}{autofile_deleted}=1;
-		return 0;
-	}
-
-	$autofiles{$file}=$plugin;
-	return 1;
-}
-
 sub pagespec_translate ($) {
 	my $spec=shift;
 
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 9e6f417bf..7a918a4e8 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -70,13 +70,13 @@ sub gentag ($) {
 		my $tagfile = newpagefile(tagpage($tag), $config{default_pageext});
 		$tagfile=~s/^\///;
 
-		return if (! add_autofile($tagfile, "tag"));
+		add_autofile($tagfile, sub {
+			debug(sprintf(gettext("creating tag page %s"), $tag));
 
-		debug(sprintf(gettext("creating tag page %s"), $tag));
-
-		my $template=template("autotag.tmpl");
-		$template->param(tag => $tag);
-		writefile($tagfile, $config{srcdir}, $template->output);
+			my $template=template("autotag.tmpl");
+			$template->param(tag => $tag);
+			writefile($tagfile, $config{srcdir}, $template->output);
+		});
 	}
 }
 
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index c80030deb..83242a197 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -680,6 +680,37 @@ sub render_backlinks ($) {
 	}
 }
 
+sub gen_autofile ($$$) {
+	my $autofile=shift;
+	my $pages=shift;
+	my $del=shift;
+	
+	if (srcfile($autofile, 1)) {
+		return 0;
+	}
+
+	my ($file, $page) = verify_src_file("$config{srcdir}/$autofile", $config{srcdir});
+	
+	if ((!defined $file) ||
+	    (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile_deleted})) {
+		return 0;
+	}
+	
+	if ($pages->{$page}) {
+		return 0;
+	}
+
+	if (grep { $_ eq $file } @$del) {
+		$wikistate{$autofiles{$autofile}{generator}}{autofile_deleted}=1;
+		return 0;
+	}
+
+	$autofiles{$autofile}{generator}->();
+	$pages->{$page}=1;
+	return 1;
+}
+
+
 sub refresh () {
 	srcdir_check();
 	run_hooks(refresh => sub { shift->() });
@@ -689,26 +720,19 @@ sub refresh () {
 	my ($changed, $internal_changed)=find_changed($files);
 	run_hooks(needsbuild => sub { shift->($changed) });
 	my $oldlink_targets=calculate_old_links($changed, $del);
-	%del_hash = map { $_ => 1 } @{$del};
 
 	foreach my $file (@$changed) {
 		scan($file);
 	}
 
-	while (my $autofile = shift @{[keys %autofiles]}) {
-		my $plugin=$autofiles{$autofile};
-		my $page=pagename($autofile);
-		if ($pages->{$page}) {
-			debug(sprintf(gettext("%s has multiple possible source pages"), $page));
+	foreach my $autofile (keys %autofiles) {
+		if (gen_autofile($autofile, $pages, $del)) {
+			push @{$files}, $autofile;
+			push @{$new}, $autofile if find_new_files([$autofile]);
+			push @{$changed}, $autofile if find_changed([$autofile]);
+			
+			scan($autofile);
 		}
-		$pages->{$page}=1;
-
-		push @{$files}, $autofile;
-		push @{$new}, $autofile if find_new_files([$autofile]);
-		push @{$changed}, $autofile if find_changed([$autofile]);
-
-		scan($autofile);
-		delete $autofiles{$autofile};
 	}
 
 	calculate_links();
-- 
cgit v1.2.3


From adc196a8b53c0b0b4f9ec4cbcea85ba37e421b59 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 15:40:39 -0400
Subject: tag_autocreate fixups

Fix style of prompt.
Optional to rebuild when it is changed. (Needed to get new all missing tags)
---
 IkiWiki/Plugin/tag.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 7a918a4e8..1145a9f13 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -37,9 +37,9 @@ sub getsetup () {
 		tag_autocreate => {
 			type => "boolean",
 			example => 0,
-			description => "Autocreate new tag pages",
+			description => "autocreate new tag pages?",
 			safe => 1,
-			rebuild => 1,
+			rebuild => undef,
 		},
 }
 
@@ -66,7 +66,7 @@ sub taglink ($$$;@) {
 
 sub gentag ($) {
 	my $tag=shift;
-	if (defined $config{tag_autocreate} && $config{tag_autocreate}) {
+	if ($config{tag_autocreate}) {
 		my $tagfile = newpagefile(tagpage($tag), $config{default_pageext});
 		$tagfile=~s/^\///;
 
-- 
cgit v1.2.3


From 3651e6263c55a0b6184fe46c856a96740621361f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 15:43:58 -0400
Subject: fix autofile call

---
 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 1145a9f13..957b012ef 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -70,7 +70,7 @@ sub gentag ($) {
 		my $tagfile = newpagefile(tagpage($tag), $config{default_pageext});
 		$tagfile=~s/^\///;
 
-		add_autofile($tagfile, sub {
+		add_autofile($tagfile, "tag", sub {
 			debug(sprintf(gettext("creating tag page %s"), $tag));
 
 			my $template=template("autotag.tmpl");
-- 
cgit v1.2.3


From b00d8771cc212349ca886401bc68facdf08e0d3c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 15:48:00 -0400
Subject: call gentag for taglinks too

---
 IkiWiki/Plugin/tag.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 957b012ef..9f6df5fc4 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -45,7 +45,7 @@ sub getsetup () {
 
 sub tagpage ($) {
 	my $tag=shift;
-			
+	
 	if ($tag !~ m{^\.?/} &&
 	    defined $config{tagbase}) {
 		$tag="/".$config{tagbase}."/".$tag;
@@ -96,7 +96,6 @@ sub preprocess_tag (@) {
 		# hidden WikiLink
 		add_link($page, tagpage($tag), 'tag');
 		
-		# add tagpage if necessary
 		gentag($tag);
 	}
 		
@@ -112,12 +111,14 @@ sub preprocess_taglink (@) {
 		if (/(.*)\|(.*)/) {
 			my $tag=linkpage($2);
 			add_link($params{page}, tagpage($tag), 'tag');
+			gentag($tag);
 			return taglink($params{page}, $params{destpage}, $tag,
 				linktext => pagetitle($1));
 		}
 		else {
 			my $tag=linkpage($_);
 			add_link($params{page}, tagpage($tag), 'tag');
+			gentag($tag);
 			return taglink($params{page}, $params{destpage}, $tag);
 		}
 	}
-- 
cgit v1.2.3


From 2fc342b048d23d8355631000b7285fb5d26b258a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 17 Apr 2010 16:01:41 -0400
Subject: fix autotag behavior for relative tags

A tag like ./foo is searched for relative to the tagging page.
However, if multiple pages use such a tag, the only one sure
to be in common is in the root, so autocreate it there to
avoid scattering redunadant autocreated tags around the tree.

(This is probably not ideal.)

Also renamed the tagpage and taglink functions for clarity.
---
 IkiWiki/Plugin/tag.pm | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 9f6df5fc4..d2a3d4dfd 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -43,7 +43,7 @@ sub getsetup () {
 		},
 }
 
-sub tagpage ($) {
+sub taglink ($) {
 	my $tag=shift;
 	
 	if ($tag !~ m{^\.?/} &&
@@ -55,20 +55,28 @@ sub tagpage ($) {
 	return $tag;
 }
 
-sub taglink ($$$;@) {
+sub htmllink_tag ($$$;@) {
 	my $page=shift;
 	my $destpage=shift;
 	my $tag=shift;
 	my %opts=@_;
 
-	return htmllink($page, $destpage, tagpage($tag), %opts);
+	return htmllink($page, $destpage, taglink($tag), %opts);
 }
 
 sub gentag ($) {
 	my $tag=shift;
+
 	if ($config{tag_autocreate}) {
-		my $tagfile = newpagefile(tagpage($tag), $config{default_pageext});
-		$tagfile=~s/^\///;
+		my $tagpage=taglink($tag);
+		if ($tagpage=~/^\.\/(.*)/) {
+			$tagpage=$1;
+		}
+		else {
+			$tagpage=~s/^\///;
+		}
+
+		my $tagfile = newpagefile($tagpage, $config{default_pageext});
 
 		add_autofile($tagfile, "tag", sub {
 			debug(sprintf(gettext("creating tag page %s"), $tag));
@@ -94,7 +102,7 @@ sub preprocess_tag (@) {
 		$tag=linkpage($tag);
 		
 		# hidden WikiLink
-		add_link($page, tagpage($tag), 'tag');
+		add_link($page, taglink($tag), 'tag');
 		
 		gentag($tag);
 	}
@@ -110,16 +118,16 @@ sub preprocess_taglink (@) {
 	return join(" ", map {
 		if (/(.*)\|(.*)/) {
 			my $tag=linkpage($2);
-			add_link($params{page}, tagpage($tag), 'tag');
+			add_link($params{page}, taglink($tag), 'tag');
 			gentag($tag);
-			return taglink($params{page}, $params{destpage}, $tag,
+			return htmllink_tag($params{page}, $params{destpage}, $tag,
 				linktext => pagetitle($1));
 		}
 		else {
 			my $tag=linkpage($_);
-			add_link($params{page}, tagpage($tag), 'tag');
+			add_link($params{page}, taglink($tag), 'tag');
 			gentag($tag);
-			return taglink($params{page}, $params{destpage}, $tag);
+			return htmllink_tag($params{page}, $params{destpage}, $tag);
 		}
 	}
 	grep {
@@ -137,7 +145,7 @@ sub pagetemplate (@) {
 
 	$template->param(tags => [
 		map { 
-			link => taglink($page, $destpage, $_, rel => "tag")
+			link => htmllink_tag($page, $destpage, $_, rel => "tag")
 		}, sort keys %$tags
 	]) if defined $tags && %$tags && $template->query(name => "tags");
 
@@ -153,7 +161,7 @@ sub pagetemplate (@) {
 package IkiWiki::PageSpec;
 
 sub match_tagged ($$;@) {
-	return match_link($_[0], IkiWiki::Plugin::tag::tagpage($_[1]), linktype => 'tag');
+	return match_link($_[0], IkiWiki::Plugin::tag::taglink($_[1]), linktype => 'tag');
 }
 
 1
-- 
cgit v1.2.3


From fd6fb4c5071d9317b4388a0db6b97037cc010477 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 16:13:37 -0400
Subject: commit autocreated tag pages

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

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index d2a3d4dfd..c98dd80b2 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -79,11 +79,18 @@ sub gentag ($) {
 		my $tagfile = newpagefile($tagpage, $config{default_pageext});
 
 		add_autofile($tagfile, "tag", sub {
-			debug(sprintf(gettext("creating tag page %s"), $tag));
+			my $message=sprintf(gettext("creating tag page %s"), $tag);
+			debug($message);
 
 			my $template=template("autotag.tmpl");
 			$template->param(tag => $tag);
 			writefile($tagfile, $config{srcdir}, $template->output);
+			if ($config{rcs}) {
+				IkiWiki::disable_commit_hook();
+				IkiWiki::rcs_add($tagfile);
+				IkiWiki::rcs_commit_staged($message, undef, undef);
+				IkiWiki::enable_commit_hook();
+			}
 		});
 	}
 }
-- 
cgit v1.2.3


From 8cde2365e43f1c96432dcedb378be55d2308dd08 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 19:09:59 -0400
Subject: add separate template variable for tag page and sanitize displayed
 tag name

---
 IkiWiki/Plugin/tag.pm  | 3 ++-
 templates/autotag.tmpl | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index c98dd80b2..6a6517671 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -83,7 +83,8 @@ sub gentag ($) {
 			debug($message);
 
 			my $template=template("autotag.tmpl");
-			$template->param(tag => $tag);
+			$template->param(tag => IkiWiki::basename($tag));
+			$template->param(tagpage => $tagpage);
 			writefile($tagfile, $config{srcdir}, $template->output);
 			if ($config{rcs}) {
 				IkiWiki::disable_commit_hook();
diff --git a/templates/autotag.tmpl b/templates/autotag.tmpl
index a8824171b..7b0d4c90f 100644
--- a/templates/autotag.tmpl
+++ b/templates/autotag.tmpl
@@ -1,3 +1,3 @@
-## Pages tagged <TMPL_VAR TAG> ##
+## Pages tagged <TMPL_VAR TAGNAME> ##
 
 [[!inline pages="tagged(<TMPL_VAR TAG>)" actions="no" archive="yes"]]
-- 
cgit v1.2.3


From 0e2b5ebe314c617ae4139b5daad314e01208d37b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 19:49:11 -0400
Subject: clarify

---
 IkiWiki/Plugin/tag.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 72ae682f3..dd7583ab2 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -170,8 +170,8 @@ package IkiWiki::PageSpec;
 
 sub match_tagged ($$;@) {
 	my $page=shift;
-	my $glob=shift;
-	return match_link($page, IkiWiki::Plugin::tag::taglink($glob), linktype => 'tag', @_);
+	my $glob=IkiWiki::Plugin::tag::taglink(shift);
+	return match_link($page, $glob, linktype => 'tag', @_);
 }
 
 1
-- 
cgit v1.2.3


From 752ccf8b48bab173839b5c7892e9868ee71846f0 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 20:08:23 -0400
Subject: fixes

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

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index dd7583ab2..a7f37a512 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -79,12 +79,12 @@ sub gentag ($) {
 		my $tagfile = newpagefile($tagpage, $config{default_pageext});
 
 		add_autofile($tagfile, "tag", sub {
-			my $message=sprintf(gettext("creating tag page %s"), $tag);
+			my $message=sprintf(gettext("creating tag page %s"), $tagpage);
 			debug($message);
 
 			my $template=template("autotag.tmpl");
-			$template->param(tag => IkiWiki::basename($tag));
-			$template->param(tagpage => $tagpage);
+			$template->param(tagname => IkiWiki::basename($tag));
+			$template->param(tag => $tag);
 			writefile($tagfile, $config{srcdir}, $template->output);
 			if ($config{rcs}) {
 				IkiWiki::disable_commit_hook();
-- 
cgit v1.2.3


From d048e9c64aca24b8e064aaf1608862b50c427de2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 20:39:20 -0400
Subject: turn on tag_autocreate by default if tagbase is set

---
 IkiWiki/Plugin/tag.pm          | 5 +++--
 debian/NEWS                    | 4 ++++
 doc/ikiwiki/directive/tag.mdwn | 3 ++-
 doc/plugins/tag.mdwn           | 8 ++++++--
 4 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index cd7ecc212..62f030f4e 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -36,7 +36,7 @@ sub getsetup () {
 		},
 		tag_autocreate => {
 			type => "boolean",
-			example => 0,
+			example => 1,
 			description => "autocreate new tag pages?",
 			safe => 1,
 			rebuild => undef,
@@ -67,7 +67,8 @@ sub htmllink_tag ($$$;@) {
 sub gentag ($) {
 	my $tag=shift;
 
-	if ($config{tag_autocreate}) {
+	if ($config{tag_autocreate} ||
+	    ($config{tagbase} && ! defined $config{tag_autocreate})) {
 		my $tagpage=taglink($tag);
 		if ($tagpage=~/^\.\/(.*)/) {
 			$tagpage=$1;
diff --git a/debian/NEWS b/debian/NEWS
index 9fd882ad2..8b87bc601 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -11,6 +11,10 @@ ikiwiki (3.20100406) unstable; urgency=low
   not regular wikilinks. If your wiki accidentially relied on the old,
   buggy behavior, you might need to change pagespecs to use `link()`.
 
+  Tag pages can automatically be created as new tags are used. This
+  feature is enabled by default if you have configured a tagbase. It
+  can be turned on or off using the `tag_autocreate` setting.
+
   The title_natural sort method (as used by the inline directive, etc)
   have been moved to the new sortnaturally plugin, which is not enabled
   by default since it requires the Sort::Naturally perl module.
diff --git a/doc/ikiwiki/directive/tag.mdwn b/doc/ikiwiki/directive/tag.mdwn
index 807a96f25..c8d9b9816 100644
--- a/doc/ikiwiki/directive/tag.mdwn
+++ b/doc/ikiwiki/directive/tag.mdwn
@@ -19,7 +19,8 @@ instead:
 Note that if the wiki is configured to use a tagbase, then the tags will be
 located under a base directory, such as "tags/". This is a useful way to
 avoid having to write the full path to tags, if you want to keep them
-grouped together out of the way.
+grouped together out of the way. Also, since ikiwiki then knows where to put
+tags, it will automatically create tag pages when new tags are used.
 
 Bear in mind that specifying a tagbase means you will need to incorporate it
 into the `link()` [[ikiwiki/PageSpec]] you use: e.g., if your tagbase is
diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn
index bdf39d7e8..8e1286e62 100644
--- a/doc/plugins/tag.mdwn
+++ b/doc/plugins/tag.mdwn
@@ -8,8 +8,12 @@ These directives allow tagging pages.
 It also provides the `tagged()` [[ikiwiki/PageSpec]], which can be used to
 match pages that are tagged with a specific tag.
 
-If the `tag_autocreate` setting is enabled, tag pages will automatically be
-created as needed.
+The `tagbase` setting can be used to make tags default to being put in a
+particular subdirectory.
+
+The `tag_autocreate` setting can be used to control whether new tag pages
+are created as needed. It defaults to being done only if a `tagbase` is
+set.
 
 [[!if test="enabled(tag)" then="""
 This wiki has the tag plugin enabled, so you'll see a note below that this
-- 
cgit v1.2.3