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/doc/luatex/luamplib/NEWS | 3 ++ Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf | Bin 149233 -> 150094 bytes .../texmf-dist/source/luatex/luamplib/luamplib.dtx | 35 ++++++++++++++++----- Master/texmf-dist/tex/luatex/luamplib/luamplib.lua | 23 +++++++++++--- Master/texmf-dist/tex/luatex/luamplib/luamplib.sty | 2 +- 5 files changed, 50 insertions(+), 13 deletions(-) diff --git a/Master/texmf-dist/doc/luatex/luamplib/NEWS b/Master/texmf-dist/doc/luatex/luamplib/NEWS index 4eed375513b..a47ff79ff35 100644 --- a/Master/texmf-dist/doc/luatex/luamplib/NEWS +++ b/Master/texmf-dist/doc/luatex/luamplib/NEWS @@ -1,5 +1,8 @@ History of the luamplib package +2021/03/11 2.20.7 + * emegency patch for context metafun 2021-03-06 + 2020/12/30 2.20.6 * fix a bug regarding no figure output when luamplib.showlog is true. (#91) diff --git a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf index 6b74341aa82..c6ed578cb8d 100644 Binary files a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf and b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf differ diff --git a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx index 12a9519dc82..dec028813fb 100644 --- a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx +++ b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment -- by the way, this file contains UTF-8 % -% Copyright (C) 2008-2020 by Hans Hagen, Taco Hoekwater, Elie Roux, +% Copyright (C) 2008-2021 by Hans Hagen, Taco Hoekwater, Elie Roux, % Manuel Pégourié-Gonnard, Philipp Gesang and Kim Dohyun. % Currently maintained by the LuaLaTeX development team. % Support: @@ -85,7 +85,7 @@ See source file '\inFileName' for licencing and contact information. %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{luamplib.drv}% - [2020/12/30 v2.20.6 Interface for using the mplib library]% + [2021/03/11 v2.20.7 Interface for using the mplib library]% \documentclass{ltxdoc} \usepackage{metalogo,multicol,mdwlist,fancyvrb,xspace} \usepackage[x11names]{xcolor} @@ -153,7 +153,7 @@ See source file '\inFileName' for licencing and contact information. % \author{Hans Hagen, Taco Hoekwater, Elie Roux, Philipp Gesang and Kim Dohyun\\ % Maintainer: LuaLaTeX Maintainers --- % Support: \email{lualatex-dev@tug.org}} -% \date{2020/12/30 v2.20.6} +% \date{2021/03/11 v2.20.7} % % \maketitle % @@ -407,8 +407,8 @@ See source file '\inFileName' for licencing and contact information. 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.", } @@ -997,6 +997,21 @@ 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 +% \end{macrocode} +% +% metafun 2021-03-09 changes crashes luamplib. +% \begin{macrocode} +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" + % \end{macrocode} % % A function from \ConTeXt\ general. @@ -1034,8 +1049,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 @@ -1959,7 +1978,7 @@ luamplib.colorconverter = colorconverter \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 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