summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/platex/jsclasses
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-12-01 22:43:34 +0000
committerKarl Berry <karl@freefriends.org>2016-12-01 22:43:34 +0000
commitaaba88fcc03c4182dbe29324e1c8207c2e245394 (patch)
treed9b5d2fd9f3c993adfe07d5c9461b282a9688880 /Master/texmf-dist/tex/platex/jsclasses
parente8c4b27b58307596f267f227da50ebaa443d7d42 (diff)
jsclasses (1dec16)
git-svn-id: svn://tug.org/texlive/trunk@42616 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex/jsclasses')
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls57
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jsbook.cls57
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/jspf.cls37
-rw-r--r--Master/texmf-dist/tex/platex/jsclasses/kiyou.cls46
4 files changed, 117 insertions, 80 deletions
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
index 5eb2e2829ac..56ec58297d0 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jsarticle.cls
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsarticle}
- [2016/10/08 okumura, texjporg]
+ [2016/12/01 okumura, texjporg]
\def\jsc@clsname{jsarticle}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
@@ -189,10 +189,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}
@@ -216,6 +219,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
@@ -233,6 +241,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}
@@ -394,6 +406,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}%
@@ -963,9 +978,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}%
@@ -1238,15 +1253,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@}%
@@ -1666,8 +1682,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@
@@ -1699,8 +1715,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
@@ -1710,7 +1726,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
@@ -1808,18 +1824,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}{}% 第
@@ -1872,6 +1876,17 @@
\raggedright
\xkanjiskip=0.1em\relax
\fi
+\@ifpackageloaded{exppl2e}{\jsc@needsp@tchtrue}{\jsc@needsp@tchfalse}
+\ifjsc@needsp@tch\else
+ \expandafter\endinput
+\fi
+\def\@gnewline #1{%
+ \ifvmode
+ \@nolnerr
+ \else
+ \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \hskip \z@
+ \ignorespaces
+ \fi}
\endinput
%%
%% End of file `jsarticle.cls'.
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
index 02b7cd6796b..51f49774990 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jsbook.cls
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jsbook}
- [2016/10/08 okumura, texjporg]
+ [2016/12/01 okumura, texjporg]
\def\jsc@clsname{jsbook}
\newif\ifjsc@needsp@tch
\jsc@needsp@tchfalse
@@ -189,10 +189,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}
@@ -219,6 +222,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
@@ -236,6 +244,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}
@@ -397,6 +409,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}%
@@ -969,9 +984,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}%
@@ -1335,15 +1350,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@}%
@@ -1746,8 +1762,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@
@@ -1779,8 +1795,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
@@ -1790,7 +1806,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
@@ -1888,18 +1904,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{\prechaptername}{\if@english Chapter~\else 第\fi}
@@ -1953,6 +1957,17 @@
\raggedright
\xkanjiskip=0.1em\relax
\fi
+\@ifpackageloaded{exppl2e}{\jsc@needsp@tchtrue}{\jsc@needsp@tchfalse}
+\ifjsc@needsp@tch\else
+ \expandafter\endinput
+\fi
+\def\@gnewline #1{%
+ \ifvmode
+ \@nolnerr
+ \else
+ \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \hskip \z@
+ \ignorespaces
+ \fi}
\endinput
%%
%% End of file `jsbook.cls'.
diff --git a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
index 0373546d5da..84786da1cbe 100644
--- a/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
+++ b/Master/texmf-dist/tex/platex/jsclasses/jspf.cls
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jspf}
- [2016/10/08 okumura, texjporg]
+ [2016/12/01 okumura, texjporg]
\def\jsc@clsname{jspf}
\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}
@@ -390,6 +402,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}%
@@ -1543,8 +1558,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@
@@ -1576,8 +1591,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
@@ -1587,7 +1602,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
@@ -1685,18 +1700,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}{}% 第
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}{}% 第