Merge branch 'master' into pedigree

[git.ikiwiki.info.git] / IkiWiki / Plugin / teximg.pm

diff --git a/IkiWiki/Plugin/teximg.pm b/IkiWiki/Plugin/teximg.pm
index fc890666ae32e8c548bdff2fe40270852b06563c..6a6bdd4fa404739789eadd065cad4c8c34e4082f 100644 (file)
--- a/IkiWiki/Plugin/teximg.pm
+++ b/IkiWiki/Plugin/teximg.pm
@@ -27,14 +27,14 @@ sub preprocess (@) { #{{{
        
        my $code = $params{code};
        if (! defined $code && ! length $code) {
        
        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 {
        }
 
        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")

        }
 } #}}}
 
        }
 } #}}}
 


@@ -70,31 +70,22 @@ sub create ($$$) { #{{{
 
        my $digest = md5_hex($code, $height);
 
 
        my $digest = md5_hex($code, $height);
 

-       my $teximgdir = "/teximg";
-       my $imglink = "$teximgdir/$digest.png";
-       my $imglog = "$teximgdir/$digest.log";
-       will_render($params->{destpage}, $imglink);
-       will_render($params->{destpage}, $imglog);
-
-       my $imgurl;
-       my $logurl;
-       if (! $params->{preview}) {
-               $imgurl = urlto($imglink, $params->{destpage});
-               $logurl = urlto($imglog, $params->{destpage});
-       }
-       else {
-               $imgurl="$config{url}/$teximgdir/$digest.png";
-               $logurl="$config{url}/$teximgdir/$digest.log";
-       }
+       my $imglink= $params->{page} . "/$digest.png";
+       my $imglog =  $params->{page} .  "/$digest.log";
+       will_render($params->{page}, $imglink);
+       will_render($params->{page}, $imglog);
+
+       my $imgurl=urlto($imglink, $params->{destpage});
+       my $logurl=urlto($imglog, $params->{destpage});

        
        if (-e "$config{destdir}/$imglink" ||
        
        if (-e "$config{destdir}/$imglink" ||

-           gen_image($code, $height, $digest, $teximgdir)) {
+           gen_image($code, $height, $digest, $params->{page})) {

                return qq{<img src="$imgurl" alt="}
                        .(exists $params->{alt} ? $params->{alt} : encode_entities($code))
                        .qq{" class="teximg" />};
        }
        else {
                return qq{<img src="$imgurl" alt="}
                        .(exists $params->{alt} ? $params->{alt} : encode_entities($code))
                        .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>";

        }
 } #}}}
 
        }
 } #}}}
 


@@ -128,12 +119,13 @@ sub gen_image ($$$$) { #{{{
        }
        else {
                # store failure log
        }
        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);
 
                }
                writefile("$digest.log", "$config{destdir}/$imagedir", $log);