From 0e008fd431955e2802ab0abb5220e3bfb78256e6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 20 Jun 2021 19:56:11 +0000 Subject: ctex (20jun21) git-svn-id: svn://tug.org/texlive/trunk@59654 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/ctex/ctex.pdf | Bin 1214489 -> 1149510 bytes Master/texmf-dist/source/latex/ctex/ctex.dtx | 488 +++++++++++++-------- .../tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex | 2 +- .../tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex | 2 +- .../tex/generic/ctex/zhmap/ctex-zhmap-founder.tex | 2 +- .../tex/generic/ctex/zhmap/ctex-zhmap-mac.tex | 2 +- .../tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex | 2 +- .../tex/generic/ctex/zhmap/ctex-zhmap-windows.tex | 2 +- .../tex/latex/ctex/config/ctex-name-gbk.cfg | 4 +- .../tex/latex/ctex/config/ctex-name-utf8.cfg | 4 +- Master/texmf-dist/tex/latex/ctex/config/ctex.cfg | 4 +- .../tex/latex/ctex/config/ctexbackend.cfg | 2 +- .../texmf-dist/tex/latex/ctex/config/ctexopts.cfg | 4 +- Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo | 4 +- Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo | 4 +- Master/texmf-dist/tex/latex/ctex/ctex.sty | 69 +-- Master/texmf-dist/tex/latex/ctex/ctexart.cls | 69 +-- Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls | 69 +-- Master/texmf-dist/tex/latex/ctex/ctexbook.cls | 69 +-- Master/texmf-dist/tex/latex/ctex/ctexcap.sty | 4 +- Master/texmf-dist/tex/latex/ctex/ctexheading.sty | 42 +- Master/texmf-dist/tex/latex/ctex/ctexhook.sty | 81 +++- Master/texmf-dist/tex/latex/ctex/ctexpatch.sty | 4 +- Master/texmf-dist/tex/latex/ctex/ctexrep.cls | 69 +-- Master/texmf-dist/tex/latex/ctex/ctexsize.sty | 46 +- Master/texmf-dist/tex/latex/ctex/ctexspa.def | 2 +- .../translator-theorem-dictionary-ChineseGBK.dict | 2 +- .../translator-theorem-dictionary-ChineseUTF8.dict | 2 +- .../tex/latex/ctex/engine/ctex-engine-aptex.def | 99 +++-- .../tex/latex/ctex/engine/ctex-engine-luatex.def | 74 ++-- .../tex/latex/ctex/engine/ctex-engine-pdftex.def | 162 ++++--- .../tex/latex/ctex/engine/ctex-engine-uptex.def | 99 +++-- .../tex/latex/ctex/engine/ctex-engine-xetex.def | 65 +-- Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd | 2 +- Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd | 2 +- Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd | 2 +- Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd | 2 +- Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd | 2 +- Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd | 2 +- Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd | 2 +- Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd | 2 +- Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd | 2 +- Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd | 2 +- Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd | 2 +- Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd | 2 +- .../tex/latex/ctex/fontset/ctex-fontset-adobe.def | 4 +- .../tex/latex/ctex/fontset/ctex-fontset-fandol.def | 4 +- .../latex/ctex/fontset/ctex-fontset-founder.def | 4 +- .../tex/latex/ctex/fontset/ctex-fontset-mac.def | 4 +- .../tex/latex/ctex/fontset/ctex-fontset-macnew.def | 4 +- .../tex/latex/ctex/fontset/ctex-fontset-macold.def | 4 +- .../tex/latex/ctex/fontset/ctex-fontset-ubuntu.def | 4 +- .../latex/ctex/fontset/ctex-fontset-windows.def | 4 +- .../latex/ctex/heading/ctex-heading-article.def | 10 +- .../tex/latex/ctex/heading/ctex-heading-beamer.def | 10 +- .../tex/latex/ctex/heading/ctex-heading-book.def | 10 +- .../tex/latex/ctex/heading/ctex-heading-report.def | 10 +- .../ctex/scheme/ctex-scheme-chinese-article.def | 4 +- .../ctex/scheme/ctex-scheme-chinese-beamer.def | 4 +- .../latex/ctex/scheme/ctex-scheme-chinese-book.def | 4 +- .../ctex/scheme/ctex-scheme-chinese-report.def | 4 +- .../tex/latex/ctex/scheme/ctex-scheme-chinese.def | 4 +- .../ctex/scheme/ctex-scheme-plain-article.def | 4 +- .../latex/ctex/scheme/ctex-scheme-plain-beamer.def | 4 +- .../latex/ctex/scheme/ctex-scheme-plain-book.def | 4 +- .../latex/ctex/scheme/ctex-scheme-plain-report.def | 4 +- .../tex/latex/ctex/scheme/ctex-scheme-plain.def | 4 +- 67 files changed, 883 insertions(+), 806 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/ctex/ctex.pdf b/Master/texmf-dist/doc/latex/ctex/ctex.pdf index 76adf7b92cd..073c674a841 100644 Binary files a/Master/texmf-dist/doc/latex/ctex/ctex.pdf and b/Master/texmf-dist/doc/latex/ctex/ctex.pdf differ diff --git a/Master/texmf-dist/source/latex/ctex/ctex.dtx b/Master/texmf-dist/source/latex/ctex/ctex.dtx index a1af5c1bf55..81488b12ef2 100644 --- a/Master/texmf-dist/source/latex/ctex/ctex.dtx +++ b/Master/texmf-dist/source/latex/ctex/ctex.dtx @@ -443,7 +443,7 @@ Copyright and Licence %\NeedsTeXFormat{LaTeX2e} %\input{ctexbackend.cfg} %\RequirePackage{expl3} -%<+!driver>\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +%<+!driver>\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ % {Chinese adapter in LaTeX (CTEX)} %\ProvidesExplPackage{\ExplFileName} % {Chinese font size definition (CTEX)} @@ -530,7 +530,7 @@ Copyright and Licence %\ProvidesExplFile{ctex-fontset-founder.def} % {Ubuntu fonts definition (CTEX)} %\ProvidesExplFile{ctex-fontset-ubuntu.def} -% {\ExplFileDate}{2.5.6}{\ExplFileDescription} +% {\ExplFileDate}{2.5.7}{\ExplFileDescription} % %\ProvidesFile{c19rm.fd}% %\ProvidesFile{c19sf.fd}% @@ -548,10 +548,10 @@ Copyright and Licence %\ProvidesFile{ctexbackend.cfg}% %\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}% %\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}% -% [2021/03/14 v2.5.6 Chinese font definition (CTEX)] -% [2021/03/14 v2.5.6 Space info for CJKpunct (CTEX)] -% [2021/03/14 v2.5.6 Backend configuration file (CTEX)] -% [2021/03/14 v2.5.6 Chinese translation for theorem name (CTEX)] +% [2021/06/20 v2.5.7 Chinese font definition (CTEX)] +% [2021/06/20 v2.5.7 Space info for CJKpunct (CTEX)] +% [2021/06/20 v2.5.7 Backend configuration file (CTEX)] +% [2021/06/20 v2.5.7 Chinese translation for theorem name (CTEX)] % %<*driver> \documentclass{ctxdoc} @@ -575,7 +575,7 @@ Copyright and Licence % \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 @@ Copyright and Licence % \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 @@ Copyright and Licence % \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,34 +3292,6 @@ Copyright and Licence %<@@=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@ctex. \@pkgextension } \c_@@_version_tl -\cs_new_eq:cN { ver@ctexcap. \@pkgextension } \c_@@_version_tl -\cs_new_eq:cN { ver@ctexsize. \@pkgextension } \c_@@_version_tl -\cs_new_eq:cN { ver@ctexheading. \@pkgextension } \c_@@_version_tl -% -%<*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@ctexsize. \@pkgextension } \c_@@_version_tl } -\@ifpackageloaded { ctexheading } - { \msg_error:nnn { ctex } { subpackage-loaded } { ctexheading } } - { \cs_new_eq:cN { ver@ctexheading. \@pkgextension } \c_@@_version_tl } -% -% -% \end{macrocode} -% % \begin{macrocode} %<*class|style> \RequirePackage { xparse , l3keys2e } @@ -3387,9 +3357,36 @@ Copyright and Licence % \begin{macrocode} %\RequirePackage { ctexhook , ctexpatch } %\RequirePackage { fix-cm } +% \end{macrocode} +% +% 宏包载入检查。 +% \begin{macrocode} +%<*class|ctex> +%<*class> +\ctex_disable_package:n { ctex } +\ctex_disable_package:n { ctexcap } +% +\ctex_disable_package:n { ctexsize } +\ctex_disable_package:n { ctexheading } +% +% \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> -%\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 } + } +% % \end{macrocode} +% \end{variable} % % \subsection{内部函数与变量} % @@ -3417,7 +3414,6 @@ Copyright and Licence { \keys_set:nn { ctex } } \cs_new_protected:Npn \ctex_set:nn #1 { \keys_set:nn { ctex / #1 } } -% % \end{macrocode} % \end{macro} % @@ -3425,54 +3421,9 @@ Copyright and Licence % \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 @@ Copyright and Licence \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 @@ Copyright and Licence % \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@plane - { \ctex_add_cmap:cn { @@_add_cmap_ #1 \CJK@plane : } {#1} } + { \exp_args:Ne \@@_add_cmap_auxi:n { #1 \CJK@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@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 @@ Copyright and Licence { \CTEX@Family@CMap {#1} {#2} } { \ctex_at_end_package:nn { cmap } - { \cs_gset_eq:NN \CTEX@Family@CMap \use_none:nn } + { + \cs_gset_eq:NN \ctex_add_cmap:n \use_none:n + \cs_gset_eq:NN \CTEX@Family@CMap \use_none:nn + } } { \ctex_patch_failure:N \DeclareFontFamily } } @@ -4273,10 +4243,7 @@ Copyright and Licence % \end{macrocode} % % \begin{macro}[int]{\ctex_CJK_input:n,\CJK@input} -% \pkg{breqn} 包可能会在正文中将 |^| 的 \tn{catcode} 改为 $12$ 或 $13$,这将 -% 破坏 \pkg{CJK} 对汉字的首字节的定义(\tn{CJK@loadBinding} 和 -% \tn{CJK@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,27 +4263,43 @@ Copyright and Licence % \footnote{\url{https://github.com/CTeX-org/ctex-kit/issues/146}}。 % 我们在这里给出 \tn{CJK@surr} 的一个不依赖 \tn{uppercase} 的实现。 % \begin{macrocode} -\if_cs_exist:N \CJK@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@surr \ctex_plane_to_utfxvibe:Nn -\fi: +\cs_if_free:NF \CJK@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@surr \ctex_plane_to_utfxvibe:Nn + } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}[int]{\CJK@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@addcmap + { + \ctex_patch_cmd:Nnn \CJK@addcmap + { \pdffontattr \font@name } + { + \pdfnobuiltintounicode \font@name + \pdffontattr \font@name + } + } % \end{macrocode} % \end{macro} % @@ -4565,7 +4548,13 @@ Copyright and Licence } \@ifpackageloaded { luatexja } { \msg_critical:nnx { ctex } { luatexja-loaded } { \g_file_curr_name_str } } - { \tl_const:cn { ver@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 @@ Copyright and Licence { \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 @@ Copyright and Licence % \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 @@ Copyright and Licence % \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 @@ Copyright and Licence \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@driver } { hdvipdfm } { - \AtBeginShipoutFirst + \ctex_at_shipout_first:n { \special { pdf:tounicode~GBK-EUC-UCS2 } } } { \RequirePackage { xCJK2uni } } @@ -6619,9 +6621,16 @@ Copyright and Licence % 置。注意 \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 } } + } % % \end{macrocode} % @@ -6759,13 +6768,6 @@ Copyright and Licence % \begin{macro}[int]{\ctex_add_to_selectfont:n,\CTEX@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 @@ Copyright and Licence { \exp_not:o { \CTEX@selectfont@hook #1 } } } \cs_new_eq:NN \CTEX@selectfont@hook \prg_do_nothing: -\if_cs_exist:N \@EverySelectfont@Init - \group_begin: - \cs_set:Npn \@@_tmp:N #1 - { - \tl_set:Nn \l_@@_tmp_tl {#1} - \cs_new_eq:NN \CTEX@selectfont@save #1 - \cs_new_protected:Npn \@@_restore_selectfont: - { - \cs_if_free:NF \scr@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@Init + \group_begin: + \cs_set:Npn \@@_tmp:N #1 + { + \tl_set:Nn \l_@@_tmp_tl {#1} + \cs_new_eq:NN \CTEX@selectfont@save #1 + \cs_new_protected:Npn \@@_restore_selectfont: + { + \cs_if_free:NF \scr@new@selectfont + { % \end{macrocode} % \pkg{CJK} 直接修改 \tn{selectfont} 和 \pkg{pxeverysel} 的补丁, % 会使 \pkg{KOMA-Script} 的 \tn{par@update} 失效。 % \begin{macrocode} %<*pdftex|uptex|aptex> - \cs_if_free:NF \par@update + \cs_if_free:NF \par@update %<*uptex|aptex> - { - \tl_put_right:Nn \@EverySelectfont@Init - { \tl_put_right:Nn #1 { \par@update } } - } + { + \tl_put_right:Nn \@EverySelectfont@Init + { \tl_put_right:Nn #1 { \par@update } } + } % %<*pdftex> - { \tl_put_right:Nn #1 { \par@update } } - \cs_set_eq:NN \scr@selectfont \CTEX@selectfont@save + { \tl_put_right:Nn #1 { \par@update } } + \cs_set_eq:NN \scr@selectfont \CTEX@selectfont@save % % - \cs_set_eq:NN \scr@new@selectfont #1 -% \cs_set_eq:NN \CTEX@selectfont@save \scr@selectfont - } - \tl_put_left:Nn \@EverySelectfont@Init - { \cs_set_eq:NN #1 \CTEX@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@update } - { \CTEX@selectfont@hook \size@update } - { \@@_restore_selectfont: } - { \ctex_patch_failure:N \selectfont } + \cs_set_eq:NN \scr@new@selectfont #1 +% \cs_set_eq:NN \CTEX@selectfont@save \scr@selectfont + } + \tl_put_left:Nn \@EverySelectfont@Init + { \cs_set_eq:NN #1 \CTEX@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@update } + { \CTEX@selectfont@hook \size@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 @@ Copyright and Licence % \tn{CJK@plane} 有定义,说明处于 \pkg{CJK} 宏包的 \tn{CJKsymbol} 之内,不必使用钩子。 % \begin{macrocode} %<*pdftex> -\EverySelectfont { \cs_if_exist:NF \CJK@plane { \CTEX@selectfont@hook } } +\ctex_gadd_selectfont_hook:n + { \cs_if_exist:NF \CJK@plane { \CTEX@selectfont@hook } } % %<*xetex|luatex|uptex|aptex> -\EverySelectfont { \CTEX@selectfont@hook } +\ctex_gadd_selectfont_hook:n { \CTEX@selectfont@hook } % % \end{macrocode} % @@ -9072,13 +9094,18 @@ Copyright and Licence % % \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} \cs_new_protected:Npn \ctex_cleveref_hook: { \@ifpackageloaded { hyperref } - { \@@_cleveref_hook_aux:N \H@refstepcounter } + { + \@ifpackagewith { hyperref } { implicit = false } + { } + { \@@_cleveref_hook_aux:N \H@refstepcounter } + } { \@@_cleveref_hook_aux:N \refstepcounter@noarg \@@_cleveref_hook_aux:N \refstepcounter@optarg @@ -9761,8 +9788,8 @@ Copyright and Licence % \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 @@ Copyright and Licence % 文件标识信息。 % \begin{macrocode} %\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)] %\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)] %\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)] %\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)] %\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)] %\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)] % \end{macrocode} % % \paragraph{\pkg{ctex-zhmap-adobe.tex}} @@ -11463,6 +11490,113 @@ Copyright and Licence %<*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@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@package@load} 禁止宏包载入。} +% +% \begin{macro}[int]{\ctex_disable_package:n} +% 禁止宏包载入。采用 \LaTeX \ 2020-10-01 提供的 \tn{disable@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@package@load + { + \exp_args:Nnx \exp_not:N \disable@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@file@substitution} 实现, +% 否则给出无效警告。 +% \begin{macrocode} +\ctex_if_format_at_least:nTF { 2020/10/01 } + { + \cs_new_protected:Npn \ctex_replace_package:nn #1#2 + { + \declare@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 @@ Copyright and Licence % % \LaTeX \ 2020/10/01 开始提供常用钩子管理机制。在新机制下,我们只需要做简单的包装。 % \begin{macrocode} -\@ifl@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 } } diff --git a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex index 5838f8e217e..1df5310ee4d 100644 --- a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex +++ b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex @@ -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 diff --git a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex index 114362de639..d806987fe69 100644 --- a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex +++ b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex @@ -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 diff --git a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex index ff0ea33eada..e419385e79c 100644 --- a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex +++ b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex @@ -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@UGBK@ $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 = Ŀ¼ , 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 f4a08db4a52..47f59da0122 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 = 目录 , diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg index cffb85ddb8d..e43aae5c4f5 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {Configuration file (CTEX)} \ProvidesExplFile{\ExplFileName.cfg} - {\ExplFileDate}{2.5.6}{\ExplFileDescription} + {\ExplFileDate}{2.5.7}{\ExplFileDescription} %% %% %% diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg index 0b179953832..e286b12784d 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}% - [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 diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg index ba231150efe..578c0beb3f4 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {Option configuration file (CTEX)} \ProvidesExplFile{ctexopts.cfg} - {\ExplFileDate}{2.5.6}{\ExplFileDescription} + {\ExplFileDate}{2.5.7}{\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 7736586bdfa..22bf69d8f5e 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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@ diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo b/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo index ca8a792432c..530e73c21b1 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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@ diff --git a/Master/texmf-dist/tex/latex/ctex/ctex.sty b/Master/texmf-dist/tex/latex/ctex/ctex.sty index 7d3dfb2277d..f15684d290d 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctex.sty @@ -26,24 +26,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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@ctexsize. \@pkgextension } \c__ctex_version_tl } -\@ifpackageloaded { ctexheading } - { \msg_error:nnn { ctex } { subpackage-loaded } { ctexheading } } - { \cs_new_eq:cN { ver@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 } { diff --git a/Master/texmf-dist/tex/latex/ctex/ctexart.cls b/Master/texmf-dist/tex/latex/ctex/ctexart.cls index c71f6075ca7..5e3ac7a4fef 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexart.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexart.cls @@ -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 $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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@ctex. \@pkgextension } \c__ctex_version_tl -\cs_new_eq:cN { ver@ctexcap. \@pkgextension } \c__ctex_version_tl -\cs_new_eq:cN { ver@ctexsize. \@pkgextension } \c__ctex_version_tl -\cs_new_eq:cN { ver@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,7 +1273,11 @@ \cs_new_protected:Npn \ctex_cleveref_hook: { \@ifpackageloaded { hyperref } - { \__ctex_cleveref_hook_aux:N \H@refstepcounter } + { + \@ifpackagewith { hyperref } { implicit = false } + { } + { \__ctex_cleveref_hook_aux:N \H@refstepcounter } + } { \__ctex_cleveref_hook_aux:N \refstepcounter@noarg \__ctex_cleveref_hook_aux:N \refstepcounter@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 } { diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls index 03a5161eb49..ee11590f034 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls @@ -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 $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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@ctex. \@pkgextension } \c__ctex_version_tl -\cs_new_eq:cN { ver@ctexcap. \@pkgextension } \c__ctex_version_tl -\cs_new_eq:cN { ver@ctexsize. \@pkgextension } \c__ctex_version_tl -\cs_new_eq:cN { ver@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,7 +757,11 @@ \cs_new_protected:Npn \ctex_cleveref_hook: { \@ifpackageloaded { hyperref } - { \__ctex_cleveref_hook_aux:N \H@refstepcounter } + { + \@ifpackagewith { hyperref } { implicit = false } + { } + { \__ctex_cleveref_hook_aux:N \H@refstepcounter } + } { \__ctex_cleveref_hook_aux:N \refstepcounter@noarg \__ctex_cleveref_hook_aux:N \refstepcounter@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 } { diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls index d5d0cf01b0a..8a18c62b58c 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls @@ -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 $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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@ctex. \@pkgextension } \c__ctex_version_tl -\cs_new_eq:cN { ver@ctexcap. \@pkgextension } \c__ctex_version_tl -\cs_new_eq:cN { ver@ctexsize. \@pkgextension } \c__ctex_version_tl -\cs_new_eq:cN { ver@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,7 +1401,11 @@ \cs_new_protected:Npn \ctex_cleveref_hook: { \@ifpackageloaded { hyperref } - { \__ctex_cleveref_hook_aux:N \H@refstepcounter } + { + \@ifpackagewith { hyperref } { implicit = false } + { } + { \__ctex_cleveref_hook_aux:N \H@refstepcounter } + } { \__ctex_cleveref_hook_aux:N \refstepcounter@noarg \__ctex_cleveref_hook_aux:N \refstepcounter@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 } { diff --git a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty index 2b13a4ee5ce..a205523333a 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 } diff --git a/Master/texmf-dist/tex/latex/ctex/ctexheading.sty b/Master/texmf-dist/tex/latex/ctex/ctexheading.sty index ca84380ca2f..877cc8f2aa6 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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: diff --git a/Master/texmf-dist/tex/latex/ctex/ctexhook.sty b/Master/texmf-dist/tex/latex/ctex/ctexhook.sty index 7401f0697a0..ed0b47caacf 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexhook.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexhook.sty @@ -26,10 +26,85 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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@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@package@load + { + \exp_args:Nnx \exp_not:N \disable@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@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@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 } } diff --git a/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty b/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty index c1ecf1e1fbe..1a670a7914b 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 diff --git a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls index 7d5b582dcf9..898e5c8fcf4 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls @@ -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 $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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@ctex. \@pkgextension } \c__ctex_version_tl -\cs_new_eq:cN { ver@ctexcap. \@pkgextension } \c__ctex_version_tl -\cs_new_eq:cN { ver@ctexsize. \@pkgextension } \c__ctex_version_tl -\cs_new_eq:cN { ver@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,7 +1396,11 @@ \cs_new_protected:Npn \ctex_cleveref_hook: { \@ifpackageloaded { hyperref } - { \__ctex_cleveref_hook_aux:N \H@refstepcounter } + { + \@ifpackagewith { hyperref } { implicit = false } + { } + { \__ctex_cleveref_hook_aux:N \H@refstepcounter } + } { \__ctex_cleveref_hook_aux:N \refstepcounter@noarg \__ctex_cleveref_hook_aux:N \refstepcounter@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 } { diff --git a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty index 045642e4a22..3ea1f0b21ef 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty @@ -26,52 +26,14 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 %% diff --git a/Master/texmf-dist/tex/latex/ctex/ctexspa.def b/Master/texmf-dist/tex/latex/ctex/ctexspa.def index 722a55199e0..b53c1d94afd 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}% - [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,,,} 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 906f137f3d1..1bbb83c0f8c 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}% - [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}{} 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 ac6037577f2..dd2bcda48e5 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}% - [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}{评论} 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 636c06f3091..aba9f456e22 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,23 +24,29 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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@selectfont@hook #1 } } } \cs_new_eq:NN \CTEX@selectfont@hook \prg_do_nothing: -\if_cs_exist:N \@EverySelectfont@Init - \group_begin: - \cs_set:Npn \__ctex_tmp:N #1 - { - \tl_set:Nn \l__ctex_tmp_tl {#1} - \cs_new_eq:NN \CTEX@selectfont@save #1 - \cs_new_protected:Npn \__ctex_restore_selectfont: - { - \cs_if_free:NF \scr@new@selectfont - { - \cs_if_free:NF \par@update - { - \tl_put_right:Nn \@EverySelectfont@Init - { \tl_put_right:Nn #1 { \par@update } } - } - \cs_set_eq:NN \scr@new@selectfont #1 - \cs_set_eq:NN \CTEX@selectfont@save \scr@selectfont - } - \tl_put_left:Nn \@EverySelectfont@Init - { \cs_set_eq:NN #1 \CTEX@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@update } - { \CTEX@selectfont@hook \size@update } - { \__ctex_restore_selectfont: } - { \ctex_patch_failure:N \selectfont } +\if_bool:N \c__ctex_everysel_loaded_bool + \if_cs_exist:N \@EverySelectfont@Init + \group_begin: + \cs_set:Npn \__ctex_tmp:N #1 + { + \tl_set:Nn \l__ctex_tmp_tl {#1} + \cs_new_eq:NN \CTEX@selectfont@save #1 + \cs_new_protected:Npn \__ctex_restore_selectfont: + { + \cs_if_free:NF \scr@new@selectfont + { + \cs_if_free:NF \par@update + { + \tl_put_right:Nn \@EverySelectfont@Init + { \tl_put_right:Nn #1 { \par@update } } + } + \cs_set_eq:NN \scr@new@selectfont #1 + \cs_set_eq:NN \CTEX@selectfont@save \scr@selectfont + } + \tl_put_left:Nn \@EverySelectfont@Init + { \cs_set_eq:NN #1 \CTEX@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@update } + { \CTEX@selectfont@hook \size@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@selectfont@hook } +\ctex_gadd_selectfont_hook:n { \CTEX@selectfont@hook } \cs_new_protected:Npn \ctex_update_xkanjiskip: { \skip_if_eq:nnT 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 e337b428141..997f4f93986 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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,13 +35,20 @@ } \@ifpackageloaded { luatexja } { \msg_critical:nnx { ctex } { luatexja-loaded } { \g_file_curr_name_str } } - { \tl_const:cn { ver@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 } } \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@selectfont@hook #1 } } } \cs_new_eq:NN \CTEX@selectfont@hook \prg_do_nothing: -\if_cs_exist:N \@EverySelectfont@Init - \group_begin: - \cs_set:Npn \__ctex_tmp:N #1 - { - \tl_set:Nn \l__ctex_tmp_tl {#1} - \cs_new_eq:NN \CTEX@selectfont@save #1 - \cs_new_protected:Npn \__ctex_restore_selectfont: - { - \cs_if_free:NF \scr@new@selectfont - { - \cs_set_eq:NN \scr@new@selectfont #1 - \cs_set_eq:NN \CTEX@selectfont@save \scr@selectfont - } - \tl_put_left:Nn \@EverySelectfont@Init - { \cs_set_eq:NN #1 \CTEX@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@update } - { \CTEX@selectfont@hook \size@update } - { \__ctex_restore_selectfont: } - { \ctex_patch_failure:N \selectfont } +\if_bool:N \c__ctex_everysel_loaded_bool + \if_cs_exist:N \@EverySelectfont@Init + \group_begin: + \cs_set:Npn \__ctex_tmp:N #1 + { + \tl_set:Nn \l__ctex_tmp_tl {#1} + \cs_new_eq:NN \CTEX@selectfont@save #1 + \cs_new_protected:Npn \__ctex_restore_selectfont: + { + \cs_if_free:NF \scr@new@selectfont + { + \cs_set_eq:NN \scr@new@selectfont #1 + \cs_set_eq:NN \CTEX@selectfont@save \scr@selectfont + } + \tl_put_left:Nn \@EverySelectfont@Init + { \cs_set_eq:NN #1 \CTEX@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@update } + { \CTEX@selectfont@hook \size@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@selectfont@hook } +\ctex_gadd_selectfont_hook:n { \CTEX@selectfont@hook } \ctex_add_to_selectfont:n { \ctex_ltj_select_font: 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 bd049cb81ec..3f197ac4d8d 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,23 +24,29 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {(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@plane - { \ctex_add_cmap:cn { __ctex_add_cmap_ #1 \CJK@plane : } {#1} } + { \exp_args:Ne \__ctex_add_cmap_auxi:n { #1 \CJK@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@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@Family@CMap {#1} {#2} } { \ctex_at_end_package:nn { cmap } - { \cs_gset_eq:NN \CTEX@Family@CMap \use_none:nn } + { + \cs_gset_eq:NN \ctex_add_cmap:n \use_none:n + \cs_gset_eq:NN \CTEX@Family@CMap \use_none:nn + } } { \ctex_patch_failure:N \DeclareFontFamily } } @@ -118,27 +134,36 @@ \ctex_pop_file: } \cs_set_eq:NN \CJK@input \ctex_CJK_input:n -\if_cs_exist:N \CJK@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@surr \ctex_plane_to_utfxvibe:Nn -\fi: +\cs_if_free:NF \CJK@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@surr \ctex_plane_to_utfxvibe:Nn + } +\cs_if_free:NF \CJK@addcmap + { + \ctex_patch_cmd:Nnn \CJK@addcmap + { \pdffontattr \font@name } + { + \pdfnobuiltintounicode \font@name + \pdffontattr \font@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@driver } { hdvipdfm } { - \AtBeginShipoutFirst + \ctex_at_shipout_first:n { \special { pdf:tounicode~GBK-EUC-UCS2 } } } { \RequirePackage { xCJK2uni } } @@ -341,36 +367,44 @@ { \exp_not:o { \CTEX@selectfont@hook #1 } } } \cs_new_eq:NN \CTEX@selectfont@hook \prg_do_nothing: -\if_cs_exist:N \@EverySelectfont@Init - \group_begin: - \cs_set:Npn \__ctex_tmp:N #1 - { - \tl_set:Nn \l__ctex_tmp_tl {#1} - \cs_new_eq:NN \CTEX@selectfont@save #1 - \cs_new_protected:Npn \__ctex_restore_selectfont: - { - \cs_if_free:NF \scr@new@selectfont - { - \cs_if_free:NF \par@update - { \tl_put_right:Nn #1 { \par@update } } - \cs_set_eq:NN \scr@selectfont \CTEX@selectfont@save - \cs_set_eq:NN \scr@new@selectfont #1 - } - \tl_put_left:Nn \@EverySelectfont@Init - { \cs_set_eq:NN #1 \CTEX@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@update } - { \CTEX@selectfont@hook \size@update } - { \__ctex_restore_selectfont: } - { \ctex_patch_failure:N \selectfont } +\if_bool:N \c__ctex_everysel_loaded_bool + \if_cs_exist:N \@EverySelectfont@Init + \group_begin: + \cs_set:Npn \__ctex_tmp:N #1 + { + \tl_set:Nn \l__ctex_tmp_tl {#1} + \cs_new_eq:NN \CTEX@selectfont@save #1 + \cs_new_protected:Npn \__ctex_restore_selectfont: + { + \cs_if_free:NF \scr@new@selectfont + { + \cs_if_free:NF \par@update + { \tl_put_right:Nn #1 { \par@update } } + \cs_set_eq:NN \scr@selectfont \CTEX@selectfont@save + \cs_set_eq:NN \scr@new@selectfont #1 + } + \tl_put_left:Nn \@EverySelectfont@Init + { \cs_set_eq:NN #1 \CTEX@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@update } + { \CTEX@selectfont@hook \size@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@plane { \CTEX@selectfont@hook } } +\ctex_gadd_selectfont_hook:n + { \cs_if_exist:NF \CJK@plane { \CTEX@selectfont@hook } } \ctex_define:n { space .choice: , 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 e36d7fffbef..5c5402024d2 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,23 +24,29 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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@selectfont@hook #1 } } } \cs_new_eq:NN \CTEX@selectfont@hook \prg_do_nothing: -\if_cs_exist:N \@EverySelectfont@Init - \group_begin: - \cs_set:Npn \__ctex_tmp:N #1 - { - \tl_set:Nn \l__ctex_tmp_tl {#1} - \cs_new_eq:NN \CTEX@selectfont@save #1 - \cs_new_protected:Npn \__ctex_restore_selectfont: - { - \cs_if_free:NF \scr@new@selectfont - { - \cs_if_free:NF \par@update - { - \tl_put_right:Nn \@EverySelectfont@Init - { \tl_put_right:Nn #1 { \par@update } } - } - \cs_set_eq:NN \scr@new@selectfont #1 - \cs_set_eq:NN \CTEX@selectfont@save \scr@selectfont - } - \tl_put_left:Nn \@EverySelectfont@Init - { \cs_set_eq:NN #1 \CTEX@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@update } - { \CTEX@selectfont@hook \size@update } - { \__ctex_restore_selectfont: } - { \ctex_patch_failure:N \selectfont } +\if_bool:N \c__ctex_everysel_loaded_bool + \if_cs_exist:N \@EverySelectfont@Init + \group_begin: + \cs_set:Npn \__ctex_tmp:N #1 + { + \tl_set:Nn \l__ctex_tmp_tl {#1} + \cs_new_eq:NN \CTEX@selectfont@save #1 + \cs_new_protected:Npn \__ctex_restore_selectfont: + { + \cs_if_free:NF \scr@new@selectfont + { + \cs_if_free:NF \par@update + { + \tl_put_right:Nn \@EverySelectfont@Init + { \tl_put_right:Nn #1 { \par@update } } + } + \cs_set_eq:NN \scr@new@selectfont #1 + \cs_set_eq:NN \CTEX@selectfont@save \scr@selectfont + } + \tl_put_left:Nn \@EverySelectfont@Init + { \cs_set_eq:NN #1 \CTEX@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@update } + { \CTEX@selectfont@hook \size@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@selectfont@hook } +\ctex_gadd_selectfont_hook:n { \CTEX@selectfont@hook } \cs_new_protected:Npn \ctex_update_xkanjiskip: { \skip_if_eq:nnT 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 74e38695699..f8807ceb56f 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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@selectfont@hook #1 } } } \cs_new_eq:NN \CTEX@selectfont@hook \prg_do_nothing: -\if_cs_exist:N \@EverySelectfont@Init - \group_begin: - \cs_set:Npn \__ctex_tmp:N #1 - { - \tl_set:Nn \l__ctex_tmp_tl {#1} - \cs_new_eq:NN \CTEX@selectfont@save #1 - \cs_new_protected:Npn \__ctex_restore_selectfont: - { - \cs_if_free:NF \scr@new@selectfont - { - \cs_set_eq:NN \scr@new@selectfont #1 - \cs_set_eq:NN \CTEX@selectfont@save \scr@selectfont - } - \tl_put_left:Nn \@EverySelectfont@Init - { \cs_set_eq:NN #1 \CTEX@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@update } - { \CTEX@selectfont@hook \size@update } - { \__ctex_restore_selectfont: } - { \ctex_patch_failure:N \selectfont } +\if_bool:N \c__ctex_everysel_loaded_bool + \if_cs_exist:N \@EverySelectfont@Init + \group_begin: + \cs_set:Npn \__ctex_tmp:N #1 + { + \tl_set:Nn \l__ctex_tmp_tl {#1} + \cs_new_eq:NN \CTEX@selectfont@save #1 + \cs_new_protected:Npn \__ctex_restore_selectfont: + { + \cs_if_free:NF \scr@new@selectfont + { + \cs_set_eq:NN \scr@new@selectfont #1 + \cs_set_eq:NN \CTEX@selectfont@save \scr@selectfont + } + \tl_put_left:Nn \@EverySelectfont@Init + { \cs_set_eq:NN #1 \CTEX@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@update } + { \CTEX@selectfont@hook \size@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@selectfont@hook } +\ctex_gadd_selectfont_hook:n { \CTEX@selectfont@hook } \ctex_define:n { space .choice: , diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd b/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd index e3faca98fff..a7a522e2198 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}% - [2021/03/14 v2.5.6 Chinese font definition (CTEX)] + [2021/06/20 v2.5.7 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 c751acbbd9f..1b12f22ed19 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}% - [2021/03/14 v2.5.6 Chinese font definition (CTEX)] + [2021/06/20 v2.5.7 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 5b68a113bad..273ec9f5470 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}% - [2021/03/14 v2.5.6 Chinese font definition (CTEX)] + [2021/06/20 v2.5.7 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 508a06a7532..efc019af2bb 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}% - [2021/03/14 v2.5.6 Chinese font definition (CTEX)] + [2021/06/20 v2.5.7 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 883d7ea1daf..bf8f05aaeb4 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}% - [2021/03/14 v2.5.6 Chinese font definition (CTEX)] + [2021/06/20 v2.5.7 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 402a4c460a3..c58c39bfcb9 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}% - [2021/03/14 v2.5.6 Chinese font definition (CTEX)] + [2021/06/20 v2.5.7 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 1a3cf49c662..7a11e95f1f9 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}% - [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}{} diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd index 61309bd339a..e1d4ef3d6c1 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}% - [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}{} diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd index eb783db6d44..fb8ddaf83f8 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}% - [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}{} %% diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd index 665d862b0f7..f9f1e9beff1 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}% - [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}{} diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd index 55fa3a6b829..b922a26a1af 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}% - [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}{} diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd index cd3aa23280b..652a65a27f5 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}% - [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}{} %% 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 9d661835203..bb89ff845c0 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 } } { 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 2b8982922b9..b5550804aa3 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 } } { 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 e9108d7202d..43ccdf2251f 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 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 61cbc302f4a..6cf6d03fa90 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 } } 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 651b4ae628e..f82ab5f7009 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 } } { 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 ecea01511fc..54607e6ea99 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 } } 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 4e19d5ead10..ed60ac8498b 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 } } { 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 726723676c9..063fa0d537d 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 } } { 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 03d7154fafe..012358c379a 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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,7 +733,11 @@ \cs_new_protected:Npn \ctex_cleveref_hook: { \@ifpackageloaded { hyperref } - { \__ctex_cleveref_hook_aux:N \H@refstepcounter } + { + \@ifpackagewith { hyperref } { implicit = false } + { } + { \__ctex_cleveref_hook_aux:N \H@refstepcounter } + } { \__ctex_cleveref_hook_aux:N \refstepcounter@noarg \__ctex_cleveref_hook_aux:N \refstepcounter@optarg 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 74a6ed0db7b..fd99ad3cd19 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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,7 +222,11 @@ \cs_new_protected:Npn \ctex_cleveref_hook: { \@ifpackageloaded { hyperref } - { \__ctex_cleveref_hook_aux:N \H@refstepcounter } + { + \@ifpackagewith { hyperref } { implicit = false } + { } + { \__ctex_cleveref_hook_aux:N \H@refstepcounter } + } { \__ctex_cleveref_hook_aux:N \refstepcounter@noarg \__ctex_cleveref_hook_aux:N \refstepcounter@optarg 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 c8f308a4438..6a01527d18e 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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,7 +861,11 @@ \cs_new_protected:Npn \ctex_cleveref_hook: { \@ifpackageloaded { hyperref } - { \__ctex_cleveref_hook_aux:N \H@refstepcounter } + { + \@ifpackagewith { hyperref } { implicit = false } + { } + { \__ctex_cleveref_hook_aux:N \H@refstepcounter } + } { \__ctex_cleveref_hook_aux:N \refstepcounter@noarg \__ctex_cleveref_hook_aux:N \refstepcounter@optarg 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 bf1501ca57a..5ec20e8892c 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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,7 +856,11 @@ \cs_new_protected:Npn \ctex_cleveref_hook: { \@ifpackageloaded { hyperref } - { \__ctex_cleveref_hook_aux:N \H@refstepcounter } + { + \@ifpackagewith { hyperref } { implicit = false } + { } + { \__ctex_cleveref_hook_aux:N \H@refstepcounter } + } { \__ctex_cleveref_hook_aux:N \refstepcounter@noarg \__ctex_cleveref_hook_aux:N \refstepcounter@optarg 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 802ab6f1cc8..f93f21e442d 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 , 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 0def935f8d3..7c689d1f565 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 , 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 a8f9745112c..8e6ad724017 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 , 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 df1652981d9..583a5d716d8 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 , 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 8fae69e4531..3e0bb86e39e 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 } } 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 e052cf10e3a..aa3068013e6 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 , 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 0718d98d312..130f9064c6b 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 , 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 6aebb704ccd..e91dbd74d4e 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 , 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 3dda453c7b7..9165389f303 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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 , 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 8aef3a73f07..76dc59ad5d9 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 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng $ +\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ {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'. -- cgit v1.2.3