X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1c4a4a41e1c96d0f486a7b039718dd5f35865af2..04a59b3c65e8e60805b6ed6d11d448b1d5babe64:/IkiWiki/Plugin/tag.pm

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 7977bbcf5..cdcfaf536 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -4,26 +4,26 @@ package IkiWiki::Plugin::tag;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my %tags;
 
-sub import { #{{{
+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);
-} # }}}
+}
 
-sub getopt () { #{{{
+sub getopt () {
 	eval q{use Getopt::Long};
 	error($@) if $@;
 	Getopt::Long::Configure('pass_through');
 	GetOptions("tagbase=s" => \$config{tagbase});
-} #}}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
@@ -36,9 +36,9 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
-sub tagpage ($) { #{{{
+sub tagpage ($) {
 	my $tag=shift;
 			
 	if ($tag !~ m{^\.?/} &&
@@ -48,24 +48,18 @@ sub tagpage ($) { #{{{
 	}
 
 	return $tag;
-} #}}}
+}
 
-sub taglink ($$$;@) { #{{{
+sub taglink ($$$;@) {
 	my $page=shift;
 	my $destpage=shift;
 	my $tag=shift;
 	my %opts=@_;
 
-	my $link=tagpage($tag);
+	return htmllink($page, $destpage, tagpage($tag), %opts);
+}
 
-	# Force tag creation links to create the tag under /tagbase,
-	# if there is a tagbase and this tag used it.
-	$link="/".$link if $tag ne $link;
-
-	return htmllink($page, $destpage, $link, %opts);
-} #}}}
-
-sub preprocess_tag (@) { #{{{
+sub preprocess_tag (@) {
 	if (! @_) {
 		return "";
 	}
@@ -79,13 +73,13 @@ sub preprocess_tag (@) { #{{{
 		$tag=linkpage($tag);
 		$tags{$page}{$tag}=1;
 		# hidden WikiLink
-		push @{$links{$page}}, tagpage($tag);
+		add_link($page, tagpage($tag));
 	}
 		
 	return "";
-} # }}}
+}
 
-sub preprocess_taglink (@) { #{{{
+sub preprocess_taglink (@) {
 	if (! @_) {
 		return "";
 	}
@@ -94,23 +88,23 @@ sub preprocess_taglink (@) { #{{{
 		if (/(.*)\|(.*)/) {
 			my $tag=linkpage($2);
 			$tags{$params{page}}{$tag}=1;
-			push @{$links{$params{page}}}, tagpage($tag);
+			add_link($params{page}, tagpage($tag));
 			return taglink($params{page}, $params{destpage}, $tag,
 				linktext => pagetitle($1));
 		}
 		else {
 			my $tag=linkpage($_);
 			$tags{$params{page}}{$tag}=1;
-			push @{$links{$params{page}}}, tagpage($tag);
+			add_link($params{page}, tagpage($tag));
 			return taglink($params{page}, $params{destpage}, $tag);
 		}
 	}
 	grep {
 		$_ ne 'page' && $_ ne 'destpage' && $_ ne 'preview'
 	} keys %params);
-} # }}}
+}
 
-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {
 	my %params=@_;
 	my $page=$params{page};
 	my $destpage=$params{destpage};
@@ -129,6 +123,14 @@ sub pagetemplate (@) { #{{{
 				sort keys %{$tags{$page}}]);
 		}
 	}
-} # }}}
+}
+
+package IkiWiki::PageSpec;
+
+sub match_tagged ($$;@) {
+	my $page = shift;
+	my $glob = shift;
+	return match_link($page, IkiWiki::Plugin::tag::tagpage($glob));
+}
 
 1