summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/platex/jsclasses
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-09-03 21:37:12 +0000
committerKarl Berry <karl@freefriends.org>2016-09-03 21:37:12 +0000
commitc8d27001d582c8d1e03deedb00628269d695ea24 (patch)
tree59c48386c3da1fb6ce429e21bf2737627bd0ff46 /Master/texmf-dist/source/platex/jsclasses
parentc22ab9576265f84ca4d5a4a331998e171aa3872d (diff)
jsclasses (3sep16)
git-svn-id: svn://tug.org/texlive/trunk@41987 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/platex/jsclasses')
-rw-r--r--Master/texmf-dist/source/platex/jsclasses/Makefile38
-rw-r--r--Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx1057
-rw-r--r--Master/texmf-dist/source/platex/jsclasses/jslogo.dtx381
-rw-r--r--Master/texmf-dist/source/platex/jsclasses/jslogo.ins4
-rw-r--r--Master/texmf-dist/source/platex/jsclasses/jsverb.dtx19
-rw-r--r--Master/texmf-dist/source/platex/jsclasses/morisawa.dtx21
-rw-r--r--Master/texmf-dist/source/platex/jsclasses/okumacro.dtx123
-rw-r--r--Master/texmf-dist/source/platex/jsclasses/okuverb.dtx21
8 files changed, 1093 insertions, 571 deletions
diff --git a/Master/texmf-dist/source/platex/jsclasses/Makefile b/Master/texmf-dist/source/platex/jsclasses/Makefile
new file mode 100644
index 00000000000..4c39a08c323
--- /dev/null
+++ b/Master/texmf-dist/source/platex/jsclasses/Makefile
@@ -0,0 +1,38 @@
+all: jsarticle.cls okumacro.sty jsverb.sty okuverb.sty morisawa.sty jslogo.sty \
+ jsclasses.pdf okumacro.pdf jsverb.pdf okuverb.pdf morisawa.pdf jslogo.pdf
+
+jsarticle.cls: jsclasses.dtx
+ platex --kanji=jis jsclasses.ins
+
+okumacro.sty: okumacro.dtx
+ platex --kanji=jis okumacro.ins
+
+jsverb.sty: jsverb.dtx
+ platex --kanji=jis jsverb.ins
+
+okuverb.sty: okuverb.dtx
+ platex --kanji=jis okuverb.ins
+
+morisawa.sty: morisawa.dtx
+ platex --kanji=jis morisawa.ins
+
+jslogo.sty: jslogo.dtx
+ platex --kanji=jis jslogo.ins
+
+jsclasses.pdf: jsclasses.dtx
+ ptex2pdf -l -ot --kanji=jis jsclasses.dtx
+
+okumacro.pdf: okumacro.dtx
+ ptex2pdf -l -ot --kanji=jis okumacro.dtx
+
+jsverb.pdf: jsverb.dtx
+ ptex2pdf -l -ot --kanji=jis jsverb.dtx
+
+okuverb.pdf: okuverb.dtx
+ ptex2pdf -l -ot --kanji=jis okuverb.dtx
+
+morisawa.pdf: morisawa.dtx
+ ptex2pdf -l -ot --kanji=jis morisawa.dtx
+
+jslogo.pdf: jslogo.dtx
+ ptex2pdf -l -ot --kanji=jis jslogo.dtx
diff --git a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
index 0e8856bf315..3c5132ca3f1 100644
--- a/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
+++ b/Master/texmf-dist/source/platex/jsclasses/jsclasses.dtx
@@ -4,37 +4,28 @@
% pLaTeX2$B&E?7%I%-%e%a%s%H%/%i%9(B
%
% $B$3$l$O(B LaTeX3 Project $B$N(B classes.dtx $B$H3t<02q<R%"%9%-!<$N(B jclasses.dtx
-% $B$K4p$E$$$F1|B<(B <okumura@edu.mie-u.ac.jp> $B$,2~JQ$7$?$b$N$G$9!#(B
-% $B1|B<$N2~JQItJ,$K$D$$$F$O2?$N8"Mx$b<gD%$7$^$;$s!#(B
-% $B%*%j%8%J%k$NCx:n8"$N5v$9HO0O$G<+M3$K$4MxMQ$/$@$5$$!#(B
+% $B$K4p$E$$$F!$$b$H$b$H1|B<@2I'(B <okumura@okumuralab.org> $B$K$h$j(B
+% $B:n@.$5$l$?$b$N$G$9!#(B
+% $B8=:_$OF|K\8l(B\TeX $B3+H/%3%_%e%K%F%#$K$h$j4IM}$5$l$F$$$^$9!#(B
%
% [2002-12-19] $B$$$m$$$m$J$b$N$K<}O?$7$F$$$?$@$/:]$K%i%$%;%s%9$rL@3N$K$9$k(B
% $BI,MW$,@8$8$F$-$^$7$?!#%"%9%-!<$N$b$N$,:G6a$O(Bmodified BSD$B%i%$%;%s%9$K$J$C(B
% $B$F$$$^$9$N$G!$;d$N$b$N$b$=$l$K=`$8$F(Bmodified BSD$B$H$9$k$3$H$K$7$^$9!#(B
%
+% [2016-07-11] abenori$B$5$s$K$h$k(B\texttt{nomag}$B%*%W%7%g%s$r%^!<%8$7$^$7$?!#(B
+% $B$J$*!$%=!<%9%3!<%I$N4IM}$O(BGitHub$B$G9T$&$3$H$K$7$^$7$?!#(B
+%
+% [2016-07-13] $BF|K\8l(B\TeX $B3+H/%3%_%e%K%F%#$K$h$k4IM}$K0\9T$7$^$7$?!#(B
+%
% Copyright 1993 1994 1995 1996 1997 1998 1999
% The LaTeX3 Project and any individual authors listed elsewhere
% in this file.
%
% Copyright 1995-1999 ASCII Corporation.
+% Copyright 1999-2016 Haruhiko Okumura
+% Copyright 2016 Japanese TeX Development Community
%
% \fi
-% \CheckSum{5668}
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
%
% \iffalse
%
@@ -47,7 +38,7 @@
%<*driver>
\ProvidesFile{jsclasses.dtx}
%</driver>
- [2014/02/07 okumura]
+ [2016/08/26 okumura, texjporg]
%<*driver>
\documentclass{jsarticle}
\usepackage{doc}
@@ -69,7 +60,7 @@
% \fi
%
% \title{\pLaTeXe $B?7%I%-%e%a%s%H%/%i%9(B}
-% \author{$B1|B<@2I'(B}
+% \author{$B1|B<@2I'!$F|K\8l(B\TeX $B3+H/%3%_%e%K%F%#(B}
% \date{\filedate}
% \maketitle
%
@@ -79,9 +70,12 @@
%
% $B$3$l$O(B\LaTeX3 Project$B$N(B \texttt{classes.dtx} $B$H(B
% $B3t<02q<R%"%9%-!<$N(B \texttt{jclasses.dtx} $B$K4p$E$$$F(B
-% $B1|B<$,2~JQ$7$?$b$N$G$9!#(B
-% $B8"Mx$K$D$$$F$ON><T$N$b$N$K=>$$$^$9!#(B
-% $B1|B<$O2?$N8"Mx$b<gD%$7$^$;$s!#(B
+% $B$b$H$b$H1|B<@2I'$K$h$j:n@.$5$l$?$b$N$G$9!#(B
+% $B8=:_$OF|K\8l(B\TeX $B3+H/%3%_%e%K%F%#$K$h$j(BGitHub$B$G4IM}$5$l$F$$$^$9!#(B
+% \begin{quote}
+% |https://github.com/texjporg/jsclasses|
+% \end{quote}
+% $B%i%$%;%s%9$O(Bmodified BSD$B$G$9!#(B
%
% [2009-02-22] $BEDCfBv<$;a$K$h$k(Bup\LaTeX $BBP1~%Q%C%A$r<h$j9~$_$^$7$?!#(B
%
@@ -123,6 +117,33 @@
%
% $B0J2<$G$O<B:]$N%3!<%I$KB($7$F@bL@$7$^$9!#(B
%
+% \begin{macro}{\jsc@clsname}
+%
+% $BJ8=q%/%i%9$NL>A0$G$9!#%(%i!<%a%C%;!<%8I=<($J$I$G;H$o$l$^$9!#(B
+%
+% \begin{macrocode}
+%<article>\def\jsc@clsname{jsarticle}
+%<book>\def\jsc@clsname{jsbook}
+%<jspf>\def\jsc@clsname{jspf}
+%<kiyou>\def\jsc@clsname{kiyou}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\ifjsc@needsp@tch}
+%
+% [2016-08-22] $B=>Mh(B\texttt{jsclasses}$B$G$O!$(B\pLaTeX $B$d(B\LaTeX $B$N(B
+% $BITET9g$JE@$KBP$7$F!$%/%i%9%U%!%$%kFb$GFH<+$KBP:v$r;\$7$F$$$^(B
+% $B$7$?!#$7$+$7!$(B2016$BG/0J9_!$%3%_%e%K%F%#HG(B\pLaTeX $B$,<!Bh$KBP:v(B
+% $B%3!<%I$r%+!<%M%kFb$K<h$j9~$`$h$&$K$J$j$^$7$?!#$=$3$G!$?7$7$$(B
+% \pLaTeX $B%+!<%M%k$H>WFM$7$J$$$h$&$K!$F|IU$,8E$$>l9g$@$1%Q%C%A(B
+% $B$r$"$F$k>l9g$,$"$j$^$9!#$3$N=hM}$K;HMQ$9$k%U%i%0$rDj5A$7$^$9!#(B
+%
+% \begin{macrocode}
+\newif\ifjsc@needsp@tch
+\jsc@needsp@tchfalse
+% \end{macrocode}
+% \end{macro}
+%
% \section{$B%*%W%7%g%s(B}
%
% $B$3$l$i$N%/%i%9$O(B |\documentclass{jsarticle}|
@@ -283,28 +304,42 @@
%
% [2003-04-18] 12Q$B%*%W%7%g%s$rDI2C$7$^$7$?!#(B
%
+% [2016-07-08] |\mag| $B$r;H$o$:$K3F<o@#K!$r%9%1!<%k$5$;$k$?$a$N%*%W%7%g%s(B \texttt{nomag} $B$r?7@_$7$^$7$?!#(B
+% \texttt{usemag} $B%*%W%7%g%s$N;XDj$G=>MhDL$j$NF0:n$H$J$j$^$9!#%G%U%)%k%H$O(B \texttt{usemag} $B$G$9!#(B
+%
+% [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
+%
% \begin{macrocode}
\newcommand{\@ptsize}{0}
-\DeclareOption{slide}{\@slidetrue\renewcommand{\@ptsize}{26}\@landscapetrue\@titlepagetrue}
-\DeclareOption{8pt}{\renewcommand{\@ptsize}{-2}}
-\DeclareOption{9pt}{\renewcommand{\@ptsize}{-1}}
-\DeclareOption{10pt}{\renewcommand{\@ptsize}{0}}
-\DeclareOption{11pt}{\renewcommand{\@ptsize}{1}}
-\DeclareOption{12pt}{\renewcommand{\@ptsize}{2}}
-\DeclareOption{14pt}{\renewcommand{\@ptsize}{4}}
-\DeclareOption{17pt}{\renewcommand{\@ptsize}{7}}
-\DeclareOption{20pt}{\renewcommand{\@ptsize}{10}}
-\DeclareOption{21pt}{\renewcommand{\@ptsize}{11}}
-\DeclareOption{25pt}{\renewcommand{\@ptsize}{15}}
-\DeclareOption{30pt}{\renewcommand{\@ptsize}{20}}
-\DeclareOption{36pt}{\renewcommand{\@ptsize}{26}}
-\DeclareOption{43pt}{\renewcommand{\@ptsize}{33}}
-\DeclareOption{12Q}{\renewcommand{\@ptsize}{1200}}
-\DeclareOption{14Q}{\renewcommand{\@ptsize}{1400}}
-\DeclareOption{10ptj}{\renewcommand{\@ptsize}{1001}}
-\DeclareOption{10.5ptj}{\renewcommand{\@ptsize}{1051}}
-\DeclareOption{11ptj}{\renewcommand{\@ptsize}{1101}}
-\DeclareOption{12ptj}{\renewcommand{\@ptsize}{1201}}
+\newif\ifjsc@mag\jsc@magtrue
+\newif\ifjsc@mag@xreal\jsc@mag@xrealfalse
+\def\jsc@magscale{1}
+\DeclareOption{slide}{%
+ \@slidetrue\def\jsc@magscale{3.583}
+ \renewcommand{\@ptsize}{26}
+ \@landscapetrue\@titlepagetrue}
+\DeclareOption{8pt}{\def\jsc@magscale{0.833}\renewcommand{\@ptsize}{-2}}
+\DeclareOption{9pt}{\def\jsc@magscale{0.913}\renewcommand{\@ptsize}{-1}}
+\DeclareOption{10pt}{\def\jsc@magscale{1}\renewcommand{\@ptsize}{0}}
+\DeclareOption{11pt}{\def\jsc@magscale{1.095}\renewcommand{\@ptsize}{1}}
+\DeclareOption{12pt}{\def\jsc@magscale{1.200}\renewcommand{\@ptsize}{2}}
+\DeclareOption{14pt}{\def\jsc@magscale{1.440}\renewcommand{\@ptsize}{4}}
+\DeclareOption{17pt}{\def\jsc@magscale{1.728}\renewcommand{\@ptsize}{7}}
+\DeclareOption{20pt}{\def\jsc@magscale{2}\renewcommand{\@ptsize}{10}}
+\DeclareOption{21pt}{\def\jsc@magscale{2.074}\renewcommand{\@ptsize}{11}}
+\DeclareOption{25pt}{\def\jsc@magscale{2.488}\renewcommand{\@ptsize}{15}}
+\DeclareOption{30pt}{\def\jsc@magscale{2.986}\renewcommand{\@ptsize}{20}}
+\DeclareOption{36pt}{\def\jsc@magscale{3.583}\renewcommand{\@ptsize}{26}}
+\DeclareOption{43pt}{\def\jsc@magscale{4.300}\renewcommand{\@ptsize}{33}}
+\DeclareOption{12Q}{\def\jsc@magscale{0.923}\renewcommand{\@ptsize}{1200}}
+\DeclareOption{14Q}{\def\jsc@magscale{1.077}\renewcommand{\@ptsize}{1400}}
+\DeclareOption{10ptj}{\def\jsc@magscale{1.085}\renewcommand{\@ptsize}{1001}}
+\DeclareOption{10.5ptj}{\def\jsc@magscale{1.139}\renewcommand{\@ptsize}{1051}}
+\DeclareOption{11ptj}{\def\jsc@magscale{1.194}\renewcommand{\@ptsize}{1101}}
+\DeclareOption{12ptj}{\def\jsc@magscale{1.302}\renewcommand{\@ptsize}{1201}}
+\DeclareOption{usemag}{\jsc@magtrue\jsc@mag@xrealfalse}
+\DeclareOption{nomag}{\jsc@magfalse\jsc@mag@xrealfalse}
+\DeclareOption{nomag*}{\jsc@magfalse\jsc@mag@xrealtrue}
% \end{macrocode}
%
% \paragraph{$B%H%s%\%*%W%7%g%s(B}
@@ -486,10 +521,11 @@
%
% \texttt{draft} $B$G(Boverfull box$B$N5/$-$?9TKv$K(B5pt$B$N7S@~$r0z$-$^$9!#(B
%
+% [2016-07-13] |\ifdraft| $B$rDj5A$9$k$N$r$d$a$^$7$?!#(B
+%
% \begin{macrocode}
-\newif\ifdraft
-\DeclareOption{draft}{\drafttrue \setlength\overfullrule{5pt}}
-\DeclareOption{final}{\draftfalse \setlength\overfullrule{0pt}}
+\DeclareOption{draft}{\setlength\overfullrule{5pt}}
+\DeclareOption{final}{\setlength\overfullrule{0pt}}
% \end{macrocode}
%
% \paragraph{$BOBJ8%U%)%s%H%a%H%j%C%/$NA*Br(B}
@@ -550,6 +586,18 @@
%</book>
% \end{macrocode}
%
+% \paragraph{jslogo$B%Q%C%1!<%8$NFI$_9~$_(B}
+%
+% \LaTeX $B4XO"$N%m%4$r:FDj5A$9$k(B\texttt{jslogo}$B%Q%C%1!<%8$r(B
+% $BFI$_9~$^$J$$%*%W%7%g%s(B\texttt{nojslogo}$B$r?7@_$7$^$7$?!#(B
+% \texttt{jslogo}$B%*%W%7%g%s$N;XDj$G=>Mh$I$*$j$NF0:n$H$J$j$^$9!#(B
+% $B%G%U%)%k%H$O(B\texttt{jslogo}$B$G!$$9$J$o$A%Q%C%1!<%8$rFI$_9~$_$^$9!#(B
+% \begin{macrocode}
+\newif\if@jslogo \@jslogotrue
+\DeclareOption{jslogo}{\@jslogotrue}
+\DeclareOption{nojslogo}{\@jslogofalse}
+% \end{macrocode}
+%
% \paragraph{$B%*%W%7%g%s$N<B9T(B}
%
% $B%G%U%)%k%H$N%*%W%7%g%s$r<B9T$7!$(B|dvi| $B%U%!%$%k$N@hF,$K(Bdvips$B$N(Bpapersize
@@ -577,6 +625,34 @@
\fi
% \end{macrocode}
%
+% \paragraph{$B;HMQ%(%s%8%s$N8!::(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
+%
+% \begin{macrocode}
+\ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000
+ \if@jsc@uplatex\else
+ \ClassError\jsc@clsname
+ {You are running upLaTeX.\MessageBreak
+ Please use pLaTeX instead, or add 'uplatex' to\MessageBreak
+ the class option list}
+ {\@ehc}
+ \@jsc@uplatextrue
+ \fi
+\else
+ \if@jsc@uplatex
+ \ClassError\jsc@clsname
+ {You are running pLaTeX.\MessageBreak
+ Please use upLaTeX instead, or remove 'uplatex' from\MessageBreak
+ the class option list}
+ {\@ehc}
+ \@jsc@uplatexfalse
+ \fi
+\fi
+% \end{macrocode}
+%
% \paragraph{papersize$B%9%Z%7%c%k$N=PNO(B}
%
% dvips$B$N(Bpapersize$B%9%Z%7%c%k$r=PNO$7$^$9!#(B
@@ -593,15 +669,19 @@
%
% [2003-05-17] $B%H%s%\$r%W%l%S%e!<$K;H$&$3$H$r9M$($F(B1$B%$%s%A$r(B2$B%$%s%A$K$7$^$7$?!#(B
%
+% [2016-07-11] memoir$B%/%i%9$N%^%K%e%"%k$K$h$k$H!$%H%s%\$r4^$a$?MQ;f$N@#K!$O(B
+% |\stockwidth|$B!$(B|\stockheight|$B$H8F$V$h$&$G$9$N$G!$$3$l$r;H$&$3$H$K$7$^$7$?!#(B
+%
% \begin{macrocode}
+\newdimen\stockwidth \newdimen\stockheight
+\setlength{\stockwidth}{\paperwidth}
+\setlength{\stockheight}{\paperheight}
+\iftombow
+ \advance \stockwidth 2in
+ \advance \stockheight 2in
+\fi
\ifpapersize
- \setlength{\@tempdima}{\paperwidth}
- \setlength{\@tempdimb}{\paperheight}
- \iftombow
- \advance \@tempdima 2in
- \advance \@tempdimb 2in
- \fi
- \AtBeginDvi{\special{papersize=\the\@tempdima,\the\@tempdimb}}
+ \AtBeginDvi{\special{papersize=\the\stockwidth,\the\stockheight}}
\fi
% \end{macrocode}
%
@@ -633,88 +713,182 @@
% \item |geometry| $BB&$G%*%W%7%g%s(B |mag| $B$O;H$($^$;$s!#(B
% \end{itemize}
%
+% [2016-07-08] |\jsc@mpt| $B$*$h$S(B |\jsc@mmm| $B$K!$$=$l$>$l(B1pt$B$*$h$S(B1mm$B$r3HBg$5$;$?CM$r3JG<$7$^$9!#(B
+% $B0J9_$N%l%$%"%&%H;XDj$G$O$3$A$i$r;H$$$^$9!#(B
+%
% \begin{macrocode}
+\newdimen\jsc@mpt
+\newdimen\jsc@mmm
\def\inv@mag{1}
-\ifnum\@ptsize=-2
- \mag 833
- \def\inv@mag{1.20048}
- \def\n@baseline{15}%
-\fi
-\ifnum\@ptsize=-1
- \mag 913 % formerly 900
- \def\inv@mag{1.09529}
- \def\n@baseline{15}%
-\fi
-\ifnum\@ptsize=1
- \mag 1095 % formerly 1100
- \def\inv@mag{0.913242}
-\fi
-\ifnum\@ptsize=2
- \mag 1200
- \def\inv@mag{0.833333}
-\fi
-\ifnum\@ptsize=4
- \mag 1440
- \def\inv@mag{0.694444}
-\fi
-\ifnum\@ptsize=7
- \mag 1728
- \def\inv@mag{0.578704}
-\fi
-\ifnum\@ptsize=10
- \mag 2000
- \def\inv@mag{0.5}
-\fi
-\ifnum\@ptsize=11
- \mag 2074
- \def\inv@mag{0.48216}
-\fi
-\ifnum\@ptsize=15
- \mag 2488
- \def\inv@mag{0.401929}
-\fi
-\ifnum\@ptsize=20
- \mag 2986
- \def\inv@mag{0.334896}
-\fi
-\ifnum\@ptsize=26
- \mag 3583
- \def\inv@mag{0.279096}
-\fi
-\ifnum\@ptsize=33
- \mag 4300
- \def\inv@mag{0.232558}
-\fi
-\ifnum\@ptsize=1200
- \mag 923
- \def\inv@mag{1.0834236}
-\fi
-\ifnum\@ptsize=1400
- \mag 1077
- \def\inv@mag{0.928505}
-\fi
-\ifnum\@ptsize=1001
- \mag 1085
- \def\inv@mag{0.921659}
-\fi
-\ifnum\@ptsize=1051
- \mag 1139
- \def\inv@mag{0.877963}
-\fi
-\ifnum\@ptsize=1101
- \mag 1194
- \def\inv@mag{0.837521}
-\fi
-\ifnum\@ptsize=1201
- \mag 1302
- \def\inv@mag{0.768049}
+\ifjsc@mag
+ \jsc@mpt=1\p@
+ \jsc@mmm=1mm
+ \ifnum\@ptsize=-2
+ \mag 833
+ \def\inv@mag{1.20048}
+ \def\n@baseline{15}%
+ \fi
+ \ifnum\@ptsize=-1
+ \mag 913 % formerly 900
+ \def\inv@mag{1.09529}
+ \def\n@baseline{15}%
+ \fi
+ \ifnum\@ptsize=1
+ \mag 1095 % formerly 1100
+ \def\inv@mag{0.913242}
+ \fi
+ \ifnum\@ptsize=2
+ \mag 1200
+ \def\inv@mag{0.833333}
+ \fi
+ \ifnum\@ptsize=4
+ \mag 1440
+ \def\inv@mag{0.694444}
+ \fi
+ \ifnum\@ptsize=7
+ \mag 1728
+ \def\inv@mag{0.578704}
+ \fi
+ \ifnum\@ptsize=10
+ \mag 2000
+ \def\inv@mag{0.5}
+ \fi
+ \ifnum\@ptsize=11
+ \mag 2074
+ \def\inv@mag{0.48216}
+ \fi
+ \ifnum\@ptsize=15
+ \mag 2488
+ \def\inv@mag{0.401929}
+ \fi
+ \ifnum\@ptsize=20
+ \mag 2986
+ \def\inv@mag{0.334896}
+ \fi
+ \ifnum\@ptsize=26
+ \mag 3583
+ \def\inv@mag{0.279096}
+ \fi
+ \ifnum\@ptsize=33
+ \mag 4300
+ \def\inv@mag{0.232558}
+ \fi
+ \ifnum\@ptsize=1200
+ \mag 923
+ \def\inv@mag{1.0834236}
+ \fi
+ \ifnum\@ptsize=1400
+ \mag 1077
+ \def\inv@mag{0.928505}
+ \fi
+ \ifnum\@ptsize=1001
+ \mag 1085
+ \def\inv@mag{0.921659}
+ \fi
+ \ifnum\@ptsize=1051
+ \mag 1139
+ \def\inv@mag{0.877963}
+ \fi
+ \ifnum\@ptsize=1101
+ \mag 1194
+ \def\inv@mag{0.837521}
+ \fi
+ \ifnum\@ptsize=1201
+ \mag 1302
+ \def\inv@mag{0.768049}
+ \fi
+\else
+ \jsc@mpt=\jsc@magscale\p@
+ \jsc@mmm=\jsc@magscale mm
+ \def\inv@mag{1}
+ \ifnum\@ptsize=-2
+ \def\n@baseline{15}%
+ \fi
+ \ifnum\@ptsize=-1
+ \def\n@baseline{15}%
+ \fi
\fi
%<*kiyou>
-\mag 977
-\def\inv@mag{1.02354}
+\def\jsc@magscale{0.9769230}
+\ifjsc@mag
+ \mag 977
+ \def\inv@mag{1.02354}
+ \jsc@mpt=1\p@
+ \jsc@mmm=1mm
+\else
+ \jsc@mpt=\jsc@magscale\p@
+ \jsc@mmm=\jsc@magscale mm
+ \def\inv@mag{1}
+\fi
%</kiyou>
+\ifjsc@mag@xreal
+ \RequirePackage{type1cm}
+ \mathchardef\jsc@csta=259
+ \def\jsc@invscale#1#2{%
+ \begingroup \@tempdima=#1\relax \@tempdimb#2\p@\relax
+ \@tempcnta\@tempdima \multiply\@tempcnta\@cclvi
+ \divide\@tempcnta\@tempdimb \multiply\@tempcnta\@cclvi
+ \@tempcntb\p@ \divide\@tempcntb\@tempdimb
+ \advance\@tempcnta-\@tempcntb \advance\@tempcnta-\tw@
+ \@tempdimb\@tempcnta\@ne
+ \advance\@tempcnta\@tempcntb \advance\@tempcnta\@tempcntb
+ \advance\@tempcnta\jsc@csta \@tempdimc\@tempcnta\@ne
+ \@whiledim\@tempdimb<\@tempdimc\do{%
+ \@tempcntb\@tempdimb \advance\@tempcntb\@tempdimc
+ \advance\@tempcntb\@ne \divide\@tempcntb\tw@
+ \ifdim #2\@tempcntb>\@tempdima
+ \advance\@tempcntb\m@ne \@tempdimc=\@tempcntb\@ne
+ \else \@tempdimb=\@tempcntb\@ne \fi}%
+ \xdef\jsc@gtmpa{\the\@tempdimb}%
+ \endgroup #1=\jsc@gtmpa\relax}
+ \expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax
+ \expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax
+ \let\jsc@get@external@font\get@external@font
+ \def\get@external@font{%
+ \jsc@preadjust@extract@font
+ \jsc@get@external@font}
+ \def\jsc@fstrunc#1{%
+ \edef\jsc@tmpa{\strip@pt#1}%
+ \expandafter\jsc@fstrunc@a\jsc@tmpa.****\@nil}
+ \def\jsc@fstrunc@a#1.#2#3#4#5#6\@nil{%
+ \if#5*\else
+ \edef\jsc@tmpa{#1%
+ \ifnum#2#3>\z@ .#2\ifnum#3>\z@ #3\fi\fi}%
+ \fi}
+ \def\jsc@preadjust@extract@font{%
+ \let\jsc@req@size\f@size
+ \dimen@\f@size\p@ \jsc@invscale\dimen@\jsc@magscale
+ \advance\dimen@.005pt\relax \jsc@fstrunc\dimen@
+ \let\jsc@ref@size\jsc@tmpa
+ \let\f@size\jsc@ref@size}
+ \def\execute@size@function#1{%
+ \let\jsc@cref@size\f@size
+ \let\f@size\jsc@req@size
+ \csname s@fct@#1\endcsname}
+ \let\jsc@DeclareErrorFont\DeclareErrorFont
+ \def\DeclareErrorFont#1#2#3#4#5{%
+ \@tempdimc#5\p@ \@tempdimc\jsc@magscale\@tempdimc
+ \edef\jsc@tmpa{{#1}{#2}{#3}{#4}{\strip@pt\@tempdimc}}
+ \expandafter\jsc@DeclareErrorFont\jsc@tmpa}
+ \def\gen@sfcnt{%
+ \edef\mandatory@arg{\mandatory@arg\jsc@cref@size}%
+ \empty@sfcnt}
+ \def\genb@sfcnt{%
+ \edef\mandatory@arg{%
+ \mandatory@arg\expandafter\genb@x\jsc@cref@size..\@@}%
+ \empty@sfcnt}
+ \DeclareErrorFont{OT1}{cmr}{m}{n}{10}
+\fi
+% \end{macrocode}
+%
+% [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
+%
+% \begin{macrocode}
\setlength\paperwidth{\inv@mag\paperwidth}%
\setlength\paperheight{\inv@mag\paperheight}%
+\setlength\stockwidth{\inv@mag\stockwidth}%
+\setlength\stockheight{\inv@mag\stockheight}%
% \end{macrocode}
%
% \paragraph{pagesize$B%9%Z%7%c%k$N=PNO(B}
@@ -897,9 +1071,17 @@
% $B2$J8!&OBJ84V$N%0%k!<$,F~$i$J$$$H$$$&I{:nMQ$b$"$j$^$9$N$G!$(B
% $BC1=c$JDj5A$KD>$7$^$9!#(B
%
+% [2016-08-26] $BOB2$J84V$N(B |\xkanjiskip| $B$,F~$i$J$$LdBj$O!$(B
+% plfonts.dtx v1.3i (2000/07/13)
+% $B$N;~E@$G=$@5$5$l$F$$$^$7$?!#5U$K!$(B\texttt{amsmath}$B%Q%C%1!<%8$r(B
+% $BFI$_9~$s$@>l9g$K!$?t<0Fb$NE:;z$GJ8;z%5%$%:$,JQ2=$9$k$h$&$K$J$k(B
+% $B$O$:$N$H$3$m$,!$JQ$o$i$J$/$J$C$F$$$^$7$?$N$G!$=$@5$7$^$7$?!#(B
+%
% \begin{macrocode}
-\def\textmc#1{\relax\ifmmode\hbox\fi{\mcfamily #1}}
-\def\textgt#1{\relax\ifmmode\hbox\fi{\gtfamily #1}}
+\DeclareRobustCommand\textmc[1]{%
+ \relax\ifmmode \expandafter\nfss@text \fi{\mcfamily #1}}
+\DeclareRobustCommand\textgt[1]{%
+ \relax\ifmmode \expandafter\nfss@text \fi{\gtfamily #1}}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -971,13 +1153,11 @@
\def\DLMfontsw@oldstyle#1#2{#1\relax\@fontswitch\relax{#2}}
\def\DLMfontsw@oldlfont#1#2{#1\relax#2\relax}
\if@enablejfam
- \if@compatibility\else
- \DeclareSymbolFont{mincho}{\jsc@JYn}{mc}{m}{n}
- \DeclareSymbolFontAlphabet{\mathmc}{mincho}
- \SetSymbolFont{mincho}{bold}{\jsc@JYn}{gt}{m}{n}
- \jfam\symmincho
- \DeclareMathAlphabet{\mathgt}{\jsc@JYn}{gt}{m}{n}
- \fi
+ \DeclareSymbolFont{mincho}{\jsc@JYn}{mc}{m}{n}
+ \DeclareSymbolFontAlphabet{\mathmc}{mincho}
+ \SetSymbolFont{mincho}{bold}{\jsc@JYn}{gt}{m}{n}
+ \jfam\symmincho
+ \DeclareMathAlphabet{\mathgt}{\jsc@JYn}{gt}{m}{n}
\AtBeginDocument{%
\reDeclareMathAlphabet{\mathrm}{\@mathrm}{\@mathmc}
\reDeclareMathAlphabet{\mathbf}{\@mathbf}{\@mathgt}}
@@ -1180,8 +1360,11 @@
% $B$G$O(B |I watch TV\@.| $B$H=q$/$H(B V $B$H%T%j%*%I$N%Z%"%+!<%K%s%0$,8z$+$J$/$J$j$^$9!#(B
% $B$=$3$G!$<!$N$h$&$JDj5A$KD>$7!$(B|I watch TV.\@| $B$H=q$/$3$H$K$7$^$9!#(B
%
+% [2016-07-14] 2015-01-01$B$N(B\LaTeX $B$G!$(Bauxiliary files$B$K=q$-=P$5$l$?$H$-$K(B
+% $B%9%Z!<%9$,?)$o$l$J$$$h$&$K$9$k=$@5$,F~$j$^$7$?!#$3$l$K9g$o$;$F(B |{}| $B$rJd$$$^$7$?!#(B
+%
% \begin{macrocode}
-\def\@{\spacefactor3000\space}
+\def\@{\spacefactor3000{}}
% \end{macrocode}
% \end{macro}
%
@@ -1254,6 +1437,15 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\jsc@setfontsize}
+% $B%/%i%9%U%!%$%k$NFbIt$G$O!$3HBgN($b9MN8$7$?(B |\jsc@setfontsize| $B$r(B
+% |\@setfontsize| $B$NJQ$o$j$KMQ$$$k$3$H$K$7$^$9!#(B
+% \begin{macrocode}
+\def\jsc@setfontsize#1#2#3{%
+ \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}}
+% \end{macrocode}
+% \end{macro}
+%
% $B$3$l$i$N%0%k!<$r$b$C$F$7$F$b9TJ,3d$,$G$-$J$$>l9g$O!$(B
% |\emergencystretch| $B$KAJ$($^$9!#(B
%
@@ -1318,9 +1510,9 @@
% \begin{macrocode}
\renewcommand{\normalsize}{%
\ifnarrowbaselines
- \@setfontsize\normalsize\@xpt\@xiipt
+ \jsc@setfontsize\normalsize\@xpt\@xiipt
\else
- \@setfontsize\normalsize\@xpt{\n@baseline}%
+ \jsc@setfontsize\normalsize\@xpt{\n@baseline}%
\fi
% \end{macrocode}
%
@@ -1334,9 +1526,9 @@
% $B$$$^$7$?$,!$7k6I!$HyD4@a$7$F$_$k$3$H$K$7$^$7$?!#(B
%
% \begin{macrocode}
- \abovedisplayskip 11\p@ \@plus3\p@ \@minus4\p@
- \abovedisplayshortskip \z@ \@plus3\p@
- \belowdisplayskip 9\p@ \@plus3\p@ \@minus4\p@
+ \abovedisplayskip 11\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
+ \abovedisplayshortskip \z@ \@plus3\jsc@mpt
+ \belowdisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
\belowdisplayshortskip \belowdisplayskip
% \end{macrocode}
%
@@ -1393,14 +1585,14 @@
% \begin{macrocode}
\newcommand{\small}{%
\ifnarrowbaselines
-%<!kiyou> \@setfontsize\small\@ixpt{11}%
-%<kiyou> \@setfontsize\small{8.8888}{11}%
+%<!kiyou> \jsc@setfontsize\small\@ixpt{11}%
+%<kiyou> \jsc@setfontsize\small{8.8888}{11}%
\else
-%<!kiyou> \@setfontsize\small\@ixpt{13}%
-%<kiyou> \@setfontsize\small{8.8888}{13.2418}%
+%<!kiyou> \jsc@setfontsize\small\@ixpt{13}%
+%<kiyou> \jsc@setfontsize\small{8.8888}{13.2418}%
\fi
- \abovedisplayskip 9\p@ \@plus3\p@ \@minus4\p@
- \abovedisplayshortskip \z@ \@plus3\p@
+ \abovedisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt
+ \abovedisplayshortskip \z@ \@plus3\jsc@mpt
\belowdisplayskip \abovedisplayskip
\belowdisplayshortskip \belowdisplayskip
\def\@listi{\leftmargin\leftmargini
@@ -1419,14 +1611,14 @@
% \begin{macrocode}
\newcommand{\footnotesize}{%
\ifnarrowbaselines
-%<!kiyou> \@setfontsize\footnotesize\@viiipt{9.5}%
-%<kiyou> \@setfontsize\footnotesize{8.8888}{11}%
+%<!kiyou> \jsc@setfontsize\footnotesize\@viiipt{9.5}%
+%<kiyou> \jsc@setfontsize\footnotesize{8.8888}{11}%
\else
-%<!kiyou> \@setfontsize\footnotesize\@viiipt{11}%
-%<kiyou> \@setfontsize\footnotesize{8.8888}{13.2418}%
+%<!kiyou> \jsc@setfontsize\footnotesize\@viiipt{11}%
+%<kiyou> \jsc@setfontsize\footnotesize{8.8888}{13.2418}%
\fi
- \abovedisplayskip 6\p@ \@plus2\p@ \@minus3\p@
- \abovedisplayshortskip \z@ \@plus2\p@
+ \abovedisplayskip 6\jsc@mpt \@plus2\jsc@mpt \@minus3\jsc@mpt
+ \abovedisplayshortskip \z@ \@plus2\jsc@mpt
\belowdisplayskip \abovedisplayskip
\belowdisplayshortskip \belowdisplayskip
\def\@listi{\leftmargin\leftmargini
@@ -1455,21 +1647,21 @@
% [2004-11-03] |\HUGE| $B$rDI2C!#(B
%
% \begin{macrocode}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
-\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
+\newcommand{\scriptsize}{\jsc@setfontsize\scriptsize\@viipt\@viiipt}
+\newcommand{\tiny}{\jsc@setfontsize\tiny\@vpt\@vipt}
\if@twocolumn
-%<!kiyou> \newcommand{\large}{\@setfontsize\large\@xiipt{\n@baseline}}
-%<kiyou> \newcommand{\large}{\@setfontsize\large{11.111}{\n@baseline}}
+%<!kiyou> \newcommand{\large}{\jsc@setfontsize\large\@xiipt{\n@baseline}}
+%<kiyou> \newcommand{\large}{\jsc@setfontsize\large{11.111}{\n@baseline}}
\else
-%<!kiyou> \newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-%<kiyou> \newcommand{\large}{\@setfontsize\large{11.111}{17}}
+%<!kiyou> \newcommand{\large}{\jsc@setfontsize\large\@xiipt{17}}
+%<kiyou> \newcommand{\large}{\jsc@setfontsize\large{11.111}{17}}
\fi
-%<!kiyou>\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-%<kiyou>\newcommand{\Large}{\@setfontsize\Large{12.222}{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
-\newcommand{\HUGE}{\@setfontsize\HUGE{30}{40}}
+%<!kiyou>\newcommand{\Large}{\jsc@setfontsize\Large\@xivpt{21}}
+%<kiyou>\newcommand{\Large}{\jsc@setfontsize\Large{12.222}{21}}
+\newcommand{\LARGE}{\jsc@setfontsize\LARGE\@xviipt{25}}
+\newcommand{\huge}{\jsc@setfontsize\huge\@xxpt{28}}
+\newcommand{\Huge}{\jsc@setfontsize\Huge\@xxvpt{33}}
+\newcommand{\HUGE}{\jsc@setfontsize\HUGE{30}{40}}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1525,7 +1717,7 @@
% \begin{macrocode}
%<!kiyou>\setlength\columnsep{2zw}
%<kiyou>\setlength\columnsep{28truebp}
-\setlength\columnseprule{0\p@}
+\setlength\columnseprule{0\jsc@mpt}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1543,10 +1735,10 @@
% \texttt{normal...} $B$NIU$$$?J}$OJ]B8MQ$G$9!#(B
%
% \begin{macrocode}
-\setlength\lineskip{1\p@}
-\setlength\normallineskip{1\p@}
-\setlength\lineskiplimit{1\p@}
-\setlength\normallineskiplimit{1\p@}
+\setlength\lineskip{1\jsc@mpt}
+\setlength\normallineskip{1\jsc@mpt}
+\setlength\lineskiplimit{1\jsc@mpt}
+\setlength\normallineskiplimit{1\jsc@mpt}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1577,7 +1769,7 @@
% |\parindent| $B$OCJMn$N@hF,$N;z2<$2I}$G$9!#(B
%
% \begin{macrocode}
-\setlength\parskip{0\p@}
+\setlength\parskip{0\jsc@mpt}
\if@slide
\setlength\parindent{0zw}
\else
@@ -1643,12 +1835,16 @@
% $B7W;;$G$O(B |\headheight| $B$G$O$J$/(B |\topskip| $B$r;H$&(B
% $B$3$H$K$7$^$7$?!#(B
%
+% [2016-08-17] $B7wE@$d%k%S$,0l9TL\$KMh$?>l9g$K2<$,$k$N$rKI$0$?(B
+% $B$a!$(B|\topskip| $B$r(B10pt$B$+$i(B1.38zw$B$KA}$d$7$^$7$?!#(B
+% |\headheight| $B$O=>Mh$HF1$8(B20pt$B$N$^$^$H$7$^$9!#(B
+%
% \begin{macrocode}
-\setlength\topskip{10\p@}
+\setlength\topskip{1.38zw}%% from 10\jsc@mpt (2016-08-17)
\if@slide
- \setlength\headheight{0\p@}
+ \setlength\headheight{0\jsc@mpt}
\else
- \setlength\headheight{2\topskip}
+ \setlength\headheight{20\jsc@mpt}%% from 2\topskip (2016-08-17); from \topskip (2003-06-26)
\fi
% \end{macrocode}
% \end{macro}
@@ -1674,7 +1870,7 @@
\fi
\fi
%</article|kiyou>
-%<jspf>\setlength\footskip{9mm}
+%<jspf>\setlength\footskip{9\jsc@mmm}
%<*book>
\if@report
\setlength\footskip{0.03367\paperheight}
@@ -1698,7 +1894,7 @@
% \begin{macrocode}
%<*article>
\if@slide
- \setlength\headsep{0\p@}
+ \setlength\headsep{0\jsc@mpt}
\else
\setlength\headsep{\footskip}
\addtolength\headsep{-\topskip}
@@ -1709,16 +1905,16 @@
\setlength\headsep{\footskip}
\addtolength\headsep{-\topskip}
\else
- \setlength\headsep{6mm}
+ \setlength\headsep{6\jsc@mmm}
\fi
%</book>
%<*jspf>
-\setlength\headsep{9mm}
+\setlength\headsep{9\jsc@mmm}
\addtolength\headsep{-\topskip}
%</jspf>
%<*kiyou>
-\setlength\headheight{0\p@}
-\setlength\headsep{0\p@}
+\setlength\headheight{0\jsc@mpt}
+\setlength\headsep{0\jsc@mpt}
%</kiyou>
% \end{macrocode}
% \end{macro}
@@ -1778,7 +1974,7 @@
\setlength\fullwidth{0.76\paperwidth}
\else
\setlength\fullwidth{\paperwidth}
- \addtolength\fullwidth{-36mm}
+ \addtolength\fullwidth{-36\jsc@mmm}
\fi
\if@twocolumn \@tempdima=2zw \else \@tempdima=1zw \fi
\divide\fullwidth\@tempdima \multiply\fullwidth\@tempdima
@@ -1793,7 +1989,7 @@
%</book>
%<*jspf>
\setlength\fullwidth{50zw}
-\addtolength\fullwidth{8mm}
+\addtolength\fullwidth{8\jsc@mmm}
\setlength\textwidth{\fullwidth}
%</jspf>
%<*kiyou>
@@ -1826,6 +2022,9 @@
% [2003-06-26] |\headheight| $B$r(B |\topskip| $B$KD>$7$^$7$?!#(B
% $B0JA0$O$3$NFs$D$OCM$,F1$8$G$"$C$?$N$G!$JQ2=$O$J$$$O$:$G$9!#(B
%
+% [2016-08-26] |\topskip| $B$r(B10pt$B$+$i(B1.38zw$B$KA}$d$7$^$7$?$N$G!$(B
+% $B$=$NJ,(B |\textheight| $B$rA}$d$7$^$9!J(B2016-08-17$B$G$N=$@5O3$l!K!#(B
+%
% \begin{macrocode}
%<*article|book>
\if@slide
@@ -1833,7 +2032,7 @@
\else
\setlength{\textheight}{0.83\paperheight}
\fi
-\addtolength{\textheight}{-\topskip}
+\addtolength{\textheight}{-0.5\headheight}%% from -\topskip (2016-08-26); from -\headheight (2003-06-26)
\addtolength{\textheight}{-\headsep}
\addtolength{\textheight}{-\footskip}
\addtolength{\textheight}{-\topskip}
@@ -1843,8 +2042,26 @@
%<jspf>\setlength{\textheight}{51\baselineskip}
%<kiyou>\setlength{\textheight}{47\baselineskip}
\addtolength{\textheight}{\topskip}
-\addtolength{\textheight}{0.1\p@}
-%<jspf>\setlength{\mathindent}{10mm}
+\addtolength{\textheight}{0.1\jsc@mpt}
+%<jspf>\setlength{\mathindent}{10\jsc@mmm}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\flushbottom}
+%
+% [2016-07-18] |\textheight| $B$KG0$N$?$a(B0.1$B%]%$%s%HM>M5$r;}$?$;$F(B
+% $B$$$k$N$HF1MM$K!$(B|\flushbottom| $B$K$bM>M5$r;}$?$;$^$9!#(B
+% $B85$N(B\LaTeXe $B$G$N40A4$J(B |\flushbottom| $B$NDj5A$O(B
+%\begin{verbatim}
+% \def\flushbottom{%
+% \let\@textbottom\relax \let\@texttop\relax}
+%\end{verbatim}
+% $B$G$9$,!$<!$N$h$&$K$7$^$9!#(B
+%
+% \begin{macrocode}
+\def\flushbottom{%
+ \def\@textbottom{\vskip \z@ \@plus.1\jsc@mpt}%
+ \let\@texttop\relax}
% \end{macrocode}
% \end{macro}
%
@@ -1901,7 +2118,7 @@
\addtolength\marginparwidth{-\oddsidemargin}
\addtolength\marginparwidth{-\inv@mag in}
\addtolength\marginparwidth{-\textwidth}
-\addtolength\marginparwidth{-1cm}
+\addtolength\marginparwidth{-10\jsc@mmm}
\addtolength\marginparwidth{-\marginparsep}
\@tempdima=1zw
\divide\marginparwidth\@tempdima
@@ -1917,13 +2134,18 @@
% [2003-06-26] |\headheight| $B$r(B |\topskip| $B$KD>$7$^$7$?!#(B
% $B0JA0$O$3$NFs$D$OCM$,F1$8$G$"$C$?$N$G!$JQ2=$O$J$$$O$:$G$9!#(B
%
+% [2016-08-17] |\topskip| $B$r(B10pt$B$+$i(B1.38zw$B$KD>$7$^$7$?$,!$(B
+% |\topmargin| $B$O=>Mh$NCM$+$iJQ$o$i$J$$$h$&$KD4@a$7$^$7$?!#(B
+% $B!D$N$D$b$j$G$7$?$,!$(B|\textheight| $B$rA}$d$7K:$l$F$$$?$N$G(B
+% $BJQ$o$C$F$7$^$C$F$$$^$7$?!J(B2016-08-26$B=$@5:Q$_!K!#(B
+%
% \begin{macrocode}
\setlength\topmargin{\paperheight}
\addtolength\topmargin{-\textheight}
\if@slide
\addtolength\topmargin{-\headheight}
\else
- \addtolength\topmargin{-\topskip}
+ \addtolength\topmargin{-0.5\headheight}%% from -\topskip (2016-08-17); from -\headheight (2003-06-26)
\fi
\addtolength\topmargin{-\headsep}
\addtolength\topmargin{-\footskip}
@@ -1958,7 +2180,7 @@
% $BOBJ8$N9TAw$j$r9M$($F$b$&$A$g$C$HBg$-$/$7$^$9!#(B
%
% \begin{macrocode}
-\setlength{\skip\footins}{16\p@ \@plus 5\p@ \@minus 2\p@}
+\setlength{\skip\footins}{16\jsc@mpt \@plus 5\jsc@mpt \@minus 2\jsc@mpt}
% \end{macrocode}
% \end{macro}
%
@@ -1966,8 +2188,8 @@
%
% $B%U%m!<%H!J?^!$I=!K4XO"$N%Q%i%a!<%?$O(B\LaTeXe $BK\BN$GDj5A$5$l$F$$$^$9$,!$(B
% $B$3$3$G@_DjJQ99$7$^$9!#K\J8%Z!<%8!JK\J8$H%U%m!<%H$,6&B8$9$k%Z!<%8!K(B
-% $B$A$J$_$K!$%+%&%s%?$OFbIt$G$O(B |\c@| $B$rL>A0$K4'$7$?%^%/%m$K$J$C$F$$$^$9!#(B
% $B$H%U%m!<%H$@$1$N%Z!<%8$G@_Dj$,0[$J$j$^$9!#(B
+% $B$A$J$_$K!$%+%&%s%?$OFbIt$G$O(B |\c@| $B$rL>A0$K4'$7$?%^%/%m$K$J$C$F$$$^$9!#(B
%
% \begin{macro}{\c@topnumber}
%
@@ -2084,9 +2306,9 @@
% |\intextsep| $B$OK\J8$NESCf$K=PNO$5$l$k%U%m!<%H$HK\J8$H$N5wN%$G$9!#(B
%
% \begin{macrocode}
-\setlength\floatsep {12\p@ \@plus 2\p@ \@minus 2\p@}
-\setlength\textfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@}
-\setlength\intextsep {12\p@ \@plus 2\p@ \@minus 2\p@}
+\setlength\floatsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt}
+\setlength\textfloatsep{20\jsc@mpt \@plus 2\jsc@mpt \@minus 4\jsc@mpt}
+\setlength\intextsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -2098,8 +2320,8 @@
% $BFsCJAH$N$H$-$NCJH4$-$N%U%m!<%H$K$D$$$F$NCM$G$9!#(B
%
% \begin{macrocode}
-\setlength\dblfloatsep {12\p@ \@plus 2\p@ \@minus 2\p@}
-\setlength\dbltextfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@}
+\setlength\dblfloatsep {12\jsc@mpt \@plus 2\jsc@mpt \@minus 2\jsc@mpt}
+\setlength\dbltextfloatsep{20\jsc@mpt \@plus 2\jsc@mpt \@minus 4\jsc@mpt}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -2114,9 +2336,9 @@
% |\@fpsep| $B$O%U%m!<%H4V$KF~$j$^$9!#(B
%
% \begin{macrocode}
-\setlength\@fptop{0\p@ \@plus 1fil}
-\setlength\@fpsep{8\p@ \@plus 2fil}
-\setlength\@fpbot{0\p@ \@plus 1fil}
+\setlength\@fptop{0\jsc@mpt \@plus 1fil}
+\setlength\@fpsep{8\jsc@mpt \@plus 2fil}
+\setlength\@fpbot{0\jsc@mpt \@plus 1fil}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -2129,9 +2351,9 @@
% $BCJH4$-%U%m!<%H$K$D$$$F$NCM$G$9!#(B
%
% \begin{macrocode}
-\setlength\@dblfptop{0\p@ \@plus 1fil}
-\setlength\@dblfpsep{8\p@ \@plus 2fil}
-\setlength\@dblfpbot{0\p@ \@plus 1fil}
+\setlength\@dblfptop{0\jsc@mpt \@plus 1fil}
+\setlength\@dblfpsep{8\jsc@mpt \@plus 2fil}
+\setlength\@dblfpbot{0\jsc@mpt \@plus 1fil}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -2435,16 +2657,16 @@
\begin{center}
\mbox{} \\[1zw]
\large
- {\maybeblue\hrule height0pt depth2pt\relax}\par
+ {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
\smallskip
\@title
\smallskip
- {\maybeblue\hrule height0pt depth2pt\relax}\par
+ {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
\vfill
{\small \@author}%
\end{center}
\else
- \vskip 60\p@
+ \vskip 60\jsc@mpt
\begin{center}%
{\LARGE \@title \par}%
\vskip 3em%
@@ -2592,7 +2814,7 @@
\centerline{\box\@abstractbox}
\ifx\@keywords\@undefined\else
\vskip 1.5em
- \centerline{\parbox{157mm}{\textsf{Keywords:}\\ \small\@keywords}}
+ \centerline{\parbox{157\jsc@mmm}{\textsf{Keywords:}\\ \small\@keywords}}
\fi
\vskip 1.5em}
%</jspf>
@@ -2720,6 +2942,9 @@
% $BFs$DA^F~$7$?(B |\everyparhook| $B$N$&$A8e<T$,(B |\paragraph| $BN`$N8e$G(B2$B2s<B9T$5$l!$(B
% $B$=$l0J9_$OA0<T$,<B9T$5$l$^$9!#(B
%
+% [2016-07-28] \texttt{slide}$B%*%W%7%g%s$H(B\texttt{twocolumn}$B%*%W%7%g%s$r(B
+% $BF1;~$K;XDj$7$?>l9g$N7S@~$N0LCV$rHyD4@0$7$^$7$?!#(B
+%
% \begin{macrocode}
\def\@xsect#1{%
% $B8+=P$7$N8e$m$N6u$-$r(B \@tempskipa $B$K%;%C%H(B
@@ -2747,7 +2972,9 @@
\@afterheading
\fi
\if@slide
- {\vskip-6pt\maybeblue\hrule height0pt depth1pt\vskip7pt\relax}%
+ {\vskip\if@twocolumn-5\jsc@mpt\else-6\jsc@mpt\fi
+ \maybeblue\hrule height0\jsc@mpt depth1\jsc@mpt
+ \vskip\if@twocolumn 4\jsc@mpt\else 7\jsc@mpt\fi\relax}%
\fi
\par % 2000-12-18
\ignorespaces}
@@ -3070,7 +3297,7 @@
\normalfont
\ifnum \c@secnumdepth >-2\relax
\huge\headfont \prepartname\thepart\postpartname
- \par\vskip20\p@
+ \par\vskip20\jsc@mpt
\fi
\Huge \headfont #2\par}%
\@endpart}
@@ -3168,8 +3395,8 @@
\addcontentsline{toc}{chapter}{#1}%
\fi
\chaptermark{#1}%
- \addtocontents{lof}{\protect\addvspace{10\p@}}%
- \addtocontents{lot}{\protect\addvspace{10\p@}}%
+ \addtocontents{lof}{\protect\addvspace{10\jsc@mpt}}%
+ \addtocontents{lot}{\protect\addvspace{10\jsc@mpt}}%
\if@twocolumn
\@topnewpage[\@makechapterhead{#2}]%
\else
@@ -3272,7 +3499,7 @@
% \begin{macrocode}
\if@twocolumn
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
- {\z@}{\z@}%
+ {\z@}{\if@slide .4\Cvs \else \z@ \fi}%
{\normalfont\normalsize\headfont}}
\else
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
@@ -3285,15 +3512,19 @@
% \end{macro}
%
% \begin{macro}{\subsubsection}
+%
+% [2016-07-22] \texttt{slide}$B%*%W%7%g%s;XDj;~$K(B |\subsubsection| $B$NJ8;zNs(B
+% $B$H7S@~$,=E$J$kLdBj$KBP=h$7$^$7$?(B(forum:1982)$B!#(B
+%
% \begin{macrocode}
\if@twocolumn
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
- {\z@}{\z@}%
+ {\z@}{\if@slide .4\Cvs \else \z@ \fi}%
{\normalfont\normalsize\headfont}}
\else
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{\Cvs \@plus.5\Cdp \@minus.2\Cdp}%
- {\z@}%
+ {\if@slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}%
{\normalfont\normalsize\headfont}}
\fi
% \end{macrocode}
@@ -3306,13 +3537,13 @@
% \begin{macrocode}
\if@twocolumn
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
- {\z@}{-1zw}% $B2~9T$;$:(B 1zw $B$N%"%-(B
+ {\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}}
\else
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}%
- {-1zw}% $B2~9T$;$:(B 1zw $B$N%"%-(B
+ {\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}}
\fi
@@ -3324,9 +3555,15 @@
% $B8+=P$7$N8e$m$G2~9T$5$l$^$;$s!#(B
%
% \begin{macrocode}
-\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
- {\z@}{-1zw}%
- {\normalfont\normalsize\headfont}}
+\if@twocolumn
+ \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
+ {\z@}{\if@slide .4\Cvs \@plus.3\Cdp \else -1zw\fi}%
+ {\normalfont\normalsize\headfont}}
+\else
+ \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
+ {\z@}{\if@slide .5\Cvs \@plus.3\Cdp \else -1zw\fi}%
+ {\normalfont\normalsize\headfont}}
+\fi
% \end{macrocode}
% \end{macro}
%
@@ -3692,9 +3929,9 @@
\newbox\@abstractbox
\newenvironment{abstract}{%
\global\setbox\@abstractbox\hbox\bgroup
- \begin{minipage}[b]{157mm}{\sffamily Abstract}\par
+ \begin{minipage}[b]{157\jsc@mmm}{\sffamily Abstract}\par
\small
- \if@english \parindent6mm \else \parindent1zw \fi}%
+ \if@english \parindent6\jsc@mmm \else \parindent1zw \fi}%
{\end{minipage}\egroup}
%</jspf>
% \end{macrocode}
@@ -3712,7 +3949,7 @@
%\newbox\@keywordsbox
%\newenvironment{keywords}{%
% \global\setbox\@keywordsbox\hbox\bgroup
-% \begin{minipage}[b]{157mm}{\sffamily Keywords:}\par
+% \begin{minipage}[b]{1570\jsc@mmm}{\sffamily Keywords:}\par
% \small\parindent0zw}%
% {\end{minipage}\egroup}
%</jspf>
@@ -3850,7 +4087,7 @@
% |array| $B4D6-$NNs4V$K$O(B |\arraycolsep| $B$N(B2$BG\$NI}$N6u$-$,F~$j$^$9!#(B
%
% \begin{macrocode}
-\setlength\arraycolsep{5\p@}
+\setlength\arraycolsep{5\jsc@mpt}
% \end{macrocode}
% \end{macro}
%
@@ -3859,7 +4096,7 @@
% |tabular| $B4D6-$NNs4V$K$O(B |\tabcolsep| $B$N(B2$BG\$NI}$N6u$-$,F~$j$^$9!#(B
%
% \begin{macrocode}
-\setlength\tabcolsep{6\p@}
+\setlength\tabcolsep{6\jsc@mpt}
% \end{macrocode}
% \end{macro}
%
@@ -3868,7 +4105,7 @@
% |array|$B!$(B|tabular| $B4D6-Fb$N7S@~$NI}$G$9!#(B
%
% \begin{macrocode}
-\setlength\arrayrulewidth{.4\p@}
+\setlength\arrayrulewidth{.4\jsc@mpt}
% \end{macrocode}
% \end{macro}
%
@@ -3877,7 +4114,7 @@
% |array|$B!$(B|tabular| $B4D6-$G$NFs=E7S@~4V$N%"%-$G$9!#(B
%
% \begin{macrocode}
-\setlength\doublerulesep{2\p@}
+\setlength\doublerulesep{2\jsc@mpt}
% \end{macrocode}
% \end{macro}
%
@@ -3916,8 +4153,8 @@
% |\fbox|$B!$(B|\framebox| $B$N7S@~$NI}$G$9!#(B
%
% \begin{macrocode}
-\setlength\fboxsep{3\p@}
-\setlength\fboxrule{.4\p@}
+\setlength\fboxsep{3\jsc@mpt}
+\setlength\fboxrule{.4\jsc@mpt}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4126,8 +4363,8 @@
% \begin{macrocode}
\newlength\abovecaptionskip
\newlength\belowcaptionskip
-\setlength\abovecaptionskip{5\p@} % $B85(B: 10\p@
-\setlength\belowcaptionskip{5\p@} % $B85(B: 0\p@
+\setlength\abovecaptionskip{5\jsc@mpt} % $B85(B: 10\p@
+\setlength\belowcaptionskip{5\jsc@mpt} % $B85(B: 0\p@
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4141,8 +4378,8 @@
% \begin{macrocode}
%<*!jspf>
% \long\def\@makecaption#1#2{{\small
-% \advance\leftskip1cm
-% \advance\rightskip1cm
+% \advance\leftskip 10\jsc@mmm
+% \advance\rightskip 10\jsc@mmm
% \vskip\abovecaptionskip
% \sbox\@tempboxa{#1\hskip1zw\relax #2}%
% \ifdim \wd\@tempboxa >\hsize
@@ -4172,9 +4409,9 @@
\itemsep \z@
\itemindent \z@
\labelsep \z@
- \labelwidth 11mm
+ \labelwidth 11\jsc@mmm
\listparindent\z@
- \leftmargin 11mm}\item\relax #2\endlist}
+ \leftmargin 11\jsc@mmm}\item\relax #2\endlist}
\else
\global \@minipagefalse
\hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
@@ -4330,18 +4567,18 @@
%
% $BL\<!$r@8@.$7$^$9!#(B
%
-% \begin{macro}{\js@tocl@width}
+% \begin{macro}{\jsc@tocl@width}
%
% [2013-12-30] |\prechaptername| $B$J$I$+$i8+@Q$b$C$?L\<!$N%i%Y%k$ND9$5$G$9!#(B(by ts)
%
% \begin{macrocode}
-\newdimen\js@tocl@width
+\newdimen\jsc@tocl@width
\newcommand{\tableofcontents}{%
%<*book>
- \settowidth\js@tocl@width{\headfont\prechaptername\postchaptername}%
+ \settowidth\jsc@tocl@width{\headfont\prechaptername\postchaptername}%
\settowidth\@tempdima{\headfont\appendixname}%
- \ifdim\js@tocl@width<\@tempdima \setlength\js@tocl@width{\@tempdima}\fi
- \ifdim\js@tocl@width<2zw \divide\js@tocl@width by 2 \advance\js@tocl@width 1zw\fi
+ \ifdim\jsc@tocl@width<\@tempdima \setlength\jsc@tocl@width{\@tempdima}\fi
+ \ifdim\jsc@tocl@width<2zw \divide\jsc@tocl@width by 2 \advance\jsc@tocl@width 1zw\fi
\if@twocolumn
\@restonecoltrue\onecolumn
\else
@@ -4351,10 +4588,10 @@
\@mkboth{\contentsname}{}%
%</book>
%<*!book>
- \settowidth\js@tocl@width{\headfont\presectionname\postsectionname}%
+ \settowidth\jsc@tocl@width{\headfont\presectionname\postsectionname}%
\settowidth\@tempdima{\headfont\appendixname}%
- \ifdim\js@tocl@width<\@tempdima\relax\setlength\js@tocl@width{\@tempdima}\fi
- \ifdim\js@tocl@width<2zw \divide\js@tocl@width by 2 \advance\js@tocl@width 1zw\fi
+ \ifdim\jsc@tocl@width<\@tempdima\relax\setlength\jsc@tocl@width{\@tempdima}\fi
+ \ifdim\jsc@tocl@width<2zw \divide\jsc@tocl@width by 2 \advance\jsc@tocl@width 1zw\fi
\section*{\contentsname}%
\@mkboth{\contentsname}{\contentsname}%
%</!book>
@@ -4373,7 +4610,7 @@
\ifnum \c@tocdepth >-2\relax
%<!book> \addpenalty\@secpenalty
%<book> \addpenalty{-\@highpenalty}%
- \addvspace{2.25em \@plus\p@}%
+ \addvspace{2.25em \@plus\jsc@mpt}%
\begingroup
\parindent \z@
% \@pnumwidth should be \@tocrmarg
@@ -4396,7 +4633,7 @@
%
% $B>O$NL\<!$G$9!#(B|\@lnumwidth| $B$r(B4.683zw$B$KA}$d$7$^$7$?!#(B
%
-% [2013-12-30] |\@lnumwidth| $B$r(B |\js@tocl@width| $B$+$i(B
+% [2013-12-30] |\@lnumwidth| $B$r(B |\jsc@tocl@width| $B$+$i(B
% $B7h$a$k$h$&$K$7$F$_$^$7$?!#(B(by ts)
%
% \begin{macrocode}
@@ -4404,7 +4641,7 @@
\newcommand*{\l@chapter}[2]{%
\ifnum \c@tocdepth >\m@ne
\addpenalty{-\@highpenalty}%
- \addvspace{1.0em \@plus\p@}
+ \addvspace{1.0em \@plus\jsc@mpt}
% \vskip 1.0em \@plus\p@ % book.cls$B$G$O",$,$3$&$J$C$F$$$k(B
\begingroup
\parindent\z@
@@ -4413,7 +4650,7 @@
\parfillskip-\rightskip
\leavevmode\headfont
% \if@english\setlength\@lnumwidth{5.5em}\else\setlength\@lnumwidth{4.683zw}\fi
- \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2.683zw
+ \setlength\@lnumwidth{\jsc@tocl@width}\advance\@lnumwidth 2.683zw
\advance\leftskip\@lnumwidth \hskip-\leftskip
#1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
\penalty\@highpenalty
@@ -4432,7 +4669,7 @@
\newcommand*{\l@section}[2]{%
\ifnum \c@tocdepth >\z@
\addpenalty{\@secpenalty}%
- \addvspace{1.0em \@plus\p@}%
+ \addvspace{1.0em \@plus\jsc@mpt}%
\begingroup
\parindent\z@
% \rightskip\@pnumwidth
@@ -4440,7 +4677,7 @@
\parfillskip-\rightskip
\leavevmode\headfont
%\setlength\@lnumwidth{4zw}% $B85(B1.5em [2003-03-02]
- \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2zw
+ \setlength\@lnumwidth{\jsc@tocl@width}\advance\@lnumwidth 2zw
\advance\leftskip\@lnumwidth \hskip-\leftskip
#1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
\endgroup
@@ -4454,7 +4691,7 @@
%<book> % \newcommand*{\l@section}{\@dottedtocline{1}{1zw}{3.683zw}}
% \end{macrocode}
%
-% [2013-12-30] $B>e$N%$%s%G%s%H$O(B |\js@tocl@width| $B$+$i7h$a$k$h$&$K(B
+% [2013-12-30] $B>e$N%$%s%G%s%H$O(B |\jsc@tocl@width| $B$+$i7h$a$k$h$&$K(B
% $B$7$^$7$?!#(B(by ts)
%
% \end{macro}
@@ -4467,7 +4704,7 @@
% $B$5$i$K2<0L%l%Y%k$NL\<!9`L\$NBN:[$G$9!#(B
% $B$"$^$j;H$C$?$3$H$,$"$j$^$;$s$N$G!$MW=$@5$+$b$7$l$^$;$s!#(B
%
-% [2013-12-30] $B$3$3$b(B |\js@tocl@width| $B$+$i7h$a$k$h$&$K(B
+% [2013-12-30] $B$3$3$b(B |\jsc@tocl@width| $B$+$i7h$a$k$h$&$K(B
% $B$7$F$_$^$7$?!#(B(by ts)
%
% \begin{macrocode}
@@ -4483,16 +4720,16 @@
% \newcommand*{\l@subparagraph} {\@dottedtocline{5}{4zw}{3zw}}
%
\newcommand*{\l@subsection}{%
- \@tempdima\js@tocl@width \advance\@tempdima -1zw
+ \@tempdima\jsc@tocl@width \advance\@tempdima -1zw
\@dottedtocline{2}{\@tempdima}{3zw}}
\newcommand*{\l@subsubsection}{%
- \@tempdima\js@tocl@width \advance\@tempdima 0zw
+ \@tempdima\jsc@tocl@width \advance\@tempdima 0zw
\@dottedtocline{3}{\@tempdima}{4zw}}
\newcommand*{\l@paragraph}{%
- \@tempdima\js@tocl@width \advance\@tempdima 1zw
+ \@tempdima\jsc@tocl@width \advance\@tempdima 1zw
\@dottedtocline{4}{\@tempdima}{5zw}}
\newcommand*{\l@subparagraph}{%
- \@tempdima\js@tocl@width \advance\@tempdima 2zw
+ \@tempdima\jsc@tocl@width \advance\@tempdima 2zw
\@dottedtocline{5}{\@tempdima}{6zw}}
%</!book>
%<*book>
@@ -4501,19 +4738,19 @@
% \newcommand*{\l@paragraph} {\@dottedtocline{4}{10em}{5em}}
% \newcommand*{\l@subparagraph} {\@dottedtocline{5}{12em}{6em}}
\newcommand*{\l@section}{%
- \@tempdima\js@tocl@width \advance\@tempdima -1zw
+ \@tempdima\jsc@tocl@width \advance\@tempdima -1zw
\@dottedtocline{1}{\@tempdima}{3.683zw}}
\newcommand*{\l@subsection}{%
- \@tempdima\js@tocl@width \advance\@tempdima 2.683zw
+ \@tempdima\jsc@tocl@width \advance\@tempdima 2.683zw
\@dottedtocline{2}{\@tempdima}{3.5zw}}
\newcommand*{\l@subsubsection}{%
- \@tempdima\js@tocl@width \advance\@tempdima 6.183zw
+ \@tempdima\jsc@tocl@width \advance\@tempdima 6.183zw
\@dottedtocline{3}{\@tempdima}{4.5zw}}
\newcommand*{\l@paragraph}{%
- \@tempdima\js@tocl@width \advance\@tempdima 10.683zw
+ \@tempdima\jsc@tocl@width \advance\@tempdima 10.683zw
\@dottedtocline{4}{\@tempdima}{5.5zw}}
\newcommand*{\l@subparagraph}{%
- \@tempdima\js@tocl@width \advance\@tempdima 16.183zw
+ \@tempdima\jsc@tocl@width \advance\@tempdima 16.183zw
\@dottedtocline{5}{\@tempdima}{6.5zw}}
%</book>
% \end{macrocode}
@@ -4546,7 +4783,7 @@
%
% \begin{macrocode}
\def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else
- \vskip \z@ \@plus.2\p@
+ \vskip \z@ \@plus.2\jsc@mpt
{\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
\parindent #2\relax\@afterindenttrue
\interlinepenalty\@M
@@ -4784,7 +5021,7 @@
%<!book> \@mkboth{\indexname}{\indexname}%
\plainifnotempty % \thispagestyle{plain}
\parindent\z@
- \parskip\z@ \@plus .3\p@\relax
+ \parskip\z@ \@plus .3\jsc@mpt\relax
\let\item\@idxitem
\raggedright
\footnotesize\narrowbaselines
@@ -4819,7 +5056,7 @@
% $B:w0z$G@hF,J8;z$4$H$N%V%m%C%/$N4V$KF~$k%9%Z!<%9$G$9!#(B
%
% \begin{macrocode}
-\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
+\newcommand{\indexspace}{\par \vskip 10\jsc@mpt \@plus5\jsc@mpt \@minus3\jsc@mpt\relax}
% \end{macrocode}
% \end{macro}
%
@@ -4843,15 +5080,19 @@
% \begin{macro}{\footnote}
% \begin{macro}{\footnotemark}
%
-% $BOBJ8$N6gFIE@!&JD$8$+$C$3N`$ND>8e$GMQ$$$?:]$K(B
-% $BM>J,$J%"%-$,F~$k$N$rKI$0$?$a!$(B
+% $BOBJ8$N6gFIE@!&JD$8$+$C$3N`$ND>8e$GMQ$$$?:]$KM>J,$J%"%-$,F~$k$N$rKI$0$?$a!$(B
% |\inhibitglue| $B$rF~$l$k$3$H$K$7$^$9!#(B
+% p\LaTeX $B$NF|IU$,(B2016/09/03$B$h$j?7$7$$>l9g$O!$$3$N%Q%C%A$,ITMW$J$N$G$"$F$^$;$s!#(B
%
% \begin{macrocode}
-\let\footnotes@ve=\footnote
-\def\footnote{\inhibitglue\footnotes@ve}
-\let\footnotemarks@ve=\footnotemark
-\def\footnotemark{\inhibitglue\footnotemarks@ve}
+\@ifl@t@r\pfmtversion{2016/09/03}
+ {\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue}
+\ifjsc@needsp@tch
+ \let\footnotes@ve=\footnote
+ \def\footnote{\inhibitglue\footnotes@ve}
+ \let\footnotemarks@ve=\footnotemark
+ \def\footnotemark{\inhibitglue\footnotemarks@ve}
+\fi
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -4872,10 +5113,17 @@
%
% [2013-05-14] plcore.ltx $B$KJo$C$?7A$K=q$-D>$7$^$7$?!J(BThanks: $BKL@n$5$s!K!#(B
%
+% [2016-07-11] $B%3%_%e%K%F%#HG(Bp\LaTeX $B$NJQ99$KDI?o$7$^$7$?!J(BThanks: $B3QF#$5$s!K!#(B
+% p\LaTeX $B$NF|IU$,(B2016/04/17$B$h$j?7$7$$>l9g$O!$$3$N%Q%C%A$,ITMW$J$N$G$"$F$^$;$s!#(B
+%
% \begin{macrocode}
-\renewcommand\@makefnmark{\hbox{}\hbox{%
- \ifydir \@textsuperscript{\normalfont\@thefnmark}%
- \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}}
+\@ifl@t@r\pfmtversion{2016/04/17}
+ {\jsc@needsp@tchfalse}{\jsc@needsp@tchtrue}
+\ifjsc@needsp@tch
+\renewcommand\@makefnmark{%
+ \ifydir \hbox{}\hbox{\@textsuperscript{\normalfont\@thefnmark}}\hbox{}%
+ \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}
+\fi
% \end{macrocode}
% \end{macro}
%
@@ -4905,9 +5153,9 @@
%
% \begin{macrocode}
\renewcommand{\footnoterule}{%
- \kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \kern-3\jsc@mpt
+ \hrule width .4\columnwidth height 0.4\jsc@mpt
+ \kern 2.6\jsc@mpt}
% \end{macrocode}
% \end{macro}
%
@@ -4926,6 +5174,10 @@
% Jeremy Gibbons, \textit{\TeX\ and TUG NEWS},
% Vol.~2, No.~4 (1993), p.~9$B!K(B
%
+% [2016-08-25] $B%3%_%e%K%F%#HG(B\pLaTeX $B$N!VJD$83g8LN`$ND>8e$K(B
+% |\footnotetext| $B$,B3$/>l9g$K2~9T$,5/$-$k$3$H$,$"$kLdBj$KBP=h!W(B
+% $B$HF1Ey$N%3!<%I$rDI2C$7$^$7$?!#(B
+%
% \begin{macrocode}
\long\def\@footnotetext{%
\insert\footins\bgroup
@@ -4945,7 +5197,13 @@
\else \let\next\f@t\fi \next}
\def\f@@t{\bgroup\aftergroup\@foot\let\next}
\def\f@t#1{#1\@foot}
-\def\@foot{\@finalstrut\strutbox\color@endgroup\egroup}
+\def\@foot{\@finalstrut\strutbox\color@endgroup\egroup\null
+ \ifx\pltx@foot@penalty\@undefined\else
+ \ifnum\pltx@foot@penalty=\z@\else
+ \penalty\pltx@foot@penalty
+ \pltx@foot@penalty\z@
+ \fi
+ \fi}
% \end{macrocode}
% \end{macro}
%
@@ -4997,20 +5255,29 @@
% \begin{macrocode}
\def\@inhibitglue{%
\futurelet\@let@token\@@inhibitglue}
+\begingroup
+\let\GDEF=\gdef
+\let\CATCODE=\catcode
+\let\ENDGROUP=\endgroup
+\CATCODE`k=12
+\CATCODE`a=12
+\CATCODE`n=12
+\CATCODE`j=12
+\CATCODE`i=12
+\CATCODE`c=12
+\CATCODE`h=12
+\CATCODE`r=12
+\CATCODE`t=12
+\CATCODE`e=12
+\GDEF\KANJI@CHARACTER{kanji character }
+\ENDGROUP
\def\@@inhibitglue{%
- \ifx\@let@token$B!V(B
- \inhibitglue
- \else
- \ifx\@let@token$B!J(B
+ \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
+ \ifnum\the\inhibitxspcode`#2=2\relax
\inhibitglue
- \else
- \ifx\@let@token$B!X(B
- \inhibitglue
- \else
- \ifx\@let@token$B!N(B
- \inhibitglue
- \fi
- \fi
\fi
\fi}
\let\everyparhook=\@inhibitglue
@@ -5139,204 +5406,30 @@
%
% \LaTeX $B4XO"$N%m%4$r:n$jD>$7$^$9!#(B
%
+% [2016-07-14] $B%m%4$NDj5A$O(B\texttt{jslogo}$B%Q%C%1!<%8$K0\E>$7$^$7$?!#(B
+% $B8eJ}8_49$N$?$a!$(B\texttt{jsclasses}$B$G$O%G%U%)%k%H$G$3$l$rFI$_9~$_$^$9!#(B
+% \texttt{nojslogo}$B%*%W%7%g%s$,;XDj$5$l$F$$$k>l9g$OFI$_9~$_$^$;$s!#(B
+%
% \begin{macro}{\$B>.(B}
% \begin{macro}{\$B>e>.(B}
%
-% $BJ8;z$r>.$5$a$K=P$7$?$j>e4s$j$K>.$5$a$K=P$7$?$j$9$kL?Na$G$9!#(B
-%
-% \begin{macrocode}
-\def\$B>.(B#1{\hbox{$\m@th$%
- \csname S@\f@size\endcsname
- \fontsize\sf@size\z@
- \math@fontsfalse\selectfont
- #1}}
-\def\$B>e>.(B#1{{\sbox\z@ T\vbox to\ht0{\$B>.(B{#1}\vss}}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\TeX}
-% \begin{macro}{\LaTeX}
-%
-% $B$3$l$i$O(B \texttt{ltlogos.dtx} $B$GDj5A$5$l$F$$$^$9$,!$(B
-% Times$B$d(BHelvetica$B$G$b8+1I$($,$9$k$h$&$K<c43JQ99$7$^$7$?!#(B
-%
-% [2003-06-12] Palatino$B$b2C$($^$7$?!JMWD4@0!K!#(B
-%
-% \begin{macrocode}
-\def\cmrTeX{%
- \ifdim \fontdimen\@ne\font >\z@
- T\kern-.25em\lower.5ex\hbox{E}\kern-.125emX\@
- \else
- T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\@
- \fi}
-\def\cmrLaTeX{%
- \ifdim \fontdimen\@ne\font >\z@
- L\kern-.32em\$B>e>.(B{A}\kern-.22em\cmrTeX
- \else
- L\kern-.36em\$B>e>.(B{A}\kern-.15em\cmrTeX
- \fi}
-\def\sfTeX{T\kern-.1em\lower.4ex\hbox{E}\kern-.07emX\@}
-\def\sfLaTeX{L\kern-.25em\$B>e>.(B{A}\kern-.08em\sfTeX}
-\def\ptmTeX{%
- \ifdim \fontdimen\@ne\font >\z@
- T\kern-.12em\lower.37ex\hbox{E}\kern-.02emX\@
- \else
- T\kern-.07em\lower.37ex\hbox{E}\kern-.05emX\@
- \fi}
-\def\ptmLaTeX{%
- \ifdim \fontdimen\@ne\font >\z@
- L\kern-.2em\$B>e>.(B{A}\kern-.1em\ptmTeX
- \else
- L\kern-.3em\$B>e>.(B{A}\kern-.1em\ptmTeX
- \fi}
-\def\pncTeX{%
- \ifdim \fontdimen\@ne\font >\z@
- T\kern-.2em\lower.5ex\hbox{E}\kern-.08emX\@
- \else
- T\kern-.13em\lower.5ex\hbox{E}\kern-.13emX\@
- \fi}
-\def\pncLaTeX{%
- \ifdim \fontdimen\@ne\font >\z@
- L\kern-.3em\$B>e>.(B{A}\kern-.1em\pncTeX
- \else
- L\kern-.3em\$B>e>.(B{A}\kern-.1em\pncTeX
- \fi}
-\def\pplTeX{%
- \ifdim \fontdimen\@ne\font >\z@
- T\kern-.17em\lower.32ex\hbox{E}\kern-.15emX\@
- \else
- T\kern-.12em\lower.34ex\hbox{E}\kern-.1emX\@
- \fi}
-\def\pplLaTeX{%
- \ifdim \fontdimen\@ne\font >\z@
- L\kern-.27em\$B>e>.(B{A}\kern-.12em\pplTeX
- \else
- L\kern-.3em\$B>e>.(B{A}\kern-.15em\pplTeX
- \fi}
-\def\ugmTeX{%
- \ifdim \fontdimen\@ne\font >\z@
- T\kern-.1em\lower.32ex\hbox{E}\kern-.06emX\@
- \else
- T\kern-.12em\lower.34ex\hbox{E}\kern-.1emX\@
- \fi}
-\def\ugmLaTeX{%
- \ifdim \fontdimen\@ne\font >\z@
- L\kern-.2em\$B>e>.(B{A}\kern-.13em\ugmTeX
- \else
- L\kern-.3em\$B>e>.(B{A}\kern-.13em\ugmTeX
- \fi}
-\DeclareRobustCommand{\TeX}{%
- \def\@tempa{cmr}%
- \ifx\f@family\@tempa\cmrTeX
- \else
- \def\@tempa{ptm}%
- \ifx\f@family\@tempa\ptmTeX
- \else
- \def\@tempa{txr}%
- \ifx\f@family\@tempa\ptmTeX
- \else
- \def\@tempa{pnc}%
- \ifx\f@family\@tempa\pncTeX
- \else
- \def\@tempa{ppl}%
- \ifx\f@family\@tempa\pplTeX
- \else
- \def\@tempa{ugm}%
- \ifx\f@family\@tempa\ugmTeX
- \else\sfTeX
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi}
-
-\DeclareRobustCommand{\LaTeX}{%
- \def\@tempa{cmr}%
- \ifx\f@family\@tempa\cmrLaTeX
- \else
- \def\@tempa{ptm}%
- \ifx\f@family\@tempa\ptmLaTeX
- \else
- \def\@tempa{txr}%
- \ifx\f@family\@tempa\ptmLaTeX
- \else
- \def\@tempa{pnc}%
- \ifx\f@family\@tempa\pncLaTeX
- \else
- \def\@tempa{ppl}%
- \ifx\f@family\@tempa\pplLaTeX
- \else
- \def\@tempa{ugm}%
- \ifx\f@family\@tempa\ugmLaTeX
- \else\sfLaTeX
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi}
-% \end{macrocode}
-%
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\LaTeXe}
-%
-% |\LaTeXe| $B%3%^%s%I$N(B |\mbox{\m@th ...| $B$G;O$^$k?7$7$$Dj5A$G$O(B
-% $BD>8e$NOBJ8$H$N4V$K(B |\xkanjiskip| $B$,F~$j$^$;$s!#$^$?!$(B
-% |mathptmx| $B%Q%C%1!<%8$J$I$HJ;MQ$9$k$H!$:G8e$N(B $\varepsilon$ $B$,(B
-% $B2<$,$j$9$.$F$7$^$$$^$9!#$=$N$?$a!$$A$g$C$H<j$r2C$($^$7$?!#(B
-%
-% \begin{macrocode}
-\DeclareRobustCommand{\LaTeXe}{$\mbox{%
- \if b\expandafter\@car\f@series\@nil\boldmath\fi
- \LaTeX\kern.15em2\raisebox{-.37ex}{$\textstyle\varepsilon$}}$}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\pTeX}
-% \begin{macro}{\pLaTeX}
-% \begin{macro}{\pLaTeXe}
-%
-% \pTeX $B!$(B\pLaTeXe $B$N%m%4$r=P$9L?Na$G$9!#(B
-%
-% \begin{macrocode}
-\def\pTeX{p\kern-.05em\TeX}
-\def\pLaTeX{p\LaTeX}
-\def\pLaTeXe{p\LaTeXe}
-% \end{macrocode}
-%
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\AmSTeX}
-%
-% \texttt{amstex.sty} $B$GDj5A$5$l$F$$$^$9!#(B
-%
-% \begin{macrocode}
-\def\AmSTeX{\protect\AmS-\protect\TeX{}}
-% \end{macrocode}
-%
-% \end{macro}
-%
-% \begin{macro}{\BibTeX}
-% \begin{macro}{\SliTeX}
-%
-% $B$3$l$i$O(B \texttt{doc.dtx} $B$+$i<h$C$?$b$N$G$9!#(B
-% $B$?$@$7!$(B|\BibTeX| $B$@$1$O$A$g$C$H=$@5$7$^$7$?!#(B
-%
-% \begin{macrocode}
-% \@ifundefined{BibTeX}
-% {\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\$B>.(B{I\kern-.025em B}%
- \ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX}
-\DeclareRobustCommand{\SliTeX}{%
- S\kern-.06emL\kern-.18em\$B>e>.(B{I}\kern -.03em\TeX}
+% $BJ8;z$r>.$5$a$K=P$7$?$j>e4s$j$K>.$5$a$K=P$7$?$j$9$kL?Na$r!$(B
+% \texttt{jslogo.sty}$B$G$OL>>NJQ99$7$F$"$j$^$9$N$G!$%3%T!<$7$^$9!#(B
+% \begin{macrocode}
+\if@jslogo
+ \IfFileExists{jslogo.sty}{%
+ \RequirePackage{jslogo}%
+ \def\$B>.(B{\jslg@small}%
+ \def\$B>e>.(B{\jslg@uppersmall}%
+ }{%
+ \ClassWarningNoLine{\jsc@clsname}{%
+ The redefinitions of LaTeX-related logos has\MessageBreak
+ been moved to jslogo.sty since 2016, but\MessageBreak
+ jslogo.sty not found. Current release of\MessageBreak
+ 'jsclasses' includes it, so please check\MessageBreak
+ the installation}%
+ }
+\fi
% \end{macrocode}
% \end{macro}
% \end{macro}
diff --git a/Master/texmf-dist/source/platex/jsclasses/jslogo.dtx b/Master/texmf-dist/source/platex/jsclasses/jslogo.dtx
new file mode 100644
index 00000000000..6165755c74d
--- /dev/null
+++ b/Master/texmf-dist/source/platex/jsclasses/jslogo.dtx
@@ -0,0 +1,381 @@
+% ^^A -*- japanese-latex -*-
+% \iffalse meta-comment
+%
+% 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 Japanese TeX Development Community
+%
+% \fi
+%
+% \iffalse
+%
+% \begin{macrocode}
+%<package>\NeedsTeXFormat{LaTeX2e}
+%<package>\ProvidesPackage{jslogo}
+%<*driver>
+\ProvidesFile{jslogo.dtx}
+%</driver>
+ [2016/07/14 okumura, texjporg]
+%<*driver>
+\documentclass{jsarticle}
+\usepackage{doc}
+\addtolength{\textwidth}{-1in}
+\addtolength{\evensidemargin}{1in}
+\addtolength{\oddsidemargin}{1in}
+\addtolength{\marginparwidth}{1in}
+\setlength\marginparpush{0pt}
+% \OnlyDescription
+\DisableCrossrefs
+\setcounter{StandardModuleDepth}{1}
+\GetFileInfo{jslogo.dtx}
+\begin{document}
+ \DocInput{jslogo.dtx}
+\end{document}
+%</driver>
+% \end{macrocode}
+%
+% \fi
+%
+% \title{\pLaTeXe $B?7%I%-%e%a%s%H%/%i%9IUO?(B $B%m%4%Q%C%1!<%8(B}
+% \author{$B1|B<@2I'!$F|K\8l(B\TeX $B3+H/%3%_%e%K%F%#(B}
+% \date{\filedate}
+% \maketitle
+%
+% \MakeShortVerb{\|}
+%
+% \section{$B$O$8$a$K(B}
+%
+% $B$3$l$O$b$H$b$H1|B<@2I';a$K$h$k(B\texttt{jsclasses.dtx}$B$GDj5A$5$l(B
+% $B$F$$$?(B\LaTeX $B4XO"$N%m%4$r!$FHN)$N%Q%C%1!<%8$KCj=P$7$?$b$N$G$9!#(B
+% \texttt{jsclasses}$B$G$O%G%U%)%k%H$GFI$_9~$^$l$^$9!#(B
+% $B8=:_$OF|K\8l(B\TeX $B3+H/%3%_%e%K%F%#$K$h$j(BGitHub$B$G4IM}$5$l$F$$$^$9!#(B
+% \begin{quote}
+% |https://github.com/texjporg/jsclasses|
+% \end{quote}
+% $B%i%$%;%s%9$O(Bmodified BSD$B$G$9!#(B
+%
+% \StopEventually{}
+%
+% $B0J2<$G$O<B:]$N%3!<%I$KB($7$F@bL@$7$^$9!#(B
+%
+%
+% \section{$B$$$m$$$m$J%m%4(B}
+%
+% \LaTeX $B4XO"$N%m%4$r:n$jD>$7$^$9!#(B
+%
+% \begin{macro}{\jslg@small}
+% \begin{macro}{\jslg@uppersmall}
+%
+% $BJ8;z$r>.$5$a$K=P$7$?$j>e4s$j$K>.$5$a$K=P$7$?$j$9$kL?Na$G$9!#(B
+%
+% \begin{macrocode}
+\def\jslg@small#1{\hbox{$\m@th$%
+ \csname S@\f@size\endcsname
+ \fontsize\sf@size\z@
+ \math@fontsfalse\selectfont
+ #1}}
+\def\jslg@uppersmall#1{{\sbox\z@ T\vbox to\ht0{\jslg@small{#1}\vss}}}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\TeX}
+% \begin{macro}{\LaTeX}
+%
+% $B$3$l$i$O(B \texttt{ltlogos.dtx} $B$GDj5A$5$l$F$$$^$9$,!$(B
+% Times$B$d(BHelvetica$B$G$b8+1I$($,$9$k$h$&$K<c43JQ99$7$^$7$?!#(B
+%
+% Computer Modern Roman$B$G$9!J%U%!%_%jL>(B\texttt{cmr}$B!K!#(B
+% $B85$NDj5A$K:G$b6a$$$N$G!$FCJL$KDj5A$7$J$$>l9g$KMQ$$$^$9!#(B
+%
+% \begin{macrocode}
+\def\cmrTeX{%
+ \ifdim \fontdimen\@ne\font >\z@
+ T\kern-.25em\lower.5ex\hbox{E}\kern-.125emX\@
+ \else
+ T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\@
+ \fi}
+\def\cmrLaTeX{%
+ \ifdim \fontdimen\@ne\font >\z@
+ L\kern-.32em\jslg@uppersmall{A}\kern-.22em\cmrTeX
+ \else
+ L\kern-.36em\jslg@uppersmall{A}\kern-.15em\cmrTeX
+ \fi}
+% \end{macrocode}
+%
+% Computer Modern Sans Serif$B!J%U%!%_%jL>(B\texttt{cmss}$B!K$d(B
+% Helvetica$B!J%U%!%_%jL>(B\texttt{phv}$B!K$J$I$N%5%s%;%j%UBN$G$9!#(B
+%
+% \begin{macrocode}
+\def\sfTeX{T\kern-.1em\lower.4ex\hbox{E}\kern-.07emX\@}
+\def\sfLaTeX{L\kern-.25em\jslg@uppersmall{A}\kern-.08em\sfTeX}
+% \end{macrocode}
+%
+% Times$B$G$9!J%U%!%_%jL>(B\texttt{ptm}$B!K!#(B
+% TX$B%U%)%s%H!J%U%!%_%jL>(B\texttt{txr}$B!K$G$bMQ$$$^$9!#(B
+%
+% \begin{macrocode}
+\def\ptmTeX{%
+ \ifdim \fontdimen\@ne\font >\z@
+ T\kern-.12em\lower.37ex\hbox{E}\kern-.02emX\@
+ \else
+ T\kern-.07em\lower.37ex\hbox{E}\kern-.05emX\@
+ \fi}
+\def\ptmLaTeX{%
+ \ifdim \fontdimen\@ne\font >\z@
+ L\kern-.2em\jslg@uppersmall{A}\kern-.1em\ptmTeX
+ \else
+ L\kern-.3em\jslg@uppersmall{A}\kern-.1em\ptmTeX
+ \fi}
+% \end{macrocode}
+%
+% New Century Schoolbook$B$G$9!J%U%!%_%jL>(B\texttt{pnc}$B!K!#(B
+%
+% \begin{macrocode}
+\def\pncTeX{%
+ \ifdim \fontdimen\@ne\font >\z@
+ T\kern-.2em\lower.5ex\hbox{E}\kern-.08emX\@
+ \else
+ T\kern-.13em\lower.5ex\hbox{E}\kern-.13emX\@
+ \fi}
+\def\pncLaTeX{%
+ \ifdim \fontdimen\@ne\font >\z@
+ L\kern-.3em\jslg@uppersmall{A}\kern-.1em\pncTeX
+ \else
+ L\kern-.3em\jslg@uppersmall{A}\kern-.1em\pncTeX
+ \fi}
+% \end{macrocode}
+%
+% Palatino$B$G$9!J%U%!%_%jL>(B\texttt{ppl}$B!K!#(B
+% PX$B%U%)%s%H!J%U%!%_%jL>(B\texttt{pxr}$B!K$G$bMQ$$$^$9!#(B
+%
+% \begin{macrocode}
+\def\pplTeX{%
+ \ifdim \fontdimen\@ne\font >\z@
+ T\kern-.17em\lower.32ex\hbox{E}\kern-.15emX\@
+ \else
+ T\kern-.12em\lower.34ex\hbox{E}\kern-.1emX\@
+ \fi}
+\def\pplLaTeX{%
+ \ifdim \fontdimen\@ne\font >\z@
+ L\kern-.27em\jslg@uppersmall{A}\kern-.12em\pplTeX
+ \else
+ L\kern-.3em\jslg@uppersmall{A}\kern-.15em\pplTeX
+ \fi}
+% \end{macrocode}
+%
+% URW Garamond$B$G$9!J%U%!%_%jL>(B\texttt{ugm}$B!K!#(B
+%
+% \begin{macrocode}
+\def\ugmTeX{%
+ \ifdim \fontdimen\@ne\font >\z@
+ T\kern-.1em\lower.32ex\hbox{E}\kern-.06emX\@
+ \else
+ T\kern-.12em\lower.34ex\hbox{E}\kern-.1emX\@
+ \fi}
+\def\ugmLaTeX{%
+ \ifdim \fontdimen\@ne\font >\z@
+ L\kern-.2em\jslg@uppersmall{A}\kern-.13em\ugmTeX
+ \else
+ L\kern-.3em\jslg@uppersmall{A}\kern-.13em\ugmTeX
+ \fi}
+% \end{macrocode}
+%
+% $B0J>e$NDj5A$r!$%U%!%_%j$K$h$C$F;H$$J,$1$^$9!#(B
+%
+% [2003-06-12] Palatino$B$b2C$($^$7$?!JMWD4@0!K!#(B
+%
+% \begin{macrocode}
+\DeclareRobustCommand{\TeX}{%
+ \def\@tempa{cmss}%
+ \ifx\f@family\@tempa\sfTeX
+ \else
+ \def\@tempa{phv}%
+ \ifx\f@family\@tempa\sfTeX
+ \else
+ \def\@tempa{qhv}%
+ \ifx\f@family\@tempa\sfTeX
+ \else
+ \def\@tempa{ptm}%
+ \ifx\f@family\@tempa\ptmTeX
+ \else
+ \def\@tempa{qtm}%
+ \ifx\f@family\@tempa\ptmTeX
+ \else
+ \def\@tempa{txr}%
+ \ifx\f@family\@tempa\ptmTeX
+ \else
+ \def\@tempa{ntxtlf}%
+ \ifx\f@family\@tempa\ptmTeX
+ \else
+ \def\@tempa{pnc}%
+ \ifx\f@family\@tempa\pncTeX
+ \else
+ \def\@tempa{ppl}%
+ \ifx\f@family\@tempa\pplTeX
+ \else
+ \def\@tempa{qpl}%
+ \ifx\f@family\@tempa\pplTeX
+ \else
+ \def\@tempa{pplx}%
+ \ifx\f@family\@tempa\pplTeX
+ \else
+ \def\@tempa{pplj}%
+ \ifx\f@family\@tempa\pplTeX
+ \else
+ \def\@tempa{pxr}%
+ \ifx\f@family\@tempa\pplTeX
+ \else
+ \def\@tempa{zpltlf}%
+ \ifx\f@family\@tempa\pplTeX
+ \else
+ \def\@tempa{ugm}%
+ \ifx\f@family\@tempa\ugmTeX
+ \else\cmrTeX
+ \fi
+ \fi\fi
+ \fi\fi\fi\fi
+ \fi
+ \fi\fi
+ \fi\fi
+ \fi\fi\fi}
+\DeclareRobustCommand{\LaTeX}{%
+ \def\@tempa{cmss}%
+ \ifx\f@family\@tempa\sfLaTeX
+ \else
+ \def\@tempa{phv}%
+ \ifx\f@family\@tempa\sfLaTeX
+ \else
+ \def\@tempa{qhv}%
+ \ifx\f@family\@tempa\sfLaTeX
+ \else
+ \def\@tempa{ptm}%
+ \ifx\f@family\@tempa\ptmLaTeX
+ \else
+ \def\@tempa{qtm}%
+ \ifx\f@family\@tempa\ptmLaTeX
+ \else
+ \def\@tempa{txr}%
+ \ifx\f@family\@tempa\ptmLaTeX
+ \else
+ \def\@tempa{ntxtlf}%
+ \ifx\f@family\@tempa\ptmLaTeX
+ \else
+ \def\@tempa{pnc}%
+ \ifx\f@family\@tempa\pncLaTeX
+ \else
+ \def\@tempa{ppl}%
+ \ifx\f@family\@tempa\pplLaTeX
+ \else
+ \def\@tempa{qpl}%
+ \ifx\f@family\@tempa\pplLaTeX
+ \else
+ \def\@tempa{pplx}%
+ \ifx\f@family\@tempa\pplLaTeX
+ \else
+ \def\@tempa{pplj}%
+ \ifx\f@family\@tempa\pplLaTeX
+ \else
+ \def\@tempa{pxr}%
+ \ifx\f@family\@tempa\pplLaTeX
+ \else
+ \def\@tempa{zpltlf}%
+ \ifx\f@family\@tempa\pplLaTeX
+ \else
+ \def\@tempa{ugm}%
+ \ifx\f@family\@tempa\ugmLaTeX
+ \else\cmrLaTeX
+ \fi
+ \fi\fi
+ \fi\fi\fi\fi
+ \fi
+ \fi\fi
+ \fi\fi
+ \fi\fi\fi}
+% \end{macrocode}
+%
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\LaTeXe}
+%
+% |\LaTeXe| $B%3%^%s%I$N(B |\mbox{\m@th ...| $B$G;O$^$k?7$7$$Dj5A$G$O(B
+% $BD>8e$NOBJ8$H$N4V$K(B |\xkanjiskip| $B$,F~$j$^$;$s!#$^$?!$(B
+% |mathptmx| $B%Q%C%1!<%8$J$I$HJ;MQ$9$k$H!$:G8e$N(B $\varepsilon$ $B$,(B
+% $B2<$,$j$9$.$F$7$^$$$^$9!#$=$N$?$a!$$A$g$C$H<j$r2C$($^$7$?!#(B
+%
+% \begin{macrocode}
+\DeclareRobustCommand{\LaTeXe}{$\mbox{%
+ \if b\expandafter\@car\f@series\@nil\boldmath\fi
+ \LaTeX\kern.15em2\raisebox{-.37ex}{$\textstyle\varepsilon$}}$}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\pTeX}
+% \begin{macro}{\pLaTeX}
+% \begin{macro}{\pLaTeXe}
+%
+% \pTeX $B!$(B\pLaTeXe $B$N%m%4$r=P$9L?Na$G$9!#(B
+%
+% \begin{macrocode}
+\def\pTeX{p\kern-.05em\TeX}
+\def\pLaTeX{p\LaTeX}
+\def\pLaTeXe{p\LaTeXe}
+% \end{macrocode}
+%
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\upTeX}
+% \begin{macro}{\upLaTeX}
+% \begin{macro}{\upLaTeXe}
+%
+% [2016-07-14] \upTeX $B!$(B\upLaTeXe $B$N%m%4$r=P$9L?Na$bDj5A$7$^$9!#(B
+%
+% \begin{macrocode}
+\def\upTeX{u\pTeX}
+\def\upLaTeX{u\pLaTeX}
+\def\upLaTeXe{u\pLaTeXe}
+% \end{macrocode}
+%
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\AmSTeX}
+%
+% \texttt{amstex.sty} $B$GDj5A$5$l$F$$$^$9!#(B
+%
+% \begin{macrocode}
+\def\AmSTeX{\protect\AmS-\protect\TeX{}}
+% \end{macrocode}
+%
+% \end{macro}
+%
+% \begin{macro}{\BibTeX}
+% \begin{macro}{\SliTeX}
+%
+% $B$3$l$i$O(B \texttt{doc.dtx} $B$+$i<h$C$?$b$N$G$9!#(B
+% $B$?$@$7!$(B|\BibTeX| $B$@$1$O$A$g$C$H=$@5$7$^$7$?!#(B
+%
+% \begin{macrocode}
+% \@ifundefined{BibTeX}
+% {\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{\SliTeX}{%
+ S\kern-.06emL\kern-.18em\jslg@uppersmall{I}\kern -.03em\TeX}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+%
+% $B0J>e$G$9!#(B
+%
+% \Finale
+%
+\endinput
diff --git a/Master/texmf-dist/source/platex/jsclasses/jslogo.ins b/Master/texmf-dist/source/platex/jsclasses/jslogo.ins
new file mode 100644
index 00000000000..26e1a43b1f0
--- /dev/null
+++ b/Master/texmf-dist/source/platex/jsclasses/jslogo.ins
@@ -0,0 +1,4 @@
+\def\batchfile{jslogo.ins}
+\input docstrip.tex
+\keepsilent
+\generateFile{jslogo.sty}{f}{\from{jslogo.dtx}{package}}
diff --git a/Master/texmf-dist/source/platex/jsclasses/jsverb.dtx b/Master/texmf-dist/source/platex/jsclasses/jsverb.dtx
index 417883137e7..10e9e2ce4f4 100644
--- a/Master/texmf-dist/source/platex/jsclasses/jsverb.dtx
+++ b/Master/texmf-dist/source/platex/jsclasses/jsverb.dtx
@@ -1,10 +1,9 @@
% ^^A -*- japanese-latex -*-
-% \CheckSum{221}
% \iffalse
%
% jsverb.dtx
% verb/verbatim $B4X78%^%/%m(B ($B<Q$F$b>F$$$F$b$+$^$$$^$;$s(B)
-% okumura@edu.mie-u.ac.jp
+% okumura@okumuralab.org
% http://oku.edu.mie-u.ac.jp/~okumura/
%
% $B!V<Q$F$b>F$$$F$b$+$^$$$^$;$s!W$G:$$k>l9g$O(Bmodified BSD$B$H$$$&$3$H$G$*4j$$$7$^$9!#(B
@@ -317,20 +316,4 @@
\endinput
% \end{macrocode}
%
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
% \Finale
diff --git a/Master/texmf-dist/source/platex/jsclasses/morisawa.dtx b/Master/texmf-dist/source/platex/jsclasses/morisawa.dtx
index 98f5fc3003d..8fb18631759 100644
--- a/Master/texmf-dist/source/platex/jsclasses/morisawa.dtx
+++ b/Master/texmf-dist/source/platex/jsclasses/morisawa.dtx
@@ -1,10 +1,9 @@
% ^^A -*- japanese-latex -*-
-% \CheckSum{142}
% \iffalse
%
% $B%b%j%5%o4pK\(B5$B=qBN$r;H$&$?$a$N%Q%C%1!<%8(B
%
-% $B1|B<@2I'(B <okumura@matsusaka-u.ac.jp>
+% $B1|B<@2I'(B <okumura@okumuralab.org>
%
% [2002-12-19] $B$$$m$$$m$J$b$N$K<}O?$7$F$$$?$@$/:]$K%i%$%;%s%9$rL@3N$K$9$k(B
% $BI,MW$,@8$8$F$-$^$7$?!#%"%9%-!<$N$b$N$,:G6a$O(Bmodified BSD$B%i%$%;%s%9$K$J$C(B
@@ -15,7 +14,7 @@
%<*driver>
\documentclass{jsarticle}
\usepackage{doc}
-\usepackage{morisawa}
+\usepackage[fake]{morisawa}
\addtolength{\textwidth}{-1in}
\addtolength{\evensidemargin}{1in}
\addtolength{\oddsidemargin}{1in}
@@ -292,20 +291,4 @@
% ^^A \endinput $B$N8e$K(B \CharacterTable $B$r=q$$$F$*$1$P!$;R%U%!%$%k$K$O(B
% ^^A $B=PNO$5$l$^$;$s!#%A%'%C%/$O(B *.dtx $B$r=hM}$7$?$H$-$K$7$F$/$l$^$9!#(B
%
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
% \Finale
diff --git a/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx b/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx
index 045da5b9bfd..f0e608279a5 100644
--- a/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx
+++ b/Master/texmf-dist/source/platex/jsclasses/okumacro.dtx
@@ -1,18 +1,17 @@
% ^^A -*- japanese-latex -*-
-% \CheckSum{1367}
% \iffalse
%
% okumacro.dtx
% $B;d2HHG%^%/%m=8(B ($B<Q$F$b>F$$$F$b$+$^$$$^$;$s(B)
-% okumura@matsusaka-u.ac.jp
-% http://www.matsusaka-u.ac.jp/~okumura/
+% okumura@okumuralab.org
+% http://oku.edu.mie-u.ac.jp/~okumura/
%
% [2002-12-19] $B$$$m$$$m$J$b$N$K<}O?$7$F$$$?$@$/:]$K%i%$%;%s%9$rL@3N$K$9$k(B
% $BI,MW$,@8$8$F$-$^$7$?!#%"%9%-!<$N$b$N$,:G6a$O!J(Bmodified$B!K(BBSD$B%i%$%;%s%9$K$J$C(B
% $B$F$$$^$9$N$G!$;d$N$b$N$b$=$l$K=`$8$F!J(Bmodified$B!K(BBSD$B$H$9$k$3$H$K$7$^$9!#(B
%
%<okumacro>\NeedsTeXFormat{pLaTeX2e}
-%<okumacro>\ProvidesPackage{okumacro}[2010/03/14 okumura]
+%<okumacro>\ProvidesPackage{okumacro}[2016/08/16 okumura, texjporg]
%<*driver>
\documentclass{jsarticle}
\usepackage{doc}
@@ -70,6 +69,11 @@
%
% $B0J2<$,<B:]$N%^%/%m=8$G$9!#(B
%
+% [2016-07-30] $B=>Mh$O!$(Bascmac$B"*(Bokumacro$B$N=g$KFI$_9~$s$@>l9g$K%(%i!<$,=P$F(B
+% $B$$$^$7$?$,!$?7$7$$;EMM$G$O!$(Bascmac$B$H(Bokumacro$B$NN>J}$rFI$_9~$`>l9g$K$O(B
+% $B!V8e$KFI$_9~$s$@$[$&!W$,>!$A$^$9!#(B
+% $B6qBNE*$K$O(B |\keytop|$B!$(B|\return|$B!$(Bscreen$B4D6-!$(Bshadebox$B4D6-$,$"$j$^$9!#(B
+%
% \begin{macrocode}
%<*okumacro>
% \end{macrocode}
@@ -93,15 +97,25 @@
% [2010-03-14] $B%k%S$ND>8e$G2~9T$G$-$J$+$C$?$N$G!$(B
% $B?F;z$,OBJ8$H2>Dj$7$FD>8e$K(B |\kanjiskip| $B$rF~$l$^$7$?!#(B
%
+% [2016-08-16] $B=DAH$KBP1~!#(B
+%
+% [2016-08-16] $B!VA0$K(B |\kanjiskip| $B$,F~$i$J$$!W!VA08e$N2$J8J8;z$H$N4V$K(B |\xkanjiskip| $B$,F~$i$J$$!W!V8e$m$N6XB'=hM}$,8z$+$J$$!WLdBj$r2r7h$9$k$?$a$KOBJ8%4!<%9%H=hM}$rDI2C!#(B
+%
% \begin{macrocode}
\providecommand{\rubyfamily}{}
-\def\kanjistrut{\vrule \@height0.88zw \@depth0.12zw \@width\z@}
+\def\kanjistrut{\iftdir
+ \vrule \@height0.5zw \@depth0.5zw \@width\z@
+\else
+ \vrule \@height0.88zw \@depth0.12zw \@width\z@
+\fi}
+\chardef\okumacro@zsp=\jis"2121\relax
\newcommand{\ruby}[3][0zw]{%
- \leavevmode
- \dimen1=#1\relax
+ \okumacro@zsp
+ \kern-1zw\relax
\dimen3=\f@size\p@
\setbox1=\hbox{#2}%
\setbox3=\hbox{\rubyfamily\fontsize{0.5\dimen3}{0pt}\selectfont #3}%
+ \dimen1=#1\relax
\ifdim\dimen1=\z@
\ifdim\wd1>\wd3 \dimen1=\wd1 \else \dimen1=\wd3 \fi
\else
@@ -122,7 +136,8 @@
\fi
}%
\nointerlineskip
- \hbox to \dimen1{\kanjistrut\hfil\unhbox1\hfil}}}\hskip\kanjiskip\relax}
+ \hbox to \dimen1{\kanjistrut\hfil\unhbox1\hfil}}}%
+ \kern-1zw\relax\okumacro@zsp}
% \end{macrocode}
% \end{macro}
%
@@ -156,6 +171,9 @@
%
% \kenten{$B7wE@(B}$B$r?6$k%3%^%s%I$G$9!#(B
%
+% [2016-07-30] $B%k%S$H7wE@$N9b$5$r9g$o$;$k$D$b$j$G$7$?$,!$4V0c$C$F(B
+% $B>e%7%U%HNL$r(B0.63zw$B$H$7$F$$$^$7$?$N$G!$@5$7$$CM(B0.75zw$B$KD>$7$^$7$?!#(B
+%
% \begin{macrocode}
\def\kenten#1{%
\ifvmode\leavevmode\else\hskip\kanjiskip\fi
@@ -164,7 +182,7 @@
\@kenten#1\end}
\def\@kenten#1{%
\ifx#1\end \let\next=\relax \else
- \raise.63zw\copy1\nobreak #1\hskip\kanjiskip\relax
+ \raise.75zw\copy1\nobreak #1\hskip\kanjiskip\relax
\let\next=\@kenten
\fi\next}
% \end{macrocode}
@@ -384,8 +402,18 @@
%
% $B$3$l$r;H$C$F%-!<%H%C%W5-9f$r:n$j$^$9!#(B
%
+% [2016-07-30] |\keytop| $B$O(Bp\LaTeX $B$N(Bascmac$B%Q%C%1!<%8(B(tascmac.sty)$B$G$b(B
+% $BDj5A$5$l$F$$$^$9$,!$(Bascmac$B$NDj5A$G$O<~0O$HF1$8%U%!%_%j$N$^$^$K$J$C$F$$$F!$(B
+% okumacro$B$G$OCf$NJ8;z$r%5%s%;%j%UBN$KJQ99$7$F$$$^$9!#(B
+% $BN>J}$N%Q%C%1!<%8$rFI$_9~$`>l9g$O!$8e$KFI$_9~$s$@$[$&$NDj5A$,>!$A$^$9!#(B
+% okumacro$B$,>!$D>l9g$K$O>o$K%5%s%;%j%UBN$KJQ99$9$k%-!<%H%C%W5-9f$r=PNO$7$^$9$7!$(B
+% ascmac$B$,>!$D>l9g$O<~0O$HF1$8%U%!%_%j$K$J$j$^$9!#(B
+%
+% $B$^$?!$?7$?$K(B |\okukeytop| $B$H$$$&L?Na$rDI2C$7$^$9!#$3$l$O(Bascmac$B$H43>D$;$:!$(B
+% $B>o$K%5%s%;%j%UBN$KJQ99$9$k%-!<%H%C%W5-9f$r=PNO$G$-$^$9!#(B
+%
% \begin{macrocode}
-\newcommand{\keytop}[1]{{\leavevmode\kern1pt
+\newcommand{\okukeytop}[1]{{\leavevmode\kern1pt
\setbox1=\hbox{\normalfont\sffamily [}%
\dimen1=\ht1
\removept{\dimen1}{\tempC}%
@@ -407,6 +435,11 @@
\put(\tempB,\tempC){\oval(\tempA,4)[t]}
\put(\tempB,0){\makebox(0,0)[b]{\box0}}
\end{picture}\kern1pt}}
+\expandafter\ifx\csname ver@tascmac.sty\endcsname\relax
+ \newcommand{\keytop}{\okukeytop}
+\else
+ \renewcommand{\keytop}{\okukeytop}
+\fi
% \end{macrocode}
% \end{macro}
%
@@ -414,6 +447,17 @@
%
% $B%j%?!<%s%-!<$N5-9f$G$9!#(B
%
+% [2016-07-30] |\return| $B$O(Bp\LaTeX $B$N(Bascmac$B%Q%C%1!<%8(B(tascmac.sty)$B$G$b(B
+% $BDj5A$5$l$F$$$^$9$,!$(Bokumacro$B$,%j%?!<%s$N%-!<%H%C%W5-9f$r=PNO$9$k$N$KBP$7!$(B
+% ascmac$B$G$O%j%?!<%s$NLp0uJ8;z(B{\font\ASCGRP=ascgrp \ASCGRP\char"20}$B$@$1(B
+% $B$r=P$9L?Na$K$J$C$F$$$^$9!#(B
+% $BN>J}$N%Q%C%1!<%8$rFI$_9~$`>l9g$O!$8e$KFI$_9~$s$@$[$&$NDj5A$,>!$A$^$9!#(B
+% okumacro$B$,>!$D>l9g$K$O(B\okureturn $B$r=PNO$7$^$9$7!$(B
+% ascmac$B$,>!$D>l9g$O(B{\font\ASCGRP=ascgrp \ASCGRP\char"20}$B$r=PNO$7$^$9!#(B
+%
+% $B$^$?!$?7$?$K(B |\okureturn| $B$H$$$&L?Na$rDI2C$7$^$9!#$3$l$O(Bascmac$B$H43>D$;$:!$(B
+% $B>o$K%j%?!<%s$N%-!<%H%C%W5-9f(B\okureturn $B$r=PNO$G$-$^$9!#(B
+%
% \begin{macrocode}
\def\RETMARK{{\unitlength=1pt
\setbox0=\hbox{\normalfont\ttfamily [}%
@@ -425,7 +469,12 @@
\put(\tempA,1){\line(0,1){\tempB}}
\put(\tempA,1){\vector(-1,0){\tempA}}
\end{picture}}}
-\newcommand{\return}{\keytop{\RETMARK}}
+\newcommand{\okureturn}{\okukeytop{\RETMARK}}
+\expandafter\ifx\csname ver@tascmac.sty\endcsname\relax
+ \newcommand{\return}{\okureturn}
+\else
+ \renewcommand{\return}{\okureturn}
+\fi
% \end{macrocode}
% \end{macro}
%
@@ -725,10 +774,23 @@
% $B$?$@!$(Bscreen$B4D6-$N:G=i$K(B |[| $B$,Mh$k>l9g$O8mF0:n$7$^$9$N$G!$(B|\relax|
% $B$+(B |{}| $B$rF~$l$F8mKb2=$7$F$/$@$5$$!#(B
%
+% [2016-07-30] $B85$K$J$C$F$$$k(Bp\LaTeX $B$N(Bascmac$B%Q%C%1!<%8(B(tascmac.sty)$B$N(B
+% screen$B4D6-$O!$%*%W%7%g%s0z?t$N?tCM$G3Q$N4]$_$NBg$-$5$r@0?tCM(B(0--8)$B$G;XDj$7(B
+% $B$^$9$,!$(Bokumacro$B%Q%C%1!<%8$G$O2#$NG\N($r;XDj$9$k$H$$$&0c$$$,$"$j$^$9!#(B
+% $BN>J}$N%Q%C%1!<%8$rFI$_9~$`>l9g$O!$8e$KFI$_9~$s$@$[$&$NDj5A$,>!$A$^$9!#(B
+% screen$B4D6-$O!$(Bokumacro$B$,>!$D>l9g$K$O2#$NG\N($r;XDj$G$-$k(B
+% $B%9%/%j!<%sIw$N4D6-$K$J$j$^$9$7!$(Bascmac$B$,>!$D>l9g$O3Q$N4]$_$r;XDj$G$-$k(B
+% $B%9%/%j!<%sIw$N4D6-$K$J$j$^$9!#(B
+%
+% $B$^$?!$?7$?$K(Bokuscreen$B4D6-$rDI2C$7$^$9!#$3$l$O(Bascmac$B$H43>D$;$:!$>o$K2#$N(B
+% $BG\N($r;XDj$G$-$k%9%/%j!<%sIw$N4D6-$K$J$j$^$9!#(B
+%
% \begin{macrocode}
-\newdimen\@scw
-\newbox\scb@x
-\newenvironment{screen}[1][1]%
+\expandafter\ifx\csname ver@tascmac.sty\endcsname\relax
+ \newdimen\@scw
+ \newbox\scb@x
+\fi
+\newenvironment{okuscreen}[1][1]%
{\def\screensc@le{#1}\@scw=\linewidth \advance \@scw by -20pt
\setbox\scb@x=\hbox\bgroup\begin{minipage}[b]{\@scw}}%
% $B$^$?$O(B \setbox\scb@x=\vbox\bgroup\advance \linewidth by -20pt \relax
@@ -748,6 +810,7 @@
\else\scalebox{\screensc@le}[1]{\box\scb@x}\fi}
\end{picture}%
\end{flushleft}}
+\let\screen\okuscreen \let\endscreen\endokuscreen
% \end{macrocode}
% \end{environment}
%
@@ -844,12 +907,21 @@
%
% $B1FIU$-$NH"$G$9!#(B|ascmac.sty| $B$+$i<h$j$^$7$?!#(B
%
+% [2016-07-30] $B85$K$J$C$F$$$k(Bp\LaTeX $B$N(Bascmac$B%Q%C%1!<%8(B(tascmac.sty)$B$H(B
+% $B>WFM$7$J$$$h$&$K!$?7$7$$;EMM$G$O!$(Bascmac$B$H(Bokumacro$B$NN>J}$rFI$_9~$`>l9g$K$O(B
+% $B!V8e$KFI$_9~$s$@$[$&!W$,>!$A$^$9!#(B
+%
+% $B$^$?!$?7$?$K(Bokushadebox$B4D6-$rDI2C$7$^$9!#$3$l$O(Bascmac$B$H43>D$;$:!$>o$K(B
+% okumacro$BN.$NDj5A$K$J$j$^$9!#(B
+%
% \begin{macrocode}
-\newdimen\shaderule \shaderule 5\p@
-\def\shadebox{\dimen0\linewidth \advance\dimen0-20\p@
+\expandafter\ifx\csname ver@tascmac.sty\endcsname\relax
+ \newdimen\shaderule \shaderule 5\p@
+\fi
+\def\okushadebox{\dimen0\linewidth \advance\dimen0-20\p@
\advance\dimen0-2\fboxrule \advance\dimen0-\shaderule
\setbox\@tempboxa=\hbox\bgroup\minipage{\dimen0}}
-\def\endshadebox{\endminipage\egroup\dimen0=10\p@ \advance\dimen0-\fboxrule
+\def\endokushadebox{\endminipage\egroup\dimen0=10\p@ \advance\dimen0-\fboxrule
\setbox\@tempboxa=\hbox{\kern\dimen0\unhbox\@tempboxa\kern\dimen0}%
\setbox0=\vbox{\hrule\@height \fboxrule
\hbox{\vrule\@width \fboxrule \hskip-\fboxrule
@@ -859,6 +931,7 @@
\hbox{\hbox to \shaderule{\copy0\hss}\kern \z@
\vrule\@width\wd0\@height\z@\@depth\shaderule\hskip-\shaderule
\vrule\@width\shaderule\@height\dimen0}}
+\let\shadebox\okushadebox \let\endshadebox\endokushadebox
% \end{macrocode}
% \end{environment}
%
@@ -1046,20 +1119,4 @@
% ^^A \endinput $B$N8e$K(B \CharacterTable $B$r=q$$$F$*$1$P!$;R%U%!%$%k$K$O(B
% ^^A $B=PNO$5$l$^$;$s!#%A%'%C%/$O(B *.dtx $B$r=hM}$7$?$H$-$K$7$F$/$l$^$9!#(B
%
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
% \Finale
diff --git a/Master/texmf-dist/source/platex/jsclasses/okuverb.dtx b/Master/texmf-dist/source/platex/jsclasses/okuverb.dtx
index a573685a4a4..b271dcb2a94 100644
--- a/Master/texmf-dist/source/platex/jsclasses/okuverb.dtx
+++ b/Master/texmf-dist/source/platex/jsclasses/okuverb.dtx
@@ -1,11 +1,10 @@
% ^^A -*- japanese-latex -*-
-% \CheckSum{167}
% \iffalse
%
% okuverb.dtx
% verb/verbatim $B4X78%^%/%m(B ($B<Q$F$b>F$$$F$b$+$^$$$^$;$s(B)
-% okumura@matsusaka-u.ac.jp
-% http://www.matsusaka-u.ac.jp/~okumura/
+% okumura@okumuralab.org
+% http://oku.edu.mie-u.ac.jp/~okumura/
%
% [2002-12-19] $B$$$m$$$m$J$b$N$K<}O?$7$F$$$?$@$/:]$K%i%$%;%s%9$rL@3N$K$9$k(B
% $BI,MW$,@8$8$F$-$^$7$?!#%"%9%-!<$N$b$N$,:G6a$O(Bmodified BSD$B%i%$%;%s%9$K$J$C(B
@@ -235,20 +234,4 @@
\endinput
% \end{macrocode}
%
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
% \Finale