diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2015-07-12 23:11:40 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2015-07-12 23:11:40 +0300 |
commit | 28072898f1bd9a925d73ac187d560198d6345524 (patch) | |
tree | a46d781fb85d9dda61fc8f68e0ba6ec43d60ce55 /wiki2html.py | |
parent | 75672b57a2d63f01d00795fe8d661d1efe7b6e8d (diff) | |
download | wit-28072898f1bd9a925d73ac187d560198d6345524.tar.gz wit-28072898f1bd9a925d73ac187d560198d6345524.tar.bz2 |
Improve tag handling and debugging
* wikimarkup.py: Rewrite tag recognition.
Implement dump method.
* wikicvt.py: New options -D (--dump), and -t dump
* wiki2html.py (input_tag): Remove method
(str_tag): Change handling of tags
* wiki2texi.py: Likewise.
* wiki2text.py: Likewise.
Diffstat (limited to 'wiki2html.py')
-rw-r--r-- | wiki2html.py | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/wiki2html.py b/wiki2html.py index 441bc76..66939c4 100644 --- a/wiki2html.py +++ b/wiki2html.py @@ -169,31 +169,27 @@ class HtmlWikiMarkup (WikiMarkup): self.envt[type]["elt"][n]) return "<%s>%s</%s>" % (self.envt[type]["hdr"], string, self.envt[type]["hdr"]) return string - supported_tags = [ 'nowiki', 'code' ] - def input_tag(self, tag): - return tag['tag'] in self.supported_tags - def str_tag(self, elt): if elt['tag'] == 'nowiki': - return '<pre>' + elt['content'] + '</pre>' + return '<pre>' + self.format(elt['content']) + '</pre>' elif elt['tag'] == 'code': - kwdict = { - 'nested': self.nested + 1, - 'lang': self.lang, - 'text': elt['content'], - 'html_base': self.html_base, - 'image_base': self.image_base, - 'media_base': self.media_base } - markup = HtmlWiktionaryMarkup(**kwdict) - markup.debug_level = self.debug_level - markup.parse() - return '<pre><code>' + str(markup) + '</code></pre>' #FIXME + self.nested += 1 + s = self.format(elt['content']) + self.nested -= 1 + return '<pre><code>' + s + '</code></pre>' #FIXME + else: + s = '<' + elt['tag'] + if elt['args']: + s += ' ' + elt['args'] + s += '>' + s += self.format(elt['content']) + return s + '</' + elt['tag'] + '>' def str_para(self, elt): string = ""; for x in elt['content']: string += self.format(x) return "<p>" + string + "</p>" |