X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/330bbd03df8f41cf6e8036dbfc764dabddcd6715..d02e350a69635c3d8e7c30cf51dc446936c6cbf1:/IkiWiki/Plugin/img.pm
diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index cff9dabf0..b6e7c9e41 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -32,6 +32,11 @@ sub preprocess (@) { #{{{
}
push @{$links{$params{page}}}, $image;
+ # optimisation: detect scan mode, and avoid generating the image
+ if (! defined wantarray) {
+ return;
+ }
+
my $file = bestlink($params{page}, $image);
my $dir = $params{page};
@@ -62,7 +67,7 @@ sub preprocess (@) { #{{{
return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
$r = $im->Resize(geometry => "${w}x${h}");
- return "[[img ".sprinftf(gettext("failed to resize: %s"), $r)."]]" if $r;
+ return "[[img ".sprintf(gettext("failed to resize: %s"), $r)."]]" if $r;
# don't actually write file in preview mode
if (! $params{preview}) {
@@ -96,12 +101,28 @@ sub preprocess (@) { #{{{
return "[[img ".sprintf(gettext("failed to determine size of image %s"), $file)."]]";
}
- return '';
+ ' />';
+
+ if (! defined $params{link} || lc($params{link}) eq 'yes') {
+ return ''.$imgtag.'';
+ }
+ elsif ($params{link} =~ /^\w+:\/\//) {
+ return ''.$imgtag.'';
+ }
+ elsif (length bestlink($params{page}, $params{link})) {
+ add_depends($params{page}, $params{link});
+ return htmllink($params{page}, $params{destpage},
+ $params{link}, linktext => $imgtag,
+ noimageinline => 1);
+ }
+ else {
+ return $imgtag;
+ }
} #}}}
1