X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/3d82d47e1896b8e64c1e22b09a05968fc481aebf..bf577d34c79ebe48efdf06ed826f9109e196cc6d:/IkiWiki/Setup/Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index d96964a23..951bcfc56 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -9,11 +9,11 @@ use warnings;
 use strict;
 use IkiWiki;
 
-sub import { #{{{
-	$IkiWiki::Setup::raw_setup=$_[1];
-} #}}}
+sub import {
+	IkiWiki::Setup::merge($_[1]);
+}
 
-sub dumpline ($$$$) { #{{{
+sub dumpline ($$$$) {
 	my $key=shift;
 	my $value=shift;
 	my $type=shift;
@@ -26,16 +26,17 @@ sub dumpline ($$$$) { #{{{
 	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') {
+	if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {
 		# 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{}
-		$dumpedvalue="[qw{ ".join(" ", @$value)." }]";
+		$dumpedvalue="[qw{".join(" ", @$value)."}]";
 	}
 	else {
 		$dumpedvalue=Dumper($value);
@@ -54,16 +55,16 @@ sub dumpline ($$$$) { #{{{
 	}
 	
 	return "\t$prefix$key => $dumpedvalue,";
-} #}}}
+}
 
-sub dumpvalues ($@) { #{{{
+sub dumpvalues ($@) {
 	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};
 		
@@ -74,39 +75,31 @@ sub dumpvalues ($@) { #{{{
 		elsif (exists $info{example}) {
 			push @ret, dumpline($key, $info{example}, $info{type}, "#");
 		}
+		else {
+			push @ret, dumpline($key, "", $info{type}, "#");
+		}
 	}
 	return @ret;
-} #}}}
+}
 
-sub gendump ($) { #{{{
+sub gendump ($) {
 	my $description=shift;
 	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",
@@ -119,6 +112,6 @@ sub gendump ($) { #{{{
 	push @ret, "}";
 
 	return @ret;
-} #}}}
+}
 
 1