[fontloader] sync with Context as of 2016-05-31

This corresponds to commit a274872832cd on the mirror repo. The changes
since then were numerous but seem to introduce a couple new files we
didn’t ask for =) Later.

4 files changed, 48 insertions, 31 deletions

diff --git a/src/fontloader/misc/fontloader-font-con.lua b/src/fontloader/misc/fontloader-font-con.lua
index 45ecdd6..367f807 100644
--- a/src/fontloader/misc/fontloader-font-con.lua
+++ b/src/fontloader/misc/fontloader-font-con.lua
@@ -337,6 +337,20 @@ function constructors.enhanceparameters(parameters)
     }
 end
 
+local function mathkerns(v,vdelta)
+    local k = { }
+    for i=1,#v do
+        local entry  = v[i]
+        local height = entry.height
+        local kern   = entry.kern
+        k[i] = {
+            height = height and vdelta*height or 0,
+            kern   = kern   and vdelta*kern   or 0,
+        }
+    end
+    return k
+end
+
 function constructors.scale(tfmdata,specification)
     local target         = { } -- the new table
     --
@@ -748,22 +762,15 @@ function constructors.scale(tfmdata,specification)
                 chr.top_accent = vdelta*va
             end
             if stackmath then
-                local mk = character.mathkerns -- not in math ?
+                local mk = character.mathkerns
                 if mk then
-                    local kerns = { }
-                    local v = mk.top_right    if v then local k = { } for i=1,#v do local vi = v[i]
-                        k[i] = { height = vdelta*vi.height, kern = vdelta*vi.kern }
-                    end     kerns.top_right    = k end
-                    local v = mk.top_left     if v then local k = { } for i=1,#v do local vi = v[i]
-                        k[i] = { height = vdelta*vi.height, kern = vdelta*vi.kern }
-                    end     kerns.top_left     = k end
-                    local v = mk.bottom_left  if v then local k = { } for i=1,#v do local vi = v[i]
-                        k[i] = { height = vdelta*vi.height, kern = vdelta*vi.kern }
-                    end     kerns.bottom_left  = k end
-                    local v = mk.bottom_right if v then local k = { } for i=1,#v do local vi = v[i]
-                        k[i] = { height = vdelta*vi.height, kern = vdelta*vi.kern }
-                    end     kerns.bottom_right = k end
-                    chr.mathkern = kerns -- singular -> should be patched in luatex !
+                    local tr, tl, br, bl = mk.topright, mk.topleft, mk.bottomright, mk.bottomleft
+                    chr.mathkern = { -- singular -> should be patched in luatex !
+                        top_right    = tr and mathkerns(tr,vdelta) or nil,
+                        top_left     = tl and mathkerns(tl,vdelta) or nil,
+                        bottom_right = br and mathkerns(br,vdelta) or nil,
+                        bottom_left  = bl and mathkerns(bl,vdelta) or nil,
+                    }
                 end
             end
             if hasitalics then
