From 726df97b4fd308f923fb1b4bf00ce533a7c88ebe Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Thu, 21 Apr 2016 12:41:27 +0200 Subject: 2016-04-21 12:17:00 --- scripts/context/lua/mtx-fonts.lua | 2 +- scripts/context/lua/mtxrun.lua | 18 +++++++++++------- scripts/context/stubs/mswin/mtxrun.lua | 18 +++++++++++------- scripts/context/stubs/unix/mtxrun | 18 +++++++++++------- scripts/context/stubs/win64/mtxrun.lua | 18 +++++++++++------- 5 files changed, 45 insertions(+), 29 deletions(-) (limited to 'scripts') diff --git a/scripts/context/lua/mtx-fonts.lua b/scripts/context/lua/mtx-fonts.lua index 0a429e3b5..f881e3d3b 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.824 -local otlversion = 3.017 +local otlversion = 3.018 local helpinfo = [[ diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index 2249c154f..6a4babe99 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -12509,7 +12509,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true --- original size: 30339, stripped down to: 21584 +-- original size: 30566, stripped down to: 21741 if not modules then modules={} end modules ['lxml-aux']={ version=1.001, @@ -12882,18 +12882,22 @@ local function include(xmldata,pattern,attribute,recursive,loaddata,level) child.__p__=ekrt child.__f__=name epdt[ek.ni]=child - local inclusions=xmldata.settings.inclusions + local settings=xmldata.settings + local inclusions=settings and settings.inclusions if inclusions then inclusions[#inclusions+1]=name + elseif settings then + settings.inclusions={ name } else - xmldata.settings.inclusions={ name } + settings={ inclusions={ name } } + xmldata.settings=settings end if child.er then - local badinclusions=xmldata.settings.badinclusions + local badinclusions=settings.badinclusions if badinclusions then badinclusions[#badinclusions+1]=name else - xmldata.settings.badinclusions={ name } + settings.badinclusions={ name } end end end @@ -18735,8 +18739,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 : 796599 --- stripped bytes : 288946 +-- original bytes : 796826 +-- stripped bytes : 289016 -- end library merge diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index 2249c154f..6a4babe99 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -12509,7 +12509,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true --- original size: 30339, stripped down to: 21584 +-- original size: 30566, stripped down to: 21741 if not modules then modules={} end modules ['lxml-aux']={ version=1.001, @@ -12882,18 +12882,22 @@ local function include(xmldata,pattern,attribute,recursive,loaddata,level) child.__p__=ekrt child.__f__=name epdt[ek.ni]=child - local inclusions=xmldata.settings.inclusions + local settings=xmldata.settings + local inclusions=settings and settings.inclusions if inclusions then inclusions[#inclusions+1]=name + elseif settings then + settings.inclusions={ name } else - xmldata.settings.inclusions={ name } + settings={ inclusions={ name } } + xmldata.settings=settings end if child.er then - local badinclusions=xmldata.settings.badinclusions + local badinclusions=settings.badinclusions if badinclusions then badinclusions[#badinclusions+1]=name else - xmldata.settings.badinclusions={ name } + settings.badinclusions={ name } end end end @@ -18735,8 +18739,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 : 796599 --- stripped bytes : 288946 +-- original bytes : 796826 +-- stripped bytes : 289016 -- end library merge diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index 2249c154f..6a4babe99 100644 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -12509,7 +12509,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true --- original size: 30339, stripped down to: 21584 +-- original size: 30566, stripped down to: 21741 if not modules then modules={} end modules ['lxml-aux']={ version=1.001, @@ -12882,18 +12882,22 @@ local function include(xmldata,pattern,attribute,recursive,loaddata,level) child.__p__=ekrt child.__f__=name epdt[ek.ni]=child - local inclusions=xmldata.settings.inclusions + local settings=xmldata.settings + local inclusions=settings and settings.inclusions if inclusions then inclusions[#inclusions+1]=name + elseif settings then + settings.inclusions={ name } else - xmldata.settings.inclusions={ name } + settings={ inclusions={ name } } + xmldata.settings=settings end if child.er then - local badinclusions=xmldata.settings.badinclusions + local badinclusions=settings.badinclusions if badinclusions then badinclusions[#badinclusions+1]=name else - xmldata.settings.badinclusions={ name } + settings.badinclusions={ name } end end end @@ -18735,8 +18739,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 : 796599 --- stripped bytes : 288946 +-- original bytes : 796826 +-- stripped bytes : 289016 -- end library merge diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua index 2249c154f..6a4babe99 100644 --- a/scripts/context/stubs/win64/mtxrun.lua +++ b/scripts/context/stubs/win64/mtxrun.lua @@ -12509,7 +12509,7 @@ do -- create closure to overcome 200 locals limit package.loaded["lxml-aux"] = package.loaded["lxml-aux"] or true --- original size: 30339, stripped down to: 21584 +-- original size: 30566, stripped down to: 21741 if not modules then modules={} end modules ['lxml-aux']={ version=1.001, @@ -12882,18 +12882,22 @@ local function include(xmldata,pattern,attribute,recursive,loaddata,level) child.__p__=ekrt child.__f__=name epdt[ek.ni]=child - local inclusions=xmldata.settings.inclusions + local settings=xmldata.settings + local inclusions=settings and settings.inclusions if inclusions then inclusions[#inclusions+1]=name + elseif settings then + settings.inclusions={ name } else - xmldata.settings.inclusions={ name } + settings={ inclusions={ name } } + xmldata.settings=settings end if child.er then - local badinclusions=xmldata.settings.badinclusions + local badinclusions=settings.badinclusions if badinclusions then badinclusions[#badinclusions+1]=name else - xmldata.settings.badinclusions={ name } + settings.badinclusions={ name } end end end @@ -18735,8 +18739,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 : 796599 --- stripped bytes : 288946 +-- original bytes : 796826 +-- stripped bytes : 289016 -- end library merge -- cgit v1.2.3