summaryrefslogtreecommitdiff
path: root/src/fontloader/misc/fontloader-font-otj.lua
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2016-04-25 23:21:28 +0200
committerPhilipp Gesang <phg@phi-gamma.net>2016-04-25 23:21:28 +0200
commitf5ae057cbe8d00ec09269080ee152fd52dfa931f (patch)
tree5943e53385184389c2b7247212392f072bf075e7 /src/fontloader/misc/fontloader-font-otj.lua
parent88636ab5075bad0fdd6c635629fc29a9f95d8cbc (diff)
downloadluaotfload-f5ae057cbe8d00ec09269080ee152fd52dfa931f.tar.gz
[fontloader] sync with Context as of 2016-04-25
Diffstat (limited to 'src/fontloader/misc/fontloader-font-otj.lua')
-rw-r--r--src/fontloader/misc/fontloader-font-otj.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fontloader/misc/fontloader-font-otj.lua b/src/fontloader/misc/fontloader-font-otj.lua
index aae70d1..ebda723 100644
--- a/src/fontloader/misc/fontloader-font-otj.lua
+++ b/src/fontloader/misc/fontloader-font-otj.lua
@@ -49,8 +49,8 @@ local attributes, nodes, node = attributes, nodes, node
fonts = fonts
local hashes = fonts.hashes
local fontdata = hashes.identifiers
-local parameters = fonts.hashes.parameters
-local resources = fonts.hashes.resources
+----- parameters = fonts.hashes.parameters -- not in generic
+----- resources = fonts.hashes.resources -- not in generic
nodes.injections = nodes.injections or { }
local injections = nodes.injections
@@ -1444,7 +1444,7 @@ local function injectspaces(head)
-- end
leftkerns = trig.left
rightkerns = trig.right
- local par = parameters[font]
+ local par = fontdata[font].parameters -- fallback for generic
factor = par.factor
threshold = par.spacing.width - 1 -- get rid of rounding errors
lastfont = font