summaryrefslogtreecommitdiff
path: root/macros/luatex/generic/luaotfload/luaotfload-init.lua
diff options
context:
space:
mode:
Diffstat (limited to 'macros/luatex/generic/luaotfload/luaotfload-init.lua')
-rw-r--r--macros/luatex/generic/luaotfload/luaotfload-init.lua39
1 files changed, 22 insertions, 17 deletions
diff --git a/macros/luatex/generic/luaotfload/luaotfload-init.lua b/macros/luatex/generic/luaotfload/luaotfload-init.lua
index 0f8d7b3206..e68741666a 100644
--- a/macros/luatex/generic/luaotfload/luaotfload-init.lua
+++ b/macros/luatex/generic/luaotfload/luaotfload-init.lua
@@ -7,8 +7,8 @@
local ProvidesLuaModule = {
name = "luaotfload-init",
- version = "3.12", --TAGVERSION
- date = "2020-02-02", --TAGDATE
+ version = "3.13", --TAGVERSION
+ date = "2020-05-01", --TAGDATE
description = "luaotfload submodule / initialization",
license = "GPL v2.0"
}
@@ -144,7 +144,7 @@ local context_modules = {
} --[[context_modules]]
-local load_context_modules = function (pth)
+local function load_context_modules (pth)
local load_module = luaotfload.loaders.context
local ignore_module = luaotfload.loaders.ignore
@@ -238,7 +238,7 @@ local function init_main(early_hook)
logreport ("log", 4, "init", "Concealing callback.register().")
local trapped_register = callback.register
- callback.register = function (id)
+ function callback.register (id)
logreport ("log", 4, "init",
"Dummy callback.register() invoked on %s.",
id)
@@ -319,7 +319,7 @@ local function init_main(early_hook)
--- of our fontloader package. Perhaps something’s wrong with the status
--- file which contains the datestamped filename? In any case, it can’t
--- hurt reporting it as a bug.
- logreport ("both", 0, "init", "Fontloader substitution failed, got “default”.")
+ logreport ("both", 0, "init", "Fontloader substitution failed, got \"default\".")
logreport ("log", 4, "init", "Falling back to reference fontloader.")
load_fontloader_module (luaotfload.fontloader_package)
@@ -392,36 +392,36 @@ local function init_main(early_hook)
elseif lfsisdir (fontloader) and verify_context_dir (fontloader) then
logreport ("log", 0, "init",
- "Loading Context files under prefix “%s”.",
+ "Loading Context files under prefix %q.",
fontloader)
load_context_modules (fontloader)
elseif lfs.isfile (fontloader) then
logreport ("log", 0, "init",
- "Loading fontloader from absolute path “%s”.",
+ "Loading fontloader from absolute path %q.",
fontloader)
local _void = assert (loadfile (fontloader, nil, context_environment)) ()
elseif kpsefind_file (fontloader) then
local path = kpsefind_file (fontloader)
logreport ("log", 0, "init",
- "Loading fontloader “%s” from kpse-resolved path “%s”.",
+ "Loading fontloader %q from kpse-resolved path %q.",
fontloader, path)
local _void = assert (loadfile (path, nil, context_environment)) ()
elseif kpsefind_file (("fontloader-%s.lua"):format(fontloader)) then
logreport ("log", 0, "init",
- "Using predefined fontloader “%s”.",
+ "Using predefined fontloader %q.",
fontloader)
load_fontloader_module (fontloader)
else
logreport ("both", 0, "init",
- "No match for requested fontloader “%s”.",
+ "No match for requested fontloader %q.",
fontloader)
fontloader = luaotfload.fontloader_package
logreport ("both", 0, "init",
- "Defaulting to predefined fontloader “%s”.",
+ "Defaulting to predefined fontloader %q.",
fontloader)
load_fontloader_module (fontloader)
end
@@ -429,7 +429,7 @@ local function init_main(early_hook)
---load_fontloader_module "font-odv.lua" --- <= Devanagari support from Context
logreport ("log", 0, "init",
- "Context OpenType loader version “%s”",
+ "Context OpenType loader version %q",
fonts.handlers.otf.version)
callback.register = trapped_register
nodes = context_environment.nodes
@@ -448,14 +448,19 @@ local init_post_install_callbacks = function ()
--doc]]--
+ -- The order is important here: multiscript=auto needs to look at the
+ -- fallback fonts, so they already have to be processed at that stage
+ local fallback = luaotfload.loaders.luaotfload "fallback".process
+ local multiscript = luaotfload.loaders.luaotfload "multiscript".process
+
-- MK Pass current text direction to simple_font_handler
local handler = luaotfload.fontloader.nodes.simple_font_handler
local callback = function(head, groupcode, _, _, direction)
if not direction then
direction = tex.get'textdir'
end
- domultiscript(head, nil, nil, nil, direction)
- dofallback(head, nil, nil, nil, direction)
+ multiscript(head, nil, nil, nil, direction)
+ fallback(head, nil, nil, nil, direction)
return handler(head, groupcode, nil, nil, direction)
end
luatexbase.add_to_callback("pre_linebreak_filter",
@@ -469,7 +474,7 @@ local init_post_install_callbacks = function ()
-- /MK
end
-local init_post_load_agl = function ()
+local function init_post_load_agl ()
--[[doc--
@@ -532,7 +537,7 @@ local init_post_load_agl = function ()
return nil
end
logreport ("both", 4, "init",
- "found Adobe glyph list file at ``%s``, using that.",
+ "found Adobe glyph list file at %q, using that.",
glyphlist)
local unicodes = dofile(glyphlist)
@@ -549,7 +554,7 @@ local init_post_actions = {
}
--- unit -> size_t
-local init_post = function ()
+local function init_post ()
--- hook for actions that need to take place after the fontloader is
--- installed