GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 16:56:36 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

log the generated .tex for debugging, and add \n on </div>

Browse source
This commit is contained in:
Damien Elmes 2012-10-24 22:29:01 +09:00
parent 63ec4983a4
commit 958967f3c3
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
anki/latex.py
View file

@ -64,7 +64,7 @@ def _latexFromHtml(col, latex):
# entitydefs defines nbsp as \xa0 instead of a standard space, so we # entitydefs defines nbsp as \xa0 instead of a standard space, so we
# replace it first # replace it first
latex = latex.replace("&nbsp;", " ") latex = latex.replace("&nbsp;", " ")
latex = re.sub("<br( /)?>", "\n", latex) latex = re.sub("<br( /)?>|</div>", "\n", latex)
# replace <div> etc with spaces # replace <div> etc with spaces
latex = re.sub("<.+?>", " ", latex) latex = re.sub("<.+?>", " ", latex)
latex = stripHTML(latex) latex = stripHTML(latex)
@ -82,7 +82,8 @@ def _buildImg(col, latex, fname, model):
assert bad not in latex assert bad not in latex
# write into a temp file # write into a temp file
log = open(namedtmp("latex_log.txt"), "w") log = open(namedtmp("latex_log.txt"), "w")
texfile = file(namedtmp("tmp.tex"), "w") texpath = namedtmp("tmp.tex")
texfile = file(texpath, "w")
texfile.write(latex) texfile.write(latex)
texfile.close() texfile.close()
mdir = col.media.dir() mdir = col.media.dir()
@ -92,19 +93,20 @@ def _buildImg(col, latex, fname, model):
# generate dvi # generate dvi
os.chdir(tmpdir()) os.chdir(tmpdir())
if call(latexCmd + ["tmp.tex"], stdout=log, stderr=log): if call(latexCmd + ["tmp.tex"], stdout=log, stderr=log):
return _errMsg("latex") return _errMsg("latex", texpath)
# and png # and png
if call(latexDviPngCmd + ["tmp.dvi", "-o", "tmp.png"], if call(latexDviPngCmd + ["tmp.dvi", "-o", "tmp.png"],
stdout=log, stderr=log): stdout=log, stderr=log):
return _errMsg("dvipng") return _errMsg("dvipng", texpath)
# add to media # add to media
shutil.copyfile(png, os.path.join(mdir, fname)) shutil.copyfile(png, os.path.join(mdir, fname))
return return
finally: finally:
os.chdir(oldcwd) os.chdir(oldcwd)
def _errMsg(type): def _errMsg(type, texpath):
msg = (_("Error executing %s.") % type) + "<br>" msg = (_("Error executing %s.") % type) + "<br>"
msg += (_("Generated file: %s") % texpath) + "<br>"
try: try:
log = open(namedtmp("latex_log.txt", rm=False)).read() log = open(namedtmp("latex_log.txt", rm=False)).read()
if not log: if not log: