diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex/ctex.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/ctex/ctex.sty | 66 |
1 files changed, 35 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex.sty b/Master/texmf-dist/tex/latex/ctex/ctex.sty index 617162c50b4..92faad889c6 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctex.sty +++ b/Master/texmf-dist/tex/latex/ctex/ctex.sty @@ -26,10 +26,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 320df30 2020-05-02 06:45:05 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter in LaTeX (CTEX)} \ProvidesExplPackage{\ExplFileName} - {\ExplFileDate}{2.5.1}{\ExplFileDescription} + {\ExplFileDate}{2.5.2}{\ExplFileDescription} \tl_const:Nx \c__ctex_version_tl { \cs_if_exist_use:cF { ver@ \@currname . \@currext } { 9999/99/99 } } \msg_new:nnnn { ctex } { subpackage-loaded } @@ -422,35 +422,39 @@ \ctex_update_em_unit: \dim_set:Nn \l__ctex_tmp_dim { \l__ctex_line_stretch_tl } \dim_compare:nNnTF \l__ctex_tmp_dim = \c_max_dim + { \__ctex_update_stretch_auxi: } + { \__ctex_update_stretch_auxii: } + } +\cs_new_protected:Npn \__ctex_update_stretch_auxi: + { + \ctex_if_ccglue_touched:TF + { \ctex_update_ccwd: } { - \ctex_if_ccglue_touched:TF - { \ctex_update_ccwd: } - { - \dim_set:Nn \l__ctex_tmp_dim - { \baselinestretch \tex_glueexpr:D \f@baselineskip \scan_stop: } - \skip_set:Nn \l__ctex_ccglue_skip - { \c_zero_dim plus .08 \l__ctex_tmp_dim } - \ctex_update_ccglue: - } + \dim_set:Nn \l__ctex_tmp_dim + { \baselinestretch \tex_glueexpr:D \f@baselineskip \scan_stop: } + \skip_set:Nn \l__ctex_ccglue_skip + { \c_zero_dim plus .08 \l__ctex_tmp_dim } + \ctex_update_ccglue: } + } +\cs_new_protected:Npn \__ctex_update_stretch_auxii: + { + \int_set:Nn \l__ctex_tmp_int + { \tex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: } + \tex_divide:D \l__ctex_tmp_int \ccwd + \int_compare:nNnTF \l__ctex_tmp_int > \c_zero_int { - \int_set:Nn \l__ctex_tmp_int - { \tex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: } - \tex_divide:D \l__ctex_tmp_int \ccwd - \int_compare:nNnTF \l__ctex_tmp_int > \c_zero_int + \skip_set:Nn \l__ctex_ccglue_skip { - \skip_set:Nn \l__ctex_ccglue_skip + \c_zero_dim plus \dim_eval:n { - \c_zero_dim plus \dim_eval:n - { - ( \linewidth - \ccwd - \l__ctex_tmp_int \ccwd ) / - \l__ctex_tmp_int - } + ( \linewidth - \ccwd - \l__ctex_tmp_int \ccwd ) / + \l__ctex_tmp_int } } - { \skip_zero:N \l__ctex_ccglue_skip } - \ctex_update_ccglue: } + { \skip_zero:N \l__ctex_ccglue_skip } + \ctex_update_ccglue: } \cs_new_protected:Npn \ctex_update_parindent: { @@ -901,14 +905,14 @@ %% ctex-fontset-windows.def, %% ctexspa.def, %% ctexpunct.spa, -%% ctexmakespa.tex, -%% ctexspamacro.tex, -%% zhadobefonts.tex, -%% zhfandolfonts.tex, -%% zhfounderfonts.tex, -%% zhmacfonts.tex, -%% zhubuntufonts.tex, -%% zhwindowsfonts.tex, +%% ctex-spa-make.tex, +%% ctex-spa-macro.tex, +%% ctex-zhmap-adobe.tex, +%% ctex-zhmap-fandol.tex, +%% ctex-zhmap-founder.tex, +%% ctex-zhmap-mac.tex, +%% ctex-zhmap-ubuntu.tex, +%% ctex-zhmap-windows.tex, %% ctex-zhconv-index.lua, %% translator-theorem-dictionary-ChineseGBK.dict, %% translator-theorem-dictionary-ChineseUTF8.dict, and |