summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-02 23:41:44 +0000
committerKarl Berry <karl@freefriends.org>2017-01-02 23:41:44 +0000
commitfaf45c3efb9312734c1b5db387bdfdda7e1f23c2 (patch)
tree2bd05bce385d168debddc7d32fa3c9930f42a469 /Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
parent35cabb19007619d5b58a655d5388e264a043265b (diff)
xecjk (2jan17)
git-svn-id: svn://tug.org/texlive/trunk@42831 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty')
-rw-r--r--Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty21
1 files changed, 12 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
index e36f03c91eb..8c535cc0cab 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
@@ -7,8 +7,8 @@
%% xeCJK.dtx (with options: `package')
%%
%% Copyright (C) 2007--2010 by Wenchang Sun <sunwch@nankai.edu.cn>
-%% Copyright (C) 2009--2016 by Leo Liu <leoliu.pku@gmail.com>
-%% Copyright (C) 2012--2016 by Qing Lee <sobenlee@gmail.com>
+%% Copyright (C) 2009--2017 by Leo Liu <leoliu.pku@gmail.com>
+%% Copyright (C) 2012--2017 by Qing Lee <sobenlee@gmail.com>
%% ----------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 4063a2e 2016-12-02 17:58:03 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 649d857 2017-01-02 09:25:53 +0800 Qing Lee <sobenlee@gmail.com> $
{Typesetting CJK scripts with XeLaTeX}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{3.4.4}{\ExplFileDescription}
+ {\ExplFileDate}{3.4.5}{\ExplFileDescription}
\msg_new:nnn { xeCJK } { Require-XeTeX }
{
The~xeCJK~package~requires~XeTeX~to~function.\\\\
@@ -1814,8 +1814,8 @@
MiddlePunct- .code:n = { \__xeCJK_sub_special_punct:nn { middle } {#1} } ,
PunctWidth .tl_gset:N = \g__xeCJK_punct_width_tl ,
PunctBoundWidth .tl_gset:N = \g__xeCJK_punct_bound_width_tl ,
- PunctWidth .value_required: ,
- PunctBoundWidth .value_required: ,
+ PunctWidth .value_required:n = true ,
+ PunctBoundWidth .value_required:n = true ,
RubberPunctSkip .choice: ,
RubberPunctSkip .default:n = { true } ,
RubberPunctSkip / true .code:n =
@@ -3920,7 +3920,10 @@
}
}
\cs_new_protected_nopar:Npn \__xeCJK_math_robust:N #1
- { \exp_args:NNc \__xeCJK_math_robust_aux:NN #1 { \cs_to_str:N #1 ~ } }
+ {
+ \group_begin: \exp_args:NcNc \group_end:
+ { __xeCJK_math_robust_aux:NN } #1 { \cs_to_str:N #1 ~ }
+ }
\cs_new_protected_nopar:Npn \__xeCJK_math_robust_aux:NN #1#2
{
\exp_args:Nx \str_case:nnTF { \token_get_replacement_spec:N #1 }
@@ -3938,13 +3941,13 @@
\exp_args:No \tl_if_head_eq_meaning:nNTF {#2} \scan_stop:
{
\cs_gset_protected_nopar:Npx #1
- { \scan_align_safe_stop: \tl_tail:N #2 }
+ { \tl_tail:N #2 }
}
{
\cs_if_eq:NNTF #1 \ensuremath
{
\cs_gset_protected_nopar:Npx #1
- { \scan_align_safe_stop: \exp_not:o {#2} }
+ { \exp_not:o {#2} }
}
{
\__xeCJK_warning:nxx { robust-failure }