summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-08-07 21:09:26 +0000
committerKarl Berry <karl@freefriends.org>2017-08-07 21:09:26 +0000
commit55af698ad13da62b3a0ae681c4bce01da52312a1 (patch)
treeedaad797940461e016e373953b5b8d1876955167 /Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
parent53fbec492a3c2c5abfb4a1cb183e2df23f8a928a (diff)
xecjk (7aug17)
git-svn-id: svn://tug.org/texlive/trunk@44978 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty')
-rw-r--r--Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty36
1 files changed, 15 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
index 8e82ebe46bd..78221c88d01 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
@@ -29,15 +29,13 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 18af4a5 2017-05-15 20:12:35 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 8b5e450 2017-08-07 17:02:18 +0800 Qing Lee <sobenlee@gmail.com> $
{addon file for xunicode}
\ProvidesExplPackage{xunicode-addon}
- {\ExplFileDate}{3.4.8}{\ExplFileDescription}
-\bool_if:nF
- {
- \sys_if_engine_xetex_p: ||
- \sys_if_engine_luatex_p:
- }
+ {\ExplFileDate}{3.5.0}{\ExplFileDescription}
+\bool_lazy_or:nnF
+ { \sys_if_engine_xetex_p: }
+ { \sys_if_engine_luatex_p: }
{
\msg_new:nnnn { xunicode-addon } { xetex-luatex }
{ This~package~requires~either~XeTeX~or~LuaTeX~to~function.}
@@ -244,11 +242,9 @@
}
\cs_new_protected:Npn \__xunadd_provide_text_command_default:N #1
{
- \bool_if:nF
- {
- \cs_if_exist_p:c { ? \token_to_str:N #1 } ||
- \cs_if_free_p:c { ? - \token_to_str: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_new_protected:Npn \__xunadd_declare_character:NNnn #1#2#3#4
@@ -412,11 +408,9 @@
\tl_if_blank:nTF {#1}
{ \cs_if_exist_use:cTF { ? #2 } { {#1} } {#1} }
{
- \bool_if:nTF
- {
- \__xunadd_glyph_if_exist_p:n { `#3 } &&
- \__xunadd_glyph_if_exist_p:n { `#4 }
- }
+ \bool_lazy_and:nnTF
+ { \__xunadd_glyph_if_exist_p:n { `#3 } }
+ { \__xunadd_glyph_if_exist_p:n { `#4 } }
{ #1#3#4 }
{ \cs_if_exist_use:cTF { ? #2 } { {#1} } { #1#3#4 } }
}
@@ -513,11 +507,11 @@
}
\cs_new_protected:Npn \__xunadd_add_double_symbol_aux:NnN #1#2#3
{
- \bool_if:nTF
+ \bool_lazy_any:nTF
{
- \token_if_letter_p:N #1 ||
- \token_if_other_p:N #1 ||
- \token_if_chardef_p:N #1
+ { \token_if_letter_p:N #1 }
+ { \token_if_other_p:N #1 }
+ { \token_if_chardef_p:N #1 }
}
{ #1#3#2 }
{ #1#2#3 }