diff options
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls | 365 |
1 files changed, 214 insertions, 151 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls index 4a4e18fdc81..19a16ccbdf1 100644 --- a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls +++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls @@ -38,7 +38,8 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsbook} - [2016/04/04 ltjsclasses ] + [2016/08/27 ltjsclasses ] +\def\jsc@clsname{ltjsbook} \RequirePackage{luatexja} \newif\if@restonecol \newif\if@titlepage @@ -98,32 +99,47 @@ \DeclareOption{landscape}{\@landscapetrue} \newif\if@slide \@slidefalse -\def\ltjs@magscale{1} -\DeclareOption{slide}{\@slidetrue\def\ltjs@magscale{3.583}\@landscapetrue\@titlepagetrue} -\DeclareOption{8pt} {\def\ltjs@magscale{0.83}}% 1.2^(-1) -\DeclareOption{9pt} {\def\ltjs@magscale{0.913}}% 1.2^(-0.5} -\DeclareOption{10pt}{\def\ltjs@magscale{1}} -\DeclareOption{11pt}{\def\ltjs@magscale{1.095}}% 1.2^0.5 -\DeclareOption{12pt}{\def\ltjs@magscale{1.200}} -\DeclareOption{14pt}{\def\ltjs@magscale{1.440}} -\DeclareOption{17pt}{\def\ltjs@magscale{1.728}} -\DeclareOption{20pt}{\def\ltjs@magscale{2}} -\DeclareOption{21pt}{\def\ltjs@magscale{2.074}} -\DeclareOption{25pt}{\def\ltjs@magscale{2.488}} -\DeclareOption{30pt}{\def\ltjs@magscale{2.986}} -\DeclareOption{36pt}{\def\ltjs@magscale{3.583}} -\DeclareOption{43pt}{\def\ltjs@magscale{4.300}} -\DeclareOption{12Q} {\def\ltjs@magscale{0.923}}% 1pt*12Q/13Q -\DeclareOption{14Q} {\def\ltjs@magscale{1.077}}% 1pt*14Q/13Q -\DeclareOption{10ptj}{\def\ltjs@magscale{1.085}}% 1pt*10bp/13Q -\DeclareOption{10.5ptj}{\def\ltjs@magscale{1.139}} -\DeclareOption{11ptj}{\def\ltjs@magscale{1.194}} -\DeclareOption{12ptj}{\def\ltjs@magscale{1.302}} +\def\jsc@magscale{1} +\DeclareOption{slide}{\@slidetrue\def\jsc@magscale{3.583}\@landscapetrue\@titlepagetrue} +\DeclareOption{8pt} {\def\jsc@magscale{0.833}}% 1.2^(-1) +\DeclareOption{9pt} {\def\jsc@magscale{0.913}}% 1.2^(-0.5} +\DeclareOption{10pt}{\def\jsc@magscale{1}} +\DeclareOption{11pt}{\def\jsc@magscale{1.095}}% 1.2^0.5 +\DeclareOption{12pt}{\def\jsc@magscale{1.200}} +\DeclareOption{14pt}{\def\jsc@magscale{1.440}} +\DeclareOption{17pt}{\def\jsc@magscale{1.728}} +\DeclareOption{20pt}{\def\jsc@magscale{2}} +\DeclareOption{21pt}{\def\jsc@magscale{2.074}} +\DeclareOption{25pt}{\def\jsc@magscale{2.488}} +\DeclareOption{30pt}{\def\jsc@magscale{2.986}} +\DeclareOption{36pt}{\def\jsc@magscale{3.583}} +\DeclareOption{43pt}{\def\jsc@magscale{4.300}} +\DeclareOption{12Q} {\def\jsc@magscale{0.923}}% 1pt*12Q/13Q +\DeclareOption{14Q} {\def\jsc@magscale{1.077}}% 1pt*14Q/13Q +\DeclareOption{10ptj}{\def\jsc@magscale{1.085}}% 1pt*10bp/13Q +\DeclareOption{10.5ptj}{\def\jsc@magscale{1.139}} +\DeclareOption{11ptj}{\def\jsc@magscale{1.194}} +\DeclareOption{12ptj}{\def\jsc@magscale{1.302}} \newif\if@ltjs@mag@xreal \@ltjs@mag@xrealtrue -\DeclareOption{xreal}{\@ltjs@mag@xrealtrue} -\DeclareOption{noxreal}{\@ltjs@mag@xrealfalse} -\DeclareOption{real}{\@ltjs@mag@xrealfalse} +\DeclareOption{nomag*}{\@ltjs@mag@xrealtrue} +\DeclareOption{nomag}{\@ltjs@mag@xrealfalse} +\DeclareOption{noxreal}{% + \ClassWarningNoLine{\jsc@clsname}{% + The class option `noxreal' is obsolete. \MessageBreak + Please use the `nomag' option instead}% + \@ltjs@mag@xrealfalse} +\DeclareOption{real}{% + \ClassWarningNoLine{\jsc@clsname}{% + The class option `real' is obsolete. \MessageBreak + Please use the `nomag' option instead}% + \@ltjs@mag@xrealfalse} +\DeclareOption{usemag}{% + \ClassWarningNoLine{\jsc@clsname}{% + This \jsc@clsname\space cls does not support `usemag'\MessageBreak +option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}% + \@ltjs@mag@xrealtrue} + \hour\time \divide\hour by 60\relax \@tempcnta\hour \multiply\@tempcnta 60\relax \minute\time \advance\minute-\@tempcnta @@ -193,10 +209,9 @@ \tabskip\z@skip\cr }} \DeclareOption{disablejfam}{% - \ClassWarningNoLine{\@currname}{The class option 'disablejfam' is obsolete}} -\newif\ifdraft -\DeclareOption{draft}{\drafttrue \setlength\overfullrule{5pt}} -\DeclareOption{final}{\draftfalse \setlength\overfullrule{0pt}} + \ClassWarningNoLine{\jsc@clsname}{The class option 'disablejfam' is obsolete}} +\DeclareOption{draft}{\setlength\overfullrule{5pt}} +\DeclareOption{final}{\setlength\overfullrule{0pt}} \newif\ifmingoth \mingothfalse \newif\ifjisfont @@ -204,9 +219,9 @@ \newif\ifptexjis \ptexjisfalse \DeclareOption{winjis}{% - \ClassWarningNoLine{\@currname}{The class option 'winjis' is obsolete}} + \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}} \DeclareOption{uplatex}{% - \ClassWarningNoLine{\@currname}{The class option 'uplatex' is obsolete}} + \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}} \DeclareOption{mingoth}{\mingothtrue} \DeclareOption{ptexjis}{\ptexjistrue} \DeclareOption{jis}{\jisfonttrue} @@ -216,6 +231,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 @@ -227,23 +245,25 @@ \setlength\paperwidth {\@tempdima} \fi \if@slide\def\n@baseline{13}\else\def\n@baseline{16}\fi -\newdimen\ltjs@mpt -\ltjs@mpt=\ltjs@magscale\p@ -\ifdim\ltjs@mpt<.92\p@ % 8pt, 9pt 指定時 +\newdimen\jsc@mpt +\newdimen\jsc@mmm +\jsc@mpt=\jsc@magscale\p@ +\jsc@mmm=\jsc@magscale mm +\ifdim\jsc@mpt<.92\p@ % 8pt, 9pt 指定時 \def\n@baseline{15}% \fi \newcommand{\@ptsize}{0} -\ifdim\ltjs@mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else -\ifdim\ltjs@mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else +\ifdim\jsc@mpt=1.0954\p@ \renewcommand{\@ptsize}{1}\else +\ifdim\jsc@mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else \renewcommand{\@ptsize}{-20}\fi\fi \if@ltjs@mag@xreal\RequirePackage{type1cm} -\ifdim\ltjs@mpt=\p@\else +\ifdim\jsc@mpt=\p@\else \expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax \expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax \newluafunction\ltjs@@magnify@font@calc \begingroup\catcode`\%=12\relax \directlua{ - local getdimen, mpt=tex.getdimen, tex.getdimen('ltjs@mpt')/65536 + local getdimen, mpt=tex.getdimen, tex.getdimen('jsc@mpt')/65536 local t = lua.get_functions_table() t[\the\ltjs@@magnify@font@calc] = function() tex.sprint(math.floor(0.5+mpt*getdimen('dimen@'))) @@ -258,7 +278,7 @@ \def\@tempa{#1}\def\@tempb{#2}% \ifx\@tempb\@empty \edef\@tempb{ scaled\directlua{% - tex.sprint(math.floor(0.5+\ltjs@magscale*1000)) + tex.sprint(math.floor(0.5+\jsc@magscale*1000)) }}% \else \dimen@\@tempb\relax @@ -276,18 +296,20 @@ \expandafter\endgroup\@tempa } \fi\fi -\setlength{\@tempdima}{\paperwidth} -\setlength{\@tempdimb}{\paperheight} +\newlength{\stockwidth} +\newlength{\stockheight} +\setlength{\stockwidth}{\paperwidth} +\setlength{\stockheight}{\paperheight} \iftombow - \advance \@tempdima 2in - \advance \@tempdimb 2in + \advance \stockwidth 2in + \advance \stockheight 2in \fi \ifdefined\pdfpagewidth - \setlength{\pdfpagewidth}{\@tempdima} - \setlength{\pdfpageheight}{\@tempdimb} + \setlength{\pdfpagewidth}{\stockwidth} + \setlength{\pdfpageheight}{\stockheight} \else - \setlength{\pagewidth}{\@tempdima} - \setlength{\pageheight}{\@tempdimb} + \setlength{\pagewidth}{\stockwidth} + \setlength{\pageheight}{\stockheight} \fi \expandafter\let\csname JY3/mc/m/n/10\endcsname\relax \ifmingoth @@ -329,7 +351,7 @@ \ltjsetparameter{jaxspmode={`〒,1}} \ltjsetparameter{alxspmode={`+,3}} \ltjsetparameter{alxspmode={`\%,3}} -\def\@{\spacefactor3000\space} +\def\@{\spacefactor3000{}} \def\@setfontsize#1#2#3{% \ifx\protect\@typeset@protect \let\@currsize#1% @@ -352,8 +374,8 @@ \ltjsetxkanjiskip .25em plus .15em minus .06em \fi \fi} -\def\ltjs@setfontsize#1#2#3{% - \@setfontsize#1{#2\ltjs@mpt}{#3\ltjs@mpt}} +\def\jsc@setfontsize#1#2#3{% + \@setfontsize#1{#2\jsc@mpt}{#3\jsc@mpt}} \emergencystretch 3\zw \newif\ifnarrowbaselines \if@english @@ -378,11 +400,11 @@ } \renewcommand{\normalsize}{% \ltj@@ifnarrowbaselines - {\ltjs@setfontsize\normalsize\@xpt\@xiipt}% - {\ltjs@setfontsize\normalsize\@xpt{\n@baseline}}% - \abovedisplayskip 11\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt - \abovedisplayshortskip \z@ \@plus3\ltjs@mpt - \belowdisplayskip 9\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt + {\jsc@setfontsize\normalsize\@xpt\@xiipt}% + {\jsc@setfontsize\normalsize\@xpt{\n@baseline}}% + \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} \mcfamily\selectfont\normalsize @@ -394,10 +416,10 @@ \setlength\Chs{\wd0} \newcommand{\small}{% \ltj@@ifnarrowbaselines - {\ltjs@setfontsize\small\@ixpt{11}}% - {\ltjs@setfontsize\small\@ixpt{13}}% - \abovedisplayskip 9\ltjs@mpt \@plus3\ltjs@mpt \@minus4\ltjs@mpt - \abovedisplayshortskip \z@ \@plus3\ltjs@mpt + {\jsc@setfontsize\small\@ixpt{11}}% + {\jsc@setfontsize\small\@ixpt{13}}% + \abovedisplayskip 9\jsc@mpt \@plus3\jsc@mpt \@minus4\jsc@mpt + \abovedisplayshortskip \z@ \@plus3\jsc@mpt \belowdisplayskip \abovedisplayskip \belowdisplayshortskip \belowdisplayskip \def\@listi{\leftmargin\leftmargini @@ -406,36 +428,36 @@ \itemsep \parsep}} \newcommand{\footnotesize}{% \ltj@@ifnarrowbaselines - {\ltjs@setfontsize\footnotesize\@viiipt{9.5}}% - {\ltjs@setfontsize\footnotesize\@viiipt{11}}% - \abovedisplayskip 6\ltjs@mpt \@plus2\ltjs@mpt \@minus3\ltjs@mpt - \abovedisplayshortskip \z@ \@plus2\ltjs@mpt + {\jsc@setfontsize\footnotesize\@viiipt{9.5}}% + {\jsc@setfontsize\footnotesize\@viiipt{11}}% + \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}{\ltjs@setfontsize\scriptsize\@viipt\@viiipt} -\newcommand{\tiny}{\ltjs@setfontsize\tiny\@vpt\@vipt} +\newcommand{\scriptsize}{\jsc@setfontsize\scriptsize\@viipt\@viiipt} +\newcommand{\tiny}{\jsc@setfontsize\tiny\@vpt\@vipt} \if@twocolumn - \newcommand{\large}{\ltjs@setfontsize\large\@xiipt{\n@baseline}} + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{\n@baseline}} \else - \newcommand{\large}{\ltjs@setfontsize\large\@xiipt{17}} + \newcommand{\large}{\jsc@setfontsize\large\@xiipt{17}} \fi -\newcommand{\Large}{\ltjs@setfontsize\Large\@xivpt{21}} -\newcommand{\LARGE}{\ltjs@setfontsize\LARGE\@xviipt{25}} -\newcommand{\huge}{\ltjs@setfontsize\huge\@xxpt{28}} -\newcommand{\Huge}{\ltjs@setfontsize\Huge\@xxvpt{33}} -\newcommand{\HUGE}{\ltjs@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{2\zw} \setlength\columnseprule{\z@} -\setlength\lineskip{1\ltjs@mpt} -\setlength\normallineskip{1\ltjs@mpt} -\setlength\lineskiplimit{1\ltjs@mpt} -\setlength\normallineskiplimit{1\ltjs@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{\z@} \if@slide @@ -446,11 +468,11 @@ \@lowpenalty 51 \@medpenalty 151 \@highpenalty 301 -\setlength\topskip{10\ltjs@mpt} +\setlength\topskip{1.38\zh}%% from 10\jsc@mpt (2016-08-17) \if@slide - \setlength\headheight{0\ltjs@mpt} + \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} @@ -464,7 +486,7 @@ \setlength\headsep{\footskip} \addtolength\headsep{-\topskip} \else - \setlength\headsep{6mm} + \setlength\headsep{6\jsc@mmm} \fi \setlength\maxdepth{.5\topskip} \newdimen\fullwidth @@ -472,7 +494,7 @@ \setlength\fullwidth{0.76\paperwidth} \else \setlength\fullwidth{\paperwidth} - \addtolength\fullwidth{-36mm} + \addtolength\fullwidth{-36\jsc@mmm} \fi \if@twocolumn \@tempdima=2\zw \else \@tempdima=1\zw \fi \divide\fullwidth\@tempdima \multiply\fullwidth\@tempdima @@ -489,14 +511,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\ltjs@mpt} +\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} @@ -512,7 +537,7 @@ \addtolength\marginparwidth{-\oddsidemargin} \addtolength\marginparwidth{-1in} \addtolength\marginparwidth{-\textwidth} -\addtolength\marginparwidth{-1cm} +\addtolength\marginparwidth{-10\jsc@mmm} \addtolength\marginparwidth{-\marginparsep} \@tempdima=1\zw \divide\marginparwidth\@tempdima @@ -522,7 +547,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} @@ -530,7 +555,7 @@ \addtolength\topmargin{-1in} {\footnotesize\global\setlength\footnotesep{\baselineskip}} \setlength\footnotesep{0.7\footnotesep} -\setlength{\skip\footins}{16\ltjs@mpt \@plus 5\ltjs@mpt \@minus 2\ltjs@mpt} +\setlength{\skip\footins}{16\jsc@mpt \@plus 5\jsc@mpt \@minus 2\jsc@mpt} \setcounter{topnumber}{9} \renewcommand{\topfraction}{.85} \setcounter{bottomnumber}{9} @@ -541,17 +566,17 @@ \setcounter{dbltopnumber}{9} \renewcommand{\dbltopfraction}{.8} \renewcommand{\dblfloatpagefraction}{.8} -\setlength\floatsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} -\setlength\textfloatsep{20\ltjs@mpt \@plus 2\ltjs@mpt \@minus 4\ltjs@mpt} -\setlength\intextsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} -\setlength\dblfloatsep {12\ltjs@mpt \@plus 2\ltjs@mpt \@minus 2\ltjs@mpt} -\setlength\dbltextfloatsep{20\ltjs@mpt \@plus 2\ltjs@mpt \@minus 4\ltjs@mpt} -\setlength\@fptop{0\ltjs@mpt \@plus 1fil} -\setlength\@fpsep{8\ltjs@mpt \@plus 2fil} -\setlength\@fpbot{0\ltjs@mpt \@plus 1fil} -\setlength\@dblfptop{0\ltjs@mpt \@plus 1fil} -\setlength\@dblfpsep{8\ltjs@mpt \@plus 2fil} -\setlength\@dblfpbot{0\ltjs@mpt \@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 @@ -626,16 +651,16 @@ \begin{center} \mbox{} \\[1\zw] \large - {\maybeblue\hrule height0\ltjs@mpt depth2\ltjs@mpt\relax}\par + {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par \smallskip \@title \smallskip - {\maybeblue\hrule height0\ltjs@mpt depth2\ltjs@mpt\relax}\par + {\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par \vfill {\small \@author}% \end{center} \else - \vskip 60\ltjs@mpt + \vskip 60\jsc@mpt \begin{center}% {\LARGE \@title \par}% \vskip 3em% @@ -796,7 +821,9 @@ \@afterheading \fi \if@slide - {\vskip-6\ltjs@mpt\maybeblue\hrule height0\ltjs@mpt depth1\ltjs@mpt\vskip7\ltjs@mpt\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} @@ -881,7 +908,7 @@ \normalfont \ifnum \c@secnumdepth >-2\relax \huge\headfont \prepartname\thepart\postpartname - \par\vskip20\ltjs@mpt + \par\vskip20\jsc@mpt \fi \Huge \headfont #2\par}% \@endpart} @@ -923,8 +950,8 @@ \addcontentsline{toc}{chapter}{#1}% \fi \chaptermark{#1}% - \addtocontents{lof}{\protect\addvspace{10\ltjs@mpt}}% - \addtocontents{lot}{\protect\addvspace{10\ltjs@mpt}}% + \addtocontents{lof}{\protect\addvspace{10\jsc@mpt}}% + \addtocontents{lot}{\protect\addvspace{10\jsc@mpt}}% \if@twocolumn \@topnewpage[\@makechapterhead{#2}]% \else @@ -973,7 +1000,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@}% @@ -983,27 +1010,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@}{-1\zw}% 改行せず 1\zw のアキ + {\z@}{\if@slide .4\Cvs \else -1\zw\fi}% 改行せず 1\zw のアキ {\normalfont\normalsize\headfont ■}} \else \newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}% {0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}% - {-1\zw}% 改行せず 1\zw のアキ + {\if@slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% 改行せず 1\zw のアキ {\normalfont\normalsize\headfont ■}} \fi -\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% - {\z@}{-1\zw}% - {\normalfont\normalsize\headfont}} +\if@twocolumn + \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% + {\z@}{\if@slide .4\Cvs \@plus.3\Cdp \else -1\zw\fi}% + {\normalfont\normalsize\headfont}} +\else + \newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}% + {\z@}{\if@slide .5\Cvs \@plus.3\Cdp \else -1\zw\fi}% + {\normalfont\normalsize\headfont}} +\fi \if@slide \setlength\leftmargini{1\zw} \else @@ -1127,14 +1160,14 @@ \gdef\@chapapp{\appendixname}% \gdef\@chappos{}% \gdef\thechapter{\@Alph\c@chapter}} -\setlength\arraycolsep{5\ltjs@mpt} -\setlength\tabcolsep{6\ltjs@mpt} -\setlength\arrayrulewidth{.4\ltjs@mpt} -\setlength\doublerulesep{2\ltjs@mpt} +\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\ltjs@mpt} -\setlength\fboxrule{.4\ltjs@mpt} +\setlength\fboxsep{3\jsc@mpt} +\setlength\fboxrule{.4\jsc@mpt} \@addtoreset{equation}{chapter} \renewcommand\theequation {\ifnum \c@chapter>\z@ \thechapter.\fi \@arabic\c@equation} @@ -1166,8 +1199,8 @@ {\end@dblfloat} \newlength\abovecaptionskip \newlength\belowcaptionskip -\setlength\abovecaptionskip{5\ltjs@mpt} % 元: 10\p@ -\setlength\belowcaptionskip{5\ltjs@mpt} % 元: 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 @@ -1176,27 +1209,51 @@ \ifdim \wd\@tempboxa <\hsize \centering \fi #1{\hskip1\zw}#2\par \vskip\belowcaptionskip}} -\DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc} -\DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt} -\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm} -\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf} -\DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt} -\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf} -\DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit} -\DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl} -\DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc} +\newif\if@jsc@warnoldfontcmd +\@jsc@warnoldfontcmdtrue +\newif\if@jsc@warnoldfontcmdexception +\@jsc@warnoldfontcmdexceptionfalse +\newcommand*{\jsc@DeclareOldFontCommand}[3]{% + \DeclareOldFontCommand{#1}{% + \jsc@warnoldfontcmd{#1}#2% + }{% + \jsc@warnoldfontcmd{#1}#3% + }% +} +\DeclareRobustCommand*{\jsc@warnoldfontcmd}[1]{% + \if@jsc@warnoldfontcmdexception\else\if@jsc@warnoldfontcmd + \ClassWarning{\jsc@clsname}{% + deprecated old font command `\string#1' used.\MessageBreak + You should note, that since 1994 LaTeX2e provides a\MessageBreak + new font selection scheme called NFSS2 with several\MessageBreak + new, combinable font commands. This \jsc@clsname\MessageBreak +class has defined the old font commands like\MessageBreak +`\string#1' only for compatibility% + }% + \global\@jsc@warnoldfontcmdfalse + \fi\fi +} +\jsc@DeclareOldFontCommand{\mc}{\normalfont\mcfamily}{\mathmc} +\jsc@DeclareOldFontCommand{\gt}{\normalfont\gtfamily}{\mathgt} +\jsc@DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm} +\jsc@DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf} +\jsc@DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt} +\jsc@DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf} +\jsc@DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit} +\jsc@DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl} +\jsc@DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} \newcommand\@pnumwidth{1.55em} \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<2\zw \divide\js@tocl@width by 2 \advance\js@tocl@width 1\zw\fi + \ifdim\jsc@tocl@width<\@tempdima \setlength\jsc@tocl@width{\@tempdima}\fi + \ifdim\jsc@tocl@width<2\zw \divide\jsc@tocl@width by 2 \advance\jsc@tocl@width 1\zw\fi \if@twocolumn \@restonecoltrue\onecolumn \else @@ -1210,7 +1267,7 @@ \newcommand*{\l@part}[2]{% \ifnum \c@tocdepth >-2\relax \addpenalty{-\@highpenalty}% - \addvspace{2.25em \@plus\ltjs@mpt}% + \addvspace{2.25em \@plus\jsc@mpt}% \begingroup \parindent \z@ \rightskip \@tocrmarg @@ -1227,14 +1284,14 @@ \newcommand*{\l@chapter}[2]{% \ifnum \c@tocdepth >\m@ne \addpenalty{-\@highpenalty}% - \addvspace{1.0em \@plus\ltjs@mpt} + \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.683\zw}\fi - \setlength\@lnumwidth{\js@tocl@width}\advance\@lnumwidth 2.683\zw + \setlength\@lnumwidth{\jsc@tocl@width}\advance\@lnumwidth 2.683\zw \advance\leftskip\@lnumwidth \hskip-\leftskip #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par \penalty\@highpenalty @@ -1242,24 +1299,24 @@ \fi} % \newcommand*{\l@section}{\@dottedtocline{1}{1\zw}{3.683\zw}} \newcommand*{\l@section}{% - \@tempdima\js@tocl@width \advance\@tempdima -1\zw + \@tempdima\jsc@tocl@width \advance\@tempdima -1\zw \@dottedtocline{1}{\@tempdima}{3.683\zw}} \newcommand*{\l@subsection}{% - \@tempdima\js@tocl@width \advance\@tempdima 2.683\zw + \@tempdima\jsc@tocl@width \advance\@tempdima 2.683\zw \@dottedtocline{2}{\@tempdima}{3.5\zw}} \newcommand*{\l@subsubsection}{% - \@tempdima\js@tocl@width \advance\@tempdima 6.183\zw + \@tempdima\jsc@tocl@width \advance\@tempdima 6.183\zw \@dottedtocline{3}{\@tempdima}{4.5\zw}} \newcommand*{\l@paragraph}{% - \@tempdima\js@tocl@width \advance\@tempdima 10.683\zw + \@tempdima\jsc@tocl@width \advance\@tempdima 10.683\zw \@dottedtocline{4}{\@tempdima}{5.5\zw}} \newcommand*{\l@subparagraph}{% - \@tempdima\js@tocl@width \advance\@tempdima 16.183\zw + \@tempdima\jsc@tocl@width \advance\@tempdima 16.183\zw \@dottedtocline{5}{\@tempdima}{6.5\zw}} \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\ltjs@mpt + \vskip \z@ \@plus.2\jsc@mpt {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip \parindent #2\relax\@afterindenttrue \interlinepenalty\@M @@ -1291,6 +1348,7 @@ \newdimen\bibindent \setlength\bibindent{2\zw} \newenvironment{thebibliography}[1]{% + \global\@jsc@warnoldfontcmdexceptiontrue \global\let\presectionname\relax \global\let\postsectionname\relax \chapter*{\bibname}\@mkboth{\bibname}{}% @@ -1310,7 +1368,8 @@ \sfcode`\.\@m} {\def\@noitemerr {\@latex@warning{Empty `thebibliography' environment}}% - \endlist} + \endlist + \global\@jsc@warnoldfontcmdexceptionfalse} \newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em} \let\@openbib@code\@empty \newenvironment{theindex}{% 索引を3段組で出力する環境 @@ -1338,7 +1397,7 @@ \@mkboth{\indexname}{}% \plainifnotempty % \thispagestyle{plain} \parindent\z@ - \parskip\z@ \@plus .3\ltjs@mpt\relax + \parskip\z@ \@plus .3\jsc@mpt\relax \let\item\@idxitem \raggedright \footnotesize\narrowbaselines @@ -1353,21 +1412,18 @@ \newcommand{\@idxitem}{\par\hangindent 4\zw} % 元 40pt \newcommand{\subitem}{\@idxitem \hspace*{2\zw}} % 元 20pt \newcommand{\subsubitem}{\@idxitem \hspace*{3\zw}} % 元 30pt -\newcommand{\indexspace}{\par \vskip 10\ltjs@mpt \@plus5\ltjs@mpt \@minus3\ltjs@mpt\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{% - \unless\ifnum\ltjgetparameter{direction}=3 \@textsuperscript{\normalfont\@thefnmark}% - \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi}\hbox{}} \def\thefootnote{\ifnum\c@footnote>\z@\leavevmode\lower.5ex\hbox{*}\@arabic\c@footnote\fi} \renewcommand{\footnoterule}{% - \kern-3\ltjs@mpt - \hrule width .4\columnwidth height .4\ltjs@mpt - \kern 2.6\ltjs@mpt} + \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 @@ -1463,6 +1519,12 @@ \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null \inhibitglue \ignorespaces \fi} +\IfFileExists{jslogo.sty}{}{\@jslogofalse}% +\if@jslogo + \RequirePackage{jslogo} + \def\小{\jslg@small} + \def\上小{\jslg@uppersmall} +\else \def\小#1{\hbox{$\m@th$% \csname S@\f@size\endcsname \fontsize\sf@size\z@ @@ -1593,6 +1655,7 @@ \ifx\f@family\cmr\kern-.08em\else\kern-.15em\fi\TeX} \DeclareRobustCommand{\SliTeX}{% S\kern-.06emL\kern-.18em\上小{I}\kern -.03em\TeX} +\fi \newcommand{\prepartname}{\if@english Part~\else 第\fi} \newcommand{\postpartname}{\if@english\else 部\fi} \newcommand{\prechaptername}{\if@english Chapter~\else 第\fi} |