From 43e07194f3d4d72b1eb2ebb6511209288664ca1a Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Tue, 12 May 2015 21:30:10 +0200
Subject: [fontloader] sync with Context as of 2015-05-12

---
 src/fontloader/misc/fontloader-fonts-inj.lua     | 11 +++++++----
 src/fontloader/runtime/fontloader-fontloader.lua | 13 ++++++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'src/fontloader')

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
diff --git a/src/fontloader/runtime/fontloader-fontloader.lua b/src/fontloader/runtime/fontloader-fontloader.lua
index c46c168..ead4e2a 100644
--- a/src/fontloader/runtime/fontloader-fontloader.lua
+++ b/src/fontloader/runtime/fontloader-fontloader.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 05/04/15 19:00:43
+-- merge date  : 05/12/15 17:57:50
 
 do -- begin closure to overcome local limits and interference
 
@@ -10509,9 +10509,9 @@ local function inject_cursives(glyphs,nofglyphs)
     end
   end
 end
-local function inject_kerns(head,glyphs,nofglyphs)
-  for i=1,#glyphs do
-    local n=glyphs[i]
+local function inject_kerns(head,list,length)
+  for i=1,length do
+    local n=list[i]
     local pn=rawget(properties,n)
     if pn then
       local i=rawget(pn,"injections")
@@ -10548,6 +10548,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
@@ -10838,7 +10841,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
-- 
cgit v1.2.3