From e80c75029084c0e8a80286f78150b5a2e320e63c Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Thu, 17 Jul 2014 13:24:00 +0200
Subject: beta 2014.07.17 13:24
---
scripts/context/lua/mtxrun.lua | 41 +++++++++++++++++++---------------
scripts/context/stubs/mswin/mtxrun.lua | 41 +++++++++++++++++++---------------
scripts/context/stubs/unix/mtxrun | 41 +++++++++++++++++++---------------
scripts/context/stubs/win64/mtxrun.lua | 41 +++++++++++++++++++---------------
4 files changed, 92 insertions(+), 72 deletions(-)
(limited to 'scripts')
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index fb3fdf5a9..9d94379d2 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -14021,7 +14021,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["data-res"] = package.loaded["data-res"] or true
--- original size: 61840, stripped down to: 43162
+-- original size: 63245, stripped down to: 43315
if not modules then modules={} end modules ['data-res']={
version=1.001,
@@ -14557,8 +14557,15 @@ function resolvers.resetextrapath()
end
end
function resolvers.registerextrapath(paths,subpaths)
- paths=settings_to_array(paths)
- subpaths=settings_to_array(subpaths)
+ if not subpaths or subpaths=="" then
+ if not paths or path=="" then
+ return
+ elseif done[paths] then
+ return
+ end
+ end
+ local paths=settings_to_array(paths)
+ local subpaths=settings_to_array(subpaths)
local ep=instance.extra_paths or {}
local oldn=#ep
local newn=oldn
@@ -14609,13 +14616,6 @@ function resolvers.registerextrapath(paths,subpaths)
end
end
local function made_list(instance,list,extra_too)
- if not extra_too then
- return list
- end
- local ep=instance.extra_paths
- if not ep or #ep==0 then
- return list
- end
local done,new,newn={},{},0
for k=1,#list do
local v=list[k]
@@ -14629,12 +14629,17 @@ local function made_list(instance,list,extra_too)
end
end
end
- for k=1,#ep do
- local v=ep[k]
- if not done[v] then
- done[v]=true
- newn=newn+1
- new[newn]=v
+ if extra_too then
+ local ep=instance.extra_paths
+ if ep and #ep>0 then
+ for k=1,#ep do
+ local v=ep[k]
+ if not done[v] then
+ done[v]=true
+ newn=newn+1
+ new[newn]=v
+ end
+ end
end
end
for k=1,#list do
@@ -17271,8 +17276,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-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 : 710661
--- stripped bytes : 252165
+-- original bytes : 712066
+-- stripped bytes : 253417
-- end library merge
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index fb3fdf5a9..9d94379d2 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -14021,7 +14021,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["data-res"] = package.loaded["data-res"] or true
--- original size: 61840, stripped down to: 43162
+-- original size: 63245, stripped down to: 43315
if not modules then modules={} end modules ['data-res']={
version=1.001,
@@ -14557,8 +14557,15 @@ function resolvers.resetextrapath()
end
end
function resolvers.registerextrapath(paths,subpaths)
- paths=settings_to_array(paths)
- subpaths=settings_to_array(subpaths)
+ if not subpaths or subpaths=="" then
+ if not paths or path=="" then
+ return
+ elseif done[paths] then
+ return
+ end
+ end
+ local paths=settings_to_array(paths)
+ local subpaths=settings_to_array(subpaths)
local ep=instance.extra_paths or {}
local oldn=#ep
local newn=oldn
@@ -14609,13 +14616,6 @@ function resolvers.registerextrapath(paths,subpaths)
end
end
local function made_list(instance,list,extra_too)
- if not extra_too then
- return list
- end
- local ep=instance.extra_paths
- if not ep or #ep==0 then
- return list
- end
local done,new,newn={},{},0
for k=1,#list do
local v=list[k]
@@ -14629,12 +14629,17 @@ local function made_list(instance,list,extra_too)
end
end
end
- for k=1,#ep do
- local v=ep[k]
- if not done[v] then
- done[v]=true
- newn=newn+1
- new[newn]=v
+ if extra_too then
+ local ep=instance.extra_paths
+ if ep and #ep>0 then
+ for k=1,#ep do
+ local v=ep[k]
+ if not done[v] then
+ done[v]=true
+ newn=newn+1
+ new[newn]=v
+ end
+ end
end
end
for k=1,#list do
@@ -17271,8 +17276,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-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 : 710661
--- stripped bytes : 252165
+-- original bytes : 712066
+-- stripped bytes : 253417
-- end library merge
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index fb3fdf5a9..9d94379d2 100755
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -14021,7 +14021,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["data-res"] = package.loaded["data-res"] or true
--- original size: 61840, stripped down to: 43162
+-- original size: 63245, stripped down to: 43315
if not modules then modules={} end modules ['data-res']={
version=1.001,
@@ -14557,8 +14557,15 @@ function resolvers.resetextrapath()
end
end
function resolvers.registerextrapath(paths,subpaths)
- paths=settings_to_array(paths)
- subpaths=settings_to_array(subpaths)
+ if not subpaths or subpaths=="" then
+ if not paths or path=="" then
+ return
+ elseif done[paths] then
+ return
+ end
+ end
+ local paths=settings_to_array(paths)
+ local subpaths=settings_to_array(subpaths)
local ep=instance.extra_paths or {}
local oldn=#ep
local newn=oldn
@@ -14609,13 +14616,6 @@ function resolvers.registerextrapath(paths,subpaths)
end
end
local function made_list(instance,list,extra_too)
- if not extra_too then
- return list
- end
- local ep=instance.extra_paths
- if not ep or #ep==0 then
- return list
- end
local done,new,newn={},{},0
for k=1,#list do
local v=list[k]
@@ -14629,12 +14629,17 @@ local function made_list(instance,list,extra_too)
end
end
end
- for k=1,#ep do
- local v=ep[k]
- if not done[v] then
- done[v]=true
- newn=newn+1
- new[newn]=v
+ if extra_too then
+ local ep=instance.extra_paths
+ if ep and #ep>0 then
+ for k=1,#ep do
+ local v=ep[k]
+ if not done[v] then
+ done[v]=true
+ newn=newn+1
+ new[newn]=v
+ end
+ end
end
end
for k=1,#list do
@@ -17271,8 +17276,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-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 : 710661
--- stripped bytes : 252165
+-- original bytes : 712066
+-- stripped bytes : 253417
-- end library merge
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index fb3fdf5a9..9d94379d2 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -14021,7 +14021,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["data-res"] = package.loaded["data-res"] or true
--- original size: 61840, stripped down to: 43162
+-- original size: 63245, stripped down to: 43315
if not modules then modules={} end modules ['data-res']={
version=1.001,
@@ -14557,8 +14557,15 @@ function resolvers.resetextrapath()
end
end
function resolvers.registerextrapath(paths,subpaths)
- paths=settings_to_array(paths)
- subpaths=settings_to_array(subpaths)
+ if not subpaths or subpaths=="" then
+ if not paths or path=="" then
+ return
+ elseif done[paths] then
+ return
+ end
+ end
+ local paths=settings_to_array(paths)
+ local subpaths=settings_to_array(subpaths)
local ep=instance.extra_paths or {}
local oldn=#ep
local newn=oldn
@@ -14609,13 +14616,6 @@ function resolvers.registerextrapath(paths,subpaths)
end
end
local function made_list(instance,list,extra_too)
- if not extra_too then
- return list
- end
- local ep=instance.extra_paths
- if not ep or #ep==0 then
- return list
- end
local done,new,newn={},{},0
for k=1,#list do
local v=list[k]
@@ -14629,12 +14629,17 @@ local function made_list(instance,list,extra_too)
end
end
end
- for k=1,#ep do
- local v=ep[k]
- if not done[v] then
- done[v]=true
- newn=newn+1
- new[newn]=v
+ if extra_too then
+ local ep=instance.extra_paths
+ if ep and #ep>0 then
+ for k=1,#ep do
+ local v=ep[k]
+ if not done[v] then
+ done[v]=true
+ newn=newn+1
+ new[newn]=v
+ end
+ end
end
end
for k=1,#list do
@@ -17271,8 +17276,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-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 : 710661
--- stripped bytes : 252165
+-- original bytes : 712066
+-- stripped bytes : 253417
-- end library merge
--
cgit v1.2.3