X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c1474d795c521c466dc997f6eb03b9a84eb1f73f..e48f8ff8a9d492f1583b05d80ed4a6ec88050108:/IkiWiki/Plugin/tag.pm

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 276d67e03..74d187cd2 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -10,6 +10,7 @@ my %tags;
 
 sub import { #{{{
 	hook(type => "getopt", id => "tag", call => \&getopt);
+	hook(type => "getsetup", id => "tag", call => \&getsetup);
 	hook(type => "preprocess", id => "tag", call => \&preprocess_tag, scan => 1);
 	hook(type => "preprocess", id => "taglink", call => \&preprocess_taglink, scan => 1);
 	hook(type => "pagetemplate", id => "tag", call => \&pagetemplate);
@@ -22,10 +23,26 @@ sub getopt () { #{{{
 	GetOptions("tagbase=s" => \$config{tagbase});
 } #}}}
 
+sub getsetup () { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+		tagbase => {
+			type => "string",
+			example => "tag",
+			description => "parent page tags are located under",
+			safe => 1,
+			rebuild => 1,
+		},
+} #}}}
+
 sub tagpage ($) { #{{{
 	my $tag=shift;
 			
-	if (exists $config{tagbase} &&
+	if ($tag !~ m{^\.?/} &&
+	    exists $config{tagbase} &&
 	    defined $config{tagbase}) {
 		$tag=$config{tagbase}."/".$tag;
 	}
@@ -62,6 +79,7 @@ sub preprocess_taglink (@) { #{{{
 		if (/(.*)\|(.*)/) {
 			my $tag=IkiWiki::linkpage($2);
 			$tags{$params{page}}{$tag}=1;
+			push @{$links{$params{page}}}, tagpage($tag);
 			return htmllink($params{page}, $params{destpage},
 				tagpage($tag),
 				linktext => IkiWiki::pagetitle($1));
@@ -69,6 +87,7 @@ sub preprocess_taglink (@) { #{{{
 		else {
 			my $tag=IkiWiki::linkpage($_);
 			$tags{$params{page}}{$tag}=1;
+			push @{$links{$params{page}}}, tagpage($tag);
 			return htmllink($params{page}, $params{destpage},
 				tagpage($tag));
 		}