texlive[59654] Master/texmf-dist: ctex (20jun21)

commits+karl at tug.org commits+karl at tug.org
Sun Jun 20 21:56:11 CEST 2021


Revision: 59654
          http://tug.org/svn/texlive?view=revision&revision=59654
Author:   karl
Date:     2021-06-20 21:56:11 +0200 (Sun, 20 Jun 2021)
Log Message:
-----------
ctex (20jun21)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/ctex/ctex.pdf
    trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx
    trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex
    trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex
    trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex
    trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex
    trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex
    trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.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/ctexbackend.cfg
    trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
    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.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/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/fd/jt2zhrm.fd
    trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd
    trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd
    trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd
    trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd
    trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.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-macnew.def
    trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.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/heading/ctex-heading-article.def
    trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def
    trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def
    trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.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/ctex.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx	2021-06-20 19:56:11 UTC (rev 59654)
@@ -443,7 +443,7 @@
 %<class|style|ctexcap|ctexhook|ctexpatch>\NeedsTeXFormat{LaTeX2e}
 %<class>\input{ctexbackend.cfg}
 %<class|style|ctexcap|ctexhook|ctexpatch>\RequirePackage{expl3}
-%<+!driver>\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+%<+!driver>\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
 %<ctex>  {Chinese adapter in LaTeX (CTEX)}
 %<ctex>\ProvidesExplPackage{\ExplFileName}
 %<ctexsize>  {Chinese font size definition (CTEX)}
@@ -530,7 +530,7 @@
 %<founder>\ProvidesExplFile{ctex-fontset-founder.def}
 %<ubuntu>  {Ubuntu fonts definition (CTEX)}
 %<ubuntu>\ProvidesExplFile{ctex-fontset-ubuntu.def}
-%<!driver>  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+%<!driver>  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 %</!(fd|ctexspa|dict|backend)>
 %<c19&rm>\ProvidesFile{c19rm.fd}%
 %<c19&sf>\ProvidesFile{c19sf.fd}%
@@ -548,10 +548,10 @@
 %<backend>\ProvidesFile{ctexbackend.cfg}%
 %<dict&theorem&GBK>\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
 %<dict&theorem&UTF8>\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
-%<fd>  [2021/03/14 v2.5.6 Chinese font definition (CTEX)]
-%<ctexspa>  [2021/03/14 v2.5.6 Space info for CJKpunct (CTEX)]
-%<backend>  [2021/03/14 v2.5.6 Backend configuration file (CTEX)]
-%<dict&theorem>  [2021/03/14 v2.5.6 Chinese translation for theorem name (CTEX)]
+%<fd>  [2021/06/20 v2.5.7 Chinese font definition (CTEX)]
+%<ctexspa>  [2021/06/20 v2.5.7 Space info for CJKpunct (CTEX)]
+%<backend>  [2021/06/20 v2.5.7 Backend configuration file (CTEX)]
+%<dict&theorem>  [2021/06/20 v2.5.7 Chinese translation for theorem name (CTEX)]
 %</!(driver|readme|install|zhmap|spa|docstrip)>
 %<*driver>
 \documentclass{ctxdoc}
@@ -575,7 +575,7 @@
 % \changes{v2.4.15}{2019/03/23}{同步 \LaTeXiii{} 2019/03/05。}
 % \changes{v2.5.1}{2020/05/02}{\pkg{zhconv} 更名为 \pkg{ctex-zhconv}。}
 %
-% \CheckSum{6335}
+% \CheckSum{6400}
 %
 % \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
@@ -3177,7 +3177,6 @@
 %   \item \pkg{expl3}、\pkg{xparse} 和 \pkg{l3keys2e} 宏包。它们属于 \pkg{l3kernel}
 %   和 \pkg{l3packages} 宏集。
 %   \item \pkg{indentfirst} 宏包,属于 \pkg{tools} 宏集。
-%   \item \pkg{everysel} 宏包,属于 \pkg{ms} 宏集。
 %   \item \pkg{zhnumber} 宏包。
 %   \item[\ding{229}] 以上是各种编译方式都必需的依赖项。
 %   \item \pkg{CJK} 宏集。
@@ -3215,7 +3214,6 @@
 %   \end{itemize}
 %   \item \pkg{fontspec} 宏包。
 %   \item[\ding{229}] 以上是使用 \LuaLaTeX{} 编译时的依赖项。
-%   \item \pkg{pxeverysel} 宏包,属于 \pkg{platex-tools} 宏集。
 %   \item \pkg{zhmetrics-uptex} 宏包。
 %   \item[\ding{229}] 以上是使用 \upLaTeX{} 编译时的依赖项。
 % \end{itemize}
@@ -3294,35 +3292,7 @@
 %<@@=ctex>
 %    \end{macrocode}
 %
-% 宏包载入检查。
 %    \begin{macrocode}
-%<*class|ctex>
-\tl_const:Nx \c_@@_version_tl
-  { \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
-%<*class>
-\cs_new_eq:cN { ver at ctex.        \@pkgextension } \c_@@_version_tl
-\cs_new_eq:cN { ver at ctexcap.     \@pkgextension } \c_@@_version_tl
-\cs_new_eq:cN { ver at ctexsize.    \@pkgextension } \c_@@_version_tl
-\cs_new_eq:cN { ver at ctexheading. \@pkgextension } \c_@@_version_tl
-%</class>
-%<*ctex>
-\msg_new:nnnn { ctex } { subpackage-loaded }
-  { Package~`#1'~can~not~be~loaded~with~`ctex'. }
-  {
-    `#1'~is~actually~a~part~of~`ctex'.\\
-    It~is~not~necessary~to~load~it~separately.
-  }
-\@ifpackageloaded { ctexsize }
-  { \msg_error:nnn { ctex } { subpackage-loaded } { ctexsize } }
-  { \cs_new_eq:cN { ver at ctexsize. \@pkgextension } \c_@@_version_tl }
-\@ifpackageloaded { ctexheading }
-  { \msg_error:nnn { ctex } { subpackage-loaded } { ctexheading } }
-  { \cs_new_eq:cN { ver at ctexheading. \@pkgextension } \c_@@_version_tl }
-%</ctex>
-%</class|ctex>
-%    \end{macrocode}
-%
-%    \begin{macrocode}
 %<*class|style>
 \RequirePackage { xparse , l3keys2e }
 %</class|style>
@@ -3387,9 +3357,36 @@
 %    \begin{macrocode}
 %<!ctexsize>\RequirePackage { ctexhook , ctexpatch }
 %<!ctexheading>\RequirePackage { fix-cm }
+%    \end{macrocode}
+%
+% 宏包载入检查。
+%    \begin{macrocode}
+%<*class|ctex>
+%<*class>
+\ctex_disable_package:n { ctex }
+\ctex_disable_package:n { ctexcap }
+%</class>
+\ctex_disable_package:n { ctexsize }
+\ctex_disable_package:n { ctexheading }
+%</class|ctex>
+%    \end{macrocode}
+%
+% \changes{v2.5.7}{2021/06/04}{兼容 \LaTeX \ 2021/06/01 的字体钩子。}
+%
+% \begin{variable}{\c_@@_everysel_loaded_bool}
+% \LaTeX \ 2021-06-01 以后的版本内建了 \pkg{everysel} 包的功能。
+%    \begin{macrocode}
 %<*!ctexsize>
-%<!ctexheading>\RequirePackage { everysel }
+%<*!ctexheading>
+\ctex_if_format_at_least:nTF { 2021/06/01 }
+  { \bool_const:Nn \c_@@_everysel_loaded_bool { \c_false_bool } }
+  {
+    \RequirePackage { everysel }
+    \bool_const:Nn \c_@@_everysel_loaded_bool { \c_true_bool }
+  }
+%</!ctexheading>
 %    \end{macrocode}
+% \end{variable}
 %
 % \subsection{内部函数与变量}
 %
@@ -3417,7 +3414,6 @@
   { \keys_set:nn { ctex } }
 \cs_new_protected:Npn \ctex_set:nn #1
   { \keys_set:nn { ctex / #1 } }
-%</!ctexsize>
 %    \end{macrocode}
 % \end{macro}
 %
@@ -3425,54 +3421,9 @@
 % \changes{v2.5.4}{2020/08/02}{应用 \pkg{l3cctab}。}
 % \changes{v2.5.5}{2020/10/17}{放弃应用 \pkg{l3cctab}。}
 %
-% \begin{macro}[int]{\ctex_file_input:n}
-% 输入文件,关闭 \LaTeXiii 语法环境,并设置 |@| 为字母类、|^| 为上标和 \tn{endlinechar} 为 $13$。
-%    \begin{macrocode}
-\cs_new_protected:Npn \ctex_file_input:n #1
-  {
-    \ctex_push_file:
-      \file_input:n {#1}
-    \ctex_pop_file:
-  }
-\cs_new_protected:Npn \ctex_push_file:
-  {
-    \seq_gpush:Nx \g_@@_file_status_seq
-      {
-        {
-          \bool_if:NTF \l__kernel_expl_bool
-            { \ExplSyntaxOn }
-            { \ExplSyntaxOff }
-        }
-        { \char_value_catcode:n { 64 } }
-        { \char_value_catcode:n { 94 } }
-        { \int_use:N \tex_endlinechar:D }
-      }
-    \ExplSyntaxOff
-    \char_set_catcode_letter:n { 64 }
-    \char_set_catcode_math_superscript:n { 94 }
-    \int_set:Nn \tex_endlinechar:D { 13 }
-  }
-\cs_new_protected:Npn \ctex_pop_file:
-  {
-    \seq_gpop:NN \g_@@_file_status_seq \l_@@_file_status_tl
-    \exp_after:wN \@@_pop_file_aux:nnnn \l_@@_file_status_tl
-  }
-\cs_new_protected:Npn \@@_pop_file_aux:nnnn #1#2#3#4
-  {
-    #1
-    \char_set_catcode:nn { 64 } {#2}
-    \char_set_catcode:nn { 94 } {#3}
-    \int_set:Nn \tex_endlinechar:D {#4}
-  }
-\tl_new:N \l_@@_file_status_tl
-\seq_new:N \g_@@_file_status_seq
-%    \end{macrocode}
-% \end{macro}
-%
 % \begin{macro}[int]{\ctex_scheme_input:n}
 % 输入 \opt{scheme} 文件。先查找当前文档类下的 \meta{scheme},找不到再查找一般的文件。
 %    \begin{macrocode}
-%<*!ctexsize>
 \cs_new_protected:Npn \ctex_scheme_input:n #1
   {
     \ctex_push_file:
@@ -4142,14 +4093,20 @@
 \cs_new_protected:Npn \ctex_use_zhmap:
   { \tl_use:N \g_@@_zhmap_tl }
 \cs_if_exist:NTF \ctex_gadd_ltxhook:nn
-  { \ctex_gadd_ltxhook:nn { shipout/firstpage } { \ctex_use_zhmap: } }
   {
+    \cs_new_protected:Npn \ctex_at_shipout_first:n
+      { \ctex_gadd_ltxhook:nn { shipout/firstpage } }
+    \ctex_at_shipout_first:n { \ctex_use_zhmap: }
+  }
+  {
     \cs_new_protected:Npn \ctex_add_dvi_zhmap:
       { \AtBeginDvi { \ctex_use_zhmap: } }
     \ctex_after_end_preamble:n { \ctex_add_dvi_zhmap: }
     \ctex_at_end_package:nn { atbegshi }
       {
-        \AtBeginShipoutFirst { \ctex_use_zhmap: }
+        \cs_new_protected:Npn \ctex_at_shipout_first:n
+          { \AtBeginShipoutFirst }
+        \ctex_at_shipout_first:n { \ctex_use_zhmap: }
         \cs_gset_eq:NN \ctex_add_dvi_zhmap: \prg_do_nothing:
       }
   }
@@ -4189,30 +4146,40 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \changes{v2.5.7}{2021/06/06}{更好地兼容 \pkg{cmap} 包。}
+%
 % \begin{macro}[int]{\ctex_add_cmap:n}
+% \changes{v2.5.7}{2021/06/06}{确保 cmap 文件存在。}
 % 给 |#1| 编码的 CJK 字体加上 CMap。
 %    \begin{macrocode}
 \cs_new_protected:Npn \ctex_add_cmap:n #1
   {
     \cs_if_free:NF \CJK at plane
-      { \ctex_add_cmap:cn { @@_add_cmap_ #1 \CJK at plane : } {#1} }
+      { \exp_args:Ne \@@_add_cmap_auxi:n { #1 \CJK at plane } }
   }
-\cs_new_protected:Npn \ctex_add_cmap:Nn #1#2
+\cs_new_protected:Npn \@@_add_cmap_auxi:n #1
+  { \exp_args:Nc \@@_add_cmap_auxii:Nn { @@_add_cmap_ #1 : } {#1} }
+\cs_new_protected:Npn \@@_add_cmap_auxii:Nn #1#2
   {
     \cs_if_exist:NF #1 { \@@_save_cmap:Nn #1 {#2} }
     #1
   }
-\cs_generate_variant:Nn \ctex_add_cmap:Nn { c }
 \cs_new_protected:Npn \@@_save_cmap:Nn #1#2
   {
-    \tl_set:Nx \l_@@_tmp_tl { \str_lowercase:n {#2} \CJK at plane }
-    \tex_immediate:D \tex_pdfobj:D stream ~ file { \l_@@_tmp_tl .cmap }
-    \cs_new_protected:Npx #1
+    \exp_args:Ne \file_get_full_name:nNTF
+      { \str_lowercase:n {#2} .cmap } \l_@@_cmap_file_tl
       {
-        \exp_not:N \tex_pdffontattr:D \exp_not:N \tex_font:D
-          { /ToUnicode ~ \int_use:N \tex_pdflastobj:D \c_space_tl 0 ~ R }
+        \tex_immediate:D \tex_pdfobj:D stream ~ file { \l_@@_cmap_file_tl }
+        \cs_new_protected:Npx #1
+          {
+            \pdfnobuiltintounicode \tex_font:D
+            \tex_pdffontattr:D \tex_font:D
+              { /ToUnicode ~ \int_value:w \tex_pdflastobj:D \c_space_tl 0 ~ R }
+          }
       }
+      { \cs_new_eq:NN #1 \prg_do_nothing: }
   }
+\tl_new:N \l_@@_cmap_file_tl
 %    \end{macrocode}
 % \end{macro}
 %
@@ -4228,7 +4195,10 @@
       { \CTEX at Family@CMap {#1} {#2} }
       {
         \ctex_at_end_package:nn { cmap }
-          { \cs_gset_eq:NN \CTEX at Family@CMap \use_none:nn }
+          {
+            \cs_gset_eq:NN \ctex_add_cmap:n \use_none:n
+            \cs_gset_eq:NN \CTEX at Family@CMap \use_none:nn
+          }
       }
       { \ctex_patch_failure:N \DeclareFontFamily }
   }
@@ -4273,10 +4243,7 @@
 %    \end{macrocode}
 %
 % \begin{macro}[int]{\ctex_CJK_input:n,\CJK at input}
-% \pkg{breqn} 包可能会在正文中将 |^| 的 \tn{catcode} 改为 $12$ 或 $13$,这将
-% 破坏 \pkg{CJK} 对汉字的首字节的定义(\tn{CJK at loadBinding} 和
-% \tn{CJK at loadEncoding})。因此需要确保载入 \file{.enc} 和 \file{.bdg} 文件时,
-% |^| 的 \tn{catcode} 为 $7$。同时要设置 \tn{endlinechar} 为 $-1$。
+% 载入 \pkg{CJK} 包的 \file{.enc} 和 \file{.bdg} 等文件时,需要设置 \tn{endlinechar} 为 $-1$。
 %    \begin{macrocode}
 \cs_new_protected:Npn \ctex_CJK_input:n #1
   {
@@ -4296,30 +4263,46 @@
 % \footnote{\url{https://github.com/CTeX-org/ctex-kit/issues/146}}。
 % 我们在这里给出 \tn{CJK at surr} 的一个不依赖 \tn{uppercase} 的实现。
 %    \begin{macrocode}
-\if_cs_exist:N \CJK at surr
-  \cs_new_protected:Npn \ctex_plane_to_utfxvibe:Nn #1#2
-    {
-      \tl_set:Nx \l_@@_tmp_tl {#2}
-      \int_set:Nn \l_@@_tmp_int
-        { \exp_args:No \int_from_hex:n { \l_@@_tmp_tl } }
-      \int_compare:nNnTF \l_@@_tmp_int < { 256 }
-        { \tl_gset:Nx #1 { \int_to_Hex:n { \l_@@_tmp_int } } }
-        {
-          \int_sub:Nn \l_@@_tmp_int { 256 }
-          \tl_gset:Nx #1
-            {
-              \int_to_Hex:n
-                { \int_div_truncate:nn { \l_@@_tmp_int } { 4 } + "D800 }
-              \int_to_Hex:n
-                { \int_mod:nn { \l_@@_tmp_int } { 4 } + "DC }
-            }
-        }
-    }
-  \cs_set_eq:NN \CJK at surr \ctex_plane_to_utfxvibe:Nn
-\fi:
+\cs_if_free:NF \CJK at surr
+  {
+    \cs_new_protected:Npn \ctex_plane_to_utfxvibe:Nn #1#2
+      {
+        \int_set:Nn \l_@@_tmp_int
+          { \exp_args:Ne \int_from_hex:n {#2} }
+        \int_compare:nNnTF \l_@@_tmp_int < { 256 }
+          { \tl_gset:Nx #1 { \int_to_Hex:n { \l_@@_tmp_int } } }
+          {
+            \int_sub:Nn \l_@@_tmp_int { 256 }
+            \tl_gset:Nx #1
+              {
+                \int_to_Hex:n
+                  { \int_div_truncate:nn { \l_@@_tmp_int } { 4 } + "D800 }
+                \int_to_Hex:n
+                  { \int_mod:nn { \l_@@_tmp_int } { 4 } + "DC }
+              }
+          }
+      }
+    \cs_set_eq:NN \CJK at surr \ctex_plane_to_utfxvibe:Nn
+  }
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}[int]{\CJK at addcmap}
+% \changes{v2.5.7}{2021/06/06}{应用 \tn{pdfnobuiltintounicode}。}
+% \LaTeX \ 2021-06-01 默认载入 \file{glyphtounicode.tex},我们对 CJK 字体禁用这一内建设置。
+%    \begin{macrocode}
+\cs_if_free:NF \CJK at addcmap
+  {
+    \ctex_patch_cmd:Nnn \CJK at addcmap
+      { \pdffontattr \font at name }
+      {
+        \pdfnobuiltintounicode \font at name
+        \pdffontattr \font at name
+      }
+  }
+%    \end{macrocode}
+% \end{macro}
+%
 % \pkg{CJKpunct} 宏包会在 \tn{AtBeginDocument} 的里设置标点格式为 \opt{quanjiao}。
 %    \begin{macrocode}
 \AtBeginDocument
@@ -4565,7 +4548,13 @@
   }
 \@ifpackageloaded { luatexja }
   { \msg_critical:nnx { ctex } { luatexja-loaded } { \g_file_curr_name_str } }
-  { \tl_const:cn { ver at ltj-latex.\@pkgextension } { 9999/99/99 } }
+  {
+    \ctex_at_begin_package:nn { luatexja }
+      { \msg_redirect_name:nnn { ctex } { disable-package } { info } }
+    \ctex_at_end_package:nn { luatexja }
+      { \msg_redirect_name:nnn { ctex } { disable-package } { } }
+    \ctex_disable_package:n { ltj-latex }
+  }
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -4580,6 +4569,13 @@
   { \msg_error:nnn { ctex } { package-too-old } { fontspec } }
 %    \end{macrocode}
 %
+% 引擎文件是通过 \cs{ctex_file_input:n} 载入的,其中的 \tn{catcodetable} 机制会完整恢复
+% 文件载入之前的 \tn{catcode} 状态,在引擎文件中的 \tn{catcode} 设置都无效。
+% 因此,对 \tn{ltjlineendcomment} 的设置要放到文件之外进行。
+%    \begin{macrocode}
+\ctex_at_end:n { \char_set_catcode_comment:n { \ltjlineendcomment } }
+%    \end{macrocode}
+%
 % \paragraph{\pkg{LuaTeX-ja} 的默认设置}
 %
 %    \begin{macrocode}
@@ -6393,7 +6389,8 @@
 % \pkg{everysel} 宏包(2011/10/28)未考虑 \upLaTeX{} 对 \tn{selectfont} 的修
 % 改,需要引入 \pkg{pxeverysel} 宏包。
 %    \begin{macrocode}
-\RequirePackage { pxeverysel }
+\bool_if:NT \c_@@_everysel_loaded_bool
+  { \RequirePackage { pxeverysel } }
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -6580,11 +6577,15 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \changes{v2.5.7}{2021/06/06}{禁用 \dvipdfmx\ 驱动的 \opt{unicode} 书签设置。}
+%
 % 在 \pdfTeX{} 下使用 \texttt{GBK} 编码,\dvipdfmx{} 驱动可以直接用它的
 % \tn{special} 命令,其他模式用 \pkg{xCJK2uni} 宏包处理。使用 \texttt{UTF-8} 编
 % 码时,\pkg{CJKutf8} 已经处理了书签问题,但仍需要设置 \opt{pdfencoding} 为
 % \opt{unicode},目的是在书签的开头写入 BOM (|\376\377|),提示这是
 % \texttt{UTF-16BE} 字节流。
+% \pkg{hyperref} 2021-02-04 版开始默认设置 \opt{unicode} 为 \opt{true},
+% 对于 \dvipdfmx\ 驱动,我们需要禁用这个设置,为此设置 \opt{pdfencoding} 为 \opt{pdfdoc}。
 %    \begin{macrocode}
 %<*pdftex>
 \ctex_hypersetup:n { driverfallback = dvipdfmx }
@@ -6594,11 +6595,12 @@
     \sys_if_output_pdf:TF
       { \ctex_at_end_package:nn { hyperref } { \RequirePackage { xCJK2uni } } }
       {
+        \ctex_hypersetup:n { pdfencoding = pdfdoc }
         \ctex_at_end_package:nn { hyperref }
           {
             \str_if_eq:onTF { \Hy at driver } { hdvipdfm }
               {
-                \AtBeginShipoutFirst
+                \ctex_at_shipout_first:n
                   { \special { pdf:tounicode~GBK-EUC-UCS2 } }
               }
               { \RequirePackage { xCJK2uni } }
@@ -6619,9 +6621,16 @@
 % 置。注意 \upTeX{} 需要使用 UTF8-UTF16 的编码转换。
 %    \begin{macrocode}
 %<*uptex|aptex>
-\ctex_hypersetup:n { driverfallback = dvipdfmx }
+\ctex_hypersetup:n
+  {
+    driverfallback = dvipdfmx ,
+    pdfencoding    = pdfdoc
+  }
 \ctex_at_end_package:nn { hyperref }
-  { \AtBeginShipoutFirst { \special { pdf:tounicode~UTF8-UTF16 } } }
+  {
+    \ctex_at_shipout_first:n
+      { \special { pdf:tounicode~UTF8-UTF16 } }
+  }
 %</uptex|aptex>
 %    \end{macrocode}
 %
@@ -6759,13 +6768,6 @@
 % \begin{macro}[int]{\ctex_add_to_selectfont:n,\CTEX at selectfont@hook}
 % \changes{v2.4.13}{2018/03/23}{修正导言区 \tn{selectfont} 钩子位置。}
 % \changes{v2.5}{2020/04/19}{兼容 \pkg{KOMA-Script} 的 \tn{selectfont} 补丁。}
-%
-% \tn{EverySelectfont} 直到文档开始时才有效。为了 \tn{ccwd} 和 \pkg{LuaTeX-ja} 的
-% 字体设置在导言区也可用,我们还需要在这里手工修改 \tn{selectfont}。\pkg{everysel}
-% 宏包会用 \tn{CheckCommand} 来检查 \tn{selectfont} 是否为标准定义。我们修改了
-% \tn{selectfont},所以会给出一个警告。为了消除这个警告,在它检查之前,还原本来
-% 定义。\pkg{pxeverysel} 宏包取消了检查,但也需要恢复定义,避免重复使用钩子。
-% \pkg{KOMA-Script} 宏包也会进行检查,我们需要小心处理。
 %    \begin{macrocode}
 \cs_new_protected:Npn \ctex_add_to_selectfont:n #1
   {
@@ -6773,49 +6775,68 @@
       { \exp_not:o { \CTEX at selectfont@hook #1 } }
   }
 \cs_new_eq:NN \CTEX at selectfont@hook \prg_do_nothing:
-\if_cs_exist:N \@EverySelectfont at Init
-  \group_begin:
-    \cs_set:Npn \@@_tmp:N #1
-      {
-        \tl_set:Nn \l_@@_tmp_tl {#1}
-        \cs_new_eq:NN \CTEX at selectfont@save #1
-        \cs_new_protected:Npn \@@_restore_selectfont:
-          {
-            \cs_if_free:NF \scr at new@selectfont
-              {
 %    \end{macrocode}
+% 使用 \pkg{everysel} 包的情况。
+% \tn{EverySelectfont} 直到文档开始时才有效。为了 \tn{ccwd} 和 \pkg{LuaTeX-ja} 的
+% 字体设置在导言区也可用,我们还需要在这里手工修改 \tn{selectfont}。\pkg{everysel}
+% 宏包会用 \tn{CheckCommand} 来检查 \tn{selectfont} 是否为标准定义。我们修改了
+% \tn{selectfont},所以会给出一个警告。为了消除这个警告,在它检查之前,还原本来
+% 定义。\pkg{pxeverysel} 宏包取消了检查,但也需要恢复定义,避免重复使用钩子。
+% \pkg{KOMA-Script} 宏包也会进行检查,我们需要小心处理。
+%    \begin{macrocode}
+\if_bool:N \c_@@_everysel_loaded_bool
+  \if_cs_exist:N \@EverySelectfont at Init
+    \group_begin:
+      \cs_set:Npn \@@_tmp:N #1
+        {
+          \tl_set:Nn \l_@@_tmp_tl {#1}
+          \cs_new_eq:NN \CTEX at selectfont@save #1
+          \cs_new_protected:Npn \@@_restore_selectfont:
+            {
+              \cs_if_free:NF \scr at new@selectfont
+                {
+%    \end{macrocode}
 % \pkg{CJK} 直接修改 \tn{selectfont} 和 \pkg{pxeverysel} 的补丁,
 % 会使 \pkg{KOMA-Script} 的 \tn{par at update} 失效。
 %    \begin{macrocode}
 %<*pdftex|uptex|aptex>
-                \cs_if_free:NF \par at update
+                  \cs_if_free:NF \par at update
 %<*uptex|aptex>
-                  {
-                    \tl_put_right:Nn \@EverySelectfont at Init
-                      { \tl_put_right:Nn #1 { \par at update } }
-                  }
+                    {
+                      \tl_put_right:Nn \@EverySelectfont at Init
+                        { \tl_put_right:Nn #1 { \par at update } }
+                    }
 %</uptex|aptex>
 %<*pdftex>
-                  { \tl_put_right:Nn #1 { \par at update } }
-                \cs_set_eq:NN \scr at selectfont \CTEX at selectfont@save
+                    { \tl_put_right:Nn #1 { \par at update } }
+                  \cs_set_eq:NN \scr at selectfont \CTEX at selectfont@save
 %</pdftex>
 %</pdftex|uptex|aptex>
-                \cs_set_eq:NN \scr at new@selectfont #1
-%<!pdftex>                \cs_set_eq:NN \CTEX at selectfont@save \scr at selectfont
-              }
-            \tl_put_left:Nn \@EverySelectfont at Init
-              { \cs_set_eq:NN #1 \CTEX at selectfont@save }
-            \cs_undefine:N \@@_restore_selectfont:
-          }
-      }
-    \ctex_parse_name:NN \@@_tmp:N \selectfont
-  \exp_last_unbraced:NNo \group_end:
-  \ctex_patch_cmd_once:NnnnTF { \l_@@_tmp_tl }
-    { \ExplSyntaxOff }
-    { \size at update }
-    { \CTEX at selectfont@hook \size at update }
-    { \@@_restore_selectfont: }
-    { \ctex_patch_failure:N \selectfont }
+                  \cs_set_eq:NN \scr at new@selectfont #1
+%<!pdftex>                  \cs_set_eq:NN \CTEX at selectfont@save \scr at selectfont
+                }
+              \tl_put_left:Nn \@EverySelectfont at Init
+                { \cs_set_eq:NN #1 \CTEX at selectfont@save }
+              \cs_undefine:N \@@_restore_selectfont:
+            }
+        }
+      \ctex_parse_name:NN \@@_tmp:N \selectfont
+    \exp_last_unbraced:NNo \group_end:
+    \ctex_patch_cmd_once:NnnnTF { \l_@@_tmp_tl }
+      { \ExplSyntaxOff }
+      { \size at update }
+      { \CTEX at selectfont@hook \size at update }
+      { \@@_restore_selectfont: }
+      { \ctex_patch_failure:N \selectfont }
+  \fi:
+  \cs_new_protected:Npn \ctex_gadd_selectfont_hook:n
+    { \EverySelectfont }
+%    \end{macrocode}
+% 使用 \LaTeX \ 2021-06-01 的新钩子,不使用 \pkg{everysel} 包的情况。
+%    \begin{macrocode}
+\else:
+  \cs_new_protected:Npn \ctex_gadd_selectfont_hook:n
+    { \ctex_gadd_ltxhook:nn { selectfont } }
 \fi:
 %    \end{macrocode}
 % \end{macro}
@@ -6823,10 +6844,11 @@
 % \tn{CJK at plane} 有定义,说明处于 \pkg{CJK} 宏包的 \tn{CJKsymbol} 之内,不必使用钩子。
 %    \begin{macrocode}
 %<*pdftex>
-\EverySelectfont { \cs_if_exist:NF \CJK at plane { \CTEX at selectfont@hook } }
+\ctex_gadd_selectfont_hook:n
+  { \cs_if_exist:NF \CJK at plane { \CTEX at selectfont@hook } }
 %</pdftex>
 %<*xetex|luatex|uptex|aptex>
-\EverySelectfont { \CTEX at selectfont@hook }
+\ctex_gadd_selectfont_hook:n { \CTEX at selectfont@hook }
 %</xetex|luatex|uptex|aptex>
 %    \end{macrocode}
 %
@@ -9072,6 +9094,7 @@
 %
 % \changes{v2.5.3}{2020/06/04}{兼容 \pkg{cleveref}。}
 % \changes{v2.5.4}{2020/06/17}{同时兼容 \pkg{cleveref} 和 \pkg{hyperref}。}
+% \changes{v2.5.7}{2021/06/04}{同时兼容 \pkg{cleveref} 和 \cls{beamer}。}
 % \begin{macro}{\ctex_cleveref_hook:,\@@_cleveref_hook_aux:N}
 % 需要将\pkg{cleveref} 包对应命令中 |\p@|\meta{counter} 的参数及时展开,以兼容 \tn{labelformat}。
 %    \begin{macrocode}
@@ -9078,8 +9101,12 @@
 \cs_new_protected:Npn \ctex_cleveref_hook:
   {
     \@ifpackageloaded { hyperref }
-      { \@@_cleveref_hook_aux:N \H at refstepcounter }
       {
+        \@ifpackagewith { hyperref } { implicit = false }
+          { }
+          { \@@_cleveref_hook_aux:N \H at refstepcounter }
+      }
+      {
         \@@_cleveref_hook_aux:N \refstepcounter at noarg
         \@@_cleveref_hook_aux:N \refstepcounter at optarg
       }
@@ -9761,8 +9788,8 @@
 %    \begin{macrocode}
 \int_case:nn { \g_@@_font_size_int }
   {
-    { 0 } { \ctex_file_input:n { ctex-c5size.clo } }
-    { 1 } { \ctex_file_input:n { ctex-cs4size.clo } }
+    { 0 } { \file_input:n { ctex-c5size.clo } }
+    { 1 } { \file_input:n { ctex-cs4size.clo } }
   }
 %    \end{macrocode}
 %
@@ -10891,17 +10918,17 @@
 % 文件标识信息。
 %    \begin{macrocode}
 %<adobe>\ProvidesFile{ctex-zhmap-adobe.tex}%
-%<adobe>  [2021/03/14 v2.5.6 Adobe font map loader for DVIPDFMx (CTEX)]
+%<adobe>  [2021/06/20 v2.5.7 Adobe font map loader for DVIPDFMx (CTEX)]
 %<fandol>\ProvidesFile{ctex-zhmap-fandol.tex}%
-%<fandol>  [2021/03/14 v2.5.6 Fandol font map loader for DVIPDFMx (CTEX)]
+%<fandol>  [2021/06/20 v2.5.7 Fandol font map loader for DVIPDFMx (CTEX)]
 %<founder>\ProvidesFile{ctex-zhmap-founder.tex}%
-%<founder>  [2021/03/14 v2.5.6 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+%<founder>  [2021/06/20 v2.5.7 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
 %<mac>\ProvidesFile{ctex-zhmap-mac.tex}%
-%<mac>  [2021/03/14 v2.5.6 Mac font map loader for DVIPDFMx (CTEX)]
+%<mac>  [2021/06/20 v2.5.7 Mac font map loader for DVIPDFMx (CTEX)]
 %<ubuntu>\ProvidesFile{ctex-zhmap-ubuntu.tex}%
-%<ubuntu>  [2021/03/14 v2.5.6 Ubuntu font map loader for DVIPDFMx (CTEX)]
+%<ubuntu>  [2021/06/20 v2.5.7 Ubuntu font map loader for DVIPDFMx (CTEX)]
 %<windows>\ProvidesFile{ctex-zhmap-windows.tex}%
-%<windows>  [2021/03/14 v2.5.6 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+%<windows>  [2021/06/20 v2.5.7 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
 %    \end{macrocode}
 %
 % \paragraph{\pkg{ctex-zhmap-adobe.tex}}
@@ -11463,6 +11490,113 @@
 %<*ctexhook>
 %    \end{macrocode}
 %
+% \begin{macro}[int]{\ctex_if_format_at_least:nTF}
+%  与 \tn{IfFormatAtLeastTF} 同义。
+%    \begin{macrocode}
+\cs_new:Npn \ctex_if_format_at_least:nTF
+  { \@ifl at t@r \fmtversion }
+%    \end{macrocode}
+% \end{macro}
+%
+% \changes{v2.5.7}{2021/06/12}{重新应用 \pkg{l3cctab}。}
+%
+% \begin{macro}[int]{\ctex_file_input:n,\ctex_push_file:,\ctex_pop_file:}
+% 输入文件,关闭 \LaTeXiii 语法环境,并设置 |@| 为字母类,利用 \pkg{l3cctab} 实现。
+% 我们使用 \cs{file_input:n} 而不是 \LaTeXe \ 的 \tn{input} 或者 \tn{InputIfFileExists}
+% 载入文件,因此 \LaTeXe \ 的文件钩子都\emph{无效}。
+%    \begin{macrocode}
+\cs_new_protected:Npn \ctex_file_input:n #1
+  {
+    \ctex_push_file:
+      \file_input:n {#1}
+    \ctex_pop_file:
+  }
+\bool_if_exist:NTF \l__kernel_expl_bool
+  {
+    \cs_new_protected:Npn \ctex_push_file:
+      {
+        \seq_gpush:Nx \g_@@_expl_status_seq
+          { \bool_if:NTF \l__kernel_expl_bool { 1 } { 0 } }
+        \bool_set_false:N \l__kernel_expl_bool
+        \cctab_begin:N \c_@@_package_cctab
+      }
+    \cs_new_protected:Npn \ctex_pop_file:
+      {
+        \cctab_end:
+        \seq_gpop:NN \g_@@_expl_status_seq \l_@@_expl_status_tl
+        \int_if_odd:nTF { \l_@@_expl_status_tl }
+          { \bool_set_true:N  \l__kernel_expl_bool }
+          { \bool_set_false:N \l__kernel_expl_bool }
+      }
+    \tl_new:N \l_@@_expl_status_tl
+    \seq_new:N \g_@@_expl_status_seq
+  }
+  {
+    \cs_new_protected:Npn \ctex_push_file:
+      { \cctab_begin:N \c_@@_package_cctab }
+    \cs_new_protected:Npn \ctex_pop_file:
+      { \cctab_end: }
+  }
+\cctab_const:Nn \c_@@_package_cctab
+  {
+    \cctab_select:N \c_document_cctab
+    \char_set_catcode_letter:n { 64 }
+  }
+%    \end{macrocode}
+% \end{macro}
+%
+% \changes{v2.5.7}{2021/06/09}{使用 \tn{disable at package@load} 禁止宏包载入。}
+%
+% \begin{macro}[int]{\ctex_disable_package:n}
+% 禁止宏包载入。采用 \LaTeX \ 2020-10-01 提供的 \tn{disable at package@load} 实现,
+% 否则采用传统方式:预定义 |\ver@|\meta{package}|.sty| 标识符。
+%    \begin{macrocode}
+\cs_new_protected:Npn \ctex_disable_package:n #1
+  {
+    \@ifpackageloaded {#1}
+      { \msg_error:nnxx }
+      { \@@_disable_package_aux:nnnn }
+      { ctex } { disable-package } {#1} { \@currname }
+  }
+\cs_new_protected:Npx \@@_disable_package_aux:nnnn #1#2#3#4
+  {
+    \cs_if_exist:NTF \disable at package@load
+      {
+        \exp_args:Nnx \exp_not:N \disable at package@load {#3}
+          { \msg_warning:nnnn {#1} {#2} {#3} {#4} }
+      }
+      { \tl_const:cn { ver@ #3 . \exp_not:N \@pkgextension } { 9999/99/99 } }
+  }
+\msg_new:nnn { ctex } { disable-package }
+  { Package~`#1'~can~not~be~loaded~with~`#2'. }
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[int]{\ctex_replace_package:nn}
+% 替换宏包。采用 \LaTeX \ 2020-10-01 提供的 \tn{declare at file@substitution} 实现,
+% 否则给出无效警告。
+%    \begin{macrocode}
+\ctex_if_format_at_least:nTF { 2020/10/01 }
+  {
+    \cs_new_protected:Npn \ctex_replace_package:nn #1#2
+      {
+        \declare at file@substitution
+          { #1 . \@pkgextension }
+          { #2 . \@pkgextension }
+      }
+  }
+  {
+    \cs_new_protected:Npn \ctex_replace_package:nn
+      { \msg_warning:nnnn { ctex } { replace-package-invalid } }
+    \msg_new:nnn { ctex } { replace-package-invalid }
+      {
+        \token_to_str:N \ctex_replace_package:nn \{#1\}\{#2\}~is~invalid~
+        before~LaTeX~2020-10-01.
+      }
+  }
+%    \end{macrocode}
+% \end{macro}
+%
 % \begin{macro}[int]{\ctex_at_begin_package:nn}
 % 如果宏包已经被载入,则钩子无效,给出警告。
 %    \begin{macrocode}
@@ -11499,7 +11633,7 @@
 %
 % \LaTeX \ 2020/10/01 开始提供常用钩子管理机制。在新机制下,我们只需要做简单的包装。
 %    \begin{macrocode}
-\@ifl at t@r \fmtversion { 2020/10/01 }
+\ctex_if_format_at_least:nTF { 2020/10/01 }
   {
     \cs_new_protected:Npx \ctex_gadd_ltxhook:nn #1
       { \hook_gput_code:nnn {#1} { \c_novalue_tl } }

Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex	2021-06-20 19:56:11 UTC (rev 59654)
@@ -75,7 +75,7 @@
 \fi
 \endgroup
 \ProvidesFile{ctex-zhmap-adobe.tex}%
-  [2021/03/14 v2.5.6 Adobe font map loader for DVIPDFMx (CTEX)]
+  [2021/06/20 v2.5.7 Adobe font map loader for DVIPDFMx (CTEX)]
 \ifzhmappdf
 %% pdfTeX does not support OTF fonts
 \else

Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex	2021-06-20 19:56:11 UTC (rev 59654)
@@ -75,7 +75,7 @@
 \fi
 \endgroup
 \ProvidesFile{ctex-zhmap-fandol.tex}%
-  [2021/03/14 v2.5.6 Fandol font map loader for DVIPDFMx (CTEX)]
+  [2021/06/20 v2.5.7 Fandol font map loader for DVIPDFMx (CTEX)]
 \ifzhmappdf
 %% pdfTeX does not support OTF fonts
 \else

Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex	2021-06-20 19:56:11 UTC (rev 59654)
@@ -75,7 +75,7 @@
 \fi
 \endgroup
 \ProvidesFile{ctex-zhmap-founder.tex}%
-  [2021/03/14 v2.5.6 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+  [2021/06/20 v2.5.7 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
 \ifzhmappdf
   \pdfmapline{=gbk at UGBK@          <FZSSK.TTF}
   \pdfmapline{=gbksong at UGBK@      <FZSSK.TTF}

Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex	2021-06-20 19:56:11 UTC (rev 59654)
@@ -75,7 +75,7 @@
 \fi
 \endgroup
 \ProvidesFile{ctex-zhmap-mac.tex}%
-  [2021/03/14 v2.5.6 Mac font map loader for DVIPDFMx (CTEX)]
+  [2021/06/20 v2.5.7 Mac font map loader for DVIPDFMx (CTEX)]
 \ifzhmappdf
 %% pdfTeX does not support OTF fonts
 \else

Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex	2021-06-20 19:56:11 UTC (rev 59654)
@@ -75,7 +75,7 @@
 \fi
 \endgroup
 \ProvidesFile{ctex-zhmap-ubuntu.tex}%
-  [2021/03/14 v2.5.6 Ubuntu font map loader for DVIPDFMx (CTEX)]
+  [2021/06/20 v2.5.7 Ubuntu font map loader for DVIPDFMx (CTEX)]
 \ifzhmappdf
 %% pdfTeX does not support OTF fonts
 \else

Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex	2021-06-20 19:56:11 UTC (rev 59654)
@@ -75,7 +75,7 @@
 \fi
 \endgroup
 \ProvidesFile{ctex-zhmap-windows.tex}%
-  [2021/03/14 v2.5.6 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+  [2021/06/20 v2.5.7 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
 \ifzhmappdf
   \pdfmapline{=gbk at UGBK@          <simsun.ttc}
   \pdfmapline{=gbksong 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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Caption with encoding GBK (CTEX)}
 \ProvidesExplFile{ctex-name-gbk.cfg}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Caption with encoding UTF-8 (CTEX)}
 \ProvidesExplFile{ctex-name-utf8.cfg}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Configuration file (CTEX)}
 \ProvidesExplFile{\ExplFileName.cfg}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 %%
 %% 
 %%

Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg	2021-06-20 19:56:11 UTC (rev 59654)
@@ -25,7 +25,7 @@
 %% ---------------------------------------------------------------------
 %% 
 \ProvidesFile{ctexbackend.cfg}%
-  [2021/03/14 v2.5.6 Backend configuration file (CTEX)]
+  [2021/06/20 v2.5.7 Backend configuration file (CTEX)]
 \begingroup
 \expandafter\ifx\csname Umathchardef\endcsname\relax
 \else\expandafter\endgroup\expandafter\endinput\fi

Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Option configuration file (CTEX)}
 \ProvidesExplFile{ctexopts.cfg}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 %%
 %% \ctex_set:nn { option } { fontset = windows }
 %% 

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {c5size option (CTEX)}
 \ProvidesExplFile{ctex-c5size.clo}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {cs4size option (CTEX)}
 \ProvidesExplFile{ctex-cs4size.clo}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \ctex_set_font_size:Nnn \normalsize { -4 }
   {
     \abovedisplayskip 12\p@ \@plus3\p@ \@minus7\p@

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty	2021-06-20 19:56:11 UTC (rev 59654)
@@ -26,24 +26,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese adapter in LaTeX (CTEX)}
 \ProvidesExplPackage{\ExplFileName}
-  {\ExplFileDate}{2.5.6}{\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 }
-  { Package~`#1'~can~not~be~loaded~with~`ctex'. }
-  {
-    `#1'~is~actually~a~part~of~`ctex'.\\
-    It~is~not~necessary~to~load~it~separately.
-  }
-\@ifpackageloaded { ctexsize }
-  { \msg_error:nnn { ctex } { subpackage-loaded } { ctexsize } }
-  { \cs_new_eq:cN { ver at ctexsize. \@pkgextension } \c__ctex_version_tl }
-\@ifpackageloaded { ctexheading }
-  { \msg_error:nnn { ctex } { subpackage-loaded } { ctexheading } }
-  { \cs_new_eq:cN { ver at ctexheading. \@pkgextension } \c__ctex_version_tl }
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \RequirePackage { xparse , l3keys2e }
 \msg_new:nnnn { ctex } { l3-too-old }
   { Support~package~`#1'~too~old. }
@@ -67,7 +53,14 @@
   { \msg_critical:nnx { ctex } { engine-not-supported } { \c__ctex_engine_str } }
 \RequirePackage { ctexhook , ctexpatch }
 \RequirePackage { fix-cm }
-\RequirePackage { everysel }
+\ctex_disable_package:n { ctexsize }
+\ctex_disable_package:n { ctexheading }
+\ctex_if_format_at_least:nTF { 2021/06/01 }
+  { \bool_const:Nn \c__ctex_everysel_loaded_bool { \c_false_bool } }
+  {
+    \RequirePackage { everysel }
+    \bool_const:Nn \c__ctex_everysel_loaded_bool { \c_true_bool }
+  }
 \tl_clear_new:N \l__ctex_tmp_tl
 \int_new:N \l__ctex_tmp_int
 \box_new:N \l__ctex_tmp_box
@@ -80,44 +73,6 @@
   { \keys_set:nn { ctex } }
 \cs_new_protected:Npn \ctex_set:nn #1
   { \keys_set:nn { ctex / #1 } }
-\cs_new_protected:Npn \ctex_file_input:n #1
-  {
-    \ctex_push_file:
-      \file_input:n {#1}
-    \ctex_pop_file:
-  }
-\cs_new_protected:Npn \ctex_push_file:
-  {
-    \seq_gpush:Nx \g__ctex_file_status_seq
-      {
-        {
-          \bool_if:NTF \l__kernel_expl_bool
-            { \ExplSyntaxOn }
-            { \ExplSyntaxOff }
-        }
-        { \char_value_catcode:n { 64 } }
-        { \char_value_catcode:n { 94 } }
-        { \int_use:N \tex_endlinechar:D }
-      }
-    \ExplSyntaxOff
-    \char_set_catcode_letter:n { 64 }
-    \char_set_catcode_math_superscript:n { 94 }
-    \int_set:Nn \tex_endlinechar:D { 13 }
-  }
-\cs_new_protected:Npn \ctex_pop_file:
-  {
-    \seq_gpop:NN \g__ctex_file_status_seq \l__ctex_file_status_tl
-    \exp_after:wN \__ctex_pop_file_aux:nnnn \l__ctex_file_status_tl
-  }
-\cs_new_protected:Npn \__ctex_pop_file_aux:nnnn #1#2#3#4
-  {
-    #1
-    \char_set_catcode:nn { 64 } {#2}
-    \char_set_catcode:nn { 94 } {#3}
-    \int_set:Nn \tex_endlinechar:D {#4}
-  }
-\tl_new:N \l__ctex_file_status_tl
-\seq_new:N \g__ctex_file_status_seq
 \cs_new_protected:Npn \ctex_scheme_input:n #1
   {
     \ctex_push_file:
@@ -740,8 +695,8 @@
   { \cs_set_protected:Npn #3 { \@setfontsize #3 {#1} {#2} #4 } }
 \int_case:nn { \g__ctex_font_size_int }
   {
-    { 0 } { \ctex_file_input:n { ctex-c5size.clo } }
-    { 1 } { \ctex_file_input:n { ctex-cs4size.clo } }
+    { 0 } { \file_input:n { ctex-c5size.clo } }
+    { 1 } { \file_input:n { ctex-cs4size.clo } }
   }
 \fp_if_nan:nF { \l__ctex_line_spread_fp }
   {

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls	2021-06-20 19:56:11 UTC (rev 59654)
@@ -27,16 +27,10 @@
 \NeedsTeXFormat{LaTeX2e}
 \input{ctexbackend.cfg}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese adapter for class article (CTEX)}
 \ProvidesExplClass{ctexart}
-  {\ExplFileDate}{2.5.6}{\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
-\cs_new_eq:cN { ver at ctexcap.     \@pkgextension } \c__ctex_version_tl
-\cs_new_eq:cN { ver at ctexsize.    \@pkgextension } \c__ctex_version_tl
-\cs_new_eq:cN { ver at ctexheading. \@pkgextension } \c__ctex_version_tl
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \RequirePackage { xparse , l3keys2e }
 \msg_new:nnnn { ctex } { l3-too-old }
   { Support~package~`#1'~too~old. }
@@ -62,7 +56,16 @@
   { \msg_critical:nnx { ctex } { engine-not-supported } { \c__ctex_engine_str } }
 \RequirePackage { ctexhook , ctexpatch }
 \RequirePackage { fix-cm }
-\RequirePackage { everysel }
+\ctex_disable_package:n { ctex }
+\ctex_disable_package:n { ctexcap }
+\ctex_disable_package:n { ctexsize }
+\ctex_disable_package:n { ctexheading }
+\ctex_if_format_at_least:nTF { 2021/06/01 }
+  { \bool_const:Nn \c__ctex_everysel_loaded_bool { \c_false_bool } }
+  {
+    \RequirePackage { everysel }
+    \bool_const:Nn \c__ctex_everysel_loaded_bool { \c_true_bool }
+  }
 \tl_clear_new:N \l__ctex_tmp_tl
 \int_new:N \l__ctex_tmp_int
 \box_new:N \l__ctex_tmp_box
@@ -75,44 +78,6 @@
   { \keys_set:nn { ctex } }
 \cs_new_protected:Npn \ctex_set:nn #1
   { \keys_set:nn { ctex / #1 } }
-\cs_new_protected:Npn \ctex_file_input:n #1
-  {
-    \ctex_push_file:
-      \file_input:n {#1}
-    \ctex_pop_file:
-  }
-\cs_new_protected:Npn \ctex_push_file:
-  {
-    \seq_gpush:Nx \g__ctex_file_status_seq
-      {
-        {
-          \bool_if:NTF \l__kernel_expl_bool
-            { \ExplSyntaxOn }
-            { \ExplSyntaxOff }
-        }
-        { \char_value_catcode:n { 64 } }
-        { \char_value_catcode:n { 94 } }
-        { \int_use:N \tex_endlinechar:D }
-      }
-    \ExplSyntaxOff
-    \char_set_catcode_letter:n { 64 }
-    \char_set_catcode_math_superscript:n { 94 }
-    \int_set:Nn \tex_endlinechar:D { 13 }
-  }
-\cs_new_protected:Npn \ctex_pop_file:
-  {
-    \seq_gpop:NN \g__ctex_file_status_seq \l__ctex_file_status_tl
-    \exp_after:wN \__ctex_pop_file_aux:nnnn \l__ctex_file_status_tl
-  }
-\cs_new_protected:Npn \__ctex_pop_file_aux:nnnn #1#2#3#4
-  {
-    #1
-    \char_set_catcode:nn { 64 } {#2}
-    \char_set_catcode:nn { 94 } {#3}
-    \int_set:Nn \tex_endlinechar:D {#4}
-  }
-\tl_new:N \l__ctex_file_status_tl
-\seq_new:N \g__ctex_file_status_seq
 \cs_new_protected:Npn \ctex_scheme_input:n #1
   {
     \ctex_push_file:
@@ -1308,8 +1273,12 @@
 \cs_new_protected:Npn \ctex_cleveref_hook:
   {
     \@ifpackageloaded { hyperref }
-      { \__ctex_cleveref_hook_aux:N \H at refstepcounter }
       {
+        \@ifpackagewith { hyperref } { implicit = false }
+          { }
+          { \__ctex_cleveref_hook_aux:N \H at refstepcounter }
+      }
+      {
         \__ctex_cleveref_hook_aux:N \refstepcounter at noarg
         \__ctex_cleveref_hook_aux:N \refstepcounter at optarg
       }
@@ -1433,8 +1402,8 @@
   { \cs_set_protected:Npn #3 { \@setfontsize #3 {#1} {#2} #4 } }
 \int_case:nn { \g__ctex_font_size_int }
   {
-    { 0 } { \ctex_file_input:n { ctex-c5size.clo } }
-    { 1 } { \ctex_file_input:n { ctex-cs4size.clo } }
+    { 0 } { \file_input:n { ctex-c5size.clo } }
+    { 1 } { \file_input:n { ctex-cs4size.clo } }
   }
 \fp_if_nan:nF { \l__ctex_line_spread_fp }
   {

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls	2021-06-20 19:56:11 UTC (rev 59654)
@@ -27,16 +27,10 @@
 \NeedsTeXFormat{LaTeX2e}
 \input{ctexbackend.cfg}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese adapter for class beamer (CTEX)}
 \ProvidesExplClass{ctexbeamer}
-  {\ExplFileDate}{2.5.6}{\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
-\cs_new_eq:cN { ver at ctexcap.     \@pkgextension } \c__ctex_version_tl
-\cs_new_eq:cN { ver at ctexsize.    \@pkgextension } \c__ctex_version_tl
-\cs_new_eq:cN { ver at ctexheading. \@pkgextension } \c__ctex_version_tl
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \RequirePackage { xparse , l3keys2e }
 \msg_new:nnnn { ctex } { l3-too-old }
   { Support~package~`#1'~too~old. }
@@ -62,7 +56,16 @@
   { \msg_critical:nnx { ctex } { engine-not-supported } { \c__ctex_engine_str } }
 \RequirePackage { ctexhook , ctexpatch }
 \RequirePackage { fix-cm }
-\RequirePackage { everysel }
+\ctex_disable_package:n { ctex }
+\ctex_disable_package:n { ctexcap }
+\ctex_disable_package:n { ctexsize }
+\ctex_disable_package:n { ctexheading }
+\ctex_if_format_at_least:nTF { 2021/06/01 }
+  { \bool_const:Nn \c__ctex_everysel_loaded_bool { \c_false_bool } }
+  {
+    \RequirePackage { everysel }
+    \bool_const:Nn \c__ctex_everysel_loaded_bool { \c_true_bool }
+  }
 \tl_clear_new:N \l__ctex_tmp_tl
 \int_new:N \l__ctex_tmp_int
 \box_new:N \l__ctex_tmp_box
@@ -75,44 +78,6 @@
   { \keys_set:nn { ctex } }
 \cs_new_protected:Npn \ctex_set:nn #1
   { \keys_set:nn { ctex / #1 } }
-\cs_new_protected:Npn \ctex_file_input:n #1
-  {
-    \ctex_push_file:
-      \file_input:n {#1}
-    \ctex_pop_file:
-  }
-\cs_new_protected:Npn \ctex_push_file:
-  {
-    \seq_gpush:Nx \g__ctex_file_status_seq
-      {
-        {
-          \bool_if:NTF \l__kernel_expl_bool
-            { \ExplSyntaxOn }
-            { \ExplSyntaxOff }
-        }
-        { \char_value_catcode:n { 64 } }
-        { \char_value_catcode:n { 94 } }
-        { \int_use:N \tex_endlinechar:D }
-      }
-    \ExplSyntaxOff
-    \char_set_catcode_letter:n { 64 }
-    \char_set_catcode_math_superscript:n { 94 }
-    \int_set:Nn \tex_endlinechar:D { 13 }
-  }
-\cs_new_protected:Npn \ctex_pop_file:
-  {
-    \seq_gpop:NN \g__ctex_file_status_seq \l__ctex_file_status_tl
-    \exp_after:wN \__ctex_pop_file_aux:nnnn \l__ctex_file_status_tl
-  }
-\cs_new_protected:Npn \__ctex_pop_file_aux:nnnn #1#2#3#4
-  {
-    #1
-    \char_set_catcode:nn { 64 } {#2}
-    \char_set_catcode:nn { 94 } {#3}
-    \int_set:Nn \tex_endlinechar:D {#4}
-  }
-\tl_new:N \l__ctex_file_status_tl
-\seq_new:N \g__ctex_file_status_seq
 \cs_new_protected:Npn \ctex_scheme_input:n #1
   {
     \ctex_push_file:
@@ -792,8 +757,12 @@
 \cs_new_protected:Npn \ctex_cleveref_hook:
   {
     \@ifpackageloaded { hyperref }
-      { \__ctex_cleveref_hook_aux:N \H at refstepcounter }
       {
+        \@ifpackagewith { hyperref } { implicit = false }
+          { }
+          { \__ctex_cleveref_hook_aux:N \H at refstepcounter }
+      }
+      {
         \__ctex_cleveref_hook_aux:N \refstepcounter at noarg
         \__ctex_cleveref_hook_aux:N \refstepcounter at optarg
       }
@@ -917,8 +886,8 @@
   { \cs_set_protected:Npn #3 { \@setfontsize #3 {#1} {#2} #4 } }
 \int_case:nn { \g__ctex_font_size_int }
   {
-    { 0 } { \ctex_file_input:n { ctex-c5size.clo } }
-    { 1 } { \ctex_file_input:n { ctex-cs4size.clo } }
+    { 0 } { \file_input:n { ctex-c5size.clo } }
+    { 1 } { \file_input:n { ctex-cs4size.clo } }
   }
 \fp_if_nan:nF { \l__ctex_line_spread_fp }
   {

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls	2021-06-20 19:56:11 UTC (rev 59654)
@@ -27,16 +27,10 @@
 \NeedsTeXFormat{LaTeX2e}
 \input{ctexbackend.cfg}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese adapter for class book (CTEX)}
 \ProvidesExplClass{ctexbook}
-  {\ExplFileDate}{2.5.6}{\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
-\cs_new_eq:cN { ver at ctexcap.     \@pkgextension } \c__ctex_version_tl
-\cs_new_eq:cN { ver at ctexsize.    \@pkgextension } \c__ctex_version_tl
-\cs_new_eq:cN { ver at ctexheading. \@pkgextension } \c__ctex_version_tl
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \RequirePackage { xparse , l3keys2e }
 \msg_new:nnnn { ctex } { l3-too-old }
   { Support~package~`#1'~too~old. }
@@ -62,7 +56,16 @@
   { \msg_critical:nnx { ctex } { engine-not-supported } { \c__ctex_engine_str } }
 \RequirePackage { ctexhook , ctexpatch }
 \RequirePackage { fix-cm }
-\RequirePackage { everysel }
+\ctex_disable_package:n { ctex }
+\ctex_disable_package:n { ctexcap }
+\ctex_disable_package:n { ctexsize }
+\ctex_disable_package:n { ctexheading }
+\ctex_if_format_at_least:nTF { 2021/06/01 }
+  { \bool_const:Nn \c__ctex_everysel_loaded_bool { \c_false_bool } }
+  {
+    \RequirePackage { everysel }
+    \bool_const:Nn \c__ctex_everysel_loaded_bool { \c_true_bool }
+  }
 \tl_clear_new:N \l__ctex_tmp_tl
 \int_new:N \l__ctex_tmp_int
 \box_new:N \l__ctex_tmp_box
@@ -75,44 +78,6 @@
   { \keys_set:nn { ctex } }
 \cs_new_protected:Npn \ctex_set:nn #1
   { \keys_set:nn { ctex / #1 } }
-\cs_new_protected:Npn \ctex_file_input:n #1
-  {
-    \ctex_push_file:
-      \file_input:n {#1}
-    \ctex_pop_file:
-  }
-\cs_new_protected:Npn \ctex_push_file:
-  {
-    \seq_gpush:Nx \g__ctex_file_status_seq
-      {
-        {
-          \bool_if:NTF \l__kernel_expl_bool
-            { \ExplSyntaxOn }
-            { \ExplSyntaxOff }
-        }
-        { \char_value_catcode:n { 64 } }
-        { \char_value_catcode:n { 94 } }
-        { \int_use:N \tex_endlinechar:D }
-      }
-    \ExplSyntaxOff
-    \char_set_catcode_letter:n { 64 }
-    \char_set_catcode_math_superscript:n { 94 }
-    \int_set:Nn \tex_endlinechar:D { 13 }
-  }
-\cs_new_protected:Npn \ctex_pop_file:
-  {
-    \seq_gpop:NN \g__ctex_file_status_seq \l__ctex_file_status_tl
-    \exp_after:wN \__ctex_pop_file_aux:nnnn \l__ctex_file_status_tl
-  }
-\cs_new_protected:Npn \__ctex_pop_file_aux:nnnn #1#2#3#4
-  {
-    #1
-    \char_set_catcode:nn { 64 } {#2}
-    \char_set_catcode:nn { 94 } {#3}
-    \int_set:Nn \tex_endlinechar:D {#4}
-  }
-\tl_new:N \l__ctex_file_status_tl
-\seq_new:N \g__ctex_file_status_seq
 \cs_new_protected:Npn \ctex_scheme_input:n #1
   {
     \ctex_push_file:
@@ -1436,8 +1401,12 @@
 \cs_new_protected:Npn \ctex_cleveref_hook:
   {
     \@ifpackageloaded { hyperref }
-      { \__ctex_cleveref_hook_aux:N \H at refstepcounter }
       {
+        \@ifpackagewith { hyperref } { implicit = false }
+          { }
+          { \__ctex_cleveref_hook_aux:N \H at refstepcounter }
+      }
+      {
         \__ctex_cleveref_hook_aux:N \refstepcounter at noarg
         \__ctex_cleveref_hook_aux:N \refstepcounter at optarg
       }
@@ -1561,8 +1530,8 @@
   { \cs_set_protected:Npn #3 { \@setfontsize #3 {#1} {#2} #4 } }
 \int_case:nn { \g__ctex_font_size_int }
   {
-    { 0 } { \ctex_file_input:n { ctex-c5size.clo } }
-    { 1 } { \ctex_file_input:n { ctex-cs4size.clo } }
+    { 0 } { \file_input:n { ctex-c5size.clo } }
+    { 1 } { \file_input:n { ctex-cs4size.clo } }
   }
 \fp_if_nan:nF { \l__ctex_line_spread_fp }
   {

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty	2021-06-20 19:56:11 UTC (rev 59654)
@@ -26,10 +26,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese adapter in LaTeX (CTEX)}
 \ProvidesExplPackage{ctexcap}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty	2021-06-20 19:56:11 UTC (rev 59654)
@@ -26,10 +26,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Heading style modification (CTEX)}
 \ProvidesExplPackage{ctexheading}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \RequirePackage { xparse , l3keys2e }
 \RequirePackage { ctexhook , ctexpatch }
 \tl_clear_new:N \l__ctex_tmp_tl
@@ -43,44 +43,6 @@
   { \keys_set:nn { ctex } }
 \cs_new_protected:Npn \ctex_set:nn #1
   { \keys_set:nn { ctex / #1 } }
-\cs_new_protected:Npn \ctex_file_input:n #1
-  {
-    \ctex_push_file:
-      \file_input:n {#1}
-    \ctex_pop_file:
-  }
-\cs_new_protected:Npn \ctex_push_file:
-  {
-    \seq_gpush:Nx \g__ctex_file_status_seq
-      {
-        {
-          \bool_if:NTF \l__kernel_expl_bool
-            { \ExplSyntaxOn }
-            { \ExplSyntaxOff }
-        }
-        { \char_value_catcode:n { 64 } }
-        { \char_value_catcode:n { 94 } }
-        { \int_use:N \tex_endlinechar:D }
-      }
-    \ExplSyntaxOff
-    \char_set_catcode_letter:n { 64 }
-    \char_set_catcode_math_superscript:n { 94 }
-    \int_set:Nn \tex_endlinechar:D { 13 }
-  }
-\cs_new_protected:Npn \ctex_pop_file:
-  {
-    \seq_gpop:NN \g__ctex_file_status_seq \l__ctex_file_status_tl
-    \exp_after:wN \__ctex_pop_file_aux:nnnn \l__ctex_file_status_tl
-  }
-\cs_new_protected:Npn \__ctex_pop_file_aux:nnnn #1#2#3#4
-  {
-    #1
-    \char_set_catcode:nn { 64 } {#2}
-    \char_set_catcode:nn { 94 } {#3}
-    \int_set:Nn \tex_endlinechar:D {#4}
-  }
-\tl_new:N \l__ctex_file_status_tl
-\seq_new:N \g__ctex_file_status_seq
 \cs_new_protected:Npn \ctex_scheme_input:n #1
   {
     \ctex_push_file:

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty	2021-06-20 19:56:11 UTC (rev 59654)
@@ -26,10 +26,85 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Document and package hooks (CTEX)}
 \ProvidesExplPackage{ctexhook}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
+\cs_new:Npn \ctex_if_format_at_least:nTF
+  { \@ifl at t@r \fmtversion }
+\cs_new_protected:Npn \ctex_file_input:n #1
+  {
+    \ctex_push_file:
+      \file_input:n {#1}
+    \ctex_pop_file:
+  }
+\bool_if_exist:NTF \l__kernel_expl_bool
+  {
+    \cs_new_protected:Npn \ctex_push_file:
+      {
+        \seq_gpush:Nx \g__ctex_expl_status_seq
+          { \bool_if:NTF \l__kernel_expl_bool { 1 } { 0 } }
+        \bool_set_false:N \l__kernel_expl_bool
+        \cctab_begin:N \c__ctex_package_cctab
+      }
+    \cs_new_protected:Npn \ctex_pop_file:
+      {
+        \cctab_end:
+        \seq_gpop:NN \g__ctex_expl_status_seq \l__ctex_expl_status_tl
+        \int_if_odd:nTF { \l__ctex_expl_status_tl }
+          { \bool_set_true:N  \l__kernel_expl_bool }
+          { \bool_set_false:N \l__kernel_expl_bool }
+      }
+    \tl_new:N \l__ctex_expl_status_tl
+    \seq_new:N \g__ctex_expl_status_seq
+  }
+  {
+    \cs_new_protected:Npn \ctex_push_file:
+      { \cctab_begin:N \c__ctex_package_cctab }
+    \cs_new_protected:Npn \ctex_pop_file:
+      { \cctab_end: }
+  }
+\cctab_const:Nn \c__ctex_package_cctab
+  {
+    \cctab_select:N \c_document_cctab
+    \char_set_catcode_letter:n { 64 }
+  }
+\cs_new_protected:Npn \ctex_disable_package:n #1
+  {
+    \@ifpackageloaded {#1}
+      { \msg_error:nnxx }
+      { \__ctex_disable_package_aux:nnnn }
+      { ctex } { disable-package } {#1} { \@currname }
+  }
+\cs_new_protected:Npx \__ctex_disable_package_aux:nnnn #1#2#3#4
+  {
+    \cs_if_exist:NTF \disable at package@load
+      {
+        \exp_args:Nnx \exp_not:N \disable at package@load {#3}
+          { \msg_warning:nnnn {#1} {#2} {#3} {#4} }
+      }
+      { \tl_const:cn { ver@ #3 . \exp_not:N \@pkgextension } { 9999/99/99 } }
+  }
+\msg_new:nnn { ctex } { disable-package }
+  { Package~`#1'~can~not~be~loaded~with~`#2'. }
+\ctex_if_format_at_least:nTF { 2020/10/01 }
+  {
+    \cs_new_protected:Npn \ctex_replace_package:nn #1#2
+      {
+        \declare at file@substitution
+          { #1 . \@pkgextension }
+          { #2 . \@pkgextension }
+      }
+  }
+  {
+    \cs_new_protected:Npn \ctex_replace_package:nn
+      { \msg_warning:nnnn { ctex } { replace-package-invalid } }
+    \msg_new:nnn { ctex } { replace-package-invalid }
+      {
+        \token_to_str:N \ctex_replace_package:nn \{#1\}\{#2\}~is~invalid~
+        before~LaTeX~2020-10-01.
+      }
+  }
 \cs_new_protected:Npn \ctex_at_begin_package:nn #1
   {
     \@ifpackageloaded {#1}
@@ -49,7 +124,7 @@
       { \use:n }
       { \ctex_gadd_package_hook:nnn { after } {#1} }
   }
-\@ifl at t@r \fmtversion { 2020/10/01 }
+\ctex_if_format_at_least:nTF { 2020/10/01 }
   {
     \cs_new_protected:Npx \ctex_gadd_ltxhook:nn #1
       { \hook_gput_code:nnn {#1} { \c_novalue_tl } }

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty	2021-06-20 19:56:11 UTC (rev 59654)
@@ -26,10 +26,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Patching commands (CTEX)}
 \ProvidesExplPackage{ctexpatch}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \cs_new_protected:Npn \ctex_patch_cmd_once:NnnnTF #1#2
   {
     \ctex_patch_boot:NNnnTF \__ctex_patch_cmd:Nnnnnw #1

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls	2021-06-20 19:56:11 UTC (rev 59654)
@@ -27,16 +27,10 @@
 \NeedsTeXFormat{LaTeX2e}
 \input{ctexbackend.cfg}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese adapter for class report (CTEX)}
 \ProvidesExplClass{ctexrep}
-  {\ExplFileDate}{2.5.6}{\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
-\cs_new_eq:cN { ver at ctexcap.     \@pkgextension } \c__ctex_version_tl
-\cs_new_eq:cN { ver at ctexsize.    \@pkgextension } \c__ctex_version_tl
-\cs_new_eq:cN { ver at ctexheading. \@pkgextension } \c__ctex_version_tl
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \RequirePackage { xparse , l3keys2e }
 \msg_new:nnnn { ctex } { l3-too-old }
   { Support~package~`#1'~too~old. }
@@ -62,7 +56,16 @@
   { \msg_critical:nnx { ctex } { engine-not-supported } { \c__ctex_engine_str } }
 \RequirePackage { ctexhook , ctexpatch }
 \RequirePackage { fix-cm }
-\RequirePackage { everysel }
+\ctex_disable_package:n { ctex }
+\ctex_disable_package:n { ctexcap }
+\ctex_disable_package:n { ctexsize }
+\ctex_disable_package:n { ctexheading }
+\ctex_if_format_at_least:nTF { 2021/06/01 }
+  { \bool_const:Nn \c__ctex_everysel_loaded_bool { \c_false_bool } }
+  {
+    \RequirePackage { everysel }
+    \bool_const:Nn \c__ctex_everysel_loaded_bool { \c_true_bool }
+  }
 \tl_clear_new:N \l__ctex_tmp_tl
 \int_new:N \l__ctex_tmp_int
 \box_new:N \l__ctex_tmp_box
@@ -75,44 +78,6 @@
   { \keys_set:nn { ctex } }
 \cs_new_protected:Npn \ctex_set:nn #1
   { \keys_set:nn { ctex / #1 } }
-\cs_new_protected:Npn \ctex_file_input:n #1
-  {
-    \ctex_push_file:
-      \file_input:n {#1}
-    \ctex_pop_file:
-  }
-\cs_new_protected:Npn \ctex_push_file:
-  {
-    \seq_gpush:Nx \g__ctex_file_status_seq
-      {
-        {
-          \bool_if:NTF \l__kernel_expl_bool
-            { \ExplSyntaxOn }
-            { \ExplSyntaxOff }
-        }
-        { \char_value_catcode:n { 64 } }
-        { \char_value_catcode:n { 94 } }
-        { \int_use:N \tex_endlinechar:D }
-      }
-    \ExplSyntaxOff
-    \char_set_catcode_letter:n { 64 }
-    \char_set_catcode_math_superscript:n { 94 }
-    \int_set:Nn \tex_endlinechar:D { 13 }
-  }
-\cs_new_protected:Npn \ctex_pop_file:
-  {
-    \seq_gpop:NN \g__ctex_file_status_seq \l__ctex_file_status_tl
-    \exp_after:wN \__ctex_pop_file_aux:nnnn \l__ctex_file_status_tl
-  }
-\cs_new_protected:Npn \__ctex_pop_file_aux:nnnn #1#2#3#4
-  {
-    #1
-    \char_set_catcode:nn { 64 } {#2}
-    \char_set_catcode:nn { 94 } {#3}
-    \int_set:Nn \tex_endlinechar:D {#4}
-  }
-\tl_new:N \l__ctex_file_status_tl
-\seq_new:N \g__ctex_file_status_seq
 \cs_new_protected:Npn \ctex_scheme_input:n #1
   {
     \ctex_push_file:
@@ -1431,8 +1396,12 @@
 \cs_new_protected:Npn \ctex_cleveref_hook:
   {
     \@ifpackageloaded { hyperref }
-      { \__ctex_cleveref_hook_aux:N \H at refstepcounter }
       {
+        \@ifpackagewith { hyperref } { implicit = false }
+          { }
+          { \__ctex_cleveref_hook_aux:N \H at refstepcounter }
+      }
+      {
         \__ctex_cleveref_hook_aux:N \refstepcounter at noarg
         \__ctex_cleveref_hook_aux:N \refstepcounter at optarg
       }
@@ -1556,8 +1525,8 @@
   { \cs_set_protected:Npn #3 { \@setfontsize #3 {#1} {#2} #4 } }
 \int_case:nn { \g__ctex_font_size_int }
   {
-    { 0 } { \ctex_file_input:n { ctex-c5size.clo } }
-    { 1 } { \ctex_file_input:n { ctex-cs4size.clo } }
+    { 0 } { \file_input:n { ctex-c5size.clo } }
+    { 1 } { \file_input:n { ctex-cs4size.clo } }
   }
 \fp_if_nan:nF { \l__ctex_line_spread_fp }
   {

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty	2021-06-20 19:56:11 UTC (rev 59654)
@@ -26,52 +26,14 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese font size definition (CTEX)}
 \ProvidesExplPackage{ctexsize}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \RequirePackage { xparse , l3keys2e }
 \RequirePackage { fix-cm }
 \cs_new_protected:Npn \ctex_define_option:n
   { \keys_define:nn { ctex / option } }
-\cs_new_protected:Npn \ctex_file_input:n #1
-  {
-    \ctex_push_file:
-      \file_input:n {#1}
-    \ctex_pop_file:
-  }
-\cs_new_protected:Npn \ctex_push_file:
-  {
-    \seq_gpush:Nx \g__ctex_file_status_seq
-      {
-        {
-          \bool_if:NTF \l__kernel_expl_bool
-            { \ExplSyntaxOn }
-            { \ExplSyntaxOff }
-        }
-        { \char_value_catcode:n { 64 } }
-        { \char_value_catcode:n { 94 } }
-        { \int_use:N \tex_endlinechar:D }
-      }
-    \ExplSyntaxOff
-    \char_set_catcode_letter:n { 64 }
-    \char_set_catcode_math_superscript:n { 94 }
-    \int_set:Nn \tex_endlinechar:D { 13 }
-  }
-\cs_new_protected:Npn \ctex_pop_file:
-  {
-    \seq_gpop:NN \g__ctex_file_status_seq \l__ctex_file_status_tl
-    \exp_after:wN \__ctex_pop_file_aux:nnnn \l__ctex_file_status_tl
-  }
-\cs_new_protected:Npn \__ctex_pop_file_aux:nnnn #1#2#3#4
-  {
-    #1
-    \char_set_catcode:nn { 64 } {#2}
-    \char_set_catcode:nn { 94 } {#3}
-    \int_set:Nn \tex_endlinechar:D {#4}
-  }
-\tl_new:N \l__ctex_file_status_tl
-\seq_new:N \g__ctex_file_status_seq
 \int_new:N \g__ctex_font_size_int
 \int_gset:Nn \g__ctex_font_size_int { -1 }
 \ctex_define_option:n
@@ -193,8 +155,8 @@
   { \cs_set_protected:Npn #3 { \@setfontsize #3 {#1} {#2} #4 } }
 \int_case:nn { \g__ctex_font_size_int }
   {
-    { 0 } { \ctex_file_input:n { ctex-c5size.clo } }
-    { 1 } { \ctex_file_input:n { ctex-cs4size.clo } }
+    { 0 } { \file_input:n { ctex-c5size.clo } }
+    { 1 } { \file_input:n { ctex-cs4size.clo } }
   }
 \normalsize
 %% 

Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -26,7 +26,7 @@
 %% ---------------------------------------------------------------------
 %% 
 \ProvidesFile{ctexspa.def}%
-  [2021/03/14 v2.5.6 Space info for CJKpunct (CTEX)]
+  [2021/06/20 v2.5.7 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/dictionary/translator-theorem-dictionary-ChineseGBK.dict
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict	2021-06-20 19:56:11 UTC (rev 59654)
@@ -25,7 +25,7 @@
 %% ---------------------------------------------------------------------
 %% 
 \ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
-  [2021/03/14 v2.5.6 Chinese translation for theorem name (CTEX)]
+  [2021/06/20 v2.5.7 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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict	2021-06-20 19:56:11 UTC (rev 59654)
@@ -25,7 +25,7 @@
 %% ---------------------------------------------------------------------
 %% 
 \ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
-  [2021/03/14 v2.5.6 Chinese translation for theorem name (CTEX)]
+  [2021/06/20 v2.5.7 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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,23 +24,29 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Asian pTeX adapter (CTEX)}
 \ProvidesExplFile{ctex-engine-aptex.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \cs_new_protected:Npn \ctex_set_zhmap:n
   { \tl_gput_right:Nx \g__ctex_zhmap_tl }
 \cs_new_protected:Npn \ctex_use_zhmap:
   { \tl_use:N \g__ctex_zhmap_tl }
 \cs_if_exist:NTF \ctex_gadd_ltxhook:nn
-  { \ctex_gadd_ltxhook:nn { shipout/firstpage } { \ctex_use_zhmap: } }
   {
+    \cs_new_protected:Npn \ctex_at_shipout_first:n
+      { \ctex_gadd_ltxhook:nn { shipout/firstpage } }
+    \ctex_at_shipout_first:n { \ctex_use_zhmap: }
+  }
+  {
     \cs_new_protected:Npn \ctex_add_dvi_zhmap:
       { \AtBeginDvi { \ctex_use_zhmap: } }
     \ctex_after_end_preamble:n { \ctex_add_dvi_zhmap: }
     \ctex_at_end_package:nn { atbegshi }
       {
-        \AtBeginShipoutFirst { \ctex_use_zhmap: }
+        \cs_new_protected:Npn \ctex_at_shipout_first:n
+          { \AtBeginShipoutFirst }
+        \ctex_at_shipout_first:n { \ctex_use_zhmap: }
         \cs_gset_eq:NN \ctex_add_dvi_zhmap: \prg_do_nothing:
       }
   }
@@ -116,7 +122,8 @@
 \@onlypreamble \ctex_set_upmap:nnn
 \@onlypreamble \ctex_set_upmap_unicode:nnn
 \@onlypreamble \ctex_set_upfonts:nnnnnn
-\RequirePackage { pxeverysel }
+\bool_if:NT \c__ctex_everysel_loaded_bool
+  { \RequirePackage { pxeverysel } }
 \cs_new_protected:Npn \ctex_provide_font_hook:NNN #1#2
   {
     \exp_args:Nc \__ctex_provide_font_hook_aux:NNNN
@@ -180,9 +187,16 @@
       { \exp_not:o { \CJKfamilydefault } }
   }
 \tl_gset_eq:NN \CJKfamilydefault \l__ctex_family_default_init_tl
-\ctex_hypersetup:n { driverfallback = dvipdfmx }
+\ctex_hypersetup:n
+  {
+    driverfallback = dvipdfmx ,
+    pdfencoding    = pdfdoc
+  }
 \ctex_at_end_package:nn { hyperref }
-  { \AtBeginShipoutFirst { \special { pdf:tounicode~UTF8-UTF16 } } }
+  {
+    \ctex_at_shipout_first:n
+      { \special { pdf:tounicode~UTF8-UTF16 } }
+  }
 \cs_new_protected:Npn \ctex_update_ccwd:
   { \skip_set:Nn \ccwd { 1zw + \tex_kanjiskip:D } }
 \dim_new:N \ccwd
@@ -202,39 +216,46 @@
       { \exp_not:o { \CTEX at selectfont@hook #1 } }
   }
 \cs_new_eq:NN \CTEX at selectfont@hook \prg_do_nothing:
-\if_cs_exist:N \@EverySelectfont at Init
-  \group_begin:
-    \cs_set:Npn \__ctex_tmp:N #1
-      {
-        \tl_set:Nn \l__ctex_tmp_tl {#1}
-        \cs_new_eq:NN \CTEX at selectfont@save #1
-        \cs_new_protected:Npn \__ctex_restore_selectfont:
-          {
-            \cs_if_free:NF \scr at new@selectfont
-              {
-                \cs_if_free:NF \par at update
-                  {
-                    \tl_put_right:Nn \@EverySelectfont at Init
-                      { \tl_put_right:Nn #1 { \par at update } }
-                  }
-                \cs_set_eq:NN \scr at new@selectfont #1
-                \cs_set_eq:NN \CTEX at selectfont@save \scr at selectfont
-              }
-            \tl_put_left:Nn \@EverySelectfont at Init
-              { \cs_set_eq:NN #1 \CTEX at selectfont@save }
-            \cs_undefine:N \__ctex_restore_selectfont:
-          }
-      }
-    \ctex_parse_name:NN \__ctex_tmp:N \selectfont
-  \exp_last_unbraced:NNo \group_end:
-  \ctex_patch_cmd_once:NnnnTF { \l__ctex_tmp_tl }
-    { \ExplSyntaxOff }
-    { \size at update }
-    { \CTEX at selectfont@hook \size at update }
-    { \__ctex_restore_selectfont: }
-    { \ctex_patch_failure:N \selectfont }
+\if_bool:N \c__ctex_everysel_loaded_bool
+  \if_cs_exist:N \@EverySelectfont at Init
+    \group_begin:
+      \cs_set:Npn \__ctex_tmp:N #1
+        {
+          \tl_set:Nn \l__ctex_tmp_tl {#1}
+          \cs_new_eq:NN \CTEX at selectfont@save #1
+          \cs_new_protected:Npn \__ctex_restore_selectfont:
+            {
+              \cs_if_free:NF \scr at new@selectfont
+                {
+                  \cs_if_free:NF \par at update
+                    {
+                      \tl_put_right:Nn \@EverySelectfont at Init
+                        { \tl_put_right:Nn #1 { \par at update } }
+                    }
+                  \cs_set_eq:NN \scr at new@selectfont #1
+                  \cs_set_eq:NN \CTEX at selectfont@save \scr at selectfont
+                }
+              \tl_put_left:Nn \@EverySelectfont at Init
+                { \cs_set_eq:NN #1 \CTEX at selectfont@save }
+              \cs_undefine:N \__ctex_restore_selectfont:
+            }
+        }
+      \ctex_parse_name:NN \__ctex_tmp:N \selectfont
+    \exp_last_unbraced:NNo \group_end:
+    \ctex_patch_cmd_once:NnnnTF { \l__ctex_tmp_tl }
+      { \ExplSyntaxOff }
+      { \size at update }
+      { \CTEX at selectfont@hook \size at update }
+      { \__ctex_restore_selectfont: }
+      { \ctex_patch_failure:N \selectfont }
+  \fi:
+  \cs_new_protected:Npn \ctex_gadd_selectfont_hook:n
+    { \EverySelectfont }
+\else:
+  \cs_new_protected:Npn \ctex_gadd_selectfont_hook:n
+    { \ctex_gadd_ltxhook:nn { selectfont } }
 \fi:
-\EverySelectfont { \CTEX at selectfont@hook }
+\ctex_gadd_selectfont_hook:n { \CTEX at selectfont@hook }
 \cs_new_protected:Npn \ctex_update_xkanjiskip:
   {
     \skip_if_eq:nnT

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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {LuaLaTeX adapter (CTEX)}
 \ProvidesExplFile{ctex-engine-luatex.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \msg_new:nnn { ctex } { luatexja-loaded }
   {
     Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\
@@ -35,7 +35,13 @@
   }
 \@ifpackageloaded { luatexja }
   { \msg_critical:nnx { ctex } { luatexja-loaded } { \g_file_curr_name_str } }
-  { \tl_const:cn { ver at ltj-latex.\@pkgextension } { 9999/99/99 } }
+  {
+    \ctex_at_begin_package:nn { luatexja }
+      { \msg_redirect_name:nnn { ctex } { disable-package } { info } }
+    \ctex_at_end_package:nn { luatexja }
+      { \msg_redirect_name:nnn { ctex } { disable-package } { } }
+    \ctex_disable_package:n { ltj-latex }
+  }
 \RequirePackage { luatexja }
 \@ifpackagelater { luatexja } { 2020/04/12 } { }
   { \msg_error:nnn { ctex } { package-too-old } { luatexja } }
@@ -42,6 +48,7 @@
 \RequirePackage { fontspec }
 \@ifpackagelater { fontspec } { 2020/02/21 } { }
   { \msg_error:nnn { ctex } { package-too-old } { fontspec } }
+\ctex_at_end:n { \char_set_catcode_comment:n { \ltjlineendcomment } }
 \ExplSyntaxOff
 \ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF}
 \ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF}
@@ -1171,34 +1178,41 @@
       { \exp_not:o { \CTEX at selectfont@hook #1 } }
   }
 \cs_new_eq:NN \CTEX at selectfont@hook \prg_do_nothing:
-\if_cs_exist:N \@EverySelectfont at Init
-  \group_begin:
-    \cs_set:Npn \__ctex_tmp:N #1
-      {
-        \tl_set:Nn \l__ctex_tmp_tl {#1}
-        \cs_new_eq:NN \CTEX at selectfont@save #1
-        \cs_new_protected:Npn \__ctex_restore_selectfont:
-          {
-            \cs_if_free:NF \scr at new@selectfont
-              {
-                \cs_set_eq:NN \scr at new@selectfont #1
-                \cs_set_eq:NN \CTEX at selectfont@save \scr at selectfont
-              }
-            \tl_put_left:Nn \@EverySelectfont at Init
-              { \cs_set_eq:NN #1 \CTEX at selectfont@save }
-            \cs_undefine:N \__ctex_restore_selectfont:
-          }
-      }
-    \ctex_parse_name:NN \__ctex_tmp:N \selectfont
-  \exp_last_unbraced:NNo \group_end:
-  \ctex_patch_cmd_once:NnnnTF { \l__ctex_tmp_tl }
-    { \ExplSyntaxOff }
-    { \size at update }
-    { \CTEX at selectfont@hook \size at update }
-    { \__ctex_restore_selectfont: }
-    { \ctex_patch_failure:N \selectfont }
+\if_bool:N \c__ctex_everysel_loaded_bool
+  \if_cs_exist:N \@EverySelectfont at Init
+    \group_begin:
+      \cs_set:Npn \__ctex_tmp:N #1
+        {
+          \tl_set:Nn \l__ctex_tmp_tl {#1}
+          \cs_new_eq:NN \CTEX at selectfont@save #1
+          \cs_new_protected:Npn \__ctex_restore_selectfont:
+            {
+              \cs_if_free:NF \scr at new@selectfont
+                {
+                  \cs_set_eq:NN \scr at new@selectfont #1
+                  \cs_set_eq:NN \CTEX at selectfont@save \scr at selectfont
+                }
+              \tl_put_left:Nn \@EverySelectfont at Init
+                { \cs_set_eq:NN #1 \CTEX at selectfont@save }
+              \cs_undefine:N \__ctex_restore_selectfont:
+            }
+        }
+      \ctex_parse_name:NN \__ctex_tmp:N \selectfont
+    \exp_last_unbraced:NNo \group_end:
+    \ctex_patch_cmd_once:NnnnTF { \l__ctex_tmp_tl }
+      { \ExplSyntaxOff }
+      { \size at update }
+      { \CTEX at selectfont@hook \size at update }
+      { \__ctex_restore_selectfont: }
+      { \ctex_patch_failure:N \selectfont }
+  \fi:
+  \cs_new_protected:Npn \ctex_gadd_selectfont_hook:n
+    { \EverySelectfont }
+\else:
+  \cs_new_protected:Npn \ctex_gadd_selectfont_hook:n
+    { \ctex_gadd_ltxhook:nn { selectfont } }
 \fi:
-\EverySelectfont { \CTEX at selectfont@hook }
+\ctex_gadd_selectfont_hook:n { \CTEX at selectfont@hook }
 \ctex_add_to_selectfont:n
   {
     \ctex_ltj_select_font:

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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,23 +24,29 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {(pdf)LaTeX adapter (CTEX)}
 \ProvidesExplFile{ctex-engine-pdftex.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \cs_new_protected:Npn \ctex_set_zhmap:n
   { \tl_gput_right:Nx \g__ctex_zhmap_tl }
 \cs_new_protected:Npn \ctex_use_zhmap:
   { \tl_use:N \g__ctex_zhmap_tl }
 \cs_if_exist:NTF \ctex_gadd_ltxhook:nn
-  { \ctex_gadd_ltxhook:nn { shipout/firstpage } { \ctex_use_zhmap: } }
   {
+    \cs_new_protected:Npn \ctex_at_shipout_first:n
+      { \ctex_gadd_ltxhook:nn { shipout/firstpage } }
+    \ctex_at_shipout_first:n { \ctex_use_zhmap: }
+  }
+  {
     \cs_new_protected:Npn \ctex_add_dvi_zhmap:
       { \AtBeginDvi { \ctex_use_zhmap: } }
     \ctex_after_end_preamble:n { \ctex_add_dvi_zhmap: }
     \ctex_at_end_package:nn { atbegshi }
       {
-        \AtBeginShipoutFirst { \ctex_use_zhmap: }
+        \cs_new_protected:Npn \ctex_at_shipout_first:n
+          { \AtBeginShipoutFirst }
+        \ctex_at_shipout_first:n { \ctex_use_zhmap: }
         \cs_gset_eq:NN \ctex_add_dvi_zhmap: \prg_do_nothing:
       }
   }
@@ -61,24 +67,31 @@
 \cs_new_protected:Npn \ctex_add_cmap:n #1
   {
     \cs_if_free:NF \CJK at plane
-      { \ctex_add_cmap:cn { __ctex_add_cmap_ #1 \CJK at plane : } {#1} }
+      { \exp_args:Ne \__ctex_add_cmap_auxi:n { #1 \CJK at plane } }
   }
-\cs_new_protected:Npn \ctex_add_cmap:Nn #1#2
+\cs_new_protected:Npn \__ctex_add_cmap_auxi:n #1
+  { \exp_args:Nc \__ctex_add_cmap_auxii:Nn { __ctex_add_cmap_ #1 : } {#1} }
+\cs_new_protected:Npn \__ctex_add_cmap_auxii:Nn #1#2
   {
     \cs_if_exist:NF #1 { \__ctex_save_cmap:Nn #1 {#2} }
     #1
   }
-\cs_generate_variant:Nn \ctex_add_cmap:Nn { c }
 \cs_new_protected:Npn \__ctex_save_cmap:Nn #1#2
   {
-    \tl_set:Nx \l__ctex_tmp_tl { \str_lowercase:n {#2} \CJK at plane }
-    \tex_immediate:D \tex_pdfobj:D stream ~ file { \l__ctex_tmp_tl .cmap }
-    \cs_new_protected:Npx #1
+    \exp_args:Ne \file_get_full_name:nNTF
+      { \str_lowercase:n {#2} .cmap } \l__ctex_cmap_file_tl
       {
-        \exp_not:N \tex_pdffontattr:D \exp_not:N \tex_font:D
-          { /ToUnicode ~ \int_use:N \tex_pdflastobj:D \c_space_tl 0 ~ R }
+        \tex_immediate:D \tex_pdfobj:D stream ~ file { \l__ctex_cmap_file_tl }
+        \cs_new_protected:Npx #1
+          {
+            \pdfnobuiltintounicode \tex_font:D
+            \tex_pdffontattr:D \tex_font:D
+              { /ToUnicode ~ \int_value:w \tex_pdflastobj:D \c_space_tl 0 ~ R }
+          }
       }
+      { \cs_new_eq:NN #1 \prg_do_nothing: }
   }
+\tl_new:N \l__ctex_cmap_file_tl
 \group_begin:
 \char_set_catcode_other:N \#
 \sys_if_output_pdf:TF
@@ -88,7 +101,10 @@
       { \CTEX at Family@CMap {#1} {#2} }
       {
         \ctex_at_end_package:nn { cmap }
-          { \cs_gset_eq:NN \CTEX at Family@CMap \use_none:nn }
+          {
+            \cs_gset_eq:NN \ctex_add_cmap:n \use_none:n
+            \cs_gset_eq:NN \CTEX at Family@CMap \use_none:nn
+          }
       }
       { \ctex_patch_failure:N \DeclareFontFamily }
   }
@@ -118,27 +134,36 @@
     \ctex_pop_file:
   }
 \cs_set_eq:NN \CJK at input \ctex_CJK_input:n
-\if_cs_exist:N \CJK at surr
-  \cs_new_protected:Npn \ctex_plane_to_utfxvibe:Nn #1#2
-    {
-      \tl_set:Nx \l__ctex_tmp_tl {#2}
-      \int_set:Nn \l__ctex_tmp_int
-        { \exp_args:No \int_from_hex:n { \l__ctex_tmp_tl } }
-      \int_compare:nNnTF \l__ctex_tmp_int < { 256 }
-        { \tl_gset:Nx #1 { \int_to_Hex:n { \l__ctex_tmp_int } } }
-        {
-          \int_sub:Nn \l__ctex_tmp_int { 256 }
-          \tl_gset:Nx #1
-            {
-              \int_to_Hex:n
-                { \int_div_truncate:nn { \l__ctex_tmp_int } { 4 } + "D800 }
-              \int_to_Hex:n
-                { \int_mod:nn { \l__ctex_tmp_int } { 4 } + "DC }
-            }
-        }
-    }
-  \cs_set_eq:NN \CJK at surr \ctex_plane_to_utfxvibe:Nn
-\fi:
+\cs_if_free:NF \CJK at surr
+  {
+    \cs_new_protected:Npn \ctex_plane_to_utfxvibe:Nn #1#2
+      {
+        \int_set:Nn \l__ctex_tmp_int
+          { \exp_args:Ne \int_from_hex:n {#2} }
+        \int_compare:nNnTF \l__ctex_tmp_int < { 256 }
+          { \tl_gset:Nx #1 { \int_to_Hex:n { \l__ctex_tmp_int } } }
+          {
+            \int_sub:Nn \l__ctex_tmp_int { 256 }
+            \tl_gset:Nx #1
+              {
+                \int_to_Hex:n
+                  { \int_div_truncate:nn { \l__ctex_tmp_int } { 4 } + "D800 }
+                \int_to_Hex:n
+                  { \int_mod:nn { \l__ctex_tmp_int } { 4 } + "DC }
+              }
+          }
+      }
+    \cs_set_eq:NN \CJK at surr \ctex_plane_to_utfxvibe:Nn
+  }
+\cs_if_free:NF \CJK at addcmap
+  {
+    \ctex_patch_cmd:Nnn \CJK at addcmap
+      { \pdffontattr \font at name }
+      {
+        \pdfnobuiltintounicode \font at name
+        \pdffontattr \font at name
+      }
+  }
 \AtBeginDocument
   {
     \str_if_eq:eeF { \l__ctex_punct_tl } { quanjiao }
@@ -294,11 +319,12 @@
     \sys_if_output_pdf:TF
       { \ctex_at_end_package:nn { hyperref } { \RequirePackage { xCJK2uni } } }
       {
+        \ctex_hypersetup:n { pdfencoding = pdfdoc }
         \ctex_at_end_package:nn { hyperref }
           {
             \str_if_eq:onTF { \Hy at driver } { hdvipdfm }
               {
-                \AtBeginShipoutFirst
+                \ctex_at_shipout_first:n
                   { \special { pdf:tounicode~GBK-EUC-UCS2 } }
               }
               { \RequirePackage { xCJK2uni } }
@@ -341,36 +367,44 @@
       { \exp_not:o { \CTEX at selectfont@hook #1 } }
   }
 \cs_new_eq:NN \CTEX at selectfont@hook \prg_do_nothing:
-\if_cs_exist:N \@EverySelectfont at Init
-  \group_begin:
-    \cs_set:Npn \__ctex_tmp:N #1
-      {
-        \tl_set:Nn \l__ctex_tmp_tl {#1}
-        \cs_new_eq:NN \CTEX at selectfont@save #1
-        \cs_new_protected:Npn \__ctex_restore_selectfont:
-          {
-            \cs_if_free:NF \scr at new@selectfont
-              {
-                \cs_if_free:NF \par at update
-                  { \tl_put_right:Nn #1 { \par at update } }
-                \cs_set_eq:NN \scr at selectfont \CTEX at selectfont@save
-                \cs_set_eq:NN \scr at new@selectfont #1
-              }
-            \tl_put_left:Nn \@EverySelectfont at Init
-              { \cs_set_eq:NN #1 \CTEX at selectfont@save }
-            \cs_undefine:N \__ctex_restore_selectfont:
-          }
-      }
-    \ctex_parse_name:NN \__ctex_tmp:N \selectfont
-  \exp_last_unbraced:NNo \group_end:
-  \ctex_patch_cmd_once:NnnnTF { \l__ctex_tmp_tl }
-    { \ExplSyntaxOff }
-    { \size at update }
-    { \CTEX at selectfont@hook \size at update }
-    { \__ctex_restore_selectfont: }
-    { \ctex_patch_failure:N \selectfont }
+\if_bool:N \c__ctex_everysel_loaded_bool
+  \if_cs_exist:N \@EverySelectfont at Init
+    \group_begin:
+      \cs_set:Npn \__ctex_tmp:N #1
+        {
+          \tl_set:Nn \l__ctex_tmp_tl {#1}
+          \cs_new_eq:NN \CTEX at selectfont@save #1
+          \cs_new_protected:Npn \__ctex_restore_selectfont:
+            {
+              \cs_if_free:NF \scr at new@selectfont
+                {
+                  \cs_if_free:NF \par at update
+                    { \tl_put_right:Nn #1 { \par at update } }
+                  \cs_set_eq:NN \scr at selectfont \CTEX at selectfont@save
+                  \cs_set_eq:NN \scr at new@selectfont #1
+                }
+              \tl_put_left:Nn \@EverySelectfont at Init
+                { \cs_set_eq:NN #1 \CTEX at selectfont@save }
+              \cs_undefine:N \__ctex_restore_selectfont:
+            }
+        }
+      \ctex_parse_name:NN \__ctex_tmp:N \selectfont
+    \exp_last_unbraced:NNo \group_end:
+    \ctex_patch_cmd_once:NnnnTF { \l__ctex_tmp_tl }
+      { \ExplSyntaxOff }
+      { \size at update }
+      { \CTEX at selectfont@hook \size at update }
+      { \__ctex_restore_selectfont: }
+      { \ctex_patch_failure:N \selectfont }
+  \fi:
+  \cs_new_protected:Npn \ctex_gadd_selectfont_hook:n
+    { \EverySelectfont }
+\else:
+  \cs_new_protected:Npn \ctex_gadd_selectfont_hook:n
+    { \ctex_gadd_ltxhook:nn { selectfont } }
 \fi:
-\EverySelectfont { \cs_if_exist:NF \CJK at plane { \CTEX at selectfont@hook } }
+\ctex_gadd_selectfont_hook:n
+  { \cs_if_exist:NF \CJK at plane { \CTEX at selectfont@hook } }
 \ctex_define:n
   {
     space .choice: ,

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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,23 +24,29 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {upTeX adapter (CTEX)}
 \ProvidesExplFile{ctex-engine-uptex.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \cs_new_protected:Npn \ctex_set_zhmap:n
   { \tl_gput_right:Nx \g__ctex_zhmap_tl }
 \cs_new_protected:Npn \ctex_use_zhmap:
   { \tl_use:N \g__ctex_zhmap_tl }
 \cs_if_exist:NTF \ctex_gadd_ltxhook:nn
-  { \ctex_gadd_ltxhook:nn { shipout/firstpage } { \ctex_use_zhmap: } }
   {
+    \cs_new_protected:Npn \ctex_at_shipout_first:n
+      { \ctex_gadd_ltxhook:nn { shipout/firstpage } }
+    \ctex_at_shipout_first:n { \ctex_use_zhmap: }
+  }
+  {
     \cs_new_protected:Npn \ctex_add_dvi_zhmap:
       { \AtBeginDvi { \ctex_use_zhmap: } }
     \ctex_after_end_preamble:n { \ctex_add_dvi_zhmap: }
     \ctex_at_end_package:nn { atbegshi }
       {
-        \AtBeginShipoutFirst { \ctex_use_zhmap: }
+        \cs_new_protected:Npn \ctex_at_shipout_first:n
+          { \AtBeginShipoutFirst }
+        \ctex_at_shipout_first:n { \ctex_use_zhmap: }
         \cs_gset_eq:NN \ctex_add_dvi_zhmap: \prg_do_nothing:
       }
   }
@@ -116,7 +122,8 @@
 \@onlypreamble \ctex_set_upmap:nnn
 \@onlypreamble \ctex_set_upmap_unicode:nnn
 \@onlypreamble \ctex_set_upfonts:nnnnnn
-\RequirePackage { pxeverysel }
+\bool_if:NT \c__ctex_everysel_loaded_bool
+  { \RequirePackage { pxeverysel } }
 \cs_new_protected:Npn \ctex_provide_font_hook:NNN #1#2
   {
     \exp_args:Nc \__ctex_provide_font_hook_aux:NNNN
@@ -180,9 +187,16 @@
       { \exp_not:o { \CJKfamilydefault } }
   }
 \tl_gset_eq:NN \CJKfamilydefault \l__ctex_family_default_init_tl
-\ctex_hypersetup:n { driverfallback = dvipdfmx }
+\ctex_hypersetup:n
+  {
+    driverfallback = dvipdfmx ,
+    pdfencoding    = pdfdoc
+  }
 \ctex_at_end_package:nn { hyperref }
-  { \AtBeginShipoutFirst { \special { pdf:tounicode~UTF8-UTF16 } } }
+  {
+    \ctex_at_shipout_first:n
+      { \special { pdf:tounicode~UTF8-UTF16 } }
+  }
 \cs_new_protected:Npn \ctex_update_ccwd:
   { \skip_set:Nn \ccwd { 1zw + \tex_kanjiskip:D } }
 \dim_new:N \ccwd
@@ -202,39 +216,46 @@
       { \exp_not:o { \CTEX at selectfont@hook #1 } }
   }
 \cs_new_eq:NN \CTEX at selectfont@hook \prg_do_nothing:
-\if_cs_exist:N \@EverySelectfont at Init
-  \group_begin:
-    \cs_set:Npn \__ctex_tmp:N #1
-      {
-        \tl_set:Nn \l__ctex_tmp_tl {#1}
-        \cs_new_eq:NN \CTEX at selectfont@save #1
-        \cs_new_protected:Npn \__ctex_restore_selectfont:
-          {
-            \cs_if_free:NF \scr at new@selectfont
-              {
-                \cs_if_free:NF \par at update
-                  {
-                    \tl_put_right:Nn \@EverySelectfont at Init
-                      { \tl_put_right:Nn #1 { \par at update } }
-                  }
-                \cs_set_eq:NN \scr at new@selectfont #1
-                \cs_set_eq:NN \CTEX at selectfont@save \scr at selectfont
-              }
-            \tl_put_left:Nn \@EverySelectfont at Init
-              { \cs_set_eq:NN #1 \CTEX at selectfont@save }
-            \cs_undefine:N \__ctex_restore_selectfont:
-          }
-      }
-    \ctex_parse_name:NN \__ctex_tmp:N \selectfont
-  \exp_last_unbraced:NNo \group_end:
-  \ctex_patch_cmd_once:NnnnTF { \l__ctex_tmp_tl }
-    { \ExplSyntaxOff }
-    { \size at update }
-    { \CTEX at selectfont@hook \size at update }
-    { \__ctex_restore_selectfont: }
-    { \ctex_patch_failure:N \selectfont }
+\if_bool:N \c__ctex_everysel_loaded_bool
+  \if_cs_exist:N \@EverySelectfont at Init
+    \group_begin:
+      \cs_set:Npn \__ctex_tmp:N #1
+        {
+          \tl_set:Nn \l__ctex_tmp_tl {#1}
+          \cs_new_eq:NN \CTEX at selectfont@save #1
+          \cs_new_protected:Npn \__ctex_restore_selectfont:
+            {
+              \cs_if_free:NF \scr at new@selectfont
+                {
+                  \cs_if_free:NF \par at update
+                    {
+                      \tl_put_right:Nn \@EverySelectfont at Init
+                        { \tl_put_right:Nn #1 { \par at update } }
+                    }
+                  \cs_set_eq:NN \scr at new@selectfont #1
+                  \cs_set_eq:NN \CTEX at selectfont@save \scr at selectfont
+                }
+              \tl_put_left:Nn \@EverySelectfont at Init
+                { \cs_set_eq:NN #1 \CTEX at selectfont@save }
+              \cs_undefine:N \__ctex_restore_selectfont:
+            }
+        }
+      \ctex_parse_name:NN \__ctex_tmp:N \selectfont
+    \exp_last_unbraced:NNo \group_end:
+    \ctex_patch_cmd_once:NnnnTF { \l__ctex_tmp_tl }
+      { \ExplSyntaxOff }
+      { \size at update }
+      { \CTEX at selectfont@hook \size at update }
+      { \__ctex_restore_selectfont: }
+      { \ctex_patch_failure:N \selectfont }
+  \fi:
+  \cs_new_protected:Npn \ctex_gadd_selectfont_hook:n
+    { \EverySelectfont }
+\else:
+  \cs_new_protected:Npn \ctex_gadd_selectfont_hook:n
+    { \ctex_gadd_ltxhook:nn { selectfont } }
 \fi:
-\EverySelectfont { \CTEX at selectfont@hook }
+\ctex_gadd_selectfont_hook:n { \CTEX at selectfont@hook }
 \cs_new_protected:Npn \ctex_update_xkanjiskip:
   {
     \skip_if_eq:nnT

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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {XeLaTeX adapter (CTEX)}
 \ProvidesExplFile{ctex-engine-xetex.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \RequirePackage { xeCJK }
 \exp_args:Nx \xeCJKsetup
   {
@@ -78,34 +78,41 @@
       { \exp_not:o { \CTEX at selectfont@hook #1 } }
   }
 \cs_new_eq:NN \CTEX at selectfont@hook \prg_do_nothing:
-\if_cs_exist:N \@EverySelectfont at Init
-  \group_begin:
-    \cs_set:Npn \__ctex_tmp:N #1
-      {
-        \tl_set:Nn \l__ctex_tmp_tl {#1}
-        \cs_new_eq:NN \CTEX at selectfont@save #1
-        \cs_new_protected:Npn \__ctex_restore_selectfont:
-          {
-            \cs_if_free:NF \scr at new@selectfont
-              {
-                \cs_set_eq:NN \scr at new@selectfont #1
-                \cs_set_eq:NN \CTEX at selectfont@save \scr at selectfont
-              }
-            \tl_put_left:Nn \@EverySelectfont at Init
-              { \cs_set_eq:NN #1 \CTEX at selectfont@save }
-            \cs_undefine:N \__ctex_restore_selectfont:
-          }
-      }
-    \ctex_parse_name:NN \__ctex_tmp:N \selectfont
-  \exp_last_unbraced:NNo \group_end:
-  \ctex_patch_cmd_once:NnnnTF { \l__ctex_tmp_tl }
-    { \ExplSyntaxOff }
-    { \size at update }
-    { \CTEX at selectfont@hook \size at update }
-    { \__ctex_restore_selectfont: }
-    { \ctex_patch_failure:N \selectfont }
+\if_bool:N \c__ctex_everysel_loaded_bool
+  \if_cs_exist:N \@EverySelectfont at Init
+    \group_begin:
+      \cs_set:Npn \__ctex_tmp:N #1
+        {
+          \tl_set:Nn \l__ctex_tmp_tl {#1}
+          \cs_new_eq:NN \CTEX at selectfont@save #1
+          \cs_new_protected:Npn \__ctex_restore_selectfont:
+            {
+              \cs_if_free:NF \scr at new@selectfont
+                {
+                  \cs_set_eq:NN \scr at new@selectfont #1
+                  \cs_set_eq:NN \CTEX at selectfont@save \scr at selectfont
+                }
+              \tl_put_left:Nn \@EverySelectfont at Init
+                { \cs_set_eq:NN #1 \CTEX at selectfont@save }
+              \cs_undefine:N \__ctex_restore_selectfont:
+            }
+        }
+      \ctex_parse_name:NN \__ctex_tmp:N \selectfont
+    \exp_last_unbraced:NNo \group_end:
+    \ctex_patch_cmd_once:NnnnTF { \l__ctex_tmp_tl }
+      { \ExplSyntaxOff }
+      { \size at update }
+      { \CTEX at selectfont@hook \size at update }
+      { \__ctex_restore_selectfont: }
+      { \ctex_patch_failure:N \selectfont }
+  \fi:
+  \cs_new_protected:Npn \ctex_gadd_selectfont_hook:n
+    { \EverySelectfont }
+\else:
+  \cs_new_protected:Npn \ctex_gadd_selectfont_hook:n
+    { \ctex_gadd_ltxhook:nn { selectfont } }
 \fi:
-\EverySelectfont { \CTEX at selectfont@hook }
+\ctex_gadd_selectfont_hook:n { \CTEX at selectfont@hook }
 \ctex_define:n
   {
     space .choice: ,

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd	2021-06-20 19:56:11 UTC (rev 59654)
@@ -25,7 +25,7 @@
 %% ---------------------------------------------------------------------
 %% 
 \ProvidesFile{c19rm.fd}%
-  [2021/03/14 v2.5.6 Chinese font definition (CTEX)]
+  [2021/06/20 v2.5.7 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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd	2021-06-20 19:56:11 UTC (rev 59654)
@@ -25,7 +25,7 @@
 %% ---------------------------------------------------------------------
 %% 
 \ProvidesFile{c19sf.fd}%
-  [2021/03/14 v2.5.6 Chinese font definition (CTEX)]
+  [2021/06/20 v2.5.7 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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd	2021-06-20 19:56:11 UTC (rev 59654)
@@ -25,7 +25,7 @@
 %% ---------------------------------------------------------------------
 %% 
 \ProvidesFile{c19tt.fd}%
-  [2021/03/14 v2.5.6 Chinese font definition (CTEX)]
+  [2021/06/20 v2.5.7 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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd	2021-06-20 19:56:11 UTC (rev 59654)
@@ -25,7 +25,7 @@
 %% ---------------------------------------------------------------------
 %% 
 \ProvidesFile{c70rm.fd}%
-  [2021/03/14 v2.5.6 Chinese font definition (CTEX)]
+  [2021/06/20 v2.5.7 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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd	2021-06-20 19:56:11 UTC (rev 59654)
@@ -25,7 +25,7 @@
 %% ---------------------------------------------------------------------
 %% 
 \ProvidesFile{c70sf.fd}%
-  [2021/03/14 v2.5.6 Chinese font definition (CTEX)]
+  [2021/06/20 v2.5.7 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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd	2021-06-20 19:56:11 UTC (rev 59654)
@@ -25,7 +25,7 @@
 %% ---------------------------------------------------------------------
 %% 
 \ProvidesFile{c70tt.fd}%
-  [2021/03/14 v2.5.6 Chinese font definition (CTEX)]
+  [2021/06/20 v2.5.7 Chinese font definition (CTEX)]
 %%
 %% Chinese characters
 %%

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd	2021-06-20 19:56:11 UTC (rev 59654)
@@ -25,7 +25,7 @@
 %% ---------------------------------------------------------------------
 %% 
 \ProvidesFile{jt2zhrm.fd}%
-  [2021/03/14 v2.5.6 Chinese font definition (CTEX)]
+  [2021/06/20 v2.5.7 Chinese font definition (CTEX)]
 \DeclareKanjiFamily{JT2}{zhrm}{}
 \DeclareFontShape{JT2}{zhrm}{m}{n}{<-> upzhserif-v}{}
 \DeclareFontShape{JT2}{zhrm}{m}{it}{<-> upzhserifit-v}{}

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd	2021-06-20 19:56:11 UTC (rev 59654)
@@ -25,7 +25,7 @@
 %% ---------------------------------------------------------------------
 %% 
 \ProvidesFile{jt2zhsf.fd}%
-  [2021/03/14 v2.5.6 Chinese font definition (CTEX)]
+  [2021/06/20 v2.5.7 Chinese font definition (CTEX)]
 \DeclareKanjiFamily{JT2}{zhsf}{}
 \DeclareFontShape{JT2}{zhsf}{m}{n}{<-> upzhsans-v}{}
 \DeclareFontShape{JT2}{zhsf}{b}{n}{<-> upzhsansb-v}{}

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd	2021-06-20 19:56:11 UTC (rev 59654)
@@ -25,7 +25,7 @@
 %% ---------------------------------------------------------------------
 %% 
 \ProvidesFile{jt2zhtt.fd}%
-  [2021/03/14 v2.5.6 Chinese font definition (CTEX)]
+  [2021/06/20 v2.5.7 Chinese font definition (CTEX)]
 \DeclareKanjiFamily{JT2}{zhtt}{}
 \DeclareFontShape{JT2}{zhtt}{m}{n}{<-> upzhmono-v}{}
 %% 

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd	2021-06-20 19:56:11 UTC (rev 59654)
@@ -25,7 +25,7 @@
 %% ---------------------------------------------------------------------
 %% 
 \ProvidesFile{jy2zhrm.fd}%
-  [2021/03/14 v2.5.6 Chinese font definition (CTEX)]
+  [2021/06/20 v2.5.7 Chinese font definition (CTEX)]
 \DeclareKanjiFamily{JY2}{zhrm}{}
 \DeclareFontShape{JY2}{zhrm}{m}{n}{<-> upzhserif-h}{}
 \DeclareFontShape{JY2}{zhrm}{m}{it}{<-> upzhserifit-h}{}

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd	2021-06-20 19:56:11 UTC (rev 59654)
@@ -25,7 +25,7 @@
 %% ---------------------------------------------------------------------
 %% 
 \ProvidesFile{jy2zhsf.fd}%
-  [2021/03/14 v2.5.6 Chinese font definition (CTEX)]
+  [2021/06/20 v2.5.7 Chinese font definition (CTEX)]
 \DeclareKanjiFamily{JY2}{zhsf}{}
 \DeclareFontShape{JY2}{zhsf}{m}{n}{<-> upzhsans-h}{}
 \DeclareFontShape{JY2}{zhsf}{b}{n}{<-> upzhsansb-h}{}

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd	2021-06-20 19:56:11 UTC (rev 59654)
@@ -25,7 +25,7 @@
 %% ---------------------------------------------------------------------
 %% 
 \ProvidesFile{jy2zhtt.fd}%
-  [2021/03/14 v2.5.6 Chinese font definition (CTEX)]
+  [2021/06/20 v2.5.7 Chinese font definition (CTEX)]
 \DeclareKanjiFamily{JY2}{zhtt}{}
 \DeclareFontShape{JY2}{zhtt}{m}{n}{<-> upzhmono-h}{}
 %% 

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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Adobe fonts definition (CTEX)}
 \ProvidesExplFile{ctex-fontset-adobe.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \ctex_fontset_case:nnnn
   { \ctex_fontset_error:n { adobe } }
   {

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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Fandol fonts definition (CTEX)}
 \ProvidesExplFile{ctex-fontset-fandol.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \ctex_fontset_case:nnnn
   { \ctex_fontset_error:n { fandol } }
   {

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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Founder fonts definition (CTEX)}
 \ProvidesExplFile{ctex-fontset-founder.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \ctex_fontset_case:nnn
   {
     \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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {macOS fonts definition (CTEX)}
 \ProvidesExplFile{ctex-fontset-mac.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \file_if_exist:nTF { /System/Library/Fonts/PingFang.ttc }
   { \ctex_file_input:n { ctex-fontset-macnew.def } }
   { \ctex_file_input:n { ctex-fontset-macold.def } }

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {macOS fonts definition for El Capitan or later version (CTEX)}
 \ProvidesExplFile{ctex-fontset-macnew.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \ctex_fontset_case:nnnn
   { \ctex_fontset_error:n { mac } }
   {

Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {macOS fonts definition for Yosemite or earlier version (CTEX)}
 \ProvidesExplFile{ctex-fontset-macold.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \ctex_fontset_case:nnnn
   { \ctex_fontset_error:n { mac } }
   { \ctex_fontset_error:n { macold } }

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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Ubuntu fonts definition (CTEX)}
 \ProvidesExplFile{ctex-fontset-ubuntu.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \ctex_fontset_case:nnnn
   { \ctex_fontset_error:n { ubuntu } }
   {

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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Windows fonts definition (CTEX)}
 \ProvidesExplFile{ctex-fontset-windows.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \file_if_exist:nTF { \c_dollar_str WINDIR/Fonts/msyh.ttc }
   { \tl_const:Nn \c__ctex_msyh_suffix_tl { ttc } }
   {

Modified: trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Heading modification for article (CTEX)}
 \ProvidesExplFile{ctex-article.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \seq_const_from_clist:Nn \c__ctex_section_headings_seq
   { section , subsection , subsubsection , paragraph , subparagraph }
 \seq_new:N \c__ctex_headings_seq
@@ -733,8 +733,12 @@
 \cs_new_protected:Npn \ctex_cleveref_hook:
   {
     \@ifpackageloaded { hyperref }
-      { \__ctex_cleveref_hook_aux:N \H at refstepcounter }
       {
+        \@ifpackagewith { hyperref } { implicit = false }
+          { }
+          { \__ctex_cleveref_hook_aux:N \H at refstepcounter }
+      }
+      {
         \__ctex_cleveref_hook_aux:N \refstepcounter at noarg
         \__ctex_cleveref_hook_aux:N \refstepcounter at optarg
       }

Modified: trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Heading modification for beamer (CTEX)}
 \ProvidesExplFile{ctex-beamer.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \seq_const_from_clist:Nn \c__ctex_headings_seq
   { part , section , subsection }
 \cs_new_protected:Npn \__ctex_initial_heading:n #1
@@ -222,8 +222,12 @@
 \cs_new_protected:Npn \ctex_cleveref_hook:
   {
     \@ifpackageloaded { hyperref }
-      { \__ctex_cleveref_hook_aux:N \H at refstepcounter }
       {
+        \@ifpackagewith { hyperref } { implicit = false }
+          { }
+          { \__ctex_cleveref_hook_aux:N \H at refstepcounter }
+      }
+      {
         \__ctex_cleveref_hook_aux:N \refstepcounter at noarg
         \__ctex_cleveref_hook_aux:N \refstepcounter at optarg
       }

Modified: trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Heading modification for book (CTEX)}
 \ProvidesExplFile{ctex-book.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \seq_const_from_clist:Nn \c__ctex_section_headings_seq
   { section , subsection , subsubsection , paragraph , subparagraph }
 \seq_new:N \c__ctex_headings_seq
@@ -861,8 +861,12 @@
 \cs_new_protected:Npn \ctex_cleveref_hook:
   {
     \@ifpackageloaded { hyperref }
-      { \__ctex_cleveref_hook_aux:N \H at refstepcounter }
       {
+        \@ifpackagewith { hyperref } { implicit = false }
+          { }
+          { \__ctex_cleveref_hook_aux:N \H at refstepcounter }
+      }
+      {
         \__ctex_cleveref_hook_aux:N \refstepcounter at noarg
         \__ctex_cleveref_hook_aux:N \refstepcounter at optarg
       }

Modified: trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Heading modification for report (CTEX)}
 \ProvidesExplFile{ctex-report.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \seq_const_from_clist:Nn \c__ctex_section_headings_seq
   { section , subsection , subsubsection , paragraph , subparagraph }
 \seq_new:N \c__ctex_headings_seq
@@ -856,8 +856,12 @@
 \cs_new_protected:Npn \ctex_cleveref_hook:
   {
     \@ifpackageloaded { hyperref }
-      { \__ctex_cleveref_hook_aux:N \H at refstepcounter }
       {
+        \@ifpackagewith { hyperref } { implicit = false }
+          { }
+          { \__ctex_cleveref_hook_aux:N \H at refstepcounter }
+      }
+      {
         \__ctex_cleveref_hook_aux:N \refstepcounter at noarg
         \__ctex_cleveref_hook_aux:N \refstepcounter at optarg
       }

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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese scheme for article (CTEX)}
 \ProvidesExplFile{ctex-scheme-chinese-article.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \ctex_set:nn { 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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese scheme for beamer (CTEX)}
 \ProvidesExplFile{ctex-scheme-chinese-beamer.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \ctex_set:nn { 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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese scheme for book (CTEX)}
 \ProvidesExplFile{ctex-scheme-chinese-book.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \ctex_set:nn { 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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese scheme for report (CTEX)}
 \ProvidesExplFile{ctex-scheme-chinese-report.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \ctex_set:nn { 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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Chinese scheme for generic (CTEX)}
 \ProvidesExplFile{ctex-scheme-chinese.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \ctex_set:n { today = small }
 \ctex_if_autoindent_touched:F
   { \ctex_set:n { 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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Plain scheme for article (CTEX)}
 \ProvidesExplFile{ctex-scheme-plain-article.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \ctex_set:nn { 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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Plain scheme for beamer (CTEX)}
 \ProvidesExplFile{ctex-scheme-plain-beamer.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \ctex_set:nn { 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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Plain scheme for book (CTEX)}
 \ProvidesExplFile{ctex-scheme-plain-book.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \ctex_set:nn { 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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Plain scheme for report (CTEX)}
 \ProvidesExplFile{ctex-scheme-plain-report.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 \ctex_set:nn { 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	2021-06-20 19:55:43 UTC (rev 59653)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def	2021-06-20 19:56:11 UTC (rev 59654)
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96 at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
   {Plain scheme for generic (CTEX)}
 \ProvidesExplFile{ctex-scheme-plain.def}
-  {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.7}{\ExplFileDescription}
 %% 
 %%
 %% End of file `ctex-scheme-plain.def'.



More information about the tex-live-commits mailing list.