summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/tabl-tab.mkiv
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2010-05-24 14:05:02 +0000
committerTaco Hoekwater <taco@elvenkind.com>2010-05-24 14:05:02 +0000
commit57ea7dad48fbf2541c04e434c31bde655ada3ac4 (patch)
tree1f8b43bc7cb92939271e1f5bec610710be69097f /Master/texmf-dist/tex/context/base/tabl-tab.mkiv
parent6ee41e1f1822657f7f23231ec56c0272de3855e3 (diff)
here is context 2010.05.24 13:05
git-svn-id: svn://tug.org/texlive/trunk@18445 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/tabl-tab.mkiv')
-rw-r--r--Master/texmf-dist/tex/context/base/tabl-tab.mkiv81
1 files changed, 41 insertions, 40 deletions
diff --git a/Master/texmf-dist/tex/context/base/tabl-tab.mkiv b/Master/texmf-dist/tex/context/base/tabl-tab.mkiv
index 429f41add44..d926dab989a 100644
--- a/Master/texmf-dist/tex/context/base/tabl-tab.mkiv
+++ b/Master/texmf-dist/tex/context/base/tabl-tab.mkiv
@@ -980,12 +980,13 @@
\newconditional\tablerepeathead
\newconditional\tablerepeattail
-\def\starttable
+\unexpanded\def\starttable
{\bgroup
+ \let\stoptable\dostoptable
\doif\@@tisplit\v!auto
{\ifinsidesplitfloat\let\@@tisplit\v!yes\fi}%
\doifinsetelse\@@tisplit{\v!yes,\v!repeat}
- {\def\stoptable{\stoptables\egroup}%
+ {\unexpanded\def\stoptable{\stoptables\egroup}%
\starttables}
{\doifelsenothing\@@tiframe
{\ifinsidefloat\else\startbaselinecorrection\fi}
@@ -993,7 +994,12 @@
\postponenotes
\firststagestartTABLE}}
-\def\stoptable
+% We cannot define \unexpanded\def\dostoptable a ssomehow lookahead
+% in alignments fail then, so we relax it and define it locally.
+
+\let\stoptabel\relax
+
+\def\dostoptable
{\chuckTABLEautorow % before the tail, else noalign problem
\insertTABLEtail
\TABLEnoalign{\globalletempty\@@TABLEhead}%
@@ -1039,7 +1045,7 @@
%D The implementation of the definition macro is not that
%D complicated:
-\def\definetabletemplate % to be redone
+\unexpanded\def\definetabletemplate % to be redone
{\bgroup
\catcode`\|=\@@other
\doquadrupleempty\dodefinetabletemplate}
@@ -1208,8 +1214,9 @@
\newbox\tablecontentbox
-\def\starttables
+\unexpanded\def\starttables
{\bgroup
+ \let\stoptables\dostoptables
\splittablestrue
\doifelse\@@tisplit\v!repeat
{\settrue \tablerepeathead\settrue \tablerepeattail}
@@ -1220,23 +1227,17 @@
\global\TABLEinbreakfalse
\firststagestartTABLE}
-% \def\stoptables
-% {\ifconditional\tablerepeattail\else\insertTABLEtail\fi
-% \finishTABLE
-% \egroup
-% \dosplittablebox\tablecontentbox
-% \flushnotes
-% \egroup}
-
-\def\stoptables
- {\chuckTABLEautorow % AM: before the tail, else noalign problem
- \ifconditional\tablerepeattail\else\insertTABLEtail\fi
- \finishTABLE
- \egroup
-\dontcomplain
- \dosplittablebox\tablecontentbox
- \flushnotes
- \egroup}
+\let\stoptables\relax % needed for \noalign
+
+\def\dostoptables
+ {\chuckTABLEautorow % AM: before the tail, else noalign problem
+ \ifconditional\tablerepeattail\else\insertTABLEtail\fi
+ \finishTABLE
+ \egroup
+ \dontcomplain
+ \dosplittablebox\tablecontentbox
+ \flushnotes
+ \egroup}
\newdimen\TABLEcaptionheight % obsolete
@@ -1296,11 +1297,11 @@
\letvalue{\e!stop \v!tabletail}=\undefined
\expanded
- {\def\csname\e!start\v!tablehead\endcsname##1\csname\e!stop\v!tablehead\endcsname%
+ {\long\def\csname\e!start\v!tablehead\endcsname##1\csname\e!stop\v!tablehead\endcsname%
{\noexpand\setTABLEhead##1\noexpand\end}}
\expanded
- {\def\csname\e!start\v!tabletail\endcsname##1\csname\e!stop\v!tabletail\endcsname%
+ {\long\def\csname\e!start\v!tabletail\endcsname##1\csname\e!stop\v!tabletail\endcsname%
{\noexpand\setTABLEtail##1\noexpand\end}}
%D The second argument is a dummy one, by scanning for it, we
@@ -1312,8 +1313,8 @@
\newconditional\preventTABLEbreak
\newconditional\someTABLEhead
-\def\dosetTABLEhead[#1][#2]#3\end{\setvalue{@@TABLEhead#1}{\TABLEnoalign{\global\settrue\someTABLEhead}#3}}
-\def\dosetTABLEtail[#1][#2]#3\end{\setvalue{@@TABLEtail#1}{\TABLEnoalign{\global\settrue\someTABLEtail}#3}}
+\long\def\dosetTABLEhead[#1][#2]#3\end{\setvalue{@@TABLEhead#1}{\TABLEnoalign{\global\settrue\someTABLEhead}#3}}
+\long\def\dosetTABLEtail[#1][#2]#3\end{\setvalue{@@TABLEtail#1}{\TABLEnoalign{\global\settrue\someTABLEtail}#3}}
%D Redudant \type{\HL}'s are removed automatically, so
%D mid||lines can be used without problems.
@@ -1454,7 +1455,7 @@
\global\TABLEgraydonefalse
\fi}
-\def\defineTABLEendings
+\unexpanded\def\defineTABLEendings
{\let\SR\TableSR
\let\FR\TableFR
\let\MR\TableMR
@@ -1694,13 +1695,13 @@
%D \sym{\type{\HC}} a horizontal colored line
%D \stopitemize
-% \def\defineTABLErules
+% \unexpanded\def\defineTABLErules
% {\let\VL\TableVL
% \let\VC\TableVC
% \let\HL\TableHL
% \let\HC\TableHC}
-\def\defineTABLErules
+\unexpanded\def\defineTABLErules
{\let\VL\TableVL
\let\VC\TableVC
\let\HL\TableHL
@@ -1865,7 +1866,7 @@
% n+1 uitleggen
-\def\defineTABLEsteps
+\unexpanded\def\defineTABLEsteps
{\let\NL\TableNL
\let\NR\TableNR
\let\NC\TableNC
@@ -1931,7 +1932,7 @@
\newif\ifTABLEdivision
-% \def\defineTABLEdivisions
+% \unexpanded\def\defineTABLEdivisions
% {\global\TABLEdivisionfalse % in start
% \let\DL\TableDL
% \let\DC\TableDC
@@ -1939,7 +1940,7 @@
% \let\VD\TableDV
% \let\DR\TableDR}
-\def\defineTABLEdivisions
+\unexpanded\def\defineTABLEdivisions
{\global\TABLEdivisionfalse % in start
\let\DL\TableDL
\let\DC\TableDC
@@ -2044,7 +2045,7 @@
% definieer: \CL \RL (eerste \CL[green] = hele row! / \CL[1,green])
% dus: \CL en \RL mix tussen \HL en \BL
-\def\defineTABLEbackgrounds
+\unexpanded\def\defineTABLEbackgrounds
{\let\BC \TableBC
\let\BL \TableBL
\let\BR \TableBR
@@ -2345,7 +2346,7 @@
\global\chardef\TABLEendofrowdepth \TABLErowfactor
\fi}
-\def\defineTABLEshorthands%
+\unexpanded\def\defineTABLEshorthands%
{\def\SPAN##1{\use{##1}}%
\def\TWO {\use2}%
\def\THREE {\use3}%
@@ -2354,7 +2355,7 @@
\def\SIX {\use6}%
\def\REF {\ReFormat}}
-\def\defineTABLEunits
+\unexpanded\def\defineTABLEunits
{\processaction
[\@@tidistance]
[ \v!none=>\OpenUp00\def\LOW{\Lower6 },
@@ -2376,7 +2377,7 @@
% De macro's t.b.v. instellingen.
-\def\setuptables
+\unexpanded\def\setuptables
{\dosingleargument\dosetuptables}
\def\dosetuptables[#1]%
@@ -2414,8 +2415,8 @@
\expanded{\switchtobodyfont[\@@tibodyfont]}%
% linecolor
\doifsomething\@@tirulecolor
- {\def\startglobalTABLEcolor{\startcolor[\@@tirulecolor]}%
- \def\stopglobalTABLEcolor {\stopcolor}}%
+ {\unexpanded\def\startglobalTABLEcolor{\startcolor[\@@tirulecolor]}%
+ \unexpanded\def\stopglobalTABLEcolor {\stopcolor}}%
% linethickness
\LineThicknessFactor4
\scratchdimen\@@tirulethickness
@@ -2423,10 +2424,10 @@
\expanded{\NormalTLTU{\the\scratchdimen}}%
% spacing, was depth=4 height=8 (counters, sigh, now macros)
\doifelse\@@tiheight\v!strut
- {\let\StrutHeightFactor\@@itheight}
+ {\let\StrutHeightFactor\strutheightfactor}
{\let\StrutHeightFactor\@@tiheight}%
\doifelse\@@tidepth\v!strut
- {\let\StrutDepthFactor\@@itdepth}
+ {\let\StrutDepthFactor\strutdepthfactor}
{\let\StrutDepthFactor\@@tidepth}%
\scratchdimen\StrutHeightFactor\points \multiply\scratchdimen 10%
\edef\StrutHeightFactor{\withoutpt\the\scratchdimen}%