summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/luatex/luamplib/NEWS12
-rw-r--r--Master/texmf-dist/doc/luatex/luamplib/luamplib.pdfbin179093 -> 167686 bytes
-rw-r--r--Master/texmf-dist/source/luatex/luamplib/Makefile2
-rw-r--r--Master/texmf-dist/source/luatex/luamplib/luamplib.dtx26
-rw-r--r--Master/texmf-dist/tex/luatex/luamplib/luamplib-createmem.lua2
-rw-r--r--Master/texmf-dist/tex/luatex/luamplib/luamplib.lua10
-rw-r--r--Master/texmf-dist/tex/luatex/luamplib/luamplib.sty6
7 files changed, 33 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/luatex/luamplib/NEWS b/Master/texmf-dist/doc/luatex/luamplib/NEWS
index 91a23690f5e..a9f08e5ee6f 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/NEWS
+++ b/Master/texmf-dist/doc/luatex/luamplib/NEWS
@@ -1,11 +1,17 @@
- History of the luamplib package
+ History of the luamplib package
-2010/08/02, luamplib v1.04:
+2010/10/17 v1.06
+ * bugfix from Hans (bad function name)
+
+2010/10/10 v1.05
+ * adapt to luatexbase v0.3
+
+2010/08/02 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:
+2010/05/10 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 b331d307a41..5ae070a30fe 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
+++ b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/luatex/luamplib/Makefile b/Master/texmf-dist/source/luatex/luamplib/Makefile
index 3d5e9cd0d49..c1c7ceda970 100644
--- a/Master/texmf-dist/source/luatex/luamplib/Makefile
+++ b/Master/texmf-dist/source/luatex/luamplib/Makefile
@@ -80,7 +80,7 @@ manifest:
@for f in $(GENERATED); do echo $$f; done
clean:
- @$(RM) -- *.log *.aux *.toc *.idx *.ind *.ilg
+ @$(RM) -- *.log *.aux *.toc *.idx *.ind *.ilg *.out
mrproper: clean
@$(RM) -- $(GENERATED) $(ZIPS)
diff --git a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
index d9835b70375..ed2680ef509 100644
--- a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
+++ b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%
% Copyright (C) 2008-2009 by Hans Hagen, Taco Hoekwater and Elie Roux
-% <elie.roux@telecom-bretagne.eu>.
+% <elie.roux@telecom-bretagne.eu>. (Support: <lualatex-dev@tug.org>.)
%
% This work is under the CC0 license.
%
@@ -37,7 +37,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: luamplib 2010/08/02 v1.04 metapost package for LuaTeX.}
+\Msg{* Package: luamplib - metapost package for LuaTeX.}
\Msg{************************************************************************}
\keepsilent
@@ -49,7 +49,7 @@
This is a generated file.
Copyright (C) 2008-2009 by Hans Hagen, Taco Hoekwater and Elie Roux
-<elie.roux@telecom-bretagne.eu>.
+<elie.roux@telecom-bretagne.eu>. (Support: <lualatex-dev@tug.org>.)
This work is under the CC0 license.
@@ -106,8 +106,10 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{luamplib.drv}%
- [2010/08/02 v1.04 mplib package for LuaTeX.]%
+ [2010/10/17 v1.06 mplib package for LuaTeX]%
\documentclass{ltxdoc}
+\usepackage{hyperref}
+\newcommand*\email[1]{\href{mailto:#1}{#1}}
\begin{document}
\DocInput{luamplib.dtx}%
\end{document}
@@ -133,9 +135,9 @@ and the derived files
% Right brace \} Tilde \~}
%
% \title{The \textsf{luamplib} package}
-% \date{2010/08/02 v1.04}
+% \date{2010/10/17 v1.06}
% \author{Hans Hagen, Taco Hoekwater and Elie Roux \\
-% \texttt{elie.roux@telecom-bretagne.eu}}
+% Support: \email{lualatex-dev@tug.org}}
%
% \maketitle
%
@@ -214,8 +216,8 @@ module('luamplib', package.seeall)
luamplib.module = {
name = "luamplib",
- version = 1.04,
- date = "2010/08/02",
+ version = 1.06,
+ date = "2010/10/17",
description = "Lua package to typeset Metapost with LuaTeX's MPLib.",
author = "Hans Hagen, Taco Hoekwater & Elie Roux",
copyright = "ConTeXt Development Team & Elie Roux",
@@ -463,8 +465,8 @@ 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 luamplib.pen_info then
- local t = luamplib.pen_info(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
@@ -732,7 +734,7 @@ end
\else
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luamplib}
- [2010/08/02 v1.04 mplib package for LuaTeX.]
+ [2010/10/17 v1.06 mplib package for LuaTeX]
\RequirePackage{luatexbase-modutils}
\RequirePackage{fancyvrb}
\fi
@@ -741,7 +743,7 @@ end
% Loading of lua code.
% \begin{macrocode}
-\luatexUseModule{luamplib}
+\RequireLuaModule{luamplib}
% \end{macrocode}
%
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib-createmem.lua b/Master/texmf-dist/tex/luatex/luamplib/luamplib-createmem.lua
index 4881dcd33a2..4066758e9bd 100644
--- a/Master/texmf-dist/tex/luatex/luamplib/luamplib-createmem.lua
+++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib-createmem.lua
@@ -8,7 +8,7 @@
-- This is a generated file.
--
-- Copyright (C) 2008-2009 by Hans Hagen, Taco Hoekwater and Elie Roux
--- <elie.roux@telecom-bretagne.eu>.
+-- <elie.roux@telecom-bretagne.eu>. (Support: <lualatex-dev@tug.org>.)
--
-- This work is under the CC0 license.
--
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
index b92db79f429..2ff14676ff2 100644
--- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
+++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
@@ -8,7 +8,7 @@
-- This is a generated file.
--
-- Copyright (C) 2008-2009 by Hans Hagen, Taco Hoekwater and Elie Roux
--- <elie.roux@telecom-bretagne.eu>.
+-- <elie.roux@telecom-bretagne.eu>. (Support: <lualatex-dev@tug.org>.)
--
-- This work is under the CC0 license.
--
@@ -23,8 +23,8 @@ module('luamplib', package.seeall)
luamplib.module = {
name = "luamplib",
- version = 1.04,
- date = "2010/08/02",
+ version = 1.06,
+ date = "2010/10/17",
description = "Lua package to typeset Metapost with LuaTeX's MPLib.",
author = "Hans Hagen, Taco Hoekwater & Elie Roux",
copyright = "ConTeXt Development Team & Elie Roux",
@@ -214,8 +214,8 @@ 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 luamplib.pen_info then
- local t = luamplib.pen_info(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
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
index 5d450f8dbe5..acdf367c53f 100644
--- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
+++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
@@ -8,7 +8,7 @@
%% This is a generated file.
%%
%% Copyright (C) 2008-2009 by Hans Hagen, Taco Hoekwater and Elie Roux
-%% <elie.roux@telecom-bretagne.eu>.
+%% <elie.roux@telecom-bretagne.eu>. (Support: <lualatex-dev@tug.org>.)
%%
%% This work is under the CC0 license.
%%
@@ -25,13 +25,13 @@
\else
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luamplib}
- [2010/08/02 v1.04 mplib package for LuaTeX.]
+ [2010/10/17 v1.06 mplib package for LuaTeX]
\RequirePackage{luatexbase-modutils}
\RequirePackage{fancyvrb}
\fi
-\luatexUseModule{luamplib}
+\RequireLuaModule{luamplib}
\def\mplibsetformat#1{\directlua{luamplib.setformat([[#1]])}}