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/l-lua.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/l-lua.lua')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/l-lua.lua | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/l-lua.lua b/Master/texmf-dist/tex/context/base/mkiv/l-lua.lua index d8989364ed5..426706f06d6 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/l-lua.lua +++ b/Master/texmf-dist/tex/context/base/mkiv/l-lua.lua @@ -35,6 +35,8 @@ if LUAVERSION < 5.2 and jit then LUAVERSION = 5.2 end +_LUAVERSION = LUAVERSION -- for old times sake, will go away + -- lpeg if not lpeg then @@ -228,27 +230,23 @@ elseif not ffi.number then ffi.number = tonumber end --- if not bit32 then -- and utf8 then --- -- bit32 = load ( [[ -- replacement code with 5.3 syntax so that 5.2 doesn't bark on it ]] ) --- bit32 = require("l-bit32") --- end +if not bit32 then -- and utf8 then + -- bit32 = load ( [[ -- replacement code with 5.3 syntax so that 5.2 doesn't bark on it ]] ) + bit32 = require("l-bit32") +end -- We need this due a bug in luatex socket loading: --- local loaded = package.loaded --- --- if not loaded["socket"] then loaded["socket"] = loaded["socket.core"] end --- if not loaded["mime"] then loaded["mime"] = loaded["mime.core"] end --- --- if not socket.mime then socket.mime = package.loaded["mime"] end --- --- if not loaded["socket.mime"] then loaded["socket.mime"] = socket.mime end --- if not loaded["socket.http"] then loaded["socket.http"] = socket.http end --- if not loaded["socket.ftp"] then loaded["socket.ftp"] = socket.ftp end --- if not loaded["socket.smtp"] then loaded["socket.smtp"] = socket.smtp end --- if not loaded["socket.tp"] then loaded["socket.tp"] = socket.tp end --- if not loaded["socket.url"] then loaded["socket.url"] = socket.url end - -if LUAVERSION > 5.3 then - collectgarbage("generational") -end +local loaded = package.loaded + +if not loaded["socket"] then loaded["socket"] = loaded["socket.core"] end +if not loaded["mime"] then loaded["mime"] = loaded["mime.core"] end + +if not socket.mime then socket.mime = package.loaded["mime"] end + +if not loaded["socket.mime"] then loaded["socket.mime"] = socket.mime end +if not loaded["socket.http"] then loaded["socket.http"] = socket.http end +if not loaded["socket.ftp"] then loaded["socket.ftp"] = socket.ftp end +if not loaded["socket.smtp"] then loaded["socket.smtp"] = socket.smtp end +if not loaded["socket.tp"] then loaded["socket.tp"] = socket.tp end +if not loaded["socket.url"] then loaded["socket.url"] = socket.url end |