Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index 021aa6b230c2a61b0a2289d2bbccc4e83abe4ae6..23631da300509c9ced74dcfc4eb58ab14dd91e2b 100644 (file)
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -8,15 +8,24 @@ use strict;
 use IkiWiki 2.00;
 use IPC::Open2;
 
 use IkiWiki 2.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,
+               },
+}

 
 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
 );
 

-sub render_graph (\%) { #{{{
+sub render_graph (\%) {

        my %params = %{(shift)};
 
        my $src = "$params{type} g {\n";
        my %params = %{(shift)};
 
        my $src = "$params{type} g {\n";


@@ -75,9 +84,9 @@ sub render_graph (\%) { #{{{
        else {
                return "<img src=\"".urlto($dest, $params{destpage})."\" />\n";
        }
        else {
                return "<img src=\"".urlto($dest, $params{destpage})."\" />\n";
        }

-} #}}}
+}

 
 

-sub graph (@) { #{{{
+sub graph (@) {

        my %params=@_;
        $params{src} = "" unless defined $params{src};
        $params{type} = "digraph" unless defined $params{type};
        my %params=@_;
        $params{src} = "" unless defined $params{src};
        $params{type} = "digraph" unless defined $params{type};


@@ -85,6 +94,6 @@ sub graph (@) { #{{{
        error gettext("prog not a valid graphviz program") unless $graphviz_programs{$params{prog}};
 
        return render_graph(%params);
        error gettext("prog not a valid graphviz program") unless $graphviz_programs{$params{prog}};
 
        return render_graph(%params);

-} # }}}
+}

 
 1
 
 1