12 files changed, 13 insertions, 13 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index e09e4caaa..de6e6c573 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{2015.03.28 16:30}
+\newcontextversion{2015.03.28 22:37}
 
 %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/context-version.pdf b/tex/context/base/context-version.pdf
index cd34b5514..b66529ce9 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index af1be861c..06723d6c2 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,7 +28,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2015.03.28 16:30}
+\edef\contextversion{2015.03.28 22:37}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/lang-hyp.mkiv b/tex/context/base/lang-hyp.mkiv
index aed6f6c2c..c5141ff6d 100644
--- a/tex/context/base/lang-hyp.mkiv
+++ b/tex/context/base/lang-hyp.mkiv
@@ -125,7 +125,7 @@
    \endgroup}
 
 \unexpanded\def\sethyphenationfeatures[#1]%
-  {\cclf_sethyphenationfeatures{#1}}
+  {\clf_sethyphenationfeatures{#1}}
 
 % todo: \start ... \stop too
 
diff --git a/tex/context/base/lxml-ini.mkiv b/tex/context/base/lxml-ini.mkiv
index 76d34032d..22654bc14 100644
--- a/tex/context/base/lxml-ini.mkiv
+++ b/tex/context/base/lxml-ini.mkiv
@@ -67,7 +67,7 @@
 \def\xmlincludeoptions#1#2#3#4{\clf_xmlincludeoptions   {#1}{#2}{#3}{#4}}
 \def\xmlinclusion           #1{\clf_xmlinclusion        {#1}}
 \def\xmlinclusions          #1{\clf_xmlinclusions       {#1}}
-\def\xmlindex           #1#2#3{\clf_xmlindex            {#1}{#2}#3 }
+\def\xmlindex           #1#2#3{\clf_xmlindex            {#1}{#2}\numexpr#3\relax}
 \def\xmlinlineverbatim      #1{\clf_xmlinlineverbatim   {#1}}
 \def\xmllast              #1#2{\clf_xmllast             {#1}{#2}}
 \def\xmlload              #1#2{\clf_xmlload             {#1}{#2}{\directxmlparameter\c!entities}{\directxmlparameter\c!compress}}
diff --git a/tex/context/base/math-frc.mkiv b/tex/context/base/math-frc.mkiv
index 36004b842..90778810e 100644
--- a/tex/context/base/math-frc.mkiv
+++ b/tex/context/base/math-frc.mkiv
@@ -221,7 +221,7 @@
 % we use utfchar anyway so we can as well do all at the lua end
 
 \def\math_frac_command
-  {\cclf_mathfraction
+  {\clf_mathfraction
      {\mathfractionparameter\c!rule}%
      \numexpr\mathfractionparameter\c!left\relax
      \numexpr\mathfractionparameter\c!right\relax
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index d01aedc28..278ee192c 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 1d06b44bb..2451479e7 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-enu.mkvi b/tex/context/base/strc-enu.mkvi
index ae122b658..2db542c6b 100644
--- a/tex/context/base/strc-enu.mkvi
+++ b/tex/context/base/strc-enu.mkvi
@@ -284,7 +284,7 @@
 
 \unexpanded\def\strc_enumerations_inject_extra_text
   {\ifconditional\c_strc_constructions_title_state
-     \ctxcommand{doiflisthastitleelse("\currentconstructionmain",\currentconstructionlistentry)}
+     \clf_doiflisthastitleelse{\currentconstructionmain}\numexpr\currentconstructionlistentry\relax
        \donothing
        \strc_enumerations_inject_extra_text_indeed
    \fi}
@@ -301,7 +301,7 @@
    \useconstructionstyleandcolor\c!titlestyle\c!titlecolor
    \constructionparameter\c!titlecommand
      {\constructionparameter\c!titleleft
-      \ctxcommand{savedlisttitle("\currentconstructionmain",\currentconstructionlistentry)}%
+      \clf_savedlisttitle{\currentconstructionmain}\currentconstructionlistentry\relax
       \constructionparameter\c!titleright}%
    \endgroup}
 
@@ -313,7 +313,7 @@
 \unexpanded\def\strc_enumerations_inject_number
   {\constructionparameter\c!left
    \constructionparameter\c!starter
-   \ctxcommand{savedlistprefixednumber("\currentconstructionmain",\currentconstructionlistentry)}%
+   \clf_savedlistprefixednumber{\currentconstructionmain}\currentconstructionlistentry\relax
    \constructionparameter\c!stopper
    \constructionparameter\c!right}
 
diff --git a/tex/context/base/strc-flt.mkvi b/tex/context/base/strc-flt.mkvi
index af3aa8183..41dc98109 100644
--- a/tex/context/base/strc-flt.mkvi
+++ b/tex/context/base/strc-flt.mkvi
@@ -254,7 +254,7 @@
        \namedtaggedlabeltexts
          \t!floatlabel \currentfloat
          \t!floatnumber\currentfloat
-         {\ctxcommand{savedlistprefixednumber("\currentfloat",\currentfloatnumber)}%
+         {\clf_savedlistprefixednumber{\currentfloat}\currentfloatnumber\relax
           \thecurrentfloatnumbersuffix}%
      \fi
    \fi \fi}
@@ -263,7 +263,7 @@
   {\ifnofloatcaption \else
      \ifx\currentfloatnumber\relax\else
        \dostarttagged\t!floattext\empty
-       \ctxcommand{savedlisttitle("\currentfloat",\currentfloatnumber)}%
+       \clf_savedlisttitle{\currentfloat}\currentfloatnumber\relax
        \dostoptagged
      \fi
    \fi}
@@ -820,7 +820,7 @@
 % uses:
 
 \def\strc_floats_group_index
-  {\numexpr\ctxcommand{listgroupindex("\currentfloat","\currentfloatgroup")}\relax}
+  {\numexpr\clf_listgroupindex{\currentfloat}{\currentfloatgroup}\relax}
 
 \def\strc_floats_place_packaged_boxes
   {\expandafter\strc_floats_place_packaged_boxes_indeed\expandafter{\m_strc_floats_saved_userdata}}
diff --git a/tex/context/base/strc-lst.lua b/tex/context/base/strc-lst.lua
index 73ee44487..7c4e423c4 100644
--- a/tex/context/base/strc-lst.lua
+++ b/tex/context/base/strc-lst.lua
@@ -1177,7 +1177,7 @@ implement {
 implement {
     name      = "savedlisttitle",
     actions   = savedlisttitle,
-    arguments = { "string", "integer", "string" }
+    arguments = { "string", "integer" }
 }
 
 implement {
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 8b045da09..b47d49e37 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  : 03/28/15 16:30:32
+-- merge date  : 03/28/15 22:37:53
 
 do -- begin closure to overcome local limits and interference