Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 289b48b87c56fc314fba6ed1c85a7f3424eee0a9..7977bbcf567887e63a66f8487bf327cdf5419e0c 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -4,26 +4,68 @@ package IkiWiki::Plugin::tag;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 my %tags;
 
 sub import { #{{{
 
 my %tags;
 
 sub import { #{{{

-       IkiWiki::hook(type => "getopt", id => "tag",
-               call => \&getopt);
-       IkiWiki::hook(type => "preprocess", id => "tag",
-               call => \&preprocess);
-       IkiWiki::hook(type => "pagetemplate", id => "tag",
-               call => \&pagetemplate);
+       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 () { #{{{
        eval q{use Getopt::Long};
 } # }}}
 
 sub getopt () { #{{{
        eval q{use Getopt::Long};

+       error($@) if $@;

        Getopt::Long::Configure('pass_through');
        Getopt::Long::Configure('pass_through');

-       GetOptions("tagbase=s" => \$IkiWiki::config{tagbase});
+       GetOptions("tagbase=s" => \$config{tagbase});

 } #}}}
 
 } #}}}
 

-sub preprocess (@) { #{{{
+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+               tagbase => {
+                       type => "string",
+                       example => "tag",
+                       description => "parent page tags are located under",
+                       safe => 1,
+                       rebuild => 1,
+               },
+} #}}}
+
+sub tagpage ($) { #{{{
+       my $tag=shift;
+                       
+       if ($tag !~ m{^\.?/} &&
+           defined $config{tagbase}) {
+               $tag="/".$config{tagbase}."/".$tag;
+               $tag=~y#/#/#s; # squash dups
+       }
+
+       return $tag;
+} #}}}
+
+sub taglink ($$$;@) { #{{{
+       my $page=shift;
+       my $destpage=shift;
+       my $tag=shift;
+       my %opts=@_;
+
+       my $link=tagpage($tag);
+
+       # 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 (@) { #{{{

        if (! @_) {
                return "";
        }
        if (! @_) {
                return "";
        }


@@ -31,21 +73,43 @@ sub preprocess (@) { #{{{
        my $page = $params{page};
        delete $params{page};
        delete $params{destpage};
        my $page = $params{page};
        delete $params{page};
        delete $params{destpage};

+       delete $params{preview};

 
 

-       $tags{$page} = [];

        foreach my $tag (keys %params) {
        foreach my $tag (keys %params) {

-               if (exists $IkiWiki::config{tagbase} &&
-                   defined $IkiWiki::config{tagbase}) {
-                       $tag=$IkiWiki::config{tagbase}."/".$tag;
-               }
-               push @{$tags{$page}}, $tag;
+               $tag=linkpage($tag);
+               $tags{$page}{$tag}=1;

                # hidden WikiLink
                # hidden WikiLink

-               push @{$IkiWiki::links{$page}}, $tag;
+               push @{$links{$page}}, tagpage($tag);

        }
                
        return "";
 } # }}}
 
        }
                
        return "";
 } # }}}
 

+sub preprocess_taglink (@) { #{{{
+       if (! @_) {
+               return "";
+       }
+       my %params=@_;
+       return join(" ", map {
+               if (/(.*)\|(.*)/) {
+                       my $tag=linkpage($2);
+                       $tags{$params{page}}{$tag}=1;
+                       push @{$links{$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);
+                       return taglink($params{page}, $params{destpage}, $tag);
+               }
+       }
+       grep {
+               $_ ne 'page' && $_ ne 'destpage' && $_ ne 'preview'
+       } keys %params);
+} # }}}
+

 sub pagetemplate (@) { #{{{
        my %params=@_;
        my $page=$params{page};
 sub pagetemplate (@) { #{{{
        my %params=@_;
        my $page=$params{page};


@@ -53,9 +117,18 @@ sub pagetemplate (@) { #{{{
        my $template=$params{template};
 
        $template->param(tags => [
        my $template=$params{template};
 
        $template->param(tags => [

-               map { link => IkiWiki::htmllink($page, $destpage, $_) }, 
-                       @{$tags{$page}}
-       ]) if exists $tags{$page} && @{$tags{$page}} && $template->query(name => "tags");
+               map { 
+                       link => taglink($page, $destpage, $_, 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 => $_ },
+                               sort keys %{$tags{$page}}]);
+               }
+       }

 } # }}}
 
 1
 } # }}}
 
 1