X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7cb620d0e8ed922184d3f1cc38d849665cf8d742..154c4ea9e:/IkiWiki/Plugin/img.pm?ds=inline
diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index e2f541506..b92e24cc0 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';
}
@@ -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,13 @@ 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,10 @@ sub preprocess (@) {
$imglink = $file;
}
}
+
+ # always get the true size of the resized image
+ $dwidth = $im->Get("width");
+ $dheight = $im->Get("height");
}
}
else {
@@ -146,39 +153,55 @@ 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='';
- 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});
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,
- noimageinline => 1);
+ noimageinline => 1,
+ );
}
}
if (exists $params{caption}) {
- return '
'.$imgtag.' |