jsclasses (14sep22)

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

18 files changed, 70 insertions, 23 deletions

diff --git a/Master/texmf-dist/doc/platex/jsclasses/LICENSE b/Master/texmf-dist/doc/platex/jsclasses/LICENSE
index 1f8bc0f5339..7d331ec0156 100644
--- a/Master/texmf-dist/doc/platex/jsclasses/LICENSE
+++ b/Master/texmf-dist/doc/platex/jsclasses/LICENSE
@@ -1,6 +1,6 @@
 Copyright 1995-1999 ASCII MEDIA WORKS
 Copyright 1999-2016 Haruhiko Okumura
-Copyright 2016-2020 Japanese TeX Development Community
+Copyright 2016-2022 Japanese TeX Development Community
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/Master/texmf-dist/doc/platex/jsclasses/README.md b/Master/texmf-dist/doc/platex/jsclasses/README.md
index 284efa78153..da6539d7bdc 100644
--- a/Master/texmf-dist/doc/platex/jsclasses/README.md
+++ b/Master/texmf-dist/doc/platex/jsclasses/README.md
@@ -37,7 +37,7 @@ distributed separately.
 
 ## Release Date
 
-2021-07-01
+2022-09-13
 
 Haruhiko Okumura,
 Japanese TeX Development Community
diff --git a/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf b/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf
index f41951d9e6b..3a3f56fe36f 100644
--- a/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf
+++ b/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf
diff --git a/Master/texmf-dist/doc/platex/jsclasses/jslogo.pdf b/Master/texmf-dist/doc/platex/jsclasses/jslogo.pdf
index 6975d75515a..d46e75216aa 100644
--- a/Master/texmf-dist/doc/platex/jsclasses/jslogo.pdf
+++ b/Master/texmf-dist/doc/platex/jsclasses/jslogo.pdf
diff --git a/Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf b/Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf
index a2273084a57..6b323f735b5 100644
--- a/Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf
+++ b/Master/texmf-dist/doc/platex/jsclasses/jsverb.pdf
diff --git a/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf b/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf
index d01f531572e..26cd6c29856 100644
--- a/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf
+++ b/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf
diff --git a/Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf b/Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf
index b8014b3c660..c0703b0c805 100644
--- a/Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf
+++ b/Master/texmf-dist/doc/platex/jsclasses/okuverb.pdf
diff --git a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
index 37567b64d9e..39c85dcabe0 100644
--- a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
+++ b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
@@ -9,13 +9,13 @@
 %  pLaTeX2ε新ドキュメントクラス（日本語 TeX 開発コミュニティ版）
 %  原作者：奥村晴彦 <okumura@okumuralab.org>
 %
-%  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
 %
@@ -32,9 +32,10 @@
 %<*driver>
 \ProvidesFile{jsclasses.dtx}
 %</driver>
