From 7ffc9d0f34adcd853be064c098eadc53930b5f27 Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Thu, 4 Sep 2014 15:15:04 +0200 Subject: 2014-09-03 22:07:00 --- scripts/context/lua/mtxrun.lua | 7 +++---- scripts/context/stubs/mswin/mtxrun.lua | 7 +++---- scripts/context/stubs/unix/mtxrun | 7 +++---- scripts/context/stubs/win64/mtxrun.lua | 7 +++---- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4433 -> 4427 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/data-exp.lua | 1 - tex/context/base/grph-inc.mkiv | 3 +++ tex/context/base/status-files.pdf | Bin 24991 -> 24982 bytes tex/context/base/status-lua.pdf | Bin 327141 -> 327139 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 12 files changed, 18 insertions(+), 20 deletions(-) diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index dd8460cfc..ffddc9de2 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -12963,7 +12963,7 @@ do -- create closure to overcome 200 locals limit package.loaded["data-exp"] = package.loaded["data-exp"] or true --- original size: 17233, stripped down to: 10672 +-- original size: 17216, stripped down to: 10657 if not modules then modules={} end modules ['data-exp']={ version=1.001, @@ -13225,7 +13225,6 @@ local function scan(files,remap,spec,path,n,m,r,onlyone,tolerant) return files,remap,n,m,r end function resolvers.scanfiles(path,branch,usecache,onlyonce,tolerant) -tolerant=false local realpath=resolveprefix(path) if usecache then local content=fullcache[realpath] @@ -17428,8 +17427,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 : 720396 --- stripped bytes : 257440 +-- original bytes : 720379 +-- stripped bytes : 257438 -- end library merge diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index dd8460cfc..ffddc9de2 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -12963,7 +12963,7 @@ do -- create closure to overcome 200 locals limit package.loaded["data-exp"] = package.loaded["data-exp"] or true --- original size: 17233, stripped down to: 10672 +-- original size: 17216, stripped down to: 10657 if not modules then modules={} end modules ['data-exp']={ version=1.001, @@ -13225,7 +13225,6 @@ local function scan(files,remap,spec,path,n,m,r,onlyone,tolerant) return files,remap,n,m,r end function resolvers.scanfiles(path,branch,usecache,onlyonce,tolerant) -tolerant=false local realpath=resolveprefix(path) if usecache then local content=fullcache[realpath] @@ -17428,8 +17427,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 : 720396 --- stripped bytes : 257440 +-- original bytes : 720379 +-- stripped bytes : 257438 -- end library merge diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index dd8460cfc..ffddc9de2 100644 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -12963,7 +12963,7 @@ do -- create closure to overcome 200 locals limit package.loaded["data-exp"] = package.loaded["data-exp"] or true --- original size: 17233, stripped down to: 10672 +-- original size: 17216, stripped down to: 10657 if not modules then modules={} end modules ['data-exp']={ version=1.001, @@ -13225,7 +13225,6 @@ local function scan(files,remap,spec,path,n,m,r,onlyone,tolerant) return files,remap,n,m,r end function resolvers.scanfiles(path,branch,usecache,onlyonce,tolerant) -tolerant=false local realpath=resolveprefix(path) if usecache then local content=fullcache[realpath] @@ -17428,8 +17427,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 : 720396 --- stripped bytes : 257440 +-- original bytes : 720379 +-- stripped bytes : 257438 -- end library merge diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua index dd8460cfc..ffddc9de2 100644 --- a/scripts/context/stubs/win64/mtxrun.lua +++ b/scripts/context/stubs/win64/mtxrun.lua @@ -12963,7 +12963,7 @@ do -- create closure to overcome 200 locals limit package.loaded["data-exp"] = package.loaded["data-exp"] or true --- original size: 17233, stripped down to: 10672 +-- original size: 17216, stripped down to: 10657 if not modules then modules={} end modules ['data-exp']={ version=1.001, @@ -13225,7 +13225,6 @@ local function scan(files,remap,spec,path,n,m,r,onlyone,tolerant) return files,remap,n,m,r end function resolvers.scanfiles(path,branch,usecache,onlyonce,tolerant) -tolerant=false local realpath=resolveprefix(path) if usecache then local content=fullcache[realpath] @@ -17428,8 +17427,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 : 720396 --- stripped bytes : 257440 +-- original bytes : 720379 +-- stripped bytes : 257438 -- end library merge diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 44dccad02..deaf90116 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2014.09.03 19:11} +\newcontextversion{2014.09.03 22:05} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf index ece0c8b6b..e804806be 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index e8dd763ae..a0a38b843 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -28,7 +28,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2014.09.03 19:11} +\edef\contextversion{2014.09.03 22:05} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/data-exp.lua b/tex/context/base/data-exp.lua index 1e1866f0f..0a7396171 100644 --- a/tex/context/base/data-exp.lua +++ b/tex/context/base/data-exp.lua @@ -402,7 +402,6 @@ local function scan(files,remap,spec,path,n,m,r,onlyone,tolerant) end function resolvers.scanfiles(path,branch,usecache,onlyonce,tolerant) -tolerant = false local realpath = resolveprefix(path) if usecache then local content = fullcache[realpath] diff --git a/tex/context/base/grph-inc.mkiv b/tex/context/base/grph-inc.mkiv index 9774320d6..ca5fbc8c6 100644 --- a/tex/context/base/grph-inc.mkiv +++ b/tex/context/base/grph-inc.mkiv @@ -13,6 +13,9 @@ % \enabledirectives[graphics.conversion.eps.cleanup.ai] +% \setupexternalfigures[directory=dirfile://./test/**] +% \externalfigure[crappname(2).eps][frame=on] + % todo: messages \writestatus{loading}{ConTeXt Graphic Macros / Figure Inclusion} diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 5eae10e8b..69f385a5b 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index a8ed9a150..86c7ece91 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index cb2a98f42..9d3fbbdc5 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 09/03/14 19:11:48 +-- merge date : 09/03/14 22:05:34 do -- begin closure to overcome local limits and interference -- cgit v1.2.3