From c1474d795c521c466dc997f6eb03b9a84eb1f73f Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Sat, 22 Sep 2007 17:07:51 +0000
Subject: make taglink support the same method for specifying link text as a
 regular wikilink

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

(limited to 'IkiWiki')

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 (@) { #{{{
-- 
cgit v1.2.3