projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
response
[ikiwiki.git]
/
IkiWiki.pm
diff --git
a/IkiWiki.pm
b/IkiWiki.pm
index 1c05a7aa55215d638400831066b1ee17496b15b9..637d56c7302b95d350651cc3516738a739a43df9 100644
(file)
--- a/
IkiWiki.pm
+++ b/
IkiWiki.pm
@@
-237,8
+237,8
@@
sub getsetup () {
html5 => {
type => "boolean",
default => 0,
html5 => {
type => "boolean",
default => 0,
- description => "generate HTML5?
(experimental)
",
- advanced =>
1
,
+ description => "generate HTML5?",
+ advanced =>
0
,
safe => 1,
rebuild => 1,
},
safe => 1,
rebuild => 1,
},
@@
-485,7
+485,7
@@
sub getsetup () {
},
setuptype => {
type => "internal",
},
setuptype => {
type => "internal",
- default => "
Standard
",
+ default => "
Yaml
",
description => "perl class to use to dump setup file",
safe => 0,
rebuild => 0,
description => "perl class to use to dump setup file",
safe => 0,
rebuild => 0,
@@
-505,7
+505,6
@@
sub defaultconfig () {
foreach my $key (keys %s) {
push @ret, $key, $s{$key}->{default};
}
foreach my $key (keys %s) {
push @ret, $key, $s{$key}->{default};
}
- use Data::Dumper;
return @ret;
}
return @ret;
}
@@
-1027,7
+1026,7
@@
sub bestlink ($$) {
sub isinlinableimage ($) {
my $file=shift;
sub isinlinableimage ($) {
my $file=shift;
- return $file =~ /\.(png|gif|jpg|jpeg)$/i;
+ return $file =~ /\.(png|gif|jpg|jpeg
|svg
)$/i;
}
sub pagetitle ($;$) {
}
sub pagetitle ($;$) {
@@
-1238,7
+1237,7
@@
sub htmllink ($$$;@) {
$cgilink = "<a href=\"".
cgiurl(
do => "create",
$cgilink = "<a href=\"".
cgiurl(
do => "create",
- page =>
lc($link)
,
+ page =>
$link
,
from => $lpage
)."\" rel=\"nofollow\">?</a>";
}
from => $lpage
)."\" rel=\"nofollow\">?</a>";
}
@@
-1393,10
+1392,15
@@
sub preprocess ($$$;$$) {
|
"([^"]*?)" # 3: single-quoted value
|
|
"([^"]*?)" # 3: single-quoted value
|
- (\S+) # 4: unquoted value
+ '''(.*?)''' # 4: triple-single-quote
+ |
+ <<([a-zA-Z]+)\n # 5: heredoc start
+ (.*?)\n\5 # 6: heredoc value
+ |
+ (\S+) # 7: unquoted value
)
(?:\s+|$) # delimiter to next param
)
(?:\s+|$) # delimiter to next param
- }sgx) {
+ }
m
sgx) {
my $key=$1;
my $val;
if (defined $2) {
my $key=$1;
my $val;
if (defined $2) {
@@
-1411,6
+1415,12
@@
sub preprocess ($$$;$$) {
elsif (defined $4) {
$val=$4;
}
elsif (defined $4) {
$val=$4;
}
+ elsif (defined $7) {
+ $val=$7;
+ }
+ elsif (defined $6) {
+ $val=$6;
+ }
if (defined $key) {
push @params, $key, $val;
if (defined $key) {
push @params, $key, $val;
@@
-1479,6
+1489,11
@@
sub preprocess ($$$;$$) {
|
"[^"]*?" # single-quoted value
|
|
"[^"]*?" # single-quoted value
|
+ '''.*?''' # triple-single-quote
+ |
+ <<([a-zA-Z]+)\n # 5: heredoc start
+ (?:.*?)\n\5 # heredoc value
+ |
[^"\s\]]+ # unquoted value
)
\s* # whitespace or end
[^"\s\]]+ # unquoted value
)
\s* # whitespace or end
@@
-1502,6
+1517,11
@@
sub preprocess ($$$;$$) {
|
"[^"]*?" # single-quoted value
|
|
"[^"]*?" # single-quoted value
|
+ '''.*?''' # triple-single-quote
+ |
+ <<([a-zA-Z]+)\n # 5: heredoc start
+ (?:.*?)\n\5 # heredoc value
+ |
[^"\s\]]+ # unquoted value
)
\s* # whitespace or end
[^"\s\]]+ # unquoted value
)
\s* # whitespace or end