diff options
| author | Context Git Mirror Bot <phg42.2a@gmail.com> | 2016-09-06 20:17:21 +0200 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2016-09-06 20:17:21 +0200 |
| commit | e2902f3463b940beaefaf51ada0b9c37966491b6 (patch) | |
| tree | 2058000b56c2091d6d45d0414f54f3e82192e28b /tex/generic | |
| parent | 9db0d829e3ee2c3ab607c3c624adf189b2da15f4 (diff) | |
| download | context-e2902f3463b940beaefaf51ada0b9c37966491b6.tar.gz | |
2016-09-06 19:15:00
Diffstat (limited to 'tex/generic')
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-swiglib.lua | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index d86c84892..7b3349e73 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 09/06/16 00:28:22 +-- merge date : 09/06/16 19:11:21 do -- begin closure to overcome local limits and interference diff --git a/tex/generic/context/luatex/luatex-swiglib.lua b/tex/generic/context/luatex/luatex-swiglib.lua index 7ffcdc375..3108dd43f 100644 --- a/tex/generic/context/luatex/luatex-swiglib.lua +++ b/tex/generic/context/luatex/luatex-swiglib.lua @@ -8,7 +8,8 @@ if not modules then modules = { } end modules ['luatex-swiglib'] = { local savedrequire = require -local libsuffix = os.type == "windows" and ".dll" or ".so" +local libsuffix = os.type == "windows" and ".dll" or ".so" +local pathsplit = "([^" .. io.pathseparator .. "]+)" function requireswiglib(required,version) local library = package.loaded[required] @@ -17,7 +18,7 @@ function requireswiglib(required,version) else local name = string.gsub(required,"%.","/") .. libsuffix local list = kpse.show_path("clua") - for root in string.gmatch(list,"([^;]+)") do + for root in string.gmatch(list,pathsplit) do local full = false if type(version) == "string" and version ~= "" then full = root .. "/" .. version .. "/" .. name |