2017-10-18 21:22:00

6 files changed, 32 insertions, 52 deletions

diff --git a/scripts/context/lua/mtx-context.lua b/scripts/context/lua/mtx-context.lua
index 574f616e2..1df3a5d5b 100644
--- a/scripts/context/lua/mtx-context.lua
+++ b/scripts/context/lua/mtx-context.lua
@@ -197,10 +197,6 @@ local synctex_runfiles = {
     "synctex", "synctex.gz", "syncctx" -- synctex
 }
 
--- local synctex_runfiles = {
---     "synctex", "synctex.gz",
--- }
-
 local persistent_runfiles = {
     "tuo", -- mkii two pass file
     "tub", -- mkii buffer file
@@ -663,8 +659,7 @@ function scripts.context.run(ctxdata,filename)
     local a_nonstopmode   = getargument("nonstopmode")
     local a_scollmode     = getargument("scrollmode")
     local a_once          = getargument("once")
---     local a_synctex       = getargument("syncctx") and "context" or getargument("synctex")
-    local a_synctex       = getargument("synctex")
+ -- local a_synctex       = getargument("synctex")
     local a_backend       = getargument("backend")
     local a_arrange       = getargument("arrange")
     local a_noarrange     = getargument("noarrange")
@@ -716,7 +711,7 @@ function scripts.context.run(ctxdata,filename)
         --
         local analysis = preamble_analyze(filename)
         --
-        a_synctex = a_synctex or analysis.synctex
+     -- a_synctex = a_synctex or analysis.synctex
         --
         if a_mkii or analysis.engine == 'pdftex' or analysis.engine == 'xetex' then
             run_texexec(filename,a_purge,a_purgeall)
@@ -864,9 +859,9 @@ function scripts.context.run(ctxdata,filename)
                 for i=1,#synctex_runfiles do
                     removefile(fileaddsuffix(jobname,synctex_runfiles[i]))
                 end
-                if a_synctex then
-                    directives[#directives+1] = format("system.synctex")
-                end
+             -- if a_synctex then
+             --     directives[#directives+1] = format("system.synctex")
+             -- end
                 --
                 if #directives > 0 then
                     c_flags.directives = concat(directives,",")
@@ -925,7 +920,8 @@ function scripts.context.run(ctxdata,filename)
                 --  this will go away after we update luatex
                 --
                 local syncctx = fileaddsuffix(jobname,"syncctx")
-                if a_synctex == "context" or validfile(syncctx) then
+             -- if a_synctex == "context" or validfile(syncctx) then
+                if validfile(syncctx) then
                     renamefile(syncctx,fileaddsuffix(jobname,"synctex"))
                 end
                 --
diff --git a/scripts/context/lua/mtx-watch.lua b/scripts/context/lua/mtx-watch.lua
index 95323f571..8629058e5 100644
--- a/scripts/context/lua/mtx-watch.lua
+++ b/scripts/context/lua/mtx-watch.lua
@@ -167,6 +167,7 @@ function scripts.watch.watch()
                 lfs.chdir(path)
                 local files = { }
                 glob(files,path)
+                glob(files,".")
                 table.sort(files,filenamesort)
 --                 for name, time in next, files do
                 for i=1,#files do
@@ -176,6 +177,7 @@ function scripts.watch.watch()
                     local name = joinname(dirname,basename)
                 --~ local ok, joblog = xpcall(function() return dofile(name) end, function() end )
                     local ok, joblog = pcall(dofile,name)
+report("checking file %s/%s: %s",dirname,basename,ok and "okay" or "skipped")
                     if ok and joblog then
                         if joblog.status == "processing" then
                             report("aborted job, %s added to queue",name)
@@ -399,7 +401,9 @@ function scripts.watch.cleanup_stale_files() -- removes duplicates
     elseif not delay then
         report("missing --cleanup=delay")
     else
-        report("dryrun, use --force for real cleanup")
+        if not force then
+            report("dryrun, use --force for real cleanup")
+        end
         local files = dir.glob(file.join(path,"*"))
         local rtime = time()
         for i=1,#files do
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index f9b090372..a65197f10 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -6481,7 +6481,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-tab"] = package.loaded["util-tab"] or true
 
--- original size: 27638, stripped down to: 17116
+-- original size: 27665, stripped down to: 17051
 
 if not modules then modules={} end modules ['util-tab']={
   version=1.001,
@@ -6861,11 +6861,6 @@ function table.drop(t,slow)
     return fastdrop(t) 
   end
 end
-function table.autokey(t,k)
-  local v={}
-  t[k]=v
-  return v
-end
 local selfmapper={ __index=function(t,k) t[k]=k return k end }
 function table.twowaymapper(t)  
   if not t then         
@@ -7710,7 +7705,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-sto"] = package.loaded["util-sto"] or true
 
--- original size: 3926, stripped down to: 2742
+-- original size: 5918, stripped down to: 2756
 
 if not modules then modules={} end modules ['util-sto']={
   version=1.001,
@@ -7719,7 +7714,7 @@ if not modules then modules={} end modules ['util-sto']={
   copyright="PRAGMA ADE / ConTeXt Development Team",
   license="see context related readme files"
 }
-local setmetatable,getmetatable,type=setmetatable,getmetatable,type
+local setmetatable,getmetatable,rawset,type=setmetatable,getmetatable,rawset,type
 utilities=utilities or {}
 utilities.storage=utilities.storage or {}
 local storage=utilities.storage
@@ -20762,8 +20757,8 @@ end -- of closure
 
 -- used libraries    : l-lua.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    : 853166
--- stripped bytes    : 307836
+-- original bytes    : 855185
+-- stripped bytes    : 309906
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index f9b090372..a65197f10 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -6481,7 +6481,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-tab"] = package.loaded["util-tab"] or true
 
--- original size: 27638, stripped down to: 17116
+-- original size: 27665, stripped down to: 17051
 
 if not modules then modules={} end modules ['util-tab']={
   version=1.001,
@@ -6861,11 +6861,6 @@ function table.drop(t,slow)
     return fastdrop(t) 
   end
 end
-function table.autokey(t,k)
-  local v={}
-  t[k]=v
-  return v
-end
 local selfmapper={ __index=function(t,k) t[k]=k return k end }
 function table.twowaymapper(t)  
   if not t then         
@@ -7710,7 +7705,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-sto"] = package.loaded["util-sto"] or true
 
--- original size: 3926, stripped down to: 2742
+-- original size: 5918, stripped down to: 2756
 
 if not modules then modules={} end modules ['util-sto']={
   version=1.001,
@@ -7719,7 +7714,7 @@ if not modules then modules={} end modules ['util-sto']={
   copyright="PRAGMA ADE / ConTeXt Development Team",
   license="see context related readme files"
 }
-local setmetatable,getmetatable,type=setmetatable,getmetatable,type
+local setmetatable,getmetatable,rawset,type=setmetatable,getmetatable,rawset,type
 utilities=utilities or {}
 utilities.storage=utilities.storage or {}
 local storage=utilities.storage
@@ -20762,8 +20757,8 @@ end -- of closure
 
 -- used libraries    : l-lua.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    : 853166
--- stripped bytes    : 307836
+-- original bytes    : 855185
+-- stripped bytes    : 309906
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index f9b090372..a65197f10 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -6481,7 +6481,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-tab"] = package.loaded["util-tab"] or true
 
--- original size: 27638, stripped down to: 17116
+-- original size: 27665, stripped down to: 17051
 
 if not modules then modules={} end modules ['util-tab']={
   version=1.001,
@@ -6861,11 +6861,6 @@ function table.drop(t,slow)
     return fastdrop(t) 
   end
 end
-function table.autokey(t,k)
-  local v={}
-  t[k]=v
-  return v
-end
 local selfmapper={ __index=function(t,k) t[k]=k return k end }
 function table.twowaymapper(t)  
   if not t then         
@@ -7710,7 +7705,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-sto"] = package.loaded["util-sto"] or true
 
--- original size: 3926, stripped down to: 2742
+-- original size: 5918, stripped down to: 2756
 
 if not modules then modules={} end modules ['util-sto']={
   version=1.001,
@@ -7719,7 +7714,7 @@ if not modules then modules={} end modules ['util-sto']={
   copyright="PRAGMA ADE / ConTeXt Development Team",
   license="see context related readme files"
 }
-local setmetatable,getmetatable,type=setmetatable,getmetatable,type
+local setmetatable,getmetatable,rawset,type=setmetatable,getmetatable,rawset,type
 utilities=utilities or {}
 utilities.storage=utilities.storage or {}
 local storage=utilities.storage
@@ -20762,8 +20757,8 @@ end -- of closure
 
 -- used libraries    : l-lua.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    : 853166
--- stripped bytes    : 307836
+-- original bytes    : 855185
+-- stripped bytes    : 309906
 
 -- end library merge
 
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index f9b090372..a65197f10 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -6481,7 +6481,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-tab"] = package.loaded["util-tab"] or true
 
--- original size: 27638, stripped down to: 17116
+-- original size: 27665, stripped down to: 17051
 
 if not modules then modules={} end modules ['util-tab']={
   version=1.001,
@@ -6861,11 +6861,6 @@ function table.drop(t,slow)
     return fastdrop(t) 
   end
 end
-function table.autokey(t,k)
-  local v={}
-  t[k]=v
-  return v
-end
 local selfmapper={ __index=function(t,k) t[k]=k return k end }
 function table.twowaymapper(t)  
   if not t then         
@@ -7710,7 +7705,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-sto"] = package.loaded["util-sto"] or true
 
--- original size: 3926, stripped down to: 2742
+-- original size: 5918, stripped down to: 2756
 
 if not modules then modules={} end modules ['util-sto']={
   version=1.001,
@@ -7719,7 +7714,7 @@ if not modules then modules={} end modules ['util-sto']={
   copyright="PRAGMA ADE / ConTeXt Development Team",
   license="see context related readme files"
 }
-local setmetatable,getmetatable,type=setmetatable,getmetatable,type
+local setmetatable,getmetatable,rawset,type=setmetatable,getmetatable,rawset,type
 utilities=utilities or {}
 utilities.storage=utilities.storage or {}
 local storage=utilities.storage
@@ -20762,8 +20757,8 @@ end -- of closure
 
 -- used libraries    : l-lua.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    : 853166
--- stripped bytes    : 307836
+-- original bytes    : 855185
+-- stripped bytes    : 309906
 
 -- end library merge