summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/mkiv/math-ini.mkiv
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-03-05 00:48:46 +0000
committerKarl Berry <karl@freefriends.org>2020-03-05 00:48:46 +0000
commitf210bce174e1f2f05305ab03e88e120a1cbfc4da (patch)
tree5c4e2ad096b5c745e859516ac3196fa0864292d5 /Master/texmf-dist/tex/context/base/mkiv/math-ini.mkiv
parent35fd641a3546acc0c62e0aa7f134888e36da30d4 (diff)
context (from cont-tmf.zip of Feb 17 16:00, size 116339406)
git-svn-id: svn://tug.org/texlive/trunk@54086 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/math-ini.mkiv')
-rw-r--r--Master/texmf-dist/tex/context/base/mkiv/math-ini.mkiv30
1 files changed, 24 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/math-ini.mkiv b/Master/texmf-dist/tex/context/base/mkiv/math-ini.mkiv
index 3c27bbf07f1..caddfca531d 100644
--- a/Master/texmf-dist/tex/context/base/mkiv/math-ini.mkiv
+++ b/Master/texmf-dist/tex/context/base/mkiv/math-ini.mkiv
@@ -129,6 +129,10 @@
\mathflattenmode 31
+\ifdefined\ordlimits\else
+ \let\ordlimits\limits
+\fi
+
\appendtoks
\attribute\mathmodeattribute\plusone
\to \everydisplay
@@ -254,11 +258,25 @@
\def\math_m_yes_math[#1]#2%
{#2}
+% \def\math_m_yes_text[#1]%
+% {\begingroup
+% \doifassignmentelse{#1}%
+% {\setupcurrentmathematics[#1]}%
+% {\edef\currentmathematics{#1}}% check for valid
+% \edef\p_openup{\mathematicsparameter\c!openup}%
+% \ifx\p_openup\v!yes
+% \expandafter\math_m_yes_text_openedup
+% \else
+% \expandafter\math_m_yes_text_normal
+% \fi}
+
\def\math_m_yes_text[#1]%
{\begingroup
- \doifassignmentelse{#1}%
- {\setupcurrentmathematics[#1]}%
- {\edef\currentmathematics{#1}}% check for valid
+ \ifcondition\validassignment{#1}%
+ \setupcurrentmathematics[#1]%
+ \else
+ \edef\currentmathematics{#1}% check for valid
+ \fi
\edef\p_openup{\mathematicsparameter\c!openup}%
\ifx\p_openup\v!yes
\expandafter\math_m_yes_text_openedup
@@ -1474,7 +1492,7 @@
\to \everymathematics
\setupmathematics
- [\s!collapsing=3] % mathlist wins over specials
+ [\s!collapsing=\v!none] % was 3 : mathlist wins over specials
%D Math italics (experiment)
@@ -2768,7 +2786,7 @@
\def\checkeddisplaywidth % hsize if zero
{\dimexpr
- \ifdim\displaywidth=\zeropoint
+ \ifzeropt\displaywidth
\hsize
\else
\displaywidth
@@ -2777,7 +2795,7 @@
\def\maximizeddisplaywidth % larger than zero but within hsize
{\dimexpr
- \ifdim\displaywidth=\zeropoint
+ \ifzeropt\displaywidth
\hsize
\else\ifdim\displaywidth>\hsize
\hsize