diff options
Diffstat (limited to 'Master/texmf-dist/tex/platex/jsclasses/jspf.cls')
| -rw-r--r-- | Master/texmf-dist/tex/platex/jsclasses/jspf.cls | 59 |
1 files changed, 27 insertions, 32 deletions
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls index ea8661f5a5a..6427dabbb93 100644 --- a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls +++ b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls @@ -25,7 +25,7 @@ \fi \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jspf} - [2017/10/04 jsclasses (okumura, texjporg)] + [2018/03/11 jsclasses (okumura, texjporg)] \def\jsc@clsname{jspf} \newif\ifjsc@needsp@tch \jsc@needsp@tchfalse @@ -180,8 +180,6 @@ \DeclareOption{disablejfam}{\@enablejfamfalse} \DeclareOption{draft}{\setlength\overfullrule{5pt}} \DeclareOption{final}{\setlength\overfullrule{0pt}} -\newif\ifwinjis -\winjisfalse \newif\ifmingoth \mingothfalse \newif\ifjisfont @@ -190,10 +188,13 @@ \@jsc@uplatexfalse \newif\if@jsc@autodetect \@jsc@autodetectfalse +\DeclareOption{winjis}{% + \ClassWarningNoLine{\jsc@clsname}{% + The option `winjis' has been removed;\MessageBreak + Use `\string\usepackage{winjis}' instead}} \DeclareOption{mingoth}{\mingothtrue} -\DeclareOption{winjis}{\winjistrue} \DeclareOption{jis}{\jisfonttrue} -\DeclareOption{uplatex}{\@jsc@uplatextrue\winjisfalse} +\DeclareOption{uplatex}{\@jsc@uplatextrue} \DeclareOption{autodetect-engine}{\@jsc@autodetecttrue} \def\jsc@JYn{\if@jsc@uplatex JY2\else JY1\fi} \def\jsc@JTn{\if@jsc@uplatex JT2\else JT1\fi} @@ -418,35 +419,29 @@ \setlength\stockwidth{\inv@mag\stockwidth}% \setlength\stockheight{\inv@mag\stockheight}% \fi -\ifwinjis - \DeclareFontShape{JY1}{mc}{m}{n}{<-> s * [0.93885] winjis}{} - \DeclareFontShape{JY1}{gt}{m}{n}{<-> s * [0.93885] winjisg}{} - \DeclareFontShape{JT1}{mc}{m}{n}{<-> s * [0.93885] winjis-v}{} - \DeclareFontShape{JT1}{gt}{m}{n}{<-> s * [0.93885] winjisg-v}{} +\def\Cjascale{0.903375} +\ifmingoth + \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.93885] \jsc@pfx@ min10}{} + \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.93885] \jsc@pfx@ goth10}{} + \DeclareFontShape{\jsc@JTn}{mc}{m}{n}{<-> s * [0.93885] \jsc@pfx@ tmin10}{} + \DeclareFontShape{\jsc@JTn}{gt}{m}{n}{<-> s * [0.93885] \jsc@pfx@ tgoth10}{} \else - \ifmingoth - \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.93885] \jsc@pfx@ min10}{} - \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.93885] \jsc@pfx@ goth10}{} + \ifjisfont + \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.93885] \jsc@pfx@ jis}{} + \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.93885] \jsc@pfx@ jisg}{} \DeclareFontShape{\jsc@JTn}{mc}{m}{n}{<-> s * [0.93885] \jsc@pfx@ tmin10}{} \DeclareFontShape{\jsc@JTn}{gt}{m}{n}{<-> s * [0.93885] \jsc@pfx@ tgoth10}{} \else - \ifjisfont + \if@jsc@uplatex + \DeclareFontShape{JY2}{mc}{m}{n}{<-> s * [0.903375] upjisr-h}{} + \DeclareFontShape{JY2}{gt}{m}{n}{<-> s * [0.903375] upjisg-h}{} + \DeclareFontShape{JT2}{mc}{m}{n}{<-> s * [0.903375] upjisr-v}{} + \DeclareFontShape{JT2}{gt}{m}{n}{<-> s * [0.903375] upjisg-v}{} + \else \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.93885] \jsc@pfx@ jis}{} \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.93885] \jsc@pfx@ jisg}{} \DeclareFontShape{\jsc@JTn}{mc}{m}{n}{<-> s * [0.93885] \jsc@pfx@ tmin10}{} \DeclareFontShape{\jsc@JTn}{gt}{m}{n}{<-> s * [0.93885] \jsc@pfx@ tgoth10}{} - \else - \if@jsc@uplatex - \DeclareFontShape{JY2}{mc}{m}{n}{<-> s * [0.903375] upjisr-h}{} - \DeclareFontShape{JY2}{gt}{m}{n}{<-> s * [0.903375] upjisg-h}{} - \DeclareFontShape{JT2}{mc}{m}{n}{<-> s * [0.903375] upjisr-v}{} - \DeclareFontShape{JT2}{gt}{m}{n}{<-> s * [0.903375] upjisg-v}{} - \else - \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.93885] \jsc@pfx@ jis}{} - \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.93885] \jsc@pfx@ jisg}{} - \DeclareFontShape{\jsc@JTn}{mc}{m}{n}{<-> s * [0.93885] \jsc@pfx@ tmin10}{} - \DeclareFontShape{\jsc@JTn}{gt}{m}{n}{<-> s * [0.93885] \jsc@pfx@ tgoth10}{} - \fi \fi \fi \fi @@ -1564,12 +1559,12 @@ \color@begingroup \@makefntext{% \rule\z@\footnotesep\ignorespaces}% - \futurelet\next\fo@t} -\def\fo@t{\ifcat\bgroup\noexpand\next \let\next\f@@t - \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 + \futurelet\jsc@next\jsc@fo@t} +\def\jsc@fo@t{\ifcat\bgroup\noexpand\jsc@next \let\jsc@next\jsc@f@@t + \else \let\jsc@next\jsc@f@t\fi \jsc@next} +\def\jsc@f@@t{\bgroup\aftergroup\jsc@@foot\let\jsc@next} +\def\jsc@f@t#1{#1\jsc@@foot} +\def\jsc@@foot{\@finalstrut\strutbox\color@endgroup\egroup \ifx\pltx@foot@penalty\@undefined\else \ifhmode\null\fi \ifnum\pltx@foot@penalty=\z@\else |