match option in luatexja-preset.sty.

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

diff --git a/src/addons/luatexja-preset.sty b/src/addons/luatexja-preset.sty
index 6f8ad23..ed93e25 100644 (file)
--- a/src/addons/luatexja-preset.sty
+++ b/src/addons/luatexja-preset.sty
@@ -1,5 +1,5 @@
 % luatexja-preset.sty
-\ProvidesPackage{luatexja-preset}[2013/10/28 Japanese font presets]
+\ProvidesPackage{luatexja-preset}[2014/12/03 Japanese font presets]
 
 \RequirePackage{expl3}
 \RequirePackage{luatexja-fontspec}
@@ -194,7 +194,15 @@
   \bool_set_true:N \l_ltjpreset_noembed_bool
 }
 
-\ExecuteOptions{noembed}
+\ExecuteOptions{ipaex}
+
+% match 
+\DeclareOption{match} {
+  \bool_if:NF  \ltj_fontspec_match_bool {
+    \ltj_fontspec_match_cmd
+    \bool_set_true:N \ltj_fontspec_match_bool
+  }
+}
 \ProcessOptions*
 
 %% KozMinPr6N の場合はjp04 feature がないので，nlck にする
@@ -269,12 +277,15 @@
 
 \tl_set:Nx \l_ltjpreset_add_features_tl {
   \tl_use:N \l_ltjpreset_kanji_shape_tl, 
-  JFM   = \ltjpreset_use_jfm:
+  YokoFeatures = { JFM = \ltjpreset_use_jfm: }, 
 }
 
 \bool_if:NT \l_ltjpreset_expert_bool {
-  \cs_set:Npn \rubyfamily { \addfontfeatures { Style = Ruby} }
-  \tl_put_left:Nn \l_ltjpreset_add_features_tl { Style = HorizontalKana, }
+  \cs_set:Npn \rubyfamily { \addjfontfeatures { Style = Ruby} }
+  \tl_put_left:Nn \l_ltjpreset_add_features_tl { 
+    YokoFeatures = {Style = HorizontalKana}, 
+    TateFeatures = {Style = VerticalKana}, 
+  }
 }
 
 % （丸）ゴシック体の設定: bold option もここで