16 files changed, 75 insertions, 54 deletions
diff --git a/tex/context/base/mkxl/anch-pos.mkxl b/tex/context/base/mkxl/anch-pos.mkxl
index d217f2cac..6b482dc05 100644
--- a/tex/context/base/mkxl/anch-pos.mkxl
+++ b/tex/context/base/mkxl/anch-pos.mkxl
@@ -406,7 +406,7 @@
 
 \permanent\let\disableparpositions\relax
 
-\aliased\let\registerparoptions\relax
+\permanent\lettonothing\registerparoptions % hooks into everypar
 
 \permanent\protected\def\doregisterparoptions
   {\iftrialtypesetting \orelse\ifinpagebody \orelse\ifmmode \orelse\ifinformula \else
diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl
index 05c0fc8b2..79bb909ab 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.04 17:20}
+\newcontextversion{2021.06.07 08:05}
 
 %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 bbd67d48b..ccd340d28 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.04 17:20}
+\immutable\edef\contextversion{2021.06.07 08:05}
 
 %overloadmode 1 % check frozen / warning
 %overloadmode 2 % check frozen / error
diff --git a/tex/context/base/mkxl/driv-ini.lmt b/tex/context/base/mkxl/driv-ini.lmt
index 729196e87..40b351d84 100644
--- a/tex/context/base/mkxl/driv-ini.lmt
+++ b/tex/context/base/mkxl/driv-ini.lmt
@@ -316,7 +316,7 @@ do
     local filename = nil
 
     drivers.install {
-        name     = "default",
+        name     = "default", -- "pdf"
         actions  = {
             convert        = drivers.converters.engine,
             outputfilename = function(driver)
diff --git a/tex/context/base/mkxl/font-fmp.lmt b/tex/context/base/mkxl/font-fmp.lmt
index f35c96f49..dc70a70e8 100644
--- a/tex/context/base/mkxl/font-fmp.lmt
+++ b/tex/context/base/mkxl/font-fmp.lmt
@@ -8,8 +8,13 @@ if not modules then modules = { } end modules ['font-fmp'] = {
 
 -- We only need to pick up the filename and optionally the enc file as we only use
 -- them for old school virtual math fonts. We might as well drop this completely.
--- This used to be a backend module but the code is rather generic so we just put it
--- here now.
+-- This used to be a backend module but the code is rather generic so for now we
+-- just put it here.
+--
+-- As Type 1 is kind of obsolete I don't expect usage of those fonts in ways that
+-- are not yet covered. Actually, we don't need map files at all because we read the
+-- afm files. Maybe for math but there at some point we'll ditch the virtual old
+-- school variants because afaik ConTeXt users are not using these any longer.
 
 local find, match, splitlines = string.find, string.match, string.splitlines
 
@@ -99,7 +104,10 @@ function mappings.loadline(how,line)
 end
 
 function mappings.reset()
-    lpdf.setmapfile("") -- tricky ... backend related
+    local setmapfile = lpdf and lpdf.setmapfile
+    if setmapfile then
+        setmapfile("") -- tricky ... backend related
+    end
 end
 
 mappings.getentry = getentry
diff --git a/tex/context/base/mkxl/node-ref.lmt b/tex/context/base/mkxl/node-ref.lmt
index 78ff824c9..a7b624591 100644
--- a/tex/context/base/mkxl/node-ref.lmt
+++ b/tex/context/base/mkxl/node-ref.lmt
@@ -100,7 +100,9 @@ local dir_code             = nodecodes.dir
 local par_code             = nodecodes.par
 
 local leftskip_code        = gluecodes.leftskip
+local lefthang_code        = gluecodes.lefthangskip
 local rightskip_code       = gluecodes.rightskip
+local righthang_code       = gluecodes.righthangskip
 local parfillleftskip_code = gluecodes.parfillleftskip
 local parfillskip_code     = gluecodes.parfillskip
 
@@ -359,9 +361,9 @@ local inject_areas do
                 goto NEXT
             elseif id == glue_code then
                 local subtype = getsubtype(current)
-                if subtype == leftskip_code or subtype == parfillleftskip_code then
+                if subtype == leftskip_code or subtype == lefthang_code or subtype == parfillleftskip_code then
                     goto NEXT
-                elseif subtype == rightskip_code or subtype == parfillskip_code then
+                elseif subtype == rightskip_code or subtype == righthang_code or subtype == parfillskip_code then
                     if reference and (done[reference] or 0) == 0 then
                         head, current = inject_range(head,first,last,reference,parent,pardir,firstdir)
                         reference = nil
diff --git a/tex/context/base/mkxl/page-par.mkxl b/tex/context/base/mkxl/page-par.mkxl
index c198784dc..4cfc3f9bf 100644
--- a/tex/context/base/mkxl/page-par.mkxl
+++ b/tex/context/base/mkxl/page-par.mkxl
@@ -22,7 +22,7 @@
 
 \definecounter[\v!paragraph]
 
-\permanent\let\showparagraphnumber\relax
+\permanent\lettonothing\showparagraphnumber
 
 \appendtoks
     \page_par_check_state
@@ -36,16 +36,16 @@
      \lastnamedcs
    \fi}
 
-\setvalue{\??paragraphnumberingvariants\v!start}%
+\defcsname\??paragraphnumberingvariants\v!start\endcsname
   {\enforced\let\showparagraphnumber\page_par_show_number_normal}
 
-\setvalue{\??paragraphnumberingvariants\v!stop}%
-  {\enforced\let\showparagraphnumber\relax}
+\defcsname\??paragraphnumberingvariants\v!stop\endcsname
+  {\enforced\lettonothing\showparagraphnumber}
 
-\setvalue{\??paragraphnumberingvariants\v!line}%
+\defcsname\??paragraphnumberingvariants\v!line\endcsname
   {\enforced\let\showparagraphnumber\page_par_show_number_lines}
 
-\setvalue{\??paragraphnumberingvariants\v!reset}%
+\defcsname\??paragraphnumberingvariants\v!reset\endcsname
   {\strc_counters_reset\v!paragraph
    \enforced\let\showparagraphnumber\page_par_show_number_normal}
 
diff --git a/tex/context/base/mkxl/spac-par.mkxl b/tex/context/base/mkxl/spac-par.mkxl
index 66b08633d..6c3927861 100644
--- a/tex/context/base/mkxl/spac-par.mkxl
+++ b/tex/context/base/mkxl/spac-par.mkxl
@@ -104,7 +104,7 @@
 \installcorenamespace {parwrapafter}
 \installcorenamespace {parwrapcount}
 
-\let\spac_paragraph_wrap\relax
+\lettonothing\spac_paragraph_wrap
 
 \newcount\c_spac_paragraph_group_level
 
@@ -147,7 +147,7 @@
                                          \clf_setparwrapper{#3}#4}%
    #2\csname\??parwrapafter #3\endcsname{#5}%
    \clf_newparwrapper{#3}%
-   \enforced\let\spac_paragraph_wrap\spac_paragraph_update}
+   \let\spac_paragraph_wrap\spac_paragraph_update}
 
 \def\spac_register_par_wrapper_nop#1#2#3#4#5%
   {\ifcsname\??parwrapcount#3\endcsname \else
@@ -212,7 +212,7 @@
 
 \setparagraphfreezing
 
-\appendtoks\enforced\let\spac_paragraph_wrap\relax\to\everyforgetall
+\appendtoks\lettonothing\spac_paragraph_wrap\to\everyforgetall
 
 %D In due time, the code below will be upgraded using the above mechanisms.
 
@@ -250,8 +250,6 @@
 
 \installcorenamespace{paragraphintro}
 
-\let\spac_paragraphs_flush_intro\relax % hook into everypar
-
 \newtoks\t_spac_paragraphs_intro_first
 \newtoks\t_spac_paragraphs_intro_next
 \newtoks\t_spac_paragraphs_intro_each
@@ -260,8 +258,8 @@
 \newconditional\c_spac_paragraphs_intro_next
 \newconditional\c_spac_paragraphs_intro_each
 
-\let\spac_paragraphs_flush_intro\relax
-\let\spac_paragraphs_intro_step \relax
+\lettonothing\spac_paragraphs_flush_intro
+\lettonothing\spac_paragraphs_intro_step
 
 \permanent\protected\tolerant\def\setupparagraphintro[#1]#*[#2]%
   {\def\spac_paragraphs_intro_step##1%
@@ -277,7 +275,7 @@
    \global\t_spac_paragraphs_intro_first\emptytoks
    \global\t_spac_paragraphs_intro_next \emptytoks
    \global\t_spac_paragraphs_intro_each \emptytoks
-   \glet\spac_paragraphs_flush_intro\relax}
+   \glettonothing\spac_paragraphs_flush_intro}
 
 \defcsname\??paragraphintro\v!first\endcsname#1%
   {\global\settrue\c_spac_paragraphs_intro_first
@@ -372,7 +370,7 @@
        \the\t_spac_paragraphs_intro_next
        \the\t_spac_paragraphs_intro_each
      \else
-       \glet\spac_paragraphs_flush_intro\relax
+       \glettonothing\spac_paragraphs_flush_intro
        \the\t_spac_paragraphs_intro_next
      \fi}}
 
@@ -385,7 +383,7 @@
 %D This macro collects data that will be flushed at the next paragraph. By using
 %D this macro you can avoid interfering nodes (writes, etc).
 
-\aliased\let\flushpostponednodedata\relax % hook into everypar
+\lettonothing\flushpostponednodedata % hook into everypar
 
 \newbox  \b_spac_postponed_data
 %newcount\c_spac_postponed_data
@@ -453,7 +451,7 @@
      \ifvoid\b_spac_postponed_data\else
        \hpack{\smashedbox\b_spac_postponed_data}% \box\b_spac_postponed_data
      \fi
-     \enforced\glet\flushpostponednodedata\relax
+     \enforced\glettonothing\flushpostponednodedata
    }%\fi}
 
 \permanent\protected\def\doflushatpar % might be renamed
