summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def')
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def74
1 files changed, 44 insertions, 30 deletions
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
index e337b428141..997f4f93986 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-engine-luatex.def
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx 07425fe 2021-03-14 16:43:36 +0800 Xiangdong Zeng <xdzeng96@gmail.com> $
+\GetIdInfo$Id: ctex.dtx 6604451 2021-06-20 17:08:49 +0800 Qing Lee <sobenlee@gmail.com> $
{LuaLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-luatex.def}
- {\ExplFileDate}{2.5.6}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.7}{\ExplFileDescription}
\msg_new:nnn { ctex } { luatexja-loaded }
{
Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\
@@ -35,13 +35,20 @@
}
\@ifpackageloaded { luatexja }
{ \msg_critical:nnx { ctex } { luatexja-loaded } { \g_file_curr_name_str } }
- { \tl_const:cn { ver@ltj-latex.\@pkgextension } { 9999/99/99 } }
+ {
+ \ctex_at_begin_package:nn { luatexja }
+ { \msg_redirect_name:nnn { ctex } { disable-package } { info } }
+ \ctex_at_end_package:nn { luatexja }
+ { \msg_redirect_name:nnn { ctex } { disable-package } { } }
+ \ctex_disable_package:n { ltj-latex }
+ }
\RequirePackage { luatexja }
\@ifpackagelater { luatexja } { 2020/04/12 } { }
{ \msg_error:nnn { ctex } { package-too-old } { luatexja } }
\RequirePackage { fontspec }
\@ifpackagelater { fontspec } { 2020/02/21 } { }
{ \msg_error:nnn { ctex } { package-too-old } { fontspec } }
+\ctex_at_end:n { \char_set_catcode_comment:n { \ltjlineendcomment } }
\ExplSyntaxOff
\ltjdefcharrange{1}{"80-"36F, "1E00-"1EFF}
\ltjdefcharrange{2}{"370-"4FF, "1F00-"1FFF}
@@ -1171,34 +1178,41 @@
{ \exp_not:o { \CTEX@selectfont@hook #1 } }
}
\cs_new_eq:NN \CTEX@selectfont@hook \prg_do_nothing:
-\if_cs_exist:N \@EverySelectfont@Init
- \group_begin:
- \cs_set:Npn \__ctex_tmp:N #1
- {
- \tl_set:Nn \l__ctex_tmp_tl {#1}
- \cs_new_eq:NN \CTEX@selectfont@save #1
- \cs_new_protected:Npn \__ctex_restore_selectfont:
- {
- \cs_if_free:NF \scr@new@selectfont
- {
- \cs_set_eq:NN \scr@new@selectfont #1
- \cs_set_eq:NN \CTEX@selectfont@save \scr@selectfont
- }
- \tl_put_left:Nn \@EverySelectfont@Init
- { \cs_set_eq:NN #1 \CTEX@selectfont@save }
- \cs_undefine:N \__ctex_restore_selectfont:
- }
- }
- \ctex_parse_name:NN \__ctex_tmp:N \selectfont
- \exp_last_unbraced:NNo \group_end:
- \ctex_patch_cmd_once:NnnnTF { \l__ctex_tmp_tl }
- { \ExplSyntaxOff }
- { \size@update }
- { \CTEX@selectfont@hook \size@update }
- { \__ctex_restore_selectfont: }
- { \ctex_patch_failure:N \selectfont }
+\if_bool:N \c__ctex_everysel_loaded_bool
+ \if_cs_exist:N \@EverySelectfont@Init
+ \group_begin:
+ \cs_set:Npn \__ctex_tmp:N #1
+ {
+ \tl_set:Nn \l__ctex_tmp_tl {#1}
+ \cs_new_eq:NN \CTEX@selectfont@save #1
+ \cs_new_protected:Npn \__ctex_restore_selectfont:
+ {
+ \cs_if_free:NF \scr@new@selectfont
+ {
+ \cs_set_eq:NN \scr@new@selectfont #1
+ \cs_set_eq:NN \CTEX@selectfont@save \scr@selectfont
+ }
+ \tl_put_left:Nn \@EverySelectfont@Init
+ { \cs_set_eq:NN #1 \CTEX@selectfont@save }
+ \cs_undefine:N \__ctex_restore_selectfont:
+ }
+ }
+ \ctex_parse_name:NN \__ctex_tmp:N \selectfont
+ \exp_last_unbraced:NNo \group_end:
+ \ctex_patch_cmd_once:NnnnTF { \l__ctex_tmp_tl }
+ { \ExplSyntaxOff }
+ { \size@update }
+ { \CTEX@selectfont@hook \size@update }
+ { \__ctex_restore_selectfont: }
+ { \ctex_patch_failure:N \selectfont }
+ \fi:
+ \cs_new_protected:Npn \ctex_gadd_selectfont_hook:n
+ { \EverySelectfont }
+\else:
+ \cs_new_protected:Npn \ctex_gadd_selectfont_hook:n
+ { \ctex_gadd_ltxhook:nn { selectfont } }
\fi:
-\EverySelectfont { \CTEX@selectfont@hook }
+\ctex_gadd_selectfont_hook:n { \CTEX@selectfont@hook }
\ctex_add_to_selectfont:n
{
\ctex_ltj_select_font: