1 files changed, 23 insertions, 33 deletions
diff --git a/tex/context/base/mkiv/spac-ver.mkxl b/tex/context/base/mkiv/spac-ver.mkxl
index 5b18ea7d3..b69c1d33c 100644
--- a/tex/context/base/mkiv/spac-ver.mkxl
+++ b/tex/context/base/mkiv/spac-ver.mkxl
@@ -64,14 +64,6 @@
 \def\skipfactor    {.75}
 \def\skipgluefactor{.25}
 
-% \def\normalskipamount
-%   {\openlineheight
-%      \ifgridsnapping \else \ifblankflexible
-%        \s!plus \skipgluefactor\openlineheight
-%        \s!minus\skipgluefactor\openlineheight
-%      \fi \fi
-%    \relax}
-
 \def\normalskipamount
   {\openlineheight
      \ifgridsnapping \orelse \ifblankflexible
@@ -793,8 +785,6 @@
    \else
      \edef\spacingfactor{#1}%
    \fi
- % \edef\systemtopskipfactor {\withoutpt\the\dimexpr#1\dimexpr\topskipfactor \points}%
- % \edef\systemmaxdepthfactor{\withoutpt\the\dimexpr#1\dimexpr\maxdepthfactor\points}%
    \edef\systemtopskipfactor {\thewithoutunit\dimexpr#1\dimexpr\topskipfactor \points}%
    \edef\systemmaxdepthfactor{\thewithoutunit\dimexpr#1\dimexpr\maxdepthfactor\points}%
    \setnormalbaselines
@@ -1514,14 +1504,14 @@
 \newdimen \globalbodyfontstrutheight
 \newdimen \globalbodyfontstrutdepth
 
-\def\snappedvboxattribute{\ifgridsnapping attr       \snapvboxattribute \attribute\snapmethodattribute\fi}
-\def\setlocalgridsnapping{\ifgridsnapping \attribute \snapvboxattribute \attribute\snapmethodattribute\fi}
+\def\snappedvboxattribute{\ifgridsnapping    attr\snapvboxattribute\c_attr_snapmethod\fi}
+\def\setlocalgridsnapping{\ifgridsnapping \c_attr_snapvbox         \c_attr_snapmethod\fi}
 
 \def\spac_grids_set_local_snapping#1%
   {\ifgridsnapping
      \doifsomething{#1}%
        {\spac_grids_snap_value_set{#1}%
-        \attribute \snapvboxattribute \attribute\snapmethodattribute}%
+        \c_attr_snapvbox\c_attr_snapmethod}%
    \fi}
 
 \def\spac_grids_expand_snapper#1%
@@ -1541,7 +1531,7 @@
      \scratchcounter\clf_definesnapmethod{#1}{\m_spac_snapper}%
      \setevalue{\??gridsnapperattributes\currentsnapper}{\the\scratchcounter}%
    \fi
-   \setevalue{\??gridsnappers#1}{\attribute\snapmethodattribute\the\scratchcounter\relax}%
+   \setevalue{\??gridsnappers#1}{\c_attr_snapmethod\the\scratchcounter\relax}%
    \letvalue{\??gridsnappersets#1}\m_spac_snapper}
 
 \def\theexpandedsnapperset#1{\begincsname\??gridsnappersets#1\endcsname} % only for manuals
@@ -1549,10 +1539,10 @@
 \unexpanded\def\usegridparameter#1% no checking here
   {\edef\m_spac_grid_asked{#1\c!grid}%
    \ifempty\m_spac_grid_asked
-     \attribute \snapvboxattribute\attributeunsetvalue
+     \c_attr_snapvbox\attributeunsetvalue
    \else
      \spac_grids_snap_value_set\m_spac_grid_asked
-     \attribute \snapvboxattribute\attribute\snapmethodattribute
+     \c_attr_snapvbox\c_attr_snapmethod
    \fi}
 
 \unexpanded\def\definegridsnapping
@@ -1563,7 +1553,7 @@
 
 \edef\spac_grids_snap_value_reset
   {%\gridsnappingfalse
-   \attribute\snapmethodattribute\attributeunsetvalue}
+   \c_attr_snapmethod\attributeunsetvalue}
 
 \def\spac_grids_snap_value_set#1%
   {%\gridsnappingtrue
@@ -1724,7 +1714,7 @@
      \clf_vspacingcollapse\nextbox\relax % isn't that already done?
    \fi
    \doifelsenothing{#1}{\spac_grids_snap_value_set\v!normal}{\spac_grids_snap_value_set{#1}}%
-   \clf_vspacingsnap\nextbox\attribute\snapmethodattribute\relax
+   \clf_vspacingsnap\nextbox\c_attr_snapmethod\relax
    \ifvbox\nextbox\vbox\else\hbox\fi attr \snapmethodattribute \zerocount {\box\nextbox}% no pack (?), we snap
    \egroup}
 
@@ -1953,7 +1943,7 @@
    \clf_vspacingsetamount{#1}}
 
 \def\spac_vspacing_no_topskip % use grouped
-  {\attribute\skipcategoryattribute\plusten}
+  {\c_attr_skipcategory\plusten}
 
 % \installcorenamespace{vspacingamountnormal}
 % \installcorenamespace{vspacingamountgrid}
@@ -1984,9 +1974,9 @@
 
 \appendtoks
     \s_spac_vspacing_temp\zeropoint
-    \attribute\skipcategoryattribute\plusone
-    \attribute\skippenaltyattribute \attributeunsetvalue
-    \attribute\skiporderattribute   \attributeunsetvalue
+    \c_attr_skipcategory\plusone
+    \c_attr_skippenalty \attributeunsetvalue
+    \c_attr_skiporder   \attributeunsetvalue
     \ifgridsnapping
         \settrue\c_space_vspacing_fixed
     \else
@@ -2008,10 +1998,10 @@
 
 \unexpanded\def\setblankcategory#1%
   {\settrue\c_space_vspacing_done
-   \attribute\skipcategoryattribute#1\relax}
+   \c_attr_skipcategory#1\relax}
 
 \unexpanded\def\setblankorder#1%
-  {\attribute\skiporderattribute#1\relax}
+  {\c_attr_skiporder#1\relax}
 
 \unexpanded\def\fixedblankskip
   {\settrue\c_space_vspacing_fixed}
@@ -2026,8 +2016,8 @@
 \unexpanded\def\setblankpenalty#1%
   {\flushblankhandling
    \settrue\c_space_vspacing_done
-   \attribute\skipcategoryattribute \plusthree
-   \attribute\skippenaltyattribute #1\relax
+   \c_attr_skipcategory\plusthree
+   \c_attr_skippenalty #1\relax
    \flushblankhandling}
 
 \unexpanded\def\startblankhandling % move this to \vspacing
@@ -2175,17 +2165,17 @@
 
 \unexpanded\def\directvpenalty#1%
   {\begingroup
-   \attribute\skipcategoryattribute \plusthree
-   \attribute\skippenaltyattribute  #1\relax
-   \attribute\skiporderattribute    \attributeunsetvalue
+   \c_attr_skipcategory\plusthree
+   \c_attr_skippenalty #1\relax
+   \c_attr_skiporder   \attributeunsetvalue
    \vskip\zeropoint
    \endgroup}
 
 \unexpanded\def\directvskip#1%
   {\begingroup
-   \attribute\skipcategoryattribute \plusone
-   \attribute\skippenaltyattribute  \attributeunsetvalue
-   \attribute\skiporderattribute    \attributeunsetvalue
+   \c_attr_skipcategory\plusone
+   \c_attr_skippenalty \attributeunsetvalue
+   \c_attr_skiporder   \attributeunsetvalue
    \vskip#1\relax
    \endgroup}
 
@@ -2337,7 +2327,7 @@
 \unexpanded\def\inhibitblank
   {\ifvmode
      \begingroup
-     \attribute\skipcategoryattribute\plusfive
+     \c_attr_skipcategory\plusfive
      \vskip\zeropoint
      \endgroup
    \fi}