luamplib (8jul14)

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

4 files changed, 16 insertions, 2 deletions

diff --git a/Master/texmf-dist/doc/luatex/luamplib/NEWS b/Master/texmf-dist/doc/luatex/luamplib/NEWS
index 36682f27656..8f26a19aba9 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/NEWS
+++ b/Master/texmf-dist/doc/luatex/luamplib/NEWS
@@ -1,5 +1,9 @@
                        History of the luamplib package
 
+2014/07/04 2.8.1
+    * support color package on plain tex.
+    * fix a failure at `btex \% etex'.
+
 2014/06/17 2.8.0
     * support color/xcolor/spotcolor packages.
       On LaTeX, color names or expressions of color/xcolor packages
diff --git a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
index 6995c8cfed9..e99e6833521 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/doc/luatex/luamplib/test-luamplib-latex.tex b/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex
index 9a07fa86f50..a7c397041b0 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex
+++ b/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex
@@ -27,7 +27,13 @@ A%
 verbatimtex \lower.2em etex
 beginfig(0);
 draw origin--(1cm,0) withcolor \mpcolor{teal};
-draw btex g\begin{huge}g\end{huge}etex withcolor \mpcolor{orange};
+draw btex g etex withcolor \mpcolor{orange};
+draw btex\tracingcommands0
+  multi%
+  \begin{huge}line\end{huge}%
+  texcode
+  with \%
+  etex shifted (10,0);
 draw bbox currentpicture;
 endfig;
 
diff --git a/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex b/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex
index c679a18a960..583c2fc4d78 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex
+++ b/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex
@@ -1,3 +1,6 @@
+\input miniltx
+\input color
+\definecolor{orange}{rgb}{1,0.5,0}
 \input luamplib.sty
 \everymplib{ beginfig(0); }\everyendmplib{ endfig; }
 \tracingcommands1
@@ -27,6 +30,7 @@ draw btex g etex withcolor blue;
 draw btex\tracingcommands0 multi
     line
     tex code
+    100 \% color
   etex shifted (20,0);
 draw textext("\tracingcommands0 textext 50\% color") shifted (10,-10) withcolor .5white;
 draw bbox currentpicture;
@@ -52,7 +56,7 @@ numeric u; u=1cm;
 z1=-z2=(-u,0);
 for i = 1 upto 3:
   draw z1..(0, i*u)..z2;
-  label.top(TEX("$e_{" & decimal(i) & "}$"), (0, i*u)) withcolor blue;
+  label.top(TEX("$e_{" & decimal(i) & "}$"), (0, i*u)) withcolor \mpcolor{orange};
 endfor;
 endfig;
 \endmplibcode