luamplib (25jan24)

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

5 files changed, 16 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/luatex/luamplib/NEWS b/Master/texmf-dist/doc/luatex/luamplib/NEWS
index 5baf7e6a34f..d56d4df8579 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
 
+2024/01/25 2.25.3
+    * protect "..." even if textextlabel is disabled (revert part of v2.25.0)
+
 2023/12/08 2.25.2
     * info instead of warning when compiling with dviluatex
 
diff --git a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
index a8022cc75bd..e46210d999b 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 023c73b9333..3b6aad6e359 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-2023 by Hans Hagen, Taco Hoekwater, Elie Roux,
+% Copyright (C) 2008-2024 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}%
-  [2023/12/08 v2.25.2 Interface for using the mplib library]%
+  [2024/01/25 v2.25.3 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{2023/12/08 v2.25.2}
+% \date{2024/01/25 v2.25.3}
 %
 % \maketitle
 %
@@ -446,8 +446,8 @@ See source file '\inFileName' for licencing and contact information.
 
 luatexbase.provides_module {
   name          = "luamplib",
-  version       = "2.25.2",
-  date          = "2023/12/08",
+  version       = "2.25.3",
+  date          = "2024/01/25",
   description   = "Lua package to typeset Metapost with LuaTeX's MPLib.",
 }
 
@@ -1311,9 +1311,7 @@ local function process_mplibcode (data, instancename)
 %    It has turned out that no comment sign is allowed.
 %    \begin{macrocode}
   if not luamplib.verbatiminput then
-    if luamplib.textextlabel then
-      data = data:gsub("\".-\"", protect_expansion)
-    end
+    data = data:gsub("\".-\"", protect_expansion)
 
     data = data:gsub("\\%%", "\0PerCent\0")
     data = data:gsub("%%.-\n","")
@@ -1326,9 +1324,7 @@ local function process_mplibcode (data, instancename)
 %    Next line to address issue \#55
 %    \begin{macrocode}
     data = data:gsub("##", "#")
-    if luamplib.textextlabel then
-      data = data:gsub("\".-\"", unprotect_expansion)
-    end
+    data = data:gsub("\".-\"", unprotect_expansion)
     data = data:gsub(btex_etex, function(str)
       return format("btex %s etex", unprotect_expansion(str))
     end)
@@ -2065,7 +2061,7 @@ luamplib.colorconverter = colorconverter
 \else
   \NeedsTeXFormat{LaTeX2e}
   \ProvidesPackage{luamplib}
-    [2023/12/08 v2.25.2 mplib package for LuaTeX]
+    [2024/01/25 v2.25.3 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 039484a22ae..2654bd28e33 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.25.2",
-  date          = "2023/12/08",
+  version       = "2.25.3",
+  date          = "2024/01/25",
   description   = "Lua package to typeset Metapost with LuaTeX's MPLib.",
 }
 
@@ -674,9 +674,7 @@ local function process_mplibcode (data, instancename)
   end)
 
   if not luamplib.verbatiminput then
-    if luamplib.textextlabel then
-      data = data:gsub("\".-\"", protect_expansion)
-    end
+    data = data:gsub("\".-\"", protect_expansion)
 
     data = data:gsub("\\%%", "\0PerCent\0")
     data = data:gsub("%%.-\n","")
@@ -685,9 +683,7 @@ local function process_mplibcode (data, instancename)
     run_tex_code(format("\\mplibtmptoks\\expanded{{%s}}",data))
     data = texgettoks"mplibtmptoks"
     data = data:gsub("##", "#")
-    if luamplib.textextlabel then
-      data = data:gsub("\".-\"", unprotect_expansion)
-    end
+    data = data:gsub("\".-\"", unprotect_expansion)
     data = data:gsub(btex_etex, function(str)
       return format("btex %s etex", unprotect_expansion(str))
     end)
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
index e8304327ee4..06a8f321ef8 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}
-    [2023/12/08 v2.25.2 mplib package for LuaTeX]
+    [2024/01/25 v2.25.3 mplib package for LuaTeX]
   \ifx\newluafunction\@undefined
   \input ltluatex
   \fi