Merge branch 'master' of ssh://git.ikiwiki.info

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7662263383271fd31e988e33cf68d00a8d2ed4ce..7035cb034d96bdf3f2a92a8655e94e2b597bf39e 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1026,7 +1026,7 @@ sub bestlink ($$) {
 sub isinlinableimage ($) {
        my $file=shift;
        
-       return $file =~ /\.(png|gif|jpg|jpeg)$/i;
+       return $file =~ /\.(png|gif|jpg|jpeg|svg)$/i;
 }
 
 sub pagetitle ($;$) {

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 103f6b2b3510067f10a5eddf86f8e657ba96fe29..b98e843d436b1aed68ca13a12da94ee44a74dd06 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -64,10 +64,11 @@ sub preprocess (@) {
 
        my $dir = $params{page};
        my $base = IkiWiki::basename($file);
+       my $issvg = $base=~s/\.svg$/.png/i;
 
        eval q{use Image::Magick};
        error gettext("Image::Magick is not installed") if $@;
-       my $im = Image::Magick->new;
+       my $im = Image::Magick->new($issvg ? (magick => "png") : ());
        my $imglink;
        my $r = $im->Read($srcfile);
        error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;

diff --git a/debian/changelog b/debian/changelog
index 8191a212a4ffc8cadcebea737256e0a8ccbf406d..7b8d84e45e4784b9d7185ca8d1ae6739397f0aa7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,10 @@ ikiwiki (3.20110609) UNRELEASED; urgency=low
   * Add libtext-multimarkdown-perl to Suggests. Closes: #630705
   * headinganchors: Plugin by Paul Wise that adds ids to <hn> headings.
   * html5 is not experimental anymore. But not the default either, quite yet.
+  * Support svg as a inlinable image type; svg images can be included on a
+    page by simply linking to them, or by using the img directive.
+    Note that sanitizing svg files is still not addressed.
+  * img: Generate png format thumbnails for svg images.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 09 Jun 2011 10:06:44 -0400
 

diff --git a/doc/bugs/SVG_files_not_recognized_as_images.mdwn b/doc/bugs/SVG_files_not_recognized_as_images.mdwn
index 207edd4266fad38aca9aae9c74b3614734f93777..b14cd9b9453087794ef378cc9624406802b2ffcf 100644 (file)
--- a/doc/bugs/SVG_files_not_recognized_as_images.mdwn
+++ b/doc/bugs/SVG_files_not_recognized_as_images.mdwn
@@ -17,6 +17,16 @@ The 'img' plugin also seems to not support SVGs.
 > image (png). The img plugin could probably do that fairly simply.
 > --[[Joey]]
 
+>> This seems to have improved since; at least chromium can display svg
+>> images from `<img>` tags. Firefox 3.5.19 did not in my testing.
+>>
+>> So, svgs can now be included on pages by linking to them, or by using
+>> the img directive. The most portable thing is to use the img directive
+>> plus some size, which forces them to be resized and a png to actually
+>> be displayed.
+>>
+>> I have not yet tried to do anything with sanitizing them. --[[Joey]] 
+
 >> I'm working on inline SVG and MathML support in ikiwiki and I've
 >> modified my htmlscrubber to sanitize SVG and MathML using the
 >> whitelists from html5lib.  Here's a [patch][].  I've also made some