From 58ab0a76f5c7be82e75aa3042950b8f57c0d9e88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Sun, 6 Feb 2011 22:49:45 +0200
Subject: [PATCH] improve linking conversion

---
 moin2doku.py | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/moin2doku.py b/moin2doku.py
index 69ad1e4..25f4b4e 100755
--- a/moin2doku.py
+++ b/moin2doku.py
@@ -119,12 +119,22 @@ def convert_markup(page, filename):
         ('\[\[BR\]\]', '\n'),                       # newline
         ('#pragma section-numbers off', ''),        # remove
         ('^##.*?\\n', ''),                          # remove
-        ('\["', '[['),                              # internal link open
-        ('"\]', ']]'),                              # internal link close
-        #('\[:(.*):',  '[[\\1]] '),                 # original internal link expressions
-        #('\[\[(.*)/(.*)\]\]',  '[[\\1:\\2]]'),
-        #('(\[\[.*\]\]).*\]', '\\1'),
-        ('\[(http.*) .*\]', '[[\\1]]'),             # web link
+
+#        ('\["', '[['),                              # internal link open
+#        ('"\]', ']]'),                              # internal link close
+        # internal links
+        ('\[:(.+)\]',  '[[\\1]]'),
+        # wiki:xxx
+        ('\[wiki:([^\s]+)\s+(.+)\]',  '[[\\1|\\2]]'),
+        # TODO: handle more depths
+        ('\[\[(.*)/(.*)\]\]',  '[[\\1:\\2]]'),
+        ('(\[\[.+\]\]).*\]', '\\1'),
+
+        # web link without title
+        ('\[(http[^\s]+)\]', '[[\\1]]'),
+        # web link with title
+        ('\[(http[^\s]+)\s+(.+)\]', '[[\\1|\\2]]'),
+
         ('\["/(.*)"\]', '[['+filename[-1]+':\\1]]'),
         ('\{{3}', '<'+'code>'),                        # code open
         ('\}{3}', '<'+'/code>'),                       # code close