summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.tex2
-rw-r--r--tex/context/base/context.tex2
-rw-r--r--tex/context/base/core-tbl.tex64
-rw-r--r--tex/context/base/page-mar.tex2
-rw-r--r--tex/context/base/supp-fil.tex7
5 files changed, 57 insertions, 20 deletions
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index a2ff8d06e..da32e7dbe 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -18,7 +18,7 @@
%D excellent place for hacks and new features.
\unprotect
-
+
\writestatus{\m!systems}{beware: some patches loaded from cont-new.tex!}
\def\toplinebox
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index e961c0dfd..83c94c796 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -15,7 +15,7 @@
\catcode`\{=1 \catcode`\}=2
-\def\contextversion{2003.1.28}
+\def\contextversion{2003.1.31}
%D Welcome to the main module. When this module is ran through
%D \type{initex} or \type{tex -i} or \type{whatevertex} using
diff --git a/tex/context/base/core-tbl.tex b/tex/context/base/core-tbl.tex
index 4923a290f..e0c662039 100644
--- a/tex/context/base/core-tbl.tex
+++ b/tex/context/base/core-tbl.tex
@@ -594,6 +594,41 @@
\let\tabulateheadcontent\empty
\let\tabulatetailcontent\empty
+% \def\checkfulltabulatecontent
+% {\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}
+%
+% \newconditional\tabulatesomeamble
+%
+% % \def\fulltabulatecontent
+% % {\tabulatecontent}
+%
+% \def\fulltabulatecontent
+% {\ifx\tabulateheadcontent\empty\else
+% \TABLEnoalign{\global\settrue\tabulatesomeamble}%
+% \tabulateheadcontent
+% \TABLEnoalign{\global\setfalse\tabulatesomeamble}%
+% \fi
+% \ignorespaces\tabulatecontent
+% \ifx\tabulatetailcontent\empty\else
+% \TABLEnoalign{\global\settrue\tabulatesomeamble}%
+% \tabulatetailcontent
+% \fi}
+%
+% the previous code breaks on first \HL
+
+\newconditional\tabulatesomeamble
+
\def\checkfulltabulatecontent
{\ifundefined{\??tt\currenttabulate\v!hoofd}%
\let\tabulateheadcontent\empty
@@ -606,25 +641,24 @@
\else
\@EA\let\@EA\tabulatetailcontent
\csname\??tt\currenttabulate\v!voet\endcsname
- \fi}
-
-\newconditional\tabulatesomeamble
-
-% \def\fulltabulatecontent
-% {\tabulatecontent}
-
-\def\fulltabulatecontent
- {\ifx\tabulateheadcontent\empty\else
- \TABLEnoalign{\global\settrue\tabulatesomeamble}%
- \tabulateheadcontent
- \TABLEnoalign{\global\setfalse\tabulatesomeamble}%
\fi
- \ignorespaces\tabulatecontent
+ \ifx\tabulateheadcontent\empty\else
+ \def\tabulateheadcontent
+ {\TABLEnoalign{\global\settrue\tabulatesomeamble}%
+ \tabulateheadcontent
+ \TABLEnoalign{\global\setfalse\tabulatesomeamble}}%
+ \fi
\ifx\tabulatetailcontent\empty\else
- \TABLEnoalign{\global\settrue\tabulatesomeamble}%
- \tabulatetailcontent
+ \def\tabulatetailcontent
+ {\TABLEnoalign{\global\settrue\tabulatesomeamble}%
+ \tabulatetailcontent}%
\fi}
+\def\fulltabulatecontent
+ {\tabulateheadcontent
+ \tabulatecontent
+ \tabulatetailcontent}
+
\setvalue{\e!start\e!tabulatehead}%
{\dosingleempty\dostartstarttabulatehead}
diff --git a/tex/context/base/page-mar.tex b/tex/context/base/page-mar.tex
index 442de4a35..f12a2a318 100644
--- a/tex/context/base/page-mar.tex
+++ b/tex/context/base/page-mar.tex
@@ -73,7 +73,7 @@
\doifnumberelse\margetekstnummer
{\ifnum\margetekstnummer>25 % to be translated
\writestatus\m!systems{potential margin stack overflow (\margetekstnummer)}%
- \fi}
+ \fi}
\donothing
\processaction
[\getvalue{\??im\margetekstnummer\c!uitlijnen}]
diff --git a/tex/context/base/supp-fil.tex b/tex/context/base/supp-fil.tex
index 378e0d12b..db33a050d 100644
--- a/tex/context/base/supp-fil.tex
+++ b/tex/context/base/supp-fil.tex
@@ -256,6 +256,8 @@
\ifx\normalinput\undefined \let\normalinput\input \fi
+\newif\iftracefiles
+
\def\maxreadlevel{3}
\def\doreadfile#1#2#3#4%
@@ -275,7 +277,7 @@
\def\redoreadfile#1#2#3%
{\immediate\openin\scratchread=#1\relax
\ifeof\scratchread
- % \writestatus\m!systems{cannot locate #1}\wait
+ \iftracefiles\writestatus\m!systems{cannot locate #1}\fi
\immediate\closein\scratchread
\decrement\readlevel\relax
\ifnum\readlevel>\zerocount
@@ -286,7 +288,8 @@
\fi
\else
\immediate\closein\scratchread
- % \writestatus\m!systems{#1 located}\wait
+ \edef\readfilename{#1}%
+ \iftracefiles\writestatus\m!systems{#1 located}\fi
\def\next{#2\dodoreadfile}%
\fi
\next}