diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/unicode-math')
-rw-r--r-- | Master/texmf-dist/source/latex/unicode-math/unicode-math-compat.dtx | 17 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx | 18 |
2 files changed, 19 insertions, 16 deletions
diff --git a/Master/texmf-dist/source/latex/unicode-math/unicode-math-compat.dtx b/Master/texmf-dist/source/latex/unicode-math/unicode-math-compat.dtx index f7768095976..f04177c60f1 100644 --- a/Master/texmf-dist/source/latex/unicode-math/unicode-math-compat.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/unicode-math-compat.dtx @@ -302,7 +302,7 @@ \box_wd:N \l_tmpb_box + (\box_ht:N \l_tmpa_box - \box_dp:N \l_tmpa_box) * \number \fontdimen 65 \l_@@_font / 100 - } + } { \box_use:N \rootbox } @@ -342,10 +342,9 @@ % \pkg{mathtools}’s |\cramped| command and others that make use of its internal version use an incorrect font dimension. % % \begin{macrocode} +%<*XE> \AtEndOfPackageFile * { mathtools } { -%<*XE> - \newfam \g_@@_empty_fam \@@_check_and_fix:NNnnn \MT_cramped_internal:Nn \cs_set_nopar:Npn { #1 #2 } { @@ -380,7 +379,9 @@ } % \end{macrocode} % The \XeTeX\ version is pretty similar to the legacy version, only using the correct font dimensions. -% Note we used `\verb|\XeTeXradical|' with a newly-allocated empty family to make sure that the radical rule width is not set. +% Note we used `\verb|\XeTeXradical|' with the family 255 to be almost sure +% that the radical rule width is not set. Former use of `\verb|\newfam|' had an +% upsetting effect on legacy math alphabets. % \begin{macrocode} { \hbox_set:Nn \l_tmpa_box @@ -390,7 +391,7 @@ \m@th #1 \dim_zero:N \nulldelimiterspace - \XeTeXradical \g_@@_empty_fam \c_zero { #2 } + \XeTeXradical \c_two_hundred_fifty_five \c_zero { #2 } \c_math_toggle_token \color@endgroup } @@ -404,6 +405,7 @@ } \box_use_clear:N \l_tmpa_box } + } %</XE> % \end{macrocode} % @@ -445,8 +447,7 @@ \let\Uunderbracket=\underbracket \let\overbracket =\MToverbracket \let\underbracket =\MTunderbracket - } - } + }% end of AtBeginDocument % \end{macrocode} % \end{macro} % \end{macro} @@ -505,4 +506,4 @@ % % \begin{macrocode} %</compat> -% \end{macrocode}
\ No newline at end of file +% \end{macrocode} diff --git a/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx b/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx index 69eeeaccc20..4513ee78eaf 100644 --- a/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx +++ b/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx @@ -69,7 +69,7 @@ This work is "maintained" by Will Robertson. %<preamble&XE>\ProvidesPackage{unicode-math-xetex} %<preamble&LU>\ProvidesPackage{unicode-math-luatex} %<*preamble> - [2017/01/27 v0.8d Unicode maths in XeLaTeX and LuaLaTeX] + [2017/07/30 v0.8e Unicode maths in XeLaTeX and LuaLaTeX] %</preamble> %<*internal> \def\DOCUMENTEND{F} @@ -759,9 +759,11 @@ This work is "maintained" by Will Robertson. % \begin{macrocode} \cs_set:Nn \@@_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} } @@ -1980,7 +1982,7 @@ This work is "maintained" by Will Robertson. \seq_if_in:NnTF \g_@@_mathclasses_seq {##1} { \seq_put_right:Nn \l_@@_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_@@_cmd_range_seq {##1} } { \seq_put_right:Nn \l_@@_char_range_seq {##1} } } @@ -3633,11 +3635,11 @@ This work is "maintained" by Will Robertson. % \begin{macrocode} \cs_new:Npn \@@_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 } { \@@_peek_execute_branches_ss_aux: } |