beta 2012.06.28 10:00

10 files changed, 15 insertions, 12 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 8dc73db6a..89c34ce86 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.06.28 09:36}
+\newcontextversion{2012.06.28 10:00}
 
 %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 ff78716df..c607f8f77 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.06.28 09:36}
+\newcontextversion{2012.06.28 10:00}
 
 %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 f1674d3fc..591eeabaf 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 db9447b42..07bec5836 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 b464ed9ee..97cfe223e 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.06.28 09:36}
+\edef\contextversion{2012.06.28 10:00}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 12db41e1f..61e86bba4 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.06.28 09:36}
+\edef\contextversion{2012.06.28 10:00}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index fbd2969f1..260e49054 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 0c86f24d3..bd5feeee5 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/syst-aux.mkiv b/tex/context/base/syst-aux.mkiv
index 9c8301f70..092b5b227 100644
--- a/tex/context/base/syst-aux.mkiv
+++ b/tex/context/base/syst-aux.mkiv
@@ -1824,7 +1824,7 @@
 \def\syst_helpers_check_parameters#1=#2#3\_e_o_s_
   {\if#2@\parametersfalse\else\parameterstrue\fi}
 
-\def\checkparameters[#1]%
+\unexpanded\def\checkparameters[#1]%
   {\syst_helpers_get_empty_parameters#1=@@\_e_o_s_}
 
 %D \macros
@@ -1861,15 +1861,18 @@
 \def\syst_helpers_get_comma_list_size#1%
   {\advance\commalistcounter\plusone}
 
-\def\getcommalistsize#1]% don't loose [{#1}]
+\unexpanded\def\getcommalistsize#1]% don't loose [{#1}]
   {\commalistcounter\zerocount
-   \processcommalist#1]\syst_helpers_get_empty_parameters   % was [{#1}]
+   \processcommalist#1]\syst_helpers_get_comma_list_size   % was [{#1}]
    \edef\commalistsize{\the\commalistcounter}}
 
-\def\getcommacommandsize[#1]%
-  {\edef\commacommand{#1}%
-   \scratchtoks\expandafter{\expandafter[\commacommand]}%
-   \expandafter\getcommalistsize\the\scratchtoks }
+% \def\getcommacommandsize[#1]%
+%   {\edef\commacommand{#1}%
+%    \scratchtoks\expandafter{\expandafter[\commacommand]}%
+%    \expandafter\getcommalistsize\the\scratchtoks }
+
+\unexpanded\def\getcommacommandsize[#1]%
+  {\normalexpanded{\getcommalistsize[#1]}}
 
 \def\syst_helpers_get_from_comma_list#1%
   {\advance\commalistcounter \minusone
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 760c26c06..0037577c6 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  : 06/28/12 09:36:55
+-- merge date  : 06/28/12 10:00:12
 
 do -- begin closure to overcome local limits and interference