* Apply a patch from Carl Worth allowing a class attribute to be passed

  through the img plugin. Also allow the id attribute to be passed through.

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index b1c9db80c969055edc59227b5c79d83945b7b911..cff9dabf082f3429e1bc6937aba9ed86ec9d00d4 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -98,7 +98,10 @@ sub preprocess (@) { #{{{
 
        return '<a href="'.$fileurl.'"><img src="'.$imgurl.
                '" alt="'.$alt.'" width="'.$im->Get("width").
-               '" height="'.$im->Get("height").'" /></a>';
+               '" height="'.$im->Get("height").'"'.
+               (exists $params{class} ? ' class="'.$params{class}.'"' : '').
+               (exists $params{id} ? ' id="'.$params{id}.'"' : '').
+               ' /></a>';
 } #}}}
 
 1

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 18e28a196a47805f6d95550894dc62e917d60593..d04bc1d51f3f75ce3b601e4cd45a3c8d91b8e9d1 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -65,7 +65,7 @@ sub preprocess (@) { #{{{
                }
        }
        elsif ($key eq 'title') {
-               $title{$page}=encode_entities($value);
+               $title{$page}=$value;
        }
        elsif ($key eq 'permalink') {
                $permalink{$page}=$value;

diff --git a/debian/changelog b/debian/changelog
index 448a43a7ba1b2b92a4d76084e6b40c4aff12c0dd..94576d4510bb445b97cc2128d5e3e0b38a6186df 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,10 @@ ikiwiki (2.2) UNRELEASED; urgency=low
     creating the same file. The move will be handled transparently, though you
     might want to rebuild your wiki to make it occur in one step.
   * Fix FTBFS in test suite introduced in last version. Closes: #425891
+  * Apply a patch from Carl Worth allowing a class attribute to be passed
+    through the img plugin. Also allow the id attribute to be passed through.
 
- -- Joey Hess <joeyh@debian.org>  Thu, 24 May 2007 16:09:59 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon, 28 May 2007 15:00:02 -0400
 
 ikiwiki (2.1) unstable; urgency=low
 

diff --git a/doc/bugs/img_plugin_should_pass_through_class_attribute.mdwn b/doc/bugs/img_plugin_should_pass_through_class_attribute.mdwn
index c66055dd0ad2730233caf8e54d36676ef409c509..2e67d63574788acb5736da313d3d4e9808d688aa 100644 (file)
--- a/doc/bugs/img_plugin_should_pass_through_class_attribute.mdwn
+++ b/doc/bugs/img_plugin_should_pass_through_class_attribute.mdwn
@@ -6,6 +6,8 @@ An example of the feature in use can be seen here (notice class="floatleft" and
 
 And here's a patch to implement it. Will this survive markdown munging? It seems quite unlikely... How does one protect a block like this? Oh well, we'll see what happens.
 
+> thanks, [[done]] --[[Joey]]
+
 -Carl
 
     From 405c29ba2ef97a514bade33ef826e71fe825962b Mon Sep 17 00:00:00 2001

diff --git a/doc/plugins/img.mdwn b/doc/plugins/img.mdwn
index bbeb2a9f3fc4bb7f0e39fc14f86380d015c1d4e8..418ef6d46b9cf5aedd3ccd517e4c80fa40cd3a21 100644 (file)
--- a/doc/plugins/img.mdwn
+++ b/doc/plugins/img.mdwn
@@ -16,10 +16,15 @@ Note that this is a stripped down version of Christian Mock's
 
        \[[img image1.jpg size="200x200" alt="clouds"]]
 
-The `alt` parameter is optional. The `size` parameter is also optional,
-defaulting to full size. Note that the original image's aspect ratio is
-always preserved, even if this means making the image smaller than the
-specified size.
+The image file will be searched for using the same rules as used to find
+the file pointed to by a [[WikiLink]].
+
+The `size` parameter is optional, defaulting to full size. Note that the
+original image's aspect ratio is always preserved, even if this means
+making the image smaller than the specified size.
+
+You can also pass `alt`, `class` and `id` parameters. These are passed through
+unchanged to the html img tag.
 
 You can also set default values that will be applied to all later images on
 the page, unless overridden. Useful when including many images on a page.
@@ -28,7 +33,3 @@ the page, unless overridden. Useful when including many images on a page.
        \[[img photo1.jpg]]
        \[[img photo2.jpg]]
        \[[img photo3.jpg size=200x600]]
-
-You can also reference an image in /images like this:
-
-       \[[img /images/photo3.jpg size=200x600]]