luamplib 1.04 (3aug10)

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

6 files changed, 28 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/luatex/luamplib/NEWS b/Master/texmf-dist/doc/luatex/luamplib/NEWS
index bbaed5dccff..91a23690f5e 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/NEWS
+++ b/Master/texmf-dist/doc/luatex/luamplib/NEWS
@@ -1,5 +1,11 @@
                         History of the luamplib package
 
+2010/08/02, luamplib v1.04:
+    * fixing a bug in LaTeX's detection (made Tikz fail)
+    * setting luamplib-luatex as the default name for the format, it's the case
+      in TeXLive 2010
+    * adding two test files in the git repository
+
 2010/05/10, luamplib v1.03:
     * adaptation to the new luatexbase package
 
diff --git a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
index 0f8633114bd..b331d307a41 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 d61b7966a98..d9835b70375 100644
--- a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
+++ b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
@@ -37,7 +37,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: luamplib 2010/05/10 v1.02 metapost package for LuaTeX.}
+\Msg{* Package: luamplib 2010/08/02 v1.04 metapost package for LuaTeX.}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -106,7 +106,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{luamplib.drv}%
-  [2010/05/10 v1.03 mplib package for LuaTeX.]%
+  [2010/08/02 v1.04 mplib package for LuaTeX.]%
 \documentclass{ltxdoc}
 \begin{document}
   \DocInput{luamplib.dtx}%
@@ -133,7 +133,7 @@ and the derived files
 %   Right brace   \}     Tilde         \~}
 %
 % \title{The \textsf{luamplib} package}
-% \date{2010/05/10 v1.03}
+% \date{2010/08/02 v1.04}
 % \author{Hans Hagen, Taco Hoekwater and Elie Roux \\
 % \texttt{elie.roux@telecom-bretagne.eu}}
 %
