From be2c1281dd10d4812d6224f0aeb1bd42bd9c2539 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 3 Jan 2023 20:50:20 +0000 Subject: pyluatex (3jan23) git-svn-id: svn://tug.org/texlive/trunk@65454 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/lualatex/pyluatex/README.md | 3 - .../doc/lualatex/pyluatex/example/beamer.tex | 2 +- .../pyluatex/example/data-visualization.tex | 12 +- .../pyluatex/example/matplotlib-external.tex | 2 +- .../lualatex/pyluatex/example/matplotlib-pgf.tex | 2 +- .../pyluatex/example/readme-custom-env.tex | 2 +- .../lualatex/pyluatex/example/readme-example.tex | 2 +- .../doc/lualatex/pyluatex/example/repl.tex | 4 +- .../doc/lualatex/pyluatex/example/sessions.tex | 2 +- .../pyluatex/example/typesetting-example.tex | 2 +- .../pyluatex/example/typesetting-listings.tex | 2 +- .../pyluatex/example/typesetting-minted.tex | 2 +- .../texmf-dist/doc/lualatex/pyluatex/pyluatex.pdf | Bin 82203 -> 82073 bytes .../texmf-dist/doc/lualatex/pyluatex/pyluatex.tex | 5 +- .../tex/lualatex/pyluatex/pyluatex-interpreter.py | 7 +- .../tex/lualatex/pyluatex/pyluatex-json.lua | 388 --------------------- .../texmf-dist/tex/lualatex/pyluatex/pyluatex.lua | 12 +- .../texmf-dist/tex/lualatex/pyluatex/pyluatex.sty | 28 +- 18 files changed, 42 insertions(+), 435 deletions(-) delete mode 100644 Master/texmf-dist/tex/lualatex/pyluatex/pyluatex-json.lua (limited to 'Master') diff --git a/Master/texmf-dist/doc/lualatex/pyluatex/README.md b/Master/texmf-dist/doc/lualatex/pyluatex/README.md index 06ae0a714d4..f753b5850d6 100644 --- a/Master/texmf-dist/doc/lualatex/pyluatex/README.md +++ b/Master/texmf-dist/doc/lualatex/pyluatex/README.md @@ -55,9 +55,6 @@ executed. For this reason, it is recommended to compile trusted documents only. [LPPL 1.3c](http://www.latex-project.org/lppl.txt) for LaTeX code and [MIT license](https://opensource.org/licenses/MIT) for Python and Lua code. -We use the great [json.lua](https://github.com/rxi/json.lua) library under the terms -of the [MIT license](https://opensource.org/licenses/MIT). - ## Further Information Author: Tobias Enderle diff --git a/Master/texmf-dist/doc/lualatex/pyluatex/example/beamer.tex b/Master/texmf-dist/doc/lualatex/pyluatex/example/beamer.tex index 31ba69db821..3592a56922a 100644 --- a/Master/texmf-dist/doc/lualatex/pyluatex/example/beamer.tex +++ b/Master/texmf-dist/doc/lualatex/pyluatex/example/beamer.tex @@ -1,4 +1,4 @@ -%% Copyright 2021-2022 Tobias Enderle +%% Copyright 2021-2023 Tobias Enderle %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/doc/lualatex/pyluatex/example/data-visualization.tex b/Master/texmf-dist/doc/lualatex/pyluatex/example/data-visualization.tex index 3a2d20a2bdd..2d43cb946bf 100644 --- a/Master/texmf-dist/doc/lualatex/pyluatex/example/data-visualization.tex +++ b/Master/texmf-dist/doc/lualatex/pyluatex/example/data-visualization.tex @@ -1,4 +1,4 @@ -%% Copyright 2021-2022 Tobias Enderle +%% Copyright 2021-2023 Tobias Enderle %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -72,8 +72,8 @@ and \py{df.Time.iloc[-1]}. The red lines mark the current year and population. xticklabel style={/pgf/number format/1000 sep=}, grid=both, ] -\addplot[no marks,black,thick] coordinates {% - \py{pgf_coords(world_data.index, world_data.PopTotal / 1e6)}% +\addplot[no marks,black,thick] coordinates { + \py{pgf_coords(world_data.index, world_data.PopTotal / 1e6)} }; \draw[red,thick] (axis cs:\py{year},0) |- (axis cs:0,\py{current_pop / 1e6}); \end{axis} @@ -123,9 +123,9 @@ plots = [ xticklabel style={/pgf/number format/1000 sep=}, grid=both, ] -\pgfplotsinvokeforeach{0,1}{% - \addplot[no marks,black,thick] coordinates {% - \py{pgf_coords(plots[#1][1].index, plots[#1][1])}% +\pgfplotsinvokeforeach{0,1}{ + \addplot[no marks,black,thick] coordinates { + \py{pgf_coords(plots[#1][1].index, plots[#1][1])} }; \node[below] at (axis cs:\py{marker_year},\py{plots[#1][1].loc[marker_year]}) {\py{plots[#1][0]}}; diff --git a/Master/texmf-dist/doc/lualatex/pyluatex/example/matplotlib-external.tex b/Master/texmf-dist/doc/lualatex/pyluatex/example/matplotlib-external.tex index bdea9c0afd8..9289d1c6d7b 100644 --- a/Master/texmf-dist/doc/lualatex/pyluatex/example/matplotlib-external.tex +++ b/Master/texmf-dist/doc/lualatex/pyluatex/example/matplotlib-external.tex @@ -1,4 +1,4 @@ -%% Copyright 2021-2022 Tobias Enderle +%% Copyright 2021-2023 Tobias Enderle %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/doc/lualatex/pyluatex/example/matplotlib-pgf.tex b/Master/texmf-dist/doc/lualatex/pyluatex/example/matplotlib-pgf.tex index 2962be862f8..9172bbe0de2 100644 --- a/Master/texmf-dist/doc/lualatex/pyluatex/example/matplotlib-pgf.tex +++ b/Master/texmf-dist/doc/lualatex/pyluatex/example/matplotlib-pgf.tex @@ -1,4 +1,4 @@ -%% Copyright 2021-2022 Tobias Enderle +%% Copyright 2021-2023 Tobias Enderle %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/doc/lualatex/pyluatex/example/readme-custom-env.tex b/Master/texmf-dist/doc/lualatex/pyluatex/example/readme-custom-env.tex index b3257fbb013..115299264ee 100644 --- a/Master/texmf-dist/doc/lualatex/pyluatex/example/readme-custom-env.tex +++ b/Master/texmf-dist/doc/lualatex/pyluatex/example/readme-custom-env.tex @@ -1,4 +1,4 @@ -%% Copyright 2021-2022 Tobias Enderle +%% Copyright 2021-2023 Tobias Enderle %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/doc/lualatex/pyluatex/example/readme-example.tex b/Master/texmf-dist/doc/lualatex/pyluatex/example/readme-example.tex index 177aa40c15c..63ba160acea 100644 --- a/Master/texmf-dist/doc/lualatex/pyluatex/example/readme-example.tex +++ b/Master/texmf-dist/doc/lualatex/pyluatex/example/readme-example.tex @@ -1,4 +1,4 @@ -%% Copyright 2021-2022 Tobias Enderle +%% Copyright 2021-2023 Tobias Enderle %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/doc/lualatex/pyluatex/example/repl.tex b/Master/texmf-dist/doc/lualatex/pyluatex/example/repl.tex index 8622223ef3c..fd56dbc91a5 100644 --- a/Master/texmf-dist/doc/lualatex/pyluatex/example/repl.tex +++ b/Master/texmf-dist/doc/lualatex/pyluatex/example/repl.tex @@ -1,4 +1,4 @@ -%% Copyright 2021-2022 Tobias Enderle +%% Copyright 2021-2023 Tobias Enderle %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -42,7 +42,7 @@ end {\PyLTVerbatimEnv\begin{pythonrepl}} {\end{pythonrepl}\pytypeset} -\begin{filecontents*}{repl.py} +\begin{filecontents*}[nosearch]{repl.py} def square(x): return x**2 diff --git a/Master/texmf-dist/doc/lualatex/pyluatex/example/sessions.tex b/Master/texmf-dist/doc/lualatex/pyluatex/example/sessions.tex index 8d206a6b0c0..49f49c4ddb0 100644 --- a/Master/texmf-dist/doc/lualatex/pyluatex/example/sessions.tex +++ b/Master/texmf-dist/doc/lualatex/pyluatex/example/sessions.tex @@ -1,4 +1,4 @@ -%% Copyright 2021-2022 Tobias Enderle +%% Copyright 2021-2023 Tobias Enderle %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-example.tex b/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-example.tex index 7c6cc910154..435c02973a8 100644 --- a/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-example.tex +++ b/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-example.tex @@ -1,4 +1,4 @@ -%% Copyright 2021-2022 Tobias Enderle +%% Copyright 2021-2023 Tobias Enderle %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-listings.tex b/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-listings.tex index f83a6abd9a9..116ebc2fc8e 100644 --- a/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-listings.tex +++ b/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-listings.tex @@ -1,4 +1,4 @@ -%% Copyright 2021-2022 Tobias Enderle +%% Copyright 2021-2023 Tobias Enderle %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-minted.tex b/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-minted.tex index f36c7b802b8..760d1a1355f 100644 --- a/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-minted.tex +++ b/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-minted.tex @@ -1,4 +1,4 @@ -%% Copyright 2021-2022 Tobias Enderle +%% Copyright 2021-2023 Tobias Enderle %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.pdf b/Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.pdf index 5f5e096b876..69fe67558e0 100644 Binary files a/Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.pdf and b/Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.pdf differ diff --git a/Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.tex b/Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.tex index 56782fcf193..12c539d6609 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.5.1 (2022/12/30)} +\date{v0.5.2 (2023/01/03)} \begin{document} \maketitle \raggedright @@ -269,7 +269,4 @@ No placeholders have to be inserted. \section{License} LPPL 1.3c\footnote{\url{http://www.latex-project.org/lppl.txt}} for \LaTeX{} code and MIT license\footnote{\url{https://opensource.org/licenses/MIT}} for Python and Lua code. - -We use the great json.lua\footnote{\url{https://github.com/rxi/json.lua}} library under the terms -of the MIT license\footnote{\url{https://opensource.org/licenses/MIT}}. \end{document} diff --git a/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex-interpreter.py b/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex-interpreter.py index 5a21e6d0f0a..28ec28e12e7 100644 --- a/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex-interpreter.py +++ b/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex-interpreter.py @@ -1,7 +1,7 @@ """ MIT License -Copyright (c) 2021-2022 Tobias Enderle +Copyright (c) 2021-2023 Tobias Enderle Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -88,11 +88,10 @@ class Handler(socketserver.StreamRequestHandler): data = self.rfile.readline().decode('utf-8') if len(data) == 0: # socket closed, LuaTeX process finished return - - data = json.loads(data) - if data == 'shutdown': + if data.strip() == 'shutdown': return + data = json.loads(data) interpreter = interpreters[data['session']] code = textwrap.dedent(data['code']) if data['repl_mode']: diff --git a/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex-json.lua b/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex-json.lua deleted file mode 100644 index 711ef786196..00000000000 --- a/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex-json.lua +++ /dev/null @@ -1,388 +0,0 @@ --- --- json.lua --- --- Copyright (c) 2020 rxi --- --- Permission is hereby granted, free of charge, to any person obtaining a copy of --- this software and associated documentation files (the "Software"), to deal in --- the Software without restriction, including without limitation the rights to --- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies --- of the Software, and to permit persons to whom the Software is furnished to do --- so, subject to the following conditions: --- --- The above copyright notice and this permission notice shall be included in all --- copies or substantial portions of the Software. --- --- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --- SOFTWARE. --- - -local json = { _version = "0.1.2" } - -------------------------------------------------------------------------------- --- Encode -------------------------------------------------------------------------------- - -local encode - -local escape_char_map = { - [ "\\" ] = "\\", - [ "\"" ] = "\"", - [ "\b" ] = "b", - [ "\f" ] = "f", - [ "\n" ] = "n", - [ "\r" ] = "r", - [ "\t" ] = "t", -} - -local escape_char_map_inv = { [ "/" ] = "/" } -for k, v in pairs(escape_char_map) do - escape_char_map_inv[v] = k -end - - -local function escape_char(c) - return "\\" .. (escape_char_map[c] or string.format("u%04x", c:byte())) -end - - -local function encode_nil(val) - return "null" -end - - -local function encode_table(val, stack) - local res = {} - stack = stack or {} - - -- Circular reference? - if stack[val] then error("circular reference") end - - stack[val] = true - - if rawget(val, 1) ~= nil or next(val) == nil then - -- Treat as array -- check keys are valid and it is not sparse - local n = 0 - for k in pairs(val) do - if type(k) ~= "number" then - error("invalid table: mixed or invalid key types") - end - n = n + 1 - end - if n ~= #val then - error("invalid table: sparse array") - end - -- Encode - for i, v in ipairs(val) do - table.insert(res, encode(v, stack)) - end - stack[val] = nil - return "[" .. table.concat(res, ",") .. "]" - - else - -- Treat as an object - for k, v in pairs(val) do - if type(k) ~= "string" then - error("invalid table: mixed or invalid key types") - end - table.insert(res, encode(k, stack) .. ":" .. encode(v, stack)) - end - stack[val] = nil - return "{" .. table.concat(res, ",") .. "}" - end -end - - -local function encode_string(val) - return '"' .. val:gsub('[%z\1-\31\\"]', escape_char) .. '"' -end - - -local function encode_number(val) - -- Check for NaN, -inf and inf - if val ~= val or val <= -math.huge or val >= math.huge then - error("unexpected number value '" .. tostring(val) .. "'") - end - return string.format("%.14g", val) -end - - -local type_func_map = { - [ "nil" ] = encode_nil, - [ "table" ] = encode_table, - [ "string" ] = encode_string, - [ "number" ] = encode_number, - [ "boolean" ] = tostring, -} - - -encode = function(val, stack) - local t = type(val) - local f = type_func_map[t] - if f then - return f(val, stack) - end - error("unexpected type '" .. t .. "'") -end - - -function json.encode(val) - return ( encode(val) ) -end - - -------------------------------------------------------------------------------- --- Decode -------------------------------------------------------------------------------- - -local parse - -local function create_set(...) - local res = {} - for i = 1, select("#", ...) do - res[ select(i, ...) ] = true - end - return res -end - -local space_chars = create_set(" ", "\t", "\r", "\n") -local delim_chars = create_set(" ", "\t", "\r", "\n", "]", "}", ",") -local escape_chars = create_set("\\", "/", '"', "b", "f", "n", "r", "t", "u") -local literals = create_set("true", "false", "null") - -local literal_map = { - [ "true" ] = true, - [ "false" ] = false, - [ "null" ] = nil, -} - - -local function next_char(str, idx, set, negate) - for i = idx, #str do - if set[str:sub(i, i)] ~= negate then - return i - end - end - return #str + 1 -end - - -local function decode_error(str, idx, msg) - local line_count = 1 - local col_count = 1 - for i = 1, idx - 1 do - col_count = col_count + 1 - if str:sub(i, i) == "\n" then - line_count = line_count + 1 - col_count = 1 - end - end - error( string.format("%s at line %d col %d", msg, line_count, col_count) ) -end - - -local function codepoint_to_utf8(n) - -- http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=iws-appendixa - local f = math.floor - if n <= 0x7f then - return string.char(n) - elseif n <= 0x7ff then - return string.char(f(n / 64) + 192, n % 64 + 128) - elseif n <= 0xffff then - return string.char(f(n / 4096) + 224, f(n % 4096 / 64) + 128, n % 64 + 128) - elseif n <= 0x10ffff then - return string.char(f(n / 262144) + 240, f(n % 262144 / 4096) + 128, - f(n % 4096 / 64) + 128, n % 64 + 128) - end - error( string.format("invalid unicode codepoint '%x'", n) ) -end - - -local function parse_unicode_escape(s) - local n1 = tonumber( s:sub(1, 4), 16 ) - local n2 = tonumber( s:sub(7, 10), 16 ) - -- Surrogate pair? - if n2 then - return codepoint_to_utf8((n1 - 0xd800) * 0x400 + (n2 - 0xdc00) + 0x10000) - else - return codepoint_to_utf8(n1) - end -end - - -local function parse_string(str, i) - local res = "" - local j = i + 1 - local k = j - - while j <= #str do - local x = str:byte(j) - - if x < 32 then - decode_error(str, j, "control character in string") - - elseif x == 92 then -- `\`: Escape - res = res .. str:sub(k, j - 1) - j = j + 1 - local c = str:sub(j, j) - if c == "u" then - local hex = str:match("^[dD][89aAbB]%x%x\\u%x%x%x%x", j + 1) - or str:match("^%x%x%x%x", j + 1) - or decode_error(str, j - 1, "invalid unicode escape in string") - res = res .. parse_unicode_escape(hex) - j = j + #hex - else - if not escape_chars[c] then - decode_error(str, j - 1, "invalid escape char '" .. c .. "' in string") - end - res = res .. escape_char_map_inv[c] - end - k = j + 1 - - elseif x == 34 then -- `"`: End of string - res = res .. str:sub(k, j - 1) - return res, j + 1 - end - - j = j + 1 - end - - decode_error(str, i, "expected closing quote for string") -end - - -local function parse_number(str, i) - local x = next_char(str, i, delim_chars) - local s = str:sub(i, x - 1) - local n = tonumber(s) - if not n then - decode_error(str, i, "invalid number '" .. s .. "'") - end - return n, x -end - - -local function parse_literal(str, i) - local x = next_char(str, i, delim_chars) - local word = str:sub(i, x - 1) - if not literals[word] then - decode_error(str, i, "invalid literal '" .. word .. "'") - end - return literal_map[word], x -end - - -local function parse_array(str, i) - local res = {} - local n = 1 - i = i + 1 - while 1 do - local x - i = next_char(str, i, space_chars, true) - -- Empty / end of array? - if str:sub(i, i) == "]" then - i = i + 1 - break - end - -- Read token - x, i = parse(str, i) - res[n] = x - n = n + 1 - -- Next token - i = next_char(str, i, space_chars, true) - local chr = str:sub(i, i) - i = i + 1 - if chr == "]" then break end - if chr ~= "," then decode_error(str, i, "expected ']' or ','") end - end - return res, i -end - - -local function parse_object(str, i) - local res = {} - i = i + 1 - while 1 do - local key, val - i = next_char(str, i, space_chars, true) - -- Empty / end of object? - if str:sub(i, i) == "}" then - i = i + 1 - break - end - -- Read key - if str:sub(i, i) ~= '"' then - decode_error(str, i, "expected string for key") - end - key, i = parse(str, i) - -- Read ':' delimiter - i = next_char(str, i, space_chars, true) - if str:sub(i, i) ~= ":" then - decode_error(str, i, "expected ':' after key") - end - i = next_char(str, i + 1, space_chars, true) - -- Read value - val, i = parse(str, i) - -- Set - res[key] = val - -- Next token - i = next_char(str, i, space_chars, true) - local chr = str:sub(i, i) - i = i + 1 - if chr == "}" then break end - if chr ~= "," then decode_error(str, i, "expected '}' or ','") end - end - return res, i -end - - -local char_func_map = { - [ '"' ] = parse_string, - [ "0" ] = parse_number, - [ "1" ] = parse_number, - [ "2" ] = parse_number, - [ "3" ] = parse_number, - [ "4" ] = parse_number, - [ "5" ] = parse_number, - [ "6" ] = parse_number, - [ "7" ] = parse_number, - [ "8" ] = parse_number, - [ "9" ] = parse_number, - [ "-" ] = parse_number, - [ "t" ] = parse_literal, - [ "f" ] = parse_literal, - [ "n" ] = parse_literal, - [ "[" ] = parse_array, - [ "{" ] = parse_object, -} - - -parse = function(str, idx) - local chr = str:sub(idx, idx) - local f = char_func_map[chr] - if f then - return f(str, idx) - end - decode_error(str, idx, "unexpected character '" .. chr .. "'") -end - - -function json.decode(str) - if type(str) ~= "string" then - error("expected argument of type string, got " .. type(str)) - end - local res, idx = parse(str, next_char(str, 1, space_chars, true)) - idx = next_char(str, idx, space_chars, true) - if idx <= #str then - decode_error(str, idx, "trailing garbage") - end - return res -end - - -return json diff --git a/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.lua b/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.lua index 2b53bd77136..9f7d5f7936b 100644 --- a/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.lua +++ b/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.lua @@ -1,7 +1,7 @@ --[[ MIT License -Copyright (c) 2021-2022 Tobias Enderle +Copyright (c) 2021-2023 Tobias Enderle Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -22,7 +22,7 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --]] -local json = require("pyluatex-json") +require("lualibs-util-jsn") local socket = require("socket") pyluatex = pyluatex or { @@ -112,13 +112,13 @@ function pyluatex.start(executable, local_imports) end function pyluatex.shutdown() - tcp:send(json.encode("shutdown") .. "\n") + tcp:send("shutdown\n") end local function request(data) - tcp:send(json.encode(data) .. "\n") + tcp:send(utilities.json.tostring(data) .. "\n") local output = tcp:receive("*l") - local response = json.decode(output) + local response = utilities.json.tolua(output) return response.success, response.output end @@ -266,6 +266,8 @@ local function parse_bool(name, value) end function pyluatex.set_option(name, value) + name = trim(name) + value = trim(value) if name == "ignoreerrors" then pyluatex.ignore_errors = parse_bool(name, value) elseif name == "verbose" then diff --git a/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.sty b/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.sty index 02ac9d5f6cf..a5adf62973b 100644 --- a/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.sty +++ b/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.sty @@ -1,4 +1,4 @@ -%% Copyright 2021-2022 Tobias Enderle +%% Copyright 2021-2023 Tobias Enderle %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -9,15 +9,15 @@ %% version 2005/12/01 or later. \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{pyluatex}[2022/12/30 v0.5.1 Execute Python code on the fly] +\ProvidesPackage{pyluatex}[2023/01/03 v0.5.2 Execute Python code on the fly] \RequirePackage{expl3} \ExplSyntaxOn -\sys_if_engine_luatex:TF{}{% - \PackageError{PyLuaTeX}{LuaTeX~is~required}{}% +\sys_if_engine_luatex:TF{}{ + \PackageError{PyLuaTeX}{LuaTeX~is~required}{} } -\sys_if_shell_unrestricted:TF{}{% - \PackageError{PyLuaTeX}{Shell~escape~required~(add~-shell-escape~option)}{}% +\sys_if_shell_unrestricted:TF{}{ + \PackageError{PyLuaTeX}{Shell~escape~required~(add~-shell-escape~option)}{} } \ExplSyntaxOff @@ -40,18 +40,18 @@ \ExplSyntaxOn \cs_generate_variant:Nn \tl_if_eq:nnTF { V } -\tl_if_eq:VnTF{\pyluatex@shutdown}{veryveryend}{% +\tl_if_eq:VnTF{\pyluatex@shutdown}{veryveryend}{ \RequirePackage{atveryend} \AtVeryVeryEnd{\directlua{pyluatex.shutdown()}} -}{% - \tl_if_eq:VnTF{\pyluatex@shutdown}{veryenddocument}{% +}{ + \tl_if_eq:VnTF{\pyluatex@shutdown}{veryenddocument}{ \RequirePackage{atveryend} \AtVeryEndDocument{\directlua{pyluatex.shutdown()}} - }{% - \tl_if_eq:VnTF{\pyluatex@shutdown}{off}{}{% - \PackageError{PyLuaTeX}{% + }{ + \tl_if_eq:VnTF{\pyluatex@shutdown}{off}{}{ + \PackageError{PyLuaTeX}{ Invalid~value~for~package~option~"shutdown":~\pyluatex@shutdown - }{}% + }{} } } } @@ -59,7 +59,7 @@ \newcommand*{\PyLTVerbatimEnv}{\directlua{pyluatex.set_parent_env([==[\@currenvir]==])}} -\newenvironment{python}{\directlua{pyluatex.record_env("python", false)}}% +\newenvironment{python}{\directlua{pyluatex.record_env("python", false)}} {\directlua{pyluatex.print_env()}} \newenvironment{pythonq}{\directlua{pyluatex.record_env("pythonq", false)}}{} -- cgit v1.2.3