11 files changed, 39 insertions, 15 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 95e8c4efc..164daaa29 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{2014.10.15 13:29}
+\newcontextversion{2014.10.15 18:22}
 
 %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 9b1c309ef..b9f12117e 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 4378ee01b..e8730c1bd 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,7 +28,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2014.10.15 13:29}
+\edef\contextversion{2014.10.15 18:22}
 \edef\contextkind   {beta}
 
 %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 124b85dec..6db88cf21 100644
--- a/tex/context/base/math-ali.mkiv
+++ b/tex/context/base/math-ali.mkiv
@@ -1035,8 +1035,7 @@
    \strc_formulas_place_number
    \setbox\scratchbox\math_hbox to \displaywidth\bgroup
      \mathinnerstrut
-     $%
-     \displaystyle
+     \startforceddisplaymath
      \ifcase\mathraggedstatus\or\hfill\or\hfill\fi}
 
 \def\math_box_llapped_math_no
@@ -1058,7 +1057,7 @@
    \fi}
 
 \unexpanded\def\stopmathbox
-  {$%
+  {\stopforceddisplaymath
    \ifcase\mathraggedstatus\or\or\hfill\or\hfill\fi
    \egroup
    \setbox0\hbox{\unhcopy\scratchbox}%
diff --git a/tex/context/base/math-ini.mkiv b/tex/context/base/math-ini.mkiv
index d988691da..e75371d4d 100644
--- a/tex/context/base/math-ini.mkiv
+++ b/tex/context/base/math-ini.mkiv
@@ -105,6 +105,20 @@
 
 \def\inlineordisplaymath{\ifconditional\indisplaymath\expandafter\secondoftwoarguments\else\expandafter\firstoftwoarguments\fi}
 
+\unexpanded\def\forcedisplaymath
+  {\ifmmode
+     \displaystyle
+     \settrue\indisplaymath
+   \fi}
+
+\unexpanded\def\startforceddisplaymath
+  {\startimath
+   \displaystyle
+   \settrue\indisplaymath}
+
+\unexpanded\def\stopforceddisplaymath
+  {\stopimath}
+
 % \unexpanded\def\rawmathcharacter#1% slow but only for tracing
 %   {\begingroup
 %    \ifmmode
@@ -1852,7 +1866,14 @@
 
 \ifdefined\text\else \let\text\hbox \fi
 
-\unexpanded\def\mathoptext#1{\mathop{\text{#1}}}
+% \unexpanded\def\mathoptext#1{\mathop{\text{#1}}}
+
+\unexpanded\def\mathoptext
+  {\normalizebodyfontsize\m_math_text_choice_face{\mathstyleface\normalmathstyle}%
+  %\showmathstyle
+   \dowithnextbox
+     {\mathop{\box\nextbox}}%
+     \hbox\bgroup\font_basics_switchtobodyfont\m_math_text_choice_face\let\next}
 
 % new:
 
diff --git a/tex/context/base/mult-low.lua b/tex/context/base/mult-low.lua
index b0d46f256..449115619 100644
--- a/tex/context/base/mult-low.lua
+++ b/tex/context/base/mult-low.lua
@@ -170,6 +170,8 @@ return {
         --
         "donetrue", "donefalse",
         --
+        "inlineordisplaymath","indisplaymath","forcedisplaymath","startforceddisplaymath","stopforceddisplaymath","reqno",
+        --
         "htdp",
         "unvoidbox",
         "hfilll", "vfilll",
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 42c77184f..54c07a7e4 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 0e6d65a1e..9374361ec 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/x-asciimath.lua b/tex/context/base/x-asciimath.lua
index 410479128..c172077a8 100644
--- a/tex/context/base/x-asciimath.lua
+++ b/tex/context/base/x-asciimath.lua
@@ -115,8 +115,8 @@ local reserved = {
     ["or"]        = { false, "\\text{or}" },
     ["if"]        = { false, "\\text{if}" },
 
-    ["sqrt"]      = { false, "\\rootradical{}",     "unary" },
-    ["root"]      = { false, "\\rootradical",       "binary" },
+    ["sqrt"]      = { false, "\\asciimathsqrt",     "unary" },
+    ["root"]      = { false, "\\asciimathroot",     "binary" },
     ["frac"]      = { false, "\\frac",              "binary" },
     ["stackrel"]  = { false, "\\asciimathstackrel", "binary" },
     ["hat"]       = { false, "\\widehat",           "unary" },
@@ -657,13 +657,14 @@ local reserved = {
 
 local isbinary = {
     ["\\frac"]              = true,
-    ["\\rootradical"]       = true,
+    ["\\root"]              = true,
+    ["\\asciimathroot"]     = true,
     ["\\asciimathstackrel"] = true,
 }
 
 local isunary = {
     ["\\sqrt"]            = true,
-    ["\\rootradical{}"]   = true,
+    ["\\asciimathsqrt"]   = true,
     ["\\text"]            = true, --  mathoptext
     ["\\mathoptext"]      = true, --  mathoptext
     ["\\asciimathoptext"] = true, --  mathoptext
diff --git a/tex/context/base/x-asciimath.mkiv b/tex/context/base/x-asciimath.mkiv
index 6a9595a59..cbc28e820 100644
--- a/tex/context/base/x-asciimath.mkiv
+++ b/tex/context/base/x-asciimath.mkiv
@@ -133,10 +133,11 @@
 
 %D Hacks:
 
-\unexpanded\def\asciimathoptext      #1{\ifmmode\mathop{\text{#1}}\else#1\fi}
-\unexpanded\def\asciimathoptexttraced#1{\ifmmode\mathop{\text{\color[darkgreen]{#1}}}\else\color[darkgreen]{#1}\fi}
-
-\unexpanded\def\asciimathstackrel  #1#2{\mathematics{\mathop{\let\limits\relax\mover{#2}{#1}}}}
+\unexpanded\def\asciimathoptext        #1{\ifmmode\mathoptext{#1}\else#1\fi}
+\unexpanded\def\asciimathoptexttraced  #1{\ifmmode\mathoptext{\color[darkgreen]{#1}}\else\color[darkgreen]{#1}\fi}
+\unexpanded\def\asciimathstackrel    #1#2{\mathematics{\mathop{\let\limits\relax\mover{#2}{#1}}}}
+\unexpanded\def\asciimathroot        #1#2{\sqrt[#1]{#2}}
+\unexpanded\def\asciimathsqrt          #1{\sqrt{#1}}
 
 %D The core commands:
 
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 26fc2421f..93261ccc2 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  : 10/15/14 13:29:40
+-- merge date  : 10/15/14 18:22:36
 
 do -- begin closure to overcome local limits and interference