diff options
Diffstat (limited to 'tex/context/base/mkxl/math-fen.mkxl')
| -rw-r--r-- | tex/context/base/mkxl/math-fen.mkxl | 56 |
1 files changed, 40 insertions, 16 deletions
diff --git a/tex/context/base/mkxl/math-fen.mkxl b/tex/context/base/mkxl/math-fen.mkxl index 1656f4b4a..a69cafb97 100644 --- a/tex/context/base/mkxl/math-fen.mkxl +++ b/tex/context/base/mkxl/math-fen.mkxl @@ -15,7 +15,7 @@ \unprotect -% \definemathfence [fancybracket] [bracket] [command=yes,color=blue] +% \definemathfence [fancybracket] [bracket] [define=yes,color=blue] % % test $|x|$ test \par % test $||x||$ test (okay) \par @@ -42,7 +42,7 @@ \c!middle=, \c!mathstyle=, \c!color=, - \c!command=, + \c!define=, % was \c!command \c!mathclass=, \c!leftclass=\mathopencode, \c!rightclass=\mathclosecode, @@ -59,9 +59,7 @@ \c!factor=\v!auto] \appendtoks - \edef\p_command{\mathfenceparameter\c!command}% - \ifx\p_command\v!yes - % \instance + \ifcstok{\mathfenceparameter\c!define}\v!yes \protected\edefcsname\currentmathfence\endcsname{\math_fenced_fenced{\currentmathfence}}% \fi \to \everydefinemathfence @@ -338,6 +336,19 @@ % \definemathfence [tupdownarrows] [text] [\c!left="2191,\c!right="2193] +\def\math_fenced_check#1% + {\iftok{\mathfenceparameter#1}\emptytoks\letmathfenceparameter#1\v!none\fi} + +\appendtoks + \math_fenced_check\c!left + \math_fenced_check\c!right +\to \everysetupmathfence + +\appendtoks + \math_fenced_check\c!left + \math_fenced_check\c!right +\to \everydefinemathfence + \protected\def\math_fenced_horizontal_common#1#2#3#4% \Uwhatever class symbol source {\c_math_fenced_class\math_class_by_parameter\mathfenceparameter#2\relax \edef\p_fence{#3}% @@ -387,7 +398,7 @@ \setupmathfence [\v!text] [\c!text=\v!yes, - \c!command=\v!yes, + \c!define=\v!yes, \c!distance=.125\emwidth] \tolerant\protected\def\math_fenced_vertical#1#*[#2]% @@ -653,10 +664,23 @@ \immutable\protected\def\Lopenbracketmirrored {\math_fenced_fenced_stop {mirroredopenbracket}} \immutable\protected\def\Ropenbracketmirrored {\math_fenced_fenced_start{mirroredopenbracket}} \immutable\protected\def\Lnothingmirrored {\math_fenced_fenced_stop {mirrorednothing}} \immutable\protected\def\Rnothingmirrored {\math_fenced_fenced_start{mirrorednothing}} -\definemathfence [interval] [\c!left="2997,\c!right="2998] -\definemathfence [openinterval] [interval] [\c!left="2998,\c!right="2998] -\definemathfence [leftopeninterval] [interval] [\c!left="2997,\c!right="2997] -\definemathfence [rightopeninterval] [interval] [\c!left="2998,\c!right="2998] +% These tortoise chars almost only exist in stix (and ar not commonly used) + +% \definemathfence [interval] [\c!left="2997,\c!right="2998] +% \definemathfence [openinterval] [interval] [\c!left="2998,\c!right="2998] +% \definemathfence [leftopeninterval] [interval] [\c!left="2997,\c!right="2997] +% \definemathfence [rightopeninterval] [interval] [\c!left="2998,\c!right="2998] + +% Different intervals. The variants are the ones suggested by Bourbaki. + +\definemathfence [interval] [\c!left="005B,\c!right="005D] +\definemathfence [openinterval] [interval] [\c!left="0028,\c!right="0029] +\definemathfence [closedinterval] [interval] [\c!left="005B,\c!right="005D] +\definemathfence [leftopeninterval] [interval] [\c!left="0028,\c!right="005D] +\definemathfence [rightopeninterval] [interval] [\c!left="005B,\c!right="0029] +\definemathfence [varopeninterval] [interval] [\c!left="005D,\c!right="005B] +\definemathfence [varleftopeninterval] [interval] [\c!left="005D,\c!right="005D] +\definemathfence [varrightopeninterval] [interval] [\c!left="005B,\c!right="005B] \immutable\protected\def\Linterval {\math_fenced_fenced_start{interval}} \immutable\protected\def\Lointerval {\math_fenced_fenced_start{openinterval}} @@ -1004,7 +1028,7 @@ % \vrule height 3cm depth 3cm % \right\rintegral -%definemathfence [fancybracket] [bracket] [command=yes,color=red] +%definemathfence [fancybracket] [bracket] [define=yes,color=red] %D The nested fences recovery code is needed for mathml and the original %D code can still be found in the mkiv file. @@ -1211,10 +1235,10 @@ % $x + \tdownuparrows{left}{right} + x$ % $x + \tupanddownarrows[color=red,leftcolor=green,rightcolor=blue]{left}{right} + x$ -\definemathfence [tupanddownarrows] [\v!text] [\c!left="2191,\c!right="2193] -\definemathfence [tupdownarrows] [\v!text] [\c!left="21C5,\c!right=0] -\definemathfence [tdownuparrows] [\v!text] [\c!middle="21F5] -\definemathfence [tuparrow] [\v!text] [\c!middle="2191] -\definemathfence [tdownarrow] [\v!text] [\c!middle="2193] +\definemathfence [tupanddownarrows][\v!text][\c!left="2191,\c!right="2193] +\definemathfence [tupdownarrows] [\v!text][\c!left="21C5,\c!right=0] +\definemathfence [tdownuparrows] [\v!text][\c!middle="21F5] +\definemathfence [tuparrow] [\v!text][\c!middle="2191] +\definemathfence [tdownarrow] [\v!text][\c!middle="2193] \protect |