beta 2013.04.07 14:05

25 files changed, 80 insertions, 70 deletions

diff --git a/metapost/context/base/mp-chem.mpiv b/metapost/context/base/mp-chem.mpiv
index a8f7d9381..2addb0a73 100644
--- a/metapost/context/base/mp-chem.mpiv
+++ b/metapost/context/base/mp-chem.mpiv
@@ -33,7 +33,7 @@ numeric
 
 boolean
     chem_setting_axis,
-    chem_doing_pb, chem_text_trace, chem_bd_wedge, chem_tracing,
+    chem_doing_pb, chem_bd_wedge,
     chem_star[], chem_front[], chem_stacked[], chem_tetra[] ;
 
 string
@@ -60,6 +60,12 @@ transform
 
 color lightblue ; lightblue := (173/255,216/255,230/255) ;
 
+% debugging
+
+boolean chem_trace_nesting     ; chem_trace_nesting     := false ;
+boolean chem_trace_text        ; chem_trace_text        := false ;
+boolean chem_trace_boundingbox ; chem_trace_boundingbox := false ;
+
 chem_axis_color         := image(draw origin withcolor lightblue) ;
 chem_setting_axis       := false ;
 chem_axis_rulethickness := 1pt ;
@@ -78,9 +84,7 @@ chem_sb_pair.m          := (0.25,1   ) ; %chem_sb_dash.m := dashpattern(off 0.25
 chem_sb_pair.p          := (0   ,0.75) ; %chem_sb_dash.p := dashpattern(on  0.75 off 0.25) ;
 chem_sb_pair.b          := (0,   1   ) ; %chem_sb_dash.b := dashpattern(on  1) ;
 
-chem_text_trace         := false ; % debugging
 chem_bd_wedge           := false ; % true is incorrect, but quite common...
-chem_tracing            := false ;
 
 def chem_reset =
     chem_rotation         := 0 ;
@@ -379,23 +383,19 @@ vardef chem_stop_structure =
         endfor
         addto currentpicture also chem_pic ;
     fi ;
-
-    if chem_tracing :
+    if chem_trace_boundingbox :
         fill boundingbox currentpicture withcolor blue withtransparency(1,.25) ;
     fi ;
     setbounds currentpicture to
         ((chem_setting_l,chem_setting_b) -- (chem_setting_r,chem_setting_b) --
          (chem_setting_r,chem_setting_t) -- (chem_setting_l,chem_setting_t) -- cycle) ;
-    if chem_tracing :
+    if chem_trace_boundingbox :
         fill boundingbox currentpicture withcolor red withtransparency(1,.25) ;
     fi ;
-    chem_tracing := false ;
 enddef ;
 
 % \chemical
 
-boolean chem_trace_nesting ; chem_trace_nesting := false ;
-
 vardef chem_start_component = enddef ;
 vardef chem_stop_component  = enddef ;
 
@@ -1530,7 +1530,7 @@ vardef chem_text@#(expr txt, z) =
         fi
     chem_pic := (chem_pic rotated -chem_setting_rotation) shifted z ;
 
-    if chem_text_trace :
+    if chem_trace_text :
         draw z                    withpen pencircle scaled 2pt withcolor red ;
         draw boundingbox chem_pic withpen pencircle scaled 1pt withcolor red ;
     fi
diff --git a/tex/context/base/chem-str.lua b/tex/context/base/chem-str.lua
index c76583fed..311b70b2d 100644
--- a/tex/context/base/chem-str.lua
+++ b/tex/context/base/chem-str.lua
@@ -23,11 +23,12 @@ if not modules then modules = { } end modules ['chem-str'] = {
 
 -- directive_strictorder: one might set this to off when associated texts are disordered too
 
-local trace_structure       = false  trackers  .register("chemistry.structure",   function(v) trace_structure       = v end)
-local trace_metapost        = false  trackers  .register("chemistry.metapost",    function(v) trace_metapost        = v end)
-local trace_textstack       = false  trackers  .register("chemistry.textstack",   function(v) trace_textstack       = v end)
-local directive_strictorder = true   directives.register("chemistry.strictorder", function(v) directive_strictorder = v end)
-local directive_strictindex = false  directives.register("chemistry.strictindex", function(v) directive_strictindex = v end)
+local trace_structure       = false  trackers  .register("chemistry.structure",     function(v) trace_structure       = v end)
+local trace_metapost        = false  trackers  .register("chemistry.metapost",      function(v) trace_metapost        = v end)
+local trace_boundingbox     = false  trackers  .register("chemistry.boundingbox",   function(v) trace_boundingbox     = v end)
+local trace_textstack       = false  trackers  .register("chemistry.textstack",     function(v) trace_textstack       = v end)
+local directive_strictorder = true   directives.register("chemistry.strictorder",   function(v) directive_strictorder = v end)
+local directive_strictindex = false  directives.register("chemistry.strictindex",   function(v) directive_strictindex = v end)
 
 local report_chemistry = logs.reporter("chemistry")
 
@@ -313,19 +314,19 @@ local pattern   =
 -- print(lpegmatch(pattern,"RZ1..3=x"))    -- 1 RZ 1     3     false x
 -- print(lpegmatch(pattern,"RZ13=x"))      -- 1 RZ false false table x
 
-local f_initialize      = 'if unknown context_chem : input mp-chem.mpiv ; fi ;'
-local f_start_structure = formatters['chem_start_structure(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s);']
-local f_set_tracing     = formatters['chem_tracing := %l ;']
-local f_stop_structure  = 'chem_stop_structure;'
-local f_start_component = 'chem_start_component;'
-local f_stop_component  = 'chem_stop_component;'
-local f_line            = formatters['chem_%s%s(%s,%s,%s,%s,%s);']
-local f_set             = formatters['chem_set(%s);']
-local f_number          = formatters['chem_%s%s(%s,%s,"\\chemicaltext{%s}");']
-local f_text            = f_number
-local f_empty_normal    = formatters['chem_%s(%s,%s,"");']
-local f_empty_center    = formatters['chem_c%s(%s,%s,"");']
-local f_transform       = formatters['chem_%s(%s,%s,%s);']
+local f_initialize       = 'if unknown context_chem : input mp-chem.mpiv ; fi ;'
+local f_start_structure  = formatters['chem_start_structure(%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s);']
+local f_set_trace_bounds = formatters['chem_trace_boundingbox := %l ;']
+local f_stop_structure   = 'chem_stop_structure;'
+local f_start_component  = 'chem_start_component;'
+local f_stop_component   = 'chem_stop_component;'
+local f_line             = formatters['chem_%s%s(%s,%s,%s,%s,%s);']
+local f_set              = formatters['chem_set(%s);']
+local f_number           = formatters['chem_%s%s(%s,%s,"\\chemicaltext{%s}");']
+local f_text             = f_number
+local f_empty_normal     = formatters['chem_%s(%s,%s,"");']
+local f_empty_center     = formatters['chem_c%s(%s,%s,"");']
+local f_transform        = formatters['chem_%s(%s,%s,%s);']
 
 local prepareMPvariable = commands and commands.prepareMPvariable
 
@@ -722,7 +723,7 @@ function chemistry.start(settings)
         rotation, topoints(unit), factor, topoints(offset),
         tostring(settings.axis == v_on), topoints(rulethickness), tostring(axiscolor)
     )
-    metacode[#metacode+1] = f_set_tracing(trace_metapost) ;
+    metacode[#metacode+1] = f_set_trace_bounds(trace_boundingbox) ;
     --
     variant, keys, stack, pstack, sstack = "one", { }, { }, { }, { }
 end
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index bbc36ce3b..530058fc9 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{2013.04.07 01:04}
+\newcontextversion{2013.04.07 14:05}
 
 %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 7da8b1af7..27388e1a0 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 42940ea80..a8a38184b 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 72544b67b..224944aec 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2013.04.07 01:04}
+\edef\contextversion{2013.04.07 14:05}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mult-aux.mkiv b/tex/context/base/mult-aux.mkiv
index 763ae9605..43d34e087 100644
--- a/tex/context/base/mult-aux.mkiv
+++ b/tex/context/base/mult-aux.mkiv
@@ -823,16 +823,7 @@
 
 \let\doifcommandhandlerelse\doifelsecommandhandler
 
-% another helper:
-%
-% \def\math_frac_alternative
-%   {\expandnamespaceparameter\??mathfractionalternative\mathfractionparameter\c!alternative\v!inner}
-%
-% \def\expandnamespaceparameter#1#2#3% \??xx \yyparameter \c!aa \c!bb
-%   {\expandafter\expandafter\expandafter\mult_aux_expand_namespace_parameter\expandafter\expandafter\expandafter#1#2#3}
-%
-% \def\mult_aux_expand_namespace_parameter#1#2#3%
-%   {\csname#1\ifcsname#1#2\endcsname#2\else#3\fi\endcsname}
+% another set of (fast) helpers (grep for usage):
 
 \def\expandnamespaceparameter#1#2#3% \??xx \getp \c!xx \c!yy
   {\csname#1\ifcsname#1\expandafter\expandafter\expandafter\mult_aux_expand_namespace_parameter#2#3}
@@ -840,6 +831,15 @@
 \def\mult_aux_expand_namespace_parameter#1#2% \cs \c!yy
   {#1\endcsname#1\else#2\fi\endcsname}
 
+\def\expandnamespacemacro#1#2#3% \??xx \some_edefed_cs \c!yy
+  {\csname#1\ifcsname#1#2\endcsname#2\else#3\fi\endcsname}
+
+\def\expandnamespacevalue#1#2% \??xx {...} \c!yy == optimized \expandcheckedcsname
+  {\csname#1\ifcsname#1\normalexpanded{\noexpand\syst_helpers_expand_checked_value{#2}}}
+
+\def\syst_helpers_expand_checked_value#1#2%
+  {#1\endcsname#1\else#2\fi\endcsname}
+
 %D Conventions:
 %D
 %D \starttyping
diff --git a/tex/context/base/pack-mrl.mkiv b/tex/context/base/pack-mrl.mkiv
index 501bf70d6..7c3f08825 100644
--- a/tex/context/base/pack-mrl.mkiv
+++ b/tex/context/base/pack-mrl.mkiv
@@ -255,7 +255,7 @@
    \ifdim\linewidth=\zeropoint
      \c_pack_thinrules_type\zerocount
    \else\ifx\p_frame\v!on
-     \c_pack_thinrules_type\expandcheckedcsname\??thinrulealternatives{\directthinrulesparameter\c!alternative}\v!b\relax
+     \c_pack_thinrules_type\expandnamespaceparameter\??thinrulealternatives\directthinrulesparameter\c!alternative\v!b\relax
    \else
      \c_pack_thinrules_type\zerocount
    \fi\fi
@@ -506,7 +506,7 @@
    \fi}
 
 \def\pack_textrule_yes[#1]%
-  {\expandcheckedcsname\??textrulealternatives{#1}\v!bottom}
+  {\expandnamespacevalue\??textrulealternatives{#1}\v!bottom}
 
 \def\pack_textrule_nop[#1]%
   {\dosinglegroupempty\pack_textrule_nop_indeed}
diff --git a/tex/context/base/page-com.mkiv b/tex/context/base/page-com.mkiv
index 61cb49e89..0ff8e3b54 100644
--- a/tex/context/base/page-com.mkiv
+++ b/tex/context/base/page-com.mkiv
@@ -51,7 +51,7 @@
 \appendtoks
     \edef\p_page_commands_location{\directpagecommentparameter\c!location}%
     \edef\p_page_commands_state   {\directpagecommentparameter\c!state}%
-    \expandcheckedcsname\??pagecommentstates\p_page_commands_state\v!none
+    \expandnamespacemacro\??pagecommentstates\p_page_commands_state\v!none
 \to \everysetuppagecomment
 
 \ifdefined\scrn_canvas_synchronize_simple
@@ -71,7 +71,7 @@
    \d_page_comments_distance\directpagecommentparameter\c!distance\relax
    \d_page_comments_width   \directpagecommentparameter\c!width   \relax
    \d_page_comments_height  \directpagecommentparameter\c!height  \relax
-   \expandcheckedcsname\??pagecommentlocations\p_page_commands_location\v!none
+   \expandnamespacemacro\??pagecommentlocations\p_page_commands_location\v!none
    \definepapersize[\v!pagecomment][\c!height=\d_page_comments_page_height,\c!width=\d_page_comments_page_width]%
    \setuppapersize[\papersize][\v!pagecomment]%
    \setupbackgrounds[\v!paper][\c!background=\v!pagecomment]} % maybe append if already set
diff --git a/tex/context/base/page-imp.mkiv b/tex/context/base/page-imp.mkiv
index 213f8be1a..c22e9e646 100644
--- a/tex/context/base/page-imp.mkiv
+++ b/tex/context/base/page-imp.mkiv
@@ -71,7 +71,7 @@
 \let\installpagehandler\installshipoutmethod % will go
 
 \unexpanded\def\invokepagehandler#1%
-  {\expandcheckedcsname{\??shipoutmethod}{#1}\v!normal}
+  {\expandnamespacevalue\??shipoutmethod{#1}\v!normal}
 
 \def\page_shipouts_handle
   {\csname\??shipoutmethod\ifcsname\??shipoutmethod\v_page_target_method\endcsname
diff --git a/tex/context/base/page-mul.mkiv b/tex/context/base/page-mul.mkiv
index 7478c997f..9e0861af9 100644
--- a/tex/context/base/page-mul.mkiv
+++ b/tex/context/base/page-mul.mkiv
@@ -1625,7 +1625,7 @@
     \fi
     \c_page_mul_balance_minimum\columnsparameter\c!ntop\relax
     \edef\p_page_mul_rule{\columnsparameter\c!rule}%
-    \expandcheckedcsname\??columnseparators\p_page_mul_rule\s!unknown
+    \expandnamespacemacro\??columnseparators\p_page_mul_rule\s!unknown
 \to \t_page_mul_initialize
 
 %D Columns breaks
diff --git a/tex/context/base/page-sel.mkvi b/tex/context/base/page-sel.mkvi
index a56c8453e..cb9bcb509 100644
--- a/tex/context/base/page-sel.mkvi
+++ b/tex/context/base/page-sel.mkvi
@@ -195,7 +195,7 @@
    \scratchdistance\directwithpagesparameter\c!distance\relax
    \scratchwidth\dimexpr(\textwidth-\scratchnx\scratchdistance+\scratchdistance)/\scratchnx\relax
    \scratchheight\dimexpr(\textheight-\scratchny\scratchdistance+\scratchdistance)/\scratchny\relax
-   \expandcheckedcsname{\??combinepagesalternative}{\directwithpagesparameter\c!alternative}\v!b
+   \expandnamespaceparameter\??combinepagesalternative\directwithpagesparameter\c!alternative\v!b
    \directwithpagesparameter\c!after
    \egroup}
 
diff --git a/tex/context/base/scrn-wid.mkvi b/tex/context/base/scrn-wid.mkvi
index 917050c54..ae5f7c556 100644
--- a/tex/context/base/scrn-wid.mkvi
+++ b/tex/context/base/scrn-wid.mkvi
@@ -66,6 +66,7 @@
 
 \installcorenamespace{attachment}
 \installcorenamespace{attachmentlocation}
+\installcorenamespace{attachmentmethod}
 
 \installcommandhandler \??attachment {attachment} \??attachment
 
@@ -171,9 +172,9 @@
 \def\scrn_attachment_inject[#registered][#settings]%
   {\edef\currentattachmentregistered{#registered}%
    \setupattachment[\currentattachment][#settings]%
-   \expandcheckedcsname{scrn_attachment_method_}{\attachmentparameter\c!method}\v!normal}
+   \expandnamespaceparameter\??attachmentmethod\attachmentparameter\c!method\v!normal}
 
-\setvalue{scrn_attachment_method_\v!normal}%
+\setvalue{\??attachmentmethod\v!normal}%
   {\edef\currentattachmentsymbol{\attachmentparameter\c!symbol}%
    \edef\currentattachmentwidth {\attachmentparameter\c!width }%
    \edef\currentattachmentheight{\attachmentparameter\c!height}%
@@ -216,7 +217,7 @@
    \dp\b_scrn_attachment_link\currentattachmentdepth
    \box\b_scrn_attachment_link}
 
-\setvalue{scrn_attachment_method_\v!hidden}%
+\setvalue{\??attachmentmethod\v!hidden}%
   {\ctxcommand{insertattachment{
      tag        = "\currentattachment",
      registered = "\currentattachmentregistered",
@@ -434,7 +435,7 @@
 \installcorenamespace{commentmethods}
 
 \unexpanded\def\scrn_comment_inject
-  {\expandcheckedcsname\??commentmethods{\commentparameter\c!method}\v!normal}
+  {\expandnamespaceparameter\??commentmethods\commentparameter\c!method\v!normal}
 
 %D Beware: comments symbols don't scale in acrobat (cf. spec but somewhat
 %D weird, esp because for instance attachment symbols do scale).
@@ -477,7 +478,7 @@
    \wd\b_scrn_comment_link\currentcommentwidth
    \ht\b_scrn_comment_link\currentcommentheight
    \dp\b_scrn_comment_link\currentcommentdepth
-   \expandcheckedcsname\??commentlocation{\commentparameter\c!location}\s!unknown}
+   \expandnamespaceparameter\??commentlocation\commentparameter\c!location\s!unknown}
 
 \setvalue{\??commentmethods\v!hidden}%
   {}
diff --git a/tex/context/base/spac-flr.mkiv b/tex/context/base/spac-flr.mkiv
index 0e685b644..d09a9cf79 100644
--- a/tex/context/base/spac-flr.mkiv
+++ b/tex/context/base/spac-flr.mkiv
@@ -50,7 +50,7 @@
      \hskip\scratchdimen
    \fi
    \fillerparameter\c!left\relax
-   \expandcheckedcsname\??filleralternative{\fillerparameter\c!alternative}\s!unknown\relax
+   \expandnamespaceparameter\??filleralternative\fillerparameter\c!alternative\s!unknown\relax
    \fillerparameter\c!right\relax
    \scratchdimen\fillerparameter\c!rightmargin\relax
    \ifdim\scratchdimen=\zeropoint\else
@@ -63,7 +63,7 @@
   {}
 
 \setvalue{\??filleralternative\v!symbol}%
-  {\expandcheckedcsname\??fillerleadermethod{\fillerparameter\c!method}\v!local
+  {\expandnamespaceparameter\??fillerleadermethod\fillerparameter\c!method\v!local
       \simplealignedbox
         {\fillerparameter\c!width}%
         {\fillerparameter\c!align}%
@@ -74,7 +74,7 @@
   {\hfill}
 
 \setvalue{\??filleralternative\c!rule}%
-  {\expandcheckedcsname\??fillerleadermethod{\fillerparameter\c!method}\v!local
+  {\expandnamespaceparameter\??fillerleadermethod\fillerparameter\c!method\v!local
      \hrule
        \!!height\fillerparameter\c!height
        \!!depth \fillerparameter\c!depth
diff --git a/tex/context/base/spac-ver.mkiv b/tex/context/base/spac-ver.mkiv
index d4a388cdc..7323230a7 100644
--- a/tex/context/base/spac-ver.mkiv
+++ b/tex/context/base/spac-ver.mkiv
@@ -1437,6 +1437,15 @@
 \unexpanded\def\snaptogrid {\dosingleempty\spac_grids_snap_to}
 \unexpanded\def\placeongrid{\dosingleempty\spac_grids_place_on}
 
+\unexpanded\def\startgridsnapping
+  {\dosingleempty\spac_grids_start_snapping}
+
+\unexpanded\def\spac_grids_start_snapping[#1]%
+  {\snaptogrid[#1]\vbox\bgroup}
+
+\unexpanded\def\stopgridsnapping
+  {\egroup}
+
 % \def\spac_grids_move_on[#1]%
 %   {[obsolete]} % gone, unless we set an attribute
 
@@ -2051,7 +2060,7 @@
 \letvalue{\??fixedalternatives\s!default}\tbox
 
 \unexpanded\def\typo_fixed_finish#1%
-  {\expandcheckedcsname\??fixedalternatives{#1}\s!default{\box\nextbox}}
+  {\expandnamespacevalue\??fixedalternatives{#1}\s!default{\box\nextbox}}
 
 % %D Forgotten already:
 %
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 2118e9209..23ddb60cc 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 277288633..19f6e0668 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-flt.mkvi b/tex/context/base/strc-flt.mkvi
index dbf70f9c3..4fe1a96ff 100644
--- a/tex/context/base/strc-flt.mkvi
+++ b/tex/context/base/strc-flt.mkvi
@@ -1864,7 +1864,7 @@
 %   {\dostarttagged\t!floatcaption\empty
 %    \edef\p_strc_floats_caption_width{\floatcaptionparameter\c!width}%
 %    \edef\p_strc_floats_caption_align{\floatcaptionparameter\c!align}%
-%    \expandcheckedcsname\??floatpreparesidecaption\p_strc_floats_caption_width\s!unknown
+%    \expandnamespacemacro\??floatpreparesidecaption\p_strc_floats_caption_width\s!unknown
 %    \dostoptagged}
 %
 % \setvalue{\??floatpreparesidecaption\v!max}%
diff --git a/tex/context/base/strc-reg.mkiv b/tex/context/base/strc-reg.mkiv
index b0d73f28c..558f266c8 100644
--- a/tex/context/base/strc-reg.mkiv
+++ b/tex/context/base/strc-reg.mkiv
@@ -604,7 +604,7 @@
    \fi\fi}
 
 \def\strc_registers_place_character_yes
-  {\expandcheckedcsname\??registerindicator{\registerparameter\c!alternative}\v!a{\currentregistercharacter}}
+  {\expandnamespaceparameter\??registerindicator\registerparameter\c!alternative\v!a{\currentregistercharacter}}
 
 \def\strc_registers_place_character_nop
   {\registerparameter\c!before
diff --git a/tex/context/base/strc-ren.mkiv b/tex/context/base/strc-ren.mkiv
index 33fccfb5c..00c8c3cd4 100644
--- a/tex/context/base/strc-ren.mkiv
+++ b/tex/context/base/strc-ren.mkiv
@@ -309,12 +309,11 @@
 \setvalue{\??headplacementcheckhang\v!none   }{\n_strc_rendering_hang_lines\zerocount}
 \setvalue{\??headplacementcheckhang          }{\n_strc_rendering_hang_lines\zerocount}
 \setvalue{\??headplacementcheckhang\s!unknown}{\strc_rendering_check_hang
-                                               \n_strc_rendering_hang_lines\numexpr\p_hang-\plusone\relax}
+                                               \n_strc_rendering_hang_lines\numexpr\headparameter\c!hang-\plusone\relax}
 
 \def\strc_rendering_initialize_line_hang
    {\ifconditional\headisdisplay
-      \edef\p_hang{\headparameter\c!hang}%
-      \expandcheckedcsname\??headplacementcheckhang\p_hang\s!unknown
+      \expandnamespaceparameter\??headplacementcheckhang\headparameter\c!hang\s!unknown
       \relax
     \else
       \n_strc_rendering_hang_lines \zerocount
diff --git a/tex/context/base/strc-sec.mkiv b/tex/context/base/strc-sec.mkiv
index 22ed9fe0d..dd51451b9 100644
--- a/tex/context/base/strc-sec.mkiv
+++ b/tex/context/base/strc-sec.mkiv
@@ -655,7 +655,7 @@
    \settrue \c_strc_sectioning_hidden}
 
 \unexpanded\def\strc_sectioning_initialize_placement
-  {\expandcheckedcsname\??headplace{\headparameter\c!placehead}\v!yes}
+  {\expandnamespaceparameter\??headplace\headparameter\c!placehead\v!yes}
 
 \newmode\v!sectionnumber
 
@@ -917,11 +917,11 @@
    \fi}
 
 \def\strc_sectioning_check_layout_nop
-  {\expandcheckedcsname\??headmarknop{\headparameter\c!marking}\s!unknown}
+  {\expandnamespaceparameter\??headmarknop\headparameter\c!marking\s!unknown}
 
 \def\strc_sectioning_check_layout_yes
   {\page[\p_page]%
-   \expandcheckedcsname\??headmarkyes{\headparameter\c!marking}\s!unknown
+   \expandnamespaceparameter\??headmarkyes\headparameter\c!marking\s!unknown
    \edef\p_header{\headparameter\c!header}%
    \ifx\p_header\empty \else
      \doifelselayouttextline\v!header{\normalexpanded{\setuplayouttext[\v!header][\c!state=\p_header]}}\donothing
diff --git a/tex/context/base/tabl-tab.mkiv b/tex/context/base/tabl-tab.mkiv
index dbea3efe9..f9ac27e70 100644
--- a/tex/context/base/tabl-tab.mkiv
+++ b/tex/context/base/tabl-tab.mkiv
@@ -2172,7 +2172,7 @@
 \setvalue{\??tabledistance\v!big   }{\dotableOpenUp22\def\LOW{\Lower8 }}
 
 \appendtoks
-    \expandcheckedcsname\??tabledistance{\directtablesparameter\c!distance}\v!medium
+    \expandnamespaceparameter\??tabledistance\directtablesparameter\c!distance\v!medium
 \to \localtabledefinitions
 
 \setvalue{\??tablealign\v!right  }{\def\dotableparalignment{\raggedright}}
@@ -2196,7 +2196,7 @@
    \fi\fi}
 
 \appendtoks
-   \expandcheckedcsname\??tablealign{\directtablesparameter\c!align}\s!unknown
+   \expandnamespaceparameter\??tablealign\directtablesparameter\c!align\s!unknown
    \assignalfadimension{\directtablesparameter\c!VL}\m_tabl_table_VLwidth 246%
    \assignalfadimension{\directtablesparameter\c!HL}\m_tabl_table_HLheight246%
 \to \everysetuptables
diff --git a/tex/context/base/tabl-xtb.mkvi b/tex/context/base/tabl-xtb.mkvi
index fae4d1615..03c68e603 100644
--- a/tex/context/base/tabl-xtb.mkvi
+++ b/tex/context/base/tabl-xtb.mkvi
@@ -323,7 +323,7 @@
 \installcorenamespace{xtableflushsplit}
 
 \def\tabl_x_flush_text_checked
-  {\expandcheckedcsname\??xtableflushsplit{\xtableparameter\c!split}\v!no}
+  {\expandnamespaceparameter\??xtableflushsplit\xtableparameter\c!split\v!no}
 
 % in text flow: headers and footers only once
 
diff --git a/tex/context/base/typo-del.mkiv b/tex/context/base/typo-del.mkiv
index b48c71e58..82cc7472d 100644
--- a/tex/context/base/typo-del.mkiv
+++ b/tex/context/base/typo-del.mkiv
@@ -21,7 +21,7 @@
 
 \unexpanded\def\setuphyphenmark[#1]% sign=normal|wide
   {\getdummyparameters[#1]%
-   \expandcheckedcsname\??hyphenmarksign{\dummyparameter\c!sign}\v!normal}
+   \expandnamespaceparameter\??hyphenmarksign\dummyparameter\c!sign\v!normal}
 
 \setvalue{\??hyphenmarksign\v!normal}%
   {\let\textmodehyphen\normalhyphen
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index c7f80e6d7..2cb036df0 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  : 04/07/13 01:04:32
+-- merge date  : 04/07/13 14:05:24
 
 do -- begin closure to overcome local limits and interference