diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-03-03 12:46:32 +0200 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-03-03 12:46:32 +0200 |
| commit | 6b0bfa216f6512e929dbe63e6c9b9cb6934dc3c5 (patch) | |
| tree | 2d730aa5e4afa504bc454f875da21052ee2f914b /wiki2text.py | |
| parent | b5e926d076af2f96cff437ace72c345289d8f92a (diff) | |
| download | wikitrans-6b0bfa216f6512e929dbe63e6c9b9cb6934dc3c5.tar.gz wikitrans-6b0bfa216f6512e929dbe63e6c9b9cb6934dc3c5.tar.bz2 | |
Fix it/bold parsing + minor bugfixes
Diffstat (limited to 'wiki2text.py')
| -rw-r--r-- | wiki2text.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/wiki2text.py b/wiki2text.py index a259157..5ed91fa 100644 --- a/wiki2text.py +++ b/wiki2text.py @@ -172,7 +172,7 @@ class TextWikiMarkup (WikiMarkup): elif elt[0] == LINK: string = self.fmtlink(elt, False) elif elt[0] == TMPL: - string = '\n' + self.fmtlink(elt, True) + '\n' + string = '[' + self.fmtlink(elt, True) + ']' elif elt[0] == BAR: w = self.width if w < 5: @@ -196,7 +196,7 @@ class TextWikiMarkup (WikiMarkup): string += "\n" x = self.format(s) if type == ENVUNNUM: - string += self.indent(lev, "* " + x.lstrip(" ")) + string += self.indent(lev, "- " + x.lstrip(" ")) elif type == ENVNUM: string += self.indent(lev, "%d. %s" % (n, x)) n += 1 @@ -209,12 +209,14 @@ class TextWikiMarkup (WikiMarkup): return string def format(self, elt, indent=0): - string = "" if elt[0] == SEQ: + string = "" for x in elt[1]: - string += " " + self.format(x, indent) + if len(string) > 1 and not string[-1].isspace(): + string += ' ' + string += self.format(x, indent) else: - string += " " + self.fmtelt(elt, indent) + string = self.fmtelt(elt, indent) return string def __str__(self): |