diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2008-11-27 13:00:46 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2008-11-27 13:00:46 +0200 |
commit | 6508bd65f006d7ca1cdaa0d177341ddfe72334a9 (patch) | |
tree | e461f6a5af1dea8cbbc92266d9926c44d88fd500 | |
parent | 9f2879e9d8fe525e9ca59ed59074bf2fdff7e740 (diff) | |
download | wikitrans-6508bd65f006d7ca1cdaa0d177341ddfe72334a9.tar.gz wikitrans-6508bd65f006d7ca1cdaa0d177341ddfe72334a9.tar.bz2 |
* wiki2html.py: Fix broken continuation after bold and it.
-rw-r--r-- | wiki2html.py | 2 | ||||
-rw-r--r-- | wikimarkup.py | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/wiki2html.py b/wiki2html.py index 4e0e78a..6fa0ae3 100644 --- a/wiki2html.py +++ b/wiki2html.py | |||
@@ -160,8 +160,6 @@ class HtmlWikiMarkup (WikiMarkup): | |||
160 | self.state = [ self.ST_PARA ] | 160 | self.state = [ self.ST_PARA ] |
161 | return WikiMarkup.__str__(self) + self.cpara() | 161 | return WikiMarkup.__str__(self) + self.cpara() |
162 | 162 | ||
163 | |||
164 | |||
165 | class HtmlWiktionaryMarkup (HtmlWikiMarkup): | 163 | class HtmlWiktionaryMarkup (HtmlWikiMarkup): |
166 | """ | 164 | """ |
167 | A class for translating Wiktionary articles into HTML. | 165 | A class for translating Wiktionary articles into HTML. |
diff --git a/wikimarkup.py b/wikimarkup.py index 7a7125e..8ed5c46 100644 --- a/wikimarkup.py +++ b/wikimarkup.py | |||
@@ -214,20 +214,21 @@ It handles: | |||
214 | e = boend.search(line, m.end(0)) | 214 | e = boend.search(line, m.end(0)) |
215 | if e: | 215 | if e: |
216 | i = e.start(0) | 216 | i = e.start(0) |
217 | pos = e.end(0) | 217 | pos = i + 3 |
218 | else: | 218 | else: |
219 | pos = len(line) | 219 | pos = len(line) |
220 | i = pos | 220 | i = pos |
221 | yield(self.BOLD, | 221 | yield(self.BOLD, |
222 | (self.SEQ, self.getkn(line[m.end(0):i]))) | 222 | (self.SEQ, self.getkn(line[m.end(0):i]))) |
223 | pos = e.end(0) | ||
224 | elif m.group(0) == "''": | 223 | elif m.group(0) == "''": |
225 | i = self.itend(line, m.end(0)) | 224 | i = self.itend(line, m.end(0)) |
226 | if i == -1: | 225 | if i == -1: |
227 | i = len(line) | 226 | pos = len(line) |
227 | i = pos | ||
228 | else: | ||
229 | pos = i + 2 | ||
228 | yield(self.IT, | 230 | yield(self.IT, |
229 | (self.SEQ, self.getkn(line[m.end(0):i]))) | 231 | (self.SEQ, self.getkn(line[m.end(0):i]))) |
230 | pos = i + 2 | ||
231 | 232 | ||
232 | def input(self): | 233 | def input(self): |
233 | return None | 234 | return None |