2018-03-21 09:24:00

6 files changed, 144 insertions, 100 deletions

diff --git a/scripts/context/lua/mtx-context.lua b/scripts/context/lua/mtx-context.lua
index 1df3a5d5b..f380dc6ff 100644
--- a/scripts/context/lua/mtx-context.lua
+++ b/scripts/context/lua/mtx-context.lua
@@ -591,17 +591,6 @@ local function run_texexec(filename,a_purge,a_purgeall)
     end
 end
 
--- context mode will become the only method some day
-
--- local function check_synctex(a_synctex) -- context is intercepted elsewhere
---     return a_synctex and (
---         tonumber(a_synctex) or
---         (toboolean(a_synctex,true) and 1) or
---         (a_synctex == "zipped" and 1) or
---         (a_synctex == "unzipped" and -1)
---     ) or nil
--- end
-
 function scripts.context.run(ctxdata,filename)
     --
     local a_nofile = getargument("nofile")
@@ -659,7 +648,6 @@ 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("synctex")
     local a_backend       = getargument("backend")
     local a_arrange       = getargument("arrange")
     local a_noarrange     = getargument("noarrange")
@@ -711,8 +699,6 @@ function scripts.context.run(ctxdata,filename)
         --
         local analysis = preamble_analyze(filename)
         --
-     -- 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)
         elseif plain_format(a_texformat or analysis.texformat) then
