ctex (6jun20)

git-svn-id: svn://tug.org/texlive/trunk@55440 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 26 insertions, 9 deletions

diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
index 32c2e7eddce..f570a17379a 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
@@ -27,10 +27,10 @@
 \NeedsTeXFormat{LaTeX2e}
 \input{ctexbackend.cfg}
 \RequirePackage{expl3}
-\GetIdInfo$Id: ctex.dtx 4819efe 2020-05-16 21:20:43 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
   {Chinese adapter for class beamer (CTEX)}
 \ProvidesExplClass{ctexbeamer}
-  {\ExplFileDate}{2.5.2}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.3}{\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
@@ -75,20 +75,27 @@
   { \keys_set:nn { ctex } }
 \cs_new_protected:Npn \ctex_set:nn #1
   { \keys_set:nn { ctex / #1 } }
-\cs_new_protected:Npn \ctex_file_wrapper:nnn #1#2#3
+\cs_new_protected:Npn \ctex_file_wrapper:nnn
   {
-    \use:x
+    \exp_args:NNx \ExplSyntaxOff
+    \__ctex_file_wrapper_aux:nnnn
       {
-        \ExplSyntaxOff
-        \char_set_catcode_letter:n { 64 }
-        #1
-        \exp_not:n {#2}
         \bool_if:NTF \l__kernel_expl_bool
           { \ExplSyntaxOn }
           { \ExplSyntaxOff }
+      }
+  }
+\cs_new_protected:Npn \__ctex_file_wrapper_aux:nnnn #1#2#3#4
+  {
+    \use:x
+      {
+        \char_set_catcode_letter:n { 64 }
+        #2
+        \exp_not:n {#3}
         \char_set_catcode:nn { 64 } { \char_value_catcode:n { 64 } }
-        #3
+        #4
       }
+    #1
   }
 \cs_new_protected:Npn \ctex_file_input:n #1
   { \ctex_file_wrapper:nnn { } { \file_input:n {#1} } { } }
@@ -764,12 +771,22 @@
   {
     \seq_map_inline:Nn \c__ctex_headings_seq
       { \ctex_fix_varioref_label:n { ##1 } }
+    \ctex_at_end_package:nn { cleveref } { \ctex_cleveref_hook: }
   }
 \cs_new_protected:Npn \ctex_fix_varioref_label:n #1
   {
     \tl_if_empty:cT { p@#1 }
       { \exp_args:Nnx \labelformat {#1} { \exp_not:c { CTEX@the#1 } } }
   }
+\cs_new_protected:Npn \ctex_cleveref_hook:
+  {
+    \ctex_patch_cmd:Nnn \refstepcounter@noarg
+      { \endcsname \csname the }
+      { \expandafter \endcsname \csname the }
+    \ctex_patch_cmd:Nnn \refstepcounter@optarg
+      { \endcsname \csname the }
+      { \expandafter \endcsname \csname the }
+  }
 \cs_if_exist:NTF \labelformat
   { \ctex_varioref_hook: }
   {