diff options
72 files changed, 297 insertions, 244 deletions
diff --git a/Master/texmf-dist/doc/latex/ctex/README.md b/Master/texmf-dist/doc/latex/ctex/README.md index fc0e62555f4..e7ab08db2a3 100644 --- a/Master/texmf-dist/doc/latex/ctex/README.md +++ b/Master/texmf-dist/doc/latex/ctex/README.md @@ -30,7 +30,7 @@ Issues and pull requests are welcome. Copyright and Licence --------------------- - Copyright (C) 2003--2021 + Copyright (C) 2003--2022 CTEX.ORG and any individual authors listed elsewhere in this file. ---------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/ctex/ctex.pdf b/Master/texmf-dist/doc/latex/ctex/ctex.pdf Binary files differindex e4e02e6d8b3..1f2e3782cad 100644 --- a/Master/texmf-dist/doc/latex/ctex/ctex.pdf +++ b/Master/texmf-dist/doc/latex/ctex/ctex.pdf diff --git a/Master/texmf-dist/source/latex/ctex/ctex.dtx b/Master/texmf-dist/source/latex/ctex/ctex.dtx index adc4440bc7f..e01c5519d51 100644 --- a/Master/texmf-dist/source/latex/ctex/ctex.dtx +++ b/Master/texmf-dist/source/latex/ctex/ctex.dtx @@ -2,7 +2,7 @@ % !TeX program = XeLaTeX % !TeX encoding = UTF-8 % -% Copyright (C) 2003--2021 +% Copyright (C) 2003--2022 % CTEX.ORG and any individual authors listed elsewhere in this file. % -------------------------------------------------------------------------- % @@ -56,7 +56,7 @@ Issues and pull requests are welcome. Copyright and Licence --------------------- - Copyright (C) 2003--2021 + Copyright (C) 2003--2022 CTEX.ORG and any individual authors listed elsewhere in this file. ---------------------------------------------------------------------- @@ -163,7 +163,7 @@ Copyright and Licence \preamble - Copyright (C) 2003--2021 + Copyright (C) 2003--2022 CTEX.ORG and any individual authors listed in the documentation. --------------------------------------------------------------------- @@ -443,7 +443,7 @@ Copyright and Licence %<class|style|ctexcap|ctexhook|ctexpatch>\NeedsTeXFormat{LaTeX2e} %<class>\input{ctexbackend.cfg} %<class|style|ctexcap|ctexhook|ctexpatch>\RequirePackage{expl3} -%<+!driver>\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +%<+!driver>\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ %<ctex> {Chinese adapter in LaTeX (CTEX)} %<ctex>\ProvidesExplPackage{\ExplFileName} %<ctexsize> {Chinese font size definition (CTEX)} @@ -530,7 +530,7 @@ Copyright and Licence %<founder>\ProvidesExplFile{ctex-fontset-founder.def} %<ubuntu> {Ubuntu fonts definition (CTEX)} %<ubuntu>\ProvidesExplFile{ctex-fontset-ubuntu.def} -%<!driver> {\ExplFileDate}{2.5.8}{\ExplFileDescription} +%<!driver> {\ExplFileDate}{2.5.9}{\ExplFileDescription} %</!(fd|ctexspa|dict|backend)> %<c19&rm>\ProvidesFile{c19rm.fd}% %<c19&sf>\ProvidesFile{c19sf.fd}% @@ -548,10 +548,10 @@ Copyright and Licence %<backend>\ProvidesFile{ctexbackend.cfg}% %<dict&theorem&GBK>\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}% %<dict&theorem&UTF8>\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}% -%<fd> [2021/12/12 v2.5.8 Chinese font definition (CTEX)] -%<ctexspa> [2021/12/12 v2.5.8 Space info for CJKpunct (CTEX)] -%<backend> [2021/12/12 v2.5.8 Backend configuration file (CTEX)] -%<dict&theorem> [2021/12/12 v2.5.8 Chinese translation for theorem name (CTEX)] +%<fd> [2022/06/04 v2.5.9 Chinese font definition (CTEX)] +%<ctexspa> [2022/06/04 v2.5.9 Space info for CJKpunct (CTEX)] +%<backend> [2022/06/04 v2.5.9 Backend configuration file (CTEX)] +%<dict&theorem> [2022/06/04 v2.5.9 Chinese translation for theorem name (CTEX)] %</!(driver|readme|install|zhmap|spa|docstrip)> %<*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{6420} +% \CheckSum{6444} % % \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 @@ -3211,6 +3211,7 @@ Copyright and Licence % \item \pkg{ltxcmds} 宏包。 % \item \pkg{pdftexcmds} 宏包。 % \item \pkg{xkeyval} 宏包。 +% \item \pkg{chinese-jfm} 宏包。 % \end{itemize} % \item \pkg{fontspec} 宏包。 % \item[\ding{229}] 以上是使用 \LuaLaTeX{} 编译时的依赖项。 @@ -3292,9 +3293,18 @@ Copyright and Licence %<@@=ctex> % \end{macrocode} % +% \changes{v2.5.9}{2022/05/27}{设置消息模块的名字和类型。} +% % \begin{macrocode} %<*class|style> \RequirePackage { xparse , l3keys2e } +%<class>\prop_gput:Nnn \g_msg_module_type_prop { ctex } { Class } +%<article>\prop_gput:Nnn \g_msg_module_name_prop { ctex } { ctexart } +%<book>\prop_gput:Nnn \g_msg_module_name_prop { ctex } { ctexbook } +%<report>\prop_gput:Nnn \g_msg_module_name_prop { ctex } { ctexrep } +%<beamer>\prop_gput:Nnn \g_msg_module_name_prop { ctex } { ctexbeamer } +%<ctexsize>\prop_gput:Nnn \g_msg_module_name_prop { ctex } { ctexsize } +%<ctexheading>\prop_gput:Nnn \g_msg_module_name_prop { ctex } { ctexheading } %</class|style> % \end{macrocode} % @@ -4550,9 +4560,9 @@ Copyright and Licence { \msg_critical:nnx { ctex } { luatexja-loaded } { \g_file_curr_name_str } } { \ctex_at_begin_package:nn { luatexja } - { \msg_redirect_name:nnn { ctex } { disable-package } { info } } + { \msg_redirect_name:nnn { ctexhook } { disable-package } { info } } \ctex_at_end_package:nn { luatexja } - { \msg_redirect_name:nnn { ctex } { disable-package } { } } + { \msg_redirect_name:nnn { ctexhook } { disable-package } { } } \ctex_disable_package:n { ltj-latex } } % \end{macrocode} @@ -4860,14 +4870,6 @@ Copyright and Licence end, "global") % \end{macrocode} % \end{macro} -% \begin{macro}{\ctex_ltj_use_jfont:} -% 使用 jfont，确保当前的 \tn{font} 是 jfont。 -% \begin{macrocode} - newluacmd("ctex_ltj_use_jfont:", function () - font.current(getattribute("ltj@curjfnt")) - end, "global", "protected") -% \end{macrocode} -% \end{macro} % \begin{macro}{\ctex_ltj_set_alt_font:nnnn} % |#1| 和 |#2| 分别是字符区间的首末，|#3| 是基础字体，|#4| 是替代字体。 % \begin{macrocode} @@ -5057,6 +5059,14 @@ Copyright and Licence % \end{macrocode} % \end{macro} % +% \begin{macro}{\ctex_ltj_use_jfont:} +% 使用 jfont，确保当前的 \tn{font} 是 jfont。 +% \begin{macrocode} +\cs_new_protected_nopar:Npn \ctex_ltj_use_jfont: + { \tex_setfontid:D \ltj@curjfnt } +% \end{macrocode} +% \end{macro} +% % \begin{macro}[int]{\ctex_ltj_subst_font:} % \tn{do@subst@correction} 在设置通过 \texttt{sub} 或者 \texttt{ssub} 函数定义的 % 字体时会用到。如果没有设置 \opt{SlantedFont}，\pkg{fontspec} 会设置 @@ -5285,19 +5295,33 @@ Copyright and Licence % % \paragraph{字体族的定义与使用} % -% \begin{macro}[int]{\ctex_mono_jfm:n} -% \begin{variable}{\l_@@_jfm_tl} -% \pkg{LuaTeX-ja} 中与标点格式 \opt{plain} 对应的 \texttt{JFM} 是 \opt{mono}。 +% \changes{v2.5.9}{2022/05/26}{依赖 \pkg{chinese-jfm} 宏包。} +% +% \begin{macro}[int]{\ctex_set_jfm:n} +% \begin{variable}{\l_@@_jfm_tl, \l_@@_redirect_jfm_prop} +% 设置 \texttt{JFM}，需要进行一些重定向操作。 % \begin{macrocode} -\cs_new_protected:Npn \ctex_mono_jfm:n #1 +\cs_new_protected:Npn \ctex_set_jfm:n #1 { - \str_if_eq:nnTF {#1} { plain } - { \tl_set:Nn \l_@@_jfm_tl { mono } } + \prop_get:NnNF \l_@@_redirect_jfm_prop {#1} \l_@@_jfm_tl { \tl_set:Nn \l_@@_jfm_tl {#1} } } +\cs_generate_variant:Nn \ctex_set_jfm:n { o } +\prop_new:N \l_@@_redirect_jfm_prop +\prop_set_from_keyval:Nn \l_@@_redirect_jfm_prop + { + plain = mono , + quanjiao = zh_CN / quanjiao , + banjiao = zh_CN / banjiao , + kaiming = zh_CN / kaiming + } +\keys_define:nn { ctex_ltj / fontspec } + { + JFM .code:n = \ctex_set_jfm:n {#1} , + JFM .value_required:n = true + } \tl_new:N \l_@@_jfm_tl -\cs_generate_variant:Nn \ctex_mono_jfm:n { o } -\ctex_mono_jfm:o { \l__ctex_punct_tl } +\ctex_set_jfm:o { \l__ctex_punct_tl } % \end{macrocode} % \end{variable} % \end{macro} @@ -6966,7 +6990,7 @@ Copyright and Licence \tl_set:Nx \l_@@_punct_tl {#1} %<pdftex> \punctstyle { \l_@@_punct_tl } %<xetex> \xeCJKsetup { PunctStyle = \l_@@_punct_tl } -%<luatex> \ctex_mono_jfm:o { \l_@@_punct_tl } +%<luatex> \ctex_set_jfm:o { \l_@@_punct_tl } %<uptex|aptex> \msg_warning:nn { ctex } { invalid-option } } , punct .default:n = { quanjiao } , @@ -10920,17 +10944,17 @@ Copyright and Licence % 文件标识信息。 % \begin{macrocode} %<adobe>\ProvidesFile{ctex-zhmap-adobe.tex}% -%<adobe> [2021/12/12 v2.5.8 Adobe font map loader for DVIPDFMx (CTEX)] +%<adobe> [2022/06/04 v2.5.9 Adobe font map loader for DVIPDFMx (CTEX)] %<fandol>\ProvidesFile{ctex-zhmap-fandol.tex}% -%<fandol> [2021/12/12 v2.5.8 Fandol font map loader for DVIPDFMx (CTEX)] +%<fandol> [2022/06/04 v2.5.9 Fandol font map loader for DVIPDFMx (CTEX)] %<founder>\ProvidesFile{ctex-zhmap-founder.tex}% -%<founder> [2021/12/12 v2.5.8 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)] +%<founder> [2022/06/04 v2.5.9 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)] %<mac>\ProvidesFile{ctex-zhmap-mac.tex}% -%<mac> [2021/12/12 v2.5.8 Mac font map loader for DVIPDFMx (CTEX)] +%<mac> [2022/06/04 v2.5.9 Mac font map loader for DVIPDFMx (CTEX)] %<ubuntu>\ProvidesFile{ctex-zhmap-ubuntu.tex}% -%<ubuntu> [2021/12/12 v2.5.8 Ubuntu font map loader for DVIPDFMx (CTEX)] +%<ubuntu> [2022/06/04 v2.5.9 Ubuntu font map loader for DVIPDFMx (CTEX)] %<windows>\ProvidesFile{ctex-zhmap-windows.tex}% -%<windows> [2021/12/12 v2.5.8 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)] +%<windows> [2022/06/04 v2.5.9 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)] % \end{macrocode} % % \paragraph{\pkg{ctex-zhmap-adobe.tex}} @@ -11558,7 +11582,7 @@ Copyright and Licence \@ifpackageloaded {#1} { \msg_error:nnxx } { \@@_disable_package_aux:nnnn } - { ctex } { disable-package } {#1} { \@currname } + { ctexhook } { disable-package } {#1} { \@currname } } \cs_new_protected:Npx \@@_disable_package_aux:nnnn #1#2#3#4 { @@ -11569,7 +11593,7 @@ Copyright and Licence } { \tl_const:cn { ver@ #3 . \exp_not:N \@pkgextension } { 9999/99/99 } } } -\msg_new:nnn { ctex } { disable-package } +\msg_new:nnn { ctexhook } { disable-package } { Package~`#1'~can~not~be~loaded~with~`#2'. } % \end{macrocode} % \end{macro} @@ -11589,8 +11613,8 @@ Copyright and Licence } { \cs_new_protected:Npn \ctex_replace_package:nn - { \msg_warning:nnnn { ctex } { replace-package-invalid } } - \msg_new:nnn { ctex } { replace-package-invalid } + { \msg_warning:nnnn { ctexhook } { replace-package-invalid } } + \msg_new:nnn { ctexhook } { replace-package-invalid } { \token_to_str:N \ctex_replace_package:nn \{#1\}\{#2\}~is~invalid~ before~LaTeX~2020-10-01. @@ -11609,8 +11633,8 @@ Copyright and Licence { \ctex_gadd_package_hook:nnn { before } {#1} } } \cs_new_protected:Npn \@@_package_loaded_warning:nn #1#2 - { \msg_warning:nnx { ctex } { invalid-hook } {#1} } -\msg_new:nnn { ctex } { invalid-hook } + { \msg_warning:nnx { ctexhook } { invalid-hook } {#1} } +\msg_new:nnn { ctexhook } { invalid-hook } { Package~`#1'~is~loaded. \\ \token_to_str:N \ctex_at_begin_package:nn \{#1\}\{...\}~is~invalid. @@ -11783,8 +11807,8 @@ Copyright and Licence { \ctex_patch_failure:N #1 } } \cs_new_protected:Npn \ctex_patch_failure:N #1 - { \msg_warning:nnx { ctex } { patch-failure } { \token_to_str:N #1 } } -\msg_new:nnn { ctex } { patch-failure } + { \msg_warning:nnx { ctexpatch } { patch-failure } { \token_to_str:N #1 } } +\msg_new:nnn { ctexpatch } { patch-failure } { Oops!~Command~`#1'~is~NOT~patchable.\\ } % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/source/latex/ctex/ctex.ins b/Master/texmf-dist/source/latex/ctex/ctex.ins index 055c6582e92..d5d741f3321 100644 --- a/Master/texmf-dist/source/latex/ctex/ctex.ins +++ b/Master/texmf-dist/source/latex/ctex/ctex.ins @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `install') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -29,7 +29,7 @@ \preamble - Copyright (C) 2003--2021 + Copyright (C) 2003--2022 CTEX.ORG and any individual authors listed in the documentation. --------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/generic/ctex/ctex-spa-macro.tex b/Master/texmf-dist/tex/generic/ctex/ctex-spa-macro.tex index 94858617869..0ef38370c2d 100644 --- a/Master/texmf-dist/tex/generic/ctex/ctex-spa-macro.tex +++ b/Master/texmf-dist/tex/generic/ctex/ctex-spa-macro.tex @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `spa,macro') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% diff --git a/Master/texmf-dist/tex/generic/ctex/ctex-spa-make.tex b/Master/texmf-dist/tex/generic/ctex/ctex-spa-make.tex index 1bcf4659234..b495ee7b849 100644 --- a/Master/texmf-dist/tex/generic/ctex/ctex-spa-make.tex +++ b/Master/texmf-dist/tex/generic/ctex/ctex-spa-make.tex @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `spa,make') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% 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 c693d897b95..383aecd7783 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `zhmap,adobe') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -75,7 +75,7 @@ \fi \endgroup \ProvidesFile{ctex-zhmap-adobe.tex}% - [2021/12/12 v2.5.8 Adobe font map loader for DVIPDFMx (CTEX)] + [2022/06/04 v2.5.9 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 8ea308304ba..c368844316f 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `zhmap,fandol') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -75,7 +75,7 @@ \fi \endgroup \ProvidesFile{ctex-zhmap-fandol.tex}% - [2021/12/12 v2.5.8 Fandol font map loader for DVIPDFMx (CTEX)] + [2022/06/04 v2.5.9 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 8c0d753f98c..afac393e221 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `zhmap,founder') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -75,7 +75,7 @@ \fi \endgroup \ProvidesFile{ctex-zhmap-founder.tex}% - [2021/12/12 v2.5.8 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)] + [2022/06/04 v2.5.9 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)] \ifzhmappdf \pdfmapline{=gbk@UGBK@ <FZSSK.TTF} \pdfmapline{=gbksong@UGBK@ <FZSSK.TTF} diff --git a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex index 7045dfb79c8..d6dba9ab731 100644 --- a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex +++ b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `zhmap,mac') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -75,7 +75,7 @@ \fi \endgroup \ProvidesFile{ctex-zhmap-mac.tex}% - [2021/12/12 v2.5.8 Mac font map loader for DVIPDFMx (CTEX)] + [2022/06/04 v2.5.9 Mac 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-ubuntu.tex b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex index f692b448e53..1225d0cd944 100644 --- a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex +++ b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `zhmap,ubuntu') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -75,7 +75,7 @@ \fi \endgroup \ProvidesFile{ctex-zhmap-ubuntu.tex}% - [2021/12/12 v2.5.8 Ubuntu font map loader for DVIPDFMx (CTEX)] + [2022/06/04 v2.5.9 Ubuntu 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-windows.tex b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex index b8fc9f49ead..78a921c0f03 100644 --- a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex +++ b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `zhmap,windows') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -75,7 +75,7 @@ \fi \endgroup \ProvidesFile{ctex-zhmap-windows.tex}% - [2021/12/12 v2.5.8 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)] + [2022/06/04 v2.5.9 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)] \ifzhmappdf \pdfmapline{=gbk@UGBK@ <simsun.ttc} \pdfmapline{=gbksong@UGBK@ <simsun.ttc} diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg index 1c127fd2f81..057819d48e7 100644 --- a/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg +++ b/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `name,GBK') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Caption with encoding GBK (CTEX)} \ProvidesExplFile{ctex-name-gbk.cfg} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 7f20acbdf85..159c67159c3 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `name,UTF8') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Caption with encoding UTF-8 (CTEX)} \ProvidesExplFile{ctex-name-utf8.cfg} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 175a9ec5151..6ed114f2ca9 100644 --- a/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg +++ b/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `config') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Configuration file (CTEX)} \ProvidesExplFile{\ExplFileName.cfg} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\ExplFileDescription} %% %% %% diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg index 3b108dc4e8a..a32d4c6cd5e 100644 --- a/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg +++ b/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `backend') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{ctexbackend.cfg}% - [2021/12/12 v2.5.8 Backend configuration file (CTEX)] + [2022/06/04 v2.5.9 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 13491af368c..ca5fb4a44d8 100644 --- a/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg +++ b/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `ctexopts') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Option configuration file (CTEX)} \ProvidesExplFile{ctexopts.cfg} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 83f771ab51a..ed71119c338 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo +++ b/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `c5size') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {c5size option (CTEX)} \ProvidesExplFile{ctex-c5size.clo} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 dd074879973..cc856e81d4f 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo +++ b/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `cs4size') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {cs4size option (CTEX)} \ProvidesExplFile{ctex-cs4size.clo} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 266af3680df..27b04eba187 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctex.sty @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `style,ctex') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -26,10 +26,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter in LaTeX (CTEX)} \ProvidesExplPackage{\ExplFileName} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\ExplFileDescription} \RequirePackage { xparse , l3keys2e } \msg_new:nnnn { ctex } { l3-too-old } { Support~package~`#1'~too~old. } diff --git a/Master/texmf-dist/tex/latex/ctex/ctexart.cls b/Master/texmf-dist/tex/latex/ctex/ctexart.cls index b29e545daa2..1242890cb2f 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexart.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexart.cls @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `class,article') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -27,11 +27,13 @@ \NeedsTeXFormat{LaTeX2e} \input{ctexbackend.cfg} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter for class article (CTEX)} \ProvidesExplClass{ctexart} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\ExplFileDescription} \RequirePackage { xparse , l3keys2e } +\prop_gput:Nnn \g_msg_module_type_prop { ctex } { Class } +\prop_gput:Nnn \g_msg_module_name_prop { ctex } { ctexart } \msg_new:nnnn { ctex } { l3-too-old } { Support~package~`#1'~too~old. } { diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls index 770796877a9..97f6903d364 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `class,beamer') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -27,11 +27,13 @@ \NeedsTeXFormat{LaTeX2e} \input{ctexbackend.cfg} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter for class beamer (CTEX)} \ProvidesExplClass{ctexbeamer} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\ExplFileDescription} \RequirePackage { xparse , l3keys2e } +\prop_gput:Nnn \g_msg_module_type_prop { ctex } { Class } +\prop_gput:Nnn \g_msg_module_name_prop { ctex } { ctexbeamer } \msg_new:nnnn { ctex } { l3-too-old } { Support~package~`#1'~too~old. } { diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls index 3e19ad52218..ff6b731b10b 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `class,book') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -27,11 +27,13 @@ \NeedsTeXFormat{LaTeX2e} \input{ctexbackend.cfg} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter for class book (CTEX)} \ProvidesExplClass{ctexbook} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\ExplFileDescription} \RequirePackage { xparse , l3keys2e } +\prop_gput:Nnn \g_msg_module_type_prop { ctex } { Class } +\prop_gput:Nnn \g_msg_module_name_prop { ctex } { ctexbook } \msg_new:nnnn { ctex } { l3-too-old } { Support~package~`#1'~too~old. } { diff --git a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty index 9a9e75908cc..4bf19b3c729 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `ctexcap') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -26,10 +26,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter in LaTeX (CTEX)} \ProvidesExplPackage{ctexcap} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 4fe2e408e86..ed958cf4aaf 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexheading.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexheading.sty @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `style,ctexheading') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -26,11 +26,12 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Heading style modification (CTEX)} \ProvidesExplPackage{ctexheading} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\ExplFileDescription} \RequirePackage { xparse , l3keys2e } +\prop_gput:Nnn \g_msg_module_name_prop { ctex } { ctexheading } \RequirePackage { ctexhook , ctexpatch } \tl_clear_new:N \l__ctex_tmp_tl \int_new:N \l__ctex_tmp_int diff --git a/Master/texmf-dist/tex/latex/ctex/ctexhook.sty b/Master/texmf-dist/tex/latex/ctex/ctexhook.sty index 0bad5bedc30..c8790544a1b 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexhook.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexhook.sty @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `ctexhook') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -26,10 +26,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Document and package hooks (CTEX)} \ProvidesExplPackage{ctexhook} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\ExplFileDescription} \cs_new:Npn \ctex_if_format_at_least:nTF { \@ifl@t@r \fmtversion } \cs_new_protected:Npn \ctex_file_input:n #1 @@ -74,7 +74,7 @@ \@ifpackageloaded {#1} { \msg_error:nnxx } { \__ctex_disable_package_aux:nnnn } - { ctex } { disable-package } {#1} { \@currname } + { ctexhook } { disable-package } {#1} { \@currname } } \cs_new_protected:Npx \__ctex_disable_package_aux:nnnn #1#2#3#4 { @@ -85,7 +85,7 @@ } { \tl_const:cn { ver@ #3 . \exp_not:N \@pkgextension } { 9999/99/99 } } } -\msg_new:nnn { ctex } { disable-package } +\msg_new:nnn { ctexhook } { disable-package } { Package~`#1'~can~not~be~loaded~with~`#2'. } \ctex_if_format_at_least:nTF { 2020/10/01 } { @@ -98,8 +98,8 @@ } { \cs_new_protected:Npn \ctex_replace_package:nn - { \msg_warning:nnnn { ctex } { replace-package-invalid } } - \msg_new:nnn { ctex } { replace-package-invalid } + { \msg_warning:nnnn { ctexhook } { replace-package-invalid } } + \msg_new:nnn { ctexhook } { replace-package-invalid } { \token_to_str:N \ctex_replace_package:nn \{#1\}\{#2\}~is~invalid~ before~LaTeX~2020-10-01. @@ -112,8 +112,8 @@ { \ctex_gadd_package_hook:nnn { before } {#1} } } \cs_new_protected:Npn \__ctex_package_loaded_warning:nn #1#2 - { \msg_warning:nnx { ctex } { invalid-hook } {#1} } -\msg_new:nnn { ctex } { invalid-hook } + { \msg_warning:nnx { ctexhook } { invalid-hook } {#1} } +\msg_new:nnn { ctexhook } { invalid-hook } { Package~`#1'~is~loaded. \\ \token_to_str:N \ctex_at_begin_package:nn \{#1\}\{...\}~is~invalid. diff --git a/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty b/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty index 8d55891dad3..d9218a83e88 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `ctexpatch') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -26,10 +26,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Patching commands (CTEX)} \ProvidesExplPackage{ctexpatch} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\ExplFileDescription} \cs_new_protected:Npn \ctex_patch_cmd_once:NnnnTF #1#2 { \ctex_patch_boot:NNnnTF \__ctex_patch_cmd:Nnnnnw #1 @@ -52,8 +52,8 @@ { \ctex_patch_failure:N #1 } } \cs_new_protected:Npn \ctex_patch_failure:N #1 - { \msg_warning:nnx { ctex } { patch-failure } { \token_to_str:N #1 } } -\msg_new:nnn { ctex } { patch-failure } + { \msg_warning:nnx { ctexpatch } { patch-failure } { \token_to_str:N #1 } } +\msg_new:nnn { ctexpatch } { patch-failure } { Oops!~Command~`#1'~is~NOT~patchable.\\ } \cs_new_protected:Npn \ctex_preto_cmd:NnnTF #1#2 { diff --git a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls index 12bc98eaff3..731762daa9d 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `class,report') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -27,11 +27,13 @@ \NeedsTeXFormat{LaTeX2e} \input{ctexbackend.cfg} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter for class report (CTEX)} \ProvidesExplClass{ctexrep} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\ExplFileDescription} \RequirePackage { xparse , l3keys2e } +\prop_gput:Nnn \g_msg_module_type_prop { ctex } { Class } +\prop_gput:Nnn \g_msg_module_name_prop { ctex } { ctexrep } \msg_new:nnnn { ctex } { l3-too-old } { Support~package~`#1'~too~old. } { diff --git a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty index 4f78323c133..1e972ec977a 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `style,ctexsize') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -26,11 +26,12 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese font size definition (CTEX)} \ProvidesExplPackage{ctexsize} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\ExplFileDescription} \RequirePackage { xparse , l3keys2e } +\prop_gput:Nnn \g_msg_module_name_prop { ctex } { ctexsize } \RequirePackage { fix-cm } \cs_new_protected:Npn \ctex_define_option:n { \keys_define:nn { ctex / option } } diff --git a/Master/texmf-dist/tex/latex/ctex/ctexspa.def b/Master/texmf-dist/tex/latex/ctex/ctexspa.def index 8578628965f..9d417b1fac5 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexspa.def +++ b/Master/texmf-dist/tex/latex/ctex/ctexspa.def @@ -7,7 +7,7 @@ %% ctex.dtx (with options: `ctexspa') %% ctexpunct.spa %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -26,7 +26,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{ctexspa.def}% - [2021/12/12 v2.5.8 Space info for CJKpunct (CTEX)] + [2022/06/04 v2.5.9 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/ctxdoc.cls b/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls index 9e5d39f97da..8b353bd0e3c 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls @@ -21,7 +21,7 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctxdoc.cls 838ebab 2021-11-19 14:11:35 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctxdoc.cls 87d629c 2022-05-23 22:55:12 +0800 Qing Lee <sobenlee@gmail.com> $ {ctex documentation (CTEX)} \ProvidesExplClass{ctxdoc}{\ExplFileDate}{}{\ExplFileDescription} \ExplSyntaxOff @@ -301,8 +301,10 @@ \GetFileInfo {#1} \file_get:nnNTF { \c_sys_jobname_str .id } { \int_set:Nn \tex_endlinechar:D { -1 } } \l__ctxdoc_tmp_tl - { \exp_after:wN \GetIdInfo \l__ctxdoc_tmp_tl } + { \tl_if_empty:NTF \l__ctxdoc_tmp_tl } + { \use_i:nn } { \GetIdInfo $Id$ } + { \exp_after:wN \GetIdInfo \l__ctxdoc_tmp_tl } { \fileinfo } } \cs_new_eq:NN \__ctxdoc_ltx_changes:nnn \changes@ @@ -431,14 +433,20 @@ \if@inlabel \global \@inlabelfalse \@noparlistfalse - \llap { \box \@labels \hskip \leftskip } + \unless \ifvoid \CTEX@labelbox + \llap { \box \CTEX@labelbox \hskip \leftskip } + \fi \fi #1 } } \ctex_patch_cmd:Nnn \macro@code { \if@inlabel \leavevmode \fi } - { \partopsep \z@skip } + { + \partopsep \z@skip + \if@inlabel \setbox \CTEX@labelbox \copy \@labels \fi + } +\newbox \CTEX@labelbox \group_begin: \int_set:Nn \tex_endlinechar:D { -1 } \use:n 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 6b9d34b87de..d74cabd99d3 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `dict,theorem,GBK') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}% - [2021/12/12 v2.5.8 Chinese translation for theorem name (CTEX)] + [2022/06/04 v2.5.9 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 4fc920fddfd..3a3c402acf1 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `dict,theorem,UTF8') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}% - [2021/12/12 v2.5.8 Chinese translation for theorem name (CTEX)] + [2022/06/04 v2.5.9 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 874557d73a4..17c3e8d931a 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `aptex') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Asian pTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-aptex.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\ExplFileDescription} \cs_new_protected:Npn \ctex_set_zhmap:n { \tl_gput_right:Nx \g__ctex_zhmap_tl } \cs_new_protected:Npn \ctex_use_zhmap: 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 1c47572caf8..4cb859a27ec 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `luatex') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {LuaLaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-luatex.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\ExplFileDescription} \msg_new:nnn { ctex } { luatexja-loaded } { Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\ @@ -37,9 +37,9 @@ { \msg_critical:nnx { ctex } { luatexja-loaded } { \g_file_curr_name_str } } { \ctex_at_begin_package:nn { luatexja } - { \msg_redirect_name:nnn { ctex } { disable-package } { info } } + { \msg_redirect_name:nnn { ctexhook } { disable-package } { info } } \ctex_at_end_package:nn { luatexja } - { \msg_redirect_name:nnn { ctex } { disable-package } { } } + { \msg_redirect_name:nnn { ctexhook } { disable-package } { } } \ctex_disable_package:n { ltj-latex } } \RequirePackage { luatexja } @@ -206,9 +206,6 @@ end sprint(-2, s) end, "global") - newluacmd("ctex_ltj_use_jfont:", function () - font.current(getattribute("ltj@curjfnt")) - end, "global", "protected") newluacmd("ctex_ltj_set_alt_font:nnnn", function () local b = tonumber(scan_arg()) local e = tonumber(scan_arg()) @@ -298,6 +295,8 @@ \use:c { \f@encoding + \f@family } \use:c { \curr@fontshape } } +\cs_new_protected_nopar:Npn \ctex_ltj_use_jfont: + { \tex_setfontid:D \ltj@curjfnt } \cs_new_protected_nopar:Npn \ctex_ltj_subst_font: { \ctex_ltj_if_alternate_shape_exist:nF { \curr@fontshape } @@ -431,15 +430,27 @@ \__um_input_math_symbol_table: } } -\cs_new_protected:Npn \ctex_mono_jfm:n #1 +\cs_new_protected:Npn \ctex_set_jfm:n #1 { - \str_if_eq:nnTF {#1} { plain } - { \tl_set:Nn \l__ctex_ltj_jfm_tl { mono } } + \prop_get:NnNF \l__ctex_ltj_redirect_jfm_prop {#1} \l__ctex_ltj_jfm_tl { \tl_set:Nn \l__ctex_ltj_jfm_tl {#1} } } +\cs_generate_variant:Nn \ctex_set_jfm:n { o } +\prop_new:N \l__ctex_ltj_redirect_jfm_prop +\prop_set_from_keyval:Nn \l__ctex_ltj_redirect_jfm_prop + { + plain = mono , + quanjiao = zh_CN / quanjiao , + banjiao = zh_CN / banjiao , + kaiming = zh_CN / kaiming + } +\keys_define:nn { ctex_ltj / fontspec } + { + JFM .code:n = \ctex_set_jfm:n {#1} , + JFM .value_required:n = true + } \tl_new:N \l__ctex_ltj_jfm_tl -\cs_generate_variant:Nn \ctex_mono_jfm:n { o } -\ctex_mono_jfm:o { \l__ctex_punct_tl } +\ctex_set_jfm:o { \l__ctex_punct_tl } \tl_const:Nn \CJK@encoding { LTJY3 } \DeclareFontEncoding { \CJK@encoding } { } { } \use:e @@ -1259,7 +1270,7 @@ punct .code:n = { \tl_set:Nx \l__ctex_punct_tl {#1} - \ctex_mono_jfm:o { \l__ctex_punct_tl } + \ctex_set_jfm:o { \l__ctex_punct_tl } } , punct .default:n = { quanjiao } , } 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 1c5d069f921..dc8cd6c91c3 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `pdftex') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {(pdf)LaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-pdftex.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\ExplFileDescription} \cs_new_protected:Npn \ctex_set_zhmap:n { \tl_gput_right:Nx \g__ctex_zhmap_tl } \cs_new_protected:Npn \ctex_use_zhmap: 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 a0eaf7e07a9..69708e9ae69 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `uptex') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {upTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-uptex.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\ExplFileDescription} \cs_new_protected:Npn \ctex_set_zhmap:n { \tl_gput_right:Nx \g__ctex_zhmap_tl } \cs_new_protected:Npn \ctex_use_zhmap: 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 2d5bec4098b..d51a9e4f952 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `xetex') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {XeLaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-xetex.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\ExplFileDescription} \RequirePackage { xeCJK } \exp_args:Nx \xeCJKsetup { diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd b/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd index 8f21c7e7000..ef35cf49d59 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fd,rm,c19') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{c19rm.fd}% - [2021/12/12 v2.5.8 Chinese font definition (CTEX)] + [2022/06/04 v2.5.9 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 998e6c1267c..7ab9fd5389d 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fd,sf,c19') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{c19sf.fd}% - [2021/12/12 v2.5.8 Chinese font definition (CTEX)] + [2022/06/04 v2.5.9 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 a56453f3f56..9298ea2ce1f 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fd,tt,c19') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{c19tt.fd}% - [2021/12/12 v2.5.8 Chinese font definition (CTEX)] + [2022/06/04 v2.5.9 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 175f66340fb..1f63868913c 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fd,rm,c70') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{c70rm.fd}% - [2021/12/12 v2.5.8 Chinese font definition (CTEX)] + [2022/06/04 v2.5.9 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 71278423230..8d5888dd6b2 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fd,sf,c70') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{c70sf.fd}% - [2021/12/12 v2.5.8 Chinese font definition (CTEX)] + [2022/06/04 v2.5.9 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 fd8774afaf9..7b314238167 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fd,tt,c70') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{c70tt.fd}% - [2021/12/12 v2.5.8 Chinese font definition (CTEX)] + [2022/06/04 v2.5.9 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 dcf25168038..d5e8e8b8fa0 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fd,rm,jt2') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{jt2zhrm.fd}% - [2021/12/12 v2.5.8 Chinese font definition (CTEX)] + [2022/06/04 v2.5.9 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 24bb31c949e..2adb53b670a 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fd,sf,jt2') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{jt2zhsf.fd}% - [2021/12/12 v2.5.8 Chinese font definition (CTEX)] + [2022/06/04 v2.5.9 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 faf77024afc..ecbaed5bf95 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fd,tt,jt2') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{jt2zhtt.fd}% - [2021/12/12 v2.5.8 Chinese font definition (CTEX)] + [2022/06/04 v2.5.9 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 61dc9187e92..6aff51f5e20 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fd,rm,jy2') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{jy2zhrm.fd}% - [2021/12/12 v2.5.8 Chinese font definition (CTEX)] + [2022/06/04 v2.5.9 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 a67d075fa58..8d8a25568dd 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fd,sf,jy2') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{jy2zhsf.fd}% - [2021/12/12 v2.5.8 Chinese font definition (CTEX)] + [2022/06/04 v2.5.9 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 c778f1679bf..0c1b3b561cb 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fd,tt,jy2') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{jy2zhtt.fd}% - [2021/12/12 v2.5.8 Chinese font definition (CTEX)] + [2022/06/04 v2.5.9 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 18502f15977..5e75f080c08 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fontset,adobe') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Adobe fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-adobe.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 2b0903f5451..310a96d2dfe 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fontset,fandol') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Fandol fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-fandol.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 48c9b05e74f..dd715916ae2 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fontset,founder') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Founder fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-founder.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 7d2b68f865c..8a5b2916d32 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fontset,mac') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {macOS fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-mac.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 0b7f00ef956..a9d2c85fa5b 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fontset,macnew') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {macOS fonts definition for El Capitan or later version (CTEX)} \ProvidesExplFile{ctex-fontset-macnew.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 42c60b3b0c5..286c76c2cea 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fontset,macold') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {macOS fonts definition for Yosemite or earlier version (CTEX)} \ProvidesExplFile{ctex-fontset-macold.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 77ed2039e78..dadb03c2343 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fontset,ubuntu') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Ubuntu fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-ubuntu.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 6ce6c4a7053..da40c90ccf3 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fontset,windows') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Windows fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-windows.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 432e9a93701..2f2ee4728ec 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `heading,article') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Heading modification for article (CTEX)} \ProvidesExplFile{ctex-article.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\ExplFileDescription} \seq_const_from_clist:Nn \c__ctex_section_headings_seq { section , subsection , subsubsection , paragraph , subparagraph } \seq_new:N \c__ctex_headings_seq 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 38533390f5c..14c03920518 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `heading,beamer') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Heading modification for beamer (CTEX)} \ProvidesExplFile{ctex-beamer.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\ExplFileDescription} \seq_const_from_clist:Nn \c__ctex_headings_seq { part , section , subsection } \cs_new_protected:Npn \__ctex_initial_heading:n #1 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 635fbd42e97..194e8924bc1 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `heading,book') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Heading modification for book (CTEX)} \ProvidesExplFile{ctex-book.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\ExplFileDescription} \seq_const_from_clist:Nn \c__ctex_section_headings_seq { section , subsection , subsubsection , paragraph , subparagraph } \seq_new:N \c__ctex_headings_seq 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 ba9f51074a2..bd41442bf50 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `heading,report') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Heading modification for report (CTEX)} \ProvidesExplFile{ctex-report.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\ExplFileDescription} \seq_const_from_clist:Nn \c__ctex_section_headings_seq { section , subsection , subsubsection , paragraph , subparagraph } \seq_new:N \c__ctex_headings_seq 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 7a048277ebe..da6b67bbc68 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `scheme,article,chinese') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for article (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-article.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 e524ef3a550..0887fe02d04 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `scheme,beamer,chinese') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for beamer (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-beamer.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 48adf21fb82..11959999882 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `scheme,book,chinese') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for book (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-book.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 190aea4124c..6be01a803b8 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `scheme,report,chinese') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for report (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-report.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 debf55fded0..adca2b3d36e 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `scheme,generic,chinese') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for generic (CTEX)} \ProvidesExplFile{ctex-scheme-chinese.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 21794825699..5b43f3aa016 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `scheme,article,plain') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for article (CTEX)} \ProvidesExplFile{ctex-scheme-plain-article.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 c8255651cba..34fa8678fde 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `scheme,beamer,plain') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for beamer (CTEX)} \ProvidesExplFile{ctex-scheme-plain-beamer.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 e91428c6b4b..d6e513afda1 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `scheme,book,plain') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for book (CTEX)} \ProvidesExplFile{ctex-scheme-plain-book.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 30a16356220..75304d9de8b 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `scheme,report,plain') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for report (CTEX)} \ProvidesExplFile{ctex-scheme-plain-report.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\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 dc528879057..c1231b1cec3 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `scheme,generic,plain') %% -%% Copyright (C) 2003--2021 +%% Copyright (C) 2003--2022 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for generic (CTEX)} \ProvidesExplFile{ctex-scheme-plain.def} - {\ExplFileDate}{2.5.8}{\ExplFileDescription} + {\ExplFileDate}{2.5.9}{\ExplFileDescription} %% %% %% End of file `ctex-scheme-plain.def'. |