3 files changed, 22 insertions, 12 deletions

diff --git a/wiki2html.py b/wiki2html.py
index 62c6da0..81ada65 100644
--- a/wiki2html.py
+++ b/wiki2html.py
@@ -82,7 +82,7 @@ class HtmlWikiMarkup (WikiMarkup):
         text = None
         if len(elt[1]) > 1:
             s = map(self.format, elt[1])
-            if s[0] == 'disambigR':
+            if s[0] == 'disambigR' or s[0] == 'wikiquote':
                 return ""
             elif len(s) > 1 and s[1] == 'thumb':
                 return ""
diff --git a/wiki2text.py b/wiki2text.py
index 5fcd718..0f8dd5f 100644
--- a/wiki2text.py
+++ b/wiki2text.py
@@ -75,7 +75,7 @@ class TextWikiMarkup (WikiMarkup):
             text = None
 
         if s:
-            if s[0] == 'disambigR':
+            if s[0] == 'disambigR' or s[0] == 'wikiquote':
                 return ""
             if len(s) > 1 and s[1] == 'thumb':
                 return ""
diff --git a/wikimarkup.py b/wikimarkup.py
index 4eb4ed0..fa60c80 100644
--- a/wikimarkup.py
+++ b/wikimarkup.py
@@ -511,11 +511,16 @@ class WikiMarkup (BaseWikiMarkup):
             return None
 
     def is_lang_link(self, elt):
-        if elt[0] == LINK and isinstance(elt[1],list) and len(elt[1]) == 1 \
-                and elt[1][0][0] == TEXT:
-            m = re.match('(.+):', elt[1][0][1])
-            if m and m.group(1) in self.langtab:
-                return True
+        if elt[0] == LINK and isinstance(elt[1],list) and len(elt[1]) == 1:
+            if elt[1][0][0] == TEXT:
+                m = re.match('([\w-]+):', elt[1][0][1])
+                if m: # and m.group(1) in self.langtab:
+                    return True
+            elif elt[1][0][0] == SEQ and len(elt[1][0][1]) == 1 and\
+                    elt[1][0][1][0][0] == TEXT:
+                m = re.match('([\w-]+):',elt[1][0][1][0][1])
+                if m: # and m.group(1) in self.langtab:
+                    return True
         return False
     
     def is_empty_text(self, elt):
@@ -526,9 +531,14 @@ class WikiMarkup (BaseWikiMarkup):
                         return False
             elif re.search('\w', elt[1]):
                 return False
-            else:
-                return True
+            return True
         return False
+
+    def is_empty_para(self, seq):
+        for x in seq:             
+            if not (self.is_lang_link(x) or self.is_empty_text(x)):
+                return False
+        return True
     
     def parse(self):
         BaseWikiMarkup.parse(self)
@@ -539,9 +549,9 @@ class WikiMarkup (BaseWikiMarkup):
                 break
         # Remove trailing links
         for i in range(len(self.tree)-1, 0, -1):
-            if not (self.is_lang_link(self.tree[i]) \
-                        or self.is_empty_text(self.tree[i])):
-                self.tree = self.tree[0:i]
+            if self.tree[i][0] == PARA \
+                    and not self.is_empty_para(self.tree[i][1]):
+                self.tree = self.tree[0:i+1]
                 break