diff options
| -rw-r--r-- | scripts/context/lua/mtxrun.lua | 10 | ||||
| -rw-r--r-- | scripts/context/stubs/mswin/mtxrun.lua | 10 | ||||
| -rw-r--r-- | scripts/context/stubs/unix/mtxrun | 10 | ||||
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4134 -> 4129 bytes | |||
| -rw-r--r-- | tex/context/base/context-version.png | bin | 40526 -> 40255 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/data-met.lua | 1 | ||||
| -rw-r--r-- | tex/context/base/data-res.lua | 7 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24753 -> 24752 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 211793 -> 211777 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
12 files changed, 29 insertions, 15 deletions
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index 18d9d9a8d..1e4fead77 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -12538,7 +12538,7 @@ do -- create closure to overcome 200 locals limit package.loaded["data-met"] = package.loaded["data-met"] or true --- original size: 4915, stripped down to: 3942 +-- original size: 4944, stripped down to: 3968 if not modules then modules={} end modules ['data-met']={ version=1.100, @@ -12551,6 +12551,7 @@ local find,format=string.find,string.format local sequenced=table.sequenced local addurlscheme,urlhashed=url.addscheme,url.hashed local trace_locating=false +local trace_methods=false trackers.register("resolvers.locating",function(v) trace_methods=v end) trackers.register("resolvers.methods",function(v) trace_methods=v end) local report_methods=logs.reporter("resolvers","methods") @@ -12655,7 +12656,7 @@ do -- create closure to overcome 200 locals limit package.loaded["data-res"] = package.loaded["data-res"] or true --- original size: 61118, stripped down to: 42544 +-- original size: 61256, stripped down to: 42565 if not modules then modules={} end modules ['data-res']={ version=1.001, @@ -12704,6 +12705,7 @@ resolvers.luacnfspec={ "selfautoparent:/texmf-context/web2c", "selfautoparent:/texmf-dist/web2c", "selfautoparent:/texmf/web2c", + "selfautoparent:", } if type(resolvers.luacnfspec)=="table" then resolvers.luacnfspec=concat(resolvers.luacnfspec,";") @@ -15845,8 +15847,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 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 : 661945 --- stripped bytes : 243028 +-- original bytes : 662112 +-- stripped bytes : 243148 -- end library merge diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index 18d9d9a8d..1e4fead77 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -12538,7 +12538,7 @@ do -- create closure to overcome 200 locals limit package.loaded["data-met"] = package.loaded["data-met"] or true --- original size: 4915, stripped down to: 3942 +-- original size: 4944, stripped down to: 3968 if not modules then modules={} end modules ['data-met']={ version=1.100, @@ -12551,6 +12551,7 @@ local find,format=string.find,string.format local sequenced=table.sequenced local addurlscheme,urlhashed=url.addscheme,url.hashed local trace_locating=false +local trace_methods=false trackers.register("resolvers.locating",function(v) trace_methods=v end) trackers.register("resolvers.methods",function(v) trace_methods=v end) local report_methods=logs.reporter("resolvers","methods") @@ -12655,7 +12656,7 @@ do -- create closure to overcome 200 locals limit package.loaded["data-res"] = package.loaded["data-res"] or true --- original size: 61118, stripped down to: 42544 +-- original size: 61256, stripped down to: 42565 if not modules then modules={} end modules ['data-res']={ version=1.001, @@ -12704,6 +12705,7 @@ resolvers.luacnfspec={ "selfautoparent:/texmf-context/web2c", "selfautoparent:/texmf-dist/web2c", "selfautoparent:/texmf/web2c", + "selfautoparent:", } if type(resolvers.luacnfspec)=="table" then resolvers.luacnfspec=concat(resolvers.luacnfspec,";") @@ -15845,8 +15847,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 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 : 661945 --- stripped bytes : 243028 +-- original bytes : 662112 +-- stripped bytes : 243148 -- end library merge diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index 18d9d9a8d..1e4fead77 100644 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -12538,7 +12538,7 @@ do -- create closure to overcome 200 locals limit package.loaded["data-met"] = package.loaded["data-met"] or true --- original size: 4915, stripped down to: 3942 +-- original size: 4944, stripped down to: 3968 if not modules then modules={} end modules ['data-met']={ version=1.100, @@ -12551,6 +12551,7 @@ local find,format=string.find,string.format local sequenced=table.sequenced local addurlscheme,urlhashed=url.addscheme,url.hashed local trace_locating=false +local trace_methods=false trackers.register("resolvers.locating",function(v) trace_methods=v end) trackers.register("resolvers.methods",function(v) trace_methods=v end) local report_methods=logs.reporter("resolvers","methods") @@ -12655,7 +12656,7 @@ do -- create closure to overcome 200 locals limit package.loaded["data-res"] = package.loaded["data-res"] or true --- original size: 61118, stripped down to: 42544 +-- original size: 61256, stripped down to: 42565 if not modules then modules={} end modules ['data-res']={ version=1.001, @@ -12704,6 +12705,7 @@ resolvers.luacnfspec={ "selfautoparent:/texmf-context/web2c", "selfautoparent:/texmf-dist/web2c", "selfautoparent:/texmf/web2c", + "selfautoparent:", } if type(resolvers.luacnfspec)=="table" then resolvers.luacnfspec=concat(resolvers.luacnfspec,";") @@ -15845,8 +15847,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 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 : 661945 --- stripped bytes : 243028 +-- original bytes : 662112 +-- stripped bytes : 243148 -- end library merge diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index b1753fbab..89ad2c16d 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{2013.04.12 11:52} +\newcontextversion{2013.04.12 15:10} %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 Binary files differindex 726be769f..7974209e1 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png Binary files differindex 47a546b6a..cbcb53a75 100644 --- a/tex/context/base/context-version.png +++ b/tex/context/base/context-version.png diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index b5643bf98..bcf7e3fda 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -25,7 +25,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2013.04.12 11:52} +\edef\contextversion{2013.04.12 15:10} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/data-met.lua b/tex/context/base/data-met.lua index 28c73e460..4ca443895 100644 --- a/tex/context/base/data-met.lua +++ b/tex/context/base/data-met.lua @@ -11,6 +11,7 @@ local sequenced = table.sequenced local addurlscheme, urlhashed = url.addscheme, url.hashed local trace_locating = false +local trace_methods = false trackers.register("resolvers.locating", function(v) trace_methods = v end) trackers.register("resolvers.methods", function(v) trace_methods = v end) diff --git a/tex/context/base/data-res.lua b/tex/context/base/data-res.lua index 74ec53f0d..23bdde637 100644 --- a/tex/context/base/data-res.lua +++ b/tex/context/base/data-res.lua @@ -118,11 +118,18 @@ resolvers.luacnfstate = "unknown" -- -- But I gave up on that after the change to texmf-dist (why-oh-why), so we stick to: resolvers.luacnfspec = { + -- for taco "home:texmf/web2c", + -- for users "selfautoparent:/texmf-local/web2c", + -- for completeness "selfautoparent:/texmf-context/web2c", + -- for tex live "selfautoparent:/texmf-dist/web2c", + -- for minimals "selfautoparent:/texmf/web2c", + -- for mojca: + "selfautoparent:", } -- not yet table, some reporters expect strings diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex b3790649c..1c54f117a 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf Binary files differindex b475896a3..ab275c62e 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 3a3a914bd..e0e42f4da 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 : 04/12/13 11:52:01 +-- merge date : 04/12/13 15:10:40 do -- begin closure to overcome local limits and interference |
