2019-05-25 10:53:00

8 files changed, 195 insertions, 212 deletions

diff --git a/scripts/context/lua/mtx-check.lua b/scripts/context/lua/mtx-check.lua
index 16b9cb64a..90f358cce 100644
--- a/scripts/context/lua/mtx-check.lua
+++ b/scripts/context/lua/mtx-check.lua
@@ -184,6 +184,9 @@ local grammars = {
     tex  = contextgrammar,
     mkii = contextgrammar,
     mkiv = contextgrammar,
+    mkvi = contextgrammar,
+    mkil = contextgrammar,
+    mkli = contextgrammar,
 }
 
 function validator.check(str,filetype)
diff --git a/scripts/context/lua/mtx-context.lua b/scripts/context/lua/mtx-context.lua
index 17867234d..4beb32a94 100644
--- a/scripts/context/lua/mtx-context.lua
+++ b/scripts/context/lua/mtx-context.lua
@@ -12,7 +12,7 @@ if not modules then modules = { } end modules['mtx-context'] = {
 local type, next, tostring, tonumber = type, next, tostring, tonumber
 local format, gmatch, match, gsub, find = string.format, string.gmatch, string.match, string.gsub, string.find
 local quote, validstring = string.quote, string.valid
-local sort, concat, insert, sortedhash = table.sort, table.concat, table.insert, table.sortedhash
+local sort, concat, insert, sortedhash, tohash = table.sort, table.concat, table.insert, table.sortedhash, table.tohash
 local settings_to_array = utilities.parsers.settings_to_array
 local appendtable = table.append
 local lpegpatterns, lpegmatch, Cs, P = lpeg.patterns, lpeg.match, lpeg.Cs, lpeg.P
@@ -34,7 +34,7 @@ local formatters    = string.formatters
 
 local application = logs.application {
     name     = "mtx-context",
-    banner   = "ConTeXt Process Management 1.02",
+    banner   = "ConTeXt Process Management 1.03",
  -- helpinfo = helpinfo, -- table with { category_a = text_1, category_b = text_2 } or helpstring or xml_blob
     helpinfo = "mtx-context.xml",
 }
@@ -1233,7 +1233,7 @@ function scripts.context.autoctx()
             if chunk then
                 ctxname = match(chunk,"<%?context%-directive%s+job%s+ctxfile%s+([^ ]-)%s*?>")
             end
-        elseif suffix == "tex" or suffix == "mkiv" then
+        elseif suffix == "tex" or suffix == "mkiv" or suffix == "mkil" then
             local analysis = preamble_analyze(firstfile)
             ctxname = analysis.ctxfile or analysis.ctx
         end
@@ -1342,15 +1342,15 @@ function scripts.context.purge_job(jobname,all,mkiitoo,fulljobname)
 end
 
 function scripts.context.purge(all,pattern,mkiitoo)
-    local all = all or getargument("all")
-    local pattern = getargument("pattern") or (pattern and (pattern.."*")) or "*.*"
-    local files = dir.glob(pattern)
-    local obsolete = table.tohash(obsolete_results)
-    local temporary = table.tohash(temporary_runfiles)
-    local synctex = table.tohash(synctex_runfiles)
-    local persistent = table.tohash(persistent_runfiles)
-    local generic = table.tohash(generic_files)
-    local deleted = { }
+    local all        = all or getargument("all")
+    local pattern    = getargument("pattern") or (pattern and (pattern.."*")) or "*.*"
+    local files      = dir.glob(pattern)
+    local obsolete   = tohash(obsolete_results)
+    local temporary  = tohash(temporary_runfiles)
+    local synctex    = tohash(synctex_runfiles)
+    local persistent = tohash(persistent_runfiles)
+    local generic    = tohash(generic_files)
+    local deleted    = { }
     for i=1,#files do
         local name = files[i]
         local suffix = filesuffix(name)
@@ -1429,17 +1429,19 @@ local function touchfiles(suffix,kind,path)
     end
 end
 
+local tobetouched = tohash { "mkii", "mkiv", "mkvi", "mkil", "mkli" }
+
 function scripts.context.touch()
     if getargument("expert") then
         local touch = getargument("touch")
         local kind  = getargument("kind")
         local path  = getargument("basepath")
-        if touch == "mkii" or touch == "mkiv" or touch == "mkvi" then -- mkix mkxi
+        if tobetouched[touch] then -- mkix mkxi ctix ctxi
             touchfiles(touch,kind,path)
         else
-            touchfiles("mkii",kind,path)
-            touchfiles("mkiv",kind,path)
-            touchfiles("mkvi",kind,path)
+            for touch in sortedhash(tobetouched) do
+                touchfiles(touch,kind,path)
+            end
         end
     else
         report("touching needs --expert")
@@ -1449,7 +1451,8 @@ end
 -- modules
 
 local labels = { "title", "comment", "status" }
-local cards  = { "*.mkvi", "*.mkiv", "*.mkxi", "*.mkix", "*.tex" }
+local cards  = { "*.mkiv", "*.mkvi",  "*.mkix", "*.mkxi", "*.mkil", "*.mkli", "*.tex" }
+local valid  = tohash { "mkiv", "mkvi", "mkix", "mkxi", "mkil", "mkli", "tex" }
 
 function scripts.context.modules(pattern)
     local list = { }
@@ -1475,7 +1478,7 @@ function scripts.context.modules(pattern)
         if not done[base] then
             done[base] = true
             local suffix = filesuffix(base)
-            if suffix == "tex" or suffix == "mkiv" or suffix == "mkvi" or suffix == "mkix" or suffix == "mkxi" then
+            if valid[suffix] then
                 local prefix, rest = match(base,"^([xmst])%-(.*)")
                 if prefix then
                     v = resolvers.findfile(base) -- so that files on my dev path are seen
@@ -1595,147 +1598,147 @@ function scripts.context.logcategories()
     scripts.context.run()
 end
 
--- updating (often one will use mtx-update instead)
-
 function scripts.context.timed(action)
     statistics.timed(action,true)
 end
 
-local zipname     = "cont-tmf.zip"
-local mainzip     = "http://www.pragma-ade.com/context/latest/" .. zipname
-local validtrees  = { "texmf-local", "texmf-context" }
-local selfscripts = { "mtxrun.lua" } -- was: { "luatools.lua", "mtxrun.lua" }
-
-function zip.loaddata(zipfile,filename) -- should be in zip lib
-    local f = zipfile:open(filename)
-    if f then
-        local data = f:read("*a")
-        f:close()
-        return data
-    end
-    return nil
-end
-
-function scripts.context.update()
-    local force = getargument("force")
-    local socket = require("socket")
-    local http   = require("socket.http")
-    local basepath = resolvers.findfile("context.mkiv") or ""
-    if basepath == "" then
-        report("quiting, no 'context.mkiv' found")
-        return
-    end
-    local basetree = basepath.match(basepath,"^(.-)tex/context/base/.*context.mkiv$") or ""
-    if basetree == "" then
-        report("quiting, no proper tds structure (%s)",basepath)
-        return
-    end
-    local function is_okay(basetree)
-        for _, tree in next, validtrees do
-            local pattern = gsub(tree,"%-","%%-")
-            if find(basetree,pattern) then
-                return tree
-            end
-        end
-        return false
-    end
-    local okay = is_okay(basetree)
-    if not okay then
-        report("quiting, tree '%s' is protected",okay)
-        return
-    else
-        report("updating tree '%s'",okay)
-    end
-    if not lfs.chdir(basetree) then
-        report("quiting, unable to change to '%s'",okay)
-        return
-    end
-    report("fetching '%s'",mainzip)
-    local latest = http.request(mainzip)
-    if not latest then
-        report("context tree '%s' can be updated, use --force",okay)
-        return
-    end
-    io.savedata("cont-tmf.zip",latest)
-    if false then
-        -- variant 1
-        os.execute("mtxrun --script unzip cont-tmf.zip")
-    else
-        -- variant 2
-        local zipfile = zip.open(zipname)
-        if not zipfile then
-            report("quiting, unable to open '%s'",zipname)
-            return
-        end
-        local newfile = zip.loaddata(zipfile,"tex/context/base/mkiv/context.mkiv")
-        if not newfile then
-            report("quiting, unable to open '%s'","context.mkiv")
-            return
-        end
-        local oldfile = io.loaddata(resolvers.findfile("context.mkiv")) or ""
-        local function versiontonumber(what,str)
-            local version = match(str,"\\edef\\contextversion{(.-)}") or ""
-            local year, month, day, hour, minute = match(str,"\\edef\\contextversion{(%d+)%.(%d+)%.(%d+) *(%d+)%:(%d+)}")
-            if year and minute then
-                local time = os.time { year=year,month=month,day=day,hour=hour,minute=minute}
-                report("%s version: %s (%s)",what,version,time)
-                return time
-            else
-                report("%s version: %s (unknown)",what,version)
-                return nil
-            end
-        end
-        local oldversion = versiontonumber("old",oldfile)
-        local newversion = versiontonumber("new",newfile)
-        if not oldversion or not newversion then
-            report("quiting, version cannot be determined")
-            return
-        elseif oldversion == newversion then
-            report("quiting, your current version is up-to-date")
-            return
-        elseif oldversion > newversion then
-            report("quiting, your current version is newer")
-            return
-        end
-        for k in zipfile:files() do
-            local filename = k.filename
-            if find(filename,"/$") then
-                lfs.mkdir(filename)
-            else
-                local data = zip.loaddata(zipfile,filename)
-                if data then
-                    if force then
-                        io.savedata(filename,data)
-                    end
-                    report(filename)
-                end
-            end
-        end
-        for _, scriptname in next, selfscripts do
-            local oldscript = resolvers.findfile(scriptname) or ""
-            if oldscript ~= "" and is_okay(oldscript) then
-                local newscript = "./scripts/context/lua/" .. scriptname
-                local data = io.loaddata(newscript) or ""
-                if data ~= "" then
-                    report("replacing script '%s' by '%s'",oldscript,newscript)
-                    if force then
-                        io.savedata(oldscript,data)
-                    end
-                end
-            else
-                report("keeping script '%s'",oldscript)
-            end
-        end
-        if force then
-            scripts.context.make()
-        end
-    end
-    if force then
-        report("context tree '%s' has been updated",okay)
-    else
-        report("context tree '%s' can been updated (use --force)",okay)
-    end
-end
+-- -- updating (often one will use mtx-update instead)
+--
+-- local zipname     = "cont-tmf.zip"
+-- local mainzip     = "http://www.pragma-ade.com/context/latest/" .. zipname
+-- local validtrees  = { "texmf-local", "texmf-context" }
+-- local selfscripts = { "mtxrun.lua" } -- was: { "luatools.lua", "mtxrun.lua" }
+--
+-- function zip.loaddata(zipfile,filename) -- should be in zip lib
+--     local f = zipfile:open(filename)
+--     if f then
+--         local data = f:read("*a")
+--         f:close()
+--         return data
+--     end
+--     return nil
+-- end
+--
+-- function scripts.context.update()
+--     local force = getargument("force")
+--     local socket = require("socket")
+--     local http   = require("socket.http")
+--     local basepath = resolvers.findfile("context.mkiv")
+--     if basepath == "" then
+--         report("quiting, no 'context.mkiv' found")
+--         return
+--     end
+--     local basetree = basepath.match(basepath,"^(.-)tex/context/base/.*context.mkiv$") or ""
+--     if basetree == "" then
+--         report("quiting, no proper tds structure (%s)",basepath)
+--         return
+--     end
+--     local function is_okay(basetree)
+--         for _, tree in next, validtrees do
+--             local pattern = gsub(tree,"%-","%%-")
+--             if find(basetree,pattern) then
+--                 return tree
+--             end
+--         end
+--         return false
+--     end
+--     local okay = is_okay(basetree)
+--     if not okay then
+--         report("quiting, tree '%s' is protected",okay)
+--         return
+--     else
+--         report("updating tree '%s'",okay)
+--     end
+--     if not lfs.chdir(basetree) then
+--         report("quiting, unable to change to '%s'",okay)
+--         return
+--     end
+--     report("fetching '%s'",mainzip)
+--     local latest = http.request(mainzip)
+--     if not latest then
+--         report("context tree '%s' can be updated, use --force",okay)
+--         return
+--     end
+--     io.savedata("cont-tmf.zip",latest)
+--     if false then
+--         -- variant 1
+--         os.execute("mtxrun --script unzip cont-tmf.zip")
+--     else
+--         -- variant 2
+--         local zipfile = zip.open(zipname)
+--         if not zipfile then
+--             report("quiting, unable to open '%s'",zipname)
+--             return
+--         end
+--         local newfile = zip.loaddata(zipfile,"tex/context/base/mkiv/context.mkiv")
+--         if not newfile then
+--             report("quiting, unable to open '%s'","context.mkiv")
+--             return
+--         end
+--         local oldfile = io.loaddata(resolvers.findfile("context.mkiv")) or ""
+--         local function versiontonumber(what,str)
+--             local version = match(str,"\\edef\\contextversion{(.-)}") or ""
+--             local year, month, day, hour, minute = match(str,"\\edef\\contextversion{(%d+)%.(%d+)%.(%d+) *(%d+)%:(%d+)}")
+--             if year and minute then
+--                 local time = os.time { year=year,month=month,day=day,hour=hour,minute=minute}
+--                 report("%s version: %s (%s)",what,version,time)
+--                 return time
+--             else
+--                 report("%s version: %s (unknown)",what,version)
+--                 return nil
+--             end
+--         end
+--         local oldversion = versiontonumber("old",oldfile)
+--         local newversion = versiontonumber("new",newfile)
+--         if not oldversion or not newversion then
+--             report("quiting, version cannot be determined")
+--             return
+--         elseif oldversion == newversion then
+--             report("quiting, your current version is up-to-date")
+--             return
+--         elseif oldversion > newversion then
+--             report("quiting, your current version is newer")
+--             return
+--         end
+--         for k in zipfile:files() do
+--             local filename = k.filename
+--             if find(filename,"/$") then
+--                 lfs.mkdir(filename)
+--             else
+--                 local data = zip.loaddata(zipfile,filename)
+--                 if data then
+--                     if force then
+--                         io.savedata(filename,data)
+--                     end
+--                     report(filename)
+--                 end
+--             end
+--         end
+--         for _, scriptname in next, selfscripts do
+--             local oldscript = resolvers.findfile(scriptname) or ""
+--             if oldscript ~= "" and is_okay(oldscript) then
+--                 local newscript = "./scripts/context/lua/" .. scriptname
+--                 local data = io.loaddata(newscript) or ""
+--                 if data ~= "" then
+--                     report("replacing script '%s' by '%s'",oldscript,newscript)
+--                     if force then
+--                         io.savedata(oldscript,data)
+--                     end
+--                 end
+--             else
+--                 report("keeping script '%s'",oldscript)
+--             end
+--         end
+--         if force then
+--             scripts.context.make()
+--         end
+--     end
+--     if force then
+--         report("context tree '%s' has been updated",okay)
+--     else
+--         report("context tree '%s' can been updated (use --force)",okay)
+--     end
+-- end
 
 -- getting it done
 
@@ -1800,8 +1803,8 @@ elseif getargument("version") then
     scripts.context.version()
 elseif getargument("touch") then
     scripts.context.touch()
-elseif getargument("update") then
-    scripts.context.update()
+-- elseif getargument("update") then
+--     scripts.context.update()
 elseif getargument("expert") then
     application.help("expert", "special")
 elseif getargument("showmodules") or getargument("modules") then
diff --git a/scripts/context/lua/mtx-context.xml b/scripts/context/lua/mtx-context.xml
index 8c21eaa8c..916dad377 100644
--- a/scripts/context/lua/mtx-context.xml
+++ b/scripts/context/lua/mtx-context.xml
@@ -4,7 +4,7 @@
     <metadata>
         <entry name="name">mtx-context</entry>
         <entry name="detail">ConTeXt Process Management</entry>
-        <entry name="version">1.01</entry>
+        <entry name="version">1.03</entry>
         <entry name="comment">external helpinfo file</entry>
     </metadata>
     <flags>
@@ -172,12 +172,12 @@
                 <flag name="touch">
                     <short>update context version number (also provide <ref name="expert"/>, optionally provide <ref name="basepath"/>)</short>
                 </flag>
-                    <flag name="nostatistics">
+                <flag name="nostatistics">
                     <short>omit runtime statistics at the end of the run</short>
                 </flag>
-                    <flag name="update">
+                <!-- flag name="update">
                     <short>update context from website (not to be confused with contextgarden)</short>
-                </flag>
+                </flag -->
                 <flag name="profile">
                     <short>profile job (use: mtxrun <ref name="script"/> profile <ref name="analyze"/>)</short>
                 </flag>
diff --git a/scripts/context/lua/mtx-modules.lua b/scripts/context/lua/mtx-modules.lua
index 78e1418fd..60427c086 100644
--- a/scripts/context/lua/mtx-modules.lua
+++ b/scripts/context/lua/mtx-modules.lua
@@ -22,8 +22,8 @@ local helpinfo = [[
  <flags>
   <category name="basic">
    <subcategory>
-    <flag name="convert"><short>convert source files (tex, mkii, mkiv, mp) to 'ted' files</short></flag>
-    <flag name="process"><short>process source files (tex, mkii, mkiv, mp) to 'pdf' files</short></flag>
+    <flag name="convert"><short>convert source files (tex, mkii, mkiv, mp, etc.) to 'ted' files</short></flag>
+    <flag name="process"><short>process source files (tex, mkii, mkiv, mp, etc.) to 'pdf' files</short></flag>
     <flag name="prep"><short>use original name with suffix 'prep' appended</short></flag>
     <flag name="direct"><short>use old method instead of extra</short></flag>
    </subcategory>
@@ -163,7 +163,12 @@ local function source_to_ted(inpname,outname,filetype)
     return true
 end
 
-local suffixes = table.tohash { 'tex', 'mkii', 'mkiv', 'mkvi', 'mp', 'mpii', 'mpiv' }
+local suffixes = table.tohash {
+    "tex",
+    "mkii",
+    "mkiv", "mkvi", "mkil", "mkli",
+    "mp", "mpii", "mpiv",
+}
 
 function scripts.modules.process(runtex)
     local processed = { }
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index b1b661066..89e23d8ae 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -14682,7 +14682,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-sbx"] = package.loaded["util-sbx"] or true
 
--- original size: 20393, stripped down to: 13121
+-- original size: 20101, stripped down to: 12871
 
 if not modules then modules={} end modules ['util-sbx']={
  version=1.001,
@@ -15171,13 +15171,6 @@ end
 if zip then
  zip.open=register(zip.open,filehandlerone,"zip.open")
 end
-if fontloader then
- fontloader.open=register(fontloader.open,filehandlerone,"fontloader.open")
- fontloader.info=register(fontloader.info,filehandlerone,"fontloader.info")
-end
-if epdf then
- epdf.open=register(epdf.open,filehandlerone,"epdf.open")
-end
 sandbox.registerroot=registerroot
 sandbox.registerbinary=registerbinary
 sandbox.registerlibrary=registerlibrary
@@ -21110,7 +21103,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["data-env"] = package.loaded["data-env"] or true
 
--- original size: 9360, stripped down to: 6312
+-- original size: 9376, stripped down to: 6326
 
 if not modules then modules={} end modules ['data-env']={
  version=1.001,
@@ -21207,7 +21200,7 @@ local relations=allocate {
   tex={
    names={ "tex" },
    variable='TEXINPUTS',
-   suffixes={ "tex","mkvi","mkiv","mkii","cld","lfg","xml" },
+   suffixes={ "tex","mkvi","mkiv","mkli","mkil","mkii","cld","lfg","xml" },
    usertype=true,
   },
   icc={
@@ -25653,8 +25646,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1023035
--- stripped bytes    : 405118
+-- original bytes    : 1022759
+-- stripped bytes    : 405078
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index b1b661066..89e23d8ae 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -14682,7 +14682,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-sbx"] = package.loaded["util-sbx"] or true
 
--- original size: 20393, stripped down to: 13121
+-- original size: 20101, stripped down to: 12871
 
 if not modules then modules={} end modules ['util-sbx']={
  version=1.001,
@@ -15171,13 +15171,6 @@ end
 if zip then
  zip.open=register(zip.open,filehandlerone,"zip.open")
 end
-if fontloader then
- fontloader.open=register(fontloader.open,filehandlerone,"fontloader.open")
- fontloader.info=register(fontloader.info,filehandlerone,"fontloader.info")
-end
-if epdf then
- epdf.open=register(epdf.open,filehandlerone,"epdf.open")
-end
 sandbox.registerroot=registerroot
 sandbox.registerbinary=registerbinary
 sandbox.registerlibrary=registerlibrary
@@ -21110,7 +21103,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["data-env"] = package.loaded["data-env"] or true
 
--- original size: 9360, stripped down to: 6312
+-- original size: 9376, stripped down to: 6326
 
 if not modules then modules={} end modules ['data-env']={
  version=1.001,
@@ -21207,7 +21200,7 @@ local relations=allocate {
   tex={
    names={ "tex" },
    variable='TEXINPUTS',
-   suffixes={ "tex","mkvi","mkiv","mkii","cld","lfg","xml" },
+   suffixes={ "tex","mkvi","mkiv","mkli","mkil","mkii","cld","lfg","xml" },
    usertype=true,
   },
   icc={
@@ -25653,8 +25646,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1023035
--- stripped bytes    : 405118
+-- original bytes    : 1022759
+-- stripped bytes    : 405078
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index b1b661066..89e23d8ae 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -14682,7 +14682,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-sbx"] = package.loaded["util-sbx"] or true
 
--- original size: 20393, stripped down to: 13121
+-- original size: 20101, stripped down to: 12871
 
 if not modules then modules={} end modules ['util-sbx']={
  version=1.001,
@@ -15171,13 +15171,6 @@ end
 if zip then
  zip.open=register(zip.open,filehandlerone,"zip.open")
 end
-if fontloader then
- fontloader.open=register(fontloader.open,filehandlerone,"fontloader.open")
- fontloader.info=register(fontloader.info,filehandlerone,"fontloader.info")
-end
-if epdf then
- epdf.open=register(epdf.open,filehandlerone,"epdf.open")
-end
 sandbox.registerroot=registerroot
 sandbox.registerbinary=registerbinary
 sandbox.registerlibrary=registerlibrary
@@ -21110,7 +21103,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["data-env"] = package.loaded["data-env"] or true
 
--- original size: 9360, stripped down to: 6312
+-- original size: 9376, stripped down to: 6326
 
 if not modules then modules={} end modules ['data-env']={
  version=1.001,
@@ -21207,7 +21200,7 @@ local relations=allocate {
   tex={
    names={ "tex" },
    variable='TEXINPUTS',
-   suffixes={ "tex","mkvi","mkiv","mkii","cld","lfg","xml" },
+   suffixes={ "tex","mkvi","mkiv","mkli","mkil","mkii","cld","lfg","xml" },
    usertype=true,
   },
   icc={
@@ -25653,8 +25646,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1023035
--- stripped bytes    : 405118
+-- original bytes    : 1022759
+-- stripped bytes    : 405078
 
 -- end library merge
 
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index b1b661066..89e23d8ae 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -14682,7 +14682,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-sbx"] = package.loaded["util-sbx"] or true
 
--- original size: 20393, stripped down to: 13121
+-- original size: 20101, stripped down to: 12871
 
 if not modules then modules={} end modules ['util-sbx']={
  version=1.001,
@@ -15171,13 +15171,6 @@ end
 if zip then
  zip.open=register(zip.open,filehandlerone,"zip.open")
 end
-if fontloader then
- fontloader.open=register(fontloader.open,filehandlerone,"fontloader.open")
- fontloader.info=register(fontloader.info,filehandlerone,"fontloader.info")
-end
-if epdf then
- epdf.open=register(epdf.open,filehandlerone,"epdf.open")
-end
 sandbox.registerroot=registerroot
 sandbox.registerbinary=registerbinary
 sandbox.registerlibrary=registerlibrary
@@ -21110,7 +21103,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["data-env"] = package.loaded["data-env"] or true
 
--- original size: 9360, stripped down to: 6312
+-- original size: 9376, stripped down to: 6326
 
 if not modules then modules={} end modules ['data-env']={
  version=1.001,
@@ -21207,7 +21200,7 @@ local relations=allocate {
   tex={
    names={ "tex" },
    variable='TEXINPUTS',
-   suffixes={ "tex","mkvi","mkiv","mkii","cld","lfg","xml" },
+   suffixes={ "tex","mkvi","mkiv","mkli","mkil","mkii","cld","lfg","xml" },
    usertype=true,
   },
   icc={
@@ -25653,8 +25646,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1023035
--- stripped bytes    : 405118
+-- original bytes    : 1022759
+-- stripped bytes    : 405078
 
 -- end library merge