diff options
author | Norbert Preining <preining@logic.at> | 2019-02-24 15:12:57 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2019-02-24 15:12:57 +0000 |
commit | 1314fbe93790c501dc436a5cf99f106b9e5c0f63 (patch) | |
tree | 04dc7734c8be8ffe385d41f4388826ef5857b6f9 /Master/texmf-dist/tex/context/base/mkiv/util-env.lua | |
parent | eb80ce7b34f59896a1dfee5ca422495394d6677f (diff) |
Revert "ConTeXt version 2019.02.22 19:35"
This reverts commit 5c6357cdb820b4f628d036ba7b2248f221d50c0b.
git-svn-id: svn://tug.org/texlive/trunk@50112 c570f23f-e606-0410-a88d-b1316a301751
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.lua | 45 |
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 |