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,
+ rebuild => undef,
+ },
tagbase => {
type => "string",
example => "tag",
safe => 1,
rebuild => 1,
},
-} #}}}
+ tagged_is_strict => {
+ type => "boolean",
+ default => 0,
+ description => "if 1, tagged() doesn't match normal WikiLinks to tag pages",
+ safe => 1,
+ rebuild => 1,
+ },
+}
-sub tagpage ($) { #{{{
+sub tagpage ($) {
my $tag=shift;
if ($tag !~ m{^\.?/} &&
- exists $config{tagbase} &&
defined $config{tagbase}) {
- $tag=$config{tagbase}."/".$tag;
+ $tag="/".$config{tagbase}."/".$tag;
+ $tag=~y#/#/#s; # squash dups
}
return $tag;
-} #}}}
+}
+
+sub taglink ($$$;@) {
+ my $page=shift;
+ my $destpage=shift;
+ my $tag=shift;
+ my %opts=@_;
-sub preprocess_tag (@) { #{{{
+ return htmllink($page, $destpage, tagpage($tag), %opts);
+}
+
+sub preprocess_tag (@) {
if (! @_) {
return "";
}
delete $params{preview};
foreach my $tag (keys %params) {
- $tag=IkiWiki::linkpage($tag);
- $tags{$page}{$tag}=1;
+ $tag=linkpage($tag);
# hidden WikiLink
- push @{$links{$page}}, tagpage($tag);
+ add_link($page, tagpage($tag), 'tag');
}
return "";
-} # }}}
+}
-sub preprocess_taglink (@) { #{{{
+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));
+ my $tag=linkpage($2);
+ add_link($params{page}, tagpage($tag), 'tag');
+ return taglink($params{page}, $params{destpage}, $tag,
+ linktext => 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));
+ my $tag=linkpage($_);
+ add_link($params{page}, tagpage($tag), '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};
my $template=$params{template};
+ my $tags = $typedlinks{$page}{tag};
+
$template->param(tags => [
map {
- link => htmllink($page, $destpage, tagpage($_),
- rel => "tag")
- }, sort keys %{$tags{$page}}
- ]) if exists $tags{$page} && %{$tags{$page}} && $template->query(name => "tags");
+ link => taglink($page, $destpage, $_, rel => "tag")
+ }, sort keys %$tags
+ ]) if defined $tags && %$tags && $template->query(name => "tags");
if ($template->query(name => "categories")) {
# It's an rss/atom template. Add any categories.
- if (exists $tags{$page} && %{$tags{$page}}) {
+ if (defined $tags && %$tags) {
$template->param(categories => [map { category => $_ },
- sort keys %{$tags{$page}}]);
+ sort keys %$tags]);
}
}
-} # }}}
+}
+
+package IkiWiki::PageSpec;
+
+sub match_tagged ($$;@) {
+ my $page = shift;
+ my $glob = shift;
+
+ if ($IkiWiki::config{tagged_is_strict}) {
+ return match_link($page, IkiWiki::Plugin::tag::tagpage($glob), linktype => 'tag');
+ }
+ else {
+ return match_link($page, IkiWiki::Plugin::tag::tagpage($glob));
+ }
+}
1