make jisfile

texjporg · Jul 1, 2021 · caec044 · caec044
1 parent ec69ce2
commit caec044
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 25 deletions.
diff --git a/jis/jsarticle.cls b/jis/jsarticle.cls
@@ -10,7 +10,7 @@
 %% 
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{jsarticle}
-  [2020/10/09 jsclasses (okumura, texjporg)]
+  [2021/06/28 jsclasses (okumura, texjporg)]
 \def\jsc@clsname{jsarticle}
 \newif\ifjsc@needsp@tch
 \jsc@needsp@tchfalse

diff --git a/jis/jsbook.cls b/jis/jsbook.cls
@@ -10,7 +10,7 @@
 %% 
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{jsbook}
-  [2020/10/09 jsclasses (okumura, texjporg)]
+  [2021/06/28 jsclasses (okumura, texjporg)]
 \def\jsc@clsname{jsbook}
 \newif\ifjsc@needsp@tch
 \jsc@needsp@tchfalse

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-2020
+%  Copyright 1993-2021
 %  The LaTeX3 Project and any individual authors listed elsewhere
 %  in this file.
 %
 %  Copyright 1995-1999 ASCII Corporation.
 %  Copyright 1999-2016 Haruhiko Okumura
-%  Copyright 2016-2020 Japanese TeX Development Community
+%  Copyright 2016-2021 Japanese TeX Development Community
 %
 % \fi
 %
@@ -27,7 +27,7 @@
 %<*driver>
 \ProvidesFile{jsclasses.dtx}
 %</driver>
-  [2020/10/09 jsclasses (okumura, texjporg)]
+  [2021/06/28 jsclasses (okumura, texjporg)]
 %<*driver>
 \documentclass{jsarticle}
 \usepackage{doc}
@@ -1083,7 +1083,7 @@
 %</class>
 %<*minijs>
 %% min/goth -> jis/jisg (for pLaTeX only)
