stable 2004.06.10

1 files changed, 86 insertions, 368 deletions

diff --git a/tex/context/base/core-tbl.tex b/tex/context/base/core-tbl.tex
index 22ce37474..09523a362 100644
--- a/tex/context/base/core-tbl.tex
+++ b/tex/context/base/core-tbl.tex
@@ -1,5 +1,4 @@
 %D \module
-%D \module
 %D   [       file=core-tbl,
 %D        version=1998.11.03,
 %D          title=\CONTEXT\ Core Macros,
@@ -509,8 +508,8 @@
 \def\dogettabulatewidth(#1)%
   {\processallactionsinset
      [#1]%
-     [\v!passend=>\chardef\tabulatemodus\plusthree,
-         \v!vast=>\chardef\tabulatemodus\plusthree
+     [\v!fit=>\chardef\tabulatemodus\plusthree,
+         \v!fixed=>\chardef\tabulatemodus\plusthree
                   \tabulatenopbreaktrue,
       \s!unknown=>\tabulatewidth#1\relax]%
    \ifnum\tabulatedimen=\plusone
@@ -573,7 +572,7 @@
   {\dontcomplain
    \global\setbox\tabulatebox % % % global ? % % %
      \vsplit\tablebox\tabulatecolumn to \lineheight
-   \setbox\tabulatebox\vbox
+   \setbox\tabulatebox\normalvbox
      {\unvbox\tabulatebox}%
    \setbox\tabulatebox\hbox to \wd\tabulatebox
      {\hss\dotabulatehook{\box\tabulatebox}\hss}%
@@ -613,7 +612,7 @@
       \fi}}
 
 %D \startbuffer
-%D \starttabulatie[|c|p|p|]
+%D \starttabulate[|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
 %D \NC 2         \NC \thinrules[n=3] \NC \thinrules[n=3]    \NC\NR
@@ -621,22 +620,22 @@
 %D \NC 4         \NC very true       \NC as false as can be \NC\NR
 %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 \stoptabulatie
+%D \stoptabulate
 %D \stopbuffer
 %D
-%D \typebuffer {\tracetabulatetrue\haalbuffer}
+%D \typebuffer {\tracetabulatetrue\getbuffer}
 %D
 %D \startbuffer
-%D \starttabulatie[|c|p|p|]
+%D \starttabulate[|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
 %D \NC 2         \NC oh yes          \NC simply no          \NC\NR
 %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 \stoptabulate
 %D \stopbuffer
 %D
-%D \typebuffer {\tracetabulatetrue\haalbuffer}
+%D \typebuffer {\tracetabulatetrue\getbuffer}
 
 % \definetabulate
 % \redefinetabulate
@@ -648,21 +647,21 @@
 
 \def\dodefinetabulate[#1][#2][#3]%
   {\ifthirdargument
-     \doifundefined{\??tt#1::\c!eenheid}
+     \doifundefined{\??tt#1::\c!unit}
        {\copyparameters
           [\??tt#1::][\??tt\v!tabulate::]%
-          [\c!kader,\c!afstand,\c!eenheid,\c!voor,\c!korps,\c!na,
-           \c!binnen,\c!inspringen,\c!marge,\c!uitlijnen,\c!hoofd,\c!titel,
-           \c!lijnkleur,\c!lijndikte,\c!splitsen,EQ]}%
+          [\c!frame,\c!distance,\c!unit,\c!before,\c!bodyfont,\c!after,
+           \c!inner,\c!indenting,\c!margin,\c!align,\c!header,\c!title,
+           \c!rulecolor,\c!rulethickness,\c!split,EQ]}%
      \copyparameters
        [\??tt#1::#2][\??tt#1::]%
-       [\c!eenheid,\c!afstand,\c!voor,\c!korps,\c!na,
-        \c!binnen,\c!inspringen,\c!kader,\c!splitsen,\c!hoofd,\c!titel,
-        \c!marge,\c!uitlijnen,\c!lijnkleur,\c!lijndikte,EQ]%
+       [\c!unit,\c!distance,\c!before,\c!bodyfont,\c!after,
+        \c!inner,\c!indenting,\c!frame,\c!split,\c!header,\c!title,
+        \c!margin,\c!align,\c!rulecolor,\c!rulethickness,EQ]%
      \setvalue{\e!start#1::#2}{\dofinalstarttabulate[#1][#2][#3]}%
      \setvalue{\e!start#1}{\bgroup\dosubstarttabulate[#1]}%
-     \letvalue{\??tt#1-\v!hoofd}\empty
-     \letvalue{\??tt#1-\v!voet }\empty
+     \letvalue{\??tt#1-\v!header}\empty
+     \letvalue{\??tt#1-\v!footer }\empty
    \else\ifsecondargument
      \definetabulate[#1][][#2]%
    \else
@@ -674,21 +673,21 @@
 
 \newconditional\tabulatesomeamble
 
-\def\checkfulltabulatecontent % - needed, else confusion with \c!hoofd
-  {\ifundefined{\??tt\currenttabulate-\v!hoofd}%
+\def\checkfulltabulatecontent % - needed, else confusion with \c!header
+  {\ifundefined{\??tt\currenttabulate-\v!header}%
      \let\tabulateheadcontent\empty
    \else
      \def\tabulateheadcontent
        {\TABLEnoalign{\global\settrue\tabulatesomeamble}%
-        \csname\??tt\currenttabulate-\v!hoofd\endcsname
+        \csname\??tt\currenttabulate-\v!header\endcsname
         \TABLEnoalign{\global\setfalse\tabulatesomeamble}}%
    \fi
-   \ifundefined{\??tt\currenttabulate-\v!voet}%
+   \ifundefined{\??tt\currenttabulate-\v!footer}%
      \let\tabulatetailcontent\empty
    \else
      \def\tabulatetailcontent
        {\TABLEnoalign{\global\settrue\tabulatesomeamble}%
-        \csname\??tt\currenttabulate-\v!voet\endcsname
+        \csname\??tt\currenttabulate-\v!footer\endcsname
         \TABLEnoalign{\global\setfalse\tabulatesomeamble}}%
    \fi}
 
@@ -714,14 +713,14 @@
 
 \def\dostartstarttabulatehead[#1]%
   {\processcontent{\e!stop\v!tabulatehead}\next
-     {\letvalue{\??tt\iffirstargument#1\else\v!tabulate\fi::-\v!hoofd}\next}}
+     {\letvalue{\??tt\iffirstargument#1\else\v!tabulate\fi::-\v!header}\next}}
 
 \setvalue{\e!start\v!tabulatetail}%
   {\dosingleempty\dostartstarttabulatetail}
 
 \def\dostartstarttabulatetail[#1]%
   {\processcontent{\e!stop\v!tabulatetail}\next
-     {\letvalue{\??tt\iffirstargument#1\else\v!tabulate\fi::-\v!voet}\next}}
+     {\letvalue{\??tt\iffirstargument#1\else\v!tabulate\fi::-\v!footer}\next}}
 
 \def\dosubstarttabulate
   {\dodoubleempty\dodosubstarttabulate}
@@ -758,28 +757,28 @@
 \def\dofinalstarttabulate[#1][#2][#3]% identifier sub preamble
   {\edef\currenttabulate{#1::#2}%
    \ifinsidefloat \else
-     \witruimte
-     \getvalue{\??tt\currenttabulate\c!voor}%
+     \whitespace
+     \getvalue{\??tt\currenttabulate\c!before}%
    \fi
    \bgroup
    \resetcharacteralign
    % todo: spacing around tabulate when bodyfont is set
    % expansion en test needed ?
-   \doifelsevalue{\??tt\currenttabulate\c!splitsen}\v!ja
+   \doifelsevalue{\??tt\currenttabulate\c!split}\v!yes
      \splittabulatetrue\splittabulatefalse
-   \doifvaluesomething{\??tt\currenttabulate\c!korps}
+   \doifvaluesomething{\??tt\currenttabulate\c!bodyfont}
      {\expanded{\switchtobodyfont
-        [\getvalue{\??tt\currenttabulate\c!korps}]}}%
+        [\getvalue{\??tt\currenttabulate\c!bodyfont}]}}%
    \postponefootnotes % new, to be tested
    \chardef\tabulatepass\plusone
    \widowpenalty\zerocount % otherwise lines are not broken
    \clubpenalty \zerocount % but overlap in funny ways
    \the\everytabulate
-   \getvalue{\??tt\currenttabulate\c!binnen}%
+   \getvalue{\??tt\currenttabulate\c!inner}%
    \scratchdimen\leftskip
    \advance\scratchdimen \hangindent
-   \doifvalue{\??tt\currenttabulate\c!inspringen}\v!ja
-     {\advance\scratchdimen \parindent}% \voorwit
+   \doifvalue{\??tt\currenttabulate\c!indenting}\v!yes
+     {\advance\scratchdimen \parindent}% \ctxparindent
    \edef\tabulateindent{\the\scratchdimen}%
    \!!toksb\emptytoks
    \def\dorepeat*##1##2%
@@ -856,13 +855,13 @@
    \let\factor\!!plusone
    \scratchskip\strutdp
    \ExpandFirstAfter\processallactionsinset
-     [\getvalue{\??tt\currenttabulate\c!afstand}]
-     [ \v!blanko=>\scratchskip\bigskipamount,
-       \v!diepte=>\scratchskip\strutdp,
-        \v!klein=>\def\factor{.25},
-       \v!middel=>\def\factor{.5},
-        \v!groot=>,
-         \v!geen=>\scratchskip\zeropoint\def\factor{0},
+     [\getvalue{\??tt\currenttabulate\c!distance}]
+     [ \v!blank=>\scratchskip\bigskipamount,
+       \v!depth=>\scratchskip\strutdp,
+        \v!small=>\def\factor{.25},
+       \v!medium=>\def\factor{.5},
+        \v!big=>,
+         \v!none=>\scratchskip\zeropoint\def\factor{0},
          \v!grid=>\scratchskip\zeropoint\def\factor{0},
       \s!unknown=>\scratchskip\commalistelement]%
    \scratchdimen\factor\scratchskip
@@ -879,19 +878,19 @@
 
 \def\dodotabulaterule#1%
   {\color
-     [\getvalue{\??tt\currenttabulate\c!lijnkleur}]
-     {\scratchdimen\getvalue{\??tt\currenttabulate\c!lijndikte}#1}}
+     [\getvalue{\??tt\currenttabulate\c!rulecolor}]
+     {\scratchdimen\getvalue{\??tt\currenttabulate\c!rulethickness}#1}}
 
 \def\dotabulaterule
   {\dodotabulaterule
      {\hrule\!!height.5\scratchdimen\!!depth.5\scratchdimen\relax
-      \doifvalue{\??tt\currenttabulate\c!afstand}\v!grid
+      \doifvalue{\??tt\currenttabulate\c!distance}\v!grid
         {\kern-\scratchdimen}}} % experimental tm-prikkels
 
 \def\dotabulatelinerule
   {\multispan\totaltabulatecolumns % \multispan is a plain macro
    % for the moment this one
-   \strut\hskip\getvalue{\??tt\currenttabulate\c!marge}%
+   \strut\hskip\getvalue{\??tt\currenttabulate\c!margin}%
    % neg values are ok !
    \hskip\tabulateindent % new august 2003
    \dodotabulaterule
@@ -952,300 +951,19 @@
 %D cum suis, since \TEX's hard coded noalign lookahead fails
 %D on it! I mistakenly added this for a while.
 
-% \def\processtabulate[|#1|]% in the process of optimizing
-%   {\tabulateunit\getvalue{\??tt\currenttabulate\c!eenheid}%
-%    \checkfulltabulatecontent
-%    \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!links=>\def\@@tabulatealign{2},%
-%        \v!midden=>\def\@@tabulatealign{3},%
-%       \s!default=>\def\@@tabulatealign{0},%
-%       \s!unknown=>\def\@@tabulatealign{0}]%
-%    \let\pretabskip\!!zeropoint
-%    \def\postabskip{.5\tabulateunit}%
-%    \global\tabulatecolumns\zerocount
-%    \global\nofautotabulate\zerocount
-%    \doglobal\newcounter\noftabulatelines
-%    \let\totalnoftabulatelines\noftabulatelines
-%    \let\minusnoftabulatelines\noftabulatelines
-%    \global\tabulatepwidth\zeropoint
-%    \global\tabulateequalfalse
-%    \resettabulatepheight
-%    \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\NN{\NC\handletabulatedigits}% new, undocumented, test first
-%    \unexpanded \def\ND{\NC\handletabulatedigits}% same, for old times sake
-%    \def\tabulaterule{\HR}% a rule with lineheight
-%    \def\tabulateline{\HL}% just a spaced rule
-%    \def\tabulateautorule{\doHR\plusone}%
-%    \def\tabulateautoline{\doHL\plusone}%
-%    \def\HR{\doHR\zerocount}
-%    \def\HL{\doHL\zerocount}
-%    \unexpanded \def\NR % next row
-%      {\doglobal\increment\noftabulatelines
-%       \global\tabulatefirstflushedfalse
-%       \global\tabulateequalfalse
-%       \globallet\tabulatecolumn\!!zerocount
-%       \resettabulatepheight
-%       \unskip\unskip\crcr\flushtabulated
-%       \TABLEnoalign
-%         {\iftolerantTABLEbreak\else
-%            \ifnum\noftabulatelines=\plusone
-%              \dotabulatenobreak
-%            \else\ifnum\noftabulatelines=\minusnoftabulatelines
-%              \ifnum\tabulatemaxplines<\plustwo
-%                \dotabulatenobreak
-%              \else
-%                \allowbreak % needed with pbreak prevention
-%              \fi
-%            \else
-%              \allowbreak % needed with pbreak prevention
-%            \fi\fi
-%          \fi
-%          \global\tabulatefirstflushedfalse}}%
-%    \let\HL\empty % not needed
-%    \let\SR\NR    \let\AR\NR
-%    \let\FL\empty \let\FR\NR
-%    \let\ML\empty \let\MR\NR
-%    \let\LL\empty \let\LR\NR
-%    \let\doHR\gobbleoneargument
-%    \let\doHL\gobbleoneargument
-%    \global\let\flushtabulated\empty
-%    \let\savedbar|\let|\nexttabulate
-%    \tabskip\zeropoint
-%    \ifdim\getvalue{\??tt\currenttabulate\c!marge}>\zeropoint
-%      \!!toksa{&\flushtabulateindent\strut##%
-%                \tabskip\getvalue{\??tt\currenttabulate\c!marge}\strut
-%               &##\tabskip\zeropoint}%
-%    \else
-%      \!!toksa{&\flushtabulateindent\strut##%
-%               &##\tabskip\zeropoint}%
-%    \fi
-%    \tabulatewidth\zeropoint
-%    |#1X|\relax
-%    \scratchcounter\tabulatecolumns
-%    \multiply\scratchcounter3%
-%    \advance\scratchcounter4%
-%    \edef\totaltabulatecolumns{\the\scratchcounter}%
-%    \tabulatewidth\zeropoint
-%    % \dorecurse\tabulatecolumns % can be made faster
-%    %   {\doifundefinedelse{\@@tabbox@@\recurselevel}
-%    %      {\expandafter\newbox\csname\@@tabbox@@\recurselevel\endcsname}%
-%    %      {\global\setbox\csname\@@tabbox@@\recurselevel\endcsname\box\voidb@x}}%
-%    \initializetableboxes\tabulatecolumns
-%    \appendtoks&##\to\!!toksa
-%    \appendtoks\doglobal\increment\tabulatecolumn\to\!!toksa
-%    \appendtoks\NC\unskip\unskip\crcr\flushtabulated\to\tabulatedummy % no count
-%    \globallet\tabulatecolumn\!!zerocount
-%    \resettabulatepheight
-%    \def\bskip
-%      {\setbox\tabulatebox\vbox\bgroup
-%         \global\let\tabulatehook\notabulatehook}%
-%    \def\eskip
-%      {\par\egroup
-%       \global\let\tabulatehook\dotabulatehook}%
-%    \def\xbskip
-%      {\hbox\bgroup\vbox\bgroup
-%         \global\let\tabulatehook\notabulatehook}%
-%    \def\xeskip
-%      {\par\egroup\egroup
-%    \global\let\tabulatehook\dotabulatehook}%
-%    \let|\savedbar
-%    \global\let\tabulatehook\dotabulatehook
-%    \doifvalue{\??tt\currenttabulate\c!inspringen}\v!nee\forgetparindent
-%    \ifinsidefloat
-%      \let\tabulateindent\!!zeropoint
-%    \else
-%      \setlocalhsize \hsize\localhsize
-%    \fi
-%    \dontcomplain
-%    \forgetall
-%    \setbox0\vbox % outside \if because of line counting
-%      {\notesenabledfalse
-%       \let\tabulateindent\!!zeropoint
-%       \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
-%      \tabulatewidth\hsize
-%      \advance\tabulatewidth -\wd0
-%      \advance\tabulatewidth -\tabulatepwidth
-%      \ifnum\nofautotabulate>\zerocount
-%        \divide\tabulatewidth \nofautotabulate\relax
-%      \fi
-%    \fi
-%    \def\xbskip{\bskip}%
-%    \def\xeskip{\eskip}%
-%    \ifsplittabulate
-%      \splittopskip\strutht
-%      \global\let\flushtabulatedindeed\empty
-%      \long\def\bbskip
-%        {\ifvoid\tablebox\tabulatecolumn
-%           \ifx\flushtabulatedindeed\empty\else
-%             \setbox0\hbox
-%           \fi
-%        \fi}%
-%      \def\bskip
-%        {\ifvoid\tablebox\tabulatecolumn
-%           \global\setbox\tablebox\tabulatecolumn\vbox
-%           \bgroup
-%           \global\let\tabulatehook\notabulatehook
-%           \ifautotabulate\hsize\tabulatewidth\fi
-%           % \begstrut % interferes with pre-\pars
-%           % evt: \appendtoks\begstrut\to\everypar
-%           \ignorespaces
-%           \def\eskip
-%             {\par\egroup
-%              \settabulatepheight
-%              \global\let\tabulatehook\dotabulatehook
-%              \splitofftabulatebox}%
-%         \else
-%           \let\eskip\empty
-%           \dontcomplain
-%           \global\let\tabulatehook\dotabulatehook
-%           \expandafter\splitofftabulatebox
-%         \fi}%
-%      \gdef\flushtabulated
-%        {\TABLEnoalign % noalign % no interference !
-%           {\global\let\flushtabulatedindeed\empty
-%            \globallet\tabulatecolumn\!!zerocount
-%            \handletabulatepbreak
-%            \dorecurse\tabulatecolumns % was: \noftabcolumns
-%              {\ifvoid\tablebox\recurselevel\else
-%                 \gdef\flushtabulatedindeed{\the\tabulatedummy}%
-%               \fi}%
-%            \global\tabulatefirstflushedtrue}%
-%         \flushtabulatedindeed}%
-%    \else
-%      % tabhook op alles ?
-%      \def\bskip
-%        {\vtop\bgroup
-%           \ifautotabulate\hsize\tabulatewidth\fi
-%           % \begstrut % interferes with pre-\pars
-%           % evt: \appendtoks\begstrut\to\everypar
-%           \ignorespaces}%
-%      \def\eskip % vertical strut added august 2003
-%        {\par\verticalstrut\vskip-\struttotal\egroup}%
-%    \fi
-%    \let\totalnoftabulatelines\noftabulatelines
-%    \let\minusnoftabulatelines\noftabulatelines
-%    \decrement\minusnoftabulatelines
-%    \doglobal\newcounter\noftabulatelines
-%    \def\doHL##1%
-%      {\TABLEnoalign
-%         {\ifnum\noftabulatelines=\zerocount
-%            \ifcase##1\or
-%              \@EAEAEA\FL
-%            \fi
-%          \else\ifnum\noftabulatelines=\totalnoftabulatelines
-%            \ifcase##1\or
-%              \@EA\@EAEAEA\@EA\LL
-%            \fi
-%          \else
-%            \@EAEAEA\ML
-%          \fi\fi}}%
-%    \def\doHR##1% horizontal rule line (break untested)
-%      {\TABLEnoalign
-%         {\globallet\TABLEautoline\dotabulatelinerule
-%          \ifcase##1\or
-%            \ifnum\noftabulatelines=\zerocount
-%              \gdef\TABLEautoline{\TABLEnoalign{}}%
-%            \else\ifnum\noftabulatelines=\totalnoftabulatelines
-%              \gdef\TABLEautoline{\TABLEnoalign{}}%
-%            \fi\fi
-%          \fi
-%          \dotabulatenobreak}%
-%       \TABLEautoline
-%       \TABLEnoalign
-%         {\nobreak
-%          \ifx\TABLEautoline\dotabulatelinerule\kern-\lineheight\fi
-%          \ifnum\noftabulatelines=\totalnoftabulatelines
-%            \@EA\dotabulatenobreak
-%          \else
-%            \@EA\allowbreak
-%          \fi}%
-%       \TABLEautoline
-%       \TABLEnoalign
-%         {\dotabulatenobreak}}%
-%    \doifelsevalue{\??tt\currenttabulate\c!lijn}\v!regel
-%      {\let\HL              \HR
-%       \let\tabulateautoline\tabulateautorule
-%       \let\tabulateline    \tabulaterule}%
-%      {\def\HL{\doHL\zerocount}}%
-%    \def\tablebaselinecorrection
-%      {\def\dobaselinecorrection
-%         {\vskip-\prevdepth
-%          \vskip\strutdp
-%          \vskip\strutdp}%
-%       \baselinecorrection}%
-%    \def\FL{\TABLEnoalign
-%      {\ifinsidefloat\else
-%         \doifemptyvalue{\??tt\currenttabulate\c!voor} % no expansion
-%           {\tablebaselinecorrection}%
-%       \fi
-%       \dotabulaterule
-%       \dotabulatenobreak
-%       \dotabulateruleseperator
-%       \prevdepth\strutdp
-%       \dotabulatenobreak}}%
-%    \def\ML{\TABLEnoalign
-%      {\dotabulateruleseperator
-%       \dotabulaterule
-%       \ifnum\noftabulatelines>\plusone
-%         \ifnum\noftabulatelines<\minusnoftabulatelines
-%           \vskip\topskip\allowbreak\vskip-\topskip
-%           \vskip-\getvalue{\??tt\currenttabulate\c!lijndikte}%
-%           \dotabulaterule
-%         \fi
-%       \fi
-%       \dotabulateruleseperator}}%
-%    \def\LL{\TABLEnoalign
-%      {\dotabulatenobreak
-%       \dotabulateruleseperator
-%       \dotabulatenobreak
-%       \dotabulaterule
-%       \ifinsidefloat\else
-%         \doifemptyvalue{\??tt\currenttabulate\c!na} % no expansion
-%           {\vskip\strutdp
-%            \verticalstrut
-%            \vskip-\struttotal}%
-%       \fi}}%
-%    \chardef\tabulatepass\plustwo
-%    %
-%    \startflushtabulate
-%      \@EA\halign\@EA{\the\!!toksa\crcr\fulltabulatecontent\crcr}%
-%      \prevdepth\strutdp % nog eens beter, temporary hack
-%      \doifvalue{\??tt\currenttabulate\c!afstand}\v!grid
-%        {\vskip-\strutdp}% experimental tm-prikkels
-%    \stopflushtabulate
-%    %
-%    \egroup
-%    \ifinsidefloat \else
-%      \getvalue{\??tt\currenttabulate\c!na}%
-%    \fi
-%    \egroup}
-
 \chardef\tabulaterepeathead\zerocount
 
 \def\processtabulate[|#1|]% in the process of optimizing
-  {\tabulateunit\getvalue{\??tt\currenttabulate\c!eenheid}%
+  {\tabulateunit\getvalue{\??tt\currenttabulate\c!unit}%
    \checkfulltabulatecontent
    \globallet\tabulateruledepth \!!zeropoint
    \globallet\tabulateruleheight\!!zeropoint
    \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!links=>\def\@@tabulatealign{2},%
-       \v!midden=>\def\@@tabulatealign{3},%
+     [\getvalue{\??tt\currenttabulate\c!align}]
+     [\v!normal=>\def\@@tabulatealign{0},% = default value
+       \v!right=>\def\@@tabulatealign{1},% chardefs gebruiken
+        \v!left=>\def\@@tabulatealign{2},%
+       \v!middle=>\def\@@tabulatealign{3},%
       \s!default=>\def\@@tabulatealign{0},%
       \s!unknown=>\def\@@tabulatealign{0}]%
    \let\pretabskip\!!zeropoint
@@ -1260,9 +978,9 @@
    \resettabulatepheight
    \ifinsidefloat \else
      \processaction
-       [\getvalue{\??tt\currenttabulate\c!hoofd}]
-       [\v!herhaal=>\chardef\tabulaterepeathead\plusone,
-          \v!tekst=>\chardef\tabulaterepeathead\plustwo]%
+       [\getvalue{\??tt\currenttabulate\c!header}]
+       [\v!repeat=>\chardef\tabulaterepeathead\plusone,
+          \v!text=>\chardef\tabulaterepeathead\plustwo]%
    \fi
    \unexpanded \def\NC{\tabulatenormalcolumn0}%
    \unexpanded \def\RC{\tabulatenormalcolumn1}%
@@ -1314,9 +1032,9 @@
    \global\let\flushtabulated\empty
    \let\savedbar|\let|\nexttabulate
    \tabskip\zeropoint
-   \ifdim\getvalue{\??tt\currenttabulate\c!marge}>\zeropoint
+   \ifdim\getvalue{\??tt\currenttabulate\c!margin}>\zeropoint
      \!!toksa{&\flushtabulateindent\strut##%
-               \tabskip\getvalue{\??tt\currenttabulate\c!marge}\strut
+               \tabskip\getvalue{\??tt\currenttabulate\c!margin}\strut
               &##\tabskip\zeropoint}%
    \else
      \!!toksa{&\flushtabulateindent\strut##%
@@ -1353,7 +1071,7 @@
       \global\let\tabulatehook\dotabulatehook}%
    \let|\savedbar
    \global\let\tabulatehook\dotabulatehook
-   \doifvalue{\??tt\currenttabulate\c!inspringen}\v!nee\forgetparindent
+   \doifvalue{\??tt\currenttabulate\c!indenting}\v!no\forgetparindent
    \ifinsidefloat
      \let\tabulateindent\!!zeropoint
    \else
@@ -1502,7 +1220,7 @@
       \TABLEautoline
       \TABLEnoalign
         {\dotabulatenobreak}}%
-   \doifelsevalue{\??tt\currenttabulate\c!lijn}\v!regel
+   \doifelsevalue{\??tt\currenttabulate\c!rule}\v!line
      {\let\HL              \HR
       \let\tabulateautoline\tabulateautorule
       \let\tabulateline    \tabulaterule}%
@@ -1515,7 +1233,7 @@
       \baselinecorrection}%
    \def\FL{\TABLEnoalign
      {\ifinsidefloat\else
-        \doifemptyvalue{\??tt\currenttabulate\c!voor} % no expansion
+        \doifemptyvalue{\??tt\currenttabulate\c!before} % no expansion
           {\tablebaselinecorrection}%
       \fi
       \dotabulaterule
@@ -1529,7 +1247,7 @@
       \ifnum\noftabulatelines>\plusone
         \ifnum\noftabulatelines<\minusnoftabulatelines
           \vskip\topskip\allowbreak\vskip-\topskip
-          \vskip-\getvalue{\??tt\currenttabulate\c!lijndikte}%
+          \vskip-\getvalue{\??tt\currenttabulate\c!rulethickness}%
           \dotabulaterule
         \fi
       \fi
@@ -1540,7 +1258,7 @@
       \dotabulatenobreak
       \dotabulaterule
       \ifinsidefloat\else
-        \doifemptyvalue{\??tt\currenttabulate\c!na} % no expansion
+        \doifemptyvalue{\??tt\currenttabulate\c!after} % no expansion
           {\vskip\strutdp
            \verticalstrut
            \vskip-\struttotal}%
@@ -1548,14 +1266,14 @@
    \chardef\tabulatepass\plustwo
    %
    \ifcase\tabulaterepeathead
-     \startframedcontent[\getvalue{\??tt\currenttabulate\c!kader}]%
+     \startframedcontent[\getvalue{\??tt\currenttabulate\c!frame}]%
    \else
      \setbox\tabulatebox\vbox \bgroup
    \fi
    %
    \@EA\halign\@EA{\the\!!toksa\crcr\fulltabulatecontent\crcr}%
    \prevdepth\strutdp % nog eens beter, temporary hack
-   \doifvalue{\??tt\currenttabulate\c!afstand}\v!grid
+   \doifvalue{\??tt\currenttabulate\c!distance}\v!grid
      {\vskip-\strutdp}% experimental tm-prikkels
    %
    \ifcase\tabulaterepeathead
@@ -1566,7 +1284,7 @@
    %
    \egroup
    \ifinsidefloat \else
-     \getvalue{\??tt\currenttabulate\c!na}%
+     \getvalue{\??tt\currenttabulate\c!after}%
    \fi
    \egroup}
 
@@ -1609,16 +1327,16 @@
           \advance\dimen0\dp0
           \advance\dimen0\ht0
           \ifdim\dimen0>\pagegoal
-            \bgroup \pagina \egroup % make sure that local vars are kept
+            \bgroup \page \egroup % make sure that local vars are kept
             \ifcase\tabulaterepeathead\or
               \unvcopy2
             \or
-              \hbox{\strut\getvalue{\??tt\currenttabulate\c!titel}}%
+              \hbox{\strut\getvalue{\??tt\currenttabulate\c!title}}%
             \fi
           \fi
         \fi
         % test this on icare checklists / quite hacky ! ! !
-        \ifdim\ht0>\getvalue{\??tt\currenttabulate\c!lijndikte}\else
+        \ifdim\ht0>\getvalue{\??tt\currenttabulate\c!rulethickness}\else
           \kern-2\ht0 % brrrr
         \fi
         %
@@ -1627,7 +1345,7 @@
         \ifvoid#1 \exitloop \fi}%
    \fi}
 
-%D \startypen
+%D \starttyping
 %D \setuptabulate[split=no,rule=line]
 %D
 %D \starttabulate
@@ -1638,7 +1356,7 @@
 %D \NC tufte \NC \input tufte \NC \NR \tabulateautorule
 %D \NC tufte \NC \input tufte \NC \NR \tabulateautorule
 %D \stoptabulate
-%D \stoptypen
+%D \stoptyping
 
 % \starttabulatie[|mc|]
 % \NC \digits{100.000,00} \NC\NR
@@ -1693,22 +1411,22 @@
    \fi\fi}
 
 \setuptabulate
-  [\c!eenheid=1em,
+  [\c!unit=1em,
    EQ={:},
-   \c!kader=\v!uit,
-   \c!korps=,
-   \c!lijn=\v!normaal,
-   \c!lijnkleur=,
-   \c!lijndikte=\linewidth,
-   \c!binnen=,
-   \c!voor=\blanko,
-   \c!na=\blanko,
-   \c!afstand={\v!diepte,\v!middel},
-   \c!uitlijnen=\v!normaal,
-   \c!marge=\!!zeropoint,
-   \c!splitsen=\v!ja,
-   \c!hoofd=\v!ja,
-   \c!titel=,
-   \c!inspringen=\v!nee]
-
-\protect \endinput
\ No newline at end of file
+   \c!frame=\v!off,
+   \c!bodyfont=,
+   \c!rule=\v!normal,
+   \c!rulecolor=,
+   \c!rulethickness=\linewidth,
+   \c!inner=,
+   \c!before=\blank,
+   \c!after=\blank,
+   \c!distance={\v!depth,\v!medium},
+   \c!align=\v!normal,
+   \c!margin=\!!zeropoint,
+   \c!split=\v!yes,
+   \c!header=\v!yes,
+   \c!title=,
+   \c!indenting=\v!no]
+
+\protect \endinput