diff options
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua')
| -rw-r--r-- | Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua index a596774e72c..c44b780113f 100644 --- a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua +++ b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua @@ -5,8 +5,8 @@ do -- block to avoid to many local variables error local ProvidesLuaModule = { name = "luaotfload-database", - version = "2.93", --TAGVERSION - date = "2018-10-28", --TAGDATE + version = "2.94", --TAGVERSION + date = "2018-12-19", --TAGDATE description = "luaotfload submodule / database", license = "GPL v2.0", author = "Khaled Hosny, Elie Roux, Philipp Gesang, Marcel Krüger", @@ -748,13 +748,14 @@ local get_font_file = function (index) end local basename = entry.basename if entry.location == "texmf" then - if kpselookup(basename) then - return true, basename, entry.subfont + local fullname = resolvers.findfile(basename) + if fullname then + return true, fullname, entry.subfont end else --- system, local local fullname = name_index.files.full [index] if lfsisfile (fullname) then - return true, basename, entry.subfont + return true, fullname, entry.subfont end end return false @@ -771,7 +772,7 @@ local verify_font_file = function (basename) if path and lfsisfile(path) then return true end - if kpsefind_file(basename) then + if resolvers.findfile(basename) then return true end return false @@ -1055,7 +1056,7 @@ local lookup_fontname = function (specification, name, style) or face.fullname == name or face.psname == name then - return face.basename, face.subfont + return face.fullpath, face.subfont elseif face.familyname == name then if typographicsubfamily == style or subfamily == style @@ -1074,10 +1075,10 @@ local lookup_fontname = function (specification, name, style) end end if fallback then - return fallback.basename, fallback.subfont + return fallback.fullpath, fallback.subfont end if lastresort then - return lastresort.basename, lastresort.subfont + return lastresort.fullpath, lastresort.subfont end return nil, nil end |