summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/mkiv/util-env.lua
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/util-env.lua')
-rw-r--r--Master/texmf-dist/tex/context/base/mkiv/util-env.lua45
1 files changed, 17 insertions, 28 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/util-env.lua b/Master/texmf-dist/tex/context/base/mkiv/util-env.lua
index dde76587486..064bd513ad5 100644
--- a/Master/texmf-dist/tex/context/base/mkiv/util-env.lua
+++ b/Master/texmf-dist/tex/context/base/mkiv/util-env.lua
@@ -72,16 +72,20 @@ end
-- dirty tricks (we will replace the texlua call by luatex --luaonly)
local validengines = allocate {
- ["luatex"] = true,
- ["luajittex"] = true,
+ ["luatex"] = true,
+ ["luajittex"] = true,
+ -- ["luatex.exe"] = true,
+ -- ["luajittex.exe"] = true,
}
local basicengines = allocate {
- ["luatex"] = "luatex",
- ["texlua"] = "luatex", -- obsolete
- ["texluac"] = "luatex", -- obsolete
- ["luajittex"] = "luajittex",
- ["texluajit"] = "luajittex", -- obsolete
+ ["luatex"] = "luatex",
+ ["texlua"] = "luatex",
+ ["texluac"] = "luatex",
+ ["luajittex"] = "luajittex",
+ ["texluajit"] = "luajittex",
+ -- ["texlua.exe"] = "luatex",
+ -- ["texluajit.exe"] = "luajittex",
}
local luaengines = allocate {
@@ -150,11 +154,8 @@ environment.sortedflags = nil
-- context specific arguments (in order not to confuse the engine)
function environment.initializearguments(arg)
- local arguments = { }
- local files = { }
- environment.arguments = arguments
- environment.files = files
- environment.sortedflags = nil
+ local arguments, files = { }, { }
+ environment.arguments, environment.files, environment.sortedflags = arguments, files, nil
for index=1,#arg do
local argument = arg[index]
if index > 0 then
@@ -173,11 +174,6 @@ function environment.initializearguments(arg)
end
end
end
- if not environment.ownname then
- if os.selfpath and os.selfname then
- environment.ownname = file.addsuffix(file.join(os.selfpath,os.selfname),"lua")
- end
- end
environment.ownname = file.reslash(environment.ownname or arg[0] or 'unknown.lua')
end
@@ -285,20 +281,13 @@ if arg then
for index=1,#arg do
local argument = arg[index]
if find(argument,"^\"") then
- if find(argument,"\"$") then
- newarg[#newarg+1] = gsub(argument,"^\"(.-)\"$","%1")
- instring = false
- else
- newarg[#newarg+1] = gsub(argument,"^\"","")
+ newarg[#newarg+1] = gsub(argument,"^\"","")
+ if not find(argument,"\"$") then
instring = true
end
elseif find(argument,"\"$") then
- if instring then
- newarg[#newarg] = newarg[#newarg] .. " " .. gsub(argument,"\"$","")
- instring = false
- else
- newarg[#newarg+1] = argument
- end
+ newarg[#newarg] = newarg[#newarg] .. " " .. gsub(argument,"\"$","")
+ instring = false
elseif instring then
newarg[#newarg] = newarg[#newarg] .. " " .. argument
else