@@ -822,9 +808,9 @@ function scripts.context.run(ctxdata,filename)
                 --
                 local l_flags = {
                     ["interaction"]           = a_batchmode,
-                 -- ["synctex"]               = check_synctex(a_synctex), -- otherwise not working
-                    ["no-parse-first-line"]   = true,           -- obsolete
-                    ["safer"]                 = a_safer,        -- better use --sandbox
+                 -- ["synctex"]               = false,       -- context has its own way
+                    ["no-parse-first-line"]   = true,        -- obsolete
+                    ["safer"]                 = a_safer,     -- better use --sandbox
                  -- ["no-mktex"]              = true,
                  -- ["file-line-error-style"] = true,
                     ["fmt"]                   = formatfile,
@@ -848,7 +834,7 @@ function scripts.context.run(ctxdata,filename)
                     directives[#directives+1] = format("backend.date=%s",type(a_nodates) == "string" and a_nodates or " no")
                 end
                 --
-                if a_trailerid then
+                if type(a_trailerid) == "string" then
                     directives[#directives+1] = format("backend.trailerid=%s",a_trailerid)
                 end
                 --
@@ -859,9 +845,6 @@ 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 #directives > 0 then
                     c_flags.directives = concat(directives,",")
@@ -920,7 +903,6 @@ 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 validfile(syncctx) then
                     renamefile(syncctx,fileaddsuffix(jobname,"synctex"))
                 end
@@ -1337,12 +1319,6 @@ function scripts.context.purge_job(jobname,all,mkiitoo,fulljobname)
                     deleted[#deleted+1] = purge_file(fileaddsuffix(fulljobname,temporary_suffixes[i],true))
                 end
             end
-         -- if not environment.argument("synctex") then
-         --     -- special case: not deleted when --synctex is given, but what if given in preamble
-         --     for i=1,#synctex_runfiles do
-         --         deleted[#deleted+1] = purge_file(fileaddsuffix(filebase,synctex_runfiles[i]))
-         --     end
-         -- end
             if all then
                 for i=1,#persistent_runfiles do
                     deleted[#deleted+1] = purge_file(fileaddsuffix(filebase,persistent_runfiles[i]))
diff --git a/scripts/context/lua/mtx-context.xml b/scripts/context/lua/mtx-context.xml
index e58d71f5f..9003b549a 100644
--- a/scripts/context/lua/mtx-context.xml
+++ b/scripts/context/lua/mtx-context.xml
@@ -128,11 +128,11 @@
                 <flag name="nonstopmode">
                     <short>run without stopping</short>
                 </flag>
-                <flag name="synctex">
-                    <short>run with synctex enabled (optional value: zipped, unzipped, 1, -1, context)</short>
+                <flag name="nosynctex">
+                    <short>never initializes synctex (for production runs)</short>
                 </flag>
-                <flag name="syncttx">
-                    <short>a shortcut for --synctex=context</short>
+                <flag name="synctex">
+                    <short>run with synctex enabled (better use \setupsynctex[state=start]</short>
                 </flag>
                 <flag name="nodates">
                     <short>omit runtime dates in pdf file (optional value: a number (this 1970 offset time) or string "YYYY-MM-DD HH:MM")</short>
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 340d4699e..cec16c7e5 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -56,7 +56,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-lua"] = package.loaded["l-lua"] or true
 
--- original size: 6090, stripped down to: 3527
+-- original size: 6230, stripped down to: 3662
 
 if not modules then modules={} end modules ['l-lua']={
   version=1.001,
@@ -180,6 +180,8 @@ end
 local loaded=package.loaded
 if not loaded["socket"] then loaded["socket"]=loaded["socket.core"] end
 if not loaded["mime"]  then loaded["mime"]=loaded["mime.core"]  end
+if not socket.mime then socket.mime=package.loaded["mime"] end
+if not loaded["socket.mime"] then loaded["socket.mime"]=socket.mime end
 if not loaded["socket.http"] then loaded["socket.http"]=socket.http end
 if not loaded["socket.ftp"] then loaded["socket.ftp"]=socket.ftp end
 if not loaded["socket.smtp"] then loaded["socket.smtp"]=socket.smtp end
@@ -1869,7 +1871,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-table"] = package.loaded["l-table"] or true
 
--- original size: 40161, stripped down to: 23559
+-- original size: 40200, stripped down to: 23561
 
 if not modules then modules={} end modules ['l-table']={
   version=1.001,
@@ -2781,10 +2783,10 @@ function table.reversed(t)
     return tt
   end
 end
-function table.reverse(t)
+function table.reverse(t) 
   if t then
     local n=#t
-    for i=1,floor(n/2) do
+    for i=1,floor(n/2) do 
       local j=n-i+1
       t[i],t[j]=t[j],t[i]
     end
@@ -6035,7 +6037,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-str"] = package.loaded["util-str"] or true
 
--- original size: 38616, stripped down to: 21710
+-- original size: 38725, stripped down to: 21726
 
 if not modules then modules={} end modules ['util-str']={
   version=1.001,
@@ -6428,7 +6430,7 @@ local format_left=function(f)
 end
 local format_q=function()
   n=n+1
-  return format("(a%s and format('%%q',a%s) or '')",n,n) 
+  return format("(a%s ~= nil and format('%%q',tostring(a%s)) or '')",n,n)
 end
 local format_Q=function() 
   n=n+1
@@ -6699,7 +6701,7 @@ local builder=Cs { "start",
   ["X"]=(prefix_any*P("X"))/format_X,
   ["o"]=(prefix_any*P("o"))/format_o,
   ["S"]=(prefix_any*P("S"))/format_S,
-  ["Q"]=(prefix_any*P("Q"))/format_S,
+  ["Q"]=(prefix_any*P("Q"))/format_Q,
   ["N"]=(prefix_any*P("N"))/format_N,
   ["k"]=(prefix_sub*P("k"))/format_k,
   ["c"]=(prefix_any*P("c"))/format_c,
@@ -14703,7 +14705,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true
 
--- original size: 30075, stripped down to: 21379
+-- original size: 30650, stripped down to: 21793
 
 if not modules then modules={} end modules ['lxml-aux']={
   version=1.001,
@@ -15571,6 +15573,27 @@ function xml.totable(x,strip,flat)
     return convert(x,strip,flat)
   end
 end
+function xml.rename(e,namespace,name,attributes)
+  if type(e)~="table" or not e.tg then
+    return
+  end
+  if type(name)=="table" then
+    attributes=name
+    name=namespace
+    namespace=""
+  elseif type(name)~="string" then
+    attributes={}
+    name=namespace
+    namespace=""
+  end
+  if type(attributes)~="table" then
+    attributes={}
+  end
+  e.ns=namespace
+  e.rn=namespace
+  e.tg=name
+  e.at=attributes
+end
 
 
 end -- of closure
@@ -16383,7 +16406,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["data-exp"] = package.loaded["data-exp"] or true
 
--- original size: 21319, stripped down to: 11325
+-- original size: 18105, stripped down to: 11207
 
 if not modules then modules={} end modules ['data-exp']={
   version=1.001,
@@ -16749,12 +16772,6 @@ function resolvers.get_from_content(content,path,name)
     return path,remap[used] or used
   else
     local name=path
-    if addcasecraptoo then
-      local path=files[name]
-      if path then
-        return path,name
-      end
-    end
     local used=lower(name)
     local path=files[used]
     if path then
@@ -21217,8 +21234,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    : 877239
--- stripped bytes    : 320368
+-- original bytes    : 874888
+-- stripped bytes    : 317568
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 340d4699e..cec16c7e5 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -56,7 +56,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-lua"] = package.loaded["l-lua"] or true
 
--- original size: 6090, stripped down to: 3527
+-- original size: 6230, stripped down to: 3662
 
 if not modules then modules={} end modules ['l-lua']={
   version=1.001,
@@ -180,6 +180,8 @@ end
 local loaded=package.loaded
 if not loaded["socket"] then loaded["socket"]=loaded["socket.core"] end
 if not loaded["mime"]  then loaded["mime"]=loaded["mime.core"]  end
+if not socket.mime then socket.mime=package.loaded["mime"] end
+if not loaded["socket.mime"] then loaded["socket.mime"]=socket.mime end
 if not loaded["socket.http"] then loaded["socket.http"]=socket.http end
 if not loaded["socket.ftp"] then loaded["socket.ftp"]=socket.ftp end
 if not loaded["socket.smtp"] then loaded["socket.smtp"]=socket.smtp end
@@ -1869,7 +1871,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-table"] = package.loaded["l-table"] or true
 
--- original size: 40161, stripped down to: 23559
+-- original size: 40200, stripped down to: 23561
 
 if not modules then modules={} end modules ['l-table']={
   version=1.001,
@@ -2781,10 +2783,10 @@ function table.reversed(t)
     return tt
   end
 end
-function table.reverse(t)
+function table.reverse(t) 
   if t then
     local n=#t
-    for i=1,floor(n/2) do
+    for i=1,floor(n/2) do 
       local j=n-i+1
       t[i],t[j]=t[j],t[i]
     end
@@ -6035,7 +6037,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-str"] = package.loaded["util-str"] or true
 
--- original size: 38616, stripped down to: 21710
+-- original size: 38725, stripped down to: 21726
 
 if not modules then modules={} end modules ['util-str']={
   version=1.001,
@@ -6428,7 +6430,7 @@ local format_left=function(f)
 end
 local format_q=function()
   n=n+1
-  return format("(a%s and format('%%q',a%s) or '')",n,n) 
+  return format("(a%s ~= nil and format('%%q',tostring(a%s)) or '')",n,n)
 end
 local format_Q=function() 
   n=n+1
@@ -6699,7 +6701,7 @@ local builder=Cs { "start",
   ["X"]=(prefix_any*P("X"))/format_X,
   ["o"]=(prefix_any*P("o"))/format_o,
   ["S"]=(prefix_any*P("S"))/format_S,
-  ["Q"]=(prefix_any*P("Q"))/format_S,
+  ["Q"]=(prefix_any*P("Q"))/format_Q,
   ["N"]=(prefix_any*P("N"))/format_N,
   ["k"]=(prefix_sub*P("k"))/format_k,
   ["c"]=(prefix_any*P("c"))/format_c,
@@ -14703,7 +14705,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true
 
--- original size: 30075, stripped down to: 21379
+-- original size: 30650, stripped down to: 21793
 
 if not modules then modules={} end modules ['lxml-aux']={
   version=1.001,
@@ -15571,6 +15573,27 @@ function xml.totable(x,strip,flat)
     return convert(x,strip,flat)
   end
 end
+function xml.rename(e,namespace,name,attributes)
+  if type(e)~="table" or not e.tg then
+    return
+  end
+  if type(name)=="table" then
+    attributes=name
+    name=namespace
+    namespace=""
+  elseif type(name)~="string" then
+    attributes={}
+    name=namespace
+    namespace=""
+  end
+  if type(attributes)~="table" then
+    attributes={}
+  end
+  e.ns=namespace
+  e.rn=namespace
+  e.tg=name
+  e.at=attributes
+end
 
 
 end -- of closure
@@ -16383,7 +16406,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["data-exp"] = package.loaded["data-exp"] or true
 
--- original size: 21319, stripped down to: 11325
+-- original size: 18105, stripped down to: 11207
 
 if not modules then modules={} end modules ['data-exp']={
   version=1.001,
@@ -16749,12 +16772,6 @@ function resolvers.get_from_content(content,path,name)
     return path,remap[used] or used
   else
     local name=path
-    if addcasecraptoo then
-      local path=files[name]
-      if path then
-        return path,name
-      end
-    end
     local used=lower(name)
     local path=files[used]
     if path then
@@ -21217,8 +21234,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    : 877239
--- stripped bytes    : 320368
+-- original bytes    : 874888
+-- stripped bytes    : 317568
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 340d4699e..cec16c7e5 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -56,7 +56,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-lua"] = package.loaded["l-lua"] or true
 
--- original size: 6090, stripped down to: 3527
+-- original size: 6230, stripped down to: 3662
 
 if not modules then modules={} end modules ['l-lua']={
   version=1.001,
@@ -180,6 +180,8 @@ end
 local loaded=package.loaded
 if not loaded["socket"] then loaded["socket"]=loaded["socket.core"] end
 if not loaded["mime"]  then loaded["mime"]=loaded["mime.core"]  end
+if not socket.mime then socket.mime=package.loaded["mime"] end
+if not loaded["socket.mime"] then loaded["socket.mime"]=socket.mime end
 if not loaded["socket.http"] then loaded["socket.http"]=socket.http end
 if not loaded["socket.ftp"] then loaded["socket.ftp"]=socket.ftp end
 if not loaded["socket.smtp"] then loaded["socket.smtp"]=socket.smtp end
@@ -1869,7 +1871,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-table"] = package.loaded["l-table"] or true
 
--- original size: 40161, stripped down to: 23559
+-- original size: 40200, stripped down to: 23561
 
 if not modules then modules={} end modules ['l-table']={
   version=1.001,
@@ -2781,10 +2783,10 @@ function table.reversed(t)
     return tt
   end
 end
-function table.reverse(t)
+function table.reverse(t) 
   if t then
     local n=#t
-    for i=1,floor(n/2) do
+    for i=1,floor(n/2) do 
       local j=n-i+1
       t[i],t[j]=t[j],t[i]
     end
@@ -6035,7 +6037,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-str"] = package.loaded["util-str"] or true
 
--- original size: 38616, stripped down to: 21710
+-- original size: 38725, stripped down to: 21726
 
 if not modules then modules={} end modules ['util-str']={
   version=1.001,
@@ -6428,7 +6430,7 @@ local format_left=function(f)
 end
 local format_q=function()
   n=n+1
-  return format("(a%s and format('%%q',a%s) or '')",n,n) 
+  return format("(a%s ~= nil and format('%%q',tostring(a%s)) or '')",n,n)
 end
 local format_Q=function() 
   n=n+1
@@ -6699,7 +6701,7 @@ local builder=Cs { "start",
   ["X"]=(prefix_any*P("X"))/format_X,
   ["o"]=(prefix_any*P("o"))/format_o,
   ["S"]=(prefix_any*P("S"))/format_S,
-  ["Q"]=(prefix_any*P("Q"))/format_S,
+  ["Q"]=(prefix_any*P("Q"))/format_Q,
   ["N"]=(prefix_any*P("N"))/format_N,
   ["k"]=(prefix_sub*P("k"))/format_k,
   ["c"]=(prefix_any*P("c"))/format_c,
@@ -14703,7 +14705,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true
 
--- original size: 30075, stripped down to: 21379
+-- original size: 30650, stripped down to: 21793
 
 if not modules then modules={} end modules ['lxml-aux']={
   version=1.001,
@@ -15571,6 +15573,27 @@ function xml.totable(x,strip,flat)
     return convert(x,strip,flat)
   end
 end
+function xml.rename(e,namespace,name,attributes)
+  if type(e)~="table" or not e.tg then
+    return
+  end
+  if type(name)=="table" then
+    attributes=name
+    name=namespace
+    namespace=""
+  elseif type(name)~="string" then
+    attributes={}
+    name=namespace
+    namespace=""
+  end
+  if type(attributes)~="table" then
+    attributes={}
+  end
+  e.ns=namespace
+  e.rn=namespace
+  e.tg=name
+  e.at=attributes
+end
 
 
 end -- of closure
@@ -16383,7 +16406,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["data-exp"] = package.loaded["data-exp"] or true
 
--- original size: 21319, stripped down to: 11325
+-- original size: 18105, stripped down to: 11207
 
 if not modules then modules={} end modules ['data-exp']={
   version=1.001,
@@ -16749,12 +16772,6 @@ function resolvers.get_from_content(content,path,name)
     return path,remap[used] or used
   else
     local name=path
-    if addcasecraptoo then
-      local path=files[name]
-      if path then
-        return path,name
-      end
-    end
     local used=lower(name)
     local path=files[used]
     if path then
@@ -21217,8 +21234,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    : 877239
--- stripped bytes    : 320368
+-- original bytes    : 874888
+-- stripped bytes    : 317568
 
 -- end library merge
 
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index 340d4699e..cec16c7e5 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -56,7 +56,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-lua"] = package.loaded["l-lua"] or true
 
--- original size: 6090, stripped down to: 3527
+-- original size: 6230, stripped down to: 3662
 
 if not modules then modules={} end modules ['l-lua']={
   version=1.001,
@@ -180,6 +180,8 @@ end
 local loaded=package.loaded
 if not loaded["socket"] then loaded["socket"]=loaded["socket.core"] end
 if not loaded["mime"]  then loaded["mime"]=loaded["mime.core"]  end
+if not socket.mime then socket.mime=package.loaded["mime"] end
+if not loaded["socket.mime"] then loaded["socket.mime"]=socket.mime end
 if not loaded["socket.http"] then loaded["socket.http"]=socket.http end
 if not loaded["socket.ftp"] then loaded["socket.ftp"]=socket.ftp end
 if not loaded["socket.smtp"] then loaded["socket.smtp"]=socket.smtp end
@@ -1869,7 +1871,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-table"] = package.loaded["l-table"] or true
 
--- original size: 40161, stripped down to: 23559
+-- original size: 40200, stripped down to: 23561
 
 if not modules then modules={} end modules ['l-table']={
   version=1.001,
@@ -2781,10 +2783,10 @@ function table.reversed(t)
     return tt
   end
 end
-function table.reverse(t)
+function table.reverse(t) 
   if t then
     local n=#t
-    for i=1,floor(n/2) do
+    for i=1,floor(n/2) do 
       local j=n-i+1
       t[i],t[j]=t[j],t[i]
     end
@@ -6035,7 +6037,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-str"] = package.loaded["util-str"] or true
 
--- original size: 38616, stripped down to: 21710
+-- original size: 38725, stripped down to: 21726
 
 if not modules then modules={} end modules ['util-str']={
   version=1.001,
@@ -6428,7 +6430,7 @@ local format_left=function(f)
 end
 local format_q=function()
   n=n+1
-  return format("(a%s and format('%%q',a%s) or '')",n,n) 
+  return format("(a%s ~= nil and format('%%q',tostring(a%s)) or '')",n,n)
 end
 local format_Q=function() 
   n=n+1
@@ -6699,7 +6701,7 @@ local builder=Cs { "start",
   ["X"]=(prefix_any*P("X"))/format_X,
   ["o"]=(prefix_any*P("o"))/format_o,
   ["S"]=(prefix_any*P("S"))/format_S,
-  ["Q"]=(prefix_any*P("Q"))/format_S,
+  ["Q"]=(prefix_any*P("Q"))/format_Q,
   ["N"]=(prefix_any*P("N"))/format_N,
   ["k"]=(prefix_sub*P("k"))/format_k,
   ["c"]=(prefix_any*P("c"))/format_c,
@@ -14703,7 +14705,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true
 
--- original size: 30075, stripped down to: 21379
+-- original size: 30650, stripped down to: 21793
 
 if not modules then modules={} end modules ['lxml-aux']={
   version=1.001,
@@ -15571,6 +15573,27 @@ function xml.totable(x,strip,flat)
     return convert(x,strip,flat)
   end
 end
+function xml.rename(e,namespace,name,attributes)
+  if type(e)~="table" or not e.tg then
+    return
+  end
+  if type(name)=="table" then
+    attributes=name
+    name=namespace
+    namespace=""
+  elseif type(name)~="string" then
+    attributes={}
+    name=namespace
+    namespace=""
+  end
+  if type(attributes)~="table" then
+    attributes={}
+  end
+  e.ns=namespace
+  e.rn=namespace
+  e.tg=name
+  e.at=attributes
+end
 
 
 end -- of closure
@@ -16383,7 +16406,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["data-exp"] = package.loaded["data-exp"] or true
 
--- original size: 21319, stripped down to: 11325
+-- original size: 18105, stripped down to: 11207
 
 if not modules then modules={} end modules ['data-exp']={
   version=1.001,
@@ -16749,12 +16772,6 @@ function resolvers.get_from_content(content,path,name)
     return path,remap[used] or used
   else
     local name=path
-    if addcasecraptoo then
-      local path=files[name]
-      if path then
-        return path,name
-      end
-    end
     local used=lower(name)
     local path=files[used]
     if path then
@@ -21217,8 +21234,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    : 877239
--- stripped bytes    : 320368
+-- original bytes    : 874888
+-- stripped bytes    : 317568
 
 -- end library merge