Handle links inside link texts

1 files changed, 20 insertions, 7 deletions

diff --git a/wikimarkup.py b/wikimarkup.py
index 46aa839..429a02a 100644
--- a/wikimarkup.py
+++ b/wikimarkup.py
@@ -28,4 +28,4 @@ delims = { "[[" : re.compile("\\||(\\]\\])"),
 term   = { "[[" : "]]" , "{{" : "}}" }                             
-ends   = { "[[" : re.compile("\\]\\]"),
-           "{{" : re.compile("\\}\\}") }                  
+ends   = { "[[" : re.compile("(\\[\\[)|(\\]\\])"),
+           "{{" : re.compile("(\\{\\{)|(\\}\\})") }                  
 itend  = re.compile("\\'\\'($|[^\\'])")
@@ -117,2 +117,17 @@ It handles:
 
+    def linkend(self, paren, line, pos):
+        r = ends[paren]
+        count = 1
+        while count > 0:
+            m = r.search(line, pos);
+            if not m:
+                return len(line), len(line)
+            else:
+                pos = m.end(0)
+                if m.group(0) == paren:
+                    count += 1
+                else:
+                    count -= 1
+        return m.start(0), m.end(0)
+                                            
     la = None
@@ -174,4 +189,3 @@ It handles:
                 yield(self.getkn(line))
-                
-                                            
+
     def getkn(self, line):
@@ -191,6 +205,5 @@ It handles:
                     if d.group(0) == "|":
-                        e = ends[m.group(0)].search(line, d.end(0))
                         target = (self.TEXT, line[pos:d.start(0)])
-                        text = (self.SEQ, self.getkn(line[d.end(0):e.start(0)]))
-                        pos = e.end(0)
+                        (start,pos) = self.linkend(m.group(0), line, m.end(0))
+                        text = (self.SEQ, self.getkn(line[d.end(0):start]))
                     elif d.group(0) == term[m.group(0)]: