2017-04-08 12:15:00

7 files changed, 897 insertions, 169 deletions

diff --git a/scripts/context/lua/mtx-context.lua b/scripts/context/lua/mtx-context.lua
index cca1001a6..b52bed379 100644
--- a/scripts/context/lua/mtx-context.lua
+++ b/scripts/context/lua/mtx-context.lua
@@ -614,6 +614,12 @@ function scripts.context.run(ctxdata,filename)
     for i=1,#filelist do
         --
         local filename = filelist[i]
+
+        if filename == "" then
+            report("warning: bad filename")
+            break
+        end
+
         local basename = filebasename(filename) -- use splitter
         local pathname = filepathpart(filename)
         --
diff --git a/scripts/context/lua/mtx-fonts.lua b/scripts/context/lua/mtx-fonts.lua
index 047383466..a3924ef8f 100644
--- a/scripts/context/lua/mtx-fonts.lua
+++ b/scripts/context/lua/mtx-fonts.lua
@@ -355,7 +355,7 @@ local function list_matches(t,info)
                     entry.familyname,
                     entry.fontname,
                     entry.filename,
-                    entry.subfont or "",
+                    tostring(entry.subfont or ""),
                     concat(entry.instancenames or { }, " "),
                 }
             end
diff --git a/scripts/context/lua/mtx-interface.lua b/scripts/context/lua/mtx-interface.lua
index b82dd5abf..908d00540 100644
--- a/scripts/context/lua/mtx-interface.lua
+++ b/scripts/context/lua/mtx-interface.lua
@@ -380,6 +380,8 @@ end
 --     flushers[editor](collected)
 -- end
 
+-- we could instead load context-en.xml
+
 function scripts.interface.editor(editor,split,forcedinterfaces)
     local interfaces= forcedinterfaces or environment.files
     if #interfaces == 0 then
@@ -421,11 +423,29 @@ function scripts.interface.editor(editor,split,forcedinterfaces)
             return io.loaddata(fullname)
         end
     end)
+    -- resolve definitions
+    local definitions = { }
+    for e in xml.collected(xmlroot,"cd:interface/cd:define") do
+        definitions[e.at.name] = e.dt
+    end
+    local function resolve(root)
+        for e in xml.collected(root,"*") do
+            if e.tg == "resolve" then
+                local resolved = definitions[e.at.name or ""]
+                if resolved then
+                    e.__p__.dt[e.ni] = resolved
+                    resolve(resolved)
+                end
+            end
+        end
+    end
+    resolve(xmlroot)
     --
     for i=1,#interfaces do
         local interface      = interfaces[i]
         local i_commands     = { }
         local i_environments = { }
+        local i_instances    = { }
         local start = elements.start[interface] or elements.start.en
         local stop  = elements.stop [interface] or elements.stop .en
         for e in xml.collected(xmlroot,"cd:interface/cd:command") do
@@ -435,8 +455,14 @@ function scripts.interface.editor(editor,split,forcedinterfaces)
             if name ~= "" then
                 local c = commands[name]
                 local n = c and (c[interface] or c.en) or name
+-- for e in xml.collected(e,"/instances") do
+--     print(n,e)
+-- end
                 if at.generated == "yes" then
                     -- skip (for now)
