2015-01-13 15:56:00

10 files changed, 40 insertions, 21 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 9e3949b29..11606f012 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{2015.01.13 11:00}
+\newcontextversion{2015.01.13 15:54}
 
 %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 369ef4ac0..94f3b95b8 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 7d6225a85..83adbddb2 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{2015.01.13 11:00}
+\edef\contextversion{2015.01.13 15:54}
 \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 a636c28c2..c333893d5 100644
--- a/tex/context/base/math-ini.mkiv
+++ b/tex/context/base/math-ini.mkiv
@@ -1531,6 +1531,16 @@
      \crampedscriptstyle  \or
     \fi}
 
+\newcount\c_math_saved_style
+
+\unexpanded\def\pushmathstyle % assumes begingroup .. endgroup
+  {\c_math_saved_style\mathstyle}
+
+\unexpanded\def\popmathstyle
+  {\ifnum\mathstyle=\c_math_saved_style\else
+     \triggermathstyle\c_math_saved_style
+   \fi}
+
 \installcorenamespace{mathstylecommand}
 \installcorenamespace{mathstylecache}
 
diff --git a/tex/context/base/mult-fun.lua b/tex/context/base/mult-fun.lua
index c6f8fee9e..4e8b9fc88 100644
--- a/tex/context/base/mult-fun.lua
+++ b/tex/context/base/mult-fun.lua
@@ -75,9 +75,9 @@ return {
         "xstretched", "ystretched", "snapped",
         --
         "pathconnectors", "function", "constructedpath", "constructedpairs",
-        "punkedfunction", "curvedfunction", "tightfunction",
-        "punkedpath", "curvedpath", "tightpath",
-        "punkedpairs", "curvedpairs", "tightpairs",
+        "punkedfunction", "straightfunction", "curvedfunction", "tightfunction",
+        "punkedpath", "straightpath", "curvedpath", "tightpath",
+        "punkedpairs", "straightpairs", "curvedpairs", "tightpairs",
         --
         "evenly", "oddly",
         --
diff --git a/tex/context/base/mult-low.lua b/tex/context/base/mult-low.lua
index bd6f3c04d..cbabec353 100644
--- a/tex/context/base/mult-low.lua
+++ b/tex/context/base/mult-low.lua
@@ -349,6 +349,7 @@ return {
         "uncramped", "cramped", "triggermathstyle", "mathstylefont", "mathsmallstylefont", "mathstyleface", "mathsmallstyleface", "mathstylecommand", "mathpalette",
         "mathstylehbox", "mathstylevbox", "mathstylevcenter", "mathstylevcenteredhbox", "mathstylevcenteredvbox",
         "mathtext", "setmathsmalltextbox", "setmathtextbox",
+        "pushmathstyle", "popmathstyle",
         --
         "triggerdisplaystyle", "triggertextstyle", "triggerscriptstyle", "triggerscriptscriptstyle",
         "triggeruncrampedstyle", "triggercrampedstyle",
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index ab52a2f3d..e1ff4721b 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 1677b60d1..7a39ff91d 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/x-mathml.mkiv b/tex/context/base/x-mathml.mkiv
index 093304e7d..c80e23825 100644
--- a/tex/context/base/x-mathml.mkiv
+++ b/tex/context/base/x-mathml.mkiv
@@ -1829,25 +1829,29 @@
 
 % helpers: maybe we can need a setting for the uprights
 
-\xmlmapvalue {mml} {normal}                 {\mathupright} % {\mathtf}
-\xmlmapvalue {mml} {double-struck}          {\mathblackboard}
-\xmlmapvalue {mml} {italic}                 {\mathit}
-\xmlmapvalue {mml} {fraktur}                {\mathfraktur}
-\xmlmapvalue {mml} {script}                 {\mathscript}
-\xmlmapvalue {mml} {bold}                   {\mb}          % {\mathbf}
-\xmlmapvalue {mml} {bold-italic}            {\mathbi}
-\xmlmapvalue {mml} {bold-fraktur}           {\mathfraktur\mathbf}
-\xmlmapvalue {mml} {bold-script}            {\mathscript\mathbf}
-\xmlmapvalue {mml} {sans-serif}             {\mathss}
-\xmlmapvalue {mml} {bold-sans-serif}        {\mathss\mathbf}
-\xmlmapvalue {mml} {sans-serif-italic}      {\mathss\mathit}
-\xmlmapvalue {mml} {sans-serif-bold-italic} {\mathss\mathbi}
-\xmlmapvalue {mml} {monospace}              {\mathtt}
+\xmlmapvalue {mml:s} {normal}                 {\mathupright} % {\mathtf}
+\xmlmapvalue {mml:s} {double-struck}          {\mathblackboard}
+\xmlmapvalue {mml:s} {italic}                 {\mathit}
+\xmlmapvalue {mml:s} {fraktur}                {\mathfraktur}
+\xmlmapvalue {mml:s} {script}                 {\mathscript}
+\xmlmapvalue {mml:s} {bold}                   {\mb}          % {\mathbf}
+\xmlmapvalue {mml:s} {bold-italic}            {\mathbi}
+\xmlmapvalue {mml:s} {bold-fraktur}           {\mathfraktur\mathbf}
+\xmlmapvalue {mml:s} {bold-script}            {\mathscript\mathbf}
+\xmlmapvalue {mml:s} {sans-serif}             {\mathss}
+\xmlmapvalue {mml:s} {bold-sans-serif}        {\mathss\mathbf}
+\xmlmapvalue {mml:s} {sans-serif-italic}      {\mathss\mathit}
+\xmlmapvalue {mml:s} {sans-serif-bold-italic} {\mathss\mathbi}
+\xmlmapvalue {mml:s} {monospace}              {\mathtt}
+
+\xmlmapvalue {mml:l} {-}                      {\triggersmallstyle}
+\xmlmapvalue {mml:l} {+}                      {\triggerbigstyle}
 
 % todo: displaystyle=true/false (or whatever else shows up)
 
 \starttexdefinition setmmlmathstyle #1
-    \xmlval {mml} {\xmlatt{#1}{mathvariant}} \empty % was: \mmmr
+    \xmlval {mml:s} {\xmlatt{#1}{mathvariant}} \empty % was: \mmmr
+    \xmlval {mml:l} {\xmlatt{#1}{scriptlevel}} \empty % was: \mmmr
 \stoptexdefinition
 
 \starttexdefinition applymmlmathcolor #1#2
@@ -1904,8 +1908,10 @@
 
 \startxmlsetups mml:mi % todo: mathsize (unlikely) mathcolor (easy) mathbackground (easy)
     \begingroup
+        \pushmathstyle
         \setmmlmathstyle{#1}
         \ctxmodulemathml{mi("#1")}
+        \popmathstyle
     \endgroup
 \stopxmlsetups
 
@@ -2079,8 +2085,10 @@
 
 \startxmlsetups mml:mstyle
     \begingroup
+        \pushmathstyle
         \setmmlmathstyle{#1}
         \xmlflush{#1}
+        \popmathstyle
     \endgroup
 \stopxmlsetups
 
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 32ebd2ddf..f0d5ff50e 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  : 01/13/15 11:00:13
+-- merge date  : 01/13/15 15:54:38
 
 do -- begin closure to overcome local limits and interference