summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-02-12 00:26:43 +0000
committerKarl Berry <karl@freefriends.org>2016-02-12 00:26:43 +0000
commitbe5bf6a52f48b97cb795ff0fa128da79cc5d9f66 (patch)
tree90b790d725c654e8828f015047b9554b1d4a4c2b /Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
parent07d426b145a3c2e39a7a85b56dc211f9fbd0a0df (diff)
xecjk (10feb16)
git-svn-id: svn://tug.org/texlive/trunk@39685 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.sty18
1 files changed, 11 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
index 78ae492ed29..18f0c54e2aa 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
@@ -31,11 +31,11 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 2667062 2016-02-01 12:02:59 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 8518191 2016-02-10 16:25:31 +0800 Qing Lee <sobenlee@gmail.com> $
{Typesetting CJK scripts with XeLaTeX}
\ProvidesExplPackage
{\ExplFileName}
- {\ExplFileDate}{3.3.3}{\ExplFileDescription}
+ {\ExplFileDate}{3.3.4}{\ExplFileDescription}
\msg_new:nnn { xeCJK } { Require-XeTeX }
{
The~xeCJK~package~requires~XeTeX~to~function.\\\\
@@ -410,12 +410,16 @@
XeTeX~character~class~`#1'~has~been~already~defined.\\\\
Please~take~another~name. \\
}
-\xeCJK_save_class:nn { Default } { \c_zero }
-\xeCJK_save_class:nn { Boundary } { \c_two_hundred_fifty_five }
+\xeCJK_save_class:nn { Default } { \c_zero }
+\tl_set:Nx \l__xeCJK_tmp_tl
+ { \int_use:N \xetex_XeTeXversion:D \xetex_XeTeXrevision:D }
+\fp_compare:nNnTF { \l__xeCJK_tmp_tl } > { 0.99993 }
+ { \xeCJK_save_class:nn { Boundary } { 4095 } }
+ { \xeCJK_save_class:nn { Boundary } { \c_two_hundred_fifty_five } }
\int_compare:nNnTF { \xetex_charclass:D "4E00 } = \c_one
{
- \xeCJK_save_class:nn { CJK } { \c_one }
- \xeCJK_save_class:nn { FullLeft } { \c_two }
+ \xeCJK_save_class:nn { CJK } { \c_one }
+ \xeCJK_save_class:nn { FullLeft } { \c_two }
\xeCJK_save_class:nn { FullRight } { \c_three }
\int_const:Nn \c__xeCJK_class_begin_int { \c_three }
}
@@ -3546,7 +3550,7 @@
AllowBreakBetweenPuncts = false
}
\defaultCJKfontfeatures { Script = CJK }
-\xeCJKsetwidth{^^^^2013}{0.5em}
+\xeCJKsetwidth { ^^^^2013 } { 0.5 em }
\ProcessKeysOptions { xeCJK / options }
\RequirePackage { fontspec } [ 2012/05/01 ]
\RequirePackage { xunicode-addon }