stable 2003.01.10

1 files changed, 118 insertions, 118 deletions

diff --git a/tex/context/base/core-tbl.tex b/tex/context/base/core-tbl.tex
index 2bf47a88d..b84ce5e37 100644
--- a/tex/context/base/core-tbl.tex
+++ b/tex/context/base/core-tbl.tex
@@ -8,29 +8,29 @@
 %D      copyright={PRAGMA / Hans Hagen \& Ton Otten}]
 %C
 %C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for 
-%C details. 
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
 
 \writestatus{loading}{Context Core Macros / Tabulation}
 
-% \processbetween gebruiken in head/tail macros 
+% \processbetween gebruiken in head/tail macros
 
 \unprotect
 
-% watch out, cells expand pretty late on a per row basis 
+% watch out, cells expand pretty late on a per row basis
 
 % |p2|p3| 2:3
-% spanning 
+% spanning
 
-% Be careful with changing the hsize calculation in p mode; 
+% Be careful with changing the hsize calculation in p mode;
 % the following code works quite well:
-% 
+%
 % \setupfield [line][location=low,height=1.2\lineheight,width=\hsize]
 % \definefield [test] [line] [line] []
-% 
+%
 % \starttabulate[|l|p|]
-% \NC test \NC \field [test] \NC \NR 
-% \stoptabulate 
+% \NC test \NC \field [test] \NC \NR
+% \stoptabulate
 
 % In-text tabbing environment
 %
@@ -63,9 +63,9 @@
 %  j  i<n> skip right of column
 %  k  i<n> skip around column
 
-%  g  g{char} align at char 
-%  .  align at . 
-%  ,  align at , 
+%  g  g{char} align at char
+%  .  align at .
+%  ,  align at ,
 
 %  Still to be done
 
@@ -76,16 +76,16 @@
 %  ~      \hskip.5em
 %  |      check
 
-%  nesting 
+%  nesting
 
 %  10     evt auto stack; dan wel andere signal dan void nodig
 
-%  present but not yet 100% ok 
+%  present but not yet 100% ok
 %
 %  \FL    top hrule
 %  \ML    mid hrule (with auto split)
 %  \LL    bottom hrule
-%  \HL 
+%  \HL
 
 %  \VL    as soon as needed
 %  color  as soon as needed
@@ -93,15 +93,15 @@
 %  \EQ \RQ \HQ  equal  (raw, hook)
 %  \NC \RC \HC  normal (raw, hook)
 %
-%  \NR 
+%  \NR
 
-%  \HR : rule with lineheight 
+%  \HR : rule with lineheight
 
-% tricky: align scans ahead, over # and expands ones before 
-% while doing  
+% tricky: align scans ahead, over # and expands ones before
+% while doing
 
-% new: 
-% 
+% new:
+%
 % \starttabulate[|cg{.}|cg{,}|cg{,}|]
 % \NC period     \NC comma      \NC comma   \NC\NR
 % \NG 100.000,00 \NG 100.000,00 \NG 100,00  \NC\NR
@@ -109,7 +109,7 @@
 % \NG 100,00     \NG 100,00     \NG 10,00   \NC\NR
 % \NG 10         \NG 10         \NG 0,00    \NC\NR
 % \stoptabulate
-% 
+%
 % \starttabulate[|c.|c,|c,|]
 % \NC period     \NC comma      \NC comma   \NC\NR
 % \NG 100.000,00 \NG 100.000,00 \NG 100,00  \NC\NR
@@ -151,7 +151,7 @@
 \newif      \ifsplittabulate         \splittabulatetrue
 \newif      \ifhandletabulatepbreak  \handletabulatepbreaktrue
 \newif      \iftabulateequal
-\newif      \iftracetabulate 
+\newif      \iftracetabulate
 \newif      \ifframedtabulate
 
 \newdimen   \tabulatepwidth
@@ -163,15 +163,15 @@
 
 % [|lg{.}|] => \NG 12.34 \NC
 
