bxjscls (5feb20)

git-svn-id: svn://tug.org/texlive/trunk@53684 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 29 insertions, 4 deletions

diff --git a/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx b/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
index d5f56464857..0fcdd4b5756 100644
--- a/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
+++ b/Master/texmf-dist/source/latex/bxjscls/bxjscls.dtx
@@ -25,15 +25,15 @@
 %
 %---------------------------------------
 %
-%  Copyright 1993-2016
+%  Copyright 1993-2019
 %  The LaTeX3 Project and any individual authors listed elsewhere
 %  in this file.
 %
 %  Copyright 1995-1999 ASCII Corporation.
 %  Copyright 1999-2016 Haruhiko Okumura
-%  Copyright 2016-2019 Japanese TeX Development Community
+%  Copyright 2016-2020 Japanese TeX Development Community
 %
-%  Copyright 2013-2019 Takayuki YATO (aka. "ZR")
+%  Copyright 2013-2020 Takayuki YATO (aka. "ZR")
 %
 % \fi
 % \CheckSum{0}
@@ -56,7 +56,9 @@
 %<*driver>
 \ProvidesFile{bxjscls.dtx}
 %</driver>
-  [2019/11/24 v1.9i BXJS document classes]
+  [2020/02/05 v1.9j BXJS document classes]
+% based on jsclasses [2020/02/02]
+% [2019/11/24 v1.9i BXJS document classes]
 % [2019/07/27 v1.9h BXJS document classes]
 % based on jsclasses [2019/07/25]
 % [2019/06/23 v1.9g BXJS document classes]
@@ -8470,7 +8472,11 @@
 %
 % 欧文総称フォント命令で和文フォントが連動するように修正する。
 % その他の和文フォント関係の定義を行う。
+%
+% \Note 2020-02-02のNFSSの改修に対する |jsclasses| の対策くぉ
+% 取り入れた。
 %    \begin{macrocode}
+\ifx\@rmfamilyhook\@undefined  % old
 \DeclareRobustCommand\rmfamily
   {\not@math@alphabet\rmfamily\mathrm
    \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -8480,6 +8486,25 @@
 \DeclareRobustCommand\ttfamily
   {\not@math@alphabet\ttfamily\mathtt
    \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+\g@addto@macro\bxjs@begin@document@hook{%
+  \ifx\mweights@init\@undefined\else  % mweights.sty is loaded
+    % my definitions above should have been overwritten, recover it!
+    % \selectfont is executed twice but I don't care about speed...
+    \expandafter\g@addto@macro\csname rmfamily \endcsname
+      {\kanjifamily\mcdefault\selectfont}%
+    \expandafter\g@addto@macro\csname sffamily \endcsname
+      {\kanjifamily\gtdefault\selectfont}%
+    \expandafter\g@addto@macro\csname ttfamily \endcsname
+      {\kanjifamily\gtdefault\selectfont}%
+  \fi}
+\else                          % 2020-02-02
+\g@addto@macro\@rmfamilyhook
+  {\prepare@family@series@update@kanji{mc}\mcdefault}
+\g@addto@macro\@sffamilyhook
+  {\prepare@family@series@update@kanji{gt}\gtdefault}
+\g@addto@macro\@ttfamilyhook
+  {\prepare@family@series@update@kanji{gt}\gtdefault}
+\fi
 \ifx\DeclareFixJFMCJKTextFontCommand\@undefined
 \DeclareJaTextFontCommand{\textmc}{\mcfamily}
 \DeclareJaTextFontCommand{\textgt}{\gtfamily}