X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Faddons%2Fluatexja-preset.sty;h=917ba786a5b2967efe90eb1e905c70f70194b099;hb=48b8e3dc636d7e15b621b2845b23e2c7b7cc7d1d;hp=bc24808a481f7294207644b66300b043f6d7f82f;hpb=afbb2516bf129f9f3a48e277ef1dc9b86327c897;p=luatex-ja%2Fluatexja.git

diff --git a/src/addons/luatexja-preset.sty b/src/addons/luatexja-preset.sty
index bc24808..917ba78 100644
--- a/src/addons/luatexja-preset.sty
+++ b/src/addons/luatexja-preset.sty
@@ -1,12 +1,15 @@
 % luatexja-preset.sty
-\ProvidesPackage{luatexja-preset}[2013/05/14 Japanese font presets]
-%% Sync with PXchfon 0.6a
+\ProvidesPackage{luatexja-preset}[2015/06/28 Japanese font presets]
 
 \RequirePackage{expl3}
-\RequirePackage{luatexja-fontspec}
+\RequirePackage{luatexja}
 \ExplSyntaxOn
 
 %%%% message
+\bool_new:N \l_ltjpreset_nfssonly_bool % nfssonly
+\bool_set_false:N \l_ltjpreset_nfssonly_bool
+\DeclareOption{nfssonly}  {\bool_set_true:N \l_ltjpreset_nfssonly_bool}
+\DeclareOption{fontspec}  {\bool_set_false:N \l_ltjpreset_nfssonly_bool}
 
 \bool_new:N \l_ltjpreset_bold_bool % bold
 \bool_set_false:N \l_ltjpreset_bold_bool
@@ -18,17 +21,12 @@
 \DeclareOption{expert}  {\bool_set_true:N \l_ltjpreset_expert_bool}
 \DeclareOption{noexpert}{\bool_set_false:N \l_ltjpreset_expert_bool}
 
-\int_new:N \l_ltjpreset_deluxe_int % expert
+\int_new:N \l_ltjpreset_deluxe_int % deluxe
 \int_set:Nn \l_ltjpreset_deluxe_int { 0 }
-\DeclareOption{deluxe}{\int_set:Nn \l_ltjpreset_deluxe_int { 2 }}   % 7 fonts
+\DeclareOption{deluxe}{\int_set:Nn \l_ltjpreset_deluxe_int { 2 }}   % 6 fonts
 \DeclareOption{nodeluxe}{\int_set:Nn \l_ltjpreset_deluxe_int { 0 }} % 2 fonts
 
-% scale
-\msg_new:nnn { luatexja-preset }{ scale }{
-  Japanese~fonts~will~be~scaled~by~\fp_use:N \g_ltj_fontspec_scale_fp.
-}
-\msg_warning:nn { luatexja-preset }{ scale }
-
+\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{luatexja-fontspec}}
 % JFM
 \cs_set:Npn \ltjpreset_use_jfm: {ujis}  % 使用する JFM
 %%% \DeclareOption{min}{\cs_set:Npn  \ltjpreset_use_jfm: {min}} % min
@@ -47,7 +45,7 @@
 \clist_new:N \l_ltjpreset_font_list
 
 \cs_new:Npn \ltjpreset_set_uni:nn #1#2 {
