summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/platex/jsclasses/kiyou.cls')
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/kiyou.cls46
1 files changed, 25 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
index ba4c2492d8c..eb88d1c12cd 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/kiyou.cls
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{kiyou}
- [2016/10/08 okumura, texjporg]
+ [2016/12/01 okumura, texjporg]
\def\jsc@clsname{kiyou}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
@@ -185,10 +185,13 @@
\jisfontfalse
\newif\if@jsc@uplatex
\@jsc@uplatexfalse
+\newif\if@jsc@autodetect
+\@jsc@autodetectfalse
\DeclareOption{mingoth}{\mingothtrue}
\DeclareOption{winjis}{\winjistrue}
\DeclareOption{jis}{\jisfonttrue}
\DeclareOption{uplatex}{\@jsc@uplatextrue\winjisfalse}
+\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}
\def\jsc@pfx@{\if@jsc@uplatex u\else \fi}
@@ -212,6 +215,11 @@
\setlength\paperwidth {\@tempdima}
\fi
\ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000
+ \if@jsc@autodetect
+ \ClassInfo\jsc@clsname{Autodetected engine: upLaTeX}
+ \@jsc@uplatextrue
+ \g@addto@macro\@classoptionslist{,uplatex}
+ \fi
\if@jsc@uplatex\else
\ClassError\jsc@clsname
{You are running upLaTeX.\MessageBreak
@@ -229,6 +237,10 @@
{\@ehc}
\@jsc@uplatexfalse
\fi
+ \if@jsc@autodetect
+ \ClassInfo\jsc@clsname{Autodetected engine: pLaTeX}
+ \@jsc@uplatexfalse
+ \fi
\fi
\newdimen\stockwidth \newdimen\stockheight
\setlength{\stockwidth}{\paperwidth}
@@ -401,6 +413,9 @@
\empty@sfcnt}
\DeclareErrorFont{OT1}{cmr}{m}{n}{10}
\fi
+\def\jsc@smallskip{\vspace\jsc@smallskipamount}
+\newskip\jsc@smallskipamount
+\jsc@smallskipamount=3\jsc@mpt plus 1\jsc@mpt minus 1\jsc@mpt
\setlength\paperwidth{\inv@mag\paperwidth}%
\setlength\paperheight{\inv@mag\paperheight}%
\setlength\stockwidth{\inv@mag\stockwidth}%
@@ -952,9 +967,9 @@
\mbox{} \\[1zw]
\large
{\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
- \smallskip
+ \jsc@smallskip
\@title
- \smallskip
+ \jsc@smallskip
{\maybeblue\hrule height0\jsc@mpt depth2\jsc@mpt\relax}\par
\vfill
{\small \@author}%
@@ -1227,15 +1242,16 @@
{\if@slide .5\Cvs \@plus.3\Cdp \else \z@ \fi}%
{\normalfont\normalsize\headfont}}
\fi
+\newcommand{\jsParagraphMark}{■}
\if@twocolumn
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{\z@}{\if@slide .4\Cvs \else -1zw\fi}% 改行せず 1zw のアキ
- {\normalfont\normalsize\headfont ■}}
+ {\normalfont\normalsize\headfont\jsParagraphMark}}
\else
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{0.5\Cvs \@plus.5\Cdp \@minus.2\Cdp}%
{\if@slide .5\Cvs \@plus.3\Cdp \else -1zw\fi}% 改行せず 1zw のアキ
- {\normalfont\normalsize\headfont ■}}
+ {\normalfont\normalsize\headfont\jsParagraphMark}}
\fi
\if@twocolumn
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
@@ -1658,8 +1674,8 @@
\def\f@@t{\bgroup\aftergroup\@foot\let\next}
\def\f@t#1{#1\@foot}
\def\@foot{\@finalstrut\strutbox\color@endgroup\egroup
- \ifhmode\null\fi
\ifx\pltx@foot@penalty\@undefined\else
+ \ifhmode\null\fi
\ifnum\pltx@foot@penalty=\z@\else
\penalty\pltx@foot@penalty
\pltx@foot@penalty\z@
@@ -1691,8 +1707,8 @@
\def\@@inhibitglue{%
\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
+ \def\jsc@tempa{#1}%
+ \ifx\jsc@tempa\@empty
\ifnum\the\inhibitxspcode`#2=2\relax
\inhibitglue
\fi
@@ -1702,7 +1718,7 @@
\def\@doendpe{%
\@endpetrue
\def\par{%
- \@restorepar\everypar{\everyparhook}\par\@endpefalse}%
+ \@restorepar\clubpenalty\@clubpenalty\everypar{\everyparhook}\par\@endpefalse}%
\everypar{{\setbox\z@\lastbox}\everypar{\everyparhook}\@endpefalse\everyparhook}}
\def\@item[#1]{%
\if@noparitem
@@ -1800,18 +1816,6 @@
the installation}%
}
\fi
-\let\ltx@ifnextchar\@ifnextchar
-\def\ProvidesFile#1{%
- \begingroup
- \catcode`\ 10 %
- \ifnum \endlinechar<256 %
- \ifnum \endlinechar>\m@ne
- \catcode\endlinechar 10 %
- \fi
- \fi
- \@makeother\/%
- \@makeother\&%
- \ltx@ifnextchar[{\@providesfile{#1}}{\@providesfile{#1}[]}}
\newcommand{\prepartname}{\if@english Part~\else 第\fi}
\newcommand{\postpartname}{\if@english\else 部\fi}
\newcommand{\presectionname}{}% 第