From 74502160056d9c1df64f653bf2364efbb2e7a56b Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Thu, 11 Apr 2013 14:18:19 +0200 Subject: add support for merge files; split into basic/extended --- lualibs-basic.lua | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 lualibs-basic.lua (limited to 'lualibs-basic.lua') diff --git a/lualibs-basic.lua b/lualibs-basic.lua new file mode 100644 index 0000000..d12eb93 --- /dev/null +++ b/lualibs-basic.lua @@ -0,0 +1,54 @@ +-- +-- This is file `lualibs.lua', +-- generated with the docstrip utility. +-- +-- The original source files were: +-- +-- lualibs.dtx (with options: `lua') +-- This is a generated file. +-- +-- Copyright (C) 2009 by PRAGMA ADE / ConTeXt Development Team +-- +-- See ConTeXt's mreadme.pdf for the license. +-- +-- This work consists of the main source file lualibs.dtx +-- and the derived file lualibs.lua. +-- +module('lualibs-basic', package.seeall) + +local lualibs_module = { + name = "lualibs-basic", + version = 1.01, + date = "2013/04/10", + description = "Basic Lua extensions, meta package.", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "See ConTeXt's mreadme.pdf for the license", +} + +local loadmodule = lualibs.loadmodule + +loadmodule("lualibs-lua.lua") +loadmodule("lualibs-lpeg.lua") +loadmodule("lualibs-function.lua") +loadmodule("lualibs-string.lua") +loadmodule("lualibs-table.lua") +loadmodule("lualibs-boolean.lua") +loadmodule("lualibs-number.lua") +loadmodule("lualibs-math.lua") +loadmodule("lualibs-io.lua") +loadmodule("lualibs-os.lua") +loadmodule("lualibs-file.lua") +loadmodule("lualibs-md5.lua") +loadmodule("lualibs-dir.lua") +loadmodule("lualibs-unicode.lua") +loadmodule("lualibs-url.lua") +loadmodule("lualibs-set.lua") + +-- these don’t look much basic to me: +--l-pdfview.lua +--l-xml.lua + + + +-- End of File `lualibs.lua'. -- cgit v1.2.3 From 11cc58366d0e7ae42e6779e26ad460b1ac182dc5 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Thu, 11 Apr 2013 14:31:26 +0200 Subject: add opt-out for merged packages --- lualibs-basic.lua | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) (limited to 'lualibs-basic.lua') diff --git a/lualibs-basic.lua b/lualibs-basic.lua index d12eb93..7957d90 100644 --- a/lualibs-basic.lua +++ b/lualibs-basic.lua @@ -1,31 +1,20 @@ --- --- This is file `lualibs.lua', --- generated with the docstrip utility. --- --- The original source files were: --- --- lualibs.dtx (with options: `lua') --- This is a generated file. --- --- Copyright (C) 2009 by PRAGMA ADE / ConTeXt Development Team --- --- See ConTeXt's mreadme.pdf for the license. --- --- This work consists of the main source file lualibs.dtx --- and the derived file lualibs.lua. --- +-- This is file `lualibs-basic.lua', module('lualibs-basic', package.seeall) -local lualibs_module = { - name = "lualibs-basic", - version = 1.01, - date = "2013/04/10", - description = "Basic Lua extensions, meta package.", - author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux", - copyright = "PRAGMA ADE / ConTeXt Development Team", - license = "See ConTeXt's mreadme.pdf for the license", +local lualibs_basic_module = { + name = "lualibs-basic", + version = 1.01, + date = "2013/04/10", + description = "Basic Lua extensions, meta package.", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL & Elie Roux", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "See ConTeXt's mreadme.pdf for the license", } +if luatexbase and luatexbase.provides_module then + local _,_,_ = luatexbase.provides_module(lualibs_module) +end + local loadmodule = lualibs.loadmodule loadmodule("lualibs-lua.lua") @@ -50,5 +39,5 @@ loadmodule("lualibs-set.lua") --l-xml.lua - +-- vim:tw=71:sw=2:ts=2:expandtab -- End of File `lualibs.lua'. -- cgit v1.2.3 From 70b8030f6092bd3913444b6da97887c35f182de2 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sat, 13 Apr 2013 18:37:43 +0200 Subject: fix module metadata for luatexbase --- lualibs-basic.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lualibs-basic.lua') diff --git a/lualibs-basic.lua b/lualibs-basic.lua index 7957d90..63a7cd0 100644 --- a/lualibs-basic.lua +++ b/lualibs-basic.lua @@ -12,7 +12,7 @@ local lualibs_basic_module = { } if luatexbase and luatexbase.provides_module then - local _,_,_ = luatexbase.provides_module(lualibs_module) + local _,_,_ = luatexbase.provides_module(lualibs_basic_module) end local loadmodule = lualibs.loadmodule -- cgit v1.2.3 From 120ce3327618dea784a0482f1db6295b4168062c Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 14 Apr 2013 02:19:52 +0200 Subject: work around merging restrictions --- lualibs-basic.lua | 51 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 19 deletions(-) (limited to 'lualibs-basic.lua') diff --git a/lualibs-basic.lua b/lualibs-basic.lua index 63a7cd0..4a17bdc 100644 --- a/lualibs-basic.lua +++ b/lualibs-basic.lua @@ -11,33 +11,46 @@ local lualibs_basic_module = { license = "See ConTeXt's mreadme.pdf for the license", } +local find_file, error, warn, info if luatexbase and luatexbase.provides_module then - local _,_,_ = luatexbase.provides_module(lualibs_basic_module) + error, warn, info = luatexbase.provides_module(lualibs_basic_module) +else + error, warn, info = texio.write_nl, texio.write_nl, texio.write_nl -- stub end -local loadmodule = lualibs.loadmodule +local loadmodule = lualibs.loadmodule +local stringformat = string.format -loadmodule("lualibs-lua.lua") -loadmodule("lualibs-lpeg.lua") -loadmodule("lualibs-function.lua") -loadmodule("lualibs-string.lua") -loadmodule("lualibs-table.lua") -loadmodule("lualibs-boolean.lua") -loadmodule("lualibs-number.lua") -loadmodule("lualibs-math.lua") -loadmodule("lualibs-io.lua") -loadmodule("lualibs-os.lua") -loadmodule("lualibs-file.lua") -loadmodule("lualibs-md5.lua") -loadmodule("lualibs-dir.lua") -loadmodule("lualibs-unicode.lua") -loadmodule("lualibs-url.lua") -loadmodule("lualibs-set.lua") +local res +if lualibs.prefer_merged then + res = loadmodule('lualibs-basic-merged.lua') +else + info"Ignoring merged packages." +end + +if not res then + info(stringformat("Falling back to “%s”.", basename)) + loadmodule("lualibs-lua.lua") + loadmodule("lualibs-lpeg.lua") + loadmodule("lualibs-function.lua") + loadmodule("lualibs-string.lua") + loadmodule("lualibs-table.lua") + loadmodule("lualibs-boolean.lua") + loadmodule("lualibs-number.lua") + loadmodule("lualibs-math.lua") + loadmodule("lualibs-io.lua") + loadmodule("lualibs-os.lua") + loadmodule("lualibs-file.lua") + loadmodule("lualibs-md5.lua") + loadmodule("lualibs-dir.lua") + loadmodule("lualibs-unicode.lua") + loadmodule("lualibs-url.lua") + loadmodule("lualibs-set.lua") +end -- these don’t look much basic to me: --l-pdfview.lua --l-xml.lua - -- vim:tw=71:sw=2:ts=2:expandtab -- End of File `lualibs.lua'. -- cgit v1.2.3 From f8a8cd8eed4087a0febaca18f2424821f5fbea73 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Tue, 16 Apr 2013 17:46:05 +0200 Subject: fix loading --- lualibs-basic.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lualibs-basic.lua') diff --git a/lualibs-basic.lua b/lualibs-basic.lua index 4a17bdc..883ae5f 100644 --- a/lualibs-basic.lua +++ b/lualibs-basic.lua @@ -21,15 +21,15 @@ end local loadmodule = lualibs.loadmodule local stringformat = string.format -local res +local loaded = false if lualibs.prefer_merged then - res = loadmodule('lualibs-basic-merged.lua') + loaded = loadmodule('lualibs-basic-merged.lua') else info"Ignoring merged packages." + info"Falling back to individual libraries from collection “basic”." end -if not res then - info(stringformat("Falling back to “%s”.", basename)) +if loaded == false then loadmodule("lualibs-lua.lua") loadmodule("lualibs-lpeg.lua") loadmodule("lualibs-function.lua") -- cgit v1.2.3 From 465d4cbb1ba7162d6c60ebd55449c71981f1b75c Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Wed, 17 Apr 2013 19:50:53 +0200 Subject: sync with Context from 2013-04-17 --- lualibs-basic.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'lualibs-basic.lua') diff --git a/lualibs-basic.lua b/lualibs-basic.lua index 883ae5f..cf8d6ea 100644 --- a/lualibs-basic.lua +++ b/lualibs-basic.lua @@ -31,6 +31,7 @@ end if loaded == false then loadmodule("lualibs-lua.lua") + loadmodule("lualibs-package.lua") loadmodule("lualibs-lpeg.lua") loadmodule("lualibs-function.lua") loadmodule("lualibs-string.lua") -- cgit v1.2.3 From 1e04ecc2c4918448e8ff30a2e6363025267cac79 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sun, 21 Apr 2013 00:55:45 +0200 Subject: add rudimentary verbosity switch --- lualibs-basic.lua | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'lualibs-basic.lua') diff --git a/lualibs-basic.lua b/lualibs-basic.lua index cf8d6ea..8bdaf70 100644 --- a/lualibs-basic.lua +++ b/lualibs-basic.lua @@ -11,18 +11,15 @@ local lualibs_basic_module = { license = "See ConTeXt's mreadme.pdf for the license", } -local find_file, error, warn, info -if luatexbase and luatexbase.provides_module then - error, warn, info = luatexbase.provides_module(lualibs_basic_module) -else - error, warn, info = texio.write_nl, texio.write_nl, texio.write_nl -- stub -end +local lualibs = _G.config.lualibs +local error, warn, info = lualibs.error, lualibs.warn, lualibs.info local loadmodule = lualibs.loadmodule local stringformat = string.format local loaded = false if lualibs.prefer_merged then + info"Loading merged package for collection “basic”." loaded = loadmodule('lualibs-basic-merged.lua') else info"Ignoring merged packages." -- cgit v1.2.3