diff options
| author | Hans Hagen <pragma@wxs.nl> | 2017-01-17 18:05:46 +0100 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2017-01-17 18:05:46 +0100 |
| commit | 0cfeab235554eeee0dddd6c3f44d3939ab490ff1 (patch) | |
| tree | fed70e9a3332741e5294a01197c716dff8556506 /tex/context/base/mkiv/font-otr.lua | |
| parent | 72d161c0a522fd92f32edd3588fa126c453f4a3d (diff) | |
| download | context-0cfeab235554eeee0dddd6c3f44d3939ab490ff1.tar.gz | |
2017-01-17 17:43:00
Diffstat (limited to 'tex/context/base/mkiv/font-otr.lua')
| -rw-r--r-- | tex/context/base/mkiv/font-otr.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tex/context/base/mkiv/font-otr.lua b/tex/context/base/mkiv/font-otr.lua index 2b18c1e0e..a9d3a8b29 100644 --- a/tex/context/base/mkiv/font-otr.lua +++ b/tex/context/base/mkiv/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") |