summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/platex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-03-11 20:23:11 +0000
committerKarl Berry <karl@freefriends.org>2018-03-11 20:23:11 +0000
commit284238c3c429197758ebc0a5e048e24e66676e70 (patch)
treed2a6200212d7ff5ec3d04d746fc1e7ad544debb3 /Master/texmf-dist/tex/platex
parent4034e550b5923f4789c697c686917a4fdc044b6f (diff)
jsclasses (11mar18)
git-svn-id: svn://tug.org/texlive/trunk@46918 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex')
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls59
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jsbook.cls59
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jspf.cls59
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jsreport.cls59
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/kiyou.cls59
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/minijs.sty3
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/morisawa.sty108
7 files changed, 137 insertions, 269 deletions
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
index 5b6169a8f1a..1cb261dab40 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
@@ -25,7 +25,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsarticle}
- [2017/10/04 jsclasses (okumura, texjporg)]
+ [2018/03/11 jsclasses (okumura, texjporg)]
\def\jsc@clsname{jsarticle}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
@@ -184,8 +184,6 @@
\DeclareOption{disablejfam}{\@enablejfamfalse}
\DeclareOption{draft}{\setlength\overfullrule{5pt}}
\DeclareOption{final}{\setlength\overfullrule{0pt}}
-\newif\ifwinjis
-\winjisfalse
\newif\ifmingoth
\mingothfalse
\newif\ifjisfont
@@ -194,10 +192,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}
@@ -422,35 +423,29 @@
\setlength\stockwidth{\inv@mag\stockwidth}%
\setlength\stockheight{\inv@mag\stockheight}%
\fi
-\ifwinjis
- \DeclareFontShape{JY1}{mc}{m}{n}{<-> s * [0.961] winjis}{}
- \DeclareFontShape{JY1}{gt}{m}{n}{<-> s * [0.961] winjisg}{}
- \DeclareFontShape{JT1}{mc}{m}{n}{<-> s * [0.961] winjis-v}{}
- \DeclareFontShape{JT1}{gt}{m}{n}{<-> s * [0.961] winjisg-v}{}
+\def\Cjascale{0.924690}
+\ifmingoth
+ \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ min10}{}
+ \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ goth10}{}
+ \DeclareFontShape{\jsc@JTn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ tmin10}{}
+ \DeclareFontShape{\jsc@JTn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ tgoth10}{}
\else
- \ifmingoth
- \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ min10}{}
- \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ goth10}{}
+ \ifjisfont
+ \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ jis}{}
+ \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ jisg}{}
\DeclareFontShape{\jsc@JTn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ tmin10}{}
\DeclareFontShape{\jsc@JTn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ tgoth10}{}
\else
- \ifjisfont
+ \if@jsc@uplatex
+ \DeclareFontShape{JY2}{mc}{m}{n}{<-> s * [0.924690] upjisr-h}{}
+ \DeclareFontShape{JY2}{gt}{m}{n}{<-> s * [0.924690] upjisg-h}{}
+ \DeclareFontShape{JT2}{mc}{m}{n}{<-> s * [0.924690] upjisr-v}{}
+ \DeclareFontShape{JT2}{gt}{m}{n}{<-> s * [0.924690] upjisg-v}{}
+ \else
\DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ jis}{}
\DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ jisg}{}
\DeclareFontShape{\jsc@JTn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ tmin10}{}
\DeclareFontShape{\jsc@JTn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ tgoth10}{}
- \else
- \if@jsc@uplatex
- \DeclareFontShape{JY2}{mc}{m}{n}{<-> s * [0.924690] upjisr-h}{}
- \DeclareFontShape{JY2}{gt}{m}{n}{<-> s * [0.924690] upjisg-h}{}
- \DeclareFontShape{JT2}{mc}{m}{n}{<-> s * [0.924690] upjisr-v}{}
- \DeclareFontShape{JT2}{gt}{m}{n}{<-> s * [0.924690] upjisg-v}{}
- \else
- \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ jis}{}
- \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ jisg}{}
- \DeclareFontShape{\jsc@JTn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ tmin10}{}
- \DeclareFontShape{\jsc@JTn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ tgoth10}{}
- \fi
\fi
\fi
\fi
@@ -1722,12 +1717,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
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
index 4bdcec88810..f3c59cd2fc3 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
@@ -25,7 +25,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsbook}
- [2017/10/04 jsclasses (okumura, texjporg)]
+ [2018/03/11 jsclasses (okumura, texjporg)]
\def\jsc@clsname{jsbook}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
@@ -186,8 +186,6 @@
\DeclareOption{disablejfam}{\@enablejfamfalse}
\DeclareOption{draft}{\setlength\overfullrule{5pt}}
\DeclareOption{final}{\setlength\overfullrule{0pt}}
-\newif\ifwinjis
-\winjisfalse
\newif\ifmingoth
\mingothfalse
\newif\ifjisfont
@@ -196,10 +194,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}
@@ -427,35 +428,29 @@
\setlength\stockwidth{\inv@mag\stockwidth}%
\setlength\stockheight{\inv@mag\stockheight}%
\fi
-\ifwinjis
- \DeclareFontShape{JY1}{mc}{m}{n}{<-> s * [0.961] winjis}{}
- \DeclareFontShape{JY1}{gt}{m}{n}{<-> s * [0.961] winjisg}{}
- \DeclareFontShape{JT1}{mc}{m}{n}{<-> s * [0.961] winjis-v}{}
- \DeclareFontShape{JT1}{gt}{m}{n}{<-> s * [0.961] winjisg-v}{}
+\def\Cjascale{0.924690}
+\ifmingoth
+ \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ min10}{}
+ \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ goth10}{}
+ \DeclareFontShape{\jsc@JTn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ tmin10}{}
+ \DeclareFontShape{\jsc@JTn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ tgoth10}{}
\else
- \ifmingoth
- \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ min10}{}
- \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ goth10}{}
+ \ifjisfont
+ \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ jis}{}
+ \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ jisg}{}
\DeclareFontShape{\jsc@JTn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ tmin10}{}
\DeclareFontShape{\jsc@JTn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ tgoth10}{}
\else
- \ifjisfont
+ \if@jsc@uplatex
+ \DeclareFontShape{JY2}{mc}{m}{n}{<-> s * [0.924690] upjisr-h}{}
+ \DeclareFontShape{JY2}{gt}{m}{n}{<-> s * [0.924690] upjisg-h}{}
+ \DeclareFontShape{JT2}{mc}{m}{n}{<-> s * [0.924690] upjisr-v}{}
+ \DeclareFontShape{JT2}{gt}{m}{n}{<-> s * [0.924690] upjisg-v}{}
+ \else
\DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ jis}{}
\DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ jisg}{}
\DeclareFontShape{\jsc@JTn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ tmin10}{}
\DeclareFontShape{\jsc@JTn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ tgoth10}{}
- \else
- \if@jsc@uplatex
- \DeclareFontShape{JY2}{mc}{m}{n}{<-> s * [0.924690] upjisr-h}{}
- \DeclareFontShape{JY2}{gt}{m}{n}{<-> s * [0.924690] upjisg-h}{}
- \DeclareFontShape{JT2}{mc}{m}{n}{<-> s * [0.924690] upjisr-v}{}
- \DeclareFontShape{JT2}{gt}{m}{n}{<-> s * [0.924690] upjisg-v}{}
- \else
- \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ jis}{}
- \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ jisg}{}
- \DeclareFontShape{\jsc@JTn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ tmin10}{}
- \DeclareFontShape{\jsc@JTn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ tgoth10}{}
- \fi
\fi
\fi
\fi
@@ -1812,12 +1807,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
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
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls b/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls
index d03cbed37d6..b4377394522 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jsreport.cls
@@ -25,7 +25,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsreport}
- [2017/10/04 jsclasses (okumura, texjporg)]
+ [2018/03/11 jsclasses (okumura, texjporg)]
\def\jsc@clsname{jsreport}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
@@ -185,8 +185,6 @@
\DeclareOption{disablejfam}{\@enablejfamfalse}
\DeclareOption{draft}{\setlength\overfullrule{5pt}}
\DeclareOption{final}{\setlength\overfullrule{0pt}}
-\newif\ifwinjis
-\winjisfalse
\newif\ifmingoth
\mingothfalse
\newif\ifjisfont
@@ -195,10 +193,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}
@@ -423,35 +424,29 @@
\setlength\stockwidth{\inv@mag\stockwidth}%
\setlength\stockheight{\inv@mag\stockheight}%
\fi
-\ifwinjis
- \DeclareFontShape{JY1}{mc}{m}{n}{<-> s * [0.961] winjis}{}
- \DeclareFontShape{JY1}{gt}{m}{n}{<-> s * [0.961] winjisg}{}
- \DeclareFontShape{JT1}{mc}{m}{n}{<-> s * [0.961] winjis-v}{}
- \DeclareFontShape{JT1}{gt}{m}{n}{<-> s * [0.961] winjisg-v}{}
+\def\Cjascale{0.924690}
+\ifmingoth
+ \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ min10}{}
+ \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ goth10}{}
+ \DeclareFontShape{\jsc@JTn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ tmin10}{}
+ \DeclareFontShape{\jsc@JTn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ tgoth10}{}
\else
- \ifmingoth
- \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ min10}{}
- \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ goth10}{}
+ \ifjisfont
+ \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ jis}{}
+ \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ jisg}{}
\DeclareFontShape{\jsc@JTn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ tmin10}{}
\DeclareFontShape{\jsc@JTn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ tgoth10}{}
\else
- \ifjisfont
+ \if@jsc@uplatex
+ \DeclareFontShape{JY2}{mc}{m}{n}{<-> s * [0.924690] upjisr-h}{}
+ \DeclareFontShape{JY2}{gt}{m}{n}{<-> s * [0.924690] upjisg-h}{}
+ \DeclareFontShape{JT2}{mc}{m}{n}{<-> s * [0.924690] upjisr-v}{}
+ \DeclareFontShape{JT2}{gt}{m}{n}{<-> s * [0.924690] upjisg-v}{}
+ \else
\DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ jis}{}
\DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ jisg}{}
\DeclareFontShape{\jsc@JTn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ tmin10}{}
\DeclareFontShape{\jsc@JTn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ tgoth10}{}
- \else
- \if@jsc@uplatex
- \DeclareFontShape{JY2}{mc}{m}{n}{<-> s * [0.924690] upjisr-h}{}
- \DeclareFontShape{JY2}{gt}{m}{n}{<-> s * [0.924690] upjisg-h}{}
- \DeclareFontShape{JT2}{mc}{m}{n}{<-> s * [0.924690] upjisr-v}{}
- \DeclareFontShape{JT2}{gt}{m}{n}{<-> s * [0.924690] upjisg-v}{}
- \else
- \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ jis}{}
- \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ jisg}{}
- \DeclareFontShape{\jsc@JTn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ tmin10}{}
- \DeclareFontShape{\jsc@JTn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ tgoth10}{}
- \fi
\fi
\fi
\fi
@@ -1805,12 +1800,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
diff --git a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
index 2356cb6f1ce..e5d86a31c6d 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
@@ -25,7 +25,7 @@
\fi
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{kiyou}
- [2017/10/04 jsclasses (okumura, texjporg)]
+ [2018/03/11 jsclasses (okumura, texjporg)]
\def\jsc@clsname{kiyou}
\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}
@@ -429,35 +430,29 @@
\setlength\stockwidth{\inv@mag\stockwidth}%
\setlength\stockheight{\inv@mag\stockheight}%
\fi
-\ifwinjis
- \DeclareFontShape{JY1}{mc}{m}{n}{<-> s * [0.961] winjis}{}
- \DeclareFontShape{JY1}{gt}{m}{n}{<-> s * [0.961] winjisg}{}
- \DeclareFontShape{JT1}{mc}{m}{n}{<-> s * [0.961] winjis-v}{}
- \DeclareFontShape{JT1}{gt}{m}{n}{<-> s * [0.961] winjisg-v}{}
+\def\Cjascale{0.924690}
+\ifmingoth
+ \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ min10}{}
+ \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ goth10}{}
+ \DeclareFontShape{\jsc@JTn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ tmin10}{}
+ \DeclareFontShape{\jsc@JTn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ tgoth10}{}
\else
- \ifmingoth
- \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ min10}{}
- \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ goth10}{}
+ \ifjisfont
+ \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ jis}{}
+ \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ jisg}{}
\DeclareFontShape{\jsc@JTn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ tmin10}{}
\DeclareFontShape{\jsc@JTn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ tgoth10}{}
\else
- \ifjisfont
+ \if@jsc@uplatex
+ \DeclareFontShape{JY2}{mc}{m}{n}{<-> s * [0.924690] upjisr-h}{}
+ \DeclareFontShape{JY2}{gt}{m}{n}{<-> s * [0.924690] upjisg-h}{}
+ \DeclareFontShape{JT2}{mc}{m}{n}{<-> s * [0.924690] upjisr-v}{}
+ \DeclareFontShape{JT2}{gt}{m}{n}{<-> s * [0.924690] upjisg-v}{}
+ \else
\DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ jis}{}
\DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ jisg}{}
\DeclareFontShape{\jsc@JTn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ tmin10}{}
\DeclareFontShape{\jsc@JTn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ tgoth10}{}
- \else
- \if@jsc@uplatex
- \DeclareFontShape{JY2}{mc}{m}{n}{<-> s * [0.924690] upjisr-h}{}
- \DeclareFontShape{JY2}{gt}{m}{n}{<-> s * [0.924690] upjisg-h}{}
- \DeclareFontShape{JT2}{mc}{m}{n}{<-> s * [0.924690] upjisr-v}{}
- \DeclareFontShape{JT2}{gt}{m}{n}{<-> s * [0.924690] upjisg-v}{}
- \else
- \DeclareFontShape{\jsc@JYn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ jis}{}
- \DeclareFontShape{\jsc@JYn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ jisg}{}
- \DeclareFontShape{\jsc@JTn}{mc}{m}{n}{<-> s * [0.961] \jsc@pfx@ tmin10}{}
- \DeclareFontShape{\jsc@JTn}{gt}{m}{n}{<-> s * [0.961] \jsc@pfx@ tgoth10}{}
- \fi
\fi
\fi
\fi
@@ -1680,12 +1675,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
diff --git a/Master/texmf-dist/tex/platex/jsclasses/minijs.sty b/Master/texmf-dist/tex/platex/jsclasses/minijs.sty
index 910a37cc8d9..da464a3a31e 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/minijs.sty
+++ b/Master/texmf-dist/tex/platex/jsclasses/minijs.sty
@@ -1,7 +1,7 @@
% minimal jsarticle-like fonts
%
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{minijs}[2016/07/16 okumura, texjporg]
+\ProvidesPackage{minijs}[2018/02/04 okumura, texjporg]
%
% if jsclasses loaded, abort loading this package
\ifx\@jsc@uplatextrue\@undefined\else
@@ -20,6 +20,7 @@
\expandafter\let\csname JT1/mc/m/n/\@tempa\endcsname\relax
\expandafter\let\csname JT1/gt/m/n/\@tempa\endcsname\relax
}
+\def\Cjascale{0.924690}
\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}{}
diff --git a/Master/texmf-dist/tex/platex/jsclasses/morisawa.sty b/Master/texmf-dist/tex/platex/jsclasses/morisawa.sty
deleted file mode 100644
index 3cccbee8d3d..00000000000
--- a/Master/texmf-dist/tex/platex/jsclasses/morisawa.sty
+++ /dev/null
@@ -1,108 +0,0 @@
-%%
-%% This is file `morisawa.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% morisawa.dtx (with options: `morisawa')
-%%
-%% IMPORTANT NOTICE:
-%%
-%% For the copyright see the source file.
-%%
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from morisawa.sty.
-%%
-%% For distribution of the original source see the terms
-%% for copying and modification in the file morisawa.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{pLaTeX2e}
-\ProvidesPackage{morisawa}[2003/02/09 okumura]
-\newif\if@fake \@fakefalse
-\DeclareOption{fake}{\@faketrue}
-\ProcessOptions\relax
-\DeclareKanjiFamily{JY1}{rml}{}
-\DeclareKanjiFamily{JT1}{rml}{}
-\if@fake
- \DeclareFontShape{JY1}{rml}{m}{n}{<-> s * [0.961] jis}{}
- \DeclareFontShape{JY1}{rml}{bx}{n}{<-> s * [0.961] jisg}{}
- \DeclareFontShape{JT1}{rml}{m}{n}{<-> s * [0.961] tmin10}{}
- \DeclareFontShape{JT1}{rml}{bx}{n}{<-> s * [0.961] tgoth10}{}
-\else
- \DeclareFontShape{JY1}{rml}{m}{n}{<-> s * [0.961] Ryumin-Light-J}{}
- \DeclareFontShape{JY1}{rml}{bx}{n}{<-> s * [0.961] GothicBBB-Medium-J}{}
- \DeclareFontShape{JT1}{rml}{m}{n}{<-> s * [0.961] Ryumin-Light-V}{}
- \DeclareFontShape{JT1}{rml}{bx}{n}{<-> s * [0.961] GothicBBB-Medium-V}{}
-\fi
-\DeclareKanjiFamily{JY1}{fma}{}
-\DeclareKanjiFamily{JT1}{fma}{}
-\if@fake
- \DeclareFontShape{JY1}{fma}{m}{n}{<-> s * [0.961] jis}{}
- \DeclareFontShape{JY1}{fma}{bx}{n}{<-> s * [0.961] jisg}{}
- \DeclareFontShape{JT1}{fma}{m}{n}{<-> s * [0.961] tmin10}{}
- \DeclareFontShape{JT1}{fma}{bx}{n}{<-> s * [0.961] tgoth10}{}
-\else
- \DeclareFontShape{JY1}{fma}{m}{n}{<-> s * [0.961] FutoMinA101-Bold-J}{}
- \DeclareFontShape{JY1}{fma}{bx}{n}{<-> s * [0.961] GothicBBB-Medium-J}{}
- \DeclareFontShape{JT1}{fma}{m}{n}{<-> s * [0.961] FutoMinA101-Bold-V}{}
- \DeclareFontShape{JT1}{fma}{bx}{n}{<-> s * [0.961] FutoGoB101-Bold-V}{}
-\fi
-\DeclareKanjiFamily{JY1}{gbm}{}
-\DeclareKanjiFamily{JT1}{gbm}{}
-\if@fake
- \DeclareFontShape{JY1}{gbm}{m}{n}{<-> s * [0.961] jisg}{}
- \DeclareFontShape{JY1}{gbm}{bx}{n}{<-> s * [0.961] jisg}{}
- \DeclareFontShape{JT1}{gbm}{m}{n}{<-> s * [0.961] tgoth10}{}
- \DeclareFontShape{JT1}{gbm}{bx}{n}{<-> s * [0.961] tgoth10}{}
-\else
- \DeclareFontShape{JY1}{gbm}{m}{n}{<-> s * [0.961] GothicBBB-Medium-J}{}
- \DeclareFontShape{JY1}{gbm}{bx}{n}{<-> s * [0.961] FutoGoB101-Bold-J}{}
- \DeclareFontShape{JT1}{gbm}{m}{n}{<-> s * [0.961] GothicBBB-Medium-V}{}
- \DeclareFontShape{JT1}{gbm}{bx}{n}{<-> s * [0.961] FutoGoB101-Bold-V}{}
-\fi
-\DeclareKanjiFamily{JY1}{jun}{}
-\DeclareKanjiFamily{JT1}{jun}{}
-\if@fake
- \DeclareFontShape{JY1}{jun}{m}{n}{<-> s * [0.961] jisg}{}
- \DeclareFontShape{JY1}{jun}{bx}{n}{<->ssub*jun/m/n}{}
- \DeclareFontShape{JT1}{jun}{m}{n}{<-> s * [0.961] tgoth10}{}
- \DeclareFontShape{JT1}{jun}{bx}{n}{<->ssub*jun/m/n}{}
-\else
- \DeclareFontShape{JY1}{jun}{m}{n}{<-> s * [0.961] Jun101-Light-J}{}
- \DeclareFontShape{JY1}{jun}{bx}{n}{<->ssub*jun/m/n}{}
- \DeclareFontShape{JT1}{jun}{m}{n}{<-> s * [0.961] Jun101-Light-V}{}
- \DeclareFontShape{JT1}{jun}{bx}{n}{<->ssub*jun/m/n}{}
-\fi
-\renewcommand{\mcdefault}{rml}
-\renewcommand{\gtdefault}{gbm}
-\DeclareRobustCommand\sffamily{%
- \not@math@alphabet\sffamily\mathsf
- \romanfamily\sfdefault
- \kanjifamily\gtdefault
- \selectfont}
-\newcommand{\mgdefault}{jun}
-\DeclareRobustCommand\mgfamily{%
- \not@math@alphabet\mgfamily\textmg
- \kanjifamily\mgdefault
- \selectfont}
-\DeclareRobustCommand\ttfamily{%
- \not@math@alphabet\ttfamily\mathtt
- \romanfamily\ttdefault
- \kanjifamily\mgdefault
- \selectfont}
-\def\textmg#1{\relax\ifmmode\hbox\fi{\mgfamily #1}}
-\normalfont\normalsize
-\setbox0\hbox{\char\euc"A1A1}%
-\setlength\Cht{\ht0}
-\setlength\Cdp{\dp0}
-\setlength\Cwd{\wd0}
-\setlength\Cvs{\baselineskip}
-\setlength\Chs{\wd0}
-\setlength\parindent{1\Cwd}
-\endinput
-%%
-%% End of file `morisawa.sty'.