X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d1999f0357d893924acdc84f7c6c93dab144aa7e..4691a2ad39cce273231fddd9a589b4f8fdc1b063:/IkiWiki/Plugin/tag.pm

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 29af37576..b0a0e53be 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -25,7 +25,8 @@ sub getopt () { #{{{
 sub tagpage ($) { #{{{
 	my $tag=shift;
 			
-	if (exists $config{tagbase} &&
+	if ($tag !~ m{^\.?/} &&
+	    exists $config{tagbase} &&
 	    defined $config{tagbase}) {
 		$tag=$config{tagbase}."/".$tag;
 	}
@@ -57,12 +58,27 @@ sub preprocess_taglink (@) { #{{{
 	if (! @_) {
 		return "";
 	}
-	preprocess_tag(@_);
 	my %params=@_;
-	delete $params{page};
-	delete $params{destpage};
-	delete $params{preview};
-	return join(" ", map { "[[$_]]" } keys %params);
+	return join(" ", map {
+		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));
+		}
+		else {
+			my $tag=IkiWiki::linkpage($_);
+			$tags{$params{page}}{$tag}=1;
+			push @{$links{$params{page}}}, tagpage($tag);
+			return htmllink($params{page}, $params{destpage},
+				tagpage($tag));
+		}
+	}
+	grep {
+		$_ ne 'page' && $_ ne 'destpage' && $_ ne 'preview'
+	} keys %params);
 } # }}}
 
 sub pagetemplate (@) { #{{{