luamplib (12may13)

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

9 files changed, 1127 insertions, 297 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
diff --git a/Master/texmf-dist/source/luatex/luamplib/Makefile b/Master/texmf-dist/source/luatex/luamplib/Makefile
index d1729897fb0..0f8224fbaa7 100644
--- a/Master/texmf-dist/source/luatex/luamplib/Makefile
+++ b/Master/texmf-dist/source/luatex/luamplib/Makefile
@@ -36,7 +36,7 @@ world: all ctan
 .PHONY: all doc unpack ctan tds check world
 
 %.pdf: %.dtx
-	latexmk -pdf -silent $< >/dev/null
+	latexmk -pdf -e '$$pdflatex = q(lualatex %O %S)' -silent $< >/dev/null
 
 $(UNPACKED): $(DTX)
 	tex -interaction=batchmode $< >/dev/null
@@ -44,8 +44,8 @@ $(UNPACKED): $(DTX)
 check: $(UNPACKED)
 	luatex   -interaction=batchmode test-$(NAME)-plain.tex  >/dev/null
 	lualatex -interaction=batchmode test-$(NAME)-latex.tex  >/dev/null
-	! grep "blank space"              test-$(NAME)-plain.log
-	! grep "blank space"              test-$(NAME)-latex.log
+#	! grep "blank space"              test-$(NAME)-plain.log
+#	! grep "blank space"              test-$(NAME)-latex.log
 
 $(CTAN_ZIP): $(SOURCES) $(DOC) $(TDS_ZIP)
 	@echo "Making $@ for CTAN upload."
diff --git a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
index 569d847037a..195b2024f49 100644
--- a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
+++ b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
@@ -1,11 +1,11 @@
 % \iffalse meta-comment -- by the way, this file contains UTF-8
 %
-% Copyright (C) 2008-2010 by Hans Hagen, Taco Hoekwater, Elie Roux, and
-% Manuel Pégourié-Gonnard.
-% Currently maintained by Manuel Pégourié-Gonnard <mpg@elzevir.fr>
+% Copyright (C) 2008-2010 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>
 %
-% This work is under the CC0 license.
+% This work is under the GPL v2.0 license.
 %
 % This work consists of the main source file luamplib.dtx
 % and the derived files
@@ -47,7 +47,7 @@ See source file '\inFileName' for licencing and contact information.
 \let\MetaPrefix\DoubleperCent
 
 \generate{%
-  \usedir{tex/luatex/mplib}%
+  \usedir{tex/luatex/luamplib}%
   \file{luamplib.sty}{\from{luamplib.dtx}{package}}%
 }
 
@@ -61,7 +61,7 @@ See source file '\inFileName' for licencing and contact information.
 \def\currentpostamble{\luapostamble}%
 
 \generate{%
-  \usedir{tex/luatex/mplib}%
+  \usedir{tex/luatex/luamplib}%
   \file{luamplib.lua}{\from{luamplib.dtx}{lua}}%
 }
 
@@ -83,17 +83,44 @@ See source file '\inFileName' for licencing and contact information.
 \fi
 %</ignore>
 %<*driver>
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile{luamplib.drv}%
+  [2013/05/09 v2.0 Interface for using the mplib library]%
 \documentclass{ltxdoc}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
-\usepackage{lmodern}
-\usepackage{fixltx2e}
+\usepackage{metalogo,multicol,mdwlist,fancyvrb,xspace}
+\usepackage[x11names]{xcolor}
+%
+\def\primarycolor{DodgerBlue4}  %%-> rgb  16  78 139 | #104e8b
+\def\secondarycolor{Goldenrod4} %%-> rgb 139 105 200 | #8b6914
+%
+\usepackage[
+    bookmarks=true,
+   colorlinks=true,
+    linkcolor=\primarycolor,
+     urlcolor=\secondarycolor,
+    citecolor=\primarycolor,
+     pdftitle={The luamplib package},
+   pdfsubject={Interface for using the mplib library},
+    pdfauthor={Hans Hagen, Taco Hoekwater, Elie Roux, Philipp Gesang & Kin Dohyun},
+  pdfkeywords={luatex, lualatex, mplib, metapost}
+]{hyperref}
+\usepackage{fontspec}
+\usepackage{unicode-math}
+\setmainfont[
+  Numbers     = OldStyle,
+  Ligatures   = TeX,
+  BoldFont    = {Linux Libertine O Bold},
+  ItalicFont  = {Linux Libertine O Italic},
+  SlantedFont = {Linux Libertine O Italic},
+]{Linux Libertine O}
+\setmonofont[Ligatures=TeX,Scale=MatchLowercase]{Liberation Mono}
+%setsansfont[Ligatures=TeX]{Linux Biolinum O}
+\setsansfont[Ligatures=TeX,Scale=MatchLowercase]{Iwona Medium}
+%setmathfont{XITS Math}
 
-\usepackage[a4paper]{geometry}
-\usepackage[english]{babel}
-\usepackage[colorlinks]{hyperref}
-\usepackage{bookmark}
+\usepackage{hologo}
+
+\newcommand\ConTeXt {Con\TeX t\xspace}
 
 \newcommand*\email [1] {<\href{mailto:#1}{#1}>}
 \newcommand \file       {\nolinkurl}
@@ -124,10 +151,10 @@ See source file '\inFileName' for licencing and contact information.
 %   Right brace   \}     Tilde         \~}
 %
 % \title{The \textsf{luamplib} package}
