projects
/
geekigeeki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use develer.com for ssl key.
[geekigeeki.git]
/
geekigeeki.py
diff --git
a/geekigeeki.py
b/geekigeeki.py
index 43b9cc1107ac68b484b205b86e69f79d18107b25..cd92c54edffbd737d1d6affdbe7e94f83faf3a2b 100755
(executable)
--- 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):
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
name = m.group(1)
descr = m.group(2) or name
@@
-397,7
+397,7
@@
class PageFormatter:
if macro:
return apply(macro, (name, descr))
elif img_re.match(name):
if macro:
return apply(macro, (name, descr))
elif img_re.match(name):
- return '<
a href="%s"><img border="0" src="%s" alt="%s" /></a>' % (name, name
, descr)
+ return '<
div class="thumb"><a href="%s"><img border="0" src="%s" alt="%s" /></a><div class="caption">%s</div></div>' % (name, name, descr
, descr)
else:
if img_re.match(descr):
descr = '<img border="0" src="' + descr + '" />'
else:
if img_re.match(descr):
descr = '<img border="0" src="' + descr + '" />'
@@
-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)"
# 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.-]+)"
+ r"|(?P<url>(http|https|ftp|mailto)\:[^\s'\"]+\S)"
+ r"|(?P<email>[-\w._+]+\@[\w.-]+)"