Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/polygen.pm b/IkiWiki/Plugin/polygen.pm
index 82fd575a78e5b921e1c73977626ff11d44825b4f..fa564aa86d1841fd13a7e31d0db5b105e3093e3f 100644 (file)
--- a/IkiWiki/Plugin/polygen.pm
+++ b/IkiWiki/Plugin/polygen.pm
@@ -7,14 +7,22 @@ package IkiWiki::Plugin::polygen;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 use File::Find;
 
 sub import { #{{{
-       IkiWiki::hook(type => "preprocess", id => "polygen",
-               call => \&preprocess);
+       hook(type => "getsetup", id => "polygen", call => \&getsetup);
+       hook(type => "preprocess", id => "polygen", call => \&preprocess);
 } # }}}
 
+sub getsetup () { #{{{
+       return 
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+
 sub preprocess (@) { #{{{
        my %params=@_;
        my $grammar = ($params{grammar} or 'polygen');
@@ -22,6 +30,7 @@ sub preprocess (@) { #{{{
 
        # Sanitize parameters
        $grammar =~ IkiWiki::basename($grammar);
+       $grammar =~ s/[^A-Za-z0-9]//g;
        $grammar =~ s/\.grm$//;
        $grammar .= '.grm';
        $symbol =~ s/[^A-Za-z0-9]//g if defined $symbol;
@@ -29,7 +38,7 @@ sub preprocess (@) { #{{{
 
        my $grmfile = '/usr/share/polygen/ita/polygen.grm';
        if (! -d '/usr/share/polygen') {
-               return "[[polygen not installed]]";
+               error gettext("polygen not installed");
        }
        find({wanted => sub {
                        if (substr($File::Find::name, -length($grammar)) eq $grammar) {
@@ -48,10 +57,10 @@ sub preprocess (@) { #{{{
        }
 
        if ($?) {
-               $res="[[polygen failed]]";
+               error gettext("command failed");
        }
 
-       # Strip trainling spaces and newlines so that we flow well with the
+       # Strip trailing spaces and newlines so that we flow well with the
        # markdown text
        $res =~ s/\s*$//;
        return $res;