2016-09-06 19:15:00

12 files changed, 16 insertions, 15 deletions

diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index e992b43cb..a2b7ea89c 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 36549b442..c7f04f470 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2016.09.06 00:28}
+\newcontextversion{2016.09.06 19:11}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 20c1ef0f0..a33b9270b 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -39,7 +39,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2016.09.06 00:28}
+\edef\contextversion{2016.09.06 19:11}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/math-noa.lua b/tex/context/base/mkiv/math-noa.lua
index 2fee1ecc0..f27f3e00a 100644
--- a/tex/context/base/mkiv/math-noa.lua
+++ b/tex/context/base/mkiv/math-noa.lua
@@ -1002,8 +1002,8 @@ statistics.register("unknown math characters", function()
     return collected(unknowns)
 end)
 
--- math alternates: (in xits       lgf: $ABC$ $\cal ABC$ $\mathalternate{cal}\cal ABC$)
--- math alternates: (in lucidanova lgf: $ABC \mathalternate{italic} ABC$)
+-- math alternates: (in xits     lgf: $ABC$ $\cal ABC$ $\mathalternate{cal}\cal ABC$)
+-- math alternates: (in lucidaot lgf: $ABC \mathalternate{italic} ABC$)
 
 -- todo: set alternate for specific symbols
 -- todo: no need to do this when already loaded
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index ed02cb42b..dad6fd02e 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 9a312c723..a941430ad 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index b286e539b..a3c49bcee 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index 9b256b9a6..d31517d39 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
diff --git a/tex/context/modules/mkiv/s-math-characters.mkiv b/tex/context/modules/mkiv/s-math-characters.mkiv
index a35429538..e5e0d084f 100644
--- a/tex/context/modules/mkiv/s-math-characters.mkiv
+++ b/tex/context/modules/mkiv/s-math-characters.mkiv
@@ -177,7 +177,7 @@
       % \setupbodyfont[stix,      12pt]
       % \setupbodyfont[xits,      12pt]
       % \setupbodyfont[lucida,    12pt]
-      % \setupbodyfont[lucidanova,12pt]
+      % \setupbodyfont[lucidaot,  12pt]
       % \setupbodyfont[pagella,   12pt]
       % \setupbodyfont[bonum,     12pt]
 
diff --git a/tex/context/modules/mkiv/s-math-repertoire.mkiv b/tex/context/modules/mkiv/s-math-repertoire.mkiv
index 5faf54b99..91af45dfc 100644
--- a/tex/context/modules/mkiv/s-math-repertoire.mkiv
+++ b/tex/context/modules/mkiv/s-math-repertoire.mkiv
@@ -13,13 +13,13 @@
 
 \usemodule[s][math-characters]
 
-% context --jit --global --bodyfont=lucidanova --result=math-repertoire-lucidanova s-math-repertoire.mkiv
-% context --jit --global --bodyfont=cambria    --result=math-repertoire-cambria    s-math-repertoire.mkiv
-% context --jit --global --bodyfont=xits       --result=math-repertoire-xits       s-math-repertoire.mkiv
-% context --jit --global --bodyfont=modern     --result=math-repertoire-modern     s-math-repertoire.mkiv
-% context --jit --global --bodyfont=pagella    --result=math-repertoire-pagella    s-math-repertoire.mkiv
-% context --jit --global --bodyfont=termes     --result=math-repertoire-termes     s-math-repertoire.mkiv
-% context --jit --global --bodyfont=bonum      --result=math-repertoire-bonum      s-math-repertoire.mkiv
+% context --jit --global --bodyfont=lucidaot --result=math-repertoire-lucidaot s-math-repertoire.mkiv
+% context --jit --global --bodyfont=cambria  --result=math-repertoire-cambria  s-math-repertoire.mkiv
+% context --jit --global --bodyfont=xits     --result=math-repertoire-xits     s-math-repertoire.mkiv
+% context --jit --global --bodyfont=modern   --result=math-repertoire-modern   s-math-repertoire.mkiv
+% context --jit --global --bodyfont=pagella  --result=math-repertoire-pagella  s-math-repertoire.mkiv
+% context --jit --global --bodyfont=termes   --result=math-repertoire-termes   s-math-repertoire.mkiv
+% context --jit --global --bodyfont=bonum    --result=math-repertoire-bonum    s-math-repertoire.mkiv
 
 \startmodule[math-repertoire]
 
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