From 50834d5bc5540f43c363b17c18a9809b5a827a47 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Fri, 12 Jul 2013 23:26:02 +0000
Subject: luatexja 20130711.0 (12jul13)

git-svn-id: svn://tug.org/texlive/trunk@31183 c570f23f-e606-0410-a88d-b1316a301751
---
 .../tex/luatex/luatexja/addons/luatexja-preset.sty | 28 ++++++++++++----------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty')

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 ad0a21b886f..d3b32e0419a 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
@@ -1,5 +1,5 @@
 % luatexja-preset.sty
-\ProvidesPackage{luatexja-preset}[2013/05/14 Japanese font presets]
+\ProvidesPackage{luatexja-preset}[2013/05/25 Japanese font presets]
 %% Sync with PXchfon 0.6a
 
 \RequirePackage{expl3}
@@ -38,8 +38,8 @@
 
 % 漢字字形
 \tl_new:N \l_ltjpreset_kanji_shape_tl
-\DeclareOption{90jis}{  \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , RawFeature = +jp90 }} % 90jis
-\DeclareOption{jis2004}{\tl_set:Nn \l_ltjpreset_kanji_shape_tl { , RawFeature = +jp04 }} % 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 系フォントを使っているか
@@ -232,9 +232,9 @@
 
 %% KozMinPr6N の場合はjp04 feature がないので，nlck にする
 \clist_if_in:NnT \l_ltjpreset_font_list { KozMinPr6N-Regular.otf } {
-  \tl_set:Nn \l_tmpa_tl {, RawFeature = +jp04}
+  \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 { , RawFeature = +nlck }
+    \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=NLC }
   }
 }
 
@@ -271,7 +271,7 @@
 
 %% HG 系フォント + JIS2004/90JIS のときはフォント名を置換
 \bool_if:NT \l_ltjpreset_office_bool {
-  \tl_set:Nn \l_tmpa_tl {, RawFeature = +jp04}
+  \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 }
   \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl { 
     \cs_set:Nx \ltjpreset_font_mc_bx: { hgrme04.ttc }
     \cs_set:Nx \ltjpreset_font_gt_bx: { hgrge04.ttc }
@@ -280,7 +280,7 @@
     \cs_set_eq:NN \ltjpreset_font_gt_m: \ltjpreset_font_gt_n_uni:
     % HG ゴシックM のときはそうはいかないので 1 ウェイト時のゴシック体を使う
   }
-  \tl_set:Nn \l_tmpa_tl {, RawFeature = +jp90}
+  \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS1990 }
   \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl { 
     \cs_set:Nx \ltjpreset_font_mc_bx: { hgrme.ttc }
     \cs_set:Nx \ltjpreset_font_gt_bx: { hgrge.ttc }
@@ -306,11 +306,13 @@
 \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 }
+      \bool_if:NT \l_ltjpreset_noembed_bool { , NoEmbed }, 
+      \tl_use:N \l_ltjpreset_add_features_tl 
     ] { \ltjpreset_font_mg: }
   \newjfontfamily \gtebfamily [
       \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_gt_eb: }
   \bool_if:NT \l_ltjpreset_bold_bool {
     \cs_set_eq:NN \ltjpreset_font_mc_bx: \ltjpreset_font_gt_bx:
@@ -328,15 +330,17 @@
 
 %%%% 実際の fontspec の呼びだし
 
-\defaultjfontfeatures{ Kerning=Off, \tl_use:N \l_ltjpreset_add_features_tl }
+\defaultjfontfeatures{ 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
-- 
cgit v1.2.3

