diff options
Diffstat (limited to 'tex')
| -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 |
9 files changed, 11 insertions, 3 deletions
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 |
