12 files changed, 19 insertions, 17 deletions
diff --git a/tex/context/base/chem-ini.mkiv b/tex/context/base/chem-ini.mkiv
index c0a1d021e..357bceefa 100644
--- a/tex/context/base/chem-ini.mkiv
+++ b/tex/context/base/chem-ini.mkiv
@@ -22,7 +22,8 @@
 %D Quick and dirty:
 %D
 %D \starttyping
-%D \def\molecule#1{$\enablesupersub\tf#1$}
+%D \unexpanded\def\molecule#1%
+%D   {$\enablesupersub\tf#1$}
 %D \stoptyping
 %D
 %D Using \LUA:
@@ -35,11 +36,12 @@
 %D
 %D \typebuffer \getbuffer
 
-\def\molecule#1{\ctxcommand{molecule(\!!bs#1\!!es)}}
+\unexpanded\def\molecule#1%
+  {\ctxcommand{molecule(\!!bs#1\!!es)}}
 
 %D For old times sake:
 
-\def\chem#1#2#3%
+\unexpanded\def\chem#1#2#3%
   {\dontleavehmode\begingroup#1\lohi{#2}{#3}\endgroup}
 
 \protect \endinput
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 9a565cc10..1f32e6ecd 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.24 00:46}
+\newcontextversion{2012.05.24 09:57}
 
 %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 0d6a027e1..62989cb45 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.24 00:46}
+\newcontextversion{2012.05.24 09:57}
 
 %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 7a40e3077..839a1957b 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 ad37d99ec..4a4d2765d 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 d265dfe78..8ba29f083 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.24 00:46}
+\edef\contextversion{2012.05.24 09:57}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 94d03f969..72e5adfd4 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.24 00:46}
+\edef\contextversion{2012.05.24 09:57}
 
 %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 1e323728c..19d4a9ec8 100644
--- a/tex/context/base/data-exp.lua
+++ b/tex/context/base/data-exp.lua
@@ -42,27 +42,30 @@ local function f_second(a,b)
     return concat(t,",")
 end
 
+-- old  {a,b}{c,d} => ac ad bc bd
+--
 -- 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
+--
+-- new  {a,b}{c,d} => ac bc ad bd
 
 local function f_both(a,b)
     local t, n = { }, 0
-    for sa in gmatch(a,"[^,]+") do
-        for sb in gmatch(b,"[^,]+") do
+    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 left  = P("{")
 local right = P("}")
 local var   = P((1 - S("{}" ))^0)
@@ -77,9 +80,6 @@ local l_rest   = Cs( ( left * var * (left/"") * var * (right/"") * var * right
 local stripper_1 = lpeg.stripper ("{}@")
 local replacer_1 = lpeg.replacer { { ",}", ",@}" }, { "{,", "{@," }, }
 
--- old  {a,b}{c,d} => ac ad bc bd
--- new  {a,b}{c,d} => ac bc ad bd
-
 local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpegging it (nice exercise).
     if trace_expansions then
         report_expansions("expanding variable '%s'",str)
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 10305e91e..9559a4446 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 bf9144e66..a97ac7f24 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/status-mkiv.lua b/tex/context/base/status-mkiv.lua
index 5c54b079f..a94080378 100644
--- a/tex/context/base/status-mkiv.lua
+++ b/tex/context/base/status-mkiv.lua
@@ -1318,7 +1318,7 @@ return {
         {
             filename = "chem-ini",
             marktype = "mkiv",
-            status   = "unknown",
+            status   = "okay",
         },
         {
             filename = "chem-str",
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 8f6258312..339d2dbbd 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/24/12 00:46:24
+-- merge date  : 05/24/12 09:57:57
 
 do -- begin closure to overcome local limits and interference