texlive[58279] Master/texmf-dist: luamplib (11mar21)
commits+karl at tug.org
commits+karl at tug.org
Thu Mar 11 23:52:16 CET 2021
Revision: 58279
http://tug.org/svn/texlive?view=revision&revision=58279
Author: karl
Date: 2021-03-11 23:52:16 +0100 (Thu, 11 Mar 2021)
Log Message:
-----------
luamplib (11mar21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/luatex/luamplib/NEWS
trunk/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
trunk/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
trunk/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
trunk/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
Modified: trunk/Master/texmf-dist/doc/luatex/luamplib/NEWS
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luamplib/NEWS 2021-03-11 22:52:00 UTC (rev 58278)
+++ trunk/Master/texmf-dist/doc/luatex/luamplib/NEWS 2021-03-11 22:52:16 UTC (rev 58279)
@@ -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)
Modified: trunk/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
===================================================================
--- trunk/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx 2021-03-11 22:52:00 UTC (rev 58278)
+++ trunk/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx 2021-03-11 22:52:16 UTC (rev 58279)
@@ -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: <lualatex-dev at tug.org>
@@ -85,7 +85,7 @@
%<*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 @@
% \author{Hans Hagen, Taco Hoekwater, Elie Roux, Philipp Gesang and Kim Dohyun\\
% Maintainer: LuaLaTeX Maintainers ---
% Support: \email{lualatex-dev at tug.org}}
-% \date{2020/12/30 v2.20.6}
+% \date{2021/03/11 v2.20.7}
%
% \maketitle
%
@@ -407,8 +407,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.",
}
@@ -999,6 +999,21 @@
% \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.
% \begin{macrocode}
local function mpprint(buffer,...)
@@ -1034,8 +1049,12 @@
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 @@
\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
Modified: trunk/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua 2021-03-11 22:52:00 UTC (rev 58278)
+++ trunk/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua 2021-03-11 22:52:16 UTC (rev 58279)
@@ -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 @@
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 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
Modified: trunk/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty 2021-03-11 22:52:00 UTC (rev 58278)
+++ trunk/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty 2021-03-11 22:52:16 UTC (rev 58279)
@@ -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
More information about the tex-live-commits
mailing list.