From c8d27001d582c8d1e03deedb00628269d695ea24 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 3 Sep 2016 21:37:12 +0000 Subject: jsclasses (3sep16) git-svn-id: svn://tug.org/texlive/trunk@41987 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/platex/jsclasses/LICENSE | 25 + Master/texmf-dist/doc/platex/jsclasses/README | 16 - Master/texmf-dist/doc/platex/jsclasses/README.md | 23 + .../texmf-dist/doc/platex/jsclasses/jsclasses.pdf | Bin 331465 -> 430324 bytes Master/texmf-dist/doc/platex/jsclasses/jslogo.pdf | Bin 0 -> 69212 bytes .../texmf-dist/doc/platex/jsclasses/okumacro.pdf | Bin 138086 -> 191536 bytes Master/texmf-dist/source/platex/jsclasses/Makefile | 38 + .../source/platex/jsclasses/jsclasses.dtx | 1057 +++++++++++--------- .../texmf-dist/source/platex/jsclasses/jslogo.dtx | 381 +++++++ .../texmf-dist/source/platex/jsclasses/jslogo.ins | 4 + .../texmf-dist/source/platex/jsclasses/jsverb.dtx | 19 +- .../source/platex/jsclasses/morisawa.dtx | 21 +- .../source/platex/jsclasses/okumacro.dtx | 123 ++- .../texmf-dist/source/platex/jsclasses/okuverb.dtx | 21 +- .../texmf-dist/tex/platex/jsclasses/jsarticle.cls | 741 +++++++------- Master/texmf-dist/tex/platex/jsclasses/jsbook.cls | 751 +++++++------- Master/texmf-dist/tex/platex/jsclasses/jslogo.sty | 216 ++++ Master/texmf-dist/tex/platex/jsclasses/jspf.cls | 749 +++++++------- Master/texmf-dist/tex/platex/jsclasses/kiyou.cls | 752 +++++++------- Master/texmf-dist/tex/platex/jsclasses/minijs.sty | 33 +- .../texmf-dist/tex/platex/jsclasses/okumacro.sty | 51 +- Master/tlpkg/libexec/ctan2tds | 7 - 22 files changed, 2953 insertions(+), 2075 deletions(-) create mode 100644 Master/texmf-dist/doc/platex/jsclasses/LICENSE delete mode 100644 Master/texmf-dist/doc/platex/jsclasses/README create mode 100644 Master/texmf-dist/doc/platex/jsclasses/README.md create mode 100644 Master/texmf-dist/doc/platex/jsclasses/jslogo.pdf create mode 100644 Master/texmf-dist/source/platex/jsclasses/Makefile create mode 100644 Master/texmf-dist/source/platex/jsclasses/jslogo.dtx create mode 100644 Master/texmf-dist/source/platex/jsclasses/jslogo.ins create mode 100644 Master/texmf-dist/tex/platex/jsclasses/jslogo.sty (limited to 'Master') diff --git a/Master/texmf-dist/doc/platex/jsclasses/LICENSE b/Master/texmf-dist/doc/platex/jsclasses/LICENSE new file mode 100644 index 00000000000..6c6f04bdecc --- /dev/null +++ b/Master/texmf-dist/doc/platex/jsclasses/LICENSE @@ -0,0 +1,25 @@ +Copyright 1995-1999 ASCII MEDIA WORKS +Copyright 1999-2016 Haruhiko Okumura +Copyright 2016 Japanese TeX Development Community +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Master/texmf-dist/doc/platex/jsclasses/README b/Master/texmf-dist/doc/platex/jsclasses/README deleted file mode 100644 index e2616c173f1..00000000000 --- a/Master/texmf-dist/doc/platex/jsclasses/README +++ /dev/null @@ -1,16 +0,0 @@ -Japanese classes written by Haruhiko Okumura (okumura@edu.mie-u.ac.jp). -jsarticle, jsbook, and jspf classes are provided. In addition, several -style files are provided, too. - -The classes themselves do not automatically enable the support of -Japanese language. You'll need set up LaTeX environment appropriately -so that it can handle Japanese, not only LaTeX itself but also viewers -of outputs. - -WWW: http://oku.edu.mie-u.ac.jp/~okumura/jsclasses/ - -We include the pre-generated cls/sty files in this package to ensure -proper encoding. The files have to be in JIS-2022 encoding to work -properly on Windows. These files can be generated in a Japanese locale -by running platex on the .dtx files. - diff --git a/Master/texmf-dist/doc/platex/jsclasses/README.md b/Master/texmf-dist/doc/platex/jsclasses/README.md new file mode 100644 index 00000000000..50905c5be83 --- /dev/null +++ b/Master/texmf-dist/doc/platex/jsclasses/README.md @@ -0,0 +1,23 @@ +# jsclasses + +Japanese classes, originally written by Haruhiko Okumura and maintained +by the Japanese TeX Development Community (https://texjp.org), including +jsarticle, jsbook, and miscellaneous classes and style files. + +The classes themselves do not automatically enable the support of +Japanese language. You'll need to set up LaTeX environment appropriately +so that it can handle Japanese. + +WWW: https://github.com/texjporg/jsclasses + +We include the pre-generated cls/sty files in this package to ensure +proper encoding. The files have to be in ISO-2022-JP encoding to work +properly on Windows. These files can be generated in a Japanese locale +by running platex on the .dtx files. + +## Release Date + +2016-09-03 + +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 94cd3fe2e38..4c666330316 100644 Binary files a/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf and b/Master/texmf-dist/doc/platex/jsclasses/jsclasses.pdf differ diff --git a/Master/texmf-dist/doc/platex/jsclasses/jslogo.pdf b/Master/texmf-dist/doc/platex/jsclasses/jslogo.pdf new file mode 100644 index 00000000000..0fdb662b830 Binary files /dev/null and b/Master/texmf-dist/doc/platex/jsclasses/jslogo.pdf differ diff --git a/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf b/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf index 85d251c1e2c..2e94cc13d08 100644 Binary files a/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf and b/Master/texmf-dist/doc/platex/jsclasses/okumacro.pdf differ 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ε新ドキュメントクラス % % これは LaTeX3 Project の classes.dtx と株式会社アスキーの jclasses.dtx -% に基づいて奥村 が改変したものです。 -% 奥村の改変部分については何の権利も主張しません。 -% オリジナルの著作権の許す範囲で自由にご利用ください。 +% に基づいて,もともと奥村晴彦 により +% 作成されたものです。 +% 現在は日本語\TeX 開発コミュニティにより管理されています。 % % [2002-12-19] いろいろなものに収録していただく際にライセンスを明確にする % 必要が生じてきました。アスキーのものが最近はmodified BSDライセンスになっ % ていますので,私のものもそれに準じてmodified BSDとすることにします。 % +% [2016-07-11] abenoriさんによる\texttt{nomag}オプションをマージしました。 +% なお,ソースコードの管理はGitHubで行うことにしました。 +% +% [2016-07-13] 日本語\TeX 開発コミュニティによる管理に移行しました。 +% % 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} % - [2014/02/07 okumura] + [2016/08/26 okumura, texjporg] %<*driver> \documentclass{jsarticle} \usepackage{doc} @@ -69,7 +60,7 @@ % \fi % % \title{\pLaTeXe 新ドキュメントクラス} -% \author{奥村晴彦} +% \author{奥村晴彦,日本語\TeX 開発コミュニティ} % \date{\filedate} % \maketitle % @@ -79,9 +70,12 @@ % % これは\LaTeX3 Projectの \texttt{classes.dtx} と % 株式会社アスキーの \texttt{jclasses.dtx} に基づいて -% 奥村が改変したものです。 -% 権利については両者のものに従います。 -% 奥村は何の権利も主張しません。 +% もともと奥村晴彦により作成されたものです。 +% 現在は日本語\TeX 開発コミュニティによりGitHubで管理されています。 +% \begin{quote} +% |https://github.com/texjporg/jsclasses| +% \end{quote} +% ライセンスはmodified BSDです。 % % [2009-02-22] 田中琢爾氏によるup\LaTeX 対応パッチを取り込みました。 % @@ -123,6 +117,33 @@ % % 以下では実際のコードに即して説明します。 % +% \begin{macro}{\jsc@clsname} +% +% 文書クラスの名前です。エラーメッセージ表示などで使われます。 +% +% \begin{macrocode} +%
\def\jsc@clsname{jsarticle} +%\def\jsc@clsname{jsbook} +%\def\jsc@clsname{jspf} +%\def\jsc@clsname{kiyou} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\ifjsc@needsp@tch} +% +% [2016-08-22] 従来\texttt{jsclasses}では,\pLaTeX や\LaTeX の +% 不都合な点に対して,クラスファイル内で独自に対策を施していま +% した。しかし,2016年以降,コミュニティ版\pLaTeX が次第に対策 +% コードをカーネル内に取り込むようになりました。そこで,新しい +% \pLaTeX カーネルと衝突しないように,日付が古い場合だけパッチ +% をあてる場合があります。この処理に使用するフラグを定義します。 +% +% \begin{macrocode} +\newif\ifjsc@needsp@tch +\jsc@needsp@tchfalse +% \end{macrocode} +% \end{macro} +% % \section{オプション} % % これらのクラスは |\documentclass{jsarticle}| @@ -283,28 +304,42 @@ % % [2003-04-18] 12Qオプションを追加しました。 % +% [2016-07-08] |\mag| を使わずに各種寸法をスケールさせるためのオプション \texttt{nomag} を新設しました。 +% \texttt{usemag} オプションの指定で従来通りの動作となります。デフォルトは \texttt{usemag} です。 +% +% [2016-07-24] オプティカルサイズを調整するためにNFSSへパッチを当てるオプション \texttt{nomag*} を新設しました。 +% % \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{トンボオプション} @@ -486,10 +521,11 @@ % % \texttt{draft} でoverfull boxの起きた行末に5ptの罫線を引きます。 % +% [2016-07-13] |\ifdraft| を定義するのをやめました。 +% % \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{和文フォントメトリックの選択} @@ -550,6 +586,18 @@ % % \end{macrocode} % +% \paragraph{jslogoパッケージの読み込み} +% +% \LaTeX 関連のロゴを再定義する\texttt{jslogo}パッケージを +% 読み込まないオプション\texttt{nojslogo}を新設しました。 +% \texttt{jslogo}オプションの指定で従来どおりの動作となります。 +% デフォルトは\texttt{jslogo}で,すなわちパッケージを読み込みます。 +% \begin{macrocode} +\newif\if@jslogo \@jslogotrue +\DeclareOption{jslogo}{\@jslogotrue} +\DeclareOption{nojslogo}{\@jslogofalse} +% \end{macrocode} +% % \paragraph{オプションの実行} % % デフォルトのオプションを実行し,|dvi| ファイルの先頭にdvipsのpapersize @@ -577,6 +625,34 @@ \fi % \end{macrocode} % +% \paragraph{使用エンジンの検査} +% +% ユーザが |uplatex| オプションの有無により指定したエンジンが,実際に +% 使われているものと一致しているかを検査し,一致しない場合はエラー +% メッセージを表示します。 +% +% \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スペシャルの出力} % % dvipsのpapersizeスペシャルを出力します。 @@ -593,15 +669,19 @@ % % [2003-05-17] トンボをプレビューに使うことを考えて1インチを2インチにしました。 % +% [2016-07-11] memoirクラスのマニュアルによると,トンボを含めた用紙の寸法は +% |\stockwidth|,|\stockheight|と呼ぶようですので,これを使うことにしました。 +% % \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| 側でオプション |mag| は使えません。 % \end{itemize} % +% [2016-07-08] |\jsc@mpt| および |\jsc@mmm| に,それぞれ1ptおよび1mmを拡大させた値を格納します。 +% 以降のレイアウト指定ではこちらを使います。 +% % \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 % +\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] 新しく追加した|\stockwidth|,|\stockheight|も|\mag|にあわせて +% スケールします。 +% +% \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スペシャルの出力} @@ -897,9 +1071,17 @@ % 欧文・和文間のグルーが入らないという副作用もありますので, % 単純な定義に直します。 % +% [2016-08-26] 和欧文間の |\xkanjiskip| が入らない問題は, +% plfonts.dtx v1.3i (2000/07/13) +% の時点で修正されていました。逆に,\texttt{amsmath}パッケージを +% 読み込んだ場合に,数式内の添字で文字サイズが変化するようになる +% はずのところが,変わらなくなっていましたので,修正しました。 +% % \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 @@ % では |I watch TV\@.| と書くと V とピリオドのペアカーニングが効かなくなります。 % そこで,次のような定義に直し,|I watch TV.\@| と書くことにします。 % +% [2016-07-14] 2015-01-01の\LaTeX で,auxiliary filesに書き出されたときに +% スペースが食われないようにする修正が入りました。これに合わせて |{}| を補いました。 +% % \begin{macrocode} -\def\@{\spacefactor3000\space} +\def\@{\spacefactor3000{}} % \end{macrocode} % \end{macro} % @@ -1254,6 +1437,15 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\jsc@setfontsize} +% クラスファイルの内部では,拡大率も考慮した |\jsc@setfontsize| を +% |\@setfontsize| の変わりに用いることにします。 +% \begin{macrocode} +\def\jsc@setfontsize#1#2#3{% + \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}} +% \end{macrocode} +% \end{macro} +% % これらのグルーをもってしても行分割ができない場合は, % |\emergencystretch| に訴えます。 % @@ -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 @@ % いましたが,結局,微調節してみることにしました。 % % \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 -% \@setfontsize\small\@ixpt{11}% -% \@setfontsize\small{8.8888}{11}% +% \jsc@setfontsize\small\@ixpt{11}% +% \jsc@setfontsize\small{8.8888}{11}% \else -% \@setfontsize\small\@ixpt{13}% -% \@setfontsize\small{8.8888}{13.2418}% +% \jsc@setfontsize\small\@ixpt{13}% +% \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 -% \@setfontsize\footnotesize\@viiipt{9.5}% -% \@setfontsize\footnotesize{8.8888}{11}% +% \jsc@setfontsize\footnotesize\@viiipt{9.5}% +% \jsc@setfontsize\footnotesize{8.8888}{11}% \else -% \@setfontsize\footnotesize\@viiipt{11}% -% \@setfontsize\footnotesize{8.8888}{13.2418}% +% \jsc@setfontsize\footnotesize\@viiipt{11}% +% \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| を追加。 % % \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 -% \newcommand{\large}{\@setfontsize\large\@xiipt{\n@baseline}} -% \newcommand{\large}{\@setfontsize\large{11.111}{\n@baseline}} +% \newcommand{\large}{\jsc@setfontsize\large\@xiipt{\n@baseline}} +% \newcommand{\large}{\jsc@setfontsize\large{11.111}{\n@baseline}} \else -% \newcommand{\large}{\@setfontsize\large\@xiipt{17}} -% \newcommand{\large}{\@setfontsize\large{11.111}{17}} +% \newcommand{\large}{\jsc@setfontsize\large\@xiipt{17}} +% \newcommand{\large}{\jsc@setfontsize\large{11.111}{17}} \fi -%\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}} -%\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}} +%\newcommand{\Large}{\jsc@setfontsize\Large\@xivpt{21}} +%\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} %\setlength\columnsep{2zw} %\setlength\columnsep{28truebp} -\setlength\columnseprule{0\p@} +\setlength\columnseprule{0\jsc@mpt} % \end{macrocode} % \end{macro} % \end{macro} @@ -1543,10 +1735,10 @@ % \texttt{normal...} の付いた方は保存用です。 % % \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| は段落の先頭の字下げ幅です。 % % \begin{macrocode} -\setlength\parskip{0\p@} +\setlength\parskip{0\jsc@mpt} \if@slide \setlength\parindent{0zw} \else @@ -1643,12 +1835,16 @@ % 計算では |\headheight| ではなく |\topskip| を使う % ことにしました。 % +% [2016-08-17] 圏点やルビが一行目に来た場合に下がるのを防ぐた +% め,|\topskip| を10ptから1.38zwに増やしました。 +% |\headheight| は従来と同じ20ptのままとします。 +% % \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 % -%\setlength\footskip{9mm} +%\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 % %<*jspf> -\setlength\headsep{9mm} +\setlength\headsep{9\jsc@mmm} \addtolength\headsep{-\topskip} % %<*kiyou> -\setlength\headheight{0\p@} -\setlength\headsep{0\p@} +\setlength\headheight{0\jsc@mpt} +\setlength\headsep{0\jsc@mpt} % % \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 @@ % %<*jspf> \setlength\fullwidth{50zw} -\addtolength\fullwidth{8mm} +\addtolength\fullwidth{8\jsc@mmm} \setlength\textwidth{\fullwidth} % %<*kiyou> @@ -1826,6 +2022,9 @@ % [2003-06-26] |\headheight| を |\topskip| に直しました。 % 以前はこの二つは値が同じであったので,変化はないはずです。 % +% [2016-08-26] |\topskip| を10ptから1.38zwに増やしましたので, +% その分 |\textheight| を増やします(2016-08-17での修正漏れ)。 +% % \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 @@ %\setlength{\textheight}{51\baselineskip} %\setlength{\textheight}{47\baselineskip} \addtolength{\textheight}{\topskip} -\addtolength{\textheight}{0.1\p@} -%\setlength{\mathindent}{10mm} +\addtolength{\textheight}{0.1\jsc@mpt} +%\setlength{\mathindent}{10\jsc@mmm} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\flushbottom} +% +% [2016-07-18] |\textheight| に念のため0.1ポイント余裕を持たせて +% いるのと同様に,|\flushbottom| にも余裕を持たせます。 +% 元の\LaTeXe での完全な |\flushbottom| の定義は +%\begin{verbatim} +% \def\flushbottom{% +% \let\@textbottom\relax \let\@texttop\relax} +%\end{verbatim} +% ですが,次のようにします。 +% +% \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| を |\topskip| に直しました。 % 以前はこの二つは値が同じであったので,変化はないはずです。 % +% [2016-08-17] |\topskip| を10ptから1.38zwに直しましたが, +% |\topmargin| は従来の値から変わらないように調節しました。 +% …のつもりでしたが,|\textheight| を増やし忘れていたので +% 変わってしまっていました(2016-08-26修正済み)。 +% % \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 @@ % 和文の行送りを考えてもうちょっと大きくします。 % % \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 @@ % % フロート(図,表)関連のパラメータは\LaTeXe 本体で定義されていますが, % ここで設定変更します。本文ページ(本文とフロートが共存するページ) -% ちなみに,カウンタは内部では |\c@| を名前に冠したマクロになっています。 % とフロートだけのページで設定が異なります。 +% ちなみに,カウンタは内部では |\c@| を名前に冠したマクロになっています。 % % \begin{macro}{\c@topnumber} % @@ -2084,9 +2306,9 @@ % |\intextsep| は本文の途中に出力されるフロートと本文との距離です。 % % \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 @@ % 二段組のときの段抜きのフロートについての値です。 % % \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| はフロート間に入ります。 % % \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 @@ % 段抜きフロートについての値です。 % % \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} % @@ -2720,6 +2942,9 @@ % 二つ挿入した |\everyparhook| のうち後者が |\paragraph| 類の後で2回実行され, % それ以降は前者が実行されます。 % +% [2016-07-28] \texttt{slide}オプションと\texttt{twocolumn}オプションを +% 同時に指定した場合の罫線の位置を微調整しました。 +% % \begin{macrocode} \def\@xsect#1{% % 見出しの後ろの空きを \@tempskipa にセット @@ -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}オプション指定時に |\subsubsection| の文字列 +% と罫線が重なる問題に対処しました(forum:1982)。 +% % \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}% 改行せず 1zw のアキ + {\z@}{\if@slide .4\Cvs \else -1zw\fi}% 改行せず 1zw のアキ % {\normalfont\normalsize\headfont}} % {\normalfont\normalsize\headfont ■}} \else \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}% - {-1zw}% 改行せず 1zw のアキ + {\if@slide .5\Cvs \@plus.3\Cdp \else -1zw\fi}% 改行せず 1zw のアキ % {\normalfont\normalsize\headfont}} % {\normalfont\normalsize\headfont ■}} \fi @@ -3324,9 +3555,15 @@ % 見出しの後ろで改行されません。 % % \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} % % \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} % @@ -3850,7 +4087,7 @@ % |array| 環境の列間には |\arraycolsep| の2倍の幅の空きが入ります。 % % \begin{macrocode} -\setlength\arraycolsep{5\p@} +\setlength\arraycolsep{5\jsc@mpt} % \end{macrocode} % \end{macro} % @@ -3859,7 +4096,7 @@ % |tabular| 環境の列間には |\tabcolsep| の2倍の幅の空きが入ります。 % % \begin{macrocode} -\setlength\tabcolsep{6\p@} +\setlength\tabcolsep{6\jsc@mpt} % \end{macrocode} % \end{macro} % @@ -3868,7 +4105,7 @@ % |array|,|tabular| 環境内の罫線の幅です。 % % \begin{macrocode} -\setlength\arrayrulewidth{.4\p@} +\setlength\arrayrulewidth{.4\jsc@mpt} % \end{macrocode} % \end{macro} % @@ -3877,7 +4114,7 @@ % |array|,|tabular| 環境での二重罫線間のアキです。 % % \begin{macrocode} -\setlength\doublerulesep{2\p@} +\setlength\doublerulesep{2\jsc@mpt} % \end{macrocode} % \end{macro} % @@ -3916,8 +4153,8 @@ % |\fbox|,|\framebox| の罫線の幅です。 % % \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@} % 元: 10\p@ -\setlength\belowcaptionskip{5\p@} % 元: 0\p@ +\setlength\abovecaptionskip{5\jsc@mpt} % 元: 10\p@ +\setlength\belowcaptionskip{5\jsc@mpt} % 元: 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 @@ % % 目次を生成します。 % -% \begin{macro}{\js@tocl@width} +% \begin{macro}{\jsc@tocl@width} % % [2013-12-30] |\prechaptername| などから見積もった目次のラベルの長さです。(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> - \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}% % @@ -4373,7 +4610,7 @@ \ifnum \c@tocdepth >-2\relax % \addpenalty\@secpenalty % \addpenalty{-\@highpenalty}% - \addvspace{2.25em \@plus\p@}% + \addvspace{2.25em \@plus\jsc@mpt}% \begingroup \parindent \z@ % \@pnumwidth should be \@tocrmarg @@ -4396,7 +4633,7 @@ % % 章の目次です。|\@lnumwidth| を4.683zwに増やしました。 % -% [2013-12-30] |\@lnumwidth| を |\js@tocl@width| から +% [2013-12-30] |\@lnumwidth| を |\jsc@tocl@width| から % 決めるようにしてみました。(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では↑がこうなっている \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}% 元1.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 @@ % % \newcommand*{\l@section}{\@dottedtocline{1}{1zw}{3.683zw}} % \end{macrocode} % -% [2013-12-30] 上のインデントは |\js@tocl@width| から決めるように +% [2013-12-30] 上のインデントは |\jsc@tocl@width| から決めるように % しました。(by ts) % % \end{macro} @@ -4467,7 +4704,7 @@ % さらに下位レベルの目次項目の体裁です。 % あまり使ったことがありませんので,要修正かもしれません。 % -% [2013-12-30] ここも |\js@tocl@width| から決めるように +% [2013-12-30] ここも |\jsc@tocl@width| から決めるように % してみました。(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> @@ -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}} % % \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 @@ % \@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 @@ % 索引で先頭文字ごとのブロックの間に入るスペースです。 % % \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} % -% 和文の句読点・閉じかっこ類の直後で用いた際に -% 余分なアキが入るのを防ぐため, +% 和文の句読点・閉じかっこ類の直後で用いた際に余分なアキが入るのを防ぐため, % |\inhibitglue| を入れることにします。 +% p\LaTeX の日付が2016/09/03より新しい場合は,このパッチが不要なのであてません。 % % \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 に倣った形に書き直しました(Thanks: 北川さん)。 % +% [2016-07-11] コミュニティ版p\LaTeX の変更に追随しました(Thanks: 角藤さん)。 +% p\LaTeX の日付が2016/04/17より新しい場合は,このパッチが不要なのであてません。 +% % \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) % +% [2016-08-25] コミュニティ版\pLaTeX の「閉じ括弧類の直後に +% |\footnotetext| が続く場合に改行が起きることがある問題に対処」 +% と同等のコードを追加しました。 +% % \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「 - \inhibitglue - \else - \ifx\@let@token( + \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『 - \inhibitglue - \else - \ifx\@let@token[ - \inhibitglue - \fi - \fi \fi \fi} \let\everyparhook=\@inhibitglue @@ -5139,204 +5406,30 @@ % % \LaTeX 関連のロゴを作り直します。 % +% [2016-07-14] ロゴの定義は\texttt{jslogo}パッケージに移転しました。 +% 後方互換のため,\texttt{jsclasses}ではデフォルトでこれを読み込みます。 +% \texttt{nojslogo}オプションが指定されている場合は読み込みません。 +% % \begin{macro}{\小} % \begin{macro}{\上小} % -% 文字を小さめに出したり上寄りに小さめに出したりする命令です。 -% -% \begin{macrocode} -\def\小#1{\hbox{$\m@th$% - \csname S@\f@size\endcsname - \fontsize\sf@size\z@ - \math@fontsfalse\selectfont - #1}} -\def\上小#1{{\sbox\z@ T\vbox to\ht0{\小{#1}\vss}}} -% \end{macrocode} -% \end{macro} -% \end{macro} -% -% \begin{macro}{\TeX} -% \begin{macro}{\LaTeX} -% -% これらは \texttt{ltlogos.dtx} で定義されていますが, -% TimesやHelveticaでも見栄えがするように若干変更しました。 -% -% [2003-06-12] Palatinoも加えました(要調整)。 -% -% \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\上小{A}\kern-.22em\cmrTeX - \else - L\kern-.36em\上小{A}\kern-.15em\cmrTeX - \fi} -\def\sfTeX{T\kern-.1em\lower.4ex\hbox{E}\kern-.07emX\@} -\def\sfLaTeX{L\kern-.25em\上小{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\上小{A}\kern-.1em\ptmTeX - \else - L\kern-.3em\上小{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\上小{A}\kern-.1em\pncTeX - \else - L\kern-.3em\上小{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\上小{A}\kern-.12em\pplTeX - \else - L\kern-.3em\上小{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\上小{A}\kern-.13em\ugmTeX - \else - L\kern-.3em\上小{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| コマンドの |\mbox{\m@th ...| で始まる新しい定義では -% 直後の和文との間に |\xkanjiskip| が入りません。また, -% |mathptmx| パッケージなどと併用すると,最後の $\varepsilon$ が -% 下がりすぎてしまいます。そのため,ちょっと手を加えました。 -% -% \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 ,\pLaTeXe のロゴを出す命令です。 -% -% \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} で定義されています。 -% -% \begin{macrocode} -\def\AmSTeX{\protect\AmS-\protect\TeX{}} -% \end{macrocode} -% -% \end{macro} -% -% \begin{macro}{\BibTeX} -% \begin{macro}{\SliTeX} -% -% これらは \texttt{doc.dtx} から取ったものです。 -% ただし,|\BibTeX| だけはちょっと修正しました。 -% -% \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\小{I\kern-.025em B}% - \ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX} -\DeclareRobustCommand{\SliTeX}{% - S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX} +% 文字を小さめに出したり上寄りに小さめに出したりする命令を, +% \texttt{jslogo.sty}では名称変更してありますので,コピーします。 +% \begin{macrocode} +\if@jslogo + \IfFileExists{jslogo.sty}{% + \RequirePackage{jslogo}% + \def\小{\jslg@small}% + \def\上小{\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 関連のロゴ(pLaTeX2ε新ドキュメントクラス付録) +% +% Copyright 1999-2016 Haruhiko Okumura +% Copyright 2016 Japanese TeX Development Community +% +% \fi +% +% \iffalse +% +% \begin{macrocode} +%\NeedsTeXFormat{LaTeX2e} +%\ProvidesPackage{jslogo} +%<*driver> +\ProvidesFile{jslogo.dtx} +% + [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} +% +% \end{macrocode} +% +% \fi +% +% \title{\pLaTeXe 新ドキュメントクラス付録 ロゴパッケージ} +% \author{奥村晴彦,日本語\TeX 開発コミュニティ} +% \date{\filedate} +% \maketitle +% +% \MakeShortVerb{\|} +% +% \section{はじめに} +% +% これはもともと奥村晴彦氏による\texttt{jsclasses.dtx}で定義され +% ていた\LaTeX 関連のロゴを,独立のパッケージに抽出したものです。 +% \texttt{jsclasses}ではデフォルトで読み込まれます。 +% 現在は日本語\TeX 開発コミュニティによりGitHubで管理されています。 +% \begin{quote} +% |https://github.com/texjporg/jsclasses| +% \end{quote} +% ライセンスはmodified BSDです。 +% +% \StopEventually{} +% +% 以下では実際のコードに即して説明します。 +% +% +% \section{いろいろなロゴ} +% +% \LaTeX 関連のロゴを作り直します。 +% +% \begin{macro}{\jslg@small} +% \begin{macro}{\jslg@uppersmall} +% +% 文字を小さめに出したり上寄りに小さめに出したりする命令です。 +% +% \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} +% +% これらは \texttt{ltlogos.dtx} で定義されていますが, +% TimesやHelveticaでも見栄えがするように若干変更しました。 +% +% Computer Modern Romanです(ファミリ名\texttt{cmr})。 +% 元の定義に最も近いので,特別に定義しない場合に用います。 +% +% \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(ファミリ名\texttt{cmss})や +% Helvetica(ファミリ名\texttt{phv})などのサンセリフ体です。 +% +% \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です(ファミリ名\texttt{ptm})。 +% TXフォント(ファミリ名\texttt{txr})でも用います。 +% +% \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です(ファミリ名\texttt{pnc})。 +% +% \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です(ファミリ名\texttt{ppl})。 +% PXフォント(ファミリ名\texttt{pxr})でも用います。 +% +% \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です(ファミリ名\texttt{ugm})。 +% +% \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} +% +% 以上の定義を,ファミリによって使い分けます。 +% +% [2003-06-12] Palatinoも加えました(要調整)。 +% +% \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| コマンドの |\mbox{\m@th ...| で始まる新しい定義では +% 直後の和文との間に |\xkanjiskip| が入りません。また, +% |mathptmx| パッケージなどと併用すると,最後の $\varepsilon$ が +% 下がりすぎてしまいます。そのため,ちょっと手を加えました。 +% +% \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 ,\pLaTeXe のロゴを出す命令です。 +% +% \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 ,\upLaTeXe のロゴを出す命令も定義します。 +% +% \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} で定義されています。 +% +% \begin{macrocode} +\def\AmSTeX{\protect\AmS-\protect\TeX{}} +% \end{macrocode} +% +% \end{macro} +% +% \begin{macro}{\BibTeX} +% \begin{macro}{\SliTeX} +% +% これらは \texttt{doc.dtx} から取ったものです。 +% ただし,|\BibTeX| だけはちょっと修正しました。 +% +% \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} +% +% +% 以上です。 +% +% \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 関係マクロ (煮ても焼いてもかまいません) -% okumura@edu.mie-u.ac.jp +% okumura@okumuralab.org % http://oku.edu.mie-u.ac.jp/~okumura/ % % 「煮ても焼いてもかまいません」で困る場合はmodified BSDということでお願いします。 @@ -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 % % モリサワ基本5書体を使うためのパッケージ % -% 奥村晴彦 +% 奥村晴彦 % % [2002-12-19] いろいろなものに収録していただく際にライセンスを明確にする % 必要が生じてきました。アスキーのものが最近はmodified BSDライセンスになっ @@ -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 の後に \CharacterTable を書いておけば,子ファイルには % ^^A 出力されません。チェックは *.dtx を処理したときにしてくれます。 % -%% \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 % 私家版マクロ集 (煮ても焼いてもかまいません) -% 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] いろいろなものに収録していただく際にライセンスを明確にする % 必要が生じてきました。アスキーのものが最近は(modified)BSDライセンスになっ % ていますので,私のものもそれに準じて(modified)BSDとすることにします。 % %\NeedsTeXFormat{pLaTeX2e} -%\ProvidesPackage{okumacro}[2010/03/14 okumura] +%\ProvidesPackage{okumacro}[2016/08/16 okumura, texjporg] %<*driver> \documentclass{jsarticle} \usepackage{doc} @@ -70,6 +69,11 @@ % % 以下が実際のマクロ集です。 % +% [2016-07-30] 従来は,ascmac→okumacroの順に読み込んだ場合にエラーが出て +% いましたが,新しい仕様では,ascmacとokumacroの両方を読み込む場合には +% 「後に読み込んだほう」が勝ちます。 +% 具体的には |\keytop|,|\return|,screen環境,shadebox環境があります。 +% % \begin{macrocode} %<*okumacro> % \end{macrocode} @@ -93,15 +97,25 @@ % [2010-03-14] ルビの直後で改行できなかったので, % 親字が和文と仮定して直後に |\kanjiskip| を入れました。 % +% [2016-08-16] 縦組に対応。 +% +% [2016-08-16] 「前に |\kanjiskip| が入らない」「前後の欧文文字との間に |\xkanjiskip| が入らない」「後ろの禁則処理が効かない」問題を解決するために和文ゴースト処理を追加。 +% % \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{圏点}を振るコマンドです。 % +% [2016-07-30] ルビと圏点の高さを合わせるつもりでしたが,間違って +% 上シフト量を0.63zwとしていましたので,正しい値0.75zwに直しました。 +% % \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 @@ % % これを使ってキートップ記号を作ります。 % +% [2016-07-30] |\keytop| はp\LaTeX のascmacパッケージ(tascmac.sty)でも +% 定義されていますが,ascmacの定義では周囲と同じファミリのままになっていて, +% okumacroでは中の文字をサンセリフ体に変更しています。 +% 両方のパッケージを読み込む場合は,後に読み込んだほうの定義が勝ちます。 +% okumacroが勝つ場合には常にサンセリフ体に変更するキートップ記号を出力しますし, +% ascmacが勝つ場合は周囲と同じファミリになります。 +% +% また,新たに |\okukeytop| という命令を追加します。これはascmacと干渉せず, +% 常にサンセリフ体に変更するキートップ記号を出力できます。 +% % \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 @@ % % リターンキーの記号です。 % +% [2016-07-30] |\return| はp\LaTeX のascmacパッケージ(tascmac.sty)でも +% 定義されていますが,okumacroがリターンのキートップ記号を出力するのに対し, +% ascmacではリターンの矢印文字{\font\ASCGRP=ascgrp \ASCGRP\char"20}だけ +% を出す命令になっています。 +% 両方のパッケージを読み込む場合は,後に読み込んだほうの定義が勝ちます。 +% okumacroが勝つ場合には\okureturn を出力しますし, +% ascmacが勝つ場合は{\font\ASCGRP=ascgrp \ASCGRP\char"20}を出力します。 +% +% また,新たに |\okureturn| という命令を追加します。これはascmacと干渉せず, +% 常にリターンのキートップ記号\okureturn を出力できます。 +% % \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 @@ % ただ,screen環境の最初に |[| が来る場合は誤動作しますので,|\relax| % か |{}| を入れて誤魔化してください。 % +% [2016-07-30] 元になっているp\LaTeX のascmacパッケージ(tascmac.sty)の +% screen環境は,オプション引数の数値で角の丸みの大きさを整数値(0--8)で指定し +% ますが,okumacroパッケージでは横の倍率を指定するという違いがあります。 +% 両方のパッケージを読み込む場合は,後に読み込んだほうの定義が勝ちます。 +% screen環境は,okumacroが勝つ場合には横の倍率を指定できる +% スクリーン風の環境になりますし,ascmacが勝つ場合は角の丸みを指定できる +% スクリーン風の環境になります。 +% +% また,新たにokuscreen環境を追加します。これはascmacと干渉せず,常に横の +% 倍率を指定できるスクリーン風の環境になります。 +% % \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}}% % または \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 @@ % % 影付きの箱です。|ascmac.sty| から取りました。 % +% [2016-07-30] 元になっているp\LaTeX のascmacパッケージ(tascmac.sty)と +% 衝突しないように,新しい仕様では,ascmacとokumacroの両方を読み込む場合には +% 「後に読み込んだほう」が勝ちます。 +% +% また,新たにokushadebox環境を追加します。これはascmacと干渉せず,常に +% okumacro流の定義になります。 +% % \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 の後に \CharacterTable を書いておけば,子ファイルには % ^^A 出力されません。チェックは *.dtx を処理したときにしてくれます。 % -%% \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 関係マクロ (煮ても焼いてもかまいません) -% 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] いろいろなものに収録していただく際にライセンスを明確にする % 必要が生じてきました。アスキーのものが最近はmodified BSDライセンスになっ @@ -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 diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls index 92c4fa67124..0d58b71d851 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls @@ -20,24 +20,12 @@ %% original source files, as listed above, are part of the %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) -%% \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 \~} \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jsarticle} - [2014/02/07 okumura] + [2016/08/26 okumura, texjporg] +\def\jsc@clsname{jsarticle} +\newif\ifjsc@needsp@tch +\jsc@needsp@tchfalse \newif\if@restonecol \newif\if@titlepage \newif\if@enablejfam \@enablejfamtrue @@ -95,26 +83,35 @@ \newif\if@slide \@slidefalse \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} \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -182,9 +179,8 @@ \tabskip\z@skip\cr }} \DeclareOption{disablejfam}{\@enablejfamfalse} -\newif\ifdraft -\DeclareOption{draft}{\drafttrue \setlength\overfullrule{5pt}} -\DeclareOption{final}{\draftfalse \setlength\overfullrule{0pt}} +\DeclareOption{draft}{\setlength\overfullrule{5pt}} +\DeclareOption{final}{\setlength\overfullrule{0pt}} \newif\ifwinjis \winjisfalse \newif\ifmingoth @@ -206,6 +202,9 @@ \newif\if@english \@englishfalse \DeclareOption{english}{\@englishtrue} +\newif\if@jslogo \@jslogotrue +\DeclareOption{jslogo}{\@jslogotrue} +\DeclareOption{nojslogo}{\@jslogofalse} \ExecuteOptions{a4paper,oneside,onecolumn,notitlepage,final} \ProcessOptions \if@slide @@ -216,93 +215,189 @@ \setlength\paperheight{\paperwidth} \setlength\paperwidth {\@tempdima} \fi -\ifpapersize - \setlength{\@tempdima}{\paperwidth} - \setlength{\@tempdimb}{\paperheight} - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in +\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 - \AtBeginDvi{\special{papersize=\the\@tempdima,\the\@tempdimb}} -\fi -\if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi -\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} +\newdimen\stockwidth \newdimen\stockheight +\setlength{\stockwidth}{\paperwidth} +\setlength{\stockheight}{\paperheight} +\iftombow + \advance \stockwidth 2in + \advance \stockheight 2in \fi -\ifnum\@ptsize=1051 - \mag 1139 - \def\inv@mag{0.877963} +\ifpapersize + \AtBeginDvi{\special{papersize=\the\stockwidth,\the\stockheight}} \fi -\ifnum\@ptsize=1101 - \mag 1194 - \def\inv@mag{0.837521} +\if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi +\newdimen\jsc@mpt +\newdimen\jsc@mmm +\def\inv@mag{1} +\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 -\ifnum\@ptsize=1201 - \mag 1302 - \def\inv@mag{0.768049} +\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 \setlength\paperwidth{\inv@mag\paperwidth}% \setlength\paperheight{\inv@mag\paperheight}% +\setlength\stockwidth{\inv@mag\stockwidth}% +\setlength\stockheight{\inv@mag\stockheight}% \ifwinjis \DeclareFontShape{JY1}{mc}{m}{n}{<-> s * [0.961] winjis}{} \DeclareFontShape{JY1}{gt}{m}{n}{<-> s * [0.961] winjisg}{} @@ -358,8 +453,10 @@ \DeclareRobustCommand\ttfamily {\not@math@alphabet\ttfamily\mathtt \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont} -\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}} \def\reDeclareMathAlphabet#1#2#3{% \edef\@tempa{\expandafter\@gobble\string#2}% \edef\@tempb{\expandafter\@gobble\string#3}% @@ -417,13 +514,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}} @@ -563,7 +658,7 @@ \xspcode`^^fd=3 \xspcode`^^fe=3 \xspcode`^^ff=3 -\def\@{\spacefactor3000\space} +\def\@{\spacefactor3000{}} \def\@setfontsize#1#2#3{% \ifx\protect\@typeset@protect \let\@currsize#1% @@ -582,6 +677,8 @@ \xkanjiskip=0.25em plus 0.15em minus 0.06em \fi \fi} +\def\jsc@setfontsize#1#2#3{% + \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}} \emergencystretch 3zw \newif\ifnarrowbaselines \if@english @@ -601,13 +698,13 @@ \def\widebaselines{\narrowbaselinesfalse\@currsize\selectfont} \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 - \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 \let\@listi\@listI} \normalsize @@ -619,12 +716,12 @@ \setlength\Chs{\wd0} \newcommand{\small}{% \ifnarrowbaselines - \@setfontsize\small\@ixpt{11}% + \jsc@setfontsize\small\@ixpt{11}% \else - \@setfontsize\small\@ixpt{13}% + \jsc@setfontsize\small\@ixpt{13}% \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 @@ -633,40 +730,40 @@ \itemsep \parsep}} \newcommand{\footnotesize}{% \ifnarrowbaselines - \@setfontsize\footnotesize\@viiipt{9.5}% + \jsc@setfontsize\footnotesize\@viiipt{9.5}% \else - \@setfontsize\footnotesize\@viiipt{11}% + \jsc@setfontsize\footnotesize\@viiipt{11}% \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 \topsep \z@ \parsep \z@ \itemsep \parsep}} -\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 - \newcommand{\large}{\@setfontsize\large\@xiipt{\n@baseline}} + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{\n@baseline}} \else - \newcommand{\large}{\@setfontsize\large\@xiipt{17}} + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{17}} \fi -\newcommand{\Large}{\@setfontsize\Large\@xivpt{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}} +\newcommand{\Large}{\jsc@setfontsize\Large\@xivpt{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}} \everydisplay=\expandafter{\the\everydisplay \narrowbaselines} \newcommand{\headfont}{\gtfamily\sffamily} \setlength\columnsep{2zw} -\setlength\columnseprule{0\p@} -\setlength\lineskip{1\p@} -\setlength\normallineskip{1\p@} -\setlength\lineskiplimit{1\p@} -\setlength\normallineskiplimit{1\p@} +\setlength\columnseprule{0\jsc@mpt} +\setlength\lineskip{1\jsc@mpt} +\setlength\normallineskip{1\jsc@mpt} +\setlength\lineskiplimit{1\jsc@mpt} +\setlength\normallineskiplimit{1\jsc@mpt} \renewcommand{\baselinestretch}{} -\setlength\parskip{0\p@} +\setlength\parskip{0\jsc@mpt} \if@slide \setlength\parindent{0zw} \else @@ -675,11 +772,11 @@ \@lowpenalty 51 \@medpenalty 151 \@highpenalty 301 -\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 \if@slide \setlength\footskip{0pt} @@ -690,7 +787,7 @@ \fi \fi \if@slide - \setlength\headsep{0\p@} + \setlength\headsep{0\jsc@mpt} \else \setlength\headsep{\footskip} \addtolength\headsep{-\topskip} @@ -710,14 +807,17 @@ \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} \divide\textheight\baselineskip \multiply\textheight\baselineskip \addtolength{\textheight}{\topskip} -\addtolength{\textheight}{0.1\p@} +\addtolength{\textheight}{0.1\jsc@mpt} +\def\flushbottom{% + \def\@textbottom{\vskip \z@ \@plus.1\jsc@mpt}% + \let\@texttop\relax} \setlength\marginparsep{\columnsep} \setlength\marginparpush{\baselineskip} \setlength{\oddsidemargin}{\paperwidth} @@ -737,7 +837,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 @@ -747,7 +847,7 @@ \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} @@ -759,7 +859,7 @@ \fi {\footnotesize\global\setlength\footnotesep{\baselineskip}} \setlength\footnotesep{0.7\footnotesep} -\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} \setcounter{topnumber}{9} \renewcommand{\topfraction}{.85} \setcounter{bottomnumber}{9} @@ -770,17 +870,17 @@ \setcounter{dbltopnumber}{9} \renewcommand{\dbltopfraction}{.8} \renewcommand{\dblfloatpagefraction}{.8} -\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\dblfloatsep {12\p@ \@plus 2\p@ \@minus 2\p@} -\setlength\dbltextfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@} -\setlength\@fptop{0\p@ \@plus 1fil} -\setlength\@fpsep{8\p@ \@plus 2fil} -\setlength\@fpbot{0\p@ \@plus 1fil} -\setlength\@dblfptop{0\p@ \@plus 1fil} -\setlength\@dblfpsep{8\p@ \@plus 2fil} -\setlength\@dblfpbot{0\p@ \@plus 1fil} +\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} +\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} +\setlength\@fptop{0\jsc@mpt \@plus 1fil} +\setlength\@fpsep{8\jsc@mpt \@plus 2fil} +\setlength\@fpbot{0\jsc@mpt \@plus 1fil} +\setlength\@dblfptop{0\jsc@mpt \@plus 1fil} +\setlength\@dblfpsep{8\jsc@mpt \@plus 2fil} +\setlength\@dblfpbot{0\jsc@mpt \@plus 1fil} \def\ps@plainfoot{% \let\@mkboth\@gobbletwo \let\@oddhead\@empty @@ -860,16 +960,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% @@ -1031,7 +1131,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} @@ -1116,7 +1218,7 @@ \fi \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@}% @@ -1126,27 +1228,33 @@ \fi \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 \if@twocolumn \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% - {\z@}{-1zw}% 改行せず 1zw のアキ + {\z@}{\if@slide .4\Cvs \else -1zw\fi}% 改行せず 1zw のアキ {\normalfont\normalsize\headfont ■}} \else \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}% - {-1zw}% 改行せず 1zw のアキ + {\if@slide .5\Cvs \@plus.3\Cdp \else -1zw\fi}% 改行せず 1zw のアキ {\normalfont\normalsize\headfont ■}} \fi -\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 \if@slide \setlength\leftmargini{1zw} \else @@ -1312,14 +1420,14 @@ \gdef\postsectionname{}% \gdef\thesection{\presectionname\@Alph\c@section\postsectionname}% \gdef\thesubsection{\@Alph\c@section.\@arabic\c@subsection}} -\setlength\arraycolsep{5\p@} -\setlength\tabcolsep{6\p@} -\setlength\arrayrulewidth{.4\p@} -\setlength\doublerulesep{2\p@} +\setlength\arraycolsep{5\jsc@mpt} +\setlength\tabcolsep{6\jsc@mpt} +\setlength\arrayrulewidth{.4\jsc@mpt} +\setlength\doublerulesep{2\jsc@mpt} \setlength\tabbingsep{\labelsep} \skip\@mpfootins = \skip\footins -\setlength\fboxsep{3\p@} -\setlength\fboxrule{.4\p@} +\setlength\fboxsep{3\jsc@mpt} +\setlength\fboxrule{.4\jsc@mpt} \renewcommand \theequation {\@arabic\c@equation} \newcounter{figure} \renewcommand \thefigure {\@arabic\c@figure} @@ -1347,8 +1455,8 @@ {\end@dblfloat} \newlength\abovecaptionskip \newlength\belowcaptionskip -\setlength\abovecaptionskip{5\p@} % 元: 10\p@ -\setlength\belowcaptionskip{5\p@} % 元: 0\p@ +\setlength\abovecaptionskip{5\jsc@mpt} % 元: 10\p@ +\setlength\belowcaptionskip{5\jsc@mpt} % 元: 0\p@ \long\def\@makecaption#1#2{{\small \advance\leftskip .0628\linewidth \advance\rightskip .0628\linewidth @@ -1372,12 +1480,12 @@ \newcommand\@tocrmarg{2.55em} \newcommand\@dotsep{4.5} \setcounter{tocdepth}{2} -\newdimen\js@tocl@width +\newdimen\jsc@tocl@width \newcommand{\tableofcontents}{% - \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}% \@starttoc{toc}% @@ -1385,7 +1493,7 @@ \newcommand*{\l@part}[2]{% \ifnum \c@tocdepth >-2\relax \addpenalty\@secpenalty - \addvspace{2.25em \@plus\p@}% + \addvspace{2.25em \@plus\jsc@mpt}% \begingroup \parindent \z@ \rightskip \@tocrmarg @@ -1400,34 +1508,34 @@ \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\@tocrmarg \parfillskip-\rightskip \leavevmode\headfont %\setlength\@lnumwidth{4zw}% 元1.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 \fi} \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}} \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} \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 @@ -1499,7 +1607,7 @@ \@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 @@ -1514,21 +1622,29 @@ \newcommand{\@idxitem}{\par\hangindent 4zw} % 元 40pt \newcommand{\subitem}{\@idxitem \hspace*{2zw}} % 元 20pt \newcommand{\subsubitem}{\@idxitem \hspace*{3zw}} % 元 30pt -\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} \newcommand\seename{\if@english see\else →\fi} \newcommand\alsoname{\if@english see also\else →\fi} -\let\footnotes@ve=\footnote -\def\footnote{\inhibitglue\footnotes@ve} -\let\footnotemarks@ve=\footnotemark -\def\footnotemark{\inhibitglue\footnotemarks@ve} -\renewcommand\@makefnmark{\hbox{}\hbox{% - \ifydir \@textsuperscript{\normalfont\@thefnmark}% - \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}} +\@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 +\@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 \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi} \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} \long\def\@footnotetext{% \insert\footins\bgroup \normalfont\footnotesize @@ -1547,7 +1663,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} \newcommand\@makefntext[1]{% \advance\leftskip 3zw \parindent 1zw @@ -1555,20 +1677,29 @@ \llap{\@makefnmark\hskip0.3zw}#1} \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「 - \inhibitglue - \else - \ifx\@let@token( + \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『 - \inhibitglue - \else - \ifx\@let@token[ - \inhibitglue - \fi - \fi \fi \fi} \let\everyparhook=\@inhibitglue @@ -1660,136 +1791,20 @@ \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null \inhibitglue \ignorespaces \fi} -\def\小#1{\hbox{$\m@th$% - \csname S@\f@size\endcsname - \fontsize\sf@size\z@ - \math@fontsfalse\selectfont - #1}} -\def\上小#1{{\sbox\z@ T\vbox to\ht0{\小{#1}\vss}}} -\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\上小{A}\kern-.22em\cmrTeX - \else - L\kern-.36em\上小{A}\kern-.15em\cmrTeX - \fi} -\def\sfTeX{T\kern-.1em\lower.4ex\hbox{E}\kern-.07emX\@} -\def\sfLaTeX{L\kern-.25em\上小{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\上小{A}\kern-.1em\ptmTeX - \else - L\kern-.3em\上小{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\上小{A}\kern-.1em\pncTeX - \else - L\kern-.3em\上小{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\上小{A}\kern-.12em\pplTeX - \else - L\kern-.3em\上小{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\上小{A}\kern-.13em\ugmTeX - \else - L\kern-.3em\上小{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} -\DeclareRobustCommand{\LaTeXe}{$\mbox{% - \if b\expandafter\@car\f@series\@nil\boldmath\fi - \LaTeX\kern.15em2\raisebox{-.37ex}{$\textstyle\varepsilon$}}$} -\def\pTeX{p\kern-.05em\TeX} -\def\pLaTeX{p\LaTeX} -\def\pLaTeXe{p\LaTeXe} -\def\AmSTeX{\protect\AmS-\protect\TeX{}} -\DeclareRobustCommand{\BibTeX}{B\kern-.05em\小{I\kern-.025em B}% - \ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX} -\DeclareRobustCommand{\SliTeX}{% - S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX} +\if@jslogo + \IfFileExists{jslogo.sty}{% + \RequirePackage{jslogo}% + \def\小{\jslg@small}% + \def\上小{\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 \let\ltx@ifnextchar\@ifnextchar \def\ProvidesFile#1{% \begingroup diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls index 35725125b59..8da4765b3be 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls @@ -20,24 +20,12 @@ %% original source files, as listed above, are part of the %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) -%% \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 \~} \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jsbook} - [2014/02/07 okumura] + [2016/08/26 okumura, texjporg] +\def\jsc@clsname{jsbook} +\newif\ifjsc@needsp@tch +\jsc@needsp@tchfalse \newif\if@restonecol \newif\if@titlepage \newif\if@openright @@ -97,26 +85,35 @@ \newif\if@slide \@slidefalse \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} \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -186,9 +183,8 @@ \tabskip\z@skip\cr }} \DeclareOption{disablejfam}{\@enablejfamfalse} -\newif\ifdraft -\DeclareOption{draft}{\drafttrue \setlength\overfullrule{5pt}} -\DeclareOption{final}{\draftfalse \setlength\overfullrule{0pt}} +\DeclareOption{draft}{\setlength\overfullrule{5pt}} +\DeclareOption{final}{\setlength\overfullrule{0pt}} \newif\ifwinjis \winjisfalse \newif\ifmingoth @@ -213,6 +209,9 @@ \newif\if@report \@reportfalse \DeclareOption{report}{\@reporttrue\@openrightfalse\@twosidefalse\@mparswitchfalse} +\newif\if@jslogo \@jslogotrue +\DeclareOption{jslogo}{\@jslogotrue} +\DeclareOption{nojslogo}{\@jslogofalse} \ExecuteOptions{a4paper,twoside,onecolumn,titlepage,openright,final} \ProcessOptions \if@slide @@ -223,93 +222,189 @@ \setlength\paperheight{\paperwidth} \setlength\paperwidth {\@tempdima} \fi -\ifpapersize - \setlength{\@tempdima}{\paperwidth} - \setlength{\@tempdimb}{\paperheight} - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in +\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 - \AtBeginDvi{\special{papersize=\the\@tempdima,\the\@tempdimb}} -\fi -\if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi -\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} +\newdimen\stockwidth \newdimen\stockheight +\setlength{\stockwidth}{\paperwidth} +\setlength{\stockheight}{\paperheight} +\iftombow + \advance \stockwidth 2in + \advance \stockheight 2in \fi -\ifnum\@ptsize=1051 - \mag 1139 - \def\inv@mag{0.877963} +\ifpapersize + \AtBeginDvi{\special{papersize=\the\stockwidth,\the\stockheight}} \fi -\ifnum\@ptsize=1101 - \mag 1194 - \def\inv@mag{0.837521} +\if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi +\newdimen\jsc@mpt +\newdimen\jsc@mmm +\def\inv@mag{1} +\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 -\ifnum\@ptsize=1201 - \mag 1302 - \def\inv@mag{0.768049} +\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 \setlength\paperwidth{\inv@mag\paperwidth}% \setlength\paperheight{\inv@mag\paperheight}% +\setlength\stockwidth{\inv@mag\stockwidth}% +\setlength\stockheight{\inv@mag\stockheight}% \ifwinjis \DeclareFontShape{JY1}{mc}{m}{n}{<-> s * [0.961] winjis}{} \DeclareFontShape{JY1}{gt}{m}{n}{<-> s * [0.961] winjisg}{} @@ -365,8 +460,10 @@ \DeclareRobustCommand\ttfamily {\not@math@alphabet\ttfamily\mathtt \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont} -\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}} \def\reDeclareMathAlphabet#1#2#3{% \edef\@tempa{\expandafter\@gobble\string#2}% \edef\@tempb{\expandafter\@gobble\string#3}% @@ -424,13 +521,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}} @@ -570,7 +665,7 @@ \xspcode`^^fd=3 \xspcode`^^fe=3 \xspcode`^^ff=3 -\def\@{\spacefactor3000\space} +\def\@{\spacefactor3000{}} \def\@setfontsize#1#2#3{% \ifx\protect\@typeset@protect \let\@currsize#1% @@ -589,6 +684,8 @@ \xkanjiskip=0.25em plus 0.15em minus 0.06em \fi \fi} +\def\jsc@setfontsize#1#2#3{% + \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}} \emergencystretch 3zw \newif\ifnarrowbaselines \if@english @@ -608,13 +705,13 @@ \def\widebaselines{\narrowbaselinesfalse\@currsize\selectfont} \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 - \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 \let\@listi\@listI} \normalsize @@ -626,12 +723,12 @@ \setlength\Chs{\wd0} \newcommand{\small}{% \ifnarrowbaselines - \@setfontsize\small\@ixpt{11}% + \jsc@setfontsize\small\@ixpt{11}% \else - \@setfontsize\small\@ixpt{13}% + \jsc@setfontsize\small\@ixpt{13}% \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 @@ -640,40 +737,40 @@ \itemsep \parsep}} \newcommand{\footnotesize}{% \ifnarrowbaselines - \@setfontsize\footnotesize\@viiipt{9.5}% + \jsc@setfontsize\footnotesize\@viiipt{9.5}% \else - \@setfontsize\footnotesize\@viiipt{11}% + \jsc@setfontsize\footnotesize\@viiipt{11}% \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 \topsep \z@ \parsep \z@ \itemsep \parsep}} -\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 - \newcommand{\large}{\@setfontsize\large\@xiipt{\n@baseline}} + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{\n@baseline}} \else - \newcommand{\large}{\@setfontsize\large\@xiipt{17}} + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{17}} \fi -\newcommand{\Large}{\@setfontsize\Large\@xivpt{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}} +\newcommand{\Large}{\jsc@setfontsize\Large\@xivpt{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}} \everydisplay=\expandafter{\the\everydisplay \narrowbaselines} \newcommand{\headfont}{\gtfamily\sffamily} \setlength\columnsep{2zw} -\setlength\columnseprule{0\p@} -\setlength\lineskip{1\p@} -\setlength\normallineskip{1\p@} -\setlength\lineskiplimit{1\p@} -\setlength\normallineskiplimit{1\p@} +\setlength\columnseprule{0\jsc@mpt} +\setlength\lineskip{1\jsc@mpt} +\setlength\normallineskip{1\jsc@mpt} +\setlength\lineskiplimit{1\jsc@mpt} +\setlength\normallineskiplimit{1\jsc@mpt} \renewcommand{\baselinestretch}{} -\setlength\parskip{0\p@} +\setlength\parskip{0\jsc@mpt} \if@slide \setlength\parindent{0zw} \else @@ -682,11 +779,11 @@ \@lowpenalty 51 \@medpenalty 151 \@highpenalty 301 -\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 \if@report \setlength\footskip{0.03367\paperheight} @@ -700,7 +797,7 @@ \setlength\headsep{\footskip} \addtolength\headsep{-\topskip} \else - \setlength\headsep{6mm} + \setlength\headsep{6\jsc@mmm} \fi \setlength\maxdepth{.5\topskip} \newdimen\fullwidth @@ -708,7 +805,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 @@ -725,14 +822,17 @@ \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} \divide\textheight\baselineskip \multiply\textheight\baselineskip \addtolength{\textheight}{\topskip} -\addtolength{\textheight}{0.1\p@} +\addtolength{\textheight}{0.1\jsc@mpt} +\def\flushbottom{% + \def\@textbottom{\vskip \z@ \@plus.1\jsc@mpt}% + \let\@texttop\relax} \setlength\marginparsep{\columnsep} \setlength\marginparpush{\baselineskip} \setlength{\oddsidemargin}{\paperwidth} @@ -752,7 +852,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 @@ -762,7 +862,7 @@ \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} @@ -774,7 +874,7 @@ \fi {\footnotesize\global\setlength\footnotesep{\baselineskip}} \setlength\footnotesep{0.7\footnotesep} -\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} \setcounter{topnumber}{9} \renewcommand{\topfraction}{.85} \setcounter{bottomnumber}{9} @@ -785,17 +885,17 @@ \setcounter{dbltopnumber}{9} \renewcommand{\dbltopfraction}{.8} \renewcommand{\dblfloatpagefraction}{.8} -\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\dblfloatsep {12\p@ \@plus 2\p@ \@minus 2\p@} -\setlength\dbltextfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@} -\setlength\@fptop{0\p@ \@plus 1fil} -\setlength\@fpsep{8\p@ \@plus 2fil} -\setlength\@fpbot{0\p@ \@plus 1fil} -\setlength\@dblfptop{0\p@ \@plus 1fil} -\setlength\@dblfpsep{8\p@ \@plus 2fil} -\setlength\@dblfpbot{0\p@ \@plus 1fil} +\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} +\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} +\setlength\@fptop{0\jsc@mpt \@plus 1fil} +\setlength\@fpsep{8\jsc@mpt \@plus 2fil} +\setlength\@fpbot{0\jsc@mpt \@plus 1fil} +\setlength\@dblfptop{0\jsc@mpt \@plus 1fil} +\setlength\@dblfpsep{8\jsc@mpt \@plus 2fil} +\setlength\@dblfpbot{0\jsc@mpt \@plus 1fil} \def\ps@plainfoot{% \let\@mkboth\@gobbletwo \let\@oddhead\@empty @@ -870,16 +970,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% @@ -1040,7 +1140,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} @@ -1125,7 +1227,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} @@ -1167,8 +1269,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 @@ -1217,7 +1319,7 @@ \fi \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@}% @@ -1227,27 +1329,33 @@ \fi \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 \if@twocolumn \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% - {\z@}{-1zw}% 改行せず 1zw のアキ + {\z@}{\if@slide .4\Cvs \else -1zw\fi}% 改行せず 1zw のアキ {\normalfont\normalsize\headfont ■}} \else \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}% - {-1zw}% 改行せず 1zw のアキ + {\if@slide .5\Cvs \@plus.3\Cdp \else -1zw\fi}% 改行せず 1zw のアキ {\normalfont\normalsize\headfont ■}} \fi -\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 \if@slide \setlength\leftmargini{1zw} \else @@ -1371,14 +1479,14 @@ \gdef\@chapapp{\appendixname}% \gdef\@chappos{}% \gdef\thechapter{\@Alph\c@chapter}} -\setlength\arraycolsep{5\p@} -\setlength\tabcolsep{6\p@} -\setlength\arrayrulewidth{.4\p@} -\setlength\doublerulesep{2\p@} +\setlength\arraycolsep{5\jsc@mpt} +\setlength\tabcolsep{6\jsc@mpt} +\setlength\arrayrulewidth{.4\jsc@mpt} +\setlength\doublerulesep{2\jsc@mpt} \setlength\tabbingsep{\labelsep} \skip\@mpfootins = \skip\footins -\setlength\fboxsep{3\p@} -\setlength\fboxrule{.4\p@} +\setlength\fboxsep{3\jsc@mpt} +\setlength\fboxrule{.4\jsc@mpt} \@addtoreset{equation}{chapter} \renewcommand\theequation {\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@equation} @@ -1410,8 +1518,8 @@ {\end@dblfloat} \newlength\abovecaptionskip \newlength\belowcaptionskip -\setlength\abovecaptionskip{5\p@} % 元: 10\p@ -\setlength\belowcaptionskip{5\p@} % 元: 0\p@ +\setlength\abovecaptionskip{5\jsc@mpt} % 元: 10\p@ +\setlength\belowcaptionskip{5\jsc@mpt} % 元: 0\p@ \long\def\@makecaption#1#2{{\small \advance\leftskip .0628\linewidth \advance\rightskip .0628\linewidth @@ -1435,12 +1543,12 @@ \newcommand\@tocrmarg{2.55em} \newcommand\@dotsep{4.5} \setcounter{tocdepth}{1} -\newdimen\js@tocl@width +\newdimen\jsc@tocl@width \newcommand{\tableofcontents}{% - \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 @@ -1454,7 +1562,7 @@ \newcommand*{\l@part}[2]{% \ifnum \c@tocdepth >-2\relax \addpenalty{-\@highpenalty}% - \addvspace{2.25em \@plus\p@}% + \addvspace{2.25em \@plus\jsc@mpt}% \begingroup \parindent \z@ \rightskip \@tocrmarg @@ -1471,14 +1579,14 @@ \newcommand*{\l@chapter}[2]{% \ifnum \c@tocdepth >\m@ne \addpenalty{-\@highpenalty}% - \addvspace{1.0em \@plus\p@} + \addvspace{1.0em \@plus\jsc@mpt} \begingroup \parindent\z@ \rightskip\@tocrmarg \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 @@ -1486,24 +1594,24 @@ \fi} % \newcommand*{\l@section}{\@dottedtocline{1}{1zw}{3.683zw}} \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}} \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} \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 @@ -1582,7 +1690,7 @@ \@mkboth{\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 @@ -1597,21 +1705,29 @@ \newcommand{\@idxitem}{\par\hangindent 4zw} % 元 40pt \newcommand{\subitem}{\@idxitem \hspace*{2zw}} % 元 20pt \newcommand{\subsubitem}{\@idxitem \hspace*{3zw}} % 元 30pt -\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} \newcommand\seename{\if@english see\else →\fi} \newcommand\alsoname{\if@english see also\else →\fi} -\let\footnotes@ve=\footnote -\def\footnote{\inhibitglue\footnotes@ve} -\let\footnotemarks@ve=\footnotemark -\def\footnotemark{\inhibitglue\footnotemarks@ve} -\renewcommand\@makefnmark{\hbox{}\hbox{% - \ifydir \@textsuperscript{\normalfont\@thefnmark}% - \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}} +\@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 +\@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 \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi} \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} \@addtoreset{footnote}{chapter} \long\def\@footnotetext{% \insert\footins\bgroup @@ -1631,7 +1747,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} \newcommand\@makefntext[1]{% \advance\leftskip 3zw \parindent 1zw @@ -1639,20 +1761,29 @@ \llap{\@makefnmark\hskip0.3zw}#1} \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「 - \inhibitglue - \else - \ifx\@let@token( + \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『 - \inhibitglue - \else - \ifx\@let@token[ - \inhibitglue - \fi - \fi \fi \fi} \let\everyparhook=\@inhibitglue @@ -1744,136 +1875,20 @@ \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null \inhibitglue \ignorespaces \fi} -\def\小#1{\hbox{$\m@th$% - \csname S@\f@size\endcsname - \fontsize\sf@size\z@ - \math@fontsfalse\selectfont - #1}} -\def\上小#1{{\sbox\z@ T\vbox to\ht0{\小{#1}\vss}}} -\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\上小{A}\kern-.22em\cmrTeX - \else - L\kern-.36em\上小{A}\kern-.15em\cmrTeX - \fi} -\def\sfTeX{T\kern-.1em\lower.4ex\hbox{E}\kern-.07emX\@} -\def\sfLaTeX{L\kern-.25em\上小{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\上小{A}\kern-.1em\ptmTeX - \else - L\kern-.3em\上小{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\上小{A}\kern-.1em\pncTeX - \else - L\kern-.3em\上小{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\上小{A}\kern-.12em\pplTeX - \else - L\kern-.3em\上小{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\上小{A}\kern-.13em\ugmTeX - \else - L\kern-.3em\上小{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} -\DeclareRobustCommand{\LaTeXe}{$\mbox{% - \if b\expandafter\@car\f@series\@nil\boldmath\fi - \LaTeX\kern.15em2\raisebox{-.37ex}{$\textstyle\varepsilon$}}$} -\def\pTeX{p\kern-.05em\TeX} -\def\pLaTeX{p\LaTeX} -\def\pLaTeXe{p\LaTeXe} -\def\AmSTeX{\protect\AmS-\protect\TeX{}} -\DeclareRobustCommand{\BibTeX}{B\kern-.05em\小{I\kern-.025em B}% - \ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX} -\DeclareRobustCommand{\SliTeX}{% - S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX} +\if@jslogo + \IfFileExists{jslogo.sty}{% + \RequirePackage{jslogo}% + \def\小{\jslg@small}% + \def\上小{\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 \let\ltx@ifnextchar\@ifnextchar \def\ProvidesFile#1{% \begingroup diff --git a/Master/texmf-dist/tex/platex/jsclasses/jslogo.sty b/Master/texmf-dist/tex/platex/jsclasses/jslogo.sty new file mode 100644 index 00000000000..304e8891a2a --- /dev/null +++ b/Master/texmf-dist/tex/platex/jsclasses/jslogo.sty @@ -0,0 +1,216 @@ +%% +%% This is file `jslogo.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% jslogo.dtx (with options: `package') +%% +%% IMPORTANT NOTICE: +%% +%% For the copyright see the source file. +%% +%% Any modified versions of this file must be renamed +%% with new filenames distinct from jslogo.sty. +%% +%% For distribution of the original source see the terms +%% for copying and modification in the file jslogo.dtx. +%% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{jslogo} + [2016/07/14 okumura, texjporg] +\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}}} +\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} +\def\sfTeX{T\kern-.1em\lower.4ex\hbox{E}\kern-.07emX\@} +\def\sfLaTeX{L\kern-.25em\jslg@uppersmall{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\jslg@uppersmall{A}\kern-.1em\ptmTeX + \else + L\kern-.3em\jslg@uppersmall{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\jslg@uppersmall{A}\kern-.1em\pncTeX + \else + L\kern-.3em\jslg@uppersmall{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\jslg@uppersmall{A}\kern-.12em\pplTeX + \else + L\kern-.3em\jslg@uppersmall{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\jslg@uppersmall{A}\kern-.13em\ugmTeX + \else + L\kern-.3em\jslg@uppersmall{A}\kern-.13em\ugmTeX + \fi} +\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} +\DeclareRobustCommand{\LaTeXe}{$\mbox{% + \if b\expandafter\@car\f@series\@nil\boldmath\fi + \LaTeX\kern.15em2\raisebox{-.37ex}{$\textstyle\varepsilon$}}$} +\def\pTeX{p\kern-.05em\TeX} +\def\pLaTeX{p\LaTeX} +\def\pLaTeXe{p\LaTeXe} +\def\upTeX{u\pTeX} +\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{\SliTeX}{% + S\kern-.06emL\kern-.18em\jslg@uppersmall{I}\kern -.03em\TeX} +\endinput +%% +%% End of file `jslogo.sty'. diff --git a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls index 4a392f7a299..2462a65de79 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls @@ -20,24 +20,12 @@ %% original source files, as listed above, are part of the %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) -%% \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 \~} \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jspf} - [2014/02/07 okumura] + [2016/08/26 okumura, texjporg] +\def\jsc@clsname{jspf} +\newif\ifjsc@needsp@tch +\jsc@needsp@tchfalse \newif\if@restonecol \newif\if@titlepage \newif\if@enablejfam \@enablejfamtrue @@ -95,26 +83,35 @@ \newif\if@slide \@slidefalse \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} \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -182,9 +179,8 @@ \tabskip\z@skip\cr }} \DeclareOption{disablejfam}{\@enablejfamfalse} -\newif\ifdraft -\DeclareOption{draft}{\drafttrue \setlength\overfullrule{5pt}} -\DeclareOption{final}{\draftfalse \setlength\overfullrule{0pt}} +\DeclareOption{draft}{\setlength\overfullrule{5pt}} +\DeclareOption{final}{\setlength\overfullrule{0pt}} \newif\ifwinjis \winjisfalse \newif\ifmingoth @@ -206,6 +202,9 @@ \newif\if@english \@englishfalse \DeclareOption{english}{\@englishtrue} +\newif\if@jslogo \@jslogotrue +\DeclareOption{jslogo}{\@jslogotrue} +\DeclareOption{nojslogo}{\@jslogofalse} \ExecuteOptions{a4paper,twoside,twocolumn,notitlepage,fleqn,final} \ProcessOptions \if@slide @@ -216,93 +215,189 @@ \setlength\paperheight{\paperwidth} \setlength\paperwidth {\@tempdima} \fi -\ifpapersize - \setlength{\@tempdima}{\paperwidth} - \setlength{\@tempdimb}{\paperheight} - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in +\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 - \AtBeginDvi{\special{papersize=\the\@tempdima,\the\@tempdimb}} -\fi -\def\n@baseline{14.554375} -\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} +\newdimen\stockwidth \newdimen\stockheight +\setlength{\stockwidth}{\paperwidth} +\setlength{\stockheight}{\paperheight} +\iftombow + \advance \stockwidth 2in + \advance \stockheight 2in \fi -\ifnum\@ptsize=1051 - \mag 1139 - \def\inv@mag{0.877963} +\ifpapersize + \AtBeginDvi{\special{papersize=\the\stockwidth,\the\stockheight}} \fi -\ifnum\@ptsize=1101 - \mag 1194 - \def\inv@mag{0.837521} +\def\n@baseline{14.554375} +\newdimen\jsc@mpt +\newdimen\jsc@mmm +\def\inv@mag{1} +\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 -\ifnum\@ptsize=1201 - \mag 1302 - \def\inv@mag{0.768049} +\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 \setlength\paperwidth{\inv@mag\paperwidth}% \setlength\paperheight{\inv@mag\paperheight}% +\setlength\stockwidth{\inv@mag\stockwidth}% +\setlength\stockheight{\inv@mag\stockheight}% \ifwinjis \DeclareFontShape{JY1}{mc}{m}{n}{<-> s * [0.93885] winjis}{} \DeclareFontShape{JY1}{gt}{m}{n}{<-> s * [0.93885] winjisg}{} @@ -358,8 +453,10 @@ \DeclareRobustCommand\ttfamily {\not@math@alphabet\ttfamily\mathtt \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont} -\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}} \def\reDeclareMathAlphabet#1#2#3{% \edef\@tempa{\expandafter\@gobble\string#2}% \edef\@tempb{\expandafter\@gobble\string#3}% @@ -417,13 +514,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}} @@ -563,7 +658,7 @@ \xspcode`^^fd=3 \xspcode`^^fe=3 \xspcode`^^ff=3 -\def\@{\spacefactor3000\space} +\def\@{\spacefactor3000{}} \def\@setfontsize#1#2#3{% \ifx\protect\@typeset@protect \let\@currsize#1% @@ -582,6 +677,8 @@ \xkanjiskip=0.25em plus 0.15em minus 0.06em \fi \fi} +\def\jsc@setfontsize#1#2#3{% + \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}} \emergencystretch 3zw \newif\ifnarrowbaselines \if@english @@ -601,13 +698,13 @@ \def\widebaselines{\narrowbaselinesfalse\@currsize\selectfont} \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 - \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 \let\@listi\@listI} \normalsize @@ -619,12 +716,12 @@ \setlength\Chs{\wd0} \newcommand{\small}{% \ifnarrowbaselines - \@setfontsize\small\@ixpt{11}% + \jsc@setfontsize\small\@ixpt{11}% \else - \@setfontsize\small\@ixpt{13}% + \jsc@setfontsize\small\@ixpt{13}% \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 @@ -633,40 +730,40 @@ \itemsep \parsep}} \newcommand{\footnotesize}{% \ifnarrowbaselines - \@setfontsize\footnotesize\@viiipt{9.5}% + \jsc@setfontsize\footnotesize\@viiipt{9.5}% \else - \@setfontsize\footnotesize\@viiipt{11}% + \jsc@setfontsize\footnotesize\@viiipt{11}% \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 \topsep \z@ \parsep \z@ \itemsep \parsep}} -\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 - \newcommand{\large}{\@setfontsize\large\@xiipt{\n@baseline}} + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{\n@baseline}} \else - \newcommand{\large}{\@setfontsize\large\@xiipt{17}} + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{17}} \fi -\newcommand{\Large}{\@setfontsize\Large\@xivpt{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}} +\newcommand{\Large}{\jsc@setfontsize\Large\@xivpt{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}} \everydisplay=\expandafter{\the\everydisplay \narrowbaselines} \newcommand{\headfont}{\gtfamily\sffamily} \setlength\columnsep{2zw} -\setlength\columnseprule{0\p@} -\setlength\lineskip{1\p@} -\setlength\normallineskip{1\p@} -\setlength\lineskiplimit{1\p@} -\setlength\normallineskiplimit{1\p@} +\setlength\columnseprule{0\jsc@mpt} +\setlength\lineskip{1\jsc@mpt} +\setlength\normallineskip{1\jsc@mpt} +\setlength\lineskiplimit{1\jsc@mpt} +\setlength\normallineskiplimit{1\jsc@mpt} \renewcommand{\baselinestretch}{} -\setlength\parskip{0\p@} +\setlength\parskip{0\jsc@mpt} \if@slide \setlength\parindent{0zw} \else @@ -675,24 +772,27 @@ \@lowpenalty 51 \@medpenalty 151 \@highpenalty 301 -\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 -\setlength\footskip{9mm} -\setlength\headsep{9mm} +\setlength\footskip{9\jsc@mmm} +\setlength\headsep{9\jsc@mmm} \addtolength\headsep{-\topskip} \setlength\maxdepth{.5\topskip} \newdimen\fullwidth \setlength\fullwidth{50zw} -\addtolength\fullwidth{8mm} +\addtolength\fullwidth{8\jsc@mmm} \setlength\textwidth{\fullwidth} \setlength{\textheight}{51\baselineskip} \addtolength{\textheight}{\topskip} -\addtolength{\textheight}{0.1\p@} -\setlength{\mathindent}{10mm} +\addtolength{\textheight}{0.1\jsc@mpt} +\setlength{\mathindent}{10\jsc@mmm} +\def\flushbottom{% + \def\@textbottom{\vskip \z@ \@plus.1\jsc@mpt}% + \let\@texttop\relax} \setlength\marginparsep{\columnsep} \setlength\marginparpush{\baselineskip} \setlength{\oddsidemargin}{\paperwidth} @@ -712,7 +812,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 @@ -722,7 +822,7 @@ \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} @@ -734,7 +834,7 @@ \fi {\footnotesize\global\setlength\footnotesep{\baselineskip}} \setlength\footnotesep{0.7\footnotesep} -\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} \setcounter{topnumber}{9} \renewcommand{\topfraction}{.85} \setcounter{bottomnumber}{9} @@ -745,17 +845,17 @@ \setcounter{dbltopnumber}{9} \renewcommand{\dbltopfraction}{.8} \renewcommand{\dblfloatpagefraction}{.8} -\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\dblfloatsep {12\p@ \@plus 2\p@ \@minus 2\p@} -\setlength\dbltextfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@} -\setlength\@fptop{0\p@ \@plus 1fil} -\setlength\@fpsep{8\p@ \@plus 2fil} -\setlength\@fpbot{0\p@ \@plus 1fil} -\setlength\@dblfptop{0\p@ \@plus 1fil} -\setlength\@dblfpsep{8\p@ \@plus 2fil} -\setlength\@dblfpbot{0\p@ \@plus 1fil} +\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} +\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} +\setlength\@fptop{0\jsc@mpt \@plus 1fil} +\setlength\@fpsep{8\jsc@mpt \@plus 2fil} +\setlength\@fpbot{0\jsc@mpt \@plus 1fil} +\setlength\@dblfptop{0\jsc@mpt \@plus 1fil} +\setlength\@dblfpsep{8\jsc@mpt \@plus 2fil} +\setlength\@dblfpbot{0\jsc@mpt \@plus 1fil} \def\ps@plainfoot{% \let\@mkboth\@gobbletwo \let\@oddhead\@empty @@ -860,7 +960,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} \def\@startsection#1#2#3#4#5#6{% @@ -944,7 +1044,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} @@ -1030,7 +1132,7 @@ \fi \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@}% @@ -1040,27 +1142,33 @@ \fi \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 \if@twocolumn \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% - {\z@}{-1zw}% 改行せず 1zw のアキ + {\z@}{\if@slide .4\Cvs \else -1zw\fi}% 改行せず 1zw のアキ {\normalfont\normalsize\headfont}} \else \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}% - {-1zw}% 改行せず 1zw のアキ + {\if@slide .5\Cvs \@plus.3\Cdp \else -1zw\fi}% 改行せず 1zw のアキ + {\normalfont\normalsize\headfont}} +\fi +\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 -\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% - {\z@}{-1zw}% - {\normalfont\normalsize\headfont}} \if@slide \setlength\leftmargini{1zw} \else @@ -1140,9 +1248,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} \newenvironment{verse}{% \let \\=\@centercr @@ -1185,14 +1293,14 @@ \gdef\postsectionname{}% \gdef\thesection{\presectionname\@Alph\c@section\postsectionname}% \gdef\thesubsection{\@Alph\c@section.\@arabic\c@subsection}} -\setlength\arraycolsep{5\p@} -\setlength\tabcolsep{6\p@} -\setlength\arrayrulewidth{.4\p@} -\setlength\doublerulesep{2\p@} +\setlength\arraycolsep{5\jsc@mpt} +\setlength\tabcolsep{6\jsc@mpt} +\setlength\arrayrulewidth{.4\jsc@mpt} +\setlength\doublerulesep{2\jsc@mpt} \setlength\tabbingsep{\labelsep} \skip\@mpfootins = \skip\footins -\setlength\fboxsep{3\p@} -\setlength\fboxrule{.4\p@} +\setlength\fboxsep{3\jsc@mpt} +\setlength\fboxrule{.4\jsc@mpt} \renewcommand \theequation {\@arabic\c@equation} \newcounter{figure} \renewcommand \thefigure {\@arabic\c@figure} @@ -1220,8 +1328,8 @@ {\end@dblfloat} \newlength\abovecaptionskip \newlength\belowcaptionskip -\setlength\abovecaptionskip{5\p@} % 元: 10\p@ -\setlength\belowcaptionskip{5\p@} % 元: 0\p@ +\setlength\abovecaptionskip{5\jsc@mpt} % 元: 10\p@ +\setlength\belowcaptionskip{5\jsc@mpt} % 元: 0\p@ \long\def\@makecaption#1#2{% \vskip\abovecaptionskip \sbox\@tempboxa{\small\sffamily #1\quad #2}% @@ -1232,9 +1340,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}% @@ -1255,12 +1363,12 @@ \newcommand\@tocrmarg{2.55em} \newcommand\@dotsep{4.5} \setcounter{tocdepth}{2} -\newdimen\js@tocl@width +\newdimen\jsc@tocl@width \newcommand{\tableofcontents}{% - \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}% \@starttoc{toc}% @@ -1268,7 +1376,7 @@ \newcommand*{\l@part}[2]{% \ifnum \c@tocdepth >-2\relax \addpenalty\@secpenalty - \addvspace{2.25em \@plus\p@}% + \addvspace{2.25em \@plus\jsc@mpt}% \begingroup \parindent \z@ \rightskip \@tocrmarg @@ -1283,34 +1391,34 @@ \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\@tocrmarg \parfillskip-\rightskip \leavevmode\headfont %\setlength\@lnumwidth{4zw}% 元1.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 \fi} \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}} \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} \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 @@ -1382,7 +1490,7 @@ \@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 @@ -1397,21 +1505,29 @@ \newcommand{\@idxitem}{\par\hangindent 4zw} % 元 40pt \newcommand{\subitem}{\@idxitem \hspace*{2zw}} % 元 20pt \newcommand{\subsubitem}{\@idxitem \hspace*{3zw}} % 元 30pt -\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} \newcommand\seename{\if@english see\else →\fi} \newcommand\alsoname{\if@english see also\else →\fi} -\let\footnotes@ve=\footnote -\def\footnote{\inhibitglue\footnotes@ve} -\let\footnotemarks@ve=\footnotemark -\def\footnotemark{\inhibitglue\footnotemarks@ve} -\renewcommand\@makefnmark{\hbox{}\hbox{% - \ifydir \@textsuperscript{\normalfont\@thefnmark}% - \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}} +\@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 +\@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 \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi} \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} \long\def\@footnotetext{% \insert\footins\bgroup \normalfont\footnotesize @@ -1430,7 +1546,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} \newcommand\@makefntext[1]{% \advance\leftskip 3zw \parindent 1zw @@ -1438,20 +1560,29 @@ \llap{\@makefnmark\hskip0.3zw}#1} \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「 - \inhibitglue - \else - \ifx\@let@token( + \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『 - \inhibitglue - \else - \ifx\@let@token[ - \inhibitglue - \fi - \fi \fi \fi} \let\everyparhook=\@inhibitglue @@ -1543,136 +1674,20 @@ \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null \inhibitglue \ignorespaces \fi} -\def\小#1{\hbox{$\m@th$% - \csname S@\f@size\endcsname - \fontsize\sf@size\z@ - \math@fontsfalse\selectfont - #1}} -\def\上小#1{{\sbox\z@ T\vbox to\ht0{\小{#1}\vss}}} -\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\上小{A}\kern-.22em\cmrTeX - \else - L\kern-.36em\上小{A}\kern-.15em\cmrTeX - \fi} -\def\sfTeX{T\kern-.1em\lower.4ex\hbox{E}\kern-.07emX\@} -\def\sfLaTeX{L\kern-.25em\上小{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\上小{A}\kern-.1em\ptmTeX - \else - L\kern-.3em\上小{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\上小{A}\kern-.1em\pncTeX - \else - L\kern-.3em\上小{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\上小{A}\kern-.12em\pplTeX - \else - L\kern-.3em\上小{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\上小{A}\kern-.13em\ugmTeX - \else - L\kern-.3em\上小{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} -\DeclareRobustCommand{\LaTeXe}{$\mbox{% - \if b\expandafter\@car\f@series\@nil\boldmath\fi - \LaTeX\kern.15em2\raisebox{-.37ex}{$\textstyle\varepsilon$}}$} -\def\pTeX{p\kern-.05em\TeX} -\def\pLaTeX{p\LaTeX} -\def\pLaTeXe{p\LaTeXe} -\def\AmSTeX{\protect\AmS-\protect\TeX{}} -\DeclareRobustCommand{\BibTeX}{B\kern-.05em\小{I\kern-.025em B}% - \ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX} -\DeclareRobustCommand{\SliTeX}{% - S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX} +\if@jslogo + \IfFileExists{jslogo.sty}{% + \RequirePackage{jslogo}% + \def\小{\jslg@small}% + \def\上小{\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 \let\ltx@ifnextchar\@ifnextchar \def\ProvidesFile#1{% \begingroup diff --git a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls index cac3fb8ef4a..8c4dcf389ca 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls @@ -20,24 +20,12 @@ %% original source files, as listed above, are part of the %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) -%% \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 \~} \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{kiyou} - [2014/02/07 okumura] + [2016/08/26 okumura, texjporg] +\def\jsc@clsname{kiyou} +\newif\ifjsc@needsp@tch +\jsc@needsp@tchfalse \newif\if@restonecol \newif\if@titlepage \newif\if@enablejfam \@enablejfamtrue @@ -95,26 +83,35 @@ \newif\if@slide \@slidefalse \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} \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -182,9 +179,8 @@ \tabskip\z@skip\cr }} \DeclareOption{disablejfam}{\@enablejfamfalse} -\newif\ifdraft -\DeclareOption{draft}{\drafttrue \setlength\overfullrule{5pt}} -\DeclareOption{final}{\draftfalse \setlength\overfullrule{0pt}} +\DeclareOption{draft}{\setlength\overfullrule{5pt}} +\DeclareOption{final}{\setlength\overfullrule{0pt}} \newif\ifwinjis \winjisfalse \newif\ifmingoth @@ -206,6 +202,9 @@ \newif\if@english \@englishfalse \DeclareOption{english}{\@englishtrue} +\newif\if@jslogo \@jslogotrue +\DeclareOption{jslogo}{\@jslogotrue} +\DeclareOption{nojslogo}{\@jslogofalse} \ExecuteOptions{a4paper,twoside,twocolumn,notitlepage,final} \ProcessOptions \if@slide @@ -216,95 +215,200 @@ \setlength\paperheight{\paperwidth} \setlength\paperwidth {\@tempdima} \fi -\ifpapersize - \setlength{\@tempdima}{\paperwidth} - \setlength{\@tempdimb}{\paperheight} - \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in +\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 - \AtBeginDvi{\special{papersize=\the\@tempdima,\the\@tempdimb}} -\fi -\def\n@baseline{14.897} -\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} +\newdimen\stockwidth \newdimen\stockheight +\setlength{\stockwidth}{\paperwidth} +\setlength{\stockheight}{\paperheight} +\iftombow + \advance \stockwidth 2in + \advance \stockheight 2in \fi -\ifnum\@ptsize=1001 - \mag 1085 - \def\inv@mag{0.921659} +\ifpapersize + \AtBeginDvi{\special{papersize=\the\stockwidth,\the\stockheight}} \fi -\ifnum\@ptsize=1051 - \mag 1139 - \def\inv@mag{0.877963} +\def\n@baseline{14.897} +\newdimen\jsc@mpt +\newdimen\jsc@mmm +\def\inv@mag{1} +\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 -\ifnum\@ptsize=1101 - \mag 1194 - \def\inv@mag{0.837521} +\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 -\ifnum\@ptsize=1201 - \mag 1302 - \def\inv@mag{0.768049} +\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 -\mag 977 -\def\inv@mag{1.02354} \setlength\paperwidth{\inv@mag\paperwidth}% \setlength\paperheight{\inv@mag\paperheight}% +\setlength\stockwidth{\inv@mag\stockwidth}% +\setlength\stockheight{\inv@mag\stockheight}% \ifwinjis \DeclareFontShape{JY1}{mc}{m}{n}{<-> s * [0.961] winjis}{} \DeclareFontShape{JY1}{gt}{m}{n}{<-> s * [0.961] winjisg}{} @@ -360,8 +464,10 @@ \DeclareRobustCommand\ttfamily {\not@math@alphabet\ttfamily\mathtt \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont} -\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}} \def\reDeclareMathAlphabet#1#2#3{% \edef\@tempa{\expandafter\@gobble\string#2}% \edef\@tempb{\expandafter\@gobble\string#3}% @@ -419,13 +525,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}} @@ -565,7 +669,7 @@ \xspcode`^^fd=3 \xspcode`^^fe=3 \xspcode`^^ff=3 -\def\@{\spacefactor3000\space} +\def\@{\spacefactor3000{}} \def\@setfontsize#1#2#3{% \ifx\protect\@typeset@protect \let\@currsize#1% @@ -584,6 +688,8 @@ \xkanjiskip=0.25em plus 0.15em minus 0.06em \fi \fi} +\def\jsc@setfontsize#1#2#3{% + \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}} \emergencystretch 3zw \newif\ifnarrowbaselines \if@english @@ -603,13 +709,13 @@ \def\widebaselines{\narrowbaselinesfalse\@currsize\selectfont} \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 - \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 \let\@listi\@listI} \normalsize @@ -621,12 +727,12 @@ \setlength\Chs{\wd0} \newcommand{\small}{% \ifnarrowbaselines - \@setfontsize\small{8.8888}{11}% + \jsc@setfontsize\small{8.8888}{11}% \else - \@setfontsize\small{8.8888}{13.2418}% + \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 @@ -635,40 +741,40 @@ \itemsep \parsep}} \newcommand{\footnotesize}{% \ifnarrowbaselines - \@setfontsize\footnotesize{8.8888}{11}% + \jsc@setfontsize\footnotesize{8.8888}{11}% \else - \@setfontsize\footnotesize{8.8888}{13.2418}% + \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 \topsep \z@ \parsep \z@ \itemsep \parsep}} -\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 - \newcommand{\large}{\@setfontsize\large{11.111}{\n@baseline}} + \newcommand{\large}{\jsc@setfontsize\large{11.111}{\n@baseline}} \else - \newcommand{\large}{\@setfontsize\large{11.111}{17}} + \newcommand{\large}{\jsc@setfontsize\large{11.111}{17}} \fi -\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}} +\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}} \everydisplay=\expandafter{\the\everydisplay \narrowbaselines} \newcommand{\headfont}{\gtfamily\sffamily} \setlength\columnsep{28truebp} -\setlength\columnseprule{0\p@} -\setlength\lineskip{1\p@} -\setlength\normallineskip{1\p@} -\setlength\lineskiplimit{1\p@} -\setlength\normallineskiplimit{1\p@} +\setlength\columnseprule{0\jsc@mpt} +\setlength\lineskip{1\jsc@mpt} +\setlength\normallineskip{1\jsc@mpt} +\setlength\lineskiplimit{1\jsc@mpt} +\setlength\normallineskiplimit{1\jsc@mpt} \renewcommand{\baselinestretch}{} -\setlength\parskip{0\p@} +\setlength\parskip{0\jsc@mpt} \if@slide \setlength\parindent{0zw} \else @@ -677,11 +783,11 @@ \@lowpenalty 51 \@medpenalty 151 \@highpenalty 301 -\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 \if@slide \setlength\footskip{0pt} @@ -691,8 +797,8 @@ \setlength\footskip{\baselineskip} \fi \fi -\setlength\headheight{0\p@} -\setlength\headsep{0\p@} +\setlength\headheight{0\jsc@mpt} +\setlength\headsep{0\jsc@mpt} \setlength\maxdepth{.5\topskip} \newdimen\fullwidth \setlength\fullwidth{48zw} @@ -700,7 +806,10 @@ \setlength\textwidth{\fullwidth} \setlength{\textheight}{47\baselineskip} \addtolength{\textheight}{\topskip} -\addtolength{\textheight}{0.1\p@} +\addtolength{\textheight}{0.1\jsc@mpt} +\def\flushbottom{% + \def\@textbottom{\vskip \z@ \@plus.1\jsc@mpt}% + \let\@texttop\relax} \setlength\marginparsep{\columnsep} \setlength\marginparpush{\baselineskip} \setlength{\oddsidemargin}{\paperwidth} @@ -720,7 +829,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 @@ -730,7 +839,7 @@ \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} @@ -743,7 +852,7 @@ \fi {\footnotesize\global\setlength\footnotesep{\baselineskip}} \setlength\footnotesep{0.7\footnotesep} -\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} \setcounter{topnumber}{9} \renewcommand{\topfraction}{.85} \setcounter{bottomnumber}{9} @@ -754,17 +863,17 @@ \setcounter{dbltopnumber}{9} \renewcommand{\dbltopfraction}{.8} \renewcommand{\dblfloatpagefraction}{.8} -\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\dblfloatsep {12\p@ \@plus 2\p@ \@minus 2\p@} -\setlength\dbltextfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@} -\setlength\@fptop{0\p@ \@plus 1fil} -\setlength\@fpsep{8\p@ \@plus 2fil} -\setlength\@fpbot{0\p@ \@plus 1fil} -\setlength\@dblfptop{0\p@ \@plus 1fil} -\setlength\@dblfpsep{8\p@ \@plus 2fil} -\setlength\@dblfpbot{0\p@ \@plus 1fil} +\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} +\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} +\setlength\@fptop{0\jsc@mpt \@plus 1fil} +\setlength\@fpsep{8\jsc@mpt \@plus 2fil} +\setlength\@fpbot{0\jsc@mpt \@plus 1fil} +\setlength\@dblfptop{0\jsc@mpt \@plus 1fil} +\setlength\@dblfpsep{8\jsc@mpt \@plus 2fil} +\setlength\@dblfpbot{0\jsc@mpt \@plus 1fil} \def\ps@plainfoot{% \let\@mkboth\@gobbletwo \let\@oddhead\@empty @@ -844,16 +953,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% @@ -1015,7 +1124,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} @@ -1100,7 +1211,7 @@ \fi \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@}% @@ -1110,27 +1221,33 @@ \fi \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 \if@twocolumn \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% - {\z@}{-1zw}% 改行せず 1zw のアキ + {\z@}{\if@slide .4\Cvs \else -1zw\fi}% 改行せず 1zw のアキ {\normalfont\normalsize\headfont ■}} \else \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}% - {-1zw}% 改行せず 1zw のアキ + {\if@slide .5\Cvs \@plus.3\Cdp \else -1zw\fi}% 改行せず 1zw のアキ {\normalfont\normalsize\headfont ■}} \fi -\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 \if@slide \setlength\leftmargini{1zw} \else @@ -1296,14 +1413,14 @@ \gdef\postsectionname{}% \gdef\thesection{\presectionname\@Alph\c@section\postsectionname}% \gdef\thesubsection{\@Alph\c@section.\@arabic\c@subsection}} -\setlength\arraycolsep{5\p@} -\setlength\tabcolsep{6\p@} -\setlength\arrayrulewidth{.4\p@} -\setlength\doublerulesep{2\p@} +\setlength\arraycolsep{5\jsc@mpt} +\setlength\tabcolsep{6\jsc@mpt} +\setlength\arrayrulewidth{.4\jsc@mpt} +\setlength\doublerulesep{2\jsc@mpt} \setlength\tabbingsep{\labelsep} \skip\@mpfootins = \skip\footins -\setlength\fboxsep{3\p@} -\setlength\fboxrule{.4\p@} +\setlength\fboxsep{3\jsc@mpt} +\setlength\fboxrule{.4\jsc@mpt} \renewcommand \theequation {\@arabic\c@equation} \newcounter{figure} \renewcommand \thefigure {\@arabic\c@figure} @@ -1331,8 +1448,8 @@ {\end@dblfloat} \newlength\abovecaptionskip \newlength\belowcaptionskip -\setlength\abovecaptionskip{5\p@} % 元: 10\p@ -\setlength\belowcaptionskip{5\p@} % 元: 0\p@ +\setlength\abovecaptionskip{5\jsc@mpt} % 元: 10\p@ +\setlength\belowcaptionskip{5\jsc@mpt} % 元: 0\p@ \long\def\@makecaption#1#2{{\small \advance\leftskip .0628\linewidth \advance\rightskip .0628\linewidth @@ -1356,12 +1473,12 @@ \newcommand\@tocrmarg{2.55em} \newcommand\@dotsep{4.5} \setcounter{tocdepth}{2} -\newdimen\js@tocl@width +\newdimen\jsc@tocl@width \newcommand{\tableofcontents}{% - \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}% \@starttoc{toc}% @@ -1369,7 +1486,7 @@ \newcommand*{\l@part}[2]{% \ifnum \c@tocdepth >-2\relax \addpenalty\@secpenalty - \addvspace{2.25em \@plus\p@}% + \addvspace{2.25em \@plus\jsc@mpt}% \begingroup \parindent \z@ \rightskip \@tocrmarg @@ -1384,34 +1501,34 @@ \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\@tocrmarg \parfillskip-\rightskip \leavevmode\headfont %\setlength\@lnumwidth{4zw}% 元1.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 \fi} \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}} \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} \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 @@ -1486,7 +1603,7 @@ \@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 @@ -1501,21 +1618,29 @@ \newcommand{\@idxitem}{\par\hangindent 4zw} % 元 40pt \newcommand{\subitem}{\@idxitem \hspace*{2zw}} % 元 20pt \newcommand{\subsubitem}{\@idxitem \hspace*{3zw}} % 元 30pt -\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} \newcommand\seename{\if@english see\else →\fi} \newcommand\alsoname{\if@english see also\else →\fi} -\let\footnotes@ve=\footnote -\def\footnote{\inhibitglue\footnotes@ve} -\let\footnotemarks@ve=\footnotemark -\def\footnotemark{\inhibitglue\footnotemarks@ve} -\renewcommand\@makefnmark{\hbox{}\hbox{% - \ifydir \@textsuperscript{\normalfont\@thefnmark}% - \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}} +\@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 +\@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 \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi} \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} \long\def\@footnotetext{% \insert\footins\bgroup \normalfont\footnotesize @@ -1534,7 +1659,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} \newcommand\@makefntext[1]{% \advance\leftskip 3zw \parindent 1zw @@ -1542,20 +1673,29 @@ \llap{\@makefnmark\hskip0.3zw}#1} \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「 - \inhibitglue - \else - \ifx\@let@token( + \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『 - \inhibitglue - \else - \ifx\@let@token[ - \inhibitglue - \fi - \fi \fi \fi} \let\everyparhook=\@inhibitglue @@ -1647,136 +1787,20 @@ \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null \inhibitglue \ignorespaces \fi} -\def\小#1{\hbox{$\m@th$% - \csname S@\f@size\endcsname - \fontsize\sf@size\z@ - \math@fontsfalse\selectfont - #1}} -\def\上小#1{{\sbox\z@ T\vbox to\ht0{\小{#1}\vss}}} -\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\上小{A}\kern-.22em\cmrTeX - \else - L\kern-.36em\上小{A}\kern-.15em\cmrTeX - \fi} -\def\sfTeX{T\kern-.1em\lower.4ex\hbox{E}\kern-.07emX\@} -\def\sfLaTeX{L\kern-.25em\上小{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\上小{A}\kern-.1em\ptmTeX - \else - L\kern-.3em\上小{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\上小{A}\kern-.1em\pncTeX - \else - L\kern-.3em\上小{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\上小{A}\kern-.12em\pplTeX - \else - L\kern-.3em\上小{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\上小{A}\kern-.13em\ugmTeX - \else - L\kern-.3em\上小{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} -\DeclareRobustCommand{\LaTeXe}{$\mbox{% - \if b\expandafter\@car\f@series\@nil\boldmath\fi - \LaTeX\kern.15em2\raisebox{-.37ex}{$\textstyle\varepsilon$}}$} -\def\pTeX{p\kern-.05em\TeX} -\def\pLaTeX{p\LaTeX} -\def\pLaTeXe{p\LaTeXe} -\def\AmSTeX{\protect\AmS-\protect\TeX{}} -\DeclareRobustCommand{\BibTeX}{B\kern-.05em\小{I\kern-.025em B}% - \ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX} -\DeclareRobustCommand{\SliTeX}{% - S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX} +\if@jslogo + \IfFileExists{jslogo.sty}{% + \RequirePackage{jslogo}% + \def\小{\jslg@small}% + \def\上小{\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 \let\ltx@ifnextchar\@ifnextchar \def\ProvidesFile#1{% \begingroup diff --git a/Master/texmf-dist/tex/platex/jsclasses/minijs.sty b/Master/texmf-dist/tex/platex/jsclasses/minijs.sty index 4109cdd3b0c..910a37cc8d9 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/minijs.sty +++ b/Master/texmf-dist/tex/platex/jsclasses/minijs.sty @@ -1,13 +1,32 @@ % minimal jsarticle-like fonts -\expandafter\def\csname ver@jsarticle.cls\endcsname{minijs} -\expandafter\let\csname JY1/mc/m/n/10\endcsname\relax -\expandafter\let\csname JY1/gt/m/n/10\endcsname\relax -\expandafter\let\csname JT1/mc/m/n/10\endcsname\relax -\expandafter\let\csname JT1/gt/m/n/10\endcsname\relax +% +\NeedsTeXFormat{pLaTeX2e} +\ProvidesPackage{minijs}[2016/07/16 okumura, texjporg] +% +% if jsclasses loaded, abort loading this package +\ifx\@jsc@uplatextrue\@undefined\else + \PackageInfo{minijs}{jsclasses does not need minijs, exiting} + \expandafter\endinput +\fi +% +% "fake" jsarticle +\expandafter\def\csname ver@jsarticle.cls\endcsname{} +% +% min/goth -> jis/jisg (for pLaTeX only) +\ifx\ucs\@undefined +\@for\@tempa:=5,6,7,8,9,10,10.95,12,14.4,17.28,20.74,24.88\do{% + \expandafter\let\csname JY1/mc/m/n/\@tempa\endcsname\relax + \expandafter\let\csname JY1/gt/m/n/\@tempa\endcsname\relax + \expandafter\let\csname JT1/mc/m/n/\@tempa\endcsname\relax + \expandafter\let\csname JT1/gt/m/n/\@tempa\endcsname\relax +} \DeclareFontShape{JY1}{mc}{m}{n}{<-> s * [0.961] jis}{} \DeclareFontShape{JY1}{gt}{m}{n}{<-> s * [0.961] jisg}{} \DeclareFontShape{JT1}{mc}{m}{n}{<-> s * [0.961] tmin10}{} \DeclareFontShape{JT1}{gt}{m}{n}{<-> s * [0.961] tgoth10}{} +\fi +% +% \@setfontsize with \parindent and \(x)kanjiskip settings \def\@setfontsize#1#2#3{\@nomath#1% \ifx\protect\@typeset@protect \let\@currsize#1% @@ -16,6 +35,8 @@ \ifdim\parindent>\z@ \parindent=1zw \fi \kanjiskip=0zw plus .1zw minus .01zw \xkanjiskip=0.25em plus 0.15em minus 0.06em} +% +% ad-hoc "relation font" \DeclareRobustCommand\rmfamily {\not@math@alphabet\rmfamily\mathrm \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont} @@ -26,3 +47,5 @@ {\not@math@alphabet\ttfamily\mathtt \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont} \normalsize +% +\endinput diff --git a/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty b/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty index 0efc60a5e28..1fe7a935afe 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty +++ b/Master/texmf-dist/tex/platex/jsclasses/okumacro.sty @@ -21,15 +21,21 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{okumacro}[2010/03/14 okumura] +\ProvidesPackage{okumacro}[2016/08/16 okumura, texjporg] \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 @@ -50,7 +56,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} \def\kenten#1{% \ifvmode\leavevmode\else\hskip\kanjiskip\fi \setbox1=\hbox to \z@{・\hss}% @@ -58,7 +65,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} \newcommand{\kintou}[2]{% @@ -128,7 +135,7 @@ \newcommand{\removept}[2]{% \edef#2{\expandafter\@removePT\the#1}} {\catcode`p=12 \catcode`t=12 \gdef\@removePT#1pt{#1}} -\newcommand{\keytop}[1]{{\leavevmode\kern1pt +\newcommand{\okukeytop}[1]{{\leavevmode\kern1pt \setbox1=\hbox{\normalfont\sffamily [}% \dimen1=\ht1 \removept{\dimen1}{\tempC}% @@ -150,6 +157,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 \def\RETMARK{{\unitlength=1pt \setbox0=\hbox{\normalfont\ttfamily [}% \dimen0=\ht0 @@ -160,7 +172,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 \newcommand{\upkey}{\raisebox{-2pt}{% \setlength{\unitlength}{1pt}% \thinlines @@ -277,9 +294,11 @@ \end{trivlist}} \newcommand{\SHUTTEN}[1]{% \par\nobreak\removelastskip\rightline{\small#1}\medbreak} -\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}}% % または \setbox\scb@x=\vbox\bgroup\advance \linewidth by -20pt \relax @@ -299,6 +318,7 @@ \else\scalebox{\screensc@le}[1]{\box\scb@x}\fi} \end{picture}% \end{flushleft}} +\let\screen\okuscreen \let\endscreen\endokuscreen \newdimen\EXAMPLEWIDTH \newenvironment{EXAMPLE}{\begin{flushleft}\EXAMPLEWIDTH=\linewidth }{\end{flushleft}} @@ -337,11 +357,13 @@ \fi \fi \fi} -\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 @@ -351,6 +373,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 \def\sankoumark{{\small ★}} \newenvironment{sankou}{\vspace{3pt}% \begin{list}{}{% diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index f9dac998eea..7baee07dc7e 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -556,8 +556,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`); 'jknappen', "die 'skipping, use jknapltx'", 'jmakepdfx', "die 'skipping, non-self-locating java?'", 'jpgfdraw', "die 'skipping, requires java'", - 'jsclasses', "die 'skipping, must be in JIS-2022 for w32, needs akira'", -# 'jsclasses', "&MAKEflatten", 'junicode', "&MAKEflatten", 'kalendar', "die 'skipping, noinfo license'", 'kbordermatrix',"die 'skipping, noinfo license'", @@ -1376,7 +1374,6 @@ $standarddest = "texmf-dist"; 'ifxetex', 'generic', 'jadetex', 'jadetex', 'japanese', 'platex', - 'jsclasses', 'platex', 'knuth-lib', 'plain', 'knuth-local', 'plain', 'kotex-plain', 'plain', @@ -1953,7 +1950,6 @@ $standardtex = '(\.(.bx|4ht|cls|clo|cmap|code\.tex|def|fd|fontspec|ldf|sty)' 'japanese-otf', 'fonts', 'japanese-otf-uptex', 'fonts', 'jfontmaps', 'fonts', - 'jsclasses', 'platex', 'junicode', 'fonts', 'kixfont', 'fonts', 'knitting', 'fonts', @@ -2089,7 +2085,6 @@ $standarddocfmt='latex'; 'genealogy', 'tex', 'insbox', 'tex', 'iso10303', 'pdflatex', - 'jsclasses', 'platex', 'mfpic', 'tex', 'ofs', 'csplain', 'pdfscreen', 'pdflatex', @@ -2145,7 +2140,6 @@ $standarddocfmt='latex'; 'hyphenex', 'generic', 'jadetex', 'jadetex', 'japanese', 'platex', - 'jsclasses', 'platex', 'kixfont', 'fonts', 'kpfonts', 'fonts', 'latexmp', 'metapost', @@ -2393,7 +2387,6 @@ my $core_latex = "$Master/texmf-dist/tex/latex"; 'hrlatex' => 'latex', # requires interaction 'isodoc' => 'luatex', 'japanese' => 'platex', - 'jsclasses' => 'platex', 'kdgdocs' => 'latex', # requires interaction 'komacv' => 'latex', # requires interaction 'labelcas' => 'latex', # requires interaction -- cgit v1.2.3