diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-03-03 12:08:48 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-03-03 12:08:48 +0200 |
commit | b5e926d076af2f96cff437ace72c345289d8f92a (patch) | |
tree | db448efe13ab5e0f93da7aa67f1a38b25ca2d099 /wiki2text.py | |
parent | ae8b8bc81eab08b2ebe9f8c0957c085b5d45fc2b (diff) | |
download | wit-b5e926d076af2f96cff437ace72c345289d8f92a.tar.gz wit-b5e926d076af2f96cff437ace72c345289d8f92a.tar.bz2 |
Fix parsing of lists
Diffstat (limited to 'wiki2text.py')
-rw-r--r-- | wiki2text.py | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/wiki2text.py b/wiki2text.py index c41c4e0..a259157 100644 --- a/wiki2text.py +++ b/wiki2text.py @@ -100,17 +100,17 @@ class TextWikiMarkup (WikiMarkup): return text def indent (self, lev, text): - print "T \"",text,"\"" - w = self.width - self.width = w - lev if text.find('\n') == -1: s = (" " * lev) + text else: s = "" for elt in text.split('\n'): - s += (" " * lev) + elt + '\n' - - self.width = w + if elt: + s += (" " * lev) + elt + '\n' + if not text.endswith('\n'): + s = s.rstrip('\n') +# print "IN: '%s'" % (text) +# print "OUT: '%s'" % (s) return s def fmtpara(self, input): @@ -189,16 +189,19 @@ class TextWikiMarkup (WikiMarkup): lev = elt[2] if lev > self.width - 4: lev = 1 - string = "\n" + string = "" n = 1 for s in elt[3]: + if not string.endswith("\n"): + string += "\n" x = self.format(s) -# print "X",x if type == ENVUNNUM: - string += self.indent(lev, "*" + x.lstrip(" ")) + '\n' + string += self.indent(lev, "* " + x.lstrip(" ")) elif type == ENVNUM: - string += self.indent(lev, "%d. %s" % (n, x)) + '\n' + string += self.indent(lev, "%d. %s" % (n, x)) n += 1 + if not string.endswith("\n"): + string += "\n" elif elt[0] == IND: string = (" " * elt[1]) + self.format(elt[2]) + '\n' else: |