From bcd63dd9814f27dfadde30f6a94c2c376ea0a9fd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 25 Apr 2016 21:49:35 +0000 Subject: ctex (25apr16) git-svn-id: svn://tug.org/texlive/trunk@40745 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/ctex/config/ctex-name-gbk.cfg | 24 +- .../tex/latex/ctex/config/ctex-name-utf8.cfg | 24 +- Master/texmf-dist/tex/latex/ctex/config/ctex.cfg | 6 +- .../texmf-dist/tex/latex/ctex/config/ctexopts.cfg | 6 +- Master/texmf-dist/tex/latex/ctex/ctex-article.def | 6 +- Master/texmf-dist/tex/latex/ctex/ctex-beamer.def | 202 +++++ Master/texmf-dist/tex/latex/ctex/ctex-book.def | 6 +- Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo | 6 +- Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo | 6 +- Master/texmf-dist/tex/latex/ctex/ctex-report.def | 6 +- Master/texmf-dist/tex/latex/ctex/ctex.sty | 42 +- Master/texmf-dist/tex/latex/ctex/ctexart.cls | 16 +- Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls | 999 +++++++++++++++++++++ Master/texmf-dist/tex/latex/ctex/ctexbook.cls | 16 +- Master/texmf-dist/tex/latex/ctex/ctexcap.sty | 6 +- Master/texmf-dist/tex/latex/ctex/ctexheading.sty | 17 +- Master/texmf-dist/tex/latex/ctex/ctexhook.sty | 6 +- Master/texmf-dist/tex/latex/ctex/ctexpatch.sty | 12 +- Master/texmf-dist/tex/latex/ctex/ctexrep.cls | 16 +- Master/texmf-dist/tex/latex/ctex/ctexsize.sty | 15 +- Master/texmf-dist/tex/latex/ctex/ctexspa.def | 4 +- .../translator-theorem-dictionary-ChineseGBK.dict | 113 +++ .../translator-theorem-dictionary-ChineseUTF8.dict | 113 +++ .../tex/latex/ctex/engine/ctex-engine-luatex.def | 8 +- .../tex/latex/ctex/engine/ctex-engine-pdftex.def | 27 +- .../tex/latex/ctex/engine/ctex-engine-uptex.def | 209 +++++ .../tex/latex/ctex/engine/ctex-engine-xetex.def | 6 +- Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd | 4 +- Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd | 4 +- Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd | 4 +- Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd | 4 +- Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd | 4 +- Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd | 4 +- .../tex/latex/ctex/fontset/ctex-fontset-adobe.def | 41 +- .../tex/latex/ctex/fontset/ctex-fontset-fandol.def | 41 +- .../latex/ctex/fontset/ctex-fontset-founder.def | 45 +- .../tex/latex/ctex/fontset/ctex-fontset-mac.def | 24 +- .../tex/latex/ctex/fontset/ctex-fontset-ubuntu.def | 32 +- .../latex/ctex/fontset/ctex-fontset-windows.def | 6 +- .../latex/ctex/fontset/ctex-fontset-windowsnew.def | 71 +- .../latex/ctex/fontset/ctex-fontset-windowsold.def | 43 +- .../ctex/scheme/ctex-scheme-chinese-article.def | 6 +- .../ctex/scheme/ctex-scheme-chinese-beamer.def | 84 ++ .../latex/ctex/scheme/ctex-scheme-chinese-book.def | 6 +- .../ctex/scheme/ctex-scheme-chinese-report.def | 6 +- .../tex/latex/ctex/scheme/ctex-scheme-chinese.def | 40 +- .../ctex/scheme/ctex-scheme-plain-article.def | 6 +- .../latex/ctex/scheme/ctex-scheme-plain-beamer.def | 68 ++ .../latex/ctex/scheme/ctex-scheme-plain-book.def | 6 +- .../latex/ctex/scheme/ctex-scheme-plain-report.def | 6 +- .../tex/latex/ctex/scheme/ctex-scheme-plain.def | 6 +- 51 files changed, 2223 insertions(+), 255 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/ctex/ctex-beamer.def create mode 100644 Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls create mode 100644 Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict create mode 100644 Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict create mode 100644 Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def create mode 100644 Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def create mode 100644 Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def (limited to 'Master/texmf-dist/tex/latex/ctex') 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 2a0669607fe..0e85f95f53c 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 @@ -4,9 +4,9 @@ %% %% The original source files were: %% -%% ctex.dtx (with options: `GBK') +%% ctex.dtx (with options: `name,GBK') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,11 +26,11 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Caption with encoding GBK (CTEX)} \ProvidesExplFile{ctex-name-gbk.cfg} - {\ExplFileDate}{2.3}{\ExplFileDescription} -\keys_set:nn { ctex } + {\ExplFileDate}{2.4}{\ExplFileDescription} +\keys_set_known:nn { ctex } { contentsname = 目录 , listfigurename = 插图 , @@ -40,13 +40,13 @@ abstractname = 摘要 , indexname = 索引 , bibname = 参考文献 , - appendixname = 附录 - } -\keys_if_exist:nnT { ctex / part } { name } - { - \keys_set:nn { ctex / part } { name = { 第 , 部分 } } - \keys_if_exist:nnT { ctex / chapter } { name } - { \keys_set:nn { ctex / chapter } { name = { 第 , 章 } } } + appendixname = 附录 , + proofname = 证明 , + algorithmname = 算法 , + refname = 参考文献 , + continuation = (续) , + part / name = { 第 , 部分 } , + chapter / name = { 第 , 章 } } %% %% 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 7499917f405..1e5784b9c58 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 @@ -4,9 +4,9 @@ %% %% The original source files were: %% -%% ctex.dtx (with options: `UTF8') +%% ctex.dtx (with options: `name,UTF8') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,11 +26,11 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Caption with encoding UTF8 (CTEX)} \ProvidesExplFile{ctex-name-utf8.cfg} - {\ExplFileDate}{2.3}{\ExplFileDescription} -\keys_set:nn { ctex } + {\ExplFileDate}{2.4}{\ExplFileDescription} +\keys_set_known:nn { ctex } { contentsname = 鐩綍 , listfigurename = 鎻掑浘 , @@ -40,13 +40,13 @@ abstractname = 鎽樿 , indexname = 绱㈠紩 , bibname = 鍙傝冩枃鐚 , - appendixname = 闄勫綍 - } -\keys_if_exist:nnT { ctex / part } { name } - { - \keys_set:nn { ctex / part } { name = { 绗 , 閮ㄥ垎 } } - \keys_if_exist:nnT { ctex / chapter } { name } - { \keys_set:nn { ctex / chapter } { name = { 绗 , 绔 } } } + appendixname = 闄勫綍 , + proofname = 璇佹槑 , + algorithmname = 绠楁硶 , + refname = 鍙傝冩枃鐚 , + continuation = 锛堢画锛 , + part / name = { 绗 , 閮ㄥ垎 } , + chapter / name = { 绗 , 绔 } } %% %% diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg index 8e6fb24890f..20b7d31209b 100644 --- a/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg +++ b/Master/texmf-dist/tex/latex/ctex/config/ctex.cfg @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `config') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Configuration file (CTEX)} \ProvidesExplFile{\ExplFileName.cfg} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\ExplFileDescription} %% %% %% diff --git a/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg b/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg index 5fb5a197174..6c50c294638 100644 --- a/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg +++ b/Master/texmf-dist/tex/latex/ctex/config/ctexopts.cfg @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `ctexopts') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Option configuration file (CTEX)} \ProvidesExplFile{ctexopts.cfg} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\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 41f9a6cbf32..3c17fbd5c77 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex-article.def +++ b/Master/texmf-dist/tex/latex/ctex/ctex-article.def @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `heading,article') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Heading modification for article (CTEX)} \ProvidesExplFile{ctex-article.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\ExplFileDescription} \seq_new:N \c__ctex_section_headings_seq \seq_gset_from_clist:Nn \c__ctex_section_headings_seq { section , subsection , subsubsection , paragraph , subparagraph } diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def b/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def new file mode 100644 index 00000000000..c672d635ad3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/ctex/ctex-beamer.def @@ -0,0 +1,202 @@ +%% +%% This is file `ctex-beamer.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% ctex.dtx (with options: `heading,beamer') +%% +%% Copyright (C) 2003--2016 +%% 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. +%% +%% ------------------------------------------------------------------------------ +%% +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ + {Heading modification for beamer (CTEX)} +\ProvidesExplFile{ctex-beamer.def} + {\ExplFileDate}{2.4}{\ExplFileDescription} +\seq_new:N \c__ctex_headings_seq +\seq_gset_from_clist:Nn \c__ctex_headings_seq + { part , section , subsection } +\cs_new_protected_nopar:Npn \__ctex_initial_heading:n #1 + { + \tl_new:c { CTEX@pre#1 } + \tl_new:c { CTEX@post#1 } + \tl_const:cx { CTEXthe#1 } + { + \exp_not:c { CTEX@pre#1 } + \exp_not:c { CTEX@the#1 } + \exp_not:c { CTEX@post#1 } + } + \tl_const:cx { CTEX@#1name } + { + \group_begin: + \exp_not:c { CTEX@#1@nameformat } + { + \exp_not:c { CTEX@pre#1 } + \exp_not:N \tl_if_empty:NTF + \exp_not:c { CTEX@#1@numberformat } + { \exp_not:c { CTEX@the#1 } } + { + \group_begin: + \exp_not:c { CTEX@#1@numberformat } + \exp_not:c { CTEX@the#1 } + \group_end: + } + \exp_not:c { CTEX@post#1 } + } + \group_end: + } + } +\cs_new_protected_nopar:Npn \__ctex_def_heading_keys:n #1 + { + \tl_put_right:Nx \l__ctex_tmp_tl + { + #1 .meta:nn = { ctex / #1 } { ####1 } , + #1 / name .code:n = + { \ctex_assign_heading_name:nn {#1} { ####1 } } , + #1 / number .tl_set:N = \exp_not:c { CTEX@the#1 } , + #1 / format .tl_set:N = \exp_not:c { CTEX@#1@format } , + #1 / nameformat .tl_set:N = \exp_not:c { CTEX@#1@nameformat } , + #1 / numberformat .tl_set:N = \exp_not:c { CTEX@#1@numberformat } , + #1 / aftername .tl_set:N = \exp_not:c { CTEX@#1@aftername } , + #1 / titleformat .tl_set:N = \exp_not:c { CTEX@#1@titleformat } , + #1 / aftertitle .tl_set:N = \exp_not:c { CTEX@#1@aftertitle } , + #1 / beforeskip .tl_set:N = \exp_not:c { CTEX@#1@beforeskip } , + #1 / afterskip .tl_set:N = \exp_not:c { CTEX@#1@afterskip} , + #1 / indent .tl_set:N = \exp_not:c { CTEX@#1@indent } , + #1 / numbering .bool_set:N = \exp_not:c { CTEX@#1@numbering } , + #1 / format+ .code:n = + { \tl_put_right:Nn \exp_not:c { CTEX@#1@format } { ####1 } } , + #1 / nameformat+ .code:n = + { \tl_put_right:Nn \exp_not:c { CTEX@#1@nameformat } { ####1 } } , + #1 / numberformat+ .code:n = + { \tl_put_right:Nn \exp_not:c { CTEX@#1@numberformat } { ####1 } } , + #1 / aftername+ .code:n = + { \tl_put_right:Nn \exp_not:c { CTEX@#1@aftername } { ####1 } } , + #1 / titleformat+ .code:n = + { \tl_put_right:Nn \exp_not:c { CTEX@#1@titleformat } { ####1 } } , + #1 / aftertitle+ .code:n = + { \tl_put_right:Nn \exp_not:c { CTEX@#1@aftertitle } { ####1 } } , + #1 / numbering .initial:n = true , + #1 / beforeskip .initial:n = \c_zero_skip , + #1 / afterskip .initial:n = \c_zero_skip , + #1 / indent .initial:n = \c_zero_dim , + #1 / beforeskip .value_required:n = true , + #1 / afterskip .value_required:n = true , + #1 / indent .value_required:n = true , + } + } +\NewDocumentCommand \ctex_assign_heading_name:nn + { m > { \SplitArgument { \c_one } { , } } +m } + { \__ctex_assign_heading_name:nnn {#1} #2 } +\cs_new_protected:Npn \__ctex_assign_heading_name:nnn #1#2#3 + { + \tl_set:cn { CTEX@pre#1 } {#2} + \IfNoValueTF {#3} + { \tl_clear:c { CTEX@post#1 } } + { \tl_set:cn { CTEX@post#1 } {#3} } + } +\seq_map_inline:Nn \c__ctex_headings_seq + { + \__ctex_initial_heading:n {#1} + \__ctex_def_heading_keys:n {#1} + } +\use:x { \keys_define:nn { ctex } { \exp_not:o { \l__ctex_tmp_tl } } } +\tl_clear:N \l__ctex_tmp_tl +\ExplSyntaxOff +\defbeamertemplate*{part page}{CTEX}[1][]{ + \begingroup + \par \addvspace{\glueexpr\CTEX@part@beforeskip\relax}% + \parindent \dimexpr \CTEX@part@indent \relax + \CTEX@part@format + \ifodd \CTEX@part@numbering + \CTEX@partname \CTEX@part@aftername + \fi + \begin{beamercolorbox}[sep=16pt,center,#1]{part title} + \CTEX@part@titleformat \insertpart \CTEX@part@aftertitle + \end{beamercolorbox} + \par \addvspace{\glueexpr\CTEX@part@afterskip\relax}% + \endgroup +} +\defbeamertemplate*{section page}{CTEX}[1][]{ + \begingroup + \par \addvspace{\glueexpr\CTEX@section@beforeskip\relax}% + \parindent \dimexpr \CTEX@section@indent \relax + \CTEX@section@format + \ifodd \CTEX@section@numbering + \CTEX@sectionname \CTEX@section@aftername + \fi + \begin{beamercolorbox}[sep=12pt,center,#1]{part title} + \CTEX@section@titleformat \insertsection \CTEX@section@aftertitle + \end{beamercolorbox} + \par \addvspace{\glueexpr\CTEX@section@afterskip\relax}% + \endgroup +} +\defbeamertemplate*{subsection page}{CTEX}[1][]{ + \begingroup + \par \addvspace{\glueexpr\CTEX@subsection@beforeskip\relax}% + \parindent \dimexpr \CTEX@subsection@indent \relax + \CTEX@subsection@format + \ifodd \CTEX@subsection@numbering + \CTEX@subsectionname \CTEX@subsection@aftername + \fi + \begin{beamercolorbox}[sep=8pt,center,#1]{part title} + \CTEX@subsection@titleformat \insertsubsection \CTEX@subsection@aftertitle + \end{beamercolorbox} + \par \addvspace{\glueexpr\CTEX@subsection@afterskip\relax}% + \endgroup +} +\defbeamertemplatealias{part page}{default}{CTEX} +\defbeamertemplatealias{section page}{default}{CTEX} +\defbeamertemplatealias{subsection page}{default}{CTEX} +\ExplSyntaxOn +\cs_new_protected_nopar:Npn \CTEX@setcurrentlabel@n #1 + { + \protected@edef \@currentlabel + { + \cs_if_exist:cTF { CTEX@the#1 } + { \exp_args:cc { p@#1 } { CTEX@the#1 } } + { \exp_not:o { \@currentlabel } } + } + } +\cs_new_protected_nopar:Npn \ctex_varioref_hook: + { + \seq_map_inline:Nn \c__ctex_headings_seq + { \ctex_fix_varioref_label:n { ##1 } } + } +\cs_new_protected_nopar:Npn \ctex_fix_varioref_label:n #1 + { + \tl_if_empty:cT { p@#1 } + { \exp_args:Nno \labelformat {#1} { \cs:w CTEX@the#1 \cs_end: } } + } +\@ifpackageloaded { varioref } + { \ctex_varioref_hook: } + { + \cs_new_eq:NN \CTEX@save@refstepcounter \refstepcounter + \RenewDocumentCommand \refstepcounter { m } + { + \CTEX@save@refstepcounter {#1} + \CTEX@setcurrentlabel@n {#1} + } + \ctex_at_end_package:nn { varioref } { \ctex_varioref_hook: } + } +\ctex_scheme_input:o { \l__ctex_scheme_tl } +%% +%% +%% End of file `ctex-beamer.def'. diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-book.def b/Master/texmf-dist/tex/latex/ctex/ctex-book.def index a52e2dff675..dc31743dd8a 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex-book.def +++ b/Master/texmf-dist/tex/latex/ctex/ctex-book.def @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `heading,book') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Heading modification for book (CTEX)} \ProvidesExplFile{ctex-book.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\ExplFileDescription} \seq_new:N \c__ctex_section_headings_seq \seq_gset_from_clist:Nn \c__ctex_section_headings_seq { section , subsection , subsubsection , paragraph , subparagraph } diff --git a/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo b/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo index cc39c258635..2a7a4279063 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo +++ b/Master/texmf-dist/tex/latex/ctex/ctex-c5size.clo @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `c5size') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {c5size option (CTEX)} \ProvidesExplFile{ctex-c5size.clo} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\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 f3cfc2fd419..f9446a3cabf 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo +++ b/Master/texmf-dist/tex/latex/ctex/ctex-cs4size.clo @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `cs4size') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {cs4size option (CTEX)} \ProvidesExplFile{ctex-cs4size.clo} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\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 74d2d488c7d..4dbec90572f 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex-report.def +++ b/Master/texmf-dist/tex/latex/ctex/ctex-report.def @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `heading,report') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Heading modification for report (CTEX)} \ProvidesExplFile{ctex-report.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\ExplFileDescription} \seq_new:N \c__ctex_section_headings_seq \seq_gset_from_clist:Nn \c__ctex_section_headings_seq { section , subsection , subsubsection , paragraph , subparagraph } diff --git a/Master/texmf-dist/tex/latex/ctex/ctex.sty b/Master/texmf-dist/tex/latex/ctex/ctex.sty index af5e62b22d2..66bed8e069d 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctex.sty @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `style,ctex') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Chinese adapter in LaTeX (CTEX)} \ProvidesExplPackage{\ExplFileName} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\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 } @@ -570,23 +570,36 @@ abstractname .tl_set:N = \abstractname , indexname .tl_set:N = \indexname , appendixname .tl_set:N = \appendixname , + proofname .tl_set:N = \proofname , } \msg_new:nnn { ctex } { ctexbibname } { Neither~`\token_to_str:N \bibname'~nor~`\token_to_str:N \refname'~can~be~found.\\ The~key~`bibname'~will~set~`\token_to_str:N \ctexbibname'~to~the~given~value. } -\tl_if_exist:NTF \bibname - { \keys_define:nn { ctex } { bibname .tl_set:N = \bibname } } +\tl_if_exist:NTF \insertcontinuationtext { - \tl_if_exist:NTF \refname - { \keys_define:nn { ctex } { bibname .tl_set:N = \refname } } + \keys_define:nn { ctex } { - \msg_warning:nn { ctex } { ctexbibname } - \keys_define:nn { ctex } { bibname .tl_set:N = \ctexbibname } + algorithmname .tl_set:N = \algorithmname , + bibname .tl_set:N = \bibname , + refname .tl_set:N = \refname , + continuation .tl_set:N = \insertcontinuationtext } } -\clist_map_inline:nn { article , book , report } + { + \tl_if_exist:NTF \bibname + { \keys_define:nn { ctex } { bibname .tl_set:N = \bibname } } + { + \tl_if_exist:NTF \refname + { \keys_define:nn { ctex } { bibname .tl_set:N = \refname } } + { + \msg_warning:nn { ctex } { ctexbibname } + \keys_define:nn { ctex } { bibname .tl_set:N = \ctexbibname } + } + } + } +\clist_map_inline:nn { article , book , report , beamer } { \@ifclassloaded {#1} { \clist_map_break:n { \tl_const:Nn \c__ctex_std_class_tl {#1} } } @@ -809,6 +822,7 @@ %% ctexart.cls, %% ctexbook.cls, %% ctexrep.cls, +%% ctexbeamer.cls, %% ctexcap.sty, %% ctexhook.sty, %% ctexpatch.sty, @@ -817,14 +831,17 @@ %% 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, @@ -832,6 +849,7 @@ %% ctex-engine-pdftex.def, %% ctex-engine-xetex.def, %% ctex-engine-luatex.def, +%% ctex-engine-uptex.def, %% c19rm.fd, %% c19sf.fd, %% c19tt.fd, @@ -854,7 +872,9 @@ %% zhfandolfonts.tex, %% zhfounderfonts.tex, %% zhubuntufonts.tex, -%% zhwindowsfonts.tex, and +%% zhwindowsfonts.tex, +%% translator-theorem-dictionary-ChineseGBK.dict, +%% translator-theorem-dictionary-ChineseUTF8.dict, and %% README. %% %% End of file `ctex.sty'. diff --git a/Master/texmf-dist/tex/latex/ctex/ctexart.cls b/Master/texmf-dist/tex/latex/ctex/ctexart.cls index ae5eb13faee..95e59591680 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexart.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexart.cls @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `class,article') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Chinese adapter for class article (CTEX)} \ProvidesExplClass{ctexart} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\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 @@ -581,6 +581,7 @@ abstractname .tl_set:N = \abstractname , indexname .tl_set:N = \indexname , appendixname .tl_set:N = \appendixname , + proofname .tl_set:N = \proofname , bibname .tl_set:N = \refname } \seq_new:N \c__ctex_section_headings_seq @@ -1243,6 +1244,7 @@ %% ctexart.cls, %% ctexbook.cls, %% ctexrep.cls, +%% ctexbeamer.cls, %% ctexcap.sty, %% ctexhook.sty, %% ctexpatch.sty, @@ -1251,14 +1253,17 @@ %% 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, @@ -1266,6 +1271,7 @@ %% ctex-engine-pdftex.def, %% ctex-engine-xetex.def, %% ctex-engine-luatex.def, +%% ctex-engine-uptex.def, %% c19rm.fd, %% c19sf.fd, %% c19tt.fd, @@ -1288,7 +1294,9 @@ %% zhfandolfonts.tex, %% zhfounderfonts.tex, %% zhubuntufonts.tex, -%% zhwindowsfonts.tex, and +%% zhwindowsfonts.tex, +%% translator-theorem-dictionary-ChineseGBK.dict, +%% translator-theorem-dictionary-ChineseUTF8.dict, and %% README. %% %% End of file `ctexart.cls'. diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls new file mode 100644 index 00000000000..d4a46d9237f --- /dev/null +++ b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls @@ -0,0 +1,999 @@ +%% +%% This is file `ctexbeamer.cls', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% ctex.dtx (with options: `class,beamer') +%% +%% Copyright (C) 2003--2016 +%% 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. +%% +%% ------------------------------------------------------------------------------ +%% +\NeedsTeXFormat{LaTeX2e} +\RequirePackage{expl3} +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ + {Chinese adapter for class beamer (CTEX)} +\ProvidesExplClass{ctexbeamer} + {\ExplFileDate}{2.4}{\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 +\cs_new_eq:cN { ver@ctexcap. \@pkgextension } \c__ctex_version_tl +\cs_new_eq:cN { ver@ctexsize. \@pkgextension } \c__ctex_version_tl +\cs_new_eq:cN { ver@ctexheading. \@pkgextension } \c__ctex_version_tl +\RequirePackage { xparse , l3keys2e } +\msg_new:nnnn { ctex } { l3-too-old } + { Support~package~`#1'~too~old. } + { + Please~update~an~up~to~date~version~of~the~bundles\\\\ + `l3kernel'~and~`l3packages'\\\\ + using~your~TeX~package~manager~or~from~CTAN. + } +\@ifpackagelater { expl3 } { 2015/12/20 } { } + { \msg_error:nnn { ctex } { l3-too-old } { expl3 } } +\@ifpackagelater { l3keys2e } { 2015/12/20 } { } + { \msg_error:nnn { ctex } { l3-too-old } { l3keys2e } } +\msg_new:nnnn { ctex } { engine-not-supported } + { Engine~`#1'~is~not~yet~supported,~ctex~will~abort! } + { You~can~switch~to~xelatex,~lualatex~or~pdflatex.} +\file_if_exist:nTF { ctex-engine- \c_sys_engine_str .def } + { + \str_const:Nx \c__ctex_engine_file_str + { ctex-engine- \c_sys_engine_str .def } + } + { \msg_critical:nnx { ctex } { engine-not-supported } { \c_sys_engine_str } } +\RequirePackage { ctexhook , ctexpatch } +\RequirePackage { fix-cm , everysel } +\tl_new:N \l__ctex_tmp_tl +\int_new:N \l__ctex_tmp_int +\dim_new:N \l__ctex_tmp_dim +\box_new:N \l__ctex_tmp_box +\cs_new_protected:Npn \ctex_file_wrapper:nnn #1#2#3 + { + \use:x + { + \ExplSyntaxOff + \char_set_catcode_letter:n { 64 } + #1 + \exp_not:n {#2} + \bool_if:NTF \l__kernel_expl_bool + { \ExplSyntaxOn } + { \ExplSyntaxOff } + \char_set_catcode:nn { 64 } { \char_value_catcode:n { 64 } } + #3 + } + } +\cs_new_protected_nopar:Npn \ctex_file_input:n #1 + { \ctex_file_wrapper:nnn { } { \file_input:n {#1} } { } } +\cs_new_protected_nopar:Npn \ctex_scheme_input:n #1 + { + \ctex_file_wrapper:nnn + { } + { + \tl_if_exist:NTF \c__ctex_class_tl + { + \file_if_exist_input:nF { ctex-scheme- #1 - \c__ctex_class_tl .def } + { \file_input:n { ctex-scheme- #1 .def } } + } + { \file_input:n { ctex-scheme- #1 .def } } + } + { } + } +\cs_generate_variant:Nn \ctex_scheme_input:n { o } +\msg_new:nnnn { ctex } { package-too-old } + { Support~package~`#1'~too~old. } + { + Please~update~an~up~to~date~version~of~the~package~`#1'\\ + using~your~TeX~package~manager~or~from~CTAN. + } +\sys_if_output_pdf:TF + { \cs_new_eq:NN \ifctexpdf \if_true: } + { \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 + { + \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 + \dim_use:N \etex_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 } } + } +\tl_new:N \l__ctex_encoding_tl +\tl_set:Nx \l__ctex_encoding_tl + { \sys_if_engine_pdftex:TF { GBK } { UTF8 } } +\bool_new:N \g__ctex_zhmCJK_bool +\tl_new:N \l__ctex_autoindent_tl +\cs_new_eq:NN \ctex_if_autoindent_touched:F \use:n +\cs_new_eq:NN \ctex_zhmap_case:nnn \use_ii:nnn +\cs_new_protected_nopar:Npn \ctex_at_end:n { \AtEndOfClass } +\clist_new:N \g__ctex_std_options_clist +\msg_new:nnn { ctex } { invalid-option } + { Option~`\l_keys_key_tl'~is~invalid~in~current~mode. } +\msg_new:nnn { ctex } { invalid-value } + { Value~`#1'~is~invalid~for~the~key~`\l_keys_key_tl'. } +\msg_new:nnn { ctex } { deprecated-option } + { Option~ `\l_keys_key_tl'~ is~ deprecated.\\ #1 } +\msg_new:nnn { ctex } { deprecated-command } + { Command~ #1 is~ deprecated.\\ #2 } +\msg_new:nnn { ctex } { deprecated-environment } + { Environment~ `#1'~ is~ deprecated.\\ #2 } +\cs_new_eq:NN \g__ctex_font_size_flag \c_minus_one +\keys_define:nn { ctex / option } + { + zihao .choice: , + zihao .default:n = { 5 } , + zihao / 5 .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_zero } , + zihao / -4 .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_one } , + zihao / false .code:n = { \cs_gset_eq:NN \g__ctex_font_size_flag \c_two } , + c5size .code:n = + { + \msg_warning:nnn { ctex } { deprecated-option } + { Option~ `zihao=5'~ is~ set. } + \keys_set:nn { ctex / option } { zihao = 5 } + } , + cs4size .code:n = + { + \msg_warning:nnn { ctex } { deprecated-option } + { Option~ `zihao=-4'~ is~ set. } + \keys_set:nn { ctex / option } { zihao = -4 } + } , + c5size .value_forbidden:n = true , + cs4size .value_forbidden:n = true , + linespread .fp_set:N = \l__ctex_line_spread_fp , + linespread .initial:n = { \c_nan_fp } , + linespread .value_required:n = true , + autoindent .choice: , + autoindent .default:n = { true } , + autoindent / true .code:n = + { + \tl_set:Nn \l__ctex_autoindent_tl { 2 \ccwd } + \cs_set_eq:NN \ctex_if_autoindent_touched:F \use_none:n + } , + autoindent / false .code:n = + { + \tl_clear:N \l__ctex_autoindent_tl + \cs_set_eq:NN \ctex_if_autoindent_touched:F \use_none:n + } , + autoindent / unknown .code:n = + { + \ctex_set_default_ccwd:Nn \l__ctex_autoindent_tl {#1} + \cs_set_eq:NN \ctex_if_autoindent_touched:F \use_none:n + } , + indent .code:n = + { + \msg_warning:nnn { ctex } { deprecated-option } + { + The~ functionality~ has~ been~ removed.\\ + It's~ better~ to~ set~ the~ heading~ styles~ via~ `afterindent'~ + options.~ + } + } , + indent .value_forbidden:n = true , + noindent .code:n = + { + \msg_warning:nnn { ctex } { deprecated-option } + { + The~ functionality~ has~ been~ removed.\\ + It's~ better~ to~ set~ the~ heading~ styles~ via~ `afterindent'~ + options. + } + } , + noindent .value_forbidden:n = true , + GBK .code:n = { \tl_set:Nn \l__ctex_encoding_tl { GBK } } , + UTF8 .code:n = { \tl_set:Nn \l__ctex_encoding_tl { UTF8 } } , + GBK .value_forbidden:n = true , + UTF8 .value_forbidden:n = true , + fontset .tl_gset:N = \g__ctex_fontset_tl , + nofonts .code:n = + { + \msg_warning:nnn { ctex } { deprecated-option } + { + Option~ `fontset=none'~ is~ set.~ It~ is~ better~ to~ use~ + fontset~ option. + } + \keys_set:nn { ctex / option } { fontset = none } + } , + adobefonts .code:n = + { + \msg_warning:nnn { ctex } { deprecated-option } + { + Option~ `fontset=adobe'~ is~ set.~ It~ is~ better~ to~ use~ + fontset~ option. + } + \keys_set:nn { ctex / option } { fontset = adobe } + } , + winfonts .code:n = + { + \msg_warning:nnn { ctex } { deprecated-option } + { + Option~ `fontset=windows'~ is~ set.~ It~ is~ better~ to~ use~ + fontset~ option. + } + \keys_set:nn { ctex / option } { fontset = windows } + } , + nofonts .value_forbidden:n = true , + winfonts .value_forbidden:n = true , + adobefonts .value_forbidden:n = true , + zhmap .choice: , + zhmap .default:n = { true } , + zhmap / zhmCJK .code:n = + { + \bool_gset_true:N \g__ctex_zhmCJK_bool + \cs_gset_eq:NN \ctex_zhmap_case:nnn \use_i:nnn + } , + zhmap / true .code:n = + { + \bool_gset_false:N \g__ctex_zhmCJK_bool + \cs_gset_eq:NN \ctex_zhmap_case:nnn \use_ii:nnn + } , + zhmap / false .code:n = + { + \bool_gset_false:N \g__ctex_zhmCJK_bool + \cs_gset_eq:NN \ctex_zhmap_case:nnn \use_iii:nnn + } , + nozhmap .code:n = + { + \msg_warning:nnn { ctex } { deprecated-option } + { Option~ `zhmap=false'~ is~ set. } + \keys_set:nn { ctex / option } { zhmap = false } + } , + nozhmap .value_forbidden:n = true , + punct .tl_set:N = \l__ctex_punct_tl , + punct .default:n = { quanjiao } , + punct .initial:n = { quanjiao } , + nopunct .code:n = + { + \msg_warning:nnn { ctex } { deprecated-option } + { Option~ `punct=plain'~ is~ set. } + \keys_set:nn { ctex / option } { punct = plain } + } , + nopunct .value_forbidden:n = true , + space .choices:nn = + { true , auto , false } + { + \exp_args:Nx \ctex_at_end:n + { \keys_set:nn { ctex } { space = \l_keys_choice_tl } } + } , + space .default:n = { true } , + nospace .code:n = + { + \msg_warning:nnn { ctex } { deprecated-option } + { Option~ `space=false'~ is~ set. } + \keys_set:nn { ctex / option } { space = false } + } , + nospace .value_forbidden:n = true , + heading .bool_set:N = \l__ctex_heading_bool , + scheme .tl_set:N = \l__ctex_scheme_tl , + scheme .default:n = { chinese } , + scheme .initial:n = { chinese } , + cap .code:n = + { + \msg_warning:nnn { ctex } { deprecated-option } + { Option~ `scheme = chinese' ~ is~ set. } + \keys_set:nn { ctex / option } { scheme = chinese } + } , + nocap .code:n = + { + \msg_warning:nnn { ctex } { deprecated-option } + { Option~ `scheme = plain' ~ is~ set. } + \keys_set:nn { ctex / option } { scheme = plain } + } , + cap .value_forbidden:n = true , + nocap .value_forbidden:n = true , + fntef .code:n = + { + \msg_warning:nnn { ctex } { deprecated-option } + { `(xe)CJKfntef'~ package~ is~ always~ loaded. } + } , + fancyhdr .code:n = + { + \msg_warning:nnn { ctex } { deprecated-option } + { `fancyhdr'~ package~ is~ loaded. } + \RequirePackage { fancyhdr } + } , + hyperref .code:n = + { + \msg_warning:nnn { ctex } { deprecated-option } + { `hyperref'~ package~ will~ be~ loaded. } + \ctex_at_end:n + { + \cs_if_exist:NF \hypersetup + { \cs_new_eq:NN \hypersetup \ctex_hypersetup:n } + } + \ctex_at_end_preamble:n { \RequirePackage { hyperref } } + } , + } +\tl_clear:N \l__ctex_tmp_tl +\clist_map_inline:nn + { + 10pt , 11pt , 12pt , + 8pt , 9pt , 14pt , 17pt , 20pt , 25pt , 30pt , 36pt , 48pt , 60pt + } + { + \tl_put_right:Nn \l__ctex_tmp_tl + { + #1 .code:n = + { + \cs_gset_eq:NN \g__ctex_font_size_flag \c_two + \clist_gput_right:Nn \g__ctex_std_options_clist {#1} + } , + #1 .value_forbidden:n = true , + } + } +\use:x { \keys_define:nn { ctex / option } { \exp_not:o { \l__ctex_tmp_tl } } } +\tl_clear:N \l__ctex_tmp_tl +\keys_define:nn { ctex / option } + { + unknown .code:n = + { \clist_gput_right:No \g__ctex_std_options_clist { \CurrentOption } } + } +\ctex_file_input:n { ctexopts.cfg } +\ProcessKeysOptions { ctex / option } +\if_case:w \g__ctex_font_size_flag + \clist_gput_right:Nn \g__ctex_std_options_clist { 10pt } +\or: + \clist_gput_right:Nn \g__ctex_std_options_clist { 12pt } +\fi: +\tl_const:Nn \c__ctex_class_tl { beamer } +\PassOptionsToClass { \g__ctex_std_options_clist } { beamer } +\LoadClass { beamer } +\NewDocumentCommand \ctexset { } { \keys_set:nn { ctex } } +\NewDocumentCommand \CTEXsetup { +o > { \TrimSpaces } m } + { + \msg_warning:nnnn { ctex } { deprecated-command } { \CTEXsetup } + { \ctexset~ {~ #2~ =~ {~ #1~ }~ }~ is~ set. } + \IfNoValueF {#1} { \keys_set:nn { ctex / #2 } {#1} } + } +\NewDocumentCommand \CTEXoptions { +o } + { + \msg_warning:nnnn { ctex } { deprecated-command } { \CTEXoptions } + { \ctexset~ {~ #1~ }~ is~ set. } + \IfNoValueF {#1} { \keys_set:nn { ctex } {#1} } + } +\@ifpackageloaded { hyperref } + { + \cs_new_protected_nopar:Npn \ctex_hypersetup:n #1 + { \hypersetup {#1} } + } + { + \cs_new_protected_nopar:Npn \ctex_hypersetup:n #1 + { \PassOptionsToPackage {#1} { hyperref } } + } +\ctex_file_input:n { \c__ctex_engine_file_str } +\keys_define:nn { ctex } + { + autoindent .choice: , + autoindent .default:n = { true } , + autoindent / true .code:n = + { + \tl_set:Nn \l__ctex_autoindent_tl { 2 \ccwd } + \ctex_select_size: + } , + autoindent / false .code:n = + { \tl_clear:N \l__ctex_autoindent_tl } , + autoindent / unknown .code:n = + { + \ctex_set_default_ccwd:Nn \l__ctex_autoindent_tl {#1} + \ctex_select_size: + } + } +\NewDocumentCommand \CTEXsetfont { } { \ctex_select_size: } +\cs_new_protected_nopar:Npn \ctex_select_size: + { \cs_if_free:NTF \size@update { \ctex_update_size: } { \selectfont } } +\cs_new_protected_nopar:Npn \ctex_update_size: + { + \tl_if_eq:NNTF \l__ctex_ziju_tl \c__ctex_zero_tl + { + \ctex_update_stretch: + \ctex_update_parindent: + } + { \ctex_update_ziju: } + } +\tl_const:Nx \c__ctex_zero_tl { \fp_use:N \c_zero_fp } +\tl_new:N \l__ctex_ziju_tl +\tl_set_eq:NN \l__ctex_ziju_tl \c__ctex_zero_tl +\ctex_add_to_selectfont:n + { \cs_if_free:NF \size@update { \ctex_update_size: } } +\keys_define:nn { ctex } + { + linestretch .code:n = + { + \ctex_set_default_ccwd:Nn \l__ctex_line_stretch_tl {#1} + \ctex_select_size: + } , + linestretch .value_required:n = true + } +\tl_new:N \l__ctex_line_stretch_tl +\tl_set:Nn \l__ctex_line_stretch_tl { \ccwd } +\cs_new_protected_nopar:Npn \ctex_update_stretch: + { + \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_if_ccglue_touched:TF + { \ctex_update_ccwd: } + { + \dim_set:Nn \l__ctex_tmp_dim + { \baselinestretch \etex_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: + } + } + { + \int_set:Nn \l__ctex_tmp_int + { \etex_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 + { + \skip_set:Nn \l__ctex_ccglue_skip + { + \c_zero_dim plus \dim_eval:n + { + ( \linewidth - \ccwd - \l__ctex_tmp_int \ccwd ) / + \l__ctex_tmp_int + } + } + } + { \skip_zero:N \l__ctex_ccglue_skip } + \ctex_update_ccglue: + } + } +\cs_new_protected_nopar:Npn \ctex_update_parindent: + { + \tl_if_empty:NF \l__ctex_autoindent_tl + { + \dim_compare:nNnF \parindent = \c_zero_dim + { \dim_set:Nn \parindent { \l__ctex_autoindent_tl } } + } + } +\NewDocumentCommand \ziju { m } + { \exp_args:Nx \ctex_ziju:n {#1} \tex_ignorespaces:D } +\cs_new_protected_nopar:Npn \ctex_ziju:n #1 + { + \tl_set:Nx \l__ctex_ziju_tl { \fp_eval:n {#1} } + \ctex_select_size: + } +\cs_new_protected_nopar:Npn \ctex_update_ziju: + { + \ctex_update_em_unit: + \dim_set:Nn \l__ctex_ziju_dim { \l__ctex_ziju_tl \ccwd } + \dim_add:Nn \ccwd { \l__ctex_ziju_dim } + \dim_compare:nNnTF \ccwd > \c_zero_dim + { + \dim_set:Nn \l__ctex_tmp_dim + { \linewidth - \ccwd + \l__ctex_ziju_dim } + \int_set:Nn \l__ctex_tmp_int { \l__ctex_tmp_dim } + \tex_divide:D \l__ctex_tmp_int \ccwd + \dim_sub:Nn \l__ctex_tmp_dim { \l__ctex_tmp_int \ccwd } + \dim_compare:nNnF \parindent = \c_zero_dim + { + \int_compare:nNnF \l__ctex_tmp_int < \c_three + { \int_sub:Nn \l__ctex_tmp_int { \c_two } } + } + \skip_set:Nn \l__ctex_ccglue_skip + { + \l__ctex_ziju_dim + plus \dim_eval:n { \l__ctex_tmp_dim / \l__ctex_tmp_int } + minus \dim_min:nn { \dim_abs:n { \l__ctex_ziju_dim } } + { ( \ccwd - \l__ctex_tmp_dim ) / ( \l__ctex_tmp_int + \c_one ) } + } + } + { \skip_set:Nn \l__ctex_ccglue_skip { \l__ctex_ziju_dim } } + \ctex_update_ccglue: + \ctex_update_parindent: + } +\dim_new:N \l__ctex_ziju_dim +\NewDocumentCommand \CTEXindent { } + { + \msg_warning:nnnn { ctex } { deprecated-command } { \CTEXindent } + { \parindent is~ set~ to~ 2\ccwd. } + \ctex_update_ccwd: \dim_set:Nn \parindent { 2 \ccwd } + } +\NewDocumentCommand \CTEXnoindent { } + { + \msg_warning:nnnn { ctex } { deprecated-command } { \CTEXnoindent } + { \parindent is~ set~ to~ 0pt. } + \dim_zero:N \parindent + } +\PassOptionsToPackage { encoding = \l__ctex_encoding_tl } { zhnumber } +\RequirePackage { zhnumber } +\cs_new_eq:NN \chinese \zhnum +\cs_new_eq:NN \Chinese \chinese +\cs_new_eq:NN \CTEXcounter \use_none:n +\ctex_at_end_package:nn { enumitem } + { + \cs_if_free:NF \AddEnumerateCounter + { + \AddEnumerateCounter * { \zhnum } { \zhnum_int:n } { 1 } + \AddEnumerateCounter * { \chinese } { \zhnum_int:n } { 1 } + } + } +\NewDocumentCommand \CTEXnumber { m m } + { \protected@edef #1 { \zhnumber {#2} } } +\NewDocumentCommand \CTEXdigits { m m } + { \protected@edef #1 { \zhdigits {#2} } } +\cs_set_eq:NN \CTEX@todayold \today +\keys_define:nn { ctex } + { + today .choice: , + today / old .code:n = + { \cs_set_eq:NN \today \CTEX@todayold } , + today / small .code:n = + { + \cs_set_eq:NN \today \zhtoday + \zhnumsetup { time = Arabic } + } , + today / big .code:n = + { + \cs_set_eq:NN \today \zhtoday + \zhnumsetup { time = Chinese } + } , + today / unknown .code:n = + { \msg_error:nnx { ctex } { today-undef } {#1} } + } +\msg_new:nnnn { ctex } { today-undef } + { Today~format~`#1'~is~undefined. } + { Available~today~formats~are~`old',~`small',~and~`big'. } +\keys_define:nn { ctex } + { + contentsname .tl_set:N = \contentsname , + listfigurename .tl_set:N = \listfigurename , + listtablename .tl_set:N = \listtablename , + figurename .tl_set:N = \figurename , + tablename .tl_set:N = \tablename , + abstractname .tl_set:N = \abstractname , + indexname .tl_set:N = \indexname , + appendixname .tl_set:N = \appendixname , + proofname .tl_set:N = \proofname , + algorithmname .tl_set:N = \algorithmname , + bibname .tl_set:N = \bibname , + refname .tl_set:N = \refname , + continuation .tl_set:N = \insertcontinuationtext + } +\seq_new:N \c__ctex_headings_seq +\seq_gset_from_clist:Nn \c__ctex_headings_seq + { part , section , subsection } +\cs_new_protected_nopar:Npn \__ctex_initial_heading:n #1 + { + \tl_new:c { CTEX@pre#1 } + \tl_new:c { CTEX@post#1 } + \tl_const:cx { CTEXthe#1 } + { + \exp_not:c { CTEX@pre#1 } + \exp_not:c { CTEX@the#1 } + \exp_not:c { CTEX@post#1 } + } + \tl_const:cx { CTEX@#1name } + { + \group_begin: + \exp_not:c { CTEX@#1@nameformat } + { + \exp_not:c { CTEX@pre#1 } + \exp_not:N \tl_if_empty:NTF + \exp_not:c { CTEX@#1@numberformat } + { \exp_not:c { CTEX@the#1 } } + { + \group_begin: + \exp_not:c { CTEX@#1@numberformat } + \exp_not:c { CTEX@the#1 } + \group_end: + } + \exp_not:c { CTEX@post#1 } + } + \group_end: + } + } +\cs_new_protected_nopar:Npn \__ctex_def_heading_keys:n #1 + { + \tl_put_right:Nx \l__ctex_tmp_tl + { + #1 .meta:nn = { ctex / #1 } { ####1 } , + #1 / name .code:n = + { \ctex_assign_heading_name:nn {#1} { ####1 } } , + #1 / number .tl_set:N = \exp_not:c { CTEX@the#1 } , + #1 / format .tl_set:N = \exp_not:c { CTEX@#1@format } , + #1 / nameformat .tl_set:N = \exp_not:c { CTEX@#1@nameformat } , + #1 / numberformat .tl_set:N = \exp_not:c { CTEX@#1@numberformat } , + #1 / aftername .tl_set:N = \exp_not:c { CTEX@#1@aftername } , + #1 / titleformat .tl_set:N = \exp_not:c { CTEX@#1@titleformat } , + #1 / aftertitle .tl_set:N = \exp_not:c { CTEX@#1@aftertitle } , + #1 / beforeskip .tl_set:N = \exp_not:c { CTEX@#1@beforeskip } , + #1 / afterskip .tl_set:N = \exp_not:c { CTEX@#1@afterskip} , + #1 / indent .tl_set:N = \exp_not:c { CTEX@#1@indent } , + #1 / numbering .bool_set:N = \exp_not:c { CTEX@#1@numbering } , + #1 / format+ .code:n = + { \tl_put_right:Nn \exp_not:c { CTEX@#1@format } { ####1 } } , + #1 / nameformat+ .code:n = + { \tl_put_right:Nn \exp_not:c { CTEX@#1@nameformat } { ####1 } } , + #1 / numberformat+ .code:n = + { \tl_put_right:Nn \exp_not:c { CTEX@#1@numberformat } { ####1 } } , + #1 / aftername+ .code:n = + { \tl_put_right:Nn \exp_not:c { CTEX@#1@aftername } { ####1 } } , + #1 / titleformat+ .code:n = + { \tl_put_right:Nn \exp_not:c { CTEX@#1@titleformat } { ####1 } } , + #1 / aftertitle+ .code:n = + { \tl_put_right:Nn \exp_not:c { CTEX@#1@aftertitle } { ####1 } } , + #1 / numbering .initial:n = true , + #1 / beforeskip .initial:n = \c_zero_skip , + #1 / afterskip .initial:n = \c_zero_skip , + #1 / indent .initial:n = \c_zero_dim , + #1 / beforeskip .value_required:n = true , + #1 / afterskip .value_required:n = true , + #1 / indent .value_required:n = true , + } + } +\NewDocumentCommand \ctex_assign_heading_name:nn + { m > { \SplitArgument { \c_one } { , } } +m } + { \__ctex_assign_heading_name:nnn {#1} #2 } +\cs_new_protected:Npn \__ctex_assign_heading_name:nnn #1#2#3 + { + \tl_set:cn { CTEX@pre#1 } {#2} + \IfNoValueTF {#3} + { \tl_clear:c { CTEX@post#1 } } + { \tl_set:cn { CTEX@post#1 } {#3} } + } +\seq_map_inline:Nn \c__ctex_headings_seq + { + \__ctex_initial_heading:n {#1} + \__ctex_def_heading_keys:n {#1} + } +\use:x { \keys_define:nn { ctex } { \exp_not:o { \l__ctex_tmp_tl } } } +\tl_clear:N \l__ctex_tmp_tl +\ExplSyntaxOff +\defbeamertemplate*{part page}{CTEX}[1][]{ + \begingroup + \par \addvspace{\glueexpr\CTEX@part@beforeskip\relax}% + \parindent \dimexpr \CTEX@part@indent \relax + \CTEX@part@format + \ifodd \CTEX@part@numbering + \CTEX@partname \CTEX@part@aftername + \fi + \begin{beamercolorbox}[sep=16pt,center,#1]{part title} + \CTEX@part@titleformat \insertpart \CTEX@part@aftertitle + \end{beamercolorbox} + \par \addvspace{\glueexpr\CTEX@part@afterskip\relax}% + \endgroup +} +\defbeamertemplate*{section page}{CTEX}[1][]{ + \begingroup + \par \addvspace{\glueexpr\CTEX@section@beforeskip\relax}% + \parindent \dimexpr \CTEX@section@indent \relax + \CTEX@section@format + \ifodd \CTEX@section@numbering + \CTEX@sectionname \CTEX@section@aftername + \fi + \begin{beamercolorbox}[sep=12pt,center,#1]{part title} + \CTEX@section@titleformat \insertsection \CTEX@section@aftertitle + \end{beamercolorbox} + \par \addvspace{\glueexpr\CTEX@section@afterskip\relax}% + \endgroup +} +\defbeamertemplate*{subsection page}{CTEX}[1][]{ + \begingroup + \par \addvspace{\glueexpr\CTEX@subsection@beforeskip\relax}% + \parindent \dimexpr \CTEX@subsection@indent \relax + \CTEX@subsection@format + \ifodd \CTEX@subsection@numbering + \CTEX@subsectionname \CTEX@subsection@aftername + \fi + \begin{beamercolorbox}[sep=8pt,center,#1]{part title} + \CTEX@subsection@titleformat \insertsubsection \CTEX@subsection@aftertitle + \end{beamercolorbox} + \par \addvspace{\glueexpr\CTEX@subsection@afterskip\relax}% + \endgroup +} +\defbeamertemplatealias{part page}{default}{CTEX} +\defbeamertemplatealias{section page}{default}{CTEX} +\defbeamertemplatealias{subsection page}{default}{CTEX} +\ExplSyntaxOn +\cs_new_protected_nopar:Npn \CTEX@setcurrentlabel@n #1 + { + \protected@edef \@currentlabel + { + \cs_if_exist:cTF { CTEX@the#1 } + { \exp_args:cc { p@#1 } { CTEX@the#1 } } + { \exp_not:o { \@currentlabel } } + } + } +\cs_new_protected_nopar:Npn \ctex_varioref_hook: + { + \seq_map_inline:Nn \c__ctex_headings_seq + { \ctex_fix_varioref_label:n { ##1 } } + } +\cs_new_protected_nopar:Npn \ctex_fix_varioref_label:n #1 + { + \tl_if_empty:cT { p@#1 } + { \exp_args:Nno \labelformat {#1} { \cs:w CTEX@the#1 \cs_end: } } + } +\@ifpackageloaded { varioref } + { \ctex_varioref_hook: } + { + \cs_new_eq:NN \CTEX@save@refstepcounter \refstepcounter + \RenewDocumentCommand \refstepcounter { m } + { + \CTEX@save@refstepcounter {#1} + \CTEX@setcurrentlabel@n {#1} + } + \ctex_at_end_package:nn { varioref } { \ctex_varioref_hook: } + } +\ctex_scheme_input:o { \l__ctex_scheme_tl } +\NewDocumentCommand \zihao { m } + { \exp_args:Nx \ctex_zihao:n {#1} \tex_ignorespaces:D } +\cs_new_protected_nopar:Npn \ctex_zihao:n #1 + { + \prop_get:NnNTF \c__ctex_font_size_prop {#1} \l__ctex_font_size_tl + { \exp_after:wN \fontsize \l__ctex_font_size_tl \selectfont } + { \msg_error:nnn { ctex } { fontsize } {#1} } + } +\msg_new:nnnn { ctex } { fontsize } + { Undefined~Chinese~font~size~`#1'~in~command~\token_to_str:N \zihao.} + { + The~old~font~size~is~used~if~you~continue.\\ + The~available~font~sizes~are~listed~as~follow.\\ + \seq_use:Nnnn \c__ctex_font_size_seq { ~and~ } { ,~ } { ,~and~ }. + } +\prop_new:N \c__ctex_font_size_prop +\seq_new:N \c__ctex_font_size_seq +\cs_new_protected_nopar:Npn \__ctex_save_font_size:nn #1#2 + { + \use:x + { + \prop_gput:Nnn \exp_not:N \c__ctex_font_size_prop {#1} + { + { \dim_to_decimal:n {#2} } + { \dim_to_decimal:n { (#2) * \c_six / \c_five } } + } + } + \seq_gput_right:Nn \c__ctex_font_size_seq {#1} + } +\clist_map_inline:nn + { + { 8 } { 5 bp } , + { 7 } { 5.5 bp } , + { -6 } { 6.5 bp } , + { 6 } { 7.5 bp } , + { -5 } { 9 bp } , + { 5 } { 10.5 bp } , + { -4 } { 12 bp } , + { 4 } { 14 bp } , + { -3 } { 15 bp } , + { 3 } { 16 bp } , + { -2 } { 18 bp } , + { 2 } { 22 bp } , + { -1 } { 24 bp } , + { 1 } { 26 bp } , + { -0 } { 36 bp } , + { 0 } { 42 bp } + } + { \__ctex_save_font_size:nn #1 } +\cs_new_protected_nopar:Npn \ctex_declare_math_sizes:nnnn #1#2#3#4 + { + \__ctex_get_font_sizes:Nn \l__ctex_font_size_tl { {#1} {#2} {#3} {#4} } + \exp_after:wN \DeclareMathSizes \l__ctex_font_size_tl + } +\cs_new_protected_nopar:Npn \__ctex_get_font_sizes:Nn #1#2 + { + \tl_clear:N #1 + \tl_map_inline:nn {#2} + { + \prop_get:NnNTF \c__ctex_font_size_prop {##1} \l__ctex_tmp_tl + { \tl_put_right:Nx #1 { { \tl_head:N \l__ctex_tmp_tl } } } + { \tl_put_right:Nx #1 { { \dim_to_decimal:n { ##1 } } } } + } + } +\clist_map_inline:nn + { + { 8 }{ 8 }{ 5pt }{ 5pt } , + { 7 }{ 7 }{ 5pt }{ 5pt } , + { -6 }{ -6 }{ 5pt }{ 5pt } , + { 6 }{ 6 }{ 5pt }{ 5pt } , + { -5 }{ -5 }{ 6pt }{ 5pt } , + { 5 }{ 5 }{ 7pt }{ 5pt } , + { -4 }{ -4 }{ 8pt }{ 6pt } , + { 4 }{ 4 }{ 5 }{ 6 } , + { -3 }{ -3 }{ -4 }{ -5 } , + { 3 }{ 3 }{ 4 }{ 5 } , + { -2 }{ -2 }{ -3 }{ -4 } , + { 2 }{ 2 }{ 3 }{ 4 } , + { -1 }{ -1 }{ -2 }{ -3 } , + { 1 }{ 1 }{ 2 }{ 3 } , + { -0 }{ -0 }{ -1 }{ -2 } , + { 0 }{ 0 }{ 1 }{ 2 } + } + { \ctex_declare_math_sizes:nnnn #1 } +\cs_new_protected:Npn \ctex_set_font_size:Nnn #1#2#3 + { + \prop_get:NnNTF \c__ctex_font_size_prop {#2} \l__ctex_font_size_tl + { \exp_after:wN \__ctex_set_font_size:nnNn \l__ctex_font_size_tl #1 {#3} } + { \msg_error:nnn { ctex } { fontsize } {#2} } + } +\cs_new_protected:Npn \__ctex_set_font_size:nnNn #1#2#3#4 + { \cs_set_protected_nopar:Npn #3 { \@setfontsize #3 {#1} {#2} #4 } } +\if_case:w \g__ctex_font_size_flag + \ctex_file_input:n { ctex-c5size.clo } +\or: + \ctex_file_input:n { ctex-cs4size.clo } +\fi: +\fp_compare:nNnF { \l__ctex_line_spread_fp } ? { \c_zero_fp } + { + \exp_args:Nx \linespread { \fp_use:N \l__ctex_line_spread_fp } + \group_begin: \footnotesize \exp_args:NNNo \group_end: + \dim_set:Nn \footnotesep { \dim_use:N \box_ht:N \strutbox } + } +\normalsize +\NewDocumentCommand \CTeX { } + { \ifincsname CTeX \else: C \TeX \fi: } +\ctex_at_end_package:nn { hyperref } + { \pdfstringdefDisableCommands { \tl_set:Nn \CTeX { CTeX } } } +\keys_define:nn { ctex } + { + captiondelimiter .code:n = + { + \msg_warning:nnn { ctex } { deprecated-option } + { You~can~load~the~package~`caption'~to~get~its~functionality. } + } + } +\cs_new_protected_nopar:Npn \ctex_fontset_error:n #1 + { \msg_critical:nnn { ctex } { fontset-unavailable } {#1} } +\msg_new:nnn { ctex } { fontset-unavailable } + { CTeX~fontset~`#1'~is~unavailable~in~current~mode. } +\cs_new_protected_nopar:Npn \ctex_load_fontset: + { + \tl_if_empty:NTF \g__ctex_fontset_tl + { + \ctex_detected_platform: + \ctex_file_input:n { ctex-fontset- \g__ctex_fontset_tl .def } + } + { + \file_if_exist:nTF { ctex-fontset- \g__ctex_fontset_tl .def } + { \ctex_file_input:n { ctex-fontset- \g__ctex_fontset_tl .def } } + { + \use:x + { + \ctex_detected_platform: + \msg_error:nnxx { ctex } { fontset-not-found } + { \g__ctex_fontset_tl } { \exp_not:N \g__ctex_fontset_tl } + } + \ctex_file_input:n { ctex-fontset- \g__ctex_fontset_tl .def } + } + } + } +\@onlypreamble \ctex_load_fontset: +\msg_new:nnnn { ctex } { fontset-not-found } + { + CTeX~fontset~`#1'~could~not~be~found.\\ + Fontset~`#2'~will~be~used~instead. + } + { You~may~run~`mktexlsr'~firstly. } +\keys_define:nn { ctex } + { + fontset .code:n = + { + \ctex_if_preamble:TF + { + \str_if_eq_x:nnTF {#1} { none } + { \msg_warning:nnn { ctex } { invalid-value } {#1} } + { + \str_if_eq:onTF { \g__ctex_fontset_tl } { none } + { + \tl_gset:Nx \g__ctex_fontset_tl {#1} + \ctex_load_fontset: + } + { + \msg_error:nnxx { ctex } { fontset-loaded } + { \g__ctex_fontset_tl } {#1} + } + } + } + { \msg_error:nn { ctex } { fontset-only-preamble } } + } + } +\msg_new:nnnn { ctex } { fontset-loaded } + { + CTeX~fontset~`#1'~has~been~loaded. + \str_if_eq:nnF {#1} {#2} { \\ Fontset~`#2'~will~be~ignored. } + } + { Only~one~fontset~can~be~loaded~in~the~preamble. } +\msg_new:nnn { ctex } { fontset-only-preamble } + { + The~ `fontset'~ option~ can~ be~ used~ only~ in~ preamble. + } +\str_if_eq:onF { \g__ctex_fontset_tl } { none } + { \ctex_load_fontset: } +\ctex_at_end:n { \ctex_file_input:n { ctex.cfg } } +%% +%% 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, +%% 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-uptex.def, +%% c19rm.fd, +%% c19sf.fd, +%% c19tt.fd, +%% c70rm.fd, +%% c70sf.fd, +%% c70tt.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-founder.def, +%% ctex-fontset-ubuntu.def, +%% ctexspa.def, +%% ctexpunct.spa, +%% ctexmakespa.tex, +%% ctexspamacro.tex, +%% zhadobefonts.tex, +%% zhfandolfonts.tex, +%% zhfounderfonts.tex, +%% zhubuntufonts.tex, +%% zhwindowsfonts.tex, +%% translator-theorem-dictionary-ChineseGBK.dict, +%% translator-theorem-dictionary-ChineseUTF8.dict, and +%% README. +%% +%% End of file `ctexbeamer.cls'. diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls index e83470e2eed..19394a51ba8 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `class,book') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Chinese adapter for class book (CTEX)} \ProvidesExplClass{ctexbook} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\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 @@ -581,6 +581,7 @@ abstractname .tl_set:N = \abstractname , indexname .tl_set:N = \indexname , appendixname .tl_set:N = \appendixname , + proofname .tl_set:N = \proofname , bibname .tl_set:N = \bibname } \seq_new:N \c__ctex_section_headings_seq @@ -1325,6 +1326,7 @@ %% ctexart.cls, %% ctexbook.cls, %% ctexrep.cls, +%% ctexbeamer.cls, %% ctexcap.sty, %% ctexhook.sty, %% ctexpatch.sty, @@ -1333,14 +1335,17 @@ %% 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, @@ -1348,6 +1353,7 @@ %% ctex-engine-pdftex.def, %% ctex-engine-xetex.def, %% ctex-engine-luatex.def, +%% ctex-engine-uptex.def, %% c19rm.fd, %% c19sf.fd, %% c19tt.fd, @@ -1370,7 +1376,9 @@ %% zhfandolfonts.tex, %% zhfounderfonts.tex, %% zhubuntufonts.tex, -%% zhwindowsfonts.tex, and +%% zhwindowsfonts.tex, +%% translator-theorem-dictionary-ChineseGBK.dict, +%% translator-theorem-dictionary-ChineseUTF8.dict, and %% README. %% %% End of file `ctexbook.cls'. diff --git a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty index ff09859c840..d92cd9bd155 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `ctexcap') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Chinese adapter in LaTeX (CTEX)} \ProvidesExplPackage{ctexcap} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\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 60c3b3d03aa..9e4e58a3886 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexheading.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexheading.sty @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `style,ctexheading') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Heading style modification (CTEX)} \ProvidesExplPackage{ctexheading} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\ExplFileDescription} \RequirePackage { xparse , l3keys2e } \RequirePackage { ctexhook , ctexpatch } \tl_new:N \l__ctex_tmp_tl @@ -84,7 +84,7 @@ } \ProcessKeysOptions { ctex / option } \NewDocumentCommand \ctexset { } { \keys_set:nn { ctex } } -\clist_map_inline:nn { article , book , report } +\clist_map_inline:nn { article , book , report , beamer } { \@ifclassloaded {#1} { \clist_map_break:n { \tl_const:Nn \c__ctex_std_class_tl {#1} } } @@ -122,6 +122,7 @@ %% ctexart.cls, %% ctexbook.cls, %% ctexrep.cls, +%% ctexbeamer.cls, %% ctexcap.sty, %% ctexhook.sty, %% ctexpatch.sty, @@ -130,14 +131,17 @@ %% 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, @@ -145,6 +149,7 @@ %% ctex-engine-pdftex.def, %% ctex-engine-xetex.def, %% ctex-engine-luatex.def, +%% ctex-engine-uptex.def, %% c19rm.fd, %% c19sf.fd, %% c19tt.fd, @@ -167,7 +172,9 @@ %% zhfandolfonts.tex, %% zhfounderfonts.tex, %% zhubuntufonts.tex, -%% zhwindowsfonts.tex, and +%% zhwindowsfonts.tex, +%% translator-theorem-dictionary-ChineseGBK.dict, +%% translator-theorem-dictionary-ChineseUTF8.dict, and %% README. %% %% End of file `ctexheading.sty'. diff --git a/Master/texmf-dist/tex/latex/ctex/ctexhook.sty b/Master/texmf-dist/tex/latex/ctex/ctexhook.sty index 101dee640de..025e4870b9d 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexhook.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexhook.sty @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `ctexhook') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Document and package hooks (CTEX)} \ProvidesExplPackage{ctexhook} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\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 fdb205421df..95c811fb41c 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexpatch.sty @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `ctexpatch') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Patching commands (CTEX)} \ProvidesExplPackage{ctexpatch} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\ExplFileDescription} \cs_if_exist:NF \str_new:N { \RequirePackage { l3str } } \cs_new_protected:Npn \ctex_patch_cmd_once:NnnnTF #1#2 { @@ -118,12 +118,12 @@ { \exp_not:n { #1@protected@ ##3 #1##3 } } { \exp_last_unbraced:Nf \__ctex_parse_name:w - \token_get_replacement_spec:N ##3 #2 ~ #1 \q_stop + \token_get_replacement_spec:N ##3 #3 ~ #2 \q_stop } { #1##5 ~ } { ##5 ~ } } { - \str_case:onTF { \__ctex_parse_name:w ##1 #2 ~ #1 \q_stop } + \str_case:onTF { \__ctex_parse_name:w ##1 #3 ~ #2 \q_stop } { { #1@protected@ ##2 ##4 } { } { #1@ ##4 } { } @@ -132,7 +132,7 @@ } } } - \cs_new:Npn \__ctex_parse_name:w ##1 #2 ~ ##2 #1 ##3 \q_stop { ##1##2 } + \cs_new:Npn \__ctex_parse_name:w ##1 #3 ~ ##2 #2 ##3 \q_stop { ##1##2 } } \use:x { diff --git a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls index a8d1d0d5155..a9efa9be97e 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `class,report') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Chinese adapter for class report (CTEX)} \ProvidesExplClass{ctexrep} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\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 @@ -581,6 +581,7 @@ abstractname .tl_set:N = \abstractname , indexname .tl_set:N = \indexname , appendixname .tl_set:N = \appendixname , + proofname .tl_set:N = \proofname , bibname .tl_set:N = \bibname } \seq_new:N \c__ctex_section_headings_seq @@ -1319,6 +1320,7 @@ %% ctexart.cls, %% ctexbook.cls, %% ctexrep.cls, +%% ctexbeamer.cls, %% ctexcap.sty, %% ctexhook.sty, %% ctexpatch.sty, @@ -1327,14 +1329,17 @@ %% 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, @@ -1342,6 +1347,7 @@ %% ctex-engine-pdftex.def, %% ctex-engine-xetex.def, %% ctex-engine-luatex.def, +%% ctex-engine-uptex.def, %% c19rm.fd, %% c19sf.fd, %% c19tt.fd, @@ -1364,7 +1370,9 @@ %% zhfandolfonts.tex, %% zhfounderfonts.tex, %% zhubuntufonts.tex, -%% zhwindowsfonts.tex, and +%% zhwindowsfonts.tex, +%% translator-theorem-dictionary-ChineseGBK.dict, +%% translator-theorem-dictionary-ChineseUTF8.dict, and %% README. %% %% End of file `ctexrep.cls'. diff --git a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty index 47e89f9aef0..2af9ea66a98 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexsize.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctexsize.sty @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `style,ctexsize') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Chinese font size definition (CTEX)} \ProvidesExplPackage{ctexsize} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\ExplFileDescription} \RequirePackage { xparse , l3keys2e } \cs_new_eq:NN \g__ctex_font_size_flag \c_minus_one \keys_define:nn { ctex / option } @@ -167,6 +167,7 @@ %% ctexart.cls, %% ctexbook.cls, %% ctexrep.cls, +%% ctexbeamer.cls, %% ctexcap.sty, %% ctexhook.sty, %% ctexpatch.sty, @@ -175,14 +176,17 @@ %% 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, @@ -190,6 +194,7 @@ %% ctex-engine-pdftex.def, %% ctex-engine-xetex.def, %% ctex-engine-luatex.def, +%% ctex-engine-uptex.def, %% c19rm.fd, %% c19sf.fd, %% c19tt.fd, @@ -212,7 +217,9 @@ %% zhfandolfonts.tex, %% zhfounderfonts.tex, %% zhubuntufonts.tex, -%% zhwindowsfonts.tex, and +%% zhwindowsfonts.tex, +%% translator-theorem-dictionary-ChineseGBK.dict, +%% translator-theorem-dictionary-ChineseUTF8.dict, and %% README. %% %% End of file `ctexsize.sty'. diff --git a/Master/texmf-dist/tex/latex/ctex/ctexspa.def b/Master/texmf-dist/tex/latex/ctex/ctexspa.def index d7be21f1073..1adb64bebcf 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexspa.def +++ b/Master/texmf-dist/tex/latex/ctex/ctexspa.def @@ -7,7 +7,7 @@ %% ctex.dtx (with options: `ctexspa') %% ctexpunct.spa %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -28,7 +28,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesFile{ctexspa.def}% - [2016/02/02 v2.3 Space info for CJKpunct (CTEX)] + [2016/04/23 v2.4 Space info for CJKpunct (CTEX)] \ctexspadef{adobezhsong}{70,15,61,8,63,14,58,7,64,13,62,12,60,11,61,15,62,14,51,6,58,5,58,8,7,5,12,12,10,68,13,63,17,63,20,69,19,69,17,63,19,70,17,55,10,10,14,63,10,65,10,61,13,62,15,61,7,49,7,56,8,58,15,69,8,61,14,63,8,57,,,} \ctexspadef{adobezhhei}{78,3,64,3,64,2,61,3,72,3,70,3,72,3,70,3,60,3,51,3,62,3,66,3,0,0,10,10,3,70,5,70,6,75,6,78,17,67,13,67,17,67,4,50,8,8,3,72,3,70,3,72,3,70,3,60,3,51,3,62,3,66,3,78,7,62,3,63,3,61,,,} \ctexspadef{adobezhkai}{76,10,55,8,63,4,62,4,71,4,65,4,71,4,74,4,54,4,54,4,62,4,62,4,0,0,11,11,5,72,6,71,7,78,7,79,18,68,18,68,18,68,2,46,14,12,4,71,4,65,4,71,4,74,4,54,4,54,4,62,4,62,10,76,8,55,4,63,4,62,,,} diff --git a/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict b/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict new file mode 100644 index 00000000000..cce8d15263d --- /dev/null +++ b/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseGBK.dict @@ -0,0 +1,113 @@ +%% +%% This is file `translator-theorem-dictionary-ChineseGBK.dict', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% ctex.dtx (with options: `dict,theorem,GBK') +%% +%% Copyright (C) 2003--2016 +%% 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. +%% +%% ------------------------------------------------------------------------------ +%% +\ProvidesDictionary{translator-theorem-dictionary}{ChineseGBK}% + [2016/02/20 v1.0 Chinese translation for theorem name (CTEX)] +\providetranslation{Comments}{评论} +\providetranslation{comments}{评论} +\providetranslation{Comment}{评论} +\providetranslation{comment}{评论} +\providetranslation{Corollaries}{推论} +\providetranslation{corollaries}{推论} +\providetranslation{Corollary}{推论} +\providetranslation{corollary}{推论} +\providetranslation{Definitions}{定义} +\providetranslation{definitions}{定义} +\providetranslation{Definition}{定义} +\providetranslation{definition}{定义} +\providetranslation{Examples}{例} +\providetranslation{examples}{例} +\providetranslation{Example}{例} +\providetranslation{example}{例} +\providetranslation{Exercises}{练习} +\providetranslation{exercises}{练习} +\providetranslation{Exercise}{练习} +\providetranslation{exercise}{练习} +\providetranslation{Facts}{事实} +\providetranslation{facts}{事实} +\providetranslation{Fact}{事实} +\providetranslation{fact}{事实} +\providetranslation{Key Lemmas}{关键引理} +\providetranslation{key lemmas}{关键引理} +\providetranslation{Key Lemma}{关键引理} +\providetranslation{key lemma}{关键引理} +\providetranslation{Key Observations}{关键观察} +\providetranslation{key observations}{关键观察} +\providetranslation{Key Observation}{关键观察} +\providetranslation{key observation}{关键观察} +\providetranslation{Lemmas}{引理} +\providetranslation{lemmas}{引理} +\providetranslation{Lemma}{引理} +\providetranslation{lemma}{引理} +\providetranslation{Main Theorems}{主要定理} +\providetranslation{main theorems}{主要定理} +\providetranslation{Main Theorem}{主要定理} +\providetranslation{main theorem}{主要定理} +\providetranslation{Observations}{观察} +\providetranslation{observations}{观察} +\providetranslation{Observation}{观察} +\providetranslation{observation}{观察} +\providetranslation{Problems}{问题} +\providetranslation{problems}{问题} +\providetranslation{Problem}{问题} +\providetranslation{problem}{问题} +\providetranslation{Proofs}{证明} +\providetranslation{proofs}{证明} +\providetranslation{Proof}{证明} +\providetranslation{proof}{证明} +\providetranslation{Proof Sketch}{证明提要} +\providetranslation{Proof sketch}{证明提要} +\providetranslation{proof sketch}{证明提要} +\providetranslation{Proof Sketches}{证明提要} +\providetranslation{Proof sketches}{证明提要} +\providetranslation{proof sketches}{证明提要} +\providetranslation{Sketch of Proof}{证明提要} +\providetranslation{Sketch of Proofs}{证明提要} +\providetranslation{Sketch of proof}{证明提要} +\providetranslation{Sketch of proofs}{证明提要} +\providetranslation{sketch of proof}{证明提要} +\providetranslation{sketch of proofs}{证明提要} +\providetranslation{Propositions}{命题} +\providetranslation{propositions}{命题} +\providetranslation{Proposition}{命题} +\providetranslation{proposition}{命题} +\providetranslation{Remarks}{注} +\providetranslation{remarks}{注} +\providetranslation{Remark}{注} +\providetranslation{remark}{注} +\providetranslation{Solutions}{解} +\providetranslation{solutions}{解} +\providetranslation{Solution}{解} +\providetranslation{solution}{解} +\providetranslation{Theorems}{定理} +\providetranslation{theorems}{定理} +\providetranslation{Theorem}{定理} +\providetranslation{theorem}{定理} +%% +%% +%% End of file `translator-theorem-dictionary-ChineseGBK.dict'. 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 new file mode 100644 index 00000000000..fec1290dd29 --- /dev/null +++ b/Master/texmf-dist/tex/latex/ctex/dictionary/translator-theorem-dictionary-ChineseUTF8.dict @@ -0,0 +1,113 @@ +%% +%% This is file `translator-theorem-dictionary-ChineseUTF8.dict', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% ctex.dtx (with options: `dict,theorem,UTF8') +%% +%% Copyright (C) 2003--2016 +%% 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. +%% +%% ------------------------------------------------------------------------------ +%% +\ProvidesDictionary{translator-theorem-dictionary}{ChineseUTF8}% + [2016/02/20 v1.0 Chinese translation for theorem name (CTEX)] +\providetranslation{Comments}{璇勮} +\providetranslation{comments}{璇勮} +\providetranslation{Comment}{璇勮} +\providetranslation{comment}{璇勮} +\providetranslation{Corollaries}{鎺ㄨ} +\providetranslation{corollaries}{鎺ㄨ} +\providetranslation{Corollary}{鎺ㄨ} +\providetranslation{corollary}{鎺ㄨ} +\providetranslation{Definitions}{瀹氫箟} +\providetranslation{definitions}{瀹氫箟} +\providetranslation{Definition}{瀹氫箟} +\providetranslation{definition}{瀹氫箟} +\providetranslation{Examples}{渚媫 +\providetranslation{examples}{渚媫 +\providetranslation{Example}{渚媫 +\providetranslation{example}{渚媫 +\providetranslation{Exercises}{缁冧範} +\providetranslation{exercises}{缁冧範} +\providetranslation{Exercise}{缁冧範} +\providetranslation{exercise}{缁冧範} +\providetranslation{Facts}{浜嬪疄} +\providetranslation{facts}{浜嬪疄} +\providetranslation{Fact}{浜嬪疄} +\providetranslation{fact}{浜嬪疄} +\providetranslation{Key Lemmas}{鍏抽敭寮曠悊} +\providetranslation{key lemmas}{鍏抽敭寮曠悊} +\providetranslation{Key Lemma}{鍏抽敭寮曠悊} +\providetranslation{key lemma}{鍏抽敭寮曠悊} +\providetranslation{Key Observations}{鍏抽敭瑙傚療} +\providetranslation{key observations}{鍏抽敭瑙傚療} +\providetranslation{Key Observation}{鍏抽敭瑙傚療} +\providetranslation{key observation}{鍏抽敭瑙傚療} +\providetranslation{Lemmas}{寮曠悊} +\providetranslation{lemmas}{寮曠悊} +\providetranslation{Lemma}{寮曠悊} +\providetranslation{lemma}{寮曠悊} +\providetranslation{Main Theorems}{涓昏瀹氱悊} +\providetranslation{main theorems}{涓昏瀹氱悊} +\providetranslation{Main Theorem}{涓昏瀹氱悊} +\providetranslation{main theorem}{涓昏瀹氱悊} +\providetranslation{Observations}{瑙傚療} +\providetranslation{observations}{瑙傚療} +\providetranslation{Observation}{瑙傚療} +\providetranslation{observation}{瑙傚療} +\providetranslation{Problems}{闂} +\providetranslation{problems}{闂} +\providetranslation{Problem}{闂} +\providetranslation{problem}{闂} +\providetranslation{Proofs}{璇佹槑} +\providetranslation{proofs}{璇佹槑} +\providetranslation{Proof}{璇佹槑} +\providetranslation{proof}{璇佹槑} +\providetranslation{Proof Sketch}{璇佹槑鎻愯} +\providetranslation{Proof sketch}{璇佹槑鎻愯} +\providetranslation{proof sketch}{璇佹槑鎻愯} +\providetranslation{Proof Sketches}{璇佹槑鎻愯} +\providetranslation{Proof sketches}{璇佹槑鎻愯} +\providetranslation{proof sketches}{璇佹槑鎻愯} +\providetranslation{Sketch of Proof}{璇佹槑鎻愯} +\providetranslation{Sketch of Proofs}{璇佹槑鎻愯} +\providetranslation{Sketch of proof}{璇佹槑鎻愯} +\providetranslation{Sketch of proofs}{璇佹槑鎻愯} +\providetranslation{sketch of proof}{璇佹槑鎻愯} +\providetranslation{sketch of proofs}{璇佹槑鎻愯} +\providetranslation{Propositions}{鍛介} +\providetranslation{propositions}{鍛介} +\providetranslation{Proposition}{鍛介} +\providetranslation{proposition}{鍛介} +\providetranslation{Remarks}{娉▆ +\providetranslation{remarks}{娉▆ +\providetranslation{Remark}{娉▆ +\providetranslation{remark}{娉▆ +\providetranslation{Solutions}{瑙 +\providetranslation{solutions}{瑙 +\providetranslation{Solution}{瑙 +\providetranslation{solution}{瑙 +\providetranslation{Theorems}{瀹氱悊} +\providetranslation{theorems}{瀹氱悊} +\providetranslation{Theorem}{瀹氱悊} +\providetranslation{theorem}{瀹氱悊} +%% +%% +%% End of file `translator-theorem-dictionary-ChineseUTF8.dict'. 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 584a58a0105..bb0cfb50ea5 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `luatex') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {LuaLaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-luatex.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\ExplFileDescription} \msg_new:nnn { ctex } { luatexja-loaded } { Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\ @@ -624,6 +624,7 @@ { \CJKfamily { \CJKfamilydefault } } { \cs_set_eq:NN \reset@font \normalfont } { \ctex_patch_failure:N \normalfont } +\ctex_at_end_preamble:n { \ctex_update_default_family: } \cs_new_protected_nopar:Npn \ctex_ltj_ensure_default_family: { \prop_if_empty:NF \g__ctex_ltj_family_font_name_prop @@ -1009,7 +1010,6 @@ } \ctex_ltj_ensure_default_family: } -\ctex_at_end_preamble:n { \ctex_update_default_family: } \tl_new:N \l__ctex_family_default_init_tl \cs_new_eq:NN \__ctex_family_default_wrap:n \use:n \tl_set:Nx \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 f4d9c367d76..617423d572e 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `pdftex') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,17 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {(pdf)LaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-pdftex.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\ExplFileDescription} +\cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1 + { + \AtBeginDvi { #1 } + \ctex_at_end_package:nn { atbegshi } + { \AtBeginShipoutFirst { #1 } } + } +\@onlypreamble \ctex_set_zhmap:n \seq_new:N \c__ctex_cmap_encoding_seq \seq_set_from_clist:Nn \c__ctex_cmap_encoding_seq { C19 , C10 , C00 , C09 , C40 , C60 } @@ -57,11 +64,11 @@ \cs_new_protected_nopar:Npn \__ctex_save_cmap:Nn #1#2 { \tl_set:Nx \l__ctex_tmp_tl { \str_lower_case:n {#2} \CJK@plane } - \tex_immediate:D \pdfobj stream ~ file { \l__ctex_tmp_tl .cmap } + \tex_immediate:D \pdftex_pdfobj:D stream ~ file { \l__ctex_tmp_tl .cmap } \cs_new_protected_nopar:Npx #1 { - \exp_not:N \pdffontattr \exp_not:N \font - { /ToUnicode ~ \int_use:N \pdflastobj \c_space_tl 0 ~ R } + \exp_not:N \pdftex_pdffontattr:D \exp_not:N \tex_font:D + { /ToUnicode ~ \int_use:N \pdftex_pdflastobj:D \c_space_tl 0 ~ R } } } \group_begin: @@ -91,11 +98,9 @@ \tl_set:Nn \CJKrmdefault {#1} \tl_set:Nn \CJKsfdefault {#2} \tl_set:Nn \CJKttdefault {#3} - \AtBeginDvi { \file_input:n {#4} } - \ctex_at_end_package:nn { atbegshi } - { \AtBeginShipoutFirst { \file_input:n {#4} } } + \ctex_set_zhmap:n { \file_input:n {#4} } } - \@onlypreamble \ctex_load_zhmap:n + \@onlypreamble \ctex_load_zhmap:nnnn \tl_if_exist:NF \CJKfamilydefault { \tl_const:Nn \CJKfamilydefault { \CJKrmdefault } } \tl_if_exist:NF \CJKrmdefault { \tl_new:N \CJKrmdefault } @@ -160,6 +165,7 @@ \str_if_eq_x:nnF { \l__ctex_punct_tl } { quanjiao } { \punctstyle { \l__ctex_punct_tl } } } +\ctex_at_end_preamble:n { \ctex_update_default_family: } \reverse_if:N \if_bool:N \g__ctex_zhmCJK_bool \str_if_eq:onF { \l__ctex_encoding_tl } { UTF8 } { @@ -254,7 +260,6 @@ \group_end: } } -\ctex_at_end_preamble:n { \ctex_update_default_family: } \tl_new:N \l__ctex_family_default_init_tl \cs_new_eq:NN \__ctex_family_default_wrap:n \use:n \tl_set:Nx \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 new file mode 100644 index 00000000000..a65526b2deb --- /dev/null +++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-uptex.def @@ -0,0 +1,209 @@ +%% +%% This is file `ctex-engine-uptex.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% ctex.dtx (with options: `uptex') +%% +%% Copyright (C) 2003--2016 +%% 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. +%% +%% ------------------------------------------------------------------------------ +%% +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ + {upTeX adapter (CTEX)} +\ProvidesExplFile{ctex-engine-uptex.def} + {\ExplFileDate}{2.4}{\ExplFileDescription} +\cs_new_protected_nopar:Npn \ctex_set_zhmap:n #1 + { + \AtBeginDvi { #1 } + \ctex_at_end_package:nn { atbegshi } + { \AtBeginShipoutFirst { #1 } } + } +\@onlypreamble \ctex_set_zhmap:n +\tl_set:Nn \CJKrmdefault { rm } +\tl_set:Nn \CJKsfdefault { sf } +\tl_set:Nn \CJKttdefault { tt } +\tl_set:Nn \CJKfamilydefault { \CJKrmdefault } +\tl_put_left:Nn \rmfamily { \kanjifamily { \CJKrmdefault } } +\tl_put_left:Nn \sffamily { \kanjifamily { \CJKsfdefault } } +\tl_put_left:Nn \ttfamily { \kanjifamily { \CJKttdefault } } +\NewDocumentCommand \CJKfamily { m } + { + \kanjifamily { #1 } + \selectfont + } +\tl_set:Nn \kanjifamilydefault { \CJKfamilydefault } +\ctex_patch_cmd:Nnn \em + { \mcfamily \upshape \else \gtfamily \itshape } + { \eminnershape \else \itshape } +\cs_new_protected_nopar:Npn \ctex_set_upfamily:nnn #1 #2 #3 + { + \DeclareKanjiFamily{JY2}{#1}{} + \DeclareKanjiFamily{JT2}{#1}{} + \DeclareFontShape{JY2}{#1}{m}{n}{<->~ #2-h}{} + \DeclareFontShape{JT2}{#1}{m}{n}{<->~ #2-v}{} + \tl_if_empty:nF { #3 } + { + \DeclareFontShape{JY2}{#1}{bx}{n}{<->~ #3-h}{} + \DeclareFontShape{JT2}{#1}{bx}{n}{<->~ #3-v}{} + } + } +\@onlypreamble \ctex_set_upfamily:nnn +\cs_new_protected_nopar:Npn \ctex_set_upmap:nnn #1 #2 #3 + { + \ctex_set_zhmap:n + { + \special{ pdf:mapline~ #1-h~ UniGB-UTF16-H~ #2 } + \special{ pdf:mapline~ #1-v~ UniGB-UTF16-V~ #2 } + \tl_if_empty:nF { #3 } + { + \special{ pdf:mapline~ #1b-h~ UniGB-UTF16-H~ #3 } + \special{ pdf:mapline~ #1b-v~ UniGB-UTF16-V~ #3 } + } + } + } +\@onlypreamble \ctex_set_upmap:nnn +\cs_new_protected_nopar:Npn \ctex_set_upfonts:nnnnnn #1 #2 #3 #4 #5 #6 + { + \ctex_set_upmap:nnn { upserif } { #1 } { #2 } + \ctex_set_upmap:nnn { upserifit } { #3 } {} + \ctex_set_upmap:nnn { upsans } { #4 } { #5 } + \ctex_set_upmap:nnn { upmono } { #6 } {} + } +\@onlypreamble \ctex_set_upfonts:nnnnnn +\cs_set_nopar:Npn \@EverySelectfont@Init + { + \ctex_patch_cmd:Nnn \selectfont + { \enc@update } + { + \@EverySelectfont@EveryHook + \@EverySelectfont@AtNextHook + \gdef \@EverySelectfont@AtNextHook { } + \enc@update + } + \@ifpackageloaded { tracefnt } + { + \EverySelectfont + { + \ifnum \tracingfonts > \tw@ + \@font@info { Switching~ to~ \font@name } + \fi + } + } + { } + \let \@EverySelectfont@Init \undefined + } +\cs_new_protected_nopar:Npn \ctex_detected_platform: + { + \file_if_exist:nTF { /dev/null } + { + \file_if_exist:nTF { nul: } + { + \file_if_exist:nTF { \c__ctex_upper_case_file_str } + { \ctex_if_macosx:TF { mac } { windows } } + { \ctex_if_macosx:TF { mac } { fandol } } + } + { \ctex_if_macosx:TF { mac } { fandol } } + } + { \tl_gset:Nn \g__ctex_fontset_tl { windows } } + } +\str_const:Nx \c__ctex_upper_case_file_str + { \exp_args:No \str_upper_case:n { \g_file_current_name_tl } } +\cs_new_protected_nopar:Npn \ctex_if_macosx:TF #1#2 + { + \file_if_exist:nTF { \c__ctex_macosx_file_str } + { \tl_gset:Nn \g__ctex_fontset_tl {#1} } + { \tl_gset:Nn \g__ctex_fontset_tl {#2} } + } +\str_const:Nn \c__ctex_macosx_file_str { /Library/Fonts/Songti.ttc } +\PassOptionsToPackage { dvipdfmx } { hyperref } +\ctex_at_end_package:nn { hyperref } + { + \AtBeginShipoutFirst{ \special{ pdf:tounicode~ UTF8-UTF16 } } + } +\clist_map_inline:nn + { underdot , underline , underdblline , underwave , sout , xout } + { \cs_new_eq:cN { CTEX#1 } \use:n } +\cs_new_eq:NN \CTEXfilltwosides \use_none:n +\cs_new_eq:NN \endCTEXfilltwosides \prg_do_nothing: +\cs_new_protected_nopar:Npn \ctex_update_ccwd: + { \skip_set:Nn \ccwd { 1zw } } +\dim_new:N \ccwd +\cs_new_protected_nopar:Npn \ctex_update_ccglue: + { \kanjiskip \l__ctex_ccglue_skip } +\skip_new:N \l__ctex_ccglue_skip +\prg_new_conditional:Npnn \ctex_if_ccglue_touched: { TF } + { + \skip_if_eq:nnTF { \l__ctex_ccglue_skip } { \kanjiskip } + { \prg_return_false: } { \prg_return_true: } + } +\cs_new_protected_nopar:Npn \ctex_update_em_unit: + { \dim_set:Nn \ccwd { 1zw } } +\cs_new_protected:Npn \ctex_add_to_selectfont:n #1 + { + \cs_set_protected_nopar:Npx \CTEX@selectfont@hook + { \exp_not:o { \CTEX@selectfont@hook #1 } } + } +\cs_new_eq:NN \CTEX@selectfont@hook \prg_do_nothing: +\cs_new_eq:Nc \__ctex_save_selectfont: { selectfont ~ } +\ctex_preto_cmd:NnnTF \selectfont { \ExplSyntaxOff } + { \CTEX@selectfont@hook } + { + \tl_put_left:Nn \@EverySelectfont@Init + { \cs_set_eq:cN { selectfont ~ } \__ctex_save_selectfont: } + } + { \ctex_patch_failure:N \selectfont } +\EverySelectfont { \CTEX@selectfont@hook } +\keys_define:nn { ctex } + { + space .code:n = + { \msg_warning:nn { ctex } { invalid-option } } + } +\keys_define:nn { ctex } + { + punct .code:n = + { + \tl_set:Nx \l__ctex_punct_tl { #1 } + \msg_warning:nn { ctex } { invalid-option } + } , + punct .default:n = { quanjiao } , + } +\tl_set:Nn \l__ctex_encoding_tl { UTF8 } +\DeclareKanjiFamily{JY2}{rm}{} +\DeclareKanjiFamily{JY2}{sf}{} +\DeclareKanjiFamily{JY2}{tt}{} +\DeclareKanjiFamily{JT2}{rm}{} +\DeclareKanjiFamily{JT2}{sf}{} +\DeclareKanjiFamily{JT2}{tt}{} +\DeclareFontShape{JY2}{rm}{m}{n}{<-> upzhserif-h}{} +\DeclareFontShape{JY2}{rm}{m}{it}{<-> upzhserifit-h}{} +\DeclareFontShape{JY2}{rm}{bx}{n}{<-> upzhserifb-h}{} +\DeclareFontShape{JT2}{rm}{m}{n}{<-> upzhserif-v}{} +\DeclareFontShape{JT2}{rm}{m}{it}{<-> upzhserifit-v}{} +\DeclareFontShape{JT2}{rm}{bx}{n}{<-> upzhserifb-v}{} +\DeclareFontShape{JY2}{sf}{m}{n}{<-> upzhsans-h}{} +\DeclareFontShape{JY2}{sf}{bx}{n}{<-> upzhsansb-h}{} +\DeclareFontShape{JT2}{sf}{m}{n}{<-> upzhsans-v}{} +\DeclareFontShape{JT2}{sf}{bx}{n}{<-> upzhsansb-v}{} +\DeclareFontShape{JY2}{tt}{m}{n}{<-> upzhmono-h}{} +\DeclareFontShape{JT2}{tt}{m}{n}{<-> upzhmono-v}{} +%% +%% +%% End of file `ctex-engine-uptex.def'. 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 d45315f24d2..7feeba4bec6 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `xetex') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {XeLaTeX adapter (CTEX)} \ProvidesExplFile{ctex-engine-xetex.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\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 515d96783ca..7506015cdec 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c19rm.fd @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `rm,c19') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -27,7 +27,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesFile{c19rm.fd}% - [2016/02/02 v2.3 Chinese font definition (CTEX)] + [2016/04/23 v2.4 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 91a3e0b12f6..948e6586357 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c19sf.fd @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `sf,c19') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -27,7 +27,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesFile{c19sf.fd}% - [2016/02/02 v2.3 Chinese font definition (CTEX)] + [2016/04/23 v2.4 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 d35485a2621..7e11f2b97b2 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c19tt.fd @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `tt,c19') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -27,7 +27,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesFile{c19tt.fd}% - [2016/02/02 v2.3 Chinese font definition (CTEX)] + [2016/04/23 v2.4 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 0e96bf9e32b..0601b235974 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c70rm.fd @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `rm,c70') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -27,7 +27,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesFile{c70rm.fd}% - [2016/02/02 v2.3 Chinese font definition (CTEX)] + [2016/04/23 v2.4 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 02708a6b676..39378da7c61 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c70sf.fd @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `sf,c70') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -27,7 +27,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesFile{c70sf.fd}% - [2016/02/02 v2.3 Chinese font definition (CTEX)] + [2016/04/23 v2.4 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 fcb5bc5137a..50ee185a3ae 100644 --- a/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd +++ b/Master/texmf-dist/tex/latex/ctex/fd/c70tt.fd @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `tt,c70') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -27,7 +27,7 @@ %% ------------------------------------------------------------------------------ %% \ProvidesFile{c70tt.fd}% - [2016/02/02 v2.3 Chinese font definition (CTEX)] + [2016/04/23 v2.4 Chinese font definition (CTEX)] %% %% Chinese characters %% 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 60bd1c0c957..ba3011e1c30 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fontset,adobe') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Adobe fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-adobe.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\ExplFileDescription} \sys_if_engine_pdftex:TF { \sys_if_output_pdf:TF @@ -71,17 +71,30 @@ } } { - \setCJKmainfont - [ - BoldFont = AdobeHeitiStd-Regular , - ItalicFont = AdobeKaitiStd-Regular - ] { AdobeSongStd-Light } - \setCJKsansfont { AdobeHeitiStd-Regular} - \setCJKmonofont { AdobeFangsongStd-Regular} - \setCJKfamilyfont { zhsong } { AdobeSongStd-Light } - \setCJKfamilyfont { zhhei } { AdobeHeitiStd-Regular } - \setCJKfamilyfont { zhfs } { AdobeFangsongStd-Regular } - \setCJKfamilyfont { zhkai } { AdobeKaitiStd-Regular } + \sys_if_engine_uptex:TF + { + \ctex_set_upfonts:nnnnnn + {AdobeSongStd-Light.otf} {AdobeHeitiStd-Regular.otf} {AdobeKaitiStd-Regular.otf} + {AdobeHeitiStd-Regular.otf} {AdobeHeitiStd-Regular.otf} + {AdobeFangsongStd-Regular.otf} + \ctex_set_upfamily:nnn { zhsong } { upzhserif } {} + \ctex_set_upfamily:nnn { zhhei } { upzhsans } {} + \ctex_set_upfamily:nnn { zhfs } { upzhmono} {} + \ctex_set_upfamily:nnn { zhkai } { upzhserifit } {} + } + { + \setCJKmainfont + [ + BoldFont = AdobeHeitiStd-Regular , + ItalicFont = AdobeKaitiStd-Regular + ] { AdobeSongStd-Light } + \setCJKsansfont { AdobeHeitiStd-Regular} + \setCJKmonofont { AdobeFangsongStd-Regular} + \setCJKfamilyfont { zhsong } { AdobeSongStd-Light } + \setCJKfamilyfont { zhhei } { AdobeHeitiStd-Regular } + \setCJKfamilyfont { zhfs } { AdobeFangsongStd-Regular } + \setCJKfamilyfont { zhkai } { AdobeKaitiStd-Regular } + } } \NewDocumentCommand \songti { } { \CJKfamily { zhsong } } \NewDocumentCommand \heiti { } { \CJKfamily { 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 955f3686992..bc41f538eeb 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fontset,fandol') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Fandol fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-fandol.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\ExplFileDescription} \sys_if_engine_pdftex:TF { \sys_if_output_pdf:TF @@ -82,17 +82,30 @@ } } { - \setCJKmainfont - [ Extension = .otf , BoldFont = FandolSong-Bold , ItalicFont = FandolKai-Regular ] - { FandolSong-Regular } - \setCJKsansfont [ Extension = .otf , BoldFont = FandolHei-Bold ] { FandolHei-Regular } - \setCJKmonofont [ Extension = .otf ] { FandolFang-Regular } - \setCJKfamilyfont { zhsong } - [ Extension = .otf , BoldFont = FandolSong-Bold ] { FandolSong-Regular } - \setCJKfamilyfont { zhhei } - [ Extension = .otf , BoldFont = FandolHei-Bold ] { FandolHei-Regular } - \setCJKfamilyfont { zhfs } [ Extension = .otf ] { FandolFang-Regular } - \setCJKfamilyfont { zhkai } [ Extension = .otf ] { FandolKai-Regular } + \sys_if_engine_uptex:TF + { + \ctex_set_upfonts:nnnnnn + {FandolSong-Regular.otf} {FandolSong-Bold.otf} {FandolKai-Regular.otf} + {FandolHei-Regular.otf} {FandolHei-Bold.otf} + {FandolFang-Regular.otf} + \ctex_set_upfamily:nnn { zhsong } { upzhserif } { upzhserifb } + \ctex_set_upfamily:nnn { zhhei } { upzhsans } { upzhsansb } + \ctex_set_upfamily:nnn { zhfs } { upzhmono} {} + \ctex_set_upfamily:nnn { zhkai } { upzhserifit } {} + } + { + \setCJKmainfont + [ Extension = .otf , BoldFont = FandolSong-Bold , ItalicFont = FandolKai-Regular ] + { FandolSong-Regular } + \setCJKsansfont [ Extension = .otf , BoldFont = FandolHei-Bold ] { FandolHei-Regular } + \setCJKmonofont [ Extension = .otf ] { FandolFang-Regular } + \setCJKfamilyfont { zhsong } + [ Extension = .otf , BoldFont = FandolSong-Bold ] { FandolSong-Regular } + \setCJKfamilyfont { zhhei } + [ Extension = .otf , BoldFont = FandolHei-Bold ] { FandolHei-Regular } + \setCJKfamilyfont { zhfs } [ Extension = .otf ] { FandolFang-Regular } + \setCJKfamilyfont { zhkai } [ Extension = .otf ] { FandolKai-Regular } + } } \NewDocumentCommand \songti { } { \CJKfamily { zhsong } } \NewDocumentCommand \heiti { } { \CJKfamily { 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 498d48c475c..d8fedd1c174 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fontset,founder') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Founder fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-founder.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\ExplFileDescription} \sys_if_engine_pdftex:TF { \ctex_zhmap_case:nnn @@ -63,17 +63,34 @@ { \ctex_fontset_error:n { founder } } } { - \setCJKmainfont - [ BoldFont = FZXiaoBiaoSong-B05 , ItalicFont = FZKai-Z03 ] { FZShuSong-Z01 } - \setCJKsansfont [ BoldFont = FZHei-B01 ] - { \sys_if_engine_xetex:TF { 鏂规缁嗛粦涓_GBK } { FZXH1K--GBK1-0 } } - \setCJKmonofont { FZFangSong-Z02 } - \setCJKfamilyfont { zhsong } [ BoldFont = FZXiaoBiaoSong-B05 ] { FZShuSong-Z01 } - \setCJKfamilyfont { zhhei } { FZHei-B01 } - \setCJKfamilyfont { zhkai } { FZKai-Z03 } - \setCJKfamilyfont { zhfs } { FZFangSong-Z02 } - \setCJKfamilyfont { zhli } { FZLiShu-S01 } - \setCJKfamilyfont { zhyou } [ BoldFont = FZZhunYuan-M02 ] { FZXiYuan-M01 } + \sys_if_engine_uptex:TF + { + \ctex_set_upfonts:nnnnnn + { FZSSK.TTF } { FZXBSK.TTF } { FZKTK.TTF } + { FZXH1K.TTF } { FZHTK.TTF } + { FZFSK.TTF } + \ctex_set_upfamily:nnn { zhsong } { upzhserif } { upzhserifb } + \ctex_set_upfamily:nnn { zhhei } { upzhsans } { upzhsansb } + \ctex_set_upfamily:nnn { zhfs } { upzhmono} {} + \ctex_set_upfamily:nnn { zhkai } { upzhserifit } {} + \ctex_set_upfamily:nnn { zhli } { upschrm } {} + \ctex_set_upmap:nnn { upstsl } { FZLSK.TTF } {} + \ctex_set_upfamily:nnn { zhyou } { upschgt } {} + \ctex_set_upmap:nnn { upstht } { FZY1K.TTF } {} + } + { + \setCJKmainfont + [ BoldFont = FZXiaoBiaoSong-B05 , ItalicFont = FZKai-Z03 ] { FZShuSong-Z01 } + \setCJKsansfont [ BoldFont = FZHei-B01 ] + { \sys_if_engine_xetex:TF { 鏂规缁嗛粦涓_GBK } { FZXH1K--GBK1-0 } } + \setCJKmonofont { FZFangSong-Z02 } + \setCJKfamilyfont { zhsong } [ BoldFont = FZXiaoBiaoSong-B05 ] { FZShuSong-Z01 } + \setCJKfamilyfont { zhhei } { FZHei-B01 } + \setCJKfamilyfont { zhkai } { FZKai-Z03 } + \setCJKfamilyfont { zhfs } { FZFangSong-Z02 } + \setCJKfamilyfont { zhli } { FZLiShu-S01 } + \setCJKfamilyfont { zhyou } [ BoldFont = FZZhunYuan-M02 ] { FZXiYuan-M01 } + } } \NewDocumentCommand \songti { } { \CJKfamily { zhsong } } \NewDocumentCommand \heiti { } { \CJKfamily { 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 d35c93356c2..e064e258d0f 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fontset,mac') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,20 +26,24 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Mac OS X fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-mac.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\ExplFileDescription} \sys_if_engine_pdftex:TF { \ctex_fontset_error:n { mac } } { - \setCJKmainfont [ BoldFont = STHeiti , ItalicFont = STKaiti ] { STSong } - \setCJKsansfont [ BoldFont = STHeiti ] { STXihei } - \setCJKmonofont { STFangsong } - \setCJKfamilyfont { zhsong } { STSong } - \setCJKfamilyfont { zhhei } { STHeiti } - \setCJKfamilyfont { zhfs } { STFangsong } - \setCJKfamilyfont { zhkai } { STKaiti } + \sys_if_engine_uptex:TF + { \ctex_fontset_error:n { mac } } + { + \setCJKmainfont [ BoldFont = STHeiti , ItalicFont = STKaiti ] { STSong } + \setCJKsansfont [ BoldFont = STHeiti ] { STXihei } + \setCJKmonofont { STFangsong } + \setCJKfamilyfont { zhsong } { STSong } + \setCJKfamilyfont { zhhei } { STHeiti } + \setCJKfamilyfont { zhfs } { STFangsong } + \setCJKfamilyfont { zhkai } { STKaiti } + } } \NewDocumentCommand \songti { } { \CJKfamily { zhsong } } \NewDocumentCommand \heiti { } { \CJKfamily { zhhei } } 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 2a66dea15ac..f48c6c85408 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fontset,ubuntu') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Ubuntu fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-ubuntu.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\ExplFileDescription} \sys_if_engine_pdftex:TF { \ctex_zhmap_case:nnn @@ -58,13 +58,25 @@ { \ctex_fontset_error:n { ubuntu } } } { - \setCJKmainfont - [ BoldFont = WenQuanYi~Zen~Hei , ItalicFont = AR~PL~UKai~CN ] { AR~PL~UMing~CN } - \setCJKsansfont { WenQuanYi~Zen~Hei } - \setCJKmonofont { AR~PL~UMing~CN } - \setCJKfamilyfont { zhsong } { AR~PL~UMing~CN } - \setCJKfamilyfont { zhhei } { WenQuanYi~Zen~Hei } - \setCJKfamilyfont { zhkai } { AR~PL~UKai~CN } + \sys_if_engine_uptex:TF + { + \ctex_set_upfonts:nnnnnn + { uming.ttc } { wqy-zenhei.ttc } { ukai.ttc } + { wqy-zenhei.ttc } { wqy-zenhei.ttc } + { uming.ttc } + \ctex_set_upfamily:nnn { zhsong } { upzhserif } {} + \ctex_set_upfamily:nnn { zhhei } { upzhsans } {} + \ctex_set_upfamily:nnn { zhkai } { upzhserifit } {} + } + { + \setCJKmainfont + [ BoldFont = WenQuanYi~Zen~Hei , ItalicFont = AR~PL~UKai~CN ] { AR~PL~UMing~CN } + \setCJKsansfont { WenQuanYi~Zen~Hei } + \setCJKmonofont { AR~PL~UMing~CN } + \setCJKfamilyfont { zhsong } { AR~PL~UMing~CN } + \setCJKfamilyfont { zhhei } { WenQuanYi~Zen~Hei } + \setCJKfamilyfont { zhkai } { AR~PL~UKai~CN } + } } \NewDocumentCommand \songti { } { \CJKfamily { zhsong } } \NewDocumentCommand \heiti { } { \CJKfamily { 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 8bd30d60680..20505f507e8 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fontset,windows') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Windows fonts definition (CTEX)} \ProvidesExplFile{ctex-fontset-windows.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\ExplFileDescription} \file_if_exist:nTF { C:/boot.ini } { \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 c880cbddba4..0419b85047b 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fontset,windowsnew') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,17 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Windows fonts definition for Vista or later version (CTEX)} \ProvidesExplFile{ctex-fontset-windowsnew.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\ExplFileDescription} +\tl_new:N \l__ctex_msyh_suffix +\tl_set:Nn \l__ctex_msyh_suffix { .ttc } +\file_if_exist:nF { C:/Windows/Fonts/msyh.ttc } + { + \file_if_exist:nF { msyh.ttc } + { \tl_set:Nn \l__ctex_msyh_suffix { .ttf } } + } \sys_if_engine_pdftex:TF { \ctex_zhmap_case:nnn @@ -37,17 +44,9 @@ \ctex_punct_set:n { windows } \setCJKmainfont [ BoldFont = simhei.ttf , ItalicFont = simkai.ttf ] { simsun.ttc } - \file_if_exist:nTF { C:/Windows/Fonts/msyh.ttc } - { - \setCJKsansfont [ BoldFont = msyhbd.ttc ] { msyh.ttc } - \setCJKfamilyfont { zhyahei } - [ BoldFont = msyhbd.ttc ] { msyh.ttc } - } - { - \setCJKsansfont [ BoldFont = msyhbd.ttf ] { msyh.ttf } - \setCJKfamilyfont { zhyahei } - [ BoldFont = msyhbd.ttf ] { msyh.ttf } - } + \setCJKsansfont [ BoldFont = msyhbd\l__ctex_msyh_suffix ] { msyh\l__ctex_msyh_suffix } + \setCJKfamilyfont { zhyahei } + [ BoldFont = msyhbd\l__ctex_msyh_suffix ] { msyh\l__ctex_msyh_suffix } \ctex_punct_map_family:nn { \CJKsfdefault } { zhyahei } \ctex_punct_map_bfseries:nn { \CJKsfdefault , zhyahei } { zhyaheib } \setCJKmonofont { simfang.ttf } @@ -76,19 +75,37 @@ } } { - \setCJKmainfont - [ BoldFont = SimHei , ItalicFont = KaiTi ] { SimSun } - \setCJKsansfont - [ BoldFont = { *~Bold } ] { Microsoft~YaHei } - \setCJKmonofont { FangSong } - \setCJKfamilyfont { zhkai } { KaiTi } - \setCJKfamilyfont { zhfs } { FangSong } - \setCJKfamilyfont { zhsong } { SimSun } - \setCJKfamilyfont { zhhei } { SimHei } - \setCJKfamilyfont { zhli } { LiSu } - \setCJKfamilyfont { zhyou } { YouYuan } - \setCJKfamilyfont { zhyahei } - [ BoldFont = { *~Bold } ] { Microsoft~YaHei } + \sys_if_engine_uptex:TF + { + \ctex_set_upfonts:nnnnnn + {simsun.ttc} {simhei.ttf} {simkai.ttf} + {msyh\l__ctex_msyh_suffix} {msyhbd\l__ctex_msyh_suffix} + {simfang.ttf} + \ctex_set_upfamily:nnn { zhsong } { upzhserif } {} + \ctex_set_upfamily:nnn { zhhei } { upzhserifb } {} + \ctex_set_upfamily:nnn { zhfs } { upzhmono} {} + \ctex_set_upfamily:nnn { zhkai } { upzhserifit } {} + \ctex_set_upfamily:nnn { zhyahei } { upzhsans } { upzhsansb } + \ctex_set_upfamily:nnn { zhli } { upschrm } {} + \ctex_set_upmap:nnn { upstsl } { simli.ttf } {} + \ctex_set_upfamily:nnn { zhyou } { upschgt } {} + \ctex_set_upmap:nnn { upstht } { simyou.ttf } {} + } + { + \setCJKmainfont + [ BoldFont = SimHei , ItalicFont = KaiTi ] { SimSun } + \setCJKsansfont + [ BoldFont = { *~Bold } ] { Microsoft~YaHei } + \setCJKmonofont { FangSong } + \setCJKfamilyfont { zhkai } { KaiTi } + \setCJKfamilyfont { zhfs } { FangSong } + \setCJKfamilyfont { zhsong } { SimSun } + \setCJKfamilyfont { zhhei } { SimHei } + \setCJKfamilyfont { zhli } { LiSu } + \setCJKfamilyfont { zhyou } { YouYuan } + \setCJKfamilyfont { zhyahei } + [ BoldFont = { *~Bold } ] { Microsoft~YaHei } + } } \NewDocumentCommand \songti { } { \CJKfamily { zhsong } } \NewDocumentCommand \heiti { } { \CJKfamily { zhhei } } 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 3060142d09b..5ba0b77c9ae 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `fontset,windowsold') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Windows fonts definition for XP or earlier version (CTEX)} \ProvidesExplFile{ctex-fontset-windowsold.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\ExplFileDescription} \sys_if_engine_pdftex:TF { \ctex_zhmap_case:nnn @@ -65,16 +65,33 @@ } } { - \setCJKmainfont - [ BoldFont = SimHei , ItalicFont = KaiTi_GB2312 ] { SimSun } - \setCJKsansfont { SimHei } - \setCJKmonofont { FangSong_GB2312 } - \setCJKfamilyfont { zhkai } { KaiTi_GB2312 } - \setCJKfamilyfont { zhfs } { FangSong_GB2312 } - \setCJKfamilyfont { zhsong } { SimSun } - \setCJKfamilyfont { zhhei } { SimHei } - \setCJKfamilyfont { zhli } { LiSu } - \setCJKfamilyfont { zhyou } { YouYuan } + \sys_if_engine_uptex:TF + { + \ctex_set_upfonts:nnnnnn + {simsun.ttc} {simhei.ttf} {simkai.ttf} + {simhei.ttf} {simhei.ttf} + {simfang.ttf} + \ctex_set_upfamily:nnn { zhsong } { upzhserif } {} + \ctex_set_upfamily:nnn { zhhei } { upzhserifb } {} + \ctex_set_upfamily:nnn { zhfs } { upzhmono} {} + \ctex_set_upfamily:nnn { zhkai } { upzhserifit } {} + \ctex_set_upfamily:nnn { zhli } { upschrm } {} + \ctex_set_upmap:nnn { upstsl } { simli.ttf } {} + \ctex_set_upfamily:nnn { zhyou } { upschgt } {} + \ctex_set_upmap:nnn { upstht } { simyou.ttf } {} + } + { + \setCJKmainfont + [ BoldFont = SimHei , ItalicFont = KaiTi_GB2312 ] { SimSun } + \setCJKsansfont { SimHei } + \setCJKmonofont { FangSong_GB2312 } + \setCJKfamilyfont { zhkai } { KaiTi_GB2312 } + \setCJKfamilyfont { zhfs } { FangSong_GB2312 } + \setCJKfamilyfont { zhsong } { SimSun } + \setCJKfamilyfont { zhhei } { SimHei } + \setCJKfamilyfont { zhli } { LiSu } + \setCJKfamilyfont { zhyou } { YouYuan } + } } \NewDocumentCommand \songti { } { \CJKfamily { zhsong } } \NewDocumentCommand \heiti { } { \CJKfamily { zhhei } } 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 6db47b31cc8..74052f63371 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `scheme,article,chinese') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Chinese scheme for article (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-article.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\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 new file mode 100644 index 00000000000..a2c5108e1e3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-chinese-beamer.def @@ -0,0 +1,84 @@ +%% +%% This is file `ctex-scheme-chinese-beamer.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% ctex.dtx (with options: `scheme,beamer,chinese') +%% +%% Copyright (C) 2003--2016 +%% 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. +%% +%% ------------------------------------------------------------------------------ +%% +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ + {Chinese scheme for beamer (CTEX)} +\ProvidesExplFile{ctex-scheme-chinese-beamer.def} + {\ExplFileDate}{2.4}{\ExplFileDescription} +\keys_set:nn { ctex / part } + { + aftertitle = \par , + number = \chinese { part } , + format = \centering , + nameformat = \usebeamerfont { part ~ name } + \usebeamercolor [fg] { part ~ name } , + aftername = \vskip 1em \par , + titleformat = \usebeamerfont { part ~ title } + } +\keys_set:nn { ctex / section } + { + format = \centering , + number = \insertsectionnumber , + nameformat = \usebeamerfont { section ~ name } + \usebeamercolor [fg] { section ~ name } , + aftername = \vskip 1em \par , + titleformat = \usebeamerfont { section ~ title } , + aftertitle = \par + } +\keys_set:nn { ctex / subsection } + { + number = \arabic { section } . \arabic { subsection } , + format = \centering , + nameformat = \usebeamerfont { subsection ~ name } + \usebeamercolor [fg] { subsection ~ name } , + aftername = \vskip 1em \par , + titleformat = \usebeamerfont { subsection ~ title } , + aftertitle = \par + } +\str_if_eq:onTF { \l__ctex_encoding_tl } { GBK } + { + \uselanguage { ChineseGBK } + \languagealias { chinese } { ChineseGBK } + \ctex_file_input:n { ctex-name-gbk.cfg } + } + { + \uselanguage { ChineseUTF8 } + \languagealias { chinese } { ChineseUTF8 } + \ctex_file_input:n { ctex-name-utf8.cfg } + } +\clist_put_left:Nn \trans@languagepath { chinese } +\keys_set:nn { ctex } { today = small } +\int_compare:nNnF \g__ctex_font_size_flag > \c_minus_one + { \cs_gset_eq:NN \g__ctex_font_size_flag \c_zero } +\fp_compare:nNnT { \l__ctex_line_spread_fp } ? { \c_zero_fp } + { \keys_set:nn { ctex / option } { linespread = 1.3 } } +\ctex_if_autoindent_touched:F + { \keys_set:nn { ctex } { autoindent = true } } +%% +%% +%% End of file `ctex-scheme-chinese-beamer.def'. 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 ae26395987c..4bd8d9c9fd1 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `scheme,book,chinese') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Chinese scheme for book (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-book.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\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 37d2bddca38..d825a37678e 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `scheme,report,chinese') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Chinese scheme for report (CTEX)} \ProvidesExplFile{ctex-scheme-chinese-report.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\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 08db97bfde2..d2ef35d84c6 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `scheme,generic,chinese') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,13 +26,39 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Chinese scheme for generic (CTEX)} \ProvidesExplFile{ctex-scheme-chinese.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} -\str_if_eq:onTF { \l__ctex_encoding_tl } { GBK } - { \ctex_file_input:n { ctex-name-gbk.cfg } } - { \ctex_file_input:n { ctex-name-utf8.cfg } } + {\ExplFileDate}{2.4}{\ExplFileDescription} +\tl_if_exist:NTF \c__ctex_std_class_tl + { + \str_if_eq:onTF { \c__ctex_std_class_tl } { beamer } + { + \str_if_eq:onTF { \l__ctex_encoding_tl } { GBK } + { + \uselanguage { ChineseGBK } + \languagealias { chinese } { ChineseGBK } + \ctex_file_input:n { ctex-name-gbk.cfg } + } + { + \uselanguage { ChineseUTF8 } + \languagealias { chinese } { ChineseUTF8 } + \ctex_file_input:n { ctex-name-utf8.cfg } + } + \clist_put_left:Nn \trans@languagepath { chinese } + } + { + \str_if_eq:onTF { \l__ctex_encoding_tl } { GBK } + { \ctex_file_input:n { ctex-name-gbk.cfg } } + { \ctex_file_input:n { ctex-name-utf8.cfg } } + \RequirePackage { indentfirst } + } + } + { + \str_if_eq:onTF { \l__ctex_encoding_tl } { GBK } + { \ctex_file_input:n { ctex-name-gbk.cfg } } + { \ctex_file_input:n { ctex-name-utf8.cfg } } + } \keys_set:nn { ctex } { today = small } \int_compare:nNnF \g__ctex_font_size_flag > \c_minus_one { \cs_gset_eq:NN \g__ctex_font_size_flag \c_zero } @@ -40,8 +66,6 @@ { \keys_set:nn { ctex / option } { linespread = 1.3 } } \ctex_if_autoindent_touched:F { \keys_set:nn { ctex } { autoindent = true } } -\tl_if_exist:NT \c__ctex_std_class_tl - { \RequirePackage { indentfirst } } %% %% %% End of file `ctex-scheme-chinese.def'. 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 c1845cd0437..ab11b96b27a 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `scheme,article,plain') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Plain scheme for article (CTEX)} \ProvidesExplFile{ctex-scheme-plain-article.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\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 new file mode 100644 index 00000000000..796c4b81aac --- /dev/null +++ b/Master/texmf-dist/tex/latex/ctex/scheme/ctex-scheme-plain-beamer.def @@ -0,0 +1,68 @@ +%% +%% This is file `ctex-scheme-plain-beamer.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% ctex.dtx (with options: `scheme,beamer,plain') +%% +%% Copyright (C) 2003--2016 +%% 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. +%% +%% ------------------------------------------------------------------------------ +%% +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ + {Plain scheme for beamer (CTEX)} +\ProvidesExplFile{ctex-scheme-plain-beamer.def} + {\ExplFileDate}{2.4}{\ExplFileDescription} +\keys_set:nn { ctex / part } + { + aftertitle = \par , + name = \partname \space , + number = \insertromanpartnumber , + format = \centering , + nameformat = \usebeamerfont { part ~ name } + \usebeamercolor [fg] { part ~ name } , + aftername = \vskip 1em \par , + titleformat = \usebeamerfont { part ~ title } + } +\keys_set:nn { ctex / section } + { + name = \sectionname \space , + format = \centering , + number = \insertsectionnumber , + nameformat = \usebeamerfont { section ~ name } + \usebeamercolor [fg] { section ~ name } , + aftername = \vskip 1em \par , + titleformat = \usebeamerfont { section ~ title } , + aftertitle = \par + } +\keys_set:nn { ctex / subsection } + { + name = \subsectionname \space , + number = \insertsubsectionnumber , + format = \centering , + nameformat = \usebeamerfont { subsection ~ name } + \usebeamercolor [fg] { subsection ~ name } , + aftername = \vskip 1em \par , + titleformat = \usebeamerfont { subsection ~ title } , + aftertitle = \par + } +%% +%% +%% End of file `ctex-scheme-plain-beamer.def'. 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 34898a62706..8903bebe106 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `scheme,book,plain') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Plain scheme for book (CTEX)} \ProvidesExplFile{ctex-scheme-plain-book.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\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 946ed89e789..846177eaa15 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `scheme,report,plain') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Plain scheme for report (CTEX)} \ProvidesExplFile{ctex-scheme-plain-report.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\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 feddaa061c5..1823e0390e3 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 @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `scheme,generic,plain') %% -%% Copyright (C) 2003--2015 +%% Copyright (C) 2003--2016 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -26,10 +26,10 @@ %% %% ------------------------------------------------------------------------------ %% -\GetIdInfo$Id: ctex.dtx 4e02493 2016-02-02 17:10:17 +0800 Qing Lee $ +\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang $ {Plain scheme for generic (CTEX)} \ProvidesExplFile{ctex-scheme-plain.def} - {\ExplFileDate}{2.3}{\ExplFileDescription} + {\ExplFileDate}{2.4}{\ExplFileDescription} %% %% %% End of file `ctex-scheme-plain.def'. -- cgit v1.2.3