From ecfb14f7d115596441fbcbee6757ff76002def67 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 8 Jun 2008 00:02:33 -0400 Subject: Don't generate empty title attributes, etc, and allow setting defaults for class and id too. --- IkiWiki/Plugin/img.pm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'IkiWiki') diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index c4e0fdd89..cc0e84b01 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -17,21 +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} || ''; - my $caption = $params{caption} || $imgdefaults{$params{page}}->{caption} || ''; if ($image eq 'defaults') { - $imgdefaults{$params{page}} = { - size => $size, - alt => $alt, - title => $title, - caption => $caption, - }; + $imgdefaults{$params{page}} = \%params; return ''; } @@ -52,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"; @@ -106,9 +105,10 @@ sub preprocess (@) { #{{{ } my $imgtag=''.$alt.''; @@ -126,9 +126,9 @@ sub preprocess (@) { #{{{ noimageinline => 1); } - if (defined $caption) { + if (exists $params{caption}) { return ''. - ''. + ''. ''. '
'.$caption.''.$params{caption}.'
'.$imgtag.'
'; } -- cgit v1.2.3