14 files changed, 65 insertions, 17 deletions
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 7948922f7..9d0edf689 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -11004,16 +11004,27 @@ local function f_second(a,b)
     return concat(t,",")
 end
 
+-- local function f_both(a,b)
+--     local t, n = { }, 0
+--     for sb in gmatch(b,"[^,]+") do              -- and not sa
+--         for sa in gmatch(a,"[^,]+") do          --         sb
+--             n = n + 1 ; t[n] = sa .. sb
+--         end
+--     end
+--     return concat(t,",")
+-- end
+
 local function f_both(a,b)
     local t, n = { }, 0
-    for sb in gmatch(b,"[^,]+") do              -- and not sa
-        for sa in gmatch(a,"[^,]+") do          --         sb
+    for sa in gmatch(a,"[^,]+") do
+        for sb in gmatch(b,"[^,]+") do
             n = n + 1 ; t[n] = sa .. sb
         end
     end
     return concat(t,",")
 end
 
+
 local left  = P("{")
 local right = P("}")
 local var   = P((1 - S("{}" ))^0)
@@ -12325,7 +12336,8 @@ if environment.default_texmfcnf then
     -- unfortunately we now have quite some overkill in the spec (not so nice on a network)
     local luacnfspec = environment.default_texmfcnf
     -- we also want to use this in the minimals / standalone
-    luacnfspec = gsub(luacnfspec,"%-local","-local,-context")
+    -- bu tit's too tricky as it can be an expanded spec
+    -- luacnfspec = gsub(luacnfspec,"%-local","-local,-context")
     -- and we also need to support the home dir (for taco)
     resolvers.luacnfspec = 'home:texmf/web2c;' .. luacnfspec
 elseif this_is_texlive then
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 7948922f7..9d0edf689 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -11004,16 +11004,27 @@ local function f_second(a,b)
     return concat(t,",")
 end
 
+-- local function f_both(a,b)
+--     local t, n = { }, 0
+--     for sb in gmatch(b,"[^,]+") do              -- and not sa
+--         for sa in gmatch(a,"[^,]+") do          --         sb
+--             n = n + 1 ; t[n] = sa .. sb
+--         end
+--     end
+--     return concat(t,",")
+-- end
+
 local function f_both(a,b)
     local t, n = { }, 0
-    for sb in gmatch(b,"[^,]+") do              -- and not sa
-        for sa in gmatch(a,"[^,]+") do          --         sb
+    for sa in gmatch(a,"[^,]+") do
+        for sb in gmatch(b,"[^,]+") do
             n = n + 1 ; t[n] = sa .. sb
         end
     end
     return concat(t,",")
 end
 
+
 local left  = P("{")
 local right = P("}")
 local var   = P((1 - S("{}" ))^0)
@@ -12325,7 +12336,8 @@ if environment.default_texmfcnf then
     -- unfortunately we now have quite some overkill in the spec (not so nice on a network)
     local luacnfspec = environment.default_texmfcnf
     -- we also want to use this in the minimals / standalone
-    luacnfspec = gsub(luacnfspec,"%-local","-local,-context")
+    -- bu tit's too tricky as it can be an expanded spec
+    -- luacnfspec = gsub(luacnfspec,"%-local","-local,-context")
     -- and we also need to support the home dir (for taco)
     resolvers.luacnfspec = 'home:texmf/web2c;' .. luacnfspec
 elseif this_is_texlive then
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 7948922f7..9d0edf689 100755
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -11004,16 +11004,27 @@ local function f_second(a,b)
     return concat(t,",")
 end
 
+-- local function f_both(a,b)
+--     local t, n = { }, 0
+--     for sb in gmatch(b,"[^,]+") do              -- and not sa
+--         for sa in gmatch(a,"[^,]+") do          --         sb
+--             n = n + 1 ; t[n] = sa .. sb
+--         end
+--     end
+--     return concat(t,",")
+-- end
+
 local function f_both(a,b)
     local t, n = { }, 0