-% \author{Hans Hagen, Taco Hoekwater and Elie Roux \\
-% Maintainer: Manuel Pégourié-Gonnard ---
+% \author{Hans Hagen, Taco Hoekwater, Elie Roux, Philipp Gesang and Kim Dohyun\\
+% Maintainer: LuaLaTeX Maintainers ---
 % Support: \email{lualatex-dev@tug.org}}
-% \date{2011/12/09 v1.09}
+% \date{2013/05/07 v2.0}
 %
 % \maketitle
 %
@@ -138,7 +165,7 @@ See source file '\inFileName' for licencing and contact information.
 % \section{Documentation}
 %
 % This packages aims at providing a simple way to typeset directly metapost
-% code in a document with Lua\TeX . Lua\TeX\ is built with the lua
+% code in a document with \LuaTeX . \LuaTeX\ is built with the lua
 % \texttt{mplib} library, that runs metapost code. This package is basically a
 % wrapper (in Lua) for the Lua \texttt{mplib} functions and some \TeX\
 % functions to have the output of the \texttt{mplib} functions in the pdf.
@@ -149,14 +176,16 @@ See source file '\inFileName' for licencing and contact information.
 % The metapost figures are put in a \TeX\ \texttt{hbox} with dimensions
 % adjusted to the metapost code.
 %
-% The code is from the \texttt{supp-mpl.lua} and \texttt{supp-mpl.tex} files
-% from Con\TeX t, they have been adapted to \LaTeX\ and Plain by Elie Roux.
+% The code is from the \texttt{luatex-mplib.lua} and \texttt{luatex-mplib.tex} files
+% from \ConTeXt, they have been adapted to \LaTeX\ and Plain by Elie Roux and
+% Philipp Gesang, new functionalities have been added by Kil Dohyun.
 % The changes are:
 %
 % \begin{itemize}
 % \item a \LaTeX\ environment
 % \item all \TeX\ macros start by \texttt{mplib}
 % \item use of luatexbase for errors, warnings and declaration
+% \item possibility to use |btex ... etex| to typeset \TeX .
 % \end{itemize}
 %
 % Using this package is easy: in Plain, type your metapost code between the
@@ -172,67 +201,80 @@ See source file '\inFileName' for licencing and contact information.
 %
 %    \subsection{Lua module}
 %
-%    \begin{macrocode}
+% \iffalse
 %<*lua>
-%    \end{macrocode}
-%
+% \fi
 %    Use the |luamplib| namespace, since |mplib| is for the metapost library
-%    itself.
+%    itself. \ConTeXt{} uses |metapost|.
 %
 %    \begin{macrocode}
-module('luamplib', package.seeall)
+
+luamplib          = luamplib or { }
+
 %    \end{macrocode}
-%
-%    Identification, and additional reporting function, for compatibility with
-%    the original |report()| function and associated data structure.
+%    Identification.
 %
 %    \begin{macrocode}
+
+local luamplib    = luamplib
+luamplib.showlog  = luamplib.showlog or false
+luamplib.lastlog  = ""
+
 local err, warn, info, log = luatexbase.provides_module({
     name          = "luamplib",
-    version       =  1.09,
-    date          = "2011/11/09",
+    version       =  2.00,
+    date          = "2013/05/07",
     description   = "Lua package to typeset Metapost with LuaTeX's MPLib.",
 })
 
-local function term(...)
-    texio.write_nl('term', 'luamplib: ' .. string.format(...))
-end
 
 %    \end{macrocode}
-%
 %    This module is a stripped down version of libraries that are used by
-%    Con\TeX t. Provide a few ``shortcuts'' expected by the imported code.
+%    \ConTeXt. Provide a few ``shortcuts'' expected by the imported code.
 %
 %    \begin{macrocode}
-local format, concat, abs = string.format, table.concat, math.abs
+
+local format, abs = string.format, math.abs
+
+local stringgsub    = string.gsub
+local stringfind    = string.find
+local stringmatch   = string.match
+local stringgmatch  = string.gmatch
+local tableconcat   = table.concat
+local texsprint     = tex.sprint
+
+local mplib = require ('mplib')
+local kpse  = require ('kpse')
+
+local file = file
+if not file then
 
 %    \end{macrocode}
-%
 %    This is a small trick for \LaTeX . In \LaTeX\ we read the metapost code
 %    line by line, but it needs to be passed entirely to |process()|, so we
 %    simply add the lines in |data| and at the end we call |process(data)|.
 %
+%    A few helpers, taken from \verb|l-file.lua|.
+%
 %    \begin{macrocode}
-local data = ""
 
-local function resetdata()
-    data = ""
-end
-function addline(line)
-    data = data .. '\n' .. line
-end
-function processlines()
-    process(data)
-    resetdata()
-end
+  file = { }
+
+  function file.replacesuffix(filename, suffix)
+      return (stringgsub(filename,"%.[%a%d]+$","")) .. "." .. suffix
+  end
 
+  function file.stripsuffix(filename)
+      return (stringgsub(filename,"%.[%a%d]+$",""))
+  end
+end
 %    \end{macrocode}
-%
-%    As the finder function for |mplib|, use the |kpse| library and
-%    make it behave like as if MetaPost was used (or almost, since the engine
-%    name is not set this way---not sure if this is a problem).
+%      As the finder function for |mplib|, use the |kpse| library and
+%      make it behave like as if MetaPost was used (or almost, since the engine
+%      name is not set this way---not sure if this is a problem).
 %
 %    \begin{macrocode}
+
 local mpkpse = kpse.new("luatex", "mpost")
 
 local function finder(name, mode, ftype)
@@ -242,133 +284,199 @@ local function finder(name, mode, ftype)
         return mpkpse:find_file(name,ftype)
     end
 end
+luamplib.finder = finder
 
 %    \end{macrocode}
-%
-%    Default format name, and a public function to change it.
+% The rest of this module is not documented. More info can be found in the
+% \LuaTeX{} manual, articles in user group journals and the files that
+% ship with \ConTeXt.
 %
 %    \begin{macrocode}
-local currentformat = "plain"
 
-function setformat (name)
-    currentformat = name
+function luamplib.resetlastlog()
+    luamplib.lastlog = ""
 end
 
 %    \end{macrocode}
-%
-%    Create a new mplib object and input the correct .mp file as given by
-%    |currentformat|. With older versions of MetaPost, using a |mem| file may
-%    be more efficient, but newer versions don't support it any more so for
-%    the sake of simplicity, don't even try to use a |mem| file.
-%    |ini_version| is ignored by new versions but is useful to prevent old
-%    ones from trying to load a |mem| file.
+% Below included is section that defines fallbacks for older
+% versions of mplib.
 %
 %    \begin{macrocode}
-function load()
-    local mpx = mplib.new {
-        find_file   = finder,
-        ini_version = true,
-    }
-    mpx:execute(format("input %s ;", currentformat))
-    return mpx
-end
+local mplibone = tonumber(mplib.version()) <= 1.50
+
+if mplibone then
+
+    luamplib.make = luamplib.make or function(name,mem_name,dump)
+        local t = os.clock()
+        local mpx = mplib.new {
+            ini_version = true,
+            find_file = luamplib.finder,
+            job_name = file.stripsuffix(name)
+        }
+        mpx:execute(format("input %s ;",name))
+        if dump then
+            mpx:execute("dump ;")
+            info("format %s made and dumped for %s in %0.3f seconds",mem_name,name,os.clock()-t)
+        else
+            info("%s read in %0.3f seconds",name,os.clock()-t)
+        end
+        return mpx
+    end
+
+    function luamplib.load(name)
+        local mem_name = file.replacesuffix(name,"mem")
+        local mpx = mplib.new {
+            ini_version = false,
+            mem_name = mem_name,
+            find_file = luamplib.finder
+        }
+        if not mpx and type(luamplib.make) == "function" then
+            -- when i have time i'll locate the format and dump
+            mpx = luamplib.make(name,mem_name)
+        end
+        if mpx then
+            info("using format %s",mem_name,false)
+            return mpx, nil
+        else
+            return nil, { status = 99, error = "out of memory or invalid format" }
+        end
+    end
+
+else
 
 %    \end{macrocode}
-%
-%    The rest of this module is not documented. More information can be found
-%    in the Lua\TeX\ manual, articles in user group journals and the files
-%    that ship with Con\TeX t.
+% These are the versions called with sufficiently recent mplib.
 %
 %    \begin{macrocode}
-function report(result)
+
+    local preamble = [[
+        boolean mplib ; mplib := true ;
+        let dump = endinput ;
+        input %s ;
+    ]]
+
+    luamplib.make = luamplib.make or function()
+    end
+
+    function luamplib.load(name)
+        local mpx = mplib.new {
+            ini_version = true,
+            find_file = luamplib.finder,
+        }
+        local result
+        if not mpx then
+            result = { status = 99, error = "out of memory"}
+        else
+            result = mpx:execute(format(preamble, file.replacesuffix(name,"mp")))
+        end
+        luamplib.reporterror(result)
+        return mpx, result
+    end
+
+end
+
+local currentformat = "plain"
+
+local function setformat (name) --- used in .sty
+    currentformat = name
+end
+luamplib.setformat = setformat
+
+
+luamplib.reporterror = function (result)
     if not result then
-        err("no result object")
+        err("no result object returned")
     elseif result.status > 0 then
-        local t, e, l, f = result.term, result.error, result.log
-        if l then
-            log(l)
-        end
+        local t, e, l = result.term, result.error, result.log
         if t then
-            term(t)
+            info(t)
         end
         if e then
-            if result.status == 1 then
-                warn(e)
-            else
-                err(e)
-            end
+            err(e)
         end
-        if not t and not e and not l then
-            if result.status == 1 then
-                warn("unknown error, no error, terminal or log messages, maybe missing beginfig/endfig")
-            else
-                err("unknown error, no error, terminal or log messages, maybe missing beginfig/endfig")
-            end
+        if not t and not e and l then
+            luamplib.lastlog = luamplib.lastlog .. "\n " .. l
+            log(l)
+        else
+            err("unknown, no error, terminal or log messages")
         end
     else
-        return true
+        return false
     end
-    return false
+    return true
 end
 
-function process(data)
+local function process_indeed (mpx, data)
     local converted, result = false, {}
-    local mpx = load()
+    local mpx = luamplib.load(mpx)
     if mpx and data then
         local result = mpx:execute(data)
-        if report(result) then
-            if result.fig then
-                converted = convert(result)
-            else
-                warn("no figure output")
-            end
+        if not result then
+            err("no result object returned")
+        elseif result.status > 0 then
+            err("%s",(result.term or "no-term") .. "\n" .. (result.error or "no-error"))
+        elseif luamplib.showlog then
+            luamplib.lastlog = luamplib.lastlog .. "\n" .. result.term
+            info("%s",result.term or "no-term")
+        elseif result.fig then
+            converted = luamplib.convert(result)
+        else
+            err("unknown error, maybe no beginfig/endfig")
         end
     else
         err("Mem file unloadable. Maybe generated with a different version of mplib?")
     end
     return converted, result
 end
+local process = function (data)
+    return process_indeed(currentformat, data)
+end
+luamplib.process = process
 
 local function getobjects(result,figure,f)
     return figure:objects()
 end
 
-function convert(result, flusher)
-    flush(result, flusher)
+local function convert(result, flusher)
+    luamplib.flush(result, flusher)
     return true -- done
 end
+luamplib.convert = convert
 
 local function pdf_startfigure(n,llx,lly,urx,ury)
-    tex.sprint(format("\\mplibstarttoPDF{%s}{%s}{%s}{%s}",llx,lly,urx,ury))
+%    \end{macrocode}
+%     The following line has been slightly modified by Kim.
+%    \begin{macrocode}
+    texsprint(format("\\mplibstarttoPDF{%f}{%f}{%f}{%f}",llx,lly,urx,ury))
 end
 
 local function pdf_stopfigure()
-    tex.sprint("\\mplibstoptoPDF")
+    texsprint("\\mplibstoptoPDF")
 end
 
-function pdf_literalcode(fmt,...) -- table
-    tex.sprint(format("\\mplibtoPDF{%s}",format(fmt,...)))
+local function pdf_literalcode(fmt,...) -- table
+    texsprint(format("\\mplibtoPDF{%s}",format(fmt,...)))
 end
+luamplib.pdf_literalcode = pdf_literalcode
 
-function pdf_textfigure(font,size,text,width,height,depth)
+local function pdf_textfigure(font,size,text,width,height,depth)
     text = text:gsub(".","\\hbox{%1}") -- kerning happens in metapost
-    tex.sprint(format("\\mplibtextext{%s}{%s}{%s}{%s}{%s}",font,size,text,0,-( 7200/ 7227)/65536*depth))
+%    \end{macrocode}
+%     The following line has been slightly modified by Kim.
+%    \begin{macrocode}
+    texsprint(format("\\mplibtextext{%s}{%f}{%s}{%s}{%f}",font,size,text,0,-( 7200/ 7227)/65536*depth))
 end
+luamplib.pdf_textfigure = pdf_textfigure
 
 local bend_tolerance = 131/65536
 
 local rx, sx, sy, ry, tx, ty, divider = 1, 0, 0, 1, 0, 0, 1
 
 local function pen_characteristics(object)
-    if mplib.pen_info then
-        local t = mplib.pen_info(object)
-        rx, ry, sx, sy, tx, ty = t.rx, t.ry, t.sx, t.sy, t.tx, t.ty
-        divider = sx*sy - rx*ry
-        return not (sx==1 and rx==0 and ry==0 and sy==1 and tx==0 and ty==0), t.width
-    else
-        rx, sx, sy, ry, tx, ty, divider = 1, 0, 0, 1, 0, 0, 1
-        return false, 1
-    end
+    local t = mplib.pen_info(object)
+    rx, ry, sx, sy, tx, ty = t.rx, t.ry, t.sx, t.sy, t.tx, t.ty
+    divider = sx*sy - rx*ry
+    return not (sx==1 and rx==0 and ry==0 and sy==1 and tx==0 and ty==0), t.width
 end
 
 local function concat(px, py) -- no tx, ty here
@@ -448,19 +556,85 @@ local function flushconcatpath(path,open)
 end
 
 %    \end{macrocode}
+%     Below code has been contributed by Dohyun Kim.
+%     It implements \verb|btex| / \verb|etex| functions.
 %
-%    Support for specials in DVI has been removed.
+%    \begin{macrocode}
+
+local mplibcodepreamble = [[
+vardef textext@#(expr n, w, h, d) =
+    image(
+        addto currentpicture doublepath unitsquare
+        xscaled w
+        yscaled (h+d)
+        withprescript "%%textext:"&decimal n&":"&decimal w&":"&decimal(h+d);
+    )
+enddef;
+]]
+
+local factor = 65536*(7227/7200)
+
+local function settexboxes (data)
+    local i = tex.count[14] -- newbox register
+    for _,c,_ in stringgmatch(data,"(%A)btex(%A.-%A)etex(%A)") do
+        i = i + 1
+        c = stringgsub(c,"^%s*(.-)%s*$","%1")
+        texsprint(format("\\setbox%i\\hbox{%s}",i,c))
+    end
+end
+
+luamplib.settexboxes = settexboxes
+
+local function gettexboxes (data)
+    local i = tex.count[14] -- the same newbox register
+    data = stringgsub(data,"(%A)btex%A.-%Aetex(%A)",
+    function(pre,post)
+        i = i + 1
+        local box = tex.box[i]
+        local boxmetr = format("textext(%i,%f,%f,%f)",
+                        i,
+                        box and (box.width/factor) or 0,
+                        box and (box.height/factor) or 0,
+                        box and (box.depth/factor) or 0)
+        return pre .. boxmetr .. post
+    end)
+    return mplibcodepreamble .. data
+end
+
+luamplib.gettexboxes = gettexboxes
+
+local function puttexboxes (object)
+    local n,tw,th = stringmatch(
+                    object.prescript,
+                    "%%%%textext:(%d+):([%d%.%+%-]+):([%d%.%+%-]+)")
+    if n and tw and th then
+        local op = object.path
+        local first, second, fourth = op[1], op[2], op[4]
+        local tx, ty = first.x_coord, first.y_coord
+        local sx, sy = (second.x_coord - tx)/tw, (fourth.y_coord - ty)/th
+        local rx, ry = (second.y_coord - ty)/tw, (fourth.x_coord - tx)/th
+        if sx == 0 then sx = 0.00001 end
+        if sy == 0 then sy = 0.00001 end
+        pdf_literalcode("q %f %f %f %f %f %f cm",sx,rx,ry,sy,tx,ty)
+        texsprint(format("\\mplibputtextbox{%i}",n))
+        pdf_literalcode("Q")
+    end
+end
+
+%    \end{macrocode}
+%     End of \verb|btex| -- \verb|etex| patch.
 %
 %    \begin{macrocode}
-function flush(result,flusher)
+
+local function flush(result,flusher)
     if result then
         local figures = result.fig
         if figures then
             for f=1, #figures do
-                log("flushing figure %s",f)
+                info("flushing figure %s",f)
                 local figure = figures[f]
                 local objects = getobjects(result,figure,f)
-                local fignum = tonumber((figure:filename()):match("([%d]+)$") or figure:charcode() or 0)
+                local fignum = tonumber(stringmatch(figure:filename(),"([%d]+)$") or figure:charcode() or 0)
                 local miterlimit, linecap, linejoin, dashed = -1, -1, -1, false
                 local bbox = figure:boundingbox()
                 local llx, lly, urx, ury = bbox[1], bbox[2], bbox[3], bbox[4] -- faster than unpack
@@ -473,9 +647,17 @@ function flush(result,flusher)
                     pdf_literalcode("q")
                     if objects then
                         for o=1,#objects do
-                            local object = objects[o]
-                            local objecttype = object.type
-                            if objecttype == "start_bounds" or objecttype == "stop_bounds" then
+                            local object        = objects[o]
+                            local objecttype    = object.type
+%    \end{macrocode}
+%     Change from \ConTeXt{} code: the following 3 lines are part of the
+%     |btex...etex| patch.
+%
+%    \begin{macrocode}
+                            local prescript     = object.prescript --- [be]tex patch
+                            if prescript and stringfind(prescript,"%%%%textext:") then
+                               puttexboxes(object)
+                            elseif objecttype == "start_bounds" or objecttype == "stop_bounds" then
                                 -- skip
                             elseif objecttype == "start_clip" then
                                 pdf_literalcode("q")
@@ -493,8 +675,16 @@ function flush(result,flusher)
                                 pdf_literalcode("Q")
                             else
                                 local cs = object.color
+%    \end{macrocode}
+%     Change from \ConTeXt{} code: the following 5 lines are part of the
+%     |btex...etex| patch.
+%
+%    \begin{macrocode}
+                                local cr = nil
                                 if cs and #cs > 0 then
-                                    pdf_literalcode(colorconverter(cs))
+                                    local start,stop = luamplib.colorconverter(cs)
+                                    pdf_literalcode(start)
+                                    cr = stop
                                 end
                                 local ml = object.miterlimit
                                 if ml and ml ~= miterlimit then
@@ -513,7 +703,7 @@ function flush(result,flusher)
                                 end
                                 local dl = object.dash
                                 if dl then
-                                    local d = format("[%s] %i d",concat(dl.dashes or {}," "),dl.offset)
+                                    local d = format("[%s] %i d",tableconcat(dl.dashes or {}," "),dl.offset)
                                     if d ~= dashed then
                                         dashed = d
                                         pdf_literalcode(dashed)
@@ -591,8 +781,9 @@ function flush(result,flusher)
         end
     end
 end
+luamplib.flush = flush
 
-function colorconverter(cr)
+local function colorconverter(cr)
     local n = #cr
     if n == 4 then
         local c, m, y, k = cr[1], cr[2], cr[3], cr[4]
@@ -605,11 +796,12 @@ function colorconverter(cr)
         return format("%.3f g %.3f G",s,s), "0 g 0 G"
     end
 end
+luamplib.colorconverter = colorconverter
 %    \end{macrocode}
 %
-%    \begin{macrocode}
+% \iffalse
 %</lua>
-%    \end{macrocode}
+% \fi
 %
 %    \subsection{\texorpdfstring{\TeX}{TeX} package}
 %
@@ -626,9 +818,9 @@ end
 \else
   \NeedsTeXFormat{LaTeX2e}
   \ProvidesPackage{luamplib}
-    [2011/12/09 v1.09 mplib package for LuaTeX]
+    [2013/05/07 v2.0 mplib package for LuaTeX]
   \RequirePackage{luatexbase-modutils}
-  \RequirePackage{fancyvrb}
+  \RequirePackage{pdftexcmds}
 \fi
 %    \end{macrocode}
 %
@@ -662,28 +854,34 @@ end
       \PackageWarning{mplib}{MPLib only works in PDF mode, no figure will be output.}
     \fi
 \fi
+\def\mplibsetupcatcodes{%
+  \catcode`\{=12 \catcode`\}=12 \catcode`\#=12
+  \catcode`\^=12 \catcode`\~=12 \catcode`\_=12
+  %catcode`\%=12 %% don’t in Plain!
+  \catcode`\&=12 \catcode`\$=12
+}
 %    \end{macrocode}
 %
 %    The Plain-specific stuff.
 %
 %    \begin{macrocode}
+\def\mplibputtextbox#1{\vbox to 0pt{\vss\hbox to 0pt{\raise\dp#1\box#1\hss}}}
 \bgroup\expandafter\expandafter\expandafter\egroup
 \expandafter\ifx\csname ProvidesPackage\endcsname\relax
-\def\mplibsetupcatcodes{%
-  \catcode`\{=12 \catcode`\}=12 \catcode`\#=12 \catcode`\^=12 \catcode`\~=12
-  \catcode`\_=12 \catcode`\%=12 \catcode`\&=12 \catcode`\$=12
-}
 \def\mplibcode{%
-  \bgroup %
-  \mplibsetupcatcodes %
+  \bgroup
+  \mplibsetupcatcodes
   \mplibdocode %
 }
 \long\def\mplibdocode#1\endmplibcode{%
-  \egroup %
-  \mplibprocess{#1}%
-}
-\long\def\mplibprocess#1{%
-  \directlua{luamplib.process("\luatexluaescapestring{#1}")}%
+  \egroup
+  \directlua{
+    luamplib.settexboxes([===[\unexpanded{#1}]===])
+  }%
+  \directlua{
+    local data = luamplib.gettexboxes([===[\unexpanded{#1}]===])
+    luamplib.process(data)
+  }%
 }
 \else
 %    \end{macrocode}
@@ -709,33 +907,33 @@ end
 \endgroup
 %    \end{macrocode}
 %
-%    In \LaTeX\ (it's not the case in plain\TeX ), we get the metapost code
-%    line by line, here is the function handling a line.
+%    The \LaTeX\ environment.
 %
 %    \begin{macrocode}
-\newcommand\mplibaddlines[1]{%
-  \begingroup %
-  \FV@hack %
-  \def\FV@ProcessLine##1{%
-    \directlua{luamplib.addline("\luatexluaescapestring{##1}")}%
-  }%
-  \csname FV@SV@#1\endcsname %
-  \endgroup %
+\newenvironment{mplibcode}{\toks@{}\ltxdomplibcode}{}
+\def\ltxdomplibcode{%
+  \bgroup
+  \mplibsetupcatcodes
+  \ltxdomplibcodeindeed %
 }
-%    \end{macrocode}
-%
-%    The \LaTeX\ environment is a modified \texttt{verbatim} environment.
 %
-%    \begin{macrocode}
-\newenvironment{mplibcode}{%
-  \VerbatimEnvironment %
-  \begin{SaveVerbatim}{memoire}%
-}{%
-  \end{SaveVerbatim}%
-  \mplibaddlines{memoire}%
-  \directlua{luamplib.processlines()}%
+\long\def\ltxdomplibcodeindeed#1\end{%
+  \egroup
+  \toks@\expandafter{\the\toks@#1}\ltxdomplibcodefinally%
+}%
+%
+\def\ltxdomplibcodefinally#1{%
+  \ifnum\pdf@strcmp{#1}{mplibcode}=\z@
+    \directlua{luamplib.settexboxes([===[\the\toks@]===])}%
+    \directlua{
+      local data = luamplib.gettexboxes([===[\the\toks@]===])
+      luamplib.process(data)
+    }%
+    \end{mplibcode}%
+  \else
+    \toks@\expandafter{\the\toks@\end{#1}}\expandafter\ltxdomplibcode
+ \fi%
 }
-
 \fi
 %    \end{macrocode}
 %
@@ -811,6 +1009,437 @@ end
 %</package>
 %    \end{macrocode}
 %
+% \clearpage
+% \section{The GNU GPL License v2}
+%
+% The GPL requires the complete license text to be distributed along
+% with the code. I recommend the canonical source, instead:
+% \url{http://www.gnu.org/licenses/old-licenses/gpl-2.0.html}.
+% But if you insist on an included copy, here it is.
+% You might want to zoom in.
+%
+% \newsavebox{\gpl}
+% \begin{lrbox}{\gpl}
+% \begin{minipage}{3\textwidth}
+% \columnsep=3\columnsep
+% \begin{multicols}{3}
+% \begin{center}
+% {\Large GNU GENERAL PUBLIC LICENSE\par}
+% \bigskip
+% {Version 2, June 1991}
+% \end{center}
+%
+% \begin{center}
+% {\parindent 0in
+%
+% Copyright \textcopyright\ 1989, 1991 Free Software Foundation, Inc.
+%
+% \bigskip
+%
+% 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+%
+% \bigskip
+%
+% Everyone is permitted to copy and distribute verbatim copies
+% of this license document, but changing it is not allowed.
+% }
+% \end{center}
+%
+% \begin{center}
+% {\bf\large Preamble}
+% \end{center}
+%
+%
+% The licenses for most software are designed to take away your freedom to
+% share and change it.  By contrast, the GNU General Public License is
+% intended to guarantee your freedom to share and change free software---to
+% make sure the software is free for all its users.  This General Public
+% License applies to most of the Free Software Foundation's software and to
+% any other program whose authors commit to using it.  (Some other Free
+% Software Foundation software is covered by the GNU Library General Public
+% License instead.)  You can apply it to your programs, too.
+%
+% When we speak of free software, we are referring to freedom, not price.
+% Our General Public Licenses are designed to make sure that you have the
+% freedom to distribute copies of free software (and charge for this service
+% if you wish), that you receive source code or can get it if you want it,
+% that you can change the software or use pieces of it in new free programs;
+% and that you know you can do these things.
+%
+% To protect your rights, we need to make restrictions that forbid anyone to
+% deny you these rights or to ask you to surrender the rights.  These
+% restrictions translate to certain responsibilities for you if you
+% distribute copies of the software, or if you modify it.
+%
+% For example, if you distribute copies of such a program, whether gratis or
+% for a fee, you must give the recipients all the rights that you have.  You
+% must make sure that they, too, receive or can get the source code.  And
+% you must show them these terms so they know their rights.
+%
+% We protect your rights with two steps: (1) copyright the software, and (2)
+% offer you this license which gives you legal permission to copy,
+% distribute and/or modify the software.
+%
+% Also, for each author's protection and ours, we want to make certain that
+% everyone understands that there is no warranty for this free software.  If
+% the software is modified by someone else and passed on, we want its
+% recipients to know that what they have is not the original, so that any
+% problems introduced by others will not reflect on the original authors'
+% reputations.
+%
+% Finally, any free program is threatened constantly by software patents.
+% We wish to avoid the danger that redistributors of a free program will
+% individually obtain patent licenses, in effect making the program
+% proprietary.  To prevent this, we have made it clear that any patent must
+% be licensed for everyone's free use or not licensed at all.
+%
+% The precise terms and conditions for copying, distribution and
+% modification follow.
+%
+% \begin{center}
+% {\Large \sc Terms and Conditions For Copying, Distribution and
+%   Modification}
+% \end{center}
+%
+% \begin{enumerate}
+% \item
+% This License applies to any program or other work which contains a notice
+% placed by the copyright holder saying it may be distributed under the
+% terms of this General Public License.  The ``Program'', below, refers to
+% any such program or work, and a ``work based on the Program'' means either
+% the Program or any derivative work under copyright law: that is to say, a
+% work containing the Program or a portion of it, either verbatim or with
+% modifications and/or translated into another language.  (Hereinafter,
+% translation is included without limitation in the term ``modification''.)
+% Each licensee is addressed as ``you''.
+%
+% Activities other than copying, distribution and modification are not
+% covered by this License; they are outside its scope.  The act of
+% running the Program is not restricted, and the output from the Program
+% is covered only if its contents constitute a work based on the
+% Program (independent of having been made by running the Program).
+% Whether that is true depends on what the Program does.
+%
+% \item You may copy and distribute verbatim copies of the Program's source
+%   code as you receive it, in any medium, provided that you conspicuously
+%   and appropriately publish on each copy an appropriate copyright notice
+%   and disclaimer of warranty; keep intact all the notices that refer to
+%   this License and to the absence of any warranty; and give any other
+%   recipients of the Program a copy of this License along with the Program.
+%
+% You may charge a fee for the physical act of transferring a copy, and you
+% may at your option offer warranty protection in exchange for a fee.
+%
+% \item
+% You may modify your copy or copies of the Program or any portion
+% of it, thus forming a work based on the Program, and copy and
+% distribute such modifications or work under the terms of Section 1
+% above, provided that you also meet all of these conditions:
+%
+% \begin{enumerate}
+%
+% \item
+% You must cause the modified files to carry prominent notices stating that
+% you changed the files and the date of any change.
+%
+% \item
+% You must cause any work that you distribute or publish, that in
+% whole or in part contains or is derived from the Program or any
+% part thereof, to be licensed as a whole at no charge to all third
+% parties under the terms of this License.
+%
+% \item
+% If the modified program normally reads commands interactively
+% when run, you must cause it, when started running for such
+% interactive use in the most ordinary way, to print or display an
+% announcement including an appropriate copyright notice and a
+% notice that there is no warranty (or else, saying that you provide
+% a warranty) and that users may redistribute the program under
+% these conditions, and telling the user how to view a copy of this
+% License.  (Exception: if the Program itself is interactive but
+% does not normally print such an announcement, your work based on
+% the Program is not required to print an announcement.)
+%
+% \end{enumerate}
+%
+%
+% These requirements apply to the modified work as a whole.  If
+% identifiable sections of that work are not derived from the Program,
+% and can be reasonably considered independent and separate works in
+% themselves, then this License, and its terms, do not apply to those
+% sections when you distribute them as separate works.  But when you
+% distribute the same sections as part of a whole which is a work based
+% on the Program, the distribution of the whole must be on the terms of
+% this License, whose permissions for other licensees extend to the
+% entire whole, and thus to each and every part regardless of who wrote it.
+%
+% Thus, it is not the intent of this section to claim rights or contest
+% your rights to work written entirely by you; rather, the intent is to
+% exercise the right to control the distribution of derivative or
+% collective works based on the Program.
+%
+% In addition, mere aggregation of another work not based on the Program
+% with the Program (or with a work based on the Program) on a volume of
+% a storage or distribution medium does not bring the other work under
+% the scope of this License.
+%
+% \item
+% You may copy and distribute the Program (or a work based on it,
+% under Section 2) in object code or executable form under the terms of
+% Sections 1 and 2 above provided that you also do one of the following:
+%
+% \begin{enumerate}
+%
+% \item
+%
+% Accompany it with the complete corresponding machine-readable
+% source code, which must be distributed under the terms of Sections
+% 1 and 2 above on a medium customarily used for software interchange; or,
+%
+% \item
+%
+% Accompany it with a written offer, valid for at least three
+% years, to give any third party, for a charge no more than your
+% cost of physically performing source distribution, a complete
+% machine-readable copy of the corresponding source code, to be
+% distributed under the terms of Sections 1 and 2 above on a medium
+% customarily used for software interchange; or,
+%
+% \item
+%
+% Accompany it with the information you received as to the offer
+% to distribute corresponding source code.  (This alternative is
+% allowed only for noncommercial distribution and only if you
+% received the program in object code or executable form with such
+% an offer, in accord with Subsection b above.)
+%
+% \end{enumerate}
+%
+%
+% The source code for a work means the preferred form of the work for
+% making modifications to it.  For an executable work, complete source
+% code means all the source code for all modules it contains, plus any
+% associated interface definition files, plus the scripts used to
+% control compilation and installation of the executable.  However, as a
+% special exception, the source code distributed need not include
+% anything that is normally distributed (in either source or binary
+% form) with the major components (compiler, kernel, and so on) of the
+% operating system on which the executable runs, unless that component
+% itself accompanies the executable.
+%
+% If distribution of executable or object code is made by offering
+% access to copy from a designated place, then offering equivalent
+% access to copy the source code from the same place counts as
+% distribution of the source code, even though third parties are not
+% compelled to copy the source along with the object code.
+%
+% \item
+% You may not copy, modify, sublicense, or distribute the Program
+% except as expressly provided under this License.  Any attempt
+% otherwise to copy, modify, sublicense or distribute the Program is
+% void, and will automatically terminate your rights under this License.
+% However, parties who have received copies, or rights, from you under
+% this License will not have their licenses terminated so long as such
+% parties remain in full compliance.
+%
+% \item
+% You are not required to accept this License, since you have not
+% signed it.  However, nothing else grants you permission to modify or
+% distribute the Program or its derivative works.  These actions are
+% prohibited by law if you do not accept this License.  Therefore, by
+% modifying or distributing the Program (or any work based on the
+% Program), you indicate your acceptance of this License to do so, and
+% all its terms and conditions for copying, distributing or modifying
+% the Program or works based on it.
+%
+% \item
+% Each time you redistribute the Program (or any work based on the
+% Program), the recipient automatically receives a license from the
+% original licensor to copy, distribute or modify the Program subject to
+% these terms and conditions.  You may not impose any further
+% restrictions on the recipients' exercise of the rights granted herein.
+% You are not responsible for enforcing compliance by third parties to
+% this License.
+%
+% \item
+% If, as a consequence of a court judgment or allegation of patent
+% infringement or for any other reason (not limited to patent issues),
+% conditions are imposed on you (whether by court order, agreement or
+% otherwise) that contradict the conditions of this License, they do not
+% excuse you from the conditions of this License.  If you cannot
+% distribute so as to satisfy simultaneously your obligations under this
+% License and any other pertinent obligations, then as a consequence you
+% may not distribute the Program at all.  For example, if a patent
+% license would not permit royalty-free redistribution of the Program by
+% all those who receive copies directly or indirectly through you, then
+% the only way you could satisfy both it and this License would be to
+% refrain entirely from distribution of the Program.
+%
+% If any portion of this section is held invalid or unenforceable under
+% any particular circumstance, the balance of the section is intended to
+% apply and the section as a whole is intended to apply in other
+% circumstances.
+%
+% It is not the purpose of this section to induce you to infringe any
+% patents or other property right claims or to contest validity of any
+% such claims; this section has the sole purpose of protecting the
+% integrity of the free software distribution system, which is
+% implemented by public license practices.  Many people have made
+% generous contributions to the wide range of software distributed
+% through that system in reliance on consistent application of that
+% system; it is up to the author/donor to decide if he or she is willing
+% to distribute software through any other system and a licensee cannot
+% impose that choice.
+%
+% This section is intended to make thoroughly clear what is believed to
+% be a consequence of the rest of this License.
+%
+% \item
+% If the distribution and/or use of the Program is restricted in
+% certain countries either by patents or by copyrighted interfaces, the
+% original copyright holder who places the Program under this License
+% may add an explicit geographical distribution limitation excluding
+% those countries, so that distribution is permitted only in or among
+% countries not thus excluded.  In such case, this License incorporates
+% the limitation as if written in the body of this License.
+%
+% \item
+% The Free Software Foundation may publish revised and/or new versions
+% of the General Public License from time to time.  Such new versions will
+% be similar in spirit to the present version, but may differ in detail to
+% address new problems or concerns.
+%
+% Each version is given a distinguishing version number.  If the Program
+% specifies a version number of this License which applies to it and ``any
+% later version'', you have the option of following the terms and conditions
+% either of that version or of any later version published by the Free
+% Software Foundation.  If the Program does not specify a version number of
+% this License, you may choose any version ever published by the Free Software
+% Foundation.
+%
+% \item
+% If you wish to incorporate parts of the Program into other free
+% programs whose distribution conditions are different, write to the author
+% to ask for permission.  For software which is copyrighted by the Free
+% Software Foundation, write to the Free Software Foundation; we sometimes
+% make exceptions for this.  Our decision will be guided by the two goals
+% of preserving the free status of all derivatives of our free software and
+% of promoting the sharing and reuse of software generally.
+%
+% \begin{center}
+% {\Large\sc
+% No Warranty
+% }
+% \end{center}
+%
+% \item
+% {\sc Because the program is licensed free of charge, there is no warranty
+% for the program, to the extent permitted by applicable law.  Except when
+% otherwise stated in writing the copyright holders and/or other parties
+% provide the program ``as is'' without warranty of any kind, either expressed
+% or implied, including, but not limited to, the implied warranties of
+% merchantability and fitness for a particular purpose.  The entire risk as
+% to the quality and performance of the program is with you.  Should the
+% program prove defective, you assume the cost of all necessary servicing,
+% repair or correction.}
+%
+% \item
+% {\sc In no event unless required by applicable law or agreed to in writing
+% will any copyright holder, or any other party who may modify and/or
+% redistribute the program as permitted above, be liable to you for damages,
+% including any general, special, incidental or consequential damages arising
+% out of the use or inability to use the program (including but not limited
+% to loss of data or data being rendered inaccurate or losses sustained by
+% you or third parties or a failure of the program to operate with any other
+% programs), even if such holder or other party has been advised of the
+% possibility of such damages.}
+%
+% \end{enumerate}
+%
+%
+% \begin{center}
+% {\Large\sc End of Terms and Conditions}
+% \end{center}
+%
+%
+% \pagebreak[2]
+%
+% \section*{Appendix: How to Apply These Terms to Your New Programs}
+%
+% If you develop a new program, and you want it to be of the greatest
+% possible use to the public, the best way to achieve this is to make it
+% free software which everyone can redistribute and change under these
+% terms.
+%
+%   To do so, attach the following notices to the program.  It is safest to
+%   attach them to the start of each source file to most effectively convey
+%   the exclusion of warranty; and each file should have at least the
+%   ``copyright'' line and a pointer to where the full notice is found.
+%
+% \begin{quote}
+% one line to give the program's name and a brief idea of what it does. \\
+% Copyright (C) yyyy  name of author \\
+%
+% 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; either version 2 of the License, or
+% (at your option) any later version.
+%
+% 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.
+%
+% You should have received a copy of the GNU General Public License
+% along with this program; if not, write to the Free Software
+% Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+% \end{quote}
+%
+% Also add information on how to contact you by electronic and paper mail.
+%
+% If the program is interactive, make it output a short notice like this
+% when it starts in an interactive mode:
+%
+% \begin{quote}
+% Gnomovision version 69, Copyright (C) yyyy  name of author \\
+% Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. \\
+% This is free software, and you are welcome to redistribute it
+% under certain conditions; type `show c' for details.
+% \end{quote}
+%
+%
+% The hypothetical commands {\tt show w} and {\tt show c} should show the
+% appropriate parts of the General Public License.  Of course, the commands
+% you use may be called something other than {\tt show w} and {\tt show c};
+% they could even be mouse-clicks or menu items---whatever suits your
+% program.
+%
+% You should also get your employer (if you work as a programmer) or your
+% school, if any, to sign a ``copyright disclaimer'' for the program, if
+% necessary.  Here is a sample; alter the names:
+%
+% \begin{quote}
+% Yoyodyne, Inc., hereby disclaims all copyright interest in the program \\
+% `Gnomovision' (which makes passes at compilers) written by James Hacker. \\
+%
+% signature of Ty Coon, 1 April 1989 \\
+% Ty Coon, President of Vice
+% \end{quote}
+%
+%
+% This General Public License does not permit incorporating your program
+% into proprietary programs.  If your program is a subroutine library, you
+% may consider it more useful to permit linking proprietary applications
+% with the library.  If this is what you want to do, use the GNU Library
+% General Public License instead of this License.
+%
+% \end{multicols}
+% \end{minipage}
+% \end{lrbox}
+%
+% \begin{center}
+% \scalebox{0.33}{\usebox{\gpl}}
+% \end{center}
 %
 % \Finale
 \endinput
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
index 71c45d440d7..45e7ceff864 100644
--- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
+++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
@@ -8,31 +8,47 @@
 --  
 --  See source file 'luamplib.dtx' for licencing and contact information.
 --  
-module('luamplib', package.seeall)
+
+luamplib          = luamplib or { }
+
+
+local luamplib    = luamplib
+luamplib.showlog  = luamplib.showlog or false
+luamplib.lastlog  = ""
+
 local err, warn, info, log = luatexbase.provides_module({
     name          = "luamplib",
-    version       =  1.09,
-    date          = "2011/11/09",
+    version       =  2.00,
+    date          = "2013/05/07",
     description   = "Lua package to typeset Metapost with LuaTeX's MPLib.",
 })
 
-local function term(...)
-    texio.write_nl('term', 'luamplib: ' .. string.format(...))
-end
 
-local format, concat, abs = string.format, table.concat, math.abs
+local format, abs = string.format, math.abs
 
-local data = ""
+local stringgsub    = string.gsub
+local stringfind    = string.find
+local stringmatch   = string.match
+local stringgmatch  = string.gmatch
+local tableconcat   = table.concat
+local texsprint     = tex.sprint
 
-local function resetdata()
-    data = ""
-end
-function addline(line)
-    data = data .. '\n' .. line
-end
-function processlines()
-    process(data)
-    resetdata()
+local mplib = require ('mplib')
+local kpse  = require ('kpse')
+
+local file = file
+if not file then
+
+
+  file = { }
+
+  function file.replacesuffix(filename, suffix)
+      return (stringgsub(filename,"%.[%a%d]+$","")) .. "." .. suffix
+  end
+
+  function file.stripsuffix(filename)
+      return (stringgsub(filename,"%.[%a%d]+$",""))
+  end
 end
 
 local mpkpse = kpse.new("luatex", "mpost")
@@ -44,111 +60,177 @@ local function finder(name, mode, ftype)
         return mpkpse:find_file(name,ftype)
     end
 end
+luamplib.finder = finder
 
-local currentformat = "plain"
 
-function setformat (name)
-    currentformat = name
+function luamplib.resetlastlog()
+    luamplib.lastlog = ""
 end
 
-function load()
-    local mpx = mplib.new {
-        find_file   = finder,
-        ini_version = true,
-    }
-    mpx:execute(format("input %s ;", currentformat))
-    return mpx
+local mplibone = tonumber(mplib.version()) <= 1.50
+
+if mplibone then
+
+    luamplib.make = luamplib.make or function(name,mem_name,dump)
+        local t = os.clock()
+        local mpx = mplib.new {
+            ini_version = true,
+            find_file = luamplib.finder,
+            job_name = file.stripsuffix(name)
+        }
+        mpx:execute(format("input %s ;",name))
+        if dump then
+            mpx:execute("dump ;")
+            info("format %s made and dumped for %s in %0.3f seconds",mem_name,name,os.clock()-t)
+        else
+            info("%s read in %0.3f seconds",name,os.clock()-t)
+        end
+        return mpx
+    end
+
+    function luamplib.load(name)
+        local mem_name = file.replacesuffix(name,"mem")
+        local mpx = mplib.new {
+            ini_version = false,
+            mem_name = mem_name,
+            find_file = luamplib.finder
+        }
+        if not mpx and type(luamplib.make) == "function" then
+            -- when i have time i'll locate the format and dump
+            mpx = luamplib.make(name,mem_name)
+        end
+        if mpx then
+            info("using format %s",mem_name,false)
+            return mpx, nil
+        else
+            return nil, { status = 99, error = "out of memory or invalid format" }
+        end
+    end
+
+else
+
+
+    local preamble = [[
+        boolean mplib ; mplib := true ;
+        let dump = endinput ;
+        input %s ;
+    ]]
+
+    luamplib.make = luamplib.make or function()
+    end
+
+    function luamplib.load(name)
+        local mpx = mplib.new {
+            ini_version = true,
+            find_file = luamplib.finder,
+        }
+        local result
+        if not mpx then
+            result = { status = 99, error = "out of memory"}
+        else
+            result = mpx:execute(format(preamble, file.replacesuffix(name,"mp")))
+        end
+        luamplib.reporterror(result)
+        return mpx, result
+    end
+
+end
+
+local currentformat = "plain"
+
+local function setformat (name) --- used in .sty
+    currentformat = name
 end
+luamplib.setformat = setformat
 
-function report(result)
+luamplib.reporterror = function (result)
     if not result then
-        err("no result object")
+        err("no result object returned")
     elseif result.status > 0 then
-        local t, e, l, f = result.term, result.error, result.log
-        if l then
-            log(l)
-        end
+        local t, e, l = result.term, result.error, result.log
         if t then
-            term(t)
+            info(t)
         end
         if e then
-            if result.status == 1 then
-                warn(e)
-            else
-                err(e)
-            end
+            err(e)
         end
-        if not t and not e and not l then
-            if result.status == 1 then
-                warn("unknown error, no error, terminal or log messages, maybe missing beginfig/endfig")
-            else
-                err("unknown error, no error, terminal or log messages, maybe missing beginfig/endfig")
-            end
+        if not t and not e and l then
+            luamplib.lastlog = luamplib.lastlog .. "\n " .. l
+            log(l)
+        else
+            err("unknown, no error, terminal or log messages")
         end
     else
-        return true
+        return false
     end
-    return false
+    return true
 end
 
-function process(data)
+local function process_indeed (mpx, data)
     local converted, result = false, {}
-    local mpx = load()
+    local mpx = luamplib.load(mpx)
     if mpx and data then
         local result = mpx:execute(data)
-        if report(result) then
-            if result.fig then
-                converted = convert(result)
-            else
-                warn("no figure output")
-            end
+        if not result then
+            err("no result object returned")
+        elseif result.status > 0 then
+            err("%s",(result.term or "no-term") .. "\n" .. (result.error or "no-error"))
+        elseif luamplib.showlog then
+            luamplib.lastlog = luamplib.lastlog .. "\n" .. result.term
+            info("%s",result.term or "no-term")
+        elseif result.fig then
+            converted = luamplib.convert(result)
+        else
+            err("unknown error, maybe no beginfig/endfig")
         end
     else
         err("Mem file unloadable. Maybe generated with a different version of mplib?")
     end
     return converted, result
 end
+local process = function (data)
+    return process_indeed(currentformat, data)
+end
+luamplib.process = process
 
 local function getobjects(result,figure,f)
     return figure:objects()
 end
 
-function convert(result, flusher)
-    flush(result, flusher)
+local function convert(result, flusher)
+    luamplib.flush(result, flusher)
     return true -- done
 end
+luamplib.convert = convert
 
 local function pdf_startfigure(n,llx,lly,urx,ury)
-    tex.sprint(format("\\mplibstarttoPDF{%s}{%s}{%s}{%s}",llx,lly,urx,ury))
+    texsprint(format("\\mplibstarttoPDF{%f}{%f}{%f}{%f}",llx,lly,urx,ury))
 end
 
 local function pdf_stopfigure()
-    tex.sprint("\\mplibstoptoPDF")
+    texsprint("\\mplibstoptoPDF")
 end
 
-function pdf_literalcode(fmt,...) -- table
-    tex.sprint(format("\\mplibtoPDF{%s}",format(fmt,...)))
+local function pdf_literalcode(fmt,...) -- table
+    texsprint(format("\\mplibtoPDF{%s}",format(fmt,...)))
 end
+luamplib.pdf_literalcode = pdf_literalcode
 
-function pdf_textfigure(font,size,text,width,height,depth)
+local function pdf_textfigure(font,size,text,width,height,depth)
     text = text:gsub(".","\\hbox{%1}") -- kerning happens in metapost
-    tex.sprint(format("\\mplibtextext{%s}{%s}{%s}{%s}{%s}",font,size,text,0,-( 7200/ 7227)/65536*depth))
+    texsprint(format("\\mplibtextext{%s}{%f}{%s}{%s}{%f}",font,size,text,0,-( 7200/ 7227)/65536*depth))
 end
+luamplib.pdf_textfigure = pdf_textfigure
 
 local bend_tolerance = 131/65536
 
 local rx, sx, sy, ry, tx, ty, divider = 1, 0, 0, 1, 0, 0, 1
 
 local function pen_characteristics(object)
-    if mplib.pen_info then
-        local t = mplib.pen_info(object)
-        rx, ry, sx, sy, tx, ty = t.rx, t.ry, t.sx, t.sy, t.tx, t.ty
-        divider = sx*sy - rx*ry
-        return not (sx==1 and rx==0 and ry==0 and sy==1 and tx==0 and ty==0), t.width
-    else
-        rx, sx, sy, ry, tx, ty, divider = 1, 0, 0, 1, 0, 0, 1
-        return false, 1
-    end
+    local t = mplib.pen_info(object)
+    rx, ry, sx, sy, tx, ty = t.rx, t.ry, t.sx, t.sy, t.tx, t.ty
+    divider = sx*sy - rx*ry
+    return not (sx==1 and rx==0 and ry==0 and sy==1 and tx==0 and ty==0), t.width
 end
 
 local function concat(px, py) -- no tx, ty here
@@ -227,15 +309,77 @@ local function flushconcatpath(path,open)
     return t
 end
 
-function flush(result,flusher)
+
+local mplibcodepreamble = [[
+vardef textext@#(expr n, w, h, d) =
+    image(
+        addto currentpicture doublepath unitsquare
+        xscaled w
+        yscaled (h+d)
+        withprescript "%%textext:"&decimal n&":"&decimal w&":"&decimal(h+d);
+    )
+enddef;
+]]
+
+local factor = 65536*(7227/7200)
+
+local function settexboxes (data)
+    local i = tex.count[14] -- newbox register
+    for _,c,_ in stringgmatch(data,"(%A)btex(%A.-%A)etex(%A)") do
+        i = i + 1
+        c = stringgsub(c,"^%s*(.-)%s*$","%1")
+        texsprint(format("\\setbox%i\\hbox{%s}",i,c))
+    end
+end
+
+luamplib.settexboxes = settexboxes
+
+local function gettexboxes (data)
+    local i = tex.count[14] -- the same newbox register
+    data = stringgsub(data,"(%A)btex%A.-%Aetex(%A)",
+    function(pre,post)
+        i = i + 1
+        local box = tex.box[i]
+        local boxmetr = format("textext(%i,%f,%f,%f)",
+                        i,
+                        box and (box.width/factor) or 0,
+                        box and (box.height/factor) or 0,
+                        box and (box.depth/factor) or 0)
+        return pre .. boxmetr .. post
+    end)
+    return mplibcodepreamble .. data
+end
+
+luamplib.gettexboxes = gettexboxes
+
+local function puttexboxes (object)
+    local n,tw,th = stringmatch(
+                    object.prescript,
+                    "%%%%textext:(%d+):([%d%.%+%-]+):([%d%.%+%-]+)")
+    if n and tw and th then
+        local op = object.path
+        local first, second, fourth = op[1], op[2], op[4]
+        local tx, ty = first.x_coord, first.y_coord
+        local sx, sy = (second.x_coord - tx)/tw, (fourth.y_coord - ty)/th
+        local rx, ry = (second.y_coord - ty)/tw, (fourth.x_coord - tx)/th
+        if sx == 0 then sx = 0.00001 end
+        if sy == 0 then sy = 0.00001 end
+        pdf_literalcode("q %f %f %f %f %f %f cm",sx,rx,ry,sy,tx,ty)
+        texsprint(format("\\mplibputtextbox{%i}",n))
+        pdf_literalcode("Q")
+    end
+end
+
+
+local function flush(result,flusher)
     if result then
         local figures = result.fig
         if figures then
             for f=1, #figures do
-                log("flushing figure %s",f)
+                info("flushing figure %s",f)
                 local figure = figures[f]
                 local objects = getobjects(result,figure,f)
-                local fignum = tonumber((figure:filename()):match("([%d]+)$") or figure:charcode() or 0)
+                local fignum = tonumber(stringmatch(figure:filename(),"([%d]+)$") or figure:charcode() or 0)
                 local miterlimit, linecap, linejoin, dashed = -1, -1, -1, false
                 local bbox = figure:boundingbox()
                 local llx, lly, urx, ury = bbox[1], bbox[2], bbox[3], bbox[4] -- faster than unpack
@@ -248,9 +392,12 @@ function flush(result,flusher)
                     pdf_literalcode("q")
                     if objects then
                         for o=1,#objects do
-                            local object = objects[o]
-                            local objecttype = object.type
-                            if objecttype == "start_bounds" or objecttype == "stop_bounds" then
+                            local object        = objects[o]
+                            local objecttype    = object.type
+                            local prescript     = object.prescript --- [be]tex patch
+                            if prescript and stringfind(prescript,"%%%%textext:") then
+                               puttexboxes(object)
+                            elseif objecttype == "start_bounds" or objecttype == "stop_bounds" then
                                 -- skip
                             elseif objecttype == "start_clip" then
                                 pdf_literalcode("q")
@@ -268,8 +415,11 @@ function flush(result,flusher)
                                 pdf_literalcode("Q")
                             else
                                 local cs = object.color
+                                local cr = nil
                                 if cs and #cs > 0 then
-                                    pdf_literalcode(colorconverter(cs))
+                                    local start,stop = luamplib.colorconverter(cs)
+                                    pdf_literalcode(start)
+                                    cr = stop
                                 end
                                 local ml = object.miterlimit
                                 if ml and ml ~= miterlimit then
@@ -288,7 +438,7 @@ function flush(result,flusher)
                                 end
                                 local dl = object.dash
                                 if dl then
-                                    local d = format("[%s] %i d",concat(dl.dashes or {}," "),dl.offset)
+                                    local d = format("[%s] %i d",tableconcat(dl.dashes or {}," "),dl.offset)
                                     if d ~= dashed then
                                         dashed = d
                                         pdf_literalcode(dashed)
@@ -366,8 +516,9 @@ function flush(result,flusher)
         end
     end
 end
+luamplib.flush = flush
 
-function colorconverter(cr)
+local function colorconverter(cr)
     local n = #cr
     if n == 4 then
         local c, m, y, k = cr[1], cr[2], cr[3], cr[4]
@@ -380,5 +531,6 @@ function colorconverter(cr)
         return format("%.3f g %.3f G",s,s), "0 g 0 G"
     end
 end
+luamplib.colorconverter = colorconverter
 -- 
 --  End of File `luamplib.lua'.
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
index e71631ad539..3f435d2b31f 100644
--- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
+++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
@@ -14,9 +14,9 @@
 \else
   \NeedsTeXFormat{LaTeX2e}
   \ProvidesPackage{luamplib}
-    [2011/12/09 v1.09 mplib package for LuaTeX]
+    [2013/05/07 v2.0 mplib package for LuaTeX]
   \RequirePackage{luatexbase-modutils}
-  \RequirePackage{fancyvrb}
+  \RequirePackage{pdftexcmds}
 \fi
 \RequireLuaModule{luamplib}
 \def\mplibsetformat#1{%
@@ -34,23 +34,29 @@
       \PackageWarning{mplib}{MPLib only works in PDF mode, no figure will be output.}
     \fi
 \fi
-\bgroup\expandafter\expandafter\expandafter\egroup
-\expandafter\ifx\csname ProvidesPackage\endcsname\relax
 \def\mplibsetupcatcodes{%
-  \catcode`\{=12 \catcode`\}=12 \catcode`\#=12 \catcode`\^=12 \catcode`\~=12
-  \catcode`\_=12 \catcode`\%=12 \catcode`\&=12 \catcode`\$=12
+  \catcode`\{=12 \catcode`\}=12 \catcode`\#=12
+  \catcode`\^=12 \catcode`\~=12 \catcode`\_=12
+  %catcode`\%=12 %% don^^e2^^80^^99t in Plain!
+  \catcode`\&=12 \catcode`\$=12
 }
+\def\mplibputtextbox#1{\vbox to 0pt{\vss\hbox to 0pt{\raise\dp#1\box#1\hss}}}
+\bgroup\expandafter\expandafter\expandafter\egroup
+\expandafter\ifx\csname ProvidesPackage\endcsname\relax
 \def\mplibcode{%
-  \bgroup %
-  \mplibsetupcatcodes %
+  \bgroup
+  \mplibsetupcatcodes
   \mplibdocode %
 }
 \long\def\mplibdocode#1\endmplibcode{%
-  \egroup %
-  \mplibprocess{#1}%
-}
-\long\def\mplibprocess#1{%
-  \directlua{luamplib.process("\luatexluaescapestring{#1}")}%
+  \egroup
+  \directlua{
+    luamplib.settexboxes([===[\unexpanded{#1}]===])
+  }%
+  \directlua{
+    local data = luamplib.gettexboxes([===[\unexpanded{#1}]===])
+    luamplib.process(data)
+  }%
 }
 \else
 \begingroup
@@ -69,24 +75,28 @@
   \def^^I{\string^^I}%
 }
 \endgroup
-\newcommand\mplibaddlines[1]{%
-  \begingroup %
-  \FV@hack %
-  \def\FV@ProcessLine##1{%
-    \directlua{luamplib.addline("\luatexluaescapestring{##1}")}%
-  }%
-  \csname FV@SV@#1\endcsname %
-  \endgroup %
+\newenvironment{mplibcode}{\toks@{}\ltxdomplibcode}{}
+\def\ltxdomplibcode{%
+  \bgroup
+  \mplibsetupcatcodes
+  \ltxdomplibcodeindeed %
 }
-\newenvironment{mplibcode}{%
-  \VerbatimEnvironment %
-  \begin{SaveVerbatim}{memoire}%
-}{%
-  \end{SaveVerbatim}%
-  \mplibaddlines{memoire}%
-  \directlua{luamplib.processlines()}%
+\long\def\ltxdomplibcodeindeed#1\end{%
+  \egroup
+  \toks@\expandafter{\the\toks@#1}\ltxdomplibcodefinally%
+}%
+\def\ltxdomplibcodefinally#1{%
+  \ifnum\pdf@strcmp{#1}{mplibcode}=\z@
+    \directlua{luamplib.settexboxes([===[\the\toks@]===])}%
+    \directlua{
+      local data = luamplib.gettexboxes([===[\the\toks@]===])
+      luamplib.process(data)
+    }%
+    \end{mplibcode}%
+  \else
+    \toks@\expandafter{\the\toks@\end{#1}}\expandafter\ltxdomplibcode
+ \fi%
 }
-
 \fi
 \ifx\mplibscratchbox\undefined \newbox\mplibscratchbox \fi
 \def\mplibstarttoPDF#1#2#3#4{%