X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=d8d984a40e7bc3e9d5f0216c674ad368d85dc7fb;hb=1c39893681aaf295fb540a84876304e8e0737065;hp=43b9cc1107ac68b484b205b86e69f79d18107b25;hpb=3c14378f82db1c48eee23445edd2fd59e03349dd;p=geekigeeki.git
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 '%s' % (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\b[a-zA-Z0-9_-]+\.(png|gif|jpg|jpeg|bmp))"
+ r"|(?P\b(?:[A-Z][a-z]+){2,}\b)"
- + r"|(?P\[\[(\S+)(?:\s*\|\s*([^\]]*)|)\]\])"
+ + r"|(?P\[\[([^ \t\n\r\f\v\|]+)(?:\s*\|\s*([^\]]+)|)\]\])"
+ r"|(?P(http|https|ftp|mailto)\:[^\s'\"]+\S)"
+ r"|(?P[-\w._+]+\@[\w.-]+)"