@@ -214,8 +214,8 @@ module('luamplib', package.seeall)
 
 luamplib.module = {
     name          = "luamplib",
-    version       =  1.03,
-    date          = "2010/05/10",
+    version       =  1.04,
+    date          = "2010/08/02",
     description   = "Lua package to typeset Metapost with LuaTeX's MPLib.",
     author        = "Hans Hagen, Taco Hoekwater & Elie Roux",
     copyright     = "ConTeXt Development Team & Elie Roux",
@@ -240,7 +240,7 @@ local format, concat, abs = string.format, table.concat, math.abs
 %    \begin{macrocode}
 
 luamplib.currentformat = "plain"
-luamplib.currentmem = "mpost"
+luamplib.currentmem = "mplib-luatex"
 
 local currentformat = luamplib.currentformat
 local currentmem = luamplib.currentmem
@@ -726,12 +726,13 @@ end
 %
 %    \begin{macrocode}
 
+\bgroup\expandafter\expandafter\expandafter\egroup
 \expandafter\ifx\csname ProvidesPackage\endcsname\relax
   \input luatexbase-modutils.sty
 \else
   \NeedsTeXFormat{LaTeX2e}
   \ProvidesPackage{luamplib}
-    [2010/05/10 v1.03 mplib package for LuaTeX.]
+    [2010/08/02 v1.04 mplib package for LuaTeX.]
   \RequirePackage{luatexbase-modutils}
   \RequirePackage{fancyvrb}
 \fi
@@ -747,8 +748,8 @@ end
 %
 %
 %    There are (basically) two formats for metapost: \emph{plain} and
-%    \emph{mpfun}. The corresponding \texttt{.mem} files are (at least will
-%    be) \texttt{luatex-plain.mem} and \texttt{luatex-mpfun.mem} in \TeX Live.
+%    \emph{mpfun}. The corresponding \texttt{.mem} files are 
+%    \texttt{mplib-luatex.mem} in \TeX Live 2010.
 %    With these functions you can set the format and the mem files that will
 %    be used by this package. Warning: the package never generates the mem
 %    files, you have to do it by hand, with \texttt{create-mem.lua}.
@@ -787,6 +788,7 @@ end
 %
 %    \begin{macrocode}
 
+\bgroup\expandafter\expandafter\expandafter\egroup
 \expandafter\ifx\csname ProvidesPackage\endcsname\relax
 
 \def\mplibsetupcatcodes{
@@ -852,7 +854,7 @@ end
 }{%
   \end{SaveVerbatim}%
   \mplibaddlines{memoire}%
-  \luadirect{luamplib.processlines()}%
+  \directlua{luamplib.processlines()}%
 }
 
 \fi
@@ -934,7 +936,7 @@ end
 % \subsection{\texttt{luamplib-createmem.lua}}
 %
 %    Finally a small standalone file to call with \texttt{texlua} that
-%    generates \texttt{luatex-plain.mem} in the current directory. To generate
+%    generates \texttt{mplib-luatex.mem} in the current directory. To generate
 %    other formats in other names, simply change the last line. After the
 %    \texttt{mem} generation, you'll have to install it in a directory
 %    searchable by \TeX .
@@ -975,7 +977,7 @@ makeformat = function (name, mem_name)
     end
 end
 
-makeformat("plain", "luatex-plain.mem")
+makeformat("plain", "mplib-luatex.mem")
 
 %    \end{macrocode}
 %    \end{macro}
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib-createmem.lua b/Master/texmf-dist/tex/luatex/luamplib/luamplib-createmem.lua
index 7d3d611110c..4881dcd33a2 100644
--- a/Master/texmf-dist/tex/luatex/luamplib/luamplib-createmem.lua
+++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib-createmem.lua
@@ -49,7 +49,7 @@ makeformat = function (name, mem_name)
     end
 end
 
-makeformat("plain", "luatex-plain.mem")
+makeformat("plain", "mplib-luatex.mem")
 
 -- 
 --  End of File `luamplib-createmem.lua'.
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
index 588ad9ab5ca..b92db79f429 100644
--- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
+++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
@@ -23,8 +23,8 @@ module('luamplib', package.seeall)
 
 luamplib.module = {
     name          = "luamplib",
-    version       =  1.03,
-    date          = "2010/05/10",
+    version       =  1.04,
+    date          = "2010/08/02",
     description   = "Lua package to typeset Metapost with LuaTeX's MPLib.",
     author        = "Hans Hagen, Taco Hoekwater & Elie Roux",
     copyright     = "ConTeXt Development Team & Elie Roux",
@@ -38,7 +38,7 @@ local format, concat, abs = string.format, table.concat, math.abs
 
 
 luamplib.currentformat = "plain"
-luamplib.currentmem = "mpost"
+luamplib.currentmem = "mplib-luatex"
 
 local currentformat = luamplib.currentformat
 local currentmem = luamplib.currentmem
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
index ce0a7cbf487..5d450f8dbe5 100644
--- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
+++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
@@ -19,12 +19,13 @@
 %%    luamplib.sty, luamplib.lua, luamplib-createmem.lua and luamplib.pdf.
 %% 
 
+\bgroup\expandafter\expandafter\expandafter\egroup
 \expandafter\ifx\csname ProvidesPackage\endcsname\relax
   \input luatexbase-modutils.sty
 \else
   \NeedsTeXFormat{LaTeX2e}
   \ProvidesPackage{luamplib}
-    [2010/05/10 v1.03 mplib package for LuaTeX.]
+    [2010/08/02 v1.04 mplib package for LuaTeX.]
   \RequirePackage{luatexbase-modutils}
   \RequirePackage{fancyvrb}
 \fi
@@ -53,6 +54,7 @@
 \fi
 
 
+\bgroup\expandafter\expandafter\expandafter\egroup
 \expandafter\ifx\csname ProvidesPackage\endcsname\relax
 
 \def\mplibsetupcatcodes{
@@ -108,7 +110,7 @@
 }{%
   \end{SaveVerbatim}%
   \mplibaddlines{memoire}%
-  \luadirect{luamplib.processlines()}%
+  \directlua{luamplib.processlines()}%
 }
 
 \fi