From 9445921ecd32433110dafdc90c349a24d58dbcad Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 2 Aug 2017 23:11:17 +0000 Subject: unicode-math (2aug17) git-svn-id: svn://tug.org/texlive/trunk@44940 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/unicode-math/unicode-math-luatex.sty | 40 ++++++++-------------- .../tex/latex/unicode-math/unicode-math-xetex.sty | 40 ++++++++-------------- .../tex/latex/unicode-math/unicode-math.sty | 2 +- 3 files changed, 29 insertions(+), 53 deletions(-) (limited to 'Master/texmf-dist/tex') 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 069b1d7b397..a7ab10aee47 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 @@ -1497,7 +1497,7 @@ \group_begin: \cs_new:Nn \__um_setup_active_superscript:nn { - \prop_gput:Non \g__um_supers_prop {\meaning #1} {#2} + \prop_gput:Nnn \g__um_supers_prop {#1} {#2} \char_set_catcode_active:N #1 \__um_char_gmake_mathactive:N #1 \scantokens @@ -1535,7 +1535,7 @@ \__um_setup_active_superscript:nn {^^^^02b8} {y} \cs_new:Nn \__um_setup_active_subscript:nn { - \prop_gput:Non \g__um_subs_prop {\meaning #1} {#2} + \prop_gput:Nnn \g__um_subs_prop {#1} {#2} \char_set_catcode_active:N #1 \__um_char_gmake_mathactive:N #1 \scantokens @@ -1599,34 +1599,22 @@ } \cs_new:Npn \__um_scan_sscript:TF #1#2 { - \tl_set:Nx \__peek_true_aux:w { \exp_not:n{ #1 } } - \tl_set_eq:NN \__peek_true:w \__peek_true_remove:w - \tl_set:Nx \__peek_false:w { \exp_not:n { \group_align_safe_end: #2 } } - \group_align_safe_begin: - \peek_after:Nw \__um_peek_execute_branches_ss: - } -\cs_new:Npn \__um_peek_execute_branches_ss: - { - \bool_lazy_any:nTF + \peek_N_type:TF { - { \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 } + \group_align_safe_begin: + \__um_scan_sscript_aux:nnN {#1} {#2} } - { \__peek_false:w } - { \__um_peek_execute_branches_ss_aux: } + {#2} } -\cs_new:Npn \__um_peek_execute_branches_ss_aux: +\cs_new:Npn \__um_scan_sscript_aux:nnN #1#2#3 { - \prop_if_in:coTF - {g__um_\l__um_tmpa_tl _prop} {\meaning\l_peek_token} - { - \prop_get:coN - {g__um_\l__um_tmpa_tl _prop} {\meaning\l_peek_token} \l__um_tmpb_tl - \tl_put_right:NV \l__um_ss_chain_tl \l__um_tmpb_tl - \__peek_true:w - } - { \__peek_false:w } + \prop_get:cnNTF {g__um_\l__um_tmpa_tl _prop} {#3} \l__um_tmpb_tl + { + \tl_put_right:NV \l__um_ss_chain_tl \l__um_tmpb_tl + \group_align_safe_end: + #1 + } + { \group_align_safe_end: #2 #3 } } \cs_new:Npn \__um_define_active_frac:Nw #1 #2/#3 { 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 b95c0b88525..b055c883b9f 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 @@ -1538,7 +1538,7 @@ \group_begin: \cs_new:Nn \__um_setup_active_superscript:nn { - \prop_gput:Non \g__um_supers_prop {\meaning #1} {#2} + \prop_gput:Nnn \g__um_supers_prop {#1} {#2} \char_set_catcode_active:N #1 \__um_char_gmake_mathactive:N #1 \scantokens @@ -1576,7 +1576,7 @@ \__um_setup_active_superscript:nn {^^^^02b8} {y} \cs_new:Nn \__um_setup_active_subscript:nn { - \prop_gput:Non \g__um_subs_prop {\meaning #1} {#2} + \prop_gput:Nnn \g__um_subs_prop {#1} {#2} \char_set_catcode_active:N #1 \__um_char_gmake_mathactive:N #1 \scantokens @@ -1640,34 +1640,22 @@ } \cs_new:Npn \__um_scan_sscript:TF #1#2 { - \tl_set:Nx \__peek_true_aux:w { \exp_not:n{ #1 } } - \tl_set_eq:NN \__peek_true:w \__peek_true_remove:w - \tl_set:Nx \__peek_false:w { \exp_not:n { \group_align_safe_end: #2 } } - \group_align_safe_begin: - \peek_after:Nw \__um_peek_execute_branches_ss: - } -\cs_new:Npn \__um_peek_execute_branches_ss: - { - \bool_lazy_any:nTF + \peek_N_type:TF { - { \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 } + \group_align_safe_begin: + \__um_scan_sscript_aux:nnN {#1} {#2} } - { \__peek_false:w } - { \__um_peek_execute_branches_ss_aux: } + {#2} } -\cs_new:Npn \__um_peek_execute_branches_ss_aux: +\cs_new:Npn \__um_scan_sscript_aux:nnN #1#2#3 { - \prop_if_in:coTF - {g__um_\l__um_tmpa_tl _prop} {\meaning\l_peek_token} - { - \prop_get:coN - {g__um_\l__um_tmpa_tl _prop} {\meaning\l_peek_token} \l__um_tmpb_tl - \tl_put_right:NV \l__um_ss_chain_tl \l__um_tmpb_tl - \__peek_true:w - } - { \__peek_false:w } + \prop_get:cnNTF {g__um_\l__um_tmpa_tl _prop} {#3} \l__um_tmpb_tl + { + \tl_put_right:NV \l__um_ss_chain_tl \l__um_tmpb_tl + \group_align_safe_end: + #1 + } + { \group_align_safe_end: #2 #3 } } \cs_new:Npn \__um_define_active_frac:Nw #1 #2/#3 { 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 34cddda2e48..8b7536094e4 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/07/30 v0.8e Unicode maths in XeLaTeX and LuaLaTeX] + [2017/08/02 v0.8f Unicode maths in XeLaTeX and LuaLaTeX] \usepackage{ifxetex,ifluatex} \ifxetex \ifdim\number\XeTeXversion\XeTeXrevision in<0.9998in% -- cgit v1.2.3