5 files changed, 10 insertions, 9 deletions
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 191926e8f..4c07bceb5 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{2022.10.21 21:11}
+\newcontextversion{2022.10.22 11:20}
 
 %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 5dfadb660..86374e2d7 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -49,7 +49,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2022.10.21 21:11}
+\edef\contextversion{2022.10.22 11:20}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/phys-dim.mkiv b/tex/context/base/mkiv/phys-dim.mkiv
index b390ce64a..a05300cce 100644
--- a/tex/context/base/mkiv/phys-dim.mkiv
+++ b/tex/context/base/mkiv/phys-dim.mkiv
@@ -170,9 +170,8 @@
 % \definesymbol[units][times][\ifmmode\cdot\else\kern.2\emwidth\cdot\kern.2\emwidth\fi]
 
 \unexpanded\def\digitstextbinop#1% assumes preceding
-  {\ifmmode#1\else\fourperemspace\nobreak#1\fourperemspace\fi}
+  {\ifmmode\mathord{#1}\else\nobreak#1\fi}
 
-%def\digitstimessymbol{\ifmmode\cdot\else\digitstextbinop\cdot\fi}
 \def\digitstimessymbol{\digitstextbinop\times}
 
 \unexpanded\def\digitszeropadding   {\hphantom{0}}
@@ -406,8 +405,13 @@
 %    \endcsname}
 
 \unexpanded\def\phys_units_separator
-  {\edef\currentunitsseparator{\unitparameter\c!separator}% no longer needed
-   \ifcsname\??unitseparator\currentunitsseparator\endcsname\lastnamedcs\else\cdot\fi}
+  {\ifcsname\??unitseparator\unitparameter\c!separator\endcsname
+     \lastnamedcs
+   \else
+     \csname\??unitseparator\v!normal\endcsname
+   \fi}
+
+\installunitsseparator\v!normal{\ifmmode\mathord{\cdot}\else\cdot\fi}
 
 \installunitsseparator\v!normal {\cdot}
 \installunitsseparator\v!big    {\unitsbigspace}
@@ -521,9 +525,6 @@
   {\edef\p_order{\unitparameter\c!order}%
    \ifx\p_order\v!reverse\expandafter\clf_unit_reverse\else\expandafter\clf_unit_normal\fi{\detokenize{#1}}}
 
-\unexpanded\def\digitstextbinnop#1%
-  {\ifmmode#1\else#1\fourperemspace\fi}
-
 \unexpanded\def\unitsPUS#1#2#3{\phys_units_next\prefixtext{#1}\unittext{#2}\unitsraise{\suffixtext{#3}}\c_phys_units_state\plusone} % suffix
 \unexpanded\def\unitsPU   #1#2{\phys_units_next\prefixtext{#1}\unittext{#2}\c_phys_units_state\plusthree}                           % unit
 \unexpanded\def\unitsPS   #1#2{\phys_units_next\prefixtext{#1}\unitsraise{\suffixtext{#2}}\c_phys_units_state\plusone}              % suffix
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 66cc6048a..c02ca06bf 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 e798b7a58..8c4741da4 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf