(no commit message)

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

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index a697fea198d1ba7c2b386a704b3971ff30894a7a..103f6b2b3510067f10a5eddf86f8e657ba96fe29 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,8 @@ 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) {
                return;
        # optimisation: detect scan mode, and avoid generating the image
        if (! defined wantarray) {
                return;


@@ -62,47 +69,82 @@ sub preprocess (@) {
        error gettext("Image::Magick is not installed") if $@;
        my $im = Image::Magick->new;
        my $imglink;
        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*)$/);
 
        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));
                        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 {
                }
                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;

                        }
                        else {
                        }
                        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 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);
+                               }
+                               else {
+                                       $imglink = $file;
+                               }

                        }
                        }

+                       
+                       $dwidth = $im->Get("width") unless defined $dwidth;
+                       $dheight = $im->Get("height") unless defined $dheight;

                }
        }
        else {
                }
        }
        else {

-               $r = $im->Read($srcfile);
-               error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;

                $imglink = $file;
                $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}) {
 
        my ($fileurl, $imgurl);
        if (! $params{preview}) {


@@ -110,38 +152,55 @@ sub preprocess (@) {
                $imgurl=urlto($imglink, $params{destpage});
        }
        else {
                $imgurl=urlto($imglink, $params{destpage});
        }
        else {

-               $fileurl="$config{url}/$file";
-               $imgurl="$config{url}/$imglink";
+               $fileurl=urlto($file);
+               $imgurl=urlto($imglink);

        }
 
        }
 

-       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.
        my $imgtag='<img src="'.$imgurl.

-               '" width="'.$im->Get("width").
-               '" height="'.$im->Get("height").'"'.
-               (exists $params{alt} ? '" alt="'.$params{alt}.'"' : '').
-               (exists $params{title} ? ' title="'.$params{title}.'"' : '').
-               (exists $params{class} ? ' class="'.$params{class}.'"' : '').
-               (exists $params{id} ? ' id="'.$params{id}.'"' : '').
+               '" width="'.$dwidth.
+               '" height="'.$dheight.'"'.
+               $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>';

        }
        }

-       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}) {
        }
 
        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>';