From 55af698ad13da62b3a0ae681c4bce01da52312a1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 7 Aug 2017 21:09:26 +0000 Subject: xecjk (7aug17) git-svn-id: svn://tug.org/texlive/trunk@44978 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty') diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty index 16d6642f86d..2c4834cbf38 100644 --- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty +++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty @@ -29,10 +29,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: xeCJK.dtx 18af4a5 2017-05-15 20:12:35 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 8b5e450 2017-08-07 17:02:18 +0800 Qing Lee $ {xeCJK font effect} \ProvidesExplPackage{xeCJKfntef} - {\ExplFileDate}{3.4.8}{\ExplFileDescription} + {\ExplFileDate}{3.5.0}{\ExplFileDescription} \PassOptionsToPackage { normalem } { ulem } \DeclareOption* { \PassOptionsToPackage { \CurrentOption } { ulem } } \ProcessOptions \scan_stop: @@ -723,7 +723,7 @@ } \cs_new_protected:Npn \xeCJK_fntef_boot:nnNNNn #1#2#3#4#5#6 { - \bool_if:nT { #3 || #5 } + \bool_lazy_or:nnT {#3} {#5} { \bool_set_false:c { l__xeCJK_#2_skip_bool } } \IfBooleanT #4 { \bool_set_true:c { l__xeCJK_#2_subtract_bool } } @@ -736,7 +736,7 @@ } \cs_new_protected:Npn \xeCJK_ulem_boot:NNNn #1#2#3#4 { - \bool_if:nT { #1 || #3 } + \bool_lazy_or:nnT {#1} {#3} { \bool_set_false:N \l__xeCJK_ulem_skip_bool } \IfBooleanT #2 { \bool_set_true:N \l__xeCJK_ulem_subtract_bool } -- cgit v1.2.3