diff options
author | Karl Berry <karl@freefriends.org> | 2013-05-18 22:10:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-05-18 22:10:13 +0000 |
commit | 0ee744b73c1c0e6ead0d311c9ceeaa96c0a3ee7b (patch) | |
tree | 022d1e6a511f9b6fe864228ab4d1f164cbc1cc60 /Master/texmf-dist/source/luatex | |
parent | 83a088d792eae526aebb1961564db25fc6902ed1 (diff) |
lualibs (18may13)
git-svn-id: svn://tug.org/texlive/trunk@30555 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/luatex')
-rw-r--r-- | Master/texmf-dist/source/luatex/lualibs/Makefile | 3 | ||||
-rw-r--r-- | Master/texmf-dist/source/luatex/lualibs/lualibs.dtx | 24 | ||||
-rw-r--r-- | Master/texmf-dist/source/luatex/lualibs/test-lualibs.lua | 2 |
3 files changed, 11 insertions, 18 deletions
diff --git a/Master/texmf-dist/source/luatex/lualibs/Makefile b/Master/texmf-dist/source/luatex/lualibs/Makefile index 4a08cf0b716..453d6cc45ad 100644 --- a/Master/texmf-dist/source/luatex/lualibs/Makefile +++ b/Master/texmf-dist/source/luatex/lualibs/Makefile @@ -3,7 +3,8 @@ NAME = lualibs DTX = $(wildcard *.dtx) DOC_DTX = $(patsubst %.dtx, %.pdf, $(DTX)) -MODULES = $(wildcard lualibs-*.lua) +LUALIBS = $(wildcard lualibs-*.lua) +MODULES = $(filter-out $(UNPACKED),$(LUALIBS)) # Files grouped by generation mode TESTSCRIPT = test-lualibs.lua diff --git a/Master/texmf-dist/source/luatex/lualibs/lualibs.dtx b/Master/texmf-dist/source/luatex/lualibs/lualibs.dtx index b8c74c01373..f2edf918fdf 100644 --- a/Master/texmf-dist/source/luatex/lualibs/lualibs.dtx +++ b/Master/texmf-dist/source/luatex/lualibs/lualibs.dtx @@ -33,7 +33,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: lualibs 2013/05/04 v2.00 Lua additional functions.} +\Msg{* Package: lualibs 2013/05/18 v2.00 Lua additional functions.} \Msg{************************************************************************} \keepsilent @@ -100,7 +100,7 @@ and the derived file lualibs.lua. %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{lualibs.drv} - [2013/05/04 v2.00 Lua Libraries.] + [2013/05/18 v2.00 Lua Libraries.] \documentclass{ltxdoc} \usepackage{fancyvrb,xspace} \usepackage[x11names]{xcolor} @@ -201,7 +201,7 @@ and the derived file lualibs.lua. % \GetFileInfo{lualibs.drv} % % \title{The \identifier{lualibs} package} -% \date{2013/05/04 v2.00} +% \date{2013/05/18 v2.00} % \author{Élie Roux · \email{elie.roux@telecom-bretagne.eu}\\ % Philipp Gesang · \email{philipp.gesang@alumni.uni-heidelberg.de}} % @@ -403,12 +403,6 @@ and the derived file lualibs.lua. % ... % \end{verbatim}\end{quote} % -% Note that there is one exception to the packaging: -% \fileent{lualibs-util-jsn.lua} cannot be successfully packaged because -% it follows a different coding convention, returning a \LUA table on exit. -% Therefore, the file is loaded separately as part of the \identifier{extended} -% set like any other \LUA module. -% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % \part{\fileent{lualibs.lua}} @@ -423,7 +417,7 @@ lualibs = lualibs or { } lualibs.module_info = { name = "lualibs", version = 2.00, - date = "2013/04/30", + date = "2013/05/18", description = "ConTeXt Lua standard libraries.", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux & Philipp Gesang", copyright = "PRAGMA ADE / ConTeXt Development Team", @@ -539,7 +533,7 @@ end --- This restores the default of loading everything should a package --- have requested otherwise. Will be gone once there is a canonical --- interface for parameterized loading of libraries. -lualibs.load_extended = true +config.lualibs.load_extended = true -- vim:tw=71:sw=2:ts=2:expandtab @@ -564,7 +558,7 @@ local loadmodule = lualibs.loadmodule local lualibs_basic_module = { name = "lualibs-basic", version = 2.00, - date = "2013/04/30", + date = "2013/05/18", description = "ConTeXt Lua libraries -- basic collection.", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux & Philipp Gesang", copyright = "PRAGMA ADE / ConTeXt Development Team", @@ -645,7 +639,7 @@ lualibs = lualibs or { } local lualibs_extended_module = { name = "lualibs-extended", version = 2.00, - date = "2013/04/30", + date = "2013/05/18", description = "ConTeXt Lua libraries -- extended collection.", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux & Philipp Gesang", copyright = "PRAGMA ADE / ConTeXt Development Team", @@ -780,7 +774,7 @@ if loaded == false then loadmodule("lualibs-util-prs.lua")--- miscellaneous parsers; cool. cool cool cool ----------("lualibs-util-fmt.lua")---!column formatter (rarely used) loadmodule("lualibs-util-dim.lua")--- conversions between dimensions - ----------("lualibs-util-jsn.lua")--- JSON parser + loadmodule("lualibs-util-jsn.lua")--- JSON parser ----------("lualibs-trac-set.lua")---!generalization of trackers ----------("lualibs-trac-log.lua")---!logging @@ -796,8 +790,6 @@ if loaded == false then ----------("lualibs-core-con.lua")--- end -loadmodule"lualibs-util-jsn.lua"--- cannot be merged because of return statement - unfake_context() --- TODO check if this works at runtime lualibs.extended_loaded = true diff --git a/Master/texmf-dist/source/luatex/lualibs/test-lualibs.lua b/Master/texmf-dist/source/luatex/lualibs/test-lualibs.lua index b74fde16f94..55cecfb0b0b 100644 --- a/Master/texmf-dist/source/luatex/lualibs/test-lualibs.lua +++ b/Master/texmf-dist/source/luatex/lualibs/test-lualibs.lua @@ -15,7 +15,7 @@ local luafiles = { "lualibs-util-jsn.lua", "lualibs-util-lua.lua", "lualibs-util-prs.lua", "lualibs-util-sta.lua", "lualibs-util-sto.lua", "lualibs-util-str.lua", - "lualibs-util-tab.lua", "lualibs-util-fmt.lua", + "lualibs-util-tab.lua", "lualibs-util-tpl.lua", "lualibs.lua", "lualibs-basic.lua", "lualibs-basic-merged.lua", "lualibs-extended.lua", "lualibs-extended-merged.lua", |