1 files changed, 112 insertions, 115 deletions
diff --git a/tex/context/base/mkxl/tabl-ntb.mkxl b/tex/context/base/mkxl/tabl-ntb.mkxl
index 59777fb9b..147cb30f5 100644
--- a/tex/context/base/mkxl/tabl-ntb.mkxl
+++ b/tex/context/base/mkxl/tabl-ntb.mkxl
@@ -139,64 +139,64 @@
 %      \fi
 %    \fi}
 
-\newcount\c_tabl_ntb_row
-\newcount\c_tabl_ntb_col
-\newcount\c_tabl_ntb_spn
+\newinteger    \c_tabl_ntb_row
+\newinteger    \c_tabl_ntb_col
+\newinteger    \c_tabl_ntb_spn
 
-\newcount\c_tabl_ntb_nx
-\newcount\c_tabl_ntb_ny
+\newinteger    \c_tabl_ntb_nx
+\newinteger    \c_tabl_ntb_ny
 
 \setnewconstant\c_tabl_ntb_cell \plusone
 \setnewconstant\c_tabl_ntb_none \plustwo
 
-\newcount\c_tabl_ntb_current_row
-\newcount\c_tabl_ntb_current_col
-\newcount\c_tabl_ntb_current_row_one
-\newcount\c_tabl_ntb_current_col_one
-\newcount\c_tabl_ntb_current_row_two
-\newcount\c_tabl_ntb_current_col_two
-\newcount\c_tabl_ntb_current_row_three
-\newcount\c_tabl_ntb_current_col_three
-\newcount\c_tabl_ntb_current_row_four
-\newcount\c_tabl_ntb_current_col_four
+\newinteger    \c_tabl_ntb_current_row
+\newinteger    \c_tabl_ntb_current_col
+\newinteger    \c_tabl_ntb_current_row_one
+\newinteger    \c_tabl_ntb_current_col_one
+\newinteger    \c_tabl_ntb_current_row_two
+\newinteger    \c_tabl_ntb_current_col_two
+\newinteger    \c_tabl_ntb_current_row_three
+\newinteger    \c_tabl_ntb_current_col_three
+\newinteger    \c_tabl_ntb_current_row_four
+\newinteger    \c_tabl_ntb_current_col_four
 
-\newcount\c_tabl_ntb_running_col
-\newcount\c_tabl_ntb_maximum_row
-\newcount\c_tabl_ntb_maximum_col
-\newcount\c_tabl_ntb_maximum_row_span
-\newcount\c_tabl_ntb_maximum_col_span
+\newinteger    \c_tabl_ntb_running_col
+\newinteger    \c_tabl_ntb_maximum_row
+\newinteger    \c_tabl_ntb_maximum_col
+\newinteger    \c_tabl_ntb_maximum_row_span
+\newinteger    \c_tabl_ntb_maximum_col_span
 
-\newcount\c_tabl_ntb_encountered_col
-\newcount\c_tabl_ntb_encountered_max
+\newinteger    \c_tabl_ntb_encountered_col
+\newinteger    \c_tabl_ntb_encountered_max
 
-\newtoks\t_tabl_ntb
-\newtoks\t_tabl_ntb_row
+\newtoks       \t_tabl_ntb
+\newtoks       \t_tabl_ntb_row
 
-\newconstant\c_tabl_tbl_pass
+\newconstant   \c_tabl_tbl_pass
 
-\newtoks\t_tabl_ntb_head
-\newtoks\t_tabl_ntb_next
-\newtoks\t_tabl_ntb_body
-\newtoks\t_tabl_ntb_foot
+\newtoks       \t_tabl_ntb_head
+\newtoks       \t_tabl_ntb_next
+\newtoks       \t_tabl_ntb_body
+\newtoks       \t_tabl_ntb_foot
 
-\newcount\c_tabl_ntb_n_of_head_lines
-\newcount\c_tabl_ntb_n_of_next_lines
-\newcount\c_tabl_ntb_n_of_hdnx_lines
+\newinteger    \c_tabl_ntb_n_of_head_lines
+\newinteger    \c_tabl_ntb_n_of_next_lines
+\newinteger    \c_tabl_ntb_n_of_hdnx_lines
 
