release candidate

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 9ae85c4e682839d7a2179785e1c4e504d6ecc866..17a58ca7a476b9b01e953d5ce10ce6c3200f8e7b 100644 (file)
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -19,6 +19,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => undef,
                plugin => {
                        safe => 1,
                        rebuild => undef,

+                       section => "widget",

                },
 }
 
                },
 }
 


@@ -26,6 +27,10 @@ sub preprocess (@) {
        my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
        my %params=@_;
 
        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}) {
        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';
        }
 
                $params{size}='full';
        }
 


@@ -44,6 +49,7 @@ sub preprocess (@) {
        }
 
        add_link($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) {
 
        # optimisation: detect scan mode, and avoid generating the image
        if (! defined wantarray) {


@@ -58,129 +64,146 @@ sub preprocess (@) {
 
        my $dir = $params{page};
        my $base = IkiWiki::basename($file);
 
        my $dir = $params{page};
        my $base = IkiWiki::basename($file);

+       my $issvg = $base=~s/\.svg$/.png/i;
+       my $ispdf = $base=~s/\.pdf$/.png/i;
+       my $pagenumber = exists($params{pagenumber}) ? int($params{pagenumber}) : 0;
+       if ($pagenumber != 0) {
+               $base = "p$pagenumber-$base";
+       }

 
        eval q{use Image::Magick};
        error gettext("Image::Magick is not installed") if $@;
 
        eval q{use Image::Magick};
        error gettext("Image::Magick is not installed") if $@;

-       my $im = Image::Magick->new;
+       my $im = Image::Magick->new();

        my $imglink;
        my $imglink;

-       my $r;
+       my $imgdatalink;
+       my $r = $im->Read("$srcfile\[$pagenumber]");
+       error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;

 
 

-       my ($dwidth, $dheight);
+       if (! defined $im->Get("width") || ! defined $im->Get("height")) {
+               error sprintf(gettext("failed to get dimensions of %s"), $file);
+       }

 
 

-       if ($params{size} ne 'full') {
-               add_depends($params{page}, $image);
+       my ($dwidth, $dheight);

 
 

+       if ($params{size} eq 'full') {
+               $dwidth = $im->Get("width");
+               $dheight = $im->Get("height");
+       } else {

                my ($w, $h) = ($params{size} =~ /^(\d*)x(\d*)$/);
                error sprintf(gettext('wrong size format "%s" (should be WxH)'), $params{size})
                        unless (defined $w && defined $h &&
                                (length $w || length $h));
 
                my ($w, $h) = ($params{size} =~ /^(\d*)x(\d*)$/);
                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";
-               
+               if ($im->Get("width") == 0 || $im->Get("height") == 0) {
+                       ($dwidth, $dheight)=(0, 0);
+               } elsif (! length $w || (length $h && $im->Get("height")*$w > $h * $im->Get("width"))) {
+                       # using height because only height is given or ...
+                       # because original image is more portrait than $w/$h
+                       # ... slimness of $im > $h/w
+                       # ... $im->Get("height")/$im->Get("width") > $h/$w
+                       # ... $im->Get("height")*$w > $h * $im->Get("width")
+
+                       $dheight=$h;
+                       $dwidth=$h / $im->Get("height") * $im->Get("width");
+               } else { # (! length $h) or $w is what determines the resized size
+                       $dwidth=$w;
+                       $dheight=$w / $im->Get("width") * $im->Get("height");
+               }
+       }
+
+       if ($dwidth < $im->Get("width") || $ispdf) {
+               # resize down, or resize to pixels at all
+
+               my $outfile = "$config{destdir}/$dir/$params{size}-$base";
+               $imglink = "$dir/$params{size}-$base";
+

                will_render($params{page}, $imglink);
 
                if (-e $outfile && (-M $srcfile >= -M $outfile)) {
                will_render($params{page}, $imglink);
 
                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;
                }
                else {
                        $r = $im->Read($outfile);
                        error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
                }
                else {

-                       $r = $im->Read($srcfile);
-                       error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
-
-                       # don't resize any larger
-                       my ($rw, $rh) = ($w, $h);
-                       if ((length $rw && $rw > $im->Get("width")) ||
-                           (length $rh && $rh > $im->Get("height"))) {
-                               $rw=$im->Get("width");
-                               $rh=$im->Get("height");
-                       }
-
-                       $r = $im->Resize(geometry => "${rw}x${rh}");
+                       $r = $im->Resize(geometry => "${dwidth}x${dheight}");

                        error sprintf(gettext("failed to resize: %s"), $r) if $r;
 
                        error sprintf(gettext("failed to resize: %s"), $r) if $r;
 

-                       # don't actually write file in preview mode
+                       $im->set(($issvg || $ispdf) ? (magick => 'png') : ());
+                       my @blob = $im->ImageToBlob();
+                       # don't actually write resized file in preview mode;
+                       # rely on width and height settings

                        if (! $params{preview}) {
                        if (! $params{preview}) {

-                               my @blob = $im->ImageToBlob();

                                writefile($imglink, $config{destdir}, $blob[0], 1);
                        }
                        else {
                                writefile($imglink, $config{destdir}, $blob[0], 1);
                        }
                        else {

-                               $imglink = $file;
+                               eval q{use MIME::Base64};
+                               error($@) if $@;
+                               $imgdatalink = "data:image/".$im->Get("magick").";base64,".encode_base64($blob[0]);

                        }
                }
 
                        }
                }
 

-               # since we don't really resize larger, set the display
-               # size, so the browser can scale the image up if necessary
-               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;
-               $imglink = $file;
-               $dwidth = $im->Get("width");
+               # always get the true size of the resized image (it could be
+               # that imagemagick did its calculations differently)
+               $dwidth  = $im->Get("width");

                $dheight = $im->Get("height");
                $dheight = $im->Get("height");

+       } else {
+               $imglink = $file;
+       }
+       
+       if (! defined($dwidth) || ! defined($dheight)) {
+               error sprintf(gettext("failed to determine size of image %s"), $file)

        }
 
        my ($fileurl, $imgurl);
        }
 
        my ($fileurl, $imgurl);

-       if (! $params{preview}) {
-               $fileurl=urlto($file, $params{destpage});
-               $imgurl=urlto($imglink, $params{destpage});
-       }
-       else {
-               $fileurl="$config{url}/$file";
-               $imgurl="$config{url}/$imglink";
-       }
+       my $urltobase = $params{preview} ? undef : $params{destpage};
+       $fileurl=urlto($file, $urltobase);
+       $imgurl=$imgdatalink ? $imgdatalink : urlto($imglink, $urltobase);

 
 

-       if (! defined($im->Get("width")) || ! defined($im->Get("height"))) {
-               error sprintf(gettext("failed to determine size of image %s"), $file)
+       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.'"'.
        my $imgtag='<img src="'.$imgurl.
                '" 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}.'"' : '').
+               $attrs.
+               (exists $params{align} && ! exists $params{caption} ? ' align="'.$params{align}.'"' : '').

                ' />';
 
                ' />';
 

-       if (! defined $params{link} || lc($params{link}) eq 'yes') {
-               $imgtag='<a href="'.$fileurl.'">'.$imgtag.'</a>';
+       my $link;
+       if (! defined $params{link}) {
+               $link=$fileurl;

        }
        elsif ($params{link} =~ /^\w+:\/\//) {
        }
        elsif ($params{link} =~ /^\w+:\/\//) {

-               $imgtag='<a href="'.$params{link}.'">'.$imgtag.'</a>';
+               $link=$params{link};
+       }
+
+       if (defined $link) {
+               $imgtag='<a href="'.$link.'">'.$imgtag.'</a>';

        }
        else {
                my $b = bestlink($params{page}, $params{link});
        
                if (length $b) {
        }
        else {
                my $b = bestlink($params{page}, $params{link});
        
                if (length $b) {

-                       add_depends($params{page}, $b);
+                       add_depends($params{page}, $b, deptype("presence"));

                        $imgtag=htmllink($params{page}, $params{destpage},
                                $params{link}, linktext => $imgtag,
                        $imgtag=htmllink($params{page}, $params{destpage},
                                $params{link}, linktext => $imgtag,

-                               noimageinline => 1);
+                               noimageinline => 1,
+                       );

                }
        }
 
        if (exists $params{caption}) {
                }
        }
 
        if (exists $params{caption}) {

-               return '<table class="img">'.
+               return '<table class="img'.
+                       (exists $params{align} ? " align-$params{align}" : "").
+                       '">'.

                        '<caption>'.$params{caption}.'</caption>'.
                        '<tr><td>'.$imgtag.'</td></tr>'.
                        '</table>';
                        '<caption>'.$params{caption}.'</caption>'.
                        '<tr><td>'.$imgtag.'</td></tr>'.
                        '</table>';