diff options
author | Hans Hagen <pragma@wxs.nl> | 2010-03-18 14:42:00 +0100 |
---|---|---|
committer | Hans Hagen <pragma@wxs.nl> | 2010-03-18 14:42:00 +0100 |
commit | 66a814af45f6ebe7ff0210238b2b9eba7dd3a499 (patch) | |
tree | c227b9351820db8c6084b82777c60b4367c80dd8 /tex/context/base/font-ctx.lua | |
parent | f8583123d8e264910387d015f4d6576551fe0ee4 (diff) | |
download | context-66a814af45f6ebe7ff0210238b2b9eba7dd3a499.tar.gz |
beta 2010.03.18 14:42
Diffstat (limited to 'tex/context/base/font-ctx.lua')
-rw-r--r-- | tex/context/base/font-ctx.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tex/context/base/font-ctx.lua b/tex/context/base/font-ctx.lua index e37c0ea76..419bd25e0 100644 --- a/tex/context/base/font-ctx.lua +++ b/tex/context/base/font-ctx.lua @@ -410,17 +410,17 @@ end) local calculate_scale = fonts.tfm.calculate_scale function fonts.tfm.calculate_scale(tfmtable, scaledpoints, relativeid) - local scaledpoints, delta = calculate_scale(tfmtable, scaledpoints, relativeid) + local scaledpoints, delta, units = calculate_scale(tfmtable, scaledpoints, relativeid) if enable_auto_r_scale and relativeid then -- for the moment this is rather context specific local relativedata = fontdata[relativeid] local id_x_height = relativedata and relativedata.parameters and relativedata.parameters.x_height local tf_x_height = id_x_height and tfmtable.parameters and tfmtable.parameters.x_height * delta if tf_x_height then scaledpoints = (id_x_height/tf_x_height) * scaledpoints - delta = scaledpoints/(tfmtable.units or 1000) + delta = scaledpoints/units end end - return scaledpoints, delta + return scaledpoints, delta, units end --~ table.insert(readers.sequence,1,'vtf') |