Merge branch 'ready/imgforpdf-and-more'

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index ff419dff220dc6afabce49939c494b09f6e23348..605f415994e73bee121faab9fb7e5e64f1a02182 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -7,11 +7,14 @@ use strict;
 use IkiWiki 3.00;
 
 sub import {
+       hook(type => "checkconfig", id => "tag", call => \&checkconfig);
        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);
+
+       IkiWiki::loadplugin("transient");
 }
 
 sub getopt () {
@@ -41,6 +44,20 @@ sub getsetup () {
                        safe => 1,
                        rebuild => undef,
                },
+               tag_autocreate_commit => {
+                       type => "boolean",
+                       example => 1,
+                       default => 1,
+                       description => "commit autocreated tag pages",
+                       safe => 1,
+                       rebuild => 0,
+               },
+}
+
+sub checkconfig () {
+       if (! defined $config{tag_autocreate_commit}) {
+               $config{tag_autocreate_commit} = 1;
+       }
 }
 
 sub taglink ($) {
@@ -63,7 +80,7 @@ sub tagname ($) {
        } else {
                $tag =~ s!^\.?/!!;
        }
-       return $tag;
+       return pagetitle($tag, 1);
 }
 
 sub htmllink_tag ($$$;@) {
@@ -87,6 +104,9 @@ sub gentag ($) {
                else {
                        $tagpage=~s/^\///;
                }
+               if (exists $IkiWiki::pagecase{lc $tagpage}) {
+                       $tagpage=$IkiWiki::pagecase{lc $tagpage}
+               }
 
                my $tagfile = newpagefile($tagpage, $config{default_pageext});
 
@@ -97,8 +117,14 @@ sub gentag ($) {
                        my $template=template("autotag.tmpl");
                        $template->param(tagname => tagname($tag));
                        $template->param(tag => $tag);
-                       writefile($tagfile, $config{srcdir}, $template->output);
-                       if ($config{rcs}) {
+
+                       my $dir = $config{srcdir};
+                       if (! $config{tag_autocreate_commit}) {
+                               $dir = $IkiWiki::Plugin::transient::transientdir;
+                       }
+
+                       writefile($tagfile, $dir, $template->output);
+                       if ($config{rcs} && $config{tag_autocreate_commit}) {
                                IkiWiki::disable_commit_hook();
                                IkiWiki::rcs_add($tagfile);
                                IkiWiki::rcs_commit_staged(message => $message);
@@ -173,8 +199,10 @@ sub pagetemplate (@) {
        if ($template->query(name => "categories")) {
                # It's an rss/atom template. Add any categories.
                if (defined $tags && %$tags) {
-                       $template->param(categories => [map { category => tagname($_) },
-                               sort keys %$tags]);
+                       eval q{use HTML::Entities};
+                       $template->param(categories =>
+                               [map { category => HTML::Entities::encode_entities_numeric(tagname($_)) },
+                                       sort keys %$tags]);
                }
        }
 }