+-- if at.variant == "instance" then
+--     i_instances = n
+-- end
                 elseif type ~= "environment" then
                     i_commands[#i_commands+1] = n
                 elseif split then
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 5e08f19ac..ec4e81506 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -5666,7 +5666,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-str"] = package.loaded["util-str"] or true
 
--- original size: 36449, stripped down to: 20179
+-- original size: 36148, stripped down to: 20179
 
 if not modules then modules={} end modules ['util-str']={
   version=1.001,
@@ -7029,7 +7029,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-fil"] = package.loaded["util-fil"] or true
 
--- original size: 7038, stripped down to: 5659
+-- original size: 7039, stripped down to: 5672
 
 if not modules then modules={} end modules ['util-fil']={
   version=1.001,
@@ -7138,11 +7138,10 @@ function files.readinteger2(f)
 end
 function files.readinteger2le(f)
   local b,a=byte(f:read(2),1,2)
-  local n=0x100*a+b
-  if n>=0x8000 then
-    return n-0x10000
+  if a>=0x80 then
+    return 0x100*a+b-0x10000
   else
-    return n
+    return 0x100*a+b
   end
 end
 function files.readcardinal3(f)
@@ -7155,20 +7154,18 @@ function files.readcardinal3le(f)
 end
 function files.readinteger3(f)
   local a,b,c=byte(f:read(3),1,3)
-  local n=0x10000*a+0x100*b+c
-  if n>=0x80000 then
-    return n-0x1000000
+  if a>=0x80 then
+    return 0x10000*a+0x100*b+c-0x1000000
   else
-    return n
+    return 0x10000*a+0x100*b+c
   end
 end
 function files.readinteger3le(f)
   local c,b,a=byte(f:read(3),1,3)
-  local n=0x10000*a+0x100*b+c
-  if n>=0x80000 then
-    return n-0x1000000
+  if a>=0x80 then
+    return 0x10000*a+0x100*b+c-0x1000000
   else
-    return n
+    return 0x10000*a+0x100*b+c
   end
 end
 function files.readcardinal4(f)
@@ -7189,11 +7186,10 @@ function files.readinteger4(f)
 end
 function files.readinteger4le(f)
   local d,c,b,a=byte(f:read(4),1,4)
-  local n=0x1000000*a+0x10000*b+0x100*c+d
-  if n>=0x8000000 then
-    return n-0x100000000
+  if a>=0x80 then
+    return 0x1000000*a+0x10000*b+0x100*c+d-0x100000000
   else
-    return n
+    return 0x1000000*a+0x10000*b+0x100*c+d
   end
 end
 function files.readfixed2(f)
@@ -7291,7 +7287,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-sac"] = package.loaded["util-sac"] or true
 
--- original size: 4330, stripped down to: 3316
+-- original size: 8697, stripped down to: 6981
 
 if not modules then modules={} end modules ['util-sac']={
   version=1.001,
@@ -7399,16 +7395,33 @@ function streams.readcardinal2(f)
   local a,b=byte(f[1],i,j)
   return 0x100*a+b
 end
+function streams.readcardinal2LE(f)
+  local i=f[2]
+  local j=i+1
+  f[2]=j+1
+  local b,a=byte(f[1],i,j)
+  return 0x100*a+b
+end
 function streams.readinteger2(f)
   local i=f[2]
   local j=i+1
   f[2]=j+1
   local a,b=byte(f[1],i,j)
-  local n=0x100*a+b
-  if n>=0x8000 then
-    return n-0x10000
+  if a>=0x80 then
+    return 0x100*a+b-0x10000
   else
-    return n
+    return 0x100*a+b
+  end
+end
+function streams.readinteger2le(f)
+  local i=f[2]
+  local j=i+1
+  f[2]=j+1
+  local b,a=byte(f[1],i,j)
+  if a>=0x80 then
+    return 0x100*a+b-0x10000
+  else
+    return 0x100*a+b
   end
 end
 function streams.readcardinal3(f)
@@ -7418,6 +7431,35 @@ function streams.readcardinal3(f)
   local a,b,c=byte(f[1],i,j)
   return 0x10000*a+0x100*b+c
 end
+function streams.readcardinal3le(f)
+  local i=f[2]
+  local j=i+2
+  f[2]=j+1
+  local c,b,a=byte(f[1],i,j)
+  return 0x10000*a+0x100*b+c
+end
+function streams.readinteger3(f)
+  local i=f[2]
+  local j=i+3
+  f[2]=j+1
+  local a,b,c=byte(f[1],i,j)
+  if a>=0x80 then
+    return 0x10000*a+0x100*b+c-0x1000000
+  else
+    return 0x10000*a+0x100*b+c
+  end
+end
+function streams.readinteger3le(f)
+  local i=f[2]
+  local j=i+3
+  f[2]=j+1
+  local c,b,a=byte(f[1],i,j)
+  if a>=0x80 then
+    return 0x10000*a+0x100*b+c-0x1000000
+  else
+    return 0x10000*a+0x100*b+c
+  end
+end
 function streams.readcardinal4(f)
   local i=f[2]
   local j=i+3
@@ -7430,11 +7472,21 @@ function streams.readinteger4(f)
   local j=i+3
   f[2]=j+1
   local a,b,c,d=byte(f[1],i,j)
-  local n=0x1000000*a+0x10000*b+0x100*c+d
-  if n>=0x8000000 then
-    return n-0x100000000
+  if a>=0x80 then
+    return 0x1000000*a+0x10000*b+0x100*c+d-0x100000000
   else
-    return n
+    return 0x1000000*a+0x10000*b+0x100*c+d
+  end
+end
+function streams.readinteger4le(f)
+  local i=f[2]
+  local j=i+3
+  f[2]=j+1
+  local d,c,b,a=byte(f[1],i,j)
+  if a>=0x80 then
+    return 0x1000000*a+0x10000*b+0x100*c+d-0x100000000
+  else
+    return 0x1000000*a+0x10000*b+0x100*c+d
   end
 end
 function streams.readfixed4(f)
@@ -7442,11 +7494,21 @@ function streams.readfixed4(f)
   local j=i+3
   f[2]=j+1
   local a,b,c,d=byte(f[1],i,j)
-  local n=0x100*a+b
-  if n>=0x8000 then
-    return n-0x10000+(0x100*c+d)/0xFFFF
+  if a>=0x80 then
+    return (0x1000000*a+0x10000*b+0x100*c+d-0x100000000)/65536.0
+  else
+    return (0x1000000*a+0x10000*b+0x100*c+d)/65536.0
+  end
+end
+function streams.readfixed2(f)
+  local i=f[2]
+  local j=i+1
+  f[2]=j+1
+  local a,b=byte(f[1],i,j)
+  if a>=0x80 then
+    return (0x100*a+b-0x10000)/256.0
   else
-    return n+(0x100*c+d)/0xFFFF
+    return (0x100*a+b)/256.0
   end
 end
 if extract then
@@ -7457,8 +7519,13 @@ if extract then
     local j=i+1
     f[2]=j+1
     local a,b=byte(f[1],i,j)
-    local n=0x100*a+b
-    return extract(n,14,2)+(band(n,0x3FFF)/16384.0)
+    if a>=0x80 then
+      local n=-(0x100*a+b)
+      return-(extract(n,14,2)+(band(n,0x3FFF)/16384.0))
+    else
+      local n=0x100*a+b
+      return  (extract(n,14,2)+(band(n,0x3FFF)/16384.0))
+    end
   end
 end
 function streams.skipshort(f,n)
@@ -7467,6 +7534,102 @@ end
 function streams.skiplong(f,n)
   f[2]=f[2]+4*(n or 1)
 end
+if sio and sio.readcardinal2 then
+  local readcardinal1=sio.readcardinal1
+  local readcardinal2=sio.readcardinal2
+  local readcardinal3=sio.readcardinal3
+  local readcardinal4=sio.readcardinal4
+  local readinteger1=sio.readinteger1
+  local readinteger2=sio.readinteger2
+  local readinteger3=sio.readinteger3
+  local readinteger4=sio.readinteger4
+  local readfixed2=sio.readfixed2
+  local readfixed4=sio.readfixed4
+  local read2dot14=sio.read2dot14
+  local readbytes=sio.readbytes
+  local readbytetable=sio.readbytetable
+  function streams.readcardinal1(f)
+    local i=f[2]
+    f[2]=i+1
+    return readcardinal1(f[1],i)
+  end
+  function streams.readcardinal2(f)
+    local i=f[2]
+    f[2]=i+2
+    return readcardinal2(f[1],i)
+  end
+  function streams.readcardinal3(f)
+    local i=f[2]
+    f[2]=i+3
+    return readcardinal3(f[1],i)
+  end
+  function streams.readcardinal4(f)
+    local i=f[2]
+    f[2]=i+4
+    return readcardinal4(f[1],i)
+  end
+  function streams.readinteger1(f)
+    local i=f[2]
+    f[2]=i+1
+    return readinteger1(f[1],i)
+  end
+  function streams.readinteger2(f)
+    local i=f[2]
+    f[2]=i+2
+    return readinteger2(f[1],i)
+  end
+  function streams.readinteger3(f)
+    local i=f[2]
+    f[2]=i+3
+    return readinteger3(f[1],i)
+  end
+  function streams.readinteger4(f)
+    local i=f[2]
+    f[2]=i+4
+    return readinteger4(f[1],i)
+  end
+  function streams.readfixed2(f)
+    local i=f[2]
+    f[2]=i+2
+    return readfixed2(f[1],i)
+  end
+  function streams.readfixed4(f)
+    local i=f[2]
+    f[2]=i+4
+    return readfixed4(f[1],i)
+  end
+  function streams.read2dot4(f)
+    local i=f[2]
+    f[2]=i+2
+    return read2dot4(f[1],i)
+  end
+  function streams.readbytes(f,n)
+    local i=f[2]
+    local s=f[3]
+    local p=i+n
+    if p>s then
+      f[2]=s+1
+    else
+      f[2]=p
+    end
+    return readbytes(f[1],i,n)
+  end
+  function streams.readbytetable(f,n)
+    local i=f[2]
+    local s=f[3]
+    local p=i+n
+    if p>s then
+      f[2]=s+1
+    else
+      f[2]=p
+    end
+    return readbytetable(f[1],i,n)
+  end
+  streams.readbyte=streams.readcardinal1
+  streams.readsignedbyte=streams.readinteger1
+  streams.readcardinal=streams.readcardinal1
+  streams.readinteger=streams.readinteger1
+end
 
 
 end -- of closure
@@ -11264,7 +11427,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-tab"] = package.loaded["lxml-tab"] or true
 
--- original size: 56300, stripped down to: 35539
+-- original size: 57003, stripped down to: 35696
 
 if not modules then modules={} end modules ['lxml-tab']={
   version=1.001,
@@ -11279,7 +11442,7 @@ if lpeg.setmaxstack then lpeg.setmaxstack(1000) end
 xml=xml or {}
 local xml=xml
 local concat,remove,insert=table.concat,table.remove,table.insert
-local type,next,setmetatable,getmetatable,tonumber,rawset=type,next,setmetatable,getmetatable,tonumber,rawset
+local type,next,setmetatable,getmetatable,tonumber,rawset,select=type,next,setmetatable,getmetatable,tonumber,rawset,select
 local lower,find,match,gsub=string.lower,string.find,string.match,string.gsub
 local sort=table.sort
 local utfchar=utf.char
@@ -12459,18 +12622,26 @@ local xmlfilehandler=newhandlers {
 function xml.save(root,name)
   serialize(root,xmlfilehandler,name)
 end
-local result
+local result,r,threshold={},0,512
 local xmlstringhandler=newhandlers {
   name="string",
   initialize=function()
-    result={}
+    r=0
     return result
   end,
   finalize=function()
-    return concat(result)
+    local done=concat(result,"",1,r)
+    r=0
+    if r>threshold then
+      result={}
+    end
+    return done
   end,
   handle=function(...)
-    result[#result+1]=concat {... }
+    for i=1,select("#",...) do
+      r=r+1
+      result[r]=select(i,...)
+    end
   end,
 }
 local function xmltostring(root) 
@@ -19660,7 +19831,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lib"] = package.loaded["util-lib"] or true
 
--- original size: 13452, stripped down to: 7398
+-- original size: 13595, stripped down to: 7500
 
 if not modules then modules={} end modules ['util-lib']={
   version=1.001,
@@ -19826,6 +19997,9 @@ do
       library=locate(required,version,trace_swiglib,report_swiglib,function(name,base)
         pushdir(pathpart(name))
         local opener="luaopen_"..base
+        if trace_swiglib then
+          report_swiglib("opening: %a with %a",name,opener)
+        end
         local library,message=loadlib(name,opener)
         local libtype=type(library)
         if libtype=="function" then
@@ -20248,8 +20422,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    : 836573
--- stripped bytes    : 304264
+-- original bytes    : 841486
+-- stripped bytes    : 305240
 
 -- end library merge
 
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 5e08f19ac..ec4e81506 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -5666,7 +5666,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-str"] = package.loaded["util-str"] or true
 
--- original size: 36449, stripped down to: 20179
+-- original size: 36148, stripped down to: 20179
 
 if not modules then modules={} end modules ['util-str']={
   version=1.001,
@@ -7029,7 +7029,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-fil"] = package.loaded["util-fil"] or true
 
--- original size: 7038, stripped down to: 5659
+-- original size: 7039, stripped down to: 5672
 
 if not modules then modules={} end modules ['util-fil']={
   version=1.001,
@@ -7138,11 +7138,10 @@ function files.readinteger2(f)
 end
 function files.readinteger2le(f)
   local b,a=byte(f:read(2),1,2)
-  local n=0x100*a+b
-  if n>=0x8000 then
-    return n-0x10000
+  if a>=0x80 then
+    return 0x100*a+b-0x10000
   else
-    return n
+    return 0x100*a+b
   end
 end
 function files.readcardinal3(f)
@@ -7155,20 +7154,18 @@ function files.readcardinal3le(f)
 end
 function files.readinteger3(f)
   local a,b,c=byte(f:read(3),1,3)
-  local n=0x10000*a+0x100*b+c
-  if n>=0x80000 then
-    return n-0x1000000
+  if a>=0x80 then
+    return 0x10000*a+0x100*b+c-0x1000000
   else
-    return n
+    return 0x10000*a+0x100*b+c
   end
 end
 function files.readinteger3le(f)
   local c,b,a=byte(f:read(3),1,3)
-  local n=0x10000*a+0x100*b+c
-  if n>=0x80000 then
-    return n-0x1000000
+  if a>=0x80 then
+    return 0x10000*a+0x100*b+c-0x1000000
   else
-    return n
+    return 0x10000*a+0x100*b+c
   end
 end
 function files.readcardinal4(f)
@@ -7189,11 +7186,10 @@ function files.readinteger4(f)
 end
 function files.readinteger4le(f)
   local d,c,b,a=byte(f:read(4),1,4)
-  local n=0x1000000*a+0x10000*b+0x100*c+d
-  if n>=0x8000000 then
-    return n-0x100000000
+  if a>=0x80 then
+    return 0x1000000*a+0x10000*b+0x100*c+d-0x100000000
   else
-    return n
+    return 0x1000000*a+0x10000*b+0x100*c+d
   end
 end
 function files.readfixed2(f)
@@ -7291,7 +7287,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-sac"] = package.loaded["util-sac"] or true
 
--- original size: 4330, stripped down to: 3316
+-- original size: 8697, stripped down to: 6981
 
 if not modules then modules={} end modules ['util-sac']={
   version=1.001,
@@ -7399,16 +7395,33 @@ function streams.readcardinal2(f)
   local a,b=byte(f[1],i,j)
   return 0x100*a+b
 end
+function streams.readcardinal2LE(f)
+  local i=f[2]
+  local j=i+1
+  f[2]=j+1
+  local b,a=byte(f[1],i,j)
+  return 0x100*a+b
+end
 function streams.readinteger2(f)
   local i=f[2]
   local j=i+1
   f[2]=j+1
   local a,b=byte(f[1],i,j)
-  local n=0x100*a+b
-  if n>=0x8000 then
-    return n-0x10000
+  if a>=0x80 then
+    return 0x100*a+b-0x10000
   else
-    return n
+    return 0x100*a+b
+  end
+end
+function streams.readinteger2le(f)
+  local i=f[2]
+  local j=i+1
+  f[2]=j+1
+  local b,a=byte(f[1],i,j)
+  if a>=0x80 then
+    return 0x100*a+b-0x10000
+  else
+    return 0x100*a+b
   end
 end
 function streams.readcardinal3(f)
@@ -7418,6 +7431,35 @@ function streams.readcardinal3(f)
   local a,b,c=byte(f[1],i,j)
   return 0x10000*a+0x100*b+c
 end
+function streams.readcardinal3le(f)
+  local i=f[2]
+  local j=i+2
+  f[2]=j+1
+  local c,b,a=byte(f[1],i,j)
+  return 0x10000*a+0x100*b+c
+end
+function streams.readinteger3(f)
+  local i=f[2]
+  local j=i+3
+  f[2]=j+1
+  local a,b,c=byte(f[1],i,j)
+  if a>=0x80 then
+    return 0x10000*a+0x100*b+c-0x1000000
+  else
+    return 0x10000*a+0x100*b+c
+  end
+end
+function streams.readinteger3le(f)
+  local i=f[2]
+  local j=i+3
+  f[2]=j+1
+  local c,b,a=byte(f[1],i,j)
+  if a>=0x80 then
+    return 0x10000*a+0x100*b+c-0x1000000
+  else
+    return 0x10000*a+0x100*b+c
+  end
+end
 function streams.readcardinal4(f)
   local i=f[2]
   local j=i+3
@@ -7430,11 +7472,21 @@ function streams.readinteger4(f)
   local j=i+3
   f[2]=j+1
   local a,b,c,d=byte(f[1],i,j)
-  local n=0x1000000*a+0x10000*b+0x100*c+d
-  if n>=0x8000000 then
-    return n-0x100000000
+  if a>=0x80 then
+    return 0x1000000*a+0x10000*b+0x100*c+d-0x100000000
   else
-    return n
+    return 0x1000000*a+0x10000*b+0x100*c+d
+  end
+end
+function streams.readinteger4le(f)
+  local i=f[2]
+  local j=i+3
+  f[2]=j+1
+  local d,c,b,a=byte(f[1],i,j)
+  if a>=0x80 then
+    return 0x1000000*a+0x10000*b+0x100*c+d-0x100000000
+  else
+    return 0x1000000*a+0x10000*b+0x100*c+d
   end
 end
 function streams.readfixed4(f)
@@ -7442,11 +7494,21 @@ function streams.readfixed4(f)
   local j=i+3
   f[2]=j+1
   local a,b,c,d=byte(f[1],i,j)
-  local n=0x100*a+b
-  if n>=0x8000 then
-    return n-0x10000+(0x100*c+d)/0xFFFF
+  if a>=0x80 then
+    return (0x1000000*a+0x10000*b+0x100*c+d-0x100000000)/65536.0
+  else
+    return (0x1000000*a+0x10000*b+0x100*c+d)/65536.0
+  end
+end
+function streams.readfixed2(f)
+  local i=f[2]
+  local j=i+1
+  f[2]=j+1
+  local a,b=byte(f[1],i,j)
+  if a>=0x80 then
+    return (0x100*a+b-0x10000)/256.0
   else
-    return n+(0x100*c+d)/0xFFFF
+    return (0x100*a+b)/256.0
   end
 end
 if extract then
@@ -7457,8 +7519,13 @@ if extract then
     local j=i+1
     f[2]=j+1
     local a,b=byte(f[1],i,j)
-    local n=0x100*a+b
-    return extract(n,14,2)+(band(n,0x3FFF)/16384.0)
+    if a>=0x80 then
+      local n=-(0x100*a+b)
+      return-(extract(n,14,2)+(band(n,0x3FFF)/16384.0))
+    else
+      local n=0x100*a+b
+      return  (extract(n,14,2)+(band(n,0x3FFF)/16384.0))
+    end
   end
 end
 function streams.skipshort(f,n)
@@ -7467,6 +7534,102 @@ end
 function streams.skiplong(f,n)
   f[2]=f[2]+4*(n or 1)
 end
+if sio and sio.readcardinal2 then
+  local readcardinal1=sio.readcardinal1
+  local readcardinal2=sio.readcardinal2
+  local readcardinal3=sio.readcardinal3
+  local readcardinal4=sio.readcardinal4
+  local readinteger1=sio.readinteger1
+  local readinteger2=sio.readinteger2
+  local readinteger3=sio.readinteger3
+  local readinteger4=sio.readinteger4
+  local readfixed2=sio.readfixed2
+  local readfixed4=sio.readfixed4
+  local read2dot14=sio.read2dot14
+  local readbytes=sio.readbytes
+  local readbytetable=sio.readbytetable
+  function streams.readcardinal1(f)
+    local i=f[2]
+    f[2]=i+1
+    return readcardinal1(f[1],i)
+  end
+  function streams.readcardinal2(f)
+    local i=f[2]
+    f[2]=i+2
+    return readcardinal2(f[1],i)
+  end
+  function streams.readcardinal3(f)
+    local i=f[2]
+    f[2]=i+3
+    return readcardinal3(f[1],i)
+  end
+  function streams.readcardinal4(f)
+    local i=f[2]
+    f[2]=i+4
+    return readcardinal4(f[1],i)
+  end
+  function streams.readinteger1(f)
+    local i=f[2]
+    f[2]=i+1
+    return readinteger1(f[1],i)
+  end
+  function streams.readinteger2(f)
+    local i=f[2]
+    f[2]=i+2
+    return readinteger2(f[1],i)
+  end
+  function streams.readinteger3(f)
+    local i=f[2]
+    f[2]=i+3
+    return readinteger3(f[1],i)
+  end
+  function streams.readinteger4(f)
+    local i=f[2]
+    f[2]=i+4
+    return readinteger4(f[1],i)
+  end
+  function streams.readfixed2(f)
+    local i=f[2]
+    f[2]=i+2
+    return readfixed2(f[1],i)
+  end
+  function streams.readfixed4(f)
+    local i=f[2]
+    f[2]=i+4
+    return readfixed4(f[1],i)
+  end
+  function streams.read2dot4(f)
+    local i=f[2]
+    f[2]=i+2
+    return read2dot4(f[1],i)
+  end
+  function streams.readbytes(f,n)
+    local i=f[2]
+    local s=f[3]
+    local p=i+n
+    if p>s then
+      f[2]=s+1
+    else
+      f[2]=p
+    end
+    return readbytes(f[1],i,n)
+  end
+  function streams.readbytetable(f,n)
+    local i=f[2]
+    local s=f[3]
+    local p=i+n
+    if p>s then
+      f[2]=s+1
+    else
+      f[2]=p
+    end
+    return readbytetable(f[1],i,n)
+  end
+  streams.readbyte=streams.readcardinal1
+  streams.readsignedbyte=streams.readinteger1
+  streams.readcardinal=streams.readcardinal1
+  streams.readinteger=streams.readinteger1
+end
 
 
 end -- of closure
@@ -11264,7 +11427,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-tab"] = package.loaded["lxml-tab"] or true
 
--- original size: 56300, stripped down to: 35539
+-- original size: 57003, stripped down to: 35696
 
 if not modules then modules={} end modules ['lxml-tab']={
   version=1.001,
@@ -11279,7 +11442,7 @@ if lpeg.setmaxstack then lpeg.setmaxstack(1000) end
 xml=xml or {}
 local xml=xml
 local concat,remove,insert=table.concat,table.remove,table.insert
-local type,next,setmetatable,getmetatable,tonumber,rawset=type,next,setmetatable,getmetatable,tonumber,rawset
+local type,next,setmetatable,getmetatable,tonumber,rawset,select=type,next,setmetatable,getmetatable,tonumber,rawset,select
 local lower,find,match,gsub=string.lower,string.find,string.match,string.gsub
 local sort=table.sort
 local utfchar=utf.char
@@ -12459,18 +12622,26 @@ local xmlfilehandler=newhandlers {
 function xml.save(root,name)
   serialize(root,xmlfilehandler,name)
 end
-local result
+local result,r,threshold={},0,512
 local xmlstringhandler=newhandlers {
   name="string",
   initialize=function()
-    result={}
+    r=0
     return result
   end,
   finalize=function()
-    return concat(result)
+    local done=concat(result,"",1,r)
+    r=0
+    if r>threshold then
+      result={}
+    end
+    return done
   end,
   handle=function(...)
-    result[#result+1]=concat {... }
+    for i=1,select("#",...) do
+      r=r+1
+      result[r]=select(i,...)
+    end
   end,
 }
 local function xmltostring(root) 
@@ -19660,7 +19831,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lib"] = package.loaded["util-lib"] or true
 
--- original size: 13452, stripped down to: 7398
+-- original size: 13595, stripped down to: 7500
 
 if not modules then modules={} end modules ['util-lib']={
   version=1.001,
@@ -19826,6 +19997,9 @@ do
       library=locate(required,version,trace_swiglib,report_swiglib,function(name,base)
         pushdir(pathpart(name))
         local opener="luaopen_"..base
+        if trace_swiglib then
+          report_swiglib("opening: %a with %a",name,opener)
+        end
         local library,message=loadlib(name,opener)
         local libtype=type(library)
         if libtype=="function" then
@@ -20248,8 +20422,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    : 836573
--- stripped bytes    : 304264
+-- original bytes    : 841486
+-- stripped bytes    : 305240
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 5e08f19ac..ec4e81506 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -5666,7 +5666,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-str"] = package.loaded["util-str"] or true
 
--- original size: 36449, stripped down to: 20179
+-- original size: 36148, stripped down to: 20179
 
 if not modules then modules={} end modules ['util-str']={
   version=1.001,
@@ -7029,7 +7029,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-fil"] = package.loaded["util-fil"] or true
 
--- original size: 7038, stripped down to: 5659
+-- original size: 7039, stripped down to: 5672
 
 if not modules then modules={} end modules ['util-fil']={
   version=1.001,
@@ -7138,11 +7138,10 @@ function files.readinteger2(f)
 end
 function files.readinteger2le(f)
   local b,a=byte(f:read(2),1,2)
-  local n=0x100*a+b
-  if n>=0x8000 then
-    return n-0x10000
+  if a>=0x80 then
+    return 0x100*a+b-0x10000
   else
-    return n
+    return 0x100*a+b
   end
 end
 function files.readcardinal3(f)
@@ -7155,20 +7154,18 @@ function files.readcardinal3le(f)
 end
 function files.readinteger3(f)
   local a,b,c=byte(f:read(3),1,3)
-  local n=0x10000*a+0x100*b+c
-  if n>=0x80000 then
-    return n-0x1000000
+  if a>=0x80 then
+    return 0x10000*a+0x100*b+c-0x1000000
   else
-    return n
+    return 0x10000*a+0x100*b+c
   end
 end
 function files.readinteger3le(f)
   local c,b,a=byte(f:read(3),1,3)
-  local n=0x10000*a+0x100*b+c
-  if n>=0x80000 then
-    return n-0x1000000
+  if a>=0x80 then
+    return 0x10000*a+0x100*b+c-0x1000000
   else
-    return n
+    return 0x10000*a+0x100*b+c
   end
 end
 function files.readcardinal4(f)
@@ -7189,11 +7186,10 @@ function files.readinteger4(f)
 end
 function files.readinteger4le(f)
   local d,c,b,a=byte(f:read(4),1,4)
-  local n=0x1000000*a+0x10000*b+0x100*c+d
-  if n>=0x8000000 then
-    return n-0x100000000
+  if a>=0x80 then
+    return 0x1000000*a+0x10000*b+0x100*c+d-0x100000000
   else
-    return n
+    return 0x1000000*a+0x10000*b+0x100*c+d
   end
 end
 function files.readfixed2(f)
@@ -7291,7 +7287,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-sac"] = package.loaded["util-sac"] or true
 
--- original size: 4330, stripped down to: 3316
+-- original size: 8697, stripped down to: 6981
 
 if not modules then modules={} end modules ['util-sac']={
   version=1.001,
@@ -7399,16 +7395,33 @@ function streams.readcardinal2(f)
   local a,b=byte(f[1],i,j)
   return 0x100*a+b
 end
+function streams.readcardinal2LE(f)
+  local i=f[2]
+  local j=i+1
+  f[2]=j+1
+  local b,a=byte(f[1],i,j)
+  return 0x100*a+b
+end
 function streams.readinteger2(f)
   local i=f[2]
   local j=i+1
   f[2]=j+1
   local a,b=byte(f[1],i,j)
-  local n=0x100*a+b
-  if n>=0x8000 then
-    return n-0x10000
+  if a>=0x80 then
+    return 0x100*a+b-0x10000
   else
-    return n
+    return 0x100*a+b
+  end
+end
+function streams.readinteger2le(f)
+  local i=f[2]
+  local j=i+1
+  f[2]=j+1
+  local b,a=byte(f[1],i,j)
+  if a>=0x80 then
+    return 0x100*a+b-0x10000
+  else
+    return 0x100*a+b
   end
 end
 function streams.readcardinal3(f)
@@ -7418,6 +7431,35 @@ function streams.readcardinal3(f)
   local a,b,c=byte(f[1],i,j)
   return 0x10000*a+0x100*b+c
 end
+function streams.readcardinal3le(f)
+  local i=f[2]
+  local j=i+2
+  f[2]=j+1
+  local c,b,a=byte(f[1],i,j)
+  return 0x10000*a+0x100*b+c
+end
+function streams.readinteger3(f)
+  local i=f[2]
+  local j=i+3
+  f[2]=j+1
+  local a,b,c=byte(f[1],i,j)
+  if a>=0x80 then
+    return 0x10000*a+0x100*b+c-0x1000000
+  else
+    return 0x10000*a+0x100*b+c
+  end
+end
+function streams.readinteger3le(f)
+  local i=f[2]
+  local j=i+3
+  f[2]=j+1
+  local c,b,a=byte(f[1],i,j)
+  if a>=0x80 then
+    return 0x10000*a+0x100*b+c-0x1000000
+  else
+    return 0x10000*a+0x100*b+c
+  end
+end
 function streams.readcardinal4(f)
   local i=f[2]
   local j=i+3
@@ -7430,11 +7472,21 @@ function streams.readinteger4(f)
   local j=i+3
   f[2]=j+1
   local a,b,c,d=byte(f[1],i,j)
-  local n=0x1000000*a+0x10000*b+0x100*c+d
-  if n>=0x8000000 then
-    return n-0x100000000
+  if a>=0x80 then
+    return 0x1000000*a+0x10000*b+0x100*c+d-0x100000000
   else
-    return n
+    return 0x1000000*a+0x10000*b+0x100*c+d
+  end
+end
+function streams.readinteger4le(f)
+  local i=f[2]
+  local j=i+3
+  f[2]=j+1
+  local d,c,b,a=byte(f[1],i,j)
+  if a>=0x80 then
+    return 0x1000000*a+0x10000*b+0x100*c+d-0x100000000
+  else
+    return 0x1000000*a+0x10000*b+0x100*c+d
   end
 end
 function streams.readfixed4(f)
@@ -7442,11 +7494,21 @@ function streams.readfixed4(f)
   local j=i+3
   f[2]=j+1
   local a,b,c,d=byte(f[1],i,j)
-  local n=0x100*a+b
-  if n>=0x8000 then
-    return n-0x10000+(0x100*c+d)/0xFFFF
+  if a>=0x80 then
+    return (0x1000000*a+0x10000*b+0x100*c+d-0x100000000)/65536.0
+  else
+    return (0x1000000*a+0x10000*b+0x100*c+d)/65536.0
+  end
+end
+function streams.readfixed2(f)
+  local i=f[2]
+  local j=i+1
+  f[2]=j+1
+  local a,b=byte(f[1],i,j)
+  if a>=0x80 then
+    return (0x100*a+b-0x10000)/256.0
   else
-    return n+(0x100*c+d)/0xFFFF
+    return (0x100*a+b)/256.0
   end
 end
 if extract then
@@ -7457,8 +7519,13 @@ if extract then
     local j=i+1
     f[2]=j+1
     local a,b=byte(f[1],i,j)
-    local n=0x100*a+b
-    return extract(n,14,2)+(band(n,0x3FFF)/16384.0)
+    if a>=0x80 then
+      local n=-(0x100*a+b)
+      return-(extract(n,14,2)+(band(n,0x3FFF)/16384.0))
+    else
+      local n=0x100*a+b
+      return  (extract(n,14,2)+(band(n,0x3FFF)/16384.0))
+    end
   end
 end
 function streams.skipshort(f,n)
@@ -7467,6 +7534,102 @@ end
 function streams.skiplong(f,n)
   f[2]=f[2]+4*(n or 1)
 end
+if sio and sio.readcardinal2 then
+  local readcardinal1=sio.readcardinal1
+  local readcardinal2=sio.readcardinal2
+  local readcardinal3=sio.readcardinal3
+  local readcardinal4=sio.readcardinal4
+  local readinteger1=sio.readinteger1
+  local readinteger2=sio.readinteger2
+  local readinteger3=sio.readinteger3
+  local readinteger4=sio.readinteger4
+  local readfixed2=sio.readfixed2
+  local readfixed4=sio.readfixed4
+  local read2dot14=sio.read2dot14
+  local readbytes=sio.readbytes
+  local readbytetable=sio.readbytetable
+  function streams.readcardinal1(f)
+    local i=f[2]
+    f[2]=i+1
+    return readcardinal1(f[1],i)
+  end
+  function streams.readcardinal2(f)
+    local i=f[2]
+    f[2]=i+2
+    return readcardinal2(f[1],i)
+  end
+  function streams.readcardinal3(f)
+    local i=f[2]
+    f[2]=i+3
+    return readcardinal3(f[1],i)
+  end
+  function streams.readcardinal4(f)
+    local i=f[2]
+    f[2]=i+4
+    return readcardinal4(f[1],i)
+  end
+  function streams.readinteger1(f)
+    local i=f[2]
+    f[2]=i+1
+    return readinteger1(f[1],i)
+  end
+  function streams.readinteger2(f)
+    local i=f[2]
+    f[2]=i+2
+    return readinteger2(f[1],i)
+  end
+  function streams.readinteger3(f)
+    local i=f[2]
+    f[2]=i+3
+    return readinteger3(f[1],i)
+  end
+  function streams.readinteger4(f)
+    local i=f[2]
+    f[2]=i+4
+    return readinteger4(f[1],i)
+  end
+  function streams.readfixed2(f)
+    local i=f[2]
+    f[2]=i+2
+    return readfixed2(f[1],i)
+  end
+  function streams.readfixed4(f)
+    local i=f[2]
+    f[2]=i+4
+    return readfixed4(f[1],i)
+  end
+  function streams.read2dot4(f)
+    local i=f[2]
+    f[2]=i+2
+    return read2dot4(f[1],i)
+  end
+  function streams.readbytes(f,n)
+    local i=f[2]
+    local s=f[3]
+    local p=i+n
+    if p>s then
+      f[2]=s+1
+    else
+      f[2]=p
+    end
+    return readbytes(f[1],i,n)
+  end
+  function streams.readbytetable(f,n)
+    local i=f[2]
+    local s=f[3]
+    local p=i+n
+    if p>s then
+      f[2]=s+1
+    else
+      f[2]=p
+    end
+    return readbytetable(f[1],i,n)
+  end
+  streams.readbyte=streams.readcardinal1
+  streams.readsignedbyte=streams.readinteger1
+  streams.readcardinal=streams.readcardinal1
+  streams.readinteger=streams.readinteger1
+end
 
 
 end -- of closure
@@ -11264,7 +11427,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-tab"] = package.loaded["lxml-tab"] or true
 
--- original size: 56300, stripped down to: 35539
+-- original size: 57003, stripped down to: 35696
 
 if not modules then modules={} end modules ['lxml-tab']={
   version=1.001,
@@ -11279,7 +11442,7 @@ if lpeg.setmaxstack then lpeg.setmaxstack(1000) end
 xml=xml or {}
 local xml=xml
 local concat,remove,insert=table.concat,table.remove,table.insert
-local type,next,setmetatable,getmetatable,tonumber,rawset=type,next,setmetatable,getmetatable,tonumber,rawset
+local type,next,setmetatable,getmetatable,tonumber,rawset,select=type,next,setmetatable,getmetatable,tonumber,rawset,select
 local lower,find,match,gsub=string.lower,string.find,string.match,string.gsub
 local sort=table.sort
 local utfchar=utf.char
@@ -12459,18 +12622,26 @@ local xmlfilehandler=newhandlers {
 function xml.save(root,name)
   serialize(root,xmlfilehandler,name)
 end
-local result
+local result,r,threshold={},0,512
 local xmlstringhandler=newhandlers {
   name="string",
   initialize=function()
-    result={}
+    r=0
     return result
   end,
   finalize=function()
-    return concat(result)
+    local done=concat(result,"",1,r)
+    r=0
+    if r>threshold then
+      result={}
+    end
+    return done
   end,
   handle=function(...)
-    result[#result+1]=concat {... }
+    for i=1,select("#",...) do
+      r=r+1
+      result[r]=select(i,...)
+    end
   end,
 }
 local function xmltostring(root) 
@@ -19660,7 +19831,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lib"] = package.loaded["util-lib"] or true
 
--- original size: 13452, stripped down to: 7398
+-- original size: 13595, stripped down to: 7500
 
 if not modules then modules={} end modules ['util-lib']={
   version=1.001,
@@ -19826,6 +19997,9 @@ do
       library=locate(required,version,trace_swiglib,report_swiglib,function(name,base)
         pushdir(pathpart(name))
         local opener="luaopen_"..base
+        if trace_swiglib then
+          report_swiglib("opening: %a with %a",name,opener)
+        end
         local library,message=loadlib(name,opener)
         local libtype=type(library)
         if libtype=="function" then
@@ -20248,8 +20422,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    : 836573
--- stripped bytes    : 304264
+-- original bytes    : 841486
+-- stripped bytes    : 305240
 
 -- end library merge
 
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index 5e08f19ac..ec4e81506 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -5666,7 +5666,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-str"] = package.loaded["util-str"] or true
 
--- original size: 36449, stripped down to: 20179
+-- original size: 36148, stripped down to: 20179
 
 if not modules then modules={} end modules ['util-str']={
   version=1.001,
@@ -7029,7 +7029,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-fil"] = package.loaded["util-fil"] or true
 
--- original size: 7038, stripped down to: 5659
+-- original size: 7039, stripped down to: 5672
 
 if not modules then modules={} end modules ['util-fil']={
   version=1.001,
@@ -7138,11 +7138,10 @@ function files.readinteger2(f)
 end
 function files.readinteger2le(f)
   local b,a=byte(f:read(2),1,2)
-  local n=0x100*a+b
-  if n>=0x8000 then
-    return n-0x10000
+  if a>=0x80 then
+    return 0x100*a+b-0x10000
   else
-    return n
+    return 0x100*a+b
   end
 end
 function files.readcardinal3(f)
@@ -7155,20 +7154,18 @@ function files.readcardinal3le(f)
 end
 function files.readinteger3(f)
   local a,b,c=byte(f:read(3),1,3)
-  local n=0x10000*a+0x100*b+c
-  if n>=0x80000 then
-    return n-0x1000000
+  if a>=0x80 then
+    return 0x10000*a+0x100*b+c-0x1000000
   else
-    return n
+    return 0x10000*a+0x100*b+c
   end
 end
 function files.readinteger3le(f)
   local c,b,a=byte(f:read(3),1,3)
-  local n=0x10000*a+0x100*b+c
-  if n>=0x80000 then
-    return n-0x1000000
+  if a>=0x80 then
+    return 0x10000*a+0x100*b+c-0x1000000
   else
-    return n
+    return 0x10000*a+0x100*b+c
   end
 end
 function files.readcardinal4(f)
@@ -7189,11 +7186,10 @@ function files.readinteger4(f)
 end
 function files.readinteger4le(f)
   local d,c,b,a=byte(f:read(4),1,4)
-  local n=0x1000000*a+0x10000*b+0x100*c+d
-  if n>=0x8000000 then
-    return n-0x100000000
+  if a>=0x80 then
+    return 0x1000000*a+0x10000*b+0x100*c+d-0x100000000
   else
-    return n
+    return 0x1000000*a+0x10000*b+0x100*c+d
   end
 end
 function files.readfixed2(f)
@@ -7291,7 +7287,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-sac"] = package.loaded["util-sac"] or true
 
--- original size: 4330, stripped down to: 3316
+-- original size: 8697, stripped down to: 6981
 
 if not modules then modules={} end modules ['util-sac']={
   version=1.001,
@@ -7399,16 +7395,33 @@ function streams.readcardinal2(f)
   local a,b=byte(f[1],i,j)
   return 0x100*a+b
 end
+function streams.readcardinal2LE(f)
+  local i=f[2]
+  local j=i+1
+  f[2]=j+1
+  local b,a=byte(f[1],i,j)
+  return 0x100*a+b
+end
 function streams.readinteger2(f)
   local i=f[2]
   local j=i+1
   f[2]=j+1
   local a,b=byte(f[1],i,j)
-  local n=0x100*a+b
-  if n>=0x8000 then
-    return n-0x10000
+  if a>=0x80 then
+    return 0x100*a+b-0x10000
   else
-    return n
+    return 0x100*a+b
+  end
+end
+function streams.readinteger2le(f)
+  local i=f[2]
+  local j=i+1
+  f[2]=j+1
+  local b,a=byte(f[1],i,j)
+  if a>=0x80 then
+    return 0x100*a+b-0x10000
+  else
+    return 0x100*a+b
   end
 end
 function streams.readcardinal3(f)
@@ -7418,6 +7431,35 @@ function streams.readcardinal3(f)
   local a,b,c=byte(f[1],i,j)
   return 0x10000*a+0x100*b+c
 end
+function streams.readcardinal3le(f)
+  local i=f[2]
+  local j=i+2
+  f[2]=j+1
+  local c,b,a=byte(f[1],i,j)
+  return 0x10000*a+0x100*b+c
+end
+function streams.readinteger3(f)
+  local i=f[2]
+  local j=i+3
+  f[2]=j+1
+  local a,b,c=byte(f[1],i,j)
+  if a>=0x80 then
+    return 0x10000*a+0x100*b+c-0x1000000
+  else
+    return 0x10000*a+0x100*b+c
+  end
+end
+function streams.readinteger3le(f)
+  local i=f[2]
+  local j=i+3
+  f[2]=j+1
+  local c,b,a=byte(f[1],i,j)
+  if a>=0x80 then
+    return 0x10000*a+0x100*b+c-0x1000000
+  else
+    return 0x10000*a+0x100*b+c
+  end
+end
 function streams.readcardinal4(f)
   local i=f[2]
   local j=i+3
@@ -7430,11 +7472,21 @@ function streams.readinteger4(f)
   local j=i+3
   f[2]=j+1
   local a,b,c,d=byte(f[1],i,j)
-  local n=0x1000000*a+0x10000*b+0x100*c+d
-  if n>=0x8000000 then
-    return n-0x100000000
+  if a>=0x80 then
+    return 0x1000000*a+0x10000*b+0x100*c+d-0x100000000
   else
-    return n
+    return 0x1000000*a+0x10000*b+0x100*c+d
+  end
+end
+function streams.readinteger4le(f)
+  local i=f[2]
+  local j=i+3
+  f[2]=j+1
+  local d,c,b,a=byte(f[1],i,j)
+  if a>=0x80 then
+    return 0x1000000*a+0x10000*b+0x100*c+d-0x100000000
+  else
+    return 0x1000000*a+0x10000*b+0x100*c+d
   end
 end
 function streams.readfixed4(f)
@@ -7442,11 +7494,21 @@ function streams.readfixed4(f)
   local j=i+3
   f[2]=j+1
   local a,b,c,d=byte(f[1],i,j)
-  local n=0x100*a+b
-  if n>=0x8000 then
-    return n-0x10000+(0x100*c+d)/0xFFFF
+  if a>=0x80 then
+    return (0x1000000*a+0x10000*b+0x100*c+d-0x100000000)/65536.0
+  else
+    return (0x1000000*a+0x10000*b+0x100*c+d)/65536.0
+  end
+end
+function streams.readfixed2(f)
+  local i=f[2]
+  local j=i+1
+  f[2]=j+1
+  local a,b=byte(f[1],i,j)
+  if a>=0x80 then
+    return (0x100*a+b-0x10000)/256.0
   else
-    return n+(0x100*c+d)/0xFFFF
+    return (0x100*a+b)/256.0
   end
 end
 if extract then
@@ -7457,8 +7519,13 @@ if extract then
     local j=i+1
     f[2]=j+1
     local a,b=byte(f[1],i,j)
-    local n=0x100*a+b
-    return extract(n,14,2)+(band(n,0x3FFF)/16384.0)
+    if a>=0x80 then
+      local n=-(0x100*a+b)
+      return-(extract(n,14,2)+(band(n,0x3FFF)/16384.0))
+    else
+      local n=0x100*a+b
+      return  (extract(n,14,2)+(band(n,0x3FFF)/16384.0))
+    end
   end
 end
 function streams.skipshort(f,n)
@@ -7467,6 +7534,102 @@ end
 function streams.skiplong(f,n)
   f[2]=f[2]+4*(n or 1)
 end
+if sio and sio.readcardinal2 then
+  local readcardinal1=sio.readcardinal1
+  local readcardinal2=sio.readcardinal2
+  local readcardinal3=sio.readcardinal3
+  local readcardinal4=sio.readcardinal4
+  local readinteger1=sio.readinteger1
+  local readinteger2=sio.readinteger2
+  local readinteger3=sio.readinteger3
+  local readinteger4=sio.readinteger4
+  local readfixed2=sio.readfixed2
+  local readfixed4=sio.readfixed4
+  local read2dot14=sio.read2dot14
+  local readbytes=sio.readbytes
+  local readbytetable=sio.readbytetable
+  function streams.readcardinal1(f)
+    local i=f[2]
+    f[2]=i+1
+    return readcardinal1(f[1],i)
+  end
+  function streams.readcardinal2(f)
+    local i=f[2]
+    f[2]=i+2
+    return readcardinal2(f[1],i)
+  end
+  function streams.readcardinal3(f)
+    local i=f[2]
+    f[2]=i+3
+    return readcardinal3(f[1],i)
+  end
+  function streams.readcardinal4(f)
+    local i=f[2]
+    f[2]=i+4
+    return readcardinal4(f[1],i)
+  end
+  function streams.readinteger1(f)
+    local i=f[2]
+    f[2]=i+1
+    return readinteger1(f[1],i)
+  end
+  function streams.readinteger2(f)
+    local i=f[2]
+    f[2]=i+2
+    return readinteger2(f[1],i)
+  end
+  function streams.readinteger3(f)
+    local i=f[2]
+    f[2]=i+3
+    return readinteger3(f[1],i)
+  end
+  function streams.readinteger4(f)
+    local i=f[2]
+    f[2]=i+4
+    return readinteger4(f[1],i)
+  end
+  function streams.readfixed2(f)
+    local i=f[2]
+    f[2]=i+2
+    return readfixed2(f[1],i)
+  end
+  function streams.readfixed4(f)
+    local i=f[2]
+    f[2]=i+4
+    return readfixed4(f[1],i)
+  end
+  function streams.read2dot4(f)
+    local i=f[2]
+    f[2]=i+2
+    return read2dot4(f[1],i)
+  end
+  function streams.readbytes(f,n)
+    local i=f[2]
+    local s=f[3]
+    local p=i+n
+    if p>s then
+      f[2]=s+1
+    else
+      f[2]=p
+    end
+    return readbytes(f[1],i,n)
+  end
+  function streams.readbytetable(f,n)
+    local i=f[2]
+    local s=f[3]
+    local p=i+n
+    if p>s then
+      f[2]=s+1
+    else
+      f[2]=p
+    end
+    return readbytetable(f[1],i,n)
+  end
+  streams.readbyte=streams.readcardinal1
+  streams.readsignedbyte=streams.readinteger1
+  streams.readcardinal=streams.readcardinal1
+  streams.readinteger=streams.readinteger1
+end
 
 
 end -- of closure
@@ -11264,7 +11427,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["lxml-tab"] = package.loaded["lxml-tab"] or true
 
--- original size: 56300, stripped down to: 35539
+-- original size: 57003, stripped down to: 35696
 
 if not modules then modules={} end modules ['lxml-tab']={
   version=1.001,
@@ -11279,7 +11442,7 @@ if lpeg.setmaxstack then lpeg.setmaxstack(1000) end
 xml=xml or {}
 local xml=xml
 local concat,remove,insert=table.concat,table.remove,table.insert
-local type,next,setmetatable,getmetatable,tonumber,rawset=type,next,setmetatable,getmetatable,tonumber,rawset
+local type,next,setmetatable,getmetatable,tonumber,rawset,select=type,next,setmetatable,getmetatable,tonumber,rawset,select
 local lower,find,match,gsub=string.lower,string.find,string.match,string.gsub
 local sort=table.sort
 local utfchar=utf.char
@@ -12459,18 +12622,26 @@ local xmlfilehandler=newhandlers {
 function xml.save(root,name)
   serialize(root,xmlfilehandler,name)
 end
-local result
+local result,r,threshold={},0,512
 local xmlstringhandler=newhandlers {
   name="string",
   initialize=function()
-    result={}
+    r=0
     return result
   end,
   finalize=function()
-    return concat(result)
+    local done=concat(result,"",1,r)
+    r=0
+    if r>threshold then
+      result={}
+    end
+    return done
   end,
   handle=function(...)
-    result[#result+1]=concat {... }
+    for i=1,select("#",...) do
+      r=r+1
+      result[r]=select(i,...)
+    end
   end,
 }
 local function xmltostring(root) 
@@ -19660,7 +19831,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["util-lib"] = package.loaded["util-lib"] or true
 
--- original size: 13452, stripped down to: 7398
+-- original size: 13595, stripped down to: 7500
 
 if not modules then modules={} end modules ['util-lib']={
   version=1.001,
@@ -19826,6 +19997,9 @@ do
       library=locate(required,version,trace_swiglib,report_swiglib,function(name,base)
         pushdir(pathpart(name))
         local opener="luaopen_"..base
+        if trace_swiglib then
+          report_swiglib("opening: %a with %a",name,opener)
+        end
         local library,message=loadlib(name,opener)
         local libtype=type(library)
         if libtype=="function" then
@@ -20248,8 +20422,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    : 836573
--- stripped bytes    : 304264
+-- original bytes    : 841486
+-- stripped bytes    : 305240
 
 -- end library merge