nongreedy link parsing

This commit is contained in:
Elan Ruusamäe 2011-02-06 22:55:57 +02:00
parent 58ab0a76f5
commit 0b8bf13743

View file

@ -133,7 +133,7 @@ def convert_markup(page, filename):
# web link without title # web link without title
('\[(http[^\s]+)\]', '[[\\1]]'), ('\[(http[^\s]+)\]', '[[\\1]]'),
# web link with title # web link with title
('\[(http[^\s]+)\s+(.+)\]', '[[\\1|\\2]]'), ('\[(http[^\s]+)\s+(.+?)\]', '[[\\1|\\2]]'),
('\["/(.*)"\]', '[['+filename[-1]+':\\1]]'), ('\["/(.*)"\]', '[['+filename[-1]+':\\1]]'),
('\{{3}', '<'+'code>'), # code open ('\{{3}', '<'+'code>'), # code open