summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2011-06-08 14:18:13 +0000
committerTaco Hoekwater <taco@elvenkind.com>2011-06-08 14:18:13 +0000
commit9c65967bf03dda21ef97fac326ed05ef0456c270 (patch)
treed2e71729a5e2628df9797a7c9e5019b0270ccacc /Master
parent8d97d9a07fc23be6ad290612432d458c2cb9d461 (diff)
fix recursion for context mkiv runtime paths
git-svn-id: svn://tug.org/texlive/trunk@22867 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/bin/alpha-linux/mtxrun5
-rwxr-xr-xMaster/bin/amd64-freebsd/mtxrun5
-rwxr-xr-xMaster/bin/amd64-kfreebsd/mtxrun5
-rwxr-xr-xMaster/bin/i386-cygwin/mtxrun5
-rwxr-xr-xMaster/bin/i386-freebsd/mtxrun5
-rwxr-xr-xMaster/bin/i386-kfreebsd/mtxrun5
-rwxr-xr-xMaster/bin/i386-linux/mtxrun5
-rwxr-xr-xMaster/bin/i386-netbsd/mtxrun5
-rwxr-xr-xMaster/bin/i386-solaris/mtxrun5
-rwxr-xr-xMaster/bin/mips-irix/mtxrun5
-rwxr-xr-xMaster/bin/powerpc-aix/mtxrun5
-rwxr-xr-xMaster/bin/powerpc-linux/mtxrun5
-rwxr-xr-xMaster/bin/sparc-linux/mtxrun5
-rwxr-xr-xMaster/bin/sparc-solaris/mtxrun5
-rwxr-xr-xMaster/bin/universal-darwin/mtxrun5
-rwxr-xr-xMaster/bin/win32/mtxrun.lua5
-rwxr-xr-xMaster/bin/x86_64-darwin/mtxrun5
-rwxr-xr-xMaster/bin/x86_64-linux/mtxrun5
-rwxr-xr-xMaster/bin/x86_64-solaris/mtxrun5
-rwxr-xr-xMaster/texmf-dist/scripts/context/lua/mtxrun.lua5
-rwxr-xr-xMaster/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua5
-rwxr-xr-xMaster/texmf-dist/scripts/context/stubs/unix/mtxrun5
-rw-r--r--Master/texmf-dist/tex/context/base/data-exp.lua3
23 files changed, 91 insertions, 22 deletions
diff --git a/Master/bin/alpha-linux/mtxrun b/Master/bin/alpha-linux/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/alpha-linux/mtxrun
+++ b/Master/bin/alpha-linux/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/amd64-freebsd/mtxrun b/Master/bin/amd64-freebsd/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/amd64-freebsd/mtxrun
+++ b/Master/bin/amd64-freebsd/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/amd64-kfreebsd/mtxrun b/Master/bin/amd64-kfreebsd/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/amd64-kfreebsd/mtxrun
+++ b/Master/bin/amd64-kfreebsd/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/i386-cygwin/mtxrun b/Master/bin/i386-cygwin/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/i386-cygwin/mtxrun
+++ b/Master/bin/i386-cygwin/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/i386-freebsd/mtxrun b/Master/bin/i386-freebsd/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/i386-freebsd/mtxrun
+++ b/Master/bin/i386-freebsd/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/i386-kfreebsd/mtxrun b/Master/bin/i386-kfreebsd/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/i386-kfreebsd/mtxrun
+++ b/Master/bin/i386-kfreebsd/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/i386-linux/mtxrun b/Master/bin/i386-linux/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/i386-linux/mtxrun
+++ b/Master/bin/i386-linux/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/i386-netbsd/mtxrun b/Master/bin/i386-netbsd/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/i386-netbsd/mtxrun
+++ b/Master/bin/i386-netbsd/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/i386-solaris/mtxrun b/Master/bin/i386-solaris/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/i386-solaris/mtxrun
+++ b/Master/bin/i386-solaris/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/mips-irix/mtxrun b/Master/bin/mips-irix/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/mips-irix/mtxrun
+++ b/Master/bin/mips-irix/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/powerpc-aix/mtxrun b/Master/bin/powerpc-aix/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/powerpc-aix/mtxrun
+++ b/Master/bin/powerpc-aix/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/powerpc-linux/mtxrun b/Master/bin/powerpc-linux/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/powerpc-linux/mtxrun
+++ b/Master/bin/powerpc-linux/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/sparc-linux/mtxrun b/Master/bin/sparc-linux/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/sparc-linux/mtxrun
+++ b/Master/bin/sparc-linux/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/sparc-solaris/mtxrun b/Master/bin/sparc-solaris/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/sparc-solaris/mtxrun
+++ b/Master/bin/sparc-solaris/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/universal-darwin/mtxrun b/Master/bin/universal-darwin/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/universal-darwin/mtxrun
+++ b/Master/bin/universal-darwin/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/win32/mtxrun.lua b/Master/bin/win32/mtxrun.lua
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/win32/mtxrun.lua
+++ b/Master/bin/win32/mtxrun.lua
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/x86_64-darwin/mtxrun b/Master/bin/x86_64-darwin/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/x86_64-darwin/mtxrun
+++ b/Master/bin/x86_64-darwin/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/x86_64-linux/mtxrun b/Master/bin/x86_64-linux/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/x86_64-linux/mtxrun
+++ b/Master/bin/x86_64-linux/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/bin/x86_64-solaris/mtxrun b/Master/bin/x86_64-solaris/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/bin/x86_64-solaris/mtxrun
+++ b/Master/bin/x86_64-solaris/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/texmf-dist/scripts/context/lua/mtxrun.lua b/Master/texmf-dist/scripts/context/lua/mtxrun.lua
index f0b07dddd4b..948545bc391 100755
--- a/Master/texmf-dist/scripts/context/lua/mtxrun.lua
+++ b/Master/texmf-dist/scripts/context/lua/mtxrun.lua
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua b/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua
index f0b07dddd4b..948545bc391 100755
--- a/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua
+++ b/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/texmf-dist/scripts/context/stubs/unix/mtxrun b/Master/texmf-dist/scripts/context/stubs/unix/mtxrun
index f0b07dddd4b..948545bc391 100755
--- a/Master/texmf-dist/scripts/context/stubs/unix/mtxrun
+++ b/Master/texmf-dist/scripts/context/stubs/unix/mtxrun
@@ -10043,9 +10043,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else
@@ -15156,7 +15159,7 @@ elseif environment.argument("find-file") then
resolvers.load()
local e_pattern = environment.argument("pattern")
- local e_format = environment.arguments("format")
+ local e_format = environment.argument("format")
if not e_pattern then
runners.register_arguments(filename)
environment.initializearguments(environment.arguments_after)
diff --git a/Master/texmf-dist/tex/context/base/data-exp.lua b/Master/texmf-dist/tex/context/base/data-exp.lua
index e8138968252..a0a85d07f58 100644
--- a/Master/texmf-dist/tex/context/base/data-exp.lua
+++ b/Master/texmf-dist/tex/context/base/data-exp.lua
@@ -95,9 +95,12 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
str = lpegmatch(stripper_1,str)
if validate then
for s in gmatch(str,"[^,]+") do
+ local restoreslashes = false
+ if gmatch(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
+ if restoreslashes and not find(s, "//$") then t[n] = t[n] .. '//' end
end
end
else