Added a comment

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7035cb034d96bdf3f2a92a8655e94e2b597bf39e..637d56c7302b95d350651cc3516738a739a43df9 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1237,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>";
                        }


@@ -1394,7 +1394,8 @@ sub preprocess ($$$;$$) {
                                |
                                        '''(.*?)'''     # 4: triple-single-quote
                                |
                                |
                                        '''(.*?)'''     # 4: triple-single-quote
                                |

-                                       <<(?<start>[a-zA-Z]+)\n(?<heredoc>.*?)\n\k<start> # 5, 6: heredoc'd value.
+                                       <<([a-zA-Z]+)\n # 5: heredoc start
+                                       (.*?)\n\5       # 6: heredoc value

                                |
                                        (\S+)           # 7: unquoted value
                                )
                                |
                                        (\S+)           # 7: unquoted value
                                )


@@ -1417,8 +1418,8 @@ sub preprocess ($$$;$$) {
                                elsif (defined $7) {
                                        $val=$7;
                                }
                                elsif (defined $7) {
                                        $val=$7;
                                }

-                               elsif (defined $+{heredoc}) {
-                                       $val=$+{heredoc};
+                               elsif (defined $6) {
+                                       $val=$6;

                                }
 
                                if (defined $key) {
                                }
 
                                if (defined $key) {


@@ -1488,9 +1489,10 @@ sub preprocess ($$$;$$) {
                                                |
                                                "[^"]*?"        # single-quoted value
                                                |
                                                |
                                                "[^"]*?"        # single-quoted value
                                                |

-                                               <<(?<start>[a-zA-Z]+)\n(?<heredoc>.*?)\n\k<start> # heredoc'd value.
+                                               '''.*?'''       # triple-single-quote

                                                |
                                                |

-                                               '''.*?''' # triple-single-quoted value
+                                               <<([a-zA-Z]+)\n # 5: heredoc start
+                                               (?:.*?)\n\5     # heredoc value

                                                |
                                                [^"\s\]]+       # unquoted value
                                        )
                                                |
                                                [^"\s\]]+       # unquoted value
                                        )


@@ -1515,9 +1517,10 @@ sub preprocess ($$$;$$) {
                                                |
                                                "[^"]*?"        # single-quoted value
                                                |
                                                |
                                                "[^"]*?"        # single-quoted value
                                                |

-                                               '''.*?'''       # triple-single-quoted value
+                                               '''.*?'''       # triple-single-quote

                                                |
                                                |

-                                               <<(?<start>[a-zA-Z]+)\n(?<heredoc>.*?)\n\k<start> # heredoc'd value.
+                                               <<([a-zA-Z]+)\n # 5: heredoc start
+                                               (?:.*?)\n\5     # heredoc value

                                                |
                                                [^"\s\]]+       # unquoted value
                                        )
                                                |
                                                [^"\s\]]+       # unquoted value
                                        )