xecjk (2jan17)

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

12 files changed, 55 insertions, 47 deletions

diff --git a/Master/texmf-dist/doc/xelatex/xecjk/README.md b/Master/texmf-dist/doc/xelatex/xecjk/README.md
index ee06cc9f0b9..0fbfcd0f65f 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/README.md
+++ b/Master/texmf-dist/doc/xelatex/xecjk/README.md
@@ -20,8 +20,8 @@ Copyright and Licence
 ---------------------
 
     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
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf b/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
index e83434123e6..b829fdd0d24 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 63dbc734fe4..e8b23c0f23f 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 dc053e09059..663427d1373 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.tex
+++ b/Master/texmf-dist/doc/xelatex/xecjk/xunicode-symbols.tex
@@ -128,7 +128,7 @@
   {
     \int_gincr:N \g__xunsym_symbol_int
     \use_none:n #1 &
-    \scan_align_safe_stop:
+    \scan_stop:
     \reverse_if:N \etex_iffontchar:D \tex_font:D #1 \exp_stop_f: \falllbackfont \fi:
     \tex_char:D #1 \exp_stop_f: &
     \tl_set:Nn \l_tmpa_clist {#2}
diff --git a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
index 0c03b340466..00313927b69 100644
--- a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
+++ b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
@@ -26,8 +26,8 @@ Copyright and Licence
 ---------------------
 
     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
@@ -92,8 +92,8 @@ Copyright and Licence
 \preamble
 
     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
@@ -194,7 +194,7 @@ Copyright and Licence
 %<*package|config|fntef|listings|xunicode|xunextra>
 %<!(config|xunextra)>\NeedsTeXFormat{LaTeX2e}
 %<!(config|xunextra)>\RequirePackage{expl3}
-%<+!driver>\GetIdInfo$Id: xeCJK.dtx 4063a2e 2016-12-02 17:58:03 +0800 Qing Lee <sobenlee@gmail.com> $
+%<+!driver>\GetIdInfo$Id: xeCJK.dtx 649d857 2017-01-02 09:25:53 +0800 Qing Lee <sobenlee@gmail.com> $
 %<package>  {Typesetting CJK scripts with XeLaTeX}
 %<config>  {Configuration file for xeCJK package}
 %<fntef>  {xeCJK font effect}
@@ -207,7 +207,7 @@ Copyright and Licence
 %<listings>\ProvidesExplPackage{xeCJK-listings}
 %<xunicode>\ProvidesExplPackage{xunicode-addon}
 %<xunextra>\ProvidesExplFile{xunicode-extra.def}
-%<!driver>  {\ExplFileDate}{3.4.4}{\ExplFileDescription}
+%<!driver>  {\ExplFileDate}{3.4.5}{\ExplFileDescription}
 %</package|config|fntef|listings|xunicode|xunextra>
 %<*driver>
 \documentclass{ctxdoc}
@@ -275,7 +275,7 @@ Copyright and Licence
 % \changes{v3.3.2}{2015/05/15}{随 Unicode 7.0.0 更新简繁汉字映射。}
 % \changes{v3.3.3}{2015/09/25}{更新 \hologo{LaTeX3} 代码。}
 %
-% \CheckSum{10164}
+% \CheckSum{10163}
 % \GetFileId{xeCJK.sty}
 %
 % \title{\bfseries\pkg{xeCJK} 宏包}
@@ -4675,8 +4675,8 @@ Copyright and Licence
     MiddlePunct-  .code:n = { \@@_sub_special_punct:nn { middle } {#1} } ,
     PunctWidth      .tl_gset:N = \g_@@_punct_width_tl ,
     PunctBoundWidth .tl_gset:N = \g_@@_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 =
@@ -7494,6 +7494,8 @@ Copyright and Licence
 %    \end{macrocode}
 % \end{macro}
 %
+% \changes{v3.4.5}{2017/01/02}{更新 \hologo{LaTeX3} 的过时用法。}
+%
 % \begin{macro}[internal]{\(,\),\math,\endmath,\ensuremath,\@@_math_robust:N}
 % \changes{v3.2.5}{2013/07/25}
 % {解决汉字后紧跟 \tn{(}\texttt{...}\tn{)} 形式的行内数学公式时，不能加入间距的问题。}
@@ -7516,7 +7518,10 @@ Copyright and Licence
 % 的定义并不完全正确，没有考虑 \TeX 不会略去控制符号后面的空格的情况。
 %    \begin{macrocode}
 \cs_new_protected_nopar:Npn \@@_math_robust:N #1
-  { \exp_args:NNc \@@_math_robust_aux:NN #1 { \cs_to_str:N #1 ~ } }
+  {
+    \group_begin: \exp_args:NcNc \group_end:
+      { @@_math_robust_aux:NN } #1 { \cs_to_str:N #1 ~ }
+  }
 \cs_new_protected_nopar:Npn \@@_math_robust_aux:NN #1#2
   {
     \exp_args:Nx \str_case:nnTF { \token_get_replacement_spec:N #1 }
@@ -7534,13 +7539,13 @@ Copyright and Licence
         \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} }
               }
               {
                 \@@_warning:nxx { robust-failure }
@@ -13036,7 +13041,7 @@ int main()
   {
     \int_gincr:N \g_@@_symbol_int
     \use_none:n #1 &
-    \scan_align_safe_stop:
+    \scan_stop:
     \reverse_if:N \etex_iffontchar:D \tex_font:D #1 \exp_stop_f: \falllbackfont \fi:
     \tex_char:D #1 \exp_stop_f: &
     \tl_set:Nn \l_tmpa_clist {#2}
diff --git a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins
index 057f01d3ab1..38ee6490a5c 100644
--- a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins
+++ b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.ins
@@ -7,8 +7,8 @@
 %% xeCJK.dtx  (with options: `install')
 %% 
 %%     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
@@ -33,8 +33,8 @@
 \preamble
 
     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
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
index 911d5c8dc27..e04176de6cd 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
@@ -7,8 +7,8 @@
 %% xeCJK.dtx  (with options: `listings')
 %% 
 %%     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> $
   {xeCJK patch file for listings}
 \ProvidesExplPackage{xeCJK-listings}
-  {\ExplFileDate}{3.4.4}{\ExplFileDescription}
+  {\ExplFileDate}{3.4.5}{\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 434d3d136a6..731de277304 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.cfg
@@ -6,10 +6,10 @@
 %%
 %% xeCJK.dtx  (with options: `config')
 %% 
-\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> $
   {Configuration file for xeCJK package}
 \ProvidesExplFile{\ExplFileName.cfg}
-  {\ExplFileDate}{3.4.4}{\ExplFileDescription}
+  {\ExplFileDate}{3.4.5}{\ExplFileDescription}
 
 %% 
 %%
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 }
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
index dcc3b7e8c3f..0a76eb66c22 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--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> $
   {xeCJK font effect}
 \ProvidesExplPackage{xeCJKfntef}
-  {\ExplFileDate}{3.4.4}{\ExplFileDescription}
+  {\ExplFileDate}{3.4.5}{\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 04ac2a33317..8ab2d505cfd 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
@@ -7,8 +7,8 @@
 %% xeCJK.dtx  (with options: `xunicode')
 %% 
 %%     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> $
   {addon file for xunicode}
 \ProvidesExplPackage{xunicode-addon}
-  {\ExplFileDate}{3.4.4}{\ExplFileDescription}
+  {\ExplFileDate}{3.4.5}{\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 d0fddf70c4a..e279c2072f9 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def
@@ -7,8 +7,8 @@
 %% xeCJK.dtx  (with options: `xunextra')
 %% 
 %%     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
@@ -27,10 +27,10 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-\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> $
   {extra definition for xunicode}
 \ProvidesExplFile{xunicode-extra.def}
-  {\ExplFileDate}{3.4.4}{\ExplFileDescription}
+  {\ExplFileDate}{3.4.5}{\ExplFileDescription}
 \DeclareUTFComposite\textsuperscript
 \DeclareUTFComposite\textsubscript
 \DeclareUTFEncodedAccent\textsbleftarrow{"20EE}{"20FF}