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

diff --git a/src/addons/luatexja-preset.sty b/src/addons/luatexja-preset.sty
index f9c17dc..917ba78 100644
--- a/src/addons/luatexja-preset.sty
+++ b/src/addons/luatexja-preset.sty
@@ -1,5 +1,5 @@
 % 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}
@@ -26,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
@@ -156,19 +157,19 @@
 % according to http://support.apple.com/kb/HT5944
 \DeclareOption{yu-osx}{
   \ltjpreset_set_multi:n {
-    "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
+    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
   }
 }
 
 % 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
+    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
   }
 }
@@ -205,13 +206,6 @@
 
 \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
@@ -324,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}
     } {}
@@ -426,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}
@@ -435,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}