beta 2012.02.16 17:54

10 files changed, 7 insertions, 11 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index d482be0d9..d84e7c457 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{2012.02.16 13:05}
+\newcontextversion{2012.02.16 17:54}
 
 %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 ac25a1fb7..954023287 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{2012.02.16 13:05}
+\newcontextversion{2012.02.16 17:54}
 
 %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 02941227e..1ad49e359 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 49194ad86..9aee2c118 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 c6703f445..665b4bf33 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{2012.02.16 13:05}
+\edef\contextversion{2012.02.16 17:54}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index d548d9410..299536c6d 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -23,7 +23,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2012.02.16 13:05}
+\edef\contextversion{2012.02.16 17:54}
 
 %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 53e1c0779..50a44d5b0 100644
--- a/tex/context/base/math-ini.mkiv
+++ b/tex/context/base/math-ini.mkiv
@@ -598,7 +598,7 @@
 
 \unexpanded\def\math_prime_indeed
   {\iffontchar\textfont\zerocount"FE325\relax
-%     ^\bgroup
+    ^\bgroup
      \expandafter\math_prime_indeed_virtual % virtual mess (using funny signal)
    \else
 %      \expandafter\math_prime_indeed_normal  % gets collapsed
@@ -611,15 +611,11 @@
 \let\prime\math_prime_indeed
 
 \def\math_prime_indeed_virtual
-  {^\bgroup
-   \math_prime_indeed_normal
+  {\math_prime_indeed_normal
    \futurelet\nexttoken\math_prime_indeed_choice}
 
 \installcorenamespace{mathprime}
 
-\def\math_prime_indeed_virtual
-  {\math_prime_indeed_normal\futurelet\nexttoken\math_prime_indeed_choice}
-
 \def\math_prime_indeed_choice
   {\csname\??mathprime
      \ifx                          '\nexttoken a\else
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 53b9869fd..73fc72cfd 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 0c838976e..39e8f7b49 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 edf868611..b8bc1b134 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  : 02/16/12 13:05:00
+-- merge date  : 02/16/12 17:54:20
 
 do -- begin closure to overcome local limits and interference