diff options
| -rw-r--r-- | Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.pdf | bin | 84163 -> 84169 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.tex | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.lua | 26 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.sty | 2 |
4 files changed, 21 insertions, 11 deletions
diff --git a/Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.pdf b/Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.pdf Binary files differindex 23699dd22bd..173c053483c 100644 --- a/Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.pdf +++ b/Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.pdf diff --git a/Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.tex b/Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.tex index 594d1c0e90b..7446313863b 100644 --- a/Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.tex +++ b/Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.tex @@ -15,7 +15,7 @@ \usepackage{url} \title{The \emph{pyluatex} package} \author{Tobias Enderle\\\url{https://github.com/tndrle/PyLuaTeX}} -\date{v0.4.1 (2022/02/04)} +\date{v0.4.2 (2022/02/13)} \begin{document} \maketitle \raggedright @@ -143,7 +143,7 @@ For an example, see the Typesetting Code section. Specifies when the Python process is shut down. (default: \inlcode|veryveryend|)\\[0.5ex] \textit{Options:} \inlcode|veryveryend|, \inlcode|veryenddocument|, \inlcode|off|\\[0.5ex] PyLuaTeX uses the hooks of the package \textit{atveryend} to shut down the Python interpreter when the compilation is done. With the option \inlcode|veryveryend|, Python is shut down in the \inlcode|\AtVeryVeryEnd| hook. With the option \inlcode|veryenddocument|, Python is shut down in the \inlcode|\AtVeryEndDocument| hook. With the option \inlcode|off|, Python is not shut down explicitly. However, the Python process will shut down when the LuaTeX process finishes even if \inlcode|off| is selected. Using \inlcode|off| on Windows might lead to problems with SyncTeX, though.\\[0.5ex] - \textit{Example:} \inlcode|\usepackage[veryenddocument]{pyluatex}| + \textit{Example:} \inlcode|\usepackage[shutdown=veryenddocument]{pyluatex}| \end{itemize} Package options (except for \inlcode|executable| and \inlcode|shutdown|) can be changed in the document with the \inlcode|\pyoption| command, e.g. \inlcode|\pyoption{verbose}{true}| or \inlcode|\pyoption{ignoreerrors}{false}|. diff --git a/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.lua b/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.lua index f95ab989c08..f9d8ff68a65 100644 --- a/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.lua +++ b/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.lua @@ -33,7 +33,6 @@ pyluatex = pyluatex or { -- status.filename: path to pyluatex.sty local folder = file.pathpart(file.collapsepath(status.filename, true)) -local script = file.join(folder, "pyluatex-interpreter.py") local tcp = nil local env_end = nil @@ -53,6 +52,7 @@ local function err_cmd(message) end function pyluatex.start(executable) + local script = file.join(folder, "pyluatex-interpreter.py") local is_windows = package.config:sub(1,1) ~= "/" local cmd if is_windows then @@ -61,15 +61,25 @@ function pyluatex.start(executable) cmd = executable .. " \"" .. script .. "\" &" end local f = io.popen(cmd, "r") - local port = f:read("*l"):gsub("\r", ""):gsub("\n", "") + local port = f:read("*l") f:close() - if port then - tcp = socket.tcp() - tcp:connect("127.0.0.1", port) - else - tex.sprint(err_cmd("Python backend (executable: " .. executable .. - ") could not be started")) + function err(message) + tex.sprint(err_cmd("Python backend could not be started (" .. message .. ")")) + end + + if port == nil then + err("executable: " .. executable) + return + end + port = trim(port) + if port:match("^%d+$") == nil then + err("invalid TCP port: " .. port) + return + end + tcp = socket.tcp() + if tcp:connect("127.0.0.1", port) == nil then + err("TCP connection failed") end end diff --git a/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.sty b/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.sty index cf67916d198..6c247993a91 100644 --- a/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.sty +++ b/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.sty @@ -9,7 +9,7 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{pyluatex}[2022/02/04 v0.4.1 Execute Python code on the fly] +\ProvidesPackage{pyluatex}[2022/02/13 v0.4.2 Execute Python code on the fly] \RequirePackage{expl3} \ExplSyntaxOn |