ctex

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

43 files changed, 109 insertions, 114 deletions

diff --git a/Master/texmf-dist/doc/latex/ctex/ctex.pdf b/Master/texmf-dist/doc/latex/ctex/ctex.pdf
index 6a53a1ad6f2..caf11940a3d 100644
--- a/Master/texmf-dist/doc/latex/ctex/ctex.pdf
+++ b/Master/texmf-dist/doc/latex/ctex/ctex.pdf
diff --git a/Master/texmf-dist/source/latex/ctex/ctex.dtx b/Master/texmf-dist/source/latex/ctex/ctex.dtx
index 1dc5f1d9e2e..af7f077cb5b 100644
--- a/Master/texmf-dist/source/latex/ctex/ctex.dtx
+++ b/Master/texmf-dist/source/latex/ctex/ctex.dtx
@@ -460,7 +460,7 @@ This package consists of the file ctex.dtx, and the derived files
 %<founder>\ProvidesExplFile{ctex-fontset-founder.def}
 %<ubuntu>  {Ubuntu fonts definition (CTEX)}
 %<ubuntu>\ProvidesExplFile{ctex-fontset-ubuntu.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 %</!(c19|c70|ctexspa)>
 %<rm&c19>\ProvidesFile{c19rm.fd}%
 %<sf&c19>\ProvidesFile{c19sf.fd}%
@@ -469,8 +469,8 @@ This package consists of the file ctex.dtx, and the derived files
 %<sf&c70>\ProvidesFile{c70sf.fd}%
 %<tt&c70>\ProvidesFile{c70tt.fd}%
 %<ctexspa>\ProvidesFile{ctexspa.def}%
-%<c19|c70>  [2015/05/15 v2.0.1 Chinese font definition (CTEX)]
-%<ctexspa>  [2015/05/15 v2.0.1 Space info for CJKpunct (CTEX)]
+%<c19|c70>  [2015/05/15 v2.0.2 Chinese font definition (CTEX)]
+%<ctexspa>  [2015/05/15 v2.0.2 Space info for CJKpunct (CTEX)]
 %</!(readme|install|zhmap|spa)>
 %<*driver>
 \ExplSyntaxOff
@@ -721,7 +721,7 @@ This package consists of the file ctex.dtx, and the derived files
 % \changes{v2.0}{2014/03/12}{删除 \file{c19gbsn.fd} 和 \file{c19gkai.fd}。}
 %
 %
-% \CheckSum{4371}
+% \CheckSum{4369}
 %
 % \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
@@ -1324,7 +1324,9 @@ This package consists of the file ctex.dtx, and the derived files
 %       在 \opt{heading = true} 的情况下^^A
 %       \footnote{使用 \CTeX{} 文档类，或者使用 \pkg{ctex} 宏包且开启该选项时。}^^A
 %       （\ref{subs:options-heading}~节），还会将章节标题的风格修改为
-%       中文样式（见 \ref{sec:secstyle}~节）。
+%       中文样式（见 \ref{sec:secstyle}~节）。当 \pkg{ctex} 宏包与标准文档类及其
+%       衍生文档类联用时，会载入 \pkg{indentfirst} 宏包，
+%       以实现章节标题后的段首缩进。
 %     \item[plain] 不调整默认字号和行距，不会汉化文档中的标题名字，也不会将章节标题风格
 %       修改为中文样式，同时不会 \tn{pagestyle}，并禁用 \opt{autoindent}
 %       选项。事实上，此时的 \CTeX{} 套件只提供了中文支持功能，而不对文章版式进行任何修改。
@@ -2529,7 +2531,9 @@ This package consists of the file ctex.dtx, and the derived files
 % \end{function}
 %
 % \begin{function}{indent, noindent}
-% 使用 \opt{indent} 宏包选项会载入 \pkg{indentfirst} 宏包。过时选项。
+% \opt{indent} 什么也不做，\pkg{ctex} 宏包的相关功能在与标准文档类及其衍生
+% 文档类联用时默认打开；\CTeX{} 文档类的相关功能由章节
+% \opt{beforeskip} 选项的值来确定。过时选项。
 %
 % \opt{noindent} 什么也不做，也不会使章节首行停止缩进。需要使用 \tn{ctexset}
 % 命令设置章节的 \opt{beforeskip} 选项为正数才能完成原来 \opt{noindent} 选项的
@@ -3221,12 +3225,10 @@ This package consists of the file ctex.dtx, and the derived files
       {
         \msg_warning:nnn { ctex } { deprecated-option }
           {
-            The~ indentfirst~ package~ will~ be~ loaded~ but~ the~
-            functionality~ may~ be~ removed~ in~ later~ version.
+            The~ functionality~ has~ been~ removed.~
             It's~ better~ to~ set~ the~ heading~ styles~ via~ beforeskip~
             options.~
           }
-        \keys_set:nn { ctex / option } { autoindent = true }
       } ,
     indent .value_forbidden: ,
     noindent .code:n =
@@ -3237,7 +3239,6 @@ This package consists of the file ctex.dtx, and the derived files
             It's~ better~ to~ set~ the~ heading~ styles~ via~ beforeskip~
             options.
           }
-        \keys_set:nn { ctex / option } { autoindent = false }
       } ,
     noindent .value_forbidden: ,
 %    \end{macrocode}
@@ -6019,11 +6020,6 @@ This package consists of the file ctex.dtx, and the derived files
 %    \end{macrocode}
 % \end{macro}
 %
-%    \begin{macrocode}
-\bool_if:NT \l_@@_indent_bool
-  { \RequirePackage { indentfirst } }
-%    \end{macrocode}
-%
 % \subsection{中文数字与日期}
 %
 %    \begin{macrocode}
@@ -7084,6 +7080,20 @@ This package consists of the file ctex.dtx, and the derived files
   { \keys_set:nn { ctex } { autoindent = true } }
 %    \end{macrocode}
 %
+% \changes{v2.0.2}{2015/05/16}{修复加载 \pkg{ctex} 宏包后章节标题后第一段
+% 无段首缩进的问题}
+% 若 \pkg{ctex} 宏包与标准文档类及其衍生文档类联用，则将载入 \pkg{indentfirst} 宏包，
+% 实现章节标题后首个段落的段首缩进。
+%    \begin{macrocode}
+%<*!(article|book|report)>
+\clist_map_inline:nn { article , book , report }
+  {
+    \@ifclassloaded {#1}
+      { \RequirePackage{ indentfirst } } { }
+  }
+%</!(article|book|report)>
+%    \end{macrocode}
+%
 %    \begin{macrocode}
 %</scheme&chinese>
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg
index b582ccd7480..fe33f135e5d 100644
--- a/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg
+++ b/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Caption with encoding GBK (CTEX)}
 \ProvidesExplFile{ctex-name-gbk.cfg}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \keys_set:nn { ctex }
   {
     contentsname   = Ŀ¼ ,
diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
index 2b029e025d5..4f86d6bebf7 100644
--- a/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
+++ b/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Caption with encoding UTF8 (CTEX)}
 \ProvidesExplFile{ctex-name-utf8.cfg}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \keys_set:nn { ctex }
   {
     contentsname   = 目录 ,
diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
index 872bd434a28..1c91052f246 100644
--- a/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
+++ b/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Configuration file (CTEX)}
 \ProvidesExplFile{\ExplFileName.cfg}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 %%
 %% 
 %%
diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
index 0f161f749ee..be98a7d9e94 100644
--- a/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
+++ b/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Option configuration file (CTEX)}
 \ProvidesExplFile{ctexopts.cfg}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 %%
 %% \keys_set:nn { ctex / option } { fontset = windowsnew }
 %% 
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-article.def b/Master/texmf-dist/tex/latex/ctex/ctex-article.def
index 66c3a913935..ba0af7ce82d 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex-article.def
+++ b/Master/texmf-dist/tex/latex/ctex/ctex-article.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Heading modification for article (CTEX)}
 \ProvidesExplFile{ctex-article.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \seq_new:N \c__ctex_headings_seq
 \seq_gset_from_clist:Nn \c__ctex_headings_seq
   {
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-book.def b/Master/texmf-dist/tex/latex/ctex/ctex-book.def
index 9f6ade49c39..82bd4be7ebb 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex-book.def
+++ b/Master/texmf-dist/tex/latex/ctex/ctex-book.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Heading modification for book (CTEX)}
 \ProvidesExplFile{ctex-book.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \seq_new:N \c__ctex_headings_seq
 \seq_gset_from_clist:Nn \c__ctex_headings_seq
   {
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo b/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
index 1426eb3117f..d77593121a1 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
+++ b/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {c5size option (CTEX)}
 \ProvidesExplFile{ctex-c5size.clo}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \ctex_set_font_size:Nnn \normalsize { 5 }
   {
     \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo b/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
index 1ed36643ee1..a93c92bae43 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
+++ b/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {cs4size option (CTEX)}
 \ProvidesExplFile{ctex-cs4size.clo}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \ctex_set_font_size:Nnn \normalsize { -4 }
   {
     \abovedisplayskip 12\p@ \@plus3\p@ \@minus7\p@
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-report.def b/Master/texmf-dist/tex/latex/ctex/ctex-report.def
index 67529157baa..ed27e9c8adb 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex-report.def
+++ b/Master/texmf-dist/tex/latex/ctex/ctex-report.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Heading modification for report (CTEX)}
 \ProvidesExplFile{ctex-report.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \seq_new:N \c__ctex_headings_seq
 \seq_gset_from_clist:Nn \c__ctex_headings_seq
   {
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex.sty b/Master/texmf-dist/tex/latex/ctex/ctex.sty
index 7bb1ca34d9a..c7201874053 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctex.sty
@@ -28,10 +28,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Chinese adapter in LaTeX (CTEX)}
 \ProvidesExplPackage{\ExplFileName}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \RequirePackage { xparse , l3keys2e }
 \RequirePackage { etoolbox , ifpdf , fix-cm , everysel }
 \tl_new:N \l__ctex_tmp_tl
@@ -279,12 +279,10 @@
       {
         \msg_warning:nnn { ctex } { deprecated-option }
           {
-            The~ indentfirst~ package~ will~ be~ loaded~ but~ the~
-            functionality~ may~ be~ removed~ in~ later~ version.
+            The~ functionality~ has~ been~ removed.~
             It's~ better~ to~ set~ the~ heading~ styles~ via~ beforeskip~
             options.~
           }
-        \keys_set:nn { ctex / option } { autoindent = true }
       } ,
     indent .value_forbidden: ,
     noindent .code:n =
@@ -295,7 +293,6 @@
             It's~ better~ to~ set~ the~ heading~ styles~ via~ beforeskip~
             options.
           }
-        \keys_set:nn { ctex / option } { autoindent = false }
       } ,
     noindent .value_forbidden: ,
     GBK  .code:n = { \tl_set:Nn \l__ctex_encoding_tl { GBK } } ,
@@ -623,8 +620,6 @@
       { \parindent is~ set~ to~ 0pt. }
     \dim_zero:N \parindent
   }
-\bool_if:NT \l__ctex_indent_bool
-  { \RequirePackage { indentfirst } }
 \PassOptionsToPackage { encoding = \l__ctex_encoding_tl } { zhnumber }
 \RequirePackage { zhnumber }
 \cs_new_eq:NN \chinese \zhnum
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexart.cls b/Master/texmf-dist/tex/latex/ctex/ctexart.cls
index c5729625677..ed34c9d861a 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexart.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexart.cls
@@ -28,10 +28,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Chinese adapter for class article (CTEX)}
 \ProvidesExplClass{ctexart}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \RequirePackage { xparse , l3keys2e }
 \msg_new:nnnn { ctex } { l3-too-old }
   { Support~package~`#1'~too~old. }
@@ -291,12 +291,10 @@
       {
         \msg_warning:nnn { ctex } { deprecated-option }
           {
-            The~ indentfirst~ package~ will~ be~ loaded~ but~ the~
-            functionality~ may~ be~ removed~ in~ later~ version.
+            The~ functionality~ has~ been~ removed.~
             It's~ better~ to~ set~ the~ heading~ styles~ via~ beforeskip~
             options.~
           }
-        \keys_set:nn { ctex / option } { autoindent = true }
       } ,
     indent .value_forbidden: ,
     noindent .code:n =
@@ -307,7 +305,6 @@
             It's~ better~ to~ set~ the~ heading~ styles~ via~ beforeskip~
             options.
           }
-        \keys_set:nn { ctex / option } { autoindent = false }
       } ,
     noindent .value_forbidden: ,
     GBK  .code:n = { \tl_set:Nn \l__ctex_encoding_tl { GBK } } ,
@@ -645,8 +642,6 @@
       { \parindent is~ set~ to~ 0pt. }
     \dim_zero:N \parindent
   }
-\bool_if:NT \l__ctex_indent_bool
-  { \RequirePackage { indentfirst } }
 \PassOptionsToPackage { encoding = \l__ctex_encoding_tl } { zhnumber }
 \RequirePackage { zhnumber }
 \cs_new_eq:NN \chinese \zhnum
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
index 44f864c0dc1..9c713e37a3f 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
@@ -28,10 +28,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Chinese adapter for class book (CTEX)}
 \ProvidesExplClass{ctexbook}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \RequirePackage { xparse , l3keys2e }
 \msg_new:nnnn { ctex } { l3-too-old }
   { Support~package~`#1'~too~old. }
@@ -291,12 +291,10 @@
       {
         \msg_warning:nnn { ctex } { deprecated-option }
           {
-            The~ indentfirst~ package~ will~ be~ loaded~ but~ the~
-            functionality~ may~ be~ removed~ in~ later~ version.
+            The~ functionality~ has~ been~ removed.~
             It's~ better~ to~ set~ the~ heading~ styles~ via~ beforeskip~
             options.~
           }
-        \keys_set:nn { ctex / option } { autoindent = true }
       } ,
     indent .value_forbidden: ,
     noindent .code:n =
@@ -307,7 +305,6 @@
             It's~ better~ to~ set~ the~ heading~ styles~ via~ beforeskip~
             options.
           }
-        \keys_set:nn { ctex / option } { autoindent = false }
       } ,
     noindent .value_forbidden: ,
     GBK  .code:n = { \tl_set:Nn \l__ctex_encoding_tl { GBK } } ,
@@ -645,8 +642,6 @@
       { \parindent is~ set~ to~ 0pt. }
     \dim_zero:N \parindent
   }
-\bool_if:NT \l__ctex_indent_bool
-  { \RequirePackage { indentfirst } }
 \PassOptionsToPackage { encoding = \l__ctex_encoding_tl } { zhnumber }
 \RequirePackage { zhnumber }
 \cs_new_eq:NN \chinese \zhnum
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
index ce7c9cd9861..840c30bcb31 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
@@ -28,10 +28,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Chinese adapter in LaTeX (CTEX)}
 \ProvidesExplPackage{ctexcap}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \PassOptionsToPackage { heading = true } { ctexcap }
 \RequirePackageWithOptions { ctex }
 %% 
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
index 48bc457a0a4..d32a3d7e999 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
@@ -28,10 +28,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Chinese adapter for class report (CTEX)}
 \ProvidesExplClass{ctexrep}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \RequirePackage { xparse , l3keys2e }
 \msg_new:nnnn { ctex } { l3-too-old }
   { Support~package~`#1'~too~old. }
@@ -291,12 +291,10 @@
       {
         \msg_warning:nnn { ctex } { deprecated-option }
           {
-            The~ indentfirst~ package~ will~ be~ loaded~ but~ the~
-            functionality~ may~ be~ removed~ in~ later~ version.
+            The~ functionality~ has~ been~ removed.~
             It's~ better~ to~ set~ the~ heading~ styles~ via~ beforeskip~
             options.~
           }
-        \keys_set:nn { ctex / option } { autoindent = true }
       } ,
     indent .value_forbidden: ,
     noindent .code:n =
@@ -307,7 +305,6 @@
             It's~ better~ to~ set~ the~ heading~ styles~ via~ beforeskip~
             options.
           }
-        \keys_set:nn { ctex / option } { autoindent = false }
       } ,
     noindent .value_forbidden: ,
     GBK  .code:n = { \tl_set:Nn \l__ctex_encoding_tl { GBK } } ,
@@ -645,8 +642,6 @@
       { \parindent is~ set~ to~ 0pt. }
     \dim_zero:N \parindent
   }
-\bool_if:NT \l__ctex_indent_bool
-  { \RequirePackage { indentfirst } }
 \PassOptionsToPackage { encoding = \l__ctex_encoding_tl } { zhnumber }
 \RequirePackage { zhnumber }
 \cs_new_eq:NN \chinese \zhnum
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
index 6265e9f0589..575169b7625 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
@@ -28,10 +28,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Chinese font size definition (CTEX)}
 \ProvidesExplPackage{ctexsize}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \RequirePackage { xparse , l3keys2e }
 \cs_new_eq:NN \g__ctex_font_size_flag \c_minus_one
 \keys_define:nn { ctex / option }
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexspa.def b/Master/texmf-dist/tex/latex/ctex/ctexspa.def
index e488b666b7e..3f5c6a67a98 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexspa.def
+++ b/Master/texmf-dist/tex/latex/ctex/ctexspa.def
@@ -28,7 +28,7 @@
 %% ------------------------------------------------------------------------------
 %% 
 \ProvidesFile{ctexspa.def}%
-  [2015/05/15 v2.0.1 Space info for CJKpunct (CTEX)]
+  [2015/05/15 v2.0.2 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,,,}
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
index 9ef5b899e6a..04434db1c8b 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {LuaLaTeX adapter (CTEX)}
 \ProvidesExplFile{ctex-engine-luatex.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \msg_new:nnn { ctex } { luatexja-loaded }
   {
     Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
index 282098cb89d..acaafe40e19 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {(pdf)LaTeX adapter (CTEX)}
 \ProvidesExplFile{ctex-engine-pdftex.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \if_bool:N \g__ctex_zhmCJK_bool
   \PassOptionsToPackage { encoding = \l__ctex_encoding_tl } { zhmCJK }
   \RequirePackage { zhmCJK }
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
index 06508ccd193..138f0e14797 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {XeLaTeX adapter (CTEX)}
 \ProvidesExplFile{ctex-engine-xetex.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \RequirePackage { xeCJK }
 \exp_args:Nx \xeCJKsetup
   {
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd b/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
index 94581a1cc51..a2f2a1b9831 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
@@ -27,7 +27,7 @@
 %% ------------------------------------------------------------------------------
 %% 
 \ProvidesFile{c19rm.fd}%
-  [2015/05/15 v2.0.1 Chinese font definition (CTEX)]
+  [2015/05/15 v2.0.2 Chinese font definition (CTEX)]
 %%
 %% Chinese characters
 %%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd b/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
index 56ced0bca55..ddd788a1e39 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
@@ -27,7 +27,7 @@
 %% ------------------------------------------------------------------------------
 %% 
 \ProvidesFile{c19sf.fd}%
-  [2015/05/15 v2.0.1 Chinese font definition (CTEX)]
+  [2015/05/15 v2.0.2 Chinese font definition (CTEX)]
 %%
 %% Chinese characters
 %%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd b/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
index a2b35b4609f..dc38700e6bc 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
@@ -27,7 +27,7 @@
 %% ------------------------------------------------------------------------------
 %% 
 \ProvidesFile{c19tt.fd}%
-  [2015/05/15 v2.0.1 Chinese font definition (CTEX)]
+  [2015/05/15 v2.0.2 Chinese font definition (CTEX)]
 %%
 %% Chinese characters
 %%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd b/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
index 05c1cd613a1..263726b5cff 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
@@ -27,7 +27,7 @@
 %% ------------------------------------------------------------------------------
 %% 
 \ProvidesFile{c70rm.fd}%
-  [2015/05/15 v2.0.1 Chinese font definition (CTEX)]
+  [2015/05/15 v2.0.2 Chinese font definition (CTEX)]
 %%
 %% Chinese characters
 %%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd b/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
index f35d67b7a9a..198ceb4f04f 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
@@ -27,7 +27,7 @@
 %% ------------------------------------------------------------------------------
 %% 
 \ProvidesFile{c70sf.fd}%
-  [2015/05/15 v2.0.1 Chinese font definition (CTEX)]
+  [2015/05/15 v2.0.2 Chinese font definition (CTEX)]
 %%
 %% Chinese characters
 %%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd b/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
index 4d3a811f3df..a1a2a6fb968 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
@@ -27,7 +27,7 @@
 %% ------------------------------------------------------------------------------
 %% 
 \ProvidesFile{c70tt.fd}%
-  [2015/05/15 v2.0.1 Chinese font definition (CTEX)]
+  [2015/05/15 v2.0.2 Chinese font definition (CTEX)]
 %%
 %% Chinese characters
 %%
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
index 3c3ef8c410f..801dacb47f1 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Adobe fonts definition (CTEX)}
 \ProvidesExplFile{ctex-fontset-adobe.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \pdftex_if_engine:TF
   {
     \ctex_if_pdfmode:TF
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
index e9fd742f5ae..90d7e04c293 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Fandol fonts definition (CTEX)}
 \ProvidesExplFile{ctex-fontset-fandol.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \pdftex_if_engine:TF
   {
     \ctex_if_pdfmode:TF
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
index 1933ca9bb90..cbf9434afd2 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Founder fonts definition (CTEX)}
 \ProvidesExplFile{ctex-fontset-founder.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \pdftex_if_engine:TF
   {
     \ctex_zhmap_case:nnn
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
index 4770d673ecc..a8038e84f00 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Mac OS X fonts definition (CTEX)}
 \ProvidesExplFile{ctex-fontset-mac.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \pdftex_if_engine:TF
   { \ctex_fontset_error:n { mac } }
   {
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
index fc3c335c2f2..0c930c754b3 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Ubuntu fonts definition (CTEX)}
 \ProvidesExplFile{ctex-fontset-ubuntu.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \pdftex_if_engine:TF
   {
     \ctex_zhmap_case:nnn
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
index 4f8ea3754ff..f3b7dfb6b47 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Windows fonts definition (CTEX)}
 \ProvidesExplFile{ctex-fontset-windows.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \file_if_exist:nTF { C:/boot.ini }
   { \ctex_file_input:n { ctex-fontset-windowsold.def } }
   { \ctex_file_input:n { ctex-fontset-windowsnew.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
index 2de49ce8ccf..2a00e97336c 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Windows fonts definition for Vista or later version (CTEX)}
 \ProvidesExplFile{ctex-fontset-windowsnew.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \pdftex_if_engine:TF
   {
     \ctex_zhmap_case:nnn
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
index f1e1ac3f184..1a45fc950c4 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Windows fonts definition for XP or earlier version (CTEX)}
 \ProvidesExplFile{ctex-fontset-windowsold.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \pdftex_if_engine:TF
   {
     \ctex_zhmap_case:nnn
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def
index 3fed0bae054..3a0fa752e60 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Chinese scheme for article (CTEX)}
 \ProvidesExplFile{ctex-scheme-chinese-article.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \keys_set:nn { ctex / part }
   {
     nameformat  = \Large \bfseries ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def
index b7a282352c4..d44baaf59f3 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Chinese scheme for book (CTEX)}
 \ProvidesExplFile{ctex-scheme-chinese-book.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \keys_set:nn { ctex / part }
   {
     format      = \centering ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
index 43fed40d35a..0b723c70b6d 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Chinese scheme for report (CTEX)}
 \ProvidesExplFile{ctex-scheme-chinese-report.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \keys_set:nn { ctex / part }
   {
     format      = \centering ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
index 86e0f604621..fbe8be476d4 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Chinese scheme for generic (CTEX)}
 \ProvidesExplFile{ctex-scheme-chinese.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \str_if_eq:onTF { \l__ctex_encoding_tl } { GBK }
   { \ctex_file_input:n { ctex-name-gbk.cfg } }
   { \ctex_file_input:n { ctex-name-utf8.cfg } }
@@ -40,6 +40,11 @@
   { \keys_set:nn { ctex / option } { linespread = 1.3 } }
 \ctex_if_autoindent_touched:F
   { \keys_set:nn { ctex } { autoindent = true } }
+\clist_map_inline:nn { article , book , report }
+  {
+    \@ifclassloaded {#1}
+      { \RequirePackage{ indentfirst } } { }
+  }
 %% 
 %%
 %% End of file `ctex-scheme-chinese.def'.
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def
index d8d41ea3829..0596bf66e9e 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Plain scheme for article (CTEX)}
 \ProvidesExplFile{ctex-scheme-plain-article.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \keys_set:nn { ctex / part }
   {
     name        = \partname \space ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def
index b24b11996c5..9f0898b3b42 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Plain scheme for book (CTEX)}
 \ProvidesExplFile{ctex-scheme-plain-book.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \keys_set:nn { ctex / part }
   {
     name        = \partname \space ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
index 24c642a7247..e7fa5adda1e 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Plain scheme for report (CTEX)}
 \ProvidesExplFile{ctex-scheme-plain-report.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 \keys_set:nn { ctex / part }
   {
     name        = \partname \space ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def
index 9728114cd76..ef554f86843 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def
@@ -26,10 +26,10 @@
 %% 
 %% ------------------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 31d1c02 2015-05-15 23:17:05 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 3216ced 2015-05-16 11:29:03 +0800 Qing Lee <sobenlee@gmail.com> $
   {Plain scheme for generic (CTEX)}
 \ProvidesExplFile{ctex-scheme-plain.def}
-  {\ExplFileDate}{2.0.1}{\ExplFileDescription}
+  {\ExplFileDate}{2.0.2}{\ExplFileDescription}
 %% 
 %%
 %% End of file `ctex-scheme-plain.def'.