nongreedy link parsing

2011-02-06 22:55:57 +02:00 · 2011-02-06 22:55:57 +02:00 · 0b8bf13743
parent 58ab0a76f5
commit 0b8bf13743
1 changed files with 1 additions and 1 deletions
--- a/moin2doku.py
+++ b/moin2doku.py
@ -133,7 +133,7 @@ def convert_markup(page, filename):
        # web link without title
        ('\[(http[^\s]+)\]', '[[\\1]]'),
        # web link with title
-        ('\[(http[^\s]+)\s+(.+)\]', '[[\\1|\\2]]'),
+        ('\[(http[^\s]+)\s+(.+?)\]', '[[\\1|\\2]]'),

        ('\["/(.*)"\]', '[['+filename[-1]+':\\1]]'),
        ('\{{3}', '<'+'code>'),                        # code open