diff options
author | Hans Hagen <pragma@wxs.nl> | 2013-04-05 22:00:00 +0200 |
---|---|---|
committer | Hans Hagen <pragma@wxs.nl> | 2013-04-05 22:00:00 +0200 |
commit | 67eb8a2fa983fc472649cfdcb5b4a6ebe4739f62 (patch) | |
tree | ffa5a2fdbf7b456c7afbb3b947e5d31241f49375 /tex/context/base/math-ali.mkiv | |
parent | 94cf6213fbed1c43b46b4debdf05b682d5dba543 (diff) | |
download | context-67eb8a2fa983fc472649cfdcb5b4a6ebe4739f62.tar.gz |
beta 2013.04.05 22:00
Diffstat (limited to 'tex/context/base/math-ali.mkiv')
-rw-r--r-- | tex/context/base/math-ali.mkiv | 68 |
1 files changed, 53 insertions, 15 deletions
diff --git a/tex/context/base/math-ali.mkiv b/tex/context/base/math-ali.mkiv index 0e08c70bb..a172dc8ae 100644 --- a/tex/context/base/math-ali.mkiv +++ b/tex/context/base/math-ali.mkiv @@ -424,6 +424,7 @@ \setupmathcases [\c!distance=\emwidth, + \c!strut=\v!yes, % new \c!numberdistance=2.5\emwidth, \c!left={\left\{\mskip\thinmuskip}, \c!right={\right.}] @@ -438,30 +439,72 @@ \edef\currentmathcases{#1}% \dosingleempty\math_cases_start_indeed} +\def\math_cases_NC_zero + {\math_cases_NC} + +\def\math_cases_MC_zero + {\math_cases_NC + \ifmmode\else + \startimath + \let\math_cases_end_math\stopimath + \fi} + +\let\math_cases_end_math\relax + +\def\math_cases_NR_zero + {\unskip + \math_cases_end_math + \aligntab + \global\let\math_cases_NC\math_cases_NC_first + \dodirectdoubleempty\math_cases_NR} + +\def\math_cases_NC_first + {\global\let\math_cases_NC\math_cases_NC_second} + +\def\math_cases_NC_second + {\math_cases_end_math\aligntab} + +\let\math_cases_NR\math_align_NR_generic + \unexpanded\def\math_cases_start_indeed[#1]% {\iffirstargument \setupcurrentmathcases[#1]% \fi + \edef\p_strut{\mathcasesparameter\c!strut}% + \ifx\p_strut\v!yes + \let\math_cases_strut\strut + \else + \let\math_cases_strut\relax + \fi \mathcasesparameter\c!left \vcenter\bgroup \pushmacro\math_cases_NC \let\endmath\relax - \def\NC{\math_cases_NC}% - \def\MC{\math_cases_NC\ifmmode\else$\def\endmath{$}\fi}% - \global\let\math_cases_NC\math_cases_NC_indeed - \def\NR{\unskip\endmath&\global\let\math_cases_NC\math_cases_NC_indeed\dodirectdoubleempty\math_cases_NR}% + \let\NC\math_cases_NC_zero + \let\MC\math_cases_MC_zero + \let\NR\math_cases_NR_zero + \global\let\math_cases_NC\math_cases_NC_first \normalbaselines \mathsurround\zeropoint \everycr\emptytoks \tabskip\zeropoint \global\c_math_eqalign_column\plusone \halign\bgroup - $\mathcasesparameter\c!style##$\hfil - &\hskip\mathcasesparameter\c!distance\relax - \popmacro\math_cases_NC##\hfil - &\hskip\mathcasesparameter\c!numberdistance\relax - \let\formuladistance\!!zeropoint - \span\math_text_in_eqalign{##}% + \startimath + \mathcasesparameter\c!style + \alignmark\alignmark + \stopimath + \hfil + \aligntab + \hskip\mathcasesparameter\c!distance\relax + \popmacro\math_cases_NC + \math_cases_strut % looks better + \alignmark\alignmark + \hfil + \aligntab + \hskip\mathcasesparameter\c!numberdistance\relax + \let\formuladistance\!!zeropoint + \span\math_text_in_eqalign{\alignmark\alignmark}% \crcr} % todo: number \def\math_cases_stop @@ -472,11 +515,6 @@ \mathcasesparameter\c!right \endgroup} -\def\math_cases_NC_indeed - {\gdef\math_cases_NC{\endmath&}} - -\let\math_cases_NR\math_align_NR_generic - \definemathcases[cases] \definemathcases[\v!mathcases] |