diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2015-07-14 16:09:36 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2015-07-14 16:09:36 +0300 |
commit | 4097896542f2279700794104c7c0728beed38cd0 (patch) | |
tree | 664012755efc30126a0ccef42245ce3068f06adc | |
parent | 28072898f1bd9a925d73ac187d560198d6345524 (diff) | |
download | wit-4097896542f2279700794104c7c0728beed38cd0.tar.gz wit-4097896542f2279700794104c7c0728beed38cd0.tar.bz2 |
Fix processing of environments (numbered/unnumbered lists, definition lists) and indented strings.
* wikimarkup.py (tokread): Always add 'continuation' key to DELIM
entries. Delete whitespace following environment delimiters.
(peektkn): Take an optional offset argument.
(parse0): Handle indentations.
* wiki2html.py (str_ind): Use <dl> to produce indentations.
* wiki2texi.py (str_ind): End text with a newline.
* testdata/colon.html: Update.
* testdata/deflist.html: Update.
* testdata/numlist.html: Update.
* testdata/unlist.html: Update.
-rw-r--r-- | testdata/colon.html | 2 | ||||
-rw-r--r-- | testdata/deflist.html | 1 | ||||
-rw-r--r-- | testdata/numlist.html | 0 | ||||
-rw-r--r-- | testdata/unlist.html | 2 | ||||
-rw-r--r-- | wiki2html.py | 2 | ||||
-rw-r--r-- | wiki2texi.py | 2 | ||||
-rw-r--r-- | wikimarkup.py | 31 |
7 files changed, 25 insertions, 15 deletions
diff --git a/testdata/colon.html b/testdata/colon.html index b9e35ed..2fb6ed3 100644 --- a/testdata/colon.html +++ b/testdata/colon.html @@ -1,4 +1,4 @@ <dl><dd>A colon (:) indents a line or paragraph.</dd></dl><p>A newline starts a new paragraph. Should only be used on talk pages. -For articles, you probably want the blockquote tag.</p><dl><dd> We use 1 colon to indent once.<dl><dd> We use 2 colons to indent twice.<dl><dd> 3 colons to indent 3 times, and so on.</dd></dl></dd></dl></dd></dl> +For articles, you probably want the blockquote tag.</p><dl><dd>We use 1 colon to indent once.</dd></dl><dl><dd><dl><dd>We use 2 colons to indent twice.</dd></dl></dd></dl><dl><dd><dl><dd><dl><dd>3 colons to indent 3 times, and so on.</dd></dl></dd></dl></dd></dl> diff --git a/testdata/deflist.html b/testdata/deflist.html index 8986533..774f21f 100644 --- a/testdata/deflist.html +++ b/testdata/deflist.html @@ -1,2 +1 @@ <dl><dt>item 1</dt><dd>definition 1</dd><dt>item 2</dt><dd>definition 2-1</dd><dd>definition 2-2</dd></dl> - diff --git a/testdata/numlist.html b/testdata/numlist.html index ce9dd2d..0ce8a9a 100644 --- a/testdata/numlist.html +++ b/testdata/numlist.html diff --git a/testdata/unlist.html b/testdata/unlist.html index 87be30f..ac4d32b 100644 --- a/testdata/unlist.html +++ b/testdata/unlist.html @@ -1,2 +1,2 @@ -<ul><li> <i>Unordered lists</i> are easy to do:<ul><li> Start every line with a star.<ul><li> More stars indicate a deeper level.</li></ul></li></ul> Previous item continues.<ul><li> A newline</li></ul></li><li> in a list </li></ul><p>marks the end of the list.</p><ul><li>Of course you can start again.</li></ul> +<ul><li><i>Unordered lists</i> are easy to do:<ul><li>Start every line with a star.<ul><li>More stars indicate a deeper level.</li></ul>Previous item continues.</li><li>A newline</li></ul></li><li>in a list </li></ul><p>marks the end of the list.</p><ul><li>Of course you can start again.</li></ul> diff --git a/wiki2html.py b/wiki2html.py index 66939c4..f3ea0e3 100644 --- a/wiki2html.py +++ b/wiki2html.py @@ -203,7 +203,7 @@ class HtmlWikiMarkup (WikiMarkup): return '<pre>' + string + '</pre>' def str_ind(self, elt): - return (" " * 2 * elt['level']) + self.format(elt['content']) + return ("<dl><dd>" * elt['level']) + self.format(elt['content']) + "</dd></dl>" * elt['level'] def format(self, elt): if elt['type'] == 'TEXT': diff --git a/wiki2texi.py b/wiki2texi.py index 0b3eb77..e9009ec 100644 --- a/wiki2texi.py +++ b/wiki2texi.py @@ -186,7 +186,7 @@ class TexiWikiMarkup (WikiMarkup): return "\n-----\n" # FIXME def str_ind(self, elt): - return ("@w{ }" * elt['level']) + self.format(elt['content']) + return ("@w{ }" * elt['level']) + self.format(elt['content']) + '\n' def str_env(self, elt): if elt['envtype'] == 'unnumbered': diff --git a/wikimarkup.py b/wikimarkup.py index 9a79d1e..0c6d2f2 100644 --- a/wikimarkup.py +++ b/wikimarkup.py @@ -184,14 +184,23 @@ class BaseWikiMarkup(object): pos = m.end(0) if m and line[m.start(0)] != '<': - if m.group(0)[0] in envtypes and pos < len(line) and line[pos] == ":": - yield({ 'type': 'DELIM', - 'content': m.group(0), - 'continuation': True }) + content = m.group(0) + if content[0] in envtypes: + t = { 'type': 'DELIM', + 'content': content, + 'continuation': pos < len(line) and line[pos] == ":" } + if t['continuation']: + t['content'] += t['content'][0] + pos += 1 + + yield(t) + + while pos < len(line) and line[pos] in [' ', '\t']: pos += 1 else: yield({ 'type': 'DELIM', - 'content': m.group(0) }) + 'content': content, + 'continuation': False}) else: if m: pos -= 1 @@ -305,8 +314,8 @@ class BaseWikiMarkup(object): for i in stack: self.toklist[i]['type'] = 'TEXT' - def peektkn(self): - return self.toklist[self.tokind] + def peektkn(self, off=0): + return self.toklist[self.tokind-off] def setkn(self,val): self.toklist[self.tokind] = val @@ -604,7 +613,7 @@ class BaseWikiMarkup(object): elt = self.parse_env(type, len(tok['content'])) else: elt = self.parse_line() - if 'continuation' not in tok: + if not tok['continuation']: list.append({ 'type': 'ELT', 'subtype': envtypes[tok['content'][0]][1], 'content': elt }) @@ -681,10 +690,12 @@ class BaseWikiMarkup(object): elif tok['content'][0] in envtypes: type = envtypes[tok['content'][0]][0] lev = len(tok['content']) + if tok['content'][0] == ':': + t = self.peektkn(2) + if not (t['type'] == 'DELIM' and t['content'] == ';'): + return self.parse_indent(lev) self.ungetkn() return self.parse_env(type, lev) - elif tok['content'][0] == ":": - return self.parse_indent(len(tok['content'])) else: self.ungetkn() return self.parse_para() |