reorg

[git.ikiwiki.info.git] / IkiWiki / Plugin / tag.pm

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index bf53209fc18342df934fed8a3b1dd2c9eaf4ae10..d439109104a8fd10dfd8ea329d083b4241c42fd0 100644 (file)
--- 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,35 +36,30 @@ sub getsetup () { #{{{
                        safe => 1,
                        rebuild => 1,
                },
-} #}}}
+}
 
-sub tagpage ($) { #{{{
+sub tagpage ($) {
        my $tag=shift;
                        
        if ($tag !~ m{^\.?/} &&
            defined $config{tagbase}) {
-               $tag=$config{tagbase}."/".$tag;
+               $tag="/".$config{tagbase}."/".$tag;
+               $tag=~y#/#/#s; # squash dups
        }
 
        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 "";
        }
@@ -75,30 +70,30 @@ sub preprocess_tag (@) { #{{{
        delete $params{preview};
 
        foreach my $tag (keys %params) {
-               $tag=IkiWiki::linkpage($tag);
+               $tag=linkpage($tag);
                $tags{$page}{$tag}=1;
                # hidden WikiLink
                push @{$links{$page}}, tagpage($tag);
        }
                
        return "";
-} # }}}
+}
 
-sub preprocess_taglink (@) { #{{{
+sub preprocess_taglink (@) {
        if (! @_) {
                return "";
        }
        my %params=@_;
        return join(" ", map {
                if (/(.*)\|(.*)/) {
-                       my $tag=IkiWiki::linkpage($2);
+                       my $tag=linkpage($2);
                        $tags{$params{page}}{$tag}=1;
                        push @{$links{$params{page}}}, tagpage($tag);
                        return taglink($params{page}, $params{destpage}, $tag,
-                               linktext => IkiWiki::pagetitle($1));
+                               linktext => pagetitle($1));
                }
                else {
-                       my $tag=IkiWiki::linkpage($_);
+                       my $tag=linkpage($_);
                        $tags{$params{page}}{$tag}=1;
                        push @{$links{$params{page}}}, tagpage($tag);
                        return taglink($params{page}, $params{destpage}, $tag);
@@ -107,9 +102,9 @@ sub preprocess_taglink (@) { #{{{
        grep {
                $_ ne 'page' && $_ ne 'destpage' && $_ ne 'preview'
        } keys %params);
-} # }}}
+}
 
-sub pagetemplate (@) { #{{{
+sub pagetemplate (@) {
        my %params=@_;
        my $page=$params{page};
        my $destpage=$params{destpage};
@@ -128,6 +123,6 @@ sub pagetemplate (@) { #{{{
                                sort keys %{$tags{$page}}]);
                }
        }
-} # }}}
+}
 
 1