texlive[61285] Master/texmf-dist: ctex (12dec21)
commits+karl at tug.org
commits+karl at tug.org
Sun Dec 12 23:29:51 CET 2021
Revision: 61285
http://tug.org/svn/texlive?view=revision&revision=61285
Author: karl
Date: 2021-12-12 23:29:51 +0100 (Sun, 12 Dec 2021)
Log Message:
-----------
ctex (12dec21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/ctex/ctex.pdf
trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx
trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex
trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex
trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex
trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex
trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex
trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex
trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg
trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
trunk/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg
trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty
trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls
trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty
trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty
trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def
trunk/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls
trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict
trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict
trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def
trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd
trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def
trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def
trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def
trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def
Modified: trunk/Master/texmf-dist/doc/latex/ctex/ctex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx 2021-12-12 22:29:51 UTC (rev 61285)
@@ -443,7 +443,7 @@
%<class|style|ctexcap|ctexhook|ctexpatch>\NeedsTeXFormat{LaTeX2e}
%<class>\input{ctexbackend.cfg}
%<class|style|ctexcap|ctexhook|ctexpatch>\RequirePackage{expl3}
-%<+!driver>\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+%<+!driver>\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
%<ctex> {Chinese adapter in LaTeX (CTEX)}
%<ctex>\ProvidesExplPackage{\ExplFileName}
%<ctexsize> {Chinese font size definition (CTEX)}
@@ -530,7 +530,7 @@
%<founder>\ProvidesExplFile{ctex-fontset-founder.def}
%<ubuntu> {Ubuntu fonts definition (CTEX)}
%<ubuntu>\ProvidesExplFile{ctex-fontset-ubuntu.def}
-%<!driver> {\ExplFileDate}{2.5.7}{\ExplFileDescription}
+%<!driver> {\ExplFileDate}{2.5.8}{\ExplFileDescription}
%</!(fd|ctexspa|dict|backend)>
%<c19&rm>\ProvidesFile{c19rm.fd}%
%<c19&sf>\ProvidesFile{c19sf.fd}%
@@ -548,10 +548,10 @@
%<backend>\ProvidesFile{ctexbackend.cfg}%
%<dict&theorem&GBK>\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
%<dict&theorem&UTF8>\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
-%<fd> [2021/06/20 v2.5.7 Chinese font definition (CTEX)]
-%<ctexspa> [2021/06/20 v2.5.7 Space info for CJKpunct (CTEX)]
-%<backend> [2021/06/20 v2.5.7 Backend configuration file (CTEX)]
-%<dict&theorem> [2021/06/20 v2.5.7 Chinese translation for theorem name (CTEX)]
+%<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)]
%</!(driver|readme|install|zhmap|spa|docstrip)>
%<*driver>
\documentclass{ctxdoc}
@@ -575,7 +575,7 @@
% \changes{v2.4.15}{2019/03/23}{同步 \LaTeXiii{} 2019/03/05。}
% \changes{v2.5.1}{2020/05/02}{\pkg{zhconv} 更名为 \pkg{ctex-zhconv}。}
%
-% \CheckSum{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,6 +4782,8 @@
%
% \paragraph{\pkg{Lua} 函数}
%
+% \changes{v2.5.8}{2021/11/29}{简化部分 \pkg{Lua} 函数。}
+%
% 直接用 |token.set_lua| 定义，不是传统意义上的 \TeX \ 宏。
% \begin{macrocode}
\group_begin:
@@ -4788,27 +4790,45 @@
\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 @@
% 主要目的是，如果当前字形有替代字体，则往字形的定义中加入一些标志，确保
% \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,44 +4856,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")
+ 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 at 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}
@@ -4881,14 +4893,12 @@
% 定义 |#1| 的替代字体，|#2| 是字体大小。\\
% 会在内部执行 \tn{ltj at pickup@altfont at auxy} 和 \tn{ltj at pickup@altfont at 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}
@@ -4895,39 +4905,17 @@
% |#1| 是 \texttt{font.id}，|#2| 是字体名称。
% 在 \tn{ltj at pickup@altfont at 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:}
@@ -4934,11 +4922,9 @@
% 设置 \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 @@
% \end{macrocode}
% \end{macro}
%
+% \changes{v2.5.8}{2021/11/18}{兼容 \pkg{microtype}。}
+%
% \begin{macro}{\@@_select_font_aux:}
% 使用 \tn{pickup at font} 取得字体名称前，总需要先设置 \tn{font at name}。在这里将
% \tn{f at family} 换成 CJK 字体族，并确保编码正确。
@@ -4971,7 +4959,8 @@
\group_begin:
\tl_set_eq:NN \f at encoding \CJK at encoding
\tl_set_eq:NN \f at family \CJK at family
- \@@_push_fontname:n { \use:c { \curr at fontshape / \f at size } }
+ \cs_set_eq:NN \pickup at font \ctex_ltj_pickup_font:
+ \@@_push_fontname:n { \curr at fontshape / \f at size }
\ctex_ltj_pickup_font:
\group_end:
\font at name
@@ -4988,12 +4977,12 @@
\cs_new_protected:Npn \@@_push_fontname:n #1
{
\seq_gpush:No \g_@@_fontname_seq { \font at name }
- \cs_gset_nopar:Npx \font at name {#1}
+ \tl_gset:Nx \font at 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 at name \l_@@_tmp_tl }
+ { \tl_gset_eq:NN \font at name \l_@@_tmp_tl }
}
\seq_new:N \g_@@_fontname_seq
% \end{macrocode}
@@ -5152,7 +5141,7 @@
{
\group_begin:
\use:e { \exp_not:N \split at name #1 / \f at size } \@nil
- \@@_push_fontname:n { \use:c { \curr at fontshape / \f at size } }
+ \@@_push_fontname:n { \curr at fontshape / \f at size }
\ctex_ltj_pickup_font:
\group_end:
\@@_pop_fontname:
@@ -6922,9 +6911,7 @@
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 at curjfnt")] or nulltable
local ft = ft and ft.char_type or nulltable
local fk = ft and ft[0] or nulltable
@@ -6931,8 +6918,7 @@
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 @@
}
% \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 at labelling
+ { \let \ifttl at toclabel \ifttl at label }
+ {
+ \let \ifttl at toclabel \ifttl at label
+ \CTEX at updatettlifname
+ }
+ \cs_new_protected:Npn \CTEX at updatettlifname
+ { \ifttl at label \CTEX at ifnametrue \else: \CTEX at ifnamefalse \fi: }
+ }
+% \end{macrocode}
+%
% \paragraph{兼容 \pkg{titleps} 宏包}
%
% \changes{v2.3}{2015/12/25}{兼容 \pkg{titleps} 宏包。}
@@ -10918,17 +10920,17 @@
% 文件标识信息。
% \begin{macrocode}
%<adobe>\ProvidesFile{ctex-zhmap-adobe.tex}%
-%<adobe> [2021/06/20 v2.5.7 Adobe font map loader for DVIPDFMx (CTEX)]
+%<adobe> [2021/12/12 v2.5.8 Adobe font map loader for DVIPDFMx (CTEX)]
%<fandol>\ProvidesFile{ctex-zhmap-fandol.tex}%
-%<fandol> [2021/06/20 v2.5.7 Fandol font map loader for DVIPDFMx (CTEX)]
+%<fandol> [2021/12/12 v2.5.8 Fandol font map loader for DVIPDFMx (CTEX)]
%<founder>\ProvidesFile{ctex-zhmap-founder.tex}%
-%<founder> [2021/06/20 v2.5.7 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+%<founder> [2021/12/12 v2.5.8 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
%<mac>\ProvidesFile{ctex-zhmap-mac.tex}%
-%<mac> [2021/06/20 v2.5.7 Mac font map loader for DVIPDFMx (CTEX)]
+%<mac> [2021/12/12 v2.5.8 Mac font map loader for DVIPDFMx (CTEX)]
%<ubuntu>\ProvidesFile{ctex-zhmap-ubuntu.tex}%
-%<ubuntu> [2021/06/20 v2.5.7 Ubuntu font map loader for DVIPDFMx (CTEX)]
+%<ubuntu> [2021/12/12 v2.5.8 Ubuntu font map loader for DVIPDFMx (CTEX)]
%<windows>\ProvidesFile{ctex-zhmap-windows.tex}%
-%<windows> [2021/06/20 v2.5.7 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+%<windows> [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 @@
% \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 @@
{ \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:
}
{ }
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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 at UGBK@ <FZSSK.TTF}
\pdfmapline{=gbksong at UGBK@ <FZSSK.TTF}
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex 2021-12-12 22:29:51 UTC (rev 61285)
@@ -75,7 +75,7 @@
\fi
\endgroup
\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)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
\else
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex 2021-12-12 22:29:51 UTC (rev 61285)
@@ -75,7 +75,7 @@
\fi
\endgroup
\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)]
\ifzhmappdf
%% pdfTeX does not support OTF fonts
\else
Modified: trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex 2021-12-12 22:29:51 UTC (rev 61285)
@@ -75,7 +75,7 @@
\fi
\endgroup
\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)]
\ifzhmappdf
\pdfmapline{=gbk at UGBK@ <simsun.ttc}
\pdfmapline{=gbksong at UGBK@ <simsun.ttc}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 = Ŀ¼ ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 = 目录 ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{Configuration file (CTEX)}
\ProvidesExplFile{\ExplFileName.cfg}
- {\ExplFileDate}{2.5.7}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.8}{\ExplFileDescription}
%%
%%
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{Option configuration file (CTEX)}
\ProvidesExplFile{ctexopts.cfg}
- {\ExplFileDate}{2.5.7}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.8}{\ExplFileDescription}
%%
%% \ctex_set:nn { option } { fontset = windows }
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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@
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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@
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty 2021-12-12 22:29:51 UTC (rev 61285)
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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. }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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 <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 at labelling
+ { \let \ifttl at toclabel \ifttl at label }
+ {
+ \let \ifttl at toclabel \ifttl at label
+ \CTEX at updatettlifname
+ }
+ \cs_new_protected:Npn \CTEX at updatettlifname
+ { \ifttl at label \CTEX at ifnametrue \else: \CTEX at ifnamefalse \fi: }
+ }
\group_begin:
\char_set_catcode_other:N \#
\cs_new_protected:Npn \ctex_titleps_hook:
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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 <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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. }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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 <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 at labelling
+ { \let \ifttl at toclabel \ifttl at label }
+ {
+ \let \ifttl at toclabel \ifttl at label
+ \CTEX at updatettlifname
+ }
+ \cs_new_protected:Npn \CTEX at updatettlifname
+ { \ifttl at label \CTEX at ifnametrue \else: \CTEX at ifnamefalse \fi: }
+ }
\group_begin:
\char_set_catcode_other:N \#
\cs_new_protected:Npn \ctex_titleps_hook:
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty 2021-12-12 22:29:51 UTC (rev 61285)
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty 2021-12-12 22:29:51 UTC (rev 61285)
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty 2021-12-12 22:29:51 UTC (rev 61285)
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 at 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:
}
{ }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty 2021-12-12 22:29:51 UTC (rev 61285)
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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 <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 at labelling
+ { \let \ifttl at toclabel \ifttl at label }
+ {
+ \let \ifttl at toclabel \ifttl at label
+ \CTEX at updatettlifname
+ }
+ \cs_new_protected:Npn \CTEX at updatettlifname
+ { \ifttl at label \CTEX at ifnametrue \else: \CTEX at ifnamefalse \fi: }
+ }
\group_begin:
\char_set_catcode_other:N \#
\cs_new_protected:Npn \ctex_titleps_hook:
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty 2021-12-12 22:29:51 UTC (rev 61285)
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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,,,}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls 2021-12-12 22:29:51 UTC (rev 61285)
@@ -21,7 +21,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctxdoc.cls 1769321 2020-05-06 19:54:31 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctxdoc.cls 838ebab 2021-11-19 14:11:35 +0800 Qing Lee <sobenlee at gmail.com> $
{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]{%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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}{\xC6\xC0\xC2\xDB}
\providetranslation{comments}{\xC6\xC0\xC2\xDB}
\providetranslation{Comment}{\xC6\xC0\xC2\xDB}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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}{评论}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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:
Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 at 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 at encoding \CJK at encoding
\tl_set_eq:NN \f at family \CJK at family
- \__ctex_ltj_push_fontname:n { \use:c { \curr at fontshape / \f at size } }
+ \cs_set_eq:NN \pickup at font \ctex_ltj_pickup_font:
+ \__ctex_ltj_push_fontname:n { \curr at fontshape / \f at size }
\ctex_ltj_pickup_font:
\group_end:
\font at name
@@ -273,12 +264,12 @@
\cs_new_protected:Npn \__ctex_ltj_push_fontname:n #1
{
\seq_gpush:No \g__ctex_ltj_fontname_seq { \font at name }
- \cs_gset_nopar:Npx \font at name {#1}
+ \tl_gset:Nx \font at 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 at name \l__ctex_ltj_tmp_tl }
+ { \tl_gset_eq:NN \font at 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 at name #1 / \f at size } \@nil
- \__ctex_ltj_push_fontname:n { \use:c { \curr at fontshape / \f at size } }
+ \__ctex_ltj_push_fontname:n { \curr at fontshape / \f at size }
\ctex_ltj_pickup_font:
\group_end:
\__ctex_ltj_pop_fontname:
@@ -1247,9 +1238,7 @@
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 at curjfnt")] or nulltable
local ft = ft and ft.char_type or nulltable
local fk = ft and ft[0] or nulltable
@@ -1256,8 +1245,7 @@
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: }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{(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:
Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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:
Modified: trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{XeLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-xetex.def}
- {\ExplFileDate}{2.5.7}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.8}{\ExplFileDescription}
\RequirePackage { xeCJK }
\exp_args:Nx \xeCJKsetup
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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}{}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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}{}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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}{}
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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}{}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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}{}
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd 2021-12-12 22:29:51 UTC (rev 61285)
@@ -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}{}
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 } }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 } }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 } }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{macOS fonts definition for El Capitan or later version (CTEX)}
\ProvidesExplFile{ctex-fontset-macnew.def}
- {\ExplFileDate}{2.5.7}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.8}{\ExplFileDescription}
\ctex_fontset_case:nnnn
{ \ctex_fontset_error:n { mac } }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 } }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 } }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 } }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 at labelling
+ { \let \ifttl at toclabel \ifttl at label }
+ {
+ \let \ifttl at toclabel \ifttl at label
+ \CTEX at updatettlifname
+ }
+ \cs_new_protected:Npn \CTEX at updatettlifname
+ { \ifttl at label \CTEX at ifnametrue \else: \CTEX at ifnamefalse \fi: }
+ }
\group_begin:
\char_set_catcode_other:N \#
\cs_new_protected:Npn \ctex_titleps_hook:
Modified: trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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
Modified: trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 at labelling
+ { \let \ifttl at toclabel \ifttl at label }
+ {
+ \let \ifttl at toclabel \ifttl at label
+ \CTEX at updatettlifname
+ }
+ \cs_new_protected:Npn \CTEX at updatettlifname
+ { \ifttl at label \CTEX at ifnametrue \else: \CTEX at ifnamefalse \fi: }
+ }
\group_begin:
\char_set_catcode_other:N \#
\cs_new_protected:Npn \ctex_titleps_hook:
Modified: trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 at labelling
+ { \let \ifttl at toclabel \ifttl at label }
+ {
+ \let \ifttl at toclabel \ifttl at label
+ \CTEX at updatettlifname
+ }
+ \cs_new_protected:Npn \CTEX at updatettlifname
+ { \ifttl at label \CTEX at ifnametrue \else: \CTEX at ifnamefalse \fi: }
+ }
\group_begin:
\char_set_catcode_other:N \#
\cs_new_protected:Npn \ctex_titleps_hook:
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 } }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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 ,
Modified: trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def 2021-12-12 22:29:25 UTC (rev 61284)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def 2021-12-12 22:29:51 UTC (rev 61285)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee at gmail.com> $
{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'.
More information about the tex-live-commits
mailing list.