X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/018321f2c8d2f130c2968642c3b9cae7378841ef..adcc349d89ada08c106f39ecb9338e3cde9668a8:/IkiWiki/Setup/Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index e77b20ffd..951bcfc56 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -9,11 +9,11 @@ use warnings;
 use strict;
 use IkiWiki;
 
-sub import { #{{{
+sub import {
 	IkiWiki::Setup::merge($_[1]);
-} #}}}
+}
 
-sub dumpline ($$$$) { #{{{
+sub dumpline ($$$$) {
 	my $key=shift;
 	my $value=shift;
 	my $type=shift;
@@ -26,13 +26,15 @@ 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') && $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{}
 		$dumpedvalue="[qw{".join(" ", @$value)."}]";
 	}
@@ -53,9 +55,9 @@ sub dumpline ($$$$) { #{{{
 	}
 	
 	return "\t$prefix$key => $dumpedvalue,";
-} #}}}
+}
 
-sub dumpvalues ($@) { #{{{
+sub dumpvalues ($@) {
 	my $setup=shift;
 	my @ret;
 	while (@_) {
@@ -78,15 +80,15 @@ sub dumpvalues ($@) { #{{{
 		}
 	}
 	return @ret;
-} #}}}
+}
 
-sub gendump ($) { #{{{
+sub gendump ($) {
 	my $description=shift;
 	my %setup=(%config);
 	my @ret;
 	
 	# disable logging to syslog while dumping
-	$config{syslog}=0;
+	$config{syslog}=undef;
 
 	push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
 	foreach my $pair (IkiWiki::Setup::getsetup()) {
@@ -110,6 +112,6 @@ sub gendump ($) { #{{{
 	push @ret, "}";
 
 	return @ret;
-} #}}}
+}
 
 1