diff --git a/jis/jsarticle.cls b/jis/jsarticle.cls index 895ebb9..f9ae1ef 100644 --- a/jis/jsarticle.cls +++ b/jis/jsarticle.cls @@ -10,7 +10,7 @@ %% \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jsarticle} - [2021/06/28 jsclasses (okumura, texjporg)] + [2022/09/13 jsclasses (okumura, texjporg)] \def\jsc@clsname{jsarticle} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -128,6 +128,7 @@ \def\eqnarray{% \stepcounter{equation}% \def\@currentlabel{\p@equation\theequation}% + \def\@currentcounter{equation}% \global\@eqnswtrue \m@th \global\@eqcnt\z@ @@ -145,6 +146,7 @@ \def\eqnarray{% \stepcounter{equation}% \def\@currentlabel{\p@equation\theequation}% + \def\@currentcounter{equation}% \global\@eqnswtrue\m@th \global\@eqcnt\z@ \tabskip\mathindent @@ -236,7 +238,8 @@ \fi \fi \iftombow - \newdimen\stockwidth \newdimen\stockheight + \ifx\stockwidth\@undefined\newdimen\stockwidth\fi + \ifx\stockheight\@undefined\newdimen\stockheight\fi \setlength{\stockwidth}{\paperwidth} \setlength{\stockheight}{\paperheight} \advance \stockwidth 2in @@ -1733,6 +1736,7 @@ \splittopskip\footnotesep \splitmaxdepth \dp\strutbox \floatingpenalty \@MM \hsize\columnwidth \@parboxrestore + \def\@currentcounter{footnote}% \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark }% diff --git a/jis/jsbook.cls b/jis/jsbook.cls index 35dfc8a..e648685 100644 --- a/jis/jsbook.cls +++ b/jis/jsbook.cls @@ -10,7 +10,7 @@ %% \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jsbook} - [2021/06/28 jsclasses (okumura, texjporg)] + [2022/09/13 jsclasses (okumura, texjporg)] \def\jsc@clsname{jsbook} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -130,6 +130,7 @@ \def\eqnarray{% \stepcounter{equation}% \def\@currentlabel{\p@equation\theequation}% + \def\@currentcounter{equation}% \global\@eqnswtrue \m@th \global\@eqcnt\z@ @@ -147,6 +148,7 @@ \def\eqnarray{% \stepcounter{equation}% \def\@currentlabel{\p@equation\theequation}% + \def\@currentcounter{equation}% \global\@eqnswtrue\m@th \global\@eqcnt\z@ \tabskip\mathindent @@ -241,7 +243,8 @@ \fi \fi \iftombow - \newdimen\stockwidth \newdimen\stockheight + \ifx\stockwidth\@undefined\newdimen\stockwidth\fi + \ifx\stockheight\@undefined\newdimen\stockheight\fi \setlength{\stockwidth}{\paperwidth} \setlength{\stockheight}{\paperheight} \advance \stockwidth 2in @@ -1823,6 +1826,7 @@ \splittopskip\footnotesep \splitmaxdepth \dp\strutbox \floatingpenalty \@MM \hsize\columnwidth \@parboxrestore + \def\@currentcounter{footnote}% \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark }% diff --git a/jis/jsclasses.dtx b/jis/jsclasses.dtx index b5f110a..b65bc07 100644 --- a/jis/jsclasses.dtx +++ b/jis/jsclasses.dtx @@ -4,13 +4,13 @@ % pLaTeX2ε新ドキュメントクラス(日本語 TeX 開発コミュニティ版) % 原作者:奥村晴彦 % -% Copyright 1993-2021 +% Copyright 1993-2022 % The LaTeX3 Project and any individual authors listed elsewhere % in this file. % % Copyright 1995-1999 ASCII Corporation. % Copyright 1999-2016 Haruhiko Okumura -% Copyright 2016-2021 Japanese TeX Development Community +% Copyright 2016-2022 Japanese TeX Development Community % % \fi % @@ -27,9 +27,10 @@ %<*driver> \ProvidesFile{jsclasses.dtx} % - [2021/06/28 jsclasses (okumura, texjporg)] + [2022/09/13 jsclasses (okumura, texjporg)] %<*driver> -\documentclass{jsarticle} +\RequirePackage{plautopatch} +\documentclass[dvipdfmx]{jsarticle} \usepackage{doc} \xspcode"5C=1 %% \ \xspcode"22=1 %% " @@ -476,10 +477,14 @@ % ようですので,少し小さくします。 % また,中央の要素も |\displaystyle| にします。 % +% [2022-09-13] \LaTeXe~2021-11-15 (ltmath.dtx 2021/10/14 v1.2j)で +% |\@currentcounter|が追加されましたので,追随します。 +% % \begin{macrocode} \def\eqnarray{% \stepcounter{equation}% \def\@currentlabel{\p@equation\theequation}% + \def\@currentcounter{equation}% \global\@eqnswtrue \m@th \global\@eqcnt\z@ @@ -499,6 +504,9 @@ % \texttt{fleqn} で数式が本文左端から一定距離のところに出力されます。 % 森本さんにしたがって訂正しました。 % +% [2022-09-13] \LaTeXe~2021-11-15 (ltmath.dtx 2021/10/14 v1.2j)で +% |\@currentcounter|が追加されましたので,追随します。 +% % \begin{macrocode} \DeclareOption{leqno}{\input{leqno.clo}} \DeclareOption{fleqn}{\input{fleqn.clo}% @@ -506,6 +514,7 @@ \def\eqnarray{% \stepcounter{equation}% \def\@currentlabel{\p@equation\theequation}% + \def\@currentcounter{equation}% \global\@eqnswtrue\m@th \global\@eqcnt\z@ \tabskip\mathindent @@ -766,9 +775,15 @@ % 発行する |\special| の中身を展開しておくようにしました。 % こうしないと,用紙サイズ設定を間違ってしまいます(Issue \#72)。 % +% [2022-09-12] 次期\LaTeXe カーネルに|\stockwidth|,|\stockheight|が +% 追加されるようですので, +% クラスファイル側では未定義のときのみこれらの長さ変数を定義します。 +% h20y6mさん,ありがとうございます。 +% % \begin{macrocode} \iftombow - \newdimen\stockwidth \newdimen\stockheight + \ifx\stockwidth\@undefined\newdimen\stockwidth\fi + \ifx\stockheight\@undefined\newdimen\stockheight\fi \setlength{\stockwidth}{\paperwidth} \setlength{\stockheight}{\paperheight} \advance \stockwidth 2in @@ -5584,6 +5599,13 @@ % % [2018-03-11] |\next|などいくつかの内部命令を |\jsc@...| 付きの % ユニークな名前にしました。 +% +% [2022-09-13] \LaTeXe~2021-11-15 (ltfloat.dtx 2021/10/14 v1.2g)で +% |\@currentcounter|が追加されましたので,追随します。 +% なお,\LaTeXe~2021-06-01 (ltfloat.dtx 2021/02/10 v1.2e)で +% parhook対応として\cs{par}が追加されていますが, +% 実は同時に\cs{color@endgroup}も\cs{endgraf}するように変更 +% されていますので,不要だと思います。というわけで追加しません。 % \begin{macrocode} \long\def\@footnotetext{% \insert\footins\bgroup @@ -5592,6 +5614,7 @@ \splittopskip\footnotesep \splitmaxdepth \dp\strutbox \floatingpenalty \@MM \hsize\columnwidth \@parboxrestore + \def\@currentcounter{footnote}% \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark }% diff --git a/jis/jslogo.dtx b/jis/jslogo.dtx index 0444036..e7bdcc0 100644 --- a/jis/jslogo.dtx +++ b/jis/jslogo.dtx @@ -4,7 +4,7 @@ % LaTeX 関連のロゴ(pLaTeX2ε新ドキュメントクラス付録) % % Copyright 1999-2016 Haruhiko Okumura -% Copyright 2016-2019 Japanese TeX Development Community +% Copyright 2016-2022 Japanese TeX Development Community % % \fi % @@ -18,7 +18,8 @@ % [2019/07/25 okumura, texjporg] %<*driver> -\documentclass{jsarticle} +\RequirePackage{plautopatch} +\documentclass[dvipdfmx]{jsarticle} \usepackage{doc} \xspcode"5C=1 %% \ \xspcode"22=1 %% " diff --git a/jis/jspf.cls b/jis/jspf.cls index 2190a8e..1c709f3 100644 --- a/jis/jspf.cls +++ b/jis/jspf.cls @@ -10,7 +10,7 @@ %% \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jspf} - [2021/06/28 jsclasses (okumura, texjporg)] + [2022/09/13 jsclasses (okumura, texjporg)] \def\jsc@clsname{jspf} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -124,6 +124,7 @@ \def\eqnarray{% \stepcounter{equation}% \def\@currentlabel{\p@equation\theequation}% + \def\@currentcounter{equation}% \global\@eqnswtrue \m@th \global\@eqcnt\z@ @@ -141,6 +142,7 @@ \def\eqnarray{% \stepcounter{equation}% \def\@currentlabel{\p@equation\theequation}% + \def\@currentcounter{equation}% \global\@eqnswtrue\m@th \global\@eqcnt\z@ \tabskip\mathindent @@ -232,7 +234,8 @@ \fi \fi \iftombow - \newdimen\stockwidth \newdimen\stockheight + \ifx\stockwidth\@undefined\newdimen\stockwidth\fi + \ifx\stockheight\@undefined\newdimen\stockheight\fi \setlength{\stockwidth}{\paperwidth} \setlength{\stockheight}{\paperheight} \advance \stockwidth 2in @@ -1575,6 +1578,7 @@ \splittopskip\footnotesep \splitmaxdepth \dp\strutbox \floatingpenalty \@MM \hsize\columnwidth \@parboxrestore + \def\@currentcounter{footnote}% \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark }% diff --git a/jis/jsreport.cls b/jis/jsreport.cls index 58d4b75..07ec040 100644 --- a/jis/jsreport.cls +++ b/jis/jsreport.cls @@ -10,7 +10,7 @@ %% \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jsreport} - [2021/06/28 jsclasses (okumura, texjporg)] + [2022/09/13 jsclasses (okumura, texjporg)] \def\jsc@clsname{jsreport} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -129,6 +129,7 @@ \def\eqnarray{% \stepcounter{equation}% \def\@currentlabel{\p@equation\theequation}% + \def\@currentcounter{equation}% \global\@eqnswtrue \m@th \global\@eqcnt\z@ @@ -146,6 +147,7 @@ \def\eqnarray{% \stepcounter{equation}% \def\@currentlabel{\p@equation\theequation}% + \def\@currentcounter{equation}% \global\@eqnswtrue\m@th \global\@eqcnt\z@ \tabskip\mathindent @@ -237,7 +239,8 @@ \fi \fi \iftombow - \newdimen\stockwidth \newdimen\stockheight + \ifx\stockwidth\@undefined\newdimen\stockwidth\fi + \ifx\stockheight\@undefined\newdimen\stockheight\fi \setlength{\stockwidth}{\paperwidth} \setlength{\stockheight}{\paperheight} \advance \stockwidth 2in @@ -1816,6 +1819,7 @@ \splittopskip\footnotesep \splitmaxdepth \dp\strutbox \floatingpenalty \@MM \hsize\columnwidth \@parboxrestore + \def\@currentcounter{footnote}% \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark }% diff --git a/jis/jsverb.dtx b/jis/jsverb.dtx index c1ce49d..e933e22 100644 --- a/jis/jsverb.dtx +++ b/jis/jsverb.dtx @@ -11,7 +11,8 @@ %\NeedsTeXFormat{pLaTeX2e} %\ProvidesFile{jsverb.sty}[2007/01/28 okumura] %<*driver> -\documentclass{jsarticle} +\RequirePackage{plautopatch} +\documentclass[dvipdfmx]{jsarticle} \usepackage{doc} \xspcode"5C=1 %% \ \xspcode"22=1 %% " diff --git a/jis/kiyou.cls b/jis/kiyou.cls index 98b9f00..a9081aa 100644 --- a/jis/kiyou.cls +++ b/jis/kiyou.cls @@ -10,7 +10,7 @@ %% \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{kiyou} - [2021/06/28 jsclasses (okumura, texjporg)] + [2022/09/13 jsclasses (okumura, texjporg)] \def\jsc@clsname{kiyou} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -124,6 +124,7 @@ \def\eqnarray{% \stepcounter{equation}% \def\@currentlabel{\p@equation\theequation}% + \def\@currentcounter{equation}% \global\@eqnswtrue \m@th \global\@eqcnt\z@ @@ -141,6 +142,7 @@ \def\eqnarray{% \stepcounter{equation}% \def\@currentlabel{\p@equation\theequation}% + \def\@currentcounter{equation}% \global\@eqnswtrue\m@th \global\@eqcnt\z@ \tabskip\mathindent @@ -232,7 +234,8 @@ \fi \fi \iftombow - \newdimen\stockwidth \newdimen\stockheight + \ifx\stockwidth\@undefined\newdimen\stockwidth\fi + \ifx\stockheight\@undefined\newdimen\stockheight\fi \setlength{\stockwidth}{\paperwidth} \setlength{\stockheight}{\paperheight} \advance \stockwidth 2in @@ -1691,6 +1694,7 @@ \splittopskip\footnotesep \splitmaxdepth \dp\strutbox \floatingpenalty \@MM \hsize\columnwidth \@parboxrestore + \def\@currentcounter{footnote}% \protected@edef\@currentlabel{% \csname p@footnote\endcsname\@thefnmark }% diff --git a/jis/minijs.sty b/jis/minijs.sty index b3f0b46..1cb8ef2 100644 --- a/jis/minijs.sty +++ b/jis/minijs.sty @@ -10,7 +10,7 @@ %% \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{minijs} - [2021/06/28 jsclasses (okumura, texjporg)] + [2022/09/13 jsclasses (okumura, texjporg)] %% if jsclasses loaded, abort loading this package \ifx\@jsc@uplatextrue\@undefined\else \PackageInfo{minijs}{jsclasses does not need minijs, exiting} diff --git a/jis/okumacro.dtx b/jis/okumacro.dtx index 78f45e9..d0ee43e 100644 --- a/jis/okumacro.dtx +++ b/jis/okumacro.dtx @@ -9,7 +9,8 @@ %\NeedsTeXFormat{pLaTeX2e} %\ProvidesPackage{okumacro}[2021/07/01 okumura, texjporg] %<*driver> -\documentclass{jsarticle} +\RequirePackage{plautopatch} +\documentclass[dvipdfmx]{jsarticle} \usepackage{doc} \xspcode"5C=1 %% \ \xspcode"22=1 %% " diff --git a/jis/okuverb.dtx b/jis/okuverb.dtx index 78948f3..4c0deaf 100644 --- a/jis/okuverb.dtx +++ b/jis/okuverb.dtx @@ -9,7 +9,8 @@ %\NeedsTeXFormat{pLaTeX2e} %\ProvidesFile{okuverb.sty}[2003/09/03 okumura] %<*driver> -\documentclass{jsarticle} +\RequirePackage{plautopatch} +\documentclass[dvipdfmx]{jsarticle} \usepackage{doc} \xspcode"5C=1 %% \ \xspcode"22=1 %% "