X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e1c0576029f2f87b77887fe499c700ca8974ae9b..19a7752021249eb8984e523fd6ed5a3730dc9be7:/IkiWiki/Plugin/tag.pm

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 29d1d030a..f0e3c223c 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -4,13 +4,14 @@ package IkiWiki::Plugin::tag;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 my %tags;
 
 sub import { #{{{
 	hook(type => "getopt", id => "tag", call => \&getopt);
-	hook(type => "preprocess", id => "tag", call => \&preprocess, scan => 1);
+	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);
 } # }}}
 
@@ -32,7 +33,7 @@ sub tagpage ($) { #{{{
 	return $tag;
 } #}}}
 
-sub preprocess (@) { #{{{
+sub preprocess_tag (@) { #{{{
 	if (! @_) {
 		return "";
 	}
@@ -40,10 +41,11 @@ sub preprocess (@) { #{{{
 	my $page = $params{page};
 	delete $params{page};
 	delete $params{destpage};
+	delete $params{preview};
 
-	$tags{$page} = [];
 	foreach my $tag (keys %params) {
-		push @{$tags{$page}}, $tag;
+		$tag=IkiWiki::linkpage($tag);
+		$tags{$page}{$tag}=1;
 		# hidden WikiLink
 		push @{$links{$page}}, tagpage($tag);
 	}
@@ -51,6 +53,33 @@ sub preprocess (@) { #{{{
 	return "";
 } # }}}
 
+sub preprocess_taglink (@) { #{{{
+	if (! @_) {
+		return "";
+	}
+	my %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 (@) { #{{{
 	my %params=@_;
 	my $page=$params{page};
@@ -59,14 +88,16 @@ sub pagetemplate (@) { #{{{
 
 	$template->param(tags => [
 		map { 
-			link => htmllink($page, $destpage, tagpage($_))
-		}, @{$tags{$page}}
-	]) if exists $tags{$page} && @{$tags{$page}} && $template->query(name => "tags");
+			link => htmllink($page, $destpage, tagpage($_),
+					rel => "tag")
+		}, sort keys %{$tags{$page}}
+	]) if exists $tags{$page} && %{$tags{$page}} && $template->query(name => "tags");
 
 	if ($template->query(name => "categories")) {
 		# It's an rss/atom template. Add any categories.
-		if (exists $tags{$page} && @{$tags{$page}}) {
-			$template->param(categories => [map { category => $_ }, @{$tags{$page}}]);
+		if (exists $tags{$page} && %{$tags{$page}}) {
+			$template->param(categories => [map { category => $_ },
+				sort keys %{$tags{$page}}]);
 		}
 	}
 } # }}}