summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty21
-rw-r--r--Master/texmf-dist/tex/latex/unicode-math/unicode-math-table.tex3
-rw-r--r--Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty23
-rw-r--r--Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty2
4 files changed, 26 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty
index e0913a4d904..069b1d7b397 100644
--- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty
+++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty
@@ -39,9 +39,11 @@
}
\cs_set:Nn \__um_set_mathsymbol:nNNn
{
- \bool_if:nT
+ \bool_lazy_and:nnT
+ {
+ \int_compare_p:nNn {#4} > {127}
+ }
{
- \int_compare_p:nNn {#4} > {127} &&
\int_compare_p:nNn { \char_value_catcode:n {#4} } = {11}
}
{ \char_set_catcode_other:n {#4} }
@@ -659,7 +661,7 @@
\seq_if_in:NnTF \g__um_mathclasses_seq {##1}
{ \seq_put_right:Nn \l__um_mclass_range_seq {##1} }
{
- \bool_if:nTF { \tl_if_single_p:n {##1} && \token_if_cs_p:N ##1 }
+ \bool_lazy_and:nnTF { \tl_if_single_p:n {##1} } { \token_if_cs_p:N ##1 }
{ \seq_put_right:Nn \l__um_cmd_range_seq {##1} }
{ \seq_put_right:Nn \l__um_char_range_seq {##1} }
}
@@ -1605,11 +1607,11 @@
}
\cs_new:Npn \__um_peek_execute_branches_ss:
{
- \bool_if:nTF
+ \bool_lazy_any:nTF
{
- \token_if_eq_catcode_p:NN \l_peek_token \c_group_begin_token ||
- \token_if_eq_catcode_p:NN \l_peek_token \c_group_end_token ||
- \token_if_eq_meaning_p:NN \l_peek_token \c_space_token
+ { \token_if_eq_catcode_p:NN \l_peek_token \c_group_begin_token }
+ { \token_if_eq_catcode_p:NN \l_peek_token \c_group_end_token }
+ { \token_if_eq_meaning_p:NN \l_peek_token \c_space_token }
}
{ \__peek_false:w }
{ \__um_peek_execute_branches_ss_aux: }
@@ -1928,8 +1930,6 @@
}
\AtEndOfPackageFile * { mathtools }
{
-\AtEndOfPackageFile * { mathtools }
- {
\cs_set_eq:NN \MToverbracket \overbracket
\cs_set_eq:NN \MTunderbracket \underbracket
@@ -1955,8 +1955,7 @@
\let\Uunderbracket=\underbracket
\let\overbracket =\MToverbracket
\let\underbracket =\MTunderbracket
- }
- }
+ }% end of AtBeginDocument
\msg_warning:nn { unicode-math } { mathtools-colon }
\NewDocumentCommand \dblcolon { } { \Colon }
\NewDocumentCommand \coloneqq { } { \coloneq }
diff --git a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-table.tex b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-table.tex
index 23e9cfa199f..aaa8d27b550 100644
--- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-table.tex
+++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-table.tex
@@ -345,6 +345,7 @@
\UnicodeMathSymbol{"02218}{\vysmwhtcircle }{\mathbin}{composite function (small circle)}%
\UnicodeMathSymbol{"02219}{\vysmblkcircle }{\mathbin}{bullet operator}%
\UnicodeMathSymbol{"0221A}{\sqrt }{\mathopen}{radical}%
+\UnicodeMathSymbol{"0221A}{\surd }{\mathord}{radical}%
\UnicodeMathSymbol{"0221B}{\cuberoot }{\mathopen}{cube root}%
\UnicodeMathSymbol{"0221C}{\fourthroot }{\mathopen}{fourth root}%
\UnicodeMathSymbol{"0221D}{\propto }{\mathrel}{is proportional to}%
@@ -387,6 +388,8 @@
\UnicodeMathSymbol{"02242}{\eqsim }{\mathrel}{equals, similar}%
\UnicodeMathSymbol{"02243}{\simeq }{\mathrel}{similar, equals}%
\UnicodeMathSymbol{"02244}{\nsime }{\mathrel}{not similar, equals}%
+\UnicodeMathSymbol{"02243}{\sime }{\mathrel}{similar, equals (alias)}%
+\UnicodeMathSymbol{"02244}{\nsimeq }{\mathrel}{not similar, equals (alias)}%
\UnicodeMathSymbol{"02245}{\cong }{\mathrel}{congruent with}%
\UnicodeMathSymbol{"02246}{\simneqq }{\mathrel}{similar, not equals [vert only for 9573 entity]}%
\UnicodeMathSymbol{"02247}{\ncong }{\mathrel}{not congruent with}%
diff --git a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty
index 6ce8f49063f..b95c0b88525 100644
--- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty
+++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty
@@ -37,9 +37,11 @@
}
\cs_set:Nn \__um_set_mathsymbol:nNNn
{
- \bool_if:nT
+ \bool_lazy_and:nnT
+ {
+ \int_compare_p:nNn {#4} > {127}
+ }
{
- \int_compare_p:nNn {#4} > {127} &&
\int_compare_p:nNn { \char_value_catcode:n {#4} } = {11}
}
{ \char_set_catcode_other:n {#4} }
@@ -684,7 +686,7 @@
\seq_if_in:NnTF \g__um_mathclasses_seq {##1}
{ \seq_put_right:Nn \l__um_mclass_range_seq {##1} }
{
- \bool_if:nTF { \tl_if_single_p:n {##1} && \token_if_cs_p:N ##1 }
+ \bool_lazy_and:nnTF { \tl_if_single_p:n {##1} } { \token_if_cs_p:N ##1 }
{ \seq_put_right:Nn \l__um_cmd_range_seq {##1} }
{ \seq_put_right:Nn \l__um_char_range_seq {##1} }
}
@@ -1646,11 +1648,11 @@
}
\cs_new:Npn \__um_peek_execute_branches_ss:
{
- \bool_if:nTF
+ \bool_lazy_any:nTF
{
- \token_if_eq_catcode_p:NN \l_peek_token \c_group_begin_token ||
- \token_if_eq_catcode_p:NN \l_peek_token \c_group_end_token ||
- \token_if_eq_meaning_p:NN \l_peek_token \c_space_token
+ { \token_if_eq_catcode_p:NN \l_peek_token \c_group_begin_token }
+ { \token_if_eq_catcode_p:NN \l_peek_token \c_group_end_token }
+ { \token_if_eq_meaning_p:NN \l_peek_token \c_space_token }
}
{ \__peek_false:w }
{ \__um_peek_execute_branches_ss_aux: }
@@ -2037,7 +2039,6 @@
}
\AtEndOfPackageFile * { mathtools }
{
- \newfam \g__um_empty_fam
\__um_check_and_fix:NNnnn
\MT_cramped_internal:Nn \cs_set_nopar:Npn { #1 #2 }
{
@@ -2078,7 +2079,7 @@
\m@th
#1
\dim_zero:N \nulldelimiterspace
- \XeTeXradical \g__um_empty_fam \c_zero { #2 }
+ \XeTeXradical \c_two_hundred_fifty_five \c_zero { #2 }
\c_math_toggle_token
\color@endgroup
}
@@ -2089,6 +2090,7 @@
}
\box_use_clear:N \l_tmpa_box
}
+ }
\AtEndOfPackageFile * { mathtools }
{
\cs_set_eq:NN \MToverbracket \overbracket
@@ -2116,8 +2118,7 @@
\let\Uunderbracket=\underbracket
\let\overbracket =\MToverbracket
\let\underbracket =\MTunderbracket
- }
- }
+ }% end of AtBeginDocument
\msg_warning:nn { unicode-math } { mathtools-colon }
\NewDocumentCommand \dblcolon { } { \Colon }
\NewDocumentCommand \coloneqq { } { \coloneq }
diff --git a/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty b/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty
index 62ee5eff1af..34cddda2e48 100644
--- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty
+++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty
@@ -19,7 +19,7 @@
%%
%% This work is "maintained" by Will Robertson.
\ProvidesPackage{unicode-math}
- [2017/01/27 v0.8d Unicode maths in XeLaTeX and LuaLaTeX]
+ [2017/07/30 v0.8e Unicode maths in XeLaTeX and LuaLaTeX]
\usepackage{ifxetex,ifluatex}
\ifxetex
\ifdim\number\XeTeXversion\XeTeXrevision in<0.9998in%