1 files changed, 22 insertions, 22 deletions
diff --git a/tex/context/base/mkiv/math-ini.mkiv b/tex/context/base/mkiv/math-ini.mkiv
index 918238fd2..d0e18ff4b 100644
--- a/tex/context/base/mkiv/math-ini.mkiv
+++ b/tex/context/base/mkiv/math-ini.mkiv
@@ -134,12 +134,12 @@
 \fi
 
 \appendtoks
-    \attribute\mathmodeattribute\plusone
+    \c_attr_mathmode\plusone
 \to \everydisplay
 
 \appendtoks
-    \attribute\mathmodeattribute\plusone
-    \attribute\displaymathattribute\plusone
+    \c_attr_mathmode   \plusone
+    \c_attr_displaymath\plusone
 \to \everybeforedisplayformula
 
 \setnewconstant\defaultmathfamily \zerocount % 255
@@ -596,7 +596,7 @@
 
 \appendtoks
     \ifcase\c_math_renderings_attribute\else
-        \attribute\mathrenderingattribute\c_math_renderings_attribute
+        \c_attr_mathrendering\c_math_renderings_attribute
     \fi
 \to \everymathematics
 
@@ -867,10 +867,10 @@
 \let\math_tags_mfunctiontxt\gobbletwoarguments
 \let\math_tags_mfunctionlab\gobbletwoarguments
 
-\unexpanded\def\math_tags_mo_indeed#1{\begingroup            \attribute\mathcategoryattribute\plusone                  #1\endgroup}
-\unexpanded\def\math_tags_mi_indeed#1{\begingroup            \attribute\mathcategoryattribute\plustwo                  #1\endgroup}
-\unexpanded\def\math_tags_mn_indeed#1{\begingroup\mathupright\attribute\mathcategoryattribute\plusthree\math_set_o_both#1\endgroup}
-\unexpanded\def\math_tags_ms_indeed#1{\begingroup\mathupright\attribute\mathcategoryattribute\plusfour \math_set_p_both#1\endgroup} % todo: mathoptext
+\unexpanded\def\math_tags_mo_indeed#1{\begingroup            \c_attr_mathcategory\plusone                  #1\endgroup}
+\unexpanded\def\math_tags_mi_indeed#1{\begingroup            \c_attr_mathcategory\plustwo                  #1\endgroup}
+\unexpanded\def\math_tags_mn_indeed#1{\begingroup\mathupright\c_attr_mathcategory\plusthree\math_set_o_both#1\endgroup}
+\unexpanded\def\math_tags_ms_indeed#1{\begingroup\mathupright\c_attr_mathcategory\plusfour \math_set_p_both#1\endgroup} % todo: mathoptext
 
 \newconditional\c_apply_function
 
@@ -1390,7 +1390,7 @@
 \to \everysetupmathematics
 
 \appendtoks
-    \attribute\mathbidiattribute\ifconditional\c_math_right_to_left\c_math_bidi\else\attributeunsetvalue\fi
+    \c_attr_mathbidi\ifconditional\c_math_right_to_left\c_math_bidi\else\attributeunsetvalue\fi
 \to \everyswitchmathematics
 
 %D Delayed: greek.
@@ -1445,15 +1445,15 @@
 
 % only used local
 
-\unexpanded\def\mathgreekupright{\attribute\mathgreekattribute"222\relax}
-\unexpanded\def\mathgreekitalic {\attribute\mathgreekattribute"333\relax}
-\unexpanded\def\mathgreekdefault{\attribute\mathgreekattribute"000\relax}
+\unexpanded\def\mathgreekupright{\c_attr_mathgreek"222\relax}
+\unexpanded\def\mathgreekitalic {\c_attr_mathgreek"333\relax}
+\unexpanded\def\mathgreekdefault{\c_attr_mathgreek"000\relax}
 
 \let\mathgreeknormal\mathgreekupright
 \let\mathgreeknone  \mathgreekdefault
 
 \appendtoks
-    \attribute\mathgreekattribute\c_math_greek_attribute
+    \c_attr_mathgreek\c_math_greek_attribute
 \to \everymathematics
 
 \setupmathematics
@@ -1488,7 +1488,7 @@
 
 \appendtoks
     \math_collapsing_initialize
-    \attribute\mathcollapsingattribute\c_math_collapsing_attribute
+    \c_attr_mathcollapsing\c_math_collapsing_attribute
 \to \everymathematics
 
 \setupmathematics
@@ -1526,7 +1526,7 @@
 
 \appendtoks
     \math_italics_initialize
-    \attribute\mathitalicsattribute\c_math_italics_attribute
+    \c_attr_mathitalics\c_math_italics_attribute
 \to \everymathematics
 
 % \setupmathematics % done later
@@ -1563,7 +1563,7 @@
 
 \appendtoks
     \math_kernpairs_initialize
-    \attribute\mathkernpairsattribute\c_math_kernpairs_attribute
+    \c_attr_mathkernpairs\c_math_kernpairs_attribute
 \to \everymathematics
 
 \setupmathematics
@@ -1611,13 +1611,13 @@
 %        \mathcode\c_math_period\c_math_special
 %        \let,\math_punctuation_comma
 %        \let.\math_punctuation_period
-%        \attribute\mathpunctuationattribute\plustwo}
+%        \c_attr_mathpunctuation\plustwo}
 %
 %     \unexpanded\gdef\math_punctuation_initialize_yes
-%       {\attribute\mathpunctuationattribute\plustwo}
+%       {\c_attr_mathpunctuation\plustwo}
 %
 %     \unexpanded\gdef\math_punctuation_initialize_nop
-%       {\attribute\mathpunctuationattribute\plusone}
+%       {\c_attr_mathpunctuation\plusone}
 %
 % \egroup
 %
@@ -2828,7 +2828,7 @@
 \to \everyswitchmathematics % only in mathematics
 
 \appendtoks
-    \attribute\mathdomainattribute\c_math_domain_attribute
+    \c_attr_mathdomain\c_math_domain_attribute
 \to \everymathematics
 
 \setupmathematics
@@ -2902,11 +2902,11 @@
 %D Experiment
 
 \unexpanded\def\math_scripts_stack
-  {\attribute\mathunstackattribute\attributeunsetvalue}
+  {\c_attr_mathunstack\attributeunsetvalue}
 
 \unexpanded\def\math_scripts_unstack
   {\clf_enablescriptunstacking
-   \attribute\mathunstackattribute\plusone}
+   \c_attr_mathunstack\plusone}
 
 \appendtoks
     \let\stackscripts  \math_scripts_stack