2016-06-19 13:35:00

1 files changed, 17 insertions, 21 deletions

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{-}