meta: Allow syntax closer to html meta to be used.

The idea here is that <meta name="foo" description="bar">
can be written like [[!meta name="foo" description="bar">.
Of course, [[!meta foo=bar]] is still supported; this new feature
provides some DWIM when trying to directly convert a meta tag into
a meta directive.

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 7d68a9b2dc4a9adc990042d07e12205850c5e3fd..d18585d3d876129990cd829b88f306eb985308fb 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -253,12 +253,20 @@ sub preprocess (@) {
                        ' content="'.encode_entities($value).'" />';
        }
        elsif ($key eq 'description') {
-               push @{$metaheaders{$page}}, '<meta name="'.encode_entities($key).
+               push @{$metaheaders{$page}}, '<meta name="'.
+                       encode_entities($key).
                        '" content="'.encode_entities($value).'" />';
        }
+       elsif ($key eq 'name') {
+               push @{$metaheaders{$page}}, scrub('<meta '.$key.'="'.
+                       encode_entities($value).
+                       join(' ', map { "$_=\"$params{$_}\"" } keys %params).
+                       ' />', $destpage);
+       }
        else {
-               push @{$metaheaders{$page}}, scrub('<meta name="'.encode_entities($key).
-                       '" content="'.encode_entities($value).'" />', $destpage);
+               push @{$metaheaders{$page}}, scrub('<meta name="'.
+                       encode_entities($key).'" content="'.
+                       encode_entities($value).'" />', $destpage);
        }
 
        return "";

diff --git a/debian/changelog b/debian/changelog
index b6a78378736fe04906212d86038d22cbb6e62192..167d02c6f99344cbee1203eb750790afebab9617 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low
     translated languages can be controlled. (intrigeri)
   * git: Fix gitweb historyurl examples so "diff to current" links work.
     (Thanks jrayhawk)
+  * meta: Allow syntax closer to html meta to be used.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 23 Jul 2010 14:00:32 -0400