luatexja-preset.sty: Use property list (also removed unnecessaty \tl_use:N)

diff --git a/src/addons/luatexja-preset.sty b/src/addons/luatexja-preset.sty
index ae799c3..1b9f0d4 100644 (file)
--- a/src/addons/luatexja-preset.sty
+++ b/src/addons/luatexja-preset.sty
@@ -59,26 +59,26 @@
 \bool_new:N \l_ltjpreset_office_bool  % MS Office の HG 系フォントを使っているか
 \bool_new:N \l_ltjpreset_noembed_bool % 非埋込か
 
-\prop_new:N \l_ltjpreset_font_prop_list
+\prop_new:N \l_ltjpreset_font_prop
 \keys_define:nn { ltjpreset_set_font_list } {
   mc .code:n =
-     \prop_put\colon Nnn \l_ltjpreset_font_prop_list { mc-l } {#1}
-     \prop_put\colon Nnn \l_ltjpreset_font_prop_list { mc-m } {#1}
-     \prop_put\colon Nnn \l_ltjpreset_font_prop_list { mc-bx } {#1},
+     \prop_put:Nnn \l_ltjpreset_font_prop { mc-l } {#1}
+     \prop_put:Nnn \l_ltjpreset_font_prop { mc-m } {#1}
+     \prop_put:Nnn \l_ltjpreset_font_prop { mc-bx } {#1},
   gt .code:n =
-     \prop_put\colon Nnn \l_ltjpreset_font_prop_list { gt-u } {#1}
-     \prop_put\colon Nnn \l_ltjpreset_font_prop_list { mc-m } {#1}
-     \prop_put\colon Nnn \l_ltjpreset_font_prop_list { mc-bx } {#1}
-     \prop_put\colon Nnn \l_ltjpreset_font_prop_list { mc-eb } {#1},
+     \prop_put:Nnn \l_ltjpreset_font_prop { gt-u } {#1}
+     \prop_put:Nnn \l_ltjpreset_font_prop { gt-m } {#1}
+     \prop_put:Nnn \l_ltjpreset_font_prop { gt-bx } {#1}
+     \prop_put:Nnn \l_ltjpreset_font_prop { gt-eb } {#1},
   unknown .code:n =
-   \prop_put:Nnn \l_ltjpreset_font_prop_list { \l_keys_key_tl } {#1}
+   \prop_put:Non \l_ltjpreset_font_prop { \l_keys_key_tl } {#1}
 }
 
 
 
 \cs_new:Npn \ltjpreset_set_uni:nn #1#2 {
   \keys_set:nn { ltjpreset_set_font_list } {
-    mc = #1, gt = #2, mc-bx = #2,
+    mc = #1, gt = #2, mc-bx = #2, mg-m = #2,
   }
 }
 \cs_new:Npn \ltjpreset_set_multi:n #1 {
@@ -157,7 +157,7 @@
 % モリサワ
 \ltjpreset_declare_option:nn{morisawa-pro}{
   \ltjpreset_set_multi:n {
-    mc-m = A-OTF-RyuminPro-Light.otf,      mc-bx = A-OTF-FutoMinA101Pro-Bold.otf,
+    mc =   A-OTF-RyuminPro-Light.otf,      mc-bx = A-OTF-FutoMinA101Pro-Bold.otf,
     gt-m = A-OTF-GothicBBBPro-Medium.otf , gt-bx = A-OTF-FutoGoB101Pro-Bold.otf,
     gt-u = A-OTF-GothicBBBPro-Medium.otf , gt-eb = A-OTF-MidashiGoPro-MB31.otf,
     mg-m = A-OTF-Jun101Pro-Light.otf,
@@ -165,7 +165,7 @@
 }
 \ltjpreset_declare_option:nn{morisawa-pr6n}{
   \ltjpreset_set_multi:n {
-    mc-m = A-OTF-RyuminPr6N-Light.otf,      mc-bx = A-OTF-FutoMinA101Pr6N-Bold.otf,
+    mc =   A-OTF-RyuminPr6N-Light.otf,      mc-bx = A-OTF-FutoMinA101Pr6N-Bold.otf,
     gt-m = A-OTF-GothicBBBPr6N-Medium.otf , gt-bx = A-OTF-FutoGoB101Pr6N-Bold.otf,
     gt-u = A-OTF-GothicBBBPr6N-Medium.otf , gt-eb = A-OTF-MidashiGoPr6N-MB31.otf,
     mg-m = A-OTF-Jun101Pr6N-Light.otf,
@@ -195,7 +195,7 @@
 % according to http://support.apple.com/kb/HT5944
 \ltjpreset_declare_option:nn{yu-osx}{
   \ltjpreset_set_multi:n {
-    mc-m =  YuMincho~Medium, mc-bx = YuMincho~Demibold,
+    mc =  YuMincho~Medium, mc-bx = YuMincho~Demibold,
     gt-m =  YuGothic~Medium, gt-u =  YuGothic~Medium,
     gt-bx = YuGothic~Bold,   gt-eb = YuGothic~Bold,
     mg-m =  YuGothic~Bold
@@ -205,78 +205,78 @@
 % moga-mobo
 \ltjpreset_declare_option:nn{moga-mobo}{
   \ltjpreset_set_multi:n {
-    Moga90Mincho, Moga90Mincho~Bold ,  % mc/m, mc/bx
-    Moga90Gothic, Moga90Gothic~Bold,   % gt/m, gt/bx (multiweight))
-    Moga90Gothic, Moga90Gothic~Bold,   % gt/m (uni), gt/eb
-    Mobo90Gothic                       % mg/m
+    mc =   Moga90Mincho, mc-bx = Moga90Mincho~Bold,
+    gt-m = Moga90Gothic, gt-bx = Moga90Gothic~Bold,
+    gt-u = Moga90Gothic, gt-eb = Moga90Gothic~Bold,
+    mg-m = Mobo90Gothic
   }
 }
 \ltjpreset_declare_option:nn{moga-mobo-ex}{
   \ltjpreset_set_multi:n {
-    MogaEx90Mincho, MogaEx90Mincho~Bold ,  % mc/m, mc/bx
-    MogaEx90Gothic, MogaEx90Gothic~Bold,   % gt/m, gt/bx (multiweight))
-    MogaEx90Gothic, MogaEx90Gothic~Bold,   % gt/m (uni), gt/eb
-    MoboEx90Gothic                         % mg/m
+    mc =   MogaEx90Mincho, mc-bx = MogaEx90Mincho~Bold,
+    gt-m = MogaEx90Gothic, gt-bx = MogaEx90Gothic~Bold,
+    gt-u = MogaEx90Gothic, gt-eb = MogaEx90Gothic~Bold,
+    mg-m = MoboEx90Gothic
   }
 }
 
 % Ume fones
 \ltjpreset_declare_option:nn{ume}{
   \ltjpreset_set_multi:n {
-    Ume~Mincho, Ume~Mincho,
-    Ume~Gothic, Ume~Gothic~O5,
-    Ume~Gothic~O5, Ume~Gothic~O5,
-    Ume~Gothic~O4
+    mc = Ume~Mincho,
+    gt-m = Ume~Gothic,    gt-bx = Ume~Gothic~O5,
+    gt-u = Ume~Gothic~O5, gt-eb = Ume~Gothic~O5,
+    mg-m = Ume~Gothic~O4
   }
 }
 
 % Source Han {Serif,Sans}
 \ltjpreset_declare_option:nn{sourcehan}{
   \ltjpreset_set_multi:n {
-    Source~Han~Serif~Regular, % mc/m
-    Source~Han~Serif~Bold,    % mc/bx
-    Source~Han~Sans~Regular,  % gt/m  (multi)
-    Source~Han~Sans~Bold,     % gt/bx
-    Source~Han~Sans~Medium,   % gt/m  (uni)
-    Source~Han~Sans~Heavy,    % gt/eb
-    Source~Han~Sans~Heavy,    % mg/m
-    Source~Han~Serif~Light,   % mc/l
+    mc-m =  Source~Han~Serif~Regular,
+    mc-bx = Source~Han~Serif~Bold,
+    gt-m =  Source~Han~Sans~Regular,
+    gt-bx = Source~Han~Sans~Bold,
+    gt-u =  Source~Han~Sans~Medium,
+    gt-eb = Source~Han~Sans~Heavy,
+    mg-m =  Source~Han~Sans~Heavy,
+    mc-l =  Source~Han~Serif~Light,
   }
 }
 \ltjpreset_declare_option:nn{sourcehan-jp}{
   \ltjpreset_set_multi:n {
-    Source~Han~Serif~JP~Regular, % mc/m
-    Source~Han~Serif~JP~Bold,    % mc/bx
-    Source~Han~Sans~JP~Regular,  % gt/m  (multi)
-    Source~Han~Sans~JP~Bold,     % gt/bx
-    Source~Han~Sans~JP~Medium,   % gt/m  (uni)
-    Source~Han~Sans~JP~Heavy,    % gt/eb
-    Source~Han~Sans~JP~Heavy,    % mg/m
-    Source~Han~Serif~JP~Light,   % mc/l
+    mc-m =  Source~Han~Serif~JP~Regular,
+    mc-bx = Source~Han~Serif~JP~Bold,
+    gt-m =  Source~Han~Sans~JP~Regular,
+    gt-bx = Source~Han~Sans~JP~Bold,
+    gt-u =  Source~Han~Sans~JP~Medium,
+    gt-eb = Source~Han~Sans~JP~Heavy,
+    mg-m =  Source~Han~Sans~JP~Heavy,
+    mc-l =  Source~Han~Serif~JP~Light,
   }
 }
 \ltjpreset_declare_option:nn{noto-otc}{
   \ltjpreset_set_multi:n {
-    Noto~Serif~CJK~Regular, % mc/m
-    Noto~Serif~CJK~Bold,    % mc/bx
-    Noto~Sans~CJK~Regular,  % gt/m  (multi)
-    Noto~Sans~CJK~Bold,     % gt/bx
-    Noto~Sans~CJK~Medium,   % gt/m  (uni)
-    Noto~Sans~CJK~Black,    % gt/eb
-    Noto~Sans~CJK~Black,    % mg/m
-    Noto~Serif~CJK~Light,   % mc/l
+    mc-m =  Noto~Serif~CJK~Regular,
+    mc-bx = Noto~Serif~CJK~Bold,
+    gt-m =  Noto~Sans~CJK~Regular,
+    gt-bx = Noto~Sans~CJK~Bold,
+    gt-u =  Noto~Sans~CJK~Medium,
+    gt-eb = Noto~Sans~CJK~Black,
+    mg-m =  Noto~Sans~CJK~Black,
+    mc-l =  Noto~Serif~CJK~Light,
   }
 }
 \ltjpreset_declare_option:nn{noto-otf}{
   \ltjpreset_set_multi:n {
-    Noto~Serif~CJK~JP~Regular, % mc/m
-    Noto~Serif~CJK~JP~Bold,    % mc/bx
-    Noto~Sans~CJK~JP~Regular,  % gt/m  (multi)
-    Noto~Sans~CJK~JP~Bold,     % gt/bx
-    Noto~Sans~CJK~JP~Medium,   % gt/m  (uni)
-    Noto~Sans~CJK~JP~Black,    % gt/eb
-    Noto~Sans~CJK~JP~Black,    % mg/m
-    Noto~Serif~CJK~JP~Light,   % mc/l
+    mc-m =  Noto~Serif~CJK~JP~Regular,
+    mc-bx = Noto~Serif~CJK~JP~Bold,
+    gt-m =  Noto~Sans~CJK~JP~Regular,
+    gt-bx = Noto~Sans~CJK~JP~Bold,
+    gt-u =  Noto~Sans~CJK~JP~Medium,
+    gt-eb = Noto~Sans~CJK~JP~Black,
+    mg-m =  Noto~Sans~CJK~JP~Black,
+    mc-l =  Noto~Serif~CJK~JP~Light,
   }
 }
 
@@ -329,57 +329,54 @@
 %% KozMinPr6N, HiraMinProN-W3 の場合はjp04 feature がないので，nlck にする
 \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 }
 \tl_if_eq:NNTF \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
-  \clist_if_in:NnT \l_ltjpreset_font_list { KozMinPr6N-Regular }
+  \tl_set:Nx \l_tmpb_tl { \prop_item:Nn \l_ltjpreset_font_prop { mc-m } }
+  \tl_if_in:NnT  \l_tmpb_tl { KozMinPr6N-Regular }
    { \bool_set_true:N \l_ltjpreset_shape_nlck_bool }
-  \clist_if_in:NnT \l_ltjpreset_font_list { HiraMinProN-W3 }
+  \tl_if_in:NnT  \l_tmpb_tl { HiraMinProN-W3 }
    { \bool_set_true:N \l_ltjpreset_shape_nlck_bool }
-   \clist_if_in:NnT \l_ltjpreset_font_list { Moga90Mincho }
+  \tl_if_in:NnT  \l_tmpb_tl { Moga90Mincho }
    {
-     \tl_remove_all:Nn \l_ltjpreset_font_list {90}
+     \prop_clear:N \l_tmpa_prop
+     \prop_map_inline:Nn \l_ltjpreset_font_prop {
+       \tl_set:Nn \l_tmpb_tl { #2 }
+       \tl_remove_all:Nn \l_tmpb_tl {90}
+       \prop_put:Nnx \l_tmpa_prop { #1 } { \tl_use:N \l_tmpb_tl }
+     }
+     \prop_set_eq:NN \l_ltjpreset_font_prop \l_tmpa_prop
      \tl_clear:N \l_ltjpreset_kanji_shape_tl
    }
-   \clist_if_in:NnT \l_ltjpreset_font_list { MogaEx90Mincho }
+  \tl_if_in:NnT  \l_tmpb_tl { MogaEx90Mincho }
    {
-     \tl_remove_all:Nn \l_ltjpreset_font_list {90}
+     \prop_clear:N \l_tmpa_prop
+     \prop_map_inline:Nn \l_ltjpreset_font_prop {
+       \tl_set:Nn \l_tmpb_tl { #2 }
+       \tl_remove_all:Nn \l_tmpb_tl {90}
+       \prop_put:Nnx \l_tmpa_prop { #1 } { \tl_use:N \l_tmpb_tl }
+     }
+     \prop_set_eq:NN \l_ltjpreset_font_prop \l_tmpa_prop
      \tl_clear:N \l_ltjpreset_kanji_shape_tl
    }
 }{
   \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS1990 }
   \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
-    \clist_if_in:NnT \l_ltjpreset_font_list { Moga90Mincho }
-     { \tl_clear:N \l_ltjpreset_kanji_shape_tl }
+    \tl_set:Nx \l_tmpb_tl { \prop_item:Nn \l_ltjpreset_font_prop { mc-m } }
+    \tl_if_in:NnT  \l_tmpb_tl { Moga90Mincho }
+      { \tl_clear:N \l_ltjpreset_kanji_shape_tl }
   }
 }
 
 %%%%  リストからの展開
 % mc/m
-\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
-\cs_set:Nx \ltjpreset_font_mc_m: { \tl_use:N \l_tmpa_tl }
-
-% mc/bx
-\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
-\cs_set:Nx \ltjpreset_font_mc_bx: { \tl_use:N \l_tmpa_tl }
-
-% gt/m
-\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
-\cs_set:Nx \ltjpreset_font_gt_m: { \tl_use:N \l_tmpa_tl }
-
-% gt/bx
-\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
-\cs_set:Nx \ltjpreset_font_gt_bx: { \tl_use:N \l_tmpa_tl }
-
-% gt/m-uni
-\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
-\cs_set:Nx \ltjpreset_font_gt_n_uni: { \tl_use:N \l_tmpa_tl }
-
-% gt/eb
-\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
-\cs_set:Nx \ltjpreset_font_gt_eb: { \tl_use:N \l_tmpa_tl }
-
-% mg/m
-\clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl
-\cs_set:Nx \ltjpreset_font_mg: { \tl_use:N \l_tmpa_tl }
+\cs_set:Nx \ltjpreset_font_mc_l:  { \prop_item:Nn \l_ltjpreset_font_prop { mc-l } }
+\cs_set:Nx \ltjpreset_font_mc_m:  { \prop_item:Nn \l_ltjpreset_font_prop { mc-m } }
+\cs_set:Nx \ltjpreset_font_mc_bx: { \prop_item:Nn \l_ltjpreset_font_prop { mc-bx } }
+\cs_set:Nx \ltjpreset_font_gt_m:  { \prop_item:Nn \l_ltjpreset_font_prop { gt-m } }
+\cs_set:Nx \ltjpreset_font_gt_u:  { \prop_item:Nn \l_ltjpreset_font_prop { gt-u } }
+\cs_set:Nx \ltjpreset_font_gt_bx: { \prop_item:Nn \l_ltjpreset_font_prop { gt-bx } }
+\cs_set:Nx \ltjpreset_font_gt_eb: { \prop_item:Nn \l_ltjpreset_font_prop { gt-eb } }
+\cs_set:Nx \ltjpreset_font_mg_m:  { \prop_item:Nn \l_ltjpreset_font_prop { mg-m } }
 
+%\prop_show:N \l_ltjpreset_font_prop 
 
 %% HG 系フォント + JIS2004/90JIS のときはフォント名を置換
 \bool_if:NT \l_ltjpreset_office_bool {
@@ -388,8 +385,8 @@
     \cs_set:Nx \ltjpreset_font_mc_bx: { hgrme04.ttc }
     \cs_set:Nx \ltjpreset_font_gt_bx: { hgrge04.ttc }
     \cs_set:Nx \ltjpreset_font_gt_eb: { hgrsgu04.ttc }
-    \cs_set:Nx \ltjpreset_font_mg:    { hgrsmp04.ttf }
-    \cs_set_eq:NN \ltjpreset_font_gt_m: \ltjpreset_font_gt_n_uni:
+    \cs_set:Nx \ltjpreset_font_mg_m:    { hgrsmp04.ttf }
+    \cs_set_eq:NN \ltjpreset_font_gt_m: \ltjpreset_font_gt_u:
     % HG ゴシックM のときはそうはいかないので 1 ウェイト時のゴシック体を使う
   }
   \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS1990 }
@@ -397,14 +394,13 @@
     \cs_set:Nx \ltjpreset_font_mc_bx: { hgrme.ttc }
     \cs_set:Nx \ltjpreset_font_gt_bx: { hgrge.ttc }
     \cs_set:Nx \ltjpreset_font_gt_eb: { hgrsgu.ttc }
-    \cs_set:Nx \ltjpreset_font_mg:    { hgrsmp.ttf }
+    \cs_set:Nx \ltjpreset_font_mg_m:  { hgrsmp.ttf }
   }
 }
 
 % mc/l
-\clist_if_empty:NTF \l_ltjpreset_font_list
-  { \tl_set:Nn \l_tmpa_tl {~} }{ \clist_pop:NN \l_ltjpreset_font_list \l_tmpa_tl }
-\tl_if_empty:NT \l_tmpa_tl {\tl_set\colon Nn \l_tmpa_tl {~}}
+\tl_set:Nx \l_tmpa_tl { \ltjpreset_font_mc_l: }
+\tl_if_empty:NT \l_tmpa_tl {\tl_set:Nn \l_tmpa_tl {~}}
 \cs_set:Nx \ltjpreset_font_mc_l: {
    \tl_if_blank:nTF \l_tmpa_tl { \ltjpreset_font_mc_m: } {\tl_use:N \l_tmpa_tl }
 }
@@ -437,23 +433,23 @@
 \bool_if:NT \l_ltjpreset_deluxe_bool {
   \group_begin:
     \suppressfontnotfounderror=1
-    \font \l_ltjpreset_font_test: = "\tl_use:N \ltjpreset_font_gt_eb:"\relax
+    \font \l_ltjpreset_font_test: = "\ltjpreset_font_gt_eb:"\relax
     \ifx \l_ltjpreset_font_test: \nullfont
       \msg_warning:nnxxxx { luatexja-preset }{ no-font }
-        { \tl_use:N \ltjpreset_font_gt_eb: }{ gt/eb }{ \tl_use:N \ltjpreset_font_gt_bx: }{ gt/bx }
+        { \ltjpreset_font_gt_eb: }{ gt/eb }{ \ltjpreset_font_gt_bx: }{ gt/bx }
       \cs_gset_eq:NN \ltjpreset_font_gt_eb: \ltjpreset_font_gt_bx:
     \fi
-    \font \l_ltjpreset_font_test: = "\tl_use:N \ltjpreset_font_mc_l:"\relax
+    \font \l_ltjpreset_font_test: = "\ltjpreset_font_mc_l:"\relax
     \ifx \l_ltjpreset_font_test: \nullfont
       \msg_warning:nnxxxx { luatexja-preset }{ no-font }
-        { \tl_use:N \ltjpreset_font_mc_l: }{ mc/l }{ \tl_use:N \ltjpreset_font_mc_m: }{ mc/m }
+        { \ltjpreset_font_mc_l: }{ mc/l }{ \ltjpreset_font_mc_m: }{ mc/m }
       \cs_gset_eq:NN \ltjpreset_font_mc_l: \ltjpreset_font_mc_m:
     \fi
-    \font \l_ltjpreset_font_test: = "\tl_use:N \ltjpreset_font_mg:"\relax
+    \font \l_ltjpreset_font_test: = "\ltjpreset_font_mg_m:"\relax
     \ifx \l_ltjpreset_font_test: \nullfont
       \msg_warning:nnxxxx { luatexja-preset }{ no-font }
-        { \tl_use:N \ltjpreset_font_mg: }{ mg/m }{ \tl_use:N \ltjpreset_font_gt_bx: }{ gt/bx }
-      \cs_gset_eq:NN \ltjpreset_font_mg: \ltjpreset_font_gt_bx:
+        { \ltjpreset_font_mg_m: }{ mg/m }{ \ltjpreset_font_gt_bx: }{ gt/bx }
+      \cs_gset_eq:NN \ltjpreset_font_mg_m: \ltjpreset_font_gt_bx:
     \fi
   \group_end:
 }
@@ -502,7 +498,7 @@
   \bool_if:NTF \l_ltjpreset_bold_bool {
     \cs_set_eq:NN \ltjpreset_font_gt_m: \ltjpreset_font_gt_bx:
   }{
-    \cs_set_eq:NN \ltjpreset_font_gt_m: \ltjpreset_font_gt_n_uni:
+    \cs_set_eq:NN \ltjpreset_font_gt_m: \ltjpreset_font_gt_u:
   }
   \cs_set_eq:NN \ltjpreset_font_gt_bx: \ltjpreset_font_gt_m:
   \cs_set_eq:NN \ltjpreset_font_mc_bx: \ltjpreset_font_gt_m:
@@ -536,7 +532,7 @@
   \ltj_preset_define_family:nnn {ltjpg}  {eb} {\ltjpreset_font_gt_eb:}
   \DeclareRobustCommand\mgfamily { \not@math@alphabet\mgfamily\relax\kanjifamily{ltjpmg}\selectfont }
   \DeclareTextFontCommand{\textmg}{\mgfamily}
-  \ltj_preset_define_family:nnn {ltjpmg} {m}  {\ltjpreset_font_mg:}
+  \ltj_preset_define_family:nnn {ltjpmg} {m}  {\ltjpreset_font_mg_m:}
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -574,10 +570,10 @@
 \bool_if:NTF \l_ltjpreset_deluxe_bool {
 %% mg
  \newjfontfamily \mgfamily [
-      BoldFont = \ltjpreset_font_mg:,
+      BoldFont = \ltjpreset_font_mg_m:,
       \bool_if:NT \l_ltjpreset_noembed_bool { NoEmbed,  }
       \tl_use:N \l_ltjpreset_add_features_tl
-    ] { \ltjpreset_font_mg: }
+    ] { \ltjpreset_font_mg_m: }
     \DeclareTextFontCommand{\textmg}{\mgfamily}
 %% gt/eb
   \def\ebdefault{eb}
@@ -594,7 +590,7 @@
   \bool_if:NTF \l_ltjpreset_bold_bool {
     \cs_set_eq:NN \ltjpreset_font_gt_m: \ltjpreset_font_gt_bx:
   }{
-    \cs_set_eq:NN \ltjpreset_font_gt_m: \ltjpreset_font_gt_n_uni:
+    \cs_set_eq:NN \ltjpreset_font_gt_m: \ltjpreset_font_gt_u:
   }
   \cs_set_eq:NN \ltjpreset_font_gt_bx: \ltjpreset_font_gt_m:
   \cs_set_eq:NN \ltjpreset_font_mc_bx: \ltjpreset_font_gt_m:

diff --git a/test/test16-preset.pdf b/test/test16-preset.pdf
index a43703d..a29d08b 100644 (file)
Binary files a/test/test16-preset.pdf and b/test/test16-preset.pdf differ

diff --git a/test/test16-preset.tex b/test/test16-preset.tex
index 8cece60..19d1ee1 100644 (file)
--- a/test/test16-preset.tex
+++ b/test/test16-preset.tex
@@ -7,7 +7,7 @@
       \ltj@orig@DeclareFontShape@{#1}{#2}{#3}{#4}{#5}{#6}%
       }
 \makeatother
-\usepackage[hiragino-pron,deluxe,expert,jis2004, match,nfssonly]{luatexja-preset}
+\usepackage[sourcehan, 90jis,deluxe,expert, match,nfssonly]{luatexja-preset}
 \begin{document}
 \makeatletter
 \def\r#1#2{ \csname #1family \endcsname \csname #2series \endcsname
@@ -31,14 +31,14 @@
 
 \r{gt}{bf}
 
-\ifdefined\mgfamily
-\r{mg}{md}
-\fi
-
 \ifdefined\ebseries
 \r{gt}{eb}
 \fi
 
+\ifdefined\mgfamily
+\r{mg}{md}
+\fi
+
 \r{tt}{md}
 
 \r{tt}{bf}