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 --- .../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 +- 7 files changed, 1812 insertions(+), 1481 deletions(-) create mode 100644 Master/texmf-dist/tex/platex/jsclasses/jslogo.sty (limited to 'Master/texmf-dist/tex/platex') 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}{}{% -- cgit v1.2.3