texlive[55440] Master/texmf-dist: ctex (6jun20)
commits+karl at tug.org
commits+karl at tug.org
Sat Jun 6 23:12:36 CEST 2020
Revision: 55440
http://tug.org/svn/texlive?view=revision&revision=55440
Author: karl
Date: 2020-06-06 23:12:36 +0200 (Sat, 06 Jun 2020)
Log Message:
-----------
ctex (6jun20)
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/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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/source/latex/ctex/ctex.dtx 2020-06-06 21:12:36 UTC (rev 55440)
@@ -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 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+%<+!driver>\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +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.2}{\ExplFileDescription}
+%<!driver> {\ExplFileDate}{2.5.3}{\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> [2020/05/16 v2.5.2 Chinese font definition (CTEX)]
-%<ctexspa> [2020/05/16 v2.5.2 Space info for CJKpunct (CTEX)]
-%<backend> [2020/05/16 v2.5.2 Backend configuration file (CTEX)]
-%<dict&theorem> [2020/05/16 v2.5.2 Chinese translation for theorem name (CTEX)]
+%<fd> [2020/06/06 v2.5.3 Chinese font definition (CTEX)]
+%<ctexspa> [2020/06/06 v2.5.3 Space info for CJKpunct (CTEX)]
+%<backend> [2020/06/06 v2.5.3 Backend configuration file (CTEX)]
+%<dict&theorem> [2020/06/06 v2.5.3 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{6116}
+% \CheckSum{6222}
%
% \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
@@ -3214,16 +3214,6 @@
% \item \pkg{xkeyval} 宏包。
% \end{itemize}
% \item \pkg{fontspec} 宏包。
-% \item \pkg{xunicode-addon} 宏包，属于 \pkg{xeCJK} 宏集，它还依赖
-% \begin{itemize}
-% \item \pkg{xunicode} 宏包，它还依赖
-% \begin{itemize}
-% \item \pkg{graphics} 宏集。
-% \item \pkg{graphics-cfg} 宏包。
-% \item \pkg{graphics-def} 宏包。
-% \item \pkg{tipa} 宏包。
-% \end{itemize}
-% \end{itemize}
% \item[\ding{229}] 以上是使用 \LuaLaTeX{} 编译时的依赖项。
% \item \pkg{pxeverysel} 宏包，属于 \pkg{platex-tools} 宏集。
% \item \pkg{zhmetrics-uptex} 宏包。
@@ -3430,25 +3420,36 @@
% \end{macrocode}
% \end{macro}
%
+% \changes{v2.5.3}{2020/06/06}{正确关闭和恢复 \LaTeXiii 语法环境。}
+%
% \begin{macro}[int]{\ctex_file_wrapper:nnn}
% 设置文件操作的 \tn{catcode} 环境，参数 |#1| 是设置，|#2| 是文件操作，|#3| 是恢复。
% 默认关闭 \LaTeXiii{} 语法环境，并设置 |@| 的 \tn{catcode} 为 $11$。
+% 这里最自然的使用 \pkg{l3cctab} 来实现，但目前 \pkg{l3cctab} 还属于
+% \pkg{l3experimental}，我们暂时不依赖它。
% \begin{macrocode}
%</!ctexsize>
-\cs_new_protected:Npn \ctex_file_wrapper:nnn #1#2#3
+\cs_new_protected:Npn \ctex_file_wrapper:nnn
{
- \use:x
+ \exp_args:NNx \ExplSyntaxOff
+ \@@_file_wrapper_aux:nnnn
{
- \ExplSyntaxOff
- \char_set_catcode_letter:n { 64 }
- #1
- \exp_not:n {#2}
\bool_if:NTF \l__kernel_expl_bool
{ \ExplSyntaxOn }
{ \ExplSyntaxOff }
+ }
+ }
+\cs_new_protected:Npn \@@_file_wrapper_aux:nnnn #1#2#3#4
+ {
+ \use:x
+ {
+ \char_set_catcode_letter:n { 64 }
+ #2
+ \exp_not:n {#3}
\char_set_catcode:nn { 64 } { \char_value_catcode:n { 64 } }
- #3
+ #4
}
+ #1
}
% \end{macrocode}
% \end{macro}
@@ -4623,10 +4624,10 @@
"A960-"A97F, "AC00-"D7FF}
\ltjdefcharrange{8}{"A7, "A8, "B0, "B1, "B4, "B6, "D7, "F7}
% \end{macrocode}
-% 将引号、破折号等中西文公用的标点符号归入字符范围 9，将他们设置为 JAchar。
+% 将间隔号、引号、破折号等中西文公用的标点符号归入字符范围 9，将他们设置为 JAchar。
% \begin{macrocode}
\ltjdefcharrange{9}{%
- "2018, "2019, "201C, "201D, "2013, "2014, "2025, "2026, "2027, "2E3A}
+ "00B7, "2018, "2019, "201C, "201D, "2013, "2014, "2025, "2026, "2027, "2E3A}
% \end{macrocode}
% \changes{v2.4.11}{2017/08/17}{不把希腊和西里尔字母设置为 JAchar。}
% \pkg{LuaTeX-ja} 默认把字符范围 2 和 3 设置为 JAchar，我们这里把它们都改成 ALchar。
@@ -4659,15 +4660,13 @@
%<@@=ctex_ltj>
% \end{macrocode}
%
-% \changes{v2.3}{2015/09/26}{更新 \pkg{unicode-math} 宏包补丁。}
+% \changes{v2.5.3}{2020/05/31}{不再依赖 \pkg{xunicode}，单独补丁 \file{tuenc.def}。}
%
-% 在 \LaTeX{} 下，\pkg{LuaTeX-ja} 对 \pkg{fontspec}、\pkg{xunicode}、\pkg{unicode-math}
-% 和 \pkg{listings} 打了补丁。其中前三个是把 \tn{char} 换成 \tn{ltjalchar}，确保
-% 字符是 ALchar 类。我们这里用 \pkg{xunicode-addon} 来处理 \pkg{xunicode}。
+% \begin{macro}{\CTEX at alchar, \CTEX at beginallalchar, \CTEX at endallalchar}
+% 分组中的字符都是 ALchar 类。
% \begin{macrocode}
-\RequirePackage { xunicode-addon }
-\AtBeginUTFCommand { \CTEX at beginallalchar }
-\AtEndUTFCommand { \CTEX at endallalchar }
+\cs_new_protected:Npn \CTEX at alchar #1
+ { \CTEX at beginallalchar #1 \CTEX at endallalchar }
\cs_new_protected:Npn \CTEX at beginallalchar
{
\group_begin:
@@ -4677,7 +4676,111 @@
\cs_new_protected:Npn \CTEX at endallalchar
{ \group_end: }
% \end{macrocode}
+% \end{macro}
%
+% \begin{macro}{\CTEX at chardef@text at cmd}
+% 补丁 \tn{chardef at text@cmd}，应用于 \tn{DeclareTextSymbol}，使其定义的符号都是 ALchar。
+% \begin{macrocode}
+\cs_new_protected:Npn \CTEX at chardef@text at cmd #1
+ {
+ \cs_set_eq:NN \@ifdefinable \@@@@ifdefinable
+ \tl_set:Nn \l_@@_cmd_tl {#1}
+ \tex_afterassignment:D \@@_chardef_text_cmd:
+ \tex_chardef:D #1
+ }
+\tl_new:N \l_@@_cmd_tl
+\cs_new_protected:Npn \@@_chardef_text_cmd:
+ { \exp_after:wN \@@_chardef_text_cmd_aux:N \l_@@_cmd_tl }
+\cs_new_protected:Npn \@@_chardef_text_cmd_aux:N #1
+ {
+ \int_compare:nNnF {#1} < { "80 }
+ { \cs_set_protected:Npx #1 { \CTEX at alchar { \tex_Uchar:D #1 } } }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\CTEX at text@composite at x}
+% \tn{@text at composite@x} 的重定义，应用于 \tn{DeclareUnicodeComposite} 等。
+% \begin{macrocode}
+\cs_new_protected:Npn \CTEX at text@composite at x #1#2
+ {
+ \CTEX at beginallalchar
+ \cs_if_exist_use:NF #1 {#2}
+ \CTEX at endallalchar
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\CTEX at add@unicode at accent}
+% \tn{add at unicode@accent} 的重定义，应用于 \tn{DeclareUnicodeAccent}。
+% \begin{macrocode}
+\cs_new_protected:Npx \CTEX at add@unicode at accent #1#2
+ {
+ \CTEX at beginallalchar
+ \exp_not:N \tl_if_blank:nTF {#2} { \tex_Uchar:D "A0 ~ } {#2}
+ \exp_not:N \tex_Uchar:D \tex_numexpr:D #1 \scan_stop:
+ \CTEX at endallalchar
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\CTEX at patch@text at cmd}
+% 单独补丁由 \tn{DeclareTextCommand} 定义的命令。
+% \begin{macrocode}
+\cs_new_protected:Npn \CTEX at patch@text at cmd #1
+ {
+ \exp_args:NNc \@@_patch_text_cmd:NN #1
+ { \UnicodeEncodingName \token_to_str:N #1 }
+ }
+\cs_new_protected:Npn \@@_patch_text_cmd:NN #1#2
+ {
+ \cs_set_eq:NN \CTEX at textcmd #2
+ \ctex_preto_cmd:NnnTF \CTEX at textcmd
+ { \ExplSyntaxOff \makeatletter }
+ { \CTEX at beginallalchar }
+ {
+ \ctex_appto_cmd:NnnTF \CTEX at textcmd
+ { \ExplSyntaxOff \makeatletter }
+ { \CTEX at endallalchar }
+ { \cs_set_eq:NN #2 \CTEX at textcmd }
+ { \ctex_patch_failure:N #1 }
+ }
+ { \ctex_patch_failure:N #1 }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\CTEX at patch@tunec}
+% 重新载入 \tn{tunec.def}，使补丁生效。
+% \begin{macrocode}
+\cs_new_protected:Npn \CTEX at patch@tunec
+ {
+ \cs_set_eq:NN \chardef at text@cmd \CTEX at chardef@text at cmd
+ \ctex_file_input:n { tuenc.def }
+ \cs_set_eq:NN \@text at composite@x \CTEX at text@composite at x
+ \cs_set_eq:NN \add at unicode@accent \CTEX at add@unicode at accent
+ \CTEX at patch@text at cmd \textasteriskcentered
+ }
+\@ifpackageloaded { xunicode }
+ { }
+ { \CTEX at patch@tunec }
+% \end{macrocode}
+% \end{macro}
+%
+% \changes{v2.3}{2015/09/26}{更新 \pkg{unicode-math} 宏包补丁。}
+%
+% 在 \LaTeX{} 下，\pkg{LuaTeX-ja} 对 \pkg{fontspec}、\pkg{xunicode}、\pkg{unicode-math}
+% 和 \pkg{listings} 打了补丁。其中前三个是把 \tn{char} 换成 \tn{ltjalchar}，确保
+% 字符是 ALchar 类。我们这里用 \pkg{xunicode-addon} 来处理 \pkg{xunicode}。
+% \begin{macrocode}
+\ctex_at_end_package:nn { xunicode }
+ {
+ \RequirePackage { xunicode-addon }
+ \AtBeginUTFCommand { \CTEX at beginallalchar }
+ \AtEndUTFCommand { \CTEX at endallalchar }
+ }
+% \end{macrocode}
+%
% \changes{v2.4.2}{2016/05/15}{恢复 \pkg{luatexja} 对 \tn{emshape} 和
% \tn{eminnershape} 的重定义。}
% \changes{v2.4.3}{2016/08/26}{简化 \pkg{fontspec} 补丁。}
@@ -6495,47 +6598,7 @@
{ \ctex_hypersetup:n { pdfencoding = unicode } }
%</pdftex>
% \end{macrocode}
-% 在 \XeTeX{} 下，\pkg{hyperref} 在处理带有非 ASCII 字符和 |\%| 的书签时有问题^^A
-% \footnote{\url{https://github.com/CTeX-org/ctex-kit/issues/39}}。
-% 事实上，\pkg{hyperref} 在驱动文件 \file{hxetex.def} 中设置了
-% \tn{Hy at unicodetrue}，从而书签总是会被 \tn{HyPsd at ConvertToUnicode} 转化成
-% \texttt{UTF-16BE} 编码的形式（抄录自 \tn{pdfstringdef}的定义）：
-% \begin{verbatim}
-% \ifHy at unicode
-% \HyPsd at ConvertToUnicode#1%
-% \ifx\HyPsd at pdfencoding\HyPsd at pdfencoding@auto
-% \ltx at IfUndefined{StringEncodingConvertTest}{%
-% }{%
-% \EdefUnescapeString\HyPsd at temp#1%
-% \ifxetex
-% \let\HyPsd at UnescapedString\HyPsd at temp
-% \StringEncodingConvertTest\HyPsd at temp\HyPsd at temp
-% {utf16be}{ascii-print}{%
-% \EdefEscapeString\HyPsd at temp\HyPsd at temp
-% \global\let#1\HyPsd at temp
-% \HyPsd at EscapeTeX#1%
-% \Hy at unicodefalse
-% }{%
-% \HyPsd at ToBigChars#1%
-% }%
-% \end{verbatim}
-% 通过宏包选项 \opt{pdfencoding=unicode} 设置 \tn{HyPsd at pdfencoding} 为
-% \opt{unicode}，可以避免随后再将书签从 \texttt{UTF-16BE} 字节流转化回正常
-% 字符（其中使用的 \tn{HyPsd at ToBigChars} 没有考虑书签中含有 |\%| 的情况）。
-% Heiko Oberdiek 在 \file{README} 中说明了将书签转化回正常字符的意图：避免
-% XDVIPDFMX 的警告^^A
-% \footnote{\url{http://project.ktug.org/dvipdfmx/mailman/dvipdfmx/2009-December/000153.html}}：
-% \begin{verbatim}
-% ** WARNING ** Failed to convert input string to UTF16...
-% \end{verbatim}
-% \XeTeX{} 的维护者 Khaled Hosny 已经注意到了这个问题^^A
-% \footnote{\url{http://tug.org/pipermail/tex-live/2013-December/034613.html}}。
-% 需要注意的是，\file{hxetex.def} 重载了宏包选项 \opt{unicode}，目的是不能设置
-% 它为 \opt{false}，但也导致它不会改变 \tn{HyPsd at pdfencoding}。如果
-% \pkg{hyperref} 先于 \CTeX{} 被载入，那么 \opt{unicode} 选项是没有意义的。
-% 因此要通过意义相同但在 \XeTeX{} 下更保险的 \opt{pdfencoding} 选项来设置。
-% 为了与 \XeTeX 下的行为一致（使用 \tn{HyPsd at LoadUnicode} 载入 \file{puenc.def}），
-% 在 \LuaTeX{} 下也启用这个选项。
+% \XeTeX 和 \LuaTeX 统一设置 \opt{pdfencoding} 为 \opt{unicode}。
% \begin{macrocode}
%<*xetex|luatex>
\ctex_hypersetup:n { pdfencoding = unicode }
@@ -8937,11 +9000,12 @@
{
\seq_map_inline:Nn \c_@@_headings_seq
{ \ctex_fix_varioref_label:n { ##1 } }
+ \ctex_at_end_package:nn { cleveref } { \ctex_cleveref_hook: }
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@@_fix_varioref_label:n}
+% \begin{macro}{\ctex_fix_varioref_label:n}
% \pkg{varioref} 宏包的 \tn{labelformat} 实际上是定义一个以 |\the<#1>| 为参数的宏
% |\p@<#1>|。\LaTeX{} 在定义计数器 |<#1>| 时，都会将 |\p@<#1>| 初始化为 \tn{@empty}。
% 如果这个宏非空，说明用户自定义了标签格式，我们就不再修改。这里不能使用
@@ -8960,6 +9024,22 @@
% \end{macrocode}
% \end{macro}
%
+% \changes{v2.5.3}{2020/06/04}{兼容 \pkg{cleveref}。}
+% \begin{macro}{\ctex_cleveref_hook:}
+% 需要将\pkg{cleveref} 包对应命令中 |\p@|\meta{counter} 的参数及时展开，以兼容 \tn{labelformat}。
+% \begin{macrocode}
+\cs_new_protected:Npn \ctex_cleveref_hook:
+ {
+ \ctex_patch_cmd:Nnn \refstepcounter at noarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ \ctex_patch_cmd:Nnn \refstepcounter at optarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \changes{v2.5}{2020/04/19}{应用新内核中的 \tn{labelformat}。}
%
% 如果 \pkg{varioref} 已经被载入，则使用它来设置。
@@ -10750,17 +10830,17 @@
% 文件标识信息。
% \begin{macrocode}
%<adobe>\ProvidesFile{ctex-zhmap-adobe.tex}%
-%<adobe> [2020/05/16 v2.5.2 Adobe font map loader for DVIPDFMx (CTEX)]
+%<adobe> [2020/06/06 v2.5.3 Adobe font map loader for DVIPDFMx (CTEX)]
%<fandol>\ProvidesFile{ctex-zhmap-fandol.tex}%
-%<fandol> [2020/05/16 v2.5.2 Fandol font map loader for DVIPDFMx (CTEX)]
+%<fandol> [2020/06/06 v2.5.3 Fandol font map loader for DVIPDFMx (CTEX)]
%<founder>\ProvidesFile{ctex-zhmap-founder.tex}%
-%<founder> [2020/05/16 v2.5.2 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+%<founder> [2020/06/06 v2.5.3 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
%<mac>\ProvidesFile{ctex-zhmap-mac.tex}%
-%<mac> [2020/05/16 v2.5.2 Mac font map loader for DVIPDFMx (CTEX)]
+%<mac> [2020/06/06 v2.5.3 Mac font map loader for DVIPDFMx (CTEX)]
%<ubuntu>\ProvidesFile{ctex-zhmap-ubuntu.tex}%
-%<ubuntu> [2020/05/16 v2.5.2 Ubuntu font map loader for DVIPDFMx (CTEX)]
+%<ubuntu> [2020/06/06 v2.5.3 Ubuntu font map loader for DVIPDFMx (CTEX)]
%<windows>\ProvidesFile{ctex-zhmap-windows.tex}%
-%<windows> [2020/05/16 v2.5.2 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+%<windows> [2020/06/06 v2.5.3 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
% \end{macrocode}
%
% \paragraph{\pkg{ctex-zhmap-adobe.tex}}
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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex 2020-06-06 21:12:36 UTC (rev 55440)
@@ -74,7 +74,7 @@
\fi
\endgroup
\ProvidesFile{ctex-zhmap-adobe.tex}%
- [2020/05/16 v2.5.2 Adobe font map loader for DVIPDFMx (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex 2020-06-06 21:12:36 UTC (rev 55440)
@@ -74,7 +74,7 @@
\fi
\endgroup
\ProvidesFile{ctex-zhmap-fandol.tex}%
- [2020/05/16 v2.5.2 Fandol font map loader for DVIPDFMx (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex 2020-06-06 21:12:36 UTC (rev 55440)
@@ -74,7 +74,7 @@
\fi
\endgroup
\ProvidesFile{ctex-zhmap-founder.tex}%
- [2020/05/16 v2.5.2 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex 2020-06-06 21:12:36 UTC (rev 55440)
@@ -74,7 +74,7 @@
\fi
\endgroup
\ProvidesFile{ctex-zhmap-mac.tex}%
- [2020/05/16 v2.5.2 Mac font map loader for DVIPDFMx (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex 2020-06-06 21:12:36 UTC (rev 55440)
@@ -74,7 +74,7 @@
\fi
\endgroup
\ProvidesFile{ctex-zhmap-ubuntu.tex}%
- [2020/05/16 v2.5.2 Ubuntu font map loader for DVIPDFMx (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex 2020-06-06 21:12:36 UTC (rev 55440)
@@ -74,7 +74,7 @@
\fi
\endgroup
\ProvidesFile{ctex-zhmap-windows.tex}%
- [2020/05/16 v2.5.2 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Caption with encoding GBK (CTEX)}
\ProvidesExplFile{ctex-name-gbk.cfg}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Caption with encoding UTF-8 (CTEX)}
\ProvidesExplFile{ctex-name-utf8.cfg}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Configuration file (CTEX)}
\ProvidesExplFile{\ExplFileName.cfg}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\ExplFileDescription}
%%
%%
%%
Modified: trunk/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg 2020-06-06 21:12:36 UTC (rev 55440)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{ctexbackend.cfg}%
- [2020/05/16 v2.5.2 Backend configuration file (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Option configuration file (CTEX)}
\ProvidesExplFile{ctexopts.cfg}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{c5size option (CTEX)}
\ProvidesExplFile{ctex-c5size.clo}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{cs4size option (CTEX)}
\ProvidesExplFile{ctex-cs4size.clo}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctex.sty 2020-06-06 21:12:36 UTC (rev 55440)
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter in LaTeX (CTEX)}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\msg_new:nnnn { ctex } { subpackage-loaded }
@@ -80,20 +80,27 @@
{ \keys_set:nn { ctex } }
\cs_new_protected:Npn \ctex_set:nn #1
{ \keys_set:nn { ctex / #1 } }
-\cs_new_protected:Npn \ctex_file_wrapper:nnn #1#2#3
+\cs_new_protected:Npn \ctex_file_wrapper:nnn
{
- \use:x
+ \exp_args:NNx \ExplSyntaxOff
+ \__ctex_file_wrapper_aux:nnnn
{
- \ExplSyntaxOff
- \char_set_catcode_letter:n { 64 }
- #1
- \exp_not:n {#2}
\bool_if:NTF \l__kernel_expl_bool
{ \ExplSyntaxOn }
{ \ExplSyntaxOff }
+ }
+ }
+\cs_new_protected:Npn \__ctex_file_wrapper_aux:nnnn #1#2#3#4
+ {
+ \use:x
+ {
+ \char_set_catcode_letter:n { 64 }
+ #2
+ \exp_not:n {#3}
\char_set_catcode:nn { 64 } { \char_value_catcode:n { 64 } }
- #3
+ #4
}
+ #1
}
\cs_new_protected:Npn \ctex_file_input:n #1
{ \ctex_file_wrapper:nnn { } { \file_input:n {#1} } { } }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexart.cls 2020-06-06 21:12:36 UTC (rev 55440)
@@ -27,10 +27,10 @@
\NeedsTeXFormat{LaTeX2e}
\input{ctexbackend.cfg}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class article (CTEX)}
\ProvidesExplClass{ctexart}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver at ctex. \@pkgextension } \c__ctex_version_tl
@@ -75,20 +75,27 @@
{ \keys_set:nn { ctex } }
\cs_new_protected:Npn \ctex_set:nn #1
{ \keys_set:nn { ctex / #1 } }
-\cs_new_protected:Npn \ctex_file_wrapper:nnn #1#2#3
+\cs_new_protected:Npn \ctex_file_wrapper:nnn
{
- \use:x
+ \exp_args:NNx \ExplSyntaxOff
+ \__ctex_file_wrapper_aux:nnnn
{
- \ExplSyntaxOff
- \char_set_catcode_letter:n { 64 }
- #1
- \exp_not:n {#2}
\bool_if:NTF \l__kernel_expl_bool
{ \ExplSyntaxOn }
{ \ExplSyntaxOff }
+ }
+ }
+\cs_new_protected:Npn \__ctex_file_wrapper_aux:nnnn #1#2#3#4
+ {
+ \use:x
+ {
+ \char_set_catcode_letter:n { 64 }
+ #2
+ \exp_not:n {#3}
\char_set_catcode:nn { 64 } { \char_value_catcode:n { 64 } }
- #3
+ #4
}
+ #1
}
\cs_new_protected:Npn \ctex_file_input:n #1
{ \ctex_file_wrapper:nnn { } { \file_input:n {#1} } { } }
@@ -1257,6 +1264,7 @@
{
\seq_map_inline:Nn \c__ctex_headings_seq
{ \ctex_fix_varioref_label:n { ##1 } }
+ \ctex_at_end_package:nn { cleveref } { \ctex_cleveref_hook: }
}
\cs_new_protected:Npn \ctex_fix_varioref_label:n #1
{
@@ -1263,6 +1271,15 @@
\tl_if_empty:cT { p@#1 }
{ \exp_args:Nnx \labelformat {#1} { \exp_not:c { CTEX at the#1 } } }
}
+\cs_new_protected:Npn \ctex_cleveref_hook:
+ {
+ \ctex_patch_cmd:Nnn \refstepcounter at noarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ \ctex_patch_cmd:Nnn \refstepcounter at optarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ }
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls 2020-06-06 21:12:36 UTC (rev 55440)
@@ -27,10 +27,10 @@
\NeedsTeXFormat{LaTeX2e}
\input{ctexbackend.cfg}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class beamer (CTEX)}
\ProvidesExplClass{ctexbeamer}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver at ctex. \@pkgextension } \c__ctex_version_tl
@@ -75,20 +75,27 @@
{ \keys_set:nn { ctex } }
\cs_new_protected:Npn \ctex_set:nn #1
{ \keys_set:nn { ctex / #1 } }
-\cs_new_protected:Npn \ctex_file_wrapper:nnn #1#2#3
+\cs_new_protected:Npn \ctex_file_wrapper:nnn
{
- \use:x
+ \exp_args:NNx \ExplSyntaxOff
+ \__ctex_file_wrapper_aux:nnnn
{
- \ExplSyntaxOff
- \char_set_catcode_letter:n { 64 }
- #1
- \exp_not:n {#2}
\bool_if:NTF \l__kernel_expl_bool
{ \ExplSyntaxOn }
{ \ExplSyntaxOff }
+ }
+ }
+\cs_new_protected:Npn \__ctex_file_wrapper_aux:nnnn #1#2#3#4
+ {
+ \use:x
+ {
+ \char_set_catcode_letter:n { 64 }
+ #2
+ \exp_not:n {#3}
\char_set_catcode:nn { 64 } { \char_value_catcode:n { 64 } }
- #3
+ #4
}
+ #1
}
\cs_new_protected:Npn \ctex_file_input:n #1
{ \ctex_file_wrapper:nnn { } { \file_input:n {#1} } { } }
@@ -764,6 +771,7 @@
{
\seq_map_inline:Nn \c__ctex_headings_seq
{ \ctex_fix_varioref_label:n { ##1 } }
+ \ctex_at_end_package:nn { cleveref } { \ctex_cleveref_hook: }
}
\cs_new_protected:Npn \ctex_fix_varioref_label:n #1
{
@@ -770,6 +778,15 @@
\tl_if_empty:cT { p@#1 }
{ \exp_args:Nnx \labelformat {#1} { \exp_not:c { CTEX at the#1 } } }
}
+\cs_new_protected:Npn \ctex_cleveref_hook:
+ {
+ \ctex_patch_cmd:Nnn \refstepcounter at noarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ \ctex_patch_cmd:Nnn \refstepcounter at optarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ }
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexbook.cls 2020-06-06 21:12:36 UTC (rev 55440)
@@ -27,10 +27,10 @@
\NeedsTeXFormat{LaTeX2e}
\input{ctexbackend.cfg}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class book (CTEX)}
\ProvidesExplClass{ctexbook}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver at ctex. \@pkgextension } \c__ctex_version_tl
@@ -75,20 +75,27 @@
{ \keys_set:nn { ctex } }
\cs_new_protected:Npn \ctex_set:nn #1
{ \keys_set:nn { ctex / #1 } }
-\cs_new_protected:Npn \ctex_file_wrapper:nnn #1#2#3
+\cs_new_protected:Npn \ctex_file_wrapper:nnn
{
- \use:x
+ \exp_args:NNx \ExplSyntaxOff
+ \__ctex_file_wrapper_aux:nnnn
{
- \ExplSyntaxOff
- \char_set_catcode_letter:n { 64 }
- #1
- \exp_not:n {#2}
\bool_if:NTF \l__kernel_expl_bool
{ \ExplSyntaxOn }
{ \ExplSyntaxOff }
+ }
+ }
+\cs_new_protected:Npn \__ctex_file_wrapper_aux:nnnn #1#2#3#4
+ {
+ \use:x
+ {
+ \char_set_catcode_letter:n { 64 }
+ #2
+ \exp_not:n {#3}
\char_set_catcode:nn { 64 } { \char_value_catcode:n { 64 } }
- #3
+ #4
}
+ #1
}
\cs_new_protected:Npn \ctex_file_input:n #1
{ \ctex_file_wrapper:nnn { } { \file_input:n {#1} } { } }
@@ -1385,6 +1392,7 @@
{
\seq_map_inline:Nn \c__ctex_headings_seq
{ \ctex_fix_varioref_label:n { ##1 } }
+ \ctex_at_end_package:nn { cleveref } { \ctex_cleveref_hook: }
}
\cs_new_protected:Npn \ctex_fix_varioref_label:n #1
{
@@ -1391,6 +1399,15 @@
\tl_if_empty:cT { p@#1 }
{ \exp_args:Nnx \labelformat {#1} { \exp_not:c { CTEX at the#1 } } }
}
+\cs_new_protected:Npn \ctex_cleveref_hook:
+ {
+ \ctex_patch_cmd:Nnn \refstepcounter at noarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ \ctex_patch_cmd:Nnn \refstepcounter at optarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ }
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexcap.sty 2020-06-06 21:12:36 UTC (rev 55440)
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter in LaTeX (CTEX)}
\ProvidesExplPackage{ctexcap}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexheading.sty 2020-06-06 21:12:36 UTC (rev 55440)
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading style modification (CTEX)}
\ProvidesExplPackage{ctexheading}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\ExplFileDescription}
\RequirePackage { xparse , l3keys2e }
\RequirePackage { ctexhook , ctexpatch }
\tl_clear_new:N \l__ctex_tmp_tl
@@ -43,20 +43,27 @@
{ \keys_set:nn { ctex } }
\cs_new_protected:Npn \ctex_set:nn #1
{ \keys_set:nn { ctex / #1 } }
-\cs_new_protected:Npn \ctex_file_wrapper:nnn #1#2#3
+\cs_new_protected:Npn \ctex_file_wrapper:nnn
{
- \use:x
+ \exp_args:NNx \ExplSyntaxOff
+ \__ctex_file_wrapper_aux:nnnn
{
- \ExplSyntaxOff
- \char_set_catcode_letter:n { 64 }
- #1
- \exp_not:n {#2}
\bool_if:NTF \l__kernel_expl_bool
{ \ExplSyntaxOn }
{ \ExplSyntaxOff }
+ }
+ }
+\cs_new_protected:Npn \__ctex_file_wrapper_aux:nnnn #1#2#3#4
+ {
+ \use:x
+ {
+ \char_set_catcode_letter:n { 64 }
+ #2
+ \exp_not:n {#3}
\char_set_catcode:nn { 64 } { \char_value_catcode:n { 64 } }
- #3
+ #4
}
+ #1
}
\cs_new_protected:Npn \ctex_file_input:n #1
{ \ctex_file_wrapper:nnn { } { \file_input:n {#1} } { } }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexhook.sty 2020-06-06 21:12:36 UTC (rev 55440)
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Document and package hooks (CTEX)}
\ProvidesExplPackage{ctexhook}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\ExplFileDescription}
\cs_new_protected:Npn \ctex_at_end_preamble:n
{ \tl_gput_right:Nn \g__ctex_end_preamble_hook_tl }
\cs_new_protected:Npn \ctex_after_end_preamble:n
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty 2020-06-06 21:12:36 UTC (rev 55440)
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Patching commands (CTEX)}
\ProvidesExplPackage{ctexpatch}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexrep.cls 2020-06-06 21:12:36 UTC (rev 55440)
@@ -27,10 +27,10 @@
\NeedsTeXFormat{LaTeX2e}
\input{ctexbackend.cfg}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese adapter for class report (CTEX)}
\ProvidesExplClass{ctexrep}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\ExplFileDescription}
\tl_const:Nx \c__ctex_version_tl
{ \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } }
\cs_new_eq:cN { ver at ctex. \@pkgextension } \c__ctex_version_tl
@@ -75,20 +75,27 @@
{ \keys_set:nn { ctex } }
\cs_new_protected:Npn \ctex_set:nn #1
{ \keys_set:nn { ctex / #1 } }
-\cs_new_protected:Npn \ctex_file_wrapper:nnn #1#2#3
+\cs_new_protected:Npn \ctex_file_wrapper:nnn
{
- \use:x
+ \exp_args:NNx \ExplSyntaxOff
+ \__ctex_file_wrapper_aux:nnnn
{
- \ExplSyntaxOff
- \char_set_catcode_letter:n { 64 }
- #1
- \exp_not:n {#2}
\bool_if:NTF \l__kernel_expl_bool
{ \ExplSyntaxOn }
{ \ExplSyntaxOff }
+ }
+ }
+\cs_new_protected:Npn \__ctex_file_wrapper_aux:nnnn #1#2#3#4
+ {
+ \use:x
+ {
+ \char_set_catcode_letter:n { 64 }
+ #2
+ \exp_not:n {#3}
\char_set_catcode:nn { 64 } { \char_value_catcode:n { 64 } }
- #3
+ #4
}
+ #1
}
\cs_new_protected:Npn \ctex_file_input:n #1
{ \ctex_file_wrapper:nnn { } { \file_input:n {#1} } { } }
@@ -1380,6 +1387,7 @@
{
\seq_map_inline:Nn \c__ctex_headings_seq
{ \ctex_fix_varioref_label:n { ##1 } }
+ \ctex_at_end_package:nn { cleveref } { \ctex_cleveref_hook: }
}
\cs_new_protected:Npn \ctex_fix_varioref_label:n #1
{
@@ -1386,6 +1394,15 @@
\tl_if_empty:cT { p@#1 }
{ \exp_args:Nnx \labelformat {#1} { \exp_not:c { CTEX at the#1 } } }
}
+\cs_new_protected:Npn \ctex_cleveref_hook:
+ {
+ \ctex_patch_cmd:Nnn \refstepcounter at noarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ \ctex_patch_cmd:Nnn \refstepcounter at optarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ }
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
{
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexsize.sty 2020-06-06 21:12:36 UTC (rev 55440)
@@ -26,28 +26,35 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese font size definition (CTEX)}
\ProvidesExplPackage{ctexsize}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\ExplFileDescription}
\RequirePackage { xparse , l3keys2e }
\RequirePackage { fix-cm }
\cs_new_protected:Npn \ctex_define_option:n
{ \keys_define:nn { ctex / option } }
-\cs_new_protected:Npn \ctex_file_wrapper:nnn #1#2#3
+\cs_new_protected:Npn \ctex_file_wrapper:nnn
{
- \use:x
+ \exp_args:NNx \ExplSyntaxOff
+ \__ctex_file_wrapper_aux:nnnn
{
- \ExplSyntaxOff
- \char_set_catcode_letter:n { 64 }
- #1
- \exp_not:n {#2}
\bool_if:NTF \l__kernel_expl_bool
{ \ExplSyntaxOn }
{ \ExplSyntaxOff }
+ }
+ }
+\cs_new_protected:Npn \__ctex_file_wrapper_aux:nnnn #1#2#3#4
+ {
+ \use:x
+ {
+ \char_set_catcode_letter:n { 64 }
+ #2
+ \exp_not:n {#3}
\char_set_catcode:nn { 64 } { \char_value_catcode:n { 64 } }
- #3
+ #4
}
+ #1
}
\cs_new_protected:Npn \ctex_file_input:n #1
{ \ctex_file_wrapper:nnn { } { \file_input:n {#1} } { } }
Modified: trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/ctexspa.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -26,7 +26,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{ctexspa.def}%
- [2020/05/16 v2.5.2 Space info for CJKpunct (CTEX)]
+ [2020/06/06 v2.5.3 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/dictionary/translator-theorem-dictionary-ChineseGBK.dict
===================================================================
--- trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict 2020-06-06 21:12:36 UTC (rev 55440)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
- [2020/05/16 v2.5.2 Chinese translation for theorem name (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict 2020-06-06 21:12:36 UTC (rev 55440)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
- [2020/05/16 v2.5.2 Chinese translation for theorem name (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Asian pTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-aptex.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{LuaLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-luatex.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\ExplFileDescription}
\msg_new:nnn { ctex } { luatexja-loaded }
{
Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\
@@ -62,7 +62,7 @@
"A960-"A97F, "AC00-"D7FF}
\ltjdefcharrange{8}{"A7, "A8, "B0, "B1, "B4, "B6, "D7, "F7}
\ltjdefcharrange{9}{%
- "2018, "2019, "201C, "201D, "2013, "2014, "2025, "2026, "2027, "2E3A}
+ "00B7, "2018, "2019, "201C, "201D, "2013, "2014, "2025, "2026, "2027, "2E3A}
\ltjsetparameter{jacharrange={-1, -2, -3, -4, -5, +6, +7, -8, +9}}
\directlua{for x=128,255 do luatexja.math.is_math_letters[x] = true end}
\directlua{
@@ -76,9 +76,8 @@
jcharwidowpenalty=500, differentjfm=paverage
}
\ExplSyntaxOn
-\RequirePackage { xunicode-addon }
-\AtBeginUTFCommand { \CTEX at beginallalchar }
-\AtEndUTFCommand { \CTEX at endallalchar }
+\cs_new_protected:Npn \CTEX at alchar #1
+ { \CTEX at beginallalchar #1 \CTEX at endallalchar }
\cs_new_protected:Npn \CTEX at beginallalchar
{
\group_begin:
@@ -87,6 +86,71 @@
}
\cs_new_protected:Npn \CTEX at endallalchar
{ \group_end: }
+\cs_new_protected:Npn \CTEX at chardef@text at cmd #1
+ {
+ \cs_set_eq:NN \@ifdefinable \@@ifdefinable
+ \tl_set:Nn \l__ctex_ltj_cmd_tl {#1}
+ \tex_afterassignment:D \__ctex_ltj_chardef_text_cmd:
+ \tex_chardef:D #1
+ }
+\tl_new:N \l__ctex_ltj_cmd_tl
+\cs_new_protected:Npn \__ctex_ltj_chardef_text_cmd:
+ { \exp_after:wN \__ctex_ltj_chardef_text_cmd_aux:N \l__ctex_ltj_cmd_tl }
+\cs_new_protected:Npn \__ctex_ltj_chardef_text_cmd_aux:N #1
+ {
+ \int_compare:nNnF {#1} < { "80 }
+ { \cs_set_protected:Npx #1 { \CTEX at alchar { \tex_Uchar:D #1 } } }
+ }
+\cs_new_protected:Npn \CTEX at text@composite at x #1#2
+ {
+ \CTEX at beginallalchar
+ \cs_if_exist_use:NF #1 {#2}
+ \CTEX at endallalchar
+ }
+\cs_new_protected:Npx \CTEX at add@unicode at accent #1#2
+ {
+ \CTEX at beginallalchar
+ \exp_not:N \tl_if_blank:nTF {#2} { \tex_Uchar:D "A0 ~ } {#2}
+ \exp_not:N \tex_Uchar:D \tex_numexpr:D #1 \scan_stop:
+ \CTEX at endallalchar
+ }
+\cs_new_protected:Npn \CTEX at patch@text at cmd #1
+ {
+ \exp_args:NNc \__ctex_ltj_patch_text_cmd:NN #1
+ { \UnicodeEncodingName \token_to_str:N #1 }
+ }
+\cs_new_protected:Npn \__ctex_ltj_patch_text_cmd:NN #1#2
+ {
+ \cs_set_eq:NN \CTEX at textcmd #2
+ \ctex_preto_cmd:NnnTF \CTEX at textcmd
+ { \ExplSyntaxOff \makeatletter }
+ { \CTEX at beginallalchar }
+ {
+ \ctex_appto_cmd:NnnTF \CTEX at textcmd
+ { \ExplSyntaxOff \makeatletter }
+ { \CTEX at endallalchar }
+ { \cs_set_eq:NN #2 \CTEX at textcmd }
+ { \ctex_patch_failure:N #1 }
+ }
+ { \ctex_patch_failure:N #1 }
+ }
+\cs_new_protected:Npn \CTEX at patch@tunec
+ {
+ \cs_set_eq:NN \chardef at text@cmd \CTEX at chardef@text at cmd
+ \ctex_file_input:n { tuenc.def }
+ \cs_set_eq:NN \@text at composite@x \CTEX at text@composite at x
+ \cs_set_eq:NN \add at unicode@accent \CTEX at add@unicode at accent
+ \CTEX at patch@text at cmd \textasteriskcentered
+ }
+\@ifpackageloaded { xunicode }
+ { }
+ { \CTEX at patch@tunec }
+\ctex_at_end_package:nn { xunicode }
+ {
+ \RequirePackage { xunicode-addon }
+ \AtBeginUTFCommand { \CTEX at beginallalchar }
+ \AtEndUTFCommand { \CTEX at endallalchar }
+ }
\ctex_at_end_package:nn { listings }
{ \RequirePackage { lltjp-listings } }
\group_begin:
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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{(pdf)LaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-pdftex.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{upTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-uptex.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{XeLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-xetex.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd 2020-06-06 21:12:36 UTC (rev 55440)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c19rm.fd}%
- [2020/05/16 v2.5.2 Chinese font definition (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd 2020-06-06 21:12:36 UTC (rev 55440)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c19sf.fd}%
- [2020/05/16 v2.5.2 Chinese font definition (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd 2020-06-06 21:12:36 UTC (rev 55440)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c19tt.fd}%
- [2020/05/16 v2.5.2 Chinese font definition (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd 2020-06-06 21:12:36 UTC (rev 55440)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c70rm.fd}%
- [2020/05/16 v2.5.2 Chinese font definition (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd 2020-06-06 21:12:36 UTC (rev 55440)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c70sf.fd}%
- [2020/05/16 v2.5.2 Chinese font definition (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd 2020-06-06 21:12:36 UTC (rev 55440)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c70tt.fd}%
- [2020/05/16 v2.5.2 Chinese font definition (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd 2020-06-06 21:12:36 UTC (rev 55440)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jt2zhrm.fd}%
- [2020/05/16 v2.5.2 Chinese font definition (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd 2020-06-06 21:12:36 UTC (rev 55440)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jt2zhsf.fd}%
- [2020/05/16 v2.5.2 Chinese font definition (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd 2020-06-06 21:12:36 UTC (rev 55440)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jt2zhtt.fd}%
- [2020/05/16 v2.5.2 Chinese font definition (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd 2020-06-06 21:12:36 UTC (rev 55440)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jy2zhrm.fd}%
- [2020/05/16 v2.5.2 Chinese font definition (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd 2020-06-06 21:12:36 UTC (rev 55440)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jy2zhsf.fd}%
- [2020/05/16 v2.5.2 Chinese font definition (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd 2020-06-06 21:12:36 UTC (rev 55440)
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jy2zhtt.fd}%
- [2020/05/16 v2.5.2 Chinese font definition (CTEX)]
+ [2020/06/06 v2.5.3 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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Adobe fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-adobe.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Fandol fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-fandol.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Founder fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-founder.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{macOS fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-mac.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +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.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{macOS fonts definition for Yosemite or earlier version (CTEX)}
\ProvidesExplFile{ctex-fontset-macold.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Ubuntu fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-ubuntu.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Windows fonts definition (CTEX)}
\ProvidesExplFile{ctex-fontset-windows.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for article (CTEX)}
\ProvidesExplFile{ctex-article.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
\seq_new:N \c__ctex_headings_seq
@@ -700,6 +700,7 @@
{
\seq_map_inline:Nn \c__ctex_headings_seq
{ \ctex_fix_varioref_label:n { ##1 } }
+ \ctex_at_end_package:nn { cleveref } { \ctex_cleveref_hook: }
}
\cs_new_protected:Npn \ctex_fix_varioref_label:n #1
{
@@ -706,6 +707,15 @@
\tl_if_empty:cT { p@#1 }
{ \exp_args:Nnx \labelformat {#1} { \exp_not:c { CTEX at the#1 } } }
}
+\cs_new_protected:Npn \ctex_cleveref_hook:
+ {
+ \ctex_patch_cmd:Nnn \refstepcounter at noarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ \ctex_patch_cmd:Nnn \refstepcounter at optarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ }
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for beamer (CTEX)}
\ProvidesExplFile{ctex-beamer.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_headings_seq
{ part , section , subsection }
\cs_new_protected:Npn \__ctex_initial_heading:n #1
@@ -212,6 +212,7 @@
{
\seq_map_inline:Nn \c__ctex_headings_seq
{ \ctex_fix_varioref_label:n { ##1 } }
+ \ctex_at_end_package:nn { cleveref } { \ctex_cleveref_hook: }
}
\cs_new_protected:Npn \ctex_fix_varioref_label:n #1
{
@@ -218,6 +219,15 @@
\tl_if_empty:cT { p@#1 }
{ \exp_args:Nnx \labelformat {#1} { \exp_not:c { CTEX at the#1 } } }
}
+\cs_new_protected:Npn \ctex_cleveref_hook:
+ {
+ \ctex_patch_cmd:Nnn \refstepcounter at noarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ \ctex_patch_cmd:Nnn \refstepcounter at optarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ }
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
{
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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for book (CTEX)}
\ProvidesExplFile{ctex-book.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
\seq_new:N \c__ctex_headings_seq
@@ -828,6 +828,7 @@
{
\seq_map_inline:Nn \c__ctex_headings_seq
{ \ctex_fix_varioref_label:n { ##1 } }
+ \ctex_at_end_package:nn { cleveref } { \ctex_cleveref_hook: }
}
\cs_new_protected:Npn \ctex_fix_varioref_label:n #1
{
@@ -834,6 +835,15 @@
\tl_if_empty:cT { p@#1 }
{ \exp_args:Nnx \labelformat {#1} { \exp_not:c { CTEX at the#1 } } }
}
+\cs_new_protected:Npn \ctex_cleveref_hook:
+ {
+ \ctex_patch_cmd:Nnn \refstepcounter at noarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ \ctex_patch_cmd:Nnn \refstepcounter at optarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ }
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Heading modification for report (CTEX)}
\ProvidesExplFile{ctex-report.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\ExplFileDescription}
\seq_const_from_clist:Nn \c__ctex_section_headings_seq
{ section , subsection , subsubsection , paragraph , subparagraph }
\seq_new:N \c__ctex_headings_seq
@@ -823,6 +823,7 @@
{
\seq_map_inline:Nn \c__ctex_headings_seq
{ \ctex_fix_varioref_label:n { ##1 } }
+ \ctex_at_end_package:nn { cleveref } { \ctex_cleveref_hook: }
}
\cs_new_protected:Npn \ctex_fix_varioref_label:n #1
{
@@ -829,6 +830,15 @@
\tl_if_empty:cT { p@#1 }
{ \exp_args:Nnx \labelformat {#1} { \exp_not:c { CTEX at the#1 } } }
}
+\cs_new_protected:Npn \ctex_cleveref_hook:
+ {
+ \ctex_patch_cmd:Nnn \refstepcounter at noarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ \ctex_patch_cmd:Nnn \refstepcounter at optarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ }
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-article.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for beamer (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-beamer.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-book.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese-report.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Chinese scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-chinese.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for article (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-article.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for beamer (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-beamer.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for book (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-book.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for report (CTEX)}
\ProvidesExplFile{ctex-scheme-plain-report.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\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 2020-06-06 21:12:15 UTC (rev 55439)
+++ trunk/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def 2020-06-06 21:12:36 UTC (rev 55440)
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee at gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee at gmail.com> $
{Plain scheme for generic (CTEX)}
\ProvidesExplFile{ctex-scheme-plain.def}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\ExplFileDescription}
%%
%%
%% End of file `ctex-scheme-plain.def'.
More information about the tex-live-commits
mailing list.