Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index d1c53c0645c242dd5c3c4974156d66c00607f819..e6bff2826ff73497385d1dbd332c2bb842fc110d 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -10,7 +10,7 @@ use strict;
 use IkiWiki;
 
 sub import { #{{{
 use IkiWiki;
 
 sub import { #{{{

-       $IkiWiki::Setup::raw_setup=$_[1];
+       IkiWiki::Setup::merge($_[1]);

 } #}}}
 
 sub dumpline ($$$$) { #{{{
 } #}}}
 
 sub dumpline ($$$$) { #{{{


@@ -26,16 +26,17 @@ sub dumpline ($$$$) { #{{{
        local $Data::Dumper::Pad="\t";
        local $Data::Dumper::Sortkeys=1;
        local $Data::Dumper::Quotekeys=0;
        local $Data::Dumper::Pad="\t";
        local $Data::Dumper::Sortkeys=1;
        local $Data::Dumper::Quotekeys=0;

+       # only the perl version preserves utf-8 in output
+       local $Data::Dumper::Useperl=1;

        
        my $dumpedvalue;
        
        my $dumpedvalue;

-       if ($type eq 'boolean' || $type eq 'integer') {
+       if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {

                # avoid quotes
                $dumpedvalue=$value;
        }
                # avoid quotes
                $dumpedvalue=$value;
        }

-       elsif ($type eq 'string' && ref $value eq 'ARRAY' && @$value &&
-           ! grep { /[^-A-Za-z0-9_]/ } @$value) {
+       elsif (ref $value eq 'ARRAY' && @$value && ! grep { /[^\S]/ } @$value) {

                # dump simple array as qw{}
                # dump simple array as qw{}

-               $dumpedvalue="[qw{ ".join(" ", @$value)." }]";
+               $dumpedvalue="[qw{".join(" ", @$value)."}]";

        }
        else {
                $dumpedvalue=Dumper($value);
        }
        else {
                $dumpedvalue=Dumper($value);


@@ -63,7 +64,7 @@ sub dumpvalues ($@) { #{{{
                my $key=shift;
                my %info=%{shift()};
 
                my $key=shift;
                my %info=%{shift()};
 

-               next if $info{type} eq "internal";
+               next if $key eq "plugin" || $info{type} eq "internal";

                
                push @ret, "\t# ".$info{description} if exists $info{description};
                
                
                push @ret, "\t# ".$info{description} if exists $info{description};
                


@@ -71,12 +72,12 @@ sub dumpvalues ($@) { #{{{
                        push @ret, dumpline($key, $setup->{$key}, $info{type}, "");
                        delete $setup->{$key};
                }
                        push @ret, dumpline($key, $setup->{$key}, $info{type}, "");
                        delete $setup->{$key};
                }

-               elsif (exists $info{default} && defined $info{default}) {
-                       push @ret, dumpline($key, $info{default}, $info{type}, "#");
-               }

                elsif (exists $info{example}) {
                        push @ret, dumpline($key, $info{example}, $info{type}, "#");
                }
                elsif (exists $info{example}) {
                        push @ret, dumpline($key, $info{example}, $info{type}, "#");
                }

+               else {
+                       push @ret, dumpline($key, "", $info{type}, "#");
+               }

        }
        return @ret;
 } #}}}
        }
        return @ret;
 } #}}}


@@ -86,30 +87,19 @@ sub gendump ($) { #{{{
        my %setup=(%config);
        my @ret;
        
        my %setup=(%config);
        my @ret;
        

-       push @ret, "\t# basic setup";
-       push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
+       # disable logging to syslog while dumping
+       $config{syslog}=undef;

 
 

-       # Load all plugins, so that all setup options are available.
-       my @plugins=grep { ! /externaldemo|pythondemo/ } sort(IkiWiki::listplugins());
-       foreach my $plugin (@plugins) {
-               eval { IkiWiki::loadplugin($plugin) };
-               if (exists $IkiWiki::hooks{checkconfig}{$plugin}{call}) {
-                       my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() };
+       push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
+       foreach my $pair (IkiWiki::Setup::getsetup()) {
+               my $plugin=$pair->[0];
+               my $setup=$pair->[1];
+               my @values=dumpvalues(\%setup, @{$setup});
+               if (@values) {
+                       push @ret, "", "\t# $plugin plugin", @values;

                }
        }
                }
        }

-       unshift @plugins, $config{rcs} if $config{rcs};

 
 

-       foreach my $id (@plugins) {
-               my $title="\t# $id".($id ne $config{rcs} ? " plugin" : "");
-               if (exists $IkiWiki::hooks{getsetup}{$id}{call}) {
-                       # use an array rather than a hash, to preserve order
-                       my @s=eval { $IkiWiki::hooks{getsetup}{$id}{call}->() };
-                       next unless @s;
-                       push @ret, "", $title;
-                       push @ret, dumpvalues(\%setup, @s);
-               }
-       }
-       

        unshift @ret,
                "#!/usr/bin/perl",
                "# $description",
        unshift @ret,
                "#!/usr/bin/perl",
                "# $description",