From 4b795f65d52cde0d136c0175ce20101946378b54 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 5 Feb 2020 03:03:08 +0000 Subject: CTAN sync 202002050303 --- language/japanese/BX/bxjscls/LICENSE | 4 +-- language/japanese/BX/bxjscls/README-ja.md | 3 +++ language/japanese/BX/bxjscls/README.md | 2 ++ language/japanese/BX/bxjscls/bxjscls-manual.pdf | Bin 729019 -> 729015 bytes language/japanese/BX/bxjscls/bxjscls.dtx | 33 +++++++++++++++++++++--- language/japanese/BX/bxjscls/bxjscls.pdf | Bin 1152167 -> 1153350 bytes 6 files changed, 36 insertions(+), 6 deletions(-) (limited to 'language/japanese/BX') diff --git a/language/japanese/BX/bxjscls/LICENSE b/language/japanese/BX/bxjscls/LICENSE index 4e794feb3a..b1ab4fd482 100644 --- a/language/japanese/BX/bxjscls/LICENSE +++ b/language/japanese/BX/bxjscls/LICENSE @@ -2,8 +2,8 @@ The BSD 2-Clause License Copyright 1995-1999 ASCII Corporation. Copyright 1999-2016 Haruhiko Okumura -Copyright 2016-2019 Japanese TeX Development Community -Copyright 2013-2019 Takayuki YATO (aka. "ZR") +Copyright 2016-2020 Japanese TeX Development Community +Copyright 2013-2020 Takayuki YATO (aka. "ZR") All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/language/japanese/BX/bxjscls/README-ja.md b/language/japanese/BX/bxjscls/README-ja.md index 00b2b20ffa..23c9abcf4e 100644 --- a/language/japanese/BX/bxjscls/README-ja.md +++ b/language/japanese/BX/bxjscls/README-ja.md @@ -98,6 +98,9 @@ XeLaTeX / LuaLaTeX の上でも日本語処理パッケージと連携して使 更新履歴 -------- + * Version 1.9j 〈2020/02/05〉 + - jsclasses の 2020/02/02 と同期。 + + NFSS の改修に対応した。 * Version 1.9i 〈2019/11/24〉 - Pandoc モードを最新の Pandoc に対応させる。 * Version 1.9h 〈2019/07/27〉 diff --git a/language/japanese/BX/bxjscls/README.md b/language/japanese/BX/bxjscls/README.md index bd1505a229..8433915dff 100644 --- a/language/japanese/BX/bxjscls/README.md +++ b/language/japanese/BX/bxjscls/README.md @@ -88,6 +88,8 @@ This package is distributed under the BSD 2-Clause License. Revision History ---------------- + * Version 1.9j 〈2020/02/05〉 + - Sync with jsclasses 2020/02/02. * Version 1.9i 〈2019/11/24〉 * Version 1.9h 〈2019/07/27〉 * Version 1.9g 〈2019/06/23〉 diff --git a/language/japanese/BX/bxjscls/bxjscls-manual.pdf b/language/japanese/BX/bxjscls/bxjscls-manual.pdf index 8b304a1f97..0ba7c6e7d5 100644 Binary files a/language/japanese/BX/bxjscls/bxjscls-manual.pdf and b/language/japanese/BX/bxjscls/bxjscls-manual.pdf differ diff --git a/language/japanese/BX/bxjscls/bxjscls.dtx b/language/japanese/BX/bxjscls/bxjscls.dtx index d5f5646485..0fcdd4b575 100644 --- a/language/japanese/BX/bxjscls/bxjscls.dtx +++ b/language/japanese/BX/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} % - [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} diff --git a/language/japanese/BX/bxjscls/bxjscls.pdf b/language/japanese/BX/bxjscls/bxjscls.pdf index 8f525c313c..4e248e1921 100644 Binary files a/language/japanese/BX/bxjscls/bxjscls.pdf and b/language/japanese/BX/bxjscls/bxjscls.pdf differ -- cgit v1.2.3