-  \ltjpreset_set_multi:n { #1, #1, #2, #2, #2, #2, #1 }
+  \ltjpreset_set_multi:n { #1, #2, #2, #2, #2, #2, #2 }
 }
 \cs_new:Npn \ltjpreset_set_multi:n #1 {
   \clist_set:Nn \l_ltjpreset_font_list { #1 }
@@ -64,54 +62,71 @@
   \bool_set_true:N \l_ltjpreset_office_bool
 }
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% OBSOLETE
-% kozuka
-\DeclareOption{kozuka4}{
+
+% 小塚 (Adobe)
+%% Pro
+\DeclareOption{kozuka-pro}{
   \ltjpreset_set_multi:n {
-    KozMinPro-Regular.otf , KozMinPro-Bold.otf, % mc/m, mc/bx
-    KozGoPro-Regular.otf  , KozGoPro-Bold.otf,  % gt/m, gt/bx (multiweight))
-    KozGoPro-Medium.otf   , KozGoPro-Heavy.otf, % gt/m (uni), gt/eb
-    KozGoPro-Heavy.otf                          % mg/m
+    KozMinPro-Regular , % mc/m
+    KozMinPro-Bold ,    % mc/bx
+    KozGoPro-Regular , % gt/m  (multi)
+    KozGoPro-Bold ,    % gt/bx
+    KozGoPro-Medium  , % gt/m  (uni)
+    KozGoPro-Heavy ,   % gt/eb
+    KozGoPro-Heavy     % mg/m
   }
 }
-\DeclareOption{kozuka6}{
+%% Pr6
+\DeclareOption{kozuka-pr6}{
   \ltjpreset_set_multi:n {
-    KozMinProVI-Regular.otf , KozMinProVI-Bold.otf, % mc/m, mc/bx
-    KozGoProVI-Regular.otf  , KozGoProVI-Bold.otf,  % gt/m, gt/bx (multiweight))
-    KozGoProVI-Medium.otf   , KozGoProVI-Heavy.otf, % gt/m (uni), gt/eb
-    KozGoProVI-Heavy.otf                            % mg/m
+    KozMinProVI-Regular , % mc/m
+    KozMinProVI-Bold ,    % mc/bx
+    KozGoProVI-Regular , % gt/m  (multi)
+    KozGoProVI-Bold ,    % gt/bx
+    KozGoProVI-Medium  , % gt/m  (uni)
+    KozGoProVI-Heavy ,   % gt/eb
+    KozGoProVI-Heavy     % mg/m
   }
 }
-\DeclareOption{kozuka6n}{
+%% Pr6N
+\DeclareOption{kozuka-pr6n}{
   \ltjpreset_set_multi:n {
-    KozMinPr6N-Regular.otf , KozMinPr6N-Bold.otf, % mc/m, mc/bx
-    KozGoPr6N-Regular.otf  , KozGoPr6N-Bold.otf,  % gt/m, gt/bx (multiweight))
-    KozGoPr6N-Medium.otf   , KozGoPr6N-Heavy.otf, % gt/m (uni), gt/eb
-    KozGoPr6N-Heavy.otf                           % mg/m
+    KozMinPr6N-Regular , % mc/m
+    KozMinPr6N-Bold ,    % mc/bx
+    KozGoPr6N-Regular , % gt/m  (multi)
+    KozGoPr6N-Bold ,    % gt/bx
+    KozGoPr6N-Medium  , % gt/m  (uni)
+    KozGoPr6N-Heavy ,   % gt/eb
+    KozGoPr6N-Heavy     % mg/m
   }
 }
 
-% hiragino
-\DeclareOption{hiragino}{
+% ヒラギノ (OSX)
+\DeclareOption{hiragino-pro}{
   \ltjpreset_set_multi:n {
-    HiraMinPro-W3.otf      , HiraMinPro-W6.otf,   % mc/m, mc/bx
-    HiraKakuPro-W3.otf     , HiraKakuPro-W6.otf,  % gt/m, gt/bx (multiweight))
-    HiraKakuPro-W3.otf     , HiraKakuStd-W8.otf,  % gt/m (uni), gt/eb
-    HiraMaruPro-W4.otf                            % mg/m
+    HiraMinPro-W3 , 
+    HiraMinPro-W6 , 
+    HiraKakuPro-W3 , % gt/m (multi)
+    HiraKakuPro-W6 , 
+    HiraKakuPro-W6 , % gt/m (uni)
+    HiraKakuStd-W8 , 
+    HiraMaruPro-W4 , 
   }
 }
-\DeclareOption{hiraginon}{
+\DeclareOption{hiragino-pron}{
   \ltjpreset_set_multi:n {
-    HiraMinProN-W3.otf      , HiraMinProN-W6.otf,   % mc/m, mc/bx
-    HiraKakuProN-W3.otf     , HiraKakuProN-W6.otf,  % gt/m, gt/bx (multiweight))
-    HiraKakuProN-W3.otf     , HiraKakuStdN-W8.otf,  % gt/m (uni), gt/eb
-    HiraMaruProN-W4.otf                             % mg/m
+    HiraMinProN-W3 , 
+    HiraMinProN-W6 , 
+    HiraKakuProN-W3 , % gt/m (multi)
+    HiraKakuProN-W6 , 
+    HiraKakuProN-W6 , % gt/m (uni)
+    HiraKakuStdN-W8 , 
+    HiraMaruProN-W4 , 
   }
 }
 
-% morisawa?
-\DeclareOption{morisawa4}{
+% モリサワ
+\DeclareOption{morisawa-pro}{
   \ltjpreset_set_multi:n {
     A-OTF-RyuminPro-Light.otf , A-OTF-FutoMinA101Pro-Bold.otf ,    % mc/m, mc/bx
     A-OTF-GothicBBBPro-Medium.otf , A-OTF-FutoGoB101Pro-Bold.otf , % gt/m, gt/bx (multiweight))
@@ -119,81 +134,43 @@
     A-OTF-Jun101Pro-Light.otf % mg/m
   }
 }
-\DeclareOption{morisawa6n}{
+\DeclareOption{morisawa-pr6n}{
   \ltjpreset_set_multi:n {
     A-OTF-RyuminPr6N-Light.otf , A-OTF-FutoMinA101Pr6N-Bold.otf ,    % mc/m, mc/bx
     A-OTF-GothicBBBPr6N-Medium.otf , A-OTF-FutoGoB101Pr6N-Bold.otf , % gt/m, gt/bx (multiweight))
     A-OTF-GothicBBBPr6N-Medium.otf , A-OTF-MidashiGoPr6N-MB31.otf ,  % gt/m (uni), gt/eb
-    A-OTF-Jun101Pr6N-Light.otf                                       % mg/m
+    A-OTF-ShinMGoPr6N-Light.otf                                      % mg/m
   }
 }
 
-\DeclareOption{ipaex-dx}{\ltjpreset_set_office:nn { IPAExMincho } { IPAExGothic }}
-\DeclareOption{ipa-dx}  {\ltjpreset_set_office:nn { IPAMincho } { IPAGothic }}
-\DeclareOption{ms-dx}   {\ltjpreset_set_office:nn { MS-Mincho } { MS-Gothic }}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-
-% kozuka
-\DeclareOption{kozuka-pro}{
-  \ltjpreset_set_multi:n {
-    KozMinPro-Regular.otf , KozMinPro-Bold.otf, % mc/m, mc/bx
-    KozGoPro-Regular.otf  , KozGoPro-Bold.otf,  % gt/m, gt/bx (multiweight))
-    KozGoPro-Medium.otf   , KozGoPro-Heavy.otf, % gt/m (uni), gt/eb
-    KozGoPro-Heavy.otf                          % mg/m
-  }
-}
-\DeclareOption{kozuka-pr6}{
-  \ltjpreset_set_multi:n {
-    KozMinProVI-Regular.otf , KozMinProVI-Bold.otf, % mc/m, mc/bx
-    KozGoProVI-Regular.otf  , KozGoProVI-Bold.otf,  % gt/m, gt/bx (multiweight))
-    KozGoProVI-Medium.otf   , KozGoProVI-Heavy.otf, % gt/m (uni), gt/eb
-    KozGoProVI-Heavy.otf                            % mg/m
-  }
-}
-\DeclareOption{kozuka-pr6n}{
+% 游明朝/游ゴシック (Win8.1)
+\DeclareOption{yu-win}{
   \ltjpreset_set_multi:n {
-    KozMinPr6N-Regular.otf , KozMinPr6N-Bold.otf, % mc/m, mc/bx
-    KozGoPr6N-Regular.otf  , KozGoPr6N-Bold.otf,  % gt/m, gt/bx (multiweight))
-    KozGoPr6N-Medium.otf   , KozGoPr6N-Heavy.otf, % gt/m (uni), gt/eb
-    KozGoPr6N-Heavy.otf                           % mg/m
+    YuMincho-Regular , YuMincho-Demibold , % mc/m, mc/bx
+    YuGothic-Regular , YuGothic-Bold ,     % gt/m, gt/bx (multiweight))
+    YuGothic-Bold    , YuGothic-Bold ,     % gt/m (uni), gt/eb
+    YuGothic-Bold                          % mg/m
   }
 }
 
-% hiragino
-\DeclareOption{hiragino-pro}{
+% Yu fonts in OSX
+% according to http://support.apple.com/kb/HT5944
+\DeclareOption{yu-osx}{
   \ltjpreset_set_multi:n {
-    HiraMinPro-W3.otf      , HiraMinPro-W6.otf,   % mc/m, mc/bx
-    HiraKakuPro-W3.otf     , HiraKakuPro-W6.otf,  % gt/m, gt/bx (multiweight))
-    HiraKakuPro-W6.otf     , HiraKakuStd-W8.otf,  % gt/m (uni), gt/eb
-    HiraMaruPro-W4.otf                            % mg/m
-  }
-}
-\DeclareOption{hiragino-pron}{
-  \ltjpreset_set_multi:n {
-    HiraMinProN-W3.otf      , HiraMinProN-W6.otf,   % mc/m, mc/bx
-    HiraKakuProN-W3.otf     , HiraKakuProN-W6.otf,  % gt/m, gt/bx (multiweight))
-    HiraKakuProN-W6.otf     , HiraKakuStdN-W8.otf,  % gt/m (uni), gt/eb
-    HiraMaruProN-W4.otf                             % mg/m
+    YuMincho~Medium , YuMincho~Demibold , % mc/m, mc/bx
+    YuGothic~Medium , YuGothic~Bold ,     % gt/m, gt/bx (multiweight))
+    YuGothic~Bold   , YuGothic~Bold ,     % gt/m (uni), gt/eb
+    YuGothic~Bold                         % mg/m
   }
 }
 
