summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty')
-rw-r--r--Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty62
1 files changed, 24 insertions, 38 deletions
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
index fc837712469..1ef2b44ff74 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 <sunwch@nankai.edu.cn>
-%% Copyright (C) 2009--2018 by Leo Liu <leoliu.pku@gmail.com>
-%% Copyright (C) 2012--2018 by Qing Lee <sobenlee@gmail.com>
+%% Copyright (C) 2009--2019 by Leo Liu <leoliu.pku@gmail.com>
+%% Copyright (C) 2012--2019 by Qing Lee <sobenlee@gmail.com>
%% ----------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -29,16 +29,15 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx b604170 2018-04-30 10:29:28 +0800 Liu Haiyang <leoliu.pku@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 8be031f 2019-04-07 23:30:14 +0800 Qing Lee <sobenlee@gmail.com> $
{xeCJK font effect}
\ProvidesExplPackage{xeCJKfntef}
- {\ExplFileDate}{3.7.1}{\ExplFileDescription}
+ {\ExplFileDate}{3.7.2}{\ExplFileDescription}
\PassOptionsToPackage { normalem } { ulem }
\DeclareOption* { \PassOptionsToPackage { \CurrentOption } { ulem } }
\ProcessOptions \scan_stop:
\RequirePackage { xeCJK }
\RequirePackage { ulem }
-\RequirePackage { environ }
\file_if_exist:nT { CJKfntef.sty }
{ \RequirePackage { CJKfntef } }
\addto@hook \UL@hook { \xeCJK_hook_for_ulem: }
@@ -192,12 +191,11 @@
\dim_compare:nNnTF \tex_lastkern:D = \c_zero_dim
{ \xeCJK_cs_gclear:N \xeCJK_ulem_right_node: }
{
- \dim_compare:nNnTF \tex_lastkern:D = { 3 sp }
+ \dim_compare:nNnTF \tex_lastkern:D = { 3sp }
{ \xeCJK_cs_gclear:N \xeCJK_ulem_right_node: }
{
- \exp_after:wN \tex_unkern:D
- \exp_after:wN \__xeCJK_ulem_right_aux:n
- \exp_after:wN { \dim_use:N \tex_lastkern:D }
+ \exp_args:NNo \tex_unkern:D
+ \__xeCJK_ulem_right_aux:n { \dim_use:N \tex_lastkern:D }
}
}
}
@@ -235,17 +233,17 @@
\cs_new_eq:NN \xeCJK_ulem_right_skip: \prg_do_nothing:
\cs_new_protected_nopar:Npn \__xeCJK_ulem_right_skip:
{
- \int_case:nn { \etex_lastnodetype:D }
+ \int_case:nn { \tex_lastnodetype:D }
{
- { \c_one } { \__xeCJK_ulem_right_skip_hbox: }
- { \c_eleven } { \__xeCJK_ulem_right_skip_glue: }
- { \c_thirteen } { \__xeCJK_ulem_right_skip_penalty: }
+ { 1 } { \__xeCJK_ulem_right_skip_hbox: }
+ { 11 } { \__xeCJK_ulem_right_skip_glue: }
+ { 13 } { \__xeCJK_ulem_right_skip_penalty: }
}
}
\cs_new_protected_nopar:Npn \__xeCJK_ulem_right_skip_hbox:
{
\box_set_to_last:N \l__xeCJK_tmp_box
- \int_compare:nNnTF \etex_lastnodetype:D = \c_twelve
+ \int_compare:nNnTF \tex_lastnodetype:D = { 12 }
{ \__xeCJK_ulem_right_skip_kern: }
{ \__xeCJK_ulem_right_skip_glue: }
\box_use_drop:N \l__xeCJK_tmp_box
@@ -274,7 +272,7 @@
{
\int_set_eq:NN \l__xeCJK_tmp_int \tex_lastpenalty:D
\tex_unpenalty:D
- \int_compare:nNnT \etex_lastnodetype:D = \c_one
+ \int_compare:nNnT \tex_lastnodetype:D = \c_one_int
{ \__xeCJK_ulem_right_skip_hbox: }
\tex_penalty:D \l__xeCJK_tmp_int
}
@@ -618,7 +616,7 @@
\tl_if_empty:NTF \l__xeCJK_group_tag_tl
{ \UL@stop \__xeCJK_ulem_hskip:n {#1} \UL@start }
{
- \str_if_eq_x:nnTF { \l__xeCJK_group_tag_tl } { \c__xeCJK_group_tag_tl }
+ \str_if_eq:eeTF { \l__xeCJK_group_tag_tl } { \c__xeCJK_group_tag_tl }
{ \UL@stop \__xeCJK_ulem_hskip:n {#1} \UL@start }
{ \skip_horizontal:n {#1} }
}
@@ -630,8 +628,8 @@
\tl_new:N \l__xeCJK_group_tag_tl
\tl_const:Nn \c__xeCJK_group_tag_tl
{
- T \int_use:N \etex_currentgrouptype:D
- L \int_use:N \etex_currentgrouplevel:D
+ T \int_use:N \tex_currentgrouptype:D
+ L \int_use:N \tex_currentgrouplevel:D
}
\cs_new_protected_nopar:Npn \__xeCJK_ulem_ccglue:
{ { \skip_set_eq:NN \UL@skip \l__xeCJK_ccglue_skip \UL@leaders } }
@@ -1013,7 +1011,7 @@
\hbox_to_zero:n
{
\xeCJK_select_font:
- \tex_kern:D \etex_fontcharwd:D \tex_font:D "4E00 \exp_stop_f:
+ \tex_kern:D \tex_fontcharwd:D \tex_font:D "4E00 \exp_stop_f:
\tex_hss:D \box_use:N \l__xeCJK_fntef_box \tex_hss:D
}
}
@@ -1051,39 +1049,27 @@
\endminipage
\ignorespacesafterend
}
-\NewEnviron { CJKfilltwosides* } [ 2 ] [ c ]
+\DeclareDocumentEnvironment { CJKfilltwosides* } { O { c } m +b }
{
\mode_leave_vertical:
\cs_set_eq:NN \CJKglue \xeCJK_fntef_hfilll:
\tl_set:Nn \arraystretch { 1 }
\cs_if_free:NF \extrarowheight
{ \cs_set_eq:NN \extrarowheight \c_zero_dim }
- \use:x { \__xeCJK_fill_two_sides:nn {#1} { \dim_eval:n {#2} } }
+ \use:x { \__xeCJK_fill_two_sides:nnn {#1} { \dim_eval:n {#2} } } {#3}
}
- [ \ignorespacesafterend ]
-\cs_new_protected:Npn \__xeCJK_fill_two_sides:nn #1#2
+ { \ignorespacesafterend }
+\cs_new_protected:Npn \__xeCJK_fill_two_sides:nnn #1#2#3
{
\dim_compare:nNnTF {#2} > \c_zero_dim
{
\hbox_set:Nn \l__xeCJK_tmp_box
- {
- \tabular [#1] { @ { } c @ { } }
- \BODY
- \endtabular
- }
+ { \tabular [#1] { @ { } c @ { } } #3 \endtabular }
\dim_compare:nNnTF {#2} > { \box_wd:N \l__xeCJK_tmp_box }
- {
- \tabular [#1] { @ { } p {#2} @ { } }
- \BODY
- \endtabular
- }
+ { \tabular [#1] { @ { } p {#2} @ { } } #3 \endtabular }
{ \box_use:N \l__xeCJK_tmp_box }
}
- {
- \tabular [#1] { @ { } c @ { } }
- \BODY
- \endtabular
- }
+ { \tabular [#1] { @ { } c @ { } } #3 \endtabular }
}
\cs_new_protected_nopar:Npn \xeCJK_fntef_hfilll:
{ \skip_horizontal:N \c__xeCJK_filll_skip }