xecjk (22feb17)

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

9 files changed, 43 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf b/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
index b829fdd0d24..596ab144ba4 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 e8b23c0f23f..7fc3e2fd1fe 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/source/xelatex/xecjk/xeCJK.dtx b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
index 00313927b69..8a3f5bbdfd9 100644
--- a/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
+++ b/Master/texmf-dist/source/xelatex/xecjk/xeCJK.dtx
@@ -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 649d857 2017-01-02 09:25:53 +0800 Qing Lee <sobenlee@gmail.com> $
+%<+!driver>\GetIdInfo$Id: xeCJK.dtx efd7a18 2017-02-23 02:07:20 +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.5}{\ExplFileDescription}
+%<!driver>  {\ExplFileDate}{3.4.6}{\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{10163}
+% \CheckSum{10171}
 % \GetFileId{xeCJK.sty}
 %
 % \title{\bfseries\pkg{xeCJK} 宏包}
@@ -5847,7 +5847,7 @@ Copyright and Licence
     \cs_gset_protected_nopar:cpx { \@@_family_csname:n {#1} }
       {
         \group_begin:
-        \exp_not:n { \cs_set_eq:NN \@@_update_family:nn \use_none:nn }
+        \exp_not:n { \cs_set_eq:NN \xeCJK@fontfamily \use_none:n }
         \exp_not:n { \fontspec_set_family:Nnn \l_@@_fontspec_family_tl }
           { \exp_not:V \l_@@_fontspec_options_clist }
           { \exp_not:V \l_@@_font_name_tl }
@@ -7646,14 +7646,27 @@ Copyright and Licence
 %    \end{macrocode}
 %
 % \begin{macro}[internal]{\fontfamily}
+% \begin{macro}[internal]{\xeCJK@fontfamily}
 % \changes{v3.1.1}{2012/12/06}{修改主要 \texttt{CJK} 字体族的自动更新方式。}
 % \changes{v3.1.2}{2013/01/01}{不将参数完全展开。}
+% \changes{v3.4.6}{2017/02/23}
+%   {将族名参数完全展开，以解决与 \pkg{fontspec} 2017/01/24 v2.5d 的兼容问题。}
 % 修改 \tn{fontfamily}，使主要 |CJK| 字体族能随西文主要字体更新。
 %    \begin{macrocode}
 \RenewDocumentCommand \fontfamily { m }
   {
     \tl_set:Nx \f@family {#1}
-    \@@_update_family:nn {#1}
+    \xeCJK@fontfamily {#1}
+  }
+\cs_new_protected_nopar:Npn \xeCJK@fontfamily #1
+  {
+    \str_if_eq:nnTF {#1} { \familydefault }
+      { \xeCJK_switch_family:n { \CJKfamilydefault } }
+      { \@@_update_family_aux: }
+  }
+\cs_new_protected_nopar:Npn \@@_update_family_aux:
+  {
+    \str_case_x:nn { \f@family }
       {
         { \rmdefault }     { \xeCJK_switch_family:n { \CJKrmdefault } }
         { \sfdefault }     { \xeCJK_switch_family:n { \CJKsfdefault } }
@@ -7661,9 +7674,9 @@ Copyright and Licence
         { \familydefault } { \xeCJK_switch_family:n { \CJKfamilydefault } }
       }
   }
-\cs_new_eq:NN \@@_update_family:nn \str_case:nn
 %    \end{macrocode}
 % \end{macro}
+% \end{macro}
 %
 %    \begin{macrocode}
 %<@@=>
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
index e04176de6cd..bf6b628fc37 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK-listings.sty
@@ -29,10 +29,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 649d857 2017-01-02 09:25:53 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx efd7a18 2017-02-23 02:07:20 +0800 Qing Lee <sobenlee@gmail.com> $
   {xeCJK patch file for listings}
 \ProvidesExplPackage{xeCJK-listings}
-  {\ExplFileDate}{3.4.5}{\ExplFileDescription}
+  {\ExplFileDate}{3.4.6}{\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 731de277304..1795c6bb4f2 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 649d857 2017-01-02 09:25:53 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx efd7a18 2017-02-23 02:07:20 +0800 Qing Lee <sobenlee@gmail.com> $
   {Configuration file for xeCJK package}
 \ProvidesExplFile{\ExplFileName.cfg}
-  {\ExplFileDate}{3.4.5}{\ExplFileDescription}
+  {\ExplFileDate}{3.4.6}{\ExplFileDescription}
 
 %% 
 %%
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
index 8c535cc0cab..6b30d8f253f 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJK.sty
@@ -29,10 +29,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 649d857 2017-01-02 09:25:53 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx efd7a18 2017-02-23 02:07:20 +0800 Qing Lee <sobenlee@gmail.com> $
   {Typesetting CJK scripts with XeLaTeX}
 \ProvidesExplPackage{\ExplFileName}
-  {\ExplFileDate}{3.4.5}{\ExplFileDescription}
+  {\ExplFileDate}{3.4.6}{\ExplFileDescription}
 \msg_new:nnn { xeCJK } { Require-XeTeX }
   {
     The~xeCJK~package~requires~XeTeX~to~function.\\\\
@@ -2734,7 +2734,7 @@
     \cs_gset_protected_nopar:cpx { \__xeCJK_family_csname:n {#1} }
       {
         \group_begin:
-        \exp_not:n { \cs_set_eq:NN \__xeCJK_update_family:nn \use_none:nn }
+        \exp_not:n { \cs_set_eq:NN \xeCJK@fontfamily \use_none:n }
         \exp_not:n { \fontspec_set_family:Nnn \l__xeCJK_fontspec_family_tl }
           { \exp_not:V \l__xeCJK_fontspec_options_clist }
           { \exp_not:V \l__xeCJK_font_name_tl }
@@ -4025,7 +4025,17 @@
 \RenewDocumentCommand \fontfamily { m }
   {
     \tl_set:Nx \f@family {#1}
-    \__xeCJK_update_family:nn {#1}
+    \xeCJK@fontfamily {#1}
+  }
+\cs_new_protected_nopar:Npn \xeCJK@fontfamily #1
+  {
+    \str_if_eq:nnTF {#1} { \familydefault }
+      { \xeCJK_switch_family:n { \CJKfamilydefault } }
+      { \__xeCJK_update_family_aux: }
+  }
+\cs_new_protected_nopar:Npn \__xeCJK_update_family_aux:
+  {
+    \str_case_x:nn { \f@family }
       {
         { \rmdefault }     { \xeCJK_switch_family:n { \CJKrmdefault } }
         { \sfdefault }     { \xeCJK_switch_family:n { \CJKsfdefault } }
@@ -4033,7 +4043,6 @@
         { \familydefault } { \xeCJK_switch_family:n { \CJKfamilydefault } }
       }
   }
-\cs_new_eq:NN \__xeCJK_update_family:nn \str_case:nn
 \cs_new_eq:NN \xeCJK@fix@penalty \fix@penalty
 \tl_replace_once:Nnn \xeCJK@fix@penalty { \@@italiccorr } { \xeCJK@italiccorr }
 \tl_replace_once:Nnn \sw@slant          { \fix@penalty }  { \xeCJK@fix@penalty }
diff --git a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
index 0a76eb66c22..f27c1418121 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xeCJKfntef.sty
@@ -29,10 +29,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 649d857 2017-01-02 09:25:53 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx efd7a18 2017-02-23 02:07:20 +0800 Qing Lee <sobenlee@gmail.com> $
   {xeCJK font effect}
 \ProvidesExplPackage{xeCJKfntef}
-  {\ExplFileDate}{3.4.5}{\ExplFileDescription}
+  {\ExplFileDate}{3.4.6}{\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 8ab2d505cfd..5346e0e9b11 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-addon.sty
@@ -29,10 +29,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 649d857 2017-01-02 09:25:53 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx efd7a18 2017-02-23 02:07:20 +0800 Qing Lee <sobenlee@gmail.com> $
   {addon file for xunicode}
 \ProvidesExplPackage{xunicode-addon}
-  {\ExplFileDate}{3.4.5}{\ExplFileDescription}
+  {\ExplFileDate}{3.4.6}{\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 e279c2072f9..58c57c48d3e 100644
--- a/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def
+++ b/Master/texmf-dist/tex/xelatex/xecjk/xunicode-extra.def
@@ -27,10 +27,10 @@
 %% 
 %% ----------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: xeCJK.dtx 649d857 2017-01-02 09:25:53 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx efd7a18 2017-02-23 02:07:20 +0800 Qing Lee <sobenlee@gmail.com> $
   {extra definition for xunicode}
 \ProvidesExplFile{xunicode-extra.def}
-  {\ExplFileDate}{3.4.5}{\ExplFileDescription}
+  {\ExplFileDate}{3.4.6}{\ExplFileDescription}
 \DeclareUTFComposite\textsuperscript
 \DeclareUTFComposite\textsubscript
 \DeclareUTFEncodedAccent\textsbleftarrow{"20EE}{"20FF}