texlive[65454] Master/texmf-dist: pyluatex (3jan23)
commits+karl at tug.org
commits+karl at tug.org
Tue Jan 3 21:50:21 CET 2023
Revision: 65454
http://tug.org/svn/texlive?view=revision&revision=65454
Author: karl
Date: 2023-01-03 21:50:20 +0100 (Tue, 03 Jan 2023)
Log Message:
-----------
pyluatex (3jan23)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/lualatex/pyluatex/README.md
trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/beamer.tex
trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/data-visualization.tex
trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/matplotlib-external.tex
trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/matplotlib-pgf.tex
trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/readme-custom-env.tex
trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/readme-example.tex
trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/repl.tex
trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/sessions.tex
trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-example.tex
trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-listings.tex
trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-minted.tex
trunk/Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.pdf
trunk/Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.tex
trunk/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex-interpreter.py
trunk/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.lua
trunk/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex-json.lua
Modified: trunk/Master/texmf-dist/doc/lualatex/pyluatex/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/pyluatex/README.md 2023-01-03 20:49:59 UTC (rev 65453)
+++ trunk/Master/texmf-dist/doc/lualatex/pyluatex/README.md 2023-01-03 20:50:20 UTC (rev 65454)
@@ -55,9 +55,6 @@
[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
Modified: trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/beamer.tex
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/beamer.tex 2023-01-03 20:49:59 UTC (rev 65453)
+++ trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/beamer.tex 2023-01-03 20:50:20 UTC (rev 65454)
@@ -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
Modified: trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/data-visualization.tex
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/data-visualization.tex 2023-01-03 20:49:59 UTC (rev 65453)
+++ trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/data-visualization.tex 2023-01-03 20:50:20 UTC (rev 65454)
@@ -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 @@
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 @@
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]}};
Modified: trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/matplotlib-external.tex
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/matplotlib-external.tex 2023-01-03 20:49:59 UTC (rev 65453)
+++ trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/matplotlib-external.tex 2023-01-03 20:50:20 UTC (rev 65454)
@@ -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
Modified: trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/matplotlib-pgf.tex
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/matplotlib-pgf.tex 2023-01-03 20:49:59 UTC (rev 65453)
+++ trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/matplotlib-pgf.tex 2023-01-03 20:50:20 UTC (rev 65454)
@@ -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
Modified: trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/readme-custom-env.tex
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/readme-custom-env.tex 2023-01-03 20:49:59 UTC (rev 65453)
+++ trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/readme-custom-env.tex 2023-01-03 20:50:20 UTC (rev 65454)
@@ -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
Modified: trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/readme-example.tex
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/readme-example.tex 2023-01-03 20:49:59 UTC (rev 65453)
+++ trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/readme-example.tex 2023-01-03 20:50:20 UTC (rev 65454)
@@ -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
Modified: trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/repl.tex
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/repl.tex 2023-01-03 20:49:59 UTC (rev 65453)
+++ trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/repl.tex 2023-01-03 20:50:20 UTC (rev 65454)
@@ -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 @@
{\PyLTVerbatimEnv\begin{pythonrepl}}
{\end{pythonrepl}\pytypeset}
-\begin{filecontents*}{repl.py}
+\begin{filecontents*}[nosearch]{repl.py}
def square(x):
return x**2
Modified: trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/sessions.tex
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/sessions.tex 2023-01-03 20:49:59 UTC (rev 65453)
+++ trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/sessions.tex 2023-01-03 20:50:20 UTC (rev 65454)
@@ -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
Modified: trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-example.tex
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-example.tex 2023-01-03 20:49:59 UTC (rev 65453)
+++ trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-example.tex 2023-01-03 20:50:20 UTC (rev 65454)
@@ -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
Modified: trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-listings.tex
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-listings.tex 2023-01-03 20:49:59 UTC (rev 65453)
+++ trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-listings.tex 2023-01-03 20:50:20 UTC (rev 65454)
@@ -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
Modified: trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-minted.tex
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-minted.tex 2023-01-03 20:49:59 UTC (rev 65453)
+++ trunk/Master/texmf-dist/doc/lualatex/pyluatex/example/typesetting-minted.tex 2023-01-03 20:50:20 UTC (rev 65454)
@@ -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
Modified: trunk/Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.tex
===================================================================
--- trunk/Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.tex 2023-01-03 20:49:59 UTC (rev 65453)
+++ trunk/Master/texmf-dist/doc/lualatex/pyluatex/pyluatex.tex 2023-01-03 20:50:20 UTC (rev 65454)
@@ -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 @@
\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}
Modified: trunk/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex-interpreter.py
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex-interpreter.py 2023-01-03 20:49:59 UTC (rev 65453)
+++ trunk/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex-interpreter.py 2023-01-03 20:50:20 UTC (rev 65454)
@@ -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 @@
data = self.rfile.readline().decode('utf-8')
if len(data) == 0: # socket closed, LuaTeX process finished
return
+ if data.strip() == 'shutdown':
+ return
data = json.loads(data)
- if data == 'shutdown':
- return
-
interpreter = interpreters[data['session']]
code = textwrap.dedent(data['code'])
if data['repl_mode']:
Deleted: trunk/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex-json.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex-json.lua 2023-01-03 20:49:59 UTC (rev 65453)
+++ trunk/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex-json.lua 2023-01-03 20:50:20 UTC (rev 65454)
@@ -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
Modified: trunk/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.lua
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.lua 2023-01-03 20:49:59 UTC (rev 65453)
+++ trunk/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.lua 2023-01-03 20:50:20 UTC (rev 65454)
@@ -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 @@
IN THE SOFTWARE.
--]]
-local json = require("pyluatex-json")
+require("lualibs-util-jsn")
local socket = require("socket")
pyluatex = pyluatex or {
@@ -112,13 +112,13 @@
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 @@
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
Modified: trunk/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.sty 2023-01-03 20:49:59 UTC (rev 65453)
+++ trunk/Master/texmf-dist/tex/lualatex/pyluatex/pyluatex.sty 2023-01-03 20:50:20 UTC (rev 65454)
@@ -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 at shutdown}{veryveryend}{%
+\tl_if_eq:VnTF{\pyluatex at shutdown}{veryveryend}{
\RequirePackage{atveryend}
\AtVeryVeryEnd{\directlua{pyluatex.shutdown()}}
-}{%
- \tl_if_eq:VnTF{\pyluatex at shutdown}{veryenddocument}{%
+}{
+ \tl_if_eq:VnTF{\pyluatex at shutdown}{veryenddocument}{
\RequirePackage{atveryend}
\AtVeryEndDocument{\directlua{pyluatex.shutdown()}}
- }{%
- \tl_if_eq:VnTF{\pyluatex at shutdown}{off}{}{%
- \PackageError{PyLuaTeX}{%
+ }{
+ \tl_if_eq:VnTF{\pyluatex at shutdown}{off}{}{
+ \PackageError{PyLuaTeX}{
Invalid~value~for~package~option~"shutdown":~\pyluatex at 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)}}{}
More information about the tex-live-commits
mailing list.