jsclasses (25jul19)

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

14 files changed, 38 insertions, 40 deletions

diff --git a/Master/texmf-dist/doc/platex/jsclasses/README.md b/Master/texmf-dist/doc/platex/jsclasses/README.md
index ff4f40d3d54..eac466dcc80 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
 
-2019-04-06
+2019-07-25
 
 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 5bed9e0fa31..ba219922b09 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 907b1485ae4..edb8926c78a 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/okumacro.pdf b/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf
index 126a102aa48..1f7e21ce5c4 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/source/platex/jsclasses/jsclasses.dtx b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
index 2ddf1d1dbe9..b8e6cba0600 100644
--- a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
+++ b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
@@ -9,7 +9,7 @@
 %  pLaTeX2ε新ドキュメントクラス（日本語 TeX 開発コミュニティ版）
 %  原作者：奥村晴彦 <okumura@okumuralab.org>
 %
-%  Copyright 1993-2016
+%  Copyright 1993-2019
 %  The LaTeX3 Project and any individual authors listed elsewhere
 %  in this file.
 %
@@ -31,7 +31,7 @@
 %<*driver>
 \ProvidesFile{jsclasses.dtx}
 %</driver>
-  [2019/04/06 jsclasses (okumura, texjporg)]
+  [2019/07/25 jsclasses (okumura, texjporg)]
 %<*driver>
 \documentclass{jsarticle}
 \usepackage{doc}
@@ -4037,7 +4037,7 @@
 %
 %    \begin{macrocode}
 \newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\inhibitglue（\theenumii）\inhibitglue}
+\newcommand{\labelenumii}{\inhibitglue （\theenumii ）\inhibitglue}
 \newcommand{\labelenumiii}{\theenumiii.}
 \newcommand{\labelenumiv}{\theenumiv.}
 %    \end{macrocode}
@@ -4056,7 +4056,7 @@
 %
 %    \begin{macrocode}
 \renewcommand{\p@enumii}{\theenumi}
-\renewcommand{\p@enumiii}{\theenumi\inhibitglue（\theenumii）}
+\renewcommand{\p@enumiii}{\theenumi\inhibitglue （\theenumii ）}
 \renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
 %    \end{macrocode}
 % \end{macro}
@@ -4456,7 +4456,7 @@
 %    数式番号の形式です。
 %    デフォルトの値をコメントアウトして示しておきます。
 %
-%    |\inhibitglue（\theequation）\inhibitglue| のように和文かっこ
+%    |\inhibitglue （\theequation ）\inhibitglue| のように和文かっこ
 %    を使うことも可能です。
 %
 %    \begin{macrocode}
@@ -4467,7 +4467,7 @@
 %    |amsmath| パッケージを使う場合は |\tagform@| を次のように修正します。
 %
 %    \begin{macrocode}
-% \def\tagform@#1{\maketag@@@{（\ignorespaces#1\unskip\@@italiccorr）}}
+% \def\tagform@#1{\maketag@@@{（\ignorespaces#1\unskip\@@italiccorr ）}}
 %    \end{macrocode}
 %
 % \subsection{フロート}
@@ -5220,7 +5220,7 @@
 % とりあえずコメントアウトしておきますので，必要に応じて生かしてください。
 %
 %    \begin{macrocode}
