Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index dd613fd035d3fc57267497e9840deecad59bebc0..f7a322317f549b9affb08730c53e685710f5930f 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -9,11 +9,11 @@ use warnings;
 use strict;
 use IkiWiki;
 
 use strict;
 use IkiWiki;
 

-sub import { #{{{
+sub import {

        IkiWiki::Setup::merge($_[1]);
        IkiWiki::Setup::merge($_[1]);

-} #}}}
+}

 
 

-sub dumpline ($$$$) { #{{{
+sub dumpline ($$$$) {

        my $key=shift;
        my $value=shift;
        my $type=shift;
        my $key=shift;
        my $value=shift;
        my $type=shift;


@@ -26,15 +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;
        if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {
                # avoid quotes
                $dumpedvalue=$value;
        }
        
        my $dumpedvalue;
        if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {
                # avoid quotes
                $dumpedvalue=$value;
        }

-       elsif (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);


@@ -53,16 +55,16 @@ sub dumpline ($$$$) { #{{{
        }
        
        return "\t$prefix$key => $dumpedvalue,";
        }
        
        return "\t$prefix$key => $dumpedvalue,";

-} #}}}
+}

 
 

-sub dumpvalues ($@) { #{{{
+sub dumpvalues ($@) {

        my $setup=shift;
        my @ret;
        while (@_) {
                my $key=shift;
                my %info=%{shift()};
 
        my $setup=shift;
        my @ret;
        while (@_) {
                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};
                


@@ -78,22 +80,40 @@ sub dumpvalues ($@) { #{{{
                }
        }
        return @ret;
                }
        }
        return @ret;

-} #}}}
+}

 
 

-sub gendump ($) { #{{{
+sub gendump ($) {

        my $description=shift;
        my %setup=(%config);
        my @ret;
        
        # disable logging to syslog while dumping
        my $description=shift;
        my %setup=(%config);
        my @ret;
        
        # disable logging to syslog while dumping

-       $config{syslog}=0;
+       $config{syslog}=undef;

 
 

+       eval q{use Text::Wrap};
+       die $@ if $@;
+
+       my %section_plugins;

        push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
        foreach my $pair (IkiWiki::Setup::getsetup()) {
                my $plugin=$pair->[0];
                my $setup=$pair->[1];
        push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
        foreach my $pair (IkiWiki::Setup::getsetup()) {
                my $plugin=$pair->[0];
                my $setup=$pair->[1];

-               push @ret, "", "\t# $plugin plugin";
-               push @ret, dumpvalues(\%setup, @{$setup});
+               my %s=@{$setup};
+               my $section=$s{plugin}->{section};
+               push @{$section_plugins{$section}}, $plugin;
+               if (@{$section_plugins{$section}} == 1) {
+                       push @ret, "", "\t".("#" x 70), "\t# $section plugins",
+                               sub {
+                                       wrap("\t#   (", "\t#    ",
+                                               join(", ", @{$section_plugins{$section}})).")"
+                               },
+                               "\t".("#" x 70);
+               }
+
+               my @values=dumpvalues(\%setup, @{$setup});
+               if (@values) {
+                       push @ret, "", "\t# $plugin plugin", @values;
+               }

        }
 
        unshift @ret,
        }
 
        unshift @ret,


@@ -107,7 +127,7 @@ sub gendump ($) { #{{{
                "use IkiWiki::Setup::Standard {";
        push @ret, "}";
 
                "use IkiWiki::Setup::Standard {";
        push @ret, "}";
 

-       return @ret;
-} #}}}
+       return map { ref $_ ? $_->() : $_ } @ret;
+}

 
 1
 
 1