-% morisawa
-\DeclareOption{morisawa-pro}{
-  \ltjpreset_set_multi:n {
-    A-OTF-RyuminPro-Light.otf , A-OTF-FutoMinA101Pro-Bold.otf ,    % mc/m, mc/bx
-    A-OTF-GothicBBBPro-Medium.otf , A-OTF-FutoGoB101Pro-Bold.otf , % gt/m, gt/bx (multiweight))
-    A-OTF-GothicBBBPro-Medium.otf , A-OTF-MidashiGoPro-MB31.otf ,  % gt/m (uni), gt/eb
-    A-OTF-Jun101Pro-Light.otf % mg/m
-  }
-}
-\DeclareOption{morisawa-pr6n}{
+% moga-mobo
+\DeclareOption{moga-mobo}{
   \ltjpreset_set_multi:n {
-    A-OTF-RyuminPr6N-Light.otf , A-OTF-FutoMinA101Pr6N-Bold.otf ,    % mc/m, mc/bx
-    A-OTF-GothicBBBPr6N-Medium.otf , A-OTF-FutoGoB101Pr6N-Bold.otf , % gt/m, gt/bx (multiweight))
-    A-OTF-GothicBBBPr6N-Medium.otf , A-OTF-MidashiGoPr6N-MB31.otf ,  % gt/m (uni), gt/eb
-    A-OTF-Jun101Pr6N-Light.otf                                       % mg/m
+    Moga90Mincho, Moga90Mincho~Bold ,       % mc/m, mc/bx
+    Moga90Gothic, Moga90Gothic~Bold ,       % gt/m, gt/bx (multiweight))
+    Moga90Gothic~Bold, Moga90Gothic~Bold,   % gt/m (uni), gt/eb
+    Mobo90Gothic                            % mg/m
   }
 }
 
@@ -227,19 +204,35 @@
   \bool_set_true:N \l_ltjpreset_noembed_bool
 }
 
