summaryrefslogtreecommitdiff
path: root/luaotfload-database.lua
diff options
context:
space:
mode:
authorPhilipp Gesang <phg42.2a@gmail.com>2014-01-03 13:53:23 -0800
committerPhilipp Gesang <phg42.2a@gmail.com>2014-01-03 13:53:23 -0800
commit70e80bb79416b0089ea9ee5f01a11be34bef251c (patch)
treef58776f8e9e616553e18198d3a4e62c87c6feeef /luaotfload-database.lua
parent61e48b2eb03f98ea6335730e5c9cf0a6f4462c44 (diff)
parentbb99e2c94aaa32cb3635ec6e35a4dc8ca6e309ae (diff)
downloadluaotfload-70e80bb79416b0089ea9ee5f01a11be34bef251c.tar.gz
Merge pull request #167 from phi-gamma/master
fixes to 2.4
Diffstat (limited to 'luaotfload-database.lua')
-rw-r--r--luaotfload-database.lua9
1 files changed, 6 insertions, 3 deletions
diff --git a/luaotfload-database.lua b/luaotfload-database.lua
index 9d7d912..7e5f8cb 100644
--- a/luaotfload-database.lua
+++ b/luaotfload-database.lua
@@ -1070,9 +1070,10 @@ local resolve_fontname = function (specification, name, style)
local face = mappings [i]
local prefmodifiers = face.prefmodifiers
local subfamily = face.subfamily
- if face.fontname == name
- or face.fullname == name
- or face.psname == name
+ if face.fontname == name
+ or face.splainname == name
+ or face.fullname == name
+ or face.psname == name
then
return face.basename, face.subfont
elseif face.familyname == name then
@@ -1608,6 +1609,7 @@ t1_fullinfo = function (filename, _subfont, location, basename, format)
fontname = sanitized.fontname,
familyname = sanitized.familyname,
plainname = fullname,
+ splainname = sanitized.fullname,
psname = sanitized.fontname,
version = metadata.version,
size = false,
@@ -2775,6 +2777,7 @@ local pull_values = function (entry)
entry.psname = english.psname
entry.fontname = info.fontname
entry.fullname = english.fullname or info.fullname
+ entry.splainname = metadata.fullname
entry.prefmodifiers = english.prefmodifiers
local metafamily = metadata.familyname
local familyname = english.preffamily or english.family