10 files changed, 30 insertions, 31 deletions
diff --git a/tex/context/base/mkxl/anch-bck.mklx b/tex/context/base/mkxl/anch-bck.mklx
index 1d0009949..740ed693b 100644
--- a/tex/context/base/mkxl/anch-bck.mklx
+++ b/tex/context/base/mkxl/anch-bck.mklx
@@ -158,11 +158,11 @@
 \let\anch_backgrounds_text_start_indeed\relax
 \let\anch_backgrounds_text_stop_indeed \relax
 
-\setvalue{\??textbackgroundlevel\v!text}%
+\defcsname\??textbackgroundlevel\v!text\endcsname
   {\let\anch_backgrounds_text_start_indeed\anch_backgrounds_text_start_txt
    \let\anch_backgrounds_text_stop_indeed \anch_backgrounds_text_stop_txt}
 
-\setvalue{\??textbackgroundlevel\v!paragraph}%
+\defcsname\??textbackgroundlevel\v!paragraph\endcsname
   {\ifnum\c_anch_backgrounds_text_level>\textbackgroundparameter\c!criterium\relax
      \let\anch_backgrounds_text_start_indeed\anch_backgrounds_text_start_txt
      \let\anch_backgrounds_text_stop_indeed \anch_backgrounds_text_stop_txt
@@ -171,11 +171,11 @@
      \let\anch_backgrounds_text_stop_indeed \anch_backgrounds_text_stop_par
    \fi}
 
-\setvalue{\??textbackgroundlevel\v!always}%
+\defcsname\??textbackgroundlevel\v!always\endcsname
   {\let\anch_backgrounds_text_start_indeed\anch_backgrounds_text_start_par
    \let\anch_backgrounds_text_stop_indeed \anch_backgrounds_text_stop_par}
 
-\setvalue{\??textbackgroundlevel\v!none}%
+\defcsname\??textbackgroundlevel\v!none\endcsname
   {\anch_backgrounds_text_preset_nop}
 
 \def\anch_backgrounds_text_preset_nop
