Merge commit 'schmonz/master' into cvs

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

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index b13d15fa6350aadd237494350dd1c8949bf72700..32e994d6b96c4d10dce2998db005ac22729a7ce5 100644 (file)
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -5,18 +5,27 @@ package IkiWiki::Plugin::graphviz;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 use IPC::Open2;
 
 use IPC::Open2;
 

-sub import { #{{{
+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
 );
 

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

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


@@ -36,7 +45,7 @@ sub render_graph (\%) { #{{{
 
        if (! -e "$config{destdir}/$dest") {
                my $pid;
 
        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");
 
                $SIG{PIPE}=sub { $sigpipe=1 };
                $pid=open2(*IN, *OUT, "$params{prog} -Tpng");
 


@@ -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