summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def')
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-pdftex.def53
1 files changed, 32 insertions, 21 deletions
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 f2504965632..1066c55c94b 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,21 +24,25 @@
%%
%% ---------------------------------------------------------------------
%%
-\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> $
{(pdf)LaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-pdftex.def}
- {\ExplFileDate}{2.5.4}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.5}{\ExplFileDescription}
\cs_new_protected:Npn \ctex_set_zhmap:n
{ \tl_gput_right:Nx \g__ctex_zhmap_tl }
\cs_new_protected:Npn \ctex_use_zhmap:
{ \tl_use:N \g__ctex_zhmap_tl }
-\cs_new_protected:Npn \ctex_add_dvi_zhmap:
- { \AtBeginDvi { \ctex_use_zhmap: } }
-\ctex_after_end_preamble:n { \ctex_add_dvi_zhmap: }
-\ctex_at_end_package:nn { atbegshi }
+\cs_if_exist:NTF \ctex_gadd_ltxhook:nn
+ { \ctex_gadd_ltxhook:nn { shipout/firstpage } { \ctex_use_zhmap: } }
{
- \AtBeginShipoutFirst { \ctex_use_zhmap: }
- \cs_gset_eq:NN \ctex_add_dvi_zhmap: \prg_do_nothing:
+ \cs_new_protected:Npn \ctex_add_dvi_zhmap:
+ { \AtBeginDvi { \ctex_use_zhmap: } }
+ \ctex_after_end_preamble:n { \ctex_add_dvi_zhmap: }
+ \ctex_at_end_package:nn { atbegshi }
+ {
+ \AtBeginShipoutFirst { \ctex_use_zhmap: }
+ \cs_gset_eq:NN \ctex_add_dvi_zhmap: \prg_do_nothing:
+ }
}
\tl_new:N \g__ctex_zhmap_tl
\@onlypreamble \ctex_set_zhmap:n
@@ -108,14 +112,10 @@
\fi:
\cs_new_protected:Npn \ctex_CJK_input:n #1
{
- \cctab_begin:N \c__ctex_CJK_cctab
+ \ctex_push_file:
+ \int_set:Nn \tex_endlinechar:D { -1 }
\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 }
+ \ctex_pop_file:
}
\cs_set_eq:NN \CJK@input \ctex_CJK_input:n
\if_cs_exist:N \CJK@surr
@@ -167,7 +167,8 @@
}
\cs_new_protected:Npn \ctex_set_ignorespaces:
{ \cs_set_eq:NN \CJK@ignorespaces \ctex_auto_ignorespaces: }
-\ctex_gadd_hook:Nn \CJKhook { \ctex_set_ignorespaces: }
+\tl_if_exist:NF \CJKhook { \tl_new:N \CJKhook }
+\tl_gput_right:Nn \CJKhook { \ctex_set_ignorespaces: }
\cs_new_protected:Npn \ctex_punct_set:n #1
{
\clist_map_inline:Nn \c__ctex_punct_family_clist
@@ -227,12 +228,22 @@
\exp_args:Nc \__ctex_provide_font_hook_aux:NNNN
{ CTEX \cs_to_str:N #2 } #1#2
}
-\cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4
+\cs_if_exist:NTF \ctex_gadd_ltxhook:nn
+ {
+ \cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4
+ {
+ \tl_new:N #1
+ \exp_args:Nx \ctex_gadd_ltxhook:nn { \cs_to_str:N #2 } {#1}
+ }
+ }
{
- \tl_new:N #1
- \cs_if_exist:NTF #3
- { \tl_gput_right:Nn #3 {#1} }
- { \ctex_parse_name:NN \tl_replace_once:Nnn #2 {#4} { #1#4 } }
+ \cs_new_protected:Npn \__ctex_provide_font_hook_aux:NNNN #1#2#3#4
+ {
+ \tl_new:N #1
+ \cs_if_exist:NTF #3
+ { \tl_gput_right:Nn #3 {#1} }
+ { \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