summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2015-10-28 07:31:42 +0100
committerPhilipp Gesang <phg@phi-gamma.net>2015-10-28 07:31:42 +0100
commitc810fcae82effa6c73b7da19e0b94d735be9f767 (patch)
tree2f7076ae10cf326fb09c09311e028b0d5afa7a57 /src
parent3b2349244c00df1393f3aedb910e7e458a52a7ea (diff)
downloadluaotfload-c810fcae82effa6c73b7da19e0b94d735be9f767.tar.gz
[tool] adapt to current initialization
Diffstat (limited to 'src')
-rwxr-xr-xsrc/luaotfload-tool.lua51
1 files changed, 47 insertions, 4 deletions
diff --git a/src/luaotfload-tool.lua b/src/luaotfload-tool.lua
index 6b84a6d..181bd5c 100755
--- a/src/luaotfload-tool.lua
+++ b/src/luaotfload-tool.lua
@@ -145,16 +145,59 @@ utilities = backup.utilities
fonts = { names = { } } -- for db; normally provided by the fontloaders
-require "luaotfload-log.lua" --- this populates the luaotfload.log.* namespace
-require "luaotfload-parsers" --- fonts.conf, configuration, and request syntax
-require "luaotfload-configuration" --- configuration file handling
-require "luaotfload-database"
+local require_init = { }
+
+local loadmodule = function (name)
+ local v = require ("luaotfload-" .. name)
+ if v then
+ local mod = { }
+ local tv = type (v)
+ if tv == "table" then
+ mod.name = name
+ mod.init = v.init
+ require_init [#require_init + 1] = mod
+ elseif tv == "function" then
+ mod.name = name
+ mod.init = v
+ require_init [#require_init + 1] = mod
+ end
+ end
+end
+
require "alt_getopt"
+loadmodule "log.lua" --- this populates the luaotfload.log.* namespace
+loadmodule "parsers" --- fonts.conf, configuration, and request syntax
+loadmodule "configuration" --- configuration file handling
+loadmodule "database"
+
local logreport
local init_modules = function ()
+ --- NB we don’t command the logger at this point.
+ local todo = #require_init
+ local ret = true
+ for i = 1, todo do
+ local mod = require_init[i]
+ local name = mod.name
+ local init = mod.init
+ if type (init) ~= "function" then
+ error ("luaotfload broken; module "
+ .. name .. " missing initializers!")
+ end
+ local v = mod.init ()
+ if v == true then
+ --- evaluated well
+ elseif type (v) == "table" then
+ luaotfload[name] = v
+ else
+ error ("luaotfload broken; initialization of module "
+ .. name .. " returned " .. tostring (v) .. ".")
+ return false
+ end
+ end
logreport = luaotfload.log.report
+ return ret
end