really add

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 48ed1a8f87eb67ae74302484d49942a468a7a7f4..b0a0e53be7cec3c73147ce61fe353aaa9b8a3d69 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -10,7 +10,8 @@ my %tags;
 
 sub import { #{{{
        hook(type => "getopt", id => "tag", call => \&getopt);
 
 sub import { #{{{
        hook(type => "getopt", id => "tag", call => \&getopt);

-       hook(type => "preprocess", id => "tag", call => \&preprocess, scan => 1);
+       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);
 } # }}}
 
        hook(type => "pagetemplate", id => "tag", call => \&pagetemplate);
 } # }}}
 


@@ -24,7 +25,8 @@ sub getopt () { #{{{
 sub tagpage ($) { #{{{
        my $tag=shift;
                        
 sub tagpage ($) { #{{{
        my $tag=shift;
                        

-       if (exists $config{tagbase} &&
+       if ($tag !~ m{^\.?/} &&
+           exists $config{tagbase} &&

            defined $config{tagbase}) {
                $tag=$config{tagbase}."/".$tag;
        }
            defined $config{tagbase}) {
                $tag=$config{tagbase}."/".$tag;
        }


@@ -32,7 +34,7 @@ sub tagpage ($) { #{{{
        return $tag;
 } #}}}
 
        return $tag;
 } #}}}
 

-sub preprocess (@) { #{{{
+sub preprocess_tag (@) { #{{{

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


@@ -52,6 +54,33 @@ sub preprocess (@) { #{{{
        return "";
 } # }}}
 
        return "";
 } # }}}
 

+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));
+               }
+               else {
+                       my $tag=IkiWiki::linkpage($_);
+                       $tags{$params{page}}{$tag}=1;
+                       push @{$links{$params{page}}}, tagpage($tag);
+                       return htmllink($params{page}, $params{destpage},
+                               tagpage($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};


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

-                       link => htmllink($page, $destpage, tagpage($_))
+                       link => htmllink($page, $destpage, tagpage($_),
+                                       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");