Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/polygen.pm b/IkiWiki/Plugin/polygen.pm
index a32003778303870515ff1cf026e56a897839989c..8ce62b754fa6161c51d94b30e4957c6d9b1d38c9 100644 (file)
--- a/IkiWiki/Plugin/polygen.pm
+++ b/IkiWiki/Plugin/polygen.pm
@@ -7,7 +7,7 @@ package IkiWiki::Plugin::polygen;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 use File::Find;
 
 sub import {
 use File::Find;
 
 sub import {


@@ -20,6 +20,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => undef,
                plugin => {
                        safe => 1,
                        rebuild => undef,

+                       section => "widget",

                },
 }
 
                },
 }
 


@@ -27,6 +28,7 @@ sub preprocess (@) {
        my %params=@_;
        my $grammar = ($params{grammar} or 'polygen');
        my $symbol = ($params{symbol} or undef);
        my %params=@_;
        my $grammar = ($params{grammar} or 'polygen');
        my $symbol = ($params{symbol} or undef);

+       my $options = ($config{deterministic} ? '-seed 42' : '');

 
        # Sanitize parameters
        $grammar =~ IkiWiki::basename($grammar);
 
        # Sanitize parameters
        $grammar =~ IkiWiki::basename($grammar);


@@ -50,10 +52,10 @@ sub preprocess (@) {
        
        my $res;
        if (defined $symbol) {
        
        my $res;
        if (defined $symbol) {

-               $res = `polygen -S $symbol $grmfile 2>/dev/null`;
+               $res = `polygen -S $symbol $options $grmfile 2>/dev/null`;

        }
        else {
        }
        else {

-               $res = `polygen $grmfile 2>/dev/null`;
+               $res = `polygen $options $grmfile 2>/dev/null`;

        }
 
        if ($?) {
        }
 
        if ($?) {