-\ifx\ucs\@undefined
+\ifnum\jis"2121="3000 \else
 \@for\@tempa:=5,6,7,8,9,10,10.95,12,14.4,17.28,20.74,24.88\do{%
   \expandafter\let\csname JY1/mc/m/n/\@tempa\endcsname\relax
   \expandafter\let\csname JY1/gt/m/n/\@tempa\endcsname\relax

diff --git a/jis/jspf.cls b/jis/jspf.cls
@@ -10,7 +10,7 @@
 %% 
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{jspf}
-  [2020/10/09 jsclasses (okumura, texjporg)]
+  [2021/06/28 jsclasses (okumura, texjporg)]
 \def\jsc@clsname{jspf}
 \newif\ifjsc@needsp@tch
 \jsc@needsp@tchfalse

diff --git a/jis/jsreport.cls b/jis/jsreport.cls
@@ -10,7 +10,7 @@
 %% 
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{jsreport}
-  [2020/10/09 jsclasses (okumura, texjporg)]
+  [2021/06/28 jsclasses (okumura, texjporg)]
 \def\jsc@clsname{jsreport}
 \newif\ifjsc@needsp@tch
 \jsc@needsp@tchfalse

diff --git a/jis/kiyou.cls b/jis/kiyou.cls
@@ -10,7 +10,7 @@
 %% 
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{kiyou}
-  [2020/10/09 jsclasses (okumura, texjporg)]
+  [2021/06/28 jsclasses (okumura, texjporg)]
 \def\jsc@clsname{kiyou}
 \newif\ifjsc@needsp@tch
 \jsc@needsp@tchfalse

diff --git a/jis/minijs.sty b/jis/minijs.sty
@@ -10,7 +10,7 @@
 %% 
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesPackage{minijs}
-  [2020/10/09 jsclasses (okumura, texjporg)]
+  [2021/06/28 jsclasses (okumura, texjporg)]
 %% if jsclasses loaded, abort loading this package
 \ifx\@jsc@uplatextrue\@undefined\else
   \PackageInfo{minijs}{jsclasses does not need minijs, exiting}
@@ -21,7 +21,7 @@
 \newif\ifjsc@needsp@tch
 \jsc@needsp@tchfalse
 %% min/goth -> jis/jisg (for pLaTeX only)
-\ifx\ucs\@undefined
+\ifnum\jis"2121="3000 \else
 \@for\@tempa:=5,6,7,8,9,10,10.95,12,14.4,17.28,20.74,24.88\do{%
   \expandafter\let\csname JY1/mc/m/n/\@tempa\endcsname\relax
   \expandafter\let\csname JY1/gt/m/n/\@tempa\endcsname\relax

diff --git a/jis/okumacro.dtx b/jis/okumacro.dtx
@@ -7,7 +7,7 @@
 %   http://oku.edu.mie-u.ac.jp/~okumura/
 %
 %<okumacro>\NeedsTeXFormat{pLaTeX2e}
-%<okumacro>\ProvidesPackage{okumacro}[2019/07/25 okumura, texjporg]
+%<okumacro>\ProvidesPackage{okumacro}[2021/07/01 okumura, texjporg]
 %<*driver>
 \documentclass{jsarticle}
 \usepackage{doc}
@@ -394,7 +394,7 @@
 % [2016-12-04] \pLaTeX $B$GDL$k%3!<%I$,(B \upLaTeX $B$GDL$i$J$/$J$k$3$H$rKI$0$?$a$K!$(Bu\pLaTeX $B$N>l9g$K$O(BU+FF0D$B!$(BU+2014$B$GDj5A$7$?$b$N$bJLESMQ0U$7$^$7$?!#(B
 %
 %    \begin{macrocode}
-\ifx\ucs\@undefined\else
+\ifnum\jis"2121="3000 % upTeX check
   \begingroup
     \kansujichar1="FF0D
     \kansujichar2="2014
@@ -1156,12 +1156,19 @@
 % $B$H$j$"$($:(B |amsmath| $B$N(B |equation(*)|$B!$(B|align(*)| $B4D6-$NN`$@$1$3$3$GD>$7$F$*$-$^$9!#(B
 % $B$3$N$"$?$j$O$^$?8+D>$7$^$9!#(B
 %
+% [2021-07-01] |okumacro| $B$,M-$k$H(B |xalignat| $B>eIt$N%"%-$,Bg$-$/$J$k8=>](B
+% (forum:3029)$B$,Js9p$5$l$^$7$?!#(B|js*| $B%/%i%9$N$?$a$N=$@5$@$C$?$O$:$G$9$,!$(B
+% |js*| $B%/%i%9$r;H$C$?>l9g$G$b!V=$@5$7$J$$J}$,%P%i%s%9$,NI$$!W$H$$$&5sF0(B
+% ^^A $B>/$J$/$H$b(B\TeX\ Live 2014--2021$B$OF1$85sF0!#(B
+% ^^A https://oku.edu.mie-u.ac.jp/tex/mod/forum/discuss.php?d=3029
+% $B$@$C$?$?$a!$:o=|$7$^$7$?!#(B
+%
 %    \begin{macrocode}
-\@ifundefined{widebaselines}{}{%
-  \let\endmathdisplaysave=\endmathdisplay
-  \def\endmathdisplay{\widebaselines\endmathdisplaysave}}
-  \let\start@alignsave=\start@align
-  \def\start@align{\vspace{4pt}\start@alignsave}
+%\@ifundefined{widebaselines}{}{%
+%  \let\endmathdisplaysave=\endmathdisplay
+%  \def\endmathdisplay{\widebaselines\endmathdisplaysave}}
+%  \let\start@alignsave=\start@align
+%  \def\start@align{\vspace{4pt}\start@alignsave}
 %    \end{macrocode}
 %
 % $B0J>e$G=*$o$j$G$9!#(B

diff --git a/jis/okumacro.sty b/jis/okumacro.sty
@@ -9,7 +9,7 @@
 %% Maintained on GitHub: https://github.com/texjporg/jsclasses
 %% 
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{okumacro}[2019/07/25 okumura, texjporg]
+\ProvidesPackage{okumacro}[2021/07/01 okumura, texjporg]
 \providecommand{\rubyfamily}{}
 \def\kanjistrut{\iftdir
   \vrule \@height0.5zw \@depth0.5zw \@width\z@
@@ -122,7 +122,7 @@
     \rule[0.8ex]{0.15ex}{0.7ex}}}
 \def\$B!]!](B{$B!=(B\kern-.5zw$B!=(B\kern-.5zw$B!=(B}
 \def\$B!=!=(B{$B!=(B\kern-.5zw$B!=(B\kern-.5zw$B!=(B}
-\ifx\ucs\@undefined\else
+\ifnum\jis"2121="3000 % upTeX check
   \begingroup
     \kansujichar1="FF0D
     \kansujichar2="2014
@@ -432,11 +432,6 @@
 \newcommand{\ANGLE}[1]{%
   $\langle$\kern0pt\nobreak{#1}\kern0pt\nobreak$\rangle$}
 \newcommand{\$B3t(B}{\hspace{\kanjiskip}\<$B!J3t!K(B\<\hspace{\kanjiskip}}
-\@ifundefined{widebaselines}{}{%
-  \let\endmathdisplaysave=\endmathdisplay
-  \def\endmathdisplay{\widebaselines\endmathdisplaysave}}
-  \let\start@alignsave=\start@align
-  \def\start@align{\vspace{4pt}\start@alignsave}
 \endinput
 %%
 %% End of file `okumacro.sty'.