ltjclasses.dtx: Make ltjt*.cls compatible with \geometry, etc.

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

diff --git a/src/addons/luatexja-preset.sty b/src/addons/luatexja-preset.sty
index 9d819e4..6f8ad23 100644 (file)
--- a/src/addons/luatexja-preset.sty
+++ b/src/addons/luatexja-preset.sty
@@ -105,18 +105,24 @@
 % ヒラギノ (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-W6.otf     , HiraKakuStd-W8.otf,  % gt/m (uni), gt/eb
-    HiraMaruPro-W4.otf                            % mg/m
+    Hiragino~Mincho~Pro~W3 , 
+    Hiragino~Mincho~Pro~W6 , 
+    Hiragino~Kaku~Gothic~Pro~W3 , % gt/m (multi)
+    Hiragino~Kaku~Gothic~Pro~W6 , 
+    Hiragino~Kaku~Gothic~Pro~W6 , % gt/m (uni)
+    Hiragino~Kaku~Gothic~Std~W8 , 
+    Hiragino~Maru~Gothic~Pro~W4 , 
   }
 }
 \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
+    Hiragino~Mincho~ProN~W3 , 
+    Hiragino~Mincho~ProN~W6 , 
+    Hiragino~Kaku~Gothic~ProN~W3 , % gt/m (multi)
+    Hiragino~Kaku~Gothic~ProN~W6 , 
+    Hiragino~Kaku~Gothic~ProN~W6 , % gt/m (uni)
+    Hiragino~Kaku~Gothic~StdN~W8 , 
+    Hiragino~Maru~Gothic~ProN~W4 , 
   }
 }
 
@@ -134,12 +140,12 @@
     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
   }
 }
 
 % 游明朝/游ゴシック (Win8.1)
-\DeclareOption{yu}{
+\DeclareOption{yu-win}{
   \ltjpreset_set_multi:n {
     YuMincho-Regular , YuMincho-Demibold , % mc/m, mc/bx
     YuGothic-Regular , YuGothic-Bold ,     % gt/m, gt/bx (multiweight))
@@ -148,6 +154,16 @@
   }
 }
 
+% Yu fonts in OSX
+% 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
+  }
+}
 
 % ipa, ipaex, ms
 \DeclareOption{ipa}{
@@ -189,6 +205,14 @@
   }
 }
 
+%% HiraMinProN の場合はjp04 feature がない??ので，nlck にする
+\clist_if_in:NnT \l_ltjpreset_font_list { Hiragino~Mincho~ProN~W3 } {
+  \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 }
+  }
+}
+
 %%%%%%%% main routine
 
 %%%%  リストからの展開
@@ -289,7 +313,7 @@
 
 % 実際の fontspec の呼びだし
 
-\defaultjfontfeatures{ Kerning=Off }
+\addjfontfeature{ Kerning=Off }
 
 \setmainjfont [ 
   BoldFont = \ltjpreset_font_mc_bx:
@@ -303,4 +327,4 @@
 ] { \ltjpreset_font_gt_m: }
 
 \ExplSyntaxOff
-\endinput
\ No newline at end of file
+\endinput