From: Bernardo Innocenti <bernie@codewiz.org>
Date: Mon, 17 Dec 2007 10:53:01 +0000 (+0100)
Subject: Allow [[foo|bar]] with no spaces in between
X-Git-Tag: v3.0~45
X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=commitdiff_plain;h=1c39893681aaf295fb540a84876304e8e0737065

Allow [[foo|bar]] with no spaces in between
---

diff --git a/geekigeeki.py b/geekigeeki.py
index 43b9cc1..d8d984a 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -389,7 +389,7 @@ class PageFormatter:
             return '<a href="%s" rel="nofollow" class="external">%s</a>' % (word, word)
 
     def _hurl_repl(self, word):
-        m = re.compile("\[\[(\S+)(?:\s*\|\s*([^\]]*)|)\]\]").match(word)
+        m = re.compile("\[\[([^ \t\n\r\f\v\|]+)(?:\s*\|\s*([^\]]+)|)\]\]").match(word)
         name = m.group(1)
         descr = m.group(2) or name
 
@@ -511,7 +511,7 @@ class PageFormatter:
             # Links
             + r"|(?P<img>\b[a-zA-Z0-9_-]+\.(png|gif|jpg|jpeg|bmp))"
             + r"|(?P<word>\b(?:[A-Z][a-z]+){2,}\b)"
-            + r"|(?P<hurl>\[\[(\S+)(?:\s*\|\s*([^\]]*)|)\]\])"
+            + r"|(?P<hurl>\[\[([^ \t\n\r\f\v\|]+)(?:\s*\|\s*([^\]]+)|)\]\])"
             + r"|(?P<url>(http|https|ftp|mailto)\:[^\s'\"]+\S)"
             + r"|(?P<email>[-\w._+]+\@[\w.-]+)"