ctex (14may15)

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

12 files changed, 631 insertions, 133 deletions

diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-cjk-adobefonts.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-cjk-adobefonts.def
deleted file mode 100644
index 168d4a69d4f..00000000000
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-cjk-adobefonts.def
+++ /dev/null
@@ -1,7 +0,0 @@
-% ctex-cjk-adobefonts.def: Adobe 的 CJK 字体设置，为 Adobe 的四套字体
-% vim:ft=tex
-
-% 目前不可用
-\input{ctex-cjk-winfonts.def}
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-cjk-winfonts.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-cjk-winfonts.def
deleted file mode 100644
index e79a250b42c..00000000000
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-cjk-winfonts.def
+++ /dev/null
@@ -1,82 +0,0 @@
-% ctex-cjk-winfonts.def: Windows 的 CJK 字体设置，默认为 CTeX 套装的六种字体
-% vim:ft=tex
-
-\ifCTEX@zhmap
-  \AtBeginDvi{\input{zhwinfonts}}
-\fi
-
-\renewcommand*\CTEX@rm@family{rm}
-\renewcommand*\CTEX@sf@family{sf}
-\renewcommand*\CTEX@tt@family{tt}
-
-\ifCTEX@punct
-% see also: c19rm.fd
-  \CJKpunctmapfamily{C19}{rm}{m}{n}{zhsong}
-  \CJKpunctmapfamily{C19}{rm}{b}{n}{zhhei}
-  \CJKpunctmapfamily{C19}{rm}{bx}{n}{zhhei}
-  \CJKpunctmapfamily{C19}{rm}{m}{sl}{zhsong}
-  \CJKpunctmapfamily{C19}{rm}{b}{sl}{zhhei}
-  \CJKpunctmapfamily{C19}{rm}{bx}{sl}{zhhei}
-  \CJKpunctmapfamily{C19}{rm}{m}{it}{zhkai}
-  \CJKpunctmapfamily{C19}{rm}{b}{it}{zhkei}
-  \CJKpunctmapfamily{C19}{rm}{bx}{it}{zhkai}
-% see also: c19sf.fd
-  \CJKpunctmapfamily{C19}{sf}{m}{n}{zhyou}
-  \CJKpunctmapfamily{C19}{sf}{b}{n}{zhyou}
-  \CJKpunctmapfamily{C19}{sf}{bx}{n}{zhyou}
-  \CJKpunctmapfamily{C19}{sf}{m}{sl}{zhyou}
-  \CJKpunctmapfamily{C19}{sf}{b}{sl}{zhyou}
-  \CJKpunctmapfamily{C19}{sf}{bx}{sl}{zhyou}
-  \CJKpunctmapfamily{C19}{sf}{m}{it}{zhyou}
-  \CJKpunctmapfamily{C19}{sf}{b}{it}{zhyou}
-  \CJKpunctmapfamily{C19}{sf}{bx}{it}{zhyou}
-% see also: c19tt.fd
-  \CJKpunctmapfamily{C19}{tt}{m}{n}{zhfs}
-  \CJKpunctmapfamily{C19}{tt}{b}{n}{zhfs}
-  \CJKpunctmapfamily{C19}{tt}{bx}{n}{zhfs}
-  \CJKpunctmapfamily{C19}{tt}{m}{sl}{zhfs}
-  \CJKpunctmapfamily{C19}{tt}{b}{sl}{zhfs}
-  \CJKpunctmapfamily{C19}{tt}{bx}{sl}{zhfs}
-  \CJKpunctmapfamily{C19}{tt}{m}{it}{zhfs}
-  \CJKpunctmapfamily{C19}{tt}{b}{it}{zhfs}
-  \CJKpunctmapfamily{C19}{tt}{bx}{it}{zhfs}
-% see also: c70rm.fd
-  \CJKpunctmapfamily{C70}{rm}{m}{n}{zhsong}
-  \CJKpunctmapfamily{C70}{rm}{b}{n}{zhhei}
-  \CJKpunctmapfamily{C70}{rm}{bx}{n}{zhhei}
-  \CJKpunctmapfamily{C70}{rm}{m}{sl}{zhsong}
-  \CJKpunctmapfamily{C70}{rm}{b}{sl}{zhhei}
-  \CJKpunctmapfamily{C70}{rm}{bx}{sl}{zhhei}
-  \CJKpunctmapfamily{C70}{rm}{m}{it}{zhkai}
-  \CJKpunctmapfamily{C70}{rm}{b}{it}{zhkei}
-  \CJKpunctmapfamily{C70}{rm}{bx}{it}{zhkai}
-% see also: c70sf.fd
-  \CJKpunctmapfamily{C70}{sf}{m}{n}{zhyou}
-  \CJKpunctmapfamily{C70}{sf}{b}{n}{zhyou}
-  \CJKpunctmapfamily{C70}{sf}{bx}{n}{zhyou}
-  \CJKpunctmapfamily{C70}{sf}{m}{sl}{zhyou}
-  \CJKpunctmapfamily{C70}{sf}{b}{sl}{zhyou}
-  \CJKpunctmapfamily{C70}{sf}{bx}{sl}{zhyou}
-  \CJKpunctmapfamily{C70}{sf}{m}{it}{zhyou}
-  \CJKpunctmapfamily{C70}{sf}{b}{it}{zhyou}
-  \CJKpunctmapfamily{C70}{sf}{bx}{it}{zhyou}
-% see also: c70tt.fd
-  \CJKpunctmapfamily{C70}{tt}{m}{n}{zhfs}
-  \CJKpunctmapfamily{C70}{tt}{b}{n}{zhfs}
-  \CJKpunctmapfamily{C70}{tt}{bx}{n}{zhfs}
-  \CJKpunctmapfamily{C70}{tt}{m}{sl}{zhfs}
-  \CJKpunctmapfamily{C70}{tt}{b}{sl}{zhfs}
-  \CJKpunctmapfamily{C70}{tt}{bx}{sl}{zhfs}
-  \CJKpunctmapfamily{C70}{tt}{m}{it}{zhfs}
-  \CJKpunctmapfamily{C70}{tt}{b}{it}{zhfs}
-  \CJKpunctmapfamily{C70}{tt}{bx}{it}{zhfs}
-\fi
-
-\newcommand*{\songti}{\CJKfamily{zhsong}} % 宋体
-\newcommand*{\heiti}{\CJKfamily{zhhei}}   % 黑体
-\newcommand*{\kaishu}{\CJKfamily{zhkai}}  % 楷书
-\newcommand*{\fangsong}{\CJKfamily{zhfs}} % 仿宋
-\newcommand*{\lishu}{\CJKfamily{zhli}}    % 隶书
-\newcommand*{\youyuan}{\CJKfamily{zhyou}} % 幼圆
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
new file mode 100644
index 00000000000..7184629e73e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
@@ -0,0 +1,92 @@
+%%
+%% This is file `ctex-fontset-adobe.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ctex.dtx  (with options: `fontset,adobe')
+%% 
+%%     Copyright (C) 2003--2015
+%%     CTEX.ORG and any individual authors listed in the documentation.
+%% ------------------------------------------------------------------------------
+%% 
+%%     This work may be distributed and/or modified under the
+%%     conditions of the LaTeX Project Public License, either
+%%     version 1.3c of this license or (at your option) any later
+%%     version. This version of this license is in
+%%        http://www.latex-project.org/lppl/lppl-1-3c.txt
+%%     and the latest version of this license is in
+%%        http://www.latex-project.org/lppl.txt
+%%     and version 1.3 or later is part of all distributions of
+%%     LaTeX version 2005/12/01 or later.
+%% 
+%%     This work has the LPPL maintenance status `maintained'.
+%% 
+%%     The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% 
+%% ------------------------------------------------------------------------------
+%% 
+\GetIdInfo$Id: ctex.dtx 3d246c0 2015-05-11 23:20:45 +0800 Qing Lee <sobenlee@gmail.com> $
+  {Adobe fonts definition (CTEX)}
+\ProvidesExplFile{ctex-fontset-adobe.def}
+  {\ExplFileDate}{2.0}{\ExplFileDescription}
+\pdftex_if_engine:TF
+  {
+    \ctex_if_pdfmode:TF
+      { \ctex_fontset_error:n { adobe } }
+      {
+        \ctex_zhmap_case:nnn
+          {
+            \setCJKmainfont
+              [
+                      cmap = UniGB-UTF16-H ,
+                  BoldFont = AdobeHeitiStd-Regular.otf ,
+                ItalicFont = AdobeKaitiStd-Regular.otf
+              ] { AdobeSongStd-Light.otf }
+            \setCJKsansfont [ cmap = UniGB-UTF16-H ] { AdobeHeitiStd-Regular.otf }
+            \setCJKmonofont [ cmap = UniGB-UTF16-H ] { AdobeFangsongStd-Regular.otf }
+            \setCJKfamilyfont { zhsong }
+              [ cmap = UniGB-UTF16-H ] { AdobeSongStd-Light.otf }
+            \setCJKfamilyfont { zhhei }
+              [ cmap = UniGB-UTF16-H ] { AdobeHeitiStd-Regular.otf }
+            \setCJKfamilyfont { zhkai }
+              [ cmap = UniGB-UTF16-H ] { AdobeKaitiStd-Regular.otf }
+            \setCJKfamilyfont { zhfs }
+              [ cmap = UniGB-UTF16-H ] { AdobeFangsongStd-Regular.otf }
+            \ctex_punct_set:n { adobe }
+            \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+            \ctex_punct_map_family:nn { \CJKsfdefault } { zhhei }
+            \ctex_punct_map_family:nn { \CJKttdefault } { zhfs }
+            \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
+            \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
+          }
+          {
+            \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhadobefonts }
+            \ctex_punct_set:n { adobe }
+            \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+            \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
+            \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
+          }
+          { \ctex_fontset_error:n { adobe } }
+      }
+  }
+  {
+    \setCJKmainfont
+      [
+          BoldFont = AdobeHeitiStd-Regular ,
+        ItalicFont = AdobeKaitiStd-Regular
+      ] { AdobeSongStd-Light }
+    \setCJKsansfont { AdobeHeitiStd-Regular}
+    \setCJKmonofont { AdobeFangsongStd-Regular}
+    \setCJKfamilyfont { zhsong } { AdobeSongStd-Light }
+    \setCJKfamilyfont { zhhei }  { AdobeHeitiStd-Regular }
+    \setCJKfamilyfont { zhfs }   { AdobeFangsongStd-Regular }
+    \setCJKfamilyfont { zhkai }  { AdobeKaitiStd-Regular }
+  }
+\NewDocumentCommand \songti   { } { \CJKfamily { zhsong } }
+\NewDocumentCommand \heiti    { } { \CJKfamily { zhhei } }
+\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
+\NewDocumentCommand \kaishu   { } { \CJKfamily { zhkai } }
+%% 
+%%
+%% End of file `ctex-fontset-adobe.def'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
new file mode 100644
index 00000000000..3b62e2a0065
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
@@ -0,0 +1,103 @@
+%%
+%% This is file `ctex-fontset-fandol.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ctex.dtx  (with options: `fontset,fandol')
+%% 
+%%     Copyright (C) 2003--2015
+%%     CTEX.ORG and any individual authors listed in the documentation.
+%% ------------------------------------------------------------------------------
+%% 
+%%     This work may be distributed and/or modified under the
+%%     conditions of the LaTeX Project Public License, either
+%%     version 1.3c of this license or (at your option) any later
+%%     version. This version of this license is in
+%%        http://www.latex-project.org/lppl/lppl-1-3c.txt
+%%     and the latest version of this license is in
+%%        http://www.latex-project.org/lppl.txt
+%%     and version 1.3 or later is part of all distributions of
+%%     LaTeX version 2005/12/01 or later.
+%% 
+%%     This work has the LPPL maintenance status `maintained'.
+%% 
+%%     The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% 
+%% ------------------------------------------------------------------------------
+%% 
+\GetIdInfo$Id: ctex.dtx 3d246c0 2015-05-11 23:20:45 +0800 Qing Lee <sobenlee@gmail.com> $
+  {Fandol fonts definition (CTEX)}
+\ProvidesExplFile{ctex-fontset-fandol.def}
+  {\ExplFileDate}{2.0}{\ExplFileDescription}
+\pdftex_if_engine:TF
+  {
+    \ctex_if_pdfmode:TF
+      { \ctex_fontset_error:n { fandol } }
+      {
+        \ctex_zhmap_case:nnn
+          {
+            \setCJKmainfont
+              [
+                      cmap = UniGB-UTF16-H ,
+                  BoldFont = FandolSong-Bold.otf ,
+                ItalicFont = FandolKai-Regular.otf
+              ] { FandolSong-Regular.otf }
+            \setCJKsansfont
+              [
+                    cmap = UniGB-UTF16-H ,
+                BoldFont = FandolHei-Bold.otf
+              ] { FandolHei-Regular.otf }
+            \setCJKmonofont [ cmap = UniGB-UTF16-H ] { FandolFang-Regular.otf }
+            \setCJKfamilyfont { zhsong }
+              [
+                    cmap = UniGB-UTF16-H ,
+                BoldFont = FandolSong-Bold.otf
+              ] { FandolSong-Regular.otf }
+            \setCJKfamilyfont { zhhei }
+              [
+                    cmap = UniGB-UTF16-H ,
+                BoldFont = FandolHei-Bold.otf
+              ] { FandolHei-Regular.otf }
+            \setCJKfamilyfont { zhfs }
+              [ cmap = UniGB-UTF16-H ] { FandolFang-Regular.otf }
+            \setCJKfamilyfont { zhkai }
+              [ cmap = UniGB-UTF16-H ] { FandolKai-Regular.otf }
+            \ctex_punct_set:n { fandol }
+            \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+            \ctex_punct_map_family:nn { \CJKsfdefault } { zhhei }
+            \ctex_punct_map_family:nn { \CJKttdefault } { zhfs }
+            \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
+            \ctex_punct_map_bfseries:nn { \CJKrmdefault , zhsong } { zhsongb }
+            \ctex_punct_map_bfseries:nn { \CJKsfdefault , zhhei } { zhheib }
+          }
+          {
+            \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhfandolfonts }
+            \ctex_punct_set:n { fandol }
+            \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+            \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
+            \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
+          }
+          { \ctex_fontset_error:n { fandol } }
+      }
+  }
+  {
+    \setCJKmainfont
+      [ Extension = .otf , BoldFont = FandolSong-Bold , ItalicFont = FandolKai-Regular ]
+      { FandolSong-Regular }
+    \setCJKsansfont [ Extension = .otf , BoldFont = FandolHei-Bold ] { FandolHei-Regular }
+    \setCJKmonofont [ Extension = .otf ] { FandolFang-Regular }
+    \setCJKfamilyfont { zhsong }
+      [ Extension = .otf , BoldFont = FandolSong-Bold ] { FandolSong-Regular }
+    \setCJKfamilyfont { zhhei }
+      [ Extension = .otf , BoldFont = FandolHei-Bold ] { FandolHei-Regular }
+    \setCJKfamilyfont { zhfs }  [ Extension = .otf ] { FandolFang-Regular }
+    \setCJKfamilyfont { zhkai } [ Extension = .otf ] { FandolKai-Regular }
+  }
+\NewDocumentCommand \songti   { } { \CJKfamily { zhsong } }
+\NewDocumentCommand \heiti    { } { \CJKfamily { zhhei } }
+\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
+\NewDocumentCommand \kaishu   { } { \CJKfamily { zhkai } }
+%% 
+%%
+%% End of file `ctex-fontset-fandol.def'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
new file mode 100644
index 00000000000..3070d245ad9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
@@ -0,0 +1,86 @@
+%%
+%% This is file `ctex-fontset-founder.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ctex.dtx  (with options: `fontset,founder')
+%% 
+%%     Copyright (C) 2003--2015
+%%     CTEX.ORG and any individual authors listed in the documentation.
+%% ------------------------------------------------------------------------------
+%% 
+%%     This work may be distributed and/or modified under the
+%%     conditions of the LaTeX Project Public License, either
+%%     version 1.3c of this license or (at your option) any later
+%%     version. This version of this license is in
+%%        http://www.latex-project.org/lppl/lppl-1-3c.txt
+%%     and the latest version of this license is in
+%%        http://www.latex-project.org/lppl.txt
+%%     and version 1.3 or later is part of all distributions of
+%%     LaTeX version 2005/12/01 or later.
+%% 
+%%     This work has the LPPL maintenance status `maintained'.
+%% 
+%%     The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% 
+%% ------------------------------------------------------------------------------
+%% 
+\GetIdInfo$Id: ctex.dtx 3d246c0 2015-05-11 23:20:45 +0800 Qing Lee <sobenlee@gmail.com> $
+  {Founder fonts definition (CTEX)}
+\ProvidesExplFile{ctex-fontset-founder.def}
+  {\ExplFileDate}{2.0}{\ExplFileDescription}
+\pdftex_if_engine:TF
+  {
+    \ctex_zhmap_case:nnn
+      {
+        \setCJKmainfont
+          [ BoldFont = FZXBSK.TTF , ItalicFont = FZKTK.TTF ] { FZSSK.TTF }
+        \setCJKsansfont [ BoldFont = FZHTK.TTF ] { FZXH1K.TTF }
+        \setCJKmonofont { FZFSK.TTF }
+        \setCJKfamilyfont { zhsong } [ BoldFont = FZXBSK.TTF ] { FZSSK.TTF }
+        \setCJKfamilyfont { zhhei }  { FZHTK.TTF }
+        \setCJKfamilyfont { zhkai }  { FZKTK.TTF }
+        \setCJKfamilyfont { zhfs }   { FZFSK.TTF }
+        \setCJKfamilyfont { zhli }   { FZLSK.TTF }
+        \setCJKfamilyfont { zhyou } [ BoldFont = FZY3K.TTF ] { FZY1K.TTF }
+        \ctex_punct_set:n { founder }
+        \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+        \ctex_punct_map_family:nn { \CJKsfdefault } { zhheil }
+        \ctex_punct_map_family:nn { \CJKttdefault } { zhfs }
+        \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
+        \ctex_punct_map_bfseries:nn { \CJKrmdefault , zhsong } { zhsongb }
+        \ctex_punct_map_bfseries:nn { \CJKsfdefault } { zhhei }
+        \ctex_punct_map_bfseries:nn { zhyou } { zhyoub }
+      }
+      {
+        \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhfounderfonts }
+        \ctex_punct_set:n { founder }
+        \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+        \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
+        \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
+      }
+      { \ctex_fontset_error:n { founder } }
+  }
+  {
+    \setCJKmainfont
+      [ BoldFont = FZXiaoBiaoSong-B05 , ItalicFont = FZKai-Z03 ] { FZShuSong-Z01 }
+    \setCJKsansfont [ BoldFont = FZHei-B01 ]
+      { \xetex_if_engine:TF { 方正细黑一_GBK } { FZXH1K--GBK1-0 } }
+    \setCJKmonofont { FZFangSong-Z02 }
+    \setCJKfamilyfont { zhsong } [ BoldFont = FZXiaoBiaoSong-B05 ] { FZShuSong-Z01 }
+    \setCJKfamilyfont { zhhei }  { FZHei-B01 }
+    \setCJKfamilyfont { zhkai }  { FZKai-Z03 }
+    \setCJKfamilyfont { zhfs }   { FZFangSong-Z02 }
+    \setCJKfamilyfont { zhli }   { FZLiShu-S01 }
+    \setCJKfamilyfont { zhyou } [ BoldFont = FZZhunYuan-M02 ] { FZXiYuan-M01 }
+  }
+\NewDocumentCommand \songti   { } { \CJKfamily { zhsong } }
+\NewDocumentCommand \heiti    { } { \CJKfamily { zhhei } }
+\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
+\NewDocumentCommand \kaishu   { } { \CJKfamily { zhkai } }
+\NewDocumentCommand \lishu    { } { \CJKfamily { zhli } }
+\NewDocumentCommand \youyuan  { } { \CJKfamily { zhyou } }
+%% 
+%%
+%% End of file `ctex-fontset-founder.def'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
new file mode 100644
index 00000000000..09ae5d7df74
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
@@ -0,0 +1,50 @@
+%%
+%% This is file `ctex-fontset-mac.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ctex.dtx  (with options: `fontset,mac')
+%% 
+%%     Copyright (C) 2003--2015
+%%     CTEX.ORG and any individual authors listed in the documentation.
+%% ------------------------------------------------------------------------------
+%% 
+%%     This work may be distributed and/or modified under the
+%%     conditions of the LaTeX Project Public License, either
+%%     version 1.3c of this license or (at your option) any later
+%%     version. This version of this license is in
+%%        http://www.latex-project.org/lppl/lppl-1-3c.txt
+%%     and the latest version of this license is in
+%%        http://www.latex-project.org/lppl.txt
+%%     and version 1.3 or later is part of all distributions of
+%%     LaTeX version 2005/12/01 or later.
+%% 
+%%     This work has the LPPL maintenance status `maintained'.
+%% 
+%%     The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% 
+%% ------------------------------------------------------------------------------
+%% 
+\GetIdInfo$Id: ctex.dtx 3d246c0 2015-05-11 23:20:45 +0800 Qing Lee <sobenlee@gmail.com> $
+  {Mac OS X fonts definition (CTEX)}
+\ProvidesExplFile{ctex-fontset-mac.def}
+  {\ExplFileDate}{2.0}{\ExplFileDescription}
+\pdftex_if_engine:TF
+  { \ctex_fontset_error:n { mac } }
+  {
+    \setCJKmainfont [ BoldFont = STHeiti , ItalicFont = STKaiti ]  { STSong }
+    \setCJKsansfont [ BoldFont = STHeiti ] { STXihei }
+    \setCJKmonofont { STFangsong }
+    \setCJKfamilyfont { zhsong } { STSong }
+    \setCJKfamilyfont { zhhei }  { STHeiti }
+    \setCJKfamilyfont { zhfs }   { STFangsong }
+    \setCJKfamilyfont { zhkai }  { STKaiti }
+  }
+\NewDocumentCommand \songti   { } { \CJKfamily { zhsong } }
+\NewDocumentCommand \heiti    { } { \CJKfamily { zhhei } }
+\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
+\NewDocumentCommand \kaishu   { } { \CJKfamily { zhkai } }
+%% 
+%%
+%% End of file `ctex-fontset-mac.def'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
new file mode 100644
index 00000000000..f80f504e099
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
@@ -0,0 +1,73 @@
+%%
+%% This is file `ctex-fontset-ubuntu.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ctex.dtx  (with options: `fontset,ubuntu')
+%% 
+%%     Copyright (C) 2003--2015
+%%     CTEX.ORG and any individual authors listed in the documentation.
+%% ------------------------------------------------------------------------------
+%% 
+%%     This work may be distributed and/or modified under the
+%%     conditions of the LaTeX Project Public License, either
+%%     version 1.3c of this license or (at your option) any later
+%%     version. This version of this license is in
+%%        http://www.latex-project.org/lppl/lppl-1-3c.txt
+%%     and the latest version of this license is in
+%%        http://www.latex-project.org/lppl.txt
+%%     and version 1.3 or later is part of all distributions of
+%%     LaTeX version 2005/12/01 or later.
+%% 
+%%     This work has the LPPL maintenance status `maintained'.
+%% 
+%%     The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% 
+%% ------------------------------------------------------------------------------
+%% 
+\GetIdInfo$Id: ctex.dtx 3d246c0 2015-05-11 23:20:45 +0800 Qing Lee <sobenlee@gmail.com> $
+  {Ubuntu fonts definition (CTEX)}
+\ProvidesExplFile{ctex-fontset-ubuntu.def}
+  {\ExplFileDate}{2.0}{\ExplFileDescription}
+\pdftex_if_engine:TF
+  {
+    \ctex_zhmap_case:nnn
+      {
+        \setCJKmainfont
+          [ BoldFont = wqy-zenhei.ttc , ItalicFont = ukai.ttc ] { uming.ttc }
+        \setCJKsansfont { wqy-zenhei.ttc }
+        \setCJKmonofont { uming.ttc }
+        \setCJKfamilyfont { zhsong } { uming.ttc }
+        \setCJKfamilyfont { zhhei }  { wqy-zenhei.ttc }
+        \setCJKfamilyfont { zhkai }  { ukai.ttc }
+        \ctex_punct_set:n { ubuntu }
+        \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+        \ctex_punct_map_family:nn { \CJKsfdefault } { zhhei }
+        \ctex_punct_map_family:nn { \CJKttdefault } { zhsong }
+        \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
+        \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
+      }
+      {
+        \ctex_load_zhmap:nnnn { rm } { zhhei } { zhsong } { zhubuntufonts }
+        \ctex_punct_set:n { ubuntu }
+        \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+        \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
+        \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
+      }
+      { \ctex_fontset_error:n { ubuntu } }
+  }
+  {
+    \setCJKmainfont [ ItalicFont = AR~PL~UKai~CN ] { AR~PL~UMing~CN }
+    \setCJKsansfont { WenQuanYi~Zen~Hei }
+    \setCJKmonofont { AR~PL~UMing~CN }
+    \setCJKfamilyfont { zhsong } { AR~PL~UMing~CN }
+    \setCJKfamilyfont { zhhei }  { WenQuanYi~Zen~Hei }
+    \setCJKfamilyfont { zhkai }  { AR~PL~UKai~CN }
+  }
+\NewDocumentCommand \songti   { } { \CJKfamily { zhsong } }
+\NewDocumentCommand \heiti    { } { \CJKfamily { zhhei } }
+\NewDocumentCommand \kaishu   { } { \CJKfamily { zhkai } }
+%% 
+%%
+%% End of file `ctex-fontset-ubuntu.def'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
new file mode 100644
index 00000000000..f12d3900a08
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
@@ -0,0 +1,38 @@
+%%
+%% This is file `ctex-fontset-windows.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ctex.dtx  (with options: `fontset,windows')
+%% 
+%%     Copyright (C) 2003--2015
+%%     CTEX.ORG and any individual authors listed in the documentation.
+%% ------------------------------------------------------------------------------
+%% 
+%%     This work may be distributed and/or modified under the
+%%     conditions of the LaTeX Project Public License, either
+%%     version 1.3c of this license or (at your option) any later
+%%     version. This version of this license is in
+%%        http://www.latex-project.org/lppl/lppl-1-3c.txt
+%%     and the latest version of this license is in
+%%        http://www.latex-project.org/lppl.txt
+%%     and version 1.3 or later is part of all distributions of
+%%     LaTeX version 2005/12/01 or later.
+%% 
+%%     This work has the LPPL maintenance status `maintained'.
+%% 
+%%     The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% 
+%% ------------------------------------------------------------------------------
+%% 
+\GetIdInfo$Id: ctex.dtx 3d246c0 2015-05-11 23:20:45 +0800 Qing Lee <sobenlee@gmail.com> $
+  {Windows fonts definition (CTEX)}
+\ProvidesExplFile{ctex-fontset-windows.def}
+  {\ExplFileDate}{2.0}{\ExplFileDescription}
+\file_if_exist:nTF { C:/boot.ini }
+  { \ctex_file_input:n { ctex-fontset-windowsold.def } }
+  { \ctex_file_input:n { ctex-fontset-windowsnew.def } }
+%% 
+%%
+%% End of file `ctex-fontset-windows.def'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def
new file mode 100644
index 00000000000..6bb86a25055
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def
@@ -0,0 +1,102 @@
+%%
+%% This is file `ctex-fontset-windowsnew.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ctex.dtx  (with options: `fontset,windowsnew')
+%% 
+%%     Copyright (C) 2003--2015
+%%     CTEX.ORG and any individual authors listed in the documentation.
+%% ------------------------------------------------------------------------------
+%% 
+%%     This work may be distributed and/or modified under the
+%%     conditions of the LaTeX Project Public License, either
+%%     version 1.3c of this license or (at your option) any later
+%%     version. This version of this license is in
+%%        http://www.latex-project.org/lppl/lppl-1-3c.txt
+%%     and the latest version of this license is in
+%%        http://www.latex-project.org/lppl.txt
+%%     and version 1.3 or later is part of all distributions of
+%%     LaTeX version 2005/12/01 or later.
+%% 
+%%     This work has the LPPL maintenance status `maintained'.
+%% 
+%%     The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% 
+%% ------------------------------------------------------------------------------
+%% 
+\GetIdInfo$Id: ctex.dtx 3d246c0 2015-05-11 23:20:45 +0800 Qing Lee <sobenlee@gmail.com> $
+  {Windows fonts definition for Vista or later version (CTEX)}
+\ProvidesExplFile{ctex-fontset-windowsnew.def}
+  {\ExplFileDate}{2.0}{\ExplFileDescription}
+\pdftex_if_engine:TF
+  {
+    \ctex_zhmap_case:nnn
+      {
+        \ctex_punct_set:n { windows }
+        \setCJKmainfont
+          [ BoldFont = simhei.ttf , ItalicFont = simkai.ttf ] { simsun.ttc }
+        \file_if_exist:nTF { C:/Windows/Fonts/msyh.ttc }
+          {
+            \setCJKsansfont [ BoldFont = msyhbd.ttc ] { msyh.ttc }
+            \setCJKfamilyfont { zhyahei }
+              [ BoldFont = msyhbd.ttc ] { msyh.ttc }
+          }
+          {
+            \setCJKsansfont [ BoldFont = msyhbd.ttf ] { msyh.ttf }
+            \setCJKfamilyfont { zhyahei }
+              [ BoldFont = msyhbd.ttf ] { msyh.ttf }
+          }
+        \ctex_punct_map_family:nn { \CJKsfdefault } { zhyahei }
+        \ctex_punct_map_bfseries:nn { \CJKsfdefault , zhyahei } { zhyaheib }
+        \setCJKmonofont { simfang.ttf }
+        \setCJKfamilyfont { zhkai }  { simkai.ttf }
+        \setCJKfamilyfont { zhfs }   { simfang.ttf }
+        \setCJKfamilyfont { zhsong } { simsun.ttc }
+        \setCJKfamilyfont { zhhei }  { simhei.ttf }
+        \setCJKfamilyfont { zhli }   { simli.ttf }
+        \setCJKfamilyfont { zhyou }  { simyou.ttf }
+        \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+        \ctex_punct_map_family:nn { \CJKttdefault } { zhfs }
+        \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
+        \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
+      }
+      {
+        \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhwindowsfonts }
+        \ctex_punct_set:n { windows }
+        \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+        \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
+        \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
+      }
+      {
+        \tl_set:Nn \CJKrmdefault { rm }
+        \tl_set:Nn \CJKsfdefault { sf }
+        \tl_set:Nn \CJKttdefault { tt }
+      }
+  }
+  {
+    \setCJKmainfont
+      [ BoldFont = SimHei , ItalicFont = KaiTi ] { SimSun }
+    \setCJKsansfont
+      [ BoldFont = { *~Bold } ] { Microsoft~YaHei }
+    \setCJKmonofont { FangSong }
+    \setCJKfamilyfont { zhkai } { KaiTi }
+    \setCJKfamilyfont { zhfs }  { FangSong }
+    \setCJKfamilyfont { zhsong }  { SimSun }
+    \setCJKfamilyfont { zhhei }   { SimHei }
+    \setCJKfamilyfont { zhli }    { LiSu }
+    \setCJKfamilyfont { zhyou }   { YouYuan }
+    \setCJKfamilyfont { zhyahei }
+      [ BoldFont = { *~Bold } ] { Microsoft~YaHei }
+  }
+\NewDocumentCommand \songti   { } { \CJKfamily { zhsong } }
+\NewDocumentCommand \heiti    { } { \CJKfamily { zhhei } }
+\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
+\NewDocumentCommand \kaishu   { } { \CJKfamily { zhkai } }
+\NewDocumentCommand \lishu    { } { \CJKfamily { zhli } }
+\NewDocumentCommand \youyuan  { } { \CJKfamily { zhyou } }
+\NewDocumentCommand \yahei    { } { \CJKfamily { zhyahei } }
+%% 
+%%
+%% End of file `ctex-fontset-windowsnew.def'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def
new file mode 100644
index 00000000000..f54ba84976a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def
@@ -0,0 +1,87 @@
+%%
+%% This is file `ctex-fontset-windowsold.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% ctex.dtx  (with options: `fontset,windowsold')
+%% 
+%%     Copyright (C) 2003--2015
+%%     CTEX.ORG and any individual authors listed in the documentation.
+%% ------------------------------------------------------------------------------
+%% 
+%%     This work may be distributed and/or modified under the
+%%     conditions of the LaTeX Project Public License, either
+%%     version 1.3c of this license or (at your option) any later
+%%     version. This version of this license is in
+%%        http://www.latex-project.org/lppl/lppl-1-3c.txt
+%%     and the latest version of this license is in
+%%        http://www.latex-project.org/lppl.txt
+%%     and version 1.3 or later is part of all distributions of
+%%     LaTeX version 2005/12/01 or later.
+%% 
+%%     This work has the LPPL maintenance status `maintained'.
+%% 
+%%     The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang.
+%% 
+%% ------------------------------------------------------------------------------
+%% 
+\GetIdInfo$Id: ctex.dtx 3d246c0 2015-05-11 23:20:45 +0800 Qing Lee <sobenlee@gmail.com> $
+  {Windows fonts definition for XP or earlier version (CTEX)}
+\ProvidesExplFile{ctex-fontset-windowsold.def}
+  {\ExplFileDate}{2.0}{\ExplFileDescription}
+\pdftex_if_engine:TF
+  {
+    \ctex_zhmap_case:nnn
+      {
+        \ctex_punct_set:n { windows }
+        \setCJKmainfont
+          [ BoldFont = simhei.ttf , ItalicFont = simkai.ttf ] { simsun.ttc }
+        \setCJKsansfont { simhei.ttf }
+        \ctex_punct_map_family:nn { \CJKsfdefault } { zhhei }
+        \setCJKmonofont { simfang.ttf }
+        \setCJKfamilyfont { zhkai }  { simkai.ttf }
+        \setCJKfamilyfont { zhfs }   { simfang.ttf }
+        \setCJKfamilyfont { zhsong } { simsun.ttc }
+        \setCJKfamilyfont { zhhei }  { simhei.ttf }
+        \setCJKfamilyfont { zhli }   { simli.ttf }
+        \setCJKfamilyfont { zhyou }  { simyou.ttf }
+        \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+        \ctex_punct_map_family:nn { \CJKttdefault } { zhfs }
+        \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
+        \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
+      }
+      {
+        \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhwindowsfonts }
+        \ctex_punct_set:n { windows }
+        \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong }
+        \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei }
+        \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai }
+      }
+      {
+        \tl_set:Nn \CJKrmdefault { rm }
+        \tl_set:Nn \CJKsfdefault { sf }
+        \tl_set:Nn \CJKttdefault { tt }
+      }
+  }
+  {
+    \setCJKmainfont
+      [ BoldFont = SimHei , ItalicFont = KaiTi_GB2312 ] { SimSun }
+    \setCJKsansfont { SimHei }
+    \setCJKmonofont { FangSong_GB2312 }
+    \setCJKfamilyfont { zhkai } { KaiTi_GB2312 }
+    \setCJKfamilyfont { zhfs }  { FangSong_GB2312 }
+    \setCJKfamilyfont { zhsong }  { SimSun }
+    \setCJKfamilyfont { zhhei }   { SimHei }
+    \setCJKfamilyfont { zhli }    { LiSu }
+    \setCJKfamilyfont { zhyou }   { YouYuan }
+  }
+\NewDocumentCommand \songti   { } { \CJKfamily { zhsong } }
+\NewDocumentCommand \heiti    { } { \CJKfamily { zhhei } }
+\NewDocumentCommand \fangsong { } { \CJKfamily { zhfs } }
+\NewDocumentCommand \kaishu   { } { \CJKfamily { zhkai } }
+\NewDocumentCommand \lishu    { } { \CJKfamily { zhli } }
+\NewDocumentCommand \youyuan  { } { \CJKfamily { zhyou } }
+%% 
+%%
+%% End of file `ctex-fontset-windowsold.def'.
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-adobefonts.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-adobefonts.def
deleted file mode 100644
index bb2a03bed92..00000000000
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-adobefonts.def
+++ /dev/null
@@ -1,21 +0,0 @@
-% ctex-xecjk-adobefonts.def: Adobe 的 xeCJK 字体设置，为 Adobe 的四套字体
-% vim:ft=tex
-
-\setCJKmainfont[BoldFont=Adobe Heiti Std,ItalicFont=Adobe Kaiti Std]
-  {Adobe Song Std}
-\setCJKsansfont{Adobe Heiti Std}
-\setCJKmonofont{Adobe Fangsong Std}
-
-\setCJKfamilyfont{zhsong}{Adobe Song Std}
-\setCJKfamilyfont{zhhei}{Adobe Heiti Std}
-\setCJKfamilyfont{zhfs}{Adobe Fangsong Std}
-\setCJKfamilyfont{zhkai}{Adobe Kaiti Std}
-
-\newcommand*{\songti}{\CJKfamily{zhsong}} % 宋体
-\newcommand*{\heiti}{\CJKfamily{zhhei}}   % 黑体
-\newcommand*{\kaishu}{\CJKfamily{zhkai}}  % 楷书
-\newcommand*{\fangsong}{\CJKfamily{zhfs}} % 仿宋
-\newcommand*{\lishu}{\CJKfamily{zhli}}    % 隶书
-\newcommand*{\youyuan}{\CJKfamily{zhyou}} % 幼圆
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-winfonts.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-winfonts.def
deleted file mode 100644
index a4eaeed7621..00000000000
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-winfonts.def
+++ /dev/null
@@ -1,23 +0,0 @@
-% ctex-xecjk-winfonts.def: Windows 的 xeCJK 字体设置，默认为六种中易字体
-% vim:ft=tex
-
-\setCJKmainfont[BoldFont={SimHei},ItalicFont={[SIMKAI.TTF]}]
-  {SimSun}
-\setCJKsansfont{SimHei}
-\setCJKmonofont{[SIMFANG.TTF]}
-
-\setCJKfamilyfont{zhsong}{SimSun}
-\setCJKfamilyfont{zhhei}{SimHei}
-\setCJKfamilyfont{zhkai}{[SIMKAI.TTF]}
-\setCJKfamilyfont{zhfs}{[SIMFANG.TTF]}
-% \setCJKfamilyfont{zhli}{LiSu}
-% \setCJKfamilyfont{zhyou}{YouYuan}
-
-\newcommand*{\songti}{\CJKfamily{zhsong}} % 宋体
-\newcommand*{\heiti}{\CJKfamily{zhhei}}   % 黑体
-\newcommand*{\kaishu}{\CJKfamily{zhkai}}  % 楷书
-\newcommand*{\fangsong}{\CJKfamily{zhfs}} % 仿宋
-% \newcommand*{\lishu}{\CJKfamily{zhli}}    % 隶书
-% \newcommand*{\youyuan}{\CJKfamily{zhyou}} % 幼圆
-
-\endinput