-  [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 %% "
@@ -481,10 +482,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@
@@ -504,6 +509,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}%
@@ -511,6 +519,7 @@
   \def\eqnarray{%
     \stepcounter{equation}%
     \def\@currentlabel{\p@equation\theequation}%
+    \def\@currentcounter{equation}%
     \global\@eqnswtrue\m@th
     \global\@eqcnt\z@
     \tabskip\mathindent
@@ -771,9 +780,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
@@ -5589,6 +5604,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
@@ -5597,6 +5619,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/Master/texmf-dist/source/platex/jsclasses/jslogo.dtx b/Master/texmf-dist/source/platex/jsclasses/jslogo.dtx
index e8350bdb61b..dc058e5ff41 100644
--- a/Master/texmf-dist/source/platex/jsclasses/jslogo.dtx
+++ b/Master/texmf-dist/source/platex/jsclasses/jslogo.dtx
@@ -15,7 +15,7 @@
 %  LaTeX 関連のロゴ（pLaTeX2ε新ドキュメントクラス付録）
 %
 %  Copyright 1999-2016 Haruhiko Okumura
-%  Copyright 2016-2019 Japanese TeX Development Community
+%  Copyright 2016-2022 Japanese TeX Development Community
 %
 % \fi
 %
@@ -29,7 +29,8 @@
 %</driver>
   [2019/07/25 okumura, texjporg]
 %<*driver>
-\documentclass{jsarticle}
+\RequirePackage{plautopatch}
+\documentclass[dvipdfmx]{jsarticle}
 \usepackage{doc}
 \xspcode"5C=1 %% \
 \xspcode"22=1 %% "
diff --git a/Master/texmf-dist/source/platex/jsclasses/jsverb.dtx b/Master/texmf-dist/source/platex/jsclasses/jsverb.dtx
index ed6fefde630..a62afba4357 100644
--- a/Master/texmf-dist/source/platex/jsclasses/jsverb.dtx
+++ b/Master/texmf-dist/source/platex/jsclasses/jsverb.dtx
@@ -22,7 +22,8 @@
 %<jsverb>\NeedsTeXFormat{pLaTeX2e}
 %<jsverb>\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/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx b/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx
index e2d70e47706..9f20aaf31ad 100644
--- a/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx
+++ b/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx
@@ -14,7 +14,8 @@
 %<okumacro>\NeedsTeXFormat{pLaTeX2e}
 %<okumacro>\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/Master/texmf-dist/source/platex/jsclasses/okuverb.dtx b/Master/texmf-dist/source/platex/jsclasses/okuverb.dtx
index b6cc0256ece..36942172456 100644
--- a/Master/texmf-dist/source/platex/jsclasses/okuverb.dtx
+++ b/Master/texmf-dist/source/platex/jsclasses/okuverb.dtx
@@ -20,7 +20,8 @@
 %<okuverb>\NeedsTeXFormat{pLaTeX2e}
 %<okuverb>\ProvidesFile{okuverb.sty}[2003/09/03 okumura]
 %<*driver>
-\documentclass{jsarticle}
+\RequirePackage{plautopatch}
+\documentclass[dvipdfmx]{jsarticle}
 \usepackage{doc}
 \xspcode"5C=1 %% \
 \xspcode"22=1 %% "
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
index b9bc77f27f6..5f086c368b6 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
@@ -13,7 +13,7 @@
 \fi
 \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
@@ -131,6 +131,7 @@
 \def\eqnarray{%
    \stepcounter{equation}%
    \def\@currentlabel{\p@equation\theequation}%
+   \def\@currentcounter{equation}%
    \global\@eqnswtrue
    \m@th
    \global\@eqcnt\z@
@@ -148,6 +149,7 @@
   \def\eqnarray{%
     \stepcounter{equation}%
     \def\@currentlabel{\p@equation\theequation}%
+    \def\@currentcounter{equation}%
     \global\@eqnswtrue\m@th
     \global\@eqcnt\z@
     \tabskip\mathindent
@@ -239,7 +241,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
@@ -1736,6 +1739,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/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
index ae78456e7c5..f0fb6ceeb2b 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
@@ -13,7 +13,7 @@
 \fi
 \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
@@ -133,6 +133,7 @@
 \def\eqnarray{%
    \stepcounter{equation}%
    \def\@currentlabel{\p@equation\theequation}%
+   \def\@currentcounter{equation}%
    \global\@eqnswtrue
    \m@th
    \global\@eqcnt\z@
@@ -150,6 +151,7 @@
   \def\eqnarray{%
     \stepcounter{equation}%
     \def\@currentlabel{\p@equation\theequation}%
+    \def\@currentcounter{equation}%
     \global\@eqnswtrue\m@th
     \global\@eqcnt\z@
     \tabskip\mathindent
@@ -244,7 +246,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
@@ -1826,6 +1829,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/Master/texmf-dist/tex/platex/jsclasses/jspf.cls b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
index b4294148ce7..75d5e572d40 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
@@ -13,7 +13,7 @@
 \fi
 \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
@@ -127,6 +127,7 @@
 \def\eqnarray{%
    \stepcounter{equation}%
    \def\@currentlabel{\p@equation\theequation}%
+   \def\@currentcounter{equation}%
    \global\@eqnswtrue
    \m@th
    \global\@eqcnt\z@
@@ -144,6 +145,7 @@
   \def\eqnarray{%
     \stepcounter{equation}%
     \def\@currentlabel{\p@equation\theequation}%
+    \def\@currentcounter{equation}%
     \global\@eqnswtrue\m@th
     \global\@eqcnt\z@
     \tabskip\mathindent
@@ -235,7 +237,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
@@ -1578,6 +1581,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/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls b/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls
index 529ce383ee0..4c96f3cb1d6 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls
@@ -13,7 +13,7 @@
 \fi
 \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
@@ -132,6 +132,7 @@
 \def\eqnarray{%
    \stepcounter{equation}%
    \def\@currentlabel{\p@equation\theequation}%
+   \def\@currentcounter{equation}%
    \global\@eqnswtrue
    \m@th
    \global\@eqcnt\z@
@@ -149,6 +150,7 @@
   \def\eqnarray{%
     \stepcounter{equation}%
     \def\@currentlabel{\p@equation\theequation}%
+    \def\@currentcounter{equation}%
     \global\@eqnswtrue\m@th
     \global\@eqcnt\z@
     \tabskip\mathindent
@@ -240,7 +242,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
@@ -1819,6 +1822,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/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
index a9a29792802..f9b75693e90 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
@@ -13,7 +13,7 @@
 \fi
 \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
@@ -127,6 +127,7 @@
 \def\eqnarray{%
    \stepcounter{equation}%
    \def\@currentlabel{\p@equation\theequation}%
+   \def\@currentcounter{equation}%
    \global\@eqnswtrue
    \m@th
    \global\@eqcnt\z@
@@ -144,6 +145,7 @@
   \def\eqnarray{%
     \stepcounter{equation}%
     \def\@currentlabel{\p@equation\theequation}%
+    \def\@currentcounter{equation}%
     \global\@eqnswtrue\m@th
     \global\@eqcnt\z@
     \tabskip\mathindent
@@ -235,7 +237,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
@@ -1694,6 +1697,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/Master/texmf-dist/tex/platex/jsclasses/minijs.sty b/Master/texmf-dist/tex/platex/jsclasses/minijs.sty
index 9ed7c0fff71..57c86dff4cf 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/minijs.sty
+++ b/Master/texmf-dist/tex/platex/jsclasses/minijs.sty
@@ -13,7 +13,7 @@
 \fi
 \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}