-\newdimen\d_tabl_ntb_height
-\newdimen\d_tabl_ntb_width
+\newdimension  \d_tabl_ntb_height
+\newdimension  \d_tabl_ntb_width
 
-\newdimen\d_tabl_ntb_leftmargindistance
-\newdimen\d_tabl_ntb_rightmargindistance
-\newdimen\d_tabl_ntb_columndistance
-\newdimen\d_tabl_ntb_maxwidth
+\newdimension  \d_tabl_ntb_leftmargindistance
+\newdimension  \d_tabl_ntb_rightmargindistance
+\newdimension  \d_tabl_ntb_columndistance
+\newdimension  \d_tabl_ntb_maxwidth
 
-\newtoks\everyTABLEpass    % public
+\newtoks       \everyTABLEpass    % public
 
-\newcount\tablecellrows    % public (needs checking)
-\newcount\tablecellcolumns % public (needs checking)
+\newinteger    \tablecellrows    % public (needs checking)
+\newinteger    \tablecellcolumns % public (needs checking)
 
-\newbox\b_tabl_ntb_final
+\newbox        \b_tabl_ntb_final
 
 %D For tagging and export:
 
@@ -256,7 +256,7 @@
 %D We have already prepared the previous macros for nesting, so we only have to pop
 %D in the right ones:
 
-\newcount\c_tabl_level
+\newinteger\c_tabl_level
 
 \installglobalmacrostack\m_tabl_ntb_saved_row
 \installglobalmacrostack\m_tabl_ntb_saved_col
@@ -280,11 +280,11 @@
    \fi}
 
 \protected\def\tabl_ntb_next_level
