diff options
Diffstat (limited to 'Master/texmf-dist/source')
4 files changed, 35 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/luatex/lualibs/Makefile b/Master/texmf-dist/source/luatex/lualibs/Makefile index 556e56f1399..a50c63d48b8 100644 --- a/Master/texmf-dist/source/luatex/lualibs/Makefile +++ b/Master/texmf-dist/source/luatex/lualibs/Makefile @@ -70,7 +70,10 @@ $(UNPACKED): lualibs.dtx $(DO_TEX) define make-ctandir -@rm -r $(DISTDIR) +@if [ -d $(DISTDIR) ] ; \ + then \ + rm -r $(DISTDIR) ; \ + fi @mkdir $(DISTDIR) && cp $(ALL_FILES) $(DISTDIR) endef @@ -112,5 +115,6 @@ clean: mrproper: clean @$(RM) -- $(GENERATED) $(ZIPS) + @$(RM) -r $(DISTDIR) merge: $(MERGED) diff --git a/Master/texmf-dist/source/luatex/lualibs/lualibs.dtx b/Master/texmf-dist/source/luatex/lualibs/lualibs.dtx index 629856432a0..43e567a8bfb 100644 --- a/Master/texmf-dist/source/luatex/lualibs/lualibs.dtx +++ b/Master/texmf-dist/source/luatex/lualibs/lualibs.dtx @@ -34,7 +34,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: lualibs 2013/07/23 v2.0c Lua additional functions.} +\Msg{* Package: lualibs 2013/11/03 v2.1 Lua additional functions.} \Msg{************************************************************************} \keepsilent @@ -101,7 +101,7 @@ and the derived file lualibs.lua. %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{lualibs.drv} - [2013/07/23 v2.0c Lua Libraries.] + [2013/11/03 v2.1 Lua Libraries.] \documentclass{ltxdoc} \usepackage{fancyvrb,xspace} \usepackage[x11names]{xcolor} @@ -202,7 +202,7 @@ and the derived file lualibs.lua. % \GetFileInfo{lualibs.drv} % % \title{The \identifier{lualibs} package} -% \date{2013/07/23 v2.0c} +% \date{2013/11/03 v2.1} % \author{Élie Roux · \email{elie.roux@telecom-bretagne.eu}\\ % Philipp Gesang · \email{philipp.gesang@alumni.uni-heidelberg.de}} % @@ -315,6 +315,7 @@ and the derived file lualibs.lua. % lualibs-io.lua & l-io.lua & reading and writing files \\ % lualibs-os.lua & l-os.lua & platform specific code \\ % lualibs-file.lua & l-file.lua & filesystem operations \\ +% lualibs-gzip.lua & l-gzip.lua & wrapper for \identifier{lgzip} \\ % lualibs-md5.lua & l-md5.lua & checksum functions \\ % lualibs-dir.lua & l-dir.lua & directory handling \\ % lualibs-unicode.lua & l-unicode.lua & utf and unicode \\ @@ -417,8 +418,8 @@ lualibs = lualibs or { } lualibs.module_info = { name = "lualibs", - version = 2.00, - date = "2013/07/23", + version = 2.10, + date = "2013/11/03", description = "ConTeXt Lua standard libraries.", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux & Philipp Gesang", copyright = "PRAGMA ADE / ConTeXt Development Team", @@ -445,9 +446,23 @@ lualibs.module_info = { config = config or { } config.lualibs = config.lualibs or { } -lualibs.prefer_merged = config.lualibs.prefer_merged or true -lualibs.load_extended = config.lualibs.load_extended or true -config.lualibs.verbose = config.lualibs.verbose or false +if config.lualibs.prefer_merged ~= nil then + lualibs.prefer_merged = config.lualibs.prefer_merged +else + lualibs.prefer_merged = true +end + +if config.lualibs.load_extended ~= nil then + lualibs.load_extended = config.lualibs.load_extended +else + lualibs.load_extended = true +end + +if config.lualibs.verbose ~= nil then + config.lualibs.verbose = config.lualibs.verbose +else + config.lualibs.verbose = false +end % \end{macrocode} % The lualibs may be loaded in scripts. @@ -558,8 +573,8 @@ local loadmodule = lualibs.loadmodule local lualibs_basic_module = { name = "lualibs-basic", - version = 2.00, - date = "2013/07/23", + version = 2.10, + date = "2013/11/03", description = "ConTeXt Lua libraries -- basic collection.", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux & Philipp Gesang", copyright = "PRAGMA ADE / ConTeXt Development Team", @@ -597,6 +612,7 @@ if loaded == false then loadmodule("lualibs-io.lua") loadmodule("lualibs-os.lua") loadmodule("lualibs-file.lua") + loadmodule("lualibs-gzip.lua") loadmodule("lualibs-md5.lua") loadmodule("lualibs-dir.lua") loadmodule("lualibs-unicode.lua") @@ -639,8 +655,8 @@ lualibs = lualibs or { } local lualibs_extended_module = { name = "lualibs-extended", - version = 2.00, - date = "2013/07/23", + version = 2.10, + date = "2013/11/03", description = "ConTeXt Lua libraries -- extended collection.", author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux & Philipp Gesang", copyright = "PRAGMA ADE / ConTeXt Development Team", diff --git a/Master/texmf-dist/source/luatex/lualibs/test-lualibs.lua b/Master/texmf-dist/source/luatex/lualibs/test-lualibs.lua index 55cecfb0b0b..c592c6e58a9 100644 --- a/Master/texmf-dist/source/luatex/lualibs/test-lualibs.lua +++ b/Master/texmf-dist/source/luatex/lualibs/test-lualibs.lua @@ -3,6 +3,7 @@ local luafiles = { "lualibs-boolean.lua", "lualibs-compat.lua", "lualibs-dir.lua", "lualibs-file.lua", + "lualibs-gzip.lua", "lualibs-function.lua", "lualibs-io.lua", "lualibs-lpeg.lua", "lualibs-lua.lua", "lualibs-math.lua", "lualibs-md5.lua", diff --git a/Master/texmf-dist/source/luatex/lualibs/whatsnew.lua b/Master/texmf-dist/source/luatex/lualibs/whatsnew.lua index 30cf83782eb..0c0ca9bd44d 100644 --- a/Master/texmf-dist/source/luatex/lualibs/whatsnew.lua +++ b/Master/texmf-dist/source/luatex/lualibs/whatsnew.lua @@ -46,6 +46,7 @@ local filenames = { "dir", "file", "function", + "gzip", "io", "lpeg", "lua", |