Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index 5d666e1be68d854e8c4e00f96c627de699521859..20b419413094f5f7dbbbd16ec78efca947da3e01 100644 (file)
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -9,9 +9,18 @@ use IkiWiki 2.00;
 use IPC::Open2;
 
 sub import { #{{{
 use IPC::Open2;
 
 sub import { #{{{

+       hook(type => "getsetup", id => "graphviz", call => \&getsetup);

        hook(type => "preprocess", id => "graph", call => \&graph);
 } # }}}
 
        hook(type => "preprocess", id => "graph", call => \&graph);
 } # }}}
 

+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+

 my %graphviz_programs = (
        "dot" => 1, "neato" => 1, "fdp" => 1, "twopi" => 1, "circo" => 1
 );
 my %graphviz_programs = (
        "dot" => 1, "neato" => 1, "fdp" => 1, "twopi" => 1, "circo" => 1
 );


@@ -41,7 +50,6 @@ sub render_graph (\%) { #{{{
                $pid=open2(*IN, *OUT, "$params{prog} -Tpng");
 
                # open2 doesn't respect "use open ':utf8'"
                $pid=open2(*IN, *OUT, "$params{prog} -Tpng");
 
                # open2 doesn't respect "use open ':utf8'"

-               binmode (IN, ':utf8');

                binmode (OUT, ':utf8');
 
                print OUT $src;
                binmode (OUT, ':utf8');
 
                print OUT $src;


@@ -56,7 +64,7 @@ sub render_graph (\%) { #{{{
 
                waitpid $pid, 0;
                $SIG{PIPE}="DEFAULT";
 
                waitpid $pid, 0;
                $SIG{PIPE}="DEFAULT";

-               return  "[[graph ".gettext("failed to run graphviz")."]]" if ($sigpipe);
+               error gettext("failed to run graphviz") if $sigpipe;

 
                if (! $params{preview}) {
                        writefile($dest, $config{destdir}, $png, 1);
 
                if (! $params{preview}) {
                        writefile($dest, $config{destdir}, $png, 1);


@@ -70,7 +78,12 @@ sub render_graph (\%) { #{{{
                }
        }
 
                }
        }
 

-       return "<img src=\"".urlto($dest, $params{page})."\" />\n";
+       if ($params{preview}) {
+               return "<img src=\"".urlto($dest, "")."\" />\n";
+       }
+       else {
+               return "<img src=\"".urlto($dest, $params{destpage})."\" />\n";
+       }

 } #}}}
 
 sub graph (@) { #{{{
 } #}}}
 
 sub graph (@) { #{{{


@@ -78,7 +91,7 @@ sub graph (@) { #{{{
        $params{src} = "" unless defined $params{src};
        $params{type} = "digraph" unless defined $params{type};
        $params{prog} = "dot" unless defined $params{prog};
        $params{src} = "" unless defined $params{src};
        $params{type} = "digraph" unless defined $params{type};
        $params{prog} = "dot" unless defined $params{prog};

-       return "[[graph ".gettext("prog not a valid graphviz program")."]]" unless $graphviz_programs{$params{prog}};
+       error gettext("prog not a valid graphviz program") unless $graphviz_programs{$params{prog}};

 
        return render_graph(%params);
 } # }}}
 
        return render_graph(%params);
 } # }}}