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.def39
1 files changed, 25 insertions, 14 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 1c47572caf8..4cb859a27ec 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
@@ -6,7 +6,7 @@
%%
%% ctex.dtx (with options: `luatex')
%%
-%% Copyright (C) 2003--2021
+%% Copyright (C) 2003--2022
%% CTEX.ORG and any individual authors listed in the documentation.
%% ---------------------------------------------------------------------
%%
@@ -24,10 +24,10 @@
%%
%% ---------------------------------------------------------------------
%%
-\GetIdInfo$Id: ctex.dtx fcbe2c0 2021-12-12 18:20:54 +0800 Qing Lee <sobenlee@gmail.com> $
+\GetIdInfo$Id: ctex.dtx c6b2e9c 2022-06-04 19:41:06 +0800 Qing Lee <sobenlee@gmail.com> $
{LuaLaTeX adapter (CTEX)}
\ProvidesExplFile{ctex-engine-luatex.def}
- {\ExplFileDate}{2.5.8}{\ExplFileDescription}
+ {\ExplFileDate}{2.5.9}{\ExplFileDescription}
\msg_new:nnn { ctex } { luatexja-loaded }
{
Package~`luatexja'~can~not~be~loaded~before~`ctex'.\\
@@ -37,9 +37,9 @@
{ \msg_critical:nnx { ctex } { luatexja-loaded } { \g_file_curr_name_str } }
{
\ctex_at_begin_package:nn { luatexja }
- { \msg_redirect_name:nnn { ctex } { disable-package } { info } }
+ { \msg_redirect_name:nnn { ctexhook } { disable-package } { info } }
\ctex_at_end_package:nn { luatexja }
- { \msg_redirect_name:nnn { ctex } { disable-package } { } }
+ { \msg_redirect_name:nnn { ctexhook } { disable-package } { } }
\ctex_disable_package:n { ltj-latex }
}
\RequirePackage { luatexja }
@@ -206,9 +206,6 @@
end
sprint(-2, s)
end, "global")
- newluacmd("ctex_ltj_use_jfont:", function ()
- font.current(getattribute("ltj@curjfnt"))
- end, "global", "protected")
newluacmd("ctex_ltj_set_alt_font:nnnn", function ()
local b = tonumber(scan_arg())
local e = tonumber(scan_arg())
@@ -298,6 +295,8 @@
\use:c { \f@encoding + \f@family }
\use:c { \curr@fontshape }
}
+\cs_new_protected_nopar:Npn \ctex_ltj_use_jfont:
+ { \tex_setfontid:D \ltj@curjfnt }
\cs_new_protected_nopar:Npn \ctex_ltj_subst_font:
{
\ctex_ltj_if_alternate_shape_exist:nF { \curr@fontshape }
@@ -431,15 +430,27 @@
\__um_input_math_symbol_table:
}
}
-\cs_new_protected:Npn \ctex_mono_jfm:n #1
+\cs_new_protected:Npn \ctex_set_jfm:n #1
{
- \str_if_eq:nnTF {#1} { plain }
- { \tl_set:Nn \l__ctex_ltj_jfm_tl { mono } }
+ \prop_get:NnNF \l__ctex_ltj_redirect_jfm_prop {#1} \l__ctex_ltj_jfm_tl
{ \tl_set:Nn \l__ctex_ltj_jfm_tl {#1} }
}
+\cs_generate_variant:Nn \ctex_set_jfm:n { o }
+\prop_new:N \l__ctex_ltj_redirect_jfm_prop
+\prop_set_from_keyval:Nn \l__ctex_ltj_redirect_jfm_prop
+ {
+ plain = mono ,
+ quanjiao = zh_CN / quanjiao ,
+ banjiao = zh_CN / banjiao ,
+ kaiming = zh_CN / kaiming
+ }
+\keys_define:nn { ctex_ltj / fontspec }
+ {
+ JFM .code:n = \ctex_set_jfm:n {#1} ,
+ JFM .value_required:n = true
+ }
\tl_new:N \l__ctex_ltj_jfm_tl
-\cs_generate_variant:Nn \ctex_mono_jfm:n { o }
-\ctex_mono_jfm:o { \l__ctex_punct_tl }
+\ctex_set_jfm:o { \l__ctex_punct_tl }
\tl_const:Nn \CJK@encoding { LTJY3 }
\DeclareFontEncoding { \CJK@encoding } { } { }
\use:e
@@ -1259,7 +1270,7 @@
punct .code:n =
{
\tl_set:Nx \l__ctex_punct_tl {#1}
- \ctex_mono_jfm:o { \l__ctex_punct_tl }
+ \ctex_set_jfm:o { \l__ctex_punct_tl }
} ,
punct .default:n = { quanjiao } ,
}