summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex
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 /Master/texmf-dist/tex/luatex
parent1d462235e9301d809d6f8b600e52e43481d77fa4 (diff)
luamplib update (13may10)
git-svn-id: svn://tug.org/texlive/trunk@18255 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex')
-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
3 files changed, 18 insertions, 18 deletions
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 %