From d8ba9c36eaf49c1f28b8e8f11c969b77ece32db4 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Sun, 12 Jun 2016 18:14:33 +0200
Subject: [fontloader] sync with Context as of 2016-06-12

---
 src/fontloader/misc/fontloader-font-con.lua | 51 +++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 7 deletions(-)

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

diff --git a/src/fontloader/misc/fontloader-font-con.lua b/src/fontloader/misc/fontloader-font-con.lua
index 367f807..1a0daff 100644
--- a/src/fontloader/misc/fontloader-font-con.lua
+++ b/src/fontloader/misc/fontloader-font-con.lua
@@ -1049,6 +1049,29 @@ function constructors.hashfeatures(specification) -- will be overloaded
     return "unknown"
 end
 
+-- hashmethods.normal = function(list)
+--     local s = { }
+--     local n = 0
+--     for k, v in next, list do
+--         if not k then
+--             -- no need to add to hash
+--         elseif k == "number" or k == "features" then
+--             -- no need to add to hash (maybe we need a skip list)
+--         else
+--             n = n + 1
+--             s[n] = k
+--         end
+--     end
+--     if n > 0 then
+--         sort(s)
+--         for i=1,n do
+--             local k = s[i]
+--             s[i] = k .. '=' .. tostring(list[k])
+--         end
+--         return concat(s,"+")
+--     end
+-- end
+
 hashmethods.normal = function(list)
     local s = { }
     local n = 0
@@ -1059,15 +1082,11 @@ hashmethods.normal = function(list)
             -- no need to add to hash (maybe we need a skip list)
         else
             n = n + 1
-            s[n] = k
+            s[n] = k .. '=' .. tostring(v)
         end
     end
     if n > 0 then
         sort(s)
-        for i=1,n do
-            local k = s[i]
-            s[i] = k .. '=' .. tostring(list[k])
-        end
         return concat(s,"+")
     end
 end
@@ -1236,7 +1255,11 @@ function constructors.getfeatureaction(what,where,mode,name)
     end
 end
 
-function constructors.newhandler(what) -- could be a metatable newindex
+local newhandler        = { }
+constructors.handlers   = newhandler -- downward compatible
+constructors.newhandler = newhandler
+
+local function setnewhandler(what) -- could be a metatable newindex
     local handler = handlers[what]
     if not handler then
         handler = { }
@@ -1245,7 +1268,16 @@ function constructors.newhandler(what) -- could be a metatable newindex
     return handler
 end
 
-function constructors.newfeatures(what) -- could be a metatable newindex
+setmetatable(newhandler, {
+    __call  = function(t,k) local v = t[k] return v end,
+    __index = function(t,k) local v = setnewhandler(k) t[k] = v return v end,
+})
+
+local newfeatures        = { }
+constructors.newfeatures = newfeatures -- downward compatible
+constructors.features    = newfeatures
+
+local function setnewfeatures(what)
     local handler = handlers[what]
     local features = handler.features
     if not features then
@@ -1265,6 +1297,11 @@ function constructors.newfeatures(what) -- could be a metatable newindex
     return features
 end
 
+setmetatable(newfeatures, {
+    __call  = function(t,k) local v = t[k] return v end,
+    __index = function(t,k) local v = setnewfeatures(k) t[k] = v return v end,
+})
+
 --[[ldx--
 <p>We need to check for default features. For this we provide
 a helper function.</p>
-- 
cgit v1.2.3