X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f7bdc2385d3ec8060f00d5ceb3b45f3cc4760e38..de468ba12dfc0891145b3f8b432eb97b70b60c0c:/IkiWiki/Plugin/img.pm
diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index c5b86bad8..cc0e84b01 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -17,17 +17,20 @@ sub preprocess (@) { #{{{
my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
my %params=@_;
- if (! exists $imgdefaults{$params{page}}) {
- $imgdefaults{$params{page}} = {};
+ if (exists $imgdefaults{$params{page}}) {
+ foreach my $key (keys %{$imgdefaults{$params{page}}}) {
+ if (! exists $params{$key}) {
+ $params{$key}=$imgdefaults{$params{page}}->{$key};
+ }
+ }
+ }
+
+ if (! exists $params{size}) {
+ $params{size}='full';
}
- my $size = $params{size} || $imgdefaults{$params{page}}->{size} || 'full';
- my $alt = $params{alt} || $imgdefaults{$params{page}}->{alt} || '';
if ($image eq 'defaults') {
- $imgdefaults{$params{page}} = {
- size => $size,
- alt => $alt,
- };
+ $imgdefaults{$params{page}} = \%params;
return '';
}
@@ -39,7 +42,7 @@ sub preprocess (@) { #{{{
my $file = bestlink($params{page}, $image);
- my $dir = $params{destpage};
+ my $dir = $params{page};
my $base = IkiWiki::basename($file);
eval q{use Image::Magick};
@@ -48,15 +51,15 @@ sub preprocess (@) { #{{{
my $imglink;
my $r;
- if ($size ne 'full') {
- my ($w, $h) = ($size =~ /^(\d+)x(\d+)$/);
- return "[[img ".sprintf(gettext('bad size "%s"'), $size)."]]"
+ if ($params{size} ne 'full') {
+ my ($w, $h) = ($params{size} =~ /^(\d+)x(\d+)$/);
+ return "[[img ".sprintf(gettext('bad size "%s"'), $params{size})."]]"
unless (defined $w && defined $h);
my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
$imglink = "$dir/${w}x${h}-$base";
- will_render($params{destpage}, $imglink);
+ will_render($params{page}, $imglink);
if (-e $outfile && (-M srcfile($file) >= -M $outfile)) {
$r = $im->Read($outfile);
@@ -102,24 +105,33 @@ sub preprocess (@) { #{{{
}
my $imgtag='';
if (! defined $params{link} || lc($params{link}) eq 'yes') {
- return ''.$imgtag.'';
+ $imgtag=''.$imgtag.'';
}
elsif ($params{link} =~ /^\w+:\/\//) {
- return ''.$imgtag.'';
+ $imgtag=''.$imgtag.'';
}
elsif (length bestlink($params{page}, $params{link})) {
add_depends($params{page}, $params{link});
- return htmllink($params{page}, $params{destpage},
+ $imgtag=htmllink($params{page}, $params{destpage},
$params{link}, linktext => $imgtag,
noimageinline => 1);
}
+
+ if (exists $params{caption}) {
+ return '
'.$imgtag.' |