From c59c766ac61971815ebca125dcac7b3291a7389d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 11 Mar 2021 22:52:16 +0000 Subject: luamplib (11mar21) git-svn-id: svn://tug.org/texlive/trunk@58279 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/luatex/luamplib/luamplib.lua | 23 ++++++++++++++++++---- Master/texmf-dist/tex/luatex/luamplib/luamplib.sty | 2 +- 2 files changed, 20 insertions(+), 5 deletions(-) (limited to 'Master/texmf-dist/tex/luatex') diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua index 96164ec72df..74dbf45d062 100644 --- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua +++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua @@ -11,8 +11,8 @@ luatexbase.provides_module { name = "luamplib", - version = "2.20.6", - date = "2020/12/30", + version = "2.20.7", + date = "2021/03/11", description = "Lua package to typeset Metapost with LuaTeX's MPLib.", } @@ -439,6 +439,17 @@ local mp = mp mp.mf_path_reset = mp.mf_path_reset or function() end 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" + local function mpprint(buffer,...) for i=1,select("#",...) do local value = select(i,...) @@ -472,8 +483,12 @@ function luamplib.runscript (code) function mp.print(...) mpprint(buffer,...) end - f() - return tableconcat(buffer,"") + local result = f() + buffer = tableconcat(buffer,"") + if buffer and buffer ~= "" then + return buffer + end + return result or "" end return "" end diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty index 1bacae209ea..8540ce79c90 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} - [2020/12/30 v2.20.6 mplib package for LuaTeX] + [2021/03/11 v2.20.7 mplib package for LuaTeX] \ifx\newluafunction\@undefined \input ltluatex \fi -- cgit v1.2.3