1 files changed, 67 insertions, 2 deletions

diff --git a/Master/texmf-dist/tex/context/base/luat-dum.lua b/Master/texmf-dist/tex/context/base/luat-dum.lua
index 699a0feefa6..4530c2ef34e 100644
--- a/Master/texmf-dist/tex/context/base/luat-dum.lua
+++ b/Master/texmf-dist/tex/context/base/luat-dum.lua
@@ -13,11 +13,21 @@ statistics = {
     starttiming   = dummyfunction,
     stoptiming    = dummyfunction,
 }
+directives = {
+    register      = dummyfunction,
+    enable        = dummyfunction,
+    disable       = dummyfunction,
+}
 trackers = {
     register      = dummyfunction,
     enable        = dummyfunction,
     disable       = dummyfunction,
 }
+experiments = {
+    register      = dummyfunction,
+    enable        = dummyfunction,
+    disable       = dummyfunction,
+}
 storage = {
     register      = dummyfunction,
     shared        = { },
@@ -32,6 +42,9 @@ tasks = {
     appendaction  = dummyfunction,
     prependaction = dummyfunction,
 }
+callbacks = {
+    register = function(n,f) return callback.register(n,f) end,
+}
 
 -- we need to cheat a bit here
 
@@ -44,13 +57,14 @@ local remapper = {
     ttf   = "truetype fonts",
     ttc   = "truetype fonts",
     dfont = "truetype dictionary",
-    cid   = "other text files", -- will become "cid files"
+    cid   = "cid maps",
+    fea   = "font feature files",
 }
 
 function resolvers.find_file(name,kind)
     name = string.gsub(name,"\\","\/")
     kind = string.lower(kind)
-    return kpse.find_file(name,(kind and kind ~= "" and (remapper[kind] or kind)) or "tex")
+    return kpse.find_file(name,(kind and kind ~= "" and (remapper[kind] or kind)) or file.extname(name,"tex"))
 end
 
 function resolvers.findbinfile(name,kind)
@@ -59,3 +73,54 @@ function resolvers.findbinfile(name,kind)
     end
     return resolvers.find_file(name,(kind and remapper[kind]) or kind)
 end
+
+-- Caches ... I will make a real stupid version some day when I'm in the
+-- mood. After all, the generic code does not need the more advanced
+-- ConTeXt features. Cached data is not shared between ConTeXt and other
+-- usage as I don't want any dependency at all. Also, ConTeXt might have
+-- different needs and tricks added.
+
+caches = { }
+
+--~ containers.usecache = true
+
+function caches.setpath(category,subcategory)
+    local root = kpse.var_value("TEXMFCACHE") or ""
+    if root == "" then
+        root = kpse.var_value("VARTEXMF") or ""
+    end
+    if root ~= "" then
+        root = file.join(root,category)
+        lfs.mkdir(root)
+        root = file.join(root,subcategory)
+        lfs.mkdir(root)
+        return lfs.isdir(root) and root
+    end
+end
+
+local function makefullname(path,name)
+    if path and path ~= "" then
+        name = "temp-" and name -- clash prevention
+        return file.addsuffix(file.join(path,name),"lua")
+    end
+end
+
+function caches.iswritable(path,name)
+    local fullname = makefullname(path,name)
+    return fullname and file.iswritable(fullname)
+end
+
+function caches.loaddata(path,name)
+    local fullname = makefullname(path,name)
+    if fullname then
+        local data = loadfile(fullname)
+        return data and data()
+    end
+end
+
+function caches.savedata(path,name,data)
+    local fullname = makefullname(path,name)
+    if fullname then
+        table.tofile(fullname,data,'return',false,true,false)
+    end
+end