-#! /usr/bin/env python
# file lyxpreview_tools.py
# This file is part of LyX, the document processor.
return exe
-def run_command_popen(cmd):
+def run_command_popen(cmd, stderr2stdout):
if os.name == 'nt':
unix = False
else:
unix = True
- pipe = subprocess.Popen(cmd, shell=unix, close_fds=unix, stdin=subprocess.PIPE, \
- stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True)
- cmd_stdout = pipe.communicate()[0]
+ if stderr2stdout:
+ pipe = subprocess.Popen(cmd, shell=unix, close_fds=unix, stdin=subprocess.PIPE, \
+ stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True)
+ cmd_stdout = pipe.communicate()[0]
+ else:
+ pipe = subprocess.Popen(cmd, shell=unix, close_fds=unix, stdin=subprocess.PIPE, \
+ stdout=subprocess.PIPE, universal_newlines=True)
+ (cmd_stdout, cmd_stderr) = pipe.communicate()
+ if cmd_stderr:
+ sys.stderr.write(cmd_stderr)
cmd_status = pipe.returncode
global debug
if hr != winerror.ERROR_IO_PENDING:
data = data + buffer
- except pywintypes.error, e:
+ except pywintypes.error as e:
if e.args[0] != winerror.ERROR_BROKEN_PIPE:
error = 1
break
return 0, data
-def run_command(cmd):
+def run_command(cmd, stderr2stdout = True):
progress("Running %s" % cmd)
if use_win32_modules:
return run_command_win32(cmd)
else:
- return run_command_popen(cmd)
+ return run_command_popen(cmd, stderr2stdout)
def get_version_info():
# Reads a .tex files and create an identical file but only with
# pages whose index is in pages_to_keep
def filter_pages(source_path, destination_path, pages_to_keep):
+ def_re = re.compile(r"(\\newcommandx|\\renewcommandx|\\global\\long\\def)(\\[a-zA-Z]+)(.+)")
source_file = open(source_path, "r")
destination_file = open(destination_path, "w")
page_index = 0
skip_page = False
+ macros = []
for line in source_file:
# We found a new page
if line.startswith("\\begin{preview}"):
skip_page = page_index not in pages_to_keep
if not skip_page:
+ match = def_re.match(line)
+ if match != None:
+ definecmd = match.group(1)
+ macroname = match.group(2)
+ if not macroname in macros:
+ macros.append(macroname)
+ if definecmd == "\\renewcommandx":
+ line = line.replace(definecmd, "\\newcommandx")
destination_file.write(line)
# End of a page, we reset the skip_page bool
tex_status, tex_stdout = run_command(tex_call)
if tex_status:
- warning("%s had problems compiling %s" \
+ progress("Warning: %s had problems compiling %s" \
% (os.path.basename(tex), tex_file))
return tex_status, tex_stdout
return True
f.close()
return False
+
+
+# Returns a list of indexes of pages giving errors extracted from the latex log
+def check_latex_log(log_file):
+
+ error_re = re.compile("^! ")
+ snippet_re = re.compile("^Preview: Snippet ")
+ data_re = re.compile("([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+)")
+
+ found_error = False
+ error_pages = []
+
+ try:
+ for line in open(log_file, 'r').readlines():
+ if not found_error:
+ match = error_re.match(line)
+ if match != None:
+ found_error = True
+ continue
+ else:
+ match = snippet_re.match(line)
+ if match == None:
+ continue
+
+ found_error = False
+ match = data_re.search(line)
+ if match == None:
+ error("Unexpected data in %s\n%s" % (log_file, line))
+
+ error_pages.append(int(match.group(1)))
+
+ except:
+ warning('check_latex_log: Unable to open "%s"' % log_file)
+ warning(repr(sys.exc_info()[0]) + ',' + repr(sys.exc_info()[1]))
+
+ return error_pages