X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3b08789e6fb5809dd9b8f51f5c5e7df1d78e6930..4ba3c1c1048705eeb6c71d1b86528eba5cf33eb7:/IkiWiki/Setup/Yaml.pm

diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm
index c7ff1988e..6da93bb64 100644
--- a/IkiWiki/Setup/Yaml.pm
+++ b/IkiWiki/Setup/Yaml.pm
@@ -5,22 +5,22 @@ package IkiWiki::Setup::Yaml;
 use warnings;
 use strict;
 use IkiWiki;
+use Encode;
 
 sub loaddump ($$) {
 	my $class=shift;
 	my $content=shift;
 
-	eval q{use YAML};
+	eval q{use YAML::Any};
+	eval q{use YAML} if $@;
 	die $@ if $@;
-	IkiWiki::Setup::merge(Load($content));
+	$YAML::Syck::ImplicitUnicode=1;
+	IkiWiki::Setup::merge(Load(encode_utf8($content)));
 }
 
 sub gendump ($@) {
 	my $class=shift;
 	
-	eval q{use YAML};
-	die $@ if $@;
-
 	"# IkiWiki::Setup::Yaml - YAML formatted setup file",
 	"#",
 	(map { "# $_" } @_),
@@ -35,11 +35,15 @@ sub dumpline ($$$$) {
 	my $type=shift;
 	my $prefix=shift;
 	
+	eval q{use YAML::Old};
+	eval q{use YAML} if $@;
+	die $@ if $@;
 	$YAML::UseHeader=0;
+
 	my $dump=Dump({$key => $value});
 	chomp $dump;
 	if (length $prefix) {
-		$dump=join("", map { $prefix.$_ } split(/\n/, $dump));
+		$dump=join("\n", map { $prefix.$_ } split(/\n/, $dump));
 	}
 	return $dump;
 }