X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/899b8c80a08ef4bf4ebc177045e86859fbef554f..358aeb9ceda825cef03dbd1c09a633096e42349b:/IkiWiki.pm?ds=sidebyside diff --git a/IkiWiki.pm b/IkiWiki.pm index 9de25a4b3..8136a7c4b 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -336,6 +336,14 @@ sub getsetup () { safe => 0, # paranoia rebuild => 0, }, + timezone => { + type => "string", + default => "", + example => "US/Eastern", + description => "time zone name", + safe => 1, + rebuild => 1, + }, include => { type => "string", default => undef, @@ -477,7 +485,7 @@ sub getsetup () { }, setuptype => { type => "internal", - default => "Standard", + default => "Yaml", description => "perl class to use to dump setup file", safe => 0, rebuild => 0, @@ -497,7 +505,6 @@ sub defaultconfig () { foreach my $key (keys %s) { push @ret, $key, $s{$key}->{default}; } - use Data::Dumper; return @ret; } @@ -529,6 +536,12 @@ sub checkconfig () { $ENV{$val}=$config{ENV}{$val}; } } + if (defined $config{timezone} && length $config{timezone}) { + $ENV{TZ}=$config{timezone}; + } + else { + $config{timezone}=$ENV{TZ}; + } if ($config{w3mmode}) { eval q{use Cwd q{abs_path}}; @@ -1379,10 +1392,14 @@ sub preprocess ($$$;$$) { | "([^"]*?)" # 3: single-quoted value | - (\S+) # 4: unquoted value + '''(.*?)''' # 4: triple-single-quote + | + <<(?[a-zA-Z]+)\n(?.*?)\n\k # 5, 6: heredoc'd value. + | + (\S+) # 7: unquoted value ) (?:\s+|$) # delimiter to next param - }sgx) { + }msgx) { my $key=$1; my $val; if (defined $2) { @@ -1397,6 +1414,12 @@ sub preprocess ($$$;$$) { elsif (defined $4) { $val=$4; } + elsif (defined $7) { + $val=$7; + } + elsif (defined $+{heredoc}) { + $val=$+{heredoc}; + } if (defined $key) { push @params, $key, $val; @@ -1465,6 +1488,10 @@ sub preprocess ($$$;$$) { | "[^"]*?" # single-quoted value | + <<(?[a-zA-Z]+)\n(?.*?)\n\k # heredoc'd value. + | + '''.*?''' # triple-single-quoted value + | [^"\s\]]+ # unquoted value ) \s* # whitespace or end @@ -1488,6 +1515,10 @@ sub preprocess ($$$;$$) { | "[^"]*?" # single-quoted value | + '''.*?''' # triple-single-quoted value + | + <<(?[a-zA-Z]+)\n(?.*?)\n\k # heredoc'd value. + | [^"\s\]]+ # unquoted value ) \s* # whitespace or end