diff --git a/tex/context/base/mkxl/spac-ver.mkxl b/tex/context/base/mkxl/spac-ver.mkxl
index d11611339..1e630c5bf 100644
--- a/tex/context/base/mkxl/spac-ver.mkxl
+++ b/tex/context/base/mkxl/spac-ver.mkxl
@@ -1356,10 +1356,10 @@
 
 \newcount\c_spac_keep_lines_together
 
-\aliased\let\restoreinterlinepenalty\relax
+\permanent\lettonothing\restoreinterlinepenalty
 
 \protected\def\spac_penalties_restore
-  {\global\enforced\let\restoreinterlinepenalty\relax
+  {\enforced\glettonothing\restoreinterlinepenalty
    \overloaded\global\resetpenalties\interlinepenalties
    \global\c_spac_keep_lines_together\zerocount}
 
diff --git a/tex/context/base/mkxl/strc-not.mklx b/tex/context/base/mkxl/strc-not.mklx
index 3faf7135b..a0691d9f1 100644
--- a/tex/context/base/mkxl/strc-not.mklx
+++ b/tex/context/base/mkxl/strc-not.mklx
@@ -1287,8 +1287,8 @@
    \fi}
 
 \appendtoks
-   \enforced\let\flushnotes   \relax
-   \enforced\let\postponenotes\relax
+   \enforced\lettonothing\flushnotes
+   \enforced\lettonothing\postponenotes
    \forgetall
    \resetallattributes   % new, we don't want color bleed into notes
    \inheritmaintextcolor % but we do want to obey the textcolor
