po plugin: force utf-8 encoding in POT files

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 29af3757630d880f320c21b5bb8191777487892d..c4a1756779126c53a265f9e40c82dcdc97c7a52c 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -10,6 +10,7 @@ my %tags;
 
 sub import { #{{{
        hook(type => "getopt", id => "tag", call => \&getopt);
 
 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);
        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);


@@ -22,17 +23,47 @@ sub getopt () { #{{{
        GetOptions("tagbase=s" => \$config{tagbase});
 } #}}}
 
        GetOptions("tagbase=s" => \$config{tagbase});
 } #}}}
 

+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;
                        
 sub tagpage ($) { #{{{
        my $tag=shift;
                        

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

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

-               $tag=$config{tagbase}."/".$tag;
+               $tag="/".$config{tagbase}."/".$tag;

        }
 
        return $tag;
 } #}}}
 
        }
 
        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 "";
 sub preprocess_tag (@) { #{{{
        if (! @_) {
                return "";


@@ -44,7 +75,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);


@@ -57,12 +88,25 @@ sub preprocess_taglink (@) { #{{{
        if (! @_) {
                return "";
        }
        if (! @_) {
                return "";
        }

-       preprocess_tag(@_);

        my %params=@_;
        my %params=@_;

-       delete $params{page};
-       delete $params{destpage};
-       delete $params{preview};
-       return join(" ", map { "[[$_]]" } keys %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 (@) { #{{{
 } # }}}
 
 sub pagetemplate (@) { #{{{


@@ -73,8 +117,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");