Merge branch 'cancel_profile_otr' into kitagawa_test

diff --git a/src/addons/luatexja-fontspec-27c.sty b/src/addons/luatexja-fontspec-27c.sty
index 2fc3d6b..76ebf87 100644 (file)
--- a/src/addons/luatexja-fontspec-27c.sty
+++ b/src/addons/luatexja-fontspec-27c.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-27c}[2020-04-04 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec-27c}[2024-02-19 fontspec support of LuaTeX-ja]
 \RequirePackage{l3keys2e}
 \ExplSyntaxOn
 
@@ -90,16 +90,16 @@
 %% save and restore global variable
 \tl_new:N \g__ltj_fontspec_kanji_nfss_family_tl
 \tl_new:N \g__ltj_fontspec_orig_nfss_family_tl
-\seq_new:N \g__ltj_fontspec_kanji_bf_series_seq
-\seq_new:N \g__ltj_fontspec_orig_bf_series_seq
+\seq_new:N \l__ltj_fontspec_kanji_bf_series_seq
+\seq_new:N \l__ltj_fontspec_orig_bf_series_seq
 \clist_new:N \g__ltj_fontspec_kanji_default_fontopts_clist
 \clist_new:N \g__ltj_fontspec_orig_default_fontopts_clist
 
 \cs_new:Nn \__ltj_set_global_variable_for_kanji: {
   \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
-  \seq_gset_eq:NN \g__ltj_fontspec_orig_bf_series_seq \g__fontspec_bf_series_seq
-  \seq_gset_eq:NN \g__fontspec_bf_series_seq \g__ltj_fontspec_kanji_bf_series_seq
+  \seq_set_eq:NN \l__ltj_fontspec_orig_bf_series_seq \l__fontspec_bf_series_seq
+  \seq_set_eq:NN \l__fontspec_bf_series_seq \l__ltj_fontspec_kanji_bf_series_seq
   %\seq_gclear:N \g__fontspec_bf_series_seq
   \clist_set_eq:NN \g__ltj_fontspec_orig_default_fontopts_clist \g__fontspec_default_fontopts_clist
   \clist_set_eq:NN \g__fontspec_default_fontopts_clist \g__ltj_fontspec_kanji_default_fontopts_clist
@@ -108,8 +108,8 @@
 \cs_new:Nn \__ltj_restore_global_variable: {
   \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
-  \seq_gset_eq:NN \g__ltj_fontspec_kanji_bf_series_seq \g__fontspec_bf_series_seq
-  \seq_gset_eq:NN \g__fontspec_bf_series_seq \g__ltj_fontspec_orig_bf_series_seq
+  \seq_set_eq:NN \l__ltj_fontspec_kanji_bf_series_seq \l__fontspec_bf_series_seq
+  \seq_set_eq:NN \l__fontspec_bf_series_seq \l__ltj_fontspec_orig_bf_series_seq
   \clist_set_eq:NN \g__ltj_fontspec_kanji_default_fontopts_clist \g__fontspec_default_fontopts_clist
   \clist_set_eq:NN \g__fontspec_default_fontopts_clist \g__ltj_fontspec_orig_default_fontopts_clist
 }
@@ -364,6 +364,7 @@
   \newjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
 }
 
+\prop_new:N \l__ltj_fontspec_tmp_prop
 \prop_new:N \g__ltj_fontspec_fontopts_prop
 \DeclareDocumentCommand \defaultjfontfeatures { t+ o m }
  {

diff --git a/src/luatexja.sty b/src/luatexja.sty
index 442e73c..164c02d 100644 (file)
--- a/src/luatexja.sty
+++ b/src/luatexja.sty
@@ -27,7 +27,7 @@
 \newif\ifltj@disablejfam
 
 %%%% VERSION
-\def\LuaTeXjaversion{20231230.0}
+\def\LuaTeXjaversion{20240219.0}
 
 %% Check if LaTeX is used.
 \begingroup\expandafter\expandafter\expandafter\endgroup

diff --git a/src/patches/lltjp-fontspec.sty b/src/patches/lltjp-fontspec.sty
index 617eeda..589a3c5 100644 (file)
--- a/src/patches/lltjp-fontspec.sty
+++ b/src/patches/lltjp-fontspec.sty
@@ -147,7 +147,7 @@
     \__fontspec_setmonofont_hook:nn {#1} {#2}
     \normalfont
   }
-%% end of 2.7d
+%% end of 2.7c
 }}
 
 \cs_set:Nn \fontspec_visible_space:

diff --git a/test/test09-fontspec.tex b/test/test09-fontspec.tex
index 3eb9252..600272f 100644 (file)
--- a/test/test09-fontspec.tex
+++ b/test/test09-fontspec.tex
@@ -15,6 +15,11 @@
 
 \newjfontfamily\ipajisninety[CJKShape=JIS1990]{IPAexMincho}
 
+\defaultjfontfeatures[MicrosoftMincho]{
+    UprightFont=msmincho,
+  }
+\setmainjfont{MicrosoftMincho}
+
 \begin{document}
 
 \section{fontspecのテスト}