X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1f95e9b4d953ffdcb496bd9e995aefedc4a33f0e..46eb410220f0ad50c07693f746e0f38481aa194b:/IkiWiki/Plugin/img.pm?ds=inline
diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 32023fa97..2375ead89 100644
--- 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';
}
@@ -110,16 +115,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 +131,9 @@ sub preprocess (@) {
$imglink = $file;
}
}
+
+ $dwidth = $im->Get("width") unless defined $dwidth;
+ $dheight = $im->Get("height") unless defined $dheight;
}
}
else {
@@ -150,21 +156,37 @@ sub preprocess (@) {
$imgurl="$config{url}/$imglink";
}
+ if (exists $params{class}) {
+ $params{class}.=" img";
+ }
+ else {
+ $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='';
- if (! defined $params{link} || lc($params{link}) eq 'yes') {
- $imgtag=''.$imgtag.'';
+ my $link;
+ if (! defined $params{link}) {
+ $link=$fileurl;
}
elsif ($params{link} =~ /^\w+:\/\//) {
- $imgtag=''.$imgtag.'';
+ $link=$params{link};
+ }
+
+ if (defined $link) {
+ $imgtag=''.$imgtag.'';
}
else {
my $b = bestlink($params{page}, $params{link});
@@ -173,12 +195,15 @@ sub preprocess (@) {
add_depends($params{page}, $b, deptype("presence"));
$imgtag=htmllink($params{page}, $params{destpage},
$params{link}, linktext => $imgtag,
- noimageinline => 1);
+ noimageinline => 1,
+ );
}
}
if (exists $params{caption}) {
- return '
'.$imgtag.' |