X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0d7bc7402c9a5e922ee3eb1b093e689756b001ff..911184432d1ccbeb1bcee224efba99f558ba74d5:/IkiWiki/Plugin/graphviz.pm
diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index 021aa6b23..c91c92fec 100644
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -5,18 +5,28 @@ package IkiWiki::Plugin::graphviz;
use warnings;
use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
use IPC::Open2;
-sub import { #{{{
- hook(type => "preprocess", id => "graphviz", call => \&graph);
-} # }}}
+sub import {
+ hook(type => "getsetup", id => "graphviz", call => \&getsetup);
+ hook(type => "preprocess", id => "graph", call => \&graph);
+}
+
+sub getsetup () {
+ return
+ plugin => {
+ safe => 1,
+ rebuild => undef,
+ section => "widget",
+ },
+}
my %graphviz_programs = (
"dot" => 1, "neato" => 1, "fdp" => 1, "twopi" => 1, "circo" => 1
);
-sub render_graph (\%) { #{{{
+sub render_graph (\%) {
my %params = %{(shift)};
my $src = "$params{type} g {\n";
@@ -36,7 +46,7 @@ sub render_graph (\%) { #{{{
if (! -e "$config{destdir}/$dest") {
my $pid;
- my $sigpipe=0;;
+ my $sigpipe=0;
$SIG{PIPE}=sub { $sigpipe=1 };
$pid=open2(*IN, *OUT, "$params{prog} -Tpng");
@@ -69,15 +79,10 @@ sub render_graph (\%) { #{{{
}
}
- if ($params{preview}) {
- return "\n";
- }
- else {
- return "\n";
- }
-} #}}}
+ return "\n";
+}
-sub graph (@) { #{{{
+sub graph (@) {
my %params=@_;
$params{src} = "" unless defined $params{src};
$params{type} = "digraph" unless defined $params{type};
@@ -85,6 +90,6 @@ sub graph (@) { #{{{
error gettext("prog not a valid graphviz program") unless $graphviz_programs{$params{prog}};
return render_graph(%params);
-} # }}}
+}
1