rename plugins/contrib/i18nheadinganchor.mdwn to plugins/contrib/i18nheadinganchors...

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 8b0bc22799dab625b9d5f8c411f8d34a93add084..07a66f3db279eabf6907c842e986b4c35095d3d5 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,70 +1,74 @@
 #!/usr/bin/perl
 #!/usr/bin/perl

-# Standard ikiwiki setup module.
-# Parameters to import should be all the standard ikiwiki config stuff,
-# plus an array of wrappers to set up.

 
 package IkiWiki::Setup::Standard;
 
 use warnings;
 use strict;
 
 package IkiWiki::Setup::Standard;
 
 use warnings;
 use strict;

+use IkiWiki;

 
 

-sub import { #{{{
-       $IkiWiki::Setup::raw_setup=$_[1];
-} #}}}
+# Parameters to import should be all the standard ikiwiki config, in a hash.
+sub import {
+       IkiWiki::Setup::merge($_[1]);
+}

 
 

-sub generate (@) { #{{{
-       my %setup=@_;
+sub gendump ($@) {
+       my $class=shift;

 
 

+       my $thisperl = eval q{use Config; $Config{perlpath}};
+       error($@) if $@;
+
+       "#!$thisperl",
+       "#",
+       (map { "# $_" } @_),
+       "use IkiWiki::Setup::Standard {",
+       IkiWiki::Setup::commented_dump(\&dumpline, "\t"),
+       "}"
+}
+
+sub dumpline ($$$$) {
+       my $key=shift;
+       my $value=shift;
+       my $type=shift;
+       my $prefix=shift;
+       

        eval q{use Data::Dumper};
        error($@) if $@;
        eval q{use Data::Dumper};
        error($@) if $@;

+       no warnings 'once';

        local $Data::Dumper::Terse=1;
        local $Data::Dumper::Indent=1;
        local $Data::Dumper::Pad="\t";
        local $Data::Dumper::Sortkeys=1;
        local $Data::Dumper::Quotekeys=0;
        local $Data::Dumper::Terse=1;
        local $Data::Dumper::Indent=1;
        local $Data::Dumper::Pad="\t";
        local $Data::Dumper::Sortkeys=1;
        local $Data::Dumper::Quotekeys=0;

-
-       my @ret="#!/usr/bin/perl
-# Setup file for ikiwiki.
-# Passing this to ikiwiki --setup will make ikiwiki generate wrappers and
-# build the wiki.
-#
-# Remember to re-run ikiwiki --setup any time you edit this file.
-
-use IkiWiki::Setup::Standard {";
-
-       foreach my $id (sort keys %{$IkiWiki::hooks{getsetup}}) {
-               my @setup=$IkiWiki::hooks{getsetup}{$id}{call}->();
-               return unless @setup;
-               push @ret, "\t# $id plugin";
-               while (@setup) {
-                       my $key=shift @setup;
-                       my %info=%{shift @setup};
-       
-                       push @ret, "\t# ".$info{description} if exists $info{description};
+       # only the perl version preserves utf-8 in output
+       local $Data::Dumper::Useperl=1;
+       use warnings;

        
        

-                       my $value=undef;
-                       my $prefix="#";
-                       if (exists $setup{$key} && defined $setup{$key}) {
-                               $value=$setup{$key};
-                               $prefix="";
-                       }
-                       elsif (exists $info{default}) {
-                               $value=$info{default};
-                       }
-                       elsif (exists $info{example}) {
-                               $value=$info{example};
+       my $dumpedvalue;
+       if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {
+               # avoid quotes
+               $dumpedvalue=$value;
+       }
+       elsif (ref $value eq 'ARRAY' && @$value && ! grep { /[^\S]/ } @$value) {
+               # dump simple array as qw{}
+               $dumpedvalue="[qw{".join(" ", @$value)."}]";
+       }
+       else {
+               $dumpedvalue=Dumper($value);
+               chomp $dumpedvalue;
+               if (length $prefix) {
+                       # add to second and subsequent lines
+                       my @lines=split(/\n/, $dumpedvalue);
+                       $dumpedvalue="";
+                       for (my $x=0; $x <= $#lines; $x++) {
+                               $lines[$x] =~ s/^\t//;
+                               $dumpedvalue.="\t".($x ? $prefix : "").$lines[$x]."\n";

                        }
                        }

-       
-                       my $dumpedvalue=Dumper($value);
-                       chomp $dumpedvalue;
-                       $dumpedvalue=~/^\t//;
-                       push @ret, "\t$prefix$key=$dumpedvalue,";

                }
                }

-               push @ret, "";
+               $dumpedvalue=~s/^\t//;
+               chomp $dumpedvalue;

        }
        }

-
-       push @ret, "}";
-       return @ret;
-} #}}}
+       
+       return "\t$prefix$key => $dumpedvalue,";
+}

 
 1
 
 1