From 39be501f308c8bdea7a36b0b366edebc21d4f382 Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Tue, 4 Aug 2020 12:04:53 +0200
Subject: 2020-08-04 10:26:00

---
 tex/context/base/mkiv/luat-fio.lmt | 47 ++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 15 deletions(-)

(limited to 'tex/context/base/mkiv/luat-fio.lmt')

diff --git a/tex/context/base/mkiv/luat-fio.lmt b/tex/context/base/mkiv/luat-fio.lmt
index 4ce981c48..c70ed54e4 100644
--- a/tex/context/base/mkiv/luat-fio.lmt
+++ b/tex/context/base/mkiv/luat-fio.lmt
@@ -26,7 +26,6 @@ if not resolvers.initialized() then
     if callback then
 
         local findbinfile = resolvers.findbinfile
-        local loadbinfile = resolvers.loadbinfile
         local findtexfile = resolvers.findtexfile
         local opentexfile = resolvers.opentexfile
         local register    = callbacks.register
@@ -44,23 +43,41 @@ if not resolvers.initialized() then
             return line
         end
 
-        local function find_data_file(name, index)
-            if index == 0 then
-                return "terminal"
-            else
-                return findbinfile(name,"tex")
-            end
-        end
-
-        local function open_data_file(name, index)
-            if index == 0 and name == "terminal" then
+     -- local function find_data_file(name)
+     --     if not name or name == "" then
+     --         return "context terminal"
+     --     else
+     --         return findbinfile(name,"tex")
+     --     end
+     -- end
+     --
+     -- local function open_data_file(name)
+     --     if not name or name == "" or name == "context terminal" then
+     --         return {
+     --             reader   = terminal,
+     --             noflines = 1,
+     --             filename = name,
+     --         }
+     --     else
+     --         name = opentexfile(name)
+     --         return name ~= "" and name or false
+     --     end
+     -- end
+
+        local function open_data_file(name)
+            if not name or name == "" then
                 return {
                     reader   = terminal,
                     noflines = 1,
-                    filename = name,
+                    filename = "context terminal"
                 }
             else
-                return opentexfile(name)
+                local fullname = findbinfile(name,"tex")
+                if fullname then
+                    return opentexfile(fullname)
+                else
+                    return false
+                end
             end
         end
 
@@ -68,10 +85,10 @@ if not resolvers.initialized() then
             return name
         end
 
-        register('find_data_file'  , find_data_file, true)
-        register('open_data_file'  , open_data_file, true)
         register('find_log_file'   , find_any_file,  true)
         register('find_format_file', find_any_file,  true)
+     -- register('find_data_file'  , find_data_file, true)
+        register('open_data_file'  , open_data_file, true)
 
     end
 
-- 
cgit v1.2.3