summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.tex2
-rw-r--r--tex/context/base/context.tex2
-rw-r--r--tex/context/base/data-res.lua178
-rw-r--r--tex/context/base/l-file.lua48
-rw-r--r--tex/context/base/l-lpeg.lua4
-rw-r--r--tex/context/base/lxml-lpt.lua62
-rw-r--r--tex/context/base/lxml-tex.lua8
-rw-r--r--tex/generic/context/luatex-fonts-merged.lua54
8 files changed, 153 insertions, 205 deletions
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index c8de3bb34..25a5b19c0 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2009.11.20 18:14}
+\newcontextversion{2009.11.21 11:45}
%D This file is loaded at runtime, thereby providing an
%D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index e432c409c..3d25b095d 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2009.11.20 18:14}
+\edef\contextversion{2009.11.21 11:45}
%D For those who want to use this:
diff --git a/tex/context/base/data-res.lua b/tex/context/base/data-res.lua
index 3a56dd9d4..1cb0b2dd9 100644
--- a/tex/context/base/data-res.lua
+++ b/tex/context/base/data-res.lua
@@ -37,8 +37,6 @@ local format, gsub, find, lower, upper, match, gmatch = string.format, string.gs
local concat, insert, sortedkeys = table.concat, table.insert, table.sortedkeys
local next, type = next, type
-local collapse_path = file.collapse_path
-
local trace_locating, trace_detail, trace_verbose = false, false, false
trackers.register("resolvers.verbose", function(v) trace_verbose = v end)
@@ -352,32 +350,6 @@ end
-- work that well; the parsing is ok, but dealing with the resulting
-- table is a pain because we need to work inside-out recursively
-local function do_first(a,b)
- local t = { }
- for s in gmatch(b,"[^,]+") do t[#t+1] = a .. s end
- return "{" .. concat(t,",") .. "}"
-end
-
-local function do_second(a,b)
- local t = { }
- for s in gmatch(a,"[^,]+") do t[#t+1] = s .. b end
- return "{" .. concat(t,",") .. "}"
-end
-
-local function do_both(a,b)
- local t = { }
- for sa in gmatch(a,"[^,]+") do
- for sb in gmatch(b,"[^,]+") do
- t[#t+1] = sa .. sb
- end
- end
- return "{" .. concat(t,",") .. "}"
-end
-
-local function do_three(a,b,c)
- return a .. b.. c
-end
-
local function splitpathexpr(str, t, validate)
-- no need for further optimization as it is only called a
-- few times, we can use lpeg for the sub; we could move
@@ -387,6 +359,28 @@ local function splitpathexpr(str, t, validate)
str = gsub(str,"{,","{@,")
-- str = "@" .. str .. "@"
local ok, done
+ local function do_first(a,b)
+ local t = { }
+ for s in gmatch(b,"[^,]+") do t[#t+1] = a .. s end
+ return "{" .. concat(t,",") .. "}"
+ end
+ local function do_second(a,b)
+ local t = { }
+ for s in gmatch(a,"[^,]+") do t[#t+1] = s .. b end
+ return "{" .. concat(t,",") .. "}"
+ end
+ local function do_both(a,b)
+ local t = { }
+ for sa in gmatch(a,"[^,]+") do
+ for sb in gmatch(b,"[^,]+") do
+ t[#t+1] = sa .. sb
+ end
+ end
+ return "{" .. concat(t,",") .. "}"
+ end
+ local function do_three(a,b,c)
+ return a .. b.. c
+ end
while true do
done = false
while true do
@@ -420,11 +414,6 @@ local function splitpathexpr(str, t, validate)
return t
end
-local function validate(s)
- s = collapse_path(s)
- return s ~= "" and not find(s,dummy_path_expr) and s
-end
-
local function expanded_path_from_list(pathlist) -- maybe not a list, just a path
-- a previous version fed back into pathlist
local newlist, ok = { }, false
@@ -435,13 +424,17 @@ local function expanded_path_from_list(pathlist) -- maybe not a list, just a pat
end
end
if ok then
+ local function validate(s)
+ s = file.collapse_path(s)
+ return s ~= "" and not find(s,dummy_path_expr) and s
+ end
for k=1,#pathlist do
splitpathexpr(pathlist[k],newlist,validate)
end
else
for k=1,#pathlist do
for p in gmatch(pathlist[k],"([^,]+)") do
- p = collapse_path(p)
+ p = file.collapse_path(p)
if p ~= "" then newlist[#newlist+1] = p end
end
end
@@ -506,9 +499,9 @@ local function identify_own()
local ownpath = resolvers.getownpath() or lfs.currentdir()
local ie = instance.environment
if ownpath then
- if resolvers.env('SELFAUTOLOC') == "" then os.env['SELFAUTOLOC'] = collapse_path(ownpath) end
- if resolvers.env('SELFAUTODIR') == "" then os.env['SELFAUTODIR'] = collapse_path(ownpath .. "/..") end
- if resolvers.env('SELFAUTOPARENT') == "" then os.env['SELFAUTOPARENT'] = collapse_path(ownpath .. "/../..") end
+ if resolvers.env('SELFAUTOLOC') == "" then os.env['SELFAUTOLOC'] = file.collapse_path(ownpath) end
+ if resolvers.env('SELFAUTODIR') == "" then os.env['SELFAUTODIR'] = file.collapse_path(ownpath .. "/..") end
+ if resolvers.env('SELFAUTOPARENT') == "" then os.env['SELFAUTOPARENT'] = file.collapse_path(ownpath .. "/../..") end
else
logs.report("fileio","error: unable to locate ownpath")
os.exit()
@@ -537,7 +530,7 @@ function resolvers.identify_cnf()
local function locate(filename,list)
for i=1,#t do
local ti = t[i]
- local texmfcnf = collapse_path(file.join(ti,filename))
+ local texmfcnf = file.collapse_path(file.join(ti,filename))
if lfs.isfile(texmfcnf) then
list[#list+1] = texmfcnf
end
@@ -549,11 +542,11 @@ function resolvers.identify_cnf()
end
local function load_cnf_file(fname)
- -- why don't we just read the file from the cache
- -- we need to switch to the lua file
fname = resolvers.clean_path(fname)
local lname = file.replacesuffix(fname,'lua')
- if lfs.isfile(lname) then
+ local f = io.open(lname)
+ if f then -- this will go
+ f:close()
local dname = file.dirname(fname)
if not instance.configuration[dname] then
resolvers.load_data(dname,'configuration',lname and file.basename(lname))
@@ -618,17 +611,13 @@ local function collapse_cnf_data() -- potential optimization: pass start index (
end
end
-local function loadoldconfigdata()
- for _, fname in ipairs(instance.cnffiles) do
- load_cnf_file(fname)
- end
-end
-
function resolvers.load_cnf()
+ local function loadoldconfigdata()
+ for _, fname in ipairs(instance.cnffiles) do
+ load_cnf_file(fname)
+ end
+ end
-- instance.cnffiles contain complete names now !
- -- we still use a funny mix of cnf and new but soon
- -- we will switch to lua exclusively as we only use
- -- the file to collect the tree roots
if #instance.cnffiles == 0 then
if trace_verbose then
logs.report("fileio","no cnf files found (TEXMFCNF may not be set/known)")
@@ -636,12 +625,12 @@ function resolvers.load_cnf()
else
instance.rootpath = instance.cnffiles[1]
for k,fname in ipairs(instance.cnffiles) do
- instance.cnffiles[k] = collapse_path(gsub(fname,"\\",'/'))
+ instance.cnffiles[k] = file.collapse_path(gsub(fname,"\\",'/'))
end
for i=1,3 do
instance.rootpath = file.dirname(instance.rootpath)
end
- instance.rootpath = collapse_path(instance.rootpath)
+ instance.rootpath = file.collapse_path(instance.rootpath)
if instance.diskcache and not instance.renewcache then
resolvers.loadoldconfig(instance.cnffiles)
if instance.loaderror then
@@ -665,12 +654,12 @@ function resolvers.load_lua()
else
instance.rootpath = instance.luafiles[1]
for k,fname in ipairs(instance.luafiles) do
- instance.luafiles[k] = collapse_path(gsub(fname,"\\",'/'))
+ instance.luafiles[k] = file.collapse_path(gsub(fname,"\\",'/'))
end
for i=1,3 do
instance.rootpath = file.dirname(instance.rootpath)
end
- instance.rootpath = collapse_path(instance.rootpath)
+ instance.rootpath = file.collapse_path(instance.rootpath)
resolvers.loadnewconfig()
collapse_cnf_data()
end
@@ -732,7 +721,7 @@ function resolvers.locatelists()
if trace_verbose then
logs.report("fileio","locating list of %s",path)
end
- resolvers.locatedatabase(collapse_path(path))
+ resolvers.locatedatabase(file.collapse_path(path))
end
end
@@ -855,11 +844,34 @@ end
-- we join them and split them after the expansion has taken place. This
-- is more convenient.
+
+local checkedsplit = string.checkedsplit
+local normalsplit = string.split
+
+local cache = { }
+
+local function split_kpse_path(str) -- beware, this can be either a path or a {specification}
+ local found = cache[str]
+ if not found then
+ str = gsub(str,"\\","/")
+ if find(str,";") then
+ found = checkedsplit(str,";")
+ else
+ found = checkedsplit(str,io.pathseparator)
+ end
+ -- print(table.serialize(found))
+ cache[str] = found
+ end
+ return found
+end
+
+resolvers.split_kpse_path = split_kpse_path
+
function resolvers.splitconfig()
for i,c in ipairs(instance) do
for k,v in pairs(c) do
if type(v) == 'string' then
- local t = file.split_path(v)
+ local t = split_kpse_path(v)
if #t > 1 then
c[k] = t
end
@@ -877,41 +889,13 @@ function resolvers.joinconfig()
end
end
end
-
-local winpath = lpeg.P("!!")^-1 * (lpeg.R("AZ","az") * lpeg.P(":") * lpeg.P("/"))
-local separator = lpeg.P(":") + lpeg.P(";")
-local rest = (1-separator)^1
-local somepath = winpath * rest + rest
-local splitter = lpeg.Ct(lpeg.C(somepath) * (separator^1 + lpeg.C(somepath))^0)
-
-local function split_kpse_path(str)
- str = gsub(str,"\\","/")
- return splitter:match(str) or { }
-end
-
-local cache = { } -- we assume stable strings
-
-function resolvers.split_path(str) -- overkill but i need to check this module anyway
+function resolvers.split_path(str)
if type(str) == 'table' then
return str
else
- str = gsub(str,"\\","/")
- local s = cache[str]
- if s then
- return s -- happens seldom
- else
- s = { }
- end
- local t = string.checkedsplit(str,io.pathseparator) or { str }
- for _, p in ipairs(t) do
- splitpathexpr(p,s)
- end
- --~ print(str,table.serialize(s))
- cache[str] = s
- return s
+ return split_kpse_path(str)
end
end
-
function resolvers.join_path(str)
if type(str) == 'table' then
return file.join_path(str)
@@ -924,7 +908,7 @@ function resolvers.splitexpansions()
local ie = instance.expansions
for k,v in next, ie do
local t, h = { }, { }
- for _,vv in ipairs(file.split_path(v)) do
+ for _,vv in ipairs(split_kpse_path(v)) do
if vv ~= "" and not h[vv] then
t[#t+1] = vv
h[vv] = true
@@ -1019,7 +1003,6 @@ function resolvers.save_data(dataname, makename) -- untested without cache overl
date = os.date("%Y-%m-%d"),
time = os.date("%H:%M:%S"),
content = files,
- uuid = os.uuid(),
}
local ok = io.savedata(luaname,resolvers.serialize(data))
if ok then
@@ -1042,12 +1025,6 @@ function resolvers.save_data(dataname, makename) -- untested without cache overl
end
end
-local data_state = { }
-
-function resolvers.data_state()
- return data_state or { }
-end
-
function resolvers.load_data(pathname,dataname,filename,makename) -- untested without cache overload
filename = ((not filename or (filename == "")) and dataname) or filename
filename = (makename and makename(dataname,filename)) or file.join(pathname,filename)
@@ -1055,7 +1032,6 @@ function resolvers.load_data(pathname,dataname,filename,makename) -- untested wi
if blob then
local data = blob()
if data and data.content and data.type == dataname and data.version == resolvers.cacheversion then
- data_state[#data_state+1] = data.uuid
if trace_verbose then
logs.report("fileio","loading %s for %s from %s",dataname,pathname,filename)
end
@@ -1310,7 +1286,7 @@ function resolvers.clean_path_list(str)
local t = resolvers.expanded_path_list(str)
if t then
for i=1,#t do
- t[i] = collapse_path(resolvers.clean_path(t[i]))
+ t[i] = file.collapse_path(resolvers.clean_path(t[i]))
end
end
return t
@@ -1507,8 +1483,8 @@ end
local function collect_instance_files(filename,collected) -- todo : plugin (scanners, checkers etc)
local result = collected or { }
local stamp = nil
- filename = collapse_path(filename) -- elsewhere
- filename = collapse_path(gsub(filename,"\\","/")) -- elsewhere
+ filename = file.collapse_path(filename) -- elsewhere
+ filename = file.collapse_path(gsub(filename,"\\","/")) -- elsewhere
-- speed up / beware: format problem
if instance.remember then
stamp = filename .. "--" .. instance.engine .. "--" .. instance.progname .. "--" .. instance.format
@@ -1739,7 +1715,7 @@ local function collect_instance_files(filename,collected) -- todo : plugin (scan
end
end
for k=1,#result do
- result[k] = collapse_path(result[k])
+ result[k] = file.collapse_path(result[k])
end
if instance.remember then
instance.found[stamp] = result
@@ -1891,9 +1867,9 @@ function resolvers.load(option)
statistics.starttiming(instance)
resolvers.resetconfig()
resolvers.identify_cnf()
- resolvers.load_lua() -- will become the new method
+ resolvers.load_lua()
resolvers.expand_variables()
- resolvers.load_cnf() -- will be skipped when we have a lua file
+ resolvers.load_cnf()
resolvers.expand_variables()
if option ~= "nofiles" then
resolvers.load_hash()
diff --git a/tex/context/base/l-file.lua b/tex/context/base/l-file.lua
index a28991339..37de64ba1 100644
--- a/tex/context/base/l-file.lua
+++ b/tex/context/base/l-file.lua
@@ -33,12 +33,8 @@ function file.dirname(name,default)
return match(name,"^(.+)[/\\].-$") or (default or "")
end
---~ function file.basename(name)
---~ return match(name,"^.+[/\\](.-)$") or name
---~ end
-
function file.basename(name)
- return match(name,"^.*[/\\](.-)$") or name
+ return match(name,"^.+[/\\](.-)$") or name
end
function file.nameonly(name)
@@ -84,39 +80,27 @@ end
file.is_readable = file.isreadable
file.is_writable = file.iswritable
-local checkedsplit = string.checkedsplit
+-- todo: lpeg
-local winpath = (lpeg.R("AZ","az") * lpeg.P(":") * lpeg.P("/"))
-local separator = lpeg.P(":") + lpeg.P(";")
-local rest = (1-separator)^1
-local somepath = winpath * rest + rest
-local splitter = lpeg.Ct(lpeg.C(somepath) * (separator^1 + lpeg.C(somepath))^0)
+--~ function file.split_path(str)
+--~ local t = { }
+--~ str = gsub(str,"\\", "/")
+--~ str = gsub(str,"(%a):([;/])", "%1\001%2")
+--~ for name in gmatch(str,"([^;:]+)") do
+--~ if name ~= "" then
+--~ t[#t+1] = gsub(name,"\001",":")
+--~ end
+--~ end
+--~ return t
+--~ end
+
+local checkedsplit = string.checkedsplit
function file.split_path(str,separator)
str = gsub(str,"\\","/")
- if separator then
- return checkedsplit(str,separator) or { }
- else
- return splitter:match(str) or { }
- end
+ return checkedsplit(str,separator or io.pathseparator)
end
--- special one for private usage
-
---~ local winpath = lpeg.P("!!")^-1 * winpath
---~ local splitter= lpeg.Ct(lpeg.C(somepath) * (separator^1 + lpeg.C(somepath))^0)
-
---~ function file.split_kpse_path(str)
---~ str = gsub(str,"\\","/")
---~ return splitter:match(str) or { }
---~ end
-
--- str = [[/opt/texlive/2009/bin/i386-linux:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/mine/bin:/home/mine/.local/bin]]
---
--- str = os.getenv("PATH") --
--- str = [[/opt/texlive/2009/bin/i386-linux:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/mine/bin:/home/mine/.local/bin]]
--- str = [[c:/oeps:whatever]]
-
function file.join_path(tab)
return concat(tab,io.pathseparator) -- can have trailing //
end
diff --git a/tex/context/base/l-lpeg.lua b/tex/context/base/l-lpeg.lua
index 44e648607..afe941e9d 100644
--- a/tex/context/base/l-lpeg.lua
+++ b/tex/context/base/l-lpeg.lua
@@ -107,8 +107,8 @@ function string:checkedsplit(separator)
local c = cache[separator]
if not c then
separator = P(separator)
- local other = C((1 - separator)^1)
- c = Ct(other * (separator^1 * other)^1)
+ local other = C((1 - separator)^0)
+ c = Ct(separator^0 * other * (separator^1 * other)^0)
cache[separator] = c
end
return c:match(self)
diff --git a/tex/context/base/lxml-lpt.lua b/tex/context/base/lxml-lpt.lua
index b417e49d5..8f92abd80 100644
--- a/tex/context/base/lxml-lpt.lua
+++ b/tex/context/base/lxml-lpt.lua
@@ -465,7 +465,7 @@ cleaner = Cs ( (
local template_e = [[
local expr = xml.expressions
- return function(list,ll,l,root)
+ return function(list,ll,l,order)
return %s
end
]]
@@ -728,7 +728,7 @@ end
local profiled = { } xml.profiled = profiled
-local function profiled_apply(list,parsed,nofparsed)
+local function profiled_apply(list,parsed,nofparsed,order)
local p = profiled[parsed.pattern]
if p then
p.tested = p.tested + 1
@@ -745,7 +745,7 @@ local function profiled_apply(list,parsed,nofparsed)
elseif kind == "nodes" then
collected = apply_nodes(collected,pi.nodetest,pi.nodes)
elseif kind == "expression" then
- collected = apply_expression(collected,pi.evaluator,i)
+ collected = apply_expression(collected,pi.evaluator,order)
elseif kind == "finalizer" then
collected = pi.finalizer(collected)
p.matched = p.matched + 1
@@ -762,12 +762,13 @@ local function profiled_apply(list,parsed,nofparsed)
return collected
end
-local function traced_apply(list,parsed,nofparsed)
+local function traced_apply(list,parsed,nofparsed,order)
if trace_lparse then
lshow(parsed)
end
logs.report("lpath", "collecting : %s",parsed.pattern)
logs.report("lpath", " root tags : %s",tagstostring(list))
+ logs.report("lpath", " order : %s",order or "unset")
local collected = list
for i=1,nofparsed do
local pi = parsed[i]
@@ -779,7 +780,7 @@ local function traced_apply(list,parsed,nofparsed)
collected = apply_nodes(collected,pi.nodetest,pi.nodes)
logs.report("lpath", "% 10i : ns : %s",(collected and #collected) or 0,nodesettostring(pi.nodes,pi.nodetest))
elseif kind == "expression" then
- collected = apply_expression(collected,pi.evaluator,i)
+ collected = apply_expression(collected,pi.evaluator,order)
logs.report("lpath", "% 10i : ex : %s -> %s",(collected and #collected) or 0,pi.expression,pi.converted)
elseif kind == "finalizer" then
collected = pi.finalizer(collected)
@@ -793,6 +794,30 @@ local function traced_apply(list,parsed,nofparsed)
return collected
end
+local function normal_apply(list,parsed,nofparsed,order)
+ local collected = list
+ for i=1,nofparsed do
+ local pi = parsed[i]
+ local kind = pi.kind
+ if kind == "axis" then
+ local axis = pi.axis
+ if axis ~= "self" then
+ collected = apply_axis[axis](collected)
+ end
+ elseif kind == "nodes" then
+ collected = apply_nodes(collected,pi.nodetest,pi.nodes)
+ elseif kind == "expression" then
+ collected = apply_expression(collected,pi.evaluator,order)
+ elseif kind == "finalizer" then
+ return pi.finalizer(collected)
+ end
+ if not collected or #collected == 0 then
+ return nil
+ end
+ end
+ return collected
+end
+
local function parse_apply(list,pattern)
-- we avoid an extra call
local parsed = cache[pattern]
@@ -812,32 +837,11 @@ local function parse_apply(list,pattern)
if nofparsed == 0 then
-- something is wrong
elseif not trace_lpath then
- -- normal apply, inline, no self
- local collected = list
- for i=1,nofparsed do
- local pi = parsed[i]
- local kind = pi.kind
- if kind == "axis" then
- local axis = pi.axis
- if axis ~= "self" then
- collected = apply_axis[axis](collected)
- end
- elseif kind == "nodes" then
- collected = apply_nodes(collected,pi.nodetest,pi.nodes)
- elseif kind == "expression" then
- collected = apply_expression(collected,pi.evaluator,i)
- elseif kind == "finalizer" then
- return pi.finalizer(collected)
- end
- if not collected or #collected == 0 then
- return nil
- end
- end
- return collected
+ return normal_apply(list,parsed,nofparsed,list[1].mi)
elseif trace_lprofile then
- return profiled_apply(list,parsed,nofparsed)
+ return profiled_apply(list,parsed,nofparsed,list[1].mi)
else -- trace_lpath
- return traced_apply(list,parsed,nofparsed)
+ return traced_apply(list,parsed,nofparsed,list[1].mi)
end
end
diff --git a/tex/context/base/lxml-tex.lua b/tex/context/base/lxml-tex.lua
index 12f44b68e..c1284b87b 100644
--- a/tex/context/base/lxml-tex.lua
+++ b/tex/context/base/lxml-tex.lua
@@ -1026,7 +1026,7 @@ finalizers.default = all -- !!
local concat = table.concat
-function finalizers.tag(root,pattern,n)
+function finalizers.tag(collected)
if collected then
local c
if n == 0 or not n then
@@ -1042,7 +1042,7 @@ function finalizers.tag(root,pattern,n)
end
end
-function finalizers.name(root,pattern,n)
+function finalizers.name(collected)
if collected then
local c
if n == 0 or not n then
@@ -1053,7 +1053,7 @@ function finalizers.name(root,pattern,n)
c = collected[#collected-n+1]
end
if c then
- if c.ns ~= "" then
+ if c.ns == "" then
texsprint(c.tg)
else
texsprint(c.ns,":",c.tg)
@@ -1062,7 +1062,7 @@ function finalizers.name(root,pattern,n)
end
end
-function finalizers.tags(root,pattern,nonamespace)
+function finalizers.tags(collected,nonamespace)
if collected then
for c=1,#collected do
local e = collected[c]
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index 6d9982f64..f18b9f83d 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : c:/data/develop/context/texmf/tex/generic/context/luatex-fonts-merged.lua
-- parent file : c:/data/develop/context/texmf/tex/generic/context/luatex-fonts.lua
--- merge date : 11/20/09 18:25:17
+-- merge date : 11/21/09 11:50:03
do -- begin closure to overcome local limits and interference
@@ -375,8 +375,8 @@ function string:checkedsplit(separator)
local c = cache[separator]
if not c then
separator = P(separator)
- local other = C((1 - separator)^1)
- c = Ct(other * (separator^1 * other)^1)
+ local other = C((1 - separator)^0)
+ c = Ct(separator^0 * other * (separator^1 * other)^0)
cache[separator] = c
end
return c:match(self)
@@ -1437,12 +1437,8 @@ function file.dirname(name,default)
return match(name,"^(.+)[/\\].-$") or (default or "")
end
---~ function file.basename(name)
---~ return match(name,"^.+[/\\](.-)$") or name
---~ end
-
function file.basename(name)
- return match(name,"^.*[/\\](.-)$") or name
+ return match(name,"^.+[/\\](.-)$") or name
end
function file.nameonly(name)
@@ -1488,39 +1484,27 @@ end
file.is_readable = file.isreadable
file.is_writable = file.iswritable
-local checkedsplit = string.checkedsplit
+-- todo: lpeg
-local winpath = (lpeg.R("AZ","az") * lpeg.P(":") * lpeg.P("/"))
-local separator = lpeg.P(":") + lpeg.P(";")
-local rest = (1-separator)^1
-local somepath = winpath * rest + rest
-local splitter = lpeg.Ct(lpeg.C(somepath) * (separator^1 + lpeg.C(somepath))^0)
+--~ function file.split_path(str)
+--~ local t = { }
+--~ str = gsub(str,"\\", "/")
+--~ str = gsub(str,"(%a):([;/])", "%1\001%2")
+--~ for name in gmatch(str,"([^;:]+)") do
+--~ if name ~= "" then
+--~ t[#t+1] = gsub(name,"\001",":")
+--~ end
+--~ end
+--~ return t
+--~ end
+
+local checkedsplit = string.checkedsplit
function file.split_path(str,separator)
str = gsub(str,"\\","/")
- if separator then
- return checkedsplit(str,separator) or { }
- else
- return splitter:match(str) or { }
- end
+ return checkedsplit(str,separator or io.pathseparator)
end
--- special one for private usage
-
---~ local winpath = lpeg.P("!!")^-1 * winpath
---~ local splitter= lpeg.Ct(lpeg.C(somepath) * (separator^1 + lpeg.C(somepath))^0)
-
---~ function file.split_kpse_path(str)
---~ str = gsub(str,"\\","/")
---~ return splitter:match(str) or { }
---~ end
-
--- str = [[/opt/texlive/2009/bin/i386-linux:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/mine/bin:/home/mine/.local/bin]]
---
--- str = os.getenv("PATH") --
--- str = [[/opt/texlive/2009/bin/i386-linux:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/mine/bin:/home/mine/.local/bin]]
--- str = [[c:/oeps:whatever]]
-
function file.join_path(tab)
return concat(tab,io.pathseparator) -- can have trailing //
end
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 01:31:18 +0000