luatexja-preset: use CJKShape=NLC/JIS1990.

[luatex-ja/luatexja.git] / src / addons / luatexja-preset.sty

diff --git a/src/addons/luatexja-preset.sty b/src/addons/luatexja-preset.sty
index ad0a21b..9bcf422 100644 (file)
--- a/src/addons/luatexja-preset.sty
+++ b/src/addons/luatexja-preset.sty
@@ -38,7 +38,7 @@
 
 % 漢字字形
 \tl_new:N \l_ltjpreset_kanji_shape_tl
-\DeclareOption{90jis}{  \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , RawFeature = +jp90 }} % 90jis
+\DeclareOption{90jis}{  \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=jp90 }} % 90jis
 \DeclareOption{jis2004}{\tl_set:Nn \l_ltjpreset_kanji_shape_tl { , RawFeature = +jp04 }} % jis2004
 
 % font preset
@@ -234,7 +234,7 @@
 \clist_if_in:NnT \l_ltjpreset_font_list { KozMinPr6N-Regular.otf } {
   \tl_set:Nn \l_tmpa_tl {, RawFeature = +jp04}
   \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
-    \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , RawFeature = +nlck }
+    \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=NLC }
   }
 }
 
@@ -271,7 +271,7 @@
 
 %% HG 系フォント + JIS2004/90JIS のときはフォント名を置換
 \bool_if:NT \l_ltjpreset_office_bool {
-  \tl_set:Nn \l_tmpa_tl {, RawFeature = +jp04}
+  \tl_set:Nn \l_tmpa_tl {, RawFeature = +jp04 }
   \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl { 
     \cs_set:Nx \ltjpreset_font_mc_bx: { hgrme04.ttc }
     \cs_set:Nx \ltjpreset_font_gt_bx: { hgrge04.ttc }
@@ -280,7 +280,7 @@
     \cs_set_eq:NN \ltjpreset_font_gt_m: \ltjpreset_font_gt_n_uni:
     % HG ゴシックM のときはそうはいかないので 1 ウェイト時のゴシック体を使う
   }
-  \tl_set:Nn \l_tmpa_tl {, RawFeature = +jp90}
+  \tl_set:Nn \l_tmpa_tl {, CJKShape=jp90 }
   \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl { 
     \cs_set:Nx \ltjpreset_font_mc_bx: { hgrme.ttc }
     \cs_set:Nx \ltjpreset_font_gt_bx: { hgrge.ttc }