From 35b2a3dcf659cafd035db36393bd178bced1dabd Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Sat, 30 Jul 2016 11:08:03 +0200
Subject: [fontloader] sync with Context as of 2016-07-30

Hans appears to have heard our pleas =)
---
 src/fontloader/misc/fontloader-font-tfm.lua | 44 +++++++----------------------
 1 file changed, 10 insertions(+), 34 deletions(-)

(limited to 'src/fontloader/misc/fontloader-font-tfm.lua')

diff --git a/src/fontloader/misc/fontloader-font-tfm.lua b/src/fontloader/misc/fontloader-font-tfm.lua
index 6565a0e..6584190 100644
--- a/src/fontloader/misc/fontloader-font-tfm.lua
+++ b/src/fontloader/misc/fontloader-font-tfm.lua
@@ -31,10 +31,14 @@ tfm.maxnestingdepth            = 5
 tfm.maxnestingsize             = 65536*1024
 
 local otf                      = fonts.handlers.otf
+local otfenhancers             = otf.enhancers
 
 local tfmfeatures              = constructors.features.tfm
 local registertfmfeature       = tfmfeatures.register
 
+local tfmenhancers             = constructors.enhancers.tfm
+local registertfmenhancer      = tfmenhancers.register
+
 constructors.resolvevirtualtoo = false -- wil be set in font-ctx.lua
 
 fonts.formats.tfm              = "type1" -- we need to have at least a value here
@@ -73,38 +77,7 @@ function tfm.setfeatures(tfmdata,features)
     end
 end
 
-local depth     = { } -- table.setmetatableindex("number")
-local enhancers = { }
-
-local steps     = {
-    "normalize features",
-    "check extra features"
-}
-
--- otf.enhancers.register("check extra features",enhance)
-
-enhancers["check extra features"] = otf.enhancers.enhance
-
---[[ PHG: begin hack for Luaotfload ]]--
-luaotfload_tfm_enhancers_reregister = function ()
-  enhancers["check extra features"]=otf.enhancers.enhance
-end
---[[ PHG: end hack for Luaotfload ]]--
-
-local function applyenhancers(data,filename)
-    for i=1,#steps do
-        local step     = steps[i]
-        local enhancer = enhancers[step]
-        if enhancer then
-            if trace_loading then
-                report_tfm("applying enhancer %a",step)
-            end
-            enhancer(data,filename)
-        else
-            report_tfm("invalid enhancer %a",step)
-        end
-    end
-end
+local depth = { } -- table.setmetatableindex("number")
 
 -- Normally we just load the tfm data and go on. However there was some demand for
 -- loading good old tfm /pfb files where afm files were lacking and even enc files
@@ -220,7 +193,7 @@ local function read_from_tfm(specification)
             --
             -- We make a pseudo opentype font, e.g. kerns and ligatures etc:
             --
-            applyenhancers(tfmdata,filename)
+            tfmenhancers.apply(tfmdata,filename)
             --
             -- Now user stuff can kick in.
             --
@@ -622,7 +595,7 @@ do
     local everywhere = { ["*"] = { ["*"] = true } } -- or: { ["*"] = { "*" } }
     local noflags    = { false, false, false, false }
 
-    enhancers["normalize features"] = function(data)
+    local function enhance_normalize_features(data)
         local ligatures  = setmetatableindex("table")
         local kerns      = setmetatableindex("table")
         local characters = data.characters
@@ -708,6 +681,9 @@ do
         data.shared.resources = data.shared.resources or resources
     end
 
+    registertfmenhancer("normalize features",   enhance_normalize_features)
+    registertfmenhancer("check extra features", otfenhancers.enhance)
+
 end
 
 -- As with type one (afm) loading, we just use the opentype ones:
-- 
cgit v1.2.3