Skip to content

Commit 5dab744

Browse files
authored
Merge pull request #14 from yuchanns/fix/font-import-failed
fix(fontmgr): fail to import when sname is nil
2 parents de0e541 + 909e6af commit 5dab744

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

src/lualib/fontmgr.lua

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,15 +221,20 @@ local function import(fontdata)
221221
local fname, sname = ttf.namestring(fontdata, index, obj.id, encoding_id, lang_id)
222222
if fname then
223223
fname = utf16toutf8(fname)
224-
sname = utf16toutf8(sname)
225-
local fullname = fname .. " " .. sname
224+
local fullname = fname
225+
fname = string.lower(fname)
226+
if sname then
227+
sname = utf16toutf8(sname)
228+
fullname = fullname .. " " .. sname
229+
sname = string.lower(sname)
230+
end
226231
if not cache[fullname] then
227232
cache[fullname] = true
228233
table.insert(namelist, {
229234
fontdata = fontdata,
230235
index = index,
231-
family = string.lower(fname),
232-
sfamily = string.lower(sname), -- sub family name
236+
family = fname,
237+
sfamily = sname, -- sub family name
233238
name = string.lower(fullname),
234239
})
235240
end

0 commit comments

Comments
 (0)