review 4.0.0 → 4.1.0

data/vendor/jsclasses/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 <okumura@okumuralab.org>
 %
-%  Copyright 1993-2016
+%  Copyright 1993-2019
 %  The LaTeX3 Project and any individual authors listed elsewhere
 %  in this file.
 %
 %  Copyright 1995-1999 ASCII Corporation.
 %  Copyright 1999-2016 Haruhiko Okumura
-%  Copyright 2016-2018 Japanese TeX Development Community
+%  Copyright 2016-2020 Japanese TeX Development Community
 %
 % \fi
 %
@@ -26,7 +26,7 @@
 %<*driver>
 \ProvidesFile{jsclasses.dtx}
 %</driver>
-  [2018/06/23 jsclasses (okumura, texjporg)]
+  [2020/02/02 jsclasses (okumura, texjporg)]
 %<*driver>
 \documentclass{jsarticle}
 \usepackage{doc}
@@ -879,7 +879,7 @@
   \fi
   \ifnum\@ptsize=-1
     \def\n@baseline{15}%
-  \fi  
+  \fi
 \fi
 %<*kiyou>
 \def\jsc@magscale{0.9769230}
@@ -888,7 +888,7 @@
   \def\inv@mag{1.02354}
   \jsc@mpt=1\p@
   \jsc@mmm=1mm
-\else 
+\else
   \jsc@mpt=\jsc@magscale\p@
   \jsc@mmm=\jsc@magscale mm
   \def\inv@mag{1}
@@ -1155,6 +1155,18 @@
 \DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
 \DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
 \DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+%    \end{macrocode}
