From: Bernie Innocenti <bernie@codewiz.org>
Date: Mon, 2 Jun 2008 06:52:35 +0000 (+0200)
Subject: Merge branch 'master' of ssh://bernie@trinity.codewiz.org/~/public_html/wiki/git... 
X-Git-Tag: v3.0~22
X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=commitdiff_plain;h=aaf6442c154b3119e038979d2a223484026893e3;hp=dd0b3b478b3d9fde450ee99bcee8e4b45c7498a8

Merge branch 'master' of ssh://bernie@trinity.codewiz.org/~/public_html/wiki/git/geekigeeki
---

diff --git a/geekigeeki.py b/geekigeeki.py
index 8bb4d36..bee5e34 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -506,13 +506,14 @@ 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>\[\[([^ \t\n\r\f\v\|]+)(?:\s*\|\s*([^\]]+)|)\]\])"
+            + r"|(?P<hurl>\[\[([^ \s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])"
             + r"|(?P<url>(http|https|ftp|mailto)\:[^\s'\"]+\S)"
             + r"|(?P<email>[-\w._+]+\@[\w.-]+)"
 
             # Lists, divs, spans
             + r"|(?P<li>^\s+[\*#] +)"
             + r"|(?P<pre>\{\{\{|\s*\}\}\})"
+            + r"|(?P<hurl>\{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})"
 
             # Tables
             + r"|(?P<tr>^\s*\|\|(=|)\s*)"