X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f6b47b0d1c67228f13242864a50827b40abb320c..3096c8ea69783b1c1cfbf5b9f940d2939d2a33f5:/IkiWiki/Plugin/img.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index c4e0fdd89..17a9367d3 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 '';
 	}
 
@@ -47,14 +46,14 @@ sub preprocess (@) { #{{{
 	my $base = IkiWiki::basename($file);
 
 	eval q{use Image::Magick};
-	error($@) if $@;
+	error gettext("Image::Magick is 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+)$/);
+		error sprintf(gettext('bad size "%s"'), $params{size})
 			unless (defined $w && defined $h);
 
 		my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
@@ -64,14 +63,14 @@ sub preprocess (@) { #{{{
 
 		if (-e $outfile && (-M srcfile($file) >= -M $outfile)) {
 			$r = $im->Read($outfile);
-			return "[[img ".sprintf(gettext("failed to read %s: %s"), $outfile, $r)."]]" if $r;
+			error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
 		}
 		else {
 			$r = $im->Read(srcfile($file));
-			return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
+			error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
 
 			$r = $im->Resize(geometry => "${w}x${h}");
-			return "[[img ".sprintf(gettext("failed to resize: %s"), $r)."]]" if $r;
+			error sprintf(gettext("failed to resize: %s"), $r) if $r;
 
 			# don't actually write file in preview mode
 			if (! $params{preview}) {
@@ -85,7 +84,7 @@ sub preprocess (@) { #{{{
 	}
 	else {
 		$r = $im->Read(srcfile($file));
-		return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
+		error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
 		$imglink = $file;
 	}
 
@@ -102,13 +101,14 @@ sub preprocess (@) { #{{{
 	}
 
 	if (! defined($im->Get("width")) || ! defined($im->Get("height"))) {
-		return "[[img ".sprintf(gettext("failed to determine size of image %s"), $file)."]]";
+		error sprintf(gettext("failed to determine size of image %s"), $file)
 	}
 
 	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").'"'.
-		(defined $title ? ' title="'.$title.'"' : '').
+		(exists $params{title} ? ' title="'.$params{title}.'"' : '').
 		(exists $params{class} ? ' class="'.$params{class}.'"' : '').
 		(exists $params{id} ? ' id="'.$params{id}.'"' : '').
 		' />';
@@ -126,9 +126,9 @@ sub preprocess (@) { #{{{
 			noimageinline => 1);
 	}
 
-	if (defined $caption) {
+	if (exists $params{caption}) {
 		return '<table class="img">'.
-			'<caption>'.$caption.'</caption>'.
+			'<caption>'.$params{caption}.'</caption>'.
 			'<tr><td>'.$imgtag.'</td></tr>'.
 			'</table>';
 	}