From caabe2b8537e3d585526755590bcef03f2396ce2 Mon Sep 17 00:00:00 2001 From: "Dmitry M. Lazutkin" Date: Thu, 18 Jun 2020 17:20:31 +0300 Subject: [PATCH] Fix jobname parsing Merge changes from PR https://github.com/aclements/latexrun/pull/47 --- latexrun | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/latexrun b/latexrun index b669d9f..550eb10 100755 --- a/latexrun +++ b/latexrun @@ -861,15 +861,16 @@ class LaTeX(Task): pages of output. """ jobname = outname = None - for m in re.finditer(r'^Transcript written on "?(.*)\.log"?\.$', stdout, + for m in re.finditer(r'Transcript written on "?(.*?)\.log"?\.', stdout, re.MULTILINE | re.DOTALL): jobname = m.group(1).replace('\n', '') if jobname is None: print(stdout, file=sys.stderr) raise TaskError('failed to extract job name from latex log') - for m in re.finditer(r'^Output written on "?(.*\.[^ ."]+)"? \([0-9]+ page', + for m in re.finditer(r'Output written on "?(.*?\.[^ ."]+)"?\s+\([0-9]+ (page)?', stdout, re.MULTILINE | re.DOTALL): - outname = m.group(1).replace('\n', '') + if m.group(2) == "page": + outname = m.group(1).replace('\n', '') if outname is None and not \ re.search(r'^No pages of output\.$|^! Emergency stop\.$' r'|^! ==> Fatal error occurred, no output PDF file produced!$',