-\gdef\handletabulatecharalign#1 % space delimited ! 
+\gdef\handletabulatecharalign#1 % space delimited !
   {\edef\alignmentclass{\tabulatecolumn}%
    \edef\alignmentcharacter{\getvalue{\@@tabalign@@\tabulatecolumn}}%
    \ifcase\tabulatepass\or
      \setfirstpasscharacteralign\checkalignment{#1}%
-   \fi % force hsize 
+   \fi % force hsize
    \setsecondpasscharacteralign\checkalignment{#1}}
 
-\def\noftabcolumns{16} 
+\def\noftabcolumns{16}
 
 \def\@@tabbox@@  {@@tabbox@}
 \def\@@tabhook@@ {@@tabhook@}
@@ -181,7 +181,7 @@
 %   {\@EA\newbox\csname\@@tabbox@@\recurselevel\endcsname}
 
 \def\tablebox#1%
-  {\csname\@@tabbox@@\number#1\endcsname} 
+  {\csname\@@tabbox@@\number#1\endcsname}
 
 \def\checktablebox#1%
   {\ifundefinedelse{\@@tabbox@@\number#1}%
@@ -198,7 +198,7 @@
 \def\initializetableboxes#1%
   {\dorecurse#1{\initializetablebox\recurselevel}}
 
-\initializetableboxes\noftabcolumns 
+\initializetableboxes\noftabcolumns
 
 \def\dotabulatenobreak
   {\noalign
@@ -208,12 +208,12 @@
         \par
         \kern-\linewidth
         \nobreak
-      \fi}} 
+      \fi}}
 
 \let\notabulatehook\empty
 
 \def\checktabulatehook
-  {\ifnum\tabulatetype<2        
+  {\ifnum\tabulatetype<\plustwo
     %\global\let\tabulatehook\relax
      \global\let\tabulatehook\notabulatehook
    \else
@@ -268,9 +268,9 @@
        %\doifdefinedelse{\@@tabalign@@\the\tabulatecolumns}
        %  {\appendtoks\handletabulatecharalign## \to\!!toksa}
        %  {\appendtoks\tabulatehook ##\to \!!toksa}%
-       % waarom kan ik hier geen \xx{##} geven, om een of 
-       % andere reden passeert dan tex de hele regel (incl \NC's) 
-       % als argument; elke delimiter <> space gaat trouwens fout  
+       % waarom kan ik hier geen \xx{##} geven, om een of
+       % andere reden passeert dan tex de hele regel (incl \NC's)
+       % als argument; elke delimiter <> space gaat trouwens fout
        \appendtoks     \unskip\unskip\ifmmode\else\endgraf\fi\egroup\to\!!toksa
        \appendtoks\ifnum\tabulatetype=1 \else                       \to\!!toksa
    \@EA\appendtoks                                \the\tabulateafter\to\!!toksa
@@ -317,7 +317,7 @@
      \else\ifx .\next \def\nextnext{\gettabulatealign.}%
      \else\ifx ,\next \def\nextnext{\gettabulatealign,}%
      \else            \message{unknown preamble key [\meaning\next]}%
-     \fi\fi\fi\fi\fi \fi\fi\fi\fi\fi \fi\fi\fi\fi\fi 
+     \fi\fi\fi\fi\fi \fi\fi\fi\fi\fi \fi\fi\fi\fi\fi
      \fi\fi\fi\fi\fi \fi\fi\fi\fi\fi \fi
    \fi
    \nextnext}
@@ -469,8 +469,8 @@
 
 \def\settabulatepheight
   {\scratchdimen\ht\tablebox\tabulatecolumn\relax
-   \ifdim\scratchdimen>\tabulatemaxpheight 
-     \global\tabulatemaxpheight\scratchdimen 
+   \ifdim\scratchdimen>\tabulatemaxpheight
+     \global\tabulatemaxpheight\scratchdimen
    \fi}
 
 \def\handletabulatepbreak
@@ -480,12 +480,12 @@
           \dotabulatenobreak
         \fi
         \doglobal\increment\tabulateminplines
-        \ifnum\tabulateminplines=\tabulatemaxplines\relax 
+        \ifnum\tabulateminplines=\tabulatemaxplines\relax
           \dotabulatenobreak
         \fi
       \fi \fi}}
 
-%D \startbuffer 
+%D \startbuffer
 %D \starttabulatie[|c|p|p|]
 %D \NC \bf Alpha \NC \bf Beta        \NC \bf Gamma          \NC\NR
 %D \NC 1         \NC right indeed    \NC definitely wrong   \NC\NR
@@ -495,11 +495,11 @@
 %D \NC 5         \NC \thinrules[n=5] \NC \thinrules[n=5]    \NC\NR
 %D \NC 6         \NC \thinrules[n=3] \NC \thinrules[n=4]    \NC\NR
 %D \stoptabulate
-%D \stopbuffer 
-%D 
+%D \stopbuffer
+%D
 %D \typebuffer {\tracetabulatetrue\haalbuffer}
 %D
-%D \startbuffer 
+%D \startbuffer
 %D \starttabulatie[|c|p|p|]
 %D \NC \bf Alpha \NC \bf Beta        \NC \bf Gamma          \NC\NR
 %D \NC 1         \NC right indeed    \NC definitely wrong   \NC\NR
@@ -507,7 +507,7 @@
 %D \NC 3         \NC very true       \NC as false as can be \NC\NR
 %D \NC 4         \NC the whole truth \NC but the truth      \NC\NR
 %D \stoptabulatie
-%D \stopbuffer 
+%D \stopbuffer
 %D
 %D \typebuffer {\tracetabulatetrue\haalbuffer}
 
@@ -528,7 +528,7 @@
            \c!binnen,\c!inspringen,\c!marge,\c!uitlijnen,
            \c!lijnkleur,\c!lijndikte,EQ]}%
      \copyparameters
-       [\??tt#1::#2][\??tt#1::]% 
+       [\??tt#1::#2][\??tt#1::]%
        [\c!eenheid,\c!afstand,\c!voor,\c!korps,\c!na,
         \c!binnen,\c!inspringen,\c!kader,
         \c!marge,\c!uitlijnen,\c!lijnkleur,\c!lijndikte,EQ]%
@@ -563,7 +563,7 @@
 
 % \def\fulltabulatecontent
 %   {\tabulatecontent}
- 
+
 \def\fulltabulatecontent
   {\ifx\tabulateheadcontent\empty\else
      \TABLEnoalign{\global\settrue\tabulatesomeamble}%
@@ -579,16 +579,16 @@
 \setvalue{\e!start\e!tabulatehead}%
   {\dosingleempty\dostartstarttabulatehead}
 
-\def\dostartstarttabulatehead[#1]% 
+\def\dostartstarttabulatehead[#1]%
   {\processcontent{\e!stop\e!tabulatehead}\next
-     {\letvalue{\??tt\iffirstargument#1\else\e!tabulate\fi::\v!hoofd}\next}} 
+     {\letvalue{\??tt\iffirstargument#1\else\e!tabulate\fi::\v!hoofd}\next}}
 
 \setvalue{\e!start\e!tabulatetail}%
   {\dosingleempty\dostartstarttabulatetail}
 
-\def\dostartstarttabulatetail[#1]% 
+\def\dostartstarttabulatetail[#1]%
   {\processcontent{\e!stop\e!tabulatetail}\next
-     {\letvalue{\??tt\iffirstargument#1\else\e!tabulate\fi::\v!voet}\next}} 
+     {\letvalue{\??tt\iffirstargument#1\else\e!tabulate\fi::\v!voet}\next}}
 
 \def\dosubstarttabulate
   {\dodoubleempty\dodosubstarttabulate}
@@ -604,32 +604,32 @@
      \getparameters[\??tt\e!tabulate::][#2]%
    \fi
    \iffirstargument
-     \def\next{\dofinalstarttabulate[\e!tabulate][][#1]}% 
+     \def\next{\dofinalstarttabulate[\e!tabulate][][#1]}%
    \else
-     \def\next{\dofinalstarttabulate[\e!tabulate][][|l|p|]}% 
+     \def\next{\dofinalstarttabulate[\e!tabulate][][|l|p|]}%
    \fi
    \next}
 
-\newtoks\everytabulate 
+\newtoks\everytabulate
 \chardef\tabulatepass=0
 
-\def\dofinalstarttabulate[#1][#2][#3]% identifier sub preamble 
+\def\dofinalstarttabulate[#1][#2][#3]% identifier sub preamble
   {\edef\currenttabulate{#1::#2}%
    \ifinsidefloat \else
      \witruimte
      \getvalue{\??tt\currenttabulate\c!voor}%
    \fi
-   \bgroup 
-   % todo: spacing around tabulate when bodyfont is set  
-   % expansion en test needed ? 
+   \bgroup
+   % todo: spacing around tabulate when bodyfont is set
+   % expansion en test needed ?
    \doifvaluesomething{\??tt\currenttabulate\c!korps}
      {\expanded{\switchtobodyfont
         [\getvalue{\??tt\currenttabulate\c!korps}]}}%
-   \postponefootnotes % new, to be tested  
+   \postponefootnotes % new, to be tested
    \chardef\tabulatepass\plusone
    \widowpenalty\zerocount % otherwise lines are not broken
    \clubpenalty \zerocount % but overlap in funny ways
-   \the\everytabulate 
+   \the\everytabulate
    \getvalue{\??tt\currenttabulate\c!binnen}%
    \scratchdimen\leftskip
    \advance\scratchdimen \hangindent
@@ -641,7 +641,7 @@
      {\dorecurse{##1}{\appendtoks##2\to\!!toksb}\do}%
    \def\do
      {\futurelet\next\dodo}%
-   \def\dodo % \@EAEAEA gebruiken 
+   \def\dodo % \@EAEAEA gebruiken
      {\ifx\next\relax
         % exit
       \else\ifx*\next
@@ -665,15 +665,15 @@
 
 \chardef\tabulatetype=0
 
-% 0 = NC column next   EQ equal column 
-% 1 = RC column raw    RQ equal column raw   
-% 2 = HC column hook   HQ equal column hook 
+% 0 = NC column next   EQ equal column
+% 1 = RC column raw    RQ equal column raw
+% 2 = HC column hook   HQ equal column hook
 
 \newif\iftabulatefirstflushed
 
 \def\tabulateEQ
   {\iftabulatefirstflushed\else\getvalue{\??tt\currenttabulate EQ}\fi
-   \global\tabulateequalfalse} 
+   \global\tabulateequalfalse}
 
 \def\tabulatenormalcolumn#1%
   {&\iftabulateequal\tabulateEQ\fi&\global\chardef\tabulatetype#1&}
@@ -686,10 +686,10 @@
    \ifnum\tabulatecolumn>\tabulatecolumns\relax
      \expandafter\NR
    \else
-     \expandafter\ignorespaces % interferes with the more tricky hooks 
+     \expandafter\ignorespaces % interferes with the more tricky hooks
    \fi}
 
-\def\setquicktabulate#1% see \startlegend \startgiven 
+\def\setquicktabulate#1% see \startlegend \startgiven
   {\let#1\tabulateautocolumn
    \let\\\tabulateautocolumn}
 
@@ -699,7 +699,7 @@
 \def\tabulateruleseperator%
   {\bgroup
    \let\factor\!!plusone
-   \scratchskip\dp\strutbox 
+   \scratchskip\dp\strutbox
    \ExpandFirstAfter\processallactionsinset
      [\getvalue{\??tt\currenttabulate\c!afstand}]
      [ \v!blanko=>\scratchskip\bigskipamount,
@@ -720,7 +720,7 @@
 %      {\scratchdimen\getvalue{\??tt\currenttabulate\c!lijndikte}%
 %       \hrule\!!height.5\scratchdimen\!!depth.5\scratchdimen\relax
 %       \doifvalue{\??tt\currenttabulate\c!afstand}\v!grid
-%         {\kern-\scratchdimen}}} % experimental tm-prikkels 
+%         {\kern-\scratchdimen}}} % experimental tm-prikkels
 
 \def\dotabulaterule#1%
   {\color
@@ -731,27 +731,27 @@
   {\dotabulaterule
      {\hrule\!!height.5\scratchdimen\!!depth.5\scratchdimen\relax
       \doifvalue{\??tt\currenttabulate\c!afstand}\v!grid
-        {\kern-\scratchdimen}}} % experimental tm-prikkels 
+        {\kern-\scratchdimen}}} % experimental tm-prikkels
 
 \def\tabulateline
   {\multispan\totaltabulatecolumns % \multispan is a plain macro
-   % for the moment this one  
-   \strut\hskip\getvalue{\??tt\currenttabulate\c!marge}% 
-   % neg values are ok ! 
+   % for the moment this one
+   \strut\hskip\getvalue{\??tt\currenttabulate\c!marge}%
+   % neg values are ok !
    \dotabulaterule
-     {\!!heighta.5\lineheight 
-      \advance\!!heighta-\strutdepth 
+     {\!!heighta.5\lineheight
+      \advance\!!heighta-\strutdepth
       \!!deptha-\!!heighta
       \advance\!!deptha\scratchdimen
       \leaders\hrule\!!height\!!heighta\!!depth\!!deptha\hfill}%
    \cr}
 
-%D When set to true, no (less) break optimization is done. 
+%D When set to true, no (less) break optimization is done.
 
 \newif\iftolerantTABLEbreak
 
-%D The main processing macro is large but splitting it up 
-%D would make things less clear. 
+%D The main processing macro is large but splitting it up
+%D would make things less clear.
 
 \def\doregistertabulateparoptions
   {\ifinsidefloat \else \iftrialtypesetting \else
@@ -760,24 +760,24 @@
 %     \global\let\registertabulateparoptions\empty
    \fi \fi}
 
-\appendtoks 
+\appendtoks
   \global\let\registertabulateparoptions\doregistertabulateparoptions
-\to \everytabulate 
+\to \everytabulate
 
 \newtoks\everytabulaterow
 
-\appendtoks 
+\appendtoks
   \registertabulateparoptions
-\to \everytabulaterow 
+\to \everytabulaterow
 
 \def\flushtabulateindent
-  {\ifnum\tabulatecolumn=\zerocount 
+  {\ifnum\tabulatecolumn=\zerocount
      \hbox to \tabulateindent
-       {% we now have a local hsize, and since we want to 
-        % register positional info (i.e. real hsizes) we 
+       {% we now have a local hsize, and since we want to
+        % register positional info (i.e. real hsizes) we
         % need to reconstitute the original hsize
         \advance\hsize\tabulateindent
-        % this is indeed rather messy and took a few hours 
+        % this is indeed rather messy and took a few hours
         % to dis/uncover
         \the\everytabulaterow
         \hss}%
@@ -793,7 +793,7 @@
    \ExpandFirstAfter\processaction % use \setalignmentswitch instead
      [\getvalue{\??tt\currenttabulate\c!uitlijnen}]
      [\v!normaal=>\def\@@tabulatealign{0},% = default value
-       \v!rechts=>\def\@@tabulatealign{1},% chardefs gebruiken 
+       \v!rechts=>\def\@@tabulatealign{1},% chardefs gebruiken
         \v!links=>\def\@@tabulatealign{2},%
        \v!midden=>\def\@@tabulatealign{3},%
       \s!default=>\def\@@tabulatealign{0},%
@@ -810,29 +810,29 @@
    \global\tabulatepwidth\zeropoint
    \global\tabulateequalfalse
    \resettabulatepheight
-   \def\NC{\tabulatenormalcolumn0}%
-   \def\RC{\tabulatenormalcolumn1}%
-   \def\HC{\tabulatenormalcolumn2}%
-   \def\EQ{\tabulateequalcolumn 0}%
-   \def\RQ{\tabulateequalcolumn 1}%
-   \def\HQ{\tabulateequalcolumn 2}%
-   \def\NG{\NC\handletabulatecharalign}%
-   \def\ND{\NC\handletabulatedigits}% new, undocumented, test first  
-   \def\HR % horizontal rule line (break untested)
+   \unexpanded \def\NC{\tabulatenormalcolumn0}%
+   \unexpanded \def\RC{\tabulatenormalcolumn1}%
+   \unexpanded \def\HC{\tabulatenormalcolumn2}%
+   \unexpanded \def\EQ{\tabulateequalcolumn 0}%
+   \unexpanded \def\RQ{\tabulateequalcolumn 1}%
+   \unexpanded \def\HQ{\tabulateequalcolumn 2}%
+   \unexpanded \def\NG{\NC\handletabulatecharalign}%
+   \unexpanded \def\ND{\NC\handletabulatedigits}% new, undocumented, test first
+   \unexpanded \def\HR % horizontal rule line (break untested)
      {\TABLEnoalign
         {\ifnum\noftabulatelines=\totalnoftabulatelines
            \@EA\dotabulatenobreak
-         \else                                                         
+         \else
            \@EA\allowbreak
          \fi}%
       \tabulateline
       \TABLEnoalign
-        {\ifnum\noftabulatelines=\zerocount 
+        {\ifnum\noftabulatelines=\zerocount
            \@EA\dotabulatenobreak
          \else
            \@EA\allowbreak
          \fi}}%
-   \def\NR % next row
+   \unexpanded \def\NR % next row
      {\doglobal\increment\noftabulatelines
       \global\tabulatefirstflushedfalse
       \global\tabulateequalfalse
@@ -841,22 +841,22 @@
       \unskip\unskip\crcr\flushtabulated
       \TABLEnoalign
         {\iftolerantTABLEbreak\else
-           \ifnum\noftabulatelines=\plusone                   
+           \ifnum\noftabulatelines=\plusone
              \dotabulatenobreak
            \else\ifnum\noftabulatelines=\minusnoftabulatelines
-             \ifnum\tabulatemaxplines<2 
+             \ifnum\tabulatemaxplines<2
                \dotabulatenobreak
              \fi
            \fi\fi
          \fi
          \global\tabulatefirstflushedfalse}}%
    \let\HL\empty \let\SR\NR \let\AR\NR
-   \let\FL\empty \let\FR\NR 
+   \let\FL\empty \let\FR\NR
    \let\ML\empty \let\MR\NR
    \let\LL\empty \let\LR\NR
    \global\let\flushtabulated\empty
    \let\savedbar|\let|\nexttabulate
-   \tabskip\zeropoint 
+   \tabskip\zeropoint
    \ifdim\getvalue{\??tt\currenttabulate\c!marge}>\zeropoint
      \!!toksa{&\flushtabulateindent\strut##%
                \tabskip\getvalue{\??tt\currenttabulate\c!marge}\strut
@@ -872,7 +872,7 @@
    \advance\scratchcounter4%
    \edef\totaltabulatecolumns{\the\scratchcounter}%
    \tabulatewidth\zeropoint
-   % \dorecurse\tabulatecolumns % can be made faster 
+   % \dorecurse\tabulatecolumns % can be made faster
    %   {\doifundefinedelse{\@@tabbox@@\recurselevel}
    %      {\expandafter\newbox\csname\@@tabbox@@\recurselevel\endcsname}%
    %      {\global\setbox\csname\@@tabbox@@\recurselevel\endcsname\box\voidb@x}}%
@@ -901,11 +901,11 @@
    \setbox0\vbox % outside if because of line counting
      {\footnotesenabledfalse
       \let\tabulateindent\!!zeropoint
-      \trialtypesettingtrue % very important 
+      \trialtypesettingtrue % very important
       \@EA\halign\@EA{\the\!!toksa\crcr\fulltabulatecontent\crcr}}%
    \ifnum\nofautotabulate>\zerocount
-     % so, even if the natural size is larger, in the final 
-     % run, we force the calculated width 
+     % so, even if the natural size is larger, in the final
+     % run, we force the calculated width
      \tabulatewidth\hsize
      \advance\tabulatewidth -\wd0
      \advance\tabulatewidth -\tabulatepwidth
@@ -966,7 +966,7 @@
    \let\minusnoftabulatelines\noftabulatelines
    \decrement\minusnoftabulatelines
    \doglobal\newcounter\noftabulatelines
-   \def\HL{\TABLEnoalign
+   \unexpanded \def\HL{\TABLEnoalign
      {\ifnum\noftabulatelines=\zerocount                  \@EA    \FL\else
       \ifnum\noftabulatelines<\totalnoftabulatelines\relax\@EAEAEA\ML\else
                                                           \@EAEAEA\LL\fi\fi}}%
@@ -978,7 +978,7 @@
          \vskip\dp\strutbox
          \vskip\dp\strutbox}%
       \baselinecorrection}%
-   \def\FL{\TABLEnoalign
+   \unexpanded \def\FL{\TABLEnoalign
      {\ifinsidefloat\else
         \doifemptyvalue{\??tt\currenttabulate\c!voor} % no expansion
           {\tablebaselinecorrection}%
@@ -988,10 +988,10 @@
       \tabulateruleseperator
       \prevdepth\dp\strutbox
       \dotabulatenobreak}}%
-   \def\ML{\TABLEnoalign
+   \unexpanded \def\ML{\TABLEnoalign
      {\tabulateruleseperator
       \tabulaterule
-      \ifnum\noftabulatelines>\plusone 
+      \ifnum\noftabulatelines>\plusone
         \ifnum\noftabulatelines<\minusnoftabulatelines
           \vskip\topskip\allowbreak\vskip-\topskip
           \vskip-\getvalue{\??tt\currenttabulate\c!lijndikte}%
@@ -999,7 +999,7 @@
         \fi
       \fi
       \tabulateruleseperator}}%
-   \def\LL{\TABLEnoalign
+   \unexpanded \def\LL{\TABLEnoalign
      {\dotabulatenobreak
       \tabulateruleseperator
       \dotabulatenobreak
@@ -1012,12 +1012,12 @@
       \fi}}%
    \startframedcontent[\getvalue{\??tt\currenttabulate\c!kader}]%
    %
-   \chardef\tabulatepass2
+   \chardef\tabulatepass\plustwo
    \@EA\halign\@EA{\the\!!toksa\crcr\fulltabulatecontent\crcr}%
    \prevdepth\dp\strutbox % nog eens beter, temporary hack
    \doifvalue{\??tt\currenttabulate\c!afstand}\v!grid
-     {\vskip-\dp\strutbox}% experimental tm-prikkels 
-   % 
+     {\vskip-\dp\strutbox}% experimental tm-prikkels
+   %
    \stopframedcontent
    %
    \egroup
@@ -1033,7 +1033,7 @@
 % \NC \digits{@@@.@10,@@} \NC\NR
 % \NC \digits{@@@.@@1,@@} \NC\NR
 % \stoptabulatie
-% 
+%
 % \starttabulatie[|mc|]
 % \ND 100.000,00 \NC\NR
 % \ND @10.000,00 \NC\NR
@@ -1041,7 +1041,7 @@
 % \ND @@@.@10,@@ \NC\NR
 % \ND @@@.@@1,@@ \NC\NR
 % \stoptabulatie
-% 
+%
 % \starttabulatie[|c|]
 % \ND $100.000,00$ \NC\NR
 % \ND $@10.000,00$ \NC\NR
@@ -1049,7 +1049,7 @@
 % \ND $@@@.@10,@@$ \NC\NR
 % \ND $@@@.@@1,@@$ \NC\NR
 % \stoptabulatie
-% 
+%
 % \starttabulatie[|c|]
 % \NC $\digits 100.000,00 $ \NC\NR
 % \NC $\digits @10.000,00 $ \NC\NR
@@ -1057,7 +1057,7 @@
 % \NC $\digits @@@.@10,@@ $ \NC\NR
 % \NC $\digits @@@.@@1,@@ $ \NC\NR
 % \stoptabulatie
-% 
+%
 % \starttabulatie[|c|]
 % \NC \digits $100.000,00$ \NC\NR
 % \NC \digits $@10.000,00$ \NC\NR
@@ -1091,7 +1091,7 @@
    \c!na=\blanko,
    \c!afstand={\v!diepte,\v!middel},
    \c!uitlijnen=\v!normaal,
-   \c!marge=\!!zeropoint, 
+   \c!marge=\!!zeropoint,
    \c!inspringen=\v!nee]
 
 \protect \endinput