diff options
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4383 -> 4384 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/math-ini.mkiv | 63 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24721 -> 24725 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 333473 -> 333473 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
7 files changed, 51 insertions, 18 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 0f004eacc..d6f5c73e2 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2014.10.20 21:10} +\newcontextversion{2014.10.21 10:09} %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/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex 3c4ce91fc..1cef09675 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 29460fb94..9ee9bc90f 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -28,7 +28,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2014.10.20 21:10} +\edef\contextversion{2014.10.21 10:09} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/math-ini.mkiv b/tex/context/base/math-ini.mkiv index e75371d4d..c4d280377 100644 --- a/tex/context/base/math-ini.mkiv +++ b/tex/context/base/math-ini.mkiv @@ -1956,17 +1956,21 @@ \installtextracker {math.openedup} - {\let\math_inline_openup_yes\math_inline_openup_traced} - {\let\math_inline_openup_yes\math_inline_openup_normal} + {\let\math_inline_openup_start_yes\math_inline_openup_traced_start} + {\let\math_inline_openup_start_yes\math_inline_openup_normal_start} -\unexpanded\def\math_inline_openup_normal +\unexpanded\def\math_inline_openup_normal_start {\scratchheight\dimexpr\ht\scratchbox+\m_math_inline_openup_ht\relax \scratchdepth \dimexpr\dp\scratchbox+\m_math_inline_openup_dp\relax \vrule\s!width\zeropoint\s!height\scratchheight\s!depth\scratchdepth\relax - \unhbox\scratchbox - \vrule\s!width\zeropoint\s!height\scratchheight\s!depth\scratchdepth\relax} + \begingroup + \let\math_inline_openup_stop\math_inline_openup_normal_stop} + +\unexpanded\def\math_inline_openup_normal_stop + {\endgroup + \vrule\s!width\zeropoint\s!height\scratchheight\s!depth\scratchdepth\relax} -\unexpanded\def\math_inline_openup_traced +\unexpanded\def\math_inline_openup_traced_start {\scratchtopoffset \ht\scratchbox \scratchbottomoffset\dp\scratchbox \scratchheight \dimexpr\scratchtopoffset +\m_math_inline_openup_ht\relax @@ -1977,7 +1981,11 @@ \vrule\s!width\emwidth\s!height\scratchheight\s!depth-\scratchtopoffset\relax \endgroup \kern-\emwidth - \unhbox\scratchbox + \begingroup + \let\math_inline_openup_stop\math_inline_openup_traced_stop} + +\unexpanded\def\math_inline_openup_traced_stop + {\endgroup \kern-\emwidth \begingroup \dofastcoloractivation{darkblue}% @@ -1985,22 +1993,47 @@ \endgroup \vrule\s!width\zeropoint\s!height\scratchheight\s!depth\scratchdepth\relax} -\let\math_inline_openup_yes\math_inline_openup_normal +\let\math_inline_openup_start_yes\math_inline_openup_normal_start +\let\math_inline_openup_stop \relax -\unexpanded\def\math_inline_openup_nop - {\unhbox\scratchbox} +\def\math_inline_openup_start_nop + {\let\math_inline_openup_stop\relax} -\unexpanded\def\openedupimath#1% +\unexpanded\def\openedupimath {\dontleavehmode \begingroup - \setbox\scratchbox\ifmmode\mathstylehbox\else\hbox\fi{\startimath#1\stopimath}% + \ifmmode + \expandafter\openedupimath_math + \else + \expandafter\openedupimath_text + \fi} + +\unexpanded\def\openedupimath_math#1% + {\setbox\scratchbox\mathstylehbox{#1}% \ifdim\ht\scratchbox>\strutht - \math_inline_openup_yes + \math_inline_openup_start_yes \else\ifdim\dp\scratchbox>\strutdp - \math_inline_openup_yes + \math_inline_openup_start_yes \else - \math_inline_openup_nop + \math_inline_openup_start_nop \fi\fi + #1% + \math_inline_openup_stop + \endgroup} + +\unexpanded\def\openedupimath_text#1% + {\setbox\scratchbox\hbox{\startimath#1\stopimath}% + \ifdim\ht\scratchbox>\strutht + \math_inline_openup_start_yes + \else\ifdim\dp\scratchbox>\strutdp + \math_inline_openup_start_yes + \else + \math_inline_openup_start_nop + \fi\fi + \startimath + #1% + \stopimath + \math_inline_openup_stop \endgroup} \protect \endinput diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex af6614d76..4ba540ee0 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf Binary files differindex e7066b4d0..2258b43f0 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 914729988..5809d2cbb 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 10/20/14 21:10:43 +-- merge date : 10/21/14 10:09:02 do -- begin closure to overcome local limits and interference |