X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/631c0d9e7c3892abb79bcb31b5769390846a07c3..6a655196b8af625c07a0ad563873448f6729eb05:/IkiWiki.pm?ds=inline
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7035cb034..637d56c73 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1237,7 +1237,7 @@ sub htmllink ($$$;@) {
$cgilink = " "create",
- page => lc($link),
+ page => $link,
from => $lpage
)."\" rel=\"nofollow\">?";
}
@@ -1394,7 +1394,8 @@ sub preprocess ($$$;$$) {
|
'''(.*?)''' # 4: triple-single-quote
|
- <<(?[a-zA-Z]+)\n(?.*?)\n\k # 5, 6: heredoc'd value.
+ <<([a-zA-Z]+)\n # 5: heredoc start
+ (.*?)\n\5 # 6: heredoc value
|
(\S+) # 7: unquoted value
)
@@ -1417,8 +1418,8 @@ sub preprocess ($$$;$$) {
elsif (defined $7) {
$val=$7;
}
- elsif (defined $+{heredoc}) {
- $val=$+{heredoc};
+ elsif (defined $6) {
+ $val=$6;
}
if (defined $key) {
@@ -1488,9 +1489,10 @@ sub preprocess ($$$;$$) {
|
"[^"]*?" # single-quoted value
|
- <<(?[a-zA-Z]+)\n(?.*?)\n\k # heredoc'd value.
+ '''.*?''' # triple-single-quote
|
- '''.*?''' # triple-single-quoted value
+ <<([a-zA-Z]+)\n # 5: heredoc start
+ (?:.*?)\n\5 # heredoc value
|
[^"\s\]]+ # unquoted value
)
@@ -1515,9 +1517,10 @@ sub preprocess ($$$;$$) {
|
"[^"]*?" # single-quoted value
|
- '''.*?''' # triple-single-quoted value
+ '''.*?''' # triple-single-quote
|
- <<(?[a-zA-Z]+)\n(?.*?)\n\k # heredoc'd value.
+ <<([a-zA-Z]+)\n # 5: heredoc start
+ (?:.*?)\n\5 # heredoc value
|
[^"\s\]]+ # unquoted value
)