From c6d3c3e07039be32f92e2f5c7fc23e41add48e32 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 12 May 2013 22:38:33 +0000 Subject: luatexbase (12may13) git-svn-id: svn://tug.org/texlive/trunk@30424 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/luatex/luatexbase/attr.lua | 21 +++++++++------------ Master/texmf-dist/tex/luatex/luatexbase/cctb.lua | 9 +++++++++ .../tex/luatex/luatexbase/luatexbase-attr.sty | 16 +++++----------- .../tex/luatex/luatexbase/luatexbase-cctb.sty | 6 +++--- .../tex/luatex/luatexbase/luatexbase-loader.sty | 2 +- .../tex/luatex/luatexbase/luatexbase-mcb.sty | 2 +- .../tex/luatex/luatexbase/luatexbase-modutils.sty | 2 +- .../texmf-dist/tex/luatex/luatexbase/luatexbase.sty | 6 +++--- Master/texmf-dist/tex/luatex/luatexbase/mcb.lua | 4 ++-- .../texmf-dist/tex/luatex/luatexbase/modutils.lua | 6 ++++++ 10 files changed, 40 insertions(+), 34 deletions(-) (limited to 'Master/texmf-dist/tex/luatex') diff --git a/Master/texmf-dist/tex/luatex/luatexbase/attr.lua b/Master/texmf-dist/tex/luatex/luatexbase/attr.lua index 3f66fd78e9d..d089c8b0865 100644 --- a/Master/texmf-dist/tex/luatex/luatexbase/attr.lua +++ b/Master/texmf-dist/tex/luatex/luatexbase/attr.lua @@ -24,18 +24,15 @@ local user_defined_t = nodesubtype"user_defined" local unassociated = "__unassociated" luatexbase = luatexbase or { } local luatexbase = luatexbase -local reporter = function (log, category, ...) - if log == true then - texiowrite_nl("log", "("..category..") ") - texiowrite("log", stringformat(...)) - else - texiowrite_nl("("..category..") ") - texiowrite(stringformat(...)) - end -end -local warning = function (...) reporter (false, "warning", ...) end ------ info = function (...) reporter (false, "info", ...) end -local log = function (...) reporter (true, "log", ...) end +local err, warning, info, log = luatexbase.provides_module({ + name = "luatexbase-attr", + version = 0.6, + date = "2013/05/11", + description = "Attributes allocation for LuaTeX", + author = "Elie Roux, Manuel Pegourie-Gonnard and Philipp Gesang", + copyright = "Elie Roux, Manuel Pegourie-Gonnard and Philipp Gesang", + license = "CC0", +}) luatexbase.attributes = luatexbase.attributes or { } local attributes = luatexbase.attributes local new_attribute diff --git a/Master/texmf-dist/tex/luatex/luatexbase/cctb.lua b/Master/texmf-dist/tex/luatex/luatexbase/cctb.lua index 48010a6b5b6..86b7297a440 100644 --- a/Master/texmf-dist/tex/luatex/luatexbase/cctb.lua +++ b/Master/texmf-dist/tex/luatex/luatexbase/cctb.lua @@ -10,6 +10,15 @@ -- luatexbase = luatexbase or { } local luatexbase = luatexbase +luatexbase.provides_module({ + name = "luatexbase-cctb", + version = 0.6, + date = "2013/05/11", + description = "Catcodetable allocation for LuaTeX", + author = "Heiko Oberdiek, Elie Roux and Manuel Pegourie-Gonnard", + copyright = "Heiko Oberdiek, Elie Roux and Manuel Pegourie-Gonnard", + license = "CC0", +}) luatexbase.catcodetables = luatexbase.catcodetables or { } local catcodetables = luatexbase.catcodetables local function catcodetabledef_from_tex(name, number) diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty index 24153a73f52..be0e86947cd 100644 --- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty +++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty @@ -54,7 +54,7 @@ \let\x\ProvidesPackage \fi \expandafter\endgroup -\x{luatexbase-attr}[2011/05/24 v0.4 Attributes allocation for LuaTeX] +\x{luatexbase-attr}[2013/05/11 v0.6 Attributes allocation for LuaTeX] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \input ifluatex.sty @@ -78,21 +78,15 @@ \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax - \input luatexbase-compat.sty + \input luatexbase-modutils.sty + \input luatex.sty \else - \RequirePackage{luatexbase-compat} + \RequirePackage{luatexbase-modutils} + \RequirePackage{luatex} \fi \luatexbase@ensure@primitive{luaescapestring} \luatexbase@ensure@primitive{attributedef} \luatexbase@ensure@primitive{attribute} -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname RequirePackage\endcsname\relax - \input luatexbase-loader.sty - \input luatex.sty -\else - \RequirePackage{luatexbase-loader} - \RequirePackage{luatex} -\fi \luatexbase@directlua{require('luatexbase.attr')} \def\newluatexattribute#1{% \begingroup\escapechar\m@ne \expandafter\expandafter\expandafter diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-cctb.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-cctb.sty index 74a8e27e0a0..69c45b25466 100644 --- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-cctb.sty +++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-cctb.sty @@ -53,7 +53,7 @@ \let\x\ProvidesPackage \fi \expandafter\endgroup -\x{luatexbase-cctb}[2011/05/24 v0.4 Catcodetable allocation for LuaTeX] +\x{luatexbase-cctb}[2013/05/11 v0.6 Catcodetable allocation for LuaTeX] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \input ifluatex.sty @@ -77,9 +77,9 @@ \fi \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax - \input luatexbase-loader.sty + \input luatexbase-modutils.sty \else - \RequirePackage{luatexbase-loader} + \RequirePackage{luatexbase-modutils} \fi \luatexbase@directlua{require('luatexbase.cctb')} \luatexbase@ensure@primitive{luaescapestring} diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-loader.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-loader.sty index ca165aa32a7..7279cf073a3 100644 --- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-loader.sty +++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-loader.sty @@ -52,7 +52,7 @@ \let\x\ProvidesPackage \fi \expandafter\endgroup -\x{luatexbase-loader}[2013/04/13 v0.5 Lua module loader for LuaTeX] +\x{luatexbase-loader}[2013/05/11 v0.6 Lua module loader for LuaTeX] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \input ifluatex.sty diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-mcb.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-mcb.sty index 36bcc79c7ca..d2291653992 100644 --- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-mcb.sty +++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-mcb.sty @@ -49,7 +49,7 @@ \let\x\ProvidesPackage \fi \expandafter\endgroup -\x{luatexbase-mcb}[2013/04/13 v0.5 Callback management for LuaTeX] +\x{luatexbase-mcb}[2013/05/11 v0.6 Callback management for LuaTeX] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \input ifluatex.sty diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-modutils.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-modutils.sty index d2a9eafee1c..7579f464a45 100644 --- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-modutils.sty +++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-modutils.sty @@ -52,7 +52,7 @@ \let\x\ProvidesPackage \fi \expandafter\endgroup -\x{luatexbase-modutils}[2013/04/13 v0.5 Module utilities for LuaTeX] +\x{luatexbase-modutils}[2013/05/11 v0.6 Module utilities for LuaTeX] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \input ifluatex.sty diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty index e03fdafc49a..6355abad35f 100644 --- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty +++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty @@ -49,7 +49,7 @@ \let\x\ProvidesPackage \fi \expandafter\endgroup -\x{luatexbase}[2013/05/04 v0.6 Module utilities for LuaTeX] +\x{luatexbase}[2013/05/11 v0.6 Resource management for the LuaTeX macro programmer] \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \input ifluatex.sty @@ -79,20 +79,20 @@ \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \input luatexbase-compat.sty + \input luatexbase-modutils.sty \input luatexbase-loader.sty \input luatexbase-regs.sty \input luatexbase-attr.sty \input luatexbase-cctb.sty \input luatexbase-mcb.sty - \input luatexbase-modutils.sty \else \RequirePackage{luatexbase-compat} + \RequirePackage{luatexbase-modutils} \RequirePackage{luatexbase-loader} \RequirePackage{luatexbase-regs} \RequirePackage{luatexbase-attr} \RequirePackage{luatexbase-cctb} \RequirePackage{luatexbase-mcb} - \RequirePackage{luatexbase-modutils} \fi \luatexbase@sty@endinput% \endinput diff --git a/Master/texmf-dist/tex/luatex/luatexbase/mcb.lua b/Master/texmf-dist/tex/luatex/luatexbase/mcb.lua index e1c7ac80c3c..ae9e8a78523 100644 --- a/Master/texmf-dist/tex/luatex/luatexbase/mcb.lua +++ b/Master/texmf-dist/tex/luatex/luatexbase/mcb.lua @@ -12,8 +12,8 @@ luatexbase = luatexbase or { } local luatexbase = luatexbase local err, warning, info, log = luatexbase.provides_module({ name = "luatexbase-mcb", - version = 0.5, - date = "2013/04/13", + version = 0.6, + date = "2013/05/11", description = "register several functions in a callback", author = "Hans Hagen, Elie Roux, Manuel Pegourie-Gonnard and Philipp Gesang", copyright = "Hans Hagen, Elie Roux, Manuel Pegourie-Gonnard and Philipp Gesang", diff --git a/Master/texmf-dist/tex/luatex/luatexbase/modutils.lua b/Master/texmf-dist/tex/luatex/luatexbase/modutils.lua index 1df34a4edba..1c5b5ca1488 100644 --- a/Master/texmf-dist/tex/luatex/luatexbase/modutils.lua +++ b/Master/texmf-dist/tex/luatex/luatexbase/modutils.lua @@ -140,5 +140,11 @@ function is_module_loaded(name) end end luatexbase.is_module_loaded = is_module_loaded +provides_module({ + name = 'luatexbase-modutils', + date = '2013/05/11', + version = 0.6, + description = 'Module utilities for LuaTeX', +}) -- -- End of File `modutils.lua'. -- cgit v1.2.3