summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-main.lua
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luaotfload/luaotfload-main.lua')
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/luaotfload-main.lua36
1 files changed, 17 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-main.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-main.lua
index 12b364355e6..280a28a77b8 100644
--- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-main.lua
+++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-main.lua
@@ -20,8 +20,8 @@ local authors = "\z
-- version number is used below!
local ProvidesLuaModule = {
name = "luaotfload-main",
- version = "2.98", --TAGVERSION
- date = "2019-07-04", --TAGDATE
+ version = "2.99", --TAGVERSION
+ date = "2019-08-11", --TAGDATE
description = "luaotfload entry point",
author = authors,
copyright = authors,
@@ -236,22 +236,20 @@ local install_loaders = function ()
loaders.initialize = function (name)
local tmp = loadmodule (name)
local logreport = luaotfload.log.report
- if type (tmp) == "table" then
- local init = tmp.init
- if init and type (init) == "function" then
- local t_0 = osgettimeofday ()
- if not init () then
- logreport ("log", 0, "load",
- "Failed to load module “%s”.", name)
- return
- end
- local t_end = osgettimeofday ()
- local d_t = t_end - t_0
- logreport ("log", 4, "load",
- "Module “%s” loaded in %d ms.",
- name, d_t)
- timing_info.t_init [name] = d_t
+ local init = type(tmp) == "table" and tmp.init or tmp
+ if init and type (init) == "function" then
+ local t_0 = osgettimeofday ()
+ if not init () then
+ logreport ("log", 0, "load",
+ "Failed to load module “%s”.", name)
+ return
end
+ local t_end = osgettimeofday ()
+ local d_t = t_end - t_0
+ logreport ("log", 4, "load",
+ "Module “%s” loaded in %d ms.",
+ name, d_t)
+ timing_info.t_init [name] = d_t
end
end
@@ -291,8 +289,8 @@ luaotfload.main = function ()
initialize "database" --- Font management.
initialize "colors" --- Per-font colors.
- luaotfload.resolvers = loadmodule "resolvers" --- Font lookup
- luaotfload.resolvers.init ()
+ local init_resolvers = loadmodule "resolvers" --- Font lookup
+ init_resolvers ()
if not config.actions.reconfigure () then
logreport ("log", 0, "load", "Post-configuration hooks failed.")