diff options
Diffstat (limited to 'Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty')
-rw-r--r-- | Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty index b23c5ffde29..e0c95aaa605 100644 --- a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty +++ b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty @@ -29,10 +29,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: xeCJK.dtx 54327e6 2018-01-28 19:10:14 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: xeCJK.dtx 25e85c2 2018-02-27 02:44:39 +0800 Qing Lee <sobenlee@gmail.com> $ {addon file for xunicode} \ProvidesExplPackage{xunicode-addon} - {\ExplFileDate}{3.6.0}{\ExplFileDescription} + {\ExplFileDate}{3.6.1}{\ExplFileDescription} \bool_lazy_or:nnF { \sys_if_engine_xetex_p: } { \sys_if_engine_luatex_p: } @@ -179,16 +179,20 @@ \cs_new_protected:Npn \__xunadd_undeclare_composite:Nnnn #1#2#3#4 { \cs_undefine:c { \__xunadd_composite_cs:Nnn #1 {#2} {#3} } } \cs_new:Npx \__xunadd_composite_cs:Nnn #1#2#3 - { \cs_to_str:N \\ #2 \exp_not:N \token_to_str:N #1 - \exp_not:N \tl_to_str:n {#3} } + { \c_backslash_str #2 \exp_not:N \token_to_str:N #1 - \exp_not:N \tl_to_str:n {#3} } \cs_new:Npx \__xunadd_composite_cs:nnn #1#2#3 - { \cs_to_str:N \\ #2 #1 - \exp_not:N \tl_to_str:n {#3} } + { \c_backslash_str #2 #1 - \exp_not:N \tl_to_str:n {#3} } \prg_new_conditional:Npnn \__xunadd_if_csname:n #1 { TF } { \tl_if_single_token:nTF {#1} { - \if_predicate:w - \bool_if_p:n { \token_if_cs_p:N #1 || \token_if_active_p:N #1 } - \prg_return_true: \else: \prg_return_false: \fi: + \token_if_cs:NTF #1 + { \prg_return_true: } + { + \token_if_active:NTF #1 + { \prg_return_true: } + { \prg_return_false: } + } } { \prg_return_false: } } @@ -242,10 +246,14 @@ } \cs_new_protected:Npn \__xunadd_provide_text_command_default:N #1 { - \bool_lazy_or:nnF - { \cs_if_exist_p:c { ? \token_to_str:N #1 } } - { \cs_if_free_p:c { ? - \token_to_str:N #1 } } - { \exp_args:NNv \ProvideTextCommandDefault #1 { ? - \token_to_str:N #1 } } + \cs_if_exist:cF { ? \token_to_str:N #1 } + { + \cs_if_free:cF { ? - \token_to_str:N #1 } + { + \exp_args:NNv \ProvideTextCommandDefault #1 + { ? - \token_to_str:N #1 } + } + } } \cs_new_protected:Npn \__xunadd_declare_character:NNnn #1#2#3#4 { \DeclareTextCommand #2 {#4} { \__xunadd_text_character:nN {#3} {#1} } } @@ -408,9 +416,9 @@ \tl_if_blank:nTF {#1} { \cs_if_exist_use:cTF { ? #2 } { {#1} } {#1} } { - \bool_lazy_and:nnTF - { \__xunadd_glyph_if_exist_p:n { `#3 } } - { \__xunadd_glyph_if_exist_p:n { `#4 } } + \__xunadd_glyph_if_exist:nTF { `#3 } + { \__xunadd_glyph_if_exist:nTF { `#4 } } + { \use_ii:nn } { #1#3#4 } { \cs_if_exist_use:cTF { ? #2 } { {#1} } { #1#3#4 } } } |