From b1cf361795a720dbfa84ca6546355be360964437 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sun, 23 Aug 2020 20:53:47 +0000
Subject: ctex (23aug20)

git-svn-id: svn://tug.org/texlive/trunk@56161 c570f23f-e606-0410-a88d-b1316a301751
---
 .../tex/latex/ctex/engine/ctex-engine-pdftex.def   | 41 +++++++---------------
 1 file changed, 12 insertions(+), 29 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def')

diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
index d88ff8bbdbf..f2504965632 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
@@ -24,10 +24,10 @@
 %% 
 %% ---------------------------------------------------------------------
 %% 
-\GetIdInfo$Id: ctex.dtx 76d4e94 2020-06-06 23:22:18 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx e805781 2020-08-23 21:30:35 +0800 Qing Lee <sobenlee@gmail.com> $
   {(pdf)LaTeX adapter (CTEX)}
 \ProvidesExplFile{ctex-engine-pdftex.def}
-  {\ExplFileDate}{2.5.3}{\ExplFileDescription}
+  {\ExplFileDate}{2.5.4}{\ExplFileDescription}
 \cs_new_protected:Npn \ctex_set_zhmap:n
   { \tl_gput_right:Nx \g__ctex_zhmap_tl }
 \cs_new_protected:Npn \ctex_use_zhmap:
@@ -102,37 +102,20 @@
       \tl_set:Nn \CJKrmdefault {#1}
       \tl_set:Nn \CJKsfdefault {#2}
       \tl_set:Nn \CJKttdefault {#3}
-      \ctex_set_zhmap:n { \ctex_zhmap_input:n { ctex-zhmap- #4 .tex } }
+      \ctex_set_zhmap:n { \ctex_file_input:n { ctex-zhmap- #4 .tex } }
     }
   \@onlypreamble \ctex_load_zhmap:nnnn
-  \cs_new_protected:Npn \ctex_zhmap_input:n #1
-    {
-      \ctex_file_wrapper:nnn
-        {
-          \char_set_catcode_comment:n { 37 } % %
-          \char_set_catcode_escape:n  { 92 } % \
-        }
-        { \file_input:n {#1} }
-        {
-          \char_set_catcode:nn { 37 } { \char_value_catcode:n { 37 } }
-          \char_set_catcode:nn { 92 } { \char_value_catcode:n { 92 } }
-        }
-    }
 \fi:
 \cs_new_protected:Npn \ctex_CJK_input:n #1
   {
-    \ctex_file_wrapper:nnn
-      {
-        \char_set_catcode_other:n            { 60 } % <
-        \char_set_catcode_math_superscript:n { 94 } % ^
-        \int_set:Nn \tex_endlinechar:D { -1 }
-      }
-      { \file_input:n {#1} }
-      {
-        \char_set_catcode:nn { 60 } { \char_value_catcode:n { 60 } }
-        \char_set_catcode:nn { 94 } { \char_value_catcode:n { 94 } }
-        \int_set:Nn \tex_endlinechar:D { \int_use:N \tex_endlinechar:D }
-      }
+    \cctab_begin:N \c__ctex_CJK_cctab
+      \file_input:n {#1}
+    \cctab_end:
+  }
+\cctab_const:Nn \c__ctex_CJK_cctab
+  {
+    \cctab_select:N \c__ctex_package_cctab
+    \int_set:Nn \tex_endlinechar:D { -1 }
   }
 \cs_set_eq:NN \CJK@input \ctex_CJK_input:n
 \if_cs_exist:N \CJK@surr
@@ -249,7 +232,7 @@
     \tl_new:N #1
     \cs_if_exist:NTF #3
       { \tl_gput_right:Nn #3 {#1} }
-      { \ctex_patch_cmd:Nnn #2 {#4} { #1#4 } }
+      { \ctex_parse_name:NN \tl_replace_once:Nnn #2 {#4} { #1#4 } }
   }
 \ctex_provide_font_hook:NNN \rmfamily \@rmfamilyhook \selectfont
 \ctex_provide_font_hook:NNN \sffamily \@sffamilyhook \selectfont
-- 
cgit v1.2.3

