diff options
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r-- | Master/texmf-dist/source/latex/ctex/ctex.dtx | 90 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/ctex/ctex.ins | 4 |
2 files changed, 66 insertions, 28 deletions
diff --git a/Master/texmf-dist/source/latex/ctex/ctex.dtx b/Master/texmf-dist/source/latex/ctex/ctex.dtx index 6d349c415cb..a1af5c1bf55 100644 --- a/Master/texmf-dist/source/latex/ctex/ctex.dtx +++ b/Master/texmf-dist/source/latex/ctex/ctex.dtx @@ -2,7 +2,7 @@ % !TeX program = XeLaTeX % !TeX encoding = UTF-8 % -% Copyright (C) 2003--2020 +% Copyright (C) 2003--2021 % CTEX.ORG and any individual authors listed elsewhere in this file. % -------------------------------------------------------------------------- % @@ -56,7 +56,7 @@ Issues and pull requests are welcome. Copyright and Licence --------------------- - Copyright (C) 2003--2020 + Copyright (C) 2003--2021 CTEX.ORG and any individual authors listed elsewhere in this file. ---------------------------------------------------------------------- @@ -163,7 +163,7 @@ Copyright and Licence \preamble - Copyright (C) 2003--2020 + Copyright (C) 2003--2021 CTEX.ORG and any individual authors listed in the documentation. --------------------------------------------------------------------- @@ -443,7 +443,7 @@ Copyright and Licence %<class|style|ctexcap|ctexhook|ctexpatch>\NeedsTeXFormat{LaTeX2e} %<class>\input{ctexbackend.cfg} %<class|style|ctexcap|ctexhook|ctexpatch>\RequirePackage{expl3} -%<+!driver>\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee@gmail.com> $ +%<+!driver>\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96@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.5}{\ExplFileDescription} +%<!driver> {\ExplFileDate}{2.5.6}{\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/10/19 v2.5.5 Chinese font definition (CTEX)] -%<ctexspa> [2020/10/19 v2.5.5 Space info for CJKpunct (CTEX)] -%<backend> [2020/10/19 v2.5.5 Backend configuration file (CTEX)] -%<dict&theorem> [2020/10/19 v2.5.5 Chinese translation for theorem name (CTEX)] +%<fd> [2021/03/14 v2.5.6 Chinese font definition (CTEX)] +%<ctexspa> [2021/03/14 v2.5.6 Space info for CJKpunct (CTEX)] +%<backend> [2021/03/14 v2.5.6 Backend configuration file (CTEX)] +%<dict&theorem> [2021/03/14 v2.5.6 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{6265} +% \CheckSum{6335} % % \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 @@ -8801,29 +8801,65 @@ Copyright and Licence % \end{macro} % % -% \begin{macro}[int]{\ps@fancy} +% \begin{macro}[int]{\f@nch@initialise} % 这里对 \pkg{fancyhdr} 宏包打补丁。原来 \pkg{fancyhdr} 宏包中使用 % \tn{thesection} 等宏表示页眉中的章节编号,这里改用 \pkg{ctex} 包所用的 % \tn{CTEXthesection} 系列宏。 +% \changes{v2.5.6}{2021/01/11}{更新 \pkg{fancyhdr} 宏包的补丁。} % \begin{macrocode} \ctex_at_end_package:nn { fancyhdr } { -%<*article> - \ctex_patch_cmd:Nnn \ps@fancy + \ctex_patch_cmd:Nnn \f@nch@initialise { \ifnum \c@secnumdepth > \z@ \thesection \hskip 1em \relax \fi } { \CTEXifname { \CTEXthesection \quad } { } } - \ctex_patch_cmd:Nnn \ps@fancy + \ctex_patch_cmd:Nnn \f@nch@initialise { \ifnum \c@secnumdepth > \@ne \thesubsection \hskip 1em \relax \fi } { \CTEXifname { \CTEXthesubsection \quad } { } } -%</article> -%<*book|report> - \ctex_patch_cmd:Nnn \ps@fancy - { \ifnum \c@secnumdepth > \m@ne \@chapapp \ \thechapter . ~ \ \fi } + \ctex_patch_cmd:Nnn \f@nch@initialise + { \ifnum \c@secnumdepth > \m@ne \@chapapp\ \thechapter . ~ \ \fi } { \CTEXifname { \CTEXthechapter \quad } { } } - \ctex_patch_cmd:Nnn \ps@fancy + \ctex_patch_cmd:Nnn \f@nch@initialise { \ifnum \c@secnumdepth > \z@ \thesection . ~ \ \fi } { \CTEXifname { \CTEXthesection \quad } { } } + \f@nch@initialise +% \end{macrocode} +% \pkg{fancyhdr} 的 \opt{headings} 选项会重定义 \cs{ps@headings}, +% 这里也要打补丁。 +% \begin{macrocode} + \@ifpackagewith { fancyhdr } { headings } + { +%<*article> + \if@twoside + \ctex_patch_cmd:Nnn \ps@headings + { \ifnum \c@secnumdepth > \z@ \thesection \quad \fi } + { \CTEXifname { \CTEXthesection \quad } { } } + \ctex_patch_cmd:Nnn \ps@headings + { \ifnum \c@secnumdepth > \@ne \thesubsection \quad \fi } + { \CTEXifname { \CTEXthesubsection \quad } { } } + \else: + \ctex_patch_cmd:Nnn \ps@headings + { \ifnum \c@secnumdepth > \z@ \thesection \quad \fi } + { \CTEXifname { \CTEXthesection \quad } { } } + \fi: +%</article> +%<*book|report> + \ctex_patch_cmd:Nnn \ps@headings + { +%<book> \ifnum \c@secnumdepth > \m@ne \if@mainmatter +%<report> \ifnum \c@secnumdepth > \m@ne + \@chapapp \ \thechapter . ~ \ % +%<report> \fi +%<book> \fi \fi + } + { \CTEXifname { \CTEXthechapter \quad } { } } + \if@twoside + \ctex_patch_cmd:Nnn \ps@headings + { \ifnum \c@secnumdepth > \z@ \thesection . ~ \ \fi } + { \CTEXifname { \CTEXthesection \quad } { } } + \fi: %</book|report> + } + { } } % \end{macrocode} % \end{macro} @@ -10855,17 +10891,17 @@ Copyright and Licence % 文件标识信息。 % \begin{macrocode} %<adobe>\ProvidesFile{ctex-zhmap-adobe.tex}% -%<adobe> [2020/10/19 v2.5.5 Adobe font map loader for DVIPDFMx (CTEX)] +%<adobe> [2021/03/14 v2.5.6 Adobe font map loader for DVIPDFMx (CTEX)] %<fandol>\ProvidesFile{ctex-zhmap-fandol.tex}% -%<fandol> [2020/10/19 v2.5.5 Fandol font map loader for DVIPDFMx (CTEX)] +%<fandol> [2021/03/14 v2.5.6 Fandol font map loader for DVIPDFMx (CTEX)] %<founder>\ProvidesFile{ctex-zhmap-founder.tex}% -%<founder> [2020/10/19 v2.5.5 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)] +%<founder> [2021/03/14 v2.5.6 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)] %<mac>\ProvidesFile{ctex-zhmap-mac.tex}% -%<mac> [2020/10/19 v2.5.5 Mac font map loader for DVIPDFMx (CTEX)] +%<mac> [2021/03/14 v2.5.6 Mac font map loader for DVIPDFMx (CTEX)] %<ubuntu>\ProvidesFile{ctex-zhmap-ubuntu.tex}% -%<ubuntu> [2020/10/19 v2.5.5 Ubuntu font map loader for DVIPDFMx (CTEX)] +%<ubuntu> [2021/03/14 v2.5.6 Ubuntu font map loader for DVIPDFMx (CTEX)] %<windows>\ProvidesFile{ctex-zhmap-windows.tex}% -%<windows> [2020/10/19 v2.5.5 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)] +%<windows> [2021/03/14 v2.5.6 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)] % \end{macrocode} % % \paragraph{\pkg{ctex-zhmap-adobe.tex}} @@ -11459,6 +11495,8 @@ Copyright and Licence % \end{macrocode} % \end{macro} % +% \changes{v2.5.6}{2021/02/16}{使用正确的导言区末尾钩子。} +% % \LaTeX \ 2020/10/01 开始提供常用钩子管理机制。在新机制下,我们只需要做简单的包装。 % \begin{macrocode} \@ifl@t@r \fmtversion { 2020/10/01 } @@ -11466,7 +11504,7 @@ Copyright and Licence \cs_new_protected:Npx \ctex_gadd_ltxhook:nn #1 { \hook_gput_code:nnn {#1} { \c_novalue_tl } } \cs_new_protected:Npn \ctex_at_end_preamble:n - { \ctex_gadd_ltxhook:nn { env/document/before } } + { \ctex_gadd_ltxhook:nn { begindocument/before } } \cs_new_protected:Npn \ctex_after_end_preamble:n { \ctex_gadd_ltxhook:nn { begindocument/end } } \cs_new_protected:Npn \ctex_gadd_package_hook:nnn #1#2 diff --git a/Master/texmf-dist/source/latex/ctex/ctex.ins b/Master/texmf-dist/source/latex/ctex/ctex.ins index 4f8f45aa5ec..055c6582e92 100644 --- a/Master/texmf-dist/source/latex/ctex/ctex.ins +++ b/Master/texmf-dist/source/latex/ctex/ctex.ins @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `install') %% -%% Copyright (C) 2003--2020 +%% Copyright (C) 2003--2021 %% CTEX.ORG and any individual authors listed in the documentation. %% --------------------------------------------------------------------- %% @@ -29,7 +29,7 @@ \preamble - Copyright (C) 2003--2020 + Copyright (C) 2003--2021 CTEX.ORG and any individual authors listed in the documentation. --------------------------------------------------------------------- |