summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorVladimir Volovich <vvv@vsu.ru>2011-06-13 07:49:08 +0000
committerVladimir Volovich <vvv@vsu.ru>2011-06-13 07:49:08 +0000
commitc7d81e5654ad8d409594401833f1976aed3c0ef7 (patch)
tree01dc6c58dd15c6a04a9e3373b599d2c21dd446c6 /Master
parenteeec1f978b2c0689acb7e1de6e23c97ae2490352 (diff)
mtxrun in i386-cygwin, i386-kfreebsd, powerpc-linux, sparc-linux was out of sync with other architectures
git-svn-id: svn://tug.org/texlive/trunk@22950 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/bin/i386-cygwin/mtxrun5
-rwxr-xr-xMaster/bin/i386-kfreebsd/mtxrun5
-rwxr-xr-xMaster/bin/powerpc-linux/mtxrun2
-rwxr-xr-xMaster/bin/sparc-linux/mtxrun5
4 files changed, 13 insertions, 4 deletions
diff --git a/Master/bin/i386-cygwin/mtxrun b/Master/bin/i386-cygwin/mtxrun
index d92f3409257..f90dbfbd7d1 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-kfreebsd/mtxrun b/Master/bin/i386-kfreebsd/mtxrun
index d92f3409257..f90dbfbd7d1 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/powerpc-linux/mtxrun b/Master/bin/powerpc-linux/mtxrun
index 948545bc391..f90dbfbd7d1 100755
--- a/Master/bin/powerpc-linux/mtxrun
+++ b/Master/bin/powerpc-linux/mtxrun
@@ -12618,7 +12618,7 @@ end
local function resolve(str) -- use schemes, this one is then for the commandline only
local res = resolved[str]
if not res then
- res = gsub(str,"([a-z][a-z]+):([^ \"\']*)",_resolve_)
+ res = gsub(str,"([a-z][a-z]+):([^ \"\';]*)",_resolve_)
resolved[str] = res
abstract[res] = str
end
diff --git a/Master/bin/sparc-linux/mtxrun b/Master/bin/sparc-linux/mtxrun
index d92f3409257..f90dbfbd7d1 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)