diff options
author | Context Git Mirror Bot <phg42.2a@gmail.com> | 2016-04-11 10:29:07 +0200 |
---|---|---|
committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2016-04-11 10:29:07 +0200 |
commit | 57a61e4673116076f5bbff7600e6dad376af9173 (patch) | |
tree | 8261af49f1576dcfea0f152300d22e1a64ae907f /tex/context/base/mkiv/font-off.lua | |
parent | 274c32699e7826f7590248f91aa1bfbf5b07c8ee (diff) | |
download | context-57a61e4673116076f5bbff7600e6dad376af9173.tar.gz |
2016-04-10 23:57:00
Diffstat (limited to 'tex/context/base/mkiv/font-off.lua')
-rw-r--r-- | tex/context/base/mkiv/font-off.lua | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/tex/context/base/mkiv/font-off.lua b/tex/context/base/mkiv/font-off.lua index 5fe68dc2a..82426552e 100644 --- a/tex/context/base/mkiv/font-off.lua +++ b/tex/context/base/mkiv/font-off.lua @@ -177,21 +177,22 @@ local function get_full_info(name) local weight = names.weight or ff.weight local width = names.width -- no: ff.width local d = { - familyname = names.preffamilyname or names.family or ff.familyname, - fullname = names.fullname or ff.fullname, - fontname = ff.fontname, - subfamily = names.subfamily, - modifiers = names.prefmodifiers, - weight = weight and lower(weight), - width = width and lower(width), - italicangle = round(1000*(tonumber(ff.italicangle) or 0))/1000 or 0, - units = ff.units_per_em, - designsize = ff.design_size, - minsize = ff.design_range_bottom, - maxsize = ff.design_range_top, - pfmweight = pfminfo.weight or 400, - pfmwidth = pfminfo.width or 5, - monospaced = pfminfo.panose and pfminfo.panose.proportion == "Monospaced", + fontname = ff.fontname, + fullname = names.fullname or ff.fullname, + family = names.family, + subfamily = names.subfamily, + familyname = names.preffamilyname or names.family or ff.familyname, + subfamilyname = names.prefmodifiers or names.subfamily, + weight = weight and lower(weight), + width = width and lower(width), + italicangle = round(1000*(tonumber(ff.italicangle) or 0))/1000 or 0, + units = ff.units_per_em, + designsize = ff.design_size, + minsize = ff.design_range_bottom, + maxsize = ff.design_range_top, + pfmweight = pfminfo.weight or 400, + pfmwidth = pfminfo.width or 5, + monospaced = pfminfo.panose and pfminfo.panose.proportion == "Monospaced", } close_font(ff) return d |