Always define \setmonojfont in luatexja-fontspec, and bx->b in luatexja-preset.

diff --git a/README b/README
index 416da00..8e35b33 100644 (file)
--- a/README
+++ b/README
@@ -22,7 +22,7 @@ Installation
 
 0. Please make sure that your TeX distribution is up-to-date.
    This version of LuaTeX-ja requires
-    - LuaTeX 1.0.0 or later
+    - LuaTeX 1.07.0 (or later)
     - luaotfload (v3.1 or later recommended)
     - adobemapping (Adobe CMap files)
     - everysel package
@@ -38,7 +38,7 @@ Installation
    One might be able to typeset documents without an error, but with
    some unwanted results.
 
-1. If you are using TeX Live 2019 or later, you can install LuaTeX-ja via tlmgr.
+1. If you are using TeX Live 2019, you can install LuaTeX-ja via tlmgr.
 
 2. If you must/want to install manually:
 

diff --git a/src/addons/luatexja-fontspec-27c.sty b/src/addons/luatexja-fontspec-27c.sty
index bb6b5f0..0c44c62 100644 (file)
--- a/src/addons/luatexja-fontspec-27c.sty
+++ b/src/addons/luatexja-fontspec-27c.sty
@@ -3,21 +3,15 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-27c}[2019/11/15 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec-27c}[2020/01/26 fontspec support of LuaTeX-ja]
 \RequirePackage{l3keys2e}
 \ExplSyntaxOn
 
 %%%%%%%% Change Japanese font family by \rmfamily or not
-\cs_new:Npn \__ltj_fontspec_match_cmd {
+\bool_if:NT  \__ltj_fontspec_match_bool {
   \renewcommand\jttdefault{\gtdefault}
   \@ltj@match@familytrue
-  \DeclareDocumentCommand \setmonojfont { O{} m O{} } {
-    \__ltj_fontspec_set_family:Nnn \jttdefault {##1,##3}{##2}
-    \normalfont
-  }
 }
-\bool_if:NT  \__ltj_fontspec_match_bool \__ltj_fontspec_match_cmd
-
 %%%%%%%% Messages
 \msg_new:nnn {luatexja-fontspec} {addjfontfeatures-ignored}
 {
@@ -336,6 +330,11 @@
   \normalfont
 }
 
+\DeclareDocumentCommand \setmonojfont { O{} m O{} } {
+  \__ltj_fontspec_set_family:Nnn \jttdefault {#1,#3}{#2}
+  \normalfont
+}
+
 \DeclareDocumentCommand \newjfontfamily { m O{} m O{} } {
   \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_fontspec_set_family:Nnn
   \newfontfamily #1 [#2,#4] {#3}

diff --git a/src/addons/luatexja-preset.sty b/src/addons/luatexja-preset.sty
index e126f6f..050f78e 100644 (file)
--- a/src/addons/luatexja-preset.sty
+++ b/src/addons/luatexja-preset.sty
@@ -1,5 +1,5 @@
 % luatexja-preset.sty
-\ProvidesPackage{luatexja-preset}[2019/03/26 Japanese font presets]
+\ProvidesPackage{luatexja-preset}[2020/01/26 Japanese font presets]
 
 \RequirePackage{expl3,l3keys2e}
 \RequirePackage{luatexja}
@@ -98,13 +98,17 @@
   mc .code:n =
      \prop_put:Nnn \g__ltjpreset_font_prop { mc-l } {#1}
      \prop_put:Nnn \g__ltjpreset_font_prop { mc-m } {#1}
-     \prop_put:Nnn \g__ltjpreset_font_prop { mc-bx } {#1},
+     \prop_put:Nnn \g__ltjpreset_font_prop { mc-b } {#1},
   mc .groups:n = { preset }, mc .value_required:n = true,
+  mc-bx .code:n =
+     \prop_put:Nnn \g__ltjpreset_font_prop { mc-b } {#1},
   gt .code:n =
      \prop_put:Nnn \g__ltjpreset_font_prop { gt-u } {#1}
      \prop_put:Nnn \g__ltjpreset_font_prop { gt-d } {#1}
-     \prop_put:Nnn \g__ltjpreset_font_prop { gt-bx } {#1}
+     \prop_put:Nnn \g__ltjpreset_font_prop { gt-b } {#1}
      \prop_put:Nnn \g__ltjpreset_font_prop { gt-eb } {#1},
+  gt-bx .code:n =
+     \prop_put:Nnn \g__ltjpreset_font_prop { gt-b } {#1},
   gt-m .code:n = % gtfamily , medium series
      \prop_put:Nnn \g__ltjpreset_font_prop { gt-u } {#1}
      \prop_put:Nnn \g__ltjpreset_font_prop { gt-d } {#1},
@@ -120,20 +124,20 @@
 }
 \ltjpreset_define_preset_prop:n { mc-l }
 \ltjpreset_define_preset_prop:n { mc-m }
-\ltjpreset_define_preset_prop:n { mc-bx }
+\ltjpreset_define_preset_prop:n { mc-b }
 \ltjpreset_define_preset_prop:n { gt-u }
 \ltjpreset_define_preset_prop:n { gt-d }
-\ltjpreset_define_preset_prop:n { gt-bx }
+\ltjpreset_define_preset_prop:n { gt-b }
 \ltjpreset_define_preset_prop:n { gt-eb}
 \ltjpreset_define_preset_prop:n { mg-m }
 
 \cs_new:Nn \__ltjpreset_set_uni:nn {
-  mc = #1, gt = #2, mc-bx = #2, mg-m = #2,
+  mc = #1, gt = #2, mc-b = #2, mg-m = #2,
   __custom = false, __office = false, __noembed = false,
 }
 \cs_new:Npn \__ltjpreset_set_office:nn #1 #2{
-  mc   = #1,         mc-bx = HGMinchoE ,
-  gt-d = HGGothicM , gt-bx = HGGothicE ,
+  mc   = #1,         mc-b = HGMinchoE ,
+  gt-d = HGGothicM , gt-b = HGGothicE ,
   gt-u = #2 ,        gt-eb = HGSoeiKakugothicUB ,
   mg-m = HGMaruGothicMPRO,
   __custom = false, __office = true, __noembed = false,
@@ -152,24 +156,24 @@
 % 小塚 (Adobe)
 %% Pro
 \ltjpreset_declare_preset:nx{kozuka-pro}{
-    mc-m =  KozMinPro-Regular, mc-bx = KozMinPro-Bold,
-    gt-d =  KozGoPro-Regular,  gt-bx = KozGoPro-Bold,
+    mc-m =  KozMinPro-Regular, mc-b = KozMinPro-Bold,
+    gt-d =  KozGoPro-Regular,  gt-b = KozGoPro-Bold,
     gt-u =  KozGoPro-Medium,   gt-eb = KozGoPro-Heavy,
     mg-m =  KozGoPro-Heavy,    mc-l =  KozMinPro-Light,
     __custom = false, __office = false, __noembed = false,
 }
 %% Pr6
 \ltjpreset_declare_preset:nx{kozuka-pr6}{
-    mc-m =  KozMinProVI-Regular, mc-bx = KozMinProVI-Bold,
-    gt-d =  KozGoProVI-Regular,  gt-bx = KozGoProVI-Bold,
+    mc-m =  KozMinProVI-Regular, mc-b = KozMinProVI-Bold,
+    gt-d =  KozGoProVI-Regular,  gt-b = KozGoProVI-Bold,
     gt-u =  KozGoProVI-Medium,   gt-eb = KozGoProVI-Heavy,
     mg-m =  KozGoProVI-Heavy,    mc-l =  KozMinProVI-Light,
     __custom = false, __office = false, __noembed = false,
 }
 %% Pr6N
 \ltjpreset_declare_preset:nx{kozuka-pr6n}{
-    mc-m =  KozMinPr6N-Regular, mc-bx = KozMinPr6N-Bold,
-    gt-d =  KozGoPr6N-Regular,  gt-bx = KozGoPr6N-Bold,
+    mc-m =  KozMinPr6N-Regular, mc-b = KozMinPr6N-Bold,
+    gt-d =  KozGoPr6N-Regular,  gt-b = KozGoPr6N-Bold,
     gt-u =  KozGoPr6N-Medium,   gt-eb = KozGoPr6N-Heavy,
     mg-m =  KozGoPr6N-Heavy,    mc-l =  KozMinPr6N-Light,
     __custom = false, __office = false, __noembed = false,
@@ -177,15 +181,15 @@
 
 % ヒラギノ (OSX)
 \ltjpreset_declare_preset:nx{hiragino-pro}{
-    mc-m = HiraMinPro-W3,  mc-bx = HiraMinPro-W6,
-    gt-d = HiraKakuPro-W3, gt-bx = HiraKakuPro-W6,
+    mc-m = HiraMinPro-W3,  mc-b = HiraMinPro-W6,
+    gt-d = HiraKakuPro-W3, gt-b = HiraKakuPro-W6,
     gt-u = HiraKakuPro-W6, gt-eb = HiraKakuStd-W8,
     mg-m = HiraMaruPro-W4, mc-l =  HiraMinPro-W2,
     __custom = false, __office = false, __noembed = false,
 }
 \ltjpreset_declare_preset:nx{hiragino-pron}{
-    mc-m = HiraMinProN-W3,  mc-bx = HiraMinProN-W6,
-    gt-d = HiraKakuProN-W3, gt-bx = HiraKakuProN-W6,
+    mc-m = HiraMinProN-W3,  mc-b = HiraMinProN-W6,
+    gt-d = HiraKakuProN-W3, gt-b = HiraKakuProN-W6,
     gt-u = HiraKakuProN-W6, gt-eb = HiraKakuStdN-W8,
     mg-m = HiraMaruProN-W4, mc-l =  HiraMinProN-W2,
     __custom = false, __office = false, __noembed = false,
@@ -194,21 +198,21 @@
 % モリサワ
 \ltjpreset_declare_preset:nx{bizud}{
     mc =   BIZ-UDMinchoM.ttc,
-    gt-d = BIZ-UDGothicR.ttc, gt-bx = BIZ-UDGothicB.ttc,
+    gt-d = BIZ-UDGothicR.ttc, gt-b = BIZ-UDGothicB.ttc,
     gt-u = BIZ-UDGothicR.ttc, gt-eb = BIZ-UDGothicB.ttc,
     mg-m = BIZ-UDGothicB.ttc,
     __custom = false, __office = false, __noembed = false,
 }
 \ltjpreset_declare_preset:nx{morisawa-pro}{
-    mc =   A-OTF-RyuminPro-Light.otf,      mc-bx = A-OTF-FutoMinA101Pro-Bold.otf,
-    gt-d = A-OTF-GothicBBBPro-Medium.otf , gt-bx = A-OTF-FutoGoB101Pro-Bold.otf,
+    mc =   A-OTF-RyuminPro-Light.otf,      mc-b = A-OTF-FutoMinA101Pro-Bold.otf,
+    gt-d = A-OTF-GothicBBBPro-Medium.otf , gt-b = 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,
     __custom = false, __office = false, __noembed = false,
 }
 \ltjpreset_declare_preset:nx{morisawa-pr6n}{
-    mc =   A-OTF-RyuminPr6N-Light.otf,      mc-bx = A-OTF-FutoMinA101Pr6N-Bold.otf,
-    gt-d = A-OTF-GothicBBBPr6N-Medium.otf , gt-bx = A-OTF-FutoGoB101Pr6N-Bold.otf,
+    mc =   A-OTF-RyuminPr6N-Light.otf,      mc-b = A-OTF-FutoMinA101Pr6N-Bold.otf,
+    gt-d = A-OTF-GothicBBBPr6N-Medium.otf , gt-b = 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,
     __custom = false, __office = false, __noembed = false,
@@ -216,16 +220,16 @@
 
 % 游明朝/游ゴシック (Win8.1)
 \ltjpreset_declare_preset:nx{yu-win}{
-    mc-m = YuMincho-Regular, mc-bx = YuMincho-Demibold,
-    gt-d = YuGothic-Regular, gt-bx = YuGothic-Bold,
+    mc-m = YuMincho-Regular, mc-b = YuMincho-Demibold,
+    gt-d = YuGothic-Regular, gt-b = YuGothic-Bold,
     gt-u = YuGothic-Regular, gt-eb = YuGothic-Bold,
     mg-m = YuGothic-Bold,    mc-l =  YuMincho-Light,
     __custom = false, __office = false, __noembed = false,
 }
 % Win10
 \ltjpreset_declare_preset:nx{yu-win10}{
-    mc-m = YuMincho-Regular, mc-bx = YuMincho-Demibold,
-    gt-d = YuGothic-Regular, gt-bx = YuGothic-Bold,
+    mc-m = YuMincho-Regular, mc-b = YuMincho-Demibold,
+    gt-d = YuGothic-Regular, gt-b = YuGothic-Bold,
     gt-u = YuGothic-Medium,  gt-eb = YuGothic-Bold,
     mg-m = YuGothic-Bold,    mc-l =  YuMincho-Light,
     __custom = false, __office = false, __noembed = false,
@@ -234,24 +238,24 @@
 % Yu fonts in OSX
 % according to http://support.apple.com/kb/HT5944
 \ltjpreset_declare_preset:nx{yu-osx}{
-    mc =  YuMincho~Medium, mc-bx = YuMincho~Demibold,
+    mc =  YuMincho~Medium,   mc-b = YuMincho~Demibold,
     gt-d =  YuGothic~Medium, gt-u =  YuGothic~Medium,
-    gt-bx = YuGothic~Bold,   gt-eb = YuGothic~Bold,
+    gt-b = YuGothic~Bold,    gt-eb = YuGothic~Bold,
     mg-m =  YuGothic~Bold,
     __custom = false, __office = false, __noembed = false,
 }
 
 % moga-mobo
 \ltjpreset_declare_preset:nx{moga-mobo}{
-    mc =   Moga90Mincho, mc-bx = Moga90Mincho~Bold,
-    gt-d = Moga90Gothic, gt-bx = Moga90Gothic~Bold,
+    mc =   Moga90Mincho, mc-b = Moga90Mincho~Bold,
+    gt-d = Moga90Gothic, gt-b = Moga90Gothic~Bold,
     gt-u = Moga90Gothic, gt-eb = Moga90Gothic~Bold,
     mg-m = Mobo90Gothic,
     __custom = false, __office = false, __noembed = false,
 }
 \ltjpreset_declare_preset:nx{moga-mobo-ex}{
-    mc =   MogaEx90Mincho, mc-bx = MogaEx90Mincho~Bold,
-    gt-d = MogaEx90Gothic, gt-bx = MogaEx90Gothic~Bold,
+    mc =   MogaEx90Mincho, mc-b = MogaEx90Mincho~Bold,
+    gt-d = MogaEx90Gothic, gt-b = MogaEx90Gothic~Bold,
     gt-u = MogaEx90Gothic, gt-eb = MogaEx90Gothic~Bold,
     mg-m = MoboEx90Gothic,
     __custom = false, __office = false, __noembed = false,
@@ -260,7 +264,7 @@
 % Ume fones
 \ltjpreset_declare_preset:nx{ume}{
     mc = Ume~Mincho,
-    gt-d = Ume~Gothic,    gt-bx = Ume~Gothic~O5,
+    gt-d = Ume~Gothic,    gt-b = Ume~Gothic~O5,
     gt-u = Ume~Gothic~O5, gt-eb = Ume~Gothic~O5,
     mg-m = Ume~Gothic~O4,
     __custom = false, __office = false, __noembed = false,
@@ -269,9 +273,9 @@
 % Source Han {Serif,Sans}
 \ltjpreset_declare_preset:nx{sourcehan}{
     mc-m =  Source~Han~Serif~Regular,
-    mc-bx = Source~Han~Serif~Bold,
+    mc-b =  Source~Han~Serif~Bold,
     gt-d =  Source~Han~Sans~Regular,
-    gt-bx = Source~Han~Sans~Bold,
+    gt-b =  Source~Han~Sans~Bold,
     gt-u =  Source~Han~Sans~Medium,
     gt-eb = Source~Han~Sans~Heavy,
     mg-m =  Source~Han~Sans~Heavy,
@@ -280,9 +284,9 @@
 }
 \ltjpreset_declare_preset:nx{sourcehan-jp}{
     mc-m =  Source~Han~Serif~JP~Regular,
-    mc-bx = Source~Han~Serif~JP~Bold,
+    mc-b =  Source~Han~Serif~JP~Bold,
     gt-d =  Source~Han~Sans~JP~Regular,
-    gt-bx = Source~Han~Sans~JP~Bold,
+    gt-b =  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,
@@ -291,9 +295,9 @@
 }
 \ltjpreset_declare_preset:nx{noto-otc}{
     mc-m =  Noto~Serif~CJK~Regular,
-    mc-bx = Noto~Serif~CJK~Bold,
+    mc-b =  Noto~Serif~CJK~Bold,
     gt-d =  Noto~Sans~CJK~Regular,
-    gt-bx = Noto~Sans~CJK~Bold,
+    gt-b =  Noto~Sans~CJK~Bold,
     gt-u =  Noto~Sans~CJK~Medium,
     gt-eb = Noto~Sans~CJK~Black,
     mg-m =  Noto~Sans~CJK~Black,
@@ -302,9 +306,9 @@
 }
 \ltjpreset_declare_preset:nx{noto-otf}{
     mc-m =  Noto~Serif~CJK~JP~Regular,
-    mc-bx = Noto~Serif~CJK~JP~Bold,
+    mc-b =  Noto~Serif~CJK~JP~Bold,
     gt-d =  Noto~Sans~CJK~JP~Regular,
-    gt-bx = Noto~Sans~CJK~JP~Bold,
+    gt-b =  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,
@@ -315,9 +319,9 @@
 % HaranoAji {Mincho, Gothic}
 \ltjpreset_declare_preset:nx{haranoaji}{
     mc-m =  HaranoAjiMincho-Regular.otf,
-    mc-bx = HaranoAjiMincho-Bold.otf,
+    mc-b =  HaranoAjiMincho-Bold.otf,
     gt-d =  HaranoAjiGothic-Regular.otf,
-    gt-bx = HaranoAjiGothic-Bold.otf,
+    gt-b =  HaranoAjiGothic-Bold.otf,
     gt-u =  HaranoAjiGothic-Medium.otf,
     gt-eb = HaranoAjiGothic-Heavy.otf,
     mg-m =  HaranoAjiGothic-Heavy.otf,
@@ -392,18 +396,18 @@
   %%%%  リストからの展開
   \cs_set:Nx \__ltjpreset_font_mc_l:  { \prop_item:Nn \g__ltjpreset_font_prop { mc-l } }
   \cs_set:Nx \__ltjpreset_font_mc_m:  { \prop_item:Nn \g__ltjpreset_font_prop { mc-m } }
-  \cs_set:Nx \__ltjpreset_font_mc_bx: { \prop_item:Nn \g__ltjpreset_font_prop { mc-bx } }
+  \cs_set:Nx \__ltjpreset_font_mc_b:  { \prop_item:Nn \g__ltjpreset_font_prop { mc-b } }
   \cs_set:Nx \__ltjpreset_font_gt_m:  { \prop_item:Nn \g__ltjpreset_font_prop { gt-d } }
   \cs_set:Nx \__ltjpreset_font_gt_u:  { \prop_item:Nn \g__ltjpreset_font_prop { gt-u } }
-  \cs_set:Nx \__ltjpreset_font_gt_bx: { \prop_item:Nn \g__ltjpreset_font_prop { gt-bx } }
+  \cs_set:Nx \__ltjpreset_font_gt_b:  { \prop_item:Nn \g__ltjpreset_font_prop { gt-b } }
   \cs_set:Nx \__ltjpreset_font_gt_eb: { \prop_item:Nn \g__ltjpreset_font_prop { gt-eb } }
   \cs_set:Nx \__ltjpreset_font_mg_m:  { \prop_item:Nn \g__ltjpreset_font_prop { mg-m } }
   %% HG 系フォント + JIS2004/90JIS のときはフォント名を置換
   \bool_if:nT { !\g__ltjpreset_custom_bool && \g__ltjpreset_office_bool } {
     \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 }
+      \cs_set:Nx \__ltjpreset_font_mc_b:  { hgrme04.ttc }
+      \cs_set:Nx \__ltjpreset_font_gt_b:  { hgrge04.ttc }
       \cs_set:Nx \__ltjpreset_font_gt_eb: { hgrsgu04.ttc }
       \cs_set:Nx \__ltjpreset_font_mg_m:  { hgrsmp04.ttf }
       \cs_set_eq:NN \__ltjpreset_font_gt_m: \__ltjpreset_font_gt_u:
@@ -411,8 +415,8 @@
     }
     \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 }
+      \cs_set:Nx \__ltjpreset_font_mc_b:  { hgrme.ttc }
+      \cs_set:Nx \__ltjpreset_font_gt_b:  { hgrge.ttc }
       \cs_set:Nx \__ltjpreset_font_gt_eb: { hgrsgu.ttc }
       \cs_set:Nx \__ltjpreset_font_mg_m:  { hgrsmp.ttf }
     }
@@ -426,14 +430,14 @@
   %% bold オプションの処理
   \bool_if:NTF \g__ltjpreset_deluxe_bool {
     \bool_if:NT \g__ltjpreset_bold_bool {
-      \cs_set_eq:NN \__ltjpreset_font_mc_bx: \__ltjpreset_font_gt_bx:
+      \cs_set_eq:NN \__ltjpreset_font_mc_b: \__ltjpreset_font_gt_b:
     }
   }{
     \bool_if:NTF \g__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_b: }
       { \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:
+    \cs_set_eq:NN \__ltjpreset_font_gt_b: \__ltjpreset_font_gt_m:
+    \cs_set_eq:NN \__ltjpreset_font_mc_b: \__ltjpreset_font_gt_m:
   }
 }
 
@@ -475,9 +479,9 @@
 %%%%%%%% deluxe (\mgfamily はあとで定義）
 \bool_if:NTF \g__ltjpreset_deluxe_bool {
   \cs_new:Nn \__ltjpreset_check_deluxe_existence: {
-    \__ltjpreset_substitute:nnnn { gt } { eb } { gt } { bx }
-    \__ltjpreset_substitute:nnnn { mg } { m  } { gt } { bx }
-    \__ltjpreset_substitute:nnnn { mc } { l  } { mc } { m  }
+    \__ltjpreset_substitute:nnnn { gt } { eb } { gt } { b }
+    \__ltjpreset_substitute:nnnn { mg } { m  } { gt } { b }
+    \__ltjpreset_substitute:nnnn { mc } { l  } { mc } { m }
   }
   \def\ltdefault{l}
   \DeclareRobustCommand\ltseries { \not@math@alphabet\ltseries\relax\fontseries\ltdefault\selectfont }
@@ -555,7 +559,7 @@
     \DeclareKanjiFamily{JT3}{\gtdefault}{}
     \unless\ifltj@disablejfam
       \SetSymbolFont{mincho}{normal}{JY3}{\mcdefault}{m}{n}
-      \SetSymbolFont{mincho}{bold}{JY3}{\mcdefault}{bx}{n}
+      \SetSymbolFont{mincho}{bold}{JY3}{\mcdefault}{b}{n}
       \DeclareMathAlphabet{\mathgt}{JY3}{\gtdefault}{m}{n}
     \fi
     \bool_if:NT \g__ltjpreset_deluxe_bool {
@@ -572,11 +576,11 @@
       \tl_set:Nx \l__ltjpreset_kanji_shape_tl { ;+jp04 }
     }
     \__ltjpreset_define_family:nnn {mc} {m}  {\__ltjpreset_font_mc_m:}
-    \__ltjpreset_define_family:nnn {mc} {bx} {\__ltjpreset_font_mc_bx:}
-    \__ltjpreset_define_family:nnn {mc} {b}  {\__ltjpreset_font_mc_bx:}
+    \__ltjpreset_define_family:nnn {mc} {bx} {\__ltjpreset_font_mc_b:}
+    \__ltjpreset_define_family:nnn {mc} {b}  {\__ltjpreset_font_mc_b:}
     \__ltjpreset_define_family:nnn {gt} {m}  {\__ltjpreset_font_gt_m:}
-    \__ltjpreset_define_family:nnn {gt} {bx} {\__ltjpreset_font_gt_bx:}
-    \__ltjpreset_define_family:nnn {gt} {b}  {\__ltjpreset_font_gt_bx:}
+    \__ltjpreset_define_family:nnn {gt} {bx} {\__ltjpreset_font_gt_b:}
+    \__ltjpreset_define_family:nnn {gt} {b}  {\__ltjpreset_font_gt_b:}
     \normalfont
     \bool_if:NT \g__ltjpreset_deluxe_bool {
       \__ltjpreset_define_family:nnn {mc}  {l} {\__ltjpreset_font_mc_l:}
@@ -622,12 +626,12 @@
              }
                },
          }
-      BoldFont = \__ltjpreset_font_mc_bx: \tl_use:N \l__ltjpreset_add_features_tl,
+      BoldFont = \__ltjpreset_font_mc_b: \tl_use:N \l__ltjpreset_add_features_tl,
       \cs_if_exist:NT \ltjpreset_define_family_hook_fontspec:nnn {
                UprightFeatures = { \ltjpreset_define_family_hook_fontspec:nnn
                  { mc } { m } { \__ltjpreset_font_mc_m: } },
                BoldFeatures = { \ltjpreset_define_family_hook_fontspec:nnn
-                 { mc } { bx } { \__ltjpreset_font_mc_bx: } },
+                 { mc } { b } { \__ltjpreset_font_mc_b: } },
          }
     ] { \__ltjpreset_font_mc_m: }
     \setsansjfont [
@@ -639,12 +643,12 @@
              }
            },
          }
-      BoldFont = \__ltjpreset_font_gt_bx: \tl_use:N \l__ltjpreset_add_features_tl,
+      BoldFont = \__ltjpreset_font_gt_b: \tl_use:N \l__ltjpreset_add_features_tl,
       \cs_if_exist:NT \ltjpreset_define_family_hook_fontspec:nnn {
                UprightFeatures = { \ltjpreset_define_family_hook_fontspec:nnn
                  { gt } { m } { \__ltjpreset_font_gt_m: } },
                BoldFeatures = { \ltjpreset_define_family_hook_fontspec:nnn
-                 { gt } { bx } { \__ltjpreset_font_gt_bx: } },
+                 { gt } { b } { \__ltjpreset_font_gt_b: } },
          }
     ] { \__ltjpreset_font_gt_m: }
     \bool_if:NT \g__ltjpreset_deluxe_bool {

diff --git a/src/patches/lltjdefs.sty b/src/patches/lltjdefs.sty
index 1006cce..8e90190 100644 (file)
--- a/src/patches/lltjdefs.sty
+++ b/src/patches/lltjdefs.sty
@@ -84,6 +84,7 @@
 \fi
 
 \ifdefined\fontseriesforce
+%%%% LaTeX 2020-02-02
 \edef\bfseries@mc{\bfdefault}
 \edef\bfseries@gt{\bfdefault}
 \def\bfseries@jtt{\bfseries@gt}

diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty
index 8ad7e45..78f8ecf 100644 (file)
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -5,6 +5,7 @@
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{lltjfont}[2020/01/12 Patch to NFSS2 for LuaTeX-ja]
 
+%% pathing \DeclareTextComposite
 \def\ltj@chardef@text@cmd#1{%
   \let\@ifdefinable\@@ifdefinable%
   \edef\ltj@chardef@text@cmd@name{\expandafter\@gobble\string#1}%
@@ -23,13 +24,11 @@
   \@dec@text@cmd\ltj@chardef@text@cmd#1{#2}#3\relax
 }
 
-\ifdefined\UnicodeEncodingName
-  \let\ltj@temp@DeclareTextComposite=\DeclareTextComposite
-  \def\DeclareTextComposite#1#2#3#4{}%
-  \input{tuenc.def}
-  \let\DeclareTextComposite=\ltj@temp@DeclareTextComposite
-  \expandafter\patchcmd\csname TU\string\textasteriskcentered\endcsname{\char}{\ltjalchar}{}{}
-\fi
+\let\ltj@temp@DeclareTextComposite=\DeclareTextComposite
+\def\DeclareTextComposite#1#2#3#4{}%
+\input{tuenc.def}
+\let\DeclareTextComposite=\ltj@temp@DeclareTextComposite
+\expandafter\patchcmd\csname TU\string\textasteriskcentered\endcsname{\char}{\ltjalchar}{}{}
 
 
 \let\k@encoding\@empty