From d232e1107d60e7689e706bee9705f26745ae8b9e Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 25 Sep 2019 03:00:48 +0000 Subject: CTAN sync 201909250300 --- macros/latex/contrib/pythontex/pythontex3.py | 157 +++++++++++++++++++++------ 1 file changed, 126 insertions(+), 31 deletions(-) (limited to 'macros/latex/contrib/pythontex/pythontex3.py') diff --git a/macros/latex/contrib/pythontex/pythontex3.py b/macros/latex/contrib/pythontex/pythontex3.py index cb96f97d33..bc61f912ca 100644 --- a/macros/latex/contrib/pythontex/pythontex3.py +++ b/macros/latex/contrib/pythontex/pythontex3.py @@ -13,7 +13,7 @@ should be in the same directory. Licensed under the BSD 3-Clause License: -Copyright (c) 2012-2017, Geoffrey M. Poore +Copyright (c) 2012-2019, Geoffrey M. Poore All rights reserved. @@ -62,6 +62,7 @@ from pygments.styles import get_all_styles from pythontex_engines import * import textwrap import platform +import itertools if sys.version_info[0] == 2: try: @@ -77,7 +78,7 @@ else: # Script parameters # Version -__version__ = '0.16' +__version__ = '0.17' @@ -1213,9 +1214,13 @@ def do_multiprocessing(data, temp_data, old_data, engine_dict): # Must double-escape any backslashes so that they survive `shlex.split()` script = basename if os.path.isabs(os.path.expanduser(os.path.normcase(outputdir))): - script_full = os.path.expanduser(os.path.normcase(os.path.join(outputdir, basename))) + script_full = os.path.expanduser(os.path.join(outputdir, basename)) else: - script_full = os.path.expanduser(os.path.normcase(os.path.join(orig_cwd, outputdir, basename))) + script_full = os.path.expanduser(os.path.join(orig_cwd, outputdir, basename)) + if platform.system() == 'Windows': + script_full = script_full.replace('/', '\\') + else: + script_full = script_full.replace('\\', '/') # `shlex.split()` only works with Unicode after 2.7.2 if (sys.version_info.major == 2 and sys.version_info.micro < 3): exec_cmd = shlex.split(bytes(command.format(file=script.replace('\\', '\\\\'), File=script_full.replace('\\', '\\\\')))) @@ -1275,7 +1280,11 @@ def do_multiprocessing(data, temp_data, old_data, engine_dict): for key in code_dict: family = key.split('#')[0] # Uncomment the following for debugging, and comment out what follows - '''run_code(encoding, outputdir, workingdir, code_dict[key], + '''run_code(encoding, outputdir, + workingdir, + cc_dict_begin[family], + code_dict[key], + cc_dict_end[family], engine_dict[family].language, engine_dict[family].commands, engine_dict[family].created, @@ -1287,9 +1296,12 @@ def do_multiprocessing(data, temp_data, old_data, engine_dict): engine_dict[family].linenumbers, engine_dict[family].lookbehind, keeptemps, hashdependencies, - pygments_settings)''' + pygments_settings]))''' tasks.append(pool.apply_async(run_code, [encoding, outputdir, - workingdir, code_dict[key], + workingdir, + cc_dict_begin[family], + code_dict[key], + cc_dict_end[family], engine_dict[family].language, engine_dict[family].commands, engine_dict[family].created, @@ -1412,7 +1424,7 @@ def do_multiprocessing(data, temp_data, old_data, engine_dict): unresolved_sessions = [] for key in dependencies: for dep, val in dependencies[key].items(): - if val[0] > start_time: + if val[0] is None or val[0] > start_time: unresolved_dependencies = True dependencies[key][dep] = (None, None) unresolved_sessions.append(key.replace('#', ':')) @@ -1474,7 +1486,8 @@ def do_multiprocessing(data, temp_data, old_data, engine_dict): -def run_code(encoding, outputdir, workingdir, code_list, language, commands, +def run_code(encoding, outputdir, workingdir, + cc_begin_list, code_list, cc_end_list, language, commands, command_created, extension, makestderr, stderrfilename, code_index, errorsig, warningsig, linesig, stderrlookbehind, keeptemps, hashdependencies, pygments_settings): @@ -1512,11 +1525,19 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands, err_file_name = os.path.expanduser(os.path.normcase(os.path.join(outputdir, basename + '.err'))) out_file = open(out_file_name, 'w', encoding=encoding) err_file = open(err_file_name, 'w', encoding=encoding) - script = os.path.expanduser(os.path.normcase(os.path.join(outputdir, basename))) + script = os.path.expanduser(os.path.join(outputdir, basename)) + if platform.system() == 'Windows': + script = script.replace('/', '\\') + else: + script = script.replace('\\', '/') if os.path.isabs(script): script_full = script else: - script_full = os.path.expanduser(os.path.normcase(os.path.join(os.getcwd(), outputdir, basename))) + script_full = os.path.expanduser(os.path.join(os.getcwd(), outputdir, basename)) + if platform.system() == 'Windows': + script_full = script_full.replace('/', '\\') + else: + script_full = script_full.replace('\\', '/') # #### Need to revise so that intermediate files can be detected and cleaned up for f in command_created: files.append(f.format(file=script, File=script_full)) @@ -1535,7 +1556,10 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands, # Add any created files due to the command # This needs to be done before attempts to execute, to prevent orphans try: - proc = subprocess.Popen(exec_cmd, stdout=out_file, stderr=err_file) + if family != 'Rcon': + proc = subprocess.Popen(exec_cmd, stdout=out_file, stderr=err_file) + else: + proc = subprocess.Popen(exec_cmd, stdout=out_file, stderr=subprocess.STDOUT) except WindowsError as e: if e.errno == 2: # Batch files won't be found when called without extension. They @@ -1546,7 +1570,10 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands, # under Windows; a list is not required. exec_cmd_string = ' '.join(exec_cmd) exec_cmd_string = 'cmd /C "@echo off & call {0} & if errorlevel 1 exit 1"'.format(exec_cmd_string) - proc = subprocess.Popen(exec_cmd_string, stdout=out_file, stderr=err_file) + if family != 'Rcon': + proc = subprocess.Popen(exec_cmd_string, stdout=out_file, stderr=err_file) + else: + proc = subprocess.Popen(exec_cmd_string, stdout=out_file, stderr=subprocess.STDOUT) else: raise @@ -1567,15 +1594,21 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands, messages.append('* PythonTeX error') messages.append(' Missing output file for ' + key_run.replace('#', ':')) errors += 1 + elif family == 'juliacon' and proc.returncode == 1: + messages.append('* PythonTeX error') + messages.append(' Running code for Julia console failed') + with open(err_file_name, encoding='utf8') as f: + messages.append(f.read()) + errors += 1 else: if family == 'juliacon': with open(out_file_name.rsplit('.', 1)[0] + '.tex', 'r', encoding=encoding) as f: tex_data_lines = f.readlines() - inst = 0 + code_iter = itertools.chain(cc_begin_list, code_list, cc_end_list) for n, line in enumerate(tex_data_lines): if line.rstrip() == '\\begin{juliaterm}': - tex_data_lines[n] = '=>PYTHONTEX:STDOUT#{0}#code#\n'.format(inst) - inst += 1 + c = next(code_iter) + tex_data_lines[n] = '=>PYTHONTEX:STDOUT#{0}#code#\n'.format(c.instance) if n != 0: tex_data_lines[n-1] = '' if line.rstrip() == '\\end{juliaterm}': @@ -1583,6 +1616,29 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands, tex_data_lines.append('=>PYTHONTEX:DEPENDENCIES#\n=>PYTHONTEX:CREATED#\n') with open(out_file_name, 'w', encoding=encoding) as f: f.write(''.join(tex_data_lines)) + elif family == 'Rcon': + with open(out_file_name, 'r', encoding=encoding) as f: + stdout_lines = f.readlines() + for n, line in enumerate(stdout_lines): + if line.startswith('> =>PYTHONTEX:'): + stdout_lines[n] = line[2:] + elif '> write("=>PYTHONTEX:' in line: + if line.startswith('> write("=>PYTHONTEX:'): + stdout_lines[n] = '' + else: + # cat() and similar functions can result in the + # prompt not being at the start of a new line. In + # that case, preserve the prompt to accurately + # emulate the console. If there is a following + # console environment, this effectively amounts + # to adding an extra empty line (pressing ENTER) + # between the two. + stdout_lines[n] = line.split('write("=>PYTHONTEX:', 1)[0] + while stdout_lines and (stdout_lines[-1].startswith('>') and not stdout_lines[-1][1:].strip(' \n')): + stdout_lines.pop() + stdout_lines.append('=>PYTHONTEX:DEPENDENCIES#\n=>PYTHONTEX:CREATED#\n') + with open(out_file_name, 'w', encoding=encoding) as f: + f.write(''.join(stdout_lines)) f = open(out_file_name, 'r', encoding=encoding) out = f.read() @@ -1640,7 +1696,7 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands, else: dependencies[dep] = (os.path.getmtime(dep_file), '') - if family == 'juliacon': + if family in ('juliacon', 'Rcon'): from pygments import highlight from pygments.lexers import get_lexer_by_name from pygments.formatters import LatexFormatter @@ -1655,16 +1711,21 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands, for block in out.split('=>PYTHONTEX:STDOUT#')[1:]: if block: delims, content = block.split('#\n', 1) + if content and not content.endswith('\n'): + # Content might not end with a newline. For example, + # Rcon with something like cat() as the last function. + content += '\n' instance, command = delims.split('#') if content or command in ('s', 'sub'): if instance.endswith('CC'): - messages.append('* PythonTeX warning') - messages.append(' Custom code for "' + family + '" attempted to print or write to stdout') - messages.append(' This is not supported; use a normal code command or environment') - messages.append(' The following content was written:') - messages.append('') - messages.extend([' ' + l for l in content.splitlines()]) - warnings += 1 + if family not in ('juliacon', 'Rcon'): + messages.append('* PythonTeX warning') + messages.append(' Custom code for "' + family + '" attempted to print or write to stdout') + messages.append(' This is not supported; use a normal code command or environment') + messages.append(' The following content was written:') + messages.append('') + messages.extend([' ' + l for l in content.splitlines()]) + warnings += 1 elif command == 'i': content = r'\pytx@SVMCR{pytx@MCR@' + key_run.replace('#', '@') + '@' + instance + '}\n' + content.rstrip('\n') + '\\endpytx@SVMCR\n\n' macros.append(content) @@ -1682,7 +1743,7 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands, # Remove newline added by printing, prevent # LaTeX from adding a space after content content = content.rsplit('\n', 1)[0] + '\\endinput\n' - if family == 'juliacon': + if family in ('juliacon', 'Rcon'): content = highlight(content, lexer[family], formatter[family]) f.write(content) f.close() @@ -1693,7 +1754,7 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands, messages.append('* PythonTeX error') messages.append(' Missing stderr file for ' + key_run.replace('#', ':')) errors += 1 - elif family == 'juliacon': + elif family in ('juliacon', 'Rcon'): pass else: # Open error and code files. @@ -1733,7 +1794,7 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands, index_next = index_now start_errgobble = None for n, line in enumerate(err_ud): - if basename in line: + if basename in line and (family not in ('perlsix', 'psix') or '.p6:' in line or '.p6 line' in line): # Get the gobbleation. This is used to determine if # other lines containing the basename are a continuation, # or separate messages. @@ -1779,7 +1840,7 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands, # both the error and warning patterns, default to # error. past_line = err_ud[index] - if (index < n and basename in past_line): + if (index < n and basename in past_line and (family not in ('perlsix', 'psix') or '.p6:' in past_line or '.p6 line' in past_line)): break for pattern in warningsig: if pattern in past_line: @@ -1843,8 +1904,9 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands, index_now_last = index_now index_next_last = index_next err_key_last_int = -1 + p6_sorry_search = False for n, line in enumerate(err_ud): - if basename in line: + if basename in line and (family not in ('perlsix', 'psix') or '.p6:' in line or '.p6 line' in line): # Determine the corresponding line number in the document found = False for pattern in linesig: @@ -1906,6 +1968,35 @@ def run_code(encoding, outputdir, workingdir, code_list, language, commands, line = line.replace(fullbasename + '.' + extension, '') elif stderrfilename == 'genericscript': line = line.replace(fullbasename + '.' + extension, '