summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty206
1 files changed, 109 insertions, 97 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty
index ac6757f7bff..a86fb8a3085 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty
@@ -3,20 +3,20 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-26h}[2018/10/08 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec-26h}[2019/01/28 fontspec support of LuaTeX-ja]
\RequirePackage{l3keys2e,luatexja}
\ExplSyntaxOn
%%%%%%%% Change Japanese font family by \rmfamily or not
-\cs_new:Npn \ltj_fontspec_match_cmd {
+\cs_new:Npn \__ltj_fontspec_match_cmd {
\renewcommand\jttdefault{\gtdefault}
\@ltj@match@familytrue
\DeclareDocumentCommand \setmonojfont { O{} m } {
- \ltj_fontspec_set_family:Nnn \jttdefault {##1}{##2}
+ \__ltj_fontspec_set_family:Nnn \jttdefault {##1}{##2}
\normalfont
}
}
-\bool_if:NT \ltj_fontspec_match_bool \ltj_fontspec_match_cmd
+\bool_if:NT \__ltj_fontspec_match_bool \__ltj_fontspec_match_cmd
%%%%%%%% Messages
\msg_new:nnn {luatexja-fontspec} {addjfontfeatures-ignored}
@@ -39,13 +39,13 @@
%%%%%%%% Internal control sequences
%% Each CS is ltj_fontspec version that corresponds to original CS of fontspec.
-\cs_new:Nn \ltj_fontspec_define_option:nn {
+\cs_new:Nn \__ltj_fontspec_define_option:nn {
\__fontspec_keys_define_code:nnn {fontspec} {#1} {#2}
}
-\cs_new:Nn \ltj_fontspec_define_preparse_external:nn {
+\cs_new:Nn \__ltj_fontspec_define_preparse_external:nn {
\__fontspec_keys_define_code:nnn {fontspec-preparse-external} {#1} {#2}
}
-\cs_new:Nn \ltj_fontspec_define_altfont_option:nn {
+\cs_new:Nn \__ltj_fontspec_define_altfont_option:nn {
\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont} {#1} {#2}
}
@@ -57,38 +57,38 @@
%% { Range = <range>, Font = <font name> },
%% ...
%% }
-\tl_new:N \l_ltj_fontspec_altname_tl
-\tl_new:N \l_ltj_fontspec_altrange_tl
-\clist_new:N \l_ltj_fontspec_altfont_clist
-\clist_new:N \l_ltj_fontspec_altfont_leftover_clist
-\int_new:N \g_ltj_fontspec_altnumber_int
-
-\ltj_fontspec_define_altfont_option:nn {Range} {
- \tl_set:Nn \l_ltj_fontspec_altrange_tl {#1}
+\tl_new:N \l__ltj_fontspec_altname_tl
+\tl_new:N \l__ltj_fontspec_altrange_tl
+\clist_new:N \l__ltj_fontspec_altfont_clist
+\clist_new:N \l__ltj_fontspec_altfont_leftover_clist
+\int_new:N \g__ltj_fontspec_altnumber_int
+
+\__ltj_fontspec_define_altfont_option:nn {Range} {
+ \tl_set:Nn \l__ltj_fontspec_altrange_tl {#1}
}
-\ltj_fontspec_define_altfont_option:nn {Font} {
- \fontspec_complete_fontname:Nn \l_ltj_fontspec_altname_tl {#1}
+\__ltj_fontspec_define_altfont_option:nn {Font} {
+ \fontspec_complete_fontname:Nn \l__ltj_fontspec_altname_tl {#1}
}
\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {AltFont} {
- \clist_put_right:Nn \l_ltj_fontspec_altfont_clist { #1 }
+ \clist_put_right:Nn \l__ltj_fontspec_altfont_clist { #1 }
}
\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {YokoFeatures} {
- \clist_put_right:Nn \l_ltj_fontspec_fontfeat_yoko_clist { #1 }
+ \clist_put_right:Nn \l__ltj_fontspec_fontfeat_yoko_clist { #1 }
}
\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {TateFeatures} {
- \clist_put_right:Nn \l_ltj_fontspec_fontfeat_tate_clist { #1 }
+ \clist_put_right:Nn \l__ltj_fontspec_fontfeat_tate_clist { #1 }
}
\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {TateFont} {
\tl_if_empty:nF {#1} {
- \fontspec_complete_fontname:Nn \l_ltj_fontspec_fontname_tate_tl {#1}
+ \fontspec_complete_fontname:Nn \l__ltj_fontspec_fontname_tate_tl {#1}
}
}
%%
-\clist_new:N \l_ltj_fontspec_fontfeat_yoko_clist
-\clist_new:N \l_ltj_fontspec_fontfeat_tate_clist
-\tl_new:N \l_ltj_fontspec_fontname_tate_tl
+\clist_new:N \l__ltj_fontspec_fontfeat_yoko_clist
+\clist_new:N \l__ltj_fontspec_fontfeat_tate_clist
+\tl_new:N \l__ltj_fontspec_fontname_tate_tl
-\cs_new:Npn \ltj_fontspec_DeclareFontFamily #1 #2 #3 {
+\cs_new:Npn \__ltj_fontspec_DeclareFontFamily #1 #2 #3 {
\DeclareKanjiFamily {JY3} {#2} {#3}
\DeclareKanjiFamily {JT3} {#2} {#3}
}
@@ -121,42 +121,42 @@
}
\cs_set_eq:NN \__ltj_orig_fontspec_select_font_family:nn \__fontspec_select_font_family:nn
-\cs_new_protected:Nn \ltj_fontspec_select_font_family:nn {
+\cs_new_protected:Nn \__ltj_fontspec_select_font_family:nn {
\group_begin:
- \ltj_fontspec_define_option:nn {NoEmbed} {}
- \ltj_fontspec_define_option:nn {AltFont} {
- \clist_put_right:Nn \l_ltj_fontspec_altfont_clist { ##1 }
+ \__ltj_fontspec_define_option:nn {NoEmbed} {}
+ \__ltj_fontspec_define_option:nn {AltFont} {
+ \clist_put_right:Nn \l__ltj_fontspec_altfont_clist { ##1 }
}
- \ltj_fontspec_define_option:nn {CID} {
+ \__ltj_fontspec_define_option:nn {CID} {
\__fontspec_update_featstr:n {cid=##1}
}
- \ltj_fontspec_define_option:nn {Kanjiskip} {
+ \__ltj_fontspec_define_option:nn {Kanjiskip} {
\str_if_eq_x:nnTF {false} { \str_lower_case:n { ##1 } }{
\__fontspec_update_featstr:n {-ltjksp}
} {
\__fontspec_update_featstr:n {+ltjksp}
}
}
- \ltj_fontspec_define_option:nn {JFM} {
+ \__ltj_fontspec_define_option:nn {JFM} {
\__fontspec_update_featstr:n {jfm=##1}
}
% vary by shape
- \ltj_fontspec_define_option:nn {YokoFeatures} {
- \clist_put_right:Nn \l_ltj_fontspec_fontfeat_yoko_clist { ##1 }
+ \__ltj_fontspec_define_option:nn {YokoFeatures} {
+ \clist_put_right:Nn \l__ltj_fontspec_fontfeat_yoko_clist { ##1 }
}
- \ltj_fontspec_define_option:nn {TateFeatures} {
- \clist_put_right:Nn \l_ltj_fontspec_fontfeat_tate_clist { ##1 }
+ \__ltj_fontspec_define_option:nn {TateFeatures} {
+ \clist_put_right:Nn \l__ltj_fontspec_fontfeat_tate_clist { ##1 }
}
- \ltj_fontspec_define_option:nn {TateFont}
+ \__ltj_fontspec_define_option:nn {TateFont}
{
\tl_if_empty:nF {##1} {
- \fontspec_complete_fontname:Nn \l_ltj_fontspec_fontname_tate_tl {##1}
+ \fontspec_complete_fontname:Nn \l__ltj_fontspec_fontname_tate_tl {##1}
}
}
- \ltj_fontspec_define_option:nn {JFM-var} {
+ \__ltj_fontspec_define_option:nn {JFM-var} {
\__fontspec_update_featstr:n {jfmvar=##1}
}
- \ltj_fontspec_define_preparse_external:nn {NoEmbed} {
+ \__ltj_fontspec_define_preparse_external:nn {NoEmbed} {
\cs_set:Npn \__fontspec_fontname_wrap:n ##1 {psft:##1}
}
@@ -166,13 +166,13 @@
Kerning/Off.code:n=\__fontspec_update_featstr:n {-kern}
}
\clist_set:Nx \g__fontspec_default_fontopts_clist {
- YokoFeatures = { JFM=ujis }, TateFeatures = { JFM=ujisv },
+ YokoFeatures = { JFM=\ltj@stdyokojfm }, TateFeatures = { JFM=\ltj@stdtatejfm },
Scale=\Cjascale, Kerning=Off, Script=CJK,
\g__ltj_fontspec_kanji_default_fontopts_clist
}
\prop_set_eq:NN \g__fontspec_fontopts_prop \g__ltj_fontspec_fontopts_prop
- \cs_set_eq:NN \__fontspec_make_font_shapes:Nnnnn \ltj_fontspec_make_font_shapes:Nnnnn
- \cs_set_eq:NN \DeclareFontFamily \ltj_fontspec_DeclareFontFamily
+ \cs_set_eq:NN \__fontspec_make_font_shapes:Nnnnn \__ltj_fontspec_make_font_shapes:Nnnnn
+ \cs_set_eq:NN \DeclareFontFamily \__ltj_fontspec_DeclareFontFamily
\tl_set:Nn \g_fontspec_encoding_tl {JY3}
\__ltj_orig_fontspec_select_font_family:nn{#1}{#2}
@@ -185,21 +185,21 @@
%% declare_shape
-\cs_new:Nn \ltj_fontspec_declare_shape_yoko:nnnn {
- \ltj_fontspec_declare_shape_aux:nnnnnn {#1} {#2} {#3} {#4} { JY3 } { \l_ltj_fontspec_fontfeat_yoko_clist }
+\cs_new:Nn \__ltj_fontspec_declare_shape_yoko:nnnn {
+ \__ltj_fontspec_declare_shape_aux:nnnnnn {#1} {#2} {#3} {#4} { JY3 } { \l__ltj_fontspec_fontfeat_yoko_clist }
}
-\cs_new:Nn \ltj_fontspec_declare_shape_tate:nnnn {
- \ltj_fontspec_declare_shape_aux:nnnnnn {#1} {#2} {#3} {#4} { JT3 } { \l_ltj_fontspec_fontfeat_tate_clist }
+\cs_new:Nn \__ltj_fontspec_declare_shape_tate:nnnn {
+ \__ltj_fontspec_declare_shape_aux:nnnnnn {#1} {#2} {#3} {#4} { JT3 } { \l__ltj_fontspec_fontfeat_tate_clist }
}
-\cs_new:Nn \ltj_fontspec_declare_shape:nnnn {
- \ltj_fontspec_declare_shape_yoko:nnnn {#1} {#2} {#3} {#4}
- \ltj_fontspec_declare_shape_tate:nnnn {#1} {#2} {#3} {#4}
+\cs_new:Nn \__ltj_fontspec_declare_shape:nnnn {
+ \__ltj_fontspec_declare_shape_yoko:nnnn {#1} {#2} {#3} {#4}
+ \__ltj_fontspec_declare_shape_tate:nnnn {#1} {#2} {#3} {#4}
}
-\cs_generate_variant:Nn \ltj_fontspec_declare_shape:nnnn {nnxx}
-\cs_generate_variant:Nn \ltj_fontspec_declare_shape_yoko:nnnn {nnxx}
-\cs_generate_variant:Nn \ltj_fontspec_declare_shape_tate:nnnn {nnxx}
+\cs_generate_variant:Nn \__ltj_fontspec_declare_shape:nnnn {nnxx}
+\cs_generate_variant:Nn \__ltj_fontspec_declare_shape_yoko:nnnn {nnxx}
+\cs_generate_variant:Nn \__ltj_fontspec_declare_shape_tate:nnnn {nnxx}
-\cs_new:Nn \ltj_fontspec_declare_shape_aux:nnnnnn
+\cs_new:Nn \__ltj_fontspec_declare_shape_aux:nnnnnn
{
\tl_clear:N \l__fontspec_nfss_tl
\tl_clear:N \l__fontspec_nfss_sc_tl
@@ -216,14 +216,26 @@
\l__fontspec_sizing_leftover_clist
\tl_if_empty:NT \l__fontspec_size_tl { \__fontspec_error:n {no-size-info} }
- \str_if_eq:nnTF { #5 } { JY3 } {
- % "normal"
- \__fontspec_load_fontname:n {\l__fontspec_sizedfont_tl}
- } {
- \tl_if_empty:NTF \l_ltj_fontspec_fontname_tate_tl
- { \__fontspec_load_fontname:n {\l__fontspec_sizedfont_tl} }
- { \__fontspec_load_fontname:n {\l_ltj_fontspec_fontname_tate_tl} }
- }
+ \cs_if_exist:NTF \__fontspec_load_fontname:Nn
+ { %% >= v2.7
+ \str_if_eq:nnTF { #5 } { JY3 } {
+ % "normal"
+ \__fontspec_load_fontname:Nn \l_fontspec_fontname_tl {\l__fontspec_sizedfont_tl}
+ } {
+ \tl_if_empty:NTF \l__ltj_fontspec_fontname_tate_tl
+ { \__fontspec_load_fontname:Nn \l_fontspec_fontname_tl {\l__fontspec_sizedfont_tl} }
+ { \__fontspec_load_fontname:Nn \l_fontspec_fontname_tl {\l__ltj_fontspec_fontname_tate_tl} }
+ }
+ } { %% < v2.7
+ \str_if_eq:nnTF { #5 } { JY3 } {
+ % "normal"
+ \__fontspec_load_fontname:n {\l__fontspec_sizedfont_tl}
+ } {
+ \tl_if_empty:NTF \l__ltj_fontspec_fontname_tate_tl
+ { \__fontspec_load_fontname:n {\l__fontspec_sizedfont_tl} }
+ { \__fontspec_load_fontname:n {\l__ltj_fontspec_fontname_tate_tl} }
+ }
+ }
\__fontspec_setup_nfss:Nnnn \l__fontspec_nfss_tl {#3} {#6} {}
}
\bool_set_true:N \l__fontspec_nosc_bool
@@ -231,9 +243,9 @@
\__fontspec_declare_shape_slanted:nn {#1} {#2}
}
-\cs_new:Nn \ltj_fontspec_set_family:Nnn {
+\cs_new:Nn \__ltj_fontspec_set_family:Nnn {
\__ltj_set_global_variable_for_kanji:
- \cs_set_eq:NN \__fontspec_select_font_family:nn \ltj_fontspec_select_font_family:nn
+ \cs_set_eq:NN \__fontspec_select_font_family:nn \__ltj_fontspec_select_font_family:nn
\__ltj_orig_fontspec_set_family:Nnn #1 {#2} {#3}
\cs_set_eq:NN \__fontspec_select_font_family:nn \__ltj_orig_fontspec_select_font_family:nn
\__ltj_restore_global_variable:
@@ -242,62 +254,62 @@
\cs_set_eq:NN \__ltj_orig_fontspec_make_font_shapes:Nnnnn \__fontspec_make_font_shapes:Nnnnn
\cs_set_eq:NN \__ltj_fontspec_orig_DeclareFontShape \DeclareFontShape
-\cs_new:Nn \ltj_fontspec_make_font_shapes:Nnnnn {
+\cs_new:Nn \__ltj_fontspec_make_font_shapes:Nnnnn {
\group_begin:
%% 基底フォント
\cs_set_eq:NN \__fontspec_font_set:Nnn \use_none:nnn
\cs_set_eq:NN \__fontspec_font_if_null:NT \use_none:nn
- \cs_set_eq:NN \__fontspec_declare_shape:nnxx \ltj_fontspec_declare_shape:nnxx
+ \cs_set_eq:NN \__fontspec_declare_shape:nnxx \__ltj_fontspec_declare_shape:nnxx
\__ltj_orig_fontspec_make_font_shapes:Nnnnn {#1} {#2} {#3} {#4} {#5}
%%
- \ltj_fontspec_make_font_shapes_alt:Nnnnnn {#1}{#2}{#3}
- {#4, \l_ltj_fontspec_fontfeat_yoko_clist}{#5} {JY3 }
- \ltj_fontspec_make_font_shapes_alt:Nnnnnn {#1}{#2}{#3}
- {#4, \l_ltj_fontspec_fontfeat_tate_clist}{#5} {JT3}
+ \__ltj_fontspec_make_font_shapes_alt:Nnnnnn {#1}{#2}{#3}
+ {#4, \l__ltj_fontspec_fontfeat_yoko_clist}{#5} {JY3 }
+ \__ltj_fontspec_make_font_shapes_alt:Nnnnnn {#1}{#2}{#3}
+ {#4, \l__ltj_fontspec_fontfeat_tate_clist}{#5} {JT3}
\group_end:
}
%%% Altfont 内部処理部
-\cs_new:Nn \ltj_fontspec_make_font_shapes_alt:Nnnnnn {
+\cs_new:Nn \__ltj_fontspec_make_font_shapes_alt:Nnnnnn {
\group_begin:
\str_if_eq:nnTF { #6 } { JY3 } {
- \cs_set_eq:NN \__fontspec_declare_shape:nnxx \ltj_fontspec_declare_shape_yoko:nnxx
+ \cs_set_eq:NN \__fontspec_declare_shape:nnxx \__ltj_fontspec_declare_shape_yoko:nnxx
}{
- \cs_set_eq:NN \__fontspec_declare_shape:nnxx \ltj_fontspec_declare_shape_tate:nnxx
+ \cs_set_eq:NN \__fontspec_declare_shape:nnxx \__ltj_fontspec_declare_shape_tate:nnxx
}
\keys_set_known:nn {fontspec-ltjaltfont-reparse} { #4 }
- \clist_if_empty:NF \l_ltj_fontspec_altfont_clist {
- \int_gzero:N \g_ltj_fontspec_altnumber_int
- \clist_map_inline:Nn \l_ltj_fontspec_altfont_clist {
- \tl_clear:N \l_ltj_fontspec_altrange_tl
- \tl_set:Nn \l_ltj_fontspec_altname_tl { #1 }
+ \clist_if_empty:NF \l__ltj_fontspec_altfont_clist {
+ \int_gzero:N \g__ltj_fontspec_altnumber_int
+ \clist_map_inline:Nn \l__ltj_fontspec_altfont_clist {
+ \tl_clear:N \l__ltj_fontspec_altrange_tl
+ \tl_set:Nn \l__ltj_fontspec_altname_tl { #1 }
\tl_set:Nn \l_tmpa_tl { #1 }
\keys_set_known:nxN {fontspec-ltjaltfont} { \exp_after:wN \use:n ##1 }
- \l_ltj_fontspec_altfont_leftover_clist
+ \l__ltj_fontspec_altfont_leftover_clist
\keys_set_known:nn {fontspec-ltjaltfont-reparse} { \exp_after:wN \use:n ##1 }
- \tl_if_empty:NT \l_ltj_fontspec_altrange_tl {
+ \tl_if_empty:NT \l__ltj_fontspec_altrange_tl {
\msg_warning:nnn {luatexja-fontspec} {altfont-ignored-by-norange} { ##1 }
} {
\bool_if:nTF {
- \tl_if_eq_p:NN \l_ltj_fontspec_altname_tl \l_tmpa_tl
+ \tl_if_eq_p:NN \l__ltj_fontspec_altname_tl \l_tmpa_tl
&&
- \tl_if_empty_p:N \l_ltj_fontspec_altfont_leftover_clist
+ \tl_if_empty_p:N \l__ltj_fontspec_altfont_leftover_clist
} {
\msg_warning:nnn {luatexja-fontspec} {altfont-ignored-by-rangeonly} { ##1 }
} {
\__ltj_orig_fontspec_make_font_shapes:Nnnnn
- { \l_ltj_fontspec_altname_tl } {#2}
- {#3 _ alt \int_use:N \g_ltj_fontspec_altnumber_int }
- {#4, \l_ltj_fontspec_altfont_leftover_clist }
+ { \l__ltj_fontspec_altname_tl } {#2}
+ {#3 _ alt \int_use:N \g__ltj_fontspec_altnumber_int }
+ {#4, \l__ltj_fontspec_altfont_leftover_clist }
{#5}
\DeclareAlternateKanjiFont
{ #6 }{ \g__fontspec_nfss_family_tl }{#2}{#3}%
{ #6 }{ \g__fontspec_nfss_family_tl }{#2}
- { #3 _alt \int_use:N \g_ltj_fontspec_altnumber_int }
- { \l_ltj_fontspec_altrange_tl }
- \int_gincr:N \g_ltj_fontspec_altnumber_int
+ { #3 _alt \int_use:N \g__ltj_fontspec_altnumber_int }
+ { \l__ltj_fontspec_altrange_tl }
+ \int_gincr:N \g__ltj_fontspec_altnumber_int
}
}
}
@@ -308,13 +320,13 @@
%%%%%%%% User commands
\DeclareDocumentCommand \jfontspec { O{} m O{} } {
- \ltj_fontspec_set_family:Nnn \k@family {#1,#3}{#2}
+ \__ltj_fontspec_set_family:Nnn \k@family {#1,#3}{#2}
\selectfont
\ignorespaces
}
\DeclareDocumentCommand \setmainjfont { O{} m O{} } {
- \ltj_fontspec_set_family:Nnn \mcdefault {#1,#3}{#2}
+ \__ltj_fontspec_set_family:Nnn \mcdefault {#1,#3}{#2}
\unless\ifltj@disablejfam
\DeclareSymbolFont{mincho}{JY3}{\mcdefault}{\mddefault}{n}
\SetSymbolFont{mincho}{bold}{JY3}{\mcdefault}{\bfdefault}{n}
@@ -323,7 +335,7 @@
}
\DeclareDocumentCommand \setsansjfont { O{} m O{} } {
- \ltj_fontspec_set_family:Nnn \gtdefault {#1,#3}{#2}
+ \__ltj_fontspec_set_family:Nnn \gtdefault {#1,#3}{#2}
\unless\ifltj@disablejfam
\DeclareMathAlphabet{\mathgt}{JY3}{\gtdefault}{\mddefault}{n}
\fi
@@ -331,17 +343,17 @@
}
\DeclareDocumentCommand \newjfontfamily { m O{} m O{} } {
- \cs_set_eq:NN \fontspec_set_family:Nnn \ltj_fontspec_set_family:Nnn
+ \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_fontspec_set_family:Nnn
\newfontfamily #1 [#2,#4] {#3}
\cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
}
\DeclareDocumentCommand \renewjfontfamily { m O{} m O{} } {
- \cs_set_eq:NN \fontspec_set_family:Nnn \ltj_fontspec_set_family:Nnn
+ \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_fontspec_set_family:Nnn
\renewfontfamily #1 [#2,#4] {#3}
\cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
}
\DeclareDocumentCommand \setjfontfamily { m O{} m O{} } {
- \cs_set_eq:NN \fontspec_set_family:Nnn \ltj_fontspec_set_family:Nnn
+ \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_fontspec_set_family:Nnn
\setfontfamily #1 [#2,#4] {#3}
\cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
}
@@ -374,12 +386,12 @@
}
\DeclareDocumentCommand \addjfontfeatures {m} {
- \ltj_fontspec_if_fontspec_font:TF
+ \__ltj_fontspec_if_fontspec_font:TF
{
\__ltj_set_global_variable_for_kanji:
\group_begin:
\tl_set_eq:NN \f@family \k@family
- \cs_set_eq:NN \__fontspec_select_font_family:nn \ltj_fontspec_select_font_family:nn
+ \cs_set_eq:NN \__fontspec_select_font_family:nn \__ltj_fontspec_select_font_family:nn
\addfontfeatures {#1}
\group_end:
\kanjifamily\g__fontspec_nfss_family_tl\selectfont
@@ -392,7 +404,7 @@
\cs_set_eq:NN \addjfontfeature \addjfontfeatures
-\prg_new_conditional:Nnn \ltj_fontspec_if_fontspec_font: {TF,T,F}
+\prg_new_conditional:Nnn \__ltj_fontspec_if_fontspec_font: {TF,T,F}
{
\cs_if_exist:cTF {g__fontspec_fontinfo_ \k@family _prop} \prg_return_true: \prg_return_false:
}