diff --git a/tex/context/base/mkxl/anch-pgr.mkxl b/tex/context/base/mkxl/anch-pgr.mkxl
index d3504c50d..3c4dcf680 100644
--- a/tex/context/base/mkxl/anch-pgr.mkxl
+++ b/tex/context/base/mkxl/anch-pgr.mkxl
@@ -327,6 +327,7 @@
 
 \def\anch_positions_meta_graphic_use#1#2#3%
   {\begingroup
+   \edef\currentmpcategory{#1}%
    \anch_positions_meta_graphic_prepare
    \startMPcode#3\stopMPcode
    \endgroup}
@@ -351,7 +352,7 @@
    \obeyMPboxorigin % do we also set the size ? when needed this must be done in mp ... might change
    \enforced\tolerant\protected\def\MPpositiongraphic##=##*##={\anch_positions_meta_graphic_nested{#3}{##1}{##2}}% takes two extra arguments
  % \def\anch_positions_meta_graphic_direct{\anch_positions_meta_graphic_nested{#3}}% takes two extra arguments
-   \setbox\b_anch_positions_graphic\hbox % \hpack
+   \setbox\b_anch_positions_graphic\hpack
      {\ignorespaces\begincsname#1#2\endcsname\removelastspace}%
    \smashbox\b_anch_positions_graphic
    \box\b_anch_positions_graphic
diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl
index 9e0a56317..b1c57cd7a 100644
--- a/tex/context/base/mkxl/cont-new.mkxl
+++ b/tex/context/base/mkxl/cont-new.mkxl
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2021.06.24 23:39}
+\newcontextversion{2021.06.25 22:44}
 
 %D This file is loaded at runtime, thereby providing an excellent place for hacks,
 %D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl
index f26dcc6cd..e28506a3a 100644
--- a/tex/context/base/mkxl/context.mkxl
+++ b/tex/context/base/mkxl/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \immutable\edef\contextformat {\jobname}
-\immutable\edef\contextversion{2021.06.24 23:39}
+\immutable\edef\contextversion{2021.06.25 22:44}
 
 %overloadmode 1 % check frozen / warning
 %overloadmode 2 % check frozen / error
diff --git a/tex/context/base/mkxl/mlib-lmp.lmt b/tex/context/base/mkxl/mlib-lmp.lmt
index c4a141eee..e4944c92e 100644
--- a/tex/context/base/mkxl/mlib-lmp.lmt
+++ b/tex/context/base/mkxl/mlib-lmp.lmt
@@ -124,25 +124,25 @@ registerdirect("mpvard", function()
 end)
 
 registerdirect("mpvarn", function()
-    if not expandtex(integer_value,  "mpcategoryparameter",true,scanstring(),0) then
+    if not expandtex(integer_value,"mpcategoryparameter",true,scanstring()) then
         injectnumeric(0)
     end
 end)
 
 registerdirect("mpvars", function()
-    if not expandtex(string_value,   "mpcategoryparameter",true,scanstring(),"") then
+    if not expandtex(string_value,"mpcategoryparameter",true,scanstring()) then
         injectstring("")
     end
 end)
 
 registerdirect("mpvarb", function()
-    if not expandtex(boolean_value,  "mpcategoryparameter",true,scanstring(),false) then
+    if not expandtex(boolean_value,"mpcategoryparameter",true,scanstring()) then
         injectboolean(false)
     end
 end)
 
 registerdirect("mpvar", function()
-    if not expandtex(unknown_value,  "mpcategoryparameter",true,scanstring(),0) then
+    if not expandtex(unknown_value,"mpcategoryparameter",true,scanstring()) then
         injectnumeric(0)
     end
 end)
diff --git a/tex/context/base/mkxl/mlib-scn.lmt b/tex/context/base/mkxl/mlib-scn.lmt
index 5339fff6e..b64533cae 100644
--- a/tex/context/base/mkxl/mlib-scn.lmt
+++ b/tex/context/base/mkxl/mlib-scn.lmt
@@ -92,6 +92,9 @@ local tokenscanners  = nil
 local scanset        = nil
 local scanparameters = nil
 
+scanners.typescanners  = typescanners
+scanners.tokenscanners = tokenscanners
+
 scanset = function() -- can be optimized, we now read twice
     scantoken()
     if scantoken(true) == rightbrace_code then
diff --git a/tex/context/base/mkxl/strc-reg.mkxl b/tex/context/base/mkxl/strc-reg.mkxl
index 22a6614b7..16226c5fc 100644
--- a/tex/context/base/mkxl/strc-reg.mkxl
+++ b/tex/context/base/mkxl/strc-reg.mkxl
@@ -819,10 +819,10 @@
    \registerparameter\c!after
    \nobreak}
 
-\setvalue{\??registerindicator a}#1{\strc_registers_indicator_a{#1}{#1}}
-\setvalue{\??registerindicator A}#1{\strc_registers_indicator_a{#1}{\WORD{#1}}}
-\setvalue{\??registerindicator b}#1{\strc_registers_indicator_b{#1}{#1}}
-\setvalue{\??registerindicator B}#1{\strc_registers_indicator_b{#1}{\WORD{#1}}}
+\defcsname\??registerindicator a\endcsname#1{\strc_registers_indicator_a{#1}{#1}}
+\defcsname\??registerindicator A\endcsname#1{\strc_registers_indicator_a{#1}{\WORD{#1}}}
+\defcsname\??registerindicator b\endcsname#1{\strc_registers_indicator_b{#1}{#1}}
+\defcsname\??registerindicator B\endcsname#1{\strc_registers_indicator_b{#1}{\WORD{#1}}}
 
 %D The following macros are the interface to the rendering. These are
 %D generated by \LUA. This might change.
@@ -1181,23 +1181,23 @@
 
 \installcorenamespace{registersymbol}
 
-\setvalue{\??registersymbol n}%
+\defcsname\??registersymbol n\endcsname
   {\enforced\frozen\def\registerpageseparatorsymbol{,\space}}
 
-\setvalue{\??registersymbol a}%
+\defcsname\??registersymbol a\endcsname
   {\enforced\frozen\def\registerpageseparatorsymbol{,\space}} % now done via conversion
 
-\setvalue{\??registersymbol\v!none}%
+\defcsname\??registersymbol\v!none\endcsname
   {\enforced\frozen\let\registerpageseparatorsymbol\empty
    \enforced\frozen\let\registeronepage\gobblefivearguments
    \enforced\frozen\let\registerpagerange\gobbleeightarguments}
 
-\setvalue{\??registersymbol 1}%
+\defcsname\??registersymbol 1\endcsname
   {\enforced\frozen\let\registerpageseparatorsymbol\space
    \enforced\frozen\def\registeronepage{\symbol[1]\gobblefivearguments}%
    \enforced\frozen\def\registerpagerange{\symbol[1]\gobbleeightarguments}}
 
-\setvalue{\??registersymbol 2}%
+\defcsname\??registersymbol 2\endcsname
   {\enforced\frozen\let\registerpageseparatorsymbol\space
    \enforced\frozen\def\registeronepage{\registerpagebuttonsymbol\gobblefivearguments}%
    \enforced\frozen\def\registerpagerange{\registerpagebuttonsymbol\gobbleeightarguments}}
diff --git a/tex/context/base/mkxl/trac-vis.lmt b/tex/context/base/mkxl/trac-vis.lmt
index fc136539e..da71535ce 100644
--- a/tex/context/base/mkxl/trac-vis.lmt
+++ b/tex/context/base/mkxl/trac-vis.lmt
@@ -699,14 +699,11 @@ local math do
         else
             local text, width = sometext(formatters["M:%s"](tag and tags[tag] or what),usedfont,nil,"trace:dr")
             local rule = new_rule(skip,-655360/fraction,2*655360/fraction)
+            local dist = tag == "beginmath" and width or skip
             setcolor(rule,"trace:dr")
             settransparency(rule,"trace:dr")
             setattr(rule,a_layer,l_math)
-            if tag == "beginmath" then
-                info = new_hlist(setlink(new_glue(-skip),rule,new_glue(-width),text))
-            else
-                info = new_hlist(setlink(new_glue(-skip),rule,new_glue(-skip),text))
-            end
+            info = new_hlist(setlink(new_glue(-skip),rule,new_glue(-dist),text))
             setattr(info,a_layer,l_math)
             m_cache[tag][skip] = info
         end
diff --git a/tex/context/base/mkxl/typo-del.mkxl b/tex/context/base/mkxl/typo-del.mkxl
index 9cac52ab8..dc26b4295 100644
--- a/tex/context/base/mkxl/typo-del.mkxl
+++ b/tex/context/base/mkxl/typo-del.mkxl
@@ -851,8 +851,7 @@
   {\dontleavehmode
    \begingroup
    \dostarttaggedchained\t!delimited\currentdelimitedtext\??delimitedtext
- % \usedlanguageparameter{\c!left\currentparentdelimitedtext}% was: \currentdelimitedtext
-   \usedlanguageparameter{\c!left\currentdelimitedtextparent}%
+   \usedlanguageparameter{\c!left\currentparentdelimitedtext}% was: \currentdelimitedtext
    \usedelimitedtextstyleandcolor\c!style\c!color
    \typo_delimited_start_content
    \bgroup
@@ -861,8 +860,7 @@
 
 \def\typo_delimited_fontdriven_e
   {\typo_delimited_stop_content
- % \usedlanguageparameter{\c!right\currentparentdelimitedtext}% was: \currentdelimitedtext
-   \usedlanguageparameter{\c!right\currentdelimitedtextparent}%
+   \usedlanguageparameter{\c!right\currentparentdelimitedtext}% was: \currentdelimitedtext
    \dostoptagged
    \typo_delimited_pop
    \endgroup}
diff --git a/tex/context/base/mkxl/typo-inj.mkxl b/tex/context/base/mkxl/typo-inj.mkxl
index f615014b0..9dae32253 100644
--- a/tex/context/base/mkxl/typo-inj.mkxl
+++ b/tex/context/base/mkxl/typo-inj.mkxl
@@ -65,8 +65,8 @@
    \letcsname typo_injectors_check_#1\endcsname\donothing}
 
 \permanent\protected\def\doactivateinjector#1% used at lua end
-  {\protected\defcsname typo_injectors_mark_#1\endcsname{\dontleavehmode\noexpand\clf_markinjector{#1}}%
-   \protected\defcsname typo_injectors_check_#1\endcsname{\noexpand\clf_checkinjector{#1}}}
+  {\protected\edefcsname typo_injectors_mark_#1\endcsname{\dontleavehmode\noexpand\clf_markinjector{#1}}%
+   \protected\edefcsname typo_injectors_check_#1\endcsname{\noexpand\clf_checkinjector{#1}}}
 
 \permanent\protected\def\dotestinjector#1%  only for testing outside unprotect
   {\begincsname typo_injectors_check_#1\endcsname