diff options
| author | Philipp Gesang <phg@phi-gamma.net> | 2017-01-29 21:01:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-29 21:01:24 +0100 |
| commit | c6a32f887d4084f0c3bde51fda4a737b51d1eb06 (patch) | |
| tree | a01850c3a3562d496bda1675c4f7da6453524597 /src/fontloader/misc/fontloader-font-otr.lua | |
| parent | 98656f9d5ca25aaea2e977b79e09c9bb661f4cef (diff) | |
| parent | 616b9077567fd670341696cb6ff2bfc71cf691a9 (diff) | |
| download | luaotfload-c6a32f887d4084f0c3bde51fda4a737b51d1eb06.tar.gz | |
Merge pull request #395 from phi-gamma/master
v2.8
Diffstat (limited to 'src/fontloader/misc/fontloader-font-otr.lua')
| -rw-r--r-- | src/fontloader/misc/fontloader-font-otr.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fontloader/misc/fontloader-font-otr.lua b/src/fontloader/misc/fontloader-font-otr.lua index 2b18c1e..a9d3a8b 100644 --- a/src/fontloader/misc/fontloader-font-otr.lua +++ b/src/fontloader/misc/fontloader-font-otr.lua @@ -645,7 +645,7 @@ local weights = { [300] = "light", [400] = "normal", [500] = "medium", - [600] = "semibold", + [600] = "semibold", -- demi demibold [700] = "bold", [800] = "extrabold", [900] = "black", @@ -1843,8 +1843,8 @@ local function getinfo(maindata,sub,platformnames,rawfamilynames,metricstoo) local fontheader = fontdata.fontheader or { } local cffinfo = fontdata.cffinfo or { } local filename = fontdata.filename - local weight = getname(fontdata,"weight") or cffinfo.weight or metrics.weight - local width = getname(fontdata,"width") or cffinfo.width or metrics.width + local weight = getname(fontdata,"weight") or (cffinfo and cffinfo.weight) or (metrics and metrics.weight) + local width = getname(fontdata,"width") or (cffinfo and cffinfo.width ) or (metrics and metrics.width ) local fontname = getname(fontdata,"postscriptname") local fullname = getname(fontdata,"fullname") local family = getname(fontdata,"family") |