Merge pull request #2234 from jvanbraekel/Fix-encoding-of-pdflatex-log-file
Fix encoding of pdflatex log file
This commit is contained in:
@@ -237,6 +237,7 @@ WRAPPER = """
|
|||||||
\\usepackage{graphicx}
|
\\usepackage{graphicx}
|
||||||
\\usepackage{grffile}
|
\\usepackage{grffile}
|
||||||
\\usepackage[utf8x]{inputenc}
|
\\usepackage[utf8x]{inputenc}
|
||||||
|
\\usepackage{textgreek}
|
||||||
\\definecolor{lg}{rgb}{0.9,0.9,0.9}
|
\\definecolor{lg}{rgb}{0.9,0.9,0.9}
|
||||||
\\definecolor{dg}{rgb}{0.3,0.3,0.3}
|
\\definecolor{dg}{rgb}{0.3,0.3,0.3}
|
||||||
\\def\\ft{\\small\\tt}
|
\\def\\ft{\\small\\tt}
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ def latex2pdf(latex, pdflatex='pdflatex', passes=3):
|
|||||||
outfile.close()
|
outfile.close()
|
||||||
re_errors = re.compile('^\!(.*)$', re.M)
|
re_errors = re.compile('^\!(.*)$', re.M)
|
||||||
re_warnings = re.compile('^LaTeX Warning\:(.*)$', re.M)
|
re_warnings = re.compile('^LaTeX Warning\:(.*)$', re.M)
|
||||||
flog = open(logname)
|
flog = open(logname,encoding="utf-8")
|
||||||
try:
|
try:
|
||||||
loglines = flog.read()
|
loglines = flog.read()
|
||||||
finally:
|
finally:
|
||||||
|
|||||||
+1
-3
@@ -2638,9 +2638,7 @@ class Auth(AuthAPI):
|
|||||||
# invalid login
|
# invalid login
|
||||||
session.flash = specific_error if self.settings.login_specify_error else self.messages.invalid_login
|
session.flash = specific_error if self.settings.login_specify_error else self.messages.invalid_login
|
||||||
callback(onfail, None)
|
callback(onfail, None)
|
||||||
if 'password' in request.post_vars:
|
redirect(self.url(args=request.args, vars=request.get_vars),client_side=settings.client_side)
|
||||||
del request.post_vars['password']
|
|
||||||
redirect(self.url(args=request.args, vars=request.vars),client_side=settings.client_side)
|
|
||||||
|
|
||||||
else: # use a central authentication server
|
else: # use a central authentication server
|
||||||
cas = settings.login_form
|
cas = settings.login_form
|
||||||
|
|||||||
Reference in New Issue
Block a user