-    for sb in gmatch(b,"[^,]+") do              -- and not sa
-        for sa in gmatch(a,"[^,]+") do          --         sb
+    for sa in gmatch(a,"[^,]+") do
+        for sb in gmatch(b,"[^,]+") do
             n = n + 1 ; t[n] = sa .. sb
         end
     end
     return concat(t,",")
 end
 
+
 local left  = P("{")
 local right = P("}")
 local var   = P((1 - S("{}" ))^0)
@@ -12325,7 +12336,8 @@ if environment.default_texmfcnf then
     -- unfortunately we now have quite some overkill in the spec (not so nice on a network)
     local luacnfspec = environment.default_texmfcnf
     -- we also want to use this in the minimals / standalone
-    luacnfspec = gsub(luacnfspec,"%-local","-local,-context")
+    -- bu tit's too tricky as it can be an expanded spec
+    -- luacnfspec = gsub(luacnfspec,"%-local","-local,-context")
     -- and we also need to support the home dir (for taco)
     resolvers.luacnfspec = 'home:texmf/web2c;' .. luacnfspec
 elseif this_is_texlive then
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 7d2e5cf74..6fec69ba0 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2012.05.23 20:34}
+\newcontextversion{2012.05.23 23:31}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index a614453e3..a1b22eb78 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2012.05.23 20:34}
+\newcontextversion{2012.05.23 23:31}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 0b8c1f20a..e9e731e57 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index dab111299..11ae2e330 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index b68df60ea..e38253f18 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2012.05.23 20:34}
+\edef\contextversion{2012.05.23 23:31}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 22d558acf..28d250791 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -23,7 +23,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2012.05.23 20:34}
+\edef\contextversion{2012.05.23 23:31}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/data-exp.lua b/tex/context/base/data-exp.lua
index ee8f1da94..1e323728c 100644
--- a/tex/context/base/data-exp.lua
+++ b/tex/context/base/data-exp.lua
@@ -42,16 +42,27 @@ local function f_second(a,b)
     return concat(t,",")
 end
 
+-- local function f_both(a,b)
+--     local t, n = { }, 0
+--     for sb in gmatch(b,"[^,]+") do              -- and not sa
+--         for sa in gmatch(a,"[^,]+") do          --         sb
+--             n = n + 1 ; t[n] = sa .. sb
+--         end
+--     end
+--     return concat(t,",")
+-- end
+
 local function f_both(a,b)
     local t, n = { }, 0
-    for sb in gmatch(b,"[^,]+") do              -- and not sa
-        for sa in gmatch(a,"[^,]+") do          --         sb
+    for sa in gmatch(a,"[^,]+") do
+        for sb in gmatch(b,"[^,]+") do
             n = n + 1 ; t[n] = sa .. sb
         end
     end
     return concat(t,",")
 end
 
+
 local left  = P("{")
 local right = P("}")
 local var   = P((1 - S("{}" ))^0)
diff --git a/tex/context/base/data-res.lua b/tex/context/base/data-res.lua
index e35773ae6..335c44dc1 100644
--- a/tex/context/base/data-res.lua
+++ b/tex/context/base/data-res.lua
@@ -93,7 +93,8 @@ if environment.default_texmfcnf then
     -- unfortunately we now have quite some overkill in the spec (not so nice on a network)
     local luacnfspec = environment.default_texmfcnf
     -- we also want to use this in the minimals / standalone
-    luacnfspec = gsub(luacnfspec,"%-local","-local,-context")
+    -- bu tit's too tricky as it can be an expanded spec
+    -- luacnfspec = gsub(luacnfspec,"%-local","-local,-context")
     -- and we also need to support the home dir (for taco)
     resolvers.luacnfspec = 'home:texmf/web2c;' .. luacnfspec
 elseif this_is_texlive then
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 463b7f4b0..2fbed7a15 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index fcfc4631e..3eee265ed 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 75b7cd709..b47e3299f 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 : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 05/23/12 20:34:15
+-- merge date  : 05/23/12 23:31:34
 
 do -- begin closure to overcome local limits and interference