luamplib (16sep21)

git-svn-id: svn://tug.org/texlive/trunk@60521 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 19 insertions, 14 deletions

diff --git a/Master/texmf-dist/doc/luatex/luamplib/NEWS b/Master/texmf-dist/doc/luatex/luamplib/NEWS
index 293da0dc6b9..f62f86fd6d2 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/09/16 2.21.0
+    * allow empty string in textext()
+
 2021/08/03 2.20.9
     * initialize every mplib instance with random integer seed values
 
diff --git a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
index 9230176d042..c785dbca430 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
+++ b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
diff --git a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
index 7257505dd5d..a1ee352b360 100644
--- a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
+++ b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
@@ -85,7 +85,7 @@ See source file '\inFileName' for licencing and contact information.
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{luamplib.drv}%
-  [2021/08/03 v2.20.9 Interface for using the mplib library]%
+  [2021/09/16 v2.21.0 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{2021/08/03 v2.20.9}
+% \date{2021/09/16 v2.21.0}
 %
 % \maketitle
 %
@@ -413,8 +413,8 @@ See source file '\inFileName' for licencing and contact information.
 
 luatexbase.provides_module {
   name          = "luamplib",
-  version       = "2.20.9",
-  date          = "2021/08/03",
+  version       = "2.21.0",
+  date          = "2021/09/16",
   description   = "Lua package to typeset Metapost with LuaTeX's MPLib.",
 }
 
@@ -1057,8 +1057,8 @@ local function mpprint(buffer,...)
 end
 
 function luamplib.runscript (code)
-  local id, str = code:match("(.-){(.+)}")
-  if id and str and str ~= "" then
+  local id, str = code:match("(.-){(.*)}")
+  if id and str then
     local f = runscript_funcs[id]
     if f then
       local t = f(str)
@@ -1172,7 +1172,8 @@ extra_beginfig := extra_beginfig & " let VerbatimTeX = normalVerbatimTeX;"&
   "runscript(" &ditto& "luamplib.in_the_fig=true" &ditto& ");";
 extra_endfig := extra_endfig & " let VerbatimTeX = specialVerbatimTeX;"&
   "runscript(" &ditto&
-  "luamplib.in_the_fig=false luamplib.figid=luamplib.figid+1" &ditto& ");";
+  "if luamplib.in_the_fig then luamplib.figid=luamplib.figid+1 end "&
+  "luamplib.in_the_fig=false" &ditto& ");";
 ]]
 luamplib.legacyverbatimtexpreamble = legacyverbatimtexpreamble
 
@@ -2002,7 +2003,7 @@ luamplib.colorconverter = colorconverter
 \else
   \NeedsTeXFormat{LaTeX2e}
   \ProvidesPackage{luamplib}
-    [2021/08/03 v2.20.9 mplib package for LuaTeX]
+    [2021/09/16 v2.21.0 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 a204896d530..f7cc692f6fa 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.9",
-  date          = "2021/08/03",
+  version       = "2.21.0",
+  date          = "2021/09/16",
   description   = "Lua package to typeset Metapost with LuaTeX's MPLib.",
 }
 
@@ -481,8 +481,8 @@ local function mpprint(buffer,...)
 end
 
 function luamplib.runscript (code)
-  local id, str = code:match("(.-){(.+)}")
-  if id and str and str ~= "" then
+  local id, str = code:match("(.-){(.*)}")
+  if id and str then
     local f = runscript_funcs[id]
     if f then
       local t = f(str)
@@ -588,7 +588,8 @@ extra_beginfig := extra_beginfig & " let VerbatimTeX = normalVerbatimTeX;"&
   "runscript(" &ditto& "luamplib.in_the_fig=true" &ditto& ");";
 extra_endfig := extra_endfig & " let VerbatimTeX = specialVerbatimTeX;"&
   "runscript(" &ditto&
-  "luamplib.in_the_fig=false luamplib.figid=luamplib.figid+1" &ditto& ");";
+  "if luamplib.in_the_fig then luamplib.figid=luamplib.figid+1 end "&
+  "luamplib.in_the_fig=false" &ditto& ");";
 ]]
 luamplib.legacyverbatimtexpreamble = legacyverbatimtexpreamble
 
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
index bc285803488..e33c7b6658f 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/03 v2.20.9 mplib package for LuaTeX]
+    [2021/09/16 v2.21.0 mplib package for LuaTeX]
   \ifx\newluafunction\@undefined
   \input ltluatex
   \fi