summaryrefslogtreecommitdiff
path: root/Master/bin
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2010-06-11 05:27:28 +0000
committerTaco Hoekwater <taco@elvenkind.com>2010-06-11 05:27:28 +0000
commitfaa11e24aa55e118745a8ca54389b21584aba19b (patch)
treec425f14e8bf7868e7a91aa6b929b8b4b7f463c98 /Master/bin
parentf161da3297477df5528ca0aabce2c826f23547d8 (diff)
A second attempt at fixing the context mkiv SELFAUTOLOC problem
git-svn-id: svn://tug.org/texlive/trunk@18889 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/bin')
-rwxr-xr-xMaster/bin/win32/luatools.lua58
-rwxr-xr-xMaster/bin/win32/mtxrun.lua58
2 files changed, 114 insertions, 2 deletions
diff --git a/Master/bin/win32/luatools.lua b/Master/bin/win32/luatools.lua
index ac1e38f4c6d..c060beff8fe 100755
--- a/Master/bin/win32/luatools.lua
+++ b/Master/bin/win32/luatools.lua
@@ -2217,7 +2217,62 @@ end
local insert = table.insert
-function file.collapse_path(str)
+function file.collapse_path(str,anchor)
+ if anchor and not find(str,"^/") and not find(str,"^%a:") then
+ str = getcurrentdir() .. "/" .. str
+ end
+ if str == "" or str =="." then
+ return "."
+ elseif find(str,"^%.%.") then
+ str = gsub(str,"\\","/")
+ return str
+ elseif not find(str,"%.") then
+ str = gsub(str,"\\","/")
+ return str
+ end
+ str = gsub(str,"\\","/")
+ local starter, rest = match(str,"^(%a+:/*)(.-)$")
+ if starter then
+ str = rest
+ end
+ local oldelements = checkedsplit(str,"/")
+ local newelements = { }
+ local i = #oldelements
+ while i > 0 do
+ local element = oldelements[i]
+ if element == '.' then
+ -- do nothing
+ elseif element == '..' then
+ local n = i -1
+ while n > 0 do
+ local element = oldelements[n]
+ if element ~= '..' and element ~= '.' then
+ oldelements[n] = '.'
+ break
+ else
+ n = n - 1
+ end
+ end
+ if n < 1 then
+ insert(newelements,1,'..')
+ end
+ elseif element ~= "" then
+ insert(newelements,1,element)
+ end
+ i = i - 1
+ end
+ if #newelements == 0 then
+ return starter or "."
+ elseif starter then
+ return starter .. concat(newelements, '/')
+ elseif find(str,"^/") then
+ return "/" .. concat(newelements,'/')
+ else
+ return concat(newelements, '/')
+ end
+end
+function file.xcollapse_path(str)
+ print('collapse', str)
if str == "" or str =="." then
return "."
elseif find(str,"^%.%.") then
@@ -7892,6 +7947,7 @@ if own.path ~= '.' then
table.insert(own.list,own.path)
end
+table.insert(own.list,own.path.."/../../texmf-dist/tex/context/base")
table.insert(own.list,own.path.."/../../../tex/context/base")
table.insert(own.list,own.path.."/mtx")
table.insert(own.list,own.path.."/../sources")
diff --git a/Master/bin/win32/mtxrun.lua b/Master/bin/win32/mtxrun.lua
index 574335c58d5..2bdd1b8f020 100755
--- a/Master/bin/win32/mtxrun.lua
+++ b/Master/bin/win32/mtxrun.lua
@@ -2226,7 +2226,62 @@ end
local insert = table.insert
-function file.collapse_path(str)
+function file.collapse_path(str,anchor)
+ if anchor and not find(str,"^/") and not find(str,"^%a:") then
+ str = getcurrentdir() .. "/" .. str
+ end
+ if str == "" or str =="." then
+ return "."
+ elseif find(str,"^%.%.") then
+ str = gsub(str,"\\","/")
+ return str
+ elseif not find(str,"%.") then
+ str = gsub(str,"\\","/")
+ return str
+ end
+ str = gsub(str,"\\","/")
+ local starter, rest = match(str,"^(%a+:/*)(.-)$")
+ if starter then
+ str = rest
+ end
+ local oldelements = checkedsplit(str,"/")
+ local newelements = { }
+ local i = #oldelements
+ while i > 0 do
+ local element = oldelements[i]
+ if element == '.' then
+ -- do nothing
+ elseif element == '..' then
+ local n = i -1
+ while n > 0 do
+ local element = oldelements[n]
+ if element ~= '..' and element ~= '.' then
+ oldelements[n] = '.'
+ break
+ else
+ n = n - 1
+ end
+ end
+ if n < 1 then
+ insert(newelements,1,'..')
+ end
+ elseif element ~= "" then
+ insert(newelements,1,element)
+ end
+ i = i - 1
+ end
+ if #newelements == 0 then
+ return starter or "."
+ elseif starter then
+ return starter .. concat(newelements, '/')
+ elseif find(str,"^/") then
+ return "/" .. concat(newelements,'/')
+ else
+ return concat(newelements, '/')
+ end
+end
+function file.xcollapse_path(str)
+ print('collapse', str)
if str == "" or str =="." then
return "."
elseif find(str,"^%.%.") then
@@ -11896,6 +11951,7 @@ own.list = { '.' }
if own.path ~= '.' then
table.insert(own.list,own.path)
end
+table.insert(own.list,own.path.."/../../texmf-dist/tex/context/base")
table.insert(own.list,own.path.."/../../../tex/context/base")
table.insert(own.list,own.path.."/mtx")
table.insert(own.list,own.path.."/../sources")