2016-06-19 13:35:00

14 files changed, 28 insertions, 32 deletions

diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 45bbe7b03..4f5952d9b 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/mkii/mult-de.mkii b/tex/context/base/mkii/mult-de.mkii
index 249e18523..67bacc727 100644
--- a/tex/context/base/mkii/mult-de.mkii
+++ b/tex/context/base/mkii/mult-de.mkii
@@ -207,7 +207,7 @@
 \setinterfacevariable{force}{zwinge}
 \setinterfacevariable{foreground}{vordergrund}
 \setinterfacevariable{formula}{formel}
-\setinterfacevariable{formulae}{formeln}
+\setinterfacevariable{formulas}{formeln}
 \setinterfacevariable{forward}{vorwaerts}
 \setinterfacevariable{four}{vier}
 \setinterfacevariable{frame}{rahmen}
diff --git a/tex/context/base/mkii/mult-en.mkii b/tex/context/base/mkii/mult-en.mkii
index 3ea8f87c5..ba08baa65 100644
--- a/tex/context/base/mkii/mult-en.mkii
+++ b/tex/context/base/mkii/mult-en.mkii
@@ -207,7 +207,7 @@
 \setinterfacevariable{force}{force}
 \setinterfacevariable{foreground}{foreground}
 \setinterfacevariable{formula}{formula}
-\setinterfacevariable{formulae}{formulae}
+\setinterfacevariable{formulas}{formulas}
 \setinterfacevariable{forward}{forward}
 \setinterfacevariable{four}{four}
 \setinterfacevariable{frame}{frame}
diff --git a/tex/context/base/mkii/mult-fr.mkii b/tex/context/base/mkii/mult-fr.mkii
index 9a1f53a52..d80cfe21e 100644
--- a/tex/context/base/mkii/mult-fr.mkii
+++ b/tex/context/base/mkii/mult-fr.mkii
@@ -207,7 +207,7 @@
 \setinterfacevariable{force}{force}
 \setinterfacevariable{foreground}{premierplan}
 \setinterfacevariable{formula}{formule}
-\setinterfacevariable{formulae}{formules}
+\setinterfacevariable{formulas}{formules}
 \setinterfacevariable{forward}{avance}
 \setinterfacevariable{four}{quatre}
 \setinterfacevariable{frame}{cadre}
diff --git a/tex/context/base/mkii/mult-it.mkii b/tex/context/base/mkii/mult-it.mkii
index 4d68bc4df..c038379e8 100644
--- a/tex/context/base/mkii/mult-it.mkii
+++ b/tex/context/base/mkii/mult-it.mkii
@@ -207,7 +207,7 @@
 \setinterfacevariable{force}{forza}
 \setinterfacevariable{foreground}{foreground}
 \setinterfacevariable{formula}{formula}
-\setinterfacevariable{formulae}{formule}
+\setinterfacevariable{formulas}{formule}
 \setinterfacevariable{forward}{avanti}
 \setinterfacevariable{four}{quattro}
 \setinterfacevariable{frame}{cornice}
diff --git a/tex/context/base/mkii/mult-nl.mkii b/tex/context/base/mkii/mult-nl.mkii
index 0711108d1..dccbfa42d 100644
--- a/tex/context/base/mkii/mult-nl.mkii
+++ b/tex/context/base/mkii/mult-nl.mkii
@@ -207,7 +207,7 @@
 \setinterfacevariable{force}{forceer}
 \setinterfacevariable{foreground}{voorgrond}
 \setinterfacevariable{formula}{formule}
-\setinterfacevariable{formulae}{formules}
+\setinterfacevariable{formulas}{formules}
 \setinterfacevariable{forward}{vooruit}
 \setinterfacevariable{four}{vier}
 \setinterfacevariable{frame}{kader}
diff --git a/tex/context/base/mkii/mult-pe.mkii b/tex/context/base/mkii/mult-pe.mkii
index de5030276..d103eab63 100644
--- a/tex/context/base/mkii/mult-pe.mkii
+++ b/tex/context/base/mkii/mult-pe.mkii
@@ -207,7 +207,7 @@
 \setinterfacevariable{force}{اجبار}
 \setinterfacevariable{foreground}{پیش‌زمینه}
 \setinterfacevariable{formula}{فرمول}
-\setinterfacevariable{formulae}{فرمولها}
+\setinterfacevariable{formulas}{فرمولها}
 \setinterfacevariable{forward}{به‌جلو}
 \setinterfacevariable{four}{چهار}
 \setinterfacevariable{frame}{قالب}
