summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/ctex/ctex.pdfbin1107269 -> 1113957 bytes
-rw-r--r--Master/texmf-dist/source/latex/ctex/ctex.dtx242
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex2
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex2
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex2
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex2
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex2
-rw-r--r--Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/config/ctex.cfg4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctex.sty25
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexart.cls35
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls35
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexbook.cls35
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexcap.sty4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexheading.sty25
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexhook.sty4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexpatch.sty4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexrep.cls35
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexsize.sty25
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexspa.def2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def76
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def14
-rw-r--r--Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def14
-rw-r--r--Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def14
-rw-r--r--Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def14
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def4
-rw-r--r--Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def4
67 files changed, 515 insertions, 242 deletions
diff --git a/Master/texmf-dist/doc/latex/ctex/ctex.pdf b/Master/texmf-dist/doc/latex/ctex/ctex.pdf
index 3762a8b60e6..61bc510f0f3 100644
--- a/Master/texmf-dist/doc/latex/ctex/ctex.pdf
+++ b/Master/texmf-dist/doc/latex/ctex/ctex.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/ctex/ctex.dtx b/Master/texmf-dist/source/latex/ctex/ctex.dtx
index bc86f369f79..c0a472bab2b 100644
--- a/Master/texmf-dist/source/latex/ctex/ctex.dtx
+++ b/Master/texmf-dist/source/latex/ctex/ctex.dtx
@@ -443,7 +443,7 @@ Copyright and Licence
%<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@gmail.com> $
+%<+!driver>\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
%<ctex> {Chinese adapter in LaTeX (CTEX)}
%<ctex>\ProvidesExplPackage{\ExplFileName}
%<ctexsize> {Chinese font size definition (CTEX)}
@@ -530,7 +530,7 @@ Copyright and Licence
%<founder>\ProvidesExplFile{ctex-fontset-founder.def}
%<ubuntu> {Ubuntu fonts definition (CTEX)}
%<ubuntu>\ProvidesExplFile{ctex-fontset-ubuntu.def}
-%<!driver> {\ExplFileDate}{2.5.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 @@ Copyright and Licence
%<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 @@ Copyright and Licence
% \changes{v2.4.15}{2019/03/23}{同步 \LaTeXiii{} 2019/03/05。}
% \changes{v2.5.1}{2020/05/02}{\pkg{zhconv} 更名为 \pkg{ctex-zhconv}。}
%
-% \CheckSum{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 @@ Copyright and Licence
% \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 @@ Copyright and Licence
% \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 @@ Copyright and Licence
"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 @@ Copyright and Licence
%<@@=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@alchar, \CTEX@beginallalchar, \CTEX@endallalchar}
+% 分组中的字符都是 ALchar 类。
% \begin{macrocode}
-\RequirePackage { xunicode-addon }
-\AtBeginUTFCommand { \CTEX@beginallalchar }
-\AtEndUTFCommand { \CTEX@endallalchar }
+\cs_new_protected:Npn \CTEX@alchar #1
+ { \CTEX@beginallalchar #1 \CTEX@endallalchar }
\cs_new_protected:Npn \CTEX@beginallalchar
{
\group_begin:
@@ -4677,6 +4676,110 @@ Copyright and Licence
\cs_new_protected:Npn \CTEX@endallalchar
{ \group_end: }
% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\CTEX@chardef@text@cmd}
+% 补丁 \tn{chardef@text@cmd},应用于 \tn{DeclareTextSymbol},使其定义的符号都是 ALchar。
+% \begin{macrocode}
+\cs_new_protected:Npn \CTEX@chardef@text@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@alchar { \tex_Uchar:D #1 } } }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\CTEX@text@composite@x}
+% \tn{@text@composite@x} 的重定义,应用于 \tn{DeclareUnicodeComposite} 等。
+% \begin{macrocode}
+\cs_new_protected:Npn \CTEX@text@composite@x #1#2
+ {
+ \CTEX@beginallalchar
+ \cs_if_exist_use:NF #1 {#2}
+ \CTEX@endallalchar
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\CTEX@add@unicode@accent}
+% \tn{add@unicode@accent} 的重定义,应用于 \tn{DeclareUnicodeAccent}。
+% \begin{macrocode}
+\cs_new_protected:Npx \CTEX@add@unicode@accent #1#2
+ {
+ \CTEX@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@endallalchar
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\CTEX@patch@text@cmd}
+% 单独补丁由 \tn{DeclareTextCommand} 定义的命令。
+% \begin{macrocode}
+\cs_new_protected:Npn \CTEX@patch@text@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@textcmd #2
+ \ctex_preto_cmd:NnnTF \CTEX@textcmd
+ { \ExplSyntaxOff \makeatletter }
+ { \CTEX@beginallalchar }
+ {
+ \ctex_appto_cmd:NnnTF \CTEX@textcmd
+ { \ExplSyntaxOff \makeatletter }
+ { \CTEX@endallalchar }
+ { \cs_set_eq:NN #2 \CTEX@textcmd }
+ { \ctex_patch_failure:N #1 }
+ }
+ { \ctex_patch_failure:N #1 }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\CTEX@patch@tunec}
+% 重新载入 \tn{tunec.def},使补丁生效。
+% \begin{macrocode}
+\cs_new_protected:Npn \CTEX@patch@tunec
+ {
+ \cs_set_eq:NN \chardef@text@cmd \CTEX@chardef@text@cmd
+ \ctex_file_input:n { tuenc.def }
+ \cs_set_eq:NN \@text@composite@x \CTEX@text@composite@x
+ \cs_set_eq:NN \add@unicode@accent \CTEX@add@unicode@accent
+ \CTEX@patch@text@cmd \textasteriskcentered
+ }
+\@ifpackageloaded { xunicode }
+ { }
+ { \CTEX@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@beginallalchar }
+ \AtEndUTFCommand { \CTEX@endallalchar }
+ }
+% \end{macrocode}
%
% \changes{v2.4.2}{2016/05/15}{恢复 \pkg{luatexja} 对 \tn{emshape} 和
% \tn{eminnershape} 的重定义。}
@@ -6495,47 +6598,7 @@ Copyright and Licence
{ \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@unicodetrue},从而书签总是会被 \tn{HyPsd@ConvertToUnicode} 转化成
-% \texttt{UTF-16BE} 编码的形式(抄录自 \tn{pdfstringdef}的定义):
-% \begin{verbatim}
-% \ifHy@unicode
-% \HyPsd@ConvertToUnicode#1%
-% \ifx\HyPsd@pdfencoding\HyPsd@pdfencoding@auto
-% \ltx@IfUndefined{StringEncodingConvertTest}{%
-% }{%
-% \EdefUnescapeString\HyPsd@temp#1%
-% \ifxetex
-% \let\HyPsd@UnescapedString\HyPsd@temp
-% \StringEncodingConvertTest\HyPsd@temp\HyPsd@temp
-% {utf16be}{ascii-print}{%
-% \EdefEscapeString\HyPsd@temp\HyPsd@temp
-% \global\let#1\HyPsd@temp
-% \HyPsd@EscapeTeX#1%
-% \Hy@unicodefalse
-% }{%
-% \HyPsd@ToBigChars#1%
-% }%
-% \end{verbatim}
-% 通过宏包选项 \opt{pdfencoding=unicode} 设置 \tn{HyPsd@pdfencoding} 为
-% \opt{unicode},可以避免随后再将书签从 \texttt{UTF-16BE} 字节流转化回正常
-% 字符(其中使用的 \tn{HyPsd@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@pdfencoding}。如果
-% \pkg{hyperref} 先于 \CTeX{} 被载入,那么 \opt{unicode} 选项是没有意义的。
-% 因此要通过意义相同但在 \XeTeX{} 下更保险的 \opt{pdfencoding} 选项来设置。
-% 为了与 \XeTeX 下的行为一致(使用 \tn{HyPsd@LoadUnicode} 载入 \file{puenc.def}),
-% 在 \LuaTeX{} 下也启用这个选项。
+% \XeTeX 和 \LuaTeX 统一设置 \opt{pdfencoding} 为 \opt{unicode}。
% \begin{macrocode}
%<*xetex|luatex>
\ctex_hypersetup:n { pdfencoding = unicode }
@@ -8937,11 +9000,12 @@ Copyright and Licence
{
\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 @@ Copyright and Licence
% \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@noarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ \ctex_patch_cmd:Nnn \refstepcounter@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 @@ Copyright and Licence
% 文件标识信息。
% \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}}
diff --git a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex
index 61bf7005385..1abbe6c708b 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex
@@ -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
diff --git a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex
index 574c4aa8160..ddb5a27d85a 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex
@@ -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
diff --git a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex
index 971b6e561e4..04d9d1516d6 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex
@@ -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@UGBK@ <FZSSK.TTF}
\pdfmapline{=gbksong@UGBK@ <FZSSK.TTF}
diff --git a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex
index 38dde65a835..16ce9a75513 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex
@@ -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
diff --git a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex
index 31c298f77be..aff12eaa34f 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex
@@ -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
diff --git a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex
index 725b8ced14b..04c02cca594 100644
--- a/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex
+++ b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex
@@ -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@UGBK@ <simsun.ttc}
\pdfmapline{=gbksong@UGBK@ <simsun.ttc}
diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg
index 575141b9707..03ddbc78b44 100644
--- a/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg
+++ b/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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 = Ŀ¼ ,
diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
index 557bd750558..b5632ce2df5 100644
--- a/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
+++ b/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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 = 目录 ,
diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
index f3b3720c747..302ecc12eb8 100644
--- a/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
+++ b/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
{Configuration file (CTEX)}
\ProvidesExplFile{\ExplFileName.cfg}
- {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.3}{\ExplFileDescription}
%%
%%
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg
index 36a5d5090f4..0c4b6a184d4 100644
--- a/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg
+++ b/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{ctexbackend.cfg}%
- [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
diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
index 5e06f2fd5a3..eefbc5a2dd4 100644
--- a/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
+++ b/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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 }
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo b/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
index d7bdc79fce2..e42c2d62b91 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
+++ b/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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@
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo b/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
index 99a45eb1725..72fa5168c6e 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
+++ b/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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@
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex.sty b/Master/texmf-dist/tex/latex/ctex/ctex.sty
index 92faad889c6..cde730a8cba 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctex.sty
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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} } { } }
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexart.cls b/Master/texmf-dist/tex/latex/ctex/ctexart.cls
index 9ae9ad1a1b7..3115b43cf9f 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexart.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexart.cls
@@ -27,10 +27,10 @@
\NeedsTeXFormat{LaTeX2e}
\input{ctexbackend.cfg}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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@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,12 +1264,22 @@
{
\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
{
\tl_if_empty:cT { p@#1 }
{ \exp_args:Nnx \labelformat {#1} { \exp_not:c { CTEX@the#1 } } }
}
+\cs_new_protected:Npn \ctex_cleveref_hook:
+ {
+ \ctex_patch_cmd:Nnn \refstepcounter@noarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ \ctex_patch_cmd:Nnn \refstepcounter@optarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ }
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
{
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
index 32c2e7eddce..f570a17379a 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
@@ -27,10 +27,10 @@
\NeedsTeXFormat{LaTeX2e}
\input{ctexbackend.cfg}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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@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,12 +771,22 @@
{
\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
{
\tl_if_empty:cT { p@#1 }
{ \exp_args:Nnx \labelformat {#1} { \exp_not:c { CTEX@the#1 } } }
}
+\cs_new_protected:Npn \ctex_cleveref_hook:
+ {
+ \ctex_patch_cmd:Nnn \refstepcounter@noarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ \ctex_patch_cmd:Nnn \refstepcounter@optarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ }
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
{
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
index eb35b520e01..e99d1bae32f 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
@@ -27,10 +27,10 @@
\NeedsTeXFormat{LaTeX2e}
\input{ctexbackend.cfg}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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@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,12 +1392,22 @@
{
\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
{
\tl_if_empty:cT { p@#1 }
{ \exp_args:Nnx \labelformat {#1} { \exp_not:c { CTEX@the#1 } } }
}
+\cs_new_protected:Npn \ctex_cleveref_hook:
+ {
+ \ctex_patch_cmd:Nnn \refstepcounter@noarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ \ctex_patch_cmd:Nnn \refstepcounter@optarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ }
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
{
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
index fd3c2ae0106..b104cc619fa 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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 }
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexheading.sty b/Master/texmf-dist/tex/latex/ctex/ctexheading.sty
index 6ead5f694d9..d30e04f7f02 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexheading.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctexheading.sty
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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} } { } }
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexhook.sty b/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
index 74f6e3caf2d..00821e29bb7 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctexhook.sty
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty b/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty
index 8f288a35f01..f0e2527b11e 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
index 4b8c8c2e182..3bd70ff528c 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
@@ -27,10 +27,10 @@
\NeedsTeXFormat{LaTeX2e}
\input{ctexbackend.cfg}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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@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,12 +1387,22 @@
{
\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
{
\tl_if_empty:cT { p@#1 }
{ \exp_args:Nnx \labelformat {#1} { \exp_not:c { CTEX@the#1 } } }
}
+\cs_new_protected:Npn \ctex_cleveref_hook:
+ {
+ \ctex_patch_cmd:Nnn \refstepcounter@noarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ \ctex_patch_cmd:Nnn \refstepcounter@optarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ }
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
{
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
index e40a6c27006..da2013bb28a 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty
@@ -26,28 +26,35 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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} } { } }
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexspa.def b/Master/texmf-dist/tex/latex/ctex/ctexspa.def
index 4075041e0a7..00caaa0fc49 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexspa.def
+++ b/Master/texmf-dist/tex/latex/ctex/ctexspa.def
@@ -26,7 +26,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{ctexspa.def}%
- [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,,,}
diff --git a/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict b/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict
index cbdee191221..a69106af939 100644
--- a/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict
+++ b/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}%
- [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}{}
diff --git a/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict b/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict
index 3a6f4de1239..c739ae7946b 100644
--- a/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict
+++ b/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}%
- [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}{评论}
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
index ea96488d56d..281e9d49110 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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:
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
index 75208abd224..5d0e587c18d 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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@beginallalchar }
-\AtEndUTFCommand { \CTEX@endallalchar }
+\cs_new_protected:Npn \CTEX@alchar #1
+ { \CTEX@beginallalchar #1 \CTEX@endallalchar }
\cs_new_protected:Npn \CTEX@beginallalchar
{
\group_begin:
@@ -87,6 +86,71 @@
}
\cs_new_protected:Npn \CTEX@endallalchar
{ \group_end: }
+\cs_new_protected:Npn \CTEX@chardef@text@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@alchar { \tex_Uchar:D #1 } } }
+ }
+\cs_new_protected:Npn \CTEX@text@composite@x #1#2
+ {
+ \CTEX@beginallalchar
+ \cs_if_exist_use:NF #1 {#2}
+ \CTEX@endallalchar
+ }
+\cs_new_protected:Npx \CTEX@add@unicode@accent #1#2
+ {
+ \CTEX@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@endallalchar
+ }
+\cs_new_protected:Npn \CTEX@patch@text@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@textcmd #2
+ \ctex_preto_cmd:NnnTF \CTEX@textcmd
+ { \ExplSyntaxOff \makeatletter }
+ { \CTEX@beginallalchar }
+ {
+ \ctex_appto_cmd:NnnTF \CTEX@textcmd
+ { \ExplSyntaxOff \makeatletter }
+ { \CTEX@endallalchar }
+ { \cs_set_eq:NN #2 \CTEX@textcmd }
+ { \ctex_patch_failure:N #1 }
+ }
+ { \ctex_patch_failure:N #1 }
+ }
+\cs_new_protected:Npn \CTEX@patch@tunec
+ {
+ \cs_set_eq:NN \chardef@text@cmd \CTEX@chardef@text@cmd
+ \ctex_file_input:n { tuenc.def }
+ \cs_set_eq:NN \@text@composite@x \CTEX@text@composite@x
+ \cs_set_eq:NN \add@unicode@accent \CTEX@add@unicode@accent
+ \CTEX@patch@text@cmd \textasteriskcentered
+ }
+\@ifpackageloaded { xunicode }
+ { }
+ { \CTEX@patch@tunec }
+\ctex_at_end_package:nn { xunicode }
+ {
+ \RequirePackage { xunicode-addon }
+ \AtBeginUTFCommand { \CTEX@beginallalchar }
+ \AtEndUTFCommand { \CTEX@endallalchar }
+ }
\ctex_at_end_package:nn { listings }
{ \RequirePackage { lltjp-listings } }
\group_begin:
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
index 7f65e702fbb..d88ff8bbdbf 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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:
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def
index ca849f22698..eec8040b270 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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:
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
index 9c584a63b48..cb6eba6a18c 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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
{
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd b/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
index c69787b1ae8..3438f2e9481 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c19rm.fd}%
- [2020/05/16 v2.5.2 Chinese font definition (CTEX)]
+ [2020/06/06 v2.5.3 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd b/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
index 2dcafccfa27..869f8098762 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c19sf.fd}%
- [2020/05/16 v2.5.2 Chinese font definition (CTEX)]
+ [2020/06/06 v2.5.3 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd b/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
index eb6bf98267f..15d7735fb97 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c19tt.fd}%
- [2020/05/16 v2.5.2 Chinese font definition (CTEX)]
+ [2020/06/06 v2.5.3 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd b/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
index 1678fa40781..aa039ca0bd2 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c70rm.fd}%
- [2020/05/16 v2.5.2 Chinese font definition (CTEX)]
+ [2020/06/06 v2.5.3 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd b/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
index 9b5176a23ed..d8ed676c34b 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c70sf.fd}%
- [2020/05/16 v2.5.2 Chinese font definition (CTEX)]
+ [2020/06/06 v2.5.3 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd b/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
index c7a91547fed..fd419fc8a99 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{c70tt.fd}%
- [2020/05/16 v2.5.2 Chinese font definition (CTEX)]
+ [2020/06/06 v2.5.3 Chinese font definition (CTEX)]
%%
%% Chinese characters
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd
index 0b8070eff8d..75425fa34ad 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jt2zhrm.fd}%
- [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}{}
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd
index 4716bc05348..fecc2344a81 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jt2zhsf.fd}%
- [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}{}
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd
index 3f04c0b1235..99cfec74315 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jt2zhtt.fd}%
- [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}{}
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd
index 0da00ca2aee..d3bb80668ce 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jy2zhrm.fd}%
- [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}{}
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd
index e2a25f7596f..086693820d6 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jy2zhsf.fd}%
- [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}{}
diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd
index c944144eeb0..664e16fb148 100644
--- a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd
+++ b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd
@@ -25,7 +25,7 @@
%% ---------------------------------------------------------------------
%%
\ProvidesFile{jy2zhtt.fd}%
- [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}{}
%%
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
index 2dd2f2e767a..cf1aa038983 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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 } }
{
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
index 151afb3ef7e..6484f56410e 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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 } }
{
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
index 3e8f2a2cbcc..f7a8b8a6f0a 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
index 7bdb09c26ea..d9c5f3b6800 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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 } }
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
index 5476dc8971e..1bca91bd506 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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 } }
{
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
index 958798d366a..033aa9b956a 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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 } }
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
index 0991aab9e84..12284911a37 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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 } }
{
diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
index d73a346a83f..3a734ac088d 100644
--- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
+++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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 } }
{
diff --git a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def
index a9141a12f83..a379007d77d 100644
--- a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def
+++ b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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,12 +700,22 @@
{
\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
{
\tl_if_empty:cT { p@#1 }
{ \exp_args:Nnx \labelformat {#1} { \exp_not:c { CTEX@the#1 } } }
}
+\cs_new_protected:Npn \ctex_cleveref_hook:
+ {
+ \ctex_patch_cmd:Nnn \refstepcounter@noarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ \ctex_patch_cmd:Nnn \refstepcounter@optarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ }
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
{
diff --git a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def
index 0904906df43..dc38764ff74 100644
--- a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def
+++ b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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,12 +212,22 @@
{
\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
{
\tl_if_empty:cT { p@#1 }
{ \exp_args:Nnx \labelformat {#1} { \exp_not:c { CTEX@the#1 } } }
}
+\cs_new_protected:Npn \ctex_cleveref_hook:
+ {
+ \ctex_patch_cmd:Nnn \refstepcounter@noarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ \ctex_patch_cmd:Nnn \refstepcounter@optarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ }
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
{
diff --git a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def
index 39c0e6cb695..551a33cce3f 100644
--- a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def
+++ b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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,12 +828,22 @@
{
\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
{
\tl_if_empty:cT { p@#1 }
{ \exp_args:Nnx \labelformat {#1} { \exp_not:c { CTEX@the#1 } } }
}
+\cs_new_protected:Npn \ctex_cleveref_hook:
+ {
+ \ctex_patch_cmd:Nnn \refstepcounter@noarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ \ctex_patch_cmd:Nnn \refstepcounter@optarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ }
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
{
diff --git a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def
index 2d418a839fe..071055fae3b 100644
--- a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def
+++ b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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,12 +823,22 @@
{
\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
{
\tl_if_empty:cT { p@#1 }
{ \exp_args:Nnx \labelformat {#1} { \exp_not:c { CTEX@the#1 } } }
}
+\cs_new_protected:Npn \ctex_cleveref_hook:
+ {
+ \ctex_patch_cmd:Nnn \refstepcounter@noarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ \ctex_patch_cmd:Nnn \refstepcounter@optarg
+ { \endcsname \csname the }
+ { \expandafter \endcsname \csname the }
+ }
\cs_if_exist:NTF \labelformat
{ \ctex_varioref_hook: }
{
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def
index 3b51a64d3b2..eb8a8ae1f17 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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 ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def
index fda6896b527..de07b2e8410 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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 ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def
index 39571dae90e..b8d84e278ad 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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 ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
index 2807d73cd9f..11c14cffd6b 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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 ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
index be567370d52..2d3f9938e9a 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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 } }
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def
index 729e5e8a44d..e6266ba491c 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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 ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def
index e78e05e45a8..9e05aa4068e 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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 ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def
index e4aca2c8f1b..d8d934d0673 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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 ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
index 47ea9467132..42306e6382e 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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 ,
diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def
index 79a10496bb0..e77a74e15a2 100644
--- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def
+++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@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'.