* Allow preprocessor directives to contain python-like triple-quoted

[git.ikiwiki.info.git] / IkiWiki / Setup / Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 9883b922a5514da91ce5d820dfe2da2bca148f06..b76c87b8e9ccf4b17c83c8e32dd88821e98016d6 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -19,17 +19,34 @@ package IkiWiki;
 sub setup_standard {
        my %setup=%{$_[1]};
 
 sub setup_standard {
        my %setup=%{$_[1]};
 

-       if (! $config{refresh}) {
+       $setup{plugin}=$config{plugin};
+       if (exists $setup{add_plugins}) {
+               push @{$setup{plugin}}, @{$setup{add_plugins}};
+               delete $setup{add_plugins};
+       }
+       if (exists $setup{disable_plugins}) {
+               foreach my $plugin (@{$setup{disable_plugins}}) {
+                       $setup{plugin}=[grep { $_ ne $plugin } @{$setup{plugin}}];
+               }
+               delete $setup{disable_plugins};
+       }
+       if (exists $setup{exclude}) {
+               $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/;
+       }
+
+       if (! $config{refresh} || $config{wrappers}) {

                debug("generating wrappers..");
                debug("generating wrappers..");

+               my @wrappers=@{$setup{wrappers}};
+               delete $setup{wrappers};

                my %startconfig=(%config);
                my %startconfig=(%config);

-               foreach my $wrapper (@{$setup{wrappers}}) {
+               foreach my $wrapper (@wrappers) {

                        %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
                        checkconfig();
                        gen_wrapper();
                }
                %config=(%startconfig);
                        %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
                        checkconfig();
                        gen_wrapper();
                }
                %config=(%startconfig);

-               delete $config{wrappers};

        }
        }

+       

        foreach my $c (keys %setup) {
                if (defined $setup{$c}) {
                        if (! ref $setup{$c}) {
        foreach my $c (keys %setup) {
                if (defined $setup{$c}) {
                        if (! ref $setup{$c}) {


@@ -52,6 +69,7 @@ sub setup_standard {
                debug("refreshing wiki..");
        }
 
                debug("refreshing wiki..");
        }
 

+       loadplugins();

        checkconfig();
        lockwiki();
        loadindex();
        checkconfig();
        lockwiki();
        loadindex();