summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2013-03-16 03:00:15 +0200
committerMarius <mariausol@gmail.com>2013-03-16 03:00:15 +0200
commit239fc2639fd42f6ad1c44bb256ae2f98ed164b45 (patch)
treedbd236ed4443bc27eefa2cdfc4a8890b89e2343a /scripts
parent792b2ca2d206c2c90cc9967a8ae4916f53f902d7 (diff)
downloadcontext-239fc2639fd42f6ad1c44bb256ae2f98ed164b45.tar.gz
beta 2013.03.16 01:51
Diffstat (limited to 'scripts')
-rw-r--r--scripts/context/lua/mtx-fonts.lua6
-rw-r--r--scripts/context/lua/mtxrun.lua13
-rw-r--r--scripts/context/stubs/mswin/mtxrun.lua13
-rw-r--r--scripts/context/stubs/unix/mtxrun13
4 files changed, 18 insertions, 27 deletions
diff --git a/scripts/context/lua/mtx-fonts.lua b/scripts/context/lua/mtx-fonts.lua
index 0f4e441ec..6dfd6b108 100644
--- a/scripts/context/lua/mtx-fonts.lua
+++ b/scripts/context/lua/mtx-fonts.lua
@@ -10,7 +10,7 @@ local helpinfo = [[
--save save open type font in raw table
--unpack save a tma file in a more readale format
---reload generate new font database
+--reload [--force] generate new font database (use force when in doubt)
--reload --simple generate 'luatex-fonts-names.lua' (not for context!)
--list --name list installed fonts, filter by name [--pattern]
@@ -142,7 +142,7 @@ function scripts.fonts.reload()
if environment.argument("simple") then
fonts.names.simple()
else
- fonts.names.load(true)
+ fonts.names.load(true,environment.arguments.force)
end
end
@@ -210,7 +210,7 @@ end
local function reloadbase(reload)
if reload then
report("fontnames, reloading font database")
- names.load(true)
+ names.load(true,environment.arguments.force)
report("fontnames, done\n\n")
end
end
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index ac46647e8..2f3ebf7ab 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -12402,7 +12402,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["data-res"] = package.loaded["data-res"] or true
--- original size: 60134, stripped down to: 42371
+-- original size: 60140, stripped down to: 42335
if not modules then modules={} end modules ['data-res']={
version=1.001,
@@ -13768,13 +13768,10 @@ function resolvers.dowithfilesintree(pattern,handle,before,after)
local files=instance.files[blobpath]
local total,checked,done=0,0,0
if files then
- for k,v in next,files do
+ for k,v in table.sortedhash(files) do
total=total+1
if find(k,"^remap:") then
- k=files[k]
- v=k
- end
- if find(k,pattern) then
+ elseif find(k,pattern) then
if type(v)=="string" then
checked=checked+1
if handle(blobtype,blobpath,v,k) then
@@ -15386,8 +15383,8 @@ end -- of closure
-- used libraries : l-lua.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-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 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 luat-sta.lua luat-fmt.lua
-- skipped libraries : -
--- original bytes : 636119
--- stripped bytes : 230331
+-- original bytes : 636125
+-- stripped bytes : 230373
-- end library merge
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index ac46647e8..2f3ebf7ab 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -12402,7 +12402,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["data-res"] = package.loaded["data-res"] or true
--- original size: 60134, stripped down to: 42371
+-- original size: 60140, stripped down to: 42335
if not modules then modules={} end modules ['data-res']={
version=1.001,
@@ -13768,13 +13768,10 @@ function resolvers.dowithfilesintree(pattern,handle,before,after)
local files=instance.files[blobpath]
local total,checked,done=0,0,0
if files then
- for k,v in next,files do
+ for k,v in table.sortedhash(files) do
total=total+1
if find(k,"^remap:") then
- k=files[k]
- v=k
- end
- if find(k,pattern) then
+ elseif find(k,pattern) then
if type(v)=="string" then
checked=checked+1
if handle(blobtype,blobpath,v,k) then
@@ -15386,8 +15383,8 @@ end -- of closure
-- used libraries : l-lua.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-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 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 luat-sta.lua luat-fmt.lua
-- skipped libraries : -
--- original bytes : 636119
--- stripped bytes : 230331
+-- original bytes : 636125
+-- stripped bytes : 230373
-- end library merge
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index ac46647e8..2f3ebf7ab 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -12402,7 +12402,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["data-res"] = package.loaded["data-res"] or true
--- original size: 60134, stripped down to: 42371
+-- original size: 60140, stripped down to: 42335
if not modules then modules={} end modules ['data-res']={
version=1.001,
@@ -13768,13 +13768,10 @@ function resolvers.dowithfilesintree(pattern,handle,before,after)
local files=instance.files[blobpath]
local total,checked,done=0,0,0
if files then
- for k,v in next,files do
+ for k,v in table.sortedhash(files) do
total=total+1
if find(k,"^remap:") then
- k=files[k]
- v=k
- end
- if find(k,pattern) then
+ elseif find(k,pattern) then
if type(v)=="string" then
checked=checked+1
if handle(blobtype,blobpath,v,k) then
@@ -15386,8 +15383,8 @@ end -- of closure
-- used libraries : l-lua.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-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 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 luat-sta.lua luat-fmt.lua
-- skipped libraries : -
--- original bytes : 636119
--- stripped bytes : 230331
+-- original bytes : 636125
+-- stripped bytes : 230373
-- end library merge