From 654f5f46c8c7bc43b73ce46035f3f6c1d5e9bbe5 Mon Sep 17 00:00:00 2001
From: Khaled Hosny <khaledhosny@eglug.org>
Date: Wed, 2 Mar 2011 20:10:46 +0200
Subject: Sync with ConTeXt 2011.02.25 22:03

This commit overrides all our local modification to ConTeXt file and is
not tested at all.
---
 otfl-luat-dum.lua | 54 +++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 19 deletions(-)

(limited to 'otfl-luat-dum.lua')

diff --git a/otfl-luat-dum.lua b/otfl-luat-dum.lua
index bd10e89..e0b6292 100644
--- a/otfl-luat-dum.lua
+++ b/otfl-luat-dum.lua
@@ -7,6 +7,7 @@ if not modules then modules = { } end modules ['luat-dum'] = {
 }
 
 local dummyfunction = function() end
+local dummyreporter = function(c) return function(...) texio.write(c .. " : " .. string.format(...)) end end
 
 statistics = {
     register      = dummyfunction,
@@ -34,9 +35,10 @@ storage = { -- probably no longer needed
     shared        = { },
 }
 logs = {
-    new           = function() return dummyfunction end,
+    new           = dummyreporter,
+    reporter      = dummyreporter,
+    messenger     = dummyreporter,
     report        = dummyfunction,
-    simple        = dummyfunction,
 }
 callbacks = {
     register = function(n,f) return callback.register(n,f) end,
@@ -62,15 +64,19 @@ local remapper = {
     otf   = "opentype fonts",
     ttf   = "truetype fonts",
     ttc   = "truetype fonts",
-    dfont = "truetype fonts",
+    dfont = "truetype fonts", -- "truetype dictionary",
     cid   = "cid maps",
     fea   = "font feature files",
 }
 
 function resolvers.findfile(name,kind)
     name = string.gsub(name,"\\","\/")
-    kind = string.lower(kind)
-    return kpse.find_file(name,(kind and kind ~= "" and (remapper[kind] or kind)) or file.extname(name,"tex"))
+    kind = kind and string.lower(kind)
+    local found = kpse.find_file(name,(kind and kind ~= "" and (remapper[kind] or kind)) or file.extname(name,"tex"))
+    if not found or found == "" then
+        found = kpse.find_file(name,"other text file")
+    end
+    return found
 end
 
 function resolvers.findbinfile(name,kind)
@@ -80,6 +86,14 @@ function resolvers.findbinfile(name,kind)
     return resolvers.findfile(name,(kind and remapper[kind]) or kind)
 end
 
+function resolvers.resolve(s)
+    return s
+end
+
+function resolvers.unresolve(s)
+    return s
+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
@@ -98,41 +112,43 @@ end
 
 do
 
-    local cachepaths
+    local cachepaths = kpse.expand_path('$TEXMFCACHE') or ""
+
+    if cachepaths == "" then
+        cachepaths = kpse.expand_path('$TEXMFVAR')
+    end
 
-    if kpse.expand_var('$TEXMFCACHE') ~= '$TEXMFCACHE' then
-        cachepaths = kpse.expand_var('$TEXMFCACHE')
-    elseif kpse.expand_var('$TEXMFVAR') ~= '$TEXMFVAR' then
-        cachepaths = kpse.expand_var('$TEXMFVAR')
+    if cachepaths == "" then
+        cachepaths = kpse.expand_path('$VARTEXMF')
     end
 
-    if not cachepaths then
+    if cachepaths == "" then
         cachepaths = "."
     end
 
     cachepaths = string.split(cachepaths,os.type == "windows" and ";" or ":")
 
     for i=1,#cachepaths do
-        local done
-        writable = file.join(cachepaths[i], "luatex-cache")
-        writable = file.join(writable,caches.namespace)
-        writable, done = dir.mkdirs(writable)
-        if done then
+        if file.is_writable(cachepaths[i]) then
+            writable = file.join(cachepaths[i],"luatex-cache")
+            lfs.mkdir(writable)
+            writable = file.join(writable,caches.namespace)
+            lfs.mkdir(writable)
             break
         end
     end
 
     for i=1,#cachepaths do
-        if file.isreadable(cachepaths[i]) then
+        if file.is_readable(cachepaths[i]) then
             readables[#readables+1] = file.join(cachepaths[i],"luatex-cache",caches.namespace)
         end
     end
 
     if not writable then
-        texio.write_nl("quiting: fix your writable cache path\n")
+        texio.write_nl("quiting: fix your writable cache path")
         os.exit()
     elseif #readables == 0 then
-        texio.write_nl("quiting: fix your readable cache path\n")
+        texio.write_nl("quiting: fix your readable cache path")
         os.exit()
     elseif #readables == 1 and readables[1] == writable then
         texio.write(string.format("(using cache: %s)",writable))
-- 
cgit v1.2.3