beta 2013.11.26 18:06

8 files changed, 24 insertions, 6 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 1f720a526..0ac1ad99a 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.11.25 20:09}
+\newcontextversion{2013.11.26 18:06}
 
 %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-version.pdf b/tex/context/base/context-version.pdf
index cd0e34fc4..a9577ae70 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 69ef0a112..db5f6f1f9 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.11.25 20:09}
+\edef\contextversion{2013.11.26 18:06}
 \edef\contextkind   {beta}
 
 %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 f2327c22c..bf9f5278c 100644
--- a/tex/context/base/math-ini.mkiv
+++ b/tex/context/base/math-ini.mkiv
@@ -1236,6 +1236,20 @@
      \expandafter#3\else
      \expandafter#1\fi}
 
+\unexpanded\def\verbosemathstyle#1% #1 is number (\normalmathstyle)
+  {{\normalexpanded{\relax\darkgray\ttxx[\number#1:\ifcase\numexpr#1\relax
+                display\or   % 0
+         crampeddisplay\or   % 1
+                   text\or   % 2
+            crampedtext\or   % 3
+                 script\or   % 4
+          crampedscript\or   % 5
+           scriptscript\or   % 6
+    crampedscriptscript\else % 7
+                unknown\fi]}}}
+
+\unexpanded\def\showmathstyle{\verbosemathstyle\normalmathstyle}
+
 %D A plain inheritance:
 
 \def\mathpalette#1#2%
@@ -1699,6 +1713,7 @@
 
 \def\math_text_choice% if needed we can get rid of the normalize (predo in font code)
   {\normalizebodyfontsize\m_math_text_choice_face{\mathstyleface\normalmathstyle}%
+  %\showmathstyle
    \hbox\bgroup\font_basics_switchtobodyfont\m_math_text_choice_face\let\next}
 
 %D Safeguard against redefinitions:
diff --git a/tex/context/base/math-rad.mkvi b/tex/context/base/math-rad.mkvi
index 541a7038e..c6053071e 100644
--- a/tex/context/base/math-rad.mkvi
+++ b/tex/context/base/math-rad.mkvi
@@ -30,6 +30,9 @@
 
 \unexpanded\def\sqrt{\doifnextoptionalelse\rootwithdegree\rootwithoutdegree}
 
+\def\styledrootradical#1#2% so that \text works ok ... \rootradical behaves somewhat weird
+  {\normalexpanded{\rootradical{\normalunexpanded{#1}}{\noexpand\triggermathstyle{\normalmathstyle}\normalunexpanded{#2}}}}
+
 \def\rootwithdegree[#1]{\rootradical{#1}}
 \def\rootwithoutdegree {\rootradical  {}}
 
@@ -77,14 +80,14 @@
 \setvalue{\??mathradicalalternative\v!normal}#body%
   {\edef\p_color{\mathradicalparameter\c!color}%
    \ifx\p_color\empty
-     \rootradical{\currentmathradicaldegree}{#body}% {} really needed as \rootradical expands first
+     \styledrootradical{\currentmathradicaldegree}{#body}% {} really needed as \rootradical expands first
    \else\ifx\currentmathradicaldegree\empty
      \pushcolor[\p_color]%
-     \rootradical{\currentmathradicaldegree}%
+     \styledrootradical{\currentmathradicaldegree}%
      {\popcolor#body}%
    \else
      \pushcolor[\p_color]%
-     \rootradical{\popcolor\currentmathradicaldegree\pushcolor[\p_color]}%
+     \styledrootradical{\popcolor\currentmathradicaldegree\pushcolor[\p_color]}%
      {\popcolor#body}%
    \fi\fi}
 
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 7258c8591..d2e77fb26 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 ae56770be..e6d2ab162 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 6d1450d58..aee036795 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/13 20:09:50
+-- merge date  : 11/26/13 18:06:19
 
 do -- begin closure to overcome local limits and interference