more lltjfont.sty (and expanded tests)

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

diff --git a/test/test31-nfss20200202.pdf b/test/test31-nfss20200202.pdf
new file mode 100644 (file)
index 0000000..19cc969
Binary files /dev/null and b/test/test31-nfss20200202.pdf differ

diff --git a/test/test31-nfss20200202.tex b/test/test31-nfss20200202.tex
index edf64ce..f2cc4ca 100644 (file)
--- a/test/test31-nfss20200202.tex
+++ b/test/test31-nfss20200202.tex
@@ -1,35 +1,49 @@
 \documentclass{ltjarticle}
 \makeatletter
+%\DeclareFontSeriesDefault[sf]{md}{b}
 \def\mdseries@mc{el}
 \def\bfseries@mc{sb}
 \def\mdseries@gt{l}
 \def\bfseries@gt{k}
-\DeclareFontShape{JY3}{gt}{k}{n}{<-> KozGoPr6N-Heavy.otf:jfm=ujis}{}
-\DeclareFontShape{JT3}{gt}{k}{n}{<-> KozGoPr6N-Heavy.otf:jfm=ujisv}{}
-\DeclareFontShape{JY3}{gt}{l}{n}{<-> KozGoPr6N-ExtraLight.otf:jfm=ujis}{}
-\DeclareFontShape{JT3}{gt}{l}{n}{<-> KozGoPr6N-ExtraLight.otf:jfm=ujisv}{}
-\DeclareFontShape{JY3}{mc}{el}{n}{<-> KozMinPr6N-ExtraLight.otf:jfm=ujis}{}
-\DeclareFontShape{JT3}{mc}{el}{n}{<-> KozMinPr6N-ExtraLight.otf:jfm=ujisv}{}
-\DeclareFontShape{JY3}{mc}{sb}{n}{<-> KozMinPr6N-Bold.otf:jfm=ujis}{}
-\DeclareFontShape{JT3}{mc}{sb}{n}{<-> KozMinPr6N-Bold.otf:jfm=ujisv}{}
+\DeclareFontShape{JY3}{gt}{k}{n}{<-> HaranoAjiGothic-Heavy.otf:jfm=ujis}{}
+\DeclareFontShape{JT3}{gt}{k}{n}{<-> HaranoAjiGothic-Heavy.otf:jfm=ujisv}{}
+\DeclareFontShape{JY3}{gt}{l}{n}{<-> HaranoAjiGothic-ExtraLight.otf:jfm=ujis}{}
+\DeclareFontShape{JT3}{gt}{l}{n}{<-> HaranoAjiGothic-ExtraLight.otf:jfm=ujisv}{}
+\DeclareFontShape{JY3}{mc}{el}{n}{<-> HaranoAjiMincho-ExtraLight.otf:jfm=ujis}{}
+\DeclareFontShape{JT3}{mc}{el}{n}{<-> HaranoAjiMincho-ExtraLight.otf:jfm=ujisv}{}
+\DeclareFontShape{JY3}{mc}{sb}{n}{<-> HaranoAjiMincho-Bold.otf:jfm=ujis}{}
+\DeclareFontShape{JT3}{mc}{sb}{n}{<-> HaranoAjiMincho-Bold.otf:jfm=ujisv}{}
 \def\TEST{%
  \par
   A: \f@encoding/\f@family/\f@series/\f@shape.
   K: \k@encoding/\k@family/\k@series/\k@shape.
   あいうABC
 }
+\def\TESTA{%
+  \TEST NORMAL
+  \emph{\TEST} EMPH
+  \textsf{\TEST} SF
+  \textbf{\TEST} BF
+  \textgt{\TEST} GT
+  \textbf{\textgt{\TEST}} BF+GT
+  \textbf{\textgt{\textmd{\TEST}}} BF+GT+MD
+  \par 
+  \textsc{\textit{\TEST}} SC+IT
+  \par
+  {\fontseries{b}\selectfont \TEST} B
+  {\fontseries{bx}\selectfont \TEST} BX
+}
 \begin{document}
-\TEST NORMAL
-\emph{\TEST} EMPH
-\textsf{\TEST} SF
-\textbf{\TEST} BF
-\textgt{\TEST} GT
-\textbf{\textgt{\TEST}} BF+GT
-\textbf{\textgt{\textmd{\TEST}}} BF+GT+MD
+%{\ttfamily\expandafter\meaning\csname bfdefault\endcsname::%
+%  \expandafter\meaning\csname bfdefault@previous\endcsname}\par
 
-\textsc{\textit{\TEST}} SC+IT
+{\ttfamily ======DEFAULT======\par}
+\TESTA
+\def\bfdefault{b}\newpage
+{\ttfamily ======\detokenize{\def\bfdefault{bx}}======\par}
 
-{\fontseries{b}\selectfont \TEST} B
-{\fontseries{bx}\selectfont \TEST} BX
+\TESTA
 
-\end{document}
\ No newline at end of file
+%\ttfamily
+%\expandafter\meaning\csname bfseries \endcsname
+\end{document}

diff --git a/test/test31a-nfss_kshape.pdf b/test/test31a-nfss_kshape.pdf
new file mode 100644 (file)
index 0000000..2aa0c5a
Binary files /dev/null and b/test/test31a-nfss_kshape.pdf differ