From 3851cb5112493bb4778c751f24b877d07cc568bf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 10 Feb 2020 22:12:31 +0000 Subject: xecjk (10feb20) git-svn-id: svn://tug.org/texlive/trunk@53750 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty | 32 ++++++++++------------ 1 file changed, 15 insertions(+), 17 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 25747f0db34..452882e159f 100644 --- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty +++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty @@ -7,8 +7,8 @@ %% xeCJK.dtx (with options: `fntef') %% %% Copyright (C) 2007--2010 by Wenchang Sun -%% Copyright (C) 2009--2019 by Leo Liu -%% Copyright (C) 2012--2019 by Qing Lee +%% Copyright (C) 2009--2020 by Leo Liu +%% Copyright (C) 2012--2020 by Qing Lee %% ---------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -29,17 +29,15 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: xeCJK.dtx 4449ab5 2019-06-02 23:02:31 +0800 Qing Lee $ +\GetIdInfo$Id: xeCJK.dtx 06a6ce4 2020-02-10 22:37:50 +0800 Qing Lee $ {xeCJK font effect} \ProvidesExplPackage{xeCJKfntef} - {\ExplFileDate}{3.7.4}{\ExplFileDescription} + {\ExplFileDate}{3.8.0}{\ExplFileDescription} \PassOptionsToPackage { normalem } { ulem } \DeclareOption* { \PassOptionsToPackage { \CurrentOption } { ulem } } \ProcessOptions \scan_stop: \RequirePackage { xeCJK } \RequirePackage { ulem } -\file_if_exist:nT { CJKfntef.sty } - { \RequirePackage { CJKfntef } } \addto@hook \UL@hook { \xeCJK_hook_for_ulem: } \cs_new_protected_nopar:Npn \xeCJK_hook_for_ulem: { @@ -648,7 +646,7 @@ \xeCJK_ulem_boot:NNNn #1#2#3 {#4} \xeCJK_ulem_on:n } -\DeclareDocumentCommand \CJKunderline { s t- s o } +\NewDocumentCommand \CJKunderline { s t- s o } { \xeCJK_ulem_group_begin: \xeCJK_fntef_boot:nnNNNn { underline } { uline } #1#2#3 {#4} @@ -664,9 +662,9 @@ } \xeCJK_ulem_on:n } -\DeclareDocumentCommand \varCJKunderline { } +\NewDocumentCommand \varCJKunderline { } { \CJKunderline - } -\DeclareDocumentCommand \CJKunderwave { s t- s o } +\NewDocumentCommand \CJKunderwave { s t- s o } { \xeCJK_ulem_group_begin: \xeCJK_fntef_boot:nnNNNn { underwave } { uwave } #1#2#3 {#4} @@ -676,7 +674,7 @@ { \l__xeCJK_uwave_format_tl \l__xeCJK_uwave_symbol_tl } \xeCJK_ulem_on:n } -\DeclareDocumentCommand \CJKunderdblline { s t- s o } +\NewDocumentCommand \CJKunderdblline { s t- s o } { \xeCJK_ulem_group_begin: \xeCJK_fntef_boot:nnNNNn { underdblline } { udbline } #1#2#3 {#4} @@ -700,7 +698,7 @@ } \xeCJK_ulem_on:n } -\DeclareDocumentCommand \CJKsout { s t- s o } +\NewDocumentCommand \CJKsout { s t- s o } { \xeCJK_ulem_group_begin: \xeCJK_fntef_boot:nnNNNn { sout } { sout } #1#2#3 {#4} @@ -719,7 +717,7 @@ } \xeCJK_ulem_on:n } -\DeclareDocumentCommand \CJKxout { s t- s o } +\NewDocumentCommand \CJKxout { s t- s o } { \xeCJK_ulem_group_begin: \xeCJK_fntef_boot:nnNNNn { xout } { xout } #1#2#3 {#4} @@ -736,7 +734,7 @@ } \xeCJK_ulem_on:n } -\DeclareDocumentCommand \CJKunderanyline { s t- s o m m } +\NewDocumentCommand \CJKunderanyline { s t- s o m m } { \xeCJK_ulem_group_begin: \xeCJK_ulem_boot:NNNn #1#2#3 {#4} @@ -926,12 +924,12 @@ xout / format = \color { blue } } } -\DeclareDocumentCommand \CJKunderanysymbol { o m m m } +\NewDocumentCommand \CJKunderanysymbol { o m m m } { \xeCJK_under_symbol:nnnnnn { symbol } { symbol } {#1} {#2} {#3} {#4} \tex_ignorespaces:D } -\DeclareDocumentCommand \CJKunderdot { o m } +\NewDocumentCommand \CJKunderdot { o m } { \xeCJK_under_symbol:nnnnnn { underdot } { udot } {#1} @@ -1035,7 +1033,7 @@ \box_use:N \l__xeCJK_under_symbol_box \xeCJK_no_break: \__xeCJK_under_CJKsymbol:N } -\DeclareDocumentEnvironment { CJKfilltwosides } { O { c } m } +\NewDocumentEnvironment { CJKfilltwosides } { O { c } m } { \use:x { \exp_not:N \minipage [#1] { \dim_eval:n {#2} } } \cs_set_eq:NN \CJKglue \xeCJK_fntef_hfilll: @@ -1044,7 +1042,7 @@ \endminipage \ignorespacesafterend } -\DeclareDocumentEnvironment { CJKfilltwosides* } { O { c } m +b } +\NewDocumentEnvironment { CJKfilltwosides* } { O { c } m +b } { \mode_leave_vertical: \cs_set_eq:NN \CJKglue \xeCJK_fntef_hfilll: -- cgit v1.2.3