From d0edf3e90e8922d9c672f24ecdc5d44fe2716f31 Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Fri, 12 Jan 2018 08:12:50 +0100
Subject: 2018-01-08 23:11:00

---
 tex/context/base/mkiv/strc-mat.mkiv | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'tex/context/base/mkiv/strc-mat.mkiv')

diff --git a/tex/context/base/mkiv/strc-mat.mkiv b/tex/context/base/mkiv/strc-mat.mkiv
index 20a639fa3..c6b277991 100644
--- a/tex/context/base/mkiv/strc-mat.mkiv
+++ b/tex/context/base/mkiv/strc-mat.mkiv
@@ -46,6 +46,7 @@
    \c!indentnext=\v!no,
    \c!alternative=\s!default,
    \c!strut=\v!no,
+   \c!numberstrut=\v!yes, % \v!no \v!yes \v!always
    \c!distance=2\emwidth]
 
 \setupformulaframed
@@ -236,11 +237,14 @@
     \global\setfalse\c_strc_formulas_inside_place_sub
 \to \everyresetformulas
 
+\def\strc_formulas_place_number_noneed
+  {\doif{\formulaparameter\c!numberstrut}\v!always\strut}
+
 \def\strc_formulas_place_numbering % place formula
   {\settrue\c_strc_formulas_handle_number
    \strc_formulas_check_reference\c_strc_formulas_place_number_mode\currentplaceformulareference
    \ifnum\c_strc_formulas_place_number_mode=\plustwo
-     \glet\strc_formulas_place_number\relax
+     \glet\strc_formulas_place_number\strc_formulas_place_number_noneed
    \else
      \glet\strc_formulas_place_number\strc_formulas_place_number_indeed
    \fi
@@ -281,7 +285,12 @@
    \begingroup
    \useformulastyleandcolor\c!numberstyle\c!numbercolor
    \formulaparameter\c!numbercommand
-     {\strut
+     {\edef\p_strut{\formulaparameter\c!numberstrut}%
+      \ifx\p_strut\v!always
+         \strut
+      \else\ifx\p_strut\v!yes
+         \strut
+      \fi\fi
       \formulaparameter\c!left
       \namedtaggedlabeltexts
         \t!formulalabel \v!formula
-- 
cgit v1.2.3