X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/e68cce6d1d51a513f54ab7d7e77e7c249aad3c06..80b244d857584c7cc4092e00265b62568c2a681e:/IkiWiki/Plugin/img.pm

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index 83f003629..17a58ca7a 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -19,6 +19,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
 }
 
@@ -26,6 +27,10 @@ sub preprocess (@) {
 	my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint
 	my %params=@_;
 
+	if (! defined $image) {
+		error("bad image filename");
+	}
+
 	if (exists $imgdefaults{$params{page}}) {
 		foreach my $key (keys %{$imgdefaults{$params{page}}}) {
 			if (! exists $params{$key}) {
@@ -34,7 +39,7 @@ sub preprocess (@) {
 		}
 	}
 
-	if (! exists $params{size}) {
+	if (! exists $params{size} || ! length $params{size}) {
 		$params{size}='full';
 	}
 
@@ -59,81 +64,90 @@ sub preprocess (@) {
 
 	my $dir = $params{page};
 	my $base = IkiWiki::basename($file);
+	my $issvg = $base=~s/\.svg$/.png/i;
+	my $ispdf = $base=~s/\.pdf$/.png/i;
+	my $pagenumber = exists($params{pagenumber}) ? int($params{pagenumber}) : 0;
+	if ($pagenumber != 0) {
+		$base = "p$pagenumber-$base";
+	}
 
 	eval q{use Image::Magick};
 	error gettext("Image::Magick is not installed") if $@;
-	my $im = Image::Magick->new;
+	my $im = Image::Magick->new();
 	my $imglink;
-	my $r = $im->Read($srcfile);
+	my $imgdatalink;
+	my $r = $im->Read("$srcfile\[$pagenumber]");
 	error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
-	
+
+	if (! defined $im->Get("width") || ! defined $im->Get("height")) {
+		error sprintf(gettext("failed to get dimensions of %s"), $file);
+	}
+
 	my ($dwidth, $dheight);
 
-	if ($params{size} ne 'full') {
+	if ($params{size} eq 'full') {
+		$dwidth = $im->Get("width");
+		$dheight = $im->Get("height");
+	} else {
 		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));
-		
-		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");
-			}
+
+		if ($im->Get("width") == 0 || $im->Get("height") == 0) {
+			($dwidth, $dheight)=(0, 0);
+		} elsif (! length $w || (length $h && $im->Get("height")*$w > $h * $im->Get("width"))) {
+			# using height because only height is given or ...
+			# because original image is more portrait than $w/$h
+			# ... slimness of $im > $h/w
+			# ... $im->Get("height")/$im->Get("width") > $h/$w
+			# ... $im->Get("height")*$w > $h * $im->Get("width")
+
+			$dheight=$h;
+			$dwidth=$h / $im->Get("height") * $im->Get("width");
+		} else { # (! length $h) or $w is what determines the resized size
+			$dwidth=$w;
+			$dheight=$w / $im->Get("width") * $im->Get("height");
+		}
+	}
+
+	if ($dwidth < $im->Get("width") || $ispdf) {
+		# resize down, or resize to pixels at all
+
+		my $outfile = "$config{destdir}/$dir/$params{size}-$base";
+		$imglink = "$dir/$params{size}-$base";
+
+		will_render($params{page}, $imglink);
+
+		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;
 		}
 		else {
-			# resizing smaller
-			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 >= -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");
+			$r = $im->Resize(geometry => "${dwidth}x${dheight}");
+			error sprintf(gettext("failed to resize: %s"), $r) if $r;
+
+			$im->set(($issvg || $ispdf) ? (magick => 'png') : ());
+			my @blob = $im->ImageToBlob();
+			# don't actually write resized file in preview mode;
+			# rely on width and height settings
+			if (! $params{preview}) {
+				writefile($imglink, $config{destdir}, $blob[0], 1);
 			}
 			else {
-				($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;
-				}
+				eval q{use MIME::Base64};
+				error($@) if $@;
+				$imgdatalink = "data:image/".$im->Get("magick").";base64,".encode_base64($blob[0]);
 			}
 		}
-	}
-	else {
-		$imglink = $file;
-		$dwidth = $im->Get("width");
+
+		# always get the true size of the resized image (it could be
+		# that imagemagick did its calculations differently)
+		$dwidth  = $im->Get("width");
 		$dheight = $im->Get("height");
+	} else {
+		$imglink = $file;
 	}
 	
 	if (! defined($dwidth) || ! defined($dheight)) {
@@ -141,39 +155,38 @@ sub preprocess (@) {
 	}
 
 	my ($fileurl, $imgurl);
-	if (! $params{preview}) {
-		$fileurl=urlto($file, $params{destpage});
-		$imgurl=urlto($imglink, $params{destpage});
-	}
-	else {
-		$fileurl="$config{url}/$file";
-		$imgurl="$config{url}/$imglink";
+	my $urltobase = $params{preview} ? undef : $params{destpage};
+	$fileurl=urlto($file, $urltobase);
+	$imgurl=$imgdatalink ? $imgdatalink : urlto($imglink, $urltobase);
+
+	if (! exists $params{class}) {
+		$params{class}="img";
 	}
 
+	my $attrs='';
+	foreach my $attr (qw{alt title class id hspace vspace}) {
+		if (exists $params{$attr}) {
+			$attrs.=" $attr=\"$params{$attr}\"";
+		}
+	}
+	
 	my $imgtag='<img src="'.$imgurl.
 		'" width="'.$dwidth.
 		'" height="'.$dheight.'"'.
-		(exists $params{alt} ? ' alt="'.$params{alt}.'"' : '').
-		(exists $params{title} ? ' title="'.$params{title}.'"' : '').
-		(exists $params{class} ? ' class="'.$params{class}.'"' : '').
-		(exists $params{id} ? ' id="'.$params{id}.'"' : '').
+		$attrs.
+		(exists $params{align} && ! exists $params{caption} ? ' align="'.$params{align}.'"' : '').
 		' />';
 
-	if (! defined $params{link} || lc($params{link}) eq 'yes') {
-		if (exists $params{caption} || !exists $params{align}) {
-			$imgtag='<a href="'.$fileurl.'">'.$imgtag.'</a>';
-		}
-		else {
-			$imgtag='<a href="'.$fileurl.'" class="align-'.$params{align}.'">'.$imgtag.'</a>';
-		}
+	my $link;
+	if (! defined $params{link}) {
+		$link=$fileurl;
 	}
 	elsif ($params{link} =~ /^\w+:\/\//) {
-		if (exists $params{caption} || !exists $params{align}) {
-			$imgtag='<a href="'.$params{link}.'">'.$imgtag.'</a>';
-		}
-		else {
-			$imgtag='<a href="'.$params{link}.'" class="align-'.$params{align}.'">'.$imgtag.'</a>';
-		}
+		$link=$params{link};
+	}
+
+	if (defined $link) {
+		$imgtag='<a href="'.$link.'">'.$imgtag.'</a>';
 	}
 	else {
 		my $b = bestlink($params{page}, $params{link});
@@ -183,14 +196,13 @@ sub preprocess (@) {
 			$imgtag=htmllink($params{page}, $params{destpage},
 				$params{link}, linktext => $imgtag,
 				noimageinline => 1,
-				(exists $params{caption} || !exists $params{align}) ?
-					() : (class => 'align-'.$params{align}));
+			);
 		}
 	}
 
 	if (exists $params{caption}) {
 		return '<table class="img'.
-			(exists $params{align} ? ' align-'.$params{align} : '').
+			(exists $params{align} ? " align-$params{align}" : "").
 			'">'.
 			'<caption>'.$params{caption}.'</caption>'.
 			'<tr><td>'.$imgtag.'</td></tr>'.