2020-11-24 00:40:00

38 files changed, 96 insertions, 76 deletions

diff --git a/doc/context/documents/general/qrcs/setup-en.pdf b/doc/context/documents/general/qrcs/setup-en.pdf
index f1ee11be3..552b8f5eb 100644
--- a/doc/context/documents/general/qrcs/setup-en.pdf
+++ b/doc/context/documents/general/qrcs/setup-en.pdf
diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf
index 908d9f916..9812f4e2c 100644
--- a/doc/context/documents/general/qrcs/setup-fr.pdf
+++ b/doc/context/documents/general/qrcs/setup-fr.pdf
diff --git a/doc/context/documents/general/qrcs/setup-it.pdf b/doc/context/documents/general/qrcs/setup-it.pdf
index 6f4bf9cf8..b9aafe70e 100644
--- a/doc/context/documents/general/qrcs/setup-it.pdf
+++ b/doc/context/documents/general/qrcs/setup-it.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-en.pdf b/doc/context/documents/general/qrcs/setup-mapping-en.pdf
index 8c3046f9b..505b8fcd2 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-en.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-en.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf
index 3550ea7ba..b04e5f50f 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf
diff --git a/doc/context/documents/general/qrcs/setup-mapping-it.pdf b/doc/context/documents/general/qrcs/setup-mapping-it.pdf
index bdaf74432..d38390483 100644
--- a/doc/context/documents/general/qrcs/setup-mapping-it.pdf
+++ b/doc/context/documents/general/qrcs/setup-mapping-it.pdf
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 6b7b74e02..07816eac0 100644
--- a/tex/context/base/mkii/cont-new.mkii
+++ b/tex/context/base/mkii/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2020.11.23 22:37}
+\newcontextversion{2020.11.24 00:35}
 
 %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/mkii/context.mkii b/tex/context/base/mkii/context.mkii
index da1378517..ba73cc2e3 100644
--- a/tex/context/base/mkii/context.mkii
+++ b/tex/context/base/mkii/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2020.11.23 22:37}
+\edef\contextversion{2020.11.24 00:35}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkii/mult-pe.mkii b/tex/context/base/mkii/mult-pe.mkii
index e2249033a..fb4ab46f0 100644
--- a/tex/context/base/mkii/mult-pe.mkii
+++ b/tex/context/base/mkii/mult-pe.mkii
@@ -283,6 +283,7 @@
 \setinterfacevariable{intermezzo}{میان‌پرده}
 \setinterfacevariable{intext}{درون‌متن}
 \setinterfacevariable{intro}{پیشگفتار}
+\setinterfacevariable{invertedshort}{invertedshort}
 \setinterfacevariable{italic}{ایتالیک}
 \setinterfacevariable{italicbold}{مشکی‌ایتالیک}
 \setinterfacevariable{item}{آیتم}
@@ -386,6 +387,7 @@
 \setinterfacevariable{nonumber}{بدون‌شماره}
 \setinterfacevariable{norepeat}{norepeat}
 \setinterfacevariable{normal}{نرمال}
+\setinterfacevariable{normalshort}{normalshort}
 \setinterfacevariable{nospacing}{بدون‌فضاگذاری}
 \setinterfacevariable{nostopper}{nostopper}
 \setinterfacevariable{not}{بدون}
@@ -453,6 +455,7 @@
 \setinterfacevariable{rectangular}{چهارگوشه}
 \setinterfacevariable{reference}{مرجع}
 \setinterfacevariable{referral}{مراجعه}
+\setinterfacevariable{region}{region}
 \setinterfacevariable{register}{ثبت}
 \setinterfacevariable{regular}{منظم}
 \setinterfacevariable{relative}{نسبی}
@@ -771,6 +774,7 @@
 \setinterfaceconstant{deepnumbercommand}{فرمان‌شماره‌عمیق}
 \setinterfaceconstant{deeptextcommand}{فرمان‌متن‌عمیق}
 \setinterfaceconstant{default}{پیش‌فرض}
+\setinterfaceconstant{define}{define}
 \setinterfaceconstant{delay}{تاخیر}
 \setinterfaceconstant{depth}{عمق}
 \setinterfaceconstant{depthcorrection}{تصحیح‌عمق}
@@ -1365,7 +1369,6 @@
 \setinterfaceelement{type}{تایپ}
 % definitions for interface commands for language pe
 %
-\setinterfacecommand{CAPPED}{CAP}
 \setinterfacecommand{Character}{Character}
 \setinterfacecommand{Characters}{Characters}
 \setinterfacecommand{MONTH}{MONTH}
@@ -1805,7 +1808,7 @@
 \setinterfacecommand{resetpath}{resetpath}
 \setinterfacecommand{resetperiodkerning}{resetperiodkerning}
 \setinterfacecommand{resetsystemmode}{resetsystemmode}
