summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/data-exp.lua
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/context/base/data-exp.lua')
-rw-r--r--Master/texmf-dist/tex/context/base/data-exp.lua20
1 files changed, 11 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/context/base/data-exp.lua b/Master/texmf-dist/tex/context/base/data-exp.lua
index 66bbb56cba5..90659e57e7f 100644
--- a/Master/texmf-dist/tex/context/base/data-exp.lua
+++ b/Master/texmf-dist/tex/context/base/data-exp.lua
@@ -85,7 +85,7 @@ local replacer_1 = lpeg.replacer { { ",}", ",@}" }, { "{,", "{@," }, }
local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpegging it (nice exercise).
if trace_expansions then
- report_expansions("expanding variable '%s'",str)
+ report_expansions("expanding variable %a",str)
end
local t, ok, done = newlist or { }, false, false
local n = #t
@@ -114,12 +114,14 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
for s in gmatch(str,"[^,]+") do
s = validate(s)
if s then
- n = n + 1 ; t[n] = s
+ n = n + 1
+ t[n] = s
end
end
else
for s in gmatch(str,"[^,]+") do
- n = n + 1 ; t[n] = s
+ n = n + 1
+ t[n] = s
end
end
if trace_expansions then
@@ -133,7 +135,7 @@ end
-- We could make the previous one public.
local function validate(s)
- s = collapsepath(s) -- already keeps the //
+ s = collapsepath(s) -- already keeps the trailing / and //
return s ~= "" and not find(s,"^!*unset/*$") and s
end
@@ -244,7 +246,7 @@ local function splitconfigurationpath(str) -- beware, this can be either a path
end
end
if trace_expansions then
- report_expansions("splitting path specification '%s'",str)
+ report_expansions("splitting path specification %a",str)
for k=1,noffound do
report_expansions("% 4i: %s",k,found[k])
end
@@ -362,13 +364,13 @@ function resolvers.scanfiles(path,branch,usecache)
local files = fullcache[realpath]
if files then
if trace_locating then
- report_expansions("using caches scan of path '%s', branch '%s'",path,branch or path)
+ report_expansions("using caches scan of path %a, branch %a",path,branch or path)
end
return files
end
end
if trace_locating then
- report_expansions("scanning path '%s', branch '%s'",path,branch or path)
+ report_expansions("scanning path %a, branch %a",path,branch or path)
end
local files, n, m, r = scan({ },realpath .. '/',"",0,0,0)
files.__path__ = path -- can be selfautoparent:texmf-whatever
@@ -434,13 +436,13 @@ function resolvers.simplescanfiles(path,branch,usecache)
end
if files then
if trace_locating then
- report_expansions("using caches scan of path '%s', branch '%s'",path,branch or path)
+ report_expansions("using caches scan of path %a, branch %a",path,branch or path)
end
return files
end
end
if trace_locating then
- report_expansions("scanning path '%s', branch '%s'",path,branch or path)
+ report_expansions("scanning path %a, branch %a",path,branch or path)
end
local files = simplescan({ },realpath .. '/',"")
if trace_locating then