diff options
| author | Karl Berry <karl@freefriends.org> | 2020-05-16 21:26:14 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2020-05-16 21:26:14 +0000 |
| commit | bc3f8ae7a070c0635a7f6aa2febefcc6bd639677 (patch) | |
| tree | 8c74427547bb691ef1dbe4a7edffa535251c4702 /Master/texmf-dist/tex | |
| parent | 74dfa355b56ae4ff3cde96e2b636198c15bcf1fc (diff) | |
ctex (16may20)
git-svn-id: svn://tug.org/texlive/trunk@55162 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
68 files changed, 662 insertions, 370 deletions
diff --git a/Master/texmf-dist/tex/generic/ctex/ctexspamacro.tex b/Master/texmf-dist/tex/generic/ctex/ctex-spa-macro.tex index e4c91b82867..0dc49a6fc7c 100644 --- a/Master/texmf-dist/tex/generic/ctex/ctexspamacro.tex +++ b/Master/texmf-dist/tex/generic/ctex/ctex-spa-macro.tex @@ -1,5 +1,5 @@ %% -%% This is file `ctexspamacro.tex', +%% This is file `ctex-spa-macro.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -88,4 +88,4 @@ \ExplSyntaxOff %% %% -%% End of file `ctexspamacro.tex'. +%% End of file `ctex-spa-macro.tex'. diff --git a/Master/texmf-dist/tex/generic/ctex/ctexmakespa.tex b/Master/texmf-dist/tex/generic/ctex/ctex-spa-make.tex index dd127a90aa6..63d435e9f19 100644 --- a/Master/texmf-dist/tex/generic/ctex/ctexmakespa.tex +++ b/Master/texmf-dist/tex/generic/ctex/ctex-spa-make.tex @@ -1,5 +1,5 @@ %% -%% This is file `ctexmakespa.tex', +%% This is file `ctex-spa-make.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -24,7 +24,7 @@ %% %% --------------------------------------------------------------------- %% -\input ctexspamacro % +\input ctex-spa-macro % \MAKESPA {ctexpunct.spa} { {adobezhsong} {AdobeSongStd-Light} , @@ -75,4 +75,4 @@ \primitive\end %% %% -%% End of file `ctexmakespa.tex'. +%% End of file `ctex-spa-make.tex'. diff --git a/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex index f79b90d807c..61bf7005385 100644 --- a/Master/texmf-dist/tex/generic/ctex/zhadobefonts.tex +++ b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-adobe.tex @@ -1,5 +1,5 @@ %% -%% This is file `zhadobefonts.tex', +%% This is file `ctex-zhmap-adobe.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -73,8 +73,8 @@ \expandafter\x% \fi \endgroup -\ProvidesFile{zhadobefonts.tex}% - [2020/05/02 v2.5.1 Adobe font map loader for DVIPDFMx (CTEX)] +\ProvidesFile{ctex-zhmap-adobe.tex}% + [2020/05/16 v2.5.2 Adobe font map loader for DVIPDFMx (CTEX)] \ifzhmappdf %% pdfTeX does not support OTF fonts \else @@ -100,4 +100,4 @@ \ctex@zhmap@endinput %% %% -%% End of file `zhadobefonts.tex'. +%% End of file `ctex-zhmap-adobe.tex'. diff --git a/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex index ccb6782467d..574c4aa8160 100644 --- a/Master/texmf-dist/tex/generic/ctex/zhfandolfonts.tex +++ b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-fandol.tex @@ -1,5 +1,5 @@ %% -%% This is file `zhfandolfonts.tex', +%% This is file `ctex-zhmap-fandol.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -73,8 +73,8 @@ \expandafter\x% \fi \endgroup -\ProvidesFile{zhfandolfonts.tex}% - [2020/05/02 v2.5.1 Fandol font map loader for DVIPDFMx (CTEX)] +\ProvidesFile{ctex-zhmap-fandol.tex}% + [2020/05/16 v2.5.2 Fandol font map loader for DVIPDFMx (CTEX)] \ifzhmappdf %% pdfTeX does not support OTF fonts \else @@ -100,4 +100,4 @@ \ctex@zhmap@endinput %% %% -%% End of file `zhfandolfonts.tex'. +%% End of file `ctex-zhmap-fandol.tex'. diff --git a/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex index 41b50779afb..971b6e561e4 100644 --- a/Master/texmf-dist/tex/generic/ctex/zhfounderfonts.tex +++ b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-founder.tex @@ -1,5 +1,5 @@ %% -%% This is file `zhfounderfonts.tex', +%% This is file `ctex-zhmap-founder.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -73,8 +73,8 @@ \expandafter\x% \fi \endgroup -\ProvidesFile{zhfounderfonts.tex}% - [2020/05/02 v2.5.1 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)] +\ProvidesFile{ctex-zhmap-founder.tex}% + [2020/05/16 v2.5.2 Founder font map loader for pdfTeX and DVIPDFMx (CTEX)] \ifzhmappdf \pdfmapline{=gbk@UGBK@ <FZSSK.TTF} \pdfmapline{=gbksong@UGBK@ <FZSSK.TTF} @@ -133,4 +133,4 @@ \ctex@zhmap@endinput %% %% -%% End of file `zhfounderfonts.tex'. +%% End of file `ctex-zhmap-founder.tex'. diff --git a/Master/texmf-dist/tex/generic/ctex/zhmacfonts.tex b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex index d55e58bc950..38dde65a835 100644 --- a/Master/texmf-dist/tex/generic/ctex/zhmacfonts.tex +++ b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-mac.tex @@ -1,5 +1,5 @@ %% -%% This is file `zhmacfonts.tex', +%% This is file `ctex-zhmap-mac.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -73,8 +73,8 @@ \expandafter\x% \fi \endgroup -\ProvidesFile{zhmacfonts.tex}% - [2020/05/02 v2.5.1 Mac font map loader for pdfTeX and DVIPDFMx (CTEX)] +\ProvidesFile{ctex-zhmap-mac.tex}% + [2020/05/16 v2.5.2 Mac font map loader for DVIPDFMx (CTEX)] \ifzhmappdf %% pdfTeX does not support OTF fonts \else @@ -108,4 +108,4 @@ \ctex@zhmap@endinput %% %% -%% End of file `zhmacfonts.tex'. +%% End of file `ctex-zhmap-mac.tex'. diff --git a/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex index 3161650088f..31c298f77be 100644 --- a/Master/texmf-dist/tex/generic/ctex/zhubuntufonts.tex +++ b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-ubuntu.tex @@ -1,5 +1,5 @@ %% -%% This is file `zhubuntufonts.tex', +%% This is file `ctex-zhmap-ubuntu.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -73,8 +73,8 @@ \expandafter\x% \fi \endgroup -\ProvidesFile{zhubuntufonts.tex}% - [2020/05/02 v2.5.1 Ubuntu font map loader for pdfTeX and DVIPDFMx (CTEX)] +\ProvidesFile{ctex-zhmap-ubuntu.tex}% + [2020/05/16 v2.5.2 Ubuntu font map loader for DVIPDFMx (CTEX)] \ifzhmappdf %% pdfTeX does not support OTF fonts \else @@ -100,4 +100,4 @@ \ctex@zhmap@endinput %% %% -%% End of file `zhubuntufonts.tex'. +%% End of file `ctex-zhmap-ubuntu.tex'. diff --git a/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex index 5c5226d0e83..725b8ced14b 100644 --- a/Master/texmf-dist/tex/generic/ctex/zhwindowsfonts.tex +++ b/Master/texmf-dist/tex/generic/ctex/zhmap/ctex-zhmap-windows.tex @@ -1,5 +1,5 @@ %% -%% This is file `zhwindowsfonts.tex', +%% This is file `ctex-zhmap-windows.tex', %% generated with the docstrip utility. %% %% The original source files were: @@ -73,8 +73,8 @@ \expandafter\x% \fi \endgroup -\ProvidesFile{zhwindowsfonts.tex}% - [2020/05/02 v2.5.1 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)] +\ProvidesFile{ctex-zhmap-windows.tex}% + [2020/05/16 v2.5.2 Windows font map loader for pdfTeX and DVIPDFMx (CTEX)] \ifzhmappdf \pdfmapline{=gbk@UGBK@ <simsun.ttc} \pdfmapline{=gbksong@UGBK@ <simsun.ttc} @@ -133,4 +133,4 @@ \ctex@zhmap@endinput %% %% -%% End of file `zhwindowsfonts.tex'. +%% End of file `ctex-zhmap-windows.tex'. 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 74898c8ade5..575141b9707 100644 --- a/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg +++ b/Master/texmf-dist/tex/latex/ctex/config/ctex-name-gbk.cfg @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Caption with encoding GBK (CTEX)} \ProvidesExplFile{ctex-name-gbk.cfg} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\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 ad9ccbc4fc2..557bd750558 100644 --- a/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg +++ b/Master/texmf-dist/tex/latex/ctex/config/ctex-name-utf8.cfg @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Caption with encoding UTF-8 (CTEX)} \ProvidesExplFile{ctex-name-utf8.cfg} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\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 f7e4a188bbd..f3b3720c747 100644 --- a/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg +++ b/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Configuration file (CTEX)} \ProvidesExplFile{\ExplFileName.cfg} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} %% %% %% diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg index 954fcb26e2c..36a5d5090f4 100644 --- a/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg +++ b/Master/texmf-dist/tex/latex/ctex/config/ctexbackend.cfg @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{ctexbackend.cfg}% - [2020/05/02 v2.5.1 Backend configuration file (CTEX)] + [2020/05/16 v2.5.2 Backend configuration file (CTEX)] \begingroup \expandafter\ifx\csname Umathchardef\endcsname\relax \else\expandafter\endgroup\expandafter\endinput\fi diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg index 6ae99b93903..5e06f2fd5a3 100644 --- a/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg +++ b/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Option configuration file (CTEX)} \ProvidesExplFile{ctexopts.cfg} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} %% %% \ctex_set:nn { option } { fontset = windows } %% diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo b/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo index c22dda7f02c..d7bdc79fce2 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo +++ b/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {c5size option (CTEX)} \ProvidesExplFile{ctex-c5size.clo} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\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 cd08fffa853..99a45eb1725 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo +++ b/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {cs4size option (CTEX)} \ProvidesExplFile{ctex-cs4size.clo} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \ctex_set_font_size:Nnn \normalsize { -4 } { \abovedisplayskip 12\p@ \@plus3\p@ \@minus7\p@ diff --git a/Master/texmf-dist/tex/latex/ctex/ctex.sty b/Master/texmf-dist/tex/latex/ctex/ctex.sty index 617162c50b4..92faad889c6 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctex.sty @@ -26,10 +26,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter in LaTeX (CTEX)} \ProvidesExplPackage{\ExplFileName} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\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 } @@ -422,35 +422,39 @@ \ctex_update_em_unit: \dim_set:Nn \l__ctex_tmp_dim { \l__ctex_line_stretch_tl } \dim_compare:nNnTF \l__ctex_tmp_dim = \c_max_dim + { \__ctex_update_stretch_auxi: } + { \__ctex_update_stretch_auxii: } + } +\cs_new_protected:Npn \__ctex_update_stretch_auxi: + { + \ctex_if_ccglue_touched:TF + { \ctex_update_ccwd: } { - \ctex_if_ccglue_touched:TF - { \ctex_update_ccwd: } - { - \dim_set:Nn \l__ctex_tmp_dim - { \baselinestretch \tex_glueexpr:D \f@baselineskip \scan_stop: } - \skip_set:Nn \l__ctex_ccglue_skip - { \c_zero_dim plus .08 \l__ctex_tmp_dim } - \ctex_update_ccglue: - } + \dim_set:Nn \l__ctex_tmp_dim + { \baselinestretch \tex_glueexpr:D \f@baselineskip \scan_stop: } + \skip_set:Nn \l__ctex_ccglue_skip + { \c_zero_dim plus .08 \l__ctex_tmp_dim } + \ctex_update_ccglue: } + } +\cs_new_protected:Npn \__ctex_update_stretch_auxii: + { + \int_set:Nn \l__ctex_tmp_int + { \tex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: } + \tex_divide:D \l__ctex_tmp_int \ccwd + \int_compare:nNnTF \l__ctex_tmp_int > \c_zero_int { - \int_set:Nn \l__ctex_tmp_int - { \tex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: } - \tex_divide:D \l__ctex_tmp_int \ccwd - \int_compare:nNnTF \l__ctex_tmp_int > \c_zero_int + \skip_set:Nn \l__ctex_ccglue_skip { - \skip_set:Nn \l__ctex_ccglue_skip + \c_zero_dim plus \dim_eval:n { - \c_zero_dim plus \dim_eval:n - { - ( \linewidth - \ccwd - \l__ctex_tmp_int \ccwd ) / - \l__ctex_tmp_int - } + ( \linewidth - \ccwd - \l__ctex_tmp_int \ccwd ) / + \l__ctex_tmp_int } } - { \skip_zero:N \l__ctex_ccglue_skip } - \ctex_update_ccglue: } + { \skip_zero:N \l__ctex_ccglue_skip } + \ctex_update_ccglue: } \cs_new_protected:Npn \ctex_update_parindent: { @@ -901,14 +905,14 @@ %% ctex-fontset-windows.def, %% ctexspa.def, %% ctexpunct.spa, -%% ctexmakespa.tex, -%% ctexspamacro.tex, -%% zhadobefonts.tex, -%% zhfandolfonts.tex, -%% zhfounderfonts.tex, -%% zhmacfonts.tex, -%% zhubuntufonts.tex, -%% zhwindowsfonts.tex, +%% ctex-spa-make.tex, +%% ctex-spa-macro.tex, +%% ctex-zhmap-adobe.tex, +%% ctex-zhmap-fandol.tex, +%% ctex-zhmap-founder.tex, +%% ctex-zhmap-mac.tex, +%% ctex-zhmap-ubuntu.tex, +%% ctex-zhmap-windows.tex, %% ctex-zhconv-index.lua, %% translator-theorem-dictionary-ChineseGBK.dict, %% translator-theorem-dictionary-ChineseUTF8.dict, and diff --git a/Master/texmf-dist/tex/latex/ctex/ctexart.cls b/Master/texmf-dist/tex/latex/ctex/ctexart.cls index f0dabcdf0be..9ae9ad1a1b7 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexart.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexart.cls @@ -27,10 +27,10 @@ \NeedsTeXFormat{LaTeX2e} \input{ctexbackend.cfg} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter for class article (CTEX)} \ProvidesExplClass{ctexart} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\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 @@ -434,35 +434,39 @@ \ctex_update_em_unit: \dim_set:Nn \l__ctex_tmp_dim { \l__ctex_line_stretch_tl } \dim_compare:nNnTF \l__ctex_tmp_dim = \c_max_dim + { \__ctex_update_stretch_auxi: } + { \__ctex_update_stretch_auxii: } + } +\cs_new_protected:Npn \__ctex_update_stretch_auxi: + { + \ctex_if_ccglue_touched:TF + { \ctex_update_ccwd: } { - \ctex_if_ccglue_touched:TF - { \ctex_update_ccwd: } - { - \dim_set:Nn \l__ctex_tmp_dim - { \baselinestretch \tex_glueexpr:D \f@baselineskip \scan_stop: } - \skip_set:Nn \l__ctex_ccglue_skip - { \c_zero_dim plus .08 \l__ctex_tmp_dim } - \ctex_update_ccglue: - } + \dim_set:Nn \l__ctex_tmp_dim + { \baselinestretch \tex_glueexpr:D \f@baselineskip \scan_stop: } + \skip_set:Nn \l__ctex_ccglue_skip + { \c_zero_dim plus .08 \l__ctex_tmp_dim } + \ctex_update_ccglue: } + } +\cs_new_protected:Npn \__ctex_update_stretch_auxii: + { + \int_set:Nn \l__ctex_tmp_int + { \tex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: } + \tex_divide:D \l__ctex_tmp_int \ccwd + \int_compare:nNnTF \l__ctex_tmp_int > \c_zero_int { - \int_set:Nn \l__ctex_tmp_int - { \tex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: } - \tex_divide:D \l__ctex_tmp_int \ccwd - \int_compare:nNnTF \l__ctex_tmp_int > \c_zero_int + \skip_set:Nn \l__ctex_ccglue_skip { - \skip_set:Nn \l__ctex_ccglue_skip + \c_zero_dim plus \dim_eval:n { - \c_zero_dim plus \dim_eval:n - { - ( \linewidth - \ccwd - \l__ctex_tmp_int \ccwd ) / - \l__ctex_tmp_int - } + ( \linewidth - \ccwd - \l__ctex_tmp_int \ccwd ) / + \l__ctex_tmp_int } } - { \skip_zero:N \l__ctex_ccglue_skip } - \ctex_update_ccglue: } + { \skip_zero:N \l__ctex_ccglue_skip } + \ctex_update_ccglue: } \cs_new_protected:Npn \ctex_update_parindent: { @@ -1217,6 +1221,29 @@ { \ifnum \c@secnumdepth > \@ne \thesubsection \hskip 1em \relax \fi } { \CTEXifname { \CTEXthesubsection \quad } { } } } +\ctex_define:n + { + secnumdepth .code:n = \ctex_heading_depth:ne { secnumdepth } {#1} , + secnumdepth .value_required:n = true , + tocdepth .code:n = \ctex_heading_depth:ne { tocdepth } {#1} , + tocdepth .value_required:n = true + } +\cs_new_protected:Npn \ctex_heading_depth:nn #1#2 + { + \prop_get:NnNTF \c__ctex_heading_level_prop {#2} \l__ctex_tmp_tl + { \setcounter {#1} { \l__ctex_tmp_tl } } + { \setcounter {#1} { \int_eval:n {#2} } } + } +\cs_generate_variant:Nn \ctex_heading_depth:nn { ne } +\prop_const_from_keyval:Nn \c__ctex_heading_level_prop + { + part = 0 , + section = 1 , + subsection = 2 , + subsubsection = 3 , + paragraph = 4 , + subparagraph = 5 + } \cs_new_protected:Npn \CTEX@setcurrentlabel@n #1 { \protected@edef \@currentlabel @@ -1525,14 +1552,14 @@ %% ctex-fontset-windows.def, %% ctexspa.def, %% ctexpunct.spa, -%% ctexmakespa.tex, -%% ctexspamacro.tex, -%% zhadobefonts.tex, -%% zhfandolfonts.tex, -%% zhfounderfonts.tex, -%% zhmacfonts.tex, -%% zhubuntufonts.tex, -%% zhwindowsfonts.tex, +%% ctex-spa-make.tex, +%% ctex-spa-macro.tex, +%% ctex-zhmap-adobe.tex, +%% ctex-zhmap-fandol.tex, +%% ctex-zhmap-founder.tex, +%% ctex-zhmap-mac.tex, +%% ctex-zhmap-ubuntu.tex, +%% ctex-zhmap-windows.tex, %% ctex-zhconv-index.lua, %% translator-theorem-dictionary-ChineseGBK.dict, %% translator-theorem-dictionary-ChineseUTF8.dict, and diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls index e6a6a8df7f3..32c2e7eddce 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls @@ -27,10 +27,10 @@ \NeedsTeXFormat{LaTeX2e} \input{ctexbackend.cfg} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter for class beamer (CTEX)} \ProvidesExplClass{ctexbeamer} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\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 @@ -426,35 +426,39 @@ \ctex_update_em_unit: \dim_set:Nn \l__ctex_tmp_dim { \l__ctex_line_stretch_tl } \dim_compare:nNnTF \l__ctex_tmp_dim = \c_max_dim + { \__ctex_update_stretch_auxi: } + { \__ctex_update_stretch_auxii: } + } +\cs_new_protected:Npn \__ctex_update_stretch_auxi: + { + \ctex_if_ccglue_touched:TF + { \ctex_update_ccwd: } { - \ctex_if_ccglue_touched:TF - { \ctex_update_ccwd: } - { - \dim_set:Nn \l__ctex_tmp_dim - { \baselinestretch \tex_glueexpr:D \f@baselineskip \scan_stop: } - \skip_set:Nn \l__ctex_ccglue_skip - { \c_zero_dim plus .08 \l__ctex_tmp_dim } - \ctex_update_ccglue: - } + \dim_set:Nn \l__ctex_tmp_dim + { \baselinestretch \tex_glueexpr:D \f@baselineskip \scan_stop: } + \skip_set:Nn \l__ctex_ccglue_skip + { \c_zero_dim plus .08 \l__ctex_tmp_dim } + \ctex_update_ccglue: } + } +\cs_new_protected:Npn \__ctex_update_stretch_auxii: + { + \int_set:Nn \l__ctex_tmp_int + { \tex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: } + \tex_divide:D \l__ctex_tmp_int \ccwd + \int_compare:nNnTF \l__ctex_tmp_int > \c_zero_int { - \int_set:Nn \l__ctex_tmp_int - { \tex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: } - \tex_divide:D \l__ctex_tmp_int \ccwd - \int_compare:nNnTF \l__ctex_tmp_int > \c_zero_int + \skip_set:Nn \l__ctex_ccglue_skip { - \skip_set:Nn \l__ctex_ccglue_skip + \c_zero_dim plus \dim_eval:n { - \c_zero_dim plus \dim_eval:n - { - ( \linewidth - \ccwd - \l__ctex_tmp_int \ccwd ) / - \l__ctex_tmp_int - } + ( \linewidth - \ccwd - \l__ctex_tmp_int \ccwd ) / + \l__ctex_tmp_int } } - { \skip_zero:N \l__ctex_ccglue_skip } - \ctex_update_ccglue: } + { \skip_zero:N \l__ctex_ccglue_skip } + \ctex_update_ccglue: } \cs_new_protected:Npn \ctex_update_parindent: { @@ -726,6 +730,27 @@ \defbeamertemplatealias{section page}{default}{CTEX} \defbeamertemplatealias{subsection page}{default}{CTEX} \ExplSyntaxOn +\ctex_define:n + { + tocdepth .code:n = \ctex_heading_depth:ne { tocdepth } {#1} , + tocdepth .value_required:n = true + } +\cs_new_protected:Npn \ctex_heading_depth:nn #1#2 + { + \prop_get:NnNTF \c__ctex_heading_level_prop {#2} \l__ctex_tmp_tl + { \setcounter {#1} { \l__ctex_tmp_tl } } + { \setcounter {#1} { \int_eval:n {#2} } } + } +\cs_generate_variant:Nn \ctex_heading_depth:nn { ne } +\prop_const_from_keyval:Nn \c__ctex_heading_level_prop + { + part = 0 , + section = 1 , + subsection = 2 , + subsubsection = 3 , + paragraph = 4 , + subparagraph = 5 + } \cs_new_protected:Npn \CTEX@setcurrentlabel@n #1 { \protected@edef \@currentlabel @@ -1034,14 +1059,14 @@ %% ctex-fontset-windows.def, %% ctexspa.def, %% ctexpunct.spa, -%% ctexmakespa.tex, -%% ctexspamacro.tex, -%% zhadobefonts.tex, -%% zhfandolfonts.tex, -%% zhfounderfonts.tex, -%% zhmacfonts.tex, -%% zhubuntufonts.tex, -%% zhwindowsfonts.tex, +%% ctex-spa-make.tex, +%% ctex-spa-macro.tex, +%% ctex-zhmap-adobe.tex, +%% ctex-zhmap-fandol.tex, +%% ctex-zhmap-founder.tex, +%% ctex-zhmap-mac.tex, +%% ctex-zhmap-ubuntu.tex, +%% ctex-zhmap-windows.tex, %% ctex-zhconv-index.lua, %% translator-theorem-dictionary-ChineseGBK.dict, %% translator-theorem-dictionary-ChineseUTF8.dict, and diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls index b98a13c6c78..eb35b520e01 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls @@ -27,10 +27,10 @@ \NeedsTeXFormat{LaTeX2e} \input{ctexbackend.cfg} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter for class book (CTEX)} \ProvidesExplClass{ctexbook} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\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 @@ -434,35 +434,39 @@ \ctex_update_em_unit: \dim_set:Nn \l__ctex_tmp_dim { \l__ctex_line_stretch_tl } \dim_compare:nNnTF \l__ctex_tmp_dim = \c_max_dim + { \__ctex_update_stretch_auxi: } + { \__ctex_update_stretch_auxii: } + } +\cs_new_protected:Npn \__ctex_update_stretch_auxi: + { + \ctex_if_ccglue_touched:TF + { \ctex_update_ccwd: } { - \ctex_if_ccglue_touched:TF - { \ctex_update_ccwd: } - { - \dim_set:Nn \l__ctex_tmp_dim - { \baselinestretch \tex_glueexpr:D \f@baselineskip \scan_stop: } - \skip_set:Nn \l__ctex_ccglue_skip - { \c_zero_dim plus .08 \l__ctex_tmp_dim } - \ctex_update_ccglue: - } + \dim_set:Nn \l__ctex_tmp_dim + { \baselinestretch \tex_glueexpr:D \f@baselineskip \scan_stop: } + \skip_set:Nn \l__ctex_ccglue_skip + { \c_zero_dim plus .08 \l__ctex_tmp_dim } + \ctex_update_ccglue: } + } +\cs_new_protected:Npn \__ctex_update_stretch_auxii: + { + \int_set:Nn \l__ctex_tmp_int + { \tex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: } + \tex_divide:D \l__ctex_tmp_int \ccwd + \int_compare:nNnTF \l__ctex_tmp_int > \c_zero_int { - \int_set:Nn \l__ctex_tmp_int - { \tex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: } - \tex_divide:D \l__ctex_tmp_int \ccwd - \int_compare:nNnTF \l__ctex_tmp_int > \c_zero_int + \skip_set:Nn \l__ctex_ccglue_skip { - \skip_set:Nn \l__ctex_ccglue_skip + \c_zero_dim plus \dim_eval:n { - \c_zero_dim plus \dim_eval:n - { - ( \linewidth - \ccwd - \l__ctex_tmp_int \ccwd ) / - \l__ctex_tmp_int - } + ( \linewidth - \ccwd - \l__ctex_tmp_int \ccwd ) / + \l__ctex_tmp_int } } - { \skip_zero:N \l__ctex_ccglue_skip } - \ctex_update_ccglue: } + { \skip_zero:N \l__ctex_ccglue_skip } + \ctex_update_ccglue: } \cs_new_protected:Npn \ctex_update_parindent: { @@ -1344,6 +1348,30 @@ { \ifnum \c@secnumdepth > \z@ \thesection . ~ \ \fi } { \CTEXifname { \CTEXthesection \quad } { } } } +\ctex_define:n + { + secnumdepth .code:n = \ctex_heading_depth:ne { secnumdepth } {#1} , + secnumdepth .value_required:n = true , + tocdepth .code:n = \ctex_heading_depth:ne { tocdepth } {#1} , + tocdepth .value_required:n = true + } +\cs_new_protected:Npn \ctex_heading_depth:nn #1#2 + { + \prop_get:NnNTF \c__ctex_heading_level_prop {#2} \l__ctex_tmp_tl + { \setcounter {#1} { \l__ctex_tmp_tl } } + { \setcounter {#1} { \int_eval:n {#2} } } + } +\cs_generate_variant:Nn \ctex_heading_depth:nn { ne } +\prop_const_from_keyval:Nn \c__ctex_heading_level_prop + { + part = -1 , + chapter = 0 , + section = 1 , + subsection = 2 , + subsubsection = 3 , + paragraph = 4 , + subparagraph = 5 + } \cs_new_protected:Npn \CTEX@setcurrentlabel@n #1 { \protected@edef \@currentlabel @@ -1652,14 +1680,14 @@ %% ctex-fontset-windows.def, %% ctexspa.def, %% ctexpunct.spa, -%% ctexmakespa.tex, -%% ctexspamacro.tex, -%% zhadobefonts.tex, -%% zhfandolfonts.tex, -%% zhfounderfonts.tex, -%% zhmacfonts.tex, -%% zhubuntufonts.tex, -%% zhwindowsfonts.tex, +%% ctex-spa-make.tex, +%% ctex-spa-macro.tex, +%% ctex-zhmap-adobe.tex, +%% ctex-zhmap-fandol.tex, +%% ctex-zhmap-founder.tex, +%% ctex-zhmap-mac.tex, +%% ctex-zhmap-ubuntu.tex, +%% ctex-zhmap-windows.tex, %% ctex-zhconv-index.lua, %% translator-theorem-dictionary-ChineseGBK.dict, %% translator-theorem-dictionary-ChineseUTF8.dict, and diff --git a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty index 08ca51d5c20..fd3c2ae0106 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty @@ -26,10 +26,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter in LaTeX (CTEX)} \ProvidesExplPackage{ctexcap} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\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 55ab37997d0..6ead5f694d9 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexheading.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexheading.sty @@ -26,10 +26,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Heading style modification (CTEX)} \ProvidesExplPackage{ctexheading} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \RequirePackage { xparse , l3keys2e } \RequirePackage { ctexhook , ctexpatch } \tl_clear_new:N \l__ctex_tmp_tl @@ -185,14 +185,14 @@ %% ctex-fontset-windows.def, %% ctexspa.def, %% ctexpunct.spa, -%% ctexmakespa.tex, -%% ctexspamacro.tex, -%% zhadobefonts.tex, -%% zhfandolfonts.tex, -%% zhfounderfonts.tex, -%% zhmacfonts.tex, -%% zhubuntufonts.tex, -%% zhwindowsfonts.tex, +%% ctex-spa-make.tex, +%% ctex-spa-macro.tex, +%% ctex-zhmap-adobe.tex, +%% ctex-zhmap-fandol.tex, +%% ctex-zhmap-founder.tex, +%% ctex-zhmap-mac.tex, +%% ctex-zhmap-ubuntu.tex, +%% ctex-zhmap-windows.tex, %% ctex-zhconv-index.lua, %% translator-theorem-dictionary-ChineseGBK.dict, %% translator-theorem-dictionary-ChineseUTF8.dict, and diff --git a/Master/texmf-dist/tex/latex/ctex/ctexhook.sty b/Master/texmf-dist/tex/latex/ctex/ctexhook.sty index ee858d5c9de..74f6e3caf2d 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexhook.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexhook.sty @@ -26,10 +26,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Document and package hooks (CTEX)} \ProvidesExplPackage{ctexhook} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \cs_new_protected:Npn \ctex_at_end_preamble:n { \tl_gput_right:Nn \g__ctex_end_preamble_hook_tl } \cs_new_protected:Npn \ctex_after_end_preamble:n diff --git a/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty b/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty index 4ea589e0261..8f288a35f01 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty @@ -26,10 +26,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Patching commands (CTEX)} \ProvidesExplPackage{ctexpatch} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \cs_new_protected:Npn \ctex_patch_cmd_once:NnnnTF #1#2 { \ctex_patch_boot:NNnnTF \__ctex_patch_cmd:Nnnnnw #1 diff --git a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls index da8136b4f06..4b8c8c2e182 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls @@ -27,10 +27,10 @@ \NeedsTeXFormat{LaTeX2e} \input{ctexbackend.cfg} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter for class report (CTEX)} \ProvidesExplClass{ctexrep} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\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 @@ -434,35 +434,39 @@ \ctex_update_em_unit: \dim_set:Nn \l__ctex_tmp_dim { \l__ctex_line_stretch_tl } \dim_compare:nNnTF \l__ctex_tmp_dim = \c_max_dim + { \__ctex_update_stretch_auxi: } + { \__ctex_update_stretch_auxii: } + } +\cs_new_protected:Npn \__ctex_update_stretch_auxi: + { + \ctex_if_ccglue_touched:TF + { \ctex_update_ccwd: } { - \ctex_if_ccglue_touched:TF - { \ctex_update_ccwd: } - { - \dim_set:Nn \l__ctex_tmp_dim - { \baselinestretch \tex_glueexpr:D \f@baselineskip \scan_stop: } - \skip_set:Nn \l__ctex_ccglue_skip - { \c_zero_dim plus .08 \l__ctex_tmp_dim } - \ctex_update_ccglue: - } + \dim_set:Nn \l__ctex_tmp_dim + { \baselinestretch \tex_glueexpr:D \f@baselineskip \scan_stop: } + \skip_set:Nn \l__ctex_ccglue_skip + { \c_zero_dim plus .08 \l__ctex_tmp_dim } + \ctex_update_ccglue: } + } +\cs_new_protected:Npn \__ctex_update_stretch_auxii: + { + \int_set:Nn \l__ctex_tmp_int + { \tex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: } + \tex_divide:D \l__ctex_tmp_int \ccwd + \int_compare:nNnTF \l__ctex_tmp_int > \c_zero_int { - \int_set:Nn \l__ctex_tmp_int - { \tex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: } - \tex_divide:D \l__ctex_tmp_int \ccwd - \int_compare:nNnTF \l__ctex_tmp_int > \c_zero_int + \skip_set:Nn \l__ctex_ccglue_skip { - \skip_set:Nn \l__ctex_ccglue_skip + \c_zero_dim plus \dim_eval:n { - \c_zero_dim plus \dim_eval:n - { - ( \linewidth - \ccwd - \l__ctex_tmp_int \ccwd ) / - \l__ctex_tmp_int - } + ( \linewidth - \ccwd - \l__ctex_tmp_int \ccwd ) / + \l__ctex_tmp_int } } - { \skip_zero:N \l__ctex_ccglue_skip } - \ctex_update_ccglue: } + { \skip_zero:N \l__ctex_ccglue_skip } + \ctex_update_ccglue: } \cs_new_protected:Npn \ctex_update_parindent: { @@ -1339,6 +1343,30 @@ { \ifnum \c@secnumdepth > \z@ \thesection . ~ \ \fi } { \CTEXifname { \CTEXthesection \quad } { } } } +\ctex_define:n + { + secnumdepth .code:n = \ctex_heading_depth:ne { secnumdepth } {#1} , + secnumdepth .value_required:n = true , + tocdepth .code:n = \ctex_heading_depth:ne { tocdepth } {#1} , + tocdepth .value_required:n = true + } +\cs_new_protected:Npn \ctex_heading_depth:nn #1#2 + { + \prop_get:NnNTF \c__ctex_heading_level_prop {#2} \l__ctex_tmp_tl + { \setcounter {#1} { \l__ctex_tmp_tl } } + { \setcounter {#1} { \int_eval:n {#2} } } + } +\cs_generate_variant:Nn \ctex_heading_depth:nn { ne } +\prop_const_from_keyval:Nn \c__ctex_heading_level_prop + { + part = -1 , + chapter = 0 , + section = 1 , + subsection = 2 , + subsubsection = 3 , + paragraph = 4 , + subparagraph = 5 + } \cs_new_protected:Npn \CTEX@setcurrentlabel@n #1 { \protected@edef \@currentlabel @@ -1647,14 +1675,14 @@ %% ctex-fontset-windows.def, %% ctexspa.def, %% ctexpunct.spa, -%% ctexmakespa.tex, -%% ctexspamacro.tex, -%% zhadobefonts.tex, -%% zhfandolfonts.tex, -%% zhfounderfonts.tex, -%% zhmacfonts.tex, -%% zhubuntufonts.tex, -%% zhwindowsfonts.tex, +%% ctex-spa-make.tex, +%% ctex-spa-macro.tex, +%% ctex-zhmap-adobe.tex, +%% ctex-zhmap-fandol.tex, +%% ctex-zhmap-founder.tex, +%% ctex-zhmap-mac.tex, +%% ctex-zhmap-ubuntu.tex, +%% ctex-zhmap-windows.tex, %% ctex-zhconv-index.lua, %% translator-theorem-dictionary-ChineseGBK.dict, %% translator-theorem-dictionary-ChineseUTF8.dict, and diff --git a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty index 8b030787cd5..e40a6c27006 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty @@ -26,10 +26,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese font size definition (CTEX)} \ProvidesExplPackage{ctexsize} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \RequirePackage { xparse , l3keys2e } \RequirePackage { fix-cm } \cs_new_protected:Npn \ctex_define_option:n @@ -242,14 +242,14 @@ %% ctex-fontset-windows.def, %% ctexspa.def, %% ctexpunct.spa, -%% ctexmakespa.tex, -%% ctexspamacro.tex, -%% zhadobefonts.tex, -%% zhfandolfonts.tex, -%% zhfounderfonts.tex, -%% zhmacfonts.tex, -%% zhubuntufonts.tex, -%% zhwindowsfonts.tex, +%% ctex-spa-make.tex, +%% ctex-spa-macro.tex, +%% ctex-zhmap-adobe.tex, +%% ctex-zhmap-fandol.tex, +%% ctex-zhmap-founder.tex, +%% ctex-zhmap-mac.tex, +%% ctex-zhmap-ubuntu.tex, +%% ctex-zhmap-windows.tex, %% ctex-zhconv-index.lua, %% translator-theorem-dictionary-ChineseGBK.dict, %% translator-theorem-dictionary-ChineseUTF8.dict, and diff --git a/Master/texmf-dist/tex/latex/ctex/ctexspa.def b/Master/texmf-dist/tex/latex/ctex/ctexspa.def index fbb45d19a99..4075041e0a7 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexspa.def +++ b/Master/texmf-dist/tex/latex/ctex/ctexspa.def @@ -26,7 +26,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{ctexspa.def}% - [2020/05/02 v2.5.1 Space info for CJKpunct (CTEX)] + [2020/05/16 v2.5.2 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 4cd102e4961..49a29d92a1c 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctxdoc.cls @@ -21,7 +21,7 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctxdoc.cls 25394ad 2020-04-20 20:56:32 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctxdoc.cls 1769321 2020-05-06 19:54:31 +0800 Qing Lee <sobenlee@gmail.com> $ {ctex documentation (CTEX)} \ProvidesExplClass{ctxdoc}{\ExplFileDate}{}{\ExplFileDescription} \ExplSyntaxOff @@ -72,7 +72,9 @@ BoldItalicFont = *tx, HyphenChar = None] \setmathfont{texgyrepagella-math.otf} -\captionsetup{strut=off, labelsep=quad, labelfont+=bf} +\captionsetup{% + strut=off, labelsep=quad, labelfont+=bf, + figureposition = bottom, tableposition = top} %% <--- http://tex.stackexchange.com/a/40896 \patchcmd{\@addtocurcol}% {\vskip \intextsep}% @@ -169,10 +171,14 @@ \AfterEndEnvironment{function}{\ctexfixprevdepth} \AtBeginEnvironment{syntax}{\linespread{1}\ctexplainps\ctexdisableecglue} \BeforeBeginEnvironment{SideBySideExample}{\par\addvspace{\medskipamount}} -\newcommand*\exptarget{\Hy@raisedlink{\hypertarget{expstar}{}}} -\newcommand*\rexptarget{\Hy@raisedlink{\hypertarget{rexpstar}{}}} -\newcommand*\expstar{\hyperlink{expstar}{$\star$}} -\newcommand*\rexpstar{\hyperlink{rexpstar}{\ding{73}}} +\newrobustcmd\exptarget{% + \AddLineBeginMainAux{\csgdef{Codedoc@expstar}{}}% + \Hy@raisedlink{\hypertarget{expstar}{}}} +\newrobustcmd\rexptarget{% + \AddLineBeginMainAux{\csgdef{Codedoc@rexpstar}{}}% + \Hy@raisedlink{\hypertarget{rexpstar}{}}} +\newrobustcmd\expstar{\hyperlink{expstar}{$\star$}} +\newrobustcmd\rexpstar{\hyperlink{rexpstar}{\ding{73}}} \ExplSyntaxOn %% l3doc 会设置列表环境中 \listparindent=\z@，我们在这里恢复它。 \cs_set_eq:NN \list \__codedoc_oldlist:nn @@ -814,6 +820,7 @@ \def\TTF{\defaultval{true}\orbar false} \def\TFF{true\orbar\defaultval{false}} \protected\def\opt{\texttt} +\def\TeX{\hologo{TeX}} \def\pdfTeX{\hologo{pdfTeX}} \def\XeTeX{\hologo{XeTeX}} \def\XeLaTeX{\hologo{XeLaTeX}} @@ -822,15 +829,29 @@ \def\LaTeX{\hologo{LaTeX}} \def\LaTeXe{\hologo{LaTeX2e}} \def\LaTeXiii{\hologo{LaTeX3}} -\def\dvipdfmx{DVIPDFM\textit{x}} -\def\TeX{\hologo{TeX}} -\def\ApTeX{Ap\TeX} -\def\ApLaTeX{Ap\LaTeX} -\def\upTeX{up\TeX} -\def\upLaTeX{up\LaTeX} -\def\bashcmd{\texttt} -\def\TeXLive{\TeX\ Live} +\def\dvipdfmx{\hologo{DVIPDFMx}} +\def\TeXLive{\hologo{TeXLive}} \def\MiKTeX{\hologo{MiKTeX}} +\def\pTeX{\hologo{pTeX}} +\def\ApTeX{\hologo{ApTeX}} +\def\upTeX{\hologo{upTeX}} +\def\ApLaTeX{\hologo{ApLaTeX}} +\def\upLaTeX{\hologo{upLaTeX}} +\def\HoLogo@pTeX#1{p\kern -.15em \hologo{TeX}} +\def\HoLogo@pLaTeX#1{p\kern -.05em \hologo{LaTeX}} +\def\HoLogo@ApTeX#1{A\kern -.05em \hologo{pTeX}} +\def\HoLogo@upTeX#1{u\kern -.05em \hologo{pTeX}} +\def\HoLogo@ApLaTeX#1{A\kern -.05em \hologo{pLaTeX}} +\def\HoLogo@upLaTeX#1{u\kern -.05em \hologo{pLaTeX}} +\def\HoLogoBkm@pTeX#1{p\hologo{TeX}} +\def\HoLogoBkm@pLaTeX#1{p\hologo{LaTeX}} +\def\HoLogoBkm@ApTeX#1{A\hologo{pTeX}} +\def\HoLogoBkm@upTeX#1{u\hologo{pTeX}} +\def\HoLogoBkm@ApLaTeX#1{A\hologo{pLaTeX}} +\def\HoLogoBkm@upLaTeX#1{u\hologo{pLaTeX}} +\def\HoLogo@TeXLive#1{\TeX\ Live} +\def\HoLogo@DVIPDFMx#1{DVIPDFM\ensuremath{x}} +\def\bashcmd{\texttt} \def\BSTACK{\begin{tabular}[t]{@{}l@{}}} \def\ESTACK{\end{tabular}} \newenvironment{defaultcapconfig}{% 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 053bc8e942c..cbdee191221 100644 --- a/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict +++ b/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}% - [2020/05/02 v2.5.1 Chinese translation for theorem name (CTEX)] + [2020/05/16 v2.5.2 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 8ae4d9a629d..3a6f4de1239 100644 --- a/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict +++ b/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}% - [2020/05/02 v2.5.1 Chinese translation for theorem name (CTEX)] + [2020/05/16 v2.5.2 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 24584de60d4..ea96488d56d 100644 --- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def +++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-aptex.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Asian pTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-aptex.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \cs_new_protected:Npn \ctex_set_zhmap:n { \tl_gput_right:Nx \g__ctex_zhmap_tl } \cs_new_protected:Npn \ctex_use_zhmap: @@ -42,15 +42,6 @@ } \tl_new:N \g__ctex_zhmap_tl \@onlypreamble \ctex_set_zhmap:n -\tl_if_exist:NF \CJKfamilydefault - { \tl_const:Nn \CJKfamilydefault { \CJKrmdefault } } -\tl_if_exist:NF \CJKrmdefault { \tl_const:Nn \CJKrmdefault { zhrm } } -\tl_if_exist:NF \CJKsfdefault { \tl_const:Nn \CJKsfdefault { zhsf } } -\tl_if_exist:NF \CJKttdefault { \tl_const:Nn \CJKttdefault { zhtt } } -\tl_set:Nn \kanjifamilydefault { \CJKfamilydefault } -\g@addto@macro \@rmfamilyhook { \kanjifamily { \CJKrmdefault } } -\g@addto@macro \@sffamilyhook { \kanjifamily { \CJKsfdefault } } -\g@addto@macro \@ttfamilyhook { \kanjifamily { \CJKttdefault } } \NewDocumentCommand \CJKfamily { m } { \kanjifamily {#1} \selectfont } \DeclareErrorKanjiFont {JY2}{zhrm}{m}{n}{10} @@ -59,8 +50,6 @@ \DeclareSymbolFont{mincho}{JY2}{zhrm}{m}{n} \SetSymbolFont{mincho}{bold}{JY2}{zhrm}{bx}{n} \jfam \symmincho -\ctex_at_end_preamble:n { \ctex_update_default_family: } -\normalfont \ctex_patch_cmd_once:NnnnTF \em { \ExplSyntaxOff } { \eminnershape \else \gtfamily \itshape } @@ -124,6 +113,32 @@ \@onlypreamble \ctex_set_upmap_unicode:nnn \@onlypreamble \ctex_set_upfonts:nnnnnn \RequirePackage { pxeverysel } +\cs_new_protected:Npn \ctex_provide_font_hook:NNN #1#2 + { + \exp_args:Nc \__ctex_provide_font_hook_aux:NNNN + { CTEX \cs_to_str:N #2 } #1#2 + } +\cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4 + { + \tl_new:N #1 + \cs_if_exist:NTF #3 + { \tl_gput_right:Nn #3 {#1} } + { \ctex_patch_cmd:Nnn #2 {#4} { #1#4 } } + } +\ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont +\ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont +\ctex_provide_font_hook:NNN \ttfamily \@ttfamilyhook \selectfont +\tl_if_exist:NF \CJKfamilydefault + { \tl_const:Nn \CJKfamilydefault { \CJKrmdefault } } +\tl_if_exist:NF \CJKrmdefault { \tl_const:Nn \CJKrmdefault { zhrm } } +\tl_if_exist:NF \CJKsfdefault { \tl_const:Nn \CJKsfdefault { zhsf } } +\tl_if_exist:NF \CJKttdefault { \tl_const:Nn \CJKttdefault { zhtt } } +\tl_gput_right:Nn \CTEX@rmfamilyhook { \kanjifamily { \CJKrmdefault } } +\tl_gput_right:Nn \CTEX@sffamilyhook { \kanjifamily { \CJKsfdefault } } +\tl_gput_right:Nn \CTEX@ttfamilyhook { \kanjifamily { \CJKttdefault } } +\tl_gset:Nn \kanjifamilydefault { \CJKfamilydefault } +\normalfont +\ctex_at_end_preamble:n { \ctex_update_default_family: } \cs_new_protected:Npn \ctex_update_default_family: { \tl_if_eq:NNT \CJKfamilydefault \l__ctex_family_default_init_tl 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 6ccee7c96a2..75208abd224 100644 --- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def +++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {LuaLaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-luatex.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \msg_new:nnn { ctex } { luatexja-loaded } { Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\ @@ -679,16 +679,6 @@ \@onlypreamble \setCJKmathfont \@onlypreamble \setCJKromanfont \@onlypreamble \defaultCJKfontfeatures -\tl_if_exist:NF \CJKfamilydefault - { \tl_const:Nn \CJKfamilydefault { \CJKrmdefault } } -\tl_if_exist:NF \CJKrmdefault { \tl_const:Nn \CJKrmdefault { rm } } -\tl_if_exist:NF \CJKsfdefault { \tl_const:Nn \CJKsfdefault { sf } } -\tl_if_exist:NF \CJKttdefault { \tl_const:Nn \CJKttdefault { tt } } -\g@addto@macro \@rmfamilyhook { \CJKfamily { \CJKrmdefault } } -\g@addto@macro \@sffamilyhook { \CJKfamily { \CJKsfdefault } } -\g@addto@macro \@ttfamilyhook { \CJKfamily { \CJKttdefault } } -\g@addto@macro \@defaultfamilyhook { \CJKfamily { \CJKfamilydefault } } -\ctex_at_end_preamble:n { \ctex_update_default_family: } \cs_new_protected:Npn \ctex_ltj_ensure_default_family: { \prop_if_empty:NF \g__ctex_ltj_family_font_name_prop @@ -966,7 +956,7 @@ { \clist_map_inline:nn {#1} { \__ctex_ltj_declare_char_range:nn ##1 } } \cs_generate_variant:Nn \ctex_ltj_declare_char_range:n { e } \cs_new_protected:Npn \__ctex_ltj_declare_char_range:nn #1 - { \exp_args:Ne \ctex_ltj_declare_char_range:nn { \tl_trim_spaces:n {#1} } } + { \tl_trim_spaces_apply:nN {#1} \ctex_ltj_declare_char_range:nn } \cs_new_protected:Npn \ctex_ltj_declare_char_range:nn #1#2 { \tl_clear:N \l__ctex_ltj_char_range_tl @@ -1028,6 +1018,33 @@ { \ltj@setpar@global \ltjsetkanjiskip } \cs_new_protected:Npn \ctex_ltj_set_xkanjiskip:N { \ltj@setpar@global \ltjsetxkanjiskip } +\cs_new_protected:Npn \ctex_provide_font_hook:NNN #1#2 + { + \exp_args:Nc \__ctex_provide_font_hook_aux:NNNN + { CTEX \cs_to_str:N #2 } #1#2 + } +\cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4 + { + \tl_new:N #1 + \cs_if_exist:NTF #3 + { \tl_gput_right:Nn #3 {#1} } + { \ctex_patch_cmd:Nnn #2 {#4} { #1#4 } } + } +\ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont +\ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont +\ctex_provide_font_hook:NNN \ttfamily \@ttfamilyhook \selectfont +\ctex_provide_font_hook:NNN \normalfont \@defaultfamilyhook \usefont +\tl_if_exist:NF \CJKfamilydefault + { \tl_const:Nn \CJKfamilydefault { \CJKrmdefault } } +\tl_if_exist:NF \CJKrmdefault { \tl_const:Nn \CJKrmdefault { rm } } +\tl_if_exist:NF \CJKsfdefault { \tl_const:Nn \CJKsfdefault { sf } } +\tl_if_exist:NF \CJKttdefault { \tl_const:Nn \CJKttdefault { tt } } +\tl_gput_right:Nn \CTEX@rmfamilyhook { \CJKfamily { \CJKrmdefault } } +\tl_gput_right:Nn \CTEX@sffamilyhook { \CJKfamily { \CJKsfdefault } } +\tl_gput_right:Nn \CTEX@ttfamilyhook { \CJKfamily { \CJKttdefault } } +\tl_gput_right:Nn \CTEX@defaultfamilyhook { \CJKfamily { \CJKfamilydefault } } +\normalfont +\ctex_at_end_preamble:n { \ctex_update_default_family: } \cs_new_protected:Npn \ctex_update_default_family: { \tl_if_eq:NNT \CJKfamilydefault \l__ctex_family_default_init_tl 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 e447c91fff9..7f65e702fbb 100644 --- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def +++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {(pdf)LaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-pdftex.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \cs_new_protected:Npn \ctex_set_zhmap:n { \tl_gput_right:Nx \g__ctex_zhmap_tl } \cs_new_protected:Npn \ctex_use_zhmap: @@ -102,7 +102,7 @@ \tl_set:Nn \CJKrmdefault {#1} \tl_set:Nn \CJKsfdefault {#2} \tl_set:Nn \CJKttdefault {#3} - \ctex_set_zhmap:n { \ctex_zhmap_input:n {#4} } + \ctex_set_zhmap:n { \ctex_zhmap_input:n { ctex-zhmap- #4 .tex } } } \@onlypreamble \ctex_load_zhmap:nnnn \cs_new_protected:Npn \ctex_zhmap_input:n #1 @@ -118,15 +118,6 @@ \char_set_catcode:nn { 92 } { \char_value_catcode:n { 92 } } } } - \tl_if_exist:NF \CJKfamilydefault - { \tl_const:Nn \CJKfamilydefault { \CJKrmdefault } } - \tl_if_exist:NF \CJKrmdefault { \tl_new:N \CJKrmdefault } - \tl_if_exist:NF \CJKsfdefault { \tl_new:N \CJKsfdefault } - \tl_if_exist:NF \CJKttdefault { \tl_new:N \CJKttdefault } - \g@addto@macro \@rmfamilyhook { \CJKfamily { \CJKrmdefault } } - \g@addto@macro \@sffamilyhook { \CJKfamily { \CJKsfdefault } } - \g@addto@macro \@ttfamilyhook { \CJKfamily { \CJKttdefault } } - \g@addto@macro \@defaultfamilyhook { \CJKfamily { \CJKfamilydefault } } \fi: \cs_new_protected:Npn \ctex_CJK_input:n #1 { @@ -209,7 +200,8 @@ \clist_const:Nn \c__ctex_punct_family_clist { zhsong , zhhei , zhfs , zhkai , zhli , zhyou , - zhsongb , zhheil , zhheib , zhyoub , zhyahei , zhyaheib + zhsongb , zhheil , zhheib , zhyoub , + zhyahei , zhyaheib , zhpf , zhpfb } \cs_new_protected:Npn \ctex_punct_map_family:nn #1#2 { @@ -246,6 +238,34 @@ { \tl_const:cn { c__ctex_ #1 _punct_spaces_tl } {#2} } \cs_new_eq:NN \ctexspadef \ctex_punct_space:nn \ctex_file_input:n { ctexspa.def } +\reverse_if:N \if_bool:N \g__ctex_zhmCJK_bool +\cs_new_protected:Npn \ctex_provide_font_hook:NNN #1#2 + { + \exp_args:Nc \__ctex_provide_font_hook_aux:NNNN + { CTEX \cs_to_str:N #2 } #1#2 + } +\cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4 + { + \tl_new:N #1 + \cs_if_exist:NTF #3 + { \tl_gput_right:Nn #3 {#1} } + { \ctex_patch_cmd:Nnn #2 {#4} { #1#4 } } + } +\ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont +\ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont +\ctex_provide_font_hook:NNN \ttfamily \@ttfamilyhook \selectfont +\ctex_provide_font_hook:NNN \normalfont \@defaultfamilyhook \usefont +\tl_if_exist:NF \CJKfamilydefault + { \tl_const:Nn \CJKfamilydefault { \CJKrmdefault } } +\tl_if_exist:NF \CJKrmdefault { \tl_const:Nn \CJKrmdefault { rm } } +\tl_if_exist:NF \CJKsfdefault { \tl_const:Nn \CJKsfdefault { sf } } +\tl_if_exist:NF \CJKttdefault { \tl_const:Nn \CJKttdefault { tt } } +\tl_gput_right:Nn \CTEX@rmfamilyhook { \CJKfamily { \CJKrmdefault } } +\tl_gput_right:Nn \CTEX@sffamilyhook { \CJKfamily { \CJKsfdefault } } +\tl_gput_right:Nn \CTEX@ttfamilyhook { \CJKfamily { \CJKttdefault } } +\tl_gput_right:Nn \CTEX@defaultfamilyhook { \CJKfamily { \CJKfamilydefault } } +\fi: +\normalfont \cs_new_protected:Npn \ctex_update_default_family: { \tl_if_eq:NNT \CJKfamilydefault \l__ctex_family_default_init_tl 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 7f24ee2da25..ca849f22698 100644 --- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def +++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {upTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-uptex.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \cs_new_protected:Npn \ctex_set_zhmap:n { \tl_gput_right:Nx \g__ctex_zhmap_tl } \cs_new_protected:Npn \ctex_use_zhmap: @@ -42,15 +42,6 @@ } \tl_new:N \g__ctex_zhmap_tl \@onlypreamble \ctex_set_zhmap:n -\tl_if_exist:NF \CJKfamilydefault - { \tl_const:Nn \CJKfamilydefault { \CJKrmdefault } } -\tl_if_exist:NF \CJKrmdefault { \tl_const:Nn \CJKrmdefault { zhrm } } -\tl_if_exist:NF \CJKsfdefault { \tl_const:Nn \CJKsfdefault { zhsf } } -\tl_if_exist:NF \CJKttdefault { \tl_const:Nn \CJKttdefault { zhtt } } -\tl_set:Nn \kanjifamilydefault { \CJKfamilydefault } -\g@addto@macro \@rmfamilyhook { \kanjifamily { \CJKrmdefault } } -\g@addto@macro \@sffamilyhook { \kanjifamily { \CJKsfdefault } } -\g@addto@macro \@ttfamilyhook { \kanjifamily { \CJKttdefault } } \NewDocumentCommand \CJKfamily { m } { \kanjifamily {#1} \selectfont } \DeclareErrorKanjiFont {JY2}{zhrm}{m}{n}{10} @@ -59,8 +50,6 @@ \DeclareSymbolFont{mincho}{JY2}{zhrm}{m}{n} \SetSymbolFont{mincho}{bold}{JY2}{zhrm}{bx}{n} \jfam \symmincho -\ctex_at_end_preamble:n { \ctex_update_default_family: } -\normalfont \ctex_patch_cmd_once:NnnnTF \em { \ExplSyntaxOff } { \eminnershape \else \gtfamily \itshape } @@ -124,6 +113,32 @@ \@onlypreamble \ctex_set_upmap_unicode:nnn \@onlypreamble \ctex_set_upfonts:nnnnnn \RequirePackage { pxeverysel } +\cs_new_protected:Npn \ctex_provide_font_hook:NNN #1#2 + { + \exp_args:Nc \__ctex_provide_font_hook_aux:NNNN + { CTEX \cs_to_str:N #2 } #1#2 + } +\cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4 + { + \tl_new:N #1 + \cs_if_exist:NTF #3 + { \tl_gput_right:Nn #3 {#1} } + { \ctex_patch_cmd:Nnn #2 {#4} { #1#4 } } + } +\ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont +\ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont +\ctex_provide_font_hook:NNN \ttfamily \@ttfamilyhook \selectfont +\tl_if_exist:NF \CJKfamilydefault + { \tl_const:Nn \CJKfamilydefault { \CJKrmdefault } } +\tl_if_exist:NF \CJKrmdefault { \tl_const:Nn \CJKrmdefault { zhrm } } +\tl_if_exist:NF \CJKsfdefault { \tl_const:Nn \CJKsfdefault { zhsf } } +\tl_if_exist:NF \CJKttdefault { \tl_const:Nn \CJKttdefault { zhtt } } +\tl_gput_right:Nn \CTEX@rmfamilyhook { \kanjifamily { \CJKrmdefault } } +\tl_gput_right:Nn \CTEX@sffamilyhook { \kanjifamily { \CJKsfdefault } } +\tl_gput_right:Nn \CTEX@ttfamilyhook { \kanjifamily { \CJKttdefault } } +\tl_gset:Nn \kanjifamilydefault { \CJKfamilydefault } +\normalfont +\ctex_at_end_preamble:n { \ctex_update_default_family: } \cs_new_protected:Npn \ctex_update_default_family: { \tl_if_eq:NNT \CJKfamilydefault \l__ctex_family_default_init_tl 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 26435410903..9c584a63b48 100644 --- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def +++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-xetex.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {XeLaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-xetex.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\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 0ca6dc60295..c69787b1ae8 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{c19rm.fd}% - [2020/05/02 v2.5.1 Chinese font definition (CTEX)] + [2020/05/16 v2.5.2 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 f83711edfb0..2dcafccfa27 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{c19sf.fd}% - [2020/05/02 v2.5.1 Chinese font definition (CTEX)] + [2020/05/16 v2.5.2 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 8c506eadec4..eb6bf98267f 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{c19tt.fd}% - [2020/05/02 v2.5.1 Chinese font definition (CTEX)] + [2020/05/16 v2.5.2 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 66664982e7f..1678fa40781 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{c70rm.fd}% - [2020/05/02 v2.5.1 Chinese font definition (CTEX)] + [2020/05/16 v2.5.2 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 6b989c6ff8f..9b5176a23ed 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{c70sf.fd}% - [2020/05/02 v2.5.1 Chinese font definition (CTEX)] + [2020/05/16 v2.5.2 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 fc43c692198..c7a91547fed 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{c70tt.fd}% - [2020/05/02 v2.5.1 Chinese font definition (CTEX)] + [2020/05/16 v2.5.2 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 0b9838bc423..0b8070eff8d 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhrm.fd @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{jt2zhrm.fd}% - [2020/05/02 v2.5.1 Chinese font definition (CTEX)] + [2020/05/16 v2.5.2 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 7ea78b75124..4716bc05348 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhsf.fd @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{jt2zhsf.fd}% - [2020/05/02 v2.5.1 Chinese font definition (CTEX)] + [2020/05/16 v2.5.2 Chinese font definition (CTEX)] \DeclareKanjiFamily{JT2}{zhsf}{} \DeclareFontShape{JT2}{zhsf}{m}{n}{<-> upzhsans-v}{} \DeclareFontShape{JT2}{zhsf}{b}{n}{<-> upzhsansb-v}{} diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd index b2fe15a09b4..3f04c0b1235 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/jt2zhtt.fd @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{jt2zhtt.fd}% - [2020/05/02 v2.5.1 Chinese font definition (CTEX)] + [2020/05/16 v2.5.2 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 1433d7b52d0..0da00ca2aee 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhrm.fd @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{jy2zhrm.fd}% - [2020/05/02 v2.5.1 Chinese font definition (CTEX)] + [2020/05/16 v2.5.2 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 1a3c2389bef..e2a25f7596f 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhsf.fd @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{jy2zhsf.fd}% - [2020/05/02 v2.5.1 Chinese font definition (CTEX)] + [2020/05/16 v2.5.2 Chinese font definition (CTEX)] \DeclareKanjiFamily{JY2}{zhsf}{} \DeclareFontShape{JY2}{zhsf}{m}{n}{<-> upzhsans-h}{} \DeclareFontShape{JY2}{zhsf}{b}{n}{<-> upzhsansb-h}{} diff --git a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd index df2ba694b86..c944144eeb0 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/jy2zhtt.fd @@ -25,7 +25,7 @@ %% --------------------------------------------------------------------- %% \ProvidesFile{jy2zhtt.fd}% - [2020/05/02 v2.5.1 Chinese font definition (CTEX)] + [2020/05/16 v2.5.2 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 675a1ce373c..2dd2f2e767a 100644 --- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def +++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-adobe.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Adobe fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-adobe.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \ctex_fontset_case:nnnn { \ctex_fontset_error:n { adobe } } { @@ -59,7 +59,7 @@ \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai } } { - \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhadobefonts } + \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { adobe } \ctex_punct_set:n { adobe } \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong } \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei } 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 2ff57b29633..151afb3ef7e 100644 --- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def +++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-fandol.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Fandol fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-fandol.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \ctex_fontset_case:nnnn { \ctex_fontset_error:n { fandol } } { @@ -60,7 +60,7 @@ \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai } } { - \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhfandolfonts } + \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { fandol } \ctex_punct_set:n { fandol } \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong } \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei } 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 c9b117e17f8..3e8f2a2cbcc 100644 --- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def +++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-founder.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Founder fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-founder.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \ctex_fontset_case:nnn { \ctex_zhmap_case:nnn @@ -52,7 +52,7 @@ \ctex_punct_map_bfseries:nn { zhyou } { zhyoub } } { - \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhfounderfonts } + \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { founder } \ctex_punct_set:n { founder } \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong } \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei } 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 16357dbe17e..7bdb09c26ea 100644 --- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def +++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-mac.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {macOS fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-mac.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\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 9dc1dfa9c9a..5476dc8971e 100644 --- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def +++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macnew.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {macOS fonts definition for El Capitan or later version (CTEX)} \ProvidesExplFile{ctex-fontset-macnew.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \ctex_fontset_case:nnnn { \ctex_fontset_error:n { mac } } { @@ -49,18 +49,19 @@ \setCJKfamilyfont { zhyou } { :4:Yuanti.ttc } [ BoldFont = :0:Yuanti.ttc ] \ctex_punct_set:n { mac } \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong } - \ctex_punct_map_family:nn { \CJKsfdefault } { zhheil } + \ctex_punct_map_family:nn { \CJKsfdefault } { zhpf } \ctex_punct_map_family:nn { \CJKttdefault } { zhfs } \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai } \ctex_punct_map_bfseries:nn { \CJKrmdefault, zhsong } { zhsongb } - \ctex_punct_map_bfseries:nn { \CJKsfdefault } { zhhei } + \ctex_punct_map_bfseries:nn { \CJKsfdefault, zhhei } { zhpfb } \ctex_punct_map_bfseries:nn { zhyou } { zhyoub } } { - \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhmacfonts } + \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { mac } \ctex_punct_set:n { mac } \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong } - \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei } + \ctex_punct_map_family:nn { \CJKsfdefault } { zhpf } + \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhpf } \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai } } { \ctex_fontset_error:n { macnew } } 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 509c23e34f4..958798d366a 100644 --- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def +++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-macold.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {macOS fonts definition for Yosemite or earlier version (CTEX)} \ProvidesExplFile{ctex-fontset-macold.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \ctex_fontset_case:nnnn { \ctex_fontset_error:n { mac } } { \ctex_fontset_error:n { macold } } diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def index 0493c6ee8e0..0991aab9e84 100644 --- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def +++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-ubuntu.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Ubuntu fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-ubuntu.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \ctex_fontset_case:nnnn { \ctex_fontset_error:n { ubuntu } } { @@ -44,15 +44,18 @@ \setCJKfamilyfont { zhhei } { :2:NotoSansCJK-Regular.ttc } [ BoldFont = :2:NotoSansCJK-Bold.ttc ] \setCJKfamilyfont { zhkai } { gkai00mp.ttf } - \ctex_punct_set:n { fandol } - \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong } - \ctex_punct_map_family:nn { \CJKsfdefault } { zhhei } - \ctex_punct_map_bfseries:nn { \CJKrmdefault, zhsong } { zhsongb } - \ctex_punct_map_bfseries:nn { \CJKsfdefault, zhhei } { zhheib } - \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai } + \ctex_punct_set:n { ubuntu } + \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong } + \ctex_punct_map_family:nn { \CJKsfdefault } { zhhei } + \ctex_punct_map_family:nn { \CJKttdefault } { zhsong } + \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai } + \ctex_punct_map_bfseries:nn { \CJKsfdefault, zhhei } { zhheib } + \ctex_punct_map_bfseries:nn + { \CJKrmdefault, \CJKttdefault, zhsong } + { zhsongb } } { - \ctex_load_zhmap:nnnn { rm } { zhhei } { zhsong } { zhubuntufonts } + \ctex_load_zhmap:nnnn { rm } { zhhei } { zhsong } { ubuntu } \ctex_punct_set:n { ubuntu } \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong } \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei } 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 daeb2dc02e1..d73a346a83f 100644 --- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def +++ b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-fontset-windows.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Windows fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-windows.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \file_if_exist:nTF { \c_dollar_str WINDIR/Fonts/msyh.ttc } { \tl_const:Nn \c__ctex_msyh_suffix_tl { ttc } } { @@ -61,17 +61,13 @@ \ctex_punct_map_family:nn { \CJKttdefault } { zhfs } } { - \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { zhwindowsfonts } + \ctex_load_zhmap:nnnn { rm } { zhhei } { zhfs } { windows } \ctex_punct_set:n { windows } \ctex_punct_map_family:nn { \CJKrmdefault } { zhsong } \ctex_punct_map_bfseries:nn { \CJKrmdefault } { zhhei } \ctex_punct_map_itshape:nn { \CJKrmdefault } { zhkai } } - { - \tl_set:Nn \CJKrmdefault { rm } - \tl_set:Nn \CJKsfdefault { sf } - \tl_set:Nn \CJKttdefault { tt } - } + { } } { \ctex_set_upfonts:nnnnnn diff --git a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def index ea14835dcfa..a9141a12f83 100644 --- a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def +++ b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-article.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Heading modification for article (CTEX)} \ProvidesExplFile{ctex-article.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \seq_const_from_clist:Nn \c__ctex_section_headings_seq { section , subsection , subsubsection , paragraph , subparagraph } \seq_new:N \c__ctex_headings_seq @@ -664,6 +664,29 @@ { \ifnum \c@secnumdepth > \@ne \thesubsection \hskip 1em \relax \fi } { \CTEXifname { \CTEXthesubsection \quad } { } } } +\ctex_define:n + { + secnumdepth .code:n = \ctex_heading_depth:ne { secnumdepth } {#1} , + secnumdepth .value_required:n = true , + tocdepth .code:n = \ctex_heading_depth:ne { tocdepth } {#1} , + tocdepth .value_required:n = true + } +\cs_new_protected:Npn \ctex_heading_depth:nn #1#2 + { + \prop_get:NnNTF \c__ctex_heading_level_prop {#2} \l__ctex_tmp_tl + { \setcounter {#1} { \l__ctex_tmp_tl } } + { \setcounter {#1} { \int_eval:n {#2} } } + } +\cs_generate_variant:Nn \ctex_heading_depth:nn { ne } +\prop_const_from_keyval:Nn \c__ctex_heading_level_prop + { + part = 0 , + section = 1 , + subsection = 2 , + subsubsection = 3 , + paragraph = 4 , + subparagraph = 5 + } \cs_new_protected:Npn \CTEX@setcurrentlabel@n #1 { \protected@edef \@currentlabel diff --git a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def index 438a97a00c2..0904906df43 100644 --- a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def +++ b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-beamer.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Heading modification for beamer (CTEX)} \ProvidesExplFile{ctex-beamer.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \seq_const_from_clist:Nn \c__ctex_headings_seq { part , section , subsection } \cs_new_protected:Npn \__ctex_initial_heading:n #1 @@ -178,6 +178,27 @@ \defbeamertemplatealias{section page}{default}{CTEX} \defbeamertemplatealias{subsection page}{default}{CTEX} \ExplSyntaxOn +\ctex_define:n + { + tocdepth .code:n = \ctex_heading_depth:ne { tocdepth } {#1} , + tocdepth .value_required:n = true + } +\cs_new_protected:Npn \ctex_heading_depth:nn #1#2 + { + \prop_get:NnNTF \c__ctex_heading_level_prop {#2} \l__ctex_tmp_tl + { \setcounter {#1} { \l__ctex_tmp_tl } } + { \setcounter {#1} { \int_eval:n {#2} } } + } +\cs_generate_variant:Nn \ctex_heading_depth:nn { ne } +\prop_const_from_keyval:Nn \c__ctex_heading_level_prop + { + part = 0 , + section = 1 , + subsection = 2 , + subsubsection = 3 , + paragraph = 4 , + subparagraph = 5 + } \cs_new_protected:Npn \CTEX@setcurrentlabel@n #1 { \protected@edef \@currentlabel diff --git a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def index df344f2c679..39c0e6cb695 100644 --- a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def +++ b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-book.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Heading modification for book (CTEX)} \ProvidesExplFile{ctex-book.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \seq_const_from_clist:Nn \c__ctex_section_headings_seq { section , subsection , subsubsection , paragraph , subparagraph } \seq_new:N \c__ctex_headings_seq @@ -791,6 +791,30 @@ { \ifnum \c@secnumdepth > \z@ \thesection . ~ \ \fi } { \CTEXifname { \CTEXthesection \quad } { } } } +\ctex_define:n + { + secnumdepth .code:n = \ctex_heading_depth:ne { secnumdepth } {#1} , + secnumdepth .value_required:n = true , + tocdepth .code:n = \ctex_heading_depth:ne { tocdepth } {#1} , + tocdepth .value_required:n = true + } +\cs_new_protected:Npn \ctex_heading_depth:nn #1#2 + { + \prop_get:NnNTF \c__ctex_heading_level_prop {#2} \l__ctex_tmp_tl + { \setcounter {#1} { \l__ctex_tmp_tl } } + { \setcounter {#1} { \int_eval:n {#2} } } + } +\cs_generate_variant:Nn \ctex_heading_depth:nn { ne } +\prop_const_from_keyval:Nn \c__ctex_heading_level_prop + { + part = -1 , + chapter = 0 , + section = 1 , + subsection = 2 , + subsubsection = 3 , + paragraph = 4 , + subparagraph = 5 + } \cs_new_protected:Npn \CTEX@setcurrentlabel@n #1 { \protected@edef \@currentlabel diff --git a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def index 751de60273c..2d418a839fe 100644 --- a/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def +++ b/Master/texmf-dist/tex/latex/ctex/heading/ctex-heading-report.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Heading modification for report (CTEX)} \ProvidesExplFile{ctex-report.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \seq_const_from_clist:Nn \c__ctex_section_headings_seq { section , subsection , subsubsection , paragraph , subparagraph } \seq_new:N \c__ctex_headings_seq @@ -786,6 +786,30 @@ { \ifnum \c@secnumdepth > \z@ \thesection . ~ \ \fi } { \CTEXifname { \CTEXthesection \quad } { } } } +\ctex_define:n + { + secnumdepth .code:n = \ctex_heading_depth:ne { secnumdepth } {#1} , + secnumdepth .value_required:n = true , + tocdepth .code:n = \ctex_heading_depth:ne { tocdepth } {#1} , + tocdepth .value_required:n = true + } +\cs_new_protected:Npn \ctex_heading_depth:nn #1#2 + { + \prop_get:NnNTF \c__ctex_heading_level_prop {#2} \l__ctex_tmp_tl + { \setcounter {#1} { \l__ctex_tmp_tl } } + { \setcounter {#1} { \int_eval:n {#2} } } + } +\cs_generate_variant:Nn \ctex_heading_depth:nn { ne } +\prop_const_from_keyval:Nn \c__ctex_heading_level_prop + { + part = -1 , + chapter = 0 , + section = 1 , + subsection = 2 , + subsubsection = 3 , + paragraph = 4 , + subparagraph = 5 + } \cs_new_protected:Npn \CTEX@setcurrentlabel@n #1 { \protected@edef \@currentlabel 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 144c3d6f476..3b51a64d3b2 100644 --- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-article.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for article (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-article.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \ctex_set:nn { part } { aftertitle = \par , diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def index c290f86a614..fda6896b527 100644 --- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for beamer (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-beamer.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \ctex_set:nn { part } { aftertitle = \par , diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def index c35e5602359..39571dae90e 100644 --- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-book.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for book (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-book.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \ctex_set:nn { part } { aftertitle = \par , diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def index 59e4dcc76ae..2807d73cd9f 100644 --- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-report.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for report (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-report.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \ctex_set:nn { part } { aftertitle = \par , diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def index bcdabc1787c..be567370d52 100644 --- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese scheme for generic (CTEX)} \ProvidesExplFile{ctex-scheme-chinese.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \ctex_set:n { today = small } \ctex_if_autoindent_touched:F { \ctex_set:n { autoindent = true } } diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def index 803fd2a5fee..729e5e8a44d 100644 --- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-article.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for article (CTEX)} \ProvidesExplFile{ctex-scheme-plain-article.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \ctex_set:nn { part } { aftertitle = \par , diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def index c103ca8b61c..e78e05e45a8 100644 --- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for beamer (CTEX)} \ProvidesExplFile{ctex-scheme-plain-beamer.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \ctex_set:nn { part } { aftertitle = \par , diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def index 7c0f0f6bd89..e4aca2c8f1b 100644 --- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-book.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for book (CTEX)} \ProvidesExplFile{ctex-scheme-plain-book.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \ctex_set:nn { part } { aftertitle = \par , diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def index e353a1281b8..47ea9467132 100644 --- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-report.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for report (CTEX)} \ProvidesExplFile{ctex-scheme-plain-report.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \ctex_set:nn { part } { aftertitle = \par , diff --git a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def index be3e922893f..79a10496bb0 100644 --- a/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain.def @@ -24,10 +24,10 @@ %% %% --------------------------------------------------------------------- %% -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Plain scheme for generic (CTEX)} \ProvidesExplFile{ctex-scheme-plain.def} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} %% %% %% End of file `ctex-scheme-plain.def'. |