diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls')
-rw-r--r-- | Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls index 87c2009d2f5..f09212611a6 100644 --- a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls +++ b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls @@ -28,10 +28,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: ctex.dtx cb8bf3c 2019-04-07 23:32:09 +0800 Qing Lee <sobenlee@gmail.com> $ +\GetIdInfo$Id: ctex.dtx 735dfe2 2019-05-29 21:42:29 +0800 Qing Lee <sobenlee@gmail.com> $ {Chinese adapter for class beamer (CTEX)} \ProvidesExplClass{ctexbeamer} - {\ExplFileDate}{2.4.15}{\ExplFileDescription} + {\ExplFileDate}{2.4.16}{\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 @@ -110,24 +110,17 @@ { \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 +\cs_new_protected:Npn \ctex_set_default_ccwd:Nn #1#2 + { \tl_set:Nx #1 { \__ctex_default_ccwd_aux:n {#2} } } +\cs_new:Npn \__ctex_default_ccwd_aux:n #1 { - \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 + \exp_not:n {#1} + \exp_after:wN \__ctex_default_ccwd_aux:w \dim_use:N \tex_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 } } - } +\exp_last_unbraced:NNNNo + \cs_new:Npn \__ctex_default_ccwd_aux:w #1 { \tl_to_str:n { pt } } #2 \q_stop + { \tl_if_empty:nT {#2} { \ccwd } } \tl_new:N \l__ctex_encoding_tl \tl_set:Nx \l__ctex_encoding_tl { \sys_if_engine_pdftex:TF { GBK } { UTF8 } } @@ -682,7 +675,7 @@ \ExplSyntaxOff \defbeamertemplate*{part page}{CTEX}[1][]{% \begingroup - \ctexset{autoindent=false}% + \CTEX@disableautoindent \par \addvspace{\glueexpr\CTEX@part@beforeskip\relax}% \CTEX@part@format \parindent \dimexpr \CTEX@part@indent \relax @@ -697,7 +690,7 @@ } \defbeamertemplate*{section page}{CTEX}[1][]{% \begingroup - \ctexset{autoindent=false}% + \CTEX@disableautoindent \par \addvspace{\glueexpr\CTEX@section@beforeskip\relax}% \CTEX@section@format \parindent \dimexpr \CTEX@section@indent \relax @@ -712,7 +705,7 @@ } \defbeamertemplate*{subsection page}{CTEX}[1][]{% \begingroup - \ctexset{autoindent=false}% + \CTEX@disableautoindent \par \addvspace{\glueexpr\CTEX@subsection@beforeskip\relax}% \CTEX@subsection@format \parindent \dimexpr \CTEX@subsection@indent \relax |