diff --git a/src/fontloader/misc/fontloader-font-dsp.lua b/src/fontloader/misc/fontloader-font-dsp.lua
index e265f48..37ae166 100644
--- a/src/fontloader/misc/fontloader-font-dsp.lua
+++ b/src/fontloader/misc/fontloader-font-dsp.lua
@@ -715,6 +715,8 @@ function gsubhandlers.single(f,fontdata,lookupid,lookupoffset,offset,glyphs,nofg
     end
 end
 
+-- we see coverage format 0x300 in some old ms fonts
+
 local function sethandler(f,fontdata,lookupid,lookupoffset,offset,glyphs,nofglyphs,what)
     local tableoffset = lookupoffset + offset
     setposition(f,tableoffset)
@@ -1628,12 +1630,12 @@ do
                                 if not h then
                                     -- here we have a lookup that is used independent as well
                                     -- as in another one
-                                    nofsublookups = nofsublookups + 1
-                                 -- report("registering %i as sublookup %i",lookupid,nofsublookups)
                                     local lookup = lookups[lookupid]
                                     if lookup then
                                         local d = lookup.done
                                         if d then
+                                            nofsublookups = nofsublookups + 1
+                                         -- report("registering %i as sublookup %i",lookupid,nofsublookups)
                                             h = {
                                                 index     = nofsublookups, -- handy for tracing
                                                 name      = f_lookupname(lookupprefix,"d",lookupid+lookupidoffset),
@@ -2027,16 +2029,15 @@ local function readmathglyphinfo(f,fontdata,offset)
             local function get(offset)
                 setposition(f,kernoffset+offset)
                 local n = readushort(f)
-                if n > 0 then
+                if n == 0 then
+                    local k = readmathvalue(f)
+                    if k == 0 then
+                        -- no need for it (happens sometimes)
+                    else
+                        return { { kern = k } }
+                    end
+                else
                     local l = { }
-                 -- for i=1,n do
-                 --     l[i] = { readushort(f), 0 } -- height, kern
-                 --     skipshort(f)
-                 -- end
-                 -- for i=1,n do
-                 --     l[i][2] = readushort(f)
-                 --     skipshort(f)
-                 -- end
                     for i=1,n do
                         l[i] = { height = readmathvalue(f) }
                     end
@@ -2071,10 +2072,10 @@ local function readmathglyphinfo(f,fontdata,offset)
                     if next(kernset) then
                         local glyph = glyphs[coverage[i]]
                         local math  = glyph.math
-                        if not math then
-                            glyph.math = { kerns = kernset }
-                        else
+                        if math then
                             math.kerns = kernset
+                        else
+                            glyph.math = { kerns = kernset }
                         end
                     end
                 end
diff --git a/src/fontloader/misc/fontloader-font-otj.lua b/src/fontloader/misc/fontloader-font-otj.lua
index 61baf93..0db30c6 100644
--- a/src/fontloader/misc/fontloader-font-otj.lua
+++ b/src/fontloader/misc/fontloader-font-otj.lua
@@ -753,7 +753,7 @@ local function inject_pairs_only(head,where)
                         end
                         local leftkern = i.leftkern
                         if leftkern and leftkern ~= 0 then
-                            insert_node_before(head,current,newkern(leftkern))
+                            head = insert_node_before(head,current,newkern(leftkern))
                         end
                         local rightkern = i.rightkern
                         if rightkern and rightkern ~= 0 then
@@ -1521,10 +1521,19 @@ function injections.handler(head,where)
         head = injectspaces(head)
     end
     if nofregisteredmarks > 0 or nofregisteredcursives > 0 then
+        if trace_injections then
+            report_injections("injection variant %a","everything")
+        end
         return inject_everything(head,where)
     elseif nofregisteredpairs > 0 then
+        if trace_injections then
+            report_injections("injection variant %a","pairs")
+        end
         return inject_pairs_only(head,where)
     elseif nofregisteredkerns > 0 then
+        if trace_injections then
+            report_injections("injection variant %a","kerns")
+        end
         return inject_kerns_only(head,where)
     else
         return head, false
diff --git a/src/fontloader/misc/fontloader-font-otl.lua b/src/fontloader/misc/fontloader-font-otl.lua
index 304b6b9..73e3df9 100644
--- a/src/fontloader/misc/fontloader-font-otl.lua
+++ b/src/fontloader/misc/fontloader-font-otl.lua
@@ -53,7 +53,7 @@ local report_otf         = logs.reporter("fonts","otf loading")
 local fonts              = fonts
 local otf                = fonts.handlers.otf
 
-otf.version              = 3.020 -- beware: also sync font-mis.lua and in mtx-fonts
+otf.version              = 3.021 -- beware: also sync font-mis.lua and in mtx-fonts
 otf.cache                = containers.define("fonts", "otl", otf.version, true)
 
 local otfreaders         = otf.readers