diff --git a/tex/context/base/mkii/mult-ro.mkii b/tex/context/base/mkii/mult-ro.mkii
index 44e01db6a..83d68a61e 100644
--- a/tex/context/base/mkii/mult-ro.mkii
+++ b/tex/context/base/mkii/mult-ro.mkii
@@ -207,7 +207,7 @@
 \setinterfacevariable{force}{fortat}
 \setinterfacevariable{foreground}{primplan}
 \setinterfacevariable{formula}{formula}
-\setinterfacevariable{formulae}{formule}
+\setinterfacevariable{formulas}{formule}
 \setinterfacevariable{forward}{avans}
 \setinterfacevariable{four}{patru}
 \setinterfacevariable{frame}{incadrat}
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 9d03d82da..852e0fddd 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2016.06.18 16:28}
+\newcontextversion{2016.06.19 13:29}
 
 %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/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index ec4da7bd0..c441cf7ad 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -39,7 +39,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2016.06.18 16:28}
+\edef\contextversion{2016.06.19 13:29}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/mult-def.lua b/tex/context/base/mkiv/mult-def.lua
index f59851f49..da982d949 100644
--- a/tex/context/base/mkiv/mult-def.lua
+++ b/tex/context/base/mkiv/mult-def.lua
@@ -13538,10 +13538,10 @@ return {
    ["pe"]="فرمول",
    ["ro"]="formula",
   },
-  ["formulae"]={
+  ["formulas"]={
    ["cs"]="rovnice",
    ["de"]="formeln",
-   ["en"]="formulae",
+   ["en"]="formulas",
    ["fr"]="formules",
    ["it"]="formule",
    ["nl"]="formules",
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 1030dfbde..08d64337b 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index ed14795e4..4582f1650 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/strc-mat.mkiv b/tex/context/base/mkiv/strc-mat.mkiv
index 554dc84ca..272b5d9b5 100644
--- a/tex/context/base/mkiv/strc-mat.mkiv
+++ b/tex/context/base/mkiv/strc-mat.mkiv
@@ -968,10 +968,21 @@
 \unexpanded\def\startformulas
   {\dosingleempty\strc_formulas_start_formulas}
 
-\unexpanded\def\startformulas
-  {\dosingleempty\strc_formulas_start_formulas}
+\expandafter\let\csname\e!stop\v!formulas\endcsname\relax
+
+\unexpanded\def\strc_formulas_nested_formula_start
+  {\hbox to \displaywidth \bgroup
+   \hsize\displaywidth
+   \hss
+   \Ustartmath}
+
+\unexpanded\def\strc_formulas_nested_formula_stop
+  {\Ustopmath
+   \hss
+   \egroup
+   \hss}
 
-\def\strc_formulas_start_formulas[#1]#2\stopformulas % new / to be internationalized
+\normalexpanded{\def\noexpand\strc_formulas_start_formulas[#1]#2\csname\e!stop\v!formulas\endcsname}%
   {\startformula
    \dostarttagged\t!formulaset\empty
    \global\settrue\c_strc_formulas_inside_formulas
@@ -979,8 +990,9 @@
    \strc_formulas_handle_number
    \let\currentformula\empty
    \strc_formulas_forget_display_skips
-   \unexpanded\def\startformula##1\stopformula
-     {\advance\scratchcounter\plusone}%
+   \unexpanded\def\startformula
+     {\advance\scratchcounter\plusone
+      \expandafter\gobbleuntil\csname\e!stop\v!formula\endcsname}%
    \scratchcounter\zerocount
    #2% preroll
    \hbox to \displaywidth \bgroup
@@ -997,22 +1009,6 @@
    \hangafter\minusone    % added for side floats
    \hangindent\zeropoint} % added for side floats
 
-\unexpanded\def\strc_formulas_nested_formula_start
-  {\hbox to \displaywidth \bgroup
-   \hsize\displaywidth
-   \Ustartmath
-   \vcenter\bgroup % not optimal
-   \vskip-\strutdepth
-   \Ustartdisplaymath}
-
-\unexpanded\def\strc_formulas_nested_formula_stop
-  {\Ustopdisplaymath
-   \obeydepth
-   \egroup
-   \Ustopmath
-   \egroup
-   \hss}
-
 % place
 
 \def\m_strc_formulas_flag_inhibit{-}