more lltjfont.sty (and expanded tests)

[luatex-ja/luatexja.git] / src / patches / lltjfont.sty

diff --git a/src/patches/lltjfont.sty b/src/patches/lltjfont.sty
index 2c572d2..034697d 100644 (file)
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -580,13 +580,11 @@
    {LaTeX2e 2020-02-02 patch level 2 (and 4) has a bug.}
 \else
   \ltj@@latex@plv=300
-  \unless\ifx\bfseries@previous\@undefined % 2020-03-19 (+gh306)
-    \ltj@@latex@plv=550
-  \else\unless\ifx\series@maybe@drop@one@m@x\@undefined % pl5 + develop
+  \unless\ifx\series@maybe@drop@one@m@x\@undefined % pl5 + develop
     \ltj@@latex@plv=501
   \else\unless\ifx\series@maybe@drop@one@m\@undefined % patch level 5
     \ltj@@latex@plv=500
-  \fi\fi\fi
+  \fi\fi
 \fi
 %%%%%%
 
@@ -768,14 +766,11 @@
 \patchcmd\update@series@target@value@kanji{\f@series}{\k@series}{}{}
 \def\@meta@family@list@kanji{\@elt{mc}\@elt{gt}\@elt{jtt}}
 
-\ifnum\ltj@@latex@plv>549 % !!! pl5 + gh306
-\ifnum\expandafter\patchcmd\csname bfseries \endcsname{%
-  \let\bfseries@previous\bfdefault
+\expandafter\patchcmd\csname bfseries \endcsname{%
   \let\bfseries@rm\bfdef@ult
   \let\bfseries@sf\bfdef@ult
   \let\bfseries@tt\bfdef@ult
 }{%
-  \let\bfseries@previous\bfdefault
   \let\bfseries@rm\bfdef@ult
   \let\bfseries@sf\bfdef@ult
   \let\bfseries@tt\bfdef@ult
@@ -784,12 +779,10 @@
   \let\bfseries@jtt\bfdef@ult
 }{}{}
 \expandafter\patchcmd\csname mdseries \endcsname{%
-  \let\mdseries@previous\mddefault
   \let\mdseries@rm\mddef@ult
   \let\mdseries@sf\mddef@ult
   \let\mdseries@tt\mddef@ult
 }{%
-  \let\mdseries@previous\mddefault
   \let\mdseries@rm\mddef@ult
   \let\mdseries@sf\mddef@ult
   \let\mdseries@tt\mddef@ult
@@ -797,7 +790,6 @@
   \let\mdseries@gt\mddef@ult
   \let\mdseries@jtt\mddef@ult
 }{}{}
-\fi
 \expandafter\patchcmd\csname bfseries \endcsname{\selectfont}%
 {%
   \ifx\k@family\mcdef@ult      \kanjiseries\bfseries@mc