diff options
| author | Karl Berry <karl@freefriends.org> | 2019-05-29 20:52:28 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2019-05-29 20:52:28 +0000 |
| commit | 06ba56c2710363cd4256b875eb274d3c5e650438 (patch) | |
| tree | 38f79a926574a27de0c2b5c0e9494f1d813510ff | |
| parent | ca76545abb30790ed39022f0f4a26ea2109c0128 (diff) | |
ctex (29may19)
git-svn-id: svn://tug.org/texlive/trunk@51262 c570f23f-e606-0410-a88d-b1316a301751
69 files changed, 411 insertions, 611 deletions
diff --git a/Master/texmf-dist/doc/latex/ctex/ctex.pdf b/Master/texmf-dist/doc/latex/ctex/ctex.pdf Binary files differindex cade6c1e9e9..88f89a1e107 100644 --- a/Master/texmf-dist/doc/latex/ctex/ctex.pdf +++ b/Master/texmf-dist/doc/latex/ctex/ctex.pdf diff --git a/Master/texmf-dist/source/latex/ctex/ctex.dtx b/Master/texmf-dist/source/latex/ctex/ctex.dtx index fd0a8bea23c..d4a80e43448 100644 --- a/Master/texmf-dist/source/latex/ctex/ctex.dtx +++ b/Master/texmf-dist/source/latex/ctex/ctex.dtx @@ -445,7 +445,7 @@ Copyright and Licence %<*!(fd|ctexspa|dict)> %<class|style|ctexcap|ctexhook|ctexpatch|ctxdoc>\NeedsTeXFormat{LaTeX2e} %<class|style|ctexcap|ctexhook|ctexpatch|ctxdoc>\RequirePackage{expl3} -%<+!driver>\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +%<+!driver>\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ %<ctxdoc> {ctex documentation (CTEX)} %<ctxdoc>\ProvidesExplClass{ctxdoc} %<ctex> {Chinese adapter in LaTeX (CTEX)} @@ -538,7 +538,7 @@ Copyright and Licence %<founder>\ProvidesExplFile{ctex-fontset-founder.def} %<ubuntu> {Ubuntu fonts definition (CTEX)} %<ubuntu>\ProvidesExplFile{ctex-fontset-ubuntu.def} -%<!driver> {\ExplFileDate}{2.4.15}{\ExplFileDescription} +%<!driver> {\ExplFileDate}{2.4.16}{\ExplFileDescription} %</!(fd|ctexspa|dict)> %<c19&rm>\ProvidesFile{c19rm.fd}% %<c19&sf>\ProvidesFile{c19sf.fd}% @@ -555,9 +555,9 @@ Copyright and Licence %<ctexspa>\ProvidesFile{ctexspa.def}% %<dict&theorem&GBK>\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}% %<dict&theorem&UTF8>\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}% -%<fd> [2019/04/07 v2.4.15 Chinese font definition (CTEX)] -%<ctexspa> [2019/04/07 v2.4.15 Space info for CJKpunct (CTEX)] -%<dict&theorem> [2019/04/07 v2.4.15 Chinese translation for theorem name (CTEX)] +%<fd> [2019/05/29 v2.4.16 Chinese font definition (CTEX)] +%<ctexspa> [2019/05/29 v2.4.16 Space info for CJKpunct (CTEX)] +%<dict&theorem> [2019/05/29 v2.4.16 Chinese translation for theorem name (CTEX)] %</!(driver|readme|install|zhmap|spa|docstrip)> %<*driver> \documentclass{ctxdoc} @@ -581,7 +581,7 @@ Copyright and Licence % \changes{v2.4.15}{2019/03/23}{同步 \LaTeXiii{} 2019/03/05。} % % -% \CheckSum{5914} +% \CheckSum{5934} % % \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 @@ -3257,36 +3257,24 @@ Copyright and Licence % \end{macrocode} % \end{macro} % -% \begin{macro}[int]{\ctex_set_default_ccwd:Nn} -% 若参数 |#2| 带长度单位，则设置它为 |tl| 变量 |#1| 的值，否则以 \tn{ccwd} 为单位。 -% \begin{macrocode} -\cs_new:Npn \ctex_set_default_ccwd:Nn #1#2 - { - \dim_compare:nNnTF - { \ctex_default_pt:n {#2} } = { \ctex_default_pt:n { #2 ~ mm } } - { \tl_set:Nn #1 {#2} } - { \tl_set:Nn #1 { #2 \ccwd } } - } -% \end{macrocode} -% \end{macro} -% % \changes{v2.3}{2015/09/17}{代码实现避免使用 \tn{lowercase} 技巧（Joseph Wright）。} % -% \begin{macro}[int]{\ctex_default_pt:n} -% 最新版本的 \pkg{expl3} 已经不允许 \cs{dim_to_decimal:n} 的参数带额外的单位。 -% 然而我们需要这个特性实现可展的 \tn{@defaultunits}。 +% \changes{v2.4.16}{2019/05/11}{允许设置 \texttt{autoindent} 为 $0$。} +% +% \begin{macro}[int]{\ctex_set_default_ccwd:Nn} +% 若参数 |#2| 带长度单位，则设置它为 |tl| 变量 |#1| 的值，否则以 \tn{ccwd} 为单位。 % \begin{macrocode} -\cs_new:Npn \ctex_default_pt:n #1 +\cs_new_protected:Npn \ctex_set_default_ccwd:Nn #1#2 + { \tl_set:Nx #1 { \@@_default_ccwd_aux:n {#2} } } +\cs_new:Npn \@@_default_ccwd_aux:n #1 { - \exp_after:wN \@@_default_pt:w + \exp_not:n {#1} + \exp_after:wN \@@_default_ccwd_aux:w \dim_use:N \tex_dimexpr:D #1 pt \scan_stop: \q_stop } -\use:x - { - \cs_new:Npn \exp_not:N \@@_default_pt:w - ##1 \tl_to_str:n { pt } ##2 \exp_not:N \q_stop - { ##1 \tl_to_str:n { pt } } - } +\exp_last_unbraced:NNNNo + \cs_new:Npn \@@_default_ccwd_aux:w #1 { \tl_to_str:n { pt } } #2 \q_stop + { \tl_if_empty:nT {#2} { \ccwd } } % \end{macrocode} % \end{macro} % @@ -7301,10 +7289,20 @@ Copyright and Licence % \end{macrocode} % \end{macro} % +% \begin{macro}[int]{\CTEX@disableautoindent} +% 禁用自动调整首行缩进。 +% \begin{macrocode} +\cs_new_protected_nopar:Npn \CTEX@disableautoindent + { \tl_clear:N \l_@@_autoindent_tl } +% \end{macrocode} +% \end{macro} +% % \changes{v2.2}{2015/06/27}{\opt{beforeskip}、\opt{afterskip} 和 \opt{indent} % 选项支持表达式。} % \changes{v2.4.15}{2019/03/31}{修正 \opt{part/indent} 和 \opt{chapter/indent} 的实现方法。} % \changes{v2.4.15}{2019/03/31}{定义 \opt{part/hang} 和 \opt{chapter/hang}。} +% \changes{v2.4.16}{2019/05/11}{修正 \opt{part/indent} 和 \opt{chapter/indent} +% 的实现方法，在其标题内部禁用 \opt{autoindent}。} % % \paragraph{part 的标题} % @@ -7377,9 +7375,11 @@ Copyright and Licence \CTEX@makeanchor{part*}% % \addcontentsline{toc}{part}{#1}% \fi + \CTEX@gettitle{#1}% \CTEX@addtocline{part}{#1}% {\interlinepenalty \@M % \normalfont \parindent \z@ \raggedright + \CTEX@disableautoindent \normalfont \CTEX@part@format % \ifnum \c@secnumdepth >\m@ne % \Large\bfseries\partname\nobreakspace\thepart\par\nobreak @@ -7415,11 +7415,13 @@ Copyright and Licence \CTEX@makeanchor{part*}% % \addcontentsline{toc}{part}{#1}% \fi + \CTEX@gettitle{#1}% \CTEX@addtocline{part}{#1}% % \markboth{}{}% \partmark{#1}% {\interlinepenalty \@M % \normalfont \centering + \CTEX@disableautoindent \normalfont \CTEX@part@format % \ifnum \c@secnumdepth >-2\relax % \huge\bfseries\partname\nobreakspace\thepart\par\vskip 20\p@ @@ -7440,8 +7442,10 @@ Copyright and Licence \def\@spart#1{% \CTEX@ifnamefalse \CTEX@makeanchor@spart{part*}% + \CTEX@gettitle{#1}% {\interlinepenalty \@M % \normalfont \parindent \z@ \raggedright + \CTEX@disableautoindent \normalfont \CTEX@part@format \CTEX@hangindent{part}{}% % \huge \bfseries #1\par}% @@ -7458,8 +7462,10 @@ Copyright and Licence \def\@spart#1{% \CTEX@ifnamefalse \CTEX@makeanchor@spart{part*}% + \CTEX@gettitle{#1}% {\interlinepenalty \@M % \normalfont \centering + \CTEX@disableautoindent \normalfont \CTEX@part@format \CTEX@hangindent{part}{}% % \Huge \bfseries #1\par}% @@ -7548,6 +7554,7 @@ Copyright and Licence \CTEX@makeanchor@chapter{\Hy@chapapp*}% % \addcontentsline{toc}{chapter}{#1}% \fi + \CTEX@gettitle{#1}% \CTEX@addtocline{chapter}{#1}% \chaptermark{#1}% % \addtocontents{lof}{\protect\addvspace{10\p@}}% @@ -7567,6 +7574,7 @@ Copyright and Licence \def\@schapter#1{% \CTEX@ifnamefalse \CTEX@makeanchor@schapter{\Hy@chapapp*}% + \CTEX@gettitle{#1}% \if@twocolumn \@topnewpage[\@makeschapterhead{#1}]% \else @@ -7584,7 +7592,8 @@ Copyright and Licence \ifodd \CTEX@chapter@fixskip \CTEX@fixtopskip \fi \vspace*{\CTEX@headingskip}% % {\normalfont \parindent \z@ \raggedright - {\normalfont \CTEX@chapter@format + {\CTEX@disableautoindent + \normalfont \CTEX@chapter@format \interlinepenalty\@M % \ifnum \c@secnumdepth >\m@ne % \if@mainmatter @@ -7613,7 +7622,8 @@ Copyright and Licence \ifodd \CTEX@chapter@fixskip \CTEX@fixtopskip \fi \vspace*{\CTEX@headingskip}% % {\normalfont \parindent \z@ \raggedright - {\normalfont \CTEX@chapter@format + {\CTEX@disableautoindent + \normalfont \CTEX@chapter@format \interlinepenalty\@M \CTEX@hangindent{chapter}{}% % \Huge \bfseries #1\par\nobreak @@ -7692,6 +7702,7 @@ Copyright and Licence \let\@svsec\@empty \fi \fi + \CTEX@gettitle{#7}% % \@tempskipa #5\relax % \ifdim \@tempskipa>\z@ \unless \ifodd \CTEX@runin @@ -7733,6 +7744,7 @@ Copyright and Licence % \begin{macrocode} \def\@ssect#1#2#3#4#5{% \CTEX@ifnamefalse + \CTEX@gettitle{#5}% % \@tempskipa #3\relax % \ifdim \@tempskipa>\z@ \unless \ifodd \CTEX@runin @@ -7796,18 +7808,15 @@ Copyright and Licence % \begin{macrocode} \cs_new_protected:Npn \CTEX@hangindent #1#2 { + \dim_set:Nn \parindent { \use:c { CTEX@#1@indent } } \bool_if:cTF { CTEX@#1@hang } - { \@hangfrom } - { \noindent \use:n } - { \@@_indent_aux:n {#1} #2 } + { \@hangfrom { \@@_indent_aux: #2 } } + {#2} } -\cs_new_protected:Npn \@@_indent_aux:n #1 +\cs_new_protected_nopar:Npn \@@_indent_aux: { - \group_begin: - \skip_set:Nn \l_@@_heading_skip { \use:c { CTEX@#1@indent } } - \dim_compare:nNnF \l_@@_heading_skip = \c_zero_dim - { \skip_horizontal:N \l_@@_heading_skip } - \group_end: + \dim_compare:nNnF \parindent = \c_zero_dim + { \skip_horizontal:n { \parindent } } } % \end{macrocode} % \end{macro} @@ -8005,6 +8014,27 @@ Copyright and Licence } % \end{macrocode} % +% \paragraph{兼容 \pkg{nameref} 宏包} +% +% \changes{v2.4.16}{2019/05/29}{更好地兼容 \pkg{nameref} 宏包。} +% +% \begin{macro}[int]{\CTEX@gettitle} +% 在 \pkg{nameref} 载入后才有意义，与上述 \pkg{hyperref} 的处理类似。 +% \begin{macrocode} +\cs_new_protected:Npn \CTEX@gettitle #1 + { } +\ctex_at_end_package:nn { nameref } + { + \cs_gset_protected_nopar:Npn \CTEX@gettitle { \NR@gettitle } + \seq_map_inline:Nn \c_@@_headings_cs_seq + { + \cs_if_eq:ccT { NR@ #1 } { CTEX@ #1 } + { \cs_gset_eq:cc { @ #1 } { CTEX@ #1 } } + } + } +% \end{macrocode} +% \end{macro} +% % \paragraph{兼容 \pkg{titlesec} 宏包} % % 我们修改了 \tn{@startsection} 的定义，它的第四个（\meta{beforeskip}）和 @@ -8355,7 +8385,7 @@ Copyright and Licence % \begin{macrocode} \defbeamertemplate*{part page}{CTEX}[1][]{% \begingroup - \ctexset{autoindent=false}% + \CTEX@disableautoindent % \centering % {\usebeamerfont{part name}% % \usebeamercolor[fg]{part name}\partname~\insertromanpartnumber} @@ -8379,7 +8409,7 @@ Copyright and Licence % \begin{macrocode} \defbeamertemplate*{section page}{CTEX}[1][]{% \begingroup - \ctexset{autoindent=false}% + \CTEX@disableautoindent % \centering % {\usebeamerfont{section name}% % \usebeamercolor[fg]{section name}\sectionname~\insertsectionnumber} @@ -8403,7 +8433,7 @@ Copyright and Licence % \begin{macrocode} \defbeamertemplate*{subsection page}{CTEX}[1][]{% \begingroup - \ctexset{autoindent=false}% + \CTEX@disableautoindent % \centering % {\usebeamerfont{subsection name}% % \usebeamercolor[fg]{subsection name}\subsectionname~\insertsubsectionnumber} @@ -10242,7 +10272,7 @@ Copyright and Licence % \begin{macrocode} %<*windows> \ProvidesFile{zhwindowsfonts.tex}% - [2019/04/07 v2.4.15 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)] + [2019/05/29 v2.4.16 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)] \ifzhmappdf \pdfmapline{=gbk@UGBK@ <simsun.ttc} @@ -10314,7 +10344,7 @@ Copyright and Licence % \begin{macrocode} %<*adobe> \ProvidesFile{zhadobefonts.tex}% - [2019/04/07 v2.4.15 Adobe font map loader for DVIPDFMx (CTEX)] + [2019/05/29 v2.4.16 Adobe font map loader for DVIPDFMx (CTEX)] \ifzhmappdf %% pdfTeX does not support OTF fonts @@ -10350,7 +10380,7 @@ Copyright and Licence % \begin{macrocode} %<*fandol> \ProvidesFile{zhfandolfonts.tex}% - [2019/04/07 v2.4.15 Fandol font map loader for DVIPDFMx (CTEX)] + [2019/05/29 v2.4.16 Fandol font map loader for DVIPDFMx (CTEX)] \ifzhmappdf %% pdfTeX does not support OTF fonts @@ -10386,7 +10416,7 @@ Copyright and Licence % \begin{macrocode} %<*founder> \ProvidesFile{zhfounderfonts.tex}% - [2019/04/07 v2.4.15 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)] + [2019/05/29 v2.4.16 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)] \ifzhmappdf \pdfmapline{=gbk@UGBK@ <FZSSK.TTF} @@ -10458,7 +10488,7 @@ Copyright and Licence % \begin{macrocode} %<*ubuntu> \ProvidesFile{zhubuntufonts.tex}% - [2019/04/07 v2.4.15 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)] + [2019/05/29 v2.4.16 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)] \ifzhmappdf \pdfmapline{=gbk@UGBK@ <uming.ttc} diff --git a/Master/texmf-dist/source/latex/ctex/ctex.ins b/Master/texmf-dist/source/latex/ctex/ctex.ins deleted file mode 100644 index e7082416c34..00000000000 --- a/Master/texmf-dist/source/latex/ctex/ctex.ins +++ /dev/null @@ -1,307 +0,0 @@ -%% -%% This is file `ctex.ins', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% ctex.dtx (with options: `install') -%% -%% Copyright (C) 2003--2019 -%% CTEX.ORG and any individual authors listed in the documentation. -%% ------------------------------------------------------------------------------ -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either -%% version 1.3c of this license or (at your option) any later -%% version. This version of this license is in -%% http://www.latex-project.org/lppl/lppl-1-3c.txt -%% and the latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of -%% LaTeX version 2005/12/01 or later. -%% -%% This work has the LPPL maintenance status `maintained'. -%% -%% The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang. -%% -%% ------------------------------------------------------------------------------ -%% - -\input ctxdocstrip % - -\preamble - - Copyright (C) 2003--2019 - CTEX.ORG and any individual authors listed in the documentation. ------------------------------------------------------------------------------- - - This work may be distributed and/or modified under the - conditions of the LaTeX Project Public License, either - version 1.3c of this license or (at your option) any later - version. This version of this license is in - http://www.latex-project.org/lppl/lppl-1-3c.txt - and the latest version of this license is in - http://www.latex-project.org/lppl.txt - and version 1.3 or later is part of all distributions of - LaTeX version 2005/12/01 or later. - - This work has the LPPL maintenance status `maintained'. - - The Current Maintainers of this work are Leo Liu, Qing Lee and Liam Huang. - ------------------------------------------------------------------------------- - -\endpreamble -\postamble - - This package consists of the file ctex.dtx, - and the derived files ctex.pdf, - ctex.ins, - ctex.sty, - ctexsize.sty, - ctexheading.sty, - ctexart.cls, - ctexbook.cls, - ctexrep.cls, - ctexbeamer.cls, - ctxdoc.cls, - ctexcap.sty, - ctexhook.sty, - ctexpatch.sty, - ctex-c5size.clo, - ctex-cs4size.clo, - ctex-article.def, - ctex-book.def, - ctex-report.def, - ctex-beamer.def, - ctex-scheme-plain.def, - ctex-scheme-plain-article.def, - ctex-scheme-plain-book.def, - ctex-scheme-plain-report.def, - ctex-scheme-plain-beamer.def, - ctex-scheme-chinese.def, - ctex-scheme-chinese-article.def, - ctex-scheme-chinese-book.def, - ctex-scheme-chinese-report.def, - ctex-scheme-chinese-beamer.def, - ctex-name-gbk.cfg, - ctex-name-utf8.cfg, - ctex.cfg, - ctexopts.cfg, - ctex-engine-pdftex.def, - ctex-engine-xetex.def, - ctex-engine-luatex.def, - ctex-engine-aptex.def, - ctex-engine-uptex.def, - c19rm.fd, - c19sf.fd, - c19tt.fd, - c70rm.fd, - c70sf.fd, - c70tt.fd, - jy2zhrm.fd, - jy2zhsf.fd, - jy2zhtt.fd, - jt2zhrm.fd, - jt2zhsf.fd, - jt2zhtt.fd, - ctex-fontset-windows.def, - ctex-fontset-windowsnew.def, - ctex-fontset-windowsold.def, - ctex-fontset-adobe.def, - ctex-fontset-fandol.def, - ctex-fontset-mac.def, - ctex-fontset-macnew.def, - ctex-fontset-macold.def, - ctex-fontset-founder.def, - ctex-fontset-ubuntu.def, - ctexspa.def, - ctexpunct.spa, - ctexmakespa.tex, - ctexspamacro.tex, - ctxdocstrip.tex, - zhadobefonts.tex, - zhfandolfonts.tex, - zhfounderfonts.tex, - zhubuntufonts.tex, - zhwindowsfonts.tex, - translator-theorem-dictionary-ChineseGBK.dict, - translator-theorem-dictionary-ChineseUTF8.dict, and - README.md. -\endpostamble - -\generate - { - \usedir{tex/latex/ctex} - \file{ctex.sty} {\from{\jobname.dtx}{style,ctex}} - \file{ctexsize.sty} {\from{\jobname.dtx}{style,ctexsize}} - \file{ctexheading.sty} {\from{\jobname.dtx}{style,ctexheading}} - \file{ctexart.cls} {\from{\jobname.dtx}{class,article}} - \file{ctexbook.cls} {\from{\jobname.dtx}{class,book}} - \file{ctexrep.cls} {\from{\jobname.dtx}{class,report}} - \file{ctexbeamer.cls} {\from{\jobname.dtx}{class,beamer}} - \usepostamble\emptypostamble - \file{ctxdoc.cls} {\from{\jobname.dtx}{ctxdoc}} - \file{ctexcap.sty} {\from{\jobname.dtx}{ctexcap}} - \file{ctexhook.sty} {\from{\jobname.dtx}{ctexhook}} - \file{ctexpatch.sty} {\from{\jobname.dtx}{ctexpatch}} - \file{ctex-c5size.clo} {\from{\jobname.dtx}{c5size}} - \file{ctex-cs4size.clo} {\from{\jobname.dtx}{cs4size}} - \file{ctex-article.def} {\from{\jobname.dtx}{heading,article}} - \file{ctex-book.def} {\from{\jobname.dtx}{heading,book}} - \file{ctex-report.def} {\from{\jobname.dtx}{heading,report}} - \file{ctex-beamer.def} {\from{\jobname.dtx}{heading,beamer}} - \file{ctex-scheme-plain.def} {\from{\jobname.dtx}{scheme,generic,plain}} - \file{ctex-scheme-plain-article.def} {\from{\jobname.dtx}{scheme,article,plain}} - \file{ctex-scheme-plain-book.def} {\from{\jobname.dtx}{scheme,book,plain}} - \file{ctex-scheme-plain-report.def} {\from{\jobname.dtx}{scheme,report,plain}} - \file{ctex-scheme-plain-beamer.def} {\from{\jobname.dtx}{scheme,beamer,plain}} - \file{ctex-scheme-chinese.def} {\from{\jobname.dtx}{scheme,generic,chinese}} - \file{ctex-scheme-chinese-article.def} {\from{\jobname.dtx}{scheme,article,chinese}} - \file{ctex-scheme-chinese-book.def} {\from{\jobname.dtx}{scheme,book,chinese}} - \file{ctex-scheme-chinese-report.def} {\from{\jobname.dtx}{scheme,report,chinese}} - \file{ctex-scheme-chinese-beamer.def} {\from{\jobname.dtx}{scheme,beamer,chinese}} - \file{ctex-name-gbk.cfg} {\from{\jobname.dtx}{name,GBK}} - \file{ctex-name-utf8.cfg} {\from{\jobname.dtx}{name,UTF8}} - \file{ctex.cfg} {\from{\jobname.dtx}{config}} - \file{ctexopts.cfg} {\from{\jobname.dtx}{ctexopts}} - \file{ctex-engine-pdftex.def} {\from{\jobname.dtx}{pdftex}} - \file{ctex-engine-xetex.def} {\from{\jobname.dtx}{xetex}} - \file{ctex-engine-luatex.def} {\from{\jobname.dtx}{luatex}} - \file{ctex-engine-aptex.def} {\from{\jobname.dtx}{aptex}} - \file{ctex-engine-uptex.def} {\from{\jobname.dtx}{uptex}} - \file{c19rm.fd} {\from{\jobname.dtx}{fd,rm,c19}} - \file{c19sf.fd} {\from{\jobname.dtx}{fd,sf,c19}} - \file{c19tt.fd} {\from{\jobname.dtx}{fd,tt,c19}} - \file{c70rm.fd} {\from{\jobname.dtx}{fd,rm,c70}} - \file{c70sf.fd} {\from{\jobname.dtx}{fd,sf,c70}} - \file{c70tt.fd} {\from{\jobname.dtx}{fd,tt,c70}} - \file{jy2zhrm.fd} {\from{\jobname.dtx}{fd,rm,jy2}} - \file{jy2zhsf.fd} {\from{\jobname.dtx}{fd,sf,jy2}} - \file{jy2zhtt.fd} {\from{\jobname.dtx}{fd,tt,jy2}} - \file{jt2zhrm.fd} {\from{\jobname.dtx}{fd,rm,jt2}} - \file{jt2zhsf.fd} {\from{\jobname.dtx}{fd,sf,jt2}} - \file{jt2zhtt.fd} {\from{\jobname.dtx}{fd,tt,jt2}} - \file{ctex-fontset-windows.def} {\from{\jobname.dtx}{fontset,windows}} - \file{ctex-fontset-windowsnew.def} {\from{\jobname.dtx}{fontset,windowsnew}} - \file{ctex-fontset-windowsold.def} {\from{\jobname.dtx}{fontset,windowsold}} - \file{ctex-fontset-adobe.def} {\from{\jobname.dtx}{fontset,adobe}} - \file{ctex-fontset-fandol.def} {\from{\jobname.dtx}{fontset,fandol}} - \file{ctex-fontset-mac.def} {\from{\jobname.dtx}{fontset,mac}} - \file{ctex-fontset-macold.def} {\from{\jobname.dtx}{fontset,macold}} - \file{ctex-fontset-macnew.def} {\from{\jobname.dtx}{fontset,macnew}} - \file{ctex-fontset-founder.def} {\from{\jobname.dtx}{fontset,founder}} - \file{ctex-fontset-ubuntu.def} {\from{\jobname.dtx}{fontset,ubuntu}} - \file{translator-theorem-dictionary-ChineseGBK.dict} - {\from{\jobname.dtx}{dict,theorem,GBK}} - \file{translator-theorem-dictionary-ChineseUTF8.dict} - {\from{\jobname.dtx}{dict,theorem,UTF8}} - \file{ctexspa.def} - { - \from{\jobname.dtx} {ctexspa} - \from{ctexpunct.spa} {} - } - \usedir{tex/generic/ctex} - \file{ctexmakespa.tex} {\from{\jobname.dtx}{spa,make}} - \file{ctexspamacro.tex} {\from{\jobname.dtx}{spa,macro}} - \file{zhadobefonts.tex} {\from{\jobname.dtx}{zhmap,adobe}} - \file{zhfandolfonts.tex} {\from{\jobname.dtx}{zhmap,fandol}} - \file{zhfounderfonts.tex} {\from{\jobname.dtx}{zhmap,founder}} - \file{zhubuntufonts.tex} {\from{\jobname.dtx}{zhmap,ubuntu}} - \file{zhwindowsfonts.tex} {\from{\jobname.dtx}{zhmap,windows}} - \file{ctxdocstrip.tex} {\from{\jobname.dtx}{docstrip}} - \nopreamble\nopostamble - \usedir{doc/latex/ctex} - \file{README.md} {\from{\jobname.dtx}{readme}} - } - -\catcode32=12\space - -\Msg{*************************************************************} -\Msg{* *} -\Msg{* To finish the installation you have to move the following *} -\Msg{* file into proper directories searched by TeX: *} -\Msg{* *} -\Msg{* The recommended directory is TDS:tex/latex/ctex *} -\Msg{* *} -\Msg{* ctex.sty *} -\Msg{* ctexsize.sty *} -\Msg{* ctexheading.sty *} -\Msg{* ctexart.cls *} -\Msg{* ctexbook.cls *} -\Msg{* ctexrep.cls *} -\Msg{* ctexbeamer.cls *} -\Msg{* ctxdoc.cls *} -\Msg{* ctexcap.sty *} -\Msg{* ctexhook.sty *} -\Msg{* ctexpatch.sty *} -\Msg{* ctex-c5size.clo *} -\Msg{* ctex-cs4size.clo *} -\Msg{* ctex-article.def *} -\Msg{* ctex-book.def *} -\Msg{* ctex-report.def *} -\Msg{* ctex-beamer.def *} -\Msg{* ctex-scheme-plain.def *} -\Msg{* ctex-scheme-plain-article.def *} -\Msg{* ctex-scheme-plain-book.def *} -\Msg{* ctex-scheme-plain-report.def *} -\Msg{* ctex-scheme-plain-beamer.def *} -\Msg{* ctex-scheme-chinese.def *} -\Msg{* ctex-scheme-chinese-article.def *} -\Msg{* ctex-scheme-chinese-book.def *} -\Msg{* ctex-scheme-chinese-report.def *} -\Msg{* ctex-scheme-chinese-beamer.def *} -\Msg{* ctex-name-gbk.cfg *} -\Msg{* ctex-name-utf8.cfg *} -\Msg{* ctex.cfg *} -\Msg{* ctexopts.cfg *} -\Msg{* ctex-engine-pdftex.def *} -\Msg{* ctex-engine-xetex.def *} -\Msg{* ctex-engine-luatex.def *} -\Msg{* ctex-engine-aptex.def *} -\Msg{* ctex-engine-uptex.def *} -\Msg{* c19rm.fd *} -\Msg{* c19sf.fd *} -\Msg{* c19tt.fd *} -\Msg{* c70rm.fd *} -\Msg{* c70sf.fd *} -\Msg{* c70tt.fd *} -\Msg{* jy2zhrm.fd *} -\Msg{* jy2zhsf.fd *} -\Msg{* jy2zhtt.fd *} -\Msg{* jt2zhrm.fd *} -\Msg{* jt2zhsf.fd *} -\Msg{* jt2zhtt.fd *} -\Msg{* ctex-fontset-windows.def *} -\Msg{* ctex-fontset-windowsnew.def *} -\Msg{* ctex-fontset-windowsold.def *} -\Msg{* ctex-fontset-adobe.def *} -\Msg{* ctex-fontset-fandol.def *} -\Msg{* ctex-fontset-mac.def *} -\Msg{* ctex-fontset-macold.def *} -\Msg{* ctex-fontset-macnew.def *} -\Msg{* ctex-fontset-founder.def *} -\Msg{* ctex-fontset-ubuntu.def *} -\Msg{* ctexspa.def *} -\Msg{* ctexmakespa.tex *} -\Msg{* ctexspamacro.tex *} -\Msg{* ctxdocstrip.tex *} -\Msg{* zhadobefonts.tex *} -\Msg{* zhfandolfonts.tex *} -\Msg{* zhfounderfonts.tex *} -\Msg{* zhubuntufonts.tex *} -\Msg{* zhwindowsfonts.tex *} -\Msg{* translator-theorem-dictionary-ChineseGBK.dict *} -\Msg{* translator-theorem-dictionary-ChineseUTF8.dict *} -\Msg{* *} -\Msg{* To produce the documentation run the file ctex.dtx *} -\Msg{* through XeLaTeX. *} -\Msg{* *} -\Msg{* Happy TeXing! *} -\Msg{* *} -\Msg{*************************************************************} - -\endbatchfile -%% -%% -%% End of file `ctex.ins'. diff --git a/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex b/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex index 9d504033268..1ef217b9e24 100644 --- a/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex +++ b/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex @@ -76,7 +76,7 @@ \fi \endgroup \ProvidesFile{zhadobefonts.tex}% - [2019/04/07 v2.4.15 Adobe font map loader for DVIPDFMx (CTEX)] + [2019/05/29 v2.4.16 Adobe font map loader for DVIPDFMx (CTEX)] \ifzhmappdf %% pdfTeX does not support OTF fonts diff --git a/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex b/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex index 29832e4a059..89ea8f3c2d0 100644 --- a/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex +++ b/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex @@ -76,7 +76,7 @@ \fi \endgroup \ProvidesFile{zhfandolfonts.tex}% - [2019/04/07 v2.4.15 Fandol font map loader for DVIPDFMx (CTEX)] + [2019/05/29 v2.4.16 Fandol font map loader for DVIPDFMx (CTEX)] \ifzhmappdf %% pdfTeX does not support OTF fonts diff --git a/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex b/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex index 2de5087fc1d..25a877e8401 100644 --- a/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex +++ b/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex @@ -76,7 +76,7 @@ \fi \endgroup \ProvidesFile{zhfounderfonts.tex}% - [2019/04/07 v2.4.15 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)] + [2019/05/29 v2.4.16 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)] \ifzhmappdf \pdfmapline{=gbk@UGBK@ <FZSSK.TTF} diff --git a/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex b/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex index 00ff878fa8e..c62ea5684b3 100644 --- a/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex +++ b/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex @@ -76,7 +76,7 @@ \fi \endgroup \ProvidesFile{zhubuntufonts.tex}% - [2019/04/07 v2.4.15 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)] + [2019/05/29 v2.4.16 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)] \ifzhmappdf \pdfmapline{=gbk@UGBK@ <uming.ttc} diff --git a/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex b/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex index 172b41b51ee..e1d6a8c4306 100644 --- a/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex +++ b/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex @@ -76,7 +76,7 @@ \fi \endgroup \ProvidesFile{zhwindowsfonts.tex}% - [2019/04/07 v2.4.15 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)] + [2019/05/29 v2.4.16 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)] \ifzhmappdf \pdfmapline{=gbk@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 d5c3abd4366..3f53f2151a5 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Caption with encoding GBK (CTEX)} \ProvidesExplFile{ctex-name-gbk.cfg} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\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 c318664ce58..37725a7f6c7 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Caption with encoding UTF8 (CTEX)} \ProvidesExplFile{ctex-name-utf8.cfg} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\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 b3d04a88324..45d3cea9ddd 100644 --- a/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg +++ b/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Configuration file (CTEX)} \ProvidesExplFile{\ExplFileName.cfg} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} %% %% %% diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg index d0b4e077134..84f62f1e10d 100644 --- a/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg +++ b/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Option configuration file (CTEX)} \ProvidesExplFile{ctexopts.cfg} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} %% %% \keys_set:nn { ctex / option } { fontset = windowsnew } %% diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-article.def b/Master/texmf-dist/tex/latex/ctex/ctex-article.def index 69e4f2ae061..95d29bee36b 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex-article.def +++ b/Master/texmf-dist/tex/latex/ctex/ctex-article.def @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Heading modification for article (CTEX)} \ProvidesExplFile{ctex-article.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \seq_const_from_clist:Nn \c__ctex_section_headings_seq { section , subsection , subsubsection , paragraph , subparagraph } \seq_new:N \c__ctex_headings_seq @@ -152,6 +152,8 @@ { \cs_set_eq:NN \CTEXifname \use_ii:nn } \cs_new_protected:Npn \CTEX@addtocline #1#2 { \addcontentsline { toc } {#1} { \use:c { CTEX@#1@tocline } {#1} {#2} } } +\cs_new_protected_nopar:Npn \CTEX@disableautoindent + { \tl_clear:N \l__ctex_autoindent_tl } \renewcommand\part{% \if@noskipsec \leavevmode \fi \par @@ -178,8 +180,10 @@ \CTEX@ifnamefalse \CTEX@makeanchor{part*}% \fi + \CTEX@gettitle{#1}% \CTEX@addtocline{part}{#1}% {\interlinepenalty \@M + \CTEX@disableautoindent \normalfont \CTEX@part@format \CTEX@hangindent{part}% {\CTEXifname{\CTEX@partname\CTEX@part@aftername}{}}% @@ -194,7 +198,9 @@ \def\@spart#1{% \CTEX@ifnamefalse \CTEX@makeanchor@spart{part*}% + \CTEX@gettitle{#1}% {\interlinepenalty \@M + \CTEX@disableautoindent \normalfont \CTEX@part@format \CTEX@hangindent{part}{}% \CTEX@part@titleformat{#1}% @@ -243,6 +249,7 @@ \let\@svsec\@empty \fi \fi + \CTEX@gettitle{#7}% \unless \ifodd \CTEX@runin \begingroup #6{% @@ -265,6 +272,7 @@ \@xsect{#5}} \def\@ssect#1#2#3#4#5{% \CTEX@ifnamefalse + \CTEX@gettitle{#5}% \unless \ifodd \CTEX@runin \begingroup #4{% @@ -304,18 +312,15 @@ \ignorespaces} \cs_new_protected:Npn \CTEX@hangindent #1#2 { + \dim_set:Nn \parindent { \use:c { CTEX@#1@indent } } \bool_if:cTF { CTEX@#1@hang } - { \@hangfrom } - { \noindent \use:n } - { \__ctex_indent_aux:n {#1} #2 } + { \@hangfrom { \__ctex_indent_aux: #2 } } + {#2} } -\cs_new_protected:Npn \__ctex_indent_aux:n #1 +\cs_new_protected_nopar:Npn \__ctex_indent_aux: { - \group_begin: - \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1@indent } } - \dim_compare:nNnF \l__ctex_heading_skip = \c_zero_dim - { \skip_horizontal:N \l__ctex_heading_skip } - \group_end: + \dim_compare:nNnF \parindent = \c_zero_dim + { \skip_horizontal:n { \parindent } } } \cs_new_protected_nopar:Npn \CTEX@hangfrom { @@ -428,6 +433,17 @@ } \CTEX@hyperheadinghook } +\cs_new_protected:Npn \CTEX@gettitle #1 + { } +\ctex_at_end_package:nn { nameref } + { + \cs_gset_protected_nopar:Npn \CTEX@gettitle { \NR@gettitle } + \seq_map_inline:Nn \c__ctex_headings_cs_seq + { + \cs_if_eq:ccT { NR@ #1 } { CTEX@ #1 } + { \cs_gset_eq:cc { @ #1 } { CTEX@ #1 } } + } + } \cs_new_protected_nopar:Npn \ctex_titlesec_hook: { \@ifpackagewith { titlesec } { explicit } diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def b/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def index 8f11e15aae1..c0a046c25ab 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def +++ b/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Heading modification for beamer (CTEX)} \ProvidesExplFile{ctex-beamer.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \seq_const_from_clist:Nn \c__ctex_headings_seq { part , section , subsection } \cs_new_protected_nopar:Npn \__ctex_initial_heading:n #1 @@ -122,7 +122,7 @@ \ExplSyntaxOff \defbeamertemplate*{part page}{CTEX}[1][]{% \begingroup - \ctexset{autoindent=false}% + \CTEX@disableautoindent \par \addvspace{\glueexpr\CTEX@part@beforeskip\relax}% \CTEX@part@format \parindent \dimexpr \CTEX@part@indent \relax @@ -137,7 +137,7 @@ } \defbeamertemplate*{section page}{CTEX}[1][]{% \begingroup - \ctexset{autoindent=false}% + \CTEX@disableautoindent \par \addvspace{\glueexpr\CTEX@section@beforeskip\relax}% \CTEX@section@format \parindent \dimexpr \CTEX@section@indent \relax @@ -152,7 +152,7 @@ } \defbeamertemplate*{subsection page}{CTEX}[1][]{% \begingroup - \ctexset{autoindent=false}% + \CTEX@disableautoindent \par \addvspace{\glueexpr\CTEX@subsection@beforeskip\relax}% \CTEX@subsection@format \parindent \dimexpr \CTEX@subsection@indent \relax diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-book.def b/Master/texmf-dist/tex/latex/ctex/ctex-book.def index e97cbee7cac..3766e4b4652 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex-book.def +++ b/Master/texmf-dist/tex/latex/ctex/ctex-book.def @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Heading modification for book (CTEX)} \ProvidesExplFile{ctex-book.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \seq_const_from_clist:Nn \c__ctex_section_headings_seq { section , subsection , subsubsection , paragraph , subparagraph } \seq_new:N \c__ctex_headings_seq @@ -184,6 +184,8 @@ } \cs_new_protected:Npn \CTEX@addtocline #1#2 { \addcontentsline { toc } {#1} { \use:c { CTEX@#1@tocline } {#1} {#2} } } +\cs_new_protected_nopar:Npn \CTEX@disableautoindent + { \tl_clear:N \l__ctex_autoindent_tl } \renewcommand\part{% \CTEX@part@break \thispagestyle{\CTEX@part@pagestyle}% @@ -210,9 +212,11 @@ \CTEX@ifnamefalse \CTEX@makeanchor{part*}% \fi + \CTEX@gettitle{#1}% \CTEX@addtocline{part}{#1}% \partmark{#1}% {\interlinepenalty \@M + \CTEX@disableautoindent \normalfont \CTEX@part@format \CTEX@hangindent{part}% {\CTEXifname{\CTEX@partname\CTEX@part@aftername}{}}% @@ -222,7 +226,9 @@ \def\@spart#1{% \CTEX@ifnamefalse \CTEX@makeanchor@spart{part*}% + \CTEX@gettitle{#1}% {\interlinepenalty \@M + \CTEX@disableautoindent \normalfont \CTEX@part@format \CTEX@hangindent{part}{}% \CTEX@part@titleformat{#1}% @@ -272,6 +278,7 @@ \CTEX@ifnamefalse \CTEX@makeanchor@chapter{\Hy@chapapp*}% \fi + \CTEX@gettitle{#1}% \CTEX@addtocline{chapter}{#1}% \chaptermark{#1}% \CTEX@addloflotskip{chapter}% @@ -284,6 +291,7 @@ \def\@schapter#1{% \CTEX@ifnamefalse \CTEX@makeanchor@schapter{\Hy@chapapp*}% + \CTEX@gettitle{#1}% \if@twocolumn \@topnewpage[\@makeschapterhead{#1}]% \else @@ -294,7 +302,8 @@ \CTEX@setheadingskip \CTEX@chapter@beforeskip \ifodd \CTEX@chapter@fixskip \CTEX@fixtopskip \fi \vspace*{\CTEX@headingskip}% - {\normalfont \CTEX@chapter@format + {\CTEX@disableautoindent + \normalfont \CTEX@chapter@format \interlinepenalty\@M \CTEX@hangindent{chapter}% {\CTEXifname{\CTEX@chaptername\CTEX@chapter@aftername}{}}% @@ -309,7 +318,8 @@ \CTEX@setheadingskip \CTEX@chapter@beforeskip \ifodd \CTEX@chapter@fixskip \CTEX@fixtopskip \fi \vspace*{\CTEX@headingskip}% - {\normalfont \CTEX@chapter@format + {\CTEX@disableautoindent + \normalfont \CTEX@chapter@format \interlinepenalty\@M \CTEX@hangindent{chapter}{}% \CTEX@chapter@titleformat{#1}% @@ -358,6 +368,7 @@ \let\@svsec\@empty \fi \fi + \CTEX@gettitle{#7}% \unless \ifodd \CTEX@runin \begingroup #6{% @@ -380,6 +391,7 @@ \@xsect{#5}} \def\@ssect#1#2#3#4#5{% \CTEX@ifnamefalse + \CTEX@gettitle{#5}% \unless \ifodd \CTEX@runin \begingroup #4{% @@ -419,18 +431,15 @@ \ignorespaces} \cs_new_protected:Npn \CTEX@hangindent #1#2 { + \dim_set:Nn \parindent { \use:c { CTEX@#1@indent } } \bool_if:cTF { CTEX@#1@hang } - { \@hangfrom } - { \noindent \use:n } - { \__ctex_indent_aux:n {#1} #2 } + { \@hangfrom { \__ctex_indent_aux: #2 } } + {#2} } -\cs_new_protected:Npn \__ctex_indent_aux:n #1 +\cs_new_protected_nopar:Npn \__ctex_indent_aux: { - \group_begin: - \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1@indent } } - \dim_compare:nNnF \l__ctex_heading_skip = \c_zero_dim - { \skip_horizontal:N \l__ctex_heading_skip } - \group_end: + \dim_compare:nNnF \parindent = \c_zero_dim + { \skip_horizontal:n { \parindent } } } \cs_new_protected_nopar:Npn \CTEX@hangfrom { @@ -550,6 +559,17 @@ } \CTEX@hyperheadinghook } +\cs_new_protected:Npn \CTEX@gettitle #1 + { } +\ctex_at_end_package:nn { nameref } + { + \cs_gset_protected_nopar:Npn \CTEX@gettitle { \NR@gettitle } + \seq_map_inline:Nn \c__ctex_headings_cs_seq + { + \cs_if_eq:ccT { NR@ #1 } { CTEX@ #1 } + { \cs_gset_eq:cc { @ #1 } { CTEX@ #1 } } + } + } \cs_new_protected_nopar:Npn \ctex_titlesec_hook: { \@ifpackagewith { titlesec } { explicit } diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo b/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo index e4c429e0f75..9f3d9794803 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo +++ b/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {c5size option (CTEX)} \ProvidesExplFile{ctex-c5size.clo} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\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 43ec2dfa51d..68f3e365f73 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo +++ b/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {cs4size option (CTEX)} \ProvidesExplFile{ctex-cs4size.clo} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\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-report.def b/Master/texmf-dist/tex/latex/ctex/ctex-report.def index 24c7719f4c1..1107fd0582b 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex-report.def +++ b/Master/texmf-dist/tex/latex/ctex/ctex-report.def @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Heading modification for report (CTEX)} \ProvidesExplFile{ctex-report.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \seq_const_from_clist:Nn \c__ctex_section_headings_seq { section , subsection , subsubsection , paragraph , subparagraph } \seq_new:N \c__ctex_headings_seq @@ -184,6 +184,8 @@ } \cs_new_protected:Npn \CTEX@addtocline #1#2 { \addcontentsline { toc } {#1} { \use:c { CTEX@#1@tocline } {#1} {#2} } } +\cs_new_protected_nopar:Npn \CTEX@disableautoindent + { \tl_clear:N \l__ctex_autoindent_tl } \renewcommand\part{% \CTEX@part@break \thispagestyle{\CTEX@part@pagestyle}% @@ -210,9 +212,11 @@ \CTEX@ifnamefalse \CTEX@makeanchor{part*}% \fi + \CTEX@gettitle{#1}% \CTEX@addtocline{part}{#1}% \partmark{#1}% {\interlinepenalty \@M + \CTEX@disableautoindent \normalfont \CTEX@part@format \CTEX@hangindent{part}% {\CTEXifname{\CTEX@partname\CTEX@part@aftername}{}}% @@ -222,7 +226,9 @@ \def\@spart#1{% \CTEX@ifnamefalse \CTEX@makeanchor@spart{part*}% + \CTEX@gettitle{#1}% {\interlinepenalty \@M + \CTEX@disableautoindent \normalfont \CTEX@part@format \CTEX@hangindent{part}{}% \CTEX@part@titleformat{#1}% @@ -267,6 +273,7 @@ \CTEX@ifnamefalse \CTEX@makeanchor@chapter{\Hy@chapapp*}% \fi + \CTEX@gettitle{#1}% \CTEX@addtocline{chapter}{#1}% \chaptermark{#1}% \CTEX@addloflotskip{chapter}% @@ -279,6 +286,7 @@ \def\@schapter#1{% \CTEX@ifnamefalse \CTEX@makeanchor@schapter{\Hy@chapapp*}% + \CTEX@gettitle{#1}% \if@twocolumn \@topnewpage[\@makeschapterhead{#1}]% \else @@ -289,7 +297,8 @@ \CTEX@setheadingskip \CTEX@chapter@beforeskip \ifodd \CTEX@chapter@fixskip \CTEX@fixtopskip \fi \vspace*{\CTEX@headingskip}% - {\normalfont \CTEX@chapter@format + {\CTEX@disableautoindent + \normalfont \CTEX@chapter@format \interlinepenalty\@M \CTEX@hangindent{chapter}% {\CTEXifname{\CTEX@chaptername\CTEX@chapter@aftername}{}}% @@ -304,7 +313,8 @@ \CTEX@setheadingskip \CTEX@chapter@beforeskip \ifodd \CTEX@chapter@fixskip \CTEX@fixtopskip \fi \vspace*{\CTEX@headingskip}% - {\normalfont \CTEX@chapter@format + {\CTEX@disableautoindent + \normalfont \CTEX@chapter@format \interlinepenalty\@M \CTEX@hangindent{chapter}{}% \CTEX@chapter@titleformat{#1}% @@ -353,6 +363,7 @@ \let\@svsec\@empty \fi \fi + \CTEX@gettitle{#7}% \unless \ifodd \CTEX@runin \begingroup #6{% @@ -375,6 +386,7 @@ \@xsect{#5}} \def\@ssect#1#2#3#4#5{% \CTEX@ifnamefalse + \CTEX@gettitle{#5}% \unless \ifodd \CTEX@runin \begingroup #4{% @@ -414,18 +426,15 @@ \ignorespaces} \cs_new_protected:Npn \CTEX@hangindent #1#2 { + \dim_set:Nn \parindent { \use:c { CTEX@#1@indent } } \bool_if:cTF { CTEX@#1@hang } - { \@hangfrom } - { \noindent \use:n } - { \__ctex_indent_aux:n {#1} #2 } + { \@hangfrom { \__ctex_indent_aux: #2 } } + {#2} } -\cs_new_protected:Npn \__ctex_indent_aux:n #1 +\cs_new_protected_nopar:Npn \__ctex_indent_aux: { - \group_begin: - \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1@indent } } - \dim_compare:nNnF \l__ctex_heading_skip = \c_zero_dim - { \skip_horizontal:N \l__ctex_heading_skip } - \group_end: + \dim_compare:nNnF \parindent = \c_zero_dim + { \skip_horizontal:n { \parindent } } } \cs_new_protected_nopar:Npn \CTEX@hangfrom { @@ -545,6 +554,17 @@ } \CTEX@hyperheadinghook } +\cs_new_protected:Npn \CTEX@gettitle #1 + { } +\ctex_at_end_package:nn { nameref } + { + \cs_gset_protected_nopar:Npn \CTEX@gettitle { \NR@gettitle } + \seq_map_inline:Nn \c__ctex_headings_cs_seq + { + \cs_if_eq:ccT { NR@ #1 } { CTEX@ #1 } + { \cs_gset_eq:cc { @ #1 } { CTEX@ #1 } } + } + } \cs_new_protected_nopar:Npn \ctex_titlesec_hook: { \@ifpackagewith { titlesec } { explicit } diff --git a/Master/texmf-dist/tex/latex/ctex/ctex.sty b/Master/texmf-dist/tex/latex/ctex/ctex.sty index 699ceb748fa..14134e13433 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctex.sty @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter in LaTeX (CTEX)} \ProvidesExplPackage{\ExplFileName} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\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 } @@ -118,24 +118,17 @@ { \cs_new_eq:NN \ifctexpdf \if_false: } \cs_new_eq:NN \ctex_if_preamble:TF \use_i:nn \ctex_after_end_preamble:n { \cs_set_eq:NN \ctex_if_preamble:TF \use_ii:nn } -\cs_new:Npn \ctex_set_default_ccwd:Nn #1#2 +\cs_new_protected:Npn \ctex_set_default_ccwd:Nn #1#2 + { \tl_set:Nx #1 { \__ctex_default_ccwd_aux:n {#2} } } +\cs_new:Npn \__ctex_default_ccwd_aux:n #1 { - \dim_compare:nNnTF - { \ctex_default_pt:n {#2} } = { \ctex_default_pt:n { #2 ~ mm } } - { \tl_set:Nn #1 {#2} } - { \tl_set:Nn #1 { #2 \ccwd } } - } -\cs_new:Npn \ctex_default_pt:n #1 - { - \exp_after:wN \__ctex_default_pt:w + \exp_not:n {#1} + \exp_after:wN \__ctex_default_ccwd_aux:w \dim_use:N \tex_dimexpr:D #1 pt \scan_stop: \q_stop } -\use:x - { - \cs_new:Npn \exp_not:N \__ctex_default_pt:w - ##1 \tl_to_str:n { pt } ##2 \exp_not:N \q_stop - { ##1 \tl_to_str:n { pt } } - } +\exp_last_unbraced:NNNNo + \cs_new:Npn \__ctex_default_ccwd_aux:w #1 { \tl_to_str:n { pt } } #2 \q_stop + { \tl_if_empty:nT {#2} { \ccwd } } \tl_new:N \l__ctex_encoding_tl \tl_set:Nx \l__ctex_encoding_tl { \sys_if_engine_pdftex:TF { GBK } { UTF8 } } diff --git a/Master/texmf-dist/tex/latex/ctex/ctexart.cls b/Master/texmf-dist/tex/latex/ctex/ctexart.cls index 20707c50646..1065d74e814 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexart.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexart.cls @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter for class article (CTEX)} \ProvidesExplClass{ctexart} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\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 @@ -112,24 +112,17 @@ { \cs_new_eq:NN \ifctexpdf \if_false: } \cs_new_eq:NN \ctex_if_preamble:TF \use_i:nn \ctex_after_end_preamble:n { \cs_set_eq:NN \ctex_if_preamble:TF \use_ii:nn } -\cs_new:Npn \ctex_set_default_ccwd:Nn #1#2 +\cs_new_protected:Npn \ctex_set_default_ccwd:Nn #1#2 + { \tl_set:Nx #1 { \__ctex_default_ccwd_aux:n {#2} } } +\cs_new:Npn \__ctex_default_ccwd_aux:n #1 { - \dim_compare:nNnTF - { \ctex_default_pt:n {#2} } = { \ctex_default_pt:n { #2 ~ mm } } - { \tl_set:Nn #1 {#2} } - { \tl_set:Nn #1 { #2 \ccwd } } - } -\cs_new:Npn \ctex_default_pt:n #1 - { - \exp_after:wN \__ctex_default_pt:w + \exp_not:n {#1} + \exp_after:wN \__ctex_default_ccwd_aux:w \dim_use:N \tex_dimexpr:D #1 pt \scan_stop: \q_stop } -\use:x - { - \cs_new:Npn \exp_not:N \__ctex_default_pt:w - ##1 \tl_to_str:n { pt } ##2 \exp_not:N \q_stop - { ##1 \tl_to_str:n { pt } } - } +\exp_last_unbraced:NNNNo + \cs_new:Npn \__ctex_default_ccwd_aux:w #1 { \tl_to_str:n { pt } } #2 \q_stop + { \tl_if_empty:nT {#2} { \ccwd } } \tl_new:N \l__ctex_encoding_tl \tl_set:Nx \l__ctex_encoding_tl { \sys_if_engine_pdftex:TF { GBK } { UTF8 } } @@ -717,6 +710,8 @@ { \cs_set_eq:NN \CTEXifname \use_ii:nn } \cs_new_protected:Npn \CTEX@addtocline #1#2 { \addcontentsline { toc } {#1} { \use:c { CTEX@#1@tocline } {#1} {#2} } } +\cs_new_protected_nopar:Npn \CTEX@disableautoindent + { \tl_clear:N \l__ctex_autoindent_tl } \renewcommand\part{% \if@noskipsec \leavevmode \fi \par @@ -743,8 +738,10 @@ \CTEX@ifnamefalse \CTEX@makeanchor{part*}% \fi + \CTEX@gettitle{#1}% \CTEX@addtocline{part}{#1}% {\interlinepenalty \@M + \CTEX@disableautoindent \normalfont \CTEX@part@format \CTEX@hangindent{part}% {\CTEXifname{\CTEX@partname\CTEX@part@aftername}{}}% @@ -759,7 +756,9 @@ \def\@spart#1{% \CTEX@ifnamefalse \CTEX@makeanchor@spart{part*}% + \CTEX@gettitle{#1}% {\interlinepenalty \@M + \CTEX@disableautoindent \normalfont \CTEX@part@format \CTEX@hangindent{part}{}% \CTEX@part@titleformat{#1}% @@ -808,6 +807,7 @@ \let\@svsec\@empty \fi \fi + \CTEX@gettitle{#7}% \unless \ifodd \CTEX@runin \begingroup #6{% @@ -830,6 +830,7 @@ \@xsect{#5}} \def\@ssect#1#2#3#4#5{% \CTEX@ifnamefalse + \CTEX@gettitle{#5}% \unless \ifodd \CTEX@runin \begingroup #4{% @@ -869,18 +870,15 @@ \ignorespaces} \cs_new_protected:Npn \CTEX@hangindent #1#2 { + \dim_set:Nn \parindent { \use:c { CTEX@#1@indent } } \bool_if:cTF { CTEX@#1@hang } - { \@hangfrom } - { \noindent \use:n } - { \__ctex_indent_aux:n {#1} #2 } + { \@hangfrom { \__ctex_indent_aux: #2 } } + {#2} } -\cs_new_protected:Npn \__ctex_indent_aux:n #1 +\cs_new_protected_nopar:Npn \__ctex_indent_aux: { - \group_begin: - \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1@indent } } - \dim_compare:nNnF \l__ctex_heading_skip = \c_zero_dim - { \skip_horizontal:N \l__ctex_heading_skip } - \group_end: + \dim_compare:nNnF \parindent = \c_zero_dim + { \skip_horizontal:n { \parindent } } } \cs_new_protected_nopar:Npn \CTEX@hangfrom { @@ -993,6 +991,17 @@ } \CTEX@hyperheadinghook } +\cs_new_protected:Npn \CTEX@gettitle #1 + { } +\ctex_at_end_package:nn { nameref } + { + \cs_gset_protected_nopar:Npn \CTEX@gettitle { \NR@gettitle } + \seq_map_inline:Nn \c__ctex_headings_cs_seq + { + \cs_if_eq:ccT { NR@ #1 } { CTEX@ #1 } + { \cs_gset_eq:cc { @ #1 } { CTEX@ #1 } } + } + } \cs_new_protected_nopar:Npn \ctex_titlesec_hook: { \@ifpackagewith { titlesec } { explicit } diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls index 87c2009d2f5..f09212611a6 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter for class beamer (CTEX)} \ProvidesExplClass{ctexbeamer} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\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 @@ -110,24 +110,17 @@ { \cs_new_eq:NN \ifctexpdf \if_false: } \cs_new_eq:NN \ctex_if_preamble:TF \use_i:nn \ctex_after_end_preamble:n { \cs_set_eq:NN \ctex_if_preamble:TF \use_ii:nn } -\cs_new:Npn \ctex_set_default_ccwd:Nn #1#2 +\cs_new_protected:Npn \ctex_set_default_ccwd:Nn #1#2 + { \tl_set:Nx #1 { \__ctex_default_ccwd_aux:n {#2} } } +\cs_new:Npn \__ctex_default_ccwd_aux:n #1 { - \dim_compare:nNnTF - { \ctex_default_pt:n {#2} } = { \ctex_default_pt:n { #2 ~ mm } } - { \tl_set:Nn #1 {#2} } - { \tl_set:Nn #1 { #2 \ccwd } } - } -\cs_new:Npn \ctex_default_pt:n #1 - { - \exp_after:wN \__ctex_default_pt:w + \exp_not:n {#1} + \exp_after:wN \__ctex_default_ccwd_aux:w \dim_use:N \tex_dimexpr:D #1 pt \scan_stop: \q_stop } -\use:x - { - \cs_new:Npn \exp_not:N \__ctex_default_pt:w - ##1 \tl_to_str:n { pt } ##2 \exp_not:N \q_stop - { ##1 \tl_to_str:n { pt } } - } +\exp_last_unbraced:NNNNo + \cs_new:Npn \__ctex_default_ccwd_aux:w #1 { \tl_to_str:n { pt } } #2 \q_stop + { \tl_if_empty:nT {#2} { \ccwd } } \tl_new:N \l__ctex_encoding_tl \tl_set:Nx \l__ctex_encoding_tl { \sys_if_engine_pdftex:TF { GBK } { UTF8 } } @@ -682,7 +675,7 @@ \ExplSyntaxOff \defbeamertemplate*{part page}{CTEX}[1][]{% \begingroup - \ctexset{autoindent=false}% + \CTEX@disableautoindent \par \addvspace{\glueexpr\CTEX@part@beforeskip\relax}% \CTEX@part@format \parindent \dimexpr \CTEX@part@indent \relax @@ -697,7 +690,7 @@ } \defbeamertemplate*{section page}{CTEX}[1][]{% \begingroup - \ctexset{autoindent=false}% + \CTEX@disableautoindent \par \addvspace{\glueexpr\CTEX@section@beforeskip\relax}% \CTEX@section@format \parindent \dimexpr \CTEX@section@indent \relax @@ -712,7 +705,7 @@ } \defbeamertemplate*{subsection page}{CTEX}[1][]{% \begingroup - \ctexset{autoindent=false}% + \CTEX@disableautoindent \par \addvspace{\glueexpr\CTEX@subsection@beforeskip\relax}% \CTEX@subsection@format \parindent \dimexpr \CTEX@subsection@indent \relax diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls index 56e9fe9dadf..bc6fab18252 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter for class book (CTEX)} \ProvidesExplClass{ctexbook} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\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 @@ -112,24 +112,17 @@ { \cs_new_eq:NN \ifctexpdf \if_false: } \cs_new_eq:NN \ctex_if_preamble:TF \use_i:nn \ctex_after_end_preamble:n { \cs_set_eq:NN \ctex_if_preamble:TF \use_ii:nn } -\cs_new:Npn \ctex_set_default_ccwd:Nn #1#2 +\cs_new_protected:Npn \ctex_set_default_ccwd:Nn #1#2 + { \tl_set:Nx #1 { \__ctex_default_ccwd_aux:n {#2} } } +\cs_new:Npn \__ctex_default_ccwd_aux:n #1 { - \dim_compare:nNnTF - { \ctex_default_pt:n {#2} } = { \ctex_default_pt:n { #2 ~ mm } } - { \tl_set:Nn #1 {#2} } - { \tl_set:Nn #1 { #2 \ccwd } } - } -\cs_new:Npn \ctex_default_pt:n #1 - { - \exp_after:wN \__ctex_default_pt:w + \exp_not:n {#1} + \exp_after:wN \__ctex_default_ccwd_aux:w \dim_use:N \tex_dimexpr:D #1 pt \scan_stop: \q_stop } -\use:x - { - \cs_new:Npn \exp_not:N \__ctex_default_pt:w - ##1 \tl_to_str:n { pt } ##2 \exp_not:N \q_stop - { ##1 \tl_to_str:n { pt } } - } +\exp_last_unbraced:NNNNo + \cs_new:Npn \__ctex_default_ccwd_aux:w #1 { \tl_to_str:n { pt } } #2 \q_stop + { \tl_if_empty:nT {#2} { \ccwd } } \tl_new:N \l__ctex_encoding_tl \tl_set:Nx \l__ctex_encoding_tl { \sys_if_engine_pdftex:TF { GBK } { UTF8 } } @@ -749,6 +742,8 @@ } \cs_new_protected:Npn \CTEX@addtocline #1#2 { \addcontentsline { toc } {#1} { \use:c { CTEX@#1@tocline } {#1} {#2} } } +\cs_new_protected_nopar:Npn \CTEX@disableautoindent + { \tl_clear:N \l__ctex_autoindent_tl } \renewcommand\part{% \CTEX@part@break \thispagestyle{\CTEX@part@pagestyle}% @@ -775,9 +770,11 @@ \CTEX@ifnamefalse \CTEX@makeanchor{part*}% \fi + \CTEX@gettitle{#1}% \CTEX@addtocline{part}{#1}% \partmark{#1}% {\interlinepenalty \@M + \CTEX@disableautoindent \normalfont \CTEX@part@format \CTEX@hangindent{part}% {\CTEXifname{\CTEX@partname\CTEX@part@aftername}{}}% @@ -787,7 +784,9 @@ \def\@spart#1{% \CTEX@ifnamefalse \CTEX@makeanchor@spart{part*}% + \CTEX@gettitle{#1}% {\interlinepenalty \@M + \CTEX@disableautoindent \normalfont \CTEX@part@format \CTEX@hangindent{part}{}% \CTEX@part@titleformat{#1}% @@ -837,6 +836,7 @@ \CTEX@ifnamefalse \CTEX@makeanchor@chapter{\Hy@chapapp*}% \fi + \CTEX@gettitle{#1}% \CTEX@addtocline{chapter}{#1}% \chaptermark{#1}% \CTEX@addloflotskip{chapter}% @@ -849,6 +849,7 @@ \def\@schapter#1{% \CTEX@ifnamefalse \CTEX@makeanchor@schapter{\Hy@chapapp*}% + \CTEX@gettitle{#1}% \if@twocolumn \@topnewpage[\@makeschapterhead{#1}]% \else @@ -859,7 +860,8 @@ \CTEX@setheadingskip \CTEX@chapter@beforeskip \ifodd \CTEX@chapter@fixskip \CTEX@fixtopskip \fi \vspace*{\CTEX@headingskip}% - {\normalfont \CTEX@chapter@format + {\CTEX@disableautoindent + \normalfont \CTEX@chapter@format \interlinepenalty\@M \CTEX@hangindent{chapter}% {\CTEXifname{\CTEX@chaptername\CTEX@chapter@aftername}{}}% @@ -874,7 +876,8 @@ \CTEX@setheadingskip \CTEX@chapter@beforeskip \ifodd \CTEX@chapter@fixskip \CTEX@fixtopskip \fi \vspace*{\CTEX@headingskip}% - {\normalfont \CTEX@chapter@format + {\CTEX@disableautoindent + \normalfont \CTEX@chapter@format \interlinepenalty\@M \CTEX@hangindent{chapter}{}% \CTEX@chapter@titleformat{#1}% @@ -923,6 +926,7 @@ \let\@svsec\@empty \fi \fi + \CTEX@gettitle{#7}% \unless \ifodd \CTEX@runin \begingroup #6{% @@ -945,6 +949,7 @@ \@xsect{#5}} \def\@ssect#1#2#3#4#5{% \CTEX@ifnamefalse + \CTEX@gettitle{#5}% \unless \ifodd \CTEX@runin \begingroup #4{% @@ -984,18 +989,15 @@ \ignorespaces} \cs_new_protected:Npn \CTEX@hangindent #1#2 { + \dim_set:Nn \parindent { \use:c { CTEX@#1@indent } } \bool_if:cTF { CTEX@#1@hang } - { \@hangfrom } - { \noindent \use:n } - { \__ctex_indent_aux:n {#1} #2 } + { \@hangfrom { \__ctex_indent_aux: #2 } } + {#2} } -\cs_new_protected:Npn \__ctex_indent_aux:n #1 +\cs_new_protected_nopar:Npn \__ctex_indent_aux: { - \group_begin: - \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1@indent } } - \dim_compare:nNnF \l__ctex_heading_skip = \c_zero_dim - { \skip_horizontal:N \l__ctex_heading_skip } - \group_end: + \dim_compare:nNnF \parindent = \c_zero_dim + { \skip_horizontal:n { \parindent } } } \cs_new_protected_nopar:Npn \CTEX@hangfrom { @@ -1115,6 +1117,17 @@ } \CTEX@hyperheadinghook } +\cs_new_protected:Npn \CTEX@gettitle #1 + { } +\ctex_at_end_package:nn { nameref } + { + \cs_gset_protected_nopar:Npn \CTEX@gettitle { \NR@gettitle } + \seq_map_inline:Nn \c__ctex_headings_cs_seq + { + \cs_if_eq:ccT { NR@ #1 } { CTEX@ #1 } + { \cs_gset_eq:cc { @ #1 } { CTEX@ #1 } } + } + } \cs_new_protected_nopar:Npn \ctex_titlesec_hook: { \@ifpackagewith { titlesec } { explicit } diff --git a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty index 0036391d0ff..8500f1a47e0 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter in LaTeX (CTEX)} \ProvidesExplPackage{ctexcap} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\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 67c125554e9..09798c222a5 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexheading.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexheading.sty @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Heading style modification (CTEX)} \ProvidesExplPackage{ctexheading} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \RequirePackage { xparse , l3keys2e } \RequirePackage { ctexhook , ctexpatch } \tl_clear_new:N \l__ctex_tmp_tl diff --git a/Master/texmf-dist/tex/latex/ctex/ctexhook.sty b/Master/texmf-dist/tex/latex/ctex/ctexhook.sty index 814b5eb4a23..e6478dc9378 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexhook.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexhook.sty @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Document and package hooks (CTEX)} \ProvidesExplPackage{ctexhook} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \cs_new_protected:Npn \ctex_at_end_preamble:n #1 { \tl_gput_right:Nn \g__ctex_end_preamble_hook_tl {#1} } \cs_new_protected:Npn \ctex_after_end_preamble:n #1 diff --git a/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty b/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty index ee308aaaa09..1773117c7bf 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Patching commands (CTEX)} \ProvidesExplPackage{ctexpatch} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \cs_if_exist:NF \str_new:N { \RequirePackage { l3str } } \cs_new_protected:Npn \ctex_patch_cmd_once:NnnnTF #1#2 { diff --git a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls index 4408972c5f0..76ca2e0dbeb 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter for class report (CTEX)} \ProvidesExplClass{ctexrep} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\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 @@ -112,24 +112,17 @@ { \cs_new_eq:NN \ifctexpdf \if_false: } \cs_new_eq:NN \ctex_if_preamble:TF \use_i:nn \ctex_after_end_preamble:n { \cs_set_eq:NN \ctex_if_preamble:TF \use_ii:nn } -\cs_new:Npn \ctex_set_default_ccwd:Nn #1#2 +\cs_new_protected:Npn \ctex_set_default_ccwd:Nn #1#2 + { \tl_set:Nx #1 { \__ctex_default_ccwd_aux:n {#2} } } +\cs_new:Npn \__ctex_default_ccwd_aux:n #1 { - \dim_compare:nNnTF - { \ctex_default_pt:n {#2} } = { \ctex_default_pt:n { #2 ~ mm } } - { \tl_set:Nn #1 {#2} } - { \tl_set:Nn #1 { #2 \ccwd } } - } -\cs_new:Npn \ctex_default_pt:n #1 - { - \exp_after:wN \__ctex_default_pt:w + \exp_not:n {#1} + \exp_after:wN \__ctex_default_ccwd_aux:w \dim_use:N \tex_dimexpr:D #1 pt \scan_stop: \q_stop } -\use:x - { - \cs_new:Npn \exp_not:N \__ctex_default_pt:w - ##1 \tl_to_str:n { pt } ##2 \exp_not:N \q_stop - { ##1 \tl_to_str:n { pt } } - } +\exp_last_unbraced:NNNNo + \cs_new:Npn \__ctex_default_ccwd_aux:w #1 { \tl_to_str:n { pt } } #2 \q_stop + { \tl_if_empty:nT {#2} { \ccwd } } \tl_new:N \l__ctex_encoding_tl \tl_set:Nx \l__ctex_encoding_tl { \sys_if_engine_pdftex:TF { GBK } { UTF8 } } @@ -749,6 +742,8 @@ } \cs_new_protected:Npn \CTEX@addtocline #1#2 { \addcontentsline { toc } {#1} { \use:c { CTEX@#1@tocline } {#1} {#2} } } +\cs_new_protected_nopar:Npn \CTEX@disableautoindent + { \tl_clear:N \l__ctex_autoindent_tl } \renewcommand\part{% \CTEX@part@break \thispagestyle{\CTEX@part@pagestyle}% @@ -775,9 +770,11 @@ \CTEX@ifnamefalse \CTEX@makeanchor{part*}% \fi + \CTEX@gettitle{#1}% \CTEX@addtocline{part}{#1}% \partmark{#1}% {\interlinepenalty \@M + \CTEX@disableautoindent \normalfont \CTEX@part@format \CTEX@hangindent{part}% {\CTEXifname{\CTEX@partname\CTEX@part@aftername}{}}% @@ -787,7 +784,9 @@ \def\@spart#1{% \CTEX@ifnamefalse \CTEX@makeanchor@spart{part*}% + \CTEX@gettitle{#1}% {\interlinepenalty \@M + \CTEX@disableautoindent \normalfont \CTEX@part@format \CTEX@hangindent{part}{}% \CTEX@part@titleformat{#1}% @@ -832,6 +831,7 @@ \CTEX@ifnamefalse \CTEX@makeanchor@chapter{\Hy@chapapp*}% \fi + \CTEX@gettitle{#1}% \CTEX@addtocline{chapter}{#1}% \chaptermark{#1}% \CTEX@addloflotskip{chapter}% @@ -844,6 +844,7 @@ \def\@schapter#1{% \CTEX@ifnamefalse \CTEX@makeanchor@schapter{\Hy@chapapp*}% + \CTEX@gettitle{#1}% \if@twocolumn \@topnewpage[\@makeschapterhead{#1}]% \else @@ -854,7 +855,8 @@ \CTEX@setheadingskip \CTEX@chapter@beforeskip \ifodd \CTEX@chapter@fixskip \CTEX@fixtopskip \fi \vspace*{\CTEX@headingskip}% - {\normalfont \CTEX@chapter@format + {\CTEX@disableautoindent + \normalfont \CTEX@chapter@format \interlinepenalty\@M \CTEX@hangindent{chapter}% {\CTEXifname{\CTEX@chaptername\CTEX@chapter@aftername}{}}% @@ -869,7 +871,8 @@ \CTEX@setheadingskip \CTEX@chapter@beforeskip \ifodd \CTEX@chapter@fixskip \CTEX@fixtopskip \fi \vspace*{\CTEX@headingskip}% - {\normalfont \CTEX@chapter@format + {\CTEX@disableautoindent + \normalfont \CTEX@chapter@format \interlinepenalty\@M \CTEX@hangindent{chapter}{}% \CTEX@chapter@titleformat{#1}% @@ -918,6 +921,7 @@ \let\@svsec\@empty \fi \fi + \CTEX@gettitle{#7}% \unless \ifodd \CTEX@runin \begingroup #6{% @@ -940,6 +944,7 @@ \@xsect{#5}} \def\@ssect#1#2#3#4#5{% \CTEX@ifnamefalse + \CTEX@gettitle{#5}% \unless \ifodd \CTEX@runin \begingroup #4{% @@ -979,18 +984,15 @@ \ignorespaces} \cs_new_protected:Npn \CTEX@hangindent #1#2 { + \dim_set:Nn \parindent { \use:c { CTEX@#1@indent } } \bool_if:cTF { CTEX@#1@hang } - { \@hangfrom } - { \noindent \use:n } - { \__ctex_indent_aux:n {#1} #2 } + { \@hangfrom { \__ctex_indent_aux: #2 } } + {#2} } -\cs_new_protected:Npn \__ctex_indent_aux:n #1 +\cs_new_protected_nopar:Npn \__ctex_indent_aux: { - \group_begin: - \skip_set:Nn \l__ctex_heading_skip { \use:c { CTEX@#1@indent } } - \dim_compare:nNnF \l__ctex_heading_skip = \c_zero_dim - { \skip_horizontal:N \l__ctex_heading_skip } - \group_end: + \dim_compare:nNnF \parindent = \c_zero_dim + { \skip_horizontal:n { \parindent } } } \cs_new_protected_nopar:Npn \CTEX@hangfrom { @@ -1110,6 +1112,17 @@ } \CTEX@hyperheadinghook } +\cs_new_protected:Npn \CTEX@gettitle #1 + { } +\ctex_at_end_package:nn { nameref } + { + \cs_gset_protected_nopar:Npn \CTEX@gettitle { \NR@gettitle } + \seq_map_inline:Nn \c__ctex_headings_cs_seq + { + \cs_if_eq:ccT { NR@ #1 } { CTEX@ #1 } + { \cs_gset_eq:cc { @ #1 } { CTEX@ #1 } } + } + } \cs_new_protected_nopar:Npn \ctex_titlesec_hook: { \@ifpackagewith { titlesec } { explicit } diff --git a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty index 469bd91da9a..868a30b57de 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese font size definition (CTEX)} \ProvidesExplPackage{ctexsize} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \RequirePackage { xparse , l3keys2e } \int_new:N \g__ctex_font_size_int \int_set:Nn \g__ctex_font_size_int { -1 } diff --git a/Master/texmf-dist/tex/latex/ctex/ctexspa.def b/Master/texmf-dist/tex/latex/ctex/ctexspa.def index 787f928e276..6a6785982f3 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexspa.def +++ b/Master/texmf-dist/tex/latex/ctex/ctexspa.def @@ -28,7 +28,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesFile{ctexspa.def}% - [2019/04/07 v2.4.15 Space info for CJKpunct (CTEX)] + [2019/05/29 v2.4.16 Space info for CJKpunct (CTEX)] \ctexspadef{adobezhsong}{70,15,61,8,63,14,58,7,64,13,62,12,60,11,61,15,62,14,51,6,58,5,58,8,7,5,12,12,10,68,13,63,17,63,20,69,19,69,17,63,19,70,17,55,10,10,14,63,10,65,10,61,13,62,15,61,7,49,7,56,8,58,15,69,8,61,14,63,8,57,,,} \ctexspadef{adobezhhei}{78,3,64,3,64,2,61,3,72,3,70,3,72,3,70,3,60,3,51,3,62,3,66,3,0,0,10,10,3,70,5,70,6,75,6,78,17,67,13,67,17,67,4,50,8,8,3,72,3,70,3,72,3,70,3,60,3,51,3,62,3,66,3,78,7,62,3,63,3,61,,,} \ctexspadef{adobezhkai}{76,10,55,8,63,4,62,4,71,4,65,4,71,4,74,4,54,4,54,4,62,4,62,4,0,0,11,11,5,72,6,71,7,78,7,79,18,68,18,68,18,68,2,46,14,12,4,71,4,65,4,71,4,74,4,54,4,54,4,62,4,62,10,76,8,55,4,63,4,62,,,} diff --git a/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls b/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls index 9622d13580c..88a7be91711 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {ctex documentation (CTEX)} \ProvidesExplClass{ctxdoc} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \ExplSyntaxOff \let\pdfmdfivesum\mdfivesum \DeclareOption*{\PassOptionsToClass{\CurrentOption}{l3doc}} 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 eb6d9ea49e1..cf849838e94 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 @@ -27,7 +27,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}% - [2019/04/07 v2.4.15 Chinese translation for theorem name (CTEX)] + [2019/05/29 v2.4.16 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 dfc9d9c8c05..09659c2f52e 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 @@ -27,7 +27,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}% - [2019/04/07 v2.4.15 Chinese translation for theorem name (CTEX)] + [2019/05/29 v2.4.16 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 58a354885a6..8cd15c75bb6 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Asian pTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-aptex.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1 { \AtBeginDvi {#1} 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 bcdc2e50814..351bb810745 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {LuaLaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-luatex.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \msg_new:nnn { ctex } { luatexja-loaded } { Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\ 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 8e2dd5f65c6..04b47108953 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {(pdf)LaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-pdftex.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1 { \AtBeginDvi {#1} 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 45203929a3c..0ef4edfae63 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {upTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-uptex.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1 { \AtBeginDvi {#1} 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 e5dd620e88b..3b3752a9bca 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {XeLaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-xetex.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\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 10a8c8487b1..f61163a9e2a 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd @@ -27,7 +27,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesFile{c19rm.fd}% - [2019/04/07 v2.4.15 Chinese font definition (CTEX)] + [2019/05/29 v2.4.16 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 24fb2757fdd..69ed84c3cf2 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd @@ -27,7 +27,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesFile{c19sf.fd}% - [2019/04/07 v2.4.15 Chinese font definition (CTEX)] + [2019/05/29 v2.4.16 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 838cd9fdb3b..7fa18f73d53 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd @@ -27,7 +27,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesFile{c19tt.fd}% - [2019/04/07 v2.4.15 Chinese font definition (CTEX)] + [2019/05/29 v2.4.16 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 654b6b643b5..d6b677a68e1 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd @@ -27,7 +27,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesFile{c70rm.fd}% - [2019/04/07 v2.4.15 Chinese font definition (CTEX)] + [2019/05/29 v2.4.16 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 37aa4c51d26..5ef3fa5e676 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd @@ -27,7 +27,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesFile{c70sf.fd}% - [2019/04/07 v2.4.15 Chinese font definition (CTEX)] + [2019/05/29 v2.4.16 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 efaa7b56ccd..a2096c243fa 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd @@ -27,7 +27,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesFile{c70tt.fd}% - [2019/04/07 v2.4.15 Chinese font definition (CTEX)] + [2019/05/29 v2.4.16 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 999887dda80..b4f3d7264d0 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd @@ -27,7 +27,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesFile{jt2zhrm.fd}% - [2019/04/07 v2.4.15 Chinese font definition (CTEX)] + [2019/05/29 v2.4.16 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 c95b887f611..97e474ccf6b 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd @@ -27,7 +27,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesFile{jt2zhsf.fd}% - [2019/04/07 v2.4.15 Chinese font definition (CTEX)] + [2019/05/29 v2.4.16 Chinese font definition (CTEX)] \DeclareKanjiFamily{JT2}{zhsf}{} \DeclareFontShape{JT2}{zhsf}{m}{n}{<-> upzhsans-v}{} \DeclareFontShape{JT2}{zhsf}{bx}{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 518d5813a8f..44be7f39f27 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd @@ -27,7 +27,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesFile{jt2zhtt.fd}% - [2019/04/07 v2.4.15 Chinese font definition (CTEX)] + [2019/05/29 v2.4.16 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 93beac66dc8..ecf164789af 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd @@ -27,7 +27,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesFile{jy2zhrm.fd}% - [2019/04/07 v2.4.15 Chinese font definition (CTEX)] + [2019/05/29 v2.4.16 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 9815f9aa3c6..9c3461c4f55 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd @@ -27,7 +27,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesFile{jy2zhsf.fd}% - [2019/04/07 v2.4.15 Chinese font definition (CTEX)] + [2019/05/29 v2.4.16 Chinese font definition (CTEX)] \DeclareKanjiFamily{JY2}{zhsf}{} \DeclareFontShape{JY2}{zhsf}{m}{n}{<-> upzhsans-h}{} \DeclareFontShape{JY2}{zhsf}{bx}{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 ca1b391bd3a..dd75814554c 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd @@ -27,7 +27,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesFile{jy2zhtt.fd}% - [2019/04/07 v2.4.15 Chinese font definition (CTEX)] + [2019/05/29 v2.4.16 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 24b82dfa15c..4c981401a65 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Adobe fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-adobe.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \sys_if_engine_pdftex:TF { \sys_if_output_pdf:TF 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 ffc3daef3ef..03853321971 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Fandol fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-fandol.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \sys_if_engine_pdftex:TF { \sys_if_output_pdf:TF 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 e58699dc34e..034ba79de24 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Founder fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-founder.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \sys_if_engine_pdftex:TF { \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 775678999ac..a3c6b43a561 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Mac OS X fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-mac.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\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 61a5a50b7d4..ff07af939d4 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Mac OS X fonts definition for El Capitan or later version (CTEX)} \ProvidesExplFile{ctex-fontset-macnew.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \sys_if_engine_pdftex:TF { \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 cefa3558604..8047567fb8a 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Mac OS X fonts definition for Yosemite or earlier version (CTEX)} \ProvidesExplFile{ctex-fontset-macold.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \sys_if_engine_pdftex:TF { \ctex_fontset_error:n { mac } } { 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 f26bb8f5c85..4c7862412b7 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Ubuntu fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-ubuntu.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \sys_if_engine_pdftex:TF { \ctex_zhmap_case:nnn 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 926a505af46..84c015cd8f7 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Windows fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-windows.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \file_if_exist:nTF { C:/bootfont.bin } { \ctex_file_input:n { ctex-fontset-windowsold.def } } { \ctex_file_input:n { ctex-fontset-windowsnew.def } } diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def index 25cbd32fc64..55957b1283d 100644 --- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def +++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsnew.def @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Windows fonts definition for Vista or later version (CTEX)} \ProvidesExplFile{ctex-fontset-windowsnew.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \tl_new:N \l__ctex_msyh_suffix_tl \tl_set:Nn \l__ctex_msyh_suffix_tl { .ttc } \file_if_exist:nF { C:/Windows/Fonts/msyh.ttc } diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def index 0750b692479..8c6ed74b725 100644 --- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def +++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windowsold.def @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Windows fonts definition for XP or earlier version (CTEX)} \ProvidesExplFile{ctex-fontset-windowsold.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \sys_if_engine_pdftex:TF { \ctex_zhmap_case:nnn 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 f58fb5e25ed..209f8079d4b 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for article (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-article.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \keys_set:nn { ctex / 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 82867dc4d25..9a0b8cdbe16 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for beamer (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-beamer.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \keys_set:nn { ctex / 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 96fb4a39efc..22b0d7cc354 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for book (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-book.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \keys_set:nn { ctex / 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 b2c1b67e0fe..8fa5249d020 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for report (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-report.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \keys_set:nn { ctex / 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 297a76fd4ed..8bf9e5551f6 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for generic (CTEX)} \ProvidesExplFile{ctex-scheme-chinese.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \keys_set:nn { ctex } { today = small } \ctex_if_autoindent_touched:F { \keys_set:nn { ctex } { 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 33daafd0fcc..7d24f3b7fe9 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for article (CTEX)} \ProvidesExplFile{ctex-scheme-plain-article.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \keys_set:nn { ctex / 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 d3a8eb93fa5..92f67b60812 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for beamer (CTEX)} \ProvidesExplFile{ctex-scheme-plain-beamer.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \keys_set:nn { ctex / 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 dbd7e2d5bd3..25ad8806276 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for book (CTEX)} \ProvidesExplFile{ctex-scheme-plain-book.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \keys_set:nn { ctex / 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 76f693cd411..347d75b590e 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for report (CTEX)} \ProvidesExplFile{ctex-scheme-plain-report.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} \keys_set:nn { ctex / 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 e9ec07ddd09..f2ac6d86d0a 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 @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for generic (CTEX)} \ProvidesExplFile{ctex-scheme-plain.def} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\ExplFileDescription} %% %% %% End of file `ctex-scheme-plain.def'. |