summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2016-04-27 08:00:39 +0200
committerPhilipp Gesang <phg@phi-gamma.net>2016-04-27 08:00:39 +0200
commit08f6c022be4fca298df03fe5582647d5b8c9785e (patch)
tree5a20790bea270781b9dde58f74409c144bd6fe50
parente789cc0309f9d850e72dc724c0e686a9c03b7979 (diff)
downloadluaotfload-08f6c022be4fca298df03fe5582647d5b8c9785e.tar.gz
[db] adapt call to getinfo() for revised interface
-rw-r--r--src/luaotfload-database.lua13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/luaotfload-database.lua b/src/luaotfload-database.lua
index b8a50d6..e0f6e61 100644
--- a/src/luaotfload-database.lua
+++ b/src/luaotfload-database.lua
@@ -1410,7 +1410,6 @@ local map_english_names = function (metadata)
certain.
--]]--
if platformnames then
- --inspect(metadata)
--namesource = platformnames.macintosh or platformnames.windows
namesource = platformnames.windows or platformnames.macintosh
end
@@ -3501,8 +3500,16 @@ local use_fontforge = function (val)
close_font_file = fontloader.close
get_english_names = get_english_names_from_ff
else
- read_font_file = otfhandler.readers.getinfo
- read_font_info = read_font_file
+ local wrapper = function (filename, subfont)
+ return otfhandler.readers.getinfo (filename,
+ { subfont = subfont
+ , details = false
+ , platformnames = true
+ , rawfamilynames = true
+ })
+ end
+ read_font_file = wrapper
+ read_font_info = wrapper
close_font_file = function () end
get_english_names = map_english_names
end