-\setinterfacecommand{resettext}{بازنشانی‌متن}
+\setinterfacecommand{resettextcontent}{بازنشانی‌متن}
 \setinterfacecommand{resetvisualizers}{resetvisualizers}
 \setinterfacecommand{restoreglobalbodyfont}{restoreglobalbodyfont}
 \setinterfacecommand{retestfeature}{retestfeature}
@@ -2071,7 +2074,7 @@
 \setinterfacecommand{startnarrower}{شروع‌باریکتر}
 \setinterfacecommand{startopposite}{شروع‌مخالف}
 \setinterfacecommand{startoverlay}{شروع‌پوشش}
-\setinterfacecommand{startoverzicht}{شروع‌بازبینی}
+\setinterfacecommand{startoverview}{شروع‌بازبینی}
 \setinterfacecommand{startpacked}{شروع‌فشرده}
 \setinterfacecommand{startpositioning}{شروع‌مکان‌گذاری}
 \setinterfacecommand{startproduct}{شروع‌تولید}
@@ -2114,7 +2117,7 @@
 \setinterfacecommand{stopnarrower}{پایان‌نازکتر}
 \setinterfacecommand{stopopposite}{پایان‌مخالف}
 \setinterfacecommand{stopoverlay}{پایان‌پوشش}
-\setinterfacecommand{stopoverzicht}{پایان‌بازبینی}
+\setinterfacecommand{stopoverview}{پایان‌بازبینی}
 \setinterfacecommand{stoppacked}{پایان‌فشرده}
 \setinterfacecommand{stoppositioning}{پایان‌مکان‌گذاری}
 \setinterfacecommand{stopproduct}{پایان‌تولید}
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 8a24a93a4..d184ff26a 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2020.11.23 22:37}
+\newcontextversion{2020.11.24 00:35}
 
 %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/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 766799ade..c74c6e5f3 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -45,7 +45,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2020.11.23 22:37}
+\edef\contextversion{2020.11.24 00:35}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index fa36e1032..6b06d8180 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index 0d1afbfb5..e6e216334 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkxl/anch-pgr.mkxl b/tex/context/base/mkxl/anch-pgr.mkxl
index 62dfe02d5..d701fc14a 100644
--- a/tex/context/base/mkxl/anch-pgr.mkxl
+++ b/tex/context/base/mkxl/anch-pgr.mkxl
@@ -317,16 +317,16 @@
 \newbox\b_anch_positions_graphic
 
 \permanent\tolerant\protected\def\startMPpositiongraphic#=#*#=#:#3\stopMPpositiongraphic % tag list mpcode
-  {\setgvalue{\??positiongraphic#1}{\anch_positions_meta_graphic_use{#1}{#2}{#3}}}
+  {\gdefcsname\??positiongraphic#1\endcsname{\anch_positions_meta_graphic_use{#1}{#2}{#3}}}
 
 \aliased\let\stopMPpositiongraphic\relax
 
 \def\anch_positions_meta_graphic_prepare
   {\ifcsname\??graphicvariable\currentmpvariableclass:self\endcsname \else
-     \letvalue{\??graphicvariable\currentmpvariableclass:self}\currentposition
+     \letcsname\??graphicvariable\currentmpvariableclass:self\endcsname\currentposition
    \fi
    \ifcsname\??graphicvariable\currentmpvariableclass:from\endcsname \else
-     \letvalue{\??graphicvariable\currentmpvariableclass:from}\currentposition
+     \letcsname\??graphicvariable\currentmpvariableclass:from\endcsname\currentposition
    \fi}
 
 \def\anch_positions_meta_graphic_use#1#2#3%
diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl
index 85c5ba30d..fa94e9d3d 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{2020.11.23 22:37}
+\newcontextversion{2020.11.24 00:35}
 
 %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 339c64360..29d7c5512 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.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2020.11.23 22:37}
+\edef\contextversion{2020.11.24 00:35}
 
 %overloadmode 1 % check frozen / warning
 %overloadmode 2 % check frozen / error
diff --git a/tex/context/base/mkxl/font-emp.mklx b/tex/context/base/mkxl/font-emp.mklx
index 33104a6d7..a6c4136f6 100644
--- a/tex/context/base/mkxl/font-emp.mklx
+++ b/tex/context/base/mkxl/font-emp.mklx
@@ -230,10 +230,20 @@
 % \protected\def\emphtf{\groupedcommand{\tf\def\emphbf{\bf}\def\emphit{\it}\def\emphsl{\sl}}{}}
 % \protected\def\emph  {\groupedcommand{\em}{}}
 
-\protected\def\font_emphasis_bf{\bf\def\emphit{\bi}\def\emphsl{\bs}}
-\protected\def\font_emphasis_it{\it\def\emphbf{\bi}\def\emphsl{\sl}}
-\protected\def\font_emphasis_sl{\sl\def\emphbf{\bs}\def\emphit{\it}}
-\protected\def\font_emphasis_tf{\tf\def\emphbf{\bf}\def\emphit{\it}\def\emphsl{\sl}}
+
+\permanent\protected\def\font_tf{\tf} \permanent\protected\def\font_bf{\bf}
+\permanent\protected\def\font_sl{\sl} \permanent\protected\def\font_bs{\bs}
+\permanent\protected\def\font_it{\it} \permanent\protected\def\font_bi{\bi}
+
+\protected\def\font_emphasis_bf{\bf\enforced\aliased\let\emphit\font_bi
+                                   \enforced\aliased\let\emphsl\font_bs}
+\protected\def\font_emphasis_it{\it\enforced\aliased\let\emphbf\font_bi
+                                   \enforced\aliased\let\emphsl\font_sl}
+\protected\def\font_emphasis_sl{\sl\enforced\aliased\let\emphbf\font_bs
+                                   \enforced\aliased\let\emphit\font_it}
+\protected\def\font_emphasis_tf{\tf\enforced\aliased\let\emphbf\font_bf
+                                   \enforced\aliased\let\emphit\font_it
+                                   \enforced\aliased\let\emphsl\font_sl}
 
 \permanent\protected\def\emphbf{\triggergroupedcommandcs\font_emphasis_bf}
 \permanent\protected\def\emphit{\triggergroupedcommandcs\font_emphasis_it}
diff --git a/tex/context/base/mkxl/math-ali.mkxl b/tex/context/base/mkxl/math-ali.mkxl
index 587eaf6a1..dadf3ebfa 100644
--- a/tex/context/base/mkxl/math-ali.mkxl
+++ b/tex/context/base/mkxl/math-ali.mkxl
@@ -1379,8 +1379,8 @@
   {\doif{\formulaparameter\c!strut}\v!yes\strut}
 
 \permanent\protected\def\defineinnermathhandler#1#2#3%
-  {\setvalue{\??mathinnerstart#1}{#2}%
-   \setvalue{\??mathinnerstop #1}{#3}}
+  {\defcsname\??mathinnerstart#1\endcsname{#2}%
+   \defcsname\??mathinnerstop #1\endcsname{#3}}
 
 \installtextracker
   {formulas.boxes}
diff --git a/tex/context/base/mkxl/node-rul.mkxl b/tex/context/base/mkxl/node-rul.mkxl
index 72201ac71..f0f660f22 100644
--- a/tex/context/base/mkxl/node-rul.mkxl
+++ b/tex/context/base/mkxl/node-rul.mkxl
@@ -531,7 +531,7 @@
   {\begingroup
    \par
    \def\currentlinefiller{#1}%
-   \ifargument#1\or
+   \ifargument#2\or
      % we need to update settings
      \setuplinefiller[#1][#2]% no \setupcurrentlinefiller as we need to update settings
    \fi
diff --git a/tex/context/base/mkxl/pack-lyr.mkxl b/tex/context/base/mkxl/pack-lyr.mkxl
index e85b3c185..ccf4290d4 100644
--- a/tex/context/base/mkxl/pack-lyr.mkxl
+++ b/tex/context/base/mkxl/pack-lyr.mkxl
@@ -37,9 +37,9 @@
 \permanent\overloaded\tolerant\protected\def\defineoverlay[#1]#*[#2]#*[#3]% overlay [layer] content
   {\ifnum\lastarguments=\plusthree
     %\writestatus{BEWARE}{This (overlay definition) has changed!}% temp
-     \def\pack_framed_define_overlay_indeed##1{\setvalue{\??overlay##1}{\setlayer[#2]{\executedefinedoverlay{##1}{#3}}}}%
+     \def\pack_framed_define_overlay_indeed##1{\defcsname\??overlay##1\endcsname{\setlayer[#2]{\executedefinedoverlay{##1}{#3}}}}%
    \else
-     \def\pack_framed_define_overlay_indeed##1{\setvalue{\??overlay##1}{\executedefinedoverlay{##1}{#2}}}%
+     \def\pack_framed_define_overlay_indeed##1{\defcsname\??overlay##1\endcsname{\executedefinedoverlay{##1}{#2}}}%
    \fi
    \processcommalist[#1]\pack_framed_define_overlay_indeed}
 
@@ -292,13 +292,12 @@
    \edef\m_pack_layers_page{\layerparameter\c!page}}
 
 \permanent\tolerant\protected\def\definelayerpreset[#1]#*[#2]%
-  {\ifarguments
-   \or
-     \letvalue{\??layerpreset#1}\empty
+  {\ifarguments\or
+     \letcsname\??layerpreset#1\endcsname\empty
    \orelse\ifhastok={#2}%
-     \setvalue{\??layerpreset#1}{\setupcurrentlayer[#2]}%
+     \defcsname\??layerpreset#1\endcsname{\setupcurrentlayer[#2]}%
    \else
-     \setvalue{\??layerpreset#1}{\csname\??layerpreset#2\endcsname}%
+     \defcsname\??layerpreset#1\endcsname{\csname\??layerpreset#2\endcsname}%
    \fi}
 
 \def\pack_layers_set_content#1%
diff --git a/tex/context/base/mkxl/pack-mrl.mkxl b/tex/context/base/mkxl/pack-mrl.mkxl
index f9736aa74..e0ab0708c 100644
--- a/tex/context/base/mkxl/pack-mrl.mkxl
+++ b/tex/context/base/mkxl/pack-mrl.mkxl
@@ -533,12 +533,15 @@
 \def\pack_textrule_yes[#1]%
   {\expandnamespacevalue\??textrulealternatives{#1}\v!bottom}
 
-\tolerant\def\pack_textrule_nop[#1]#:#=%
-  {\ifparameter#2\or
-     \expandafter\pack_textrule_nop_indeed_yes
-   \else
-     \expandafter\pack_textrule_nop_indeed_nop
-   \fi[#1]{#2}}
+% \tolerant\def\pack_textrule_nop[#1]#:#=%
+%   {\ifparameter#2\or
+%      \expandafter\pack_textrule_nop_indeed_yes
+%    \else
+%      \expandafter\pack_textrule_nop_indeed_nop
+%    \fi[#1]{#2}}
+
+\def\pack_textrule_nop[#1]%
+  {\doifelsenextbgroupcs\pack_textrule_nop_indeed_yes\pack_textrule_nop_indeed_nop}
 
 \def\pack_textrule_nop_indeed_yes
   {\csname\??textrulealternatives\v!top\endcsname}
diff --git a/tex/context/base/mkxl/pack-pos.mkxl b/tex/context/base/mkxl/pack-pos.mkxl
index 025232eb3..aee22081f 100644
--- a/tex/context/base/mkxl/pack-pos.mkxl
+++ b/tex/context/base/mkxl/pack-pos.mkxl
@@ -111,7 +111,7 @@
       \ifdim           #3<-#7\relax \global#7-#3\relax    \fi
       \ifdim\scratchdimen> #6\relax \global#6\scratchdimen\fi}}
 
-\permanent\tolerant\protected\def\position[#1]#*(#2,#3)%
+\permanent\tolerant\protected\def\position[#1]#:(#2,#3)%
   {\bgroup
    \ifparameter#1\or
      \setupcurrentpositioning[#1]%
diff --git a/tex/context/base/mkxl/page-app.mkxl b/tex/context/base/mkxl/page-app.mkxl
index 77a3bf2d6..73235a887 100644
--- a/tex/context/base/mkxl/page-app.mkxl
+++ b/tex/context/base/mkxl/page-app.mkxl
@@ -200,6 +200,6 @@
    \egroup}
 
 \permanent\tolerant\protected\def\pagefigure[#1]#*[#2]%
-  {\page_figures_start[#1][#2]\stoppagefigure}
+  {\startpagefigure[#1][#2]\stoppagefigure}
 
 \protect \endinput
diff --git a/tex/context/base/mkxl/page-cst.mkxl b/tex/context/base/mkxl/page-cst.mkxl
index a033d740b..31cf158f5 100644
--- a/tex/context/base/mkxl/page-cst.mkxl
+++ b/tex/context/base/mkxl/page-cst.mkxl
@@ -126,7 +126,7 @@
 
 \permanent\tolerant\protected\def\startpagegrid[#1]#*[#2]%
   {\bgroup
-   \let\page_grd_start\page_grd_start_dummy
+   \enforced\let\startpagegrid\page_grd_start_dummy
    \ifarguments
      \let\currentpagegrid\empty
    \or
@@ -184,7 +184,7 @@
    %
    }%\begingroup}
 
-\def\page_grd_start_dummy[#1][#2]%
+\tolerant\def\page_grd_start_dummy[#1]#*[#2]%
   {\let\page_grd_stop\egroup}
 
 \permanent\protected\def\stoppagegrid
diff --git a/tex/context/base/mkxl/page-lay.mkxl b/tex/context/base/mkxl/page-lay.mkxl
index 230315a03..c9997583a 100644
--- a/tex/context/base/mkxl/page-lay.mkxl
+++ b/tex/context/base/mkxl/page-lay.mkxl
@@ -355,16 +355,16 @@
    \orelse\ifhastok={#2}%
      \definelayouttarget[#1][#2]%
    \else
-     \setevalue{\??layoutpaper#1}{#2}%
+     \edefcsname\??layoutpaper#1\endcsname{#2}%
      \ifparameter#3\or
-       \setevalue{\??layoutprint#1}{#3}%
+       \edefcsname\??layoutprint#1\endcsname{#3}%
      \else
-       \setevalue{\??layoutprint#1}{#2}%
+       \edefcsname\??layoutprint#1\endcsname{#2}%
      \fi
    \fi}
 
 \appendtoks
-    \letvalue{\??layoutcurrent\currentlayouttarget}\relax
+    \letcsname\??layoutcurrent\currentlayouttarget\endcsname\relax
 \to \everydefinelayouttarget
 
 %def\page_paper_the_paper_size#1{\ifcsname\??layoutpaper#1\endcsname\csname\??layoutpaper#1\endcsname\else#1\fi}
@@ -744,7 +744,7 @@
    \fi}
 
 \def\page_layouts_check_pseudo_column
-  {\setxvalue{\??layoutcolumn\recurselevel}%
+  {\xdefcsname\??layoutcolumn\recurselevel\endcsname
      {\the\numexpr\recurselevel-\plusone\relax\dimexpr\layoutcolumnwidth+\layoutcolumndistance\relax}}
 
 \letvalue{\??layoutcolumn0}\zeropoint
@@ -835,7 +835,7 @@
    \fi}
 
 \permanent\protected\def\installlayoutmethod#1#2%
-  {\setgvalue{\??layoutmethod#1}{#2}}
+  {\gdefcsname\??layoutmethod#1\endcsname{#2}}
 
 \installlayoutmethod\v!default{\page_layouts_check_default}
 \installlayoutmethod\v!normal {\page_layouts_check_default}
@@ -945,7 +945,7 @@
 % installers
 
 \permanent\protected\def\installlayoutalternative#1#2%
-  {\setgvalue{\??layoutalternative#1}{#2}}
+  {\gdefcsname\??layoutalternative#1\endcsname{#2}}
 
 \def\page_boxes_construct_content_default#1#2#3% targetbox flusher box
   {\setbox#1\vpack % was \vbox
@@ -996,7 +996,7 @@
    \fi}
 
 \def\page_adapts_layout_register#1#2%
-  {\setgvalue{\??pageadaptations#2}{\page_adapts_layout_indeed{#1}}}
+  {\gdefcsname\??pageadaptations#2\endcsname{\page_adapts_layout_indeed{#1}}}
 
 \let\p_adapts_height\zeropoint
 \let\p_adapts_lines \zerocount
diff --git a/tex/context/base/mkxl/spac-flr.mkxl b/tex/context/base/mkxl/spac-flr.mkxl
index 3bf1aa800..8264f5e5e 100644
--- a/tex/context/base/mkxl/spac-flr.mkxl
+++ b/tex/context/base/mkxl/spac-flr.mkxl
@@ -76,7 +76,7 @@
    \ifzeropt\scratchdimen\else
      \parfillskip \scratchdimen\s!plus \plusone\s!fil\relax
    \fi
-   \spac_fillers_indeed[#1]%
+   \filler[#1]%
    \doifsomething{#2}{\hbox{#2}}%
    \par
    \endgroup
diff --git a/tex/context/base/mkxl/strc-num.mkxl b/tex/context/base/mkxl/strc-num.mkxl
index 041e2c138..49fd1d3c4 100644
--- a/tex/context/base/mkxl/strc-num.mkxl
+++ b/tex/context/base/mkxl/strc-num.mkxl
@@ -144,42 +144,42 @@
    \fi}
 
 \permanent\tolerant\protected\def\rawcounter[#1]#*[#2]%
-  {\ifarguments\or\or
+  {\ifarguments\or
      \clf_countervalue   {\namedcounterparameter{#1}\s!name}%
    \else
      \clf_subcountervalue{\namedcounterparameter{#1}\s!name}\numexpr#2\relax\or
    \fi}
 
 \permanent\tolerant\protected\def\lastcounter[#1]#*[#2]%
-  {\ifarguments\or\or
+  {\ifarguments\or
      \clf_lastcountervalue   {\namedcounterparameter{#1}\s!name}%
    \else
      \clf_lastsubcountervalue{\namedcounterparameter{#1}\s!name}\numexpr#2\relax\or
    \fi}
 
 \permanent\tolerant\protected\def\firstcounter[#1]#*[#2]%
-  {\ifarguments\or\or
+  {\ifarguments\or
      \clf_firstcountervalue   {\namedcounterparameter{#1}\s!name}%
    \else
      \clf_firstsubcountervalue{\namedcounterparameter{#1}\s!name}\numexpr#2\relax\or
    \fi}
 
 \permanent\tolerant\protected\def\prevcounter[#1]#*[#2]%
-  {\ifarguments\or\or
+  {\ifarguments\or
      \clf_previouscountervalue   {\namedcounterparameter{#1}\s!name}%}
    \else
      \clf_previoussubcountervalue{\namedcounterparameter{#1}\s!name}\numexpr#2\relax\or
    \fi}
 
 \permanent\tolerant\protected\def\nextcounter[#1]#*[#2]%
-  {\ifarguments\or\or
+  {\ifarguments\or
      \clf_nextcountervalue   {\namedcounterparameter{#1}\s!name}%
    \else
      \clf_nextsubcountervalue{\namedcounterparameter{#1}\s!name}\numexpr#2\relax\or
    \fi}
 
 \permanent\tolerant\protected\def\countersubs[#1]#*[#2]%
-  {\ifarguments\or\or
+  {\ifarguments\or
     \clf_subcountervalues   {\namedcounterparameter{#1}\s!name}%
    \else
     \clf_subsubcountervalues{\namedcounterparameter{#1}\s!name}\numexpr#2\relax\or
diff --git a/tex/context/base/mkxl/symb-ini.mkxl b/tex/context/base/mkxl/symb-ini.mkxl
index 1d1f66c17..513174075 100644
--- a/tex/context/base/mkxl/symb-ini.mkxl
+++ b/tex/context/base/mkxl/symb-ini.mkxl
@@ -209,15 +209,15 @@
 
 \ifdefined\externalfigure \else \def\externalfigure[#1][#2]{#1} \fi
 
-\def\defaultsymbolfactor{10}
-\def\defaultsymbolheight{1.25ex}
+\mutable\def\defaultsymbolfactor{10}
+\mutable\def\defaultsymbolheight{1.25ex}
 
 \permanent\tolerant\protected\def\figuresymbol[#1]#*[#2]%
   {\externalfigure[#1][\c!reset=\v!yes,\c!symbol=\v!yes,\c!height=\defaultsymbolheight,#2]}
 
 \permanent\tolerant\protected\def\definefiguresymbol[#1]#*[#2]#*[#3]%
   {\ifarguments\or\else
-     \definesymbol[#1][{\symb_figure[#2][#3]}]%
+     \definesymbol[#1][{\figuresymbol[#2][#3]}]%
    \fi}
 
 %D \macros
diff --git a/tex/context/base/mkxl/syst-aux.mkxl b/tex/context/base/mkxl/syst-aux.mkxl
index 8a7da172d..043cd818d 100644
--- a/tex/context/base/mkxl/syst-aux.mkxl
+++ b/tex/context/base/mkxl/syst-aux.mkxl
@@ -465,7 +465,7 @@
 %D existance is not the same as the one described here. Therefore we introduce:
 
 \permanent\protected\def\letbeundefined#1%
-  {\letcsname#1\endcsname\undefined} % or use \undefinevalue to match \setvalue
+  {\letcsname#1\endcsname\undefined}
 
 \permanent\protected\def\localundefine#1% conditional
   {\ifcsname#1\endcsname\letcsname#1\endcsname\undefined\fi}
diff --git a/tex/context/base/mkxl/syst-ini.mkxl b/tex/context/base/mkxl/syst-ini.mkxl
index 1f78c5864..3295c7d97 100644
--- a/tex/context/base/mkxl/syst-ini.mkxl
+++ b/tex/context/base/mkxl/syst-ini.mkxl
@@ -138,6 +138,14 @@
 %D available; it cannot limit itself to being \TEX\ or \ETEX. It could not do that
 %D anyway because there are differences (no backend, to mention one).
 
+%D Temp hack ... build bot down:
+
+\ifdefined\gletcsname \else \protected\def\gletcsname{\global\letcsname } \fi
+\ifdefined\gdefcsname \else \protected\def\gdefcsname{\global\defcsname } \fi
+\ifdefined\xdefcsname \else \protected\def\xdefcsname{\global\edefcsname} \fi
+
+%D We create (for now) aliases:
+
 \directlua {
     local primitives = tex.extraprimitives()  % "tex","etex","luatex"
     tex.enableprimitives("normal",primitives) % could default to everything
@@ -1104,10 +1112,4 @@
 \mutable\let\par\par
 \popoverloadmode
 
-%D Temp hack ... build bot down:
-
-\ifdefined\gletcsname \else \protected\def\gletcsname{\global\letcsname } \fi
-\ifdefined\gdefcsname \else \protected\def\gdefcsname{\global\defcsname } \fi
-\ifdefined\xdefcsname \else \protected\def\xdefcsname{\global\edefcsname} \fi
-
 \protect \endinput
diff --git a/tex/context/base/mkxl/tabl-xtb.mklx b/tex/context/base/mkxl/tabl-xtb.mklx
index 267168ac1..840d0af04 100644
--- a/tex/context/base/mkxl/tabl-xtb.mklx
+++ b/tex/context/base/mkxl/tabl-xtb.mklx
@@ -743,7 +743,7 @@
 %D \typebuffer \placetable{}{\getbuffer}
 
 \appendtoks
-    \letvalue{\??xtablecheck\currentxtable}\relax % faster than checking parent
+    \letcsname\??xtablecheck\currentxtable\endcsname\relax % faster than checking parent
 \to \everysetupxtable
 
 % \definefontfamily[newtimes][serif][TeX Gyre Termes]
@@ -793,7 +793,7 @@
   {\begingroup
    \doifelsenextoptionalcs\tabl_x_start_cell_delayed_one\tabl_x_start_cell_nop}
 
-\tolerant\protected\def\tabl_x_start_cell_delayed_one[#tag]#spacer%
+\protected\def\tabl_x_start_cell_delayed_one[#tag]%
   {\ifcsname\??xtablecheck\detokenize\expandafter{\normalexpanded{#tag}}\endcsname
      \expandafter\tabl_x_start_cell_delayed_two
    \else
@@ -908,7 +908,7 @@
      \gtoksapp\t_tabl_x_swapped\expandafter{\expandafter\tabl_x_c_cell_start\expandafter{\m_tabl_x_swapped_settings}#content\tabl_x_c_cell_stop}%
    \fi}
 
-\tolerant\def\tabl_x_collect_cell_start_yes[#settings]#spacer#content\stopxcell
+\def\tabl_x_collect_cell_start_yes[#settings]#content\stopxcell
   {\tabl_x_collect_advance
    \ifempty\m_tabl_x_swapped_settings
      \gtoksapp\t_tabl_x_swapped{\tabl_x_c_cell_start{}[#settings]#content\tabl_x_c_cell_stop}%
diff --git a/tex/context/base/mkxl/typo-inj.mkxl b/tex/context/base/mkxl/typo-inj.mkxl
index 7bd01aac0..f615014b0 100644
--- a/tex/context/base/mkxl/typo-inj.mkxl
+++ b/tex/context/base/mkxl/typo-inj.mkxl
@@ -61,12 +61,12 @@
 % use \v!list instead of \s!list
 
 \permanent\protected\def\doinstallinjector#1%
-  {\letvalue{typo_injectors_mark_#1}\donothing
-   \letvalue{typo_injectors_check_#1}\donothing}
+  {\letcsname typo_injectors_mark_#1\endcsname\donothing
+   \letcsname typo_injectors_check_#1\endcsname\donothing}
 
 \permanent\protected\def\doactivateinjector#1% used at lua end
-  {\setuxvalue{typo_injectors_mark_#1}{\dontleavehmode\noexpand\clf_markinjector{#1}}%
-   \setuxvalue{typo_injectors_check_#1}{\noexpand\clf_checkinjector{#1}}}
+  {\protected\defcsname typo_injectors_mark_#1\endcsname{\dontleavehmode\noexpand\clf_markinjector{#1}}%
+   \protected\defcsname 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
diff --git a/tex/context/interface/mkii/keys-pe.xml b/tex/context/interface/mkii/keys-pe.xml
index db02305c6..da58ff34c 100644
--- a/tex/context/interface/mkii/keys-pe.xml
+++ b/tex/context/interface/mkii/keys-pe.xml
@@ -286,6 +286,7 @@
 		<cd:variable name='intermezzo' value='میان‌پرده'/>
 		<cd:variable name='intext' value='درون‌متن'/>
 		<cd:variable name='intro' value='پیشگفتار'/>
+		<cd:variable name='invertedshort' value='invertedshort'/>
 		<cd:variable name='italic' value='ایتالیک'/>
 		<cd:variable name='italicbold' value='مشکی‌ایتالیک'/>
 		<cd:variable name='item' value='آیتم'/>
@@ -389,6 +390,7 @@
 		<cd:variable name='nonumber' value='بدون‌شماره'/>
 		<cd:variable name='norepeat' value='norepeat'/>
 		<cd:variable name='normal' value='نرمال'/>
+		<cd:variable name='normalshort' value='normalshort'/>
 		<cd:variable name='nospacing' value='بدون‌فضاگذاری'/>
 		<cd:variable name='nostopper' value='nostopper'/>
 		<cd:variable name='not' value='بدون'/>
@@ -456,6 +458,7 @@
 		<cd:variable name='rectangular' value='چهارگوشه'/>
 		<cd:variable name='reference' value='مرجع'/>
 		<cd:variable name='referral' value='مراجعه'/>
+		<cd:variable name='region' value='region'/>
 		<cd:variable name='register' value='ثبت'/>
 		<cd:variable name='regular' value='منظم'/>
 		<cd:variable name='relative' value='نسبی'/>
@@ -777,6 +780,7 @@
 		<cd:constant name='deepnumbercommand' value='فرمان‌شماره‌عمیق'/>
 		<cd:constant name='deeptextcommand' value='فرمان‌متن‌عمیق'/>
 		<cd:constant name='default' value='پیش‌فرض'/>
+		<cd:constant name='define' value='define'/>
 		<cd:constant name='delay' value='تاخیر'/>
 		<cd:constant name='depth' value='عمق'/>
 		<cd:constant name='depthcorrection' value='تصحیح‌عمق'/>
@@ -1377,7 +1381,6 @@
 	<!-- definitions for interface commands for language pe -->
 
 	<cd:commands>
-		<cd:command name='CAPPED' value='CAP'/>
 		<cd:command name='Character' value='Character'/>
 		<cd:command name='Characters' value='Characters'/>
 		<cd:command name='MONTH' value='MONTH'/>
@@ -1817,7 +1820,7 @@
 		<cd:command name='resetpath' value='resetpath'/>
 		<cd:command name='resetperiodkerning' value='resetperiodkerning'/>
 		<cd:command name='resetsystemmode' value='resetsystemmode'/>
-		<cd:command name='resettext' value='بازنشانی‌متن'/>
+		<cd:command name='resettextcontent' value='بازنشانی‌متن'/>
 		<cd:command name='resetvisualizers' value='resetvisualizers'/>
 		<cd:command name='restoreglobalbodyfont' value='restoreglobalbodyfont'/>
 		<cd:command name='retestfeature' value='retestfeature'/>
@@ -2083,7 +2086,7 @@
 		<cd:command name='startnarrower' value='شروع‌باریکتر'/>
 		<cd:command name='startopposite' value='شروع‌مخالف'/>
 		<cd:command name='startoverlay' value='شروع‌پوشش'/>
-		<cd:command name='startoverzicht' value='شروع‌بازبینی'/>
+		<cd:command name='startoverview' value='شروع‌بازبینی'/>
 		<cd:command name='startpacked' value='شروع‌فشرده'/>
 		<cd:command name='startpositioning' value='شروع‌مکان‌گذاری'/>
 		<cd:command name='startproduct' value='شروع‌تولید'/>
@@ -2126,7 +2129,7 @@
 		<cd:command name='stopnarrower' value='پایان‌نازکتر'/>
 		<cd:command name='stopopposite' value='پایان‌مخالف'/>
 		<cd:command name='stopoverlay' value='پایان‌پوشش'/>
-		<cd:command name='stopoverzicht' value='پایان‌بازبینی'/>
+		<cd:command name='stopoverview' value='پایان‌بازبینی'/>
 		<cd:command name='stoppacked' value='پایان‌فشرده'/>
 		<cd:command name='stoppositioning' value='پایان‌مکان‌گذاری'/>
 		<cd:command name='stopproduct' value='پایان‌تولید'/>
diff --git a/tex/context/interface/mkiv/context-en.xml b/tex/context/interface/mkiv/context-en.xml
index 59ecba8ec..476e8ee62 100644
--- a/tex/context/interface/mkiv/context-en.xml
+++ b/tex/context/interface/mkiv/context-en.xml
@@ -16611,7 +16611,7 @@
   <cd:command category="language" file="lang-ini.mkxl" level="style" name="nohyphens"/>
   <cd:command category="language" file="lang-ini.mkxl" level="system" name="usehyphensparameter">
    <cd:arguments>
-    <cd:csname _error_="&quot;"/>
+    <cd:csname/>
    </cd:arguments>
   </cd:command>
   <cd:command category="language" file="lang-mis.mkxl" level="system" name="compounddiscretionary"/>
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index f1ee11be3..552b8f5eb 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
diff --git a/tex/context/interface/mkiv/i-hyphenation.xml b/tex/context/interface/mkiv/i-hyphenation.xml
index 5437c81c0..19a91072b 100644
--- a/tex/context/interface/mkiv/i-hyphenation.xml
+++ b/tex/context/interface/mkiv/i-hyphenation.xml
@@ -267,7 +267,7 @@
 
     <cd:command name="usehyphensparameter" level="system" category="language" file="lang-ini.mkxl">
         <cd:arguments>
-            <cd:csname"/>
+            <cd:csname/>
         </cd:arguments>
     </cd:command>
 
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index 2e51059b1..654cbb8de 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index f84c4408f..f6a0f6bbc 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 2020-11-23 22:37
+-- merge date  : 2020-11-24 00:35
 
 do -- begin closure to overcome local limits and interference