X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cb8d1c86425999eb3572326679fae9a033664150..15424d405b8736fa2568c12f7cfca94f34dcf07a:/IkiWiki/Plugin/teximg.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/teximg.pm b/IkiWiki/Plugin/teximg.pm
index 0753a9a77..369c10882 100644
--- a/IkiWiki/Plugin/teximg.pm
+++ b/IkiWiki/Plugin/teximg.pm
@@ -11,9 +11,18 @@ use HTML::Entities;
 use IkiWiki 2.00;
 
 sub import { #{{{
+	hook(type => "getsetup", id => "teximg", call => \&getsetup);
 	hook(type => "preprocess", id => "teximg", call => \&preprocess);
 } #}}}
 
+sub getsetup () { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+} #}}}
+
 sub preprocess (@) { #{{{
 	my %params = @_;
 	
@@ -27,14 +36,14 @@ sub preprocess (@) { #{{{
 	
 	my $code = $params{code};
 	if (! defined $code && ! length $code) {
-		return "[[teximg ".gettext("missing tex code"). "]]";
+		error gettext("missing tex code");
 	}
 
 	if (check($code)) {
 		return create($code, check_height($height), \%params);
 	}
 	else {
-		return "[[teximg ".gettext("code includes disallowed latex commands"). "]]";
+		error gettext("code includes disallowed latex commands")
 	}
 } #}}}
 
@@ -76,7 +85,7 @@ sub create ($$$) { #{{{
 	will_render($params->{page}, $imglog);
 
 	my $imgurl=urlto($imglink, $params->{destpage});
-	my $logurl=urlto($imglink, $params->{destpage});
+	my $logurl=urlto($imglog, $params->{destpage});
 	
 	if (-e "$config{destdir}/$imglink" ||
 	    gen_image($code, $height, $digest, $params->{page})) {
@@ -85,7 +94,7 @@ sub create ($$$) { #{{{
 			.qq{" class="teximg" />};
 	}
 	else {
-		return qq{[[teximg <a href="$logurl">}.gettext("failed to generate image from code")."</a>]]";
+		error qq{<a href="$logurl">}.gettext("failed to generate image from code")."</a>";
 	}
 } #}}}
 
@@ -119,12 +128,13 @@ sub gen_image ($$$$) { #{{{
 	}
 	else {
 		# store failure log
-		my $log;
+		my $log="";
 		{
-			open(my $f, '<', "$tmp/$digest.log");
-			local $/=undef;
-			$log = <$f>;
-			close($f);
+			if (open(my $f, '<', "$tmp/$digest.log")) {
+				local $/=undef;
+				$log = <$f>;
+				close($f);
+			}
 		}
 		writefile("$digest.log", "$config{destdir}/$imagedir", $log);