-  {\advance\c_tabl_level\plusone
+  {\advanceby\c_tabl_level\plusone
    \edef\m_tabl_tbl_level{\the\c_tabl_level}}
 
 \protected\def\tabl_ntb_prev_level
-  {\advance\c_tabl_level\minusone
+  {\advanceby\c_tabl_level\minusone
    \edef\m_tabl_tbl_level{\the\c_tabl_level}}
 
 \tabl_ntb_next_level % go to level 1
@@ -736,7 +736,7 @@
 \tolerant\protected\def\tabl_ntb_tr[#1]%
   {\c_tabl_ntb_running_col\zerocount
    \c_tabl_ntb_encountered_col\zerocount
-   \advance\c_tabl_ntb_maximum_row\plusone
+   \advanceby\c_tabl_ntb_maximum_row\plusone
    \ifparameter#1\or
      \expandafter\tabl_ntb_tr_yes
    \else
@@ -750,7 +750,7 @@
 \def\m_tabl_ntb_default_nc{\naturaltableparameter\c!nc}
 
 \tolerant\protected\def\tabl_ntb_td[#1]%
-  {\advance\c_tabl_ntb_encountered_col\plusone
+  {\advanceby\c_tabl_ntb_encountered_col\plusone
    \ifparameter#1\or
      \expandafter\tabl_ntb_td_yes
    \else
@@ -774,7 +774,7 @@
    \edef\m_tabl_ntb_m{\naturaltableparameter\c!m}%
    %
    \ifempty\m_tabl_ntb_n
-     \global\advance\c_tabl_ntb_spn\c_tabl_ntb_nx\relax
+     \global\advanceby\c_tabl_ntb_spn\c_tabl_ntb_nx\relax
    \orelse\ifnum\m_tabl_ntb_n=\c_tabl_ntb_running_col
    \else
      \tabl_ntb_td_pass_n{#1}%
@@ -785,7 +785,7 @@
      \tabl_ntb_td_pass_m{#1}%
    \fi
    \localcontrolledloop\plusone\maxcard\plusone % skip over columns that result from earlier span
-     {\advance\c_tabl_ntb_running_col\plusone
+     {\advanceby\c_tabl_ntb_running_col\plusone
       \ifcsname\tabl_ntb_tag_pattern\c_tabl_ntb_maximum_row\c_tabl_ntb_running_col\endcsname \else
         \quitloop
       \fi}%
@@ -818,9 +818,9 @@
    \fi}
 
 \def\tabl_ntb_td_nop[#1]#2\eTD
-  {\global\advance\c_tabl_ntb_spn\plusone\relax
+  {\global\advanceby\c_tabl_ntb_spn\plusone\relax
    \localcontrolledloop\plusone\maxcard\plusone
-     {\advance\c_tabl_ntb_running_col\plusone
+     {\advanceby\c_tabl_ntb_running_col\plusone
       \ifcsname\tabl_ntb_tag_pattern\c_tabl_ntb_maximum_row\c_tabl_ntb_running_col\endcsname \else
         \quitloop
       \fi}%
@@ -870,7 +870,7 @@
    \c_tabl_ntb_current_col\c_tabl_ntb_running_col
    \localcontrolledloop\plusone\c_tabl_ntb_ny\plusone{\tabl_ntb_cell_preset_rows}%
    % check max column
-   \advance\c_tabl_ntb_current_col\minusone
+   \advanceby\c_tabl_ntb_current_col\minusone
    \ifnum\c_tabl_ntb_current_col>\c_tabl_ntb_maximum_col\relax
      \c_tabl_ntb_maximum_col\c_tabl_ntb_current_col
    \fi}
@@ -882,11 +882,11 @@
      \c_tabl_ntb_maximum_row_span\c_tabl_ntb_nx
    \fi
    \localcontrolledloop\plusone\c_tabl_ntb_nx\plusone{\tabl_ntb_cell_preset_cells}%
-   \advance\c_tabl_ntb_current_row\plusone}
+   \advanceby\c_tabl_ntb_current_row\plusone}
 
 \def\tabl_ntb_cell_preset_cells
   {\tabl_ntb_let_tag\c_tabl_ntb_current_row\c_tabl_ntb_current_col\c_tabl_ntb_none
-   \advance\c_tabl_ntb_current_col\plusone}
+   \advanceby\c_tabl_ntb_current_col\plusone}
 
 %D The usage of n and m:
 %D
@@ -1171,7 +1171,7 @@
         {\ifcsname\tabl_ntb_tag_pattern\c_tabl_ntb_current_row_one\c_tabl_ntb_current_col_one\endcsname
            \quitloop
          \else
-           \advance\c_tabl_ntb_current_col_one\plusone
+           \advanceby\c_tabl_ntb_current_col_one\plusone
            \ifnum\c_tabl_ntb_current_col_one>\c_tabl_ntb_maximum_col\relax
              \quitloop
            \fi
@@ -1181,7 +1181,7 @@
       \else
         \c_tabl_ntb_current_row_two\c_tabl_ntb_current_row_one
         \c_tabl_ntb_current_col_two\c_tabl_ntb_current_col_one
-        \advance\c_tabl_ntb_current_row_one\plusone
+        \advanceby\c_tabl_ntb_current_row_one\plusone
         \ifnum\c_tabl_ntb_current_row_one>\c_tabl_ntb_maximum_row
           \quitloop
         \fi
@@ -1196,8 +1196,8 @@
       \tabl_ntb_set_col\c_tabl_ntb_current_row_one\c_tabl_ntb_current_col_one\c_tabl_ntb_current_col_two
       \localcontrolledloop\plusone\c_tabl_ntb_current_col_two\plusone
         {\tabl_ntb_let_tag\c_tabl_ntb_current_row_one\c_tabl_ntb_current_col_one\c_tabl_ntb_none
-         \advance\c_tabl_ntb_current_col_one\plusone}%
-      \advance\c_tabl_ntb_current_row_one\plusone}%
+         \advanceby\c_tabl_ntb_current_col_one\plusone}%
+      \advanceby\c_tabl_ntb_current_row_one\plusone}%
    \tabl_ntb_let_tag\c_tabl_ntb_current_row\c_tabl_ntb_current_col\c_tabl_ntb_cell
    \tabl_ntb_set_col\c_tabl_ntb_current_row\c_tabl_ntb_current_col\c_tabl_ntb_current_col_two
    \tabl_ntb_set_row\c_tabl_ntb_current_row\c_tabl_ntb_current_col\c_tabl_ntb_current_row_two%
@@ -1235,7 +1235,7 @@
 \mutable\let\startTBLprocessing\relax % public
 \mutable\let\stopTBLprocessing \relax % public
 
-\newcount\c_tabl_prelocated_rows % \prelocateTBLrows{1000} may speed up large tables
+\newinteger\c_tabl_prelocated_rows % \prelocateTBLrows{1000} may speed up large tables
 
 % \def\tabl_ntb_row_start{\t_tabl_ntb_row\emptytoks}
 % \def\tabl_ntb_row_stop {\normalexpanded{\t_tabl_ntb{\the\t_tabl_ntb\noexpand\tabl_ntb_row_align_start\the\t_tabl_ntb_row\tabl_ntb_row_align_stop}}}
@@ -1368,7 +1368,7 @@
    \fi}
 
 \protected\def\tabl_ntb_row_align_start
-  {\global\advance\c_tabl_ntb_row\plusone
+  {\global\advanceby\c_tabl_ntb_row\plusone
    \global\c_tabl_ntb_col\plusone
    \global\c_tabl_ntb_spn\zerocount
    \tabl_ntb_row_align_start_inject
@@ -1451,7 +1451,7 @@
    \global\c_tabl_ntb_spn\zerocount
    \global\c_tabl_ntb_col\zerocount
    \global\c_tabl_ntb_row\zerocount
-   \global\advance\c_tabl_ntb_row\minusone
+   \global\advanceby\c_tabl_ntb_row\minusone
    \dostarttaggedchained\t!table\empty\??naturaltable
   %\registerparoptions % (*) triggers max hsize
    \the\t_tabl_ntb
@@ -1461,13 +1461,13 @@
   {\hskip\tabl_ntb_get_dis\c_tabl_ntb_col
    \localcontrolledloop\plusone#1\plusone
      {\hskip\tabl_ntb_get_wid\c_tabl_ntb_col\relax
-      \global\advance\c_tabl_ntb_col\plusone}}
+      \global\advanceby\c_tabl_ntb_col\plusone}}
 
 \protected\def\tabl_ntb_skip#1%
-  {\global\advance\c_tabl_ntb_col#1\relax}
+  {\global\advanceby\c_tabl_ntb_col#1\relax}
 
 \protected\def\tabl_ntb_plus
-  {\global\advance\c_tabl_ntb_col\plusone
+  {\global\advanceby\c_tabl_ntb_col\plusone
    \kern\d_tabl_ntb_columndistance}
 
 \defcsname\??naturaltablecell\the\c_tabl_ntb_none\endcsname#1#2%
@@ -1507,20 +1507,20 @@
    \scratchcounter\c_tabl_ntb_col
    \scratchcounterone\tabl_ntb_get_col{#1}{#2}\relax
    \ifcase\scratchcounterone\or
-     \advance\d_tabl_ntb_width\dimexpr % no need for dimexpr
+     \advanceby\d_tabl_ntb_width\dimexpr % no need for dimexpr
        \tabl_ntb_get_wid\scratchcounter
      \relax
-     \advance\scratchcounter\plusone
+     \advanceby\scratchcounter\plusone
    \else
      \localcontrolledloop\plusone\scratchcounterone\plusone
-       {\advance\d_tabl_ntb_width\dimexpr
+       {\advanceby\d_tabl_ntb_width\dimexpr
           \tabl_ntb_get_wid\scratchcounter
           \ifnum\currentloopiterator<\scratchcounterone
             +\d_tabl_ntb_columndistance
             +\tabl_ntb_get_dis\scratchcounter
           \fi
         \relax
-        \advance\scratchcounter\plusone}%
+        \advanceby\scratchcounter\plusone}%
    \fi
    \setbox\scratchbox\hbox{\tabl_ntb_get_txt{#1}{#2}}%
    \tabl_ntb_set_ht{#1}{#2}\ht\scratchbox
@@ -1543,8 +1543,8 @@
    \else
      \scratchcounter#1\relax
      \localcontrolledloop\plusone\scratchcountertwo\plusone
-       {\advance\d_tabl_ntb_height\tabl_ntb_get_hei\scratchcounter
-        \advance\scratchcounter\plusone}%
+       {\advanceby\d_tabl_ntb_height\tabl_ntb_get_hei\scratchcounter
+        \advanceby\scratchcounter\plusone}%
      \ifdim\d_tabl_ntb_height<\scratchheight\relax
        \d_tabl_ntb_height\scratchheight
      \fi
@@ -1553,20 +1553,20 @@
    \d_tabl_ntb_width\zeropoint
    \scratchcounter\c_tabl_ntb_col
    \ifcase\scratchcounterone\or
-     \advance\d_tabl_ntb_width\dimexpr
+     \advanceby\d_tabl_ntb_width\dimexpr
        \tabl_ntb_get_wid\scratchcounter
      \relax
-     \advance\scratchcounter\plusone
+     \advanceby\scratchcounter\plusone
    \else
      \localcontrolledloop\plusone\scratchcounterone\plusone
-       {\advance\d_tabl_ntb_width\dimexpr
+       {\advanceby\d_tabl_ntb_width\dimexpr
           \tabl_ntb_get_wid\scratchcounter
           \ifnum\currentloopiterator<\scratchcounterone
             +\d_tabl_ntb_columndistance
             +\tabl_ntb_get_dis\scratchcounter
           \fi
         \relax
-        \advance\scratchcounter\plusone}%
+        \advanceby\scratchcounter\plusone}%
    \fi
    % cell
    \setbox\scratchbox\hbox attr \taggedattribute \c_attr_tagged \bgroup
@@ -1615,8 +1615,8 @@
 % enabled per 2018-02-22
 
 \def\tabl_ntb_table_get_max_width_step
-  {\advance\scratchdimen\tabl_ntb_get_wid\fastloopindex
-   \advance\scratchdimen\tabl_ntb_get_dis\fastloopindex}
+  {\advanceby\scratchdimen\tabl_ntb_get_wid\fastloopindex
+   \advanceby\scratchdimen\tabl_ntb_get_dis\fastloopindex}
 
 \def\tabl_ntb_table_get_max_width
   {\scratchdimen\zeropoint
@@ -1625,7 +1625,7 @@
      \scratchdimen\wd\scratchbox\relax
    \fi}
 
-\newdimen\d_tabl_ntb_saved_hsize
+\newdimension\d_tabl_ntb_saved_hsize
 
 \let\tabl_ntb_pass\relax
 
@@ -1725,18 +1725,18 @@
        +\d_tabl_ntb_columndistance
      \relax
      \localcontrolledloop\plusone\c_tabl_ntb_maximum_col\plusone
-       {\advance\scratchdimenfour\dimexpr
+       {\advanceby\scratchdimenfour\dimexpr
           \tabl_ntb_get_wid\currentloopiterator
         \relax
-        \advance\scratchdimenfive\dimexpr
+        \advanceby\scratchdimenfive\dimexpr
           -\tabl_ntb_get_dis\currentloopiterator
           -\d_tabl_ntb_columndistance
         \relax}%
      \relax
      % distribute width (stretch)
      \ifdim\scratchdimenfour<\scratchdimenfive
-       \advance\scratchdimenfour-\scratchdimenfive
-       \divide\scratchdimenfour\c_tabl_ntb_maximum_col
+       \advanceby\scratchdimenfour-\scratchdimenfive
+       \divideby\scratchdimenfour\c_tabl_ntb_maximum_col
        \localcontrolledloop\plusone\c_tabl_ntb_maximum_col\plusone
          {\scratchdimen\dimexpr\tabl_ntb_get_wid\currentloopiterator-\scratchdimenfour\relax
           \tabl_ntb_set_wid\currentloopiterator\scratchdimen}%
@@ -1837,27 +1837,27 @@
    \relax
    \localcontrolledloop\plusone\c_tabl_ntb_maximum_col\plusone
      {\scratchdimen\tabl_ntb_get_aut\currentloopiterator
-      \advance\scratchdimenone\dimexpr
+      \advanceby\scratchdimenone\dimexpr
         -\tabl_ntb_get_dis\currentloopiterator
         -\d_tabl_ntb_columndistance
       \relax
       \ifdim\scratchdimen>\zeropoint\relax
-        \advance\scratchdimenone -\scratchdimen
+        \advanceby\scratchdimenone -\scratchdimen
       \else
         \scratchdimen\tabl_ntb_get_wid\currentloopiterator\relax
         \ifdim\scratchdimen>\d_tabl_ntb_maxwidth\relax
           \ifcase#1\else\tabl_ntb_let_wid\currentloopiterator\zeropoint\fi
-          \advance\scratchcounterone \plusone
+          \advanceby\scratchcounterone \plusone
         \orelse\ifdim\scratchdimen>\zeropoint\relax
-          \advance\scratchdimenone -\scratchdimen
+          \advanceby\scratchdimenone -\scratchdimen
         \orelse\ifnum\c_tabl_ntb_encountered_max=\c_tabl_ntb_maximum_col % *nx* bah
           % eigenlijk moet dit alleen als de kolom wordt overspannen door een
           % vorige, maw extra dubbele loop en status var
-            \advance\scratchcounterone \plusone % setting maxwidth to a large value also works
+            \advanceby\scratchcounterone \plusone % setting maxwidth to a large value also works
         \fi
       \fi}%
    \ifconditional\c_tabl_ntb_trace_widths\tabl_ntb_show_widths M#1\fi
-   \ifcase\scratchcounterone \else \divide\scratchdimenone \scratchcounterone \fi
+   \ifcase\scratchcounterone \else \divideby\scratchdimenone \scratchcounterone \fi
    \localcontrolledloop\plusone\c_tabl_ntb_maximum_col\plusone
      {\scratchdimen\tabl_ntb_get_wid\currentloopiterator
       \ifcase#1\relax
@@ -1871,62 +1871,59 @@
       \fi}%
    \ifconditional\c_tabl_ntb_trace_widths\tabl_ntb_show_widths E#1\fi}
 
-% todo: use scratchcounters, not !! ones
-
 \def\tabl_ntb_check_heights_one_indeed
   {\scratchcountertwo\tabl_ntb_get_row\c_tabl_ntb_current_row_three\c_tabl_ntb_current_col_three\relax
     % check row span
    \ifnum\scratchcountertwo>\plusone
      % current height in row
-     \dimen0=\tabl_ntb_get_ht\c_tabl_ntb_current_row_three\c_tabl_ntb_current_col_three
+     \scratchdimenone\tabl_ntb_get_ht\c_tabl_ntb_current_row_three\c_tabl_ntb_current_col_three
      % find nearest height in row
-     \dimen2=\zeropoint
+     \scratchdimentwo\zeropoint
      \localcontrolledloop\plusone\c_tabl_ntb_maximum_col\plusone
-       {\ifnum\currentloopiterator=\c_tabl_ntb_current_col_three\else
-          \ifcsname\tabl_ntb_row_pattern\c_tabl_ntb_current_row_three\the\currentloopiterator\endcsname
-            \scratchcounterthree\tabl_ntb_get_row\c_tabl_ntb_current_row_three\currentloopiterator\relax
-            \ifnum\scratchcounterthree=\plusone
-              \dimen4=\tabl_ntb_get_ht\c_tabl_ntb_current_row_three\currentloopiterator\relax
-              \ifdim\dimen2<\dimen4
-                \dimen2=\dimen4
-              \fi
+       {\ifnum\currentloopiterator=\c_tabl_ntb_current_col_three
+        \orelse\ifcsname\tabl_ntb_row_pattern\c_tabl_ntb_current_row_three\the\currentloopiterator\endcsname
+          \scratchcounterthree\tabl_ntb_get_row\c_tabl_ntb_current_row_three\currentloopiterator\relax
+          \ifnum\scratchcounterthree=\plusone
+            \scratchdimenthree\tabl_ntb_get_ht\c_tabl_ntb_current_row_three\currentloopiterator\relax
+            \ifdim\scratchdimentwo<\scratchdimenthree
+              \scratchdimentwo\scratchdimenthree
             \fi
           \fi
         \fi}%
      \c_tabl_ntb_current_row_four\c_tabl_ntb_current_row_three
      % calculate cummulative height
-     \dimen4=\dimen2
+     \scratchdimenthree\scratchdimentwo
      \scratchcounterthree\c_tabl_ntb_current_row_three
-     \advance\scratchcounterthree\minusone
+     \advanceby\scratchcounterthree\minusone
      \localcontrolledloop\plusone\scratchcountertwo\plusone
        {\ifnum\c_tabl_ntb_current_row_four=\c_tabl_ntb_current_row_three\else
-          \advance\dimen4 \tabl_ntb_get_hei\c_tabl_ntb_current_row_four
+          \advanceby\scratchdimenthree\tabl_ntb_get_hei\c_tabl_ntb_current_row_four
         \fi
         \ifnum\currentloopiterator=\scratchcountertwo\else
           \tabl_ntb_set_nob\scratchcounterthree
-          \advance\scratchcounterthree\plusone
-       \fi
-        \advance\c_tabl_ntb_current_row_four\plusone}%
+          \advanceby\scratchcounterthree\plusone
+        \fi
+        \advanceby\c_tabl_ntb_current_row_four\plusone}%
      % distribute overshoot equally
-     \ifdim\dimen2>\zeropoint % new: test on natural-003
-       \ifdim\dimen4<\dimen0
-         \advance\dimen0 -\dimen4
-         \divide\dimen0 \scratchcountertwo
+     \ifdim\scratchdimentwo>\zeropoint % new: test on natural-003
+       \ifdim\scratchdimenthree<\scratchdimenone
+         \advanceby\scratchdimenone -\scratchdimenthree
+         \divideby\scratchdimenone \scratchcountertwo
          \c_tabl_ntb_current_row_four\c_tabl_ntb_current_row_three
-         \tabl_ntb_set_hei\c_tabl_ntb_current_row_three\dimen2\relax
+         \tabl_ntb_set_hei\c_tabl_ntb_current_row_three\scratchdimentwo\relax
          \localcontrolledloop\plusone\scratchcountertwo\plusone
            {\localcontrolledloop\plusone\c_tabl_ntb_maximum_col\plusone
               {\ifnum\currentloopiterator=\c_tabl_ntb_current_col_three\else
-                 \scratchdimen\dimexpr\tabl_ntb_get_ht\c_tabl_ntb_current_row_four\currentloopiterator+\dimen0\relax
+                 \scratchdimen\dimexpr\tabl_ntb_get_ht\c_tabl_ntb_current_row_four\currentloopiterator+\scratchdimenone\relax
                  \tabl_ntb_set_ht\c_tabl_ntb_current_row_four\currentloopiterator\scratchdimen
                  \ifdim\tabl_ntb_get_hei\c_tabl_ntb_current_row_four<\scratchdimen
                    \tabl_ntb_set_hei\c_tabl_ntb_current_row_four\scratchdimen
                  \fi
                \fi}%
-            \advance\c_tabl_ntb_current_row_four\plusone}%
-       \orelse\ifdim\dimen4>\dimen0
+            \advanceby\c_tabl_ntb_current_row_four\plusone}%
+       \orelse\ifdim\scratchdimenthree>\scratchdimenone
          \iftightTBLrowspan
-           \tabl_ntb_set_hei\c_tabl_ntb_current_row_three\dimen2\relax
+           \tabl_ntb_set_hei\c_tabl_ntb_current_row_three\scratchdimentwo\relax
          \fi
        \fi
      \fi
@@ -1948,7 +1945,7 @@
   {\begingroup
    \scratchdimen\zeropoint
    \localcontrolledloop\plusone\c_tabl_ntb_maximum_col\plusone
-     {\advance\scratchdimen\tabl_ntb_get_wid\currentloopiterator\relax}%
+     {\advanceby\scratchdimen\tabl_ntb_get_wid\currentloopiterator\relax}%
    \writestatus\m!TABLE{#1 \ifcase#2trial\else real\fi: hsize: \the\hsize, total: \the\scratchdimen}%
    \localcontrolledloop\plusone\c_tabl_ntb_maximum_col\plusone
      {\writestatus\m!TABLE{\space\space\the\currentloopiterator: \the\dimexpr\tabl_ntb_get_wid\currentloopiterator}}%