X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7647109bac71f0930717fe90f8eab4bd24960c6a..43c647edd31c224e0ca07785ef1ac7e856639c09:/IkiWiki/Plugin/img.pm?ds=inline diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index abc7e099a..cc0e84b01 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -17,19 +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} || ''; - my $title = $params{title} || $imgdefaults{$params{page}}->{title} || ''; if ($image eq 'defaults') { - $imgdefaults{$params{page}} = { - size => $size, - alt => $alt, - title => $title, - }; + $imgdefaults{$params{page}} = \%params; return ''; } @@ -50,9 +51,9 @@ 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"; @@ -104,25 +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.' |