luamplib (12may13)

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

5 files changed, 54 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/luatex/luamplib/NEWS b/Master/texmf-dist/doc/luatex/luamplib/NEWS
index e8909848e7b..5c3fc9e0a40 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
 
+2013/05/07 2.0
+    * Update with current ConTeXt code
+    * Adding the possibility of btex...etex commands (Kim)
+
 2011/12/09 1.09
     * Fix bug reported by Paul Vojta: spurious spaces.
 
diff --git a/Master/texmf-dist/doc/luatex/luamplib/README b/Master/texmf-dist/doc/luatex/luamplib/README
index c698798ae43..bd195aa62cd 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/README
+++ b/Master/texmf-dist/doc/luatex/luamplib/README
@@ -4,7 +4,7 @@
 This package allows typesetting of metapost natively in the TeX documents
 thanks to the LuaTeX mplib library. It only works in PDF mode.
 
-This package is developed on <http://github.com/mpg/luamplib>.
+This package is developed on <http://github.com/lualatex/luamplib>.
 
 
 Installation
@@ -15,16 +15,12 @@ Here are the recommended installation methods (preferred first).
 1. If you are using TeX Live 2008 or later, use 'tlmgr install luamplib'.
 Alternatively, try your (TeX or Linux) distribution's package management system.
 
-2. a. Grab luamplib.tds.zip on the CTAN.
-   b. Unzip it at the root of one or your TDS trees.
+2. a. Grab the sources from CTAN or github.
+   b. Run 'make install TEXMFROOT=/path/to/texmf'.
    c. You may need to update some filename database after, see your TeX
 distribution's manual for details.
 
-3. a. Grab the sources from CTAN or github.
-   b. Run 'make install TEXMFROOT=/path/to/texmf'.
-   c. See 2c.
-
-4. Try to figure it out by looking at the Makefile and comments in the sources.
+3. Try to figure it out by looking at the Makefile and comments in the sources.
 
 
 Manifest
@@ -37,18 +33,29 @@ Derived files:
         luamplib.pdf            documentation
         luamplib.sty            package
         luamplib.lua            lua code used by the package
-        luamplib-createmem.lua  script used to generated mpost mem file
 
 
 License
 -------
 
-This work and the derived files are under the Creative Commons CC0 license.
+The luamplib bundle, as a derived work of ConTeXt, is distributed under the
+GNU GPLv2 license:
+
+   <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>
+
+This license requires the license itself to be distributed with the work. For
+its full text see the documentation in luamplib.pdf.
+
 
-See the full text at
+                                  DISCLAIMER
 
-http://creativecommons.org/publicdomain/zero/1.0/legalcode
+        This program is free software; you can redistribute it and/or
+        modify it under the terms of the GNU General Public License
+        as published by the Free Software Foundation; version 2.
 
-and a FAQ at
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
 
-http://wiki.creativecommons.org/CC0
+        See headers of each source file for copyright details.
diff --git a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
index 24a36479bf0..9e96b9daebb 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 7ae0e97c0f8..8c2aa557135 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex
+++ b/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex
@@ -18,6 +18,19 @@ A%
 beginfig(1);
 	fill fullcircle scaled 20; %% actual <tab> to make sure it works
 endfig;
-\end{mplibcode}
+\end{mplibcode}%
 B\par
+\begin{mplibcode}
+beginfig(18);
+numeric u;
+u = 1cm;
+draw (0,2u)--(0,0)--(4u,0);
+pickup pencircle scaled 1pt;
+draw (0,0){up}
+  for i=1 upto 8: ..(i/2,sqrt(i/2))*u  endfor;
+label.lrt(btex $\sqrt x$ etex, (3,sqrt 3)*u);
+label.bot(btex $x$ etex, (2u,0));
+label.lft(btex $y$ etex, (0,u));
+endfig;
+\end{mplibcode}
 \end{document}
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 08a4f8c16b6..96b1ea73553 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex
+++ b/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex
@@ -18,4 +18,19 @@ beginfig(1);
 endfig;
 \endmplibcode
 B\par
+A%
+\mplibcode
+beginfig(18);
+numeric u;
+u = 1cm;
+draw (0,2u)--(0,0)--(4u,0);
+pickup pencircle scaled 1pt;
+draw (0,0){up}
+  for i=1 upto 8: ..(i/2,sqrt(i/2))*u  endfor;
+label.lrt(btex $\sqrt x$ etex, (3,sqrt 3)*u);
+label.bot(btex $x$ etex, (2u,0));
+label.lft(btex $y$ etex, (0,u));
+endfig;
+\endmplibcode
+B\par
 \bye