diff options
author | Mojca Miklavec <mojca.miklavec@gmail.com> | 2012-05-24 20:38:29 +0000 |
---|---|---|
committer | Mojca Miklavec <mojca.miklavec@gmail.com> | 2012-05-24 20:38:29 +0000 |
commit | 8b6aa4917f960304df746f97e8861cc422c7990a (patch) | |
tree | 78288b0dd7fc5c159ec1df6c6ddc1c00f72b5bbf /Master/texmf-dist/tex/context/base/data-res.lua | |
parent | 2e0afd608a5d9a2bd37c7b1db5fa2f1b4d2ce976 (diff) |
ConTeXt 2012.05.24 19:36
git-svn-id: svn://tug.org/texlive/trunk@26637 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/data-res.lua')
-rw-r--r-- | Master/texmf-dist/tex/context/base/data-res.lua | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/context/base/data-res.lua b/Master/texmf-dist/tex/context/base/data-res.lua index 335c44dc171..01b5f25254e 100644 --- a/Master/texmf-dist/tex/context/base/data-res.lua +++ b/Master/texmf-dist/tex/context/base/data-res.lua @@ -91,20 +91,14 @@ resolvers.luacnfstate = "unknown" if environment.default_texmfcnf then -- unfortunately we now have quite some overkill in the spec (not so nice on a network) - local luacnfspec = environment.default_texmfcnf - -- we also want to use this in the minimals / standalone - -- bu tit's too tricky as it can be an expanded spec - -- luacnfspec = gsub(luacnfspec,"%-local","-local,-context") - -- and we also need to support the home dir (for taco) - resolvers.luacnfspec = 'home:texmf/web2c;' .. luacnfspec -elseif this_is_texlive then - -- old, in case default_texmfcnf is not supported yet - resolvers.luacnfspec = 'selfautodir:;selfautoparent:;{selfautodir:,selfautoparent:}{/share,}/texmf{-local,}/web2c' + resolvers.luacnfspec = environment.default_texmfcnf else - -- the best for the minimals / standalone - resolvers.luacnfspec = 'home:texmf/web2c;selfautoparent:texmf{-local,-context,}/web2c' + -- 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: -- -- if environment and environment.ownpath and string.find(environment.ownpath,"[\\/]texlive[\\/]") then @@ -446,7 +440,7 @@ local function load_configuration_files() instance.loaderror = true end elseif trace_locating then - report_resolving("skipping configuration file '%s' (no file)",filename) + report_resolving("skipping configuration file '%s' (no valid format)",filename) end instance.order[#instance.order+1] = instance.setups[pathname] if instance.loaderror then |