summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2009-03-07 22:30:59 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2009-03-07 22:30:59 (GMT)
commita8d15328a95bc16c3d9f4ca06c0c69767899f678 (patch) (unidiff)
tree9ec0df4e03725853c07cc5016979b74ef9707485
parentec326ad225c6cda0051f1c7b3751639f4823d4ac (diff)
downloadwikitrans-a8d15328a95bc16c3d9f4ca06c0c69767899f678.tar.gz
wikitrans-a8d15328a95bc16c3d9f4ca06c0c69767899f678.tar.bz2
Another buch of dirty kludges
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--wiki2html.py2
-rw-r--r--wiki2text.py2
-rw-r--r--wikimarkup.py30
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):
82 text = None 82 text = None
83 if len(elt[1]) > 1: 83 if len(elt[1]) > 1:
84 s = map(self.format, elt[1]) 84 s = map(self.format, elt[1])
85 if s[0] == 'disambigR': 85 if s[0] == 'disambigR' or s[0] == 'wikiquote':
86 return "" 86 return ""
87 elif len(s) > 1 and s[1] == 'thumb': 87 elif len(s) > 1 and s[1] == 'thumb':
88 return "" 88 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):
75 text = None 75 text = None
76 76
77 if s: 77 if s:
78 if s[0] == 'disambigR': 78 if s[0] == 'disambigR' or s[0] == 'wikiquote':
79 return "" 79 return ""
80 if len(s) > 1 and s[1] == 'thumb': 80 if len(s) > 1 and s[1] == 'thumb':
81 return "" 81 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):
511 return None 511 return None
512 512
513 def is_lang_link(self, elt): 513 def is_lang_link(self, elt):
514 if elt[0] == LINK and isinstance(elt[1],list) and len(elt[1]) == 1 \ 514 if elt[0] == LINK and isinstance(elt[1],list) and len(elt[1]) == 1:
515 and elt[1][0][0] == TEXT: 515 if elt[1][0][0] == TEXT:
516 m = re.match('(.+):', elt[1][0][1]) 516 m = re.match('([\w-]+):', elt[1][0][1])
517 if m and m.group(1) in self.langtab: 517 if m: # and m.group(1) in self.langtab:
518 return True 518 return True
519 elif elt[1][0][0] == SEQ and len(elt[1][0][1]) == 1 and\
520 elt[1][0][1][0][0] == TEXT:
521 m = re.match('([\w-]+):',elt[1][0][1][0][1])
522 if m: # and m.group(1) in self.langtab:
523 return True
519 return False 524 return False
520 525
521 def is_empty_text(self, elt): 526 def is_empty_text(self, elt):
@@ -526,9 +531,14 @@ class WikiMarkup (BaseWikiMarkup):
526 return False 531 return False
527 elif re.search('\w', elt[1]): 532 elif re.search('\w', elt[1]):
528 return False 533 return False
529 else: 534 return True
530 return True
531 return False 535 return False
536
537 def is_empty_para(self, seq):
538 for x in seq:
539 if not (self.is_lang_link(x) or self.is_empty_text(x)):
540 return False
541 return True
532 542
533 def parse(self): 543 def parse(self):
534 BaseWikiMarkup.parse(self) 544 BaseWikiMarkup.parse(self)
@@ -539,9 +549,9 @@ class WikiMarkup (BaseWikiMarkup):
539 break 549 break
540 # Remove trailing links 550 # Remove trailing links
541 for i in range(len(self.tree)-1, 0, -1): 551 for i in range(len(self.tree)-1, 0, -1):
542 if not (self.is_lang_link(self.tree[i]) \ 552 if self.tree[i][0] == PARA \
543 or self.is_empty_text(self.tree[i])): 553 and not self.is_empty_para(self.tree[i][1]):
544 self.tree = self.tree[0:i] 554 self.tree = self.tree[0:i+1]
545 break 555 break
546 556
547 557

Return to:

Send suggestions and report system problems to the System administrator.