summaryrefslogtreecommitdiff
path: root/tex/context/base/core-tbl.tex
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2003-03-03 00:00:00 +0100
committerHans Hagen <pragma@wxs.nl>2003-03-03 00:00:00 +0100
commit76c1d3fbb08e9b34c68f4b326b538f5802802500 (patch)
tree7a2111798bfa0ac208caa249510c8135dace8059 /tex/context/base/core-tbl.tex
parent94506ae16cbb3851986ebf900316894301f46667 (diff)
downloadcontext-76c1d3fbb08e9b34c68f4b326b538f5802802500.tar.gz
stable 2003.03.03
Diffstat (limited to 'tex/context/base/core-tbl.tex')
-rw-r--r--tex/context/base/core-tbl.tex33
1 files changed, 18 insertions, 15 deletions
diff --git a/tex/context/base/core-tbl.tex b/tex/context/base/core-tbl.tex
index 9238a4a55..ce682bb8d 100644
--- a/tex/context/base/core-tbl.tex
+++ b/tex/context/base/core-tbl.tex
@@ -633,25 +633,18 @@
{\ifundefined{\??tt\currenttabulate\v!hoofd}%
\let\tabulateheadcontent\empty
\else
- \@EA\let\@EA\tabulateheadcontent
- \csname\??tt\currenttabulate\v!hoofd\endcsname
- \fi
- \ifundefined{\??tt\currenttabulate\v!voet}%
- \let\tabulatetailcontent\empty
- \else
- \@EA\let\@EA\tabulatetailcontent
- \csname\??tt\currenttabulate\v!voet\endcsname
- \fi
- \ifx\tabulateheadcontent\empty\else
\def\tabulateheadcontent
{\TABLEnoalign{\global\settrue\tabulatesomeamble}%
- \tabulateheadcontent
+ \csname\??tt\currenttabulate\v!hoofd\endcsname
\TABLEnoalign{\global\setfalse\tabulatesomeamble}}%
\fi
- \ifx\tabulatetailcontent\empty\else
+ \ifundefined{\??tt\currenttabulate\v!voet}%
+ \let\tabulatetailcontent\empty
+ \else
\def\tabulatetailcontent
{\TABLEnoalign{\global\settrue\tabulatesomeamble}%
- \tabulatetailcontent}%
+ \csname\??tt\currenttabulate\v!voet\endcsname
+ \TABLEnoalign{\global\setfalse\tabulatesomeamble}}%
\fi}
\def\fulltabulatecontent
@@ -759,11 +752,21 @@
{\iftabulatefirstflushed\else\getvalue{\??tt\currenttabulate EQ}\fi
\global\tabulateequalfalse}
+% \def\tabulatenormalcolumn#1%
+% {&\iftabulateequal\tabulateEQ\fi&\global\chardef\tabulatetype#1&}
+%
+% \def\tabulateequalcolumn#1%
+% {&\tabulateEQ&\global\chardef\tabulatetype#1&}
+%
+% however, \unskip en \ignorespaces permit usage in complex XML/\starttabulate
+
\def\tabulatenormalcolumn#1%
- {&\iftabulateequal\tabulateEQ\fi&\global\chardef\tabulatetype#1&}
+ {\unskip&\iftabulateequal\tabulateEQ\fi&\global\chardef\tabulatetype#1&%
+ \ignorespaces}
\def\tabulateequalcolumn#1%
- {&\tabulateEQ&\global\chardef\tabulatetype#1&}
+ {\unskip&\tabulateEQ&\global\chardef\tabulatetype#1&%
+ \ignorespaces}
\def\tabulateautocolumn
{\tabulatenormalcolumn\zerocount