From 09fc8c418b594788a6016848b852d7b7a5a064f3 Mon Sep 17 00:00:00 2001 From: Hironori Kitagawa Date: Tue, 31 Jul 2018 16:30:50 +0900 Subject: [PATCH] more #38424 --- src/addons/luatexja-fontspec-26h.sty | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/addons/luatexja-fontspec-26h.sty b/src/addons/luatexja-fontspec-26h.sty index ef7adf6..8a99602 100644 --- a/src/addons/luatexja-fontspec-26h.sty +++ b/src/addons/luatexja-fontspec-26h.sty @@ -93,6 +93,9 @@ \DeclareKanjiFamily {JT3} {#2} {#3} } +\tl_new:N \g__ltj_fontspec_kanji_nfss_family_tl +\tl_new:N \g__ltj_fontspec_orig_nfss_family_tl + \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 { \group_begin: @@ -207,9 +210,15 @@ } \cs_new:Nn \ltj_fontspec_set_family:Nnn { + %\typeout{A>>[\g__fontspec_nfss_family_tl][\g__ltj_fontspec_kanji_nfss_family_tl]} + \tl_gset_eq:NN \g__ltj_fontspec_orig_nfss_family_tl \g__fontspec_nfss_family_tl + \tl_gset_eq:NN \g__fontspec_nfss_family_tl \g__ltj_fontspec_kanji_nfss_family_tl \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 + \tl_gset_eq:NN \g__ltj_fontspec_kanji_nfss_family_tl \g__fontspec_nfss_family_tl + \tl_gset_eq:NN \g__fontspec_nfss_family_tl \g__ltj_fontspec_orig_nfss_family_tl + %\typeout{B>>[\g__fontspec_nfss_family_tl][\g__ltj_fontspec_kanji_nfss_family_tl]} } \cs_set_eq:NN \__ltj_orig_fontspec_set_family:Nnn \fontspec_set_family:Nnn \cs_set_eq:NN \__ltj_orig_fontspec_make_font_shapes:Nnnnn \__fontspec_make_font_shapes:Nnnnn @@ -338,12 +347,18 @@ \DeclareDocumentCommand \addjfontfeatures {m} { \ltj_fontspec_if_fontspec_font:TF { + %\typeout{C>>[\g__fontspec_nfss_family_tl][\g__ltj_fontspec_kanji_nfss_family_tl]} + \tl_gset_eq:NN \g__ltj_fontspec_orig_nfss_family_tl \g__fontspec_nfss_family_tl + \tl_gset_eq:NN \g__fontspec_nfss_family_tl \g__ltj_fontspec_kanji_nfss_family_tl \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 \addfontfeatures {#1} \group_end: - \fontfamily\l_fontspec_family_tl\selectfont + \kanjifamily\g__fontspec_nfss_family_tl\selectfont + \tl_gset_eq:NN \g__ltj_fontspec_kanji_nfss_family_tl \g__fontspec_nfss_family_tl + \tl_gset_eq:NN \g__fontspec_nfss_family_tl \g__ltj_fontspec_orig_nfss_family_tl + %\typeout{D>>[\g__fontspec_nfss_family_tl][\g__ltj_fontspec_kanji_nfss_family_tl]} }{ \msg_warning:nn {luatexja-fontspec} {addjfontfeatures-ignored} } @@ -354,7 +369,7 @@ \prg_new_conditional:Nnn \ltj_fontspec_if_fontspec_font: {TF,T,F} { - \cs_if_exist:cTF {g__fontspec_ \k@family _prop} \prg_return_true: \prg_return_false: + \cs_if_exist:cTF {g__fontspec_fontinfo_ \k@family _prop} \prg_return_true: \prg_return_false: } \endinput -- 2.11.0