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

diff --git a/src/addons/luatexja-preset.sty b/src/addons/luatexja-preset.sty
index da61515..917ba78 100644
--- a/src/addons/luatexja-preset.sty
+++ b/src/addons/luatexja-preset.sty
@@ -1,13 +1,15 @@
 % luatexja-preset.sty
-\ProvidesPackage{luatexja-preset}[2015/04/05 Japanese font presets]
+\ProvidesPackage{luatexja-preset}[2015/06/28 Japanese font presets]
 
 \RequirePackage{expl3}
+\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
@@ -24,6 +26,7 @@
 \DeclareOption{deluxe}{\int_set:Nn \l_ltjpreset_deluxe_int { 2 }}   % 6 fonts
 \DeclareOption{nodeluxe}{\int_set:Nn \l_ltjpreset_deluxe_int { 0 }} % 2 fonts
 
+\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{luatexja-fontspec}}
 % JFM
 \cs_set:Npn \ltjpreset_use_jfm: {ujis}  % 使用する JFM
 %%% \DeclareOption{min}{\cs_set:Npn  \ltjpreset_use_jfm: {min}} % min
@@ -42,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 }
@@ -157,10 +160,21 @@
     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
+    YuGothic~Bold                         % mg/m
   }
 }
 
+% moga-mobo
+\DeclareOption{moga-mobo}{
+  \ltjpreset_set_multi:n {
+    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
+  }
+}
+
+
 % ipa, ipaex, ms
 \DeclareOption{ipa}{
   \ltjpreset_set_uni:nn { IPAMincho } { IPAGothic }
@@ -192,19 +206,21 @@
 
 \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*
 
 %%%%%%%% main routine
 
-\bool_new:N \l_ltjpreset_shape_nlck_bool
+\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 {
@@ -212,6 +228,9 @@
    { \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} }%%% これでいいのか？
+ 
 }
 
 %%%%  リストからの展開
@@ -287,7 +306,6 @@
 %%%%%%%% nfss only
 \bool_if:NTF \l_ltjpreset_nfssonly_bool {
 
-\message{NFSS}
 \fp_new:N \l_ltjpreset_scale_fp
 \group_begin:
 \fontsize{10}{10}\selectfont
@@ -300,23 +318,23 @@
 
 \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
+    {\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
+    {\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
+      {\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
+      {\bool_if:NT \l_ltjpreset_noembed_bool {psft:} "#3"
       : jfm=ujisv ;-kern;\tl_use:N \l_ltjpreset_kanji_shape_tl ;+ruby
       ; script=kana}
     } {}
@@ -360,9 +378,11 @@
   \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:}
-  \DeclareRobustCommand\gtebfamily { \kanjifamily{ltjpg}\kanjiseries{eb}\selectfont }
+  \def\ebdefault{eb}
+  \DeclareRobustCommand\ebseries { \not@math@alphabet\ebseries\relaxfontseries\ebdefault\selectfont }
+  \DeclareRobustCommand\gtebfamily { \kanjifamily{ltjpg}\fontseries{eb}\selectfont }
   \DeclareTextFontCommand{\textgteb}{\gtebfamily}
-  \DeclareRobustCommand\mgfamily { \kanjifamily{ltjpmg}\selectfont }
+  \DeclareRobustCommand\mgfamily { \not@math@alphabet\mgfamily\relax\kanjifamily{ltjpmg}\selectfont }
   \DeclareTextFontCommand{\textmg}{\mgfamily}
 }
 
@@ -400,8 +420,7 @@
 %% mg
  \newjfontfamily \mgfamily [
       BoldFont = \ltjpreset_font_mg:,
-      \tl_use:N \l_ltjpreset_add_features_tl
-      \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_mg: }
     \DeclareTextFontCommand{\textmg}{\mgfamily}
@@ -409,9 +428,8 @@
 %% 注意: ファミリは 'gteb'．シリーズは \mdseries のまま．
 %%       \bfseries を追加したほうが良い？
   \newjfontfamily \gtebfamily [
-      BoldFont = \ltjpreset_font_gt_eb:, 
-      \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}