5 files changed, 15 insertions, 7 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 0d2067765..e27d1360d 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{2013.04.10 00:41}
+\newcontextversion{2013.04.10 09:23}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/cont-new.tmp b/tex/context/base/cont-new.tmp
index ec8bedc97..0d2067765 100644
--- a/tex/context/base/cont-new.tmp
+++ b/tex/context/base/cont-new.tmp
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2013.04.10 00:33}
+\newcontextversion{2013.04.10 00:41}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index d9aeaacbb..48e5a0641 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2013.04.10 00:41}
+\edef\contextversion{2013.04.10 09:23}
 \edef\contextkind   {current}
 
 %D For those who want to use this:
diff --git a/tex/context/base/context.tmp b/tex/context/base/context.tmp
index a43b0d5c8..d9aeaacbb 100644
--- a/tex/context/base/context.tmp
+++ b/tex/context/base/context.tmp
@@ -25,8 +25,8 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2013.04.10 00:33}
-\edef\contextkind   {beta}
+\edef\contextversion{2013.04.10 00:41}
+\edef\contextkind   {current}
 
 %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 0d9d38e20..db960de26 100644
--- a/tex/context/base/math-ali.mkiv
+++ b/tex/context/base/math-ali.mkiv
@@ -242,8 +242,16 @@
 
     \let\stopalign\relax
 
-    \let\startalignment\startalign
-    \let\stopalignment \stopalign
+    \unexpanded\def\startalignment
+      {\ifmmode
+         \let\stopalignment\align_math_normal_stop % cannot be an unexpanded def ... lookahead in align
+         \expandafter\align_math_normal_start
+       \else
+         \let\stopalignment\align_text_normal_stop
+         \expandafter\align_text_normal_start
+       \fi}
+
+    \let\stopalignment\relax
 
 \fi