texlive[53641] Master/texmf-dist: jsclasses (2feb20)
commits+karl at tug.org
commits+karl at tug.org
Sun Feb 2 23:42:26 CET 2020
Revision: 53641
http://tug.org/svn/texlive?view=revision&revision=53641
Author: karl
Date: 2020-02-02 23:42:26 +0100 (Sun, 02 Feb 2020)
Log Message:
-----------
jsclasses (2feb20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/platex/jsclasses/LICENSE
trunk/Master/texmf-dist/doc/platex/jsclasses/README.md
trunk/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf
trunk/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
trunk/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
trunk/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
trunk/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
trunk/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls
trunk/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
Modified: trunk/Master/texmf-dist/doc/platex/jsclasses/LICENSE
===================================================================
--- trunk/Master/texmf-dist/doc/platex/jsclasses/LICENSE 2020-02-02 22:42:01 UTC (rev 53640)
+++ trunk/Master/texmf-dist/doc/platex/jsclasses/LICENSE 2020-02-02 22:42:26 UTC (rev 53641)
@@ -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
Modified: trunk/Master/texmf-dist/doc/platex/jsclasses/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/platex/jsclasses/README.md 2020-02-02 22:42:01 UTC (rev 53640)
+++ trunk/Master/texmf-dist/doc/platex/jsclasses/README.md 2020-02-02 22:42:26 UTC (rev 53641)
@@ -37,7 +37,7 @@
## Release Date
-2019-07-25
+2020-02-02
Haruhiko Okumura,
Japanese TeX Development Community
Modified: trunk/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
===================================================================
--- trunk/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx 2020-02-02 22:42:01 UTC (rev 53640)
+++ trunk/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx 2020-02-02 22:42:26 UTC (rev 53641)
@@ -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}
%</driver>
- [2019/07/25 jsclasses (okumura, texjporg)]
+ [2020/02/02 jsclasses (okumura, texjporg)]
%<*driver>
\documentclass{jsarticle}
\usepackage{doc}
@@ -1160,6 +1160,18 @@
\DeclareFontShape{\jsc at JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc at 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 at math@alphabet\rmfamily\mathrm
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -1169,6 +1181,25 @@
\DeclareRobustCommand\ttfamily
{\not at math@alphabet\ttfamily\mathtt
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+\AtBeginDocument{%
+ \ifx\mweights at 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 at addto@macro\csname rmfamily \endcsname
+ {\kanjifamily\mcdefault\selectfont}%
+ \expandafter\g at addto@macro\csname sffamily \endcsname
+ {\kanjifamily\gtdefault\selectfont}%
+ \expandafter\g at addto@macro\csname ttfamily \endcsname
+ {\kanjifamily\gtdefault\selectfont}%
+ \fi}
+\else % 2020-02-02
+\g at addto@macro\@rmfamilyhook
+ {\prepare at family@series at update@kanji{mc}\mcdefault}
+\g at addto@macro\@sffamilyhook
+ {\prepare at family@series at update@kanji{gt}\gtdefault}
+\g at addto@macro\@ttfamilyhook
+ {\prepare at family@series at update@kanji{gt}\gtdefault}
+\fi
% \end{macrocode}
%
% \begin{macro}{\textmc}
Modified: trunk/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls 2020-02-02 22:42:01 UTC (rev 53640)
+++ trunk/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls 2020-02-02 22:42:26 UTC (rev 53641)
@@ -25,7 +25,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsarticle}
- [2019/07/25 jsclasses (okumura, texjporg)]
+ [2020/02/02 jsclasses (okumura, texjporg)]
\def\jsc at clsname{jsarticle}
\newif\ifjsc at needsp@tch
\jsc at needsp@tchfalse
@@ -463,6 +463,7 @@
\DeclareFontShape{\jsc at JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\ifx\@rmfamilyhook\@undefined % old
\DeclareRobustCommand\rmfamily
{\not at math@alphabet\rmfamily\mathrm
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -472,6 +473,25 @@
\DeclareRobustCommand\ttfamily
{\not at math@alphabet\ttfamily\mathtt
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+\AtBeginDocument{%
+ \ifx\mweights at 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 at addto@macro\csname rmfamily \endcsname
+ {\kanjifamily\mcdefault\selectfont}%
+ \expandafter\g at addto@macro\csname sffamily \endcsname
+ {\kanjifamily\gtdefault\selectfont}%
+ \expandafter\g at addto@macro\csname ttfamily \endcsname
+ {\kanjifamily\gtdefault\selectfont}%
+ \fi}
+\else % 2020-02-02
+\g at addto@macro\@rmfamilyhook
+ {\prepare at family@series at update@kanji{mc}\mcdefault}
+\g at addto@macro\@sffamilyhook
+ {\prepare at family@series at update@kanji{gt}\gtdefault}
+\g at addto@macro\@ttfamilyhook
+ {\prepare at family@series at update@kanji{gt}\gtdefault}
+\fi
\ifx\DeclareFixJFMCJKTextFontCommand\@undefined
\DeclareRobustCommand\textmc[1]{%
\relax\ifmmode \expandafter\nfss at text \fi{\mcfamily #1}}
Modified: trunk/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls 2020-02-02 22:42:01 UTC (rev 53640)
+++ trunk/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls 2020-02-02 22:42:26 UTC (rev 53641)
@@ -25,7 +25,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsbook}
- [2019/07/25 jsclasses (okumura, texjporg)]
+ [2020/02/02 jsclasses (okumura, texjporg)]
\def\jsc at clsname{jsbook}
\newif\ifjsc at needsp@tch
\jsc at needsp@tchfalse
@@ -468,6 +468,7 @@
\DeclareFontShape{\jsc at JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\ifx\@rmfamilyhook\@undefined % old
\DeclareRobustCommand\rmfamily
{\not at math@alphabet\rmfamily\mathrm
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -477,6 +478,25 @@
\DeclareRobustCommand\ttfamily
{\not at math@alphabet\ttfamily\mathtt
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+\AtBeginDocument{%
+ \ifx\mweights at 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 at addto@macro\csname rmfamily \endcsname
+ {\kanjifamily\mcdefault\selectfont}%
+ \expandafter\g at addto@macro\csname sffamily \endcsname
+ {\kanjifamily\gtdefault\selectfont}%
+ \expandafter\g at addto@macro\csname ttfamily \endcsname
+ {\kanjifamily\gtdefault\selectfont}%
+ \fi}
+\else % 2020-02-02
+\g at addto@macro\@rmfamilyhook
+ {\prepare at family@series at update@kanji{mc}\mcdefault}
+\g at addto@macro\@sffamilyhook
+ {\prepare at family@series at update@kanji{gt}\gtdefault}
+\g at addto@macro\@ttfamilyhook
+ {\prepare at family@series at update@kanji{gt}\gtdefault}
+\fi
\ifx\DeclareFixJFMCJKTextFontCommand\@undefined
\DeclareRobustCommand\textmc[1]{%
\relax\ifmmode \expandafter\nfss at text \fi{\mcfamily #1}}
Modified: trunk/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/jsclasses/jspf.cls 2020-02-02 22:42:01 UTC (rev 53640)
+++ trunk/Master/texmf-dist/tex/platex/jsclasses/jspf.cls 2020-02-02 22:42:26 UTC (rev 53641)
@@ -25,7 +25,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jspf}
- [2019/07/25 jsclasses (okumura, texjporg)]
+ [2020/02/02 jsclasses (okumura, texjporg)]
\def\jsc at clsname{jspf}
\newif\ifjsc at needsp@tch
\jsc at needsp@tchfalse
@@ -459,6 +459,7 @@
\DeclareFontShape{\jsc at JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\ifx\@rmfamilyhook\@undefined % old
\DeclareRobustCommand\rmfamily
{\not at math@alphabet\rmfamily\mathrm
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -468,6 +469,25 @@
\DeclareRobustCommand\ttfamily
{\not at math@alphabet\ttfamily\mathtt
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+\AtBeginDocument{%
+ \ifx\mweights at 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 at addto@macro\csname rmfamily \endcsname
+ {\kanjifamily\mcdefault\selectfont}%
+ \expandafter\g at addto@macro\csname sffamily \endcsname
+ {\kanjifamily\gtdefault\selectfont}%
+ \expandafter\g at addto@macro\csname ttfamily \endcsname
+ {\kanjifamily\gtdefault\selectfont}%
+ \fi}
+\else % 2020-02-02
+\g at addto@macro\@rmfamilyhook
+ {\prepare at family@series at update@kanji{mc}\mcdefault}
+\g at addto@macro\@sffamilyhook
+ {\prepare at family@series at update@kanji{gt}\gtdefault}
+\g at addto@macro\@ttfamilyhook
+ {\prepare at family@series at update@kanji{gt}\gtdefault}
+\fi
\ifx\DeclareFixJFMCJKTextFontCommand\@undefined
\DeclareRobustCommand\textmc[1]{%
\relax\ifmmode \expandafter\nfss at text \fi{\mcfamily #1}}
Modified: trunk/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls 2020-02-02 22:42:01 UTC (rev 53640)
+++ trunk/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls 2020-02-02 22:42:26 UTC (rev 53641)
@@ -25,7 +25,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsreport}
- [2019/07/25 jsclasses (okumura, texjporg)]
+ [2020/02/02 jsclasses (okumura, texjporg)]
\def\jsc at clsname{jsreport}
\newif\ifjsc at needsp@tch
\jsc at needsp@tchfalse
@@ -464,6 +464,7 @@
\DeclareFontShape{\jsc at JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\ifx\@rmfamilyhook\@undefined % old
\DeclareRobustCommand\rmfamily
{\not at math@alphabet\rmfamily\mathrm
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -473,6 +474,25 @@
\DeclareRobustCommand\ttfamily
{\not at math@alphabet\ttfamily\mathtt
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+\AtBeginDocument{%
+ \ifx\mweights at 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 at addto@macro\csname rmfamily \endcsname
+ {\kanjifamily\mcdefault\selectfont}%
+ \expandafter\g at addto@macro\csname sffamily \endcsname
+ {\kanjifamily\gtdefault\selectfont}%
+ \expandafter\g at addto@macro\csname ttfamily \endcsname
+ {\kanjifamily\gtdefault\selectfont}%
+ \fi}
+\else % 2020-02-02
+\g at addto@macro\@rmfamilyhook
+ {\prepare at family@series at update@kanji{mc}\mcdefault}
+\g at addto@macro\@sffamilyhook
+ {\prepare at family@series at update@kanji{gt}\gtdefault}
+\g at addto@macro\@ttfamilyhook
+ {\prepare at family@series at update@kanji{gt}\gtdefault}
+\fi
\ifx\DeclareFixJFMCJKTextFontCommand\@undefined
\DeclareRobustCommand\textmc[1]{%
\relax\ifmmode \expandafter\nfss at text \fi{\mcfamily #1}}
Modified: trunk/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
===================================================================
--- trunk/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls 2020-02-02 22:42:01 UTC (rev 53640)
+++ trunk/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls 2020-02-02 22:42:26 UTC (rev 53641)
@@ -25,7 +25,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{kiyou}
- [2019/07/25 jsclasses (okumura, texjporg)]
+ [2020/02/02 jsclasses (okumura, texjporg)]
\def\jsc at clsname{kiyou}
\newif\ifjsc at needsp@tch
\jsc at needsp@tchfalse
@@ -470,6 +470,7 @@
\DeclareFontShape{\jsc at JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
\DeclareFontShape{\jsc at JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\ifx\@rmfamilyhook\@undefined % old
\DeclareRobustCommand\rmfamily
{\not at math@alphabet\rmfamily\mathrm
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -479,6 +480,25 @@
\DeclareRobustCommand\ttfamily
{\not at math@alphabet\ttfamily\mathtt
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+\AtBeginDocument{%
+ \ifx\mweights at 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 at addto@macro\csname rmfamily \endcsname
+ {\kanjifamily\mcdefault\selectfont}%
+ \expandafter\g at addto@macro\csname sffamily \endcsname
+ {\kanjifamily\gtdefault\selectfont}%
+ \expandafter\g at addto@macro\csname ttfamily \endcsname
+ {\kanjifamily\gtdefault\selectfont}%
+ \fi}
+\else % 2020-02-02
+\g at addto@macro\@rmfamilyhook
+ {\prepare at family@series at update@kanji{mc}\mcdefault}
+\g at addto@macro\@sffamilyhook
+ {\prepare at family@series at update@kanji{gt}\gtdefault}
+\g at addto@macro\@ttfamilyhook
+ {\prepare at family@series at update@kanji{gt}\gtdefault}
+\fi
\ifx\DeclareFixJFMCJKTextFontCommand\@undefined
\DeclareRobustCommand\textmc[1]{%
\relax\ifmmode \expandafter\nfss at text \fi{\mcfamily #1}}
More information about the tex-live-commits
mailing list.