summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-03-11 22:57:15 +0000
committerKarl Berry <karl@freefriends.org>2021-03-11 22:57:15 +0000
commit7b231522db5a36ee1adb84012907a09a3aac98e1 (patch)
treef60aca2e9cc70e95ad95678a5161dbc5c95ac114
parent162c9c1300db43fc146e657c983f97637dff2189 (diff)
luamplib (11mar21) (branch)
git-svn-id: svn://tug.org/texlive/branches/branch2020.0@58280 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/luatex/luamplib/NEWS3
-rw-r--r--Master/texmf-dist/doc/luatex/luamplib/luamplib.pdfbin149233 -> 150094 bytes
-rw-r--r--Master/texmf-dist/source/luatex/luamplib/luamplib.dtx35
-rw-r--r--Master/texmf-dist/tex/luatex/luamplib/luamplib.lua23
-rw-r--r--Master/texmf-dist/tex/luatex/luamplib/luamplib.sty2
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
--- a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
+++ b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
Binary files 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: <lualatex-dev@tug.org>
@@ -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.",
}
@@ -999,6 +999,21 @@ 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.
% \begin{macrocode}
local function mpprint(buffer,...)
@@ -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