diff options
author | Karl Berry <karl@freefriends.org> | 2019-11-05 21:35:11 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-11-05 21:35:11 +0000 |
commit | 34a198a074607c6eb90b0d82734630ca2bf439d9 (patch) | |
tree | ca4c5abc73c33da09c19716b13688a1b7ac53b9d /Master/texmf-dist/tex/luatex/luaotfload/luaotfload-resolvers.lua | |
parent | faac65e4c5efc26d958be7633783eecc9d0c0ddc (diff) |
luaotfload (5nov19)
git-svn-id: svn://tug.org/texlive/trunk@52645 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luaotfload/luaotfload-resolvers.lua')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luaotfload/luaotfload-resolvers.lua | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-resolvers.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-resolvers.lua index 5146f1d20e6..97e85f0a41e 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-resolvers.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-resolvers.lua @@ -11,8 +11,8 @@ local ProvidesLuaModule = { name = "luaotfload-resolvers", - version = "3.00", --TAGVERSION - date = "2019-09-13", --TAGDATE + version = "3.1", --TAGVERSION + date = "2019-11-04", --TAGDATE description = "luaotfload submodule / resolvers", license = "GPL v2.0" } @@ -148,11 +148,12 @@ end local tex_formats = { "tfm", "ofm" } +local resolvers_findfile = luaotfload.fontloader.resolvers.findfile local resolve_tex_format = function (specification) local name = specification.name for i=1, #tex_formats do local format = tex_formats [i] - local resolved = resolvers.findfile(name, format) + local resolved = resolvers_findfile(name, format) if resolved then return resolved, format end @@ -241,6 +242,7 @@ local function resolve_kpse (specification) end end +local lookup_subfont_index = fonts.names.lookup_subfont_index local function wrap_resolver(resolver) return function (specification) local filename, sub, forced = resolver(specification) @@ -253,6 +255,10 @@ local function wrap_resolver(resolver) specification.filename = filename specification.name = filename specification.sub = sub or specification.sub + if type(specification.sub) == "string" then + specification.sub = + lookup_subfont_index(filename, specification.sub) + end specification.forced = specification.forced or forced if not specification.forced then local suffix = stringlower (filesuffix (filename)) |