X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/330bbd03df8f41cf6e8036dbfc764dabddcd6715..7cb620d0e8ed922184d3f1cc38d849665cf8d742:/IkiWiki/Plugin/img.pm

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index cff9dabf0..e2f541506 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -5,82 +5,140 @@ package IkiWiki::Plugin::img;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my %imgdefaults;
 
-sub import { #{{{
+sub import {
+	hook(type => "getsetup", id => "img", call => \&getsetup);
 	hook(type => "preprocess", id => "img", call => \&preprocess, scan => 1);
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+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 '';
 	}
 
-	push @{$links{$params{page}}}, $image;
+	add_link($params{page}, $image);
+	add_depends($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 = $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);
-
-		my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
-		$imglink = "$dir/${w}x${h}-$base";
+	my $r = $im->Read($srcfile);
+	error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
+	
+	my ($dwidth, $dheight);
+
+	if ($params{size} ne 'full') {
+		my ($w, $h) = ($params{size} =~ /^(\d*)x(\d*)$/);
+		error sprintf(gettext('wrong size format "%s" (should be WxH)'), $params{size})
+			unless (defined $w && defined $h &&
+			        (length $w || length $h));
 		
-		will_render($params{page}, $imglink);
-
-		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;
+		if ((length $w && $w > $im->Get("width")) ||
+		    (length $h && $h > $im->Get("height"))) {
+		    	# resizing larger
+			$imglink = $file;
+
+			# don't generate larger image, just set display size
+			if (length $w && length $h) {
+				($dwidth, $dheight)=($w, $h);
+			}
+			# avoid division by zero on 0x0 image
+			elsif ($im->Get("width") == 0 || $im->Get("height") == 0) {
+				($dwidth, $dheight)=(0, 0);
+			}
+			# calculate unspecified size from the other one, preserving
+			# aspect ratio
+			elsif (length $w) {
+				$dwidth=$w;
+				$dheight=$w / $im->Get("width") * $im->Get("height");
+			}
+			elsif (length $h) {
+				$dheight=$h;
+				$dwidth=$h / $im->Get("height") * $im->Get("width");
+			}
 		}
 		else {
-			$r = $im->Read(srcfile($file));
-			return "[[img ".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;
+			# resizing smaller
+			my $outfile = "$config{destdir}/$dir/${w}x${h}-$base";
+			$imglink = "$dir/${w}x${h}-$base";
+		
+			will_render($params{page}, $imglink);
 
-			# don't actually write file in preview mode
-			if (! $params{preview}) {
-				my @blob = $im->ImageToBlob();
-				writefile($imglink, $config{destdir}, $blob[0], 1);
+			if (-e $outfile && (-M $srcfile >= -M $outfile)) {
+				$im = Image::Magick->new;
+				$r = $im->Read($outfile);
+				error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
+		
+				$dwidth = $im->Get("width");
+				$dheight = $im->Get("height");
 			}
 			else {
-				$imglink = $file;
+				($dwidth, $dheight)=($w, $h);
+				$r = $im->Resize(geometry => "${w}x${h}");
+				error sprintf(gettext("failed to resize: %s"), $r) if $r;
+
+				# don't actually write file in preview mode
+				if (! $params{preview}) {
+					my @blob = $im->ImageToBlob();
+					writefile($imglink, $config{destdir}, $blob[0], 1);
+				}
+				else {
+					$imglink = $file;
+				}
 			}
 		}
 	}
 	else {
-		$r = $im->Read(srcfile($file));
-		return "[[img ".sprintf(gettext("failed to read %s: %s"), $file, $r)."]]" if $r;
 		$imglink = $file;
+		$dwidth = $im->Get("width");
+		$dheight = $im->Get("height");
+	}
+	
+	if (! defined($dwidth) || ! defined($dheight)) {
+		error sprintf(gettext("failed to determine size of image %s"), $file)
 	}
-
-	add_depends($imglink, $params{page});
 
 	my ($fileurl, $imgurl);
 	if (! $params{preview}) {
@@ -92,16 +150,42 @@ sub preprocess (@) { #{{{
 		$imgurl="$config{url}/$imglink";
 	}
 
-	if (! defined($im->Get("width")) || ! defined($im->Get("height"))) {
-		return "[[img ".sprintf(gettext("failed to determine size of image %s"), $file)."]]";
-	}
-
-	return '<a href="'.$fileurl.'"><img src="'.$imgurl.
-		'" alt="'.$alt.'" width="'.$im->Get("width").
-		'" height="'.$im->Get("height").'"'.
+	my $imgtag='<img src="'.$imgurl.
+		'" width="'.$dwidth.
+		'" height="'.$dheight.'"'.
+		(exists $params{alt} ? ' alt="'.$params{alt}.'"' : '').
+		(exists $params{title} ? ' title="'.$params{title}.'"' : '').
+		(exists $params{align} ? ' align="'.$params{align}.'"' : '').
 		(exists $params{class} ? ' class="'.$params{class}.'"' : '').
 		(exists $params{id} ? ' id="'.$params{id}.'"' : '').
-		' /></a>';
-} #}}}
+		' />';
+
+	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>';
+	}
+	else {
+		my $b = bestlink($params{page}, $params{link});
+	
+		if (length $b) {
+			add_depends($params{page}, $b);
+			$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