Error handling improvement for preprocess hooks. It's now safe to call error() from...

[git.ikiwiki.info.git] / IkiWiki / Plugin / img.pm

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index b6e7c9e41db20db9639ec7927a2994a0560a799e..49e1d57d61b49a3eb0faa7740a2a3a5c74fd744b 100644 (file)
--- 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 '';
        }
 
@@ -43,14 +46,14 @@ sub preprocess (@) { #{{{
        my $base = IkiWiki::basename($file);
 
        eval q{use Image::Magick};
-       error($@) if $@;
+       return "[[img ".gettext("Image::Magick not installed")."]]" if $@;
        my $im = Image::Magick->new;
        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";
@@ -102,24 +105,33 @@ sub preprocess (@) { #{{{
        }
 
        my $imgtag='<img src="'.$imgurl.
-               '" alt="'.$alt.'" width="'.$im->Get("width").
+               '" alt="'.(exists $params{alt} ? $params{alt} : '').
+               '" width="'.$im->Get("width").
                '" height="'.$im->Get("height").'"'.
+               (exists $params{title} ? ' title="'.$params{title}.'"' : '').
                (exists $params{class} ? ' class="'.$params{class}.'"' : '').
                (exists $params{id} ? ' id="'.$params{id}.'"' : '').
                ' />';
 
        if (! defined $params{link} || lc($params{link}) eq 'yes') {
-               return  '<a href="'.$fileurl.'">'.$imgtag.'</a>';
+               $imgtag='<a href="'.$fileurl.'">'.$imgtag.'</a>';
        }
        elsif ($params{link} =~ /^\w+:\/\//) {
-               return  '<a href="'.$params{link}.'">'.$imgtag.'</a>';
+               $imgtag='<a href="'.$params{link}.'">'.$imgtag.'</a>';
        }
        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 '<table class="img">'.
+                       '<caption>'.$params{caption}.'</caption>'.
+                       '<tr><td>'.$imgtag.'</td></tr>'.
+                       '</table>';
+       }
        else {
                return $imgtag;
        }