From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sat, 22 Sep 2007 17:07:51 +0000 (+0000)
Subject: make taglink support the same method for specifying link text as a regular
X-Git-Tag: 2.9~56
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c1474d795c521c466dc997f6eb03b9a84eb1f73f;p=ikiwiki.git

make taglink support the same method for specifying link text as a regular
wikilink
---

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 29af37576..276d67e03 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -57,12 +57,25 @@ 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;
+			return htmllink($params{page}, $params{destpage},
+				tagpage($tag),
+				linktext => IkiWiki::pagetitle($1));
+		}
+		else {
+			my $tag=IkiWiki::linkpage($_);
+			$tags{$params{page}}{$tag}=1;
+			return htmllink($params{page}, $params{destpage},
+				tagpage($tag));
+		}
+	}
+	grep {
+		$_ ne 'page' && $_ ne 'destpage' && $_ ne 'preview'
+	} keys %params);
 } # }}}
 
 sub pagetemplate (@) { #{{{
diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn
index c221624cd..caffaa692 100644
--- a/doc/plugins/tag.mdwn
+++ b/doc/plugins/tag.mdwn
@@ -14,6 +14,7 @@ feeds.
 If you want a visible [[WikiLink]] along with the tag, use taglink instead:
 
 	\[[taglink foo]]
+	\[[taglink tagged_as_foo|foo]]
 
 This plugin has a configuration option. Set --tagbase=tags and links to tags
 will be located under the specified base page. If ikiwiki is configured