diff options
author | Taco Hoekwater <taco@elvenkind.com> | 2011-06-22 10:59:18 +0000 |
---|---|---|
committer | Taco Hoekwater <taco@elvenkind.com> | 2011-06-22 10:59:18 +0000 |
commit | e9926fd469aff4508bb8cacdfa41eb2186e40ef8 (patch) | |
tree | 6cd9bd4214218d06204986e7b65e3cd7d33bbcfc /Master/texmf-dist/tex | |
parent | 97425552ee681cfb80901aa7e68b13a82fad5a1c (diff) |
Previous context mkiv patch for runtime files was problematic:
it always did a deep search on all paths, regardless of whether
or not // was appended to the specification. This commit fixes that.
git-svn-id: svn://tug.org/texlive/trunk@23087 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/context/base/data-exp.lua | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/base/data-res.lua | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Master/texmf-dist/tex/context/base/data-exp.lua b/Master/texmf-dist/tex/context/base/data-exp.lua index a0a85d07f58..11e69bcae5d 100644 --- a/Master/texmf-dist/tex/context/base/data-exp.lua +++ b/Master/texmf-dist/tex/context/base/data-exp.lua @@ -96,7 +96,7 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi if validate then for s in gmatch(str,"[^,]+") do local restoreslashes = false - if gmatch(s, "//$") then restoreslashes = true end + if find(s, "//$") then restoreslashes = true end s = validate(s) if s then n = n + 1 ; t[n] = s diff --git a/Master/texmf-dist/tex/context/base/data-res.lua b/Master/texmf-dist/tex/context/base/data-res.lua index 33b1fe65274..cac283092c2 100644 --- a/Master/texmf-dist/tex/context/base/data-res.lua +++ b/Master/texmf-dist/tex/context/base/data-res.lua @@ -1019,6 +1019,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : local path = pathlist[k] local pathname = lpegmatch(inhibitstripper,path) local doscan = path == pathname -- no ^!! + if not find (pathname, '//$') then doscan = false end done = false -- using file list if filelist then |