From b2a2304cbb0c65040d7b118ac9b857d304e333e6 Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Sat, 25 Jun 2016 15:40:51 +0200 Subject: 2016-06-25 14:42:00 --- scripts/context/lua/mtx-fonts.lua | 2 +- scripts/context/lua/mtxrun.lua | 40 +++++++++++++++++++++++++--------- scripts/context/stubs/mswin/mtxrun.lua | 40 +++++++++++++++++++++++++--------- scripts/context/stubs/unix/mtxrun | 40 +++++++++++++++++++++++++--------- scripts/context/stubs/win64/mtxrun.lua | 40 +++++++++++++++++++++++++--------- 5 files changed, 121 insertions(+), 41 deletions(-) (limited to 'scripts') diff --git a/scripts/context/lua/mtx-fonts.lua b/scripts/context/lua/mtx-fonts.lua index 40d367008..afc64eca9 100644 --- a/scripts/context/lua/mtx-fonts.lua +++ b/scripts/context/lua/mtx-fonts.lua @@ -15,7 +15,7 @@ local nameonly, basename, joinpath, collapsepath = file.nameonly, file.basename, local lower = string.lower local otfversion = 2.826 -local otlversion = 3.024 +local otlversion = 3.025 local helpinfo = [[ diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index 975761cca..6f9e8239b 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -5222,7 +5222,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-str"] = package.loaded["util-str"] or true --- original size: 36053, stripped down to: 19685 +-- original size: 36124, stripped down to: 19685 if not modules then modules={} end modules ['util-str']={ version=1.001, @@ -10012,7 +10012,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-tab"] = package.loaded["lxml-tab"] or true --- original size: 57132, stripped down to: 35990 +-- original size: 57426, stripped down to: 36192 if not modules then modules={} end modules ['lxml-tab']={ version=1.001, @@ -10936,14 +10936,24 @@ function xml.toxml(data) return data end end -local function copy(old) +local function copy(old,p) if old then local new={} for k,v in next,old do - if type(v)=="table" then - new[k]=table.copy(v) - else + local t=type(v)=="table" + if k=="at" then + local t={} + for k,v in next,v do + t[k]=v + end + new[k]=t + elseif k=="dt" then + v.__p__=nil + v=copy(v,new) new[k]=v + v.__p__=p + else + new[k]=v end end local mt=getmetatable(old) @@ -12535,7 +12545,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true --- original size: 30536, stripped down to: 21713 +-- original size: 30855, stripped down to: 21924 if not modules then modules={} end modules ['lxml-aux']={ version=1.001, @@ -12754,7 +12764,17 @@ function xml.replace(root,pattern,whatever) report('replacing',pattern,c,e) end local d=p.dt - d[e.ni]=copiedelement(element,p) + local n=e.ni + local t=copiedelement(element,p) + if type(t)=="table" then + d[n]=t[1] + for i=2,#t do + n=n+1 + insert(d,n,t[i]) + end + else + d[n]=t + end redo_ni(d) end end @@ -18763,8 +18783,8 @@ end -- of closure -- used libraries : l-lua.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-mrg.lua util-tpl.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 : 798348 --- stripped bytes : 289756 +-- original bytes : 799032 +-- stripped bytes : 290027 -- end library merge diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index 975761cca..6f9e8239b 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -5222,7 +5222,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-str"] = package.loaded["util-str"] or true --- original size: 36053, stripped down to: 19685 +-- original size: 36124, stripped down to: 19685 if not modules then modules={} end modules ['util-str']={ version=1.001, @@ -10012,7 +10012,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-tab"] = package.loaded["lxml-tab"] or true --- original size: 57132, stripped down to: 35990 +-- original size: 57426, stripped down to: 36192 if not modules then modules={} end modules ['lxml-tab']={ version=1.001, @@ -10936,14 +10936,24 @@ function xml.toxml(data) return data end end -local function copy(old) +local function copy(old,p) if old then local new={} for k,v in next,old do - if type(v)=="table" then - new[k]=table.copy(v) - else + local t=type(v)=="table" + if k=="at" then + local t={} + for k,v in next,v do + t[k]=v + end + new[k]=t + elseif k=="dt" then + v.__p__=nil + v=copy(v,new) new[k]=v + v.__p__=p + else + new[k]=v end end local mt=getmetatable(old) @@ -12535,7 +12545,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true --- original size: 30536, stripped down to: 21713 +-- original size: 30855, stripped down to: 21924 if not modules then modules={} end modules ['lxml-aux']={ version=1.001, @@ -12754,7 +12764,17 @@ function xml.replace(root,pattern,whatever) report('replacing',pattern,c,e) end local d=p.dt - d[e.ni]=copiedelement(element,p) + local n=e.ni + local t=copiedelement(element,p) + if type(t)=="table" then + d[n]=t[1] + for i=2,#t do + n=n+1 + insert(d,n,t[i]) + end + else + d[n]=t + end redo_ni(d) end end @@ -18763,8 +18783,8 @@ end -- of closure -- used libraries : l-lua.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-mrg.lua util-tpl.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 : 798348 --- stripped bytes : 289756 +-- original bytes : 799032 +-- stripped bytes : 290027 -- end library merge diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index 975761cca..6f9e8239b 100644 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -5222,7 +5222,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-str"] = package.loaded["util-str"] or true --- original size: 36053, stripped down to: 19685 +-- original size: 36124, stripped down to: 19685 if not modules then modules={} end modules ['util-str']={ version=1.001, @@ -10012,7 +10012,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-tab"] = package.loaded["lxml-tab"] or true --- original size: 57132, stripped down to: 35990 +-- original size: 57426, stripped down to: 36192 if not modules then modules={} end modules ['lxml-tab']={ version=1.001, @@ -10936,14 +10936,24 @@ function xml.toxml(data) return data end end -local function copy(old) +local function copy(old,p) if old then local new={} for k,v in next,old do - if type(v)=="table" then - new[k]=table.copy(v) - else + local t=type(v)=="table" + if k=="at" then + local t={} + for k,v in next,v do + t[k]=v + end + new[k]=t + elseif k=="dt" then + v.__p__=nil + v=copy(v,new) new[k]=v + v.__p__=p + else + new[k]=v end end local mt=getmetatable(old) @@ -12535,7 +12545,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true --- original size: 30536, stripped down to: 21713 +-- original size: 30855, stripped down to: 21924 if not modules then modules={} end modules ['lxml-aux']={ version=1.001, @@ -12754,7 +12764,17 @@ function xml.replace(root,pattern,whatever) report('replacing',pattern,c,e) end local d=p.dt - d[e.ni]=copiedelement(element,p) + local n=e.ni + local t=copiedelement(element,p) + if type(t)=="table" then + d[n]=t[1] + for i=2,#t do + n=n+1 + insert(d,n,t[i]) + end + else + d[n]=t + end redo_ni(d) end end @@ -18763,8 +18783,8 @@ end -- of closure -- used libraries : l-lua.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-mrg.lua util-tpl.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 : 798348 --- stripped bytes : 289756 +-- original bytes : 799032 +-- stripped bytes : 290027 -- end library merge diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua index 975761cca..6f9e8239b 100644 --- a/scripts/context/stubs/win64/mtxrun.lua +++ b/scripts/context/stubs/win64/mtxrun.lua @@ -5222,7 +5222,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-str"] = package.loaded["util-str"] or true --- original size: 36053, stripped down to: 19685 +-- original size: 36124, stripped down to: 19685 if not modules then modules={} end modules ['util-str']={ version=1.001, @@ -10012,7 +10012,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-tab"] = package.loaded["lxml-tab"] or true --- original size: 57132, stripped down to: 35990 +-- original size: 57426, stripped down to: 36192 if not modules then modules={} end modules ['lxml-tab']={ version=1.001, @@ -10936,14 +10936,24 @@ function xml.toxml(data) return data end end -local function copy(old) +local function copy(old,p) if old then local new={} for k,v in next,old do - if type(v)=="table" then - new[k]=table.copy(v) - else + local t=type(v)=="table" + if k=="at" then + local t={} + for k,v in next,v do + t[k]=v + end + new[k]=t + elseif k=="dt" then + v.__p__=nil + v=copy(v,new) new[k]=v + v.__p__=p + else + new[k]=v end end local mt=getmetatable(old) @@ -12535,7 +12545,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true --- original size: 30536, stripped down to: 21713 +-- original size: 30855, stripped down to: 21924 if not modules then modules={} end modules ['lxml-aux']={ version=1.001, @@ -12754,7 +12764,17 @@ function xml.replace(root,pattern,whatever) report('replacing',pattern,c,e) end local d=p.dt - d[e.ni]=copiedelement(element,p) + local n=e.ni + local t=copiedelement(element,p) + if type(t)=="table" then + d[n]=t[1] + for i=2,#t do + n=n+1 + insert(d,n,t[i]) + end + else + d[n]=t + end redo_ni(d) end end @@ -18763,8 +18783,8 @@ end -- of closure -- used libraries : l-lua.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-mrg.lua util-tpl.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 : 798348 --- stripped bytes : 289756 +-- original bytes : 799032 +-- stripped bytes : 290027 -- end library merge -- cgit v1.2.3