diff options
author | Karl Berry <karl@freefriends.org> | 2019-01-18 22:36:39 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-01-18 22:36:39 +0000 |
commit | 9fe86978e3c05cc8ffe90251487f8240f3765402 (patch) | |
tree | fcccbc6193e9111774462036fb5a130adad6319e /Master/texmf-dist/tex/luatex/luaotfload/luaotfload-resolvers.lua | |
parent | 1da73770bc3b5546208cb6511e69cbc7f86bc33e (diff) |
luaotfload (18jan19)
git-svn-id: svn://tug.org/texlive/trunk@49747 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 | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-resolvers.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-resolvers.lua index 89d4fc7c5d3..d932aee3e46 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 = "2.93", --TAGVERSION - date = "2018-10-28", --TAGDATE + version = "2.94", --TAGVERSION + date = "2018-12-19", --TAGDATE description = "luaotfload submodule / resolvers", license = "GPL v2.0" } @@ -77,7 +77,7 @@ local resolve_file resolve_file = function (specification) local name, _format, success = fonts.names.lookup_font_file (specification.name) local suffix = filesuffix (name) - if fonts.formats[suffix] then + if not specification.forced and fonts.formats[suffix] then specification.forced = stringlower (suffix) specification.forcedname = fileremovesuffix (name) else @@ -110,7 +110,7 @@ resolve_path = function (specification) return resolve_file (specification) end local suffix = filesuffix (name) - if fonts.formats [suffix] then + if not specification.forced and fonts.formats [suffix] then specification.forced = stringlower (suffix) specification.name = fileremovesuffix (name) specification.forcedname = name @@ -142,7 +142,8 @@ resolve_name = function (specification) subfont and stringformat ("(%d)", subfont) or "") specification.resolved = resolved specification.sub = subfont - specification.forced = stringlower (filesuffix (resolved) or "") + specification.forced = specification.forced + or stringlower (filesuffix (resolved) or "") specification.forcedname = resolved specification.name = fileremovesuffix (resolved) return true @@ -184,7 +185,7 @@ local resolve_tex_format = function (specification) if resolvers.findfile (name, format) then local usename = suffix == format and fileremovesuffix (name) or name specification.forcedname = file.addsuffix (usename, format) - specification.forced = format + specification.forced = specification.forced or format ---- specification.resolved = name return true end @@ -277,7 +278,7 @@ local resolve_kpse resolve_kpse = function (specification) local name = specification.name local suffix = filesuffix (name) - if suffix and fonts.formats[suffix] then + if not specification.forced and suffix and fonts.formats[suffix] then name = fileremovesuffix (name) if resolvers.findfile (name, suffix) then specification.forced = stringlower (suffix) |