summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua')
-rw-r--r--Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua22
1 files changed, 15 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua b/Master/texmf-dist/tex/luatex/luaotfload/luaotfload-database.lua
index 6918c4abf87..385944a5ab6 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.96", --TAGVERSION
- date = "2019-02-14", --TAGDATE
+ version = "2.97", --TAGVERSION
+ date = "2019-05-18", --TAGDATE
description = "luaotfload submodule / database",
license = "GPL v2.0",
author = "Khaled Hosny, Elie Roux, Philipp Gesang, Marcel Krüger",
@@ -529,9 +529,15 @@ load_names = function (dry_run, no_rebuild)
end
names_version = names.version
if db_version ~= names_version then
- logreport ("both", 0, "db",
- [[Version mismatch; expected %d, got %d.]],
- names_version, db_version)
+ if math.tointeger(db_version) then
+ logreport ("both", 0, "db",
+ [[Version mismatch; expected %d, got %d.]],
+ names_version, db_version)
+ else
+ logreport ("both", 0, "db",
+ [[Version mismatch; expected %d, got invalid data.]],
+ names_version, db_version)
+ end
if not fonts_reloaded then
logreport ("both", 0, "db", [[Force rebuild.]])
data = update_names (initialize_namedata (get_font_filter ()),
@@ -1097,7 +1103,7 @@ do
if conv ~= nil then
logreport ("both", 4, "db",
"Interpreting design sizes as %q, factor %.6f.",
- dim, conv)
+ dim, conv or 1)
design_size_dimension = conv
return
end
@@ -1474,7 +1480,9 @@ local get_english_names = function (metadata)
certain.
--]]--
if platformnames then
- --namesource = platformnames.macintosh or platformnames.windows
+ if platformnames.windows and platformnames.macintosh then
+ return table.merge(platformnames.macintosh, platformnames.windows)
+ end
namesource = platformnames.windows or platformnames.macintosh
end
return namesource or metadata