diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex/ctex.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/ctex/ctex.sty | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex.sty b/Master/texmf-dist/tex/latex/ctex/ctex.sty index 66bed8e069d..632b12b04f1 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctex.sty @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 1fcc459 2016-04-25 13:35:13 +0800 Liu Haiyang <leoliu.pku@gmail.com> $ +\GetIdInfo$Id: ctex.dtx f745b21 2016-05-14 12:17:18 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter in LaTeX (CTEX)} \ProvidesExplPackage{\ExplFileName} - {\ExplFileDate}{2.4}{\ExplFileDescription} + {\ExplFileDate}{2.4.1}{\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 } @@ -56,15 +56,17 @@ } \@ifpackagelater { expl3 } { 2015/12/20 } { } { \msg_error:nnn { ctex } { l3-too-old } { expl3 } } +\str_const:Nx \c__ctex_engine_str + { \cs_if_exist:NTF \ngostype { aptex } { \c_sys_engine_str } } \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 } + { You~can~switch~to~xelatex,~lualatex,~pdflatex,~uplatex,~or~aplatex. } +\file_if_exist:nTF { ctex-engine- \c__ctex_engine_str .def } { \str_const:Nx \c__ctex_engine_file_str - { ctex-engine- \c_sys_engine_str .def } + { ctex-engine- \c__ctex_engine_str .def } } - { \msg_critical:nnx { ctex } { engine-not-supported } { \c_sys_engine_str } } + { \msg_critical:nnx { ctex } { engine-not-supported } { \c__ctex_engine_str } } \RequirePackage { ctexhook , ctexpatch } \RequirePackage { fix-cm , everysel } \tl_new:N \l__ctex_tmp_tl @@ -155,7 +157,7 @@ \keys_define:nn { ctex / option } { zihao .choice: , - zihao .default:n = { 5 } , + zihao .value_required:n = true , 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 } , @@ -523,15 +525,17 @@ } \PassOptionsToPackage { encoding = \l__ctex_encoding_tl } { zhnumber } \RequirePackage { zhnumber } -\cs_new_eq:NN \chinese \zhnum +\cs_new_nopar:Npn \chinese { \zhnum_counter:n } +\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 } + \AddEnumerateCounter * { \zhnum } { \@zhnum } { 1 } + \AddEnumerateCounter * { \zhdig } { \@zhdig } { 1 } + \AddEnumerateCounter * { \chinese } { \@chinese } { 1 } } } \NewDocumentCommand \CTEXnumber { m m } @@ -823,6 +827,7 @@ %% ctexbook.cls, %% ctexrep.cls, %% ctexbeamer.cls, +%% ctxdoc.cls, %% ctexcap.sty, %% ctexhook.sty, %% ctexpatch.sty, @@ -849,6 +854,7 @@ %% ctex-engine-pdftex.def, %% ctex-engine-xetex.def, %% ctex-engine-luatex.def, +%% ctex-engine-aptex.def, %% ctex-engine-uptex.def, %% c19rm.fd, %% c19sf.fd, @@ -868,6 +874,7 @@ %% ctexpunct.spa, %% ctexmakespa.tex, %% ctexspamacro.tex, +%% ctxdocstrip.tex, %% zhadobefonts.tex, %% zhfandolfonts.tex, %% zhfounderfonts.tex, @@ -875,6 +882,6 @@ %% zhwindowsfonts.tex, %% translator-theorem-dictionary-ChineseGBK.dict, %% translator-theorem-dictionary-ChineseUTF8.dict, and -%% README. +%% README.md. %% %% End of file `ctex.sty'. |