beta 2011.11.25 21:29

10 files changed, 13 insertions, 9 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 17812ba50..9722ce612 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2011.11.25 13:29}
+\newcontextversion{2011.11.25 21:29}
 
 %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/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 15caf079d..f179f1feb 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2011.11.25 13:29}
+\newcontextversion{2011.11.25 21:29}
 
 %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-version.pdf b/tex/context/base/context-version.pdf
index 230e099a6..858d49e7b 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 95879f6e5..6dbdc2bca 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index fbc493e89..da9357673 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.11.25 13:29}
+\edef\contextversion{2011.11.25 21:29}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 1f739713f..395e6dc15 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.11.25 13:29}
+\edef\contextversion{2011.11.25 21:29}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/math-ali.mkiv b/tex/context/base/math-ali.mkiv
index b0399d9d1..9efd948a2 100644
--- a/tex/context/base/math-ali.mkiv
+++ b/tex/context/base/math-ali.mkiv
@@ -262,13 +262,17 @@
 %                       \letvalue{\??eq:\v!left :\number\eqaligncolumn}\hfill}}
 
 \def\leftofeqalign
-  {\ifcase\csname\??eq::a::\number\eqaligncolumn\endcsname\or
-     \relax \or \hfill \or \hfill
+  {\ifcsname\??eq::a::\number\eqaligncolumn\endcsname
+     \ifcase\csname\??eq::a::\number\eqaligncolumn\endcsname\or
+       \relax \or \hfill \or \hfill
+     \fi
    \fi}
 
 \def\rightofeqalign
-  {\ifcase\csname\??eq::a::\number\eqaligncolumn\endcsname\or
-     \hfill \or \relax \or \hfill
+  {\ifcsname\??eq::a::\number\eqaligncolumn\endcsname
+     \ifcase\csname\??eq::a::\number\eqaligncolumn\endcsname\or
+       \hfill \or \relax \or \hfill
+     \fi
    \fi}
 
 \def\doseteqaligncolumn#1% we could just add to the preamble (as with other alignments)
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 0830f1414..329a70948 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 7606145b6..68547675c 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 8d287bcbb..c09168701 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 11/25/11 13:29:31
+-- merge date  : 11/25/11 21:29:42
 
 do -- begin closure to overcome local limits and interference