jsclasses (1dec16)

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

1 files changed, 150 insertions, 28 deletions

diff --git a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
index af441d0b001..a307d630a9b 100644
--- a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
+++ b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
@@ -38,7 +38,7 @@
 %<*driver>
 \ProvidesFile{jsclasses.dtx}
 %</driver>
-  [2016/10/08 okumura, texjporg]
+  [2016/12/01 okumura, texjporg]
 %<*driver>
 \documentclass{jsarticle}
 \usepackage{doc}
@@ -288,6 +288,9 @@
 %
 % $B%*%W%7%g%s(B \texttt{slide} $B$r?7@_$7$^$7$?!#(B
 %
+% [2016-10-08] \texttt{slide} $B%*%W%7%g%s$O(B article $B0J30$G$O;H$$J*$K$J$i$J$+$C$?$N$G!$(B
+% $B4JC1$N$?$a(B article $B$N$_$G;H$($k%*%W%7%g%s$H$7$^$7$?!#(B
+%
 %    \begin{macrocode}
 \newif\if@slide
 \@slidefalse
@@ -309,9 +312,6 @@
 %
 % [2016-07-24] $B%*%W%F%#%+%k%5%$%:$rD4@0$9$k$?$a$K(BNFSS$B$X%Q%C%A$rEv$F$k%*%W%7%g%s(B \texttt{nomag*} $B$r?7@_$7$^$7$?!#(B
 %
-% [2016-10-08] \texttt{slide} $B%*%W%7%g%s$O(B article $B0J30$G$O;H$$J*$K$J$i$J$+$C$?$N$G!$(B
-% $B4JC1$N$?$a(B article $B$N$_$G;H$($k%*%W%7%g%s$H$7$^$7$?!#(B
-%
 %    \begin{macrocode}
 \newcommand{\@ptsize}{0}
 \newif\ifjsc@mag\jsc@magtrue
@@ -549,10 +549,13 @@
 \jisfontfalse
 \newif\if@jsc@uplatex
 \@jsc@uplatexfalse
+\newif\if@jsc@autodetect
+\@jsc@autodetectfalse
 \DeclareOption{mingoth}{\mingothtrue}
 \DeclareOption{winjis}{\winjistrue}
 \DeclareOption{jis}{\jisfonttrue}
 \DeclareOption{uplatex}{\@jsc@uplatextrue\winjisfalse}
+\DeclareOption{autodetect-engine}{\@jsc@autodetecttrue}
 \def\jsc@JYn{\if@jsc@uplatex JY2\else JY1\fi}
 \def\jsc@JTn{\if@jsc@uplatex JT2\else JT1\fi}
 \def\jsc@pfx@{\if@jsc@uplatex u\else \fi}
@@ -630,14 +633,23 @@
 \fi
 %    \end{macrocode}
 %
-% \paragraph{$B;HMQ%(%s%8%s$N8!::(B}
+% \paragraph{$B;HMQ%(%s%8%s$N8!::!&<+F0H=Dj(B}
 %
 % $B%f!<%6$,(B |uplatex| $B%*%W%7%g%s$NM-L5$K$h$j;XDj$7$?%(%s%8%s$,!$<B:]$K(B
 % $B;H$o$l$F$$$k$b$N$H0lCW$7$F$$$k$+$r8!::$7!$0lCW$7$J$$>l9g$O%(%i!<(B
 % $B%a%C%;!<%8$rI=<($7$^$9!#(B
 %
+% [2016-11-09] p\LaTeX / up\LaTeX $B$r<+F0H=JL$9$k%*%W%7%g%s(B |autodetect-engine| $B$r?7@_$7$^$7$?!#(B
+% up\LaTeX $B$N>l9g$O!$%0%m!<%P%k%*%W%7%g%s$K(B |uplatex| $B$rDI2C$9$k$3$H$G!$(B
+% $B<+F0H=Dj$K1~$8$F(B |otf| $B%Q%C%1!<%8$K$b(B |uplatex| $B%*%W%7%g%s$,EO$k$h$&$K$7$^$9!#(B
+%
 %    \begin{macrocode}
 \ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000
+  \if@jsc@autodetect
+    \ClassInfo\jsc@clsname{Autodetected engine: upLaTeX}
+    \@jsc@uplatextrue
+    \g@addto@macro\@classoptionslist{,uplatex}
+  \fi
   \if@jsc@uplatex\else
     \ClassError\jsc@clsname
       {You are running upLaTeX.\MessageBreak
@@ -646,6 +658,13 @@
       {\@ehc}
     \@jsc@uplatextrue
   \fi
+%    \end{macrocode}
+%
+% [2016-11-11] p\LaTeX $B$N>l9g$O!$%*%W%7%g%s(B |uplatex| $B$,;XDj$5$l$F$$$l$PI,$:%(%i!<$r=P$7$^$9!#(B
+% |autodetect-engine| $B$,M-8z$K$J$C$F$$$F$b%(%i!<$r=P$7$^$9$,!$$3$l$O(B |otf| $B%Q%C%1!<%8$K(B
+% |uplatex| $B%*%W%7%g%s$,EO$C$F$7$^$&$N$rKI$0$?$a$G$9!#(B
+%
+%    \begin{macrocode}
 \else
   \if@jsc@uplatex
     \ClassError\jsc@clsname
@@ -655,6 +674,10 @@
       {\@ehc}
     \@jsc@uplatexfalse
   \fi
+  \if@jsc@autodetect
+    \ClassInfo\jsc@clsname{Autodetected engine: pLaTeX}
+    \@jsc@uplatexfalse
+  \fi
 \fi
 %    \end{macrocode}
 %
@@ -886,6 +909,38 @@
 \fi
 %    \end{macrocode}
 %
+% [2016-11-16] latex.ltx (ltspace.dtx)$B$GDj5A$5$l$F$$$k(B |\smallskip| $B$N!$(B
+% $BC10L(B |pt| $B$r(B |\jsc@mpt| $B$KCV$-49$($?(B |\jsc@smallskip| $B$rDj5A$7$^$9!#(B
+% $B$3$l$O(B |\maketitle| $B$GMQ$$$i$l$^$9!#(B
+% |\jsc@medskip| $B$H(B |\jsc@bigskip| $B$OI,MW$J$$$N$G%3%a%s%H%"%&%H$7$F$$$^$9!#(B
+%
+% \begin{macro}{\jsc@smallskip}
+% \begin{macro}{\jsc@medskip}
+% \begin{macro}{\jsc@bigskip}
+%    \begin{macrocode}
+\def\jsc@smallskip{\vspace\jsc@smallskipamount}
+%\def\jsc@medskip{\vspace\jsc@medskipamount}
+%\def\jsc@bigskip{\vspace\jsc@bigskipamount}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\jsc@smallskipamount}
+% \begin{macro}{\jsc@medskipamount}
+% \begin{macro}{\jsc@bigskipamount}
+%    \begin{macrocode}
+\newskip\jsc@smallskipamount
+\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt
+%\newskip\jsc@medskipamount
+%\jsc@medskipamount =6\jsc@mpt plus 2\jsc@mpt minus 2\jsc@mpt
+%\newskip\jsc@bigskipamount
+%\jsc@bigskipamoun =12\jsc@mpt plus 4\jsc@mpt minus 4\jsc@mpt
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
 % [2016-07-11] $B?7$7$/DI2C$7$?(B|\stockwidth|$B!$(B|\stockheight|$B$b(B|\mag|$B$K$"$o$;$F(B
 % $B%9%1!<%k$7$^$9!#(B
 %
@@ -2661,6 +2716,11 @@
 % $BOBJ8$N$b$N$G$O(B |\Large| $B$K$J$C$F$$$^$7$?$,!$$3$3$G$O(B |\large|
 % $B$K$7$^$7$?!#(B
 %
+% [2016-11-16] $B?7@_$5$l$?(B \texttt{nomag} $B$*$h$S(B \texttt{nomag*} $B%*%W%7%g%s(B
+% $B$N>l9g$r%G%U%)%k%H!J(B\texttt{usemag} $BAjEv!K$K9g$o$;$k$?$a!$(B|\smallskip| $B$r(B
+% |\jsc@smallskip| $B$KCV$-49$($^$7$?!#(B|\smallskip| $B$N$^$^$G$O(B
+% \texttt{nomag(*)} $B$N>l9g$K%9%1!<%k$7$J$/$J$j!$%l%$%"%&%H$,JQ$o$C$F$7$^$$$^$9!#(B
+%
 %    \begin{macrocode}
 %<*article|book|kiyou>
 \if@titlepage
@@ -2676,9 +2736,9 @@
           \mbox{} \\[1zw]
           \large
           {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
-          \smallskip
+          \jsc@smallskip
           \@title
-          \smallskip
+          \jsc@smallskip
           {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
           \vfill
           {\small \@author}%
@@ -3552,18 +3612,28 @@
 %
 %    $B8+=P$7$N8e$m$G2~9T$5$l$^$;$s!#(B
 %
+% [2016-11-16] $B=>Mh$O(B |\paragraph| $B$N:G=i$K=P$k%^!<%/$r!V"#!W$K8GDj$7$F(B
+% $B$$$^$7$?$,!$$3$N%^!<%/$rJQ992DG=$K$9$k$?$a(B |\jsParagraphMark| $B$H$$$&%^%/%m(B
+% $B$K@Z$j=P$7$^$7$?!#$3$l$G!$$?$H$($P(B
+%\begin{verbatim}
+%  \renewcommand{\jsParagraphMark}{$B!z(B}
+%\end{verbatim}
+% $B$H$9$l$P!V!z!W$KJQ99$G$-$^$9$7!$%^!<%/$r6u$K$9$k$3$H$bMF0W$G$9!#(B
+% $B$J$*!$K?3X2q%/%i%9$G$O=>Mh$I$*$j%^!<%/$OIU$-$^$;$s!#(B
+%
 %    \begin{macrocode}
+%<!jspf>\newcommand{\jsParagraphMark}{$B"#(B}
 \if@twocolumn
   \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
     {\z@}{\if@slide .4\Cvs \else -1zw\fi}% $B2~9T$;$:(B 1zw $B$N%"%-(B
 %<jspf>    {\normalfont\normalsize\headfont}}
-%<!jspf>    {\normalfont\normalsize\headfont $B"#(B}}
+%<!jspf>    {\normalfont\normalsize\headfont\jsParagraphMark}}
 \else
   \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
     {0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}%
     {\if@slide .5\Cvs \@plus.3\Cdp \else -1zw\fi}% $B2~9T$;$:(B 1zw $B$N%"%-(B
 %<jspf>    {\normalfont\normalsize\headfont}}
-%<!jspf>    {\normalfont\normalsize\headfont $B"#(B}}
+%<!jspf>    {\normalfont\normalsize\headfont\jsParagraphMark}}
 \fi
 %    \end{macrocode}
 % \end{macro}
@@ -4971,17 +5041,17 @@
 % $B$G0O$s$G$/$@$5$$!#(B
 %
 %    \begin{macrocode}
-% \def\@citex[#1]#2{%
+% \def\@citex[#1]#2{\leavevmode
 %   \let\@citea\@empty
 %   \@cite{\@for\@citeb:=#2\do
 %     {\@citea\def\@citea{$B!$(B\inhibitglue\penalty\@m\ }%
-%      \edef\@citeb{\expandafter\@firstofone\@citeb}%
+%      \edef\@citeb{\expandafter\@firstofone\@citeb\@empty}%
 %      \if@filesw\immediate\write\@auxout{\string\citation{\@citeb}}\fi
 %      \@ifundefined{b@\@citeb}{\mbox{\normalfont\bfseries ?}%
 %        \G@refundefinedtrue
 %        \@latex@warning
 %          {Citation `\@citeb' on page \thepage \space undefined}}%
-%        {\hbox{\csname b@\@citeb\endcsname}}}}{#1}}
+%        {\@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}
 %    \end{macrocode}
 %
@@ -5203,6 +5273,13 @@
 %
 % [2016-09-08] $B%3%_%e%K%F%#HG(B\pLaTeX $B$N%P%0=$@5$KDI?o$7$^$7$?!#(B
 %
+% [2016-11-29] $B8E$$(B\pLaTeX $B$G;HMQ$5$l$?>l9g$r9MN8$7$F%3!<%I$r2~NI!#(B
+% ^^A $B5SCmD>8e$K2~9T$r2DG=$K$9$k$?$a$K(B|\null|$B$rF~$l$k>l9g!$(B
+% ^^A $BF1;~$K%Z%J%k%F%#$b9MN8$7$J$1$l$P8m$C$?2~9T$,5/$-$k2DG=@-$,$"$k!#(B
+% ^^A $B$3$N$?$a!$(B|\ifhmode\null\fi|$B$O(B
+% ^^A   |\ifx\pltx@foot@penalty\@undefined\else ... \fi|
+% ^^A $B>r7o$NFbB&$KCV$$$F$*$/$N$,0BA4!#(B
+%
 %    \begin{macrocode}
 \long\def\@footnotetext{%
   \insert\footins\bgroup
@@ -5223,8 +5300,8 @@
 \def\f@@t{\bgroup\aftergroup\@foot\let\next}
 \def\f@t#1{#1\@foot}
 \def\@foot{\@finalstrut\strutbox\color@endgroup\egroup
-  \ifhmode\null\fi
   \ifx\pltx@foot@penalty\@undefined\else
+    \ifhmode\null\fi
     \ifnum\pltx@foot@penalty=\z@\else
       \penalty\pltx@foot@penalty
       \pltx@foot@penalty\z@
@@ -5278,6 +5355,12 @@
 %
 % $BCJMnF,$N$+$.$+$C$3$J$I$r8+$+$1(B1$B;zH>2<$2$+$iA43Q(B1$B;z2<$2$KD>$7$^$9!#(B
 %
+% [2016-07-18] |\inhibitglue| $B$NH/9TBP>]$r(B |\inhibitxspcode| $B$,(B2$B$K(B
+% $B@_Dj$5$l$F$$$k$b$N$9$Y$F$K3HBg$7$^$7$?!#(B
+%
+% [2016-12-01] $B$9$0>e$NJQ99$G(B |\@tempa| $B$r;H$C$F$$$?$N$,$h$/$J$+$C$?(B
+% $B$N$G!$%W%l%U%#%C%/%9$rIU$1$F(B |\jsc@tempa| $B$K$7$^$7$?(B(forum:2085)$B!#(B
+%
 %    \begin{macrocode}
 \def\@inhibitglue{%
   \futurelet\@let@token\@@inhibitglue}
@@ -5300,8 +5383,8 @@
 \def\@@inhibitglue{%
   \expandafter\expandafter\expandafter\jsc@inhibitglue\expandafter\meaning\expandafter\@let@token\KANJI@CHARACTER\relax\jsc@end}
 \expandafter\def\expandafter\jsc@inhibitglue\expandafter#\expandafter1\KANJI@CHARACTER#2#3\jsc@end{%
-  \def\@tempa{#1}%
-  \ifx\@tempa\@empty
+  \def\jsc@tempa{#1}%
+  \ifx\jsc@tempa\@empty
     \ifnum\the\inhibitxspcode`#2=2\relax
       \inhibitglue
     \fi
@@ -5315,11 +5398,14 @@
 %
 % $B$^$:!$4D6-$ND>8e$NCJMn$G$9!#(B
 %
+% [2016-11-19] ltlists.dtx 2015/05/10 v1.0t$B$NJQ99$KDI?o$7$F(B |\clubpenalty| $B$N(B
+% $B%j%;%C%H$rDI2C$7$^$7$?!#(B
+%
 %    \begin{macrocode}
 \def\@doendpe{%
   \@endpetrue
   \def\par{%
-    \@restorepar\everypar{\everyparhook}\par\@endpefalse}%
+    \@restorepar\clubpenalty\@clubpenalty\everypar{\everyparhook}\par\@endpefalse}%
   \everypar{{\setbox\z@\lastbox}\everypar{\everyparhook}\@endpefalse\everyparhook}}
 %    \end{macrocode}
 %
@@ -5476,19 +5562,22 @@
 % $B$J$*!$(BAMS$B4X78$N%Q%C%1!<%8$rFI$_9~$`:]$K(B psamsfonts $B%*%W%7%g%s$r(B
 % $BM?$($F$b2sHr$G$-$^$9!J(BThanks: $B$7$C$]0&9%2H$5$s!K!#(B
 %
+% [2016-11-19] $BK\2H$N(B ltclass.dtx 2004/01/28 v1.1g $B$G=$@5$5$l$F$$$k$N$G(B
+% $B%3%a%s%H%"%&%H$7$^$7$?!#(B
+%
 %    \begin{macrocode}
-\let\ltx@ifnextchar\@ifnextchar
-\def\ProvidesFile#1{%
-  \begingroup
-    \catcode`\ 10 %
-    \ifnum \endlinechar<256 %
-      \ifnum \endlinechar>\m@ne
-        \catcode\endlinechar 10 %
-      \fi
-    \fi
-    \@makeother\/%
-    \@makeother\&%
-    \ltx@ifnextchar[{\@providesfile{#1}}{\@providesfile{#1}[]}}
+%\let\ltx@ifnextchar\@ifnextchar
+%\def\ProvidesFile#1{%
+%  \begingroup
+%    \catcode`\ 10 %
+%    \ifnum \endlinechar<256 %
+%      \ifnum \endlinechar>\m@ne
+%        \catcode\endlinechar 10 %
+%      \fi
+%    \fi
+%    \@makeother\/%
+%    \@makeother\&%
+%    \ltx@ifnextchar[{\@providesfile{#1}}{\@providesfile{#1}[]}}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -5628,6 +5717,39 @@
 \fi
 %    \end{macrocode}
 %
+%
+% \section{$B<B83E*%3!<%I(B}
+%
+% [2016-11-29] $B%3%_%e%K%F%#HG(Bp\LaTeX $B$G?7@_$5$l$?%F%9%HMQ%Q%C%1!<%8(B
+% $B!J(B\texttt{exppl2e}$B%Q%C%1!<%8!K$,J8=q%/%i%9$h$j@h$KFI$_9~$^$l$F$$$?(B
+% $B>l9g$O!$(Bjsclasses$B$b%F%9%HHG$H$7$FF0:n$7$^$9!#$3$N=hCV$O(Bjsarticle$B$H(B
+% jsbook$B$K$N$_9T$$!$(Bjspf$B$H(Bkiyou$B$O=|30$7$F$*$-$^$9!#(Bexppl2e$B%Q%C%1!<%8(B
+% $B$,FI$_$3$^$l$F$$$J$$>l9g$ODL>oHG$H$7$FF0:n$7$^$9$N$G!$$3$3$G=*N;$7$^$9!#(B
+%
+%    \begin{macrocode}
+%<*article|book>
+\@ifpackageloaded{exppl2e}{\jsc@needsp@tchtrue}{\jsc@needsp@tchfalse}
+\ifjsc@needsp@tch\else
+  \expandafter\endinput
+\fi
+%    \end{macrocode}
+%
+% $B0J2<$O<B83E*%3!<%I$G$9!#6qBNE*$K$O!$(B2016/11/29$B$N(B\texttt{exppl2e}$B%Q%C%1!<%8(B
+% $B$G@bL@$5$l$F$$$k(B|\@gnewline|$B$N%Q%C%A$rF~$l$F$"$j$^$9!#(B
+%
+% \begin{macro}{\@gnewline}
+%    \begin{macrocode}
+\def\@gnewline #1{%
+  \ifvmode
+    \@nolnerr
+  \else
+    \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \hskip \z@
+    \ignorespaces
+  \fi}
+%</article|book>
+%    \end{macrocode}
+% \end{macro}
+%
 % $B0J>e$G$9!#(B
 %
 % \Finale