summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-12-24 00:12:52 +0000
committerKarl Berry <karl@freefriends.org>2014-12-24 00:12:52 +0000
commit98ea5fa0bdfa84abc23329217d1ce9ef4ae27b96 (patch)
tree66f242cd6300e62d873cf0d2ea745d647385de7e /Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
parent57cb67ae7c5220468344a53f91e761209f2befd0 (diff)
xecjk (23dec14)
git-svn-id: svn://tug.org/texlive/trunk@35889 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty')
-rw-r--r--Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty18
1 files changed, 6 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
index 2f786e46bd6..a950e5364e6 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
@@ -6,7 +6,7 @@
%%
%% xeCJK.dtx (with options: `fntef')
%%
-%% $Id: xeCJK.dtx 737 2014-11-10 17:04:31Z sobenlee@gmail.com $
+%% $Id: xeCJK.dtx 742 2014-12-16 13:32:27Z sobenlee@gmail.com $
%% $URL: https://ctex-kit.googlecode.com/svn/trunk/xeCJK/xeCJK.dtx $
%% -----------------------------------------------------------------
%% Author:
@@ -33,11 +33,11 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 737 2014-11-10 17:04:31Z sobenlee@gmail.com $
+\GetIdInfo$Id: xeCJK.dtx 742 2014-12-16 13:32:27Z sobenlee@gmail.com $
{xeCJK font effect}
\ProvidesExplPackage
{xeCJKfntef}
- {\ExplFileDate}{3.2.15}{\ExplFileDescription}
+ {\ExplFileDate}{3.2.16}{\ExplFileDescription}
\PassOptionsToPackage { normalem } { ulem }
\DeclareOption* { \PassOptionsToPackage { \CurrentOption } { ulem } }
\ProcessOptions \scan_stop:
@@ -93,7 +93,8 @@
{ \__xeCJK_ulem_glue:n \l__xeCJK_ecglue_skip }
\cs_set_protected_nopar:Npn \xeCJK_space_glue:
{ \__xeCJK_ulem_glue:n \l__xeCJK_space_skip }
- \xeCJKsetup { CheckFullRight = false , xCJKecglue = false }
+ \keys_set:nn { xeCJK / options }
+ { CheckFullRight = false , xCJKecglue = false }
\xeCJK_ulem_detect_node:
}
}
@@ -275,7 +276,7 @@
{
\tl_if_empty:NF \UL@start
{
- \xeCJK_zero_vrule:
+ \box_use:N \c__xeCJK_null_box
\xeCJK_no_break:
\xeCJK_ulem_hskip:n { \box_wd:N \UL@box }
\box_use:N \c__xeCJK_null_box
@@ -283,13 +284,6 @@
}
\box_new:N \c__xeCJK_null_box
\hbox_gset:Nn \c__xeCJK_null_box { }
-\cs_new_protected_nopar:Npn \xeCJK_zero_vrule:
- {
- \tex_vrule:D
- width \c_zero_dim
- depth \c_zero_dim
- height \c_zero_dim \scan_stop:
- }
\cs_new_protected_nopar:Npn \__xeCJK_ulem_skip_punct_begin:
{
\cs_set_eq:NN \UL@putbox \__xeCJK_ulem_skip_putbox: