* Replace underscores in shortcut texts with spaces when formatting for

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 56bf17e2c1042ae367c1cd9afa63012ff33723ab..29d1d030a2e328088feb1244d98e934b226dc227 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -9,18 +9,27 @@ use IkiWiki;
 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 => "preprocess", id => "tag", call => \&preprocess, 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 tagpage ($) { #{{{
+       my $tag=shift;
+                       
+       if (exists $config{tagbase} &&
+           defined $config{tagbase}) {
+               $tag=$config{tagbase}."/".$tag;
+       }
+
+       return $tag;

 } #}}}
 
 sub preprocess (@) { #{{{
 } #}}}
 
 sub preprocess (@) { #{{{


@@ -34,12 +43,9 @@ sub preprocess (@) { #{{{
 
        $tags{$page} = [];
        foreach my $tag (keys %params) {
 
        $tags{$page} = [];
        foreach my $tag (keys %params) {

-               if (exists $IkiWiki::config{tagbase}) {
-                       $tag=$IkiWiki::config{tagbase}."/".$tag;
-               }

                push @{$tags{$page}}, $tag;
                # hidden WikiLink
                push @{$tags{$page}}, $tag;
                # hidden WikiLink

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

        }
                
        return "";
        }
                
        return "";


@@ -52,9 +58,17 @@ sub pagetemplate (@) { #{{{
        my $template=$params{template};
 
        $template->param(tags => [
        my $template=$params{template};
 
        $template->param(tags => [

-               map { link => IkiWiki::htmllink($page, $destpage, $_) }, 
-                       @{$tags{$page}}
+               map { 
+                       link => htmllink($page, $destpage, tagpage($_))
+               }, @{$tags{$page}}

        ]) if exists $tags{$page} && @{$tags{$page}} && $template->query(name => "tags");
        ]) 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 => $_ }, @{$tags{$page}}]);
+               }
+       }

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