summaryrefslogtreecommitdiff
path: root/luaotfload-database.lua
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2013-05-21 13:41:00 -0700
committerPhilipp Gesang <phg42.2a@gmail.com>2013-05-21 13:41:00 -0700
commit1b1890c3b306e42a451465e64c5dbd8f0f094303 (patch)
treefca2e364841ccf8cf2c61d851446092c05ce2ce9 /luaotfload-database.lua
parente7b6210272a3287205d0692c995d35d5b783c189 (diff)
parentbd84183e5fb0e97e974b4a9c5fdfac776fdf369a (diff)
downloadluaotfload-1b1890c3b306e42a451465e64c5dbd8f0f094303.tar.gz
Merge pull request #88 from phi-gamma/master
fix request parser; fix name matching bug; better workaround for ``mkdirs()``; sync with latest Contest
Diffstat (limited to 'luaotfload-database.lua')
-rw-r--r--luaotfload-database.lua6
1 files changed, 4 insertions, 2 deletions
diff --git a/luaotfload-database.lua b/luaotfload-database.lua
index 0e46874..ee7701d 100644
--- a/luaotfload-database.lua
+++ b/luaotfload-database.lua
@@ -568,9 +568,11 @@ resolve = function (_,_,specification) -- the 1st two parameters are used by Con
subfamily = facenames.subfamily
fullname = facenames.fullname
psname = facenames.psname
+ fontname = facenames.fontname
+ pfullname = facenames.pfullname
end
- fontname = facenames.fontname or sanitize_string(face.fontname)
- pfullname = facenames.pfullname or sanitize_string(face.fullname)
+ fontname = fontname or sanitize_string(face.fontname)
+ pfullname = pfullname or sanitize_string(face.fullname)
local optsize, dsnsize, maxsize, minsize
if #face.size > 0 then