From 66b9b693db7f4cf04485426bc74dd2e4ae31a1d9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 12 Dec 2021 22:29:51 +0000 Subject: ctex (12dec21) git-svn-id: svn://tug.org/texlive/trunk@61285 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/ctex/ctex.pdf | Bin 1149510 -> 1152148 bytes Master/texmf-dist/source/latex/ctex/ctex.dtx | 175 +++++++++++---------- .../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 | 4 +- Master/texmf-dist/tex/latex/ctex/ctexart.cls | 15 +- Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls | 4 +- Master/texmf-dist/tex/latex/ctex/ctexbook.cls | 15 +- Master/texmf-dist/tex/latex/ctex/ctexcap.sty | 4 +- Master/texmf-dist/tex/latex/ctex/ctexheading.sty | 4 +- Master/texmf-dist/tex/latex/ctex/ctexhook.sty | 12 +- Master/texmf-dist/tex/latex/ctex/ctexpatch.sty | 4 +- Master/texmf-dist/tex/latex/ctex/ctexrep.cls | 15 +- Master/texmf-dist/tex/latex/ctex/ctexsize.sty | 4 +- Master/texmf-dist/tex/latex/ctex/ctexspa.def | 2 +- Master/texmf-dist/tex/latex/ctex/ctxdoc.cls | 6 +- .../translator-theorem-dictionary-ChineseGBK.dict | 2 +- .../translator-theorem-dictionary-ChineseUTF8.dict | 2 +- .../tex/latex/ctex/engine/ctex-engine-aptex.def | 4 +- .../tex/latex/ctex/engine/ctex-engine-luatex.def | 104 ++++++------ .../tex/latex/ctex/engine/ctex-engine-pdftex.def | 4 +- .../tex/latex/ctex/engine/ctex-engine-uptex.def | 4 +- .../tex/latex/ctex/engine/ctex-engine-xetex.def | 4 +- 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 | 15 +- .../tex/latex/ctex/heading/ctex-heading-beamer.def | 4 +- .../tex/latex/ctex/heading/ctex-heading-book.def | 15 +- .../tex/latex/ctex/heading/ctex-heading-report.def | 15 +- .../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 +- 68 files changed, 320 insertions(+), 251 deletions(-) diff --git a/Master/texmf-dist/doc/latex/ctex/ctex.pdf b/Master/texmf-dist/doc/latex/ctex/ctex.pdf index 073c674a841..e4e02e6d8b3 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 81488b12ef2..adc4440bc7f 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +%<+!driver>\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +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.7}{\ExplFileDescription} +% {\ExplFileDate}{2.5.8}{\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/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)] +% [2021/12/12 v2.5.8 Chinese font definition (CTEX)] +% [2021/12/12 v2.5.8 Space info for CJKpunct (CTEX)] +% [2021/12/12 v2.5.8 Backend configuration file (CTEX)] +% [2021/12/12 v2.5.8 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{6400} +% \CheckSum{6420} % % \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 @@ -4782,33 +4782,53 @@ Copyright and Licence % % \paragraph{\pkg{Lua} 函数} % +% \changes{v2.5.8}{2021/11/29}{简化部分 \pkg{Lua} 函数。} +% % 直接用 |token.set_lua| 定义，不是传统意义上的 \TeX \ 宏。 % \begin{macrocode} \group_begin: \char_set_catcode_space:n { 32 } \lua_now:e { - local func = lua.get_functions_table() +% \end{macrocode} +% \begin{macro}{ctex.newluacmd} +% 定义新的 \pkg{Lua} 函数。 +% \begin{macrocode} + ctex = ctex or { } + local ctex = ctex + local functions = lua.get_functions_table() + local new_luafunction = luatexbase.new_luafunction + local create, set_lua = token.create, token.set_lua + local lua_cmds = { + lua_call = true , + lua_expandable_call = true , + } + local newluacmd = function (name, func, ...) + local tok = create(name) + local id = lua_cmds[tok.cmdname] and tok.index + local id = id or new_luafunction(name) + set_lua(name, id, ...) + functions[id] = func + end + ctex.newluacmd = newluacmd +% \end{macrocode} +% \end{macro} +% \begin{macrocode} local ltjfont = luatexja.jfont local getattribute = tex.getattribute - local set_lua = token.set_lua + local tex_set, sprint = tex.set, tex.sprint local scan_int, scan_arg = token.scan_int, token.scan_argument - local new_luafunction = luatexbase.new_luafunction % \end{macrocode} % \begin{macro}{\ctex_ltj_add_kyenc:n} % 保存 jfont 的编码，用于判断。 % \begin{macrocode} - local id = new_luafunction("ctex") - func[id] = ltjfont.add_kyenc_list - set_lua("ctex_ltj_add_kyenc:n", id, "global", "protected") + newluacmd("ctex_ltj_add_kyenc:n", ltjfont.add_kyenc_list, "global", "protected") % \end{macrocode} % \end{macro} % \begin{macro}{\ctex_ltj_is_kenc:n} % 判断编码是否属于 jfont。 % \begin{macrocode} - local id = new_luafunction("ctex") - func[id] = ltjfont.is_kenc - set_lua("ctex_ltj_is_kenc:n", id, "global") + newluacmd("ctex_ltj_is_kenc:n", ltjfont.is_kenc, "global") % \end{macrocode} % \end{macro} % \begin{macro}{\ctex_ltj_patch_external_font:n} @@ -4823,8 +4843,7 @@ Copyright and Licence % 主要目的是，如果当前字形有替代字体，则往字形的定义中加入一些标志，确保 % \texttt{font.id} 唯一。 % \begin{macrocode} - local id = new_luafunction("ctex") - func[id] = function () + newluacmd("ctex_ltj_patch_external_font:n", function () local s = scan_arg() local is_braced, is_quoted if s:sub(1,1) == '{' and s:sub(-1)=='}' then @@ -4837,108 +4856,75 @@ Copyright and Licence if is_braced then s = '{'..s..'}' elseif is_quoted then s = '"'..s..'"' end - tex.sprint(-2, s) - end - set_lua("ctex_ltj_patch_external_font:n", id, "global") + sprint(-2, s) + end, "global") % \end{macrocode} % \end{macro} % \begin{macro}{\ctex_ltj_use_jfont:} % 使用 jfont，确保当前的 \tn{font} 是 jfont。 % \begin{macrocode} - local id = new_luafunction("ctex") - func[id] = function () + newluacmd("ctex_ltj_use_jfont:", function () font.current(getattribute("ltj@curjfnt")) - end - set_lua("ctex_ltj_use_jfont:", id, "global", "protected") + end, "global", "protected") % \end{macrocode} % \end{macro} % \begin{macro}{\ctex_ltj_set_alt_font:nnnn} % |#1| 和 |#2| 分别是字符区间的首末，|#3| 是基础字体，|#4| 是替代字体。 % \begin{macrocode} - local id = new_luafunction("ctex") - func[id] = function () + newluacmd("ctex_ltj_set_alt_font:nnnn", function () local b = tonumber(scan_arg()) local e = tonumber(scan_arg()) local alt = scan_arg() local base = scan_arg() ltjfont.set_alt_font_latex(b, e, alt, base) - end - set_lua("ctex_ltj_set_alt_font:nnnn", id, "global", "protected") + end, "global", "protected") % \end{macrocode} % \end{macro} % \begin{macro}{\ctex_ltj_clear_alt_font:n} % 清除 |#1| 的替代字体。 % \begin{macrocode} - local id = new_luafunction("ctex") - func[id] = function () + newluacmd("ctex_ltj_clear_alt_font:n", function () local base = scan_arg() ltjfont.clear_alt_font_latex(base) - end - set_lua("ctex_ltj_clear_alt_font:n", id, "global", "protected") + end, "global", "protected") % \end{macrocode} % \end{macro} % \begin{macro}{\ctex_ltj_pickup_alt_font:nn} % 定义 |#1| 的替代字体，|#2| 是字体大小。\\ % 会在内部执行 \tn{ltj@pickup@altfont@auxy} 和 \tn{ltj@pickup@altfont@copy}。 % \begin{macrocode} - local id = new_luafunction("ctex") - func[id] = function () + newluacmd("ctex_ltj_pickup_alt_font:nn", function () local base = scan_arg() local size = scan_arg() ltjfont.output_alt_font_cmd("y", base) ltjfont.pickup_alt_font_a(size) - end - set_lua("ctex_ltj_pickup_alt_font:nn", id, "global", "protected") + end, "global", "protected") % \end{macrocode} % \end{macro} % \begin{macro}{\@@_pickup_alt_font:Nn} % |#1| 是 \texttt{font.id}，|#2| 是字体名称。 % 在 \tn{ltj@pickup@altfont@copy} 之中使用。 % \begin{macrocode} - local id = new_luafunction("ctex") - func[id] = function () + newluacmd("@@_pickup_alt_font:Nn", function () local num = scan_int() local base = scan_arg() ltjfont.pickup_alt_font_b(num, base) - end - set_lua("@@_pickup_alt_font:Nn", id, "global", "protected") + end, "global", "protected") % \end{macrocode} % \end{macro} % \begin{macro}{\@@_if_alt_set:nT} % 判断是否存在替代字体。会设置变量 |aftl_base| 和返回 \tn{@firstofone} 或 \tn{@gobble}。 -% \begin{verbatim} -% function luatexja.jfont.does_alt_set(bbase) -% aftl_base = alt_font_table_latex[bbase] -% tex.sprint(cat_lp, aftl_base and '\\@firstofone' or '\\@gobble') -% end -% \end{verbatim} -% \pkg{luatexja} 20200412.0 以后的定义为： -% \begin{verbatim} -% function luatexja.jfont.does_alt_set() -% aftl_base = alt_font_table_latex[scan_arg()] -% tex.sprint(cat_lp, aftl_base and '\\@firstofone' or '\\@gobble') -% end -% \end{verbatim} % \begin{macrocode} - local id = new_luafunction("ctex") - func[id] = \LuaTeXjaversion > 20200412.0 - and ltjfont.does_alt_set - or function () - local base = scan_arg() - ltjfont.does_alt_set(base) - end - set_lua("@@_if_alt_set:nT", id, "global") + newluacmd("@@_if_alt_set:nT", ltjfont.does_alt_set, "global") % \end{macrocode} % \end{macro} % \begin{macro}{\ctex_ltj_zero_globaldefs:} % 设置 \tn{globaldefs} 为 $0$，避免全局设置，应当在分组中使用。 % 这里通过 Lua 设置，可以不受外部 \TeX\ 环境中的 \tn{globaldefs} 的影响。 % \begin{macrocode} - local id = new_luafunction("ctex") - func[id] = function () - tex.set("globaldefs", 0) - end - set_lua("ctex_ltj_zero_globaldefs:", id, "global", "protected") + newluacmd("ctex_ltj_zero_globaldefs:", function () + tex_set("globaldefs", 0) + end, "global", "protected") } \group_end: % \end{macrocode} @@ -4962,6 +4948,8 @@ Copyright and Licence % \end{macrocode} % \end{macro} % +% \changes{v2.5.8}{2021/11/18}{兼容 \pkg{microtype}。} +% % \begin{macro}{\@@_select_font_aux:} % 使用 \tn{pickup@font} 取得字体名称前，总需要先设置 \tn{font@name}。在这里将 % \tn{f@family} 换成 CJK 字体族，并确保编码正确。 @@ -4971,7 +4959,8 @@ Copyright and Licence \group_begin: \tl_set_eq:NN \f@encoding \CJK@encoding \tl_set_eq:NN \f@family \CJK@family - \@@_push_fontname:n { \use:c { \curr@fontshape / \f@size } } + \cs_set_eq:NN \pickup@font \ctex_ltj_pickup_font: + \@@_push_fontname:n { \curr@fontshape / \f@size } \ctex_ltj_pickup_font: \group_end: \font@name @@ -4988,12 +4977,12 @@ Copyright and Licence \cs_new_protected:Npn \@@_push_fontname:n #1 { \seq_gpush:No \g_@@_fontname_seq { \font@name } - \cs_gset_nopar:Npx \font@name {#1} + \tl_gset:Nx \font@name { \exp_not:c {#1} } } \cs_new_protected:Npn \@@_pop_fontname: { \seq_gpop:NNT \g_@@_fontname_seq \l_@@_tmp_tl - { \cs_gset_eq:NN \font@name \l_@@_tmp_tl } + { \tl_gset_eq:NN \font@name \l_@@_tmp_tl } } \seq_new:N \g_@@_fontname_seq % \end{macrocode} @@ -5152,7 +5141,7 @@ Copyright and Licence { \group_begin: \use:e { \exp_not:N \split@name #1 / \f@size } \@nil - \@@_push_fontname:n { \use:c { \curr@fontshape / \f@size } } + \@@_push_fontname:n { \curr@fontshape / \f@size } \ctex_ltj_pickup_font: \group_end: \@@_pop_fontname: @@ -6922,17 +6911,14 @@ Copyright and Licence local fmt = luatexja.jfont.font_metric_table local getattribute = tex.getattribute local setdimen = tex.setdimen - local func = lua.get_functions_table() - local id = luatexbase.new_luafunction("ctex") - func[id] = function () + ctex.newluacmd("ctex_update_kanjisize:", function () local ft = fmt[getattribute("ltj@curjfnt")] or nulltable local ft = ft and ft.char_type or nulltable local fk = ft and ft[0] or nulltable setdimen("cht", fk.height or 0) setdimen("cdp", fk.depth or 0) setdimen("cwd", fk.width or ft.zw or 0) - end - token.set_lua("ctex_update_kanjisize:", id, "global", "protected") + end, "global", "protected") } \group_end: \ctex_add_to_selectfont:n { \ctex_update_kanjisize: } @@ -8635,6 +8621,22 @@ Copyright and Licence } % \end{macrocode} % +% \changes{v2.5.8}{2021/12/04}{兼容 \pkg{titlesec} 包和 \tn{CTEXifname}。} +% 在 \pkg{titlesec} 包定义的标题中更新 \tn{CTEXifname}。 +% \begin{macrocode} +\ctex_at_end_package:nn { titlesec } + { + \ctex_patch_cmd:Nnn \ttl@labelling + { \let \ifttl@toclabel \ifttl@label } + { + \let \ifttl@toclabel \ifttl@label + \CTEX@updatettlifname + } + \cs_new_protected:Npn \CTEX@updatettlifname + { \ifttl@label \CTEX@ifnametrue \else: \CTEX@ifnamefalse \fi: } + } +% \end{macrocode} +% % \paragraph{兼容 \pkg{titleps} 宏包} % % \changes{v2.3}{2015/12/25}{兼容 \pkg{titleps} 宏包。} @@ -10918,17 +10920,17 @@ Copyright and Licence % 文件标识信息。 % \begin{macrocode} %\ProvidesFile{ctex-zhmap-adobe.tex}% -% [2021/06/20 v2.5.7 Adobe font map loader for DVIPDFMx (CTEX)] +% [2021/12/12 v2.5.8 Adobe font map loader for DVIPDFMx (CTEX)] %\ProvidesFile{ctex-zhmap-fandol.tex}% -% [2021/06/20 v2.5.7 Fandol font map loader for DVIPDFMx (CTEX)] +% [2021/12/12 v2.5.8 Fandol font map loader for DVIPDFMx (CTEX)] %\ProvidesFile{ctex-zhmap-founder.tex}% -% [2021/06/20 v2.5.7 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)] +% [2021/12/12 v2.5.8 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)] %\ProvidesFile{ctex-zhmap-mac.tex}% -% [2021/06/20 v2.5.7 Mac font map loader for DVIPDFMx (CTEX)] +% [2021/12/12 v2.5.8 Mac font map loader for DVIPDFMx (CTEX)] %\ProvidesFile{ctex-zhmap-ubuntu.tex}% -% [2021/06/20 v2.5.7 Ubuntu font map loader for DVIPDFMx (CTEX)] +% [2021/12/12 v2.5.8 Ubuntu font map loader for DVIPDFMx (CTEX)] %\ProvidesFile{ctex-zhmap-windows.tex}% -% [2021/06/20 v2.5.7 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)] +% [2021/12/12 v2.5.8 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)] % \end{macrocode} % % \paragraph{\pkg{ctex-zhmap-adobe.tex}} @@ -11630,6 +11632,7 @@ Copyright and Licence % \end{macro} % % \changes{v2.5.6}{2021/02/16}{使用正确的导言区末尾钩子。} +% \changes{v2.5.8}{2021/11/18}{兼容 \LaTeX \ 2021/11/15。} % % \LaTeX \ 2020/10/01 开始提供常用钩子管理机制。在新机制下，我们只需要做简单的包装。 % \begin{macrocode} @@ -11641,8 +11644,12 @@ Copyright and Licence { \ctex_gadd_ltxhook:nn { begindocument/before } } \cs_new_protected:Npn \ctex_after_end_preamble:n { \ctex_gadd_ltxhook:nn { begindocument/end } } - \cs_new_protected:Npn \ctex_gadd_package_hook:nnn #1#2 - { \ctex_gadd_ltxhook:nn { package/#1/#2 } } + \cs_new_protected:Npx \ctex_gadd_package_hook:nnn #1#2 + { + \ctex_if_format_at_least:nTF { 2021/11/15 } + { \ctex_gadd_ltxhook:nn { package/#2/#1 } } + { \ctex_gadd_ltxhook:nn { package/#1/#2 } } + } \file_input_stop: } { } 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 1df5310ee4d..c693d897b95 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/06/20 v2.5.7 Adobe font map loader for DVIPDFMx (CTEX)] + [2021/12/12 v2.5.8 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 d806987fe69..8ea308304ba 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/06/20 v2.5.7 Fandol font map loader for DVIPDFMx (CTEX)] + [2021/12/12 v2.5.8 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 e419385e79c..8c0d753f98c 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/06/20 v2.5.7 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)] + [2021/12/12 v2.5.8 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)] \ifzhmappdf \pdfmapline{=gbk@UGBK@ $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Caption with encoding GBK (CTEX)} \ProvidesExplFile{ctex-name-gbk.cfg} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 47f59da0122..7f20acbdf85 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Caption with encoding UTF-8 (CTEX)} \ProvidesExplFile{ctex-name-utf8.cfg} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 e43aae5c4f5..175a9ec5151 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Configuration file (CTEX)} \ProvidesExplFile{\ExplFileName.cfg} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\ExplFileDescription} %% %% %% diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg index e286b12784d..3b108dc4e8a 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/06/20 v2.5.7 Backend configuration file (CTEX)] + [2021/12/12 v2.5.8 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 578c0beb3f4..13491af368c 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Option configuration file (CTEX)} \ProvidesExplFile{ctexopts.cfg} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 22bf69d8f5e..83f771ab51a 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {c5size option (CTEX)} \ProvidesExplFile{ctex-c5size.clo} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 530e73c21b1..dd074879973 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {cs4size option (CTEX)} \ProvidesExplFile{ctex-cs4size.clo} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 f15684d290d..266af3680df 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctex.sty @@ -26,10 +26,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Chinese adapter in LaTeX (CTEX)} \ProvidesExplPackage{\ExplFileName} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 5e3ac7a4fef..b29e545daa2 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexart.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexart.cls @@ -27,10 +27,10 @@ \NeedsTeXFormat{LaTeX2e} \input{ctexbackend.cfg} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Chinese adapter for class article (CTEX)} \ProvidesExplClass{ctexart} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\ExplFileDescription} \RequirePackage { xparse , l3keys2e } \msg_new:nnnn { ctex } { l3-too-old } { Support~package~`#1'~too~old. } @@ -1097,6 +1097,17 @@ } } } +\ctex_at_end_package:nn { titlesec } + { + \ctex_patch_cmd:Nnn \ttl@labelling + { \let \ifttl@toclabel \ifttl@label } + { + \let \ifttl@toclabel \ifttl@label + \CTEX@updatettlifname + } + \cs_new_protected:Npn \CTEX@updatettlifname + { \ifttl@label \CTEX@ifnametrue \else: \CTEX@ifnamefalse \fi: } + } \group_begin: \char_set_catcode_other:N \# \cs_new_protected:Npn \ctex_titleps_hook: diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls index ee11590f034..770796877a9 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls @@ -27,10 +27,10 @@ \NeedsTeXFormat{LaTeX2e} \input{ctexbackend.cfg} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Chinese adapter for class beamer (CTEX)} \ProvidesExplClass{ctexbeamer} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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/ctexbook.cls b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls index 8a18c62b58c..3e19ad52218 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls @@ -27,10 +27,10 @@ \NeedsTeXFormat{LaTeX2e} \input{ctexbackend.cfg} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Chinese adapter for class book (CTEX)} \ProvidesExplClass{ctexbook} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\ExplFileDescription} \RequirePackage { xparse , l3keys2e } \msg_new:nnnn { ctex } { l3-too-old } { Support~package~`#1'~too~old. } @@ -1224,6 +1224,17 @@ } } } +\ctex_at_end_package:nn { titlesec } + { + \ctex_patch_cmd:Nnn \ttl@labelling + { \let \ifttl@toclabel \ifttl@label } + { + \let \ifttl@toclabel \ifttl@label + \CTEX@updatettlifname + } + \cs_new_protected:Npn \CTEX@updatettlifname + { \ifttl@label \CTEX@ifnametrue \else: \CTEX@ifnamefalse \fi: } + } \group_begin: \char_set_catcode_other:N \# \cs_new_protected:Npn \ctex_titleps_hook: diff --git a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty index a205523333a..9a9e75908cc 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Chinese adapter in LaTeX (CTEX)} \ProvidesExplPackage{ctexcap} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 877cc8f2aa6..4fe2e408e86 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Heading style modification (CTEX)} \ProvidesExplPackage{ctexheading} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\ExplFileDescription} \RequirePackage { xparse , l3keys2e } \RequirePackage { ctexhook , ctexpatch } \tl_clear_new:N \l__ctex_tmp_tl diff --git a/Master/texmf-dist/tex/latex/ctex/ctexhook.sty b/Master/texmf-dist/tex/latex/ctex/ctexhook.sty index ed0b47caacf..0bad5bedc30 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexhook.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexhook.sty @@ -26,10 +26,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Document and package hooks (CTEX)} \ProvidesExplPackage{ctexhook} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\ExplFileDescription} \cs_new:Npn \ctex_if_format_at_least:nTF { \@ifl@t@r \fmtversion } \cs_new_protected:Npn \ctex_file_input:n #1 @@ -132,8 +132,12 @@ { \ctex_gadd_ltxhook:nn { begindocument/before } } \cs_new_protected:Npn \ctex_after_end_preamble:n { \ctex_gadd_ltxhook:nn { begindocument/end } } - \cs_new_protected:Npn \ctex_gadd_package_hook:nnn #1#2 - { \ctex_gadd_ltxhook:nn { package/#1/#2 } } + \cs_new_protected:Npx \ctex_gadd_package_hook:nnn #1#2 + { + \ctex_if_format_at_least:nTF { 2021/11/15 } + { \ctex_gadd_ltxhook:nn { package/#2/#1 } } + { \ctex_gadd_ltxhook:nn { package/#1/#2 } } + } \file_input_stop: } { } diff --git a/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty b/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty index 1a670a7914b..8d55891dad3 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Patching commands (CTEX)} \ProvidesExplPackage{ctexpatch} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 898e5c8fcf4..12bc98eaff3 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls @@ -27,10 +27,10 @@ \NeedsTeXFormat{LaTeX2e} \input{ctexbackend.cfg} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Chinese adapter for class report (CTEX)} \ProvidesExplClass{ctexrep} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\ExplFileDescription} \RequirePackage { xparse , l3keys2e } \msg_new:nnnn { ctex } { l3-too-old } { Support~package~`#1'~too~old. } @@ -1219,6 +1219,17 @@ } } } +\ctex_at_end_package:nn { titlesec } + { + \ctex_patch_cmd:Nnn \ttl@labelling + { \let \ifttl@toclabel \ifttl@label } + { + \let \ifttl@toclabel \ifttl@label + \CTEX@updatettlifname + } + \cs_new_protected:Npn \CTEX@updatettlifname + { \ifttl@label \CTEX@ifnametrue \else: \CTEX@ifnamefalse \fi: } + } \group_begin: \char_set_catcode_other:N \# \cs_new_protected:Npn \ctex_titleps_hook: diff --git a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty index 3ea1f0b21ef..4f78323c133 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty @@ -26,10 +26,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Chinese font size definition (CTEX)} \ProvidesExplPackage{ctexsize} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\ExplFileDescription} \RequirePackage { xparse , l3keys2e } \RequirePackage { fix-cm } \cs_new_protected:Npn \ctex_define_option:n diff --git a/Master/texmf-dist/tex/latex/ctex/ctexspa.def b/Master/texmf-dist/tex/latex/ctex/ctexspa.def index b53c1d94afd..8578628965f 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/06/20 v2.5.7 Space info for CJKpunct (CTEX)] + [2021/12/12 v2.5.8 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 49a29d92a1c..9e5d39f97da 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 1769321 2020-05-06 19:54:31 +0800 Qing Lee $ +\GetIdInfo$Id: ctxdoc.cls 838ebab 2021-11-19 14:11:35 +0800 Qing Lee $ {ctex documentation (CTEX)} \ProvidesExplClass{ctxdoc}{\ExplFileDate}{}{\ExplFileDescription} \ExplSyntaxOff @@ -123,6 +123,10 @@ \setlist[1]{labelindent=\parindent} \setlist[enumerate]{leftmargin=*} \setlist[itemize]{leftmargin=*} +\renewlist{arguments}{enumerate}{1} +\setlist[arguments]{nolistsep, + leftmargin=\parindent, labelindent=0pt, labelsep=*, + label=\texttt{\#\arabic*}\,:} \newlist{optdesc}{description}{3} %% 设置间距为 \marginparsep，与 l3doc 一致 \setlist[optdesc]{% 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 1bbb83c0f8c..6b9d34b87de 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/06/20 v2.5.7 Chinese translation for theorem name (CTEX)] + [2021/12/12 v2.5.8 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 dd2bcda48e5..4fc920fddfd 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/06/20 v2.5.7 Chinese translation for theorem name (CTEX)] + [2021/12/12 v2.5.8 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 aba9f456e22..874557d73a4 100644 --- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def +++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Asian pTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-aptex.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 997f4f93986..1c47572caf8 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {LuaLaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-luatex.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\ExplFileDescription} \msg_new:nnn { ctex } { luatexja-loaded } { Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\ @@ -168,20 +168,30 @@ \char_set_catcode_space:n { 32 } \lua_now:e { - local func = lua.get_functions_table() + ctex = ctex or { } + local ctex = ctex + local functions = lua.get_functions_table() + local new_luafunction = luatexbase.new_luafunction + local create, set_lua = token.create, token.set_lua + local lua_cmds = { + lua_call = true , + lua_expandable_call = true , + } + local newluacmd = function (name, func, ...) + local tok = create(name) + local id = lua_cmds[tok.cmdname] and tok.index + local id = id or new_luafunction(name) + set_lua(name, id, ...) + functions[id] = func + end + ctex.newluacmd = newluacmd local ltjfont = luatexja.jfont local getattribute = tex.getattribute - local set_lua = token.set_lua + local tex_set, sprint = tex.set, tex.sprint local scan_int, scan_arg = token.scan_int, token.scan_argument - local new_luafunction = luatexbase.new_luafunction - local id = new_luafunction("ctex") - func[id] = ltjfont.add_kyenc_list - set_lua("ctex_ltj_add_kyenc:n", id, "global", "protected") - local id = new_luafunction("ctex") - func[id] = ltjfont.is_kenc - set_lua("ctex_ltj_is_kenc:n", id, "global") - local id = new_luafunction("ctex") - func[id] = function () + newluacmd("ctex_ltj_add_kyenc:n", ltjfont.add_kyenc_list, "global", "protected") + newluacmd("ctex_ltj_is_kenc:n", ltjfont.is_kenc, "global") + newluacmd("ctex_ltj_patch_external_font:n", function () local s = scan_arg() local is_braced, is_quoted if s:sub(1,1) == '{' and s:sub(-1)=='}' then @@ -194,57 +204,37 @@ if is_braced then s = '{'..s..'}' elseif is_quoted then s = '"'..s..'"' end - tex.sprint(-2, s) - end - set_lua("ctex_ltj_patch_external_font:n", id, "global") - local id = new_luafunction("ctex") - func[id] = function () + sprint(-2, s) + end, "global") + newluacmd("ctex_ltj_use_jfont:", function () font.current(getattribute("ltj@curjfnt")) - end - set_lua("ctex_ltj_use_jfont:", id, "global", "protected") - local id = new_luafunction("ctex") - func[id] = function () + end, "global", "protected") + newluacmd("ctex_ltj_set_alt_font:nnnn", function () local b = tonumber(scan_arg()) local e = tonumber(scan_arg()) local alt = scan_arg() local base = scan_arg() ltjfont.set_alt_font_latex(b, e, alt, base) - end - set_lua("ctex_ltj_set_alt_font:nnnn", id, "global", "protected") - local id = new_luafunction("ctex") - func[id] = function () + end, "global", "protected") + newluacmd("ctex_ltj_clear_alt_font:n", function () local base = scan_arg() ltjfont.clear_alt_font_latex(base) - end - set_lua("ctex_ltj_clear_alt_font:n", id, "global", "protected") - local id = new_luafunction("ctex") - func[id] = function () + end, "global", "protected") + newluacmd("ctex_ltj_pickup_alt_font:nn", function () local base = scan_arg() local size = scan_arg() ltjfont.output_alt_font_cmd("y", base) ltjfont.pickup_alt_font_a(size) - end - set_lua("ctex_ltj_pickup_alt_font:nn", id, "global", "protected") - local id = new_luafunction("ctex") - func[id] = function () + end, "global", "protected") + newluacmd("__ctex_ltj_pickup_alt_font:Nn", function () local num = scan_int() local base = scan_arg() ltjfont.pickup_alt_font_b(num, base) - end - set_lua("__ctex_ltj_pickup_alt_font:Nn", id, "global", "protected") - local id = new_luafunction("ctex") - func[id] = \LuaTeXjaversion > 20200412.0 - and ltjfont.does_alt_set - or function () - local base = scan_arg() - ltjfont.does_alt_set(base) - end - set_lua("__ctex_ltj_if_alt_set:nT", id, "global") - local id = new_luafunction("ctex") - func[id] = function () - tex.set("globaldefs", 0) - end - set_lua("ctex_ltj_zero_globaldefs:", id, "global", "protected") + end, "global", "protected") + newluacmd("__ctex_ltj_if_alt_set:nT", ltjfont.does_alt_set, "global") + newluacmd("ctex_ltj_zero_globaldefs:", function () + tex_set("globaldefs", 0) + end, "global", "protected") } \group_end: \cs_new_protected:Npn \ctex_ltj_select_font: @@ -262,7 +252,8 @@ \group_begin: \tl_set_eq:NN \f@encoding \CJK@encoding \tl_set_eq:NN \f@family \CJK@family - \__ctex_ltj_push_fontname:n { \use:c { \curr@fontshape / \f@size } } + \cs_set_eq:NN \pickup@font \ctex_ltj_pickup_font: + \__ctex_ltj_push_fontname:n { \curr@fontshape / \f@size } \ctex_ltj_pickup_font: \group_end: \font@name @@ -273,12 +264,12 @@ \cs_new_protected:Npn \__ctex_ltj_push_fontname:n #1 { \seq_gpush:No \g__ctex_ltj_fontname_seq { \font@name } - \cs_gset_nopar:Npx \font@name {#1} + \tl_gset:Nx \font@name { \exp_not:c {#1} } } \cs_new_protected:Npn \__ctex_ltj_pop_fontname: { \seq_gpop:NNT \g__ctex_ltj_fontname_seq \l__ctex_ltj_tmp_tl - { \cs_gset_eq:NN \font@name \l__ctex_ltj_tmp_tl } + { \tl_gset_eq:NN \font@name \l__ctex_ltj_tmp_tl } } \seq_new:N \g__ctex_ltj_fontname_seq \cs_new_protected:Npn \ctex_ltj_pickup_font: @@ -351,7 +342,7 @@ { \group_begin: \use:e { \exp_not:N \split@name #1 / \f@size } \@nil - \__ctex_ltj_push_fontname:n { \use:c { \curr@fontshape / \f@size } } + \__ctex_ltj_push_fontname:n { \curr@fontshape / \f@size } \ctex_ltj_pickup_font: \group_end: \__ctex_ltj_pop_fontname: @@ -1247,17 +1238,14 @@ local fmt = luatexja.jfont.font_metric_table local getattribute = tex.getattribute local setdimen = tex.setdimen - local func = lua.get_functions_table() - local id = luatexbase.new_luafunction("ctex") - func[id] = function () + ctex.newluacmd("ctex_update_kanjisize:", function () local ft = fmt[getattribute("ltj@curjfnt")] or nulltable local ft = ft and ft.char_type or nulltable local fk = ft and ft[0] or nulltable setdimen("cht", fk.height or 0) setdimen("cdp", fk.depth or 0) setdimen("cwd", fk.width or ft.zw or 0) - end - token.set_lua("ctex_update_kanjisize:", id, "global", "protected") + end, "global", "protected") } \group_end: \ctex_add_to_selectfont:n { \ctex_update_kanjisize: } 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 3f197ac4d8d..1c5d069f921 100644 --- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def +++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {(pdf)LaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-pdftex.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 5c5402024d2..a0eaf7e07a9 100644 --- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def +++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {upTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-uptex.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 f8807ceb56f..2d5bec4098b 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {XeLaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-xetex.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 a7a522e2198..8f21c7e7000 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/06/20 v2.5.7 Chinese font definition (CTEX)] + [2021/12/12 v2.5.8 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 1b12f22ed19..998e6c1267c 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/06/20 v2.5.7 Chinese font definition (CTEX)] + [2021/12/12 v2.5.8 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 273ec9f5470..a56453f3f56 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/06/20 v2.5.7 Chinese font definition (CTEX)] + [2021/12/12 v2.5.8 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 efc019af2bb..175f66340fb 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/06/20 v2.5.7 Chinese font definition (CTEX)] + [2021/12/12 v2.5.8 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 bf8f05aaeb4..71278423230 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/06/20 v2.5.7 Chinese font definition (CTEX)] + [2021/12/12 v2.5.8 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 c58c39bfcb9..fd8774afaf9 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/06/20 v2.5.7 Chinese font definition (CTEX)] + [2021/12/12 v2.5.8 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 7a11e95f1f9..dcf25168038 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/06/20 v2.5.7 Chinese font definition (CTEX)] + [2021/12/12 v2.5.8 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 e1d4ef3d6c1..24bb31c949e 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/06/20 v2.5.7 Chinese font definition (CTEX)] + [2021/12/12 v2.5.8 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 fb8ddaf83f8..faf77024afc 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/06/20 v2.5.7 Chinese font definition (CTEX)] + [2021/12/12 v2.5.8 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 f9f1e9beff1..61dc9187e92 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/06/20 v2.5.7 Chinese font definition (CTEX)] + [2021/12/12 v2.5.8 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 b922a26a1af..a67d075fa58 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/06/20 v2.5.7 Chinese font definition (CTEX)] + [2021/12/12 v2.5.8 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 652a65a27f5..c778f1679bf 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/06/20 v2.5.7 Chinese font definition (CTEX)] + [2021/12/12 v2.5.8 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 bb89ff845c0..18502f15977 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Adobe fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-adobe.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 b5550804aa3..2b0903f5451 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Fandol fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-fandol.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 43ccdf2251f..48c9b05e74f 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Founder fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-founder.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 6cf6d03fa90..7d2b68f865c 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {macOS fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-mac.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 f82ab5f7009..0b7f00ef956 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {macOS fonts definition for El Capitan or later version (CTEX)} \ProvidesExplFile{ctex-fontset-macnew.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 54607e6ea99..42c60b3b0c5 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {macOS fonts definition for Yosemite or earlier version (CTEX)} \ProvidesExplFile{ctex-fontset-macold.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 ed60ac8498b..77ed2039e78 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Ubuntu fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-ubuntu.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 063fa0d537d..6ce6c4a7053 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Windows fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-windows.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 012358c379a..432e9a93701 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Heading modification for article (CTEX)} \ProvidesExplFile{ctex-article.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\ExplFileDescription} \seq_const_from_clist:Nn \c__ctex_section_headings_seq { section , subsection , subsubsection , paragraph , subparagraph } \seq_new:N \c__ctex_headings_seq @@ -557,6 +557,17 @@ } } } +\ctex_at_end_package:nn { titlesec } + { + \ctex_patch_cmd:Nnn \ttl@labelling + { \let \ifttl@toclabel \ifttl@label } + { + \let \ifttl@toclabel \ifttl@label + \CTEX@updatettlifname + } + \cs_new_protected:Npn \CTEX@updatettlifname + { \ifttl@label \CTEX@ifnametrue \else: \CTEX@ifnamefalse \fi: } + } \group_begin: \char_set_catcode_other:N \# \cs_new_protected:Npn \ctex_titleps_hook: diff --git a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def index fd99ad3cd19..38533390f5c 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Heading modification for beamer (CTEX)} \ProvidesExplFile{ctex-beamer.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 6a01527d18e..635fbd42e97 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Heading modification for book (CTEX)} \ProvidesExplFile{ctex-book.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\ExplFileDescription} \seq_const_from_clist:Nn \c__ctex_section_headings_seq { section , subsection , subsubsection , paragraph , subparagraph } \seq_new:N \c__ctex_headings_seq @@ -684,6 +684,17 @@ } } } +\ctex_at_end_package:nn { titlesec } + { + \ctex_patch_cmd:Nnn \ttl@labelling + { \let \ifttl@toclabel \ifttl@label } + { + \let \ifttl@toclabel \ifttl@label + \CTEX@updatettlifname + } + \cs_new_protected:Npn \CTEX@updatettlifname + { \ifttl@label \CTEX@ifnametrue \else: \CTEX@ifnamefalse \fi: } + } \group_begin: \char_set_catcode_other:N \# \cs_new_protected:Npn \ctex_titleps_hook: diff --git a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def index 5ec20e8892c..ba9f51074a2 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Heading modification for report (CTEX)} \ProvidesExplFile{ctex-report.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\ExplFileDescription} \seq_const_from_clist:Nn \c__ctex_section_headings_seq { section , subsection , subsubsection , paragraph , subparagraph } \seq_new:N \c__ctex_headings_seq @@ -679,6 +679,17 @@ } } } +\ctex_at_end_package:nn { titlesec } + { + \ctex_patch_cmd:Nnn \ttl@labelling + { \let \ifttl@toclabel \ifttl@label } + { + \let \ifttl@toclabel \ifttl@label + \CTEX@updatettlifname + } + \cs_new_protected:Npn \CTEX@updatettlifname + { \ifttl@label \CTEX@ifnametrue \else: \CTEX@ifnamefalse \fi: } + } \group_begin: \char_set_catcode_other:N \# \cs_new_protected:Npn \ctex_titleps_hook: diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def index f93f21e442d..7a048277ebe 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Chinese scheme for article (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-article.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 7c689d1f565..e524ef3a550 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Chinese scheme for beamer (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-beamer.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 8e6ad724017..48adf21fb82 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Chinese scheme for book (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-book.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 583a5d716d8..190aea4124c 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Chinese scheme for report (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-report.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 3e0bb86e39e..debf55fded0 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Chinese scheme for generic (CTEX)} \ProvidesExplFile{ctex-scheme-chinese.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 aa3068013e6..21794825699 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Plain scheme for article (CTEX)} \ProvidesExplFile{ctex-scheme-plain-article.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 130f9064c6b..c8255651cba 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Plain scheme for beamer (CTEX)} \ProvidesExplFile{ctex-scheme-plain-beamer.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 e91dbd74d4e..e91428c6b4b 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Plain scheme for book (CTEX)} \ProvidesExplFile{ctex-scheme-plain-book.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 9165389f303..30a16356220 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Plain scheme for report (CTEX)} \ProvidesExplFile{ctex-scheme-plain-report.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\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 76dc59ad5d9..dc528879057 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 6604451 2021-06-20 17:08:49 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee $ {Plain scheme for generic (CTEX)} \ProvidesExplFile{ctex-scheme-plain.def} - {\ExplFileDate}{2.5.7}{\ExplFileDescription} + {\ExplFileDate}{2.5.8}{\ExplFileDescription} %% %% %% End of file `ctex-scheme-plain.def'. -- cgit v1.2.3