X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=bee5e34693139ce0f7f022a2ad3d815802fa10fa;hb=aaf6442c154b3119e038979d2a223484026893e3;hp=cf69d55e013c25335643290af2dde44b8820f91a;hpb=e8b84c43bb30331bdca8f81b9fb9bdc5c3ea8521;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index cf69d55..bee5e34 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -28,7 +28,7 @@ from os import path, environ
# Regular expression defining a WikiWord
# (but this definition is also assumed in other places)
-word_re = re.compile(r"^\b((([A-Z][a-z]+){2,}/)*([A-Z][a-z]+){2,})\b$")
+word_re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$")
# FIXME: we accept stuff like foo/../bar and we shouldn't
file_re = re.compile(r"^\b([A-Za-z0-9_\-][A-Za-z0-9_\.\-/]*)\b$")
img_re = re.compile(r"^.*\.(png|gif|jpg|jpeg)$", re.IGNORECASE)
@@ -363,7 +363,7 @@ class PageFormatter:
else:
self.h_level = len(word) - 1
link = permalink(self.line)
- result = '
\{\{\{|\s*\}\}\})" + + r"|(?P\{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})" # Tables + r"|(?P ^\s*\|\|(=|)\s*)"