luatexja (9sep13)

git-svn-id: svn://tug.org/texlive/trunk@31609 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 14 insertions, 5 deletions

diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
index d3b32e0419a..0134a784564 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
@@ -6,7 +6,6 @@
 \RequirePackage{luatexja-fontspec}
 \ExplSyntaxOn
 
-%%%% message
 
 \bool_new:N \l_ltjpreset_bold_bool % bold
 \bool_set_false:N \l_ltjpreset_bold_bool
@@ -20,7 +19,7 @@
 
 \int_new:N \l_ltjpreset_deluxe_int % expert
 \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
@@ -38,8 +37,12 @@
 
 % 漢字字形
 \tl_new:N \l_ltjpreset_kanji_shape_tl
-\DeclareOption{90jis}{  \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS1990 }} % 90jis
-\DeclareOption{jis2004}{\tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS2004 }} % jis2004
+\DeclareOption{90jis}{  
+  \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS1990 }
+} % 90jis
+\DeclareOption{jis2004}{
+  \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=JIS2004 }
+} % jis2004
 
 % font preset
 \bool_new:N \l_ltjpreset_office_bool  % MS Office の HG 系フォントを使っているか
@@ -304,16 +307,22 @@
 
 %%%% （丸）ゴシック体の設定: bold option もここで
 \int_compare:nTF { \l_ltjpreset_deluxe_int ==  2 } {
+%%% mg
   \newjfontfamily \mgfamily [
+      BoldFont = \ltjpreset_font_mg:, 
       \tl_use:N \l_ltjpreset_add_features_tl
       \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }, 
       \tl_use:N \l_ltjpreset_add_features_tl 
     ] { \ltjpreset_font_mg: }
+  \DeclareTextFontCommand{\textmg}{\mgfamily}
+%%% gteb
   \newjfontfamily \gtebfamily [
+      BoldFont = \ltjpreset_font_gt_eb:, 
       \tl_use:N \l_ltjpreset_add_features_tl
       \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:
   }
@@ -331,7 +340,6 @@
 %%%% 実際の fontspec の呼びだし
 
 \defaultjfontfeatures{ Kerning=Off }
-
 \setmainjfont [ 
   BoldFont = \ltjpreset_font_mc_bx:
   \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }, 
@@ -343,5 +351,6 @@
   \tl_use:N \l_ltjpreset_add_features_tl 
 ] { \ltjpreset_font_gt_m: }
 
+
 \ExplSyntaxOff
 \endinput
\ No newline at end of file