releasing version 3.20110905

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 845a4bf365be84167bda4a352368b183a40813db..b98e843d436b1aed68ca13a12da94ee44a74dd06 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -19,6 +19,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => undef,
+                       section => "widget",
                },
 }
 
@@ -26,6 +27,10 @@ sub preprocess (@) {
        my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
        my %params=@_;
 
+       if (! defined $image) {
+               error("bad image filename");
+       }
+
        if (exists $imgdefaults{$params{page}}) {
                foreach my $key (keys %{$imgdefaults{$params{page}}}) {
                        if (! exists $params{$key}) {
@@ -34,7 +39,7 @@ sub preprocess (@) {
                }
        }
 
-       if (! exists $params{size}) {
+       if (! exists $params{size} || ! length $params{size}) {
                $params{size}='full';
        }
 
@@ -59,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;
@@ -110,16 +116,14 @@ sub preprocess (@) {
                                $im = Image::Magick->new;
                                $r = $im->Read($outfile);
                                error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
-               
-                               $dwidth = $im->Get("width");
-                               $dheight = $im->Get("height");
                        }
                        else {
                                ($dwidth, $dheight)=($w, $h);
                                $r = $im->Resize(geometry => "${w}x${h}");
                                error sprintf(gettext("failed to resize: %s"), $r) if $r;
 
-                               # don't actually write file in preview mode
+                               # don't actually write resized file in preview mode;
+                               # rely on width and height settings
                                if (! $params{preview}) {
                                        my @blob = $im->ImageToBlob();
                                        writefile($imglink, $config{destdir}, $blob[0], 1);
@@ -128,6 +132,9 @@ sub preprocess (@) {
                                        $imglink = $file;
                                }
                        }
+                       
+                       $dwidth = $im->Get("width") unless defined $dwidth;
+                       $dheight = $im->Get("height") unless defined $dheight;
                }
        }
        else {
@@ -146,23 +153,30 @@ sub preprocess (@) {
                $imgurl=urlto($imglink, $params{destpage});
        }
        else {
-               $fileurl="$config{url}/$file";
-               $imgurl="$config{url}/$imglink";
+               $fileurl=urlto($file);
+               $imgurl=urlto($imglink);
+       }
+
+       if (! exists $params{class}) {
+               $params{class}="img";
        }
 
+       my $attrs='';
+       foreach my $attr (qw{alt title class id hspace vspace}) {
+               if (exists $params{$attr}) {
+                       $attrs.=" $attr=\"$params{$attr}\"";
+               }
+       }
+       
        my $imgtag='<img src="'.$imgurl.
                '" width="'.$dwidth.
                '" height="'.$dheight.'"'.
-               (exists $params{alt} ? ' alt="'.$params{alt}.'"' : '').
-               (exists $params{title} ? ' title="'.$params{title}.'"' : '').
-               (exists $params{class} ? ' class="'.$params{class}.'"' : '').
-               (exists $params{id} ? ' id="'.$params{id}.'"' : '').
+               $attrs.
+               (exists $params{align} && ! exists $params{caption} ? ' align="'.$params{align}.'"' : '').
                ' />';
 
-       my $alignclass=exists $params{align} ? "align-$params{align}" : "";
-
        my $link;
-       if (! defined $params{link} || lc($params{link}) eq 'yes') {
+       if (! defined $params{link}) {
                $link=$fileurl;
        }
        elsif ($params{link} =~ /^\w+:\/\//) {
@@ -170,9 +184,7 @@ sub preprocess (@) {
        }
 
        if (defined $link) {
-               $imgtag='<a href="'.$link.'"'.
-                       (!exists $params{caption} && $alignclass ? ' class="'.$alignclass.'"' : '').
-                       '>'.$imgtag.'</a>';
+               $imgtag='<a href="'.$link.'">'.$imgtag.'</a>';
        }
        else {
                my $b = bestlink($params{page}, $params{link});
@@ -182,15 +194,13 @@ sub preprocess (@) {
                        $imgtag=htmllink($params{page}, $params{destpage},
                                $params{link}, linktext => $imgtag,
                                noimageinline => 1,
-                               (!exists $params{caption} && $alignclass) ?
-                                       (class => $alignclass) : (),
                        );
                }
        }
 
        if (exists $params{caption}) {
                return '<table class="img'.
-                       ($alignclass ? ' '.$alignclass : '').
+                       (exists $params{align} ? " align-$params{align}" : "").
                        '">'.
                        '<caption>'.$params{caption}.'</caption>'.
                        '<tr><td>'.$imgtag.'</td></tr>'.