1 files changed, 18 insertions, 18 deletions
diff --git a/tex/context/base/mkxl/tabl-xtb.mklx b/tex/context/base/mkxl/tabl-xtb.mklx
index 4f3d1683c..57685bbcd 100644
--- a/tex/context/base/mkxl/tabl-xtb.mklx
+++ b/tex/context/base/mkxl/tabl-xtb.mklx
@@ -82,21 +82,21 @@
       {\signalcharacter}% not used
 \to \everyenableelements
 
-\newdimen\d_tabl_x_width
-\newdimen\d_tabl_x_height
-\newdimen\d_tabl_x_depth        % not used
-\newdimen\d_tabl_x_distance
-\newcount\c_tabl_x_nx
-\newcount\c_tabl_x_ny
-\newcount\c_tabl_x_mode
-\newbox  \b_tabl_x
-\newcount\c_tabl_x_state        % 0=empty 1=content 3=splitleft
-\newdimen\d_tabl_x_final_width
-\newcount\c_tabl_x_nesting
-\newcount\c_tabl_x_skip_mode    % 1 = skip
-\newdimen\d_tabl_x_textwidth
-\newcount\c_tabl_x_swapped
-\newcount\c_tabl_x_swapped_max
+\newdimension\d_tabl_x_width
+\newdimension\d_tabl_x_height
+\newdimension\d_tabl_x_depth        % not used
+\newdimension\d_tabl_x_distance
+\newinteger  \c_tabl_x_nx
+\newinteger  \c_tabl_x_ny
+\newinteger  \c_tabl_x_mode
+\newbox      \b_tabl_x
+\newinteger  \c_tabl_x_state        % 0=empty 1=content 3=splitleft
+\newdimension\d_tabl_x_final_width
+\newinteger  \c_tabl_x_nesting
+\newinteger  \c_tabl_x_skip_mode    % 1 = skip
+\newdimension\d_tabl_x_textwidth
+\newinteger  \c_tabl_x_swapped
+\newinteger  \c_tabl_x_swapped_max
 
 \lettonothing\m_tabl_x_swapped_settings
 
@@ -216,7 +216,7 @@
 \protected\def\tabl_x_start_named[#tag]#spacer[#settings]%
   {\bgroup
    \edef\currentxtable{#tag}%
-   \advance\c_tabl_x_nesting\plusone
+   \advanceby\c_tabl_x_nesting\plusone
    \dostarttaggedchained\t!table\empty\??xtable
    \setupcurrentxtable[#settings]%
    \tabl_x_check_textwidth
@@ -240,7 +240,7 @@
 \newtoks\everypreparextable
 
 \protected\def\tabl_x_prepare#settings%
-  {\advance\c_tabl_x_nesting\plusone
+  {\advanceby\c_tabl_x_nesting\plusone
    \dostarttaggedchained\t!table\empty\??xtable
    \tabl_x_set_checked{#settings}%
    \tabl_x_check_textwidth
@@ -899,7 +899,7 @@
    \expandafter\let\expandafter\t_tabl_x_swapped\csname\??xtableswap\number\c_tabl_x_swapped\endcsname}
 
 \def\tabl_x_collect_advance
-  {\global\advance\c_tabl_x_swapped\plusone
+  {\global\advanceby\c_tabl_x_swapped\plusone
    \ifnum\c_tabl_x_swapped>\c_tabl_x_swapped_max
      \global\c_tabl_x_swapped_max\c_tabl_x_swapped
    \fi