2018-03-22 19:49:00

5 files changed, 338 insertions, 84 deletions

diff --git a/scripts/context/lua/mtxlibs.lua b/scripts/context/lua/mtxlibs.lua
index bb0e03b17..f6839eb9d 100644
--- a/scripts/context/lua/mtxlibs.lua
+++ b/scripts/context/lua/mtxlibs.lua
@@ -68,7 +68,7 @@ local owntree = ownpath
 local ownlibs = {
 
     "l-lua.lua",
-    "l-macros.lua",
+    "l-macro.lua",
     "l-sandbox.lua",
     "l-package.lua",
     "l-lpeg.lua",
@@ -196,15 +196,13 @@ end
 local arguments = environment.arguments
 local files     = environment.files
 
-if file.basename(environment.ownname) ~= "mtxlibs.lua" then
-    return
-end
+local ownname   = file.basename(environment.ownname)
 
 local helpinfo = [[
 usage: mtxlibs [options]
 
---merge
---merge targetfile extralibs
+--selfmerge
+--selfmerge targetfile extralibs
 --selfclean
 
 and in a lua file:
@@ -218,7 +216,19 @@ local application = logs.application {
     helpinfo = helpinfo,
 }
 
-local report    = application.report
+local report = application.report
+
+if ownname == "mtxrun" or ownname == "mtxrun.lua" then
+    -- we're using mtxrun
+    ownname = "mtxlibs.lua"
+elseif ownname == "mtxlibs" or ownname == "mtxlibs.lua" then
+    -- we're using lua
+    ownname = "mtxlibs.lua"
+else
+    report("usage : lua mtxlibs.lua ...")
+    report("      : mtxrun --script mtxlibs.lua ...")
+    return
+end
 
 if arguments.selfmerge then
 
@@ -247,7 +257,7 @@ elseif arguments.selfclean then
     merger.selfclean(ownname)
     report("done")
 
-elseif arguments.help or files[1] == "help" then
+else -- if arguments.help or files[1] == "help" then
 
     application.help()
 
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index cec16c7e5..1a470244a 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -195,7 +195,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-macro"] = package.loaded["l-macro"] or true
 
--- original size: 6393, stripped down to: 3659
+-- original size: 8260, stripped down to: 5213
 
 if not modules then modules={} end modules ['l-macros']={
   version=1.001,
@@ -207,7 +207,8 @@ if not modules then modules={} end modules ['l-macros']={
 local S,P,R,V,C,Cs,Cc,Ct,Carg=lpeg.S,lpeg.P,lpeg.R,lpeg.V,lpeg.C,lpeg.Cs,lpeg.Cc,lpeg.Ct,lpeg.Carg
 local lpegmatch=lpeg.match
 local concat=table.concat
-local next=next
+local format,sub=string.format,string.sub
+local next,load,type=next,load,type
 local newline=S("\n\r")^1
 local continue=P("\\")*newline
 local spaces=S(" \t")+continue
@@ -228,6 +229,14 @@ local patterns={}
 local definitions={}
 local resolve
 local subparser
+local report_lua=function(...)
+  if logs and logs.reporter then
+    report_lua=logs.reporter("system","lua")
+    report_lua(...)
+  else
+    print(format(...))
+  end
+end
 resolve=C(C(name)*arguments^-1)/function(raw,s,a)
   local d=definitions[s]
   if d then
@@ -334,6 +343,61 @@ end
 function macros.resolving()
   return next(patterns)
 end
+local function loaded(name,trace,detail)
+  local f=io.open(name,"rb")
+  if not f then
+    return false,format("file '%s' not found",name)
+  end
+  local c=f:read("*a")
+  if not c then
+    return false,format("file '%s' is invalid",name)
+  end
+  f:close()
+  local n=lpegmatch(parser,c)
+  if trace then
+    if #n~=#c then
+      report_lua("macros expanded in '%s' (%i => %i bytes)",name,#c,#n)
+      if detail then
+        report_lua()
+        report_lua(n)
+        report_lua()
+      end
+    elseif detail then
+      report_lua("no macros expanded in '%s'",name)
+    end
+  end
+  if #name>30 then
+    n="--[["..sub(name,-30).."]] "..n
+  else
+    n="--[["..name.."]] "..n
+  end
+  return load(n)
+end
+macros.loaded=loaded
+function required(name,trace)
+  local filename=file.addsuffix(name,"lua")
+  local fullname=resolvers and resolvers.find_file(filename) or filename
+  if not fullname or fullname=="" then
+    return false
+  end
+  local codeblob=package.loaded[fullname]
+  if codeblob then
+    return codeblob
+  end
+  local code,message=loaded(fullname,macros,trace,trace)
+  if type(code)=="function" then
+    code=code()
+  else
+    report_lua("error when loading '%s'",fullname)
+    return false,message
+  end
+  if code==nil then
+    code=false
+  end
+  package.loaded[fullname]=code
+  return code
+end
+macros.required=required
 
 
 end -- of closure
@@ -609,7 +673,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-package"] = package.loaded["l-package"] or true
 
--- original size: 11564, stripped down to: 8625
+-- original size: 11562, stripped down to: 8625
 
 if not modules then modules={} end modules ['l-package']={
   version=1.001,
@@ -620,10 +684,10 @@ if not modules then modules={} end modules ['l-package']={
 }
 local type=type
 local gsub,format,find=string.gsub,string.format,string.find
+local insert,remove=table.insert,table.remove
 local P,S,Cs,lpegmatch=lpeg.P,lpeg.S,lpeg.Cs,lpeg.match
 local package=package
 local searchers=package.searchers or package.loaders
-local insert,remove=table.insert,table.remove
 local filejoin=file and file.join    or function(path,name)  return path.."/"..name end
 local isreadable=file and file.is_readable or function(name)    local f=io.open(name) if f then f:close() return true end end
 local addsuffix=file and file.addsuffix  or function(name,suffix) return name.."."..suffix end
@@ -9200,7 +9264,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["trac-log"] = package.loaded["trac-log"] or true
 
--- original size: 32737, stripped down to: 22946
+-- original size: 32923, stripped down to: 23011
 
 if not modules then modules={} end modules ['trac-log']={
   version=1.001,
@@ -9210,13 +9274,15 @@ if not modules then modules={} end modules ['trac-log']={
   license="see context related readme files"
 }
 local next,type,select,print=next,type,select,print
-local write_nl,write=texio and texio.write_nl or print,texio and texio.write or io.write
 local format,gmatch,find=string.format,string.gmatch,string.find
 local concat,insert,remove=table.concat,table.insert,table.remove
 local topattern=string.topattern
 local utfchar=utf.char
 local datetime=os.date
 local openfile=io.open
+local runningtex=tex and (tex.jobname or tex.formatname)
+local write_nl=runningtex and texio and texio.write_nl or print
+local write=runningtex and texio and texio.write  or io.write
 local setmetatableindex=table.setmetatableindex
 local formatters=string.formatters
 local settings_to_hash=utilities.parsers.settings_to_hash
@@ -9243,7 +9309,7 @@ local function ignore() end
 setmetatableindex(logs,function(t,k) t[k]=ignore;return ignore end)
 local report,subreport,status,settarget,setformats,settranslations
 local direct,subdirect,writer,pushtarget,poptarget,setlogfile,settimedlog,setprocessor,setformatters,newline
-if tex and (tex.jobname or tex.formatname) then
+if runningtex then
   if texio.setescape then
     texio.setescape(0) 
   end
@@ -10427,7 +10493,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lua"] = package.loaded["util-lua"] or true
 
--- original size: 6921, stripped down to: 4998
+-- original size: 6621, stripped down to: 4764
 
 if not modules then modules={} end modules ['util-lua']={
   version=1.001,
@@ -10463,7 +10529,7 @@ luautilities.suffixes={
   tua="tua",
   tuc="tuc",
 }
-local function register(name)
+local function register(name) 
   if tracestripping then
     report_lua("stripped bytecode from %a",name or "unknown")
   end
@@ -10491,17 +10557,12 @@ local function stupidcompile(luafile,lucfile,strip)
 end
 function luautilities.loadedluacode(fullname,forcestrip,name,macros)
   name=name or fullname
-  local code,message
   if macros then
     macros=lua.macros
   end
-  if macros and macros.enabled then
-    local f=io.open(fullname,"rb") local c=f:read("*a") f:close()
-    local n=c and macros.resolvestring("--[["..fullname.."]] "..c)
-    if n and #n~=#c then
-      report_lua("preprocessed file %a: %i => %i bytes",fullname,#c,#n)
-    end
-    code,message=load(n or c)
+  local code,message
+  if macros then
+    code,message=macros.loaded(fullname,true,false)
   else
     code,message=loadfile(fullname)
   end
@@ -21234,8 +21295,8 @@ end -- of closure
 
 -- used libraries    : 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-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 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 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    : 874888
--- stripped bytes    : 317568
+-- original bytes    : 876639
+-- stripped bytes    : 317934
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index cec16c7e5..1a470244a 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -195,7 +195,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-macro"] = package.loaded["l-macro"] or true
 
--- original size: 6393, stripped down to: 3659
+-- original size: 8260, stripped down to: 5213
 
 if not modules then modules={} end modules ['l-macros']={
   version=1.001,
@@ -207,7 +207,8 @@ if not modules then modules={} end modules ['l-macros']={
 local S,P,R,V,C,Cs,Cc,Ct,Carg=lpeg.S,lpeg.P,lpeg.R,lpeg.V,lpeg.C,lpeg.Cs,lpeg.Cc,lpeg.Ct,lpeg.Carg
 local lpegmatch=lpeg.match
 local concat=table.concat
-local next=next
+local format,sub=string.format,string.sub
+local next,load,type=next,load,type
 local newline=S("\n\r")^1
 local continue=P("\\")*newline
 local spaces=S(" \t")+continue
@@ -228,6 +229,14 @@ local patterns={}
 local definitions={}
 local resolve
 local subparser
+local report_lua=function(...)
+  if logs and logs.reporter then
+    report_lua=logs.reporter("system","lua")
+    report_lua(...)
+  else
+    print(format(...))
+  end
+end
 resolve=C(C(name)*arguments^-1)/function(raw,s,a)
   local d=definitions[s]
   if d then
@@ -334,6 +343,61 @@ end
 function macros.resolving()
   return next(patterns)
 end
+local function loaded(name,trace,detail)
+  local f=io.open(name,"rb")
+  if not f then
+    return false,format("file '%s' not found",name)
+  end
+  local c=f:read("*a")
+  if not c then
+    return false,format("file '%s' is invalid",name)
+  end
+  f:close()
+  local n=lpegmatch(parser,c)
+  if trace then
+    if #n~=#c then
+      report_lua("macros expanded in '%s' (%i => %i bytes)",name,#c,#n)
+      if detail then
+        report_lua()
+        report_lua(n)
+        report_lua()
+      end
+    elseif detail then
+      report_lua("no macros expanded in '%s'",name)
+    end
+  end
+  if #name>30 then
+    n="--[["..sub(name,-30).."]] "..n
+  else
+    n="--[["..name.."]] "..n
+  end
+  return load(n)
+end
+macros.loaded=loaded
+function required(name,trace)
+  local filename=file.addsuffix(name,"lua")
+  local fullname=resolvers and resolvers.find_file(filename) or filename
+  if not fullname or fullname=="" then
+    return false
+  end
+  local codeblob=package.loaded[fullname]
+  if codeblob then
+    return codeblob
+  end
+  local code,message=loaded(fullname,macros,trace,trace)
+  if type(code)=="function" then
+    code=code()
+  else
+    report_lua("error when loading '%s'",fullname)
+    return false,message
+  end
+  if code==nil then
+    code=false
+  end
+  package.loaded[fullname]=code
+  return code
+end
+macros.required=required
 
 
 end -- of closure
@@ -609,7 +673,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-package"] = package.loaded["l-package"] or true
 
--- original size: 11564, stripped down to: 8625
+-- original size: 11562, stripped down to: 8625
 
 if not modules then modules={} end modules ['l-package']={
   version=1.001,
@@ -620,10 +684,10 @@ if not modules then modules={} end modules ['l-package']={
 }
 local type=type
 local gsub,format,find=string.gsub,string.format,string.find
+local insert,remove=table.insert,table.remove
 local P,S,Cs,lpegmatch=lpeg.P,lpeg.S,lpeg.Cs,lpeg.match
 local package=package
 local searchers=package.searchers or package.loaders
-local insert,remove=table.insert,table.remove
 local filejoin=file and file.join    or function(path,name)  return path.."/"..name end
 local isreadable=file and file.is_readable or function(name)    local f=io.open(name) if f then f:close() return true end end
 local addsuffix=file and file.addsuffix  or function(name,suffix) return name.."."..suffix end
@@ -9200,7 +9264,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["trac-log"] = package.loaded["trac-log"] or true
 
--- original size: 32737, stripped down to: 22946
+-- original size: 32923, stripped down to: 23011
 
 if not modules then modules={} end modules ['trac-log']={
   version=1.001,
@@ -9210,13 +9274,15 @@ if not modules then modules={} end modules ['trac-log']={
   license="see context related readme files"
 }
 local next,type,select,print=next,type,select,print
-local write_nl,write=texio and texio.write_nl or print,texio and texio.write or io.write
 local format,gmatch,find=string.format,string.gmatch,string.find
 local concat,insert,remove=table.concat,table.insert,table.remove
 local topattern=string.topattern
 local utfchar=utf.char
 local datetime=os.date
 local openfile=io.open
+local runningtex=tex and (tex.jobname or tex.formatname)
+local write_nl=runningtex and texio and texio.write_nl or print
+local write=runningtex and texio and texio.write  or io.write
 local setmetatableindex=table.setmetatableindex
 local formatters=string.formatters
 local settings_to_hash=utilities.parsers.settings_to_hash
@@ -9243,7 +9309,7 @@ local function ignore() end
 setmetatableindex(logs,function(t,k) t[k]=ignore;return ignore end)
 local report,subreport,status,settarget,setformats,settranslations
 local direct,subdirect,writer,pushtarget,poptarget,setlogfile,settimedlog,setprocessor,setformatters,newline
-if tex and (tex.jobname or tex.formatname) then
+if runningtex then
   if texio.setescape then
     texio.setescape(0) 
   end
@@ -10427,7 +10493,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lua"] = package.loaded["util-lua"] or true
 
--- original size: 6921, stripped down to: 4998
+-- original size: 6621, stripped down to: 4764
 
 if not modules then modules={} end modules ['util-lua']={
   version=1.001,
@@ -10463,7 +10529,7 @@ luautilities.suffixes={
   tua="tua",
   tuc="tuc",
 }
-local function register(name)
+local function register(name) 
   if tracestripping then
     report_lua("stripped bytecode from %a",name or "unknown")
   end
@@ -10491,17 +10557,12 @@ local function stupidcompile(luafile,lucfile,strip)
 end
 function luautilities.loadedluacode(fullname,forcestrip,name,macros)
   name=name or fullname
-  local code,message
   if macros then
     macros=lua.macros
   end
-  if macros and macros.enabled then
-    local f=io.open(fullname,"rb") local c=f:read("*a") f:close()
-    local n=c and macros.resolvestring("--[["..fullname.."]] "..c)
-    if n and #n~=#c then
-      report_lua("preprocessed file %a: %i => %i bytes",fullname,#c,#n)
-    end
-    code,message=load(n or c)
+  local code,message
+  if macros then
+    code,message=macros.loaded(fullname,true,false)
   else
     code,message=loadfile(fullname)
   end
@@ -21234,8 +21295,8 @@ end -- of closure
 
 -- used libraries    : 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-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 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 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    : 874888
--- stripped bytes    : 317568
+-- original bytes    : 876639
+-- stripped bytes    : 317934
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index cec16c7e5..1a470244a 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -195,7 +195,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-macro"] = package.loaded["l-macro"] or true
 
--- original size: 6393, stripped down to: 3659
+-- original size: 8260, stripped down to: 5213
 
 if not modules then modules={} end modules ['l-macros']={
   version=1.001,
@@ -207,7 +207,8 @@ if not modules then modules={} end modules ['l-macros']={
 local S,P,R,V,C,Cs,Cc,Ct,Carg=lpeg.S,lpeg.P,lpeg.R,lpeg.V,lpeg.C,lpeg.Cs,lpeg.Cc,lpeg.Ct,lpeg.Carg
 local lpegmatch=lpeg.match
 local concat=table.concat
-local next=next
+local format,sub=string.format,string.sub
+local next,load,type=next,load,type
 local newline=S("\n\r")^1
 local continue=P("\\")*newline
 local spaces=S(" \t")+continue
@@ -228,6 +229,14 @@ local patterns={}
 local definitions={}
 local resolve
 local subparser
+local report_lua=function(...)
+  if logs and logs.reporter then
+    report_lua=logs.reporter("system","lua")
+    report_lua(...)
+  else
+    print(format(...))
+  end
+end
 resolve=C(C(name)*arguments^-1)/function(raw,s,a)
   local d=definitions[s]
   if d then
@@ -334,6 +343,61 @@ end
 function macros.resolving()
   return next(patterns)
 end
+local function loaded(name,trace,detail)
+  local f=io.open(name,"rb")
+  if not f then
+    return false,format("file '%s' not found",name)
+  end
+  local c=f:read("*a")
+  if not c then
+    return false,format("file '%s' is invalid",name)
+  end
+  f:close()
+  local n=lpegmatch(parser,c)
+  if trace then
+    if #n~=#c then
+      report_lua("macros expanded in '%s' (%i => %i bytes)",name,#c,#n)
+      if detail then
+        report_lua()
+        report_lua(n)
+        report_lua()
+      end
+    elseif detail then
+      report_lua("no macros expanded in '%s'",name)
+    end
+  end
+  if #name>30 then
+    n="--[["..sub(name,-30).."]] "..n
+  else
+    n="--[["..name.."]] "..n
+  end
+  return load(n)
+end
+macros.loaded=loaded
+function required(name,trace)
+  local filename=file.addsuffix(name,"lua")
+  local fullname=resolvers and resolvers.find_file(filename) or filename
+  if not fullname or fullname=="" then
+    return false
+  end
+  local codeblob=package.loaded[fullname]
+  if codeblob then
+    return codeblob
+  end
+  local code,message=loaded(fullname,macros,trace,trace)
+  if type(code)=="function" then
+    code=code()
+  else
+    report_lua("error when loading '%s'",fullname)
+    return false,message
+  end
+  if code==nil then
+    code=false
+  end
+  package.loaded[fullname]=code
+  return code
+end
+macros.required=required
 
 
 end -- of closure
@@ -609,7 +673,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-package"] = package.loaded["l-package"] or true
 
--- original size: 11564, stripped down to: 8625
+-- original size: 11562, stripped down to: 8625
 
 if not modules then modules={} end modules ['l-package']={
   version=1.001,
@@ -620,10 +684,10 @@ if not modules then modules={} end modules ['l-package']={
 }
 local type=type
 local gsub,format,find=string.gsub,string.format,string.find
+local insert,remove=table.insert,table.remove
 local P,S,Cs,lpegmatch=lpeg.P,lpeg.S,lpeg.Cs,lpeg.match
 local package=package
 local searchers=package.searchers or package.loaders
-local insert,remove=table.insert,table.remove
 local filejoin=file and file.join    or function(path,name)  return path.."/"..name end
 local isreadable=file and file.is_readable or function(name)    local f=io.open(name) if f then f:close() return true end end
 local addsuffix=file and file.addsuffix  or function(name,suffix) return name.."."..suffix end
@@ -9200,7 +9264,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["trac-log"] = package.loaded["trac-log"] or true
 
--- original size: 32737, stripped down to: 22946
+-- original size: 32923, stripped down to: 23011
 
 if not modules then modules={} end modules ['trac-log']={
   version=1.001,
@@ -9210,13 +9274,15 @@ if not modules then modules={} end modules ['trac-log']={
   license="see context related readme files"
 }
 local next,type,select,print=next,type,select,print
-local write_nl,write=texio and texio.write_nl or print,texio and texio.write or io.write
 local format,gmatch,find=string.format,string.gmatch,string.find
 local concat,insert,remove=table.concat,table.insert,table.remove
 local topattern=string.topattern
 local utfchar=utf.char
 local datetime=os.date
 local openfile=io.open
+local runningtex=tex and (tex.jobname or tex.formatname)
+local write_nl=runningtex and texio and texio.write_nl or print
+local write=runningtex and texio and texio.write  or io.write
 local setmetatableindex=table.setmetatableindex
 local formatters=string.formatters
 local settings_to_hash=utilities.parsers.settings_to_hash
@@ -9243,7 +9309,7 @@ local function ignore() end
 setmetatableindex(logs,function(t,k) t[k]=ignore;return ignore end)
 local report,subreport,status,settarget,setformats,settranslations
 local direct,subdirect,writer,pushtarget,poptarget,setlogfile,settimedlog,setprocessor,setformatters,newline
-if tex and (tex.jobname or tex.formatname) then
+if runningtex then
   if texio.setescape then
     texio.setescape(0) 
   end
@@ -10427,7 +10493,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lua"] = package.loaded["util-lua"] or true
 
--- original size: 6921, stripped down to: 4998
+-- original size: 6621, stripped down to: 4764
 
 if not modules then modules={} end modules ['util-lua']={
   version=1.001,
@@ -10463,7 +10529,7 @@ luautilities.suffixes={
   tua="tua",
   tuc="tuc",
 }
-local function register(name)
+local function register(name) 
   if tracestripping then
     report_lua("stripped bytecode from %a",name or "unknown")
   end
@@ -10491,17 +10557,12 @@ local function stupidcompile(luafile,lucfile,strip)
 end
 function luautilities.loadedluacode(fullname,forcestrip,name,macros)
   name=name or fullname
-  local code,message
   if macros then
     macros=lua.macros
   end
-  if macros and macros.enabled then
-    local f=io.open(fullname,"rb") local c=f:read("*a") f:close()
-    local n=c and macros.resolvestring("--[["..fullname.."]] "..c)
-    if n and #n~=#c then
-      report_lua("preprocessed file %a: %i => %i bytes",fullname,#c,#n)
-    end
-    code,message=load(n or c)
+  local code,message
+  if macros then
+    code,message=macros.loaded(fullname,true,false)
   else
     code,message=loadfile(fullname)
   end
@@ -21234,8 +21295,8 @@ end -- of closure
 
 -- used libraries    : 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-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 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 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    : 874888
--- stripped bytes    : 317568
+-- original bytes    : 876639
+-- stripped bytes    : 317934
 
 -- end library merge
 
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index cec16c7e5..1a470244a 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -195,7 +195,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-macro"] = package.loaded["l-macro"] or true
 
--- original size: 6393, stripped down to: 3659
+-- original size: 8260, stripped down to: 5213
 
 if not modules then modules={} end modules ['l-macros']={
   version=1.001,
@@ -207,7 +207,8 @@ if not modules then modules={} end modules ['l-macros']={
 local S,P,R,V,C,Cs,Cc,Ct,Carg=lpeg.S,lpeg.P,lpeg.R,lpeg.V,lpeg.C,lpeg.Cs,lpeg.Cc,lpeg.Ct,lpeg.Carg
 local lpegmatch=lpeg.match
 local concat=table.concat
-local next=next
+local format,sub=string.format,string.sub
+local next,load,type=next,load,type
 local newline=S("\n\r")^1
 local continue=P("\\")*newline
 local spaces=S(" \t")+continue
@@ -228,6 +229,14 @@ local patterns={}
 local definitions={}
 local resolve
 local subparser
+local report_lua=function(...)
+  if logs and logs.reporter then
+    report_lua=logs.reporter("system","lua")
+    report_lua(...)
+  else
+    print(format(...))
+  end
+end
 resolve=C(C(name)*arguments^-1)/function(raw,s,a)
   local d=definitions[s]
   if d then
@@ -334,6 +343,61 @@ end
 function macros.resolving()
   return next(patterns)
 end
+local function loaded(name,trace,detail)
+  local f=io.open(name,"rb")
+  if not f then
+    return false,format("file '%s' not found",name)
+  end
+  local c=f:read("*a")
+  if not c then
+    return false,format("file '%s' is invalid",name)
+  end
+  f:close()
+  local n=lpegmatch(parser,c)
+  if trace then
+    if #n~=#c then
+      report_lua("macros expanded in '%s' (%i => %i bytes)",name,#c,#n)
+      if detail then
+        report_lua()
+        report_lua(n)
+        report_lua()
+      end
+    elseif detail then
+      report_lua("no macros expanded in '%s'",name)
+    end
+  end
+  if #name>30 then
+    n="--[["..sub(name,-30).."]] "..n
+  else
+    n="--[["..name.."]] "..n
+  end
+  return load(n)
+end
+macros.loaded=loaded
+function required(name,trace)
+  local filename=file.addsuffix(name,"lua")
+  local fullname=resolvers and resolvers.find_file(filename) or filename
+  if not fullname or fullname=="" then
+    return false
+  end
+  local codeblob=package.loaded[fullname]
+  if codeblob then
+    return codeblob
+  end
+  local code,message=loaded(fullname,macros,trace,trace)
+  if type(code)=="function" then
+    code=code()
+  else
+    report_lua("error when loading '%s'",fullname)
+    return false,message
+  end
+  if code==nil then
+    code=false
+  end
+  package.loaded[fullname]=code
+  return code
+end
+macros.required=required
 
 
 end -- of closure
@@ -609,7 +673,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-package"] = package.loaded["l-package"] or true
 
--- original size: 11564, stripped down to: 8625
+-- original size: 11562, stripped down to: 8625
 
 if not modules then modules={} end modules ['l-package']={
   version=1.001,
@@ -620,10 +684,10 @@ if not modules then modules={} end modules ['l-package']={
 }
 local type=type
 local gsub,format,find=string.gsub,string.format,string.find
+local insert,remove=table.insert,table.remove
 local P,S,Cs,lpegmatch=lpeg.P,lpeg.S,lpeg.Cs,lpeg.match
 local package=package
 local searchers=package.searchers or package.loaders
-local insert,remove=table.insert,table.remove
 local filejoin=file and file.join    or function(path,name)  return path.."/"..name end
 local isreadable=file and file.is_readable or function(name)    local f=io.open(name) if f then f:close() return true end end
 local addsuffix=file and file.addsuffix  or function(name,suffix) return name.."."..suffix end
@@ -9200,7 +9264,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["trac-log"] = package.loaded["trac-log"] or true
 
--- original size: 32737, stripped down to: 22946
+-- original size: 32923, stripped down to: 23011
 
 if not modules then modules={} end modules ['trac-log']={
   version=1.001,
@@ -9210,13 +9274,15 @@ if not modules then modules={} end modules ['trac-log']={
   license="see context related readme files"
 }
 local next,type,select,print=next,type,select,print
-local write_nl,write=texio and texio.write_nl or print,texio and texio.write or io.write
 local format,gmatch,find=string.format,string.gmatch,string.find
 local concat,insert,remove=table.concat,table.insert,table.remove
 local topattern=string.topattern
 local utfchar=utf.char
 local datetime=os.date
 local openfile=io.open
+local runningtex=tex and (tex.jobname or tex.formatname)
+local write_nl=runningtex and texio and texio.write_nl or print
+local write=runningtex and texio and texio.write  or io.write
 local setmetatableindex=table.setmetatableindex
 local formatters=string.formatters
 local settings_to_hash=utilities.parsers.settings_to_hash
@@ -9243,7 +9309,7 @@ local function ignore() end
 setmetatableindex(logs,function(t,k) t[k]=ignore;return ignore end)
 local report,subreport,status,settarget,setformats,settranslations
 local direct,subdirect,writer,pushtarget,poptarget,setlogfile,settimedlog,setprocessor,setformatters,newline
-if tex and (tex.jobname or tex.formatname) then
+if runningtex then
   if texio.setescape then
     texio.setescape(0) 
   end
@@ -10427,7 +10493,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lua"] = package.loaded["util-lua"] or true
 
--- original size: 6921, stripped down to: 4998
+-- original size: 6621, stripped down to: 4764
 
 if not modules then modules={} end modules ['util-lua']={
   version=1.001,
@@ -10463,7 +10529,7 @@ luautilities.suffixes={
   tua="tua",
   tuc="tuc",
 }
-local function register(name)
+local function register(name) 
   if tracestripping then
     report_lua("stripped bytecode from %a",name or "unknown")
   end
@@ -10491,17 +10557,12 @@ local function stupidcompile(luafile,lucfile,strip)
 end
 function luautilities.loadedluacode(fullname,forcestrip,name,macros)
   name=name or fullname
-  local code,message
   if macros then
     macros=lua.macros
   end
-  if macros and macros.enabled then
-    local f=io.open(fullname,"rb") local c=f:read("*a") f:close()
-    local n=c and macros.resolvestring("--[["..fullname.."]] "..c)
-    if n and #n~=#c then
-      report_lua("preprocessed file %a: %i => %i bytes",fullname,#c,#n)
-    end
-    code,message=load(n or c)
+  local code,message
+  if macros then
+    code,message=macros.loaded(fullname,true,false)
   else
     code,message=loadfile(fullname)
   end
@@ -21234,8 +21295,8 @@ end -- of closure
 
 -- used libraries    : 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-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 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 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    : 874888
--- stripped bytes    : 317568
+-- original bytes    : 876639
+-- stripped bytes    : 317934
 
 -- end library merge