summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2015-11-18 07:47:47 +0100
committerPhilipp Gesang <phg@phi-gamma.net>2015-11-18 07:47:47 +0100
commit17b8126f260a4f80a041ab179ceb68abf425c359 (patch)
treefce012a53756a7e126a3099828020526f2784718
parent0bfd03b4fcdf1cbf3f1fb8e8afa7a2c4d917715a (diff)
downloadluaotfload-17b8126f260a4f80a041ab179ceb68abf425c359.tar.gz
[init] fix pathless Context module loading
-rw-r--r--src/luaotfload-init.lua10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua
index 2755f78..f1d1a8e 100644
--- a/src/luaotfload-init.lua
+++ b/src/luaotfload-init.lua
@@ -228,8 +228,8 @@ local context_modules = {
local load_context_modules = function (pth)
- local load_context_module = luaotfload.loaders.context
- local ignore_module = luaotfload.loaders.ignore
+ local load_module = luaotfload.loaders.context
+ local ignore_module = luaotfload.loaders.ignore
logreport ("both", 2, "init",
"Loading fontloader components from context.")
@@ -239,7 +239,11 @@ local load_context_modules = function (pth)
if sub == false then
ignore_module (spec)
elseif type (sub) == "string" then
- load_context_module (spec, file.join (pth, sub))
+ if pth then
+ load_module (spec, file.join (pth, sub))
+ else
+ load_module (spec)
+ end
else
logreport ("both", 0, "init",
"Internal error, please report. \z