@@ -1517,7 +1517,7 @@
      \fi
    \fi}
 
-\aliased\let\flushnotes\relax
+\permanent\lettonothing\flushnotes
 
 % also \ifcase\insertionmigrationmode here, needs testing:
 
@@ -1534,8 +1534,8 @@
 \permanent\protected\def\doflushnotes
   {\ifconditional\postponingnotes
      \begingroup
-     \enforced\let\flushnotes   \relax
-     \enforced\let\postponenotes\relax
+     \enforced\lettonothing\flushnotes
+     \enforced\lettonothing\postponenotes
      \ifconditional\postponednote
        \ifhmode
          % needed for tagging ... otherwise we get some weird node free error
@@ -1545,7 +1545,7 @@
      \clf_flushpostponednotes% this also resets the states !
      \global\setfalse\postponednote
      \global\setfalse\postponingnotes
-     \enforced\glet\flushnotes\relax
+     \enforced\glettonothing\flushnotes
      \endgroup
    \fi}
 
@@ -1563,8 +1563,8 @@
 \newtoks\everyplacelocalnotes
 
 \appendtoks
-    \enforced\let\flushnotes   \relax
-    \enforced\let\postponenotes\relax
+    \enforced\lettonothing\flushnotes
+    \enforced\lettonothing\postponenotes
 \to \everyplacelocalnotes
 
 \newconditional\inlocalnotes
