1 files changed, 35 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls b/Master/texmf-dist/tex/latex/ctex/ctexbeamer.cls
index a92073b06aa..643e5962bf6 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 e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 81d4c90 2020-10-19 20:24:58 +0800 Qing Lee <sobenlee@gmail.com> $
   {Chinese adapter for class beamer (CTEX)}
 \ProvidesExplClass{ctexbeamer}
-  {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.5}{\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
@@ -77,25 +77,52 @@
   { \keys_set:nn { ctex / #1 } }
 \cs_new_protected:Npn \ctex_file_input:n #1
   {
-    \cctab_begin:N \c__ctex_package_cctab
+    \ctex_push_file:
       \file_input:n {#1}
-    \cctab_end:
+    \ctex_pop_file:
   }
-\cctab_const:Nn \c__ctex_package_cctab
+\cs_new_protected:Npn \ctex_push_file:
   {
-    \cctab_select:N \c_document_cctab
+    \seq_gpush:Nx \g__ctex_file_status_seq
+      {
+        {
+          \bool_if:NTF \l__kernel_expl_bool
+            { \ExplSyntaxOn }
+            { \ExplSyntaxOff }
+        }
+        { \char_value_catcode:n { 64 } }
+        { \char_value_catcode:n { 94 } }
+        { \int_use:N \tex_endlinechar:D }
+      }
+    \ExplSyntaxOff
     \char_set_catcode_letter:n { 64 }
+    \char_set_catcode_math_superscript:n { 94 }
+    \int_set:Nn \tex_endlinechar:D { 13 }
+  }
+\cs_new_protected:Npn \ctex_pop_file:
+  {
+    \seq_gpop:NN \g__ctex_file_status_seq \l__ctex_file_status_tl
+    \exp_after:wN \__ctex_pop_file_aux:nnnn \l__ctex_file_status_tl
+  }
+\cs_new_protected:Npn \__ctex_pop_file_aux:nnnn #1#2#3#4
+  {
+    #1
+    \char_set_catcode:nn { 64 } {#2}
+    \char_set_catcode:nn { 94 } {#3}
+    \int_set:Nn \tex_endlinechar:D {#4}
   }
+\tl_new:N \l__ctex_file_status_tl
+\seq_new:N \g__ctex_file_status_seq
 \cs_new_protected:Npn \ctex_scheme_input:n #1
   {
-    \cctab_begin:N \c__ctex_package_cctab
+    \ctex_push_file:
       \tl_if_exist:NTF \c__ctex_class_tl
         {
           \file_if_exist_input:nF { ctex-scheme- #1 - \c__ctex_class_tl .def }
             { \file_input:n  { ctex-scheme- #1 .def } }
         }
         { \file_input:n  { ctex-scheme- #1 .def } }
-    \cctab_end:
+    \ctex_pop_file:
   }
 \cs_generate_variant:Nn \ctex_scheme_input:n { o }
 \msg_new:nnnn { ctex } { package-too-old }