summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-05-14 18:32:51 +0000
committerKarl Berry <karl@freefriends.org>2010-05-14 18:32:51 +0000
commit37056aa438ffe6895f43f303d6de45bdafefdccd (patch)
tree9af7cb5ca6f5ed3bcf8792c435330808456373d5
parent1d462235e9301d809d6f8b600e52e43481d77fa4 (diff)
luamplib update (13may10)
git-svn-id: svn://tug.org/texlive/trunk@18255 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/luatex/luamplib/NEWS5
-rw-r--r--Master/texmf-dist/doc/luatex/luamplib/README2
-rw-r--r--Master/texmf-dist/doc/luatex/luamplib/luamplib.pdfbin179149 -> 179015 bytes
-rw-r--r--Master/texmf-dist/source/luatex/luamplib/Makefile4
-rw-r--r--Master/texmf-dist/source/luatex/luamplib/luamplib.dtx50
-rw-r--r--Master/texmf-dist/tex/luatex/luamplib/luamplib-createmem.lua2
-rw-r--r--Master/texmf-dist/tex/luatex/luamplib/luamplib.lua20
-rw-r--r--Master/texmf-dist/tex/luatex/luamplib/luamplib.sty14
8 files changed, 51 insertions, 46 deletions
diff --git a/Master/texmf-dist/doc/luatex/luamplib/NEWS b/Master/texmf-dist/doc/luatex/luamplib/NEWS
new file mode 100644
index 00000000000..bbaed5dccff
--- /dev/null
+++ b/Master/texmf-dist/doc/luatex/luamplib/NEWS
@@ -0,0 +1,5 @@
+ History of the luamplib package
+
+2010/05/10, luamplib v1.03:
+ * adaptation to the new luatexbase package
+
diff --git a/Master/texmf-dist/doc/luatex/luamplib/README b/Master/texmf-dist/doc/luatex/luamplib/README
index 685463b080a..c698798ae43 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 developped on <http://github.com/mpg/luamplib>.
+This package is developed on <http://github.com/mpg/luamplib>.
Installation
diff --git a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
index 96dcf478b59..0f8633114bd 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 fa7a67c1c79..3d5e9cd0d49 100644
--- a/Master/texmf-dist/source/luatex/luamplib/Makefile
+++ b/Master/texmf-dist/source/luatex/luamplib/Makefile
@@ -7,12 +7,12 @@ DTX = $(NAME).dtx
# Files grouped by generation mode
COMPILED = $(DOC)
UNPACKED = luamplib-createmem.lua luamplib.lua luamplib.sty
-SOURCE = $(DTX) README Makefile
+SOURCE = $(DTX) README Makefile NEWS
GENERATED = $(COMPILED) $(UNPACKED)
# Files grouped by installation location
RUNFILES = $(UNPACKED)
-DOCFILES = $(DOC) README
+DOCFILES = $(DOC) README NEWS
SRCFILES = $(DTX) Makefile
# The following definitions should be equivalent
diff --git a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
index 9bdf455b428..d61b7966a98 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 2009/10/06 v1.02 metapost package for LuaTeX.}
+\Msg{* Package: luamplib 2010/05/10 v1.02 metapost package for LuaTeX.}
\Msg{************************************************************************}
\keepsilent
@@ -106,7 +106,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{luamplib.drv}%
- [2009/10/06 v1.02 mplib package for LuaTeX.]%
+ [2010/05/10 v1.03 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{2009/10/06 v1.02}
+% \date{2010/05/10 v1.03}
% \author{Hans Hagen, Taco Hoekwater and Elie Roux \\
% \texttt{elie.roux@telecom-bretagne.eu}}
%
@@ -164,7 +164,7 @@ and the derived files
% \begin{itemize}
% \item a \LaTeX\ environment
% \item all \TeX\ macros start by \texttt{mplib}
-% \item use of the luatextra printing and module functions
+% \item use of the luatexbase printing and module functions
% \item adapted warning, error and log messages
% \end{itemize}
%
@@ -210,19 +210,19 @@ and the derived files
%
% \begin{macrocode}
-luamplib = { }
+module('luamplib', package.seeall)
luamplib.module = {
name = "luamplib",
- version = 1.02,
- date = "2009/10/06",
+ version = 1.03,
+ date = "2010/05/10",
description = "Lua package to typeset Metapost with LuaTeX's MPLib.",
author = "Hans Hagen, Taco Hoekwater & Elie Roux",
copyright = "ConTeXt Development Team & Elie Roux",
license = "CC0",
}
-luatextra.provides_module(luamplib.module)
+luatexbase.provides_module(luamplib.module)
% \end{macrocode}
% This module is a stripped down version of libraries that are used by
@@ -240,7 +240,7 @@ local format, concat, abs = string.format, table.concat, math.abs
% \begin{macrocode}
luamplib.currentformat = "plain"
-luamplib.currentmem = "mplib-luatex"
+luamplib.currentmem = "mpost"
local currentformat = luamplib.currentformat
local currentmem = luamplib.currentmem
@@ -276,23 +276,23 @@ function luamplib.finder(name, mode, ftype)
end
function luamplib.info (...)
- luatextra.module_info('luamplib', format(...))
+ luatexbase.module_info('luamplib', format(...))
end
function luamplib.log (...)
- luatextra.module_log('luamplib', format(...))
+ luatexbase.module_log('luamplib', format(...))
end
function luamplib.term (...)
- luatextra.module_term('luamplib', format(...))
+ luatexbase.module_term('luamplib', format(...))
end
function luamplib.warning (...)
- luatextra.module_warning('luamplib', format(...))
+ luatexbase.module_warning('luamplib', format(...))
end
function luamplib.error (...)
- luatextra.module_error('luamplib', format(...))
+ luatexbase.module_error('luamplib', format(...))
end
% \end{macrocode}
@@ -727,12 +727,12 @@ end
% \begin{macrocode}
\expandafter\ifx\csname ProvidesPackage\endcsname\relax
- \input luatextra.sty
+ \input luatexbase-modutils.sty
\else
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luamplib}
- [2009/10/06 v1.02 mplib package for LuaTeX.]
- \RequirePackage{luatextra}
+ [2010/05/10 v1.03 mplib package for LuaTeX.]
+ \RequirePackage{luatexbase-modutils}
\RequirePackage{fancyvrb}
\fi
@@ -748,16 +748,16 @@ end
%
% There are (basically) two formats for metapost: \emph{plain} and
% \emph{mpfun}. The corresponding \texttt{.mem} files are (at least will
-% be) \texttt{mplib-luatex.mem} in \TeX Live (starting from 2009).
+% be) \texttt{luatex-plain.mem} and \texttt{luatex-mpfun.mem} in \TeX Live.
% 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}.
%
% \begin{macrocode}
-\def\mplibsetformat#1{\directlua0{luamplib.setformat([[#1]])}}
+\def\mplibsetformat#1{\directlua{luamplib.setformat([[#1]])}}
-\def\mplibsetmemfile#1{\directlua0{luamplib.setmemfile([[#1]])}}
+\def\mplibsetmemfile#1{\directlua{luamplib.setmemfile([[#1]])}}
% \end{macrocode}
%
@@ -806,7 +806,7 @@ end
}
\long\def\mplibprocess#1{%
- \luadirect{luamplib.process([[#1]])}%
+ \directlua{luamplib.process([[#1]])}%
}
\else
@@ -834,7 +834,7 @@ end
\begingroup %
\FV@hack %
\def\FV@ProcessLine##1{%
- \luadirect{luamplib.addline([[##1]])}%
+ \directlua{luamplib.addline([[##1]])}%
}%
\csname FV@SV@#1\endcsname %
\endgroup %
@@ -934,7 +934,7 @@ end
% \subsection{\texttt{luamplib-createmem.lua}}
%
% Finally a small standalone file to call with \texttt{texlua} that
-% generates \texttt{mplib-luatex.mem} in the current directory. To generate
+% generates \texttt{luatex-plain.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 +975,7 @@ makeformat = function (name, mem_name)
end
end
-makeformat("plain", "mplib-luatex.mem")
+makeformat("plain", "luatex-plain.mem")
% \end{macrocode}
% \end{macro}
@@ -983,4 +983,4 @@ makeformat("plain", "mplib-luatex.mem")
%</gen-lua>
% \fi
% \Finale
-\endinput \ No newline at end of file
+\endinput
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib-createmem.lua b/Master/texmf-dist/tex/luatex/luamplib/luamplib-createmem.lua
index 4881dcd33a2..7d3d611110c 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", "mplib-luatex.mem")
+makeformat("plain", "luatex-plain.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 84c583ffd61..588ad9ab5ca 100644
--- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
+++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
@@ -19,26 +19,26 @@
-- luamplib.sty, luamplib.lua, luamplib-createmem.lua and luamplib.pdf.
--
-luamplib = { }
+module('luamplib', package.seeall)
luamplib.module = {
name = "luamplib",
- version = 1.02,
- date = "2009/10/06",
+ version = 1.03,
+ date = "2010/05/10",
description = "Lua package to typeset Metapost with LuaTeX's MPLib.",
author = "Hans Hagen, Taco Hoekwater & Elie Roux",
copyright = "ConTeXt Development Team & Elie Roux",
license = "CC0",
}
-luatextra.provides_module(luamplib.module)
+luatexbase.provides_module(luamplib.module)
local format, concat, abs = string.format, table.concat, math.abs
luamplib.currentformat = "plain"
-luamplib.currentmem = "mplib-luatex"
+luamplib.currentmem = "mpost"
local currentformat = luamplib.currentformat
local currentmem = luamplib.currentmem
@@ -67,23 +67,23 @@ function luamplib.finder(name, mode, ftype)
end
function luamplib.info (...)
- luatextra.module_info('luamplib', format(...))
+ luatexbase.module_info('luamplib', format(...))
end
function luamplib.log (...)
- luatextra.module_log('luamplib', format(...))
+ luatexbase.module_log('luamplib', format(...))
end
function luamplib.term (...)
- luatextra.module_term('luamplib', format(...))
+ luatexbase.module_term('luamplib', format(...))
end
function luamplib.warning (...)
- luatextra.module_warning('luamplib', format(...))
+ luatexbase.module_warning('luamplib', format(...))
end
function luamplib.error (...)
- luatextra.module_error('luamplib', format(...))
+ luatexbase.module_error('luamplib', format(...))
end
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
index dd60059bfbf..ce0a7cbf487 100644
--- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
+++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
@@ -20,12 +20,12 @@
%%
\expandafter\ifx\csname ProvidesPackage\endcsname\relax
- \input luatextra.sty
+ \input luatexbase-modutils.sty
\else
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luamplib}
- [2009/10/06 v1.02 mplib package for LuaTeX.]
- \RequirePackage{luatextra}
+ [2010/05/10 v1.03 mplib package for LuaTeX.]
+ \RequirePackage{luatexbase-modutils}
\RequirePackage{fancyvrb}
\fi
@@ -33,9 +33,9 @@
\luatexUseModule{luamplib}
-\def\mplibsetformat#1{\directlua0{luamplib.setformat([[#1]])}}
+\def\mplibsetformat#1{\directlua{luamplib.setformat([[#1]])}}
-\def\mplibsetmemfile#1{\directlua0{luamplib.setmemfile([[#1]])}}
+\def\mplibsetmemfile#1{\directlua{luamplib.setmemfile([[#1]])}}
\ifnum\pdfoutput>0
@@ -72,7 +72,7 @@
}
\long\def\mplibprocess#1{%
- \luadirect{luamplib.process([[#1]])}%
+ \directlua{luamplib.process([[#1]])}%
}
\else
@@ -93,7 +93,7 @@
\begingroup %
\FV@hack %
\def\FV@ProcessLine##1{%
- \luadirect{luamplib.addline([[##1]])}%
+ \directlua{luamplib.addline([[##1]])}%
}%
\csname FV@SV@#1\endcsname %
\endgroup %