-\ExecuteOptions{noembed}
-\ProcessOptions*
+\ExecuteOptions{ipaex}
 
-%% KozMinPr6N の場合はjp04 feature がないので，nlck にする
-\clist_if_in:NnT \l_ltjpreset_font_list { KozMinPr6N-Regular.otf } {
-  \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 }
-  \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
-    \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=NLC }
-  }
-}
+\ProcessOptions*
 
 %%%%%%%% main routine
 
+\msg_new:nnn { luatexja-preset }{ ltj-fontspec }{
+  The~ luatexja-fontspec~ package~ is~ loaded~ already.~
+  Hence~ we~ ignore~ `nfssonly'~option.
+}
+\@ifpackageloaded{luatexja-fontspec}{
+  \bool_if:NT \l_ltjpreset_nfssonly_bool
+    { \msg_warning:nn { luatexja-preset }{ ltj-fontspec } }
+  \bool_set_false:N \l_ltjpreset_nfssonly_bool
+}{}
+
+\bool_new:N \l_ltjpreset_shape_nlck_bool
+%% KozMinPr6N, HiraMinProN-W3 の場合はjp04 feature がないので，nlck にする
+\tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 }
+\tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
+  \clist_if_in:NnT \l_ltjpreset_font_list { KozMinPr6N-Regular }
+   { \bool_set_true:N \l_ltjpreset_shape_nlck_bool }
+  \clist_if_in:NnT \l_ltjpreset_font_list { HiraMinProN-W3 }
+   { \bool_set_true:N \l_ltjpreset_shape_nlck_bool }
+   \clist_if_in:NnT \l_ltjpreset_font_list { Moga90Mincho }
+   { \tl_remove_all:Nn \l_ltjpreset_font_list {90} }%%% これでいいのか？
+ 
+}
+
 %%%%  リストからの展開
 % mc/m
 \clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
@@ -289,29 +282,157 @@
   }
 }
 
-%%%% expert 用設定
+%% 90JIS/JIS2004 字形指定のオプション
+\bool_if:NTF \l_ltjpreset_nfssonly_bool {
+  \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS1990 }
+  \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
+    \tl_set:Nn \l_ltjpreset_kanji_shape_tl { +jp90 }
+  }
+  \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 }
+  \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
+    \bool_if:NTF \l_ltjpreset_shape_nlck_bool 
+      { \tl_set:Nn \l_ltjpreset_kanji_shape_tl { +nlck } }
+      { \tl_set:Nn \l_ltjpreset_kanji_shape_tl { +jp04 } }
+  }
+} {
+  \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 }
+  \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
+    \bool_if:NT \l_ltjpreset_shape_nlck_bool 
+      { \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=NLC } }
+  }
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%% nfss only
+\bool_if:NTF \l_ltjpreset_nfssonly_bool {
+
+\fp_new:N \l_ltjpreset_scale_fp
+\group_begin:
+\fontsize{10}{10}\selectfont
+\fp_gset:Nn \l_ltjpreset_scale_fp {\zw / 10}
+\group_end:
+\msg_new:nnn { luatexja-preset }{ scale }{
+  Japanese~fonts~will~be~scaled~by~\fp_use:N \l_ltjpreset_scale_fp.
+}
+\msg_warning:nn { luatexja-preset }{ scale }
+
+\cs_new:Nn \ltj_preset_define_family:nnn {
+  \DeclareFontShape{JY3}{#1}{#2}{n}{ <-> s*[\fp_use:N \l_ltjpreset_scale_fp] 
+    {\bool_if:NT \l_ltjpreset_noembed_bool {psft:} "#3"
+    : jfm=\ltjpreset_use_jfm: ;-kern;\tl_use:N \l_ltjpreset_kanji_shape_tl
+    ; script=latn \bool_if:NT \l_ltjpreset_expert_bool { ;+hkna }}
+  } {}
+  \DeclareFontShape{JT3}{#1}{#2}{n}{ <-> s*[\fp_use:N \l_ltjpreset_scale_fp] 
+    {\bool_if:NT \l_ltjpreset_noembed_bool {psft:} "#3"
+    : jfm=ujisv ;-kern;\tl_use:N \l_ltjpreset_kanji_shape_tl;
+    ; script=latn \bool_if:NT \l_ltjpreset_expert_bool { ;+vkna }}
+  } {}
+  \bool_if:NT \l_ltjpreset_expert_bool { 
+    \DeclareFontShape{JY3}{#1}{#2}{rb}{ <-> s*[\fp_use:N \l_ltjpreset_scale_fp] 
+      {\bool_if:NT \l_ltjpreset_noembed_bool {psft:} "#3"
+      : jfm=\ltjpreset_use_jfm: ;-kern;\tl_use:N \l_ltjpreset_kanji_shape_tl ;+ruby
+      ; script=kana}
+    } {}
+    \DeclareFontShape{JT3}{#1}{#2}{rb}{ <-> s*[\fp_use:N \l_ltjpreset_scale_fp] 
+      {\bool_if:NT \l_ltjpreset_noembed_bool {psft:} "#3"
+      : jfm=ujisv ;-kern;\tl_use:N \l_ltjpreset_kanji_shape_tl ;+ruby
+      ; script=kana}
+    } {}
+  }
+}
+
+\DeclareKanjiFamily{JY3}{ltjpm}{}\DeclareKanjiFamily{JT3}{ltjpm}{}
+\DeclareKanjiFamily{JY3}{ltjpg}{}\DeclareKanjiFamily{JT3}{ltjpg}{}
+
+\int_compare:nTF { \l_ltjpreset_deluxe_int ==  2 } {
+  \bool_if:NT \l_ltjpreset_bold_bool {
+    \cs_set_eq:NN \ltjpreset_font_mc_bx: \ltjpreset_font_gt_bx:
+  }
+}{
+  \bool_if:NTF \l_ltjpreset_bold_bool {
+    \cs_set_eq:NN \ltjpreset_font_gt_m: \ltjpreset_font_gt_bx:
+  }{
+    \cs_set_eq:NN \ltjpreset_font_gt_m: \ltjpreset_font_gt_n_uni:
+  }
+  \cs_set_eq:NN \ltjpreset_font_gt_bx: \ltjpreset_font_gt_m:
+  \cs_set_eq:NN \ltjpreset_font_mc_bx: \ltjpreset_font_gt_m:
+}
+
+\ltj_preset_define_family:nnn {ltjpm} {m}  {\ltjpreset_font_mc_m:} 
+\ltj_preset_define_family:nnn {ltjpm} {bx} {\ltjpreset_font_mc_bx:}
+\ltj_preset_define_family:nnn {ltjpg} {m}  {\ltjpreset_font_gt_m:} 
+\ltj_preset_define_family:nnn {ltjpg} {bx} {\ltjpreset_font_gt_bx:}
+
+\def\mcdefault{ltjpm}\def\gtdefault{ltjpg}
+\normalfont
+
+\SetSymbolFont{mincho}{normal}{JY3}{ltjpm}{m}{n}
+\SetSymbolFont{mincho}{bold}{JY3}{ltjpm}{bx}{n}
+\DeclareMathAlphabet{\mathgt}{JY3}{ltjpg}{m}{n}
+
+\bool_if:NT \l_ltjpreset_expert_bool { 
+  \DeclareRobustCommand\rubyfamily { \kanjishape{rb}\selectfont }
+}
+
+\int_compare:nTF { \l_ltjpreset_deluxe_int ==  2 } {
+  \DeclareKanjiFamily{JY3}{ltjpmg}{}\DeclareKanjiFamily{JT3}{ltjpmg}{}
+  \ltj_preset_define_family:nnn {ltjpmg} {m}  {\ltjpreset_font_mg:} 
+  \ltj_preset_define_family:nnn {ltjpg}  {eb} {\ltjpreset_font_gt_eb:}
+  \def\ebdefault{eb}
+  \DeclareRobustCommand\ebseries { \not@math@alphabet\ebseries\relaxfontseries\ebdefault\selectfont }
+  \DeclareRobustCommand\gtebfamily { \kanjifamily{ltjpg}\fontseries{eb}\selectfont }
+  \DeclareTextFontCommand{\textgteb}{\gtebfamily}
+  \DeclareRobustCommand\mgfamily { \not@math@alphabet\mgfamily\relax\kanjifamily{ltjpmg}\selectfont }
+  \DeclareTextFontCommand{\textmg}{\mgfamily}
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%% fontspec
+} {
+
+\RequirePackage{luatexja-fontspec}
+% scale
+\msg_new:nnn { luatexja-preset }{ scale }{
+  Japanese~fonts~will~be~scaled~by~\fp_use:N \g_ltj_fontspec_scale_fp.
+}
+\msg_warning:nn { luatexja-preset }{ scale }
+
+% expert 用設定
 \tl_new:N \l_ltjpreset_add_features_tl
 
 \tl_set:Nx \l_ltjpreset_add_features_tl {
-  \tl_use:N \l_ltjpreset_kanji_shape_tl, 
-  JFM   = \ltjpreset_use_jfm:
+  \tl_use:N \l_ltjpreset_kanji_shape_tl,
+  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 , YokoFeatures={RawFeature=-hkna} , TateFeatures={RawFeature=-vkna}
+  } }
+  \tl_put_left:Nn \l_ltjpreset_add_features_tl { 
+    YokoFeatures = {Style = HorizontalKana}, 
+    TateFeatures = {Style = VerticalKana}, 
+  }
 }
 
-%%%% （丸）ゴシック体の設定: bold option もここで
+% （丸）ゴシック体の設定: bold option もここで
 \int_compare:nTF { \l_ltjpreset_deluxe_int ==  2 } {
-  \newjfontfamily \mgfamily [
-      \tl_use:N \l_ltjpreset_add_features_tl
-      \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }
+%% mg
+ \newjfontfamily \mgfamily [
+      BoldFont = \ltjpreset_font_mg:,
+      \bool_if:NT \l_ltjpreset_noembed_bool { NoEmbed,  }
+      \tl_use:N \l_ltjpreset_add_features_tl 
     ] { \ltjpreset_font_mg: }
+    \DeclareTextFontCommand{\textmg}{\mgfamily}
+%% gt/eb
+%% 注意: ファミリは 'gteb'．シリーズは \mdseries のまま．
+%%       \bfseries を追加したほうが良い？
   \newjfontfamily \gtebfamily [
-      \tl_use:N \l_ltjpreset_add_features_tl
-      \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }
+      BoldFont = \ltjpreset_font_gt_eb:,
+      \bool_if:NT \l_ltjpreset_noembed_bool { NoEmbed,  }
+      \tl_use:N \l_ltjpreset_add_features_tl 
     ] { \ltjpreset_font_gt_eb: }
+  \DeclareTextFontCommand{\textgteb}{\gtebfamily}
   \bool_if:NT \l_ltjpreset_bold_bool {
     \cs_set_eq:NN \ltjpreset_font_mc_bx: \ltjpreset_font_gt_bx:
   }
@@ -326,18 +447,22 @@
 }
 
 
-%%%% 実際の fontspec の呼びだし
+% 実際の fontspec の呼びだし
 
-\defaultjfontfeatures{ Kerning=Off, \tl_use:N \l_ltjpreset_add_features_tl }
+\addjfontfeature{ Kerning=Off }
 
 \setmainjfont [ 
   BoldFont = \ltjpreset_font_mc_bx:
-  \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }
+  \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }, 
+  \tl_use:N \l_ltjpreset_add_features_tl 
 ] { \ltjpreset_font_mc_m: }
 \setsansjfont [ 
   BoldFont = \ltjpreset_font_gt_bx: 
-  \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }
+  \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }, 
+  \tl_use:N \l_ltjpreset_add_features_tl 
 ] { \ltjpreset_font_gt_m: }
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+}
 \ExplSyntaxOff
-\endinput
\ No newline at end of file
+\endinput