diff options
author | Karl Berry <karl@freefriends.org> | 2021-08-08 21:07:36 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-08-08 21:07:36 +0000 |
commit | ab9273e9461abb560d344e43c377de25f4e2577b (patch) | |
tree | aa356185a59627324aecdd1aa36e53d1466d7a0e /Master/texmf-dist/tex/luatex | |
parent | eec3a67f3a57872862cf4adee13eeddc981d5442 (diff) |
luamplib (8aug21)
git-svn-id: svn://tug.org/texlive/trunk@60197 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luamplib/luamplib.lua | 44 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luamplib/luamplib.sty | 2 |
2 files changed, 26 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua index 0ea75e7b61f..a204896d530 100644 --- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua +++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua @@ -11,16 +11,22 @@ luatexbase.provides_module { name = "luamplib", - version = "2.20.8", - date = "2021/08/02", + version = "2.20.9", + date = "2021/08/03", description = "Lua package to typeset Metapost with LuaTeX's MPLib.", } local format, abs = string.format, math.abs -local err = function(...) return luatexbase.module_error ("luamplib", format(...)) end -local warn = function(...) return luatexbase.module_warning("luamplib", format(...)) end -local info = function(...) return luatexbase.module_info ("luamplib", format(...)) end +local err = function(...) + return luatexbase.module_error ("luamplib", select("#",...) > 1 and format(...) or ...) +end +local warn = function(...) + return luatexbase.module_warning("luamplib", select("#",...) > 1 and format(...) or ...) +end +local info = function(...) + return luatexbase.module_info ("luamplib", select("#",...) > 1 and format(...) or ...) +end luamplib = luamplib or { } local luamplib = luamplib @@ -118,10 +124,10 @@ function luamplib.getcachedir(dir) if is_writable(dir) then luamplib.cachedir = dir else - warn("Directory '"..dir.."' is not writable!") + warn("Directory '%s' is not writable!", dir) end else - warn("Directory '"..dir.."' does not exist!") + warn("Directory '%s' does not exist!", dir) end end end @@ -285,6 +291,7 @@ local function luamplibload (name) make_text = luamplib.maketext, run_script = luamplib.runscript, math_mode = luamplib.numbersystem, + random_seed = math.random(4095), extensions = 1, } local preamble = preamble .. luamplib.mplibcodepreamble @@ -447,13 +454,13 @@ mp.mf_finish_saving_data = mp.mf_finish_saving_data or function() end catcodes = catcodes or {} local catcodes = catcodes catcodes.numbers = catcodes.numbers or {} -catcodes.numbers.ctxcatcodes = catcodes.numbers.ctxcatcodes or "0" -catcodes.numbers.texcatcodes = catcodes.numbers.texcatcodes or "0" -catcodes.numbers.luacatcodes = catcodes.numbers.luacatcodes or "0" -catcodes.numbers.notcatcodes = catcodes.numbers.notcatcodes or "0" -catcodes.numbers.vrbcatcodes = catcodes.numbers.vrbcatcodes or "0" -catcodes.numbers.prtcatcodes = catcodes.numbers.prtcatcodes or "0" -catcodes.numbers.txtcatcodes = catcodes.numbers.txtcatcodes or "0" +catcodes.numbers.ctxcatcodes = catcodes.numbers.ctxcatcodes or catlatex +catcodes.numbers.texcatcodes = catcodes.numbers.texcatcodes or catlatex +catcodes.numbers.luacatcodes = catcodes.numbers.luacatcodes or catlatex +catcodes.numbers.notcatcodes = catcodes.numbers.notcatcodes or catlatex +catcodes.numbers.vrbcatcodes = catcodes.numbers.vrbcatcodes or catlatex +catcodes.numbers.prtcatcodes = catcodes.numbers.prtcatcodes or catlatex +catcodes.numbers.txtcatcodes = catcodes.numbers.txtcatcodes or catlatex local function mpprint(buffer,...) for i=1,select("#",...) do @@ -488,15 +495,14 @@ function luamplib.runscript (code) function mp.print(...) mpprint(buffer,...) end - local result = f() - buffer = tableconcat(buffer,"") + f() + buffer = tableconcat(buffer) if buffer and buffer ~= "" then return buffer end buffer = {} - mpprint(buffer, result) - buffer = tableconcat(buffer) - return buffer + mpprint(buffer, f()) + return tableconcat(buffer) end return "" end diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty index e37fc3da406..bc285803488 100644 --- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty +++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty @@ -14,7 +14,7 @@ \else \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luamplib} - [2021/08/02 v2.20.8 mplib package for LuaTeX] + [2021/08/03 v2.20.9 mplib package for LuaTeX] \ifx\newluafunction\@undefined \input ltluatex \fi |