summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2018-08-04 21:11:33 +0300
committerSergey Poznyakoff <gray@gnu.org>2018-08-04 21:33:31 +0300
commit635ba88e73ee9bffa45b9e487ca555c25e931d05 (patch)
treeada4ffb40bdffd002a90743b4976b1467fd92b8f
parentca53e0361ac27a532017057faa7e417fe1bc80bb (diff)
downloadwikitrans-635ba88e73ee9bffa45b9e487ca555c25e931d05.tar.gz
wikitrans-635ba88e73ee9bffa45b9e487ca555c25e931d05.tar.bz2
Minor changes
-rw-r--r--MANIFEST.in5
-rw-r--r--WikiTrans/wiki2html.py2
-rw-r--r--WikiTrans/wiki2texi.py5
-rw-r--r--WikiTrans/wiki2text.py58
4 files changed, 6 insertions, 64 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index 207b54e..96ff0e1 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1,6 @@
1exclude .gitignore 1exclude .gitignore
2include COPYING.txtx
3recursive-include testdata *.wiki
4recursive-include testdata *.texi
5recursive-include testdata *.text
6recursive-include testdata *.html \ No newline at end of file
diff --git a/WikiTrans/wiki2html.py b/WikiTrans/wiki2html.py
index d2af746..eb1b611 100644
--- a/WikiTrans/wiki2html.py
+++ b/WikiTrans/wiki2html.py
@@ -269,7 +269,7 @@ class HtmlWiktionaryMarkup (HtmlWikiMarkup):
269 269
270 2. Capitulation notice: 270 2. Capitulation notice:
271 Given the: 271 Given the:
272 1. waste amount of wiktionaries available, 272 1. vast amount of wiktionaries available,
273 2. abundance of various templates for each wictionary, 273 2. abundance of various templates for each wictionary,
274 3. apparent lack of documentation thereof, 274 3. apparent lack of documentation thereof,
275 4. the lack of standardized language-independent templates, 275 4. the lack of standardized language-independent templates,
diff --git a/WikiTrans/wiki2texi.py b/WikiTrans/wiki2texi.py
index f087c65..9c7eb7b 100644
--- a/WikiTrans/wiki2texi.py
+++ b/WikiTrans/wiki2texi.py
@@ -324,11 +324,6 @@ class TexiWikiMarkup (WikiMarkup):
324 else: 324 else:
325 self.acc += text 325 self.acc += text
326 326
327 def swapacc(self, val = Acc()):
328 s = self.acc
329 self.acc = val
330 return s
331
332 def _begin_print(self): 327 def _begin_print(self):
333 s = self.acc 328 s = self.acc
334 self.acc = Acc() 329 self.acc = Acc()
diff --git a/WikiTrans/wiki2text.py b/WikiTrans/wiki2text.py
index 004ae4a..3fa2b0e 100644
--- a/WikiTrans/wiki2text.py
+++ b/WikiTrans/wiki2text.py
@@ -251,49 +251,6 @@ class TextWikiMarkup (WikiMarkup):
251 lang = self.lang 251 lang = self.lang
252 return self.html_base % { 'lang' : lang } + url_quote(tgt) 252 return self.html_base % { 'lang' : lang } + url_quote(tgt)
253 253
254 def fmtlink(self, elt, istmpl):
255 arg = self.format(elt.content[0])
256 if len(elt.content) > 1:
257 s = [x for x in map(self.format, elt.content)]
258 text = s[1]
259 else:
260 s = None
261 text = None
262
263 if s:
264 if s[0] == 'disambigR' or s[0] == 'wikiquote':
265 return ""
266 if len(s) > 1 and s[1] == 'thumb':
267 return ""
268 (qual,sep,tgt) = arg.partition(':')
269 if tgt != '':
270 ns = self.wiki_ns_name(qual)
271 if ns:
272 if ns == 'NS_IMAGE':
273 if not self.references:
274 return ""
275 text = "[%s: %s]" % (qual, text if text else arg)
276 tgt = self.image_base + '/' + \
277 url_quote(tgt) + \
278 '/250px-' + url_quote(tgt)
279 elif ns == 'NS_MEDIA':
280 text = "[%s]" % (qual)
281 else:
282 tgt = self.mktgt(tgt)
283 elif not istmpl and qual in self.langtab:
284 text = self.langtab[qual] + ": " + tgt
285 tgt = self.mktgt(tgt, qual)
286 else:
287 tgt = self.mktgt(tgt)
288 else:
289 tgt = self.mktgt(arg)
290 if self.references:
291 return "%s (see %s) " % (text, tgt)
292 elif not text or text == '':
293 return arg
294 else:
295 return text
296
297 def indent (self, lev, text): 254 def indent (self, lev, text):
298 if text.find('\n') == -1: 255 if text.find('\n') == -1:
299 s = (" " * lev) + text 256 s = (" " * lev) + text
@@ -304,8 +261,6 @@ class TextWikiMarkup (WikiMarkup):
304 s += (" " * lev) + elt + '\n' 261 s += (" " * lev) + elt + '\n'
305 if not text.endswith('\n'): 262 if not text.endswith('\n'):
306 s = s.rstrip('\n') 263 s = s.rstrip('\n')
307# print "IN: '%s'" % (text)
308# print "OUT: '%s'" % (s)
309 return s 264 return s
310 265
311 def fmtpara(self, input): 266 def fmtpara(self, input):
@@ -330,19 +285,6 @@ class TextWikiMarkup (WikiMarkup):
330 length += wsc + wlen 285 length += wsc + wlen
331 return output + linebuf 286 return output + linebuf
332 287
333 def str_tag(self, elt):
334 if elt.tag == 'code':
335 self.nested += 1
336 s = self.format(elt.content)
337 self.nested -= 1
338 return s #FIXME
339 else:
340 s = '<' + elt.tag
341 if elt.args:
342 s += ' ' + str(elt.args)
343 s += '>' + self.format(elt.content) + '</' + elt.tag + '>'
344 return s
345
346 def __str__(self): 288 def __str__(self):
347 str = "" 289 str = ""
348 for elt in self.tree: 290 for elt in self.tree:

Return to:

Send suggestions and report system problems to the System administrator.