changelog

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

diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm
index c7ff1988e850e9e04f3055d21d7018cff5e27234..6da93bb644bb5f639dd6871b492782cfa059345d 100644 (file)
--- 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 warnings;
 use strict;
 use IkiWiki;

+use Encode;

 
 sub loaddump ($$) {
        my $class=shift;
        my $content=shift;
 
 
 sub loaddump ($$) {
        my $class=shift;
        my $content=shift;
 

-       eval q{use YAML};
+       eval q{use YAML::Any};
+       eval q{use YAML} if $@;

        die $@ if $@;
        die $@ if $@;

-       IkiWiki::Setup::merge(Load($content));
+       $YAML::Syck::ImplicitUnicode=1;
+       IkiWiki::Setup::merge(Load(encode_utf8($content)));

 }
 
 sub gendump ($@) {
        my $class=shift;
        
 }
 
 sub gendump ($@) {
        my $class=shift;
        

-       eval q{use YAML};
-       die $@ if $@;
-

        "# IkiWiki::Setup::Yaml - YAML formatted setup file",
        "#",
        (map { "# $_" } @_),
        "# IkiWiki::Setup::Yaml - YAML formatted setup file",
        "#",
        (map { "# $_" } @_),


@@ -35,11 +35,15 @@ sub dumpline ($$$$) {
        my $type=shift;
        my $prefix=shift;
        
        my $type=shift;
        my $prefix=shift;
        

+       eval q{use YAML::Old};
+       eval q{use YAML} if $@;
+       die $@ if $@;

        $YAML::UseHeader=0;
        $YAML::UseHeader=0;

+

        my $dump=Dump({$key => $value});
        chomp $dump;
        if (length $prefix) {
        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;
 }
        }
        return $dump;
 }