diff options
| author | Philipp Gesang <phg@phi-gamma.net> | 2015-06-13 00:40:45 +0200 |
|---|---|---|
| committer | Philipp Gesang <phg@phi-gamma.net> | 2015-06-13 00:40:45 +0200 |
| commit | 90f398e1c9d2896b2d30d0b66f9c8a88255511a8 (patch) | |
| tree | 88459ad0c6986a6648c969726081248cd5c8d74e /src/fontloader/misc/fontloader-fonts-inj.lua | |
| parent | c4c4901173b0f4284534db1b6a3cfe865b05e15c (diff) | |
| parent | b271e253b40cd0af97f6d50f0461f87ad1ed5314 (diff) | |
| download | luaotfload-90f398e1c9d2896b2d30d0b66f9c8a88255511a8.tar.gz | |
Merge pull request #274 from phi-gamma/master
pull in current state of affairs
Diffstat (limited to 'src/fontloader/misc/fontloader-fonts-inj.lua')
| -rw-r--r-- | src/fontloader/misc/fontloader-fonts-inj.lua | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/fontloader/misc/fontloader-fonts-inj.lua b/src/fontloader/misc/fontloader-fonts-inj.lua index cb9ed89..332e920 100644 --- a/src/fontloader/misc/fontloader-fonts-inj.lua +++ b/src/fontloader/misc/fontloader-fonts-inj.lua @@ -647,10 +647,10 @@ local function inject_cursives(glyphs,nofglyphs) end end -local function inject_kerns(head,glyphs,nofglyphs) +local function inject_kerns(head,list,length) -- todo: pre/post/replace - for i=1,#glyphs do - local n = glyphs[i] + for i=1,length do + local n = list[i] local pn = rawget(properties,n) if pn then local i = rawget(pn,"injections") @@ -688,6 +688,9 @@ local function inject_everything(head,where) end inject_kerns(head,glyphs,nofglyphs) end + if nofmarks > 0 then + inject_kerns(head,marks,nofmarks) + end if keepregisteredcounts then keepregisteredcounts = false else @@ -998,7 +1001,7 @@ local function inject_pairs_only(head,where) if getsubtype(n) < 256 then local p = rawget(properties,n) if p then - local i = rawget(pn,"replaceinjections") + local i = rawget(p,"replaceinjections") if i then local yoffset = i.yoffset if yoffset and yoffset ~= 0 then |