summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tex/context/base/cont-new.tex2
-rw-r--r--tex/context/base/context.tex2
-rw-r--r--tex/context/base/math-ini.mkiv4
-rw-r--r--tex/context/base/tabl-tab.mkiv6
-rw-r--r--tex/generic/context/luatex-fonts-merged.lua2
5 files changed, 10 insertions, 6 deletions
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index e8b89219b..97a4843d1 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2010.11.26 22:49}
+\newcontextversion{2010.11.27 14:27}
%D This file is loaded at runtime, thereby providing an
%D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index 06c589c92..8623788f2 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2010.11.26 22:49}
+\edef\contextversion{2010.11.27 14:27}
%D For those who want to use this:
diff --git a/tex/context/base/math-ini.mkiv b/tex/context/base/math-ini.mkiv
index bab8792f7..b081af7c1 100644
--- a/tex/context/base/math-ini.mkiv
+++ b/tex/context/base/math-ini.mkiv
@@ -683,6 +683,8 @@
% for a while:
-\def\Umathbotaccent{\Umathaccent bottom }
+\ifnum\luatexversion<65
+ \def\Umathbotaccent{\Umathaccent bottom }
+\fi
\protect \endinput
diff --git a/tex/context/base/tabl-tab.mkiv b/tex/context/base/tabl-tab.mkiv
index 3c9515e60..29e7e86ac 100644
--- a/tex/context/base/tabl-tab.mkiv
+++ b/tex/context/base/tabl-tab.mkiv
@@ -2220,7 +2220,8 @@
{\xdef\tablecurrenthrulecolor{#1}}}
\unexpanded\def\TableHL
- {\finishTABLErow
+ {\chuckTABLEautorow
+ \finishTABLErow
\startTABLEnoalign
\dosingleempty\doTableHL}
@@ -2283,7 +2284,8 @@
\to \localtabledefinitions
\unexpanded\def\TableTB
- {\finishTABLErow
+ {\chuckTABLEautorow
+ \finishTABLErow
\startTABLEnoalign
\dosingleempty\doTableTB}
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index 7685bb12c..6897f2151 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 11/26/10 22:49:55
+-- merge date : 11/27/10 14:27:23
do -- begin closure to overcome local limits and interference