diff options
| -rw-r--r-- | src/luaotfload-init.lua | 38 | ||||
| -rw-r--r-- | src/luaotfload-main.lua | 12 |
2 files changed, 35 insertions, 15 deletions
diff --git a/src/luaotfload-init.lua b/src/luaotfload-init.lua index 1c2046d..1d6d1a5 100644 --- a/src/luaotfload-init.lua +++ b/src/luaotfload-init.lua @@ -203,6 +203,7 @@ end --- [init_adapt] local init_main = function () local load_fontloader_module = luaotfload.loaders.fontloader + local ignore_module = luaotfload.loaders.ignore --[[doc-- @@ -214,26 +215,33 @@ local init_main = function () --doc]]-- + logreport ("log", 4, "init", + "Loading fontloader as merged package.") load_fontloader_module (luaotfload.fontloader_package) ---load_fontloader_module "font-odv.lua" --- <= Devanagari support from Context if not fonts then - --- the loading sequence is known to change, so this might have to - --- be updated with future updates! - --- do not modify it though unless there is a change to the merged - --- package! - load_fontloader_module "l-lua" - load_fontloader_module "l-lpeg" - load_fontloader_module "l-function" - load_fontloader_module "l-string" - load_fontloader_module "l-table" - load_fontloader_module "l-io" - load_fontloader_module "l-file" - load_fontloader_module "l-boolean" - load_fontloader_module "l-math" - load_fontloader_module "util-str" - load_fontloader_module "luatex-basics-gen" + logreport ("log", 4, "init", + "Loading fontloader components individually.") + --- The loading sequence is known to change, so this might have to be + --- updated with future updates. Do not modify it though unless there is + --- a change to the upstream package! + + --- Since 2.6 those are directly provided by the Lualibs package. + ignore_module "l-lua" + ignore_module "l-lpeg" + ignore_module "l-function" + ignore_module "l-string" + ignore_module "l-table" + ignore_module "l-io" + ignore_module "l-file" + ignore_module "l-boolean" + ignore_module "l-math" + ignore_module "util-str" + ignore_module "luatex-basics-gen" + + --- These constitute the fontloader proper. load_fontloader_module "data-con" load_fontloader_module "luatex-basics-nod" load_fontloader_module "font-ini" diff --git a/src/luaotfload-main.lua b/src/luaotfload-main.lua index 85c9cee..686ce0e 100644 --- a/src/luaotfload-main.lua +++ b/src/luaotfload-main.lua @@ -127,11 +127,23 @@ local make_loader = function (prefix) end end +--[[doc-- + Certain files are kept around that aren’t loaded because they are part of + the imported fontloader. In order to keep the initialization structure + intact we also provide a no-op version of the module loader that can be + called in the expected places. +--doc]]-- + +local dummy_loader = function (name) + luaotfload.log.report("log", 3, "load", "Skipping module “%s”.", name) +end + local install_loaders = function () local loaders = { } local loadmodule = make_loader "luaotfload" loaders.luaotfload = loadmodule loaders.fontloader = make_loader "fontloader" + loaders.ignore = dummy_loader ----loaders.plaintex = make_loader "luatex" --=> for Luatex-Plain loaders.initialize = function (name) |