-% \def\@biblabel#1{\inhibitglue［#1］\inhibitglue}
+% \def\@biblabel#1{\inhibitglue ［#1］\inhibitglue}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -5247,7 +5247,7 @@
 %        \@latex@warning
 %          {Citation `\@citeb' on page \thepage \space undefined}}%
 %        {\@cite@ofmt{\csname b@\@citeb\endcsname}}}}{#1}}
-% \def\@cite#1#2{\inhibitglue［{#1\if@tempswa ，#2\fi}］\inhibitglue}
+% \def\@cite#1#2{\inhibitglue ［{#1\if@tempswa ，#2\fi}］\inhibitglue}
 %    \end{macrocode}
 %
 % 引用番号を上ツキの 1）のようなスタイルにするには次のようにします。
diff --git a/Master/texmf-dist/source/platex/jsclasses/jslogo.dtx b/Master/texmf-dist/source/platex/jsclasses/jslogo.dtx
index 6bce634037e..e8350bdb61b 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-2017 Japanese TeX Development Community
+%  Copyright 2016-2019 Japanese TeX Development Community
 %
 % \fi
 %
@@ -27,7 +27,7 @@
 %<*driver>
 \ProvidesFile{jslogo.dtx}
 %</driver>
-  [2017/02/24 okumura, texjporg]
+  [2019/07/25 okumura, texjporg]
 %<*driver>
 \documentclass{jsarticle}
 \usepackage{doc}
@@ -379,8 +379,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}
diff --git a/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx b/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx
index 9492f0fc48f..0c9648258ea 100644
--- a/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx
+++ b/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx
@@ -12,7 +12,7 @@
 %   http://oku.edu.mie-u.ac.jp/~okumura/
 %
 %<okumacro>\NeedsTeXFormat{pLaTeX2e}
-%<okumacro>\ProvidesPackage{okumacro}[2018/06/11 okumura, texjporg]
+%<okumacro>\ProvidesPackage{okumacro}[2019/07/25 okumura, texjporg]
 %<*driver>
 \documentclass{jsarticle}
 \usepackage{doc}
@@ -193,7 +193,7 @@
 %\end{verbatim}
 % としていましたが，2017年9月の\pTeX (p3.7.2)に対応するため
 %\begin{verbatim}
-%    \setbox1=\hbox to\z@{\hbox to 1zw{\hss・\hss}\hss}%
+%    \setbox1=\hbox to\z@{\hbox to 1zw{\hss ・\hss}\hss}%
 %\end{verbatim}
 % に変更しました。これで，p3.7.1以前・p3.7.2以降どちらもOKです。
 %
@@ -604,9 +604,8 @@
 \newcommand{\PiCTeX}{\PiC\kern-.11em\TeX}
 \newcommand{\JTeX}{\leavevmode\lower.5ex\hbox{J}\kern-.17em\TeX}
 \newcommand{\JLaTeX}{\leavevmode\lower.5ex\hbox{\rm J}\kern-.17em\LaTeX}
-\DeclareRobustCommand{\JBibTeX}{$\mbox{%
-    \lower.5ex\hbox{J}\ifx\f@family\cmr\kern-.15em\else\kern-.05em\fi
-    \BibTeX}$}
+\DeclareRobustCommand{\JBibTeX}{$\m@th\mbox{%
+  \lower.5ex\hbox{J}\kern-.05em\BibTeX}$}
 \newcommand{\pTeXsT}{p\kern-.21em\TeX\kern-.10em s\kern-.21em T}
 % インプレスの新 TeX の仮称
 \newcommand{\iTeX}{\accent'27\i\TeX}
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
index d1a07e0e39e..b03bdec5f67 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
@@ -25,7 +25,7 @@
 \fi
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{jsarticle}
-  [2019/04/06 jsclasses (okumura, texjporg)]
+  [2019/07/25 jsclasses (okumura, texjporg)]
 \def\jsc@clsname{jsarticle}
 \newif\ifjsc@needsp@tch
 \jsc@needsp@tchfalse
@@ -1373,11 +1373,11 @@
 \renewcommand{\theenumiii}{\@roman\c@enumiii}
 \renewcommand{\theenumiv}{\@Alph\c@enumiv}
 \newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\inhibitglue（\theenumii）\inhibitglue}
+\newcommand{\labelenumii}{\inhibitglue （\theenumii ）\inhibitglue}
 \newcommand{\labelenumiii}{\theenumiii.}
 \newcommand{\labelenumiv}{\theenumiv.}
 \renewcommand{\p@enumii}{\theenumi}
-\renewcommand{\p@enumiii}{\theenumi\inhibitglue（\theenumii）}
+\renewcommand{\p@enumiii}{\theenumi\inhibitglue （\theenumii ）}
 \renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
 \newcommand\labelitemi{\textbullet}
 \newcommand\labelitemii{\normalfont\bfseries \textendash}
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
index e50732a6e2b..b31303292ca 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
@@ -25,7 +25,7 @@
 \fi
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{jsbook}
-  [2019/04/06 jsclasses (okumura, texjporg)]
+  [2019/07/25 jsclasses (okumura, texjporg)]
 \def\jsc@clsname{jsbook}
 \newif\ifjsc@needsp@tch
 \jsc@needsp@tchfalse
@@ -1480,11 +1480,11 @@
 \renewcommand{\theenumiii}{\@roman\c@enumiii}
 \renewcommand{\theenumiv}{\@Alph\c@enumiv}
 \newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\inhibitglue（\theenumii）\inhibitglue}
+\newcommand{\labelenumii}{\inhibitglue （\theenumii ）\inhibitglue}
 \newcommand{\labelenumiii}{\theenumiii.}
 \newcommand{\labelenumiv}{\theenumiv.}
 \renewcommand{\p@enumii}{\theenumi}
-\renewcommand{\p@enumiii}{\theenumi\inhibitglue（\theenumii）}
+\renewcommand{\p@enumiii}{\theenumi\inhibitglue （\theenumii ）}
 \renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
 \newcommand\labelitemi{\textbullet}
 \newcommand\labelitemii{\normalfont\bfseries \textendash}
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jslogo.sty b/Master/texmf-dist/tex/platex/jsclasses/jslogo.sty
index ab5a5e7e3ce..01d3c6f9b4a 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jslogo.sty
+++ b/Master/texmf-dist/tex/platex/jsclasses/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{}
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
index a20a4308227..e2ebc6b9e38 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
@@ -25,7 +25,7 @@
 \fi
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{jspf}
-  [2019/04/06 jsclasses (okumura, texjporg)]
+  [2019/07/25 jsclasses (okumura, texjporg)]
 \def\jsc@clsname{jspf}
 \newif\ifjsc@needsp@tch
 \jsc@needsp@tchfalse
@@ -1246,11 +1246,11 @@
 \renewcommand{\theenumiii}{\@roman\c@enumiii}
 \renewcommand{\theenumiv}{\@Alph\c@enumiv}
 \newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\inhibitglue（\theenumii）\inhibitglue}
+\newcommand{\labelenumii}{\inhibitglue （\theenumii ）\inhibitglue}
 \newcommand{\labelenumiii}{\theenumiii.}
 \newcommand{\labelenumiv}{\theenumiv.}
 \renewcommand{\p@enumii}{\theenumi}
-\renewcommand{\p@enumiii}{\theenumi\inhibitglue（\theenumii）}
+\renewcommand{\p@enumiii}{\theenumi\inhibitglue （\theenumii ）}
 \renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
 \newcommand\labelitemi{\textbullet}
 \newcommand\labelitemii{\normalfont\bfseries \textendash}
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls b/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls
index d51267e622b..cd352f4b4ae 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls
@@ -25,7 +25,7 @@
 \fi
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{jsreport}
-  [2019/04/06 jsclasses (okumura, texjporg)]
+  [2019/07/25 jsclasses (okumura, texjporg)]
 \def\jsc@clsname{jsreport}
 \newif\ifjsc@needsp@tch
 \jsc@needsp@tchfalse
@@ -1432,11 +1432,11 @@
 \renewcommand{\theenumiii}{\@roman\c@enumiii}
 \renewcommand{\theenumiv}{\@Alph\c@enumiv}
 \newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\inhibitglue（\theenumii）\inhibitglue}
+\newcommand{\labelenumii}{\inhibitglue （\theenumii ）\inhibitglue}
 \newcommand{\labelenumiii}{\theenumiii.}
 \newcommand{\labelenumiv}{\theenumiv.}
 \renewcommand{\p@enumii}{\theenumi}
-\renewcommand{\p@enumiii}{\theenumi\inhibitglue（\theenumii）}
+\renewcommand{\p@enumiii}{\theenumi\inhibitglue （\theenumii ）}
 \renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
 \newcommand\labelitemi{\textbullet}
 \newcommand\labelitemii{\normalfont\bfseries \textendash}
diff --git a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
index de417c63a2d..1336962ffec 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
@@ -25,7 +25,7 @@
 \fi
 \NeedsTeXFormat{pLaTeX2e}
 \ProvidesClass{kiyou}
-  [2019/04/06 jsclasses (okumura, texjporg)]
+  [2019/07/25 jsclasses (okumura, texjporg)]
 \def\jsc@clsname{kiyou}
 \newif\ifjsc@needsp@tch
 \jsc@needsp@tchfalse
@@ -1328,11 +1328,11 @@
 \renewcommand{\theenumiii}{\@roman\c@enumiii}
 \renewcommand{\theenumiv}{\@Alph\c@enumiv}
 \newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\inhibitglue（\theenumii）\inhibitglue}
+\newcommand{\labelenumii}{\inhibitglue （\theenumii ）\inhibitglue}
 \newcommand{\labelenumiii}{\theenumiii.}
 \newcommand{\labelenumiv}{\theenumiv.}
 \renewcommand{\p@enumii}{\theenumi}
-\renewcommand{\p@enumiii}{\theenumi\inhibitglue（\theenumii）}
+\renewcommand{\p@enumiii}{\theenumi\inhibitglue （\theenumii ）}
 \renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
 \newcommand\labelitemi{\textbullet}
 \newcommand\labelitemii{\normalfont\bfseries \textendash}
diff --git a/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty b/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty
index 824c17ecdcb..bfafb6f2870 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty
+++ b/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty
@@ -24,7 +24,7 @@
   \epTeXinputencoding utf8 % ^^A added (2017-10-04)
 \fi
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{okumacro}[2018/06/11 okumura, texjporg]
+\ProvidesPackage{okumacro}[2019/07/25 okumura, texjporg]
 \providecommand{\rubyfamily}{}
 \def\kanjistrut{\iftdir
   \vrule \@height0.5zw \@depth0.5zw \@width\z@
@@ -249,9 +249,8 @@
 \newcommand{\PiCTeX}{\PiC\kern-.11em\TeX}
 \newcommand{\JTeX}{\leavevmode\lower.5ex\hbox{J}\kern-.17em\TeX}
 \newcommand{\JLaTeX}{\leavevmode\lower.5ex\hbox{\rm J}\kern-.17em\LaTeX}
-\DeclareRobustCommand{\JBibTeX}{$\mbox{%
-    \lower.5ex\hbox{J}\ifx\f@family\cmr\kern-.15em\else\kern-.05em\fi
-    \BibTeX}$}
+\DeclareRobustCommand{\JBibTeX}{$\m@th\mbox{%
+  \lower.5ex\hbox{J}\kern-.05em\BibTeX}$}
 \newcommand{\pTeXsT}{p\kern-.21em\TeX\kern-.10em s\kern-.21em T}
 \newcommand{\iTeX}{\accent'27\i\TeX}
 \newcommand{\MlTeX}{M\kern-.1667em\lower.5ex\hbox{L}\kern-.25em\TeX}