Merge branch 'master' into autotag

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 1145a9f130966d4c69b1a6ce6b8373fdbaf0eafd..cd7ecc212fd7c928560ade98d34366ae9da45999 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -43,10 +43,10 @@ sub getsetup () {
                },
 }
 
-sub tagpage ($) {
+sub taglink ($) {
        my $tag=shift;
-                       
-       if ($tag !~ m{^\.?/} &&
+       
+       if ($tag !~ m{^/} &&
            defined $config{tagbase}) {
                $tag="/".$config{tagbase}."/".$tag;
                $tag=~y#/#/#s; # squash dups
@@ -55,27 +55,43 @@ sub tagpage ($) {
        return $tag;
 }
 
-sub taglink ($$$;@) {
+sub htmllink_tag ($$$;@) {
        my $page=shift;
        my $destpage=shift;
        my $tag=shift;
        my %opts=@_;
 
-       return htmllink($page, $destpage, tagpage($tag), %opts);
+       return htmllink($page, $destpage, taglink($tag), %opts);
 }
 
 sub gentag ($) {
        my $tag=shift;
+
        if ($config{tag_autocreate}) {
-               my $tagfile = newpagefile(tagpage($tag), $config{default_pageext});
-               $tagfile=~s/^\///;
+               my $tagpage=taglink($tag);
+               if ($tagpage=~/^\.\/(.*)/) {
+                       $tagpage=$1;
+               }
+               else {
+                       $tagpage=~s/^\///;
+               }
+
+               my $tagfile = newpagefile($tagpage, $config{default_pageext});
 
-               add_autofile($tagfile, sub {
-                       debug(sprintf(gettext("creating tag page %s"), $tag));
+               add_autofile($tagfile, "tag", sub {
+                       my $message=sprintf(gettext("creating tag page %s"), $tagpage);
+                       debug($message);
 
                        my $template=template("autotag.tmpl");
+                       $template->param(tagname => IkiWiki::basename($tag));
                        $template->param(tag => $tag);
                        writefile($tagfile, $config{srcdir}, $template->output);
+                       if ($config{rcs}) {
+                               IkiWiki::disable_commit_hook();
+                               IkiWiki::rcs_add($tagfile);
+                               IkiWiki::rcs_commit_staged($message, undef, undef);
+                               IkiWiki::enable_commit_hook();
+                       }
                });
        }
 }
@@ -94,9 +110,8 @@ sub preprocess_tag (@) {
                $tag=linkpage($tag);
                
                # hidden WikiLink
-               add_link($page, tagpage($tag), 'tag');
+               add_link($page, taglink($tag), 'tag');
                
-               # add tagpage if necessary
                gentag($tag);
        }
                
@@ -111,14 +126,16 @@ sub preprocess_taglink (@) {
        return join(" ", map {
                if (/(.*)\|(.*)/) {
                        my $tag=linkpage($2);
-                       add_link($params{page}, tagpage($tag), 'tag');
-                       return taglink($params{page}, $params{destpage}, $tag,
+                       add_link($params{page}, taglink($tag), 'tag');
+                       gentag($tag);
+                       return htmllink_tag($params{page}, $params{destpage}, $tag,
                                linktext => pagetitle($1));
                }
                else {
                        my $tag=linkpage($_);
-                       add_link($params{page}, tagpage($tag), 'tag');
-                       return taglink($params{page}, $params{destpage}, $tag);
+                       add_link($params{page}, taglink($tag), 'tag');
+                       gentag($tag);
+                       return htmllink_tag($params{page}, $params{destpage}, $tag);
                }
        }
        grep {
@@ -136,7 +153,7 @@ sub pagetemplate (@) {
 
        $template->param(tags => [
                map { 
-                       link => taglink($page, $destpage, $_, rel => "tag")
+                       link => htmllink_tag($page, $destpage, $_, rel => "tag")
                }, sort keys %$tags
        ]) if defined $tags && %$tags && $template->query(name => "tags");
 
@@ -152,7 +169,9 @@ sub pagetemplate (@) {
 package IkiWiki::PageSpec;
 
 sub match_tagged ($$;@) {
-       return match_link($_[0], IkiWiki::Plugin::tag::tagpage($_[1]), linktype => 'tag');
+       my $page=shift;
+       my $glob=IkiWiki::Plugin::tag::taglink(shift);
+       return match_link($page, $glob, linktype => 'tag', @_);
 }
 
 1