+%
+% [2020-02-02] \LaTeXe~2020-02-02$B$G(BNFSS$B$,3HD%$5$l!$(B
+% $B$=$l$KH<$$%*%j%8%J%k$N(B |\rmfamily| $B$J$I$NDj5A$,JQ2=$7$^$7$?!#(B
+% |\DeclareRobustCommand| $B$GD>@\Dj5A$9$k$H!$$3$l$r>e=q$-$7$F(B
+% NFSS$B$N3HD%ItJ,$r2u$7$F$7$^$$$^$9$N$G!$(B
+% $B?7$?$KDs6!$5$l$?%U%C%/$K%3!<%I$rA^F~$7$^$9!#(B
+% $B=>Mh$N%3!<%I$b(B\LaTeXe~2019-10-01$B0JA0$N$?$a$K;D$7$F$"$j$^$9$,!$(B
+% \texttt{mweights}$B%Q%C%1!<%8BP:v$b;\$7$^$7$?(B(forum:2763)$B!#(B
+%
+%    \begin{macrocode}
+\ifx\@rmfamilyhook\@undefined  % old
 \DeclareRobustCommand\rmfamily
         {\not@math@alphabet\rmfamily\mathrm
          \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -1164,6 +1176,25 @@
 \DeclareRobustCommand\ttfamily
         {\not@math@alphabet\ttfamily\mathtt
          \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+\AtBeginDocument{%
+  \ifx\mweights@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@addto@macro\csname rmfamily \endcsname
+      {\kanjifamily\mcdefault\selectfont}%
+    \expandafter\g@addto@macro\csname sffamily \endcsname
+      {\kanjifamily\gtdefault\selectfont}%
+    \expandafter\g@addto@macro\csname ttfamily \endcsname
+      {\kanjifamily\gtdefault\selectfont}%
+  \fi}
+\else                          % 2020-02-02
+\g@addto@macro\@rmfamilyhook
+  {\prepare@family@series@update@kanji{mc}\mcdefault}
+\g@addto@macro\@sffamilyhook
+  {\prepare@family@series@update@kanji{gt}\gtdefault}
+\g@addto@macro\@ttfamilyhook
+  {\prepare@family@series@update@kanji{gt}\gtdefault}
+\fi
 %    \end{macrocode}
 %
 % \begin{macro}{\textmc}
@@ -1335,10 +1366,10 @@
 \xspcode`+=3
 \xspcode`\%=3
 %    \end{macrocode}
-% 
+%
 % $B$3$l0J30$K(BT1$B%(%s%3!<%G%#%s%0$G(B80$B!A(Bff$B$NJ8;z$b$9$Y$F2$J8J8;z$G$9$N$G!$(B
 % $BN>B&$NOBJ8J8;z$H$N4V$K%9%Z!<%9$,F~$i$J$1$l$P$J$j$^$;$s!#(B
-% 
+%
 %    \begin{macrocode}
 \xspcode`^^80=3
 \xspcode`^^81=3
@@ -4032,7 +4063,7 @@
 %
 %    \begin{macrocode}
 \newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\inhibitglue$B!J(B\theenumii$B!K(B\inhibitglue}
+\newcommand{\labelenumii}{\inhibitglue $B!J(B\theenumii $B!K(B\inhibitglue}
 \newcommand{\labelenumiii}{\theenumiii.}
 \newcommand{\labelenumiv}{\theenumiv.}
 %    \end{macrocode}
@@ -4051,7 +4082,7 @@
 %
 %    \begin{macrocode}
 \renewcommand{\p@enumii}{\theenumi}
-\renewcommand{\p@enumiii}{\theenumi\inhibitglue$B!J(B\theenumii$B!K(B}
+\renewcommand{\p@enumiii}{\theenumi\inhibitglue $B!J(B\theenumii $B!K(B}
 \renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
 %    \end{macrocode}
 % \end{macro}
@@ -4451,7 +4482,7 @@
 %    $B?t<0HV9f$N7A<0$G$9!#(B
 %    $B%G%U%)%k%H$NCM$r%3%a%s%H%"%&%H$7$F<($7$F$*$-$^$9!#(B
 %
-%    |\inhibitglue$B!J(B\theequation$B!K(B\inhibitglue| $B$N$h$&$KOBJ8$+$C$3(B
+%    |\inhibitglue $B!J(B\theequation $B!K(B\inhibitglue| $B$N$h$&$KOBJ8$+$C$3(B
 %    $B$r;H$&$3$H$b2DG=$G$9!#(B
 %
 %    \begin{macrocode}
@@ -4462,7 +4493,7 @@
 %    |amsmath| $B%Q%C%1!<%8$r;H$&>l9g$O(B |\tagform@| $B$r<!$N$h$&$K=$@5$7$^$9!#(B
 %
 %    \begin{macrocode}
-% \def\tagform@#1{\maketag@@@{$B!J(B\ignorespaces#1\unskip\@@italiccorr$B!K(B}}
+% \def\tagform@#1{\maketag@@@{$B!J(B\ignorespaces#1\unskip\@@italiccorr $B!K(B}}
 %    \end{macrocode}
 %
 % \subsection{$B%U%m!<%H(B}
@@ -4636,6 +4667,10 @@
 %
 % [2003-11-05] $B%m%8%C%/$r>/$7JQ$($F$_$^$7$?!#(B
 %
+% [2018-12-11] $BCY$/$J$j$^$7$?$,!$(B|listings| $B%Q%C%1!<%8$r;H$&$H$-$K(B
+% |title| $B$r;XDj$9$k$H(B ``1zw'' $B$,=PNO$5$l$F$7$^$&(B
+% $BLdBj(B (forum:1543$B!$(BIssue \#71) $B$KBP=h$7$^$7$?!#(B
+%
 %    \begin{macrocode}
 %<*!jspf>
 % \long\def\@makecaption#1#2{{\small
@@ -4656,7 +4691,7 @@
   \vskip\abovecaptionskip
   \sbox\@tempboxa{#1\hskip1zw\relax #2}%
   \ifdim \wd\@tempboxa <\hsize \centering \fi
-  #1\hskip1zw\relax #2\par
+  #1{\hskip1zw\relax}#2\par
   \vskip\belowcaptionskip}}
 %</!jspf>
 %<*jspf>
@@ -5211,7 +5246,7 @@
 % $B$H$j$"$($:%3%a%s%H%"%&%H$7$F$*$-$^$9$N$G!$I,MW$K1~$8$F@8$+$7$F$/$@$5$$!#(B
 %
 %    \begin{macrocode}
-% \def\@biblabel#1{\inhibitglue$B!N(B#1$B!O(B\inhibitglue}
+% \def\@biblabel#1{\inhibitglue $B!N(B#1$B!O(B\inhibitglue}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -5238,7 +5273,7 @@
 %        \@latex@warning
 %          {Citation `\@citeb' on page \thepage \space undefined}}%
 %        {\@cite@ofmt{\csname b@\@citeb\endcsname}}}}{#1}}
-% \def\@cite#1#2{\inhibitglue$B!N(B{#1\if@tempswa $B!$(B#2\fi}$B!O(B\inhibitglue}
+% \def\@cite#1#2{\inhibitglue $B!N(B{#1\if@tempswa $B!$(B#2\fi}$B!O(B\inhibitglue}
 %    \end{macrocode}
 %
 % $B0zMQHV9f$r>e%D%-$N(B 1$B!K$N$h$&$J%9%?%$%k$K$9$k$K$O<!$N$h$&$K$7$^$9!#(B
@@ -5857,8 +5892,13 @@
 % \paragraph{$B:#F|$NF|IU(B}
 %
 % \LaTeX $B$G=hM}$7$?F|IU$r=PNO$7$^$9!#(B
-% |jarticle| $B$J$I$H0c$C$F!$I8=`$r@>Nq$K$7!$M>J,$J6uGr$,F~$i$J$$$h$&$K2~NI$7$^$7$?!#(B
+% ^^A |jarticle| $B$J$I$H0c$C$F!$I8=`$r@>Nq$K$7!$(B
+% ^^A $BM>J,$J6uGr$,F~$i$J$$$h$&$K2~NI$7$^$7$?!#(B
+% ^^A -- 2018$BG/(B7$B7n0J9_$O(B |jarticle| $B$J$I$bI8=`$,@>Nq!$(B
+% ^^A -- 2019$BG/(B4$B7n0J9_$OM>J,$J6uGr$,F~$i$J$/$J$C$F$$$^$9!#(B
 % $BOBNq$K$9$k$K$O(B |\$BOBNq(B| $B$H=q$$$F$/$@$5$$!#(B
+% $B$A$J$_$K$3$NJ8>O$N:n@.F|$O@>Nq$G$O(B{\$B@>Nq(B\today}$B$G!$(B
+% $BOBNq$G$O(B{\$BOBNq(B\today}$B$G$9!#(B
 %
 % \begin{macro}{\today}
 %    \begin{macrocode}
@@ -5866,23 +5906,42 @@
 \def\$B@>Nq(B{\$B@>Nq(Btrue}
 \def\$BOBNq(B{\$B@>Nq(Bfalse}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
+\def\pltx@today@year@#1{%
+  \ifnum\numexpr\year-#1=1 $B85(B\else
+    \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+      \kansuji\numexpr\year-#1\relax
+    \else
+      \number\numexpr\year-#1\relax\nobreak
+    \fi
+  \fi $BG/(B
+}
+\def\pltx@today@year{%
+  \ifnum\numexpr\year*10000+\month*100+\day<19890108
+    $B><OB(B\pltx@today@year@{1925}%
+  \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+    $BJ?@.(B\pltx@today@year@{1988}%
+  \else
+    $BNaOB(B\pltx@today@year@{2018}%
+  \fi\fi}
 \def\today{%
   \if@english
     \ifcase\month\or
       January\or February\or March\or April\or May\or June\or
       July\or August\or September\or October\or November\or December\fi
       \space\number\day, \number\year
+  \else\if$B@>Nq(B
+    \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
+    \else\number\year\nobreak\fi $BG/(B
   \else
-    \if$B@>Nq(B
-      \number\year $BG/(B
-      \number\month $B7n(B
-      \number\day $BF|(B
-    \else
-      $BJ?@.(B\number\heisei $BG/(B
-      \number\month $B7n(B
-      \number\day $BF|(B
-    \fi
-  \fi}
+    \pltx@today@year
+  \fi
+  \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+    \kansuji\month $B7n(B
+    \kansuji\day $BF|(B
+  \else
+    \number\month\nobreak $B7n(B
+    \number\day\nobreak $BF|(B
+  \fi\fi}
 %    \end{macrocode}
 % \end{macro}
 %

data/vendor/jsclasses/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-2017 Japanese TeX Development Community
+%  Copyright 2016-2019 Japanese TeX Development Community
 %
 % \fi
 %
@@ -16,7 +16,7 @@
 %<*driver>
 \ProvidesFile{jslogo.dtx}
 %</driver>
-  [2017/02/24 okumura, texjporg]
+  [2019/07/25 okumura, texjporg]
 %<*driver>
 \documentclass{jsarticle}
 \usepackage{doc}
@@ -368,8 +368,8 @@
 %    {\def\BibTeX{{\rmfamily B\kern-.05em%
 %     \textsc{i\kern-.025em b}\kern-.08em%
 %     T\kern-.1667em\lower.7ex\hbox{E}\kern-.125emX}}}{}
-\DeclareRobustCommand{\BibTeX}{B\kern-.05em\jslg@small{I\kern-.025em B}%
-  \ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX}
+\DeclareRobustCommand{\BibTeX}{%
+  B\kern-.05em\jslg@small{I\kern-.025em B}\kern-.15em\TeX}
 \DeclareRobustCommand{\SliTeX}{%
   S\kern-.06emL\kern-.18em\jslg@uppersmall{I}\kern -.03em\TeX}
 %    \end{macrocode}

data/vendor/jsclasses/jis/jslogo.sty

@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{jslogo}
-  [2017/02/24 okumura, texjporg]
+  [2019/07/25 okumura, texjporg]
 \def\jslg@small#1{\hbox{$\m@th$%
   \csname S@\f@size\endcsname
   \fontsize\sf@size\z@
@@ -207,8 +207,8 @@
 \def\upLaTeX{u\pLaTeX}
 \def\upLaTeXe{u\pLaTeXe}
 \def\AmSTeX{\protect\AmS-\protect\TeX{}}
-\DeclareRobustCommand{\BibTeX}{B\kern-.05em\jslg@small{I\kern-.025em B}%
-  \ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX}
+\DeclareRobustCommand{\BibTeX}{%
+  B\kern-.05em\jslg@small{I\kern-.025em B}\kern-.15em\TeX}
 \DeclareRobustCommand{\SliTeX}{%
   S\kern-.06emL\kern-.18em\jslg@uppersmall{I}\kern -.03em\TeX}
 \providecommand*\pdfstringdefPreHook{}

data/vendor/jsclasses/jis/jspf.cls

@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{jspf}
-  [2018/06/23 jsclasses (okumura, texjporg)]
+  [2020/02/02 jsclasses (okumura, texjporg)]
 \def\jsc@clsname{jspf}
 \newif\ifjsc@needsp@tch
 \jsc@needsp@tchfalse
@@ -456,6 +456,7 @@
 \DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
 \DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
 \DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\ifx\@rmfamilyhook\@undefined  % old
 \DeclareRobustCommand\rmfamily
         {\not@math@alphabet\rmfamily\mathrm
          \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -465,6 +466,25 @@
 \DeclareRobustCommand\ttfamily
         {\not@math@alphabet\ttfamily\mathtt
          \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+\AtBeginDocument{%
+  \ifx\mweights@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@addto@macro\csname rmfamily \endcsname
+      {\kanjifamily\mcdefault\selectfont}%
+    \expandafter\g@addto@macro\csname sffamily \endcsname
+      {\kanjifamily\gtdefault\selectfont}%
+    \expandafter\g@addto@macro\csname ttfamily \endcsname
+      {\kanjifamily\gtdefault\selectfont}%
+  \fi}
+\else                          % 2020-02-02
+\g@addto@macro\@rmfamilyhook
+  {\prepare@family@series@update@kanji{mc}\mcdefault}
+\g@addto@macro\@sffamilyhook
+  {\prepare@family@series@update@kanji{gt}\gtdefault}
+\g@addto@macro\@ttfamilyhook
+  {\prepare@family@series@update@kanji{gt}\gtdefault}
+\fi
 \ifx\DeclareFixJFMCJKTextFontCommand\@undefined
 \DeclareRobustCommand\textmc[1]{%
     \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
@@ -1243,11 +1263,11 @@
 \renewcommand{\theenumiii}{\@roman\c@enumiii}
 \renewcommand{\theenumiv}{\@Alph\c@enumiv}
 \newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\inhibitglue$B!J(B\theenumii$B!K(B\inhibitglue}
+\newcommand{\labelenumii}{\inhibitglue $B!J(B\theenumii $B!K(B\inhibitglue}
 \newcommand{\labelenumiii}{\theenumiii.}
 \newcommand{\labelenumiv}{\theenumiv.}
 \renewcommand{\p@enumii}{\theenumi}
-\renewcommand{\p@enumiii}{\theenumi\inhibitglue$B!J(B\theenumii$B!K(B}
+\renewcommand{\p@enumiii}{\theenumi\inhibitglue $B!J(B\theenumii $B!K(B}
 \renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
 \newcommand\labelitemi{\textbullet}
 \newcommand\labelitemii{\normalfont\bfseries \textendash}
@@ -1727,23 +1747,42 @@
 \def\$B@>Nq(B{\$B@>Nq(Btrue}
 \def\$BOBNq(B{\$B@>Nq(Bfalse}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
+\def\pltx@today@year@#1{%
+  \ifnum\numexpr\year-#1=1 $B85(B\else
+    \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+      \kansuji\numexpr\year-#1\relax
+    \else
+      \number\numexpr\year-#1\relax\nobreak
+    \fi
+  \fi $BG/(B
+}
+\def\pltx@today@year{%
+  \ifnum\numexpr\year*10000+\month*100+\day<19890108
+    $B><OB(B\pltx@today@year@{1925}%
+  \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+    $BJ?@.(B\pltx@today@year@{1988}%
+  \else
+    $BNaOB(B\pltx@today@year@{2018}%
+  \fi\fi}
 \def\today{%
   \if@english
     \ifcase\month\or
       January\or February\or March\or April\or May\or June\or
       July\or August\or September\or October\or November\or December\fi
       \space\number\day, \number\year
+  \else\if$B@>Nq(B
+    \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
+    \else\number\year\nobreak\fi $BG/(B
   \else
-    \if$B@>Nq(B
-      \number\year $BG/(B
-      \number\month $B7n(B
-      \number\day $BF|(B
-    \else
-      $BJ?@.(B\number\heisei $BG/(B
-      \number\month $B7n(B
-      \number\day $BF|(B
-    \fi
-  \fi}
+    \pltx@today@year
+  \fi
+  \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+    \kansuji\month $B7n(B
+    \kansuji\day $BF|(B
+  \else
+    \number\month\nobreak $B7n(B
+    \number\day\nobreak $BF|(B
+  \fi\fi}
 \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
 \pagestyle{headings}
 \pagenumbering{arabic}

data/vendor/jsclasses/jis/jsreport.cls

@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{jsreport}
-  [2018/06/23 jsclasses (okumura, texjporg)]
+  [2020/02/02 jsclasses (okumura, texjporg)]
 \def\jsc@clsname{jsreport}
 \newif\ifjsc@needsp@tch
 \jsc@needsp@tchfalse
@@ -461,6 +461,7 @@
 \DeclareFontShape{\jsc@JTn}{gt}{m}{sl}{<->ssub*gt/m/n}{}
 \DeclareFontShape{\jsc@JTn}{mc}{bx}{it}{<->ssub*gt/m/n}{}
 \DeclareFontShape{\jsc@JTn}{mc}{bx}{sl}{<->ssub*gt/m/n}{}
+\ifx\@rmfamilyhook\@undefined  % old
 \DeclareRobustCommand\rmfamily
         {\not@math@alphabet\rmfamily\mathrm
          \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -470,6 +471,25 @@
 \DeclareRobustCommand\ttfamily
         {\not@math@alphabet\ttfamily\mathtt
          \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+\AtBeginDocument{%
+  \ifx\mweights@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@addto@macro\csname rmfamily \endcsname
+      {\kanjifamily\mcdefault\selectfont}%
+    \expandafter\g@addto@macro\csname sffamily \endcsname
+      {\kanjifamily\gtdefault\selectfont}%
+    \expandafter\g@addto@macro\csname ttfamily \endcsname
+      {\kanjifamily\gtdefault\selectfont}%
+  \fi}
+\else                          % 2020-02-02
+\g@addto@macro\@rmfamilyhook
+  {\prepare@family@series@update@kanji{mc}\mcdefault}
+\g@addto@macro\@sffamilyhook
+  {\prepare@family@series@update@kanji{gt}\gtdefault}
+\g@addto@macro\@ttfamilyhook
+  {\prepare@family@series@update@kanji{gt}\gtdefault}
+\fi
 \ifx\DeclareFixJFMCJKTextFontCommand\@undefined
 \DeclareRobustCommand\textmc[1]{%
     \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
@@ -1429,11 +1449,11 @@
 \renewcommand{\theenumiii}{\@roman\c@enumiii}
 \renewcommand{\theenumiv}{\@Alph\c@enumiv}
 \newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\inhibitglue$B!J(B\theenumii$B!K(B\inhibitglue}
+\newcommand{\labelenumii}{\inhibitglue $B!J(B\theenumii $B!K(B\inhibitglue}
 \newcommand{\labelenumiii}{\theenumiii.}
 \newcommand{\labelenumiv}{\theenumiv.}
 \renewcommand{\p@enumii}{\theenumi}
-\renewcommand{\p@enumiii}{\theenumi\inhibitglue$B!J(B\theenumii$B!K(B}
+\renewcommand{\p@enumiii}{\theenumi\inhibitglue $B!J(B\theenumii $B!K(B}
 \renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
 \newcommand\labelitemi{\textbullet}
 \newcommand\labelitemii{\normalfont\bfseries \textendash}
@@ -1581,7 +1601,7 @@
   \vskip\abovecaptionskip
   \sbox\@tempboxa{#1\hskip1zw\relax #2}%
   \ifdim \wd\@tempboxa <\hsize \centering \fi
-  #1\hskip1zw\relax #2\par
+  #1{\hskip1zw\relax}#2\par
   \vskip\belowcaptionskip}}
 \DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc}
 \DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt}
@@ -1970,23 +1990,42 @@
 \def\$B@>Nq(B{\$B@>Nq(Btrue}
 \def\$BOBNq(B{\$B@>Nq(Bfalse}
 \newcount\heisei \heisei\year \advance\heisei-1988\relax
+\def\pltx@today@year@#1{%
+  \ifnum\numexpr\year-#1=1 $B85(B\else
+    \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+      \kansuji\numexpr\year-#1\relax
+    \else
+      \number\numexpr\year-#1\relax\nobreak
+    \fi
+  \fi $BG/(B
+}
+\def\pltx@today@year{%
+  \ifnum\numexpr\year*10000+\month*100+\day<19890108
+    $B><OB(B\pltx@today@year@{1925}%
+  \else\ifnum\numexpr\year*10000+\month*100+\day<20190501
+    $BJ?@.(B\pltx@today@year@{1988}%
+  \else
+    $BNaOB(B\pltx@today@year@{2018}%
+  \fi\fi}
 \def\today{%
   \if@english
     \ifcase\month\or
       January\or February\or March\or April\or May\or June\or
       July\or August\or September\or October\or November\or December\fi
       \space\number\day, \number\year
+  \else\if$B@>Nq(B
+    \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi \kansuji\year
+    \else\number\year\nobreak\fi $BG/(B
   \else
-    \if$B@>Nq(B
-      \number\year $BG/(B
-      \number\month $B7n(B
-      \number\day $BF|(B
-    \else
-      $BJ?@.(B\number\heisei $BG/(B
-      \number\month $B7n(B
-      \number\day $BF|(B
-    \fi
-  \fi}
+    \pltx@today@year
+  \fi
+  \ifnum1=\iftdir\ifmdir0\else1\fi\else0\fi
+    \kansuji\month $B7n(B
+    \kansuji\day $BF|(B
+  \else
+    \number\month\nobreak $B7n(B
+    \number\day\nobreak $BF|(B
+  \fi\fi}
 \hyphenation{ado-be post-script ghost-script phe-nom-e-no-log-i-cal man-u-script}
 \pagestyle{plain}
 \pagenumbering{arabic}