diff --git a/tex/context/base/mkxl/syst-aux.mkxl b/tex/context/base/mkxl/syst-aux.mkxl
index 21b1a66ef..fea524bee 100644
--- a/tex/context/base/mkxl/syst-aux.mkxl
+++ b/tex/context/base/mkxl/syst-aux.mkxl
@@ -216,7 +216,17 @@
 
 %D Reserved macros for tests:
 
-\aliased\let\donothing\empty
+%D A \type \type {\let} is more efficient than a \type {\def} so we often let something
+%D to relax or do nothing. However, we then loose the name in tracing. For that we now
+%D have \type {\lettonothing \foo} which is efficient but also keeps the name. Of course
+%D this is no solution for commands that take arguments but at least it helps tracing a
+%D bit. We keep of course \type {\donothing}.
+
+%D Maybe even nicer is a let that aliases but keeps the name.
+
+%          \aliased\let\donothing\empty
+         \immutable\def\donothing        {} % better in tracing
+%untraced\immutable\def\untraceddonothing{}
 
 \let\m_syst_string_one  \empty
 \let\m_syst_string_two  \empty
diff --git a/tex/context/base/mkxl/syst-ini.mkxl b/tex/context/base/mkxl/syst-ini.mkxl
index d147e07aa..d87277657 100644
--- a/tex/context/base/mkxl/syst-ini.mkxl
+++ b/tex/context/base/mkxl/syst-ini.mkxl
@@ -681,8 +681,8 @@
 
 \permanent\protected\def\tracingall
   {\tracingonline    \plusone
-   \tracingcommands  \plusthree
-   \tracingmacros    \plustwo
+   \tracingcommands  \plusfour  % > 3: show mode change independent
+   \tracingmacros    \plusthree % > 2: obey \untraced
    \tracingoutput    \plusone
    \tracingpages     \plusone
    \tracingparagraphs\plusone
diff --git a/tex/context/base/mkxl/typo-cap.mkxl b/tex/context/base/mkxl/typo-cap.mkxl
index afdefe923..744b09a47 100644
--- a/tex/context/base/mkxl/typo-cap.mkxl
+++ b/tex/context/base/mkxl/typo-cap.mkxl
@@ -249,8 +249,9 @@
 
 \definefont
   [MixedCaps]
-% [CurrentFont*default cp 1.2\exheight]
-  [CurrentFont*default sa .8] % better adaptation to slanted
+  [CurrentFont*default cp 1.2\exheight]
+% [CurrentFont*default at 1.5\exheight] % better adaptation to slanted but still not nice
+% [CurrentFont*default ht 1.2\exheight] % maybe this is better indeed
 
 \setupcapitals
   [\v!mixed]
diff --git a/tex/context/base/mkxl/typo-del.mkxl b/tex/context/base/mkxl/typo-del.mkxl
index 8e17ea82b..4b8540368 100644
--- a/tex/context/base/mkxl/typo-del.mkxl
+++ b/tex/context/base/mkxl/typo-del.mkxl
@@ -379,9 +379,9 @@
 
 \appendtoks
     \expandafter\newcount\csname\??delimitedtextlevel\currentdelimitedtext\endcsname
-    \frozen\instance\setuevalue{\currentdelimitedtext        }{\delimitedtext[\currentdelimitedtext]}%
-    \frozen\instance\setuevalue{\e!start\currentdelimitedtext}{\startdelimitedtext[\currentdelimitedtext]}%
-    \frozen\instance\setuevalue{\e!stop \currentdelimitedtext}{\stopdelimitedtext}%
+    \frozen\instance\protected\edefcsname\currentdelimitedtext        \endcsname{\delimitedtext[\currentdelimitedtext]}%
+    \frozen\instance\protected\edefcsname\e!start\currentdelimitedtext\endcsname{\startdelimitedtext[\currentdelimitedtext]}%
+    \frozen\instance\protected\edefcsname\e!stop \currentdelimitedtext\endcsname{\stopdelimitedtext}%
 \to \everydefinedelimitedtext
 
 \setupdelimitedtext
@@ -407,7 +407,7 @@
      \typo_delimited_handle_middle\c!middle
    \fi}
 
-\let\typo_delimited_repeat\relax
+\lettonothing\typo_delimited_repeat
 
 \permanent\tolerant\protected\def\startdelimitedtext[#1]#*[#2]%
   {\begingroup
@@ -437,7 +437,7 @@
    \ifx\p_delimited_repeat\v!yes
      \let\typo_delimited_repeat\typo_delimited_repeat_indeed
    \else
-     \let\typo_delimited_repeat\relax
+     \lettonothing\typo_delimited_repeat
    \fi
    \setfalse\c_typo_delimited_repeating
    \edef\p_delimited_location{\delimitedtextparameter\c!location}%
@@ -847,7 +847,8 @@
   {\dontleavehmode
    \begingroup
    \dostarttaggedchained\t!delimited\currentdelimitedtext\??delimitedtext
-   \usedlanguageparameter{\c!left\currentparentdelimitedtext}% was: \currentdelimitedtext
+ % \usedlanguageparameter{\c!left\currentparentdelimitedtext}% was: \currentdelimitedtext
+   \usedlanguageparameter{\c!left\currentparentdelimitedtextparent}% was: \currentdelimitedtext
    \usedelimitedtextstyleandcolor\c!style\c!color
    \typo_delimited_start_content
    \bgroup
@@ -856,7 +857,8 @@
 
 \def\typo_delimited_fontdriven_e
   {\typo_delimited_stop_content
-   \usedlanguageparameter{\c!right\currentparentdelimitedtext}% was: \currentdelimitedtext
+ % \usedlanguageparameter{\c!right\currentparentdelimitedtext}% was: \currentdelimitedtext
+   \usedlanguageparameter{\c!right\currendelimitedtextparent}% was: \currentdelimitedtext
    \dostoptagged
    \typo_delimited_pop
    \endgroup}
diff --git a/tex/context/base/mkxl/typo-drp.mkxl b/tex/context/base/mkxl/typo-drp.mkxl
index 35bbbca8c..da11f76e7 100644
--- a/tex/context/base/mkxl/typo-drp.mkxl
+++ b/tex/context/base/mkxl/typo-drp.mkxl
@@ -71,10 +71,10 @@
 \permanent\tolerant\protected\def\placeinitial[#1]% old command
   {\par
    \namedinitialparameter{#1}\c!before
-   \edef\typo_initial_handle{\typo_initial_handle_indeed{#1}{}}}
+   \enforced\edef\typo_initial_handle{\typo_initial_handle_indeed{#1}{}}}
 
 \permanent\tolerant\protected\def\setinitial[#1]#*[#2]%
-  {\edef\typo_initial_handle{\typo_initial_handle_indeed{#1}{#2}}}
+  {\enforced\edef\typo_initial_handle{\typo_initial_handle_indeed{#1}{#2}}}
 
 \permanent\tolerant\protected\def\flushinitial % when used inside a mechanism that forgets
   {\typo_initial_handle}
@@ -110,9 +110,9 @@
    \c_attr_initial\plusone
    \initialparameter\c!text
    \endgroup
-   \glet\typo_initial_handle\relax}
+   \enforced\glettonothing\typo_initial_handle}
 
-\let\typo_initial_handle\relax
+\lettonothing\typo_initial_handle % hook into everypar
 
 % \setupbodyfont[dejavu,9pt]
 %
diff --git a/tex/context/base/mkxl/typo-fln.mkxl b/tex/context/base/mkxl/typo-fln.mkxl
index 3ef688bb5..a62646fff 100644
--- a/tex/context/base/mkxl/typo-fln.mkxl
+++ b/tex/context/base/mkxl/typo-fln.mkxl
@@ -88,9 +88,9 @@
 %    \kern\zeropoint % we need a node
 %    \hskip\zeropoint\s!plus\emwidth\relax % can be an option
    \endgroup
-   \glet\typo_firstline_handle\relax}
+   \glettonothing\typo_firstline_handle}
 
-\let\typo_firstline_handle\relax
+\lettonothing\typo_firstline_handle
 
 % goodie, question on list
 %