here be a plugin for processing POD!

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 395890c0e1bcafdebc1ff4b84082026a634b42a0..32023fa97af8ba8e63192cacaff10a4677d20654 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -5,7 +5,7 @@ package IkiWiki::Plugin::img;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my %imgdefaults;
 
@@ -43,7 +43,9 @@ sub preprocess (@) {
                return '';
        }
 
-       push @{$links{$params{page}}}, $image;
+       add_link($params{page}, $image);
+       add_depends($params{page}, $image);
+
        # optimisation: detect scan mode, and avoid generating the image
        if (! defined wantarray) {
                return;
@@ -62,47 +64,81 @@ sub preprocess (@) {
        error gettext("Image::Magick is not installed") if $@;
        my $im = Image::Magick->new;
        my $imglink;
-       my $r;
+       my $r = $im->Read($srcfile);
+       error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
+       
+       my ($dwidth, $dheight);
 
        if ($params{size} ne 'full') {
                my ($w, $h) = ($params{size} =~ /^(\d*)x(\d*)$/);
-               error sprintf(gettext('bad size "%s"'), $params{size})
+               error sprintf(gettext('wrong size format "%s" (should be WxH)'), $params{size})
                        unless (defined $w && defined $h &&
                                (length $w || length $h));
-
-               my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
-               $imglink = "$dir/${w}x${h}-$base";
                
-               will_render($params{page}, $imglink);
-
-               if (-e $outfile && (-M $srcfile >= -M $outfile)) {
-                       $r = $im->Read($outfile);
-                       error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
+               if ((length $w && $w > $im->Get("width")) ||
+                   (length $h && $h > $im->Get("height"))) {
+                       # resizing larger
+                       $imglink = $file;
+
+                       # don't generate larger image, just set display size
+                       if (length $w && length $h) {
+                               ($dwidth, $dheight)=($w, $h);
+                       }
+                       # avoid division by zero on 0x0 image
+                       elsif ($im->Get("width") == 0 || $im->Get("height") == 0) {
+                               ($dwidth, $dheight)=(0, 0);
+                       }
+                       # calculate unspecified size from the other one, preserving
+                       # aspect ratio
+                       elsif (length $w) {
+                               $dwidth=$w;
+                               $dheight=$w / $im->Get("width") * $im->Get("height");
+                       }
+                       elsif (length $h) {
+                               $dheight=$h;
+                               $dwidth=$h / $im->Get("height") * $im->Get("width");
+                       }
                }
                else {
-                       $r = $im->Read($srcfile);
-                       error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
-
-                       $r = $im->Resize(geometry => "${w}x${h}");
-                       error sprintf(gettext("failed to resize: %s"), $r) if $r;
+                       # resizing smaller
+                       my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
+                       $imglink = "$dir/${w}x${h}-$base";
+               
+                       will_render($params{page}, $imglink);
 
-                       # don't actually write file in preview mode
-                       if (! $params{preview}) {
-                               my @blob = $im->ImageToBlob();
-                               writefile($imglink, $config{destdir}, $blob[0], 1);
+                       if (-e $outfile && (-M $srcfile >= -M $outfile)) {
+                               $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 {
-                               $imglink = $file;
+                               ($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
+                               if (! $params{preview}) {
+                                       my @blob = $im->ImageToBlob();
+                                       writefile($imglink, $config{destdir}, $blob[0], 1);
+                               }
+                               else {
+                                       $imglink = $file;
+                               }
                        }
                }
        }
        else {
-               $r = $im->Read($srcfile);
-               error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
                $imglink = $file;
+               $dwidth = $im->Get("width");
+               $dheight = $im->Get("height");
+       }
+       
+       if (! defined($dwidth) || ! defined($dheight)) {
+               error sprintf(gettext("failed to determine size of image %s"), $file)
        }
-
-       add_depends($imglink, $params{page});
 
        my ($fileurl, $imgurl);
        if (! $params{preview}) {
@@ -114,15 +150,12 @@ sub preprocess (@) {
                $imgurl="$config{url}/$imglink";
        }
 
-       if (! defined($im->Get("width")) || ! defined($im->Get("height"))) {
-               error sprintf(gettext("failed to determine size of image %s"), $file)
-       }
-
        my $imgtag='<img src="'.$imgurl.
-               '" alt="'.(exists $params{alt} ? $params{alt} : '').
-               '" width="'.$im->Get("width").
-               '" height="'.$im->Get("height").'"'.
+               '" width="'.$dwidth.
+               '" height="'.$dheight.'"'.
+               (exists $params{alt} ? ' alt="'.$params{alt}.'"' : '').
                (exists $params{title} ? ' title="'.$params{title}.'"' : '').
+               (exists $params{align} ? ' align="'.$params{align}.'"' : '').
                (exists $params{class} ? ' class="'.$params{class}.'"' : '').
                (exists $params{id} ? ' id="'.$params{id}.'"' : '').
                ' />';
@@ -133,11 +166,15 @@ sub preprocess (@) {
        elsif ($params{link} =~ /^\w+:\/\//) {
                $imgtag='<a href="'.$params{link}.'">'.$imgtag.'</a>';
        }
-       elsif (length bestlink($params{page}, $params{link})) {
-               add_depends($params{page}, $params{link});
-               $imgtag=htmllink($params{page}, $params{destpage},
-                       $params{link}, linktext => $imgtag,
-                       noimageinline => 1);
+       else {
+               my $b = bestlink($params{page}, $params{link});
+       
+               if (length $b) {
+                       add_depends($params{page}, $b, deptype("presence"));
+                       $imgtag=htmllink($params{page}, $params{destpage},
+                               $params{link}, linktext => $imgtag,
+                               noimageinline => 1);
+               }
        }
 
        if (exists $params{caption}) {