diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls')
| -rw-r--r-- | Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls | 71 |
1 files changed, 40 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls index 6e294129256..87c2009d2f5 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls @@ -6,7 +6,7 @@ %% %% ctex.dtx (with options: `class,beamer') %% -%% Copyright (C) 2003--2018 +%% Copyright (C) 2003--2019 %% CTEX.ORG and any individual authors listed in the documentation. %% ------------------------------------------------------------------------------ %% @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx 096f319 2018-05-02 19:51:41 +0800 Liam Huang <liamhuang0205@gmail.com> $ +\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter for class beamer (CTEX)} \ProvidesExplClass{ctexbeamer} - {\ExplFileDate}{2.4.14}{\ExplFileDescription} + {\ExplFileDate}{2.4.15}{\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 @@ -46,7 +46,7 @@ `l3kernel'~and~`l3packages'\\\\ using~your~TeX~package~manager~or~from~CTAN. } -\@ifpackagelater { expl3 } { 2017/12/16 } { } +\@ifpackagelater { expl3 } { 2019/03/05 } { } { \msg_error:nnn { ctex } { l3-too-old } { expl3 } } \@ifpackagelater { l3keys2e } { 2015/12/20 } { } { \msg_error:nnn { ctex } { l3-too-old } { l3keys2e } } @@ -120,7 +120,7 @@ \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 + \dim_use:N \tex_dimexpr:D #1 pt \scan_stop: \q_stop } \use:x { @@ -147,15 +147,15 @@ { Command~ #1 is~ deprecated.\\ #2 } \msg_new:nnn { ctex } { deprecated-environment } { Environment~ `#1'~ is~ deprecated.\\ #2 } -\int_new:N \g__ctex_font_size_flag -\int_set:Nn \g__ctex_font_size_flag { -1 } +\int_new:N \g__ctex_font_size_int +\int_set:Nn \g__ctex_font_size_int { -1 } \keys_define:nn { ctex / option } { zihao .choice: , 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 } , + zihao / 5 .code:n = { \int_gset:Nn \g__ctex_font_size_int { 0 } } , + zihao / -4 .code:n = { \int_gset:Nn \g__ctex_font_size_int { 1 } } , + zihao / false .code:n = { \int_gset:Nn \g__ctex_font_size_int { 2 } } , c5size .code:n = { \msg_warning:nnn { ctex } { deprecated-option } @@ -345,7 +345,7 @@ { #1 .code:n = { - \cs_gset_eq:NN \g__ctex_font_size_flag \c_two + \int_gset:Nn \g__ctex_font_size_int { 2 } \clist_gput_right:Nn \g__ctex_std_options_clist {#1} } , #1 .value_forbidden:n = true , @@ -360,7 +360,7 @@ } \ctex_file_input:n { ctexopts.cfg } \ProcessKeysOptions { ctex / option } -\if_case:w \g__ctex_font_size_flag +\if_case:w \g__ctex_font_size_int \clist_gput_right:Nn \g__ctex_std_options_clist { 10pt } \or: \clist_gput_right:Nn \g__ctex_std_options_clist { 12pt } @@ -446,7 +446,7 @@ { \ctex_update_ccwd: } { \dim_set:Nn \l__ctex_tmp_dim - { \baselinestretch \etex_glueexpr:D \f@baselineskip \scan_stop: } + { \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: @@ -454,9 +454,9 @@ } { \int_set:Nn \l__ctex_tmp_int - { \etex_dimexpr:D \linewidth - \ccwd - \l__ctex_tmp_dim \scan_stop: } + { \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_compare:nNnTF \l__ctex_tmp_int > \c_zero_int { \skip_set:Nn \l__ctex_ccglue_skip { @@ -500,15 +500,15 @@ \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 } } + \int_compare:nNnF \l__ctex_tmp_int < 3 + { \int_sub:Nn \l__ctex_tmp_int { 2 } } } \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 ) } + { ( \ccwd - \l__ctex_tmp_dim ) / ( \l__ctex_tmp_int + 1 ) } } } { \skip_set:Nn \l__ctex_ccglue_skip { \l__ctex_ziju_dim } } @@ -658,7 +658,7 @@ { \tl_put_right:Nn \exp_not:c { CTEX@#1@#2 } { ####1 } } } \NewDocumentCommand \ctex_assign_heading_name:nn - { m > { \SplitArgument { \c_one } { , } } +m } + { m > { \SplitArgument { 1 } { , } } +m } { \__ctex_assign_heading_name:nnn {#1} #2 } \cs_new_protected:Npn \__ctex_assign_heading_name:nnn #1#2#3 { @@ -680,45 +680,48 @@ \keys_define:nn { ctex } { \exp_not:o { \l__ctex_tmp_tl } } } \ExplSyntaxOff -\defbeamertemplate*{part page}{CTEX}[1][]{ +\defbeamertemplate*{part page}{CTEX}[1][]{% \begingroup + \ctexset{autoindent=false}% \par \addvspace{\glueexpr\CTEX@part@beforeskip\relax}% - \parindent \dimexpr \CTEX@part@indent \relax \CTEX@part@format + \parindent \dimexpr \CTEX@part@indent \relax \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} + \end{beamercolorbox}% \par \addvspace{\glueexpr\CTEX@part@afterskip\relax}% \endgroup } -\defbeamertemplate*{section page}{CTEX}[1][]{ +\defbeamertemplate*{section page}{CTEX}[1][]{% \begingroup + \ctexset{autoindent=false}% \par \addvspace{\glueexpr\CTEX@section@beforeskip\relax}% - \parindent \dimexpr \CTEX@section@indent \relax \CTEX@section@format + \parindent \dimexpr \CTEX@section@indent \relax \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} + \end{beamercolorbox}% \par \addvspace{\glueexpr\CTEX@section@afterskip\relax}% \endgroup } -\defbeamertemplate*{subsection page}{CTEX}[1][]{ +\defbeamertemplate*{subsection page}{CTEX}[1][]{% \begingroup + \ctexset{autoindent=false}% \par \addvspace{\glueexpr\CTEX@subsection@beforeskip\relax}% - \parindent \dimexpr \CTEX@subsection@indent \relax \CTEX@subsection@format + \parindent \dimexpr \CTEX@subsection@indent \relax \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} + \end{beamercolorbox}% \par \addvspace{\glueexpr\CTEX@subsection@afterskip\relax}% \endgroup } @@ -781,7 +784,7 @@ \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 } } + { \dim_to_decimal:n { (#2) * 6 / 5 } } } } \seq_gput_right:Nn \c__ctex_font_size_seq {#1} @@ -849,7 +852,7 @@ } \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 +\if_case:w \g__ctex_font_size_int \ctex_file_input:n { ctex-c5size.clo } \or: \ctex_file_input:n { ctex-cs4size.clo } @@ -911,7 +914,7 @@ { \ctex_if_preamble:TF { - \str_if_eq_x:nnTF {#1} { none } + \str_if_eq:eeTF {#1} { none } { \msg_warning:nnn { ctex } { invalid-value } {#1} } { \str_if_eq:onTF { \g__ctex_fontset_tl } { none } @@ -987,6 +990,12 @@ %% c70rm.fd, %% c70sf.fd, %% c70tt.fd, +%% jy2zhrm.fd, +%% jy2zhsf.fd, +%% jy2zhtt.fd, +%% jt2zhrm.fd, +%% jt2zhsf.fd, +%% jt2zhtt.fd, %% ctex-fontset-windows.def, %% ctex-fontset-windowsnew.def, %% ctex-fontset-windowsold.def, |