make jisfile

texjporg · Sep 14, 2022 · a221e8a · a221e8a
1 parent 0574141
commit a221e8a
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 21 deletions.
diff --git 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
@@ -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
@@ -4,13 +4,13 @@
 %  pLaTeX2$B&E?7%I%-%e%a%s%H%/%i%9!JF|K\8l(B TeX $B3+H/%3%_%e%K%F%#HG!K(B
 %  $B86:n<T!'1|B<@2I'(B <[email protected]>
 %
-%  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}
 %</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 %% "
@@ -476,10 +477,14 @@
 %    $B$h$&$G$9$N$G!$>/$7>.$5$/$7$^$9!#(B
 %    $B$^$?!$Cf1{$NMWAG$b(B |\displaystyle| $B$K$7$^$9!#(B
 %
+% [2022-09-13] \LaTeXe~2021-11-15 (ltmath.dtx 2021/10/14 v1.2j)$B$G(B
+% |\@currentcounter|$B$,DI2C$5$l$^$7$?$N$G!$DI?o$7$^$9!#(B
+%
 %    \begin{macrocode}
 \def\eqnarray{%
    \stepcounter{equation}%
    \def\@currentlabel{\p@equation\theequation}%
+   \def\@currentcounter{equation}%
    \global\@eqnswtrue
    \m@th
    \global\@eqcnt\z@
@@ -499,13 +504,17 @@
 % \texttt{fleqn} $B$G?t<0$,K\J8:8C<$+$i0lDj5wN%$N$H$3$m$K=PNO$5$l$^$9!#(B
 % $B?9K\$5$s$K$7$?$,$C$FD{@5$7$^$7$?!#(B
 %
+% [2022-09-13] \LaTeXe~2021-11-15 (ltmath.dtx 2021/10/14 v1.2j)$B$G(B
+% |\@currentcounter|$B$,DI2C$5$l$^$7$?$N$G!$DI?o$7$^$9!#(B
+%
 %    \begin{macrocode}
 \DeclareOption{leqno}{\input{leqno.clo}}
 \DeclareOption{fleqn}{\input{fleqn.clo}%
 % fleqn$BMQ$N(Beqnarray$B4D6-$N:FDj5A(B
   \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 @@
 % $BH/9T$9$k(B |\special| $B$NCf?H$rE83+$7$F$*$/$h$&$K$7$^$7$?!#(B
 % $B$3$&$7$J$$$H!$MQ;f%5%$%:@_Dj$r4V0c$C$F$7$^$$$^$9(B(Issue \#72)$B!#(B
 %
+% [2022-09-12] $B<!4|(B\LaTeXe $B%+!<%M%k$K(B|\stockwidth|$B!$(B|\stockheight|$B$,(B
+% $BDI2C$5$l$k$h$&$G$9$N$G!$(B
+% $B%/%i%9%U%!%$%kB&$G$OL$Dj5A$N$H$-$N$_$3$l$i$ND9$5JQ?t$rDj5A$7$^$9!#(B
+% h20y6m$B$5$s!$$"$j$,$H$&$4$6$$$^$9!#(B
+%
 %    \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|$B$J$I$$$/$D$+$NFbItL?Na$r(B |\jsc@...| $BIU$-$N(B
 % $B%f%K!<%/$JL>A0$K$7$^$7$?!#(B
+%
+% [2022-09-13] \LaTeXe~2021-11-15 (ltfloat.dtx 2021/10/14 v1.2g)$B$G(B
+% |\@currentcounter|$B$,DI2C$5$l$^$7$?$N$G!$DI?o$7$^$9!#(B
+% $B$J$*!$(B\LaTeXe~2021-06-01 (ltfloat.dtx 2021/02/10 v1.2e)$B$G(B
+% parhook$BBP1~$H$7$F(B\cs{par}$B$,DI2C$5$l$F$$$^$9$,!$(B
+% $B<B$OF1;~$K(B\cs{color@endgroup}$B$b(B\cs{endgraf}$B$9$k$h$&$KJQ99(B
+% $B$5$l$F$$$^$9$N$G!$ITMW$@$H;W$$$^$9!#$H$$$&$o$1$GDI2C$7$^$;$s!#(B
 %    \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
@@ -4,7 +4,7 @@
 %  LaTeX $B4XO"$N%m%4!J(BpLaTeX2$B&E?7%I%-%e%a%s%H%/%i%9IUO?!K(B
 %
 %  Copyright 1999-2016 Haruhiko Okumura
-%  Copyright 2016-2019 Japanese TeX Development Community
+%  Copyright 2016-2022 Japanese TeX Development Community
 %
 % \fi
 %
@@ -18,7 +18,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/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
@@ -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
@@ -11,7 +11,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/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
@@ -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
@@ -9,7 +9,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/jis/okuverb.dtx b/jis/okuverb.dtx
@@ -9,7 +9,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 %% "