1 files changed, 7 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
index b826fc117af..1fdda30df69 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}
-    [2015/01/26 v2.9.1 mplib package for LuaTeX]
+    [2015/03/20 v2.10.0 mplib package for LuaTeX]
   \RequirePackage{luatexbase-modutils}
 \fi
 \RequireLuaModule{luamplib}
@@ -61,7 +61,7 @@
 \long\def\mplibdocode#1\endmplibcode{%
   \endgroup
   \edef\mplibtemp{\directlua{luamplib.protecttextext([===[\unexpanded{#1}]===])}}%
-  \directlua{ tex.sprint(table.concat(luamplib.mpxcolors)) }%
+  \directlua{ tex.sprint(luamplib.mpxcolors) }%
   \directlua{luamplib.tempdata = luamplib.makeTEXboxes([===[\mplibtemp]===])}%
   \directlua{luamplib.processwithTEXboxes(luamplib.tempdata)}%
   \endgroup
@@ -83,7 +83,7 @@
   \toks@\expandafter{\the\toks@#1}%
   \def\mplibtemp@a{#2}\ifx\mplib@mplibcode\mplibtemp@a
     \edef\mplibtemp{\directlua{luamplib.protecttextext([===[\the\toks@]===])}}%
-    \directlua{ tex.sprint(table.concat(luamplib.mpxcolors)) }%
+    \directlua{ tex.sprint(luamplib.mpxcolors) }%
     \directlua{luamplib.tempdata=luamplib.makeTEXboxes([===[\mplibtemp]===])}%
     \directlua{luamplib.processwithTEXboxes(luamplib.tempdata)}%
     \end{mplibcode}%
@@ -95,20 +95,6 @@
   \fi
 }
 \fi
-\def\mplibcolor#1#2{%
-  \ifcsname\string\color @#2\endcsname
-    \edef#1{1 withprescript
-      "MPlibOverrideColor=\csname\string\color @#2\endcsname"}%
-  \else
-    \ifdefined\extractcolorspecs
-      \extractcolorspecs{#2}\mplibtemp@a\mplibtemp@b
-      \convertcolorspec\mplibtemp@a\mplibtemp@b{cmyk}\mplibtemp@c
-      \edef#1{(\mplibtemp@c)}%
-    \else
-      \errmessage{Undefined color `#2'}%
-    \fi
-  \fi
-}
 \newtoks\everymplibtoks
 \newtoks\everyendmplibtoks
 \protected\def\everymplib{%
@@ -134,6 +120,10 @@
   \ifnum\mplibstartlineno<\inputlineno\expandafter\mplibreplacenewlinebr\fi
 }
 \def\mpdim#1{ begingroup \the\dimexpr #1\relax\space endgroup } % gmp.sty
+\def\mplibcolor#1{%
+  \def\set@color{\edef#1{1 withprescript "MPlibOverrideColor=\current@color"}}%
+  \color
+}
 \def\mplibnumbersystem#1{\directlua{luamplib.numbersystem = "#1"}}
 \def\mplibmakenocache#1{\mplibdomakenocache #1,*,}
 \def\mplibdomakenocache#1,{%