diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2008-11-29 15:16:12 +0200 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2008-11-29 15:16:12 +0200 |
| commit | e3710f6c32aa9a9e6b737c4ebc64af0df2ea872b (patch) | |
| tree | 441aa7476fd40685be4d8287bfa90d8a169a4b6c /wiki2html.py | |
| parent | 88befee77fdaacc2e0dc92beffd1c6a68f86a8b7 (diff) | |
| download | wit-e3710f6c32aa9a9e6b737c4ebc64af0df2ea872b.tar.gz wit-e3710f6c32aa9a9e6b737c4ebc64af0df2ea872b.tar.bz2 | |
Improve text output generation
* wiki2html.py (mktgt): Add 3rd argument. All callers updated.
* wiki2text.py (wiki_ns_name,mktgt): New functions
(str_link,str_tmpl): Rewrite
* wikicvt.py: New argument --input-text (not used yet)
Diffstat (limited to 'wiki2html.py')
| -rw-r--r-- | wiki2html.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/wiki2html.py b/wiki2html.py index b87923b..58195be 100644 --- a/wiki2html.py +++ b/wiki2html.py @@ -63,8 +63,10 @@ class HtmlWikiMarkup (WikiMarkup): envhdr = [ "ul", "ol", "dl" ] envel = [ "li", "li", "dd" ] - def mktgt(self, tgt): - return self.html_base % { 'lang' : self.lang } + urllib.quote(tgt) + def mktgt(self, tgt, lang = None): + if not lang: + lang = self.lang + return self.html_base % { 'lang' : lang } + urllib.quote(tgt) def link(self, tok, env, istmpl): arg = self.fmtok(tok[1], env) @@ -84,7 +86,7 @@ class HtmlWikiMarkup (WikiMarkup): else: tgt = self.mktgt(tgt) elif not istmpl and qual in self.langtab: - tgt = self.html_base % { 'lang' : qual } + urllib.quote(tgt) + tgt = self.mktgt(tgt, qual) if not text or text == '': text = self.langtab[qual] else: |