diff options
| author | Context Git Mirror Bot <phg42.2a@gmail.com> | 2015-09-04 11:15:09 +0200 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2015-09-04 11:15:09 +0200 |
| commit | cf4c4c56e5748e91ecc28f8126f5fc6eadfd73fa (patch) | |
| tree | ca9c7f5782d3622203ade72f1d2d32f6c463bc98 /tex/context/base/font-ctx.lua | |
| parent | f4508b5b95b4fc2b3ed59aaa28a8dfc1a667360a (diff) | |
| download | context-cf4c4c56e5748e91ecc28f8126f5fc6eadfd73fa.tar.gz | |
2015-09-04 11:02:00
Diffstat (limited to 'tex/context/base/font-ctx.lua')
| -rw-r--r-- | tex/context/base/font-ctx.lua | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tex/context/base/font-ctx.lua b/tex/context/base/font-ctx.lua index ca9a83086..4dd75b480 100644 --- a/tex/context/base/font-ctx.lua +++ b/tex/context/base/font-ctx.lua @@ -50,6 +50,7 @@ local implement = interfaces.implement local fonts = fonts local handlers = fonts.handlers local otf = handlers.otf -- brrr +----- afm = handlers.afm -- brrr local names = fonts.names local definers = fonts.definers local specifiers = fonts.specifiers @@ -1366,14 +1367,14 @@ function constructors.calculatescale(tfmdata,scaledpoints,relativeid,specificati if special then -- we also have available specification.textsize local parameters = tfmdata.parameters - local designsize = parameters.designsize + -- local designsize = parameters.designsize if special == "ht" then --- inspect(parameters) - local height = parameters.ascender * designsize / parameters.units - scaledpoints = (scaledpoints/height) * designsize + local height = parameters.ascender / parameters.units + scaledpoints = scaledpoints / height elseif special == "cp" then - local height = (tfmdata.descriptions[utf.byte("X")].height or parameters.ascender) * designsize / parameters.units - scaledpoints = (scaledpoints/height) * designsize + local glyph = tfmdata.descriptions[utfbyte("X")] + local height = (glyph and glyph.height or parameters.ascender) / parameters.units + scaledpoints = scaledpoints / height end end end |