1 files changed, 17 insertions, 17 deletions
diff --git a/tex/context/base/font-ini.mkvi b/tex/context/base/font-ini.mkvi
index 3e9660cf3..2bf4c49dd 100644
--- a/tex/context/base/font-ini.mkvi
+++ b/tex/context/base/font-ini.mkvi
@@ -618,7 +618,7 @@
 
 \def\font_helpers_set_math_family#mrfam#familytag%
   {\ifconditional\optimizemathfontdefinitions
-     \ifcsname*\fontclass\textface\s!mm#familytag1\fontsize1*\endcsname
+     \ifcsname\??fontsclass\fontclass\textface\s!mm#familytag1\fontsize1\endcsname
        \font_helpers_preset_math_family_indeed#mrfam#familytag%
      \else
        \font_helpers_set_math_family_indeed#mrfam#familytag%
@@ -629,7 +629,7 @@
 
 \def\font_helpers_set_math_family_bold#mbfam#familytag#mrfam%
   {\ifconditional\optimizemathfontdefinitions
-     \ifcsname*\fontclass\textface\s!mm#familytag1\fontsize1*\endcsname
+     \ifcsname\??fontsclass\fontclass\textface\s!mm#familytag1\fontsize1\endcsname
        \font_helpers_preset_math_family_indeed#mbfam#familytag%
      \else
        \font_helpers_set_math_family_bold_indeed#mbfam#familytag#mrfam%
@@ -639,9 +639,9 @@
    \fi}
 
 \def\font_helpers_preset_math_family_indeed#fam#familytag%
-  {\scriptscriptfont#fam\csname*\fontclass\scriptscriptface\s!mm#familytag3\fontsize3*\endcsname
-   \scriptfont      #fam\csname*\fontclass\scriptface      \s!mm#familytag2\fontsize2*\endcsname
-   \textfont        #fam\csname*\fontclass\textface        \s!mm#familytag1\fontsize1*\endcsname}
+  {\scriptscriptfont#fam\csname\??fontsclass\fontclass\scriptscriptface\s!mm#familytag3\fontsize3\endcsname
+   \scriptfont      #fam\csname\??fontsclass\fontclass\scriptface      \s!mm#familytag2\fontsize2\endcsname
+   \textfont        #fam\csname\??fontsclass\fontclass\textface        \s!mm#familytag1\fontsize1\endcsname}
 
 \let\font_helpers_reset_fontclass_math_families\gobbleoneargument
 
@@ -1540,8 +1540,8 @@
 % todo: now mathsize twice in name (so it can go here)
 % todo: check when mathsize is needed
 
-\installcorenamespace {fontsbasic}
-\installcorenamespace {fontsclass}
+\installcorenamespace{fontsbasic}
+\installcorenamespace{fontsclass}
 
 \newconditional\font_auto_font_size \settrue\font_auto_font_size
 
@@ -1556,7 +1556,7 @@
 \let\v_font_identifier_basic_saved\v_font_identifier_basic
 \let\v_font_identifier_class_saved\v_font_identifier_class
 
-% \def\v_font_identifier_class{*\fontclass\lastfontidentifier\fontstyle\fontsize*} % no \currentmathsize
+% \def\v_font_identifier_class{\??fontsclass\fontclass\lastfontidentifier\fontstyle\fontsize} % no \currentmathsize
 
 \def\font_basics_define_font_without_parameters#identifier#2%
   {\c_font_feature_inheritance_mode\c_font_feature_inheritance_fontonly
@@ -2092,28 +2092,28 @@
 
 \def\font_basics_define_body_font_nop_xx#style#body[#one#two#rest=#value]%
   {\ifcsname#style#one#two#rest\endcsname\else\font_basics_check_bodyfont{#style}{#one#two}{#rest}\fi
-   \expandafter\let\csname*#body#style#one#two#rest*\endcsname\undefined
+   \expandafter\let\csname\??fontsclass#body#style#one#two#rest\endcsname\undefined
    \unexpanded\expandafter\normaledef\csname#body#style#one#two#rest\endcsname{\font_helpers_trigger{#body#style#one#two#rest}{\number\p_font_rscale}{#body}{\normalunexpanded{#value}}}}
 
 \def\font_basics_define_body_font_yes_xx#style#body[#one#two#rest=#value]%
   {\ifcsname#style#one#two#rest\endcsname\else\font_basics_check_bodyfont{#style}{#one#two}{#rest}\fi
-   \global\expandafter\let\csname*\fontclass#body#style#one#two#rest*\endcsname\undefined
+   \global\expandafter\let\csname\??fontsclass\fontclass#body#style#one#two#rest\endcsname\undefined
    \unexpanded\expandafter\normalxdef\csname\fontclass#body#style#one#two#rest\endcsname{\font_helpers_trigger{#body#style#one#two#rest}{\number\p_font_rscale}{#body}{\normalunexpanded{#value}}}}
 
 \def\font_basics_define_body_font_nop_mm#style#body[#one#two#rest=#value]%
   {\ifcsname#style#one#two#rest\endcsname\else\font_basics_check_bodyfont{#style}{#one#two}{#rest}\fi
-   \expandafter\let\csname*#body#style#one#two#rest1*\endcsname\undefined
-   \expandafter\let\csname*#body#style#one#two#rest2*\endcsname\undefined
-   \expandafter\let\csname*#body#style#one#two#rest3*\endcsname\undefined
+   \expandafter\let\csname\??fontsclass#body#style#one#two#rest1\endcsname\undefined
+   \expandafter\let\csname\??fontsclass#body#style#one#two#rest2\endcsname\undefined
+   \expandafter\let\csname\??fontsclass#body#style#one#two#rest3\endcsname\undefined
    \unexpanded\expandafter\normaledef\csname#body#style#one#two#rest1\endcsname{\font_helpers_trigger{#body#style#one#two#rest1}{\number\p_font_rscale}{#body}{\normalunexpanded{#value}}}%
    \unexpanded\expandafter\normaledef\csname#body#style#one#two#rest2\endcsname{\font_helpers_trigger{#body#style#one#two#rest2}{\number\p_font_rscale}{#body}{\normalunexpanded{#value}}}%
    \unexpanded\expandafter\normaledef\csname#body#style#one#two#rest3\endcsname{\font_helpers_trigger{#body#style#one#two#rest3}{\number\p_font_rscale}{#body}{\normalunexpanded{#value}}}}
 
 \def\font_basics_define_body_font_yes_mm#style#body[#one#two#rest=#value]%
   {\ifcsname#style#one#two#rest\endcsname\else\font_basics_check_bodyfont{#style}{#one#two}{#rest}\fi
-   \global\expandafter\let\csname*\fontclass#body#style#one#two#rest1*\endcsname\undefined
-   \global\expandafter\let\csname*\fontclass#body#style#one#two#rest2*\endcsname\undefined
-   \global\expandafter\let\csname*\fontclass#body#style#one#two#rest3*\endcsname\undefined
+   \global\expandafter\let\csname\??fontsclass\fontclass#body#style#one#two#rest1\endcsname\undefined
+   \global\expandafter\let\csname\??fontsclass\fontclass#body#style#one#two#rest2\endcsname\undefined
+   \global\expandafter\let\csname\??fontsclass\fontclass#body#style#one#two#rest3\endcsname\undefined
    \unexpanded\expandafter\normalxdef\csname\fontclass#body#style#one#two#rest1\endcsname{\font_helpers_trigger{#body#style#one#two#rest1}{\number\p_font_rscale}{#body}{\normalunexpanded{#value}}}%
    \unexpanded\expandafter\normalxdef\csname\fontclass#body#style#one#two#rest2\endcsname{\font_helpers_trigger{#body#style#one#two#rest2}{\number\p_font_rscale}{#body}{\normalunexpanded{#value}}}%
    \unexpanded\expandafter\normalxdef\csname\fontclass#body#style#one#two#rest3\endcsname{\font_helpers_trigger{#body#style#one#two#rest3}{\number\p_font_rscale}{#body}{\normalunexpanded{#value}}}}
@@ -3684,7 +3684,7 @@
 %D Since we know what scaling it to be applied, we can
 %D implement a much faster alternative:
 
-\installcorenamespace {symbolfont}
+\installcorenamespace{symbolfont}
 
 \let\thedefinedfont\relax