texlive[43306] Master/texmf-dist: ctex (22feb17)

commits+karl at tug.org commits+karl at tug.org
Thu Feb 23 00:03:37 CET 2017


Revision: 43306
          http://tug.org/svn/texlive?view=revision&revision=43306
Author:   karl
Date:     2017-02-23 00:03:37 +0100 (Thu, 23 Feb 2017)
Log Message:
-----------
ctex (22feb17)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/ctex/README.md
    trunk/Master/texmf-dist/doc/latex/ctex/ctex.pdf
    trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx
    trunk/Master/texmf-dist/source/latex/ctex/ctex.ins
    trunk/Master/texmf-dist/tex/generic/ctex/ctexmakespa.tex
    trunk/Master/texmf-dist/tex/generic/ctex/ctexspamacro.tex
    trunk/Master/texmf-dist/tex/generic/ctex/ctxdocstrip.tex
    trunk/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex
    trunk/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex
    trunk/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex
    trunk/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex
    trunk/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex
    trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg
    trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
    trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
    trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
    trunk/Master/texmf-dist/tex/latex/ctex/ctex-article.def
    trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def
    trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def
    trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
    trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
    trunk/Master/texmf-dist/tex/latex/ctex/ctex-report.def
    trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty
    trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls
    trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
    trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
    trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
    trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty
    trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
    trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty
    trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
    trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
    trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def
    trunk/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls
    trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict
    trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict
    trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
    trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
    trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
    trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def
    trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
    trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
    trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
    trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
    trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
    trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
    trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
    trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
    trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
    trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
    trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
    trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
    trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
    trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def
    trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def
    trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def
    trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def
    trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def
    trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
    trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
    trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def
    trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def
    trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def
    trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
    trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def

Modified: trunk/Master/texmf-dist/doc/latex/ctex/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/ctex/README.md	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/doc/latex/ctex/README.md	2017-02-22 23:03:37 UTC (rev 43306)
@@ -26,7 +26,7 @@
 Copyright and Licence
 ---------------------
 
-    Copyright (C) 2003--2016
+    Copyright (C) 2003--2017
     CTEX.ORG and any individual authors listed elsewhere in this file.
     ----------------------------------------------------------------------
 

Modified: trunk/Master/texmf-dist/doc/latex/ctex/ctex.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx	2017-02-22 23:03:37 UTC (rev 43306)
@@ -2,7 +2,7 @@
 % !TeX program  = XeLaTeX
 % !TeX encoding = UTF-8
 %
-% Copyright (C) 2003--2016
+% Copyright (C) 2003--2017
 % CTEX.ORG and any individual authors listed elsewhere in this file.
 % --------------------------------------------------------------------------
 %
@@ -54,7 +54,7 @@
 Copyright and Licence
 ---------------------
 
-    Copyright (C) 2003--2016
+    Copyright (C) 2003--2017
     CTEX.ORG and any individual authors listed elsewhere in this file.
     ----------------------------------------------------------------------
 
@@ -152,7 +152,7 @@
 
 \preamble
 
-    Copyright (C) 2003--2016
+    Copyright (C) 2003--2017
     CTEX.ORG and any individual authors listed in the documentation.
 ------------------------------------------------------------------------------
 
@@ -413,7 +413,7 @@
 %<*!(c19|c70|ctexspa|dict)>
 %<class|style|ctexcap|ctexhook|ctexpatch|ctxdoc>\NeedsTeXFormat{LaTeX2e}
 %<class|style|ctexcap|ctexhook|ctexpatch|ctxdoc>\RequirePackage{expl3}
-%<+!driver>\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+%<+!driver>\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
 %<ctxdoc>  {ctex documentation (CTEX)}
 %<ctxdoc>\ProvidesExplClass{ctxdoc}
 %<ctex>  {Chinese adapter in LaTeX (CTEX)}
@@ -502,7 +502,7 @@
 %<founder>\ProvidesExplFile{ctex-fontset-founder.def}
 %<ubuntu>  {Ubuntu fonts definition (CTEX)}
 %<ubuntu>\ProvidesExplFile{ctex-fontset-ubuntu.def}
-%<!driver>  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+%<!driver>  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 %</!(c19|c70|ctexspa|dict)>
 %<c19&rm>\ProvidesFile{c19rm.fd}%
 %<c19&sf>\ProvidesFile{c19sf.fd}%
@@ -513,9 +513,9 @@
 %<ctexspa>\ProvidesFile{ctexspa.def}%
 %<dict&theorem&GBK>\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
 %<dict&theorem&UTF8>\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
-%<c19|c70>  [2016/12/27 v2.4.7 Chinese font definition (CTEX)]
-%<ctexspa>  [2016/12/27 v2.4.7 Space info for CJKpunct (CTEX)]
-%<dict&theorem>  [2016/12/27 v2.4.7 Chinese translation for theorem name (CTEX)]
+%<c19|c70>  [2017/02/23 v2.4.8 Chinese font definition (CTEX)]
+%<ctexspa>  [2017/02/23 v2.4.8 Space info for CJKpunct (CTEX)]
+%<dict&theorem>  [2017/02/23 v2.4.8 Chinese translation for theorem name (CTEX)]
 %</!(driver|readme|install|zhmap|spa|docstrip)>
 %<*driver>
 \documentclass{ctxdoc}
@@ -537,7 +537,7 @@
 % \changes{v2.4}{2015/02/19}{加强 \pkg{beamer} 宏包支持。}
 %
 %
-% \CheckSum{5878}
+% \CheckSum{5898}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -4725,12 +4725,12 @@
 \newfontfeature { JFM-var } { jfmvar = #1 }
 %    \end{macrocode}
 %
-% 在新版本的 \pkg{fontspec} 中,\cs{__fontspec_namewrap:n} 变成了私有函数。
+% 在新版本的 \pkg{fontspec} 中,\cs{__fontspec_fontname_wrap:n} 变成了私有函数。
 %    \begin{macrocode}
 \keys_define:nn { fontspec-preparse-external }
   {
     NoEmbed .code:n =
-      { \cs_set_eq:NN \__fontspec_namewrap:n \@@_noembed_wrap:n }
+      { \cs_set_eq:NN \__fontspec_fontname_wrap:n \@@_noembed_wrap:n }
   }
 \cs_new:Npn \@@_noembed_wrap:n #1 { psft: #1 }
 %    \end{macrocode}
@@ -4813,6 +4813,7 @@
         \group_begin:
         \@@_change_encoding:
         \exp_not:n { \cs_set_eq:NN \CJKfamily \use_none:n }
+        \exp_not:n { \cs_set_eq:NN \CTEX at fontfamily \use_none:n }
         \exp_not:n { \fontspec_set_family:Nnn \g_@@_fontspec_family_tl }
           { \exp_not:o { \l_@@_font_options_clist } } {#2}
         \prop_gput:Nno \exp_not:N \g_@@_family_name_prop {#1}
@@ -5094,24 +5095,39 @@
 \tl_if_exist:NF \CJKrmdefault { \tl_const:Nn \CJKrmdefault { rm } }
 \tl_if_exist:NF \CJKsfdefault { \tl_const:Nn \CJKsfdefault { sf } }
 \tl_if_exist:NF \CJKttdefault { \tl_const:Nn \CJKttdefault { tt } }
-\ctex_preto_cmd:NnnTF \rmfamily { \ExplSyntaxOff }
-  { \CJKfamily { \CJKrmdefault } }
-  { }
-  { \ctex_patch_failure:N \rmfamily }
-\ctex_preto_cmd:NnnTF \sffamily { \ExplSyntaxOff }
-  { \CJKfamily { \CJKsfdefault } }
-  { }
-  { \ctex_patch_failure:N \sffamily }
-\ctex_preto_cmd:NnnTF \ttfamily { \ExplSyntaxOff }
-  { \CJKfamily { \CJKttdefault } }
-  { }
-  { \ctex_patch_failure:N \ttfamily }
-\ctex_preto_cmd:NnnTF \normalfont { \ExplSyntaxOff }
-  { \CJKfamily { \CJKfamilydefault } }
-  { \cs_set_eq:NN \reset at font \normalfont }
-  { \ctex_patch_failure:N \normalfont }
 %    \end{macrocode}
 %
+% \begin{macro}[int]{\fontfamily}
+% \begin{macro}[int]{\CTEX at fontfamily}
+% \changes{v2.4.8}{2017/02/23}
+%   {解决与 \pkg{fontspec} 2017/01/24 v2.5d 的字体族匹配兼容问题。}
+% 修改 \tn{fontfamily},使主要 |CJK| 字体族能随西文主要字体更新。
+%    \begin{macrocode}
+\RenewDocumentCommand \fontfamily { m }
+  {
+    \tl_set:Nx \f at family {#1}
+    \CTEX at fontfamily {#1}
+  }
+\cs_new_protected_nopar:Npn \CTEX at fontfamily #1
+  {
+    \str_if_eq:nnTF {#1} { \familydefault }
+      { \CJKfamily { \CJKfamilydefault } }
+      { \@@_update_family_aux: }
+  }
+\cs_new_protected_nopar:Npn \@@_update_family_aux:
+  {
+    \str_case_x:nn { \f at family }
+      {
+        { \rmdefault }     { \CJKfamily { \CJKrmdefault } }
+        { \sfdefault }     { \CJKfamily { \CJKsfdefault } }
+        { \ttdefault }     { \CJKfamily { \CJKttdefault } }
+        { \familydefault } { \CJKfamily { \CJKfamilydefault } }
+      }
+  }
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
 % 在导言区末尾更新 \tn{CJKfamilydefault}。
 %    \begin{macrocode}
 \ctex_at_end_preamble:n { \ctex_update_default_family: }
@@ -5680,9 +5696,22 @@
 \tl_set:Nn \CJKsfdefault { sf }
 \tl_set:Nn \CJKttdefault { tt }
 \tl_set:Nn \CJKfamilydefault { \CJKrmdefault }
-\tl_put_left:Nn \rmfamily { \kanjifamily { \CJKrmdefault } }
-\tl_put_left:Nn \sffamily { \kanjifamily { \CJKsfdefault } }
-\tl_put_left:Nn \ttfamily { \kanjifamily { \CJKttdefault } }
+\ctex_preto_cmd:NnnTF \rmfamily { \ExplSyntaxOff }
+  { \kanjifamily { \CJKrmdefault } }
+  { }
+  { \ctex_patch_failure:N \rmfamily }
+\ctex_preto_cmd:NnnTF \sffamily { \ExplSyntaxOff }
+  { \kanjifamily { \CJKsfdefault } }
+  { }
+  { \ctex_patch_failure:N \sffamily }
+\ctex_preto_cmd:NnnTF \ttfamily { \ExplSyntaxOff }
+  { \kanjifamily { \CJKttdefault } }
+  { }
+  { \ctex_patch_failure:N \ttfamily }
+\ctex_preto_cmd:NnnTF \normalfont { \ExplSyntaxOff }
+  { \kanjifamily { \CJKfamilydefault } }
+  { \cs_set_eq:NN \reset at font \normalfont }
+  { \ctex_patch_failure:N \normalfont }
 \NewDocumentCommand \CJKfamily { m }
   {
     \kanjifamily { #1 }
@@ -9966,7 +9995,7 @@
 %    \begin{macrocode}
 %<*windows>
 \ProvidesFile{zhwindowsfonts.tex}%
-  [2016/12/27 v2.4.7 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+  [2017/02/23 v2.4.8 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
 
 \ifzhmappdf
   \pdfmapline{=gbk at UGBK@     <simsun.ttc}
@@ -10038,7 +10067,7 @@
 %    \begin{macrocode}
 %<*adobe>
 \ProvidesFile{zhadobefonts.tex}%
-  [2016/12/27 v2.4.7 Adobe font map loader for DVIPDFMx (CTEX)]
+  [2017/02/23 v2.4.8 Adobe font map loader for DVIPDFMx (CTEX)]
 
 \ifzhmappdf
 %% pdfTeX does not support OTF fonts
@@ -10074,7 +10103,7 @@
 %    \begin{macrocode}
 %<*fandol>
 \ProvidesFile{zhfandolfonts.tex}%
-  [2016/12/27 v2.4.7 Fandol font map loader for DVIPDFMx (CTEX)]
+  [2017/02/23 v2.4.8 Fandol font map loader for DVIPDFMx (CTEX)]
 
 \ifzhmappdf
 %% pdfTeX does not support OTF fonts
@@ -10110,7 +10139,7 @@
 %    \begin{macrocode}
 %<*founder>
 \ProvidesFile{zhfounderfonts.tex}%
-  [2016/12/27 v2.4.7 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+  [2017/02/23 v2.4.8 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
 
 \ifzhmappdf
   \pdfmapline{=gbk at UGBK@     <FZSSK.TTF}
@@ -10182,7 +10211,7 @@
 %    \begin{macrocode}
 %<*ubuntu>
 \ProvidesFile{zhubuntufonts.tex}%
-  [2016/12/27 v2.4.7 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
+  [2017/02/23 v2.4.8 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
 
 \ifzhmappdf
   \pdfmapline{=gbk at UGBK@     <uming.ttc}

Modified: trunk/Master/texmf-dist/source/latex/ctex/ctex.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/ctex/ctex.ins	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/source/latex/ctex/ctex.ins	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `install')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -31,7 +31,7 @@
 
 \preamble
 
-    Copyright (C) 2003--2016
+    Copyright (C) 2003--2017
     CTEX.ORG and any individual authors listed in the documentation.
 ------------------------------------------------------------------------------
 

Modified: trunk/Master/texmf-dist/tex/generic/ctex/ctexmakespa.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/ctexmakespa.tex	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/generic/ctex/ctexmakespa.tex	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `spa,make')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 

Modified: trunk/Master/texmf-dist/tex/generic/ctex/ctexspamacro.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/ctexspamacro.tex	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/generic/ctex/ctexspamacro.tex	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `spa,macro')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 

Modified: trunk/Master/texmf-dist/tex/generic/ctex/ctxdocstrip.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/ctxdocstrip.tex	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/generic/ctex/ctxdocstrip.tex	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `docstrip')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 

Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `zhmap,adobe')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -76,7 +76,7 @@
 \fi
 \endgroup
 \ProvidesFile{zhadobefonts.tex}%
-  [2016/12/27 v2.4.7 Adobe font map loader for DVIPDFMx (CTEX)]
+  [2017/02/23 v2.4.8 Adobe font map loader for DVIPDFMx (CTEX)]
 
 \ifzhmappdf
 %% pdfTeX does not support OTF fonts

Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `zhmap,fandol')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -76,7 +76,7 @@
 \fi
 \endgroup
 \ProvidesFile{zhfandolfonts.tex}%
-  [2016/12/27 v2.4.7 Fandol font map loader for DVIPDFMx (CTEX)]
+  [2017/02/23 v2.4.8 Fandol font map loader for DVIPDFMx (CTEX)]
 
 \ifzhmappdf
 %% pdfTeX does not support OTF fonts

Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `zhmap,founder')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -76,7 +76,7 @@
 \fi
 \endgroup
 \ProvidesFile{zhfounderfonts.tex}%
-  [2016/12/27 v2.4.7 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+  [2017/02/23 v2.4.8 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
 
 \ifzhmappdf
   \pdfmapline{=gbk at UGBK@     <FZSSK.TTF}

Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `zhmap,ubuntu')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -76,7 +76,7 @@
 \fi
 \endgroup
 \ProvidesFile{zhubuntufonts.tex}%
-  [2016/12/27 v2.4.7 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
+  [2017/02/23 v2.4.8 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)]
 
 \ifzhmappdf
   \pdfmapline{=gbk at UGBK@     <uming.ttc}

Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `zhmap,windows')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -76,7 +76,7 @@
 \fi
 \endgroup
 \ProvidesFile{zhwindowsfonts.tex}%
-  [2016/12/27 v2.4.7 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+  [2017/02/23 v2.4.8 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
 
 \ifzhmappdf
   \pdfmapline{=gbk at UGBK@     <simsun.ttc}

Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `name,GBK')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Caption with encoding GBK (CTEX)}
 \ProvidesExplFile{ctex-name-gbk.cfg}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \keys_set_known:nn { ctex }
   {
     contentsname   = Ŀ¼ ,

Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `name,UTF8')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Caption with encoding UTF8 (CTEX)}
 \ProvidesExplFile{ctex-name-utf8.cfg}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \keys_set_known:nn { ctex }
   {
     contentsname   = 目录 ,

Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `config')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Configuration file (CTEX)}
 \ProvidesExplFile{\ExplFileName.cfg}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 %%
 %% 
 %%

Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `ctexopts')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Option configuration file (CTEX)}
 \ProvidesExplFile{ctexopts.cfg}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 %%
 %% \keys_set:nn { ctex / option } { fontset = windowsnew }
 %% 

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-article.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-article.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-article.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `heading,article')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Heading modification for article (CTEX)}
 \ProvidesExplFile{ctex-article.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \seq_new:N \c__ctex_section_headings_seq
 \seq_gset_from_clist:Nn \c__ctex_section_headings_seq
   { section , subsection , subsubsection , paragraph , subparagraph }

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `heading,beamer')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Heading modification for beamer (CTEX)}
 \ProvidesExplFile{ctex-beamer.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \seq_new:N \c__ctex_headings_seq
 \seq_gset_from_clist:Nn \c__ctex_headings_seq
   { part , section , subsection }

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-book.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `heading,book')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Heading modification for book (CTEX)}
 \ProvidesExplFile{ctex-book.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \seq_new:N \c__ctex_section_headings_seq
 \seq_gset_from_clist:Nn \c__ctex_section_headings_seq
   { section , subsection , subsubsection , paragraph , subparagraph }

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `c5size')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {c5size option (CTEX)}
 \ProvidesExplFile{ctex-c5size.clo}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \ctex_set_font_size:Nnn \normalsize { 5 }
   {
     \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `cs4size')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {cs4size option (CTEX)}
 \ProvidesExplFile{ctex-cs4size.clo}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \ctex_set_font_size:Nnn \normalsize { -4 }
   {
     \abovedisplayskip 12\p@ \@plus3\p@ \@minus7\p@

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-report.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-report.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-report.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `heading,report')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Heading modification for report (CTEX)}
 \ProvidesExplFile{ctex-report.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \seq_new:N \c__ctex_section_headings_seq
 \seq_gset_from_clist:Nn \c__ctex_section_headings_seq
   { section , subsection , subsubsection , paragraph , subparagraph }

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `style,ctex')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -28,10 +28,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese adapter in LaTeX (CTEX)}
 \ProvidesExplPackage{\ExplFileName}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \tl_const:Nx \c__ctex_version_tl
   { \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
 \msg_new:nnnn { ctex } { subpackage-loaded }

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `class,article')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -28,10 +28,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese adapter for class article (CTEX)}
 \ProvidesExplClass{ctexart}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \tl_const:Nx \c__ctex_version_tl
   { \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
 \cs_new_eq:cN { ver at ctex.        \@pkgextension } \c__ctex_version_tl

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `class,beamer')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -28,10 +28,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese adapter for class beamer (CTEX)}
 \ProvidesExplClass{ctexbeamer}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \tl_const:Nx \c__ctex_version_tl
   { \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
 \cs_new_eq:cN { ver at ctex.        \@pkgextension } \c__ctex_version_tl

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `class,book')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -28,10 +28,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese adapter for class book (CTEX)}
 \ProvidesExplClass{ctexbook}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \tl_const:Nx \c__ctex_version_tl
   { \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
 \cs_new_eq:cN { ver at ctex.        \@pkgextension } \c__ctex_version_tl

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `ctexcap')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -28,10 +28,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese adapter in LaTeX (CTEX)}
 \ProvidesExplPackage{ctexcap}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \clist_new:N \l__ctex_ctexcap_options_clist
 \clist_set:Nx \l__ctex_ctexcap_options_clist
   { \exp_not:v { opt@ \@currname . \@currext } , heading }

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `style,ctexheading')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -28,10 +28,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Heading style modification (CTEX)}
 \ProvidesExplPackage{ctexheading}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \RequirePackage { xparse , l3keys2e }
 \RequirePackage { ctexhook , ctexpatch }
 \tl_new:N \l__ctex_tmp_tl

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `ctexhook')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -28,10 +28,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Document and package hooks (CTEX)}
 \ProvidesExplPackage{ctexhook}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \cs_new_protected:Npn \ctex_at_end_preamble:n #1
   { \tl_gput_right:Nn \g__ctex_end_preamble_hook_tl {#1} }
 \cs_new_protected:Npn \ctex_after_end_preamble:n #1

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `ctexpatch')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -28,10 +28,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Patching commands (CTEX)}
 \ProvidesExplPackage{ctexpatch}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \cs_if_exist:NF \str_new:N { \RequirePackage { l3str } }
 \cs_new_protected:Npn \ctex_patch_cmd_once:NnnnTF #1#2
   {

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `class,report')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -28,10 +28,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese adapter for class report (CTEX)}
 \ProvidesExplClass{ctexrep}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \tl_const:Nx \c__ctex_version_tl
   { \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
 \cs_new_eq:cN { ver at ctex.        \@pkgextension } \c__ctex_version_tl

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `style,ctexsize')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -28,10 +28,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese font size definition (CTEX)}
 \ProvidesExplPackage{ctexsize}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \RequirePackage { xparse , l3keys2e }
 \cs_new_eq:NN \g__ctex_font_size_flag \c_minus_one
 \keys_define:nn { ctex / option }

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -7,7 +7,7 @@
 %% ctex.dtx  (with options: `ctexspa')
 %% ctexpunct.spa 
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -28,7 +28,7 @@
 %% ------------------------------------------------------------------------------
 %% 
 \ProvidesFile{ctexspa.def}%
-  [2016/12/27 v2.4.7 Space info for CJKpunct (CTEX)]
+  [2017/02/23 v2.4.8 Space info for CJKpunct (CTEX)]
 \ctexspadef{adobezhsong}{70,15,61,8,63,14,58,7,64,13,62,12,60,11,61,15,62,14,51,6,58,5,58,8,7,5,12,12,10,68,13,63,17,63,20,69,19,69,17,63,19,70,17,55,10,10,14,63,10,65,10,61,13,62,15,61,7,49,7,56,8,58,15,69,8,61,14,63,8,57,,,}
 \ctexspadef{adobezhhei}{78,3,64,3,64,2,61,3,72,3,70,3,72,3,70,3,60,3,51,3,62,3,66,3,0,0,10,10,3,70,5,70,6,75,6,78,17,67,13,67,17,67,4,50,8,8,3,72,3,70,3,72,3,70,3,60,3,51,3,62,3,66,3,78,7,62,3,63,3,61,,,}
 \ctexspadef{adobezhkai}{76,10,55,8,63,4,62,4,71,4,65,4,71,4,74,4,54,4,54,4,62,4,62,4,0,0,11,11,5,72,6,71,7,78,7,79,18,68,18,68,18,68,2,46,14,12,4,71,4,65,4,71,4,74,4,54,4,54,4,62,4,62,10,76,8,55,4,63,4,62,,,}

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `ctxdoc')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -28,10 +28,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {ctex documentation (CTEX)}
 \ProvidesExplClass{ctxdoc}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \ExplSyntaxOff
 \let\pdfmdfivesum\mdfivesum
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{l3doc}}

Modified: trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `dict,theorem,GBK')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -27,7 +27,7 @@
 %% ------------------------------------------------------------------------------
 %% 
 \ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
-  [2016/12/27 v2.4.7 Chinese translation for theorem name (CTEX)]
+  [2017/02/23 v2.4.8 Chinese translation for theorem name (CTEX)]
 \providetranslation{Comments}{\xC6\xC0\xC2\xDB}
 \providetranslation{comments}{\xC6\xC0\xC2\xDB}
 \providetranslation{Comment}{\xC6\xC0\xC2\xDB}

Modified: trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `dict,theorem,UTF8')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -27,7 +27,7 @@
 %% ------------------------------------------------------------------------------
 %% 
 \ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
-  [2016/12/27 v2.4.7 Chinese translation for theorem name (CTEX)]
+  [2017/02/23 v2.4.8 Chinese translation for theorem name (CTEX)]
 \providetranslation{Comments}{评论}
 \providetranslation{comments}{评论}
 \providetranslation{Comment}{评论}

Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `aptex')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Asian pTeX adapter (CTEX)}
 \ProvidesExplFile{ctex-engine-aptex.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1
   {
     \AtBeginDvi {#1}
@@ -41,9 +41,22 @@
 \tl_set:Nn \CJKsfdefault { sf }
 \tl_set:Nn \CJKttdefault { tt }
 \tl_set:Nn \CJKfamilydefault { \CJKrmdefault }
-\tl_put_left:Nn \rmfamily { \kanjifamily { \CJKrmdefault } }
-\tl_put_left:Nn \sffamily { \kanjifamily { \CJKsfdefault } }
-\tl_put_left:Nn \ttfamily { \kanjifamily { \CJKttdefault } }
+\ctex_preto_cmd:NnnTF \rmfamily { \ExplSyntaxOff }
+  { \kanjifamily { \CJKrmdefault } }
+  { }
+  { \ctex_patch_failure:N \rmfamily }
+\ctex_preto_cmd:NnnTF \sffamily { \ExplSyntaxOff }
+  { \kanjifamily { \CJKsfdefault } }
+  { }
+  { \ctex_patch_failure:N \sffamily }
+\ctex_preto_cmd:NnnTF \ttfamily { \ExplSyntaxOff }
+  { \kanjifamily { \CJKttdefault } }
+  { }
+  { \ctex_patch_failure:N \ttfamily }
+\ctex_preto_cmd:NnnTF \normalfont { \ExplSyntaxOff }
+  { \kanjifamily { \CJKfamilydefault } }
+  { \cs_set_eq:NN \reset at font \normalfont }
+  { \ctex_patch_failure:N \normalfont }
 \NewDocumentCommand \CJKfamily { m }
   {
     \kanjifamily { #1 }

Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `luatex')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {LuaLaTeX adapter (CTEX)}
 \ProvidesExplFile{ctex-engine-luatex.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \msg_new:nnn { ctex } { luatexja-loaded }
   {
     Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\
@@ -331,7 +331,7 @@
 \keys_define:nn { fontspec-preparse-external }
   {
     NoEmbed .code:n =
-      { \cs_set_eq:NN \__fontspec_namewrap:n \__ctex_ltj_noembed_wrap:n }
+      { \cs_set_eq:NN \__fontspec_fontname_wrap:n \__ctex_ltj_noembed_wrap:n }
   }
 \cs_new:Npn \__ctex_ltj_noembed_wrap:n #1 { psft: #1 }
 \cs_new_protected:Npn \ctex_ltj_set_family:nnn #1#2#3
@@ -389,6 +389,7 @@
         \group_begin:
         \__ctex_ltj_change_encoding:
         \exp_not:n { \cs_set_eq:NN \CJKfamily \use_none:n }
+        \exp_not:n { \cs_set_eq:NN \CTEX at fontfamily \use_none:n }
         \exp_not:n { \fontspec_set_family:Nnn \g__ctex_ltj_fontspec_family_tl }
           { \exp_not:o { \l__ctex_ltj_font_options_clist } } {#2}
         \prop_gput:Nno \exp_not:N \g__ctex_ltj_family_name_prop {#1}
@@ -617,22 +618,27 @@
 \tl_if_exist:NF \CJKrmdefault { \tl_const:Nn \CJKrmdefault { rm } }
 \tl_if_exist:NF \CJKsfdefault { \tl_const:Nn \CJKsfdefault { sf } }
 \tl_if_exist:NF \CJKttdefault { \tl_const:Nn \CJKttdefault { tt } }
-\ctex_preto_cmd:NnnTF \rmfamily { \ExplSyntaxOff }
-  { \CJKfamily { \CJKrmdefault } }
-  { }
-  { \ctex_patch_failure:N \rmfamily }
-\ctex_preto_cmd:NnnTF \sffamily { \ExplSyntaxOff }
-  { \CJKfamily { \CJKsfdefault } }
-  { }
-  { \ctex_patch_failure:N \sffamily }
-\ctex_preto_cmd:NnnTF \ttfamily { \ExplSyntaxOff }
-  { \CJKfamily { \CJKttdefault } }
-  { }
-  { \ctex_patch_failure:N \ttfamily }
-\ctex_preto_cmd:NnnTF \normalfont { \ExplSyntaxOff }
-  { \CJKfamily { \CJKfamilydefault } }
-  { \cs_set_eq:NN \reset at font \normalfont }
-  { \ctex_patch_failure:N \normalfont }
+\RenewDocumentCommand \fontfamily { m }
+  {
+    \tl_set:Nx \f at family {#1}
+    \CTEX at fontfamily {#1}
+  }
+\cs_new_protected_nopar:Npn \CTEX at fontfamily #1
+  {
+    \str_if_eq:nnTF {#1} { \familydefault }
+      { \CJKfamily { \CJKfamilydefault } }
+      { \__ctex_ltj_update_family_aux: }
+  }
+\cs_new_protected_nopar:Npn \__ctex_ltj_update_family_aux:
+  {
+    \str_case_x:nn { \f at family }
+      {
+        { \rmdefault }     { \CJKfamily { \CJKrmdefault } }
+        { \sfdefault }     { \CJKfamily { \CJKsfdefault } }
+        { \ttdefault }     { \CJKfamily { \CJKttdefault } }
+        { \familydefault } { \CJKfamily { \CJKfamilydefault } }
+      }
+  }
 \ctex_at_end_preamble:n { \ctex_update_default_family: }
 \cs_new_protected_nopar:Npn \ctex_ltj_ensure_default_family:
   {

Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `pdftex')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {(pdf)LaTeX adapter (CTEX)}
 \ProvidesExplFile{ctex-engine-pdftex.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1
   {
     \AtBeginDvi {#1}

Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `uptex')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {upTeX adapter (CTEX)}
 \ProvidesExplFile{ctex-engine-uptex.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1
   {
     \AtBeginDvi {#1}
@@ -41,9 +41,22 @@
 \tl_set:Nn \CJKsfdefault { sf }
 \tl_set:Nn \CJKttdefault { tt }
 \tl_set:Nn \CJKfamilydefault { \CJKrmdefault }
-\tl_put_left:Nn \rmfamily { \kanjifamily { \CJKrmdefault } }
-\tl_put_left:Nn \sffamily { \kanjifamily { \CJKsfdefault } }
-\tl_put_left:Nn \ttfamily { \kanjifamily { \CJKttdefault } }
+\ctex_preto_cmd:NnnTF \rmfamily { \ExplSyntaxOff }
+  { \kanjifamily { \CJKrmdefault } }
+  { }
+  { \ctex_patch_failure:N \rmfamily }
+\ctex_preto_cmd:NnnTF \sffamily { \ExplSyntaxOff }
+  { \kanjifamily { \CJKsfdefault } }
+  { }
+  { \ctex_patch_failure:N \sffamily }
+\ctex_preto_cmd:NnnTF \ttfamily { \ExplSyntaxOff }
+  { \kanjifamily { \CJKttdefault } }
+  { }
+  { \ctex_patch_failure:N \ttfamily }
+\ctex_preto_cmd:NnnTF \normalfont { \ExplSyntaxOff }
+  { \kanjifamily { \CJKfamilydefault } }
+  { \cs_set_eq:NN \reset at font \normalfont }
+  { \ctex_patch_failure:N \normalfont }
 \NewDocumentCommand \CJKfamily { m }
   {
     \kanjifamily { #1 }

Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `xetex')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {XeLaTeX adapter (CTEX)}
 \ProvidesExplFile{ctex-engine-xetex.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \RequirePackage { xeCJK }
 \exp_args:Nx \xeCJKsetup
   {

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `rm,c19')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -27,7 +27,7 @@
 %% ------------------------------------------------------------------------------
 %% 
 \ProvidesFile{c19rm.fd}%
-  [2016/12/27 v2.4.7 Chinese font definition (CTEX)]
+  [2017/02/23 v2.4.8 Chinese font definition (CTEX)]
 %%
 %% Chinese characters
 %%

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `sf,c19')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -27,7 +27,7 @@
 %% ------------------------------------------------------------------------------
 %% 
 \ProvidesFile{c19sf.fd}%
-  [2016/12/27 v2.4.7 Chinese font definition (CTEX)]
+  [2017/02/23 v2.4.8 Chinese font definition (CTEX)]
 %%
 %% Chinese characters
 %%

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `tt,c19')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -27,7 +27,7 @@
 %% ------------------------------------------------------------------------------
 %% 
 \ProvidesFile{c19tt.fd}%
-  [2016/12/27 v2.4.7 Chinese font definition (CTEX)]
+  [2017/02/23 v2.4.8 Chinese font definition (CTEX)]
 %%
 %% Chinese characters
 %%

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `rm,c70')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -27,7 +27,7 @@
 %% ------------------------------------------------------------------------------
 %% 
 \ProvidesFile{c70rm.fd}%
-  [2016/12/27 v2.4.7 Chinese font definition (CTEX)]
+  [2017/02/23 v2.4.8 Chinese font definition (CTEX)]
 %%
 %% Chinese characters
 %%

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `sf,c70')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -27,7 +27,7 @@
 %% ------------------------------------------------------------------------------
 %% 
 \ProvidesFile{c70sf.fd}%
-  [2016/12/27 v2.4.7 Chinese font definition (CTEX)]
+  [2017/02/23 v2.4.8 Chinese font definition (CTEX)]
 %%
 %% Chinese characters
 %%

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `tt,c70')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -27,7 +27,7 @@
 %% ------------------------------------------------------------------------------
 %% 
 \ProvidesFile{c70tt.fd}%
-  [2016/12/27 v2.4.7 Chinese font definition (CTEX)]
+  [2017/02/23 v2.4.8 Chinese font definition (CTEX)]
 %%
 %% Chinese characters
 %%

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `fontset,adobe')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Adobe fonts definition (CTEX)}
 \ProvidesExplFile{ctex-fontset-adobe.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \sys_if_engine_pdftex:TF
   {
     \sys_if_output_pdf:TF

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `fontset,fandol')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Fandol fonts definition (CTEX)}
 \ProvidesExplFile{ctex-fontset-fandol.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \sys_if_engine_pdftex:TF
   {
     \sys_if_output_pdf:TF

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `fontset,founder')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Founder fonts definition (CTEX)}
 \ProvidesExplFile{ctex-fontset-founder.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \sys_if_engine_pdftex:TF
   {
     \ctex_zhmap_case:nnn

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `fontset,mac')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Mac OS X fonts definition (CTEX)}
 \ProvidesExplFile{ctex-fontset-mac.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \sys_if_engine_pdftex:TF
   { \ctex_fontset_error:n { mac } }
   {

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `fontset,ubuntu')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Ubuntu fonts definition (CTEX)}
 \ProvidesExplFile{ctex-fontset-ubuntu.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \sys_if_engine_pdftex:TF
   {
     \ctex_zhmap_case:nnn

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `fontset,windows')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Windows fonts definition (CTEX)}
 \ProvidesExplFile{ctex-fontset-windows.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \file_if_exist:nTF { C:/bootfont.bin }
   { \ctex_file_input:n { ctex-fontset-windowsold.def } }
   { \ctex_file_input:n { ctex-fontset-windowsnew.def } }

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `fontset,windowsnew')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Windows fonts definition for Vista or later version (CTEX)}
 \ProvidesExplFile{ctex-fontset-windowsnew.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \tl_new:N \l__ctex_msyh_suffix_tl
 \tl_set:Nn \l__ctex_msyh_suffix_tl { .ttc }
 \file_if_exist:nF { C:/Windows/Fonts/msyh.ttc }

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `fontset,windowsold')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Windows fonts definition for XP or earlier version (CTEX)}
 \ProvidesExplFile{ctex-fontset-windowsold.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \sys_if_engine_pdftex:TF
   {
     \ctex_zhmap_case:nnn

Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `scheme,article,chinese')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese scheme for article (CTEX)}
 \ProvidesExplFile{ctex-scheme-chinese-article.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \keys_set:nn { ctex / part }
   {
     aftertitle  = \par ,

Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `scheme,beamer,chinese')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese scheme for beamer (CTEX)}
 \ProvidesExplFile{ctex-scheme-chinese-beamer.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \keys_set:nn { ctex / part }
   {
     aftertitle  = \par ,

Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `scheme,book,chinese')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese scheme for book (CTEX)}
 \ProvidesExplFile{ctex-scheme-chinese-book.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \keys_set:nn { ctex / part }
   {
     aftertitle  = \par ,

Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `scheme,report,chinese')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese scheme for report (CTEX)}
 \ProvidesExplFile{ctex-scheme-chinese-report.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \keys_set:nn { ctex / part }
   {
     aftertitle  = \par ,

Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `scheme,generic,chinese')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese scheme for generic (CTEX)}
 \ProvidesExplFile{ctex-scheme-chinese.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \keys_set:nn { ctex } { today = small }
 \ctex_if_autoindent_touched:F
   { \keys_set:nn { ctex } { autoindent = true } }

Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `scheme,article,plain')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Plain scheme for article (CTEX)}
 \ProvidesExplFile{ctex-scheme-plain-article.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \keys_set:nn { ctex / part }
   {
     aftertitle  = \par ,

Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `scheme,beamer,plain')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Plain scheme for beamer (CTEX)}
 \ProvidesExplFile{ctex-scheme-plain-beamer.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \keys_set:nn { ctex / part }
   {
     aftertitle  = \par ,

Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `scheme,book,plain')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Plain scheme for book (CTEX)}
 \ProvidesExplFile{ctex-scheme-plain-book.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \keys_set:nn { ctex / part }
   {
     aftertitle  = \par ,

Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `scheme,report,plain')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Plain scheme for report (CTEX)}
 \ProvidesExplFile{ctex-scheme-plain-report.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 \keys_set:nn { ctex / part }
   {
     aftertitle  = \par ,

Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def	2017-02-22 23:03:14 UTC (rev 43305)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def	2017-02-22 23:03:37 UTC (rev 43306)
@@ -6,7 +6,7 @@
 %%
 %% ctex.dtx  (with options: `scheme,generic,plain')
 %% 
-%%     Copyright (C) 2003--2016
+%%     Copyright (C) 2003--2017
 %%     CTEX.ORG and any individual authors listed in the documentation.
 %% ------------------------------------------------------------------------------
 %% 
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 6471e87 2016-12-27 17:33:18 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx d459e18 2017-02-23 02:07:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Plain scheme for generic (CTEX)}
 \ProvidesExplFile{ctex-scheme-plain.def}
-  {\ExplFileDate}{2.4.7}{\ExplFileDescription}
+  {\ExplFileDate}{2.4.8}{\ExplFileDescription}
 %% 
 %%
 %% End of file `ctex-scheme-plain.def'.



More information about the tex-live-commits mailing list