X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ee1ad53c4c2710aa7ded61bdc56f3a8cce514f22..a28559798ad8c60e79fe80f109dd8e63204cd208:/IkiWiki/Plugin/img.pm

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 7226231a0..7b89ab673 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -10,60 +10,81 @@ use IkiWiki 2.00;
 my %imgdefaults;
 
 sub import { #{{{
-	hook(type => "preprocess", id => "img", call => \&preprocess);
+	hook(type => "getsetup", id => "img", call => \&getsetup);
+	hook(type => "preprocess", id => "img", call => \&preprocess, scan => 1);
+} #}}}
+
+sub getsetup () { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
 } #}}}
 
 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 '';
 	}
 
-	add_depends($params{page}, $image);
-	my $file = bestlink($params{page}, $image)
-		|| return "[[img ".sprintf(gettext("%s not found"), $image)."]]";
+	push @{$links{$params{page}}}, $image;
+	# optimisation: detect scan mode, and avoid generating the image
+	if (! defined wantarray) {
+		return;
+	}
+
+	my $file = bestlink($params{page}, $image);
+	my $srcfile = srcfile($file, 1);
+	if (! length $file || ! defined $srcfile) {
+		return htmllink($params{page}, $params{destpage}, $image);
+	}
 
-	my $dir = IkiWiki::dirname($file);
+	my $dir = $params{page};
 	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)."]]"
-			unless (defined $w && defined $h);
+	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 &&
+			        (length $w || length $h));
 
 		my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
 		$imglink = "$dir/${w}x${h}-$base";
-				
+		
 		will_render($params{page}, $imglink);
 
-		if (-e $outfile && (-M srcfile($file) >= -M $outfile)) {
+		if (-e $outfile && (-M $srcfile >= -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;
+			$r = $im->Read($srcfile);
+			error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
 
 			$r = $im->Resize(geometry => "${w}x${h}");
-			return "[[img ".sprinftf(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}) {
@@ -76,8 +97,8 @@ sub preprocess (@) { #{{{
 		}
 	}
 	else {
-		$r = $im->Read(srcfile($file));
-		return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
+		$r = $im->Read($srcfile);
+		error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
 		$imglink = $file;
 	}
 
@@ -93,9 +114,41 @@ sub preprocess (@) { #{{{
 		$imgurl="$config{url}/$imglink";
 	}
 
-	return '<a href="'.$fileurl.'"><img src="'.$imgurl.
-		'" alt="'.$alt.'" width="'.$im->Get("width").
-		'" height="'.$im->Get("height").'" /></a>';
+	if (! defined($im->Get("width")) || ! defined($im->Get("height"))) {
+		error sprintf(gettext("failed to determine size of image %s"), $file)
+	}
+
+	my $imgtag='<img src="'.$imgurl.
+		'" 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') {
+		$imgtag='<a href="'.$fileurl.'">'.$imgtag.'</a>';
+	}
+	elsif ($params{link} =~ /^\w+:\/\//) {
+		$imgtag='<a href="'.$params{link}.'">'.$imgtag.'</a>';
+	}
+	elsif (length bestlink($params{page}, $params{link})) {
+		add_depends($params{page}, $params{link});
+		$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;
+	}
 } #}}}
 
 1