Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index d4cbb67059a2ed0cd38db658cad288341a979a4a..d725ef9b3a948f3b5967f66d5ac6dde887a1f633 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -25,9 +25,12 @@ sub getopt () { #{{{
 
 sub getsetup () { #{{{
        return
 
 sub getsetup () { #{{{
        return

+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },

                tagbase => {
                        type => "string",
                tagbase => {
                        type => "string",

-                       default => "",

                        example => "tag",
                        description => "parent page tags are located under",
                        safe => 1,
                        example => "tag",
                        description => "parent page tags are located under",
                        safe => 1,


@@ -39,14 +42,23 @@ sub tagpage ($) { #{{{
        my $tag=shift;
                        
        if ($tag !~ m{^\.?/} &&
        my $tag=shift;
                        
        if ($tag !~ m{^\.?/} &&

-           exists $config{tagbase} &&

            defined $config{tagbase}) {
            defined $config{tagbase}) {

-               $tag=$config{tagbase}."/".$tag;
+               $tag="/".$config{tagbase}."/".$tag;
+               $tag=~y#/#/#s; # squash dups

        }
 
        return $tag;
 } #}}}
 
        }
 
        return $tag;
 } #}}}
 

+sub taglink ($$$;@) { #{{{
+       my $page=shift;
+       my $destpage=shift;
+       my $tag=shift;
+       my %opts=@_;
+
+       return htmllink($page, $destpage, tagpage($tag), %opts);
+} #}}}
+

 sub preprocess_tag (@) { #{{{
        if (! @_) {
                return "";
 sub preprocess_tag (@) { #{{{
        if (! @_) {
                return "";


@@ -58,7 +70,7 @@ sub preprocess_tag (@) { #{{{
        delete $params{preview};
 
        foreach my $tag (keys %params) {
        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);
                $tags{$page}{$tag}=1;
                # hidden WikiLink
                push @{$links{$page}}, tagpage($tag);


@@ -74,19 +86,17 @@ sub preprocess_taglink (@) { #{{{
        my %params=@_;
        return join(" ", map {
                if (/(.*)\|(.*)/) {
        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);
                        $tags{$params{page}}{$tag}=1;
                        push @{$links{$params{page}}}, tagpage($tag);

-                       return htmllink($params{page}, $params{destpage},
-                               tagpage($tag),
-                               linktext => IkiWiki::pagetitle($1));
+                       return taglink($params{page}, $params{destpage}, $tag,
+                               linktext => pagetitle($1));

                }
                else {
                }
                else {

-                       my $tag=IkiWiki::linkpage($_);
+                       my $tag=linkpage($_);

                        $tags{$params{page}}{$tag}=1;
                        push @{$links{$params{page}}}, tagpage($tag);
                        $tags{$params{page}}{$tag}=1;
                        push @{$links{$params{page}}}, tagpage($tag);

-                       return htmllink($params{page}, $params{destpage},
-                               tagpage($tag));
+                       return taglink($params{page}, $params{destpage}, $tag);

                }
        }
        grep {
                }
        }
        grep {


@@ -102,8 +112,7 @@ sub pagetemplate (@) { #{{{
 
        $template->param(tags => [
                map { 
 
        $template->param(tags => [
                map { 

-                       link => htmllink($page, $destpage, tagpage($_),
-                                       rel => "tag")
+                       link => taglink($page, $destpage, $_, rel => "tag")

                }, sort keys %{$tags{$page}}
        ]) if exists $tags{$page} && %{$tags{$page}} && $template->query(name => "tags");
 
                }, sort keys %{$tags{$page}}
        ]) if exists $tags{$page} && %{$tags{$page}} && $template->query(name => "tags");