From 6448b726ded4b6f912a588e8f0bafb6182ca5db1 Mon Sep 17 00:00:00 2001 From: Marius Date: Tue, 9 Apr 2013 17:40:14 +0300 Subject: beta 2013.04.09 16:22 --- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4130 -> 4133 bytes tex/context/base/context-version.png | Bin 40295 -> 40377 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/data-exp.lua | 2 +- tex/context/base/data-pre.lua | 8 +++- tex/context/base/data-res.lua | 47 ++++++++++++--------- tex/context/base/status-files.pdf | Bin 24752 -> 24752 bytes tex/context/base/status-lua.pdf | Bin 211809 -> 211902 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 10 files changed, 39 insertions(+), 24 deletions(-) (limited to 'tex') diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 362967b36..f63e30ab2 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.09 11:17} +\newcontextversion{2013.04.09 16:22} %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 9b62ce81b..e772cbe4e 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-version.png b/tex/context/base/context-version.png index 7bc7cf829..6e9705938 100644 Binary files a/tex/context/base/context-version.png and b/tex/context/base/context-version.png differ diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index ff2779d42..71a1d746b 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.09 11:17} +\edef\contextversion{2013.04.09 16:22} \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 90659e57e..8a2fd0320 100644 --- a/tex/context/base/data-exp.lua +++ b/tex/context/base/data-exp.lua @@ -201,7 +201,7 @@ end -- This one strips quotes and funny tokens. -local expandhome = P("~") / "$HOME" -- environment.homedir +local expandhome = P("~") / "$HOME" -- environment.homedir or "home:" local dodouble = P('"')/"" * (expandhome + (1 - P('"')))^0 * P('"')/"" local dosingle = P("'")/"" * (expandhome + (1 - P("'")))^0 * P("'")/"" diff --git a/tex/context/base/data-pre.lua b/tex/context/base/data-pre.lua index e48a5aa8c..f2f5bddc4 100644 --- a/tex/context/base/data-pre.lua +++ b/tex/context/base/data-pre.lua @@ -21,7 +21,7 @@ resolvers.prefixes = prefixes local cleanpath, findgivenfile, expansion = resolvers.cleanpath, resolvers.findgivenfile, resolvers.expansion local getenv = resolvers.getenv -- we can probably also use resolvers.expansion -local P, S, R, C, Cs, lpegmatch = lpeg.P, lpeg.S, lpeg.R, lpeg.C, lpeg.Cs, lpeg.match +local P, S, R, C, Cs, Cc, lpegmatch = lpeg.P, lpeg.S, lpeg.R, lpeg.C, lpeg.Cs, lpeg.Cc, lpeg.match local joinpath, basename, dirname = file.join, file.basename, file.dirname local getmetatable, rawset, type = getmetatable, rawset, type @@ -165,6 +165,12 @@ end local pattern = Cs((C(R("az")^2) * P(":") * C((1-S(" \"\';,"))^1) / _resolve_ + P(1))^0) +local prefix = C(R("az")^2) * P(":") +local target = C((1-S(" \"\';,"))^1) +local notarget = (#S(";,") + P(-1)) * Cc("") + +local pattern = Cs(((prefix * (target + notarget)) / _resolve_ + P(1))^0) + local function resolve(str) -- use schemes, this one is then for the commandline only if type(str) == "table" then local t = { } diff --git a/tex/context/base/data-res.lua b/tex/context/base/data-res.lua index 32e19cf13..74ec53f0d 100644 --- a/tex/context/base/data-res.lua +++ b/tex/context/base/data-res.lua @@ -95,33 +95,41 @@ resolvers.luacnfstate = "unknown" -- selfautoparent:texmf-context/web2c -- selfautoparent:texmf/web2c -if environment.default_texmfcnf then - -- unfortunately we now have quite some overkill in the spec (not so nice on a network) - resolvers.luacnfspec = environment.default_texmfcnf -else - -- resolvers.luacnfspec = "selfautoparent:texmf{-local,-context,}/web2c" - resolvers.luacnfspec = "{selfautoloc:,selfautodir:,selfautoparent:}{,/texmf{-local,}/web2c}" -end - -resolvers.luacnfspec = 'home:texmf/web2c;' .. resolvers.luacnfspec - --- which (as we want users to use the web2c path) be can be simplified to this: +-- -- Till 2013 we had this: +-- +-- if environment.default_texmfcnf then +-- -- unfortunately we now have quite some overkill in the spec (not so nice on a network) +-- resolvers.luacnfspec = environment.default_texmfcnf +-- else +-- resolvers.luacnfspec = "selfautoparent:texmf{-local,-context,-dist,}/web2c" +-- -- resolvers.luacnfspec = "{selfautoloc:,selfautodir:,selfautoparent:}{,/texmf{-local,-dist,}/web2c}" +-- end +-- +-- resolvers.luacnfspec = 'home:texmf/web2c;' .. resolvers.luacnfspec +-- +-- -- which (as we want users to use the web2c path) be can be simplified to this: -- -- if environment and environment.ownpath and string.find(environment.ownpath,"[\\/]texlive[\\/]") then -- resolvers.luacnfspec = 'selfautodir:/texmf-local/web2c,selfautoparent:/texmf-local/web2c,selfautoparent:/texmf/web2c' -- else -- resolvers.luacnfspec = 'selfautoparent:/texmf-local/web2c,selfautoparent:/texmf/web2c' -- end +-- +-- -- But I gave up on that after the change to texmf-dist (why-oh-why), so we stick to: + +resolvers.luacnfspec = { + "home:texmf/web2c", + "selfautoparent:/texmf-local/web2c", + "selfautoparent:/texmf-context/web2c", + "selfautoparent:/texmf-dist/web2c", + "selfautoparent:/texmf/web2c", +} ---~ -- not yet, some reporters expect strings +-- not yet table, some reporters expect strings ---~ resolvers.luacnfspec = { ---~ "selfautoparent:/texmf-local", -- is actually a user mistake ---~ "selfautoparent:/texmf-local/web2c", ---~ "selfautoparent:/texmf", -- idem ---~ "selfautoparent:/texmf/web2c", ---~ "selfautoparent:", -- idem ---~ } +if type(resolvers.luacnfspec) == "table" then + resolvers.luacnfspec = concat(resolvers.luacnfspec,";") +end local unset_variable = "unset" @@ -340,6 +348,7 @@ local function identify_configuration_files() if cnfspec == "" then cnfspec = resolvers.luacnfspec resolvers.luacnfstate = "default" +-- resolvers.setenv("TEXMFCNF",cnfspec) -- for running texexec etc else resolvers.luacnfstate = "environment" end diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 1baa4a113..ef645abce 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 cbde0a7e1..8e25ce1de 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 77a3edb25..fc8197ff0 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/09/13 11:17:30 +-- merge date : 04/09/13 16:22:38 do -- begin closure to overcome local limits and interference -- cgit v1.2.3