From a1f166da06ae1a6bb6be7a1d4ee23d00751165a9 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Fri, 4 Nov 2016 22:04:13 +0100 Subject: 2016-11-04 20:56:00 --- tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/math-del.mkiv | 66 +++++++++++++++++++++------------ tex/context/base/mkiv/mult-def.lua | 3 ++ tex/context/base/mkiv/status-files.pdf | Bin 25648 -> 25665 bytes tex/context/base/mkiv/status-lua.pdf | Bin 368443 -> 368442 bytes tex/context/base/mkiv/strc-con.mkvi | 5 ++- 7 files changed, 51 insertions(+), 27 deletions(-) (limited to 'tex/context/base/mkiv') diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 6815414db..ed4c07e2a 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2016.11.04 11:06} +\newcontextversion{2016.11.04 20:50} %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/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index aceb8fe35..8e1364f90 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2016.11.04 11:06} +\edef\contextversion{2016.11.04 20:50} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/math-del.mkiv b/tex/context/base/mkiv/math-del.mkiv index 41dd40a99..9629d595d 100644 --- a/tex/context/base/mkiv/math-del.mkiv +++ b/tex/context/base/mkiv/math-del.mkiv @@ -79,6 +79,8 @@ [\c!symbol=0, \c!command=\v!yes, \c!factor=1.5, + \c!axis=\v!yes, + % \c!exact=\v!yes \c!height=\exheight, \c!depth=\exheight] @@ -93,34 +95,50 @@ {\dodoubleempty\math_fenced_extensible_indeed} \unexpanded\def\math_fenced_extensible_indeed[#1][#2]% - {\mathop{% - \edef\currentmathextensible{#1}% - \edef\p_factor{\mathextensibleparameter\c!factor}% - \ifsecondargument - \doifassignmentelse{#2} - {\setupcurrentmathextensible[#2]% - \edef\p_factor{\mathextensibleparameter\c!factor}}% - {\edef\p_factor{#2}}% - \else - \edef\p_factor{\mathextensibleparameter\c!factor}% - \fi - \Uvextensible - axis % can be an option - height \p_factor\dimexpr\mathextensibleparameter\c!height\relax - depth \p_factor\dimexpr\mathextensibleparameter\c!depth\relax - \Udelimiter\zerocount\zerocount\mathextensibleparameter\c!symbol - \relax}% - } + {\mathop + {\edef\currentmathextensible{#1}% + \edef\p_factor{\mathextensibleparameter\c!factor}% + \ifsecondargument + \doifassignmentelse{#2} + {\setupcurrentmathextensible[#2]% + \edef\p_factor{\mathextensibleparameter\c!factor}}% + {\edef\p_factor{#2}}% + \else + \edef\p_factor{\mathextensibleparameter\c!factor}% + \fi + \edef\p_exact{\mathextensibleparameter\c!exact}% + \edef\p_axis {\mathextensibleparameter\c!axis}% + \edef\p_leftoffset{\mathextensibleparameter\c!leftoffset}% + \edef\p_rightoffset{\mathextensibleparameter\c!rightoffset}% + \ifx\p_leftoffset\empty\else + \mskip\p_leftoffset + \fi + \Uvextensible + \ifx\p_exact\v!yes exact \fi + \ifx\p_axis \v!yes axis \fi + height \p_factor\dimexpr\mathextensibleparameter\c!height\relax + depth \p_factor\dimexpr\mathextensibleparameter\c!depth \relax + \Udelimiter\zerocount\zerocount\mathextensibleparameter\c!symbol + \relax + \ifx\p_rightoffset\empty\else + \mskip\p_rightoffset + \fi}} \let\mathextensible\math_fenced_extensible -% \startformula -% \integral[factor=3] \frac{1}{2} -% \integral[5] \frac{1}{2} -% \stopformula - \definemathextensible[integral][\c!symbol="222B] +% \setupmathextensible[integral][rightoffset=-3mu,exact=yes,factor=2] +% +% \let\int\integral +% +% \startlines +% \ruledhbox{$\integral f\frac{1}{2}$} +% \ruledhbox{$\integral[factor=1] f\frac{1}{2}$} +% \ruledhbox{$\integral[factor=3] f\frac{1}{2}$} +% \ruledhbox{$\int f\frac{1}{2}$} +% \stoplines + \unexpanded\def\autointegral#1#2#3% {\ifmmode \setbox\nextbox\mathstylehbox{#3}% @@ -138,7 +156,7 @@ \normalsubscript{#2}% \box\nextbox \else - \char"222B\relax + \char"222B\relax \fi} % \startformula diff --git a/tex/context/base/mkiv/mult-def.lua b/tex/context/base/mkiv/mult-def.lua index d1ed74b6e..8bd8bb802 100644 --- a/tex/context/base/mkiv/mult-def.lua +++ b/tex/context/base/mkiv/mult-def.lua @@ -7745,6 +7745,9 @@ return { ["pe"]="حاشیه‌زوج", ["ro"]="marginepara", }, + ["exact"]={ + ["en"]="exact", + }, ["exitoffset"]={ ["en"]="exitoffset", }, diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index 4e44163d8..3b2304159 100644 Binary files a/tex/context/base/mkiv/status-files.pdf and b/tex/context/base/mkiv/status-files.pdf differ diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf index adc58e56e..c64546d95 100644 Binary files a/tex/context/base/mkiv/status-lua.pdf and b/tex/context/base/mkiv/status-lua.pdf differ diff --git a/tex/context/base/mkiv/strc-con.mkvi b/tex/context/base/mkiv/strc-con.mkvi index 25e26bf73..36c5d1b42 100644 --- a/tex/context/base/mkiv/strc-con.mkvi +++ b/tex/context/base/mkiv/strc-con.mkvi @@ -914,6 +914,9 @@ \global\let\currentconstructionexpansion\v!no \fi % + \ifx\currentconstructionreferenceprefix\empty + \global\let\currentconstructionreferenceprefix\referenceprefix + \fi \ifx\currentconstructionexpansion\s!xml \xmlstartraw \xdef\currentconstructiontitle {\constructionparameter\c!title}% @@ -972,7 +975,7 @@ internal \nextinternalreference order \nextinternalorderreference reference {\currentconstructionreference} - prefix {\referenceprefix} + prefix {\currentconstructionreferenceprefix} % block {\currentsectionblock} % section structures.sections.currentid(), } -- cgit v1.2.3