lltjfont.sty: fix \bfseries and \mdseries

diff --git a/src/addons/luatexja-fontspec-27c.sty b/src/addons/luatexja-fontspec-27c.sty
index 0c44c62..2fc3d6b 100644 (file)
--- a/src/addons/luatexja-fontspec-27c.sty
+++ b/src/addons/luatexja-fontspec-27c.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-27c}[2020/01/26 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec-27c}[2020-04-04 fontspec support of LuaTeX-ja]
 \RequirePackage{l3keys2e}
 \ExplSyntaxOn
 
@@ -314,6 +314,9 @@
 }
 
 \DeclareDocumentCommand \setmainjfont { O{} m O{} } {
+  \ifdefined\DeclareFontSeriesDefault
+    \DeclareFontSeriesDefault[mc]{bf}{\bfdefault}
+  \fi
   \__ltj_fontspec_set_family:Nnn \mcdefault {#1,#3}{#2}
   \unless\ifltj@disablejfam
     \DeclareSymbolFont{mincho}{JY3}{\mcdefault}{\mddefault}{n}
@@ -323,6 +326,9 @@
 }
 
 \DeclareDocumentCommand \setsansjfont { O{} m O{} } {
+  \ifdefined\DeclareFontSeriesDefault
+    \DeclareFontSeriesDefault[gt]{bf}{\bfdefault}
+  \fi
   \__ltj_fontspec_set_family:Nnn \gtdefault {#1,#3}{#2}
   \unless\ifltj@disablejfam
     \DeclareMathAlphabet{\mathgt}{JY3}{\gtdefault}{\mddefault}{n}
@@ -331,6 +337,9 @@
 }
 
 \DeclareDocumentCommand \setmonojfont { O{} m O{} } {
+  \ifdefined\DeclareFontSeriesDefault
+    \DeclareFontSeriesDefault[jtt]{bf}{\bfdefault}
+  \fi
   \__ltj_fontspec_set_family:Nnn \jttdefault {#1,#3}{#2}
   \normalfont
 }

diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty
index 2f2fe9a..e9539ed 100644 (file)
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2020-04-01 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2020-04-04 Patch to NFSS2 for LuaTeX-ja]
 
 %% patching \DeclareTextComposite
 \def\ltj@chardef@text@cmd#1{%
@@ -833,6 +833,32 @@
   \let\mdseries@gt\mddef@ult
   \let\mdseries@jtt\mddef@ult
 }{}{}
+\expandafter\patchcmd\csname bfseries \endcsname{%
+  \ifx\f@family\rmdef@ult      \fontseries\bfseries@rm
+  \else\ifx\f@family\sfdef@ult \fontseries\bfseries@sf
+  \else\ifx\f@family\ttdef@ult \fontseries\bfseries@tt
+  \else                        \fontseries\bfdefault
+  \fi\fi\fi
+}{%
+  \ifx\f@family\rmdef@ult      \romanseries\bfseries@rm
+  \else\ifx\f@family\sfdef@ult \romanseries\bfseries@sf
+  \else\ifx\f@family\ttdef@ult \romanseries\bfseries@tt
+  \else                        \romanseries\bfdefault
+  \fi\fi\fi
+}{}{}
+\expandafter\patchcmd\csname mdseries \endcsname{%
+  \ifx\f@family\rmdef@ult      \fontseries\mdseries@rm
+  \else\ifx\f@family\sfdef@ult \fontseries\mdseries@sf
+  \else\ifx\f@family\ttdef@ult \fontseries\mdseries@tt
+  \else                        \fontseries\mddefault
+  \fi\fi\fi
+}{%
+  \ifx\f@family\rmdef@ult      \romanseries\mdseries@rm
+  \else\ifx\f@family\sfdef@ult \romanseries\mdseries@sf
+  \else\ifx\f@family\ttdef@ult \romanseries\mdseries@tt
+  \else                        \romanseries\mddefault
+  \fi\fi\fi
+}{}{}
 \expandafter\patchcmd\csname bfseries \endcsname{\selectfont}%
 {%
   \ifx\k@family\mcdef@ult      \kanjiseries\bfseries@mc