diff options
| author | Philipp Gesang <phg@phi-gamma.net> | 2015-07-22 23:12:04 +0200 |
|---|---|---|
| committer | Philipp Gesang <phg@phi-gamma.net> | 2015-07-22 23:12:04 +0200 |
| commit | 548fd5b0934425247e1c4e2a9aa52955813625ff (patch) | |
| tree | 3cb0dd107d8c0b8878c87bf9c8d74657d04d2798 /src/luaotfload-main.lua | |
| parent | 6f273e157c650d396cbad8e09e059b8b7c359818 (diff) | |
| parent | ff022fd5de42d55aef94ce7cd7e221055f1d0c6a (diff) | |
| download | luaotfload-548fd5b0934425247e1c4e2a9aa52955813625ff.tar.gz | |
Merge pull request #279 from phi-gamma/master
Restructure initialization
Diffstat (limited to 'src/luaotfload-main.lua')
| -rw-r--r-- | src/luaotfload-main.lua | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/luaotfload-main.lua b/src/luaotfload-main.lua index e8f05d6..5ac1421 100644 --- a/src/luaotfload-main.lua +++ b/src/luaotfload-main.lua @@ -1,6 +1,6 @@ ----------------------------------------------------------------------- -- FILE: luaotfload-main.lua --- DESCRIPTION: Luaotfload initialization +-- DESCRIPTION: Luaotfload entry point -- REQUIREMENTS: luatex v.0.80 or later; packages lualibs, luatexbase -- AUTHOR: Élie Roux, Khaled Hosny, Philipp Gesang -- VERSION: same as Luaotfload @@ -20,9 +20,7 @@ luaotfload.log = luaotfload.log or { } luaotfload.version = "2.6" luaotfload.loaders = { } luaotfload.min_luatex_version = 79 --- i. e. 0.79 -luaotfload.fontloader_package = "fontloader" --- default: from current Context -----------.fontloader_package = "slim" - +luaotfload.fontloader_package = "reference" --- default: from current Context local authors = "\z Hans Hagen,\z @@ -155,13 +153,11 @@ luaotfload.loaders.luaotfload = load_luaotfload_module luaotfload.loaders.fontloader = load_fontloader_module luaotfload.init = load_luaotfload_module "init" --- fontloader initialization -luaotfload.init.init () +local store = luaotfload.init.early () local log = luaotfload.log local logreport = log.report -load_luaotfload_module "override" --- load glyphlist on demand - --[[doc-- Now we load the modules written for \identifier{luaotfload}. @@ -175,6 +171,8 @@ if not config.actions.apply_defaults () then logreport ("log", 0, "load", "Configuration unsuccessful.") end +luaotfload.init.main (store) + load_luaotfload_module "loaders" --- Type1 font wrappers load_luaotfload_module "database" --- Font management. load_luaotfload_module "colors" --- Per-font colors. |