xecjk (10feb16)

git-svn-id: svn://tug.org/texlive/trunk@39685 c570f23f-e606-0410-a88d-b1316a301751

10 files changed, 41 insertions, 26 deletions

diff --git a/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf b/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
index e9195d2b53d..bde676d31d4 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
+++ b/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdf b/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdf
index 3ae85e497a2..835cf06e8bf 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdf
+++ b/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.pdf
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.tex b/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.tex
index 800185cd9e3..dc053e09059 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.tex
+++ b/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.tex
@@ -6,7 +6,7 @@
 %%
 %% xeCJK.dtx  (with options: `xunicode-symbols')
 %% 
-\documentclass{article}
+\documentclass[a4paper]{article}
 \usepackage[margin=2cm]{geometry}
 \usepackage{fontspec}
 \usepackage{xunicode-addon}
diff --git a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
index 605160b3509..af634c8171e 100644
--- a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
+++ b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
@@ -268,7 +268,7 @@ CJK scripts fonts (TrueType or OpenType).
 %<fntef>  {xeCJKfntef}
 %<listings>  {xeCJK-listings}
 %<xunicode>  {xunicode-addon}
-  {\ExplFileDate}{3.3.3}{\ExplFileDescription}
+  {\ExplFileDate}{3.3.4}{\ExplFileDescription}
 %<xunextra>\ExplSyntaxOff
 %<*driver>
 \let\xeCJKrevnum\ExplFileVersion
@@ -453,7 +453,7 @@ CJK scripts fonts (TrueType or OpenType).
 % \changes{v3.3.2}{2015/05/15}{随 Unicode 7.0.0 更新简繁汉字映射。}
 % \changes{v3.3.3}{2015/09/25}{更新 \hologo{LaTeX3} 代码。}
 %
-% \CheckSum{9814}
+% \CheckSum{9822}
 % \GetFileInfo{\jobname.dtx}
 %
 % \title{\bfseries\pkg{xeCJK} 宏包}
@@ -2365,15 +2365,26 @@ CJK scripts fonts (TrueType or OpenType).
 % \end{center}
 %
 % \changes{v3.3.3}{2016/01/20}{兼容 \LaTeXe{} 2016/02/01 的字符类设置。}
+% \changes{v3.3.4}{2016/02/07}{兼容 \XeTeX{} 0.99994 的边界字符类。}
 % \begin{macro}[internal]{Default,CJK,FullLeft,FullRight,Boundary}
+%    \begin{macrocode}
+\xeCJK_save_class:nn { Default } { \c_zero }
+%    \end{macrocode}
+% \XeTeX{} 0.99994 将字符类总数扩大到 $4096$^^A
+% \footnote{\url{http://tug.org/pipermail/xetex/2016-February/026363.html}}。
+%    \begin{macrocode}
+\tl_set:Nx \l_@@_tmp_tl
+  { \int_use:N \xetex_XeTeXversion:D \xetex_XeTeXrevision:D }
+\fp_compare:nNnTF { \l_@@_tmp_tl } > { 0.99993 }
+  { \xeCJK_save_class:nn { Boundary } { 4095 } }
+  { \xeCJK_save_class:nn { Boundary } { \c_two_hundred_fifty_five } }
+%    \end{macrocode}
 % \LaTeXe{} 2016/02/01 不再预设置 CJK 字符类。
 %    \begin{macrocode}
-\xeCJK_save_class:nn { Default }   { \c_zero  }
-\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_@@_class_begin_int { \c_three }
   }
@@ -7086,7 +7097,7 @@ CJK scripts fonts (TrueType or OpenType).
 % 半字线连接号\footnote{见\href{http://www.moe.gov.cn/ewebeditor/uploadfile/2015/01/13/20150113092346124.pdf}
 % {《夹用英文的中文文本的标点符号用法（草案）》5.13 节。}}应为半角宽度。
 %    \begin{macrocode}
-\xeCJKsetwidth{^^^^2013}{0.5em}
+\xeCJKsetwidth { ^^^^2013 } { 0.5 em }
 %    \end{macrocode}
 %
 % 执行宏包选项，并载入 \pkg{fontspec} 宏包和 \pkg{xunicode-addon}。
@@ -12611,7 +12622,7 @@ int main()
 %    \end{macrocode}\egroup
 %
 %    \begin{macrocode}
-\documentclass{article}
+\documentclass[a4paper]{article}
 \usepackage[margin=2cm]{geometry}
 \usepackage{fontspec}
 \usepackage{xunicode-addon}
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
index e4b52dd35c6..1d5affa3d8a 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.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> $
   {xeCJK patch file for listings}
 \ProvidesExplPackage
   {xeCJK-listings}
-  {\ExplFileDate}{3.3.3}{\ExplFileDescription}
+  {\ExplFileDate}{3.3.4}{\ExplFileDescription}
 \DeclareOption* { \PassOptionsToPackage { \CurrentOption } { xeCJK } }
 \ProcessOptions \scan_stop:
 \RequirePackage { xeCJK }
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg
index 76461f6fdd3..e374933479d 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg
@@ -6,11 +6,11 @@
 %%
 %% xeCJK.dtx  (with options: `config')
 %% 
-\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> $
   {Configuration file for xeCJK package}
 \ProvidesExplFile
   {\ExplFileName.cfg}
-  {\ExplFileDate}{3.3.3}{\ExplFileDescription}
+  {\ExplFileDate}{3.3.4}{\ExplFileDescription}
 
 %% 
 %%
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 }
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
index 6eb48c1f651..18afb61899e 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.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> $
   {xeCJK font effect}
 \ProvidesExplPackage
   {xeCJKfntef}
-  {\ExplFileDate}{3.3.3}{\ExplFileDescription}
+  {\ExplFileDate}{3.3.4}{\ExplFileDescription}
 \PassOptionsToPackage { normalem } { ulem }
 \DeclareOption* { \PassOptionsToPackage { \CurrentOption } { ulem } }
 \ProcessOptions \scan_stop:
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
index e033226ccfe..be3750f1aca 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.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> $
   {addon file for xunicode}
 \ProvidesExplPackage
   {xunicode-addon}
-  {\ExplFileDate}{3.3.3}{\ExplFileDescription}
+  {\ExplFileDate}{3.3.4}{\ExplFileDescription}
 \bool_if:nF
   {
     \sys_if_engine_xetex_p: ||
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def
index 242904283f7..767654b9d2b 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def
@@ -29,11 +29,11 @@
 %%    The Current Maintainer of this work are Leo Liu and Qing Lee.
 %% -----------------------------------------------------------------
 %% 
-\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> $
   {extra definition for xunicode}
 \ProvidesExplFile
   {xunicode-extra.def}
-  {\ExplFileDate}{3.3.3}{\ExplFileDescription}
+  {\ExplFileDate}{3.3.4}{\ExplFileDescription}
 \ExplSyntaxOff
 \DeclareUTFComposite\textsuperscript
 \DeclareUTFComposite\textsubscript