diff options
-rw-r--r-- | wiki2html.py | 2 | ||||
-rw-r--r-- | wiki2text.py | 2 | ||||
-rw-r--r-- | wikimarkup.py | 30 |
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 @@ -84,3 +84,3 @@ class HtmlWikiMarkup (WikiMarkup): s = map(self.format, elt[1]) - if s[0] == 'disambigR': + if s[0] == 'disambigR' or s[0] == 'wikiquote': return "" diff --git a/wiki2text.py b/wiki2text.py index 5fcd718..0f8dd5f 100644 --- a/wiki2text.py +++ b/wiki2text.py @@ -77,3 +77,3 @@ class TextWikiMarkup (WikiMarkup): if s: - if s[0] == 'disambigR': + if s[0] == 'disambigR' or s[0] == 'wikiquote': return "" diff --git a/wikimarkup.py b/wikimarkup.py index 4eb4ed0..fa60c80 100644 --- a/wikimarkup.py +++ b/wikimarkup.py @@ -513,7 +513,12 @@ class WikiMarkup (BaseWikiMarkup): 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 @@ -528,5 +533,10 @@ class WikiMarkup (BaseWikiMarkup): 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 @@ -541,5 +551,5 @@ class WikiMarkup (BaseWikiMarkup): 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 |