summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/ctex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-08-23 20:53:47 +0000
committerKarl Berry <karl@freefriends.org>2020-08-23 20:53:47 +0000
commitb1cf361795a720dbfa84ca6546355be360964437 (patch)
tree0f4e7ab3eb499669e27d35feb127efc305f2c69c /Master/texmf-dist/tex/latex/ctex
parent20b89567543c9ede8bcd65a562ce3abff8eaa617 (diff)
ctex (23aug20)
git-svn-id: svn://tug.org/texlive/trunk@56161 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex')
-rw-r--r--Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/config/ctex.cfg4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctex.sty52
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexart.cls73
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls73
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexbook.cls73
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexcap.sty4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexheading.sty50
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexhook.sty55
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexpatch.sty4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexrep.cls73
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexsize.sty31
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexspa.def2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def31
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def41
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def6
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def25
-rw-r--r--Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def25
-rw-r--r--Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def25
-rw-r--r--Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def25
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def4
59 files changed, 399 insertions, 405 deletions
diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg
index 03ddbc78b44..040f300cba5 100644
--- a/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg
+++ b/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Caption with encoding GBK (CTEX)}
\ProvidesExplFile{ctex-name-gbk.cfg}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\keys_set_known:nn { ctex }
{
contentsname = Ŀ¼ ,
diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
index b5632ce2df5..685cab0e6c0 100644
--- a/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
+++ b/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Caption with encoding UTF-8 (CTEX)}
\ProvidesExplFile{ctex-name-utf8.cfg}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\keys_set_known:nn { ctex }
{
contentsname = 目录 ,
diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
index 302ecc12eb8..0f87941254c 100644
--- a/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
+++ b/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Configuration file (CTEX)}
\ProvidesExplFile{\ExplFileName.cfg}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
%%
%%
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg
index 0c4b6a184d4..20717f88b9f 100644
--- a/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg
+++ b/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{ctexbackend.cfg}%
- [2020/06/06 v2.5.3 Backend configuration file (CTEX)]
+ [2020/08/23 v2.5.4 Backend configuration file (CTEX)]
\begingroup
\expandafter\ifx\csname Umathchardef\endcsname\relax
\else\expandafter\endgroup\expandafter\endinput\fi
diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
index eefbc5a2dd4..7a8055aab43 100644
--- a/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
+++ b/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Option configuration file (CTEX)}
\ProvidesExplFile{ctexopts.cfg}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
%%
%% \ctex_set:nn { option } { fontset = windows }
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo b/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
index e42c2d62b91..6de48816c21 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
+++ b/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{c5size option (CTEX)}
\ProvidesExplFile{ctex-c5size.clo}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\ctex_set_font_size:Nnn \normalsize { 5 }
{
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo b/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
index 72fa5168c6e..6ca292b07ae 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
+++ b/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{cs4size option (CTEX)}
\ProvidesExplFile{ctex-cs4size.clo}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\ctex_set_font_size:Nnn \normalsize { -4 }
{
\abovedisplayskip 12\p@ \@plus3\p@ \@minus7\p@
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex.sty b/Master/texmf-dist/tex/latex/ctex/ctex.sty
index cde730a8cba..21cd5704085 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctex.sty
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese adapter in LaTeX (CTEX)}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\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 }
@@ -52,7 +52,7 @@
`l3kernel'~and~`l3packages'\\\\
using~your~TeX~package~manager~or~from~CTAN.
}
-\@ifpackagelater { expl3 } { 2020/04/06 } { }
+\@ifpackagelater { expl3 } { 2020/07/17 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { expl3 } }
\str_const:Nx \c__ctex_engine_str
{ \cs_if_exist:NTF \ngostype { aptex } { \c_sys_engine_str } }
@@ -80,43 +80,27 @@
{ \keys_set:nn { ctex } }
\cs_new_protected:Npn \ctex_set:nn #1
{ \keys_set:nn { ctex / #1 } }
-\cs_new_protected:Npn \ctex_file_wrapper:nnn
+\cs_new_protected:Npn \ctex_file_input:n #1
{
- \exp_args:NNx \ExplSyntaxOff
- \__ctex_file_wrapper_aux:nnnn
- {
- \bool_if:NTF \l__kernel_expl_bool
- { \ExplSyntaxOn }
- { \ExplSyntaxOff }
- }
+ \cctab_begin:N \c__ctex_package_cctab
+ \file_input:n {#1}
+ \cctab_end:
}
-\cs_new_protected:Npn \__ctex_file_wrapper_aux:nnnn #1#2#3#4
+\cctab_const:Nn \c__ctex_package_cctab
{
- \use:x
- {
- \char_set_catcode_letter:n { 64 }
- #2
- \exp_not:n {#3}
- \char_set_catcode:nn { 64 } { \char_value_catcode:n { 64 } }
- #4
- }
- #1
+ \cctab_select:N \c_document_cctab
+ \char_set_catcode_letter:n { 64 }
}
-\cs_new_protected:Npn \ctex_file_input:n #1
- { \ctex_file_wrapper:nnn { } { \file_input:n {#1} } { } }
\cs_new_protected:Npn \ctex_scheme_input:n #1
{
- \ctex_file_wrapper:nnn
- { }
- {
- \tl_if_exist:NTF \c__ctex_class_tl
- {
- \file_if_exist_input:nF { ctex-scheme- #1 - \c__ctex_class_tl .def }
- { \file_input:n { ctex-scheme- #1 .def } }
- }
- { \file_input:n { ctex-scheme- #1 .def } }
- }
- { }
+ \cctab_begin:N \c__ctex_package_cctab
+ \tl_if_exist:NTF \c__ctex_class_tl
+ {
+ \file_if_exist_input:nF { ctex-scheme- #1 - \c__ctex_class_tl .def }
+ { \file_input:n { ctex-scheme- #1 .def } }
+ }
+ { \file_input:n { ctex-scheme- #1 .def } }
+ \cctab_end:
}
\cs_generate_variant:Nn \ctex_scheme_input:n { o }
\int_new:N \g__ctex_section_depth_int
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexart.cls b/Master/texmf-dist/tex/latex/ctex/ctexart.cls
index 3115b43cf9f..6c6ba0bd0c4 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexart.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexart.cls
@@ -27,10 +27,10 @@
\NeedsTeXFormat{LaTeX2e}
\input{ctexbackend.cfg}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese adapter for class article (CTEX)}
\ProvidesExplClass{ctexart}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver@ctex. \@pkgextension } \c__ctex_version_tl
@@ -45,7 +45,7 @@
`l3kernel'~and~`l3packages'\\\\
using~your~TeX~package~manager~or~from~CTAN.
}
-\@ifpackagelater { expl3 } { 2020/04/06 } { }
+\@ifpackagelater { expl3 } { 2020/07/17 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { expl3 } }
\@ifpackagelater { l3keys2e } { 2015/12/20 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { l3keys2e } }
@@ -75,43 +75,27 @@
{ \keys_set:nn { ctex } }
\cs_new_protected:Npn \ctex_set:nn #1
{ \keys_set:nn { ctex / #1 } }
-\cs_new_protected:Npn \ctex_file_wrapper:nnn
+\cs_new_protected:Npn \ctex_file_input:n #1
{
- \exp_args:NNx \ExplSyntaxOff
- \__ctex_file_wrapper_aux:nnnn
- {
- \bool_if:NTF \l__kernel_expl_bool
- { \ExplSyntaxOn }
- { \ExplSyntaxOff }
- }
+ \cctab_begin:N \c__ctex_package_cctab
+ \file_input:n {#1}
+ \cctab_end:
}
-\cs_new_protected:Npn \__ctex_file_wrapper_aux:nnnn #1#2#3#4
+\cctab_const:Nn \c__ctex_package_cctab
{
- \use:x
- {
- \char_set_catcode_letter:n { 64 }
- #2
- \exp_not:n {#3}
- \char_set_catcode:nn { 64 } { \char_value_catcode:n { 64 } }
- #4
- }
- #1
+ \cctab_select:N \c_document_cctab
+ \char_set_catcode_letter:n { 64 }
}
-\cs_new_protected:Npn \ctex_file_input:n #1
- { \ctex_file_wrapper:nnn { } { \file_input:n {#1} } { } }
\cs_new_protected:Npn \ctex_scheme_input:n #1
{
- \ctex_file_wrapper:nnn
- { }
- {
- \tl_if_exist:NTF \c__ctex_class_tl
- {
- \file_if_exist_input:nF { ctex-scheme- #1 - \c__ctex_class_tl .def }
- { \file_input:n { ctex-scheme- #1 .def } }
- }
- { \file_input:n { ctex-scheme- #1 .def } }
- }
- { }
+ \cctab_begin:N \c__ctex_package_cctab
+ \tl_if_exist:NTF \c__ctex_class_tl
+ {
+ \file_if_exist_input:nF { ctex-scheme- #1 - \c__ctex_class_tl .def }
+ { \file_input:n { ctex-scheme- #1 .def } }
+ }
+ { \file_input:n { ctex-scheme- #1 .def } }
+ \cctab_end:
}
\cs_generate_variant:Nn \ctex_scheme_input:n { o }
\int_new:N \g__ctex_section_depth_int
@@ -1273,12 +1257,25 @@
}
\cs_new_protected:Npn \ctex_cleveref_hook:
{
- \ctex_patch_cmd:Nnn \refstepcounter@noarg
- { \endcsname \csname the }
- { \expandafter \endcsname \csname the }
- \ctex_patch_cmd:Nnn \refstepcounter@optarg
+ \@ifpackageloaded { hyperref }
+ { \__ctex_cleveref_hook_aux:N \H@refstepcounter }
+ {
+ \__ctex_cleveref_hook_aux:N \refstepcounter@noarg
+ \__ctex_cleveref_hook_aux:N \refstepcounter@optarg
+ }
+ \__ctex_cleveref_hook_aux:N \appendix
+ }
+\cs_new_protected:Npn \__ctex_cleveref_hook_aux:N #1
+ {
+ \ctex_patch_cmd_all:NnnnTF #1
+ {
+ \ExplSyntaxOff
+ \char_set_catcode_letter:n { 64 }
+ }
{ \endcsname \csname the }
{ \expandafter \endcsname \csname the }
+ { }
+ { \ctex_patch_failure:N #1 }
}
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
index f570a17379a..a92073b06aa 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
@@ -27,10 +27,10 @@
\NeedsTeXFormat{LaTeX2e}
\input{ctexbackend.cfg}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese adapter for class beamer (CTEX)}
\ProvidesExplClass{ctexbeamer}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver@ctex. \@pkgextension } \c__ctex_version_tl
@@ -45,7 +45,7 @@
`l3kernel'~and~`l3packages'\\\\
using~your~TeX~package~manager~or~from~CTAN.
}
-\@ifpackagelater { expl3 } { 2020/04/06 } { }
+\@ifpackagelater { expl3 } { 2020/07/17 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { expl3 } }
\@ifpackagelater { l3keys2e } { 2015/12/20 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { l3keys2e } }
@@ -75,43 +75,27 @@
{ \keys_set:nn { ctex } }
\cs_new_protected:Npn \ctex_set:nn #1
{ \keys_set:nn { ctex / #1 } }
-\cs_new_protected:Npn \ctex_file_wrapper:nnn
+\cs_new_protected:Npn \ctex_file_input:n #1
{
- \exp_args:NNx \ExplSyntaxOff
- \__ctex_file_wrapper_aux:nnnn
- {
- \bool_if:NTF \l__kernel_expl_bool
- { \ExplSyntaxOn }
- { \ExplSyntaxOff }
- }
+ \cctab_begin:N \c__ctex_package_cctab
+ \file_input:n {#1}
+ \cctab_end:
}
-\cs_new_protected:Npn \__ctex_file_wrapper_aux:nnnn #1#2#3#4
+\cctab_const:Nn \c__ctex_package_cctab
{
- \use:x
- {
- \char_set_catcode_letter:n { 64 }
- #2
- \exp_not:n {#3}
- \char_set_catcode:nn { 64 } { \char_value_catcode:n { 64 } }
- #4
- }
- #1
+ \cctab_select:N \c_document_cctab
+ \char_set_catcode_letter:n { 64 }
}
-\cs_new_protected:Npn \ctex_file_input:n #1
- { \ctex_file_wrapper:nnn { } { \file_input:n {#1} } { } }
\cs_new_protected:Npn \ctex_scheme_input:n #1
{
- \ctex_file_wrapper:nnn
- { }
- {
- \tl_if_exist:NTF \c__ctex_class_tl
- {
- \file_if_exist_input:nF { ctex-scheme- #1 - \c__ctex_class_tl .def }
- { \file_input:n { ctex-scheme- #1 .def } }
- }
- { \file_input:n { ctex-scheme- #1 .def } }
- }
- { }
+ \cctab_begin:N \c__ctex_package_cctab
+ \tl_if_exist:NTF \c__ctex_class_tl
+ {
+ \file_if_exist_input:nF { ctex-scheme- #1 - \c__ctex_class_tl .def }
+ { \file_input:n { ctex-scheme- #1 .def } }
+ }
+ { \file_input:n { ctex-scheme- #1 .def } }
+ \cctab_end:
}
\cs_generate_variant:Nn \ctex_scheme_input:n { o }
\msg_new:nnnn { ctex } { package-too-old }
@@ -780,12 +764,25 @@
}
\cs_new_protected:Npn \ctex_cleveref_hook:
{
- \ctex_patch_cmd:Nnn \refstepcounter@noarg
- { \endcsname \csname the }
- { \expandafter \endcsname \csname the }
- \ctex_patch_cmd:Nnn \refstepcounter@optarg
+ \@ifpackageloaded { hyperref }
+ { \__ctex_cleveref_hook_aux:N \H@refstepcounter }
+ {
+ \__ctex_cleveref_hook_aux:N \refstepcounter@noarg
+ \__ctex_cleveref_hook_aux:N \refstepcounter@optarg
+ }
+ \__ctex_cleveref_hook_aux:N \appendix
+ }
+\cs_new_protected:Npn \__ctex_cleveref_hook_aux:N #1
+ {
+ \ctex_patch_cmd_all:NnnnTF #1
+ {
+ \ExplSyntaxOff
+ \char_set_catcode_letter:n { 64 }
+ }
{ \endcsname \csname the }
{ \expandafter \endcsname \csname the }
+ { }
+ { \ctex_patch_failure:N #1 }
}
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
index e99d1bae32f..67f587f15d8 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
@@ -27,10 +27,10 @@
\NeedsTeXFormat{LaTeX2e}
\input{ctexbackend.cfg}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese adapter for class book (CTEX)}
\ProvidesExplClass{ctexbook}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver@ctex. \@pkgextension } \c__ctex_version_tl
@@ -45,7 +45,7 @@
`l3kernel'~and~`l3packages'\\\\
using~your~TeX~package~manager~or~from~CTAN.
}
-\@ifpackagelater { expl3 } { 2020/04/06 } { }
+\@ifpackagelater { expl3 } { 2020/07/17 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { expl3 } }
\@ifpackagelater { l3keys2e } { 2015/12/20 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { l3keys2e } }
@@ -75,43 +75,27 @@
{ \keys_set:nn { ctex } }
\cs_new_protected:Npn \ctex_set:nn #1
{ \keys_set:nn { ctex / #1 } }
-\cs_new_protected:Npn \ctex_file_wrapper:nnn
+\cs_new_protected:Npn \ctex_file_input:n #1
{
- \exp_args:NNx \ExplSyntaxOff
- \__ctex_file_wrapper_aux:nnnn
- {
- \bool_if:NTF \l__kernel_expl_bool
- { \ExplSyntaxOn }
- { \ExplSyntaxOff }
- }
+ \cctab_begin:N \c__ctex_package_cctab
+ \file_input:n {#1}
+ \cctab_end:
}
-\cs_new_protected:Npn \__ctex_file_wrapper_aux:nnnn #1#2#3#4
+\cctab_const:Nn \c__ctex_package_cctab
{
- \use:x
- {
- \char_set_catcode_letter:n { 64 }
- #2
- \exp_not:n {#3}
- \char_set_catcode:nn { 64 } { \char_value_catcode:n { 64 } }
- #4
- }
- #1
+ \cctab_select:N \c_document_cctab
+ \char_set_catcode_letter:n { 64 }
}
-\cs_new_protected:Npn \ctex_file_input:n #1
- { \ctex_file_wrapper:nnn { } { \file_input:n {#1} } { } }
\cs_new_protected:Npn \ctex_scheme_input:n #1
{
- \ctex_file_wrapper:nnn
- { }
- {
- \tl_if_exist:NTF \c__ctex_class_tl
- {
- \file_if_exist_input:nF { ctex-scheme- #1 - \c__ctex_class_tl .def }
- { \file_input:n { ctex-scheme- #1 .def } }
- }
- { \file_input:n { ctex-scheme- #1 .def } }
- }
- { }
+ \cctab_begin:N \c__ctex_package_cctab
+ \tl_if_exist:NTF \c__ctex_class_tl
+ {
+ \file_if_exist_input:nF { ctex-scheme- #1 - \c__ctex_class_tl .def }
+ { \file_input:n { ctex-scheme- #1 .def } }
+ }
+ { \file_input:n { ctex-scheme- #1 .def } }
+ \cctab_end:
}
\cs_generate_variant:Nn \ctex_scheme_input:n { o }
\int_new:N \g__ctex_section_depth_int
@@ -1401,12 +1385,25 @@
}
\cs_new_protected:Npn \ctex_cleveref_hook:
{
- \ctex_patch_cmd:Nnn \refstepcounter@noarg
- { \endcsname \csname the }
- { \expandafter \endcsname \csname the }
- \ctex_patch_cmd:Nnn \refstepcounter@optarg
+ \@ifpackageloaded { hyperref }
+ { \__ctex_cleveref_hook_aux:N \H@refstepcounter }
+ {
+ \__ctex_cleveref_hook_aux:N \refstepcounter@noarg
+ \__ctex_cleveref_hook_aux:N \refstepcounter@optarg
+ }
+ \__ctex_cleveref_hook_aux:N \appendix
+ }
+\cs_new_protected:Npn \__ctex_cleveref_hook_aux:N #1
+ {
+ \ctex_patch_cmd_all:NnnnTF #1
+ {
+ \ExplSyntaxOff
+ \char_set_catcode_letter:n { 64 }
+ }
{ \endcsname \csname the }
{ \expandafter \endcsname \csname the }
+ { }
+ { \ctex_patch_failure:N #1 }
}
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
index b104cc619fa..9a8e8185bb3 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese adapter in LaTeX (CTEX)}
\ProvidesExplPackage{ctexcap}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\clist_new:N \l__ctex_ctexcap_options_clist
\clist_set:Nx \l__ctex_ctexcap_options_clist
{ \exp_not:v { opt@ \@currname . \@currext } , heading }
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexheading.sty b/Master/texmf-dist/tex/latex/ctex/ctexheading.sty
index d30e04f7f02..2a2d1e3a561 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexheading.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctexheading.sty
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Heading style modification (CTEX)}
\ProvidesExplPackage{ctexheading}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\RequirePackage { xparse , l3keys2e }
\RequirePackage { ctexhook , ctexpatch }
\tl_clear_new:N \l__ctex_tmp_tl
@@ -43,43 +43,27 @@
{ \keys_set:nn { ctex } }
\cs_new_protected:Npn \ctex_set:nn #1
{ \keys_set:nn { ctex / #1 } }
-\cs_new_protected:Npn \ctex_file_wrapper:nnn
+\cs_new_protected:Npn \ctex_file_input:n #1
{
- \exp_args:NNx \ExplSyntaxOff
- \__ctex_file_wrapper_aux:nnnn
- {
- \bool_if:NTF \l__kernel_expl_bool
- { \ExplSyntaxOn }
- { \ExplSyntaxOff }
- }
+ \cctab_begin:N \c__ctex_package_cctab
+ \file_input:n {#1}
+ \cctab_end:
}
-\cs_new_protected:Npn \__ctex_file_wrapper_aux:nnnn #1#2#3#4
+\cctab_const:Nn \c__ctex_package_cctab
{
- \use:x
- {
- \char_set_catcode_letter:n { 64 }
- #2
- \exp_not:n {#3}
- \char_set_catcode:nn { 64 } { \char_value_catcode:n { 64 } }
- #4
- }
- #1
+ \cctab_select:N \c_document_cctab
+ \char_set_catcode_letter:n { 64 }
}
-\cs_new_protected:Npn \ctex_file_input:n #1
- { \ctex_file_wrapper:nnn { } { \file_input:n {#1} } { } }
\cs_new_protected:Npn \ctex_scheme_input:n #1
{
- \ctex_file_wrapper:nnn
- { }
- {
- \tl_if_exist:NTF \c__ctex_class_tl
- {
- \file_if_exist_input:nF { ctex-scheme- #1 - \c__ctex_class_tl .def }
- { \file_input:n { ctex-scheme- #1 .def } }
- }
- { \file_input:n { ctex-scheme- #1 .def } }
- }
- { }
+ \cctab_begin:N \c__ctex_package_cctab
+ \tl_if_exist:NTF \c__ctex_class_tl
+ {
+ \file_if_exist_input:nF { ctex-scheme- #1 - \c__ctex_class_tl .def }
+ { \file_input:n { ctex-scheme- #1 .def } }
+ }
+ { \file_input:n { ctex-scheme- #1 .def } }
+ \cctab_end:
}
\cs_generate_variant:Nn \ctex_scheme_input:n { o }
\int_new:N \g__ctex_section_depth_int
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexhook.sty b/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
index 00821e29bb7..c6ae5130a98 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
@@ -26,31 +26,15 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Document and package hooks (CTEX)}
\ProvidesExplPackage{ctexhook}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
-\cs_new_protected:Npn \ctex_at_end_preamble:n
- { \tl_gput_right:Nn \g__ctex_end_preamble_hook_tl }
-\cs_new_protected:Npn \ctex_after_end_preamble:n
- { \tl_gput_right:Nn \g__ctex_after_end_preamble_hook_tl }
-\cs_new_protected:Npn \CTEX@document@left@hook
- { \group_end: \g__ctex_end_preamble_hook_tl \group_begin: }
-\cs_new_protected:Npn \CTEX@document@right@hook
- { \scan_stop: \g__ctex_after_end_preamble_hook_tl \tex_ignorespaces:D }
-\cs_set_nopar:Npx \document
- {
- \CTEX@document@left@hook
- \exp_not:o { \document }
- \CTEX@document@right@hook
- }
-\tl_new:N \g__ctex_end_preamble_hook_tl
-\tl_new:N \g__ctex_after_end_preamble_hook_tl
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\cs_new_protected:Npn \ctex_at_begin_package:nn #1
{
\@ifpackageloaded {#1}
{ \__ctex_package_loaded_warning:nn {#1} }
- { \ctex_gadd_package_hook:nnn { begin } {#1} }
+ { \ctex_gadd_package_hook:nnn { before } {#1} }
}
\cs_new_protected:Npn \__ctex_package_loaded_warning:nn #1#2
{ \msg_warning:nnx { ctex } { invalid-hook } {#1} }
@@ -63,8 +47,35 @@
{
\@ifpackageloaded {#1}
{ \use:n }
- { \ctex_gadd_package_hook:nnn { end } {#1} }
+ { \ctex_gadd_package_hook:nnn { after } {#1} }
+ }
+\@ifl@t@r \fmtversion { 2020/10/01 }
+ {
+ \cs_new_protected:Npx \ctex_at_end_preamble:n
+ { \hook_gput_code:nnn { env/document/before } { \c_novalue_tl } }
+ \cs_new_protected:Npx \ctex_after_end_preamble:n
+ { \hook_gput_code:nnn { begindocument/end } { \c_novalue_tl } }
+ \cs_new_protected:Npx \ctex_gadd_package_hook:nnn #1#2
+ { \hook_gput_code:nnn { package/#1/#2 } { \c_novalue_tl } }
+ \file_input_stop:
}
+ { }
+\cs_new_protected:Npn \ctex_at_end_preamble:n
+ { \tl_gput_right:Nn \g__ctex_end_preamble_hook_tl }
+\cs_new_protected:Npn \ctex_after_end_preamble:n
+ { \tl_gput_right:Nn \g__ctex_after_end_preamble_hook_tl }
+\cs_new_protected:Npn \CTEX@document@left@hook
+ { \group_end: \g__ctex_end_preamble_hook_tl \group_begin: }
+\cs_new_protected:Npn \CTEX@document@right@hook
+ { \scan_stop: \g__ctex_after_end_preamble_hook_tl \tex_ignorespaces:D }
+\cs_set_nopar:Npx \document
+ {
+ \CTEX@document@left@hook
+ \exp_not:o { \document }
+ \CTEX@document@right@hook
+ }
+\tl_new:N \g__ctex_end_preamble_hook_tl
+\tl_new:N \g__ctex_after_end_preamble_hook_tl
\cs_new_protected:Npn \ctex_gadd_package_hook:nnn #1#2
{ \ctex_gadd_hook:cn { g__ctex_at_ #1 _ #2 _hook_tl } }
\cs_new_protected:Npn \ctex_gadd_hook:Nn #1
@@ -84,13 +95,13 @@
\cs_new_protected:Npn \CTEX@reset@ptions@hook
{
\cs_if_eq:NNT \@currext \@pkgextension
- { \ctex_use_package_hook:nn { begin } { \@currname } }
+ { \ctex_use_package_hook:nn { before } { \@currname } }
}
\tl_put_left:Nn \@popfilename { \CTEX@popfilename@hook }
\cs_new_protected:Npn \CTEX@popfilename@hook
{
\cs_if_eq:NNT \@currext \@pkgextension
- { \ctex_use_package_hook:nn { end } { \@currname } }
+ { \ctex_use_package_hook:nn { after } { \@currname } }
}
%%
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty b/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty
index f0e2527b11e..88c5bc08631 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Patching commands (CTEX)}
\ProvidesExplPackage{ctexpatch}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\cs_new_protected:Npn \ctex_patch_cmd_once:NnnnTF #1#2
{
\ctex_patch_boot:NNnnTF \__ctex_patch_cmd:Nnnnnw #1
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
index 3bd70ff528c..d77caa6e8b1 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
@@ -27,10 +27,10 @@
\NeedsTeXFormat{LaTeX2e}
\input{ctexbackend.cfg}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese adapter for class report (CTEX)}
\ProvidesExplClass{ctexrep}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver@ctex. \@pkgextension } \c__ctex_version_tl
@@ -45,7 +45,7 @@
`l3kernel'~and~`l3packages'\\\\
using~your~TeX~package~manager~or~from~CTAN.
}
-\@ifpackagelater { expl3 } { 2020/04/06 } { }
+\@ifpackagelater { expl3 } { 2020/07/17 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { expl3 } }
\@ifpackagelater { l3keys2e } { 2015/12/20 } { }
{ \msg_error:nnn { ctex } { l3-too-old } { l3keys2e } }
@@ -75,43 +75,27 @@
{ \keys_set:nn { ctex } }
\cs_new_protected:Npn \ctex_set:nn #1
{ \keys_set:nn { ctex / #1 } }
-\cs_new_protected:Npn \ctex_file_wrapper:nnn
+\cs_new_protected:Npn \ctex_file_input:n #1
{
- \exp_args:NNx \ExplSyntaxOff
- \__ctex_file_wrapper_aux:nnnn
- {
- \bool_if:NTF \l__kernel_expl_bool
- { \ExplSyntaxOn }
- { \ExplSyntaxOff }
- }
+ \cctab_begin:N \c__ctex_package_cctab
+ \file_input:n {#1}
+ \cctab_end:
}
-\cs_new_protected:Npn \__ctex_file_wrapper_aux:nnnn #1#2#3#4
+\cctab_const:Nn \c__ctex_package_cctab
{
- \use:x
- {
- \char_set_catcode_letter:n { 64 }
- #2
- \exp_not:n {#3}
- \char_set_catcode:nn { 64 } { \char_value_catcode:n { 64 } }
- #4
- }
- #1
+ \cctab_select:N \c_document_cctab
+ \char_set_catcode_letter:n { 64 }
}
-\cs_new_protected:Npn \ctex_file_input:n #1
- { \ctex_file_wrapper:nnn { } { \file_input:n {#1} } { } }
\cs_new_protected:Npn \ctex_scheme_input:n #1
{
- \ctex_file_wrapper:nnn
- { }
- {
- \tl_if_exist:NTF \c__ctex_class_tl
- {
- \file_if_exist_input:nF { ctex-scheme- #1 - \c__ctex_class_tl .def }
- { \file_input:n { ctex-scheme- #1 .def } }
- }
- { \file_input:n { ctex-scheme- #1 .def } }
- }
- { }
+ \cctab_begin:N \c__ctex_package_cctab
+ \tl_if_exist:NTF \c__ctex_class_tl
+ {
+ \file_if_exist_input:nF { ctex-scheme- #1 - \c__ctex_class_tl .def }
+ { \file_input:n { ctex-scheme- #1 .def } }
+ }
+ { \file_input:n { ctex-scheme- #1 .def } }
+ \cctab_end:
}
\cs_generate_variant:Nn \ctex_scheme_input:n { o }
\int_new:N \g__ctex_section_depth_int
@@ -1396,12 +1380,25 @@
}
\cs_new_protected:Npn \ctex_cleveref_hook:
{
- \ctex_patch_cmd:Nnn \refstepcounter@noarg
- { \endcsname \csname the }
- { \expandafter \endcsname \csname the }
- \ctex_patch_cmd:Nnn \refstepcounter@optarg
+ \@ifpackageloaded { hyperref }
+ { \__ctex_cleveref_hook_aux:N \H@refstepcounter }
+ {
+ \__ctex_cleveref_hook_aux:N \refstepcounter@noarg
+ \__ctex_cleveref_hook_aux:N \refstepcounter@optarg
+ }
+ \__ctex_cleveref_hook_aux:N \appendix
+ }
+\cs_new_protected:Npn \__ctex_cleveref_hook_aux:N #1
+ {
+ \ctex_patch_cmd_all:NnnnTF #1
+ {
+ \ExplSyntaxOff
+ \char_set_catcode_letter:n { 64 }
+ }
{ \endcsname \csname the }
{ \expandafter \endcsname \csname the }
+ { }
+ { \ctex_patch_failure:N #1 }
}
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
index da2013bb28a..f7899635a47 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
@@ -26,38 +26,25 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese font size definition (CTEX)}
\ProvidesExplPackage{ctexsize}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\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_wrapper:nnn
+\cs_new_protected:Npn \ctex_file_input:n #1
{
- \exp_args:NNx \ExplSyntaxOff
- \__ctex_file_wrapper_aux:nnnn
- {
- \bool_if:NTF \l__kernel_expl_bool
- { \ExplSyntaxOn }
- { \ExplSyntaxOff }
- }
+ \cctab_begin:N \c__ctex_package_cctab
+ \file_input:n {#1}
+ \cctab_end:
}
-\cs_new_protected:Npn \__ctex_file_wrapper_aux:nnnn #1#2#3#4
+\cctab_const:Nn \c__ctex_package_cctab
{
- \use:x
- {
- \char_set_catcode_letter:n { 64 }
- #2
- \exp_not:n {#3}
- \char_set_catcode:nn { 64 } { \char_value_catcode:n { 64 } }
- #4
- }
- #1
+ \cctab_select:N \c_document_cctab
+ \char_set_catcode_letter:n { 64 }
}
-\cs_new_protected:Npn \ctex_file_input:n #1
- { \ctex_file_wrapper:nnn { } { \file_input:n {#1} } { } }
\int_new:N \g__ctex_font_size_int
\int_gset:Nn \g__ctex_font_size_int { -1 }
\ctex_define_option:n
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexspa.def b/Master/texmf-dist/tex/latex/ctex/ctexspa.def
index 00caaa0fc49..54d8590f2f2 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexspa.def
+++ b/Master/texmf-dist/tex/latex/ctex/ctexspa.def
@@ -26,7 +26,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{ctexspa.def}%
- [2020/06/06 v2.5.3 Space info for CJKpunct (CTEX)]
+ [2020/08/23 v2.5.4 Space info for CJKpunct (CTEX)]
\ctexspadef{adobezhsong}{70,15,61,8,63,14,58,7,64,13,62,12,60,11,61,15,62,14,51,6,58,5,58,8,7,5,12,12,10,68,13,63,17,63,20,69,19,69,17,63,19,70,17,55,10,10,14,63,10,65,10,61,13,62,15,61,7,49,7,56,8,58,15,69,8,61,14,63,8,57,,,}
\ctexspadef{adobezhhei}{78,3,64,3,64,2,61,3,72,3,70,3,72,3,70,3,60,3,51,3,62,3,66,3,0,0,10,10,3,70,5,70,6,75,6,78,17,67,13,67,17,67,4,50,8,8,3,72,3,70,3,72,3,70,3,60,3,51,3,62,3,66,3,78,7,62,3,63,3,61,,,}
\ctexspadef{adobezhkai}{76,10,55,8,63,4,62,4,71,4,65,4,71,4,74,4,54,4,54,4,62,4,62,4,0,0,11,11,5,72,6,71,7,78,7,79,18,68,18,68,18,68,2,46,14,12,4,71,4,65,4,71,4,74,4,54,4,54,4,62,4,62,10,76,8,55,4,63,4,62,,,}
diff --git a/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict b/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict
index a69106af939..cbb5a835c7e 100644
--- a/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict
+++ b/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
- [2020/06/06 v2.5.3 Chinese translation for theorem name (CTEX)]
+ [2020/08/23 v2.5.4 Chinese translation for theorem name (CTEX)]
\providetranslation{Comments}{ÆÀÂÛ}
\providetranslation{comments}{ÆÀÂÛ}
\providetranslation{Comment}{ÆÀÂÛ}
diff --git a/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict b/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict
index c739ae7946b..04ea0a0cb38 100644
--- a/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict
+++ b/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
- [2020/06/06 v2.5.3 Chinese translation for theorem name (CTEX)]
+ [2020/08/23 v2.5.4 Chinese translation for theorem name (CTEX)]
\providetranslation{Comments}{评论}
\providetranslation{comments}{评论}
\providetranslation{Comment}{评论}
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
index 281e9d49110..674b7a70a46 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Asian pTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-aptex.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\cs_new_protected:Npn \ctex_set_zhmap:n
{ \tl_gput_right:Nx \g__ctex_zhmap_tl }
\cs_new_protected:Npn \ctex_use_zhmap:
@@ -123,7 +123,7 @@
\tl_new:N #1
\cs_if_exist:NTF #3
{ \tl_gput_right:Nn #3 {#1} }
- { \ctex_patch_cmd:Nnn #2 {#4} { #1#4 } }
+ { \ctex_parse_name:NN \tl_replace_once:Nnn #2 {#4} { #1#4 } }
}
\ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont
\ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
index 5d0e587c18d..51d88db1d5c 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{LuaLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-luatex.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\msg_new:nnn { ctex } { luatexja-loaded }
{
Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\
@@ -42,6 +42,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}
@@ -65,16 +66,20 @@
"00B7, "2018, "2019, "201C, "201D, "2013, "2014, "2025, "2026, "2027, "2E3A}
\ltjsetparameter{jacharrange={-1, -2, -3, -4, -5, +6, +7, -8, +9}}
\directlua{for x=128,255 do luatexja.math.is_math_letters[x] = true end}
-\directlua{
- local s = kpse.find_file('ltj-kinsoku.lua', 'tex')
- luatexja.stack.charprop_stack_table[0] = s and dofile(s) or {}
-}
-\ltjsetparameter{kanjiskip=\z@ plus .4pt minus .5pt,
- xkanjiskip=.25\zw plus 1pt minus 1pt,
- autospacing, autoxspacing, jacharrange={-1},
- yalbaselineshift=\z@, yjabaselineshift=\z@,
- jcharwidowpenalty=500, differentjfm=paverage
-}
+\@ifpackagelater{luatexja}{2020/08/08}
+ { \ltjsetparameter { autospacing, autoxspacing, differentjfm = paverage } }
+ {
+ \directlua{
+ local s = kpse.find_file('ltj-kinsoku.lua', 'tex')
+ luatexja.stack.charprop_stack_table[0] = s and dofile(s) or {}
+ }
+ \ltjsetparameter{kanjiskip=\z@ plus .4pt minus .5pt,
+ xkanjiskip=.25\zw plus 1pt minus 1pt,
+ autospacing, autoxspacing, jacharrange={-1},
+ yalbaselineshift=\z@, yjabaselineshift=\z@,
+ jcharwidowpenalty=500, differentjfm=paverage
+ }
+ }
\ExplSyntaxOn
\cs_new_protected:Npn \CTEX@alchar #1
{ \CTEX@beginallalchar #1 \CTEX@endallalchar }
@@ -1092,7 +1097,7 @@
\tl_new:N #1
\cs_if_exist:NTF #3
{ \tl_gput_right:Nn #3 {#1} }
- { \ctex_patch_cmd:Nnn #2 {#4} { #1#4 } }
+ { \ctex_parse_name:NN \tl_replace_once:Nnn #2 {#4} { #1#4 } }
}
\ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont
\ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
index d88ff8bbdbf..f2504965632 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{(pdf)LaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-pdftex.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\cs_new_protected:Npn \ctex_set_zhmap:n
{ \tl_gput_right:Nx \g__ctex_zhmap_tl }
\cs_new_protected:Npn \ctex_use_zhmap:
@@ -102,37 +102,20 @@
\tl_set:Nn \CJKrmdefault {#1}
\tl_set:Nn \CJKsfdefault {#2}
\tl_set:Nn \CJKttdefault {#3}
- \ctex_set_zhmap:n { \ctex_zhmap_input:n { ctex-zhmap- #4 .tex } }
+ \ctex_set_zhmap:n { \ctex_file_input:n { ctex-zhmap- #4 .tex } }
}
\@onlypreamble \ctex_load_zhmap:nnnn
- \cs_new_protected:Npn \ctex_zhmap_input:n #1
- {
- \ctex_file_wrapper:nnn
- {
- \char_set_catcode_comment:n { 37 } % %
- \char_set_catcode_escape:n { 92 } % \
- }
- { \file_input:n {#1} }
- {
- \char_set_catcode:nn { 37 } { \char_value_catcode:n { 37 } }
- \char_set_catcode:nn { 92 } { \char_value_catcode:n { 92 } }
- }
- }
\fi:
\cs_new_protected:Npn \ctex_CJK_input:n #1
{
- \ctex_file_wrapper:nnn
- {
- \char_set_catcode_other:n { 60 } % <
- \char_set_catcode_math_superscript:n { 94 } % ^
- \int_set:Nn \tex_endlinechar:D { -1 }
- }
- { \file_input:n {#1} }
- {
- \char_set_catcode:nn { 60 } { \char_value_catcode:n { 60 } }
- \char_set_catcode:nn { 94 } { \char_value_catcode:n { 94 } }
- \int_set:Nn \tex_endlinechar:D { \int_use:N \tex_endlinechar:D }
- }
+ \cctab_begin:N \c__ctex_CJK_cctab
+ \file_input:n {#1}
+ \cctab_end:
+ }
+\cctab_const:Nn \c__ctex_CJK_cctab
+ {
+ \cctab_select:N \c__ctex_package_cctab
+ \int_set:Nn \tex_endlinechar:D { -1 }
}
\cs_set_eq:NN \CJK@input \ctex_CJK_input:n
\if_cs_exist:N \CJK@surr
@@ -249,7 +232,7 @@
\tl_new:N #1
\cs_if_exist:NTF #3
{ \tl_gput_right:Nn #3 {#1} }
- { \ctex_patch_cmd:Nnn #2 {#4} { #1#4 } }
+ { \ctex_parse_name:NN \tl_replace_once:Nnn #2 {#4} { #1#4 } }
}
\ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont
\ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def
index eec8040b270..15fd28982cc 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{upTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-uptex.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\cs_new_protected:Npn \ctex_set_zhmap:n
{ \tl_gput_right:Nx \g__ctex_zhmap_tl }
\cs_new_protected:Npn \ctex_use_zhmap:
@@ -123,7 +123,7 @@
\tl_new:N #1
\cs_if_exist:NTF #3
{ \tl_gput_right:Nn #3 {#1} }
- { \ctex_patch_cmd:Nnn #2 {#4} { #1#4 } }
+ { \ctex_parse_name:NN \tl_replace_once:Nnn #2 {#4} { #1#4 } }
}
\ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont
\ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
index cb6eba6a18c..fdfdaa5bfe0 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{XeLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-xetex.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\RequirePackage { xeCJK }
\exp_args:Nx \xeCJKsetup
{
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd b/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
index 3438f2e9481..422dde52263 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c19rm.fd}%
- [2020/06/06 v2.5.3 Chinese font definition (CTEX)]
+ [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd b/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
index 869f8098762..b87ac2b0bfb 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c19sf.fd}%
- [2020/06/06 v2.5.3 Chinese font definition (CTEX)]
+ [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd b/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
index 15d7735fb97..863ea6d3183 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c19tt.fd}%
- [2020/06/06 v2.5.3 Chinese font definition (CTEX)]
+ [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd b/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
index aa039ca0bd2..191d9530bc0 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c70rm.fd}%
- [2020/06/06 v2.5.3 Chinese font definition (CTEX)]
+ [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd b/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
index d8ed676c34b..e4a1164e4ee 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c70sf.fd}%
- [2020/06/06 v2.5.3 Chinese font definition (CTEX)]
+ [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd b/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
index fd419fc8a99..7ef781323e1 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c70tt.fd}%
- [2020/06/06 v2.5.3 Chinese font definition (CTEX)]
+ [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd
index 75425fa34ad..68174ec47e2 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jt2zhrm.fd}%
- [2020/06/06 v2.5.3 Chinese font definition (CTEX)]
+ [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
\DeclareKanjiFamily{JT2}{zhrm}{}
\DeclareFontShape{JT2}{zhrm}{m}{n}{<-> upzhserif-v}{}
\DeclareFontShape{JT2}{zhrm}{m}{it}{<-> upzhserifit-v}{}
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd
index fecc2344a81..bd591a4a5d2 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jt2zhsf.fd}%
- [2020/06/06 v2.5.3 Chinese font definition (CTEX)]
+ [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
\DeclareKanjiFamily{JT2}{zhsf}{}
\DeclareFontShape{JT2}{zhsf}{m}{n}{<-> upzhsans-v}{}
\DeclareFontShape{JT2}{zhsf}{b}{n}{<-> upzhsansb-v}{}
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd
index 99cfec74315..9849eb366f4 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jt2zhtt.fd}%
- [2020/06/06 v2.5.3 Chinese font definition (CTEX)]
+ [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
\DeclareKanjiFamily{JT2}{zhtt}{}
\DeclareFontShape{JT2}{zhtt}{m}{n}{<-> upzhmono-v}{}
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd
index d3bb80668ce..624f4360625 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jy2zhrm.fd}%
- [2020/06/06 v2.5.3 Chinese font definition (CTEX)]
+ [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
\DeclareKanjiFamily{JY2}{zhrm}{}
\DeclareFontShape{JY2}{zhrm}{m}{n}{<-> upzhserif-h}{}
\DeclareFontShape{JY2}{zhrm}{m}{it}{<-> upzhserifit-h}{}
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd
index 086693820d6..76e76910d23 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jy2zhsf.fd}%
- [2020/06/06 v2.5.3 Chinese font definition (CTEX)]
+ [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
\DeclareKanjiFamily{JY2}{zhsf}{}
\DeclareFontShape{JY2}{zhsf}{m}{n}{<-> upzhsans-h}{}
\DeclareFontShape{JY2}{zhsf}{b}{n}{<-> upzhsansb-h}{}
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd
index 664e16fb148..1b071e37287 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jy2zhtt.fd}%
- [2020/06/06 v2.5.3 Chinese font definition (CTEX)]
+ [2020/08/23 v2.5.4 Chinese font definition (CTEX)]
\DeclareKanjiFamily{JY2}{zhtt}{}
\DeclareFontShape{JY2}{zhtt}{m}{n}{<-> upzhmono-h}{}
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
index cf1aa038983..4b347dfbcb9 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Adobe fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-adobe.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\ctex_fontset_case:nnnn
{ \ctex_fontset_error:n { adobe } }
{
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
index 6484f56410e..60c3b383d0d 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Fandol fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-fandol.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\ctex_fontset_case:nnnn
{ \ctex_fontset_error:n { fandol } }
{
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
index f7a8b8a6f0a..967c520e1a9 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Founder fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-founder.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\ctex_fontset_case:nnn
{
\ctex_zhmap_case:nnn
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
index d9c5f3b6800..8f4b257afb4 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{macOS fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-mac.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\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 } }
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
index 1bca91bd506..99d652f1a4f 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{macOS fonts definition for El Capitan or later version (CTEX)}
\ProvidesExplFile{ctex-fontset-macnew.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\ctex_fontset_case:nnnn
{ \ctex_fontset_error:n { mac } }
{
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
index 033aa9b956a..96680a0ab3b 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{macOS fonts definition for Yosemite or earlier version (CTEX)}
\ProvidesExplFile{ctex-fontset-macold.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\ctex_fontset_case:nnnn
{ \ctex_fontset_error:n { mac } }
{ \ctex_fontset_error:n { macold } }
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
index 12284911a37..3da09d24eac 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Ubuntu fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-ubuntu.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\ctex_fontset_case:nnnn
{ \ctex_fontset_error:n { ubuntu } }
{
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
index 3a734ac088d..4ca68a4bb77 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Windows fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-windows.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\file_if_exist:nTF { \c_dollar_str WINDIR/Fonts/msyh.ttc }
{ \tl_const:Nn \c__ctex_msyh_suffix_tl { ttc } }
{
diff --git a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def
index a379007d77d..885d785e2a1 100644
--- a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def
+++ b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Heading modification for article (CTEX)}
\ProvidesExplFile{ctex-article.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
\seq_new:N \c__ctex_headings_seq
@@ -709,12 +709,25 @@
}
\cs_new_protected:Npn \ctex_cleveref_hook:
{
- \ctex_patch_cmd:Nnn \refstepcounter@noarg
- { \endcsname \csname the }
- { \expandafter \endcsname \csname the }
- \ctex_patch_cmd:Nnn \refstepcounter@optarg
+ \@ifpackageloaded { hyperref }
+ { \__ctex_cleveref_hook_aux:N \H@refstepcounter }
+ {
+ \__ctex_cleveref_hook_aux:N \refstepcounter@noarg
+ \__ctex_cleveref_hook_aux:N \refstepcounter@optarg
+ }
+ \__ctex_cleveref_hook_aux:N \appendix
+ }
+\cs_new_protected:Npn \__ctex_cleveref_hook_aux:N #1
+ {
+ \ctex_patch_cmd_all:NnnnTF #1
+ {
+ \ExplSyntaxOff
+ \char_set_catcode_letter:n { 64 }
+ }
{ \endcsname \csname the }
{ \expandafter \endcsname \csname the }
+ { }
+ { \ctex_patch_failure:N #1 }
}
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
diff --git a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def
index dc38764ff74..180eec15942 100644
--- a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def
+++ b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Heading modification for beamer (CTEX)}
\ProvidesExplFile{ctex-beamer.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_headings_seq
{ part , section , subsection }
\cs_new_protected:Npn \__ctex_initial_heading:n #1
@@ -221,12 +221,25 @@
}
\cs_new_protected:Npn \ctex_cleveref_hook:
{
- \ctex_patch_cmd:Nnn \refstepcounter@noarg
- { \endcsname \csname the }
- { \expandafter \endcsname \csname the }
- \ctex_patch_cmd:Nnn \refstepcounter@optarg
+ \@ifpackageloaded { hyperref }
+ { \__ctex_cleveref_hook_aux:N \H@refstepcounter }
+ {
+ \__ctex_cleveref_hook_aux:N \refstepcounter@noarg
+ \__ctex_cleveref_hook_aux:N \refstepcounter@optarg
+ }
+ \__ctex_cleveref_hook_aux:N \appendix
+ }
+\cs_new_protected:Npn \__ctex_cleveref_hook_aux:N #1
+ {
+ \ctex_patch_cmd_all:NnnnTF #1
+ {
+ \ExplSyntaxOff
+ \char_set_catcode_letter:n { 64 }
+ }
{ \endcsname \csname the }
{ \expandafter \endcsname \csname the }
+ { }
+ { \ctex_patch_failure:N #1 }
}
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
diff --git a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def
index 551a33cce3f..98efa36e7af 100644
--- a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def
+++ b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Heading modification for book (CTEX)}
\ProvidesExplFile{ctex-book.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
\seq_new:N \c__ctex_headings_seq
@@ -837,12 +837,25 @@
}
\cs_new_protected:Npn \ctex_cleveref_hook:
{
- \ctex_patch_cmd:Nnn \refstepcounter@noarg
- { \endcsname \csname the }
- { \expandafter \endcsname \csname the }
- \ctex_patch_cmd:Nnn \refstepcounter@optarg
+ \@ifpackageloaded { hyperref }
+ { \__ctex_cleveref_hook_aux:N \H@refstepcounter }
+ {
+ \__ctex_cleveref_hook_aux:N \refstepcounter@noarg
+ \__ctex_cleveref_hook_aux:N \refstepcounter@optarg
+ }
+ \__ctex_cleveref_hook_aux:N \appendix
+ }
+\cs_new_protected:Npn \__ctex_cleveref_hook_aux:N #1
+ {
+ \ctex_patch_cmd_all:NnnnTF #1
+ {
+ \ExplSyntaxOff
+ \char_set_catcode_letter:n { 64 }
+ }
{ \endcsname \csname the }
{ \expandafter \endcsname \csname the }
+ { }
+ { \ctex_patch_failure:N #1 }
}
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
diff --git a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def
index 071055fae3b..2493c18cf19 100644
--- a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def
+++ b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Heading modification for report (CTEX)}
\ProvidesExplFile{ctex-report.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
\seq_new:N \c__ctex_headings_seq
@@ -832,12 +832,25 @@
}
\cs_new_protected:Npn \ctex_cleveref_hook:
{
- \ctex_patch_cmd:Nnn \refstepcounter@noarg
- { \endcsname \csname the }
- { \expandafter \endcsname \csname the }
- \ctex_patch_cmd:Nnn \refstepcounter@optarg
+ \@ifpackageloaded { hyperref }
+ { \__ctex_cleveref_hook_aux:N \H@refstepcounter }
+ {
+ \__ctex_cleveref_hook_aux:N \refstepcounter@noarg
+ \__ctex_cleveref_hook_aux:N \refstepcounter@optarg
+ }
+ \__ctex_cleveref_hook_aux:N \appendix
+ }
+\cs_new_protected:Npn \__ctex_cleveref_hook_aux:N #1
+ {
+ \ctex_patch_cmd_all:NnnnTF #1
+ {
+ \ExplSyntaxOff
+ \char_set_catcode_letter:n { 64 }
+ }
{ \endcsname \csname the }
{ \expandafter \endcsname \csname the }
+ { }
+ { \ctex_patch_failure:N #1 }
}
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def
index eb8a8ae1f17..616b9a095e0 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-article.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\ctex_set:nn { part }
{
aftertitle = \par ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def
index de07b2e8410..18ba0eea77e 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese scheme for beamer (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-beamer.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\ctex_set:nn { part }
{
aftertitle = \par ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def
index b8d84e278ad..f9eb187526b 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-book.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\ctex_set:nn { part }
{
aftertitle = \par ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
index 11c14cffd6b..64b80f65156 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-report.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\ctex_set:nn { part }
{
aftertitle = \par ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
index 2d3f9938e9a..2c3cd23ed7d 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Chinese scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\ctex_set:n { today = small }
\ctex_if_autoindent_touched:F
{ \ctex_set:n { autoindent = true } }
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def
index e6266ba491c..553b3147eed 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Plain scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-article.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\ctex_set:nn { part }
{
aftertitle = \par ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def
index 9e05aa4068e..f878144236a 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Plain scheme for beamer (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-beamer.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\ctex_set:nn { part }
{
aftertitle = \par ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def
index d8d934d0673..9db4cd75349 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Plain scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-book.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\ctex_set:nn { part }
{
aftertitle = \par ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
index 42306e6382e..9aba0b40f15 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Plain scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-report.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
\ctex_set:nn { part }
{
aftertitle = \par ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def
index e77a74e15a2..242b10e60aa 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
{Plain scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-plain.def}
- {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.4}{\ExplFileDescription}
%%
%%
%% End of file `ctex-scheme-plain.def'.