From 34897eebd22c3de968b64f09bb4a371d96cb0b89 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 3 Feb 2020 03:02:01 +0000 Subject: CTAN sync 202002030302 --- macros/latex/contrib/jsclasses/LICENSE | 2 +- macros/latex/contrib/jsclasses/README.md | 2 +- macros/latex/contrib/jsclasses/jsclasses.dtx | 35 +++++++++++++++++++++++++-- macros/latex/contrib/jsclasses/jsclasses.pdf | Bin 479848 -> 482131 bytes 4 files changed, 35 insertions(+), 4 deletions(-) (limited to 'macros/latex/contrib/jsclasses') diff --git a/macros/latex/contrib/jsclasses/LICENSE b/macros/latex/contrib/jsclasses/LICENSE index ff8691b935..1f8bc0f533 100644 --- a/macros/latex/contrib/jsclasses/LICENSE +++ b/macros/latex/contrib/jsclasses/LICENSE @@ -1,6 +1,6 @@ Copyright 1995-1999 ASCII MEDIA WORKS Copyright 1999-2016 Haruhiko Okumura -Copyright 2016-2019 Japanese TeX Development Community +Copyright 2016-2020 Japanese TeX Development Community All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/macros/latex/contrib/jsclasses/README.md b/macros/latex/contrib/jsclasses/README.md index eac466dcc8..e051a09a40 100644 --- a/macros/latex/contrib/jsclasses/README.md +++ b/macros/latex/contrib/jsclasses/README.md @@ -37,7 +37,7 @@ distributed separately. ## Release Date -2019-07-25 +2020-02-02 Haruhiko Okumura, Japanese TeX Development Community diff --git a/macros/latex/contrib/jsclasses/jsclasses.dtx b/macros/latex/contrib/jsclasses/jsclasses.dtx index b8e6cba060..8e6642b329 100644 --- a/macros/latex/contrib/jsclasses/jsclasses.dtx +++ b/macros/latex/contrib/jsclasses/jsclasses.dtx @@ -15,7 +15,7 @@ % % Copyright 1995-1999 ASCII Corporation. % Copyright 1999-2016 Haruhiko Okumura -% Copyright 2016-2019 Japanese TeX Development Community +% Copyright 2016-2020 Japanese TeX Development Community % % \fi % @@ -31,7 +31,7 @@ %<*driver> \ProvidesFile{jsclasses.dtx} % - [2019/07/25 jsclasses (okumura, texjporg)] + [2020/02/02 jsclasses (okumura, texjporg)] %<*driver> \documentclass{jsarticle} \usepackage{doc} @@ -1160,6 +1160,18 @@ \DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{} \DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{} \DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{} +% \end{macrocode} +% +% [2020-02-02] \LaTeXe~2020-02-02でNFSSが拡張され, +% それに伴いオリジナルの |\rmfamily| などの定義が変化しました。 +% |\DeclareRobustCommand| で直接定義すると,これを上書きして +% NFSSの拡張部分を壊してしまいますので, +% 新たに提供されたフックにコードを挿入します。 +% 従来のコードも\LaTeXe~2019-10-01以前のために残してありますが, +% \texttt{mweights}パッケージ対策も施しました(forum:2763)。 +% +% \begin{macrocode} +\ifx\@rmfamilyhook\@undefined % old \DeclareRobustCommand\rmfamily {\not@math@alphabet\rmfamily\mathrm \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont} @@ -1169,6 +1181,25 @@ \DeclareRobustCommand\ttfamily {\not@math@alphabet\ttfamily\mathtt \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont} +\AtBeginDocument{% + \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 % \end{macrocode} % % \begin{macro}{\textmc} diff --git a/macros/latex/contrib/jsclasses/jsclasses.pdf b/macros/latex/contrib/jsclasses/jsclasses.pdf index ba219922b0..63ff3c6e69 100644 Binary files a/macros/latex/contrib/jsclasses/jsclasses.pdf and b/macros/latex/contrib/jsclasses/jsclasses.pdf differ -- cgit v1.2.3