summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-03-09 22:46:10 +0000
committerKarl Berry <karl@freefriends.org>2018-03-09 22:46:10 +0000
commit1363382ab40cad5afc0990b51f99f03141b6d4f3 (patch)
treee5e1f8190eeb888f8f7247f1e1516443ff3ca978 /Master/texmf-dist/tex
parent8f6a85906eed05ad9e0bf213a1232b24ab5f5d71 (diff)
platex (9mar18)
git-svn-id: svn://tug.org/texlive/trunk@46902 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/platex/base/ascmac.sty25
-rw-r--r--Master/texmf-dist/tex/platex/base/exppl2e.sty176
-rw-r--r--Master/texmf-dist/tex/platex/base/jarticle.cls5
-rw-r--r--Master/texmf-dist/tex/platex/base/jarticle.sty2
-rw-r--r--Master/texmf-dist/tex/platex/base/jbk10.clo4
-rw-r--r--Master/texmf-dist/tex/platex/base/jbk11.clo4
-rw-r--r--Master/texmf-dist/tex/platex/base/jbk12.clo4
-rw-r--r--Master/texmf-dist/tex/platex/base/jbook.cls5
-rw-r--r--Master/texmf-dist/tex/platex/base/jbook.sty2
-rw-r--r--Master/texmf-dist/tex/platex/base/jltxdoc.cls2
-rw-r--r--Master/texmf-dist/tex/platex/base/jreport.cls5
-rw-r--r--Master/texmf-dist/tex/platex/base/jreport.sty2
-rw-r--r--Master/texmf-dist/tex/platex/base/jsize10.clo4
-rw-r--r--Master/texmf-dist/tex/platex/base/jsize11.clo4
-rw-r--r--Master/texmf-dist/tex/platex/base/jsize12.clo4
-rw-r--r--Master/texmf-dist/tex/platex/base/jt1gt.fd4
-rw-r--r--Master/texmf-dist/tex/platex/base/jt1mc.fd4
-rw-r--r--Master/texmf-dist/tex/platex/base/jy1gt.fd4
-rw-r--r--Master/texmf-dist/tex/platex/base/jy1mc.fd4
-rw-r--r--Master/texmf-dist/tex/platex/base/kinsoku.tex2
-rw-r--r--Master/texmf-dist/tex/platex/base/nidanfloat.sty652
-rw-r--r--Master/texmf-dist/tex/platex/base/oldpfont.sty2
-rw-r--r--Master/texmf-dist/tex/platex/base/pfltrace.sty2
-rw-r--r--Master/texmf-dist/tex/platex/base/pl209.def2
-rw-r--r--Master/texmf-dist/tex/platex/base/platex.ltx7
-rw-r--r--Master/texmf-dist/tex/platex/base/platexrelease.sty141
-rw-r--r--Master/texmf-dist/tex/platex/base/plcore.ltx92
-rw-r--r--Master/texmf-dist/tex/platex/base/pldefs.ltx4
-rw-r--r--Master/texmf-dist/tex/platex/base/plext.sty2
-rw-r--r--Master/texmf-dist/tex/platex/base/plnews.cls100
-rw-r--r--Master/texmf-dist/tex/platex/base/ptrace.sty2
-rw-r--r--Master/texmf-dist/tex/platex/base/tarticle.cls5
-rw-r--r--Master/texmf-dist/tex/platex/base/tarticle.sty2
-rw-r--r--Master/texmf-dist/tex/platex/base/tascmac.sty276
-rw-r--r--Master/texmf-dist/tex/platex/base/tbk10.clo4
-rw-r--r--Master/texmf-dist/tex/platex/base/tbk11.clo4
-rw-r--r--Master/texmf-dist/tex/platex/base/tbk12.clo4
-rw-r--r--Master/texmf-dist/tex/platex/base/tbook.cls5
-rw-r--r--Master/texmf-dist/tex/platex/base/tbook.sty2
-rw-r--r--Master/texmf-dist/tex/platex/base/treport.cls5
-rw-r--r--Master/texmf-dist/tex/platex/base/treport.sty2
-rw-r--r--Master/texmf-dist/tex/platex/base/tsize10.clo4
-rw-r--r--Master/texmf-dist/tex/platex/base/tsize11.clo4
-rw-r--r--Master/texmf-dist/tex/platex/base/tsize12.clo4
44 files changed, 556 insertions, 1037 deletions
diff --git a/Master/texmf-dist/tex/platex/base/ascmac.sty b/Master/texmf-dist/tex/platex/base/ascmac.sty
deleted file mode 100644
index f2ab32cc2a6..00000000000
--- a/Master/texmf-dist/tex/platex/base/ascmac.sty
+++ /dev/null
@@ -1,25 +0,0 @@
-%%
-%% This is file `ascmac.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% ascmac.dtx (with options: `ascmac')
-%%
-%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
-%%
-%% This file is part of the pLaTeX2e system (community edition).
-%% -------------------------------------------------------------
-%%
-%% wrapper for tascmac.sty
-%%
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ascmac}
- [2017/12/17 v2.0f
- ascmac wrapper (community edition)
- ]
-\RequirePackage{tascmac}
-\endinput
-%%
-%% End of file `ascmac.sty'.
diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty
index 3365ad72fc3..eaaf3bc6538 100644
--- a/Master/texmf-dist/tex/platex/base/exppl2e.sty
+++ b/Master/texmf-dist/tex/platex/base/exppl2e.sty
@@ -385,9 +385,183 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
+% \subsection{$BD>A0$N(BJFM$BM3Mh%9%Z!<%9$N:o=|!Z%3%_%e%K%F%#HGFH<+![(B}
+% $B8=>u$N(Bp\TeX{}$B!J(B\TeX\ Live 2017$B;~E@!K$G$O!"(B
+% |\inhibitglue|$B%W%j%_%F%#%V$O!V(BJFM$BM3Mh$N%9%Z!<%9!J%0%k!<!&%+!<%s!KA^F~(B
+% $B%k!<%A%s$rM^@)$9$k!WF/$-$r$7$^$9!#$7$+$7!"4{$KA^F~$5$l$F$7$^$C$?(B
+% JFM$B%0%k!<$d%+!<%s$r:o=|$9$k$3$H$O$G$-$^$;$s!#(B
+%
+% \begin{macro}{\removejfmglue}
+% $B$=$3$G!"!V:G8e$N%N!<%I$,(BJFM$B%0%k!<$G$"$C$?>l9g$K$=$l$r:o=|$9$k!W$H$$$&(B
+% $B%f!<%68~$1L?Na$rDj5A$7$^$9!#$3$N5!G=$K$O(Be-p\TeX{} 180226$B0J9_$N(B
+% |\lastnodesubtype|$B%W%j%_%F%#%V$,I,MW$G$9!#(B
+% \changes{v1.2x}{2018/03/01}{JFM$B%0%k!<%N!<%I$r:o=|$9$k%^%/%mDI2C(B}
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2018/03/09}%
+%<platexrelease> {\removejfmglue}{Macro added}%
+%<*plcore|platexrelease>
+% \end{macrocode}
+% \begin{macrocode}
+\ifx\lastnodesubtype\@undefined
+ \let\removejfmglue\@undefined
+\else
+ \def\pltx@gluetype{11}
+ \def\pltx@jfmgluesubtype{21}
+ \protected\def\removejfmglue{%
+ \ifnum\lastnodetype=\pltx@gluetype\relax
+ \ifnum\lastnodesubtype=\pltx@jfmgluesubtype\relax
+ \unskip
+ \fi
+ \fi}
+\fi
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}%
+%<platexrelease> {\removejfmglue}{Macro added}%
+%<platexrelease>\let\removejfmglue\@undefined
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+% \end{macro}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
% \section{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=(B}
%
-% p\LaTeXe{}$B%+!<%M%k(B(2017/07/29)$B$KF3F~$7$?$?$a:o=|!#(B
+% \begin{macro}{\@tabclassz}
+% \LaTeX{}$B%+!<%M%k$O!"%"%i%$%s%a%s%HJ8;z(B|&|$B$N<~0O$KH>3Q6uGr$r=q$$$?$+$I$&$+$K(B
+% $B$+$+$o$i$:M>J,$J%9%Z!<%9$r=PNO$7$J$$$h$&$K!"(B|\ignorespaces|$B$H(B|\unskip|$B$r(B
+% $BH/9T$7$F$$$^$9(B(lttab.dtx)$B!#$7$+$7!"$3$l$@$1$G$O(BJFM$B%0%k!<$,>C$($:$K;D$C$F(B
+% $B$7$^$&$N$G!"(Bp\LaTeX{}$B$G$ODI2C$NBP=h$rF~$l$^$9!#(B
+%
+% $B$^$:!"(B|l|, |c|, |r|$B$N>l9g$G$9!#(B
+% 2017/09/26$B$N=$@5$G$O!V%;%k$NMWAG$r(B|\mbox|$B$KF~$l!"(B
+% $B$=$N:G=i$G(B|\inhibitglue|$B$rH/9T$9$k!W$H$$$&J}?K$G$7$?$,!"(B
+% 2018/03/09$B$N=$@5$G$O!V(B|\removejfmglue|$B%^%/%m$,Dj5A$5$l$F$$$k>l9g$O(B
+% $B:G=i$K(B|\inhibitglue|$B$rH/9T$7!":G8e$K(B|\removejfmglue|$B$rH/9T$9$k!W$H$$$&(B
+% $BJ}?K$K$7$^$9!#$3$&$9$l$P>/!9(B\LaTeX{}$B$H$N8_49@-$,8~>e$7$^$9!#(B
+% \changes{v1.2p}{2017/07/21}{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=$r:o=|(B}
+% \changes{v1.2r}{2017/09/26}{tabular$B4D6-$N1&B7$((B(r)$B$G7S@~$,$:$l$k$h$&$K(B
+% $B$J$C$F$$$?%P%0$r=$@5(B}
+% \changes{v1.2x}{2018/03/01}{\cs{removejfmglue}$B$,$"$l$PMxMQ$9$k$h$&$K$7$?(B}
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2018/03/09}{\@tabclassz}
+%<platexrelease> {Inhibit JFM glue in tabular cells}%
+%<*plcore|platexrelease>
+\ifx\removejfmglue\@undefined
+\def\@tabclassz{%
+ \ifcase\@lastchclass
+ \@acolampacol
+ \or
+ \@ampacol
+ \or
+ \or
+ \or
+ \@addamp
+ \or
+ \@acolampacol
+ \or
+ \@firstampfalse\@acol
+ \fi
+ \edef\@preamble{%
+ \@preamble{%
+ \ifcase\@chnum
+ \hfil\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % c
+ \or
+ \hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % l
+ \or
+ \hfil\hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}% % r
+ \fi}}}
+\else
+\def\@tabclassz{%
+ \ifcase\@lastchclass
+ \@acolampacol
+ \or
+ \@ampacol
+ \or
+ \or
+ \or
+ \@addamp
+ \or
+ \@acolampacol
+ \or
+ \@firstampfalse\@acol
+ \fi
+ \edef\@preamble{%
+ \@preamble{%
+ \ifcase\@chnum
+ \hfil\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue\hfil % c
+ \or
+ \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue\hfil % l
+ \or
+ \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue % r
+ \fi}}}
+\fi
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@classv}
+% $B<!$K!"(B|p|$B$N>l9g$G$9!#(B
+% 2017/07/29$B$N=$@5$G$O(B|\mbox{}\inhibitglue|$B$H(B|\unskip|$B$rDI2C$7$F$$$^$7$?$,!"(B
+% $B0J2<$N$h$&$K(B|p|$B;XDj$N%;%k$N:G=i$G(B|\par|$B$H$7$F(B
+% $B2~CJMn$rH/9T$9$k$H!"0l9T6u$$$F$7$^$&$H$$$&>I>u$,5/$-$F$7$^$$$^$9(B(platex/\#63)$B!#(B
+%\begin{verbatim}
+% \begin{tabular}{p{5cm}}
+% A\\
+% \relax\par
+% A
+% \end{tabular}
+%\end{verbatim}
+% $B$3$3$G$O!"(B2017/07/29$B$N=$@5$+$iJ}?K$r2~$a!"(B|\everypar|$BFb$K(B|\inhibitglue|$B$r(B
+% $B;E9~$`$H$$$&J}?K$GBP1~$7$^$9!#(B
+% \changes{v1.2p}{2017/07/21}{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=$r:o=|(B}
+% \changes{v1.2x}{2018/03/01}{$B%;%k:G=i$N(B\cs{par}$B$G6u9T$,F~$i$J$$$h$&$K$7$?(B}
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2018/03/09}{\@classv}
+%<platexrelease> {Inhibit JFM glue in tabular cells}%
+%<*plcore|platexrelease>
+\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\pltx@next@inhibitglue\ignorespaces
+\@sharp\unskip\@endpbox}}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2017/07/29}{\@classv}
+%<platexrelease> {Inhibit JFM glue in tabular cells}%
+%<platexrelease>\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces
+%<platexrelease>\@sharp\unskip\@endpbox}}
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\@classv}
+%<platexrelease> {Inhibit JFM glue in tabular cells}%
+%<platexrelease>\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\ignorespaces
+%<platexrelease>\@sharp\@endpbox}}
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\pltx@next@inhibitglue}
+% $B?eJ?%b!<%I$G$"$l$P$=$N$^$^(B|\inhibitglue|$B$rH/9T$7!"$=$l0J30$G$"$l$P(B
+% |\everypar|$BFb$K(B|\inhibitglue|$B$r;E9~$_$^$9!#(B
+% \changes{v1.2x}{2018/03/01}{\cs{everypar}$B$K(B\cs{inhibitglue}$B$r;E9~$`%^%/%mDI2C(B}
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2018/03/09}{\pltx@next@inhibitglue}
+%<platexrelease> {Add \pltx@next@inhibitglue}%
+%<*plcore|platexrelease>
+\protected\def\pltx@next@inhibitglue{%
+ \ifhmode\inhibitglue\else
+ \edef\@tempa{\everypar{\inhibitglue
+ \everypar{\unexpanded\expandafter{\the\everypar}}%
+ \unexpanded\expandafter{\the\everypar}}}%
+ \@tempa\fi}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\pltx@next@inhibitglue}
+%<platexrelease> {Add \pltx@next@inhibitglue}%
+%<platexrelease>\let\pltx@next@inhibitglue\@undefined
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+% \end{macro}
+%
+% % p\LaTeXe{}$B%+!<%M%k(B(2017/07/29)$B$KF3F~$7$?$?$a:o=|!#(B
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
diff --git a/Master/texmf-dist/tex/platex/base/jarticle.cls b/Master/texmf-dist/tex/platex/base/jarticle.cls
index 54dee29d31c..ad7dda0cd24 100644
--- a/Master/texmf-dist/tex/platex/base/jarticle.cls
+++ b/Master/texmf-dist/tex/platex/base/jarticle.cls
@@ -7,7 +7,7 @@
%% jclasses.dtx (with options: `article,yoko')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jarticle}
- [2017/09/19 v1.7g
+ [2018/02/04 v1.7h
Standard pLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -123,6 +123,7 @@
\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final}
\ProcessOptions\relax
\input{jsize1\@ptsize.clo}
+\def\Cjascale{0.962216}
\if@stysize
\setlength\columnsep{2\Cwd}
\else
diff --git a/Master/texmf-dist/tex/platex/base/jarticle.sty b/Master/texmf-dist/tex/platex/base/jarticle.sty
index 632cf58b3dd..7b0259aed6d 100644
--- a/Master/texmf-dist/tex/platex/base/jarticle.sty
+++ b/Master/texmf-dist/tex/platex/base/jarticle.sty
@@ -7,7 +7,7 @@
%% pl209.dtx (with options: `style,jarticle')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/platex/base/jbk10.clo b/Master/texmf-dist/tex/platex/base/jbk10.clo
index 6a1a6680d9f..db8f59405f2 100644
--- a/Master/texmf-dist/tex/platex/base/jbk10.clo
+++ b/Master/texmf-dist/tex/platex/base/jbk10.clo
@@ -7,7 +7,7 @@
%% jclasses.dtx (with options: `10pt,bk,yoko')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{jbk10.clo}
- [2017/09/19 v1.7g
+ [2018/02/04 v1.7h
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
diff --git a/Master/texmf-dist/tex/platex/base/jbk11.clo b/Master/texmf-dist/tex/platex/base/jbk11.clo
index 2631554031a..e948cdc37b2 100644
--- a/Master/texmf-dist/tex/platex/base/jbk11.clo
+++ b/Master/texmf-dist/tex/platex/base/jbk11.clo
@@ -7,7 +7,7 @@
%% jclasses.dtx (with options: `11pt,bk,yoko')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{jbk11.clo}
- [2017/09/19 v1.7g
+ [2018/02/04 v1.7h
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
diff --git a/Master/texmf-dist/tex/platex/base/jbk12.clo b/Master/texmf-dist/tex/platex/base/jbk12.clo
index 0921fe9d3c7..c3d78b9d9c6 100644
--- a/Master/texmf-dist/tex/platex/base/jbk12.clo
+++ b/Master/texmf-dist/tex/platex/base/jbk12.clo
@@ -7,7 +7,7 @@
%% jclasses.dtx (with options: `12pt,bk,yoko')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{jbk12.clo}
- [2017/09/19 v1.7g
+ [2018/02/04 v1.7h
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
diff --git a/Master/texmf-dist/tex/platex/base/jbook.cls b/Master/texmf-dist/tex/platex/base/jbook.cls
index b7b5e168996..ae4cef59e17 100644
--- a/Master/texmf-dist/tex/platex/base/jbook.cls
+++ b/Master/texmf-dist/tex/platex/base/jbook.cls
@@ -7,7 +7,7 @@
%% jclasses.dtx (with options: `book,yoko')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jbook}
- [2017/09/19 v1.7g
+ [2018/02/04 v1.7h
Standard pLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -133,6 +133,7 @@
\ExecuteOptions{a4paper,10pt,twoside,onecolumn,final,openright}
\ProcessOptions\relax
\input{jbk1\@ptsize.clo}
+\def\Cjascale{0.962216}
\if@stysize
\setlength\columnsep{2\Cwd}
\else
diff --git a/Master/texmf-dist/tex/platex/base/jbook.sty b/Master/texmf-dist/tex/platex/base/jbook.sty
index 56d6df93ff6..bb46725487f 100644
--- a/Master/texmf-dist/tex/platex/base/jbook.sty
+++ b/Master/texmf-dist/tex/platex/base/jbook.sty
@@ -7,7 +7,7 @@
%% pl209.dtx (with options: `style,jbook')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/platex/base/jltxdoc.cls b/Master/texmf-dist/tex/platex/base/jltxdoc.cls
index 065d313892d..750ba659c65 100644
--- a/Master/texmf-dist/tex/platex/base/jltxdoc.cls
+++ b/Master/texmf-dist/tex/platex/base/jltxdoc.cls
@@ -7,7 +7,7 @@
%% jltxdoc.dtx (with options: `class')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/platex/base/jreport.cls b/Master/texmf-dist/tex/platex/base/jreport.cls
index 74b7cd3a8cb..e6541e5929e 100644
--- a/Master/texmf-dist/tex/platex/base/jreport.cls
+++ b/Master/texmf-dist/tex/platex/base/jreport.cls
@@ -7,7 +7,7 @@
%% jclasses.dtx (with options: `report,yoko')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jreport}
- [2017/09/19 v1.7g
+ [2018/02/04 v1.7h
Standard pLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -131,6 +131,7 @@
\ExecuteOptions{a4paper,10pt,oneside,onecolumn,final,openany}
\ProcessOptions\relax
\input{jsize1\@ptsize.clo}
+\def\Cjascale{0.962216}
\if@stysize
\setlength\columnsep{2\Cwd}
\else
diff --git a/Master/texmf-dist/tex/platex/base/jreport.sty b/Master/texmf-dist/tex/platex/base/jreport.sty
index c898d43150e..6c4502171b0 100644
--- a/Master/texmf-dist/tex/platex/base/jreport.sty
+++ b/Master/texmf-dist/tex/platex/base/jreport.sty
@@ -7,7 +7,7 @@
%% pl209.dtx (with options: `style,jreport')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/platex/base/jsize10.clo b/Master/texmf-dist/tex/platex/base/jsize10.clo
index 803d5f3a9f8..159b590f2e7 100644
--- a/Master/texmf-dist/tex/platex/base/jsize10.clo
+++ b/Master/texmf-dist/tex/platex/base/jsize10.clo
@@ -7,7 +7,7 @@
%% jclasses.dtx (with options: `10pt,yoko')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{jsize10.clo}
- [2017/09/19 v1.7g
+ [2018/02/04 v1.7h
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
diff --git a/Master/texmf-dist/tex/platex/base/jsize11.clo b/Master/texmf-dist/tex/platex/base/jsize11.clo
index f6bda2652a7..b3e8cdb8b43 100644
--- a/Master/texmf-dist/tex/platex/base/jsize11.clo
+++ b/Master/texmf-dist/tex/platex/base/jsize11.clo
@@ -7,7 +7,7 @@
%% jclasses.dtx (with options: `11pt,yoko')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{jsize11.clo}
- [2017/09/19 v1.7g
+ [2018/02/04 v1.7h
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
diff --git a/Master/texmf-dist/tex/platex/base/jsize12.clo b/Master/texmf-dist/tex/platex/base/jsize12.clo
index 5f101a0e017..62cb93d187a 100644
--- a/Master/texmf-dist/tex/platex/base/jsize12.clo
+++ b/Master/texmf-dist/tex/platex/base/jsize12.clo
@@ -7,7 +7,7 @@
%% jclasses.dtx (with options: `12pt,yoko')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{jsize12.clo}
- [2017/09/19 v1.7g
+ [2018/02/04 v1.7h
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
diff --git a/Master/texmf-dist/tex/platex/base/jt1gt.fd b/Master/texmf-dist/tex/platex/base/jt1gt.fd
index 01412ea3af0..29bc547fc04 100644
--- a/Master/texmf-dist/tex/platex/base/jt1gt.fd
+++ b/Master/texmf-dist/tex/platex/base/jt1gt.fd
@@ -7,14 +7,14 @@
%% plfonts.dtx (with options: `JT1gt')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
%%
%% File: plfonts.dtx
\ProvidesFile{jt1gt.fd}
- [1997/01/24 v1.3 KANJI font defines]
+ [2018/02/04 v1.6l KANJI font defines]
\DeclareKanjiFamily{JT1}{gt}{}
\DeclareRelationFont{JT1}{gt}{m}{}{OT1}{cmr}{bx}{}
\DeclareFontShape{JT1}{gt}{m}{n}{<5> <6> <7> <8> <9> <10> sgen*tgoth
diff --git a/Master/texmf-dist/tex/platex/base/jt1mc.fd b/Master/texmf-dist/tex/platex/base/jt1mc.fd
index ebd9ce717ee..3fba2724099 100644
--- a/Master/texmf-dist/tex/platex/base/jt1mc.fd
+++ b/Master/texmf-dist/tex/platex/base/jt1mc.fd
@@ -7,14 +7,14 @@
%% plfonts.dtx (with options: `JT1mc')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
%%
%% File: plfonts.dtx
\ProvidesFile{jt1mc.fd}
- [1997/01/24 v1.3 KANJI font defines]
+ [2018/02/04 v1.6l KANJI font defines]
\DeclareKanjiFamily{JT1}{mc}{}
\DeclareRelationFont{JT1}{mc}{m}{}{OT1}{cmr}{m}{}
\DeclareRelationFont{JT1}{mc}{bx}{}{OT1}{cmr}{bx}{}
diff --git a/Master/texmf-dist/tex/platex/base/jy1gt.fd b/Master/texmf-dist/tex/platex/base/jy1gt.fd
index c2710d9c677..2d6943e5862 100644
--- a/Master/texmf-dist/tex/platex/base/jy1gt.fd
+++ b/Master/texmf-dist/tex/platex/base/jy1gt.fd
@@ -7,14 +7,14 @@
%% plfonts.dtx (with options: `JY1gt')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
%%
%% File: plfonts.dtx
\ProvidesFile{jy1gt.fd}
- [1997/01/24 v1.3 KANJI font defines]
+ [2018/02/04 v1.6l KANJI font defines]
\DeclareKanjiFamily{JY1}{gt}{}
\DeclareRelationFont{JY1}{gt}{m}{}{OT1}{cmr}{bx}{}
\DeclareFontShape{JY1}{gt}{m}{n}{<5> <6> <7> <8> <9> <10> sgen*goth
diff --git a/Master/texmf-dist/tex/platex/base/jy1mc.fd b/Master/texmf-dist/tex/platex/base/jy1mc.fd
index a45f3b5a539..0fd86603a06 100644
--- a/Master/texmf-dist/tex/platex/base/jy1mc.fd
+++ b/Master/texmf-dist/tex/platex/base/jy1mc.fd
@@ -7,14 +7,14 @@
%% plfonts.dtx (with options: `JY1mc')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
%%
%% File: plfonts.dtx
\ProvidesFile{jy1mc.fd}
- [1997/01/24 v1.3 KANJI font defines]
+ [2018/02/04 v1.6l KANJI font defines]
\DeclareKanjiFamily{JY1}{mc}{}
\DeclareRelationFont{JY1}{mc}{m}{}{OT1}{cmr}{m}{}
\DeclareRelationFont{JY1}{mc}{bx}{}{OT1}{cmr}{bx}{}
diff --git a/Master/texmf-dist/tex/platex/base/kinsoku.tex b/Master/texmf-dist/tex/platex/base/kinsoku.tex
index 5d0767aa1f1..c6ef58789c3 100644
--- a/Master/texmf-dist/tex/platex/base/kinsoku.tex
+++ b/Master/texmf-dist/tex/platex/base/kinsoku.tex
@@ -7,7 +7,7 @@
%% kinsoku.dtx (with options: `plcore')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/platex/base/nidanfloat.sty b/Master/texmf-dist/tex/platex/base/nidanfloat.sty
deleted file mode 100644
index f7444b16137..00000000000
--- a/Master/texmf-dist/tex/platex/base/nidanfloat.sty
+++ /dev/null
@@ -1,652 +0,0 @@
-%%
-%% This is file `nidanfloat.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% nidanfloat.dtx (with options: `core')
-%%
-%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
-%%
-%% This file is part of the pLaTeX2e system (community edition).
-%% -------------------------------------------------------------
-%%
-%% File: nidanfloat.dtx
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{nidanfloat}%
- [2017/05/01 v2.8 Put double-floats at top/bottom within twocolumn mode]
-\DeclareOption{balance}{\AtEndDocument{\let\clearpage\balanceclearpage}}
-\DeclareOption{nobalance}{\relax}
-\ExecuteOptions{nobalance}
-\ProcessOptions
-\newcommand\dblbotfraction{0.5}
-\newcount\c@dblbotnumber
-\setcounter{dblbotnumber}{2}
-\newdimen\@dblbotroom
-\newcount\@dblbotnum
-\def\@dblfloatplacement{%
- \global\@dbltopnum\c@dbltopnumber
- \global\@dblbotnum\c@dblbotnumber % added
- \global\@dbltoproom\dbltopfraction\@colht
- \global\@dblbotroom\dblbotfraction\@colht % added
- \@textmin\@colht
- \advance\@textmin-\@dbltoproom
- \advance\@textmin-\@dblbotroom % added
- \@fpmin\dblfloatpagefraction\textheight
- \@fptop\@dblfptop
- \@fpsep\@dblfpsep
- \@fpbot\@dblfpbot
-}
-\gdef\@dblbotlist{}
-\gdef\L@toplist{}
-\gdef\R@toplist{}
-\gdef\L@botlist{}
-\gdef\R@botlist{}
-\def\@dblfloat{%
- \if@twocolumn\let\reserved@a\@dbflt\else\let\reserved@a\@float\fi
- \reserved@a}
-\def\@dbflt#1{\@ifnextchar[{\@xdblfloat{#1}}{\@xdblfloat{#1}[tb]}}
-\def\@xdblfloat#1[#2]{%
- \@xfloat{#1}[#2]\hsize\textwidth\linewidth\textwidth}
-\let\end@dblfloat\end@float
-\def\@addtocurcol{%
- \ifdim\wd\@currbox>\columnwidth
- \@addtodblcol
- \else
- \@insertfalse
- \@setfloattypecounts
- \ifnum\@fpstype=8 % is only `!p'
- \else
- \ifnum\@fpstype=24 % is only `p'
- \else
- \@flsettextmin
- \advance\@textmin\@textfloatsheight
- \@reqcolroom\@pageht
- \ifdim\@textmin>\@reqcolroom \@reqcolroom\@textmin\fi
- \advance\@reqcolroom\ht\@currbox
- \ifdim\@colroom>\@reqcolroom
- \@flsetnum\@colnum
- \ifnum\@colnum>\z@
- \@bitor\@currtype\@deferlist
- \if@test
- \else
- \@bitor\@currtype{\L@botlist\R@botlist}%
- \if@test
- \@addtobot
- \else
- \ifodd\count\@currbox
- \advance\@reqcolroom\intextsep
- \ifdim\@colroom>\@reqcolroom
- \global\advance\@colnum\m@ne
- \global\advance\@textfloatsheight\ht\@currbox
- \global\advance\@textfloatsheight 2\intextsep
- \@cons\@midlist\@currbox
- \if@nobreak
- \nobreak
- \@nobreakfalse
- \everypar{}%
- \else
- \addpenalty \interlinepenalty
- \fi
- \vskip\intextsep
- \box\@currbox
- \penalty\interlinepenalty
- \vskip\intextsep
- \ifnum\outputpenalty<-\@Mii \vskip-\parskip \fi
- \outputpenalty\z@
- \@inserttrue
- \fi
- \fi
- \if@insert\else\@addtotoporbot\fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \if@insert\else\@resethfps\@cons\@deferlist\@currbox\fi
- \fi
-}
-\def\@addtotoporbot{%
- \@getfpsbit \tw@
- \ifodd\@tempcnta
- \@flsetnum\@topnum
- \ifnum\@topnum>\z@
- \@tempswafalse
- \@flcheckspace\@toproom\@toplist\L@toplist\R@toplist
- \if@tempswa
- \@bitor\@currtype{\@midlist\L@botlist\R@botlist}%
- \if@test\else
- \if@firstcolumn
- \@flupdates \@topnum \@toproom \L@toplist
- \else
- \@flupdates \@topnum \@toproom \R@toplist
- \fi
- \@inserttrue
- \fi
- \fi
- \fi
- \fi
- \if@insert\else\@addtobot\fi
-}
-\def\@addtobot{%
- \@getfpsbit 4\relax
- \ifodd\@tempcnta
- \@flsetnum\@botnum
- \ifnum\@botnum>\z@
- \@tempswafalse
- \@flcheckspace\@botroom\@botlist\L@botlist\R@botlist
- \if@tempswa
- \global\maxdepth\z@
- \if@firstcolumn
- \@flupdates \@botnum \@botroom \L@botlist
- \else
- \@flupdates \@botnum \@botroom \R@botlist
- \fi
- \@inserttrue
- \fi
- \fi
- \fi
-}
-\let\org@addtonextcol\@addtonextcol
-\def\@addtonextcol{%
- \ifdim\wd\@currbox>\columnwidth
- \@addtodblcol
- \else
- \org@addtonextcol
- \fi
-}
-\def\@addtodblcol{%
- \begingroup
- \@insertfalse
- \@setfloattypecounts
- \ifnum\@fpstype=8 % is only `!p'
- \else
- \ifnum\@fpstype=24 % is only `p'
- \else
- \@bitor\@currtype{\@dbldeferlist}
- %\@bitor\@currtype{\@deferlist\@dbldeferlist}
- \if@test
- \else
- \@tempswafalse
- \@checkdblspace
- \if@tempswa
- \@addtodbltoporbot
- \fi
- \fi
- \fi
- \fi
- \if@insert\else\@cons\@dbldeferlist\@currbox\fi
- \endgroup
-}
-\def\@addtodbltoporbot{%
- \@getfpsbit \tw@
- \ifodd\@tempcnta
- \@flsetnum\@dbltopnum
- \ifnum\@dbltopnum>\z@
- \@bitor\@currtype{%
- \L@toplist\R@toplist\L@botlist\R@botlist\@dblbotlist}
- \if@test
- \else
- \@tempswafalse
- \@dblflcheckspace \@dbltoproom \@dbltoplist
- \if@tempswa
- \@tempdima-\ht\@currbox
- \advance\@tempdima
- -\ifx\@dbltoplist\@empty \dbltextfloatsep\else\dblfloatsep\fi
- \global\advance\@dbltoproom\@tempdima
- \global\advance\@dbltopnum\m@ne
- \@cons\@dbltoplist\@currbox
- \if@firstcolumn
- \advance\@colroom\@tempdima
- \global\advance\@colroom\maxdepth
- \else
- \@tempdima\textheight
- \@chkdblfloatht\advance\@tempdima-\@floatht
- \L@chkfloatht\advance\@tempdima-\@floatht
- \vbadness=\@M \splittopskip=\topskip \splitmaxdepth=\maxdepth
- \setbox\z@=\vbox{\unvcopy\@leftcolumn}%
- \setbox\@ne=\vsplit\z@ to\@tempdima
- \advance\@colroom-\ht\z@
- \global\advance\@colroom-\dp\z@
- \fi
- \@inserttrue
- \fi
- \fi
- \fi
- \fi
- \if@insert\else\@addtodblbot\fi
-}
-\def\@addtodblbot{%
- \@getfpsbit 4\relax
- \ifodd\@tempcnta
- \@flsetnum\@botnum
- \ifnum\@botnum>\z@
- \@tempswafalse
- \@dblflcheckspace \@dbltoproom \@dbltoplist
- \if@tempswa
- \@tempdima-\ht\@currbox \advance\@tempdima
- -\ifx\@dblbotlist\@empty \dbltextfloatsep\else\dblfloatsep\fi
- \global\advance\@dblbotroom\@tempdima
- \global\advance\@dblbotnum\m@ne
- \@cons\@dblbotlist\@currbox
- \if@firstcolumn
- \advance\@colroom\@tempdima
- \global\advance\@colroom\maxdepth
- \else
- \@tempdima\textheight
- \@chkdblfloatht\advance\@tempdima-\@floatht
- \L@chkfloatht\advance\@tempdima-\@floatht
- \vbadness=\@M \splittopskip=\topskip \splitmaxdepth=\maxdepth
- \setbox\z@=\vbox{\unvcopy\@leftcolumn}%
- \setbox\@ne=\vsplit\z@ to\@tempdima
- \advance\@colroom-\ht\z@
- \global\advance\@colroom-\dp\z@
- \fi
- \@inserttrue
- \fi
- \fi
- \fi
-}
-\global\newdimen\@floatht \@floatht\z@
-\def \@flcheckspace #1#2#3#4{%
- \advance \@reqcolroom
- \if@twocolumn
- \if@firstcolumn
- \ifx #3\@empty \textfloatsep \else \floatsep \fi
- \else
- \ifx #4\@empty \textfloatsep \else \floatsep \fi
- \fi
- \else
- \ifx #2\@empty \textfloatsep \else \floatsep \fi
- \fi
- \ifdim \@colroom>\@reqcolroom
- \ifdim #1>\ht\@currbox
- \@tempswatrue
- \else
- \ifnum \@fpstype<\sixt@@n
- \@tempswatrue
- \fi
- \fi
- \fi
-}
-\def\@dblflcheckspace#1#2{%
- \@tempdima=#1\relax
- \advance\@tempdima
- -\ifx #2\@empty \dbltextfloatsep\else\dblfloatsep\fi
- \ifdim\@tempdima>\ht\@currbox
- \@tempswatrue
- \else
- \ifnum\@fpstype<\sixt@@n
- \advance\@tempdima\@textmin
- \if \@tempdima>\ht\@currbox
- \@tempswatrue
- \fi
- \fi
- \fi
-}
-\def\@checkdblspace{%
- \@tempdima\@pageht\advance\@tempdima\@pagedp
- \@tempdimb\textfraction\@colht
- \ifdim\@tempdima<\@tempdimb \@tempdima\@tempdimb\fi
- \if@firstcolumn\else
- \advance\@tempdima\ht\@leftcolumn
- \advance\@tempdima\dp\@leftcolumn
- \fi
- \L@chkfloatht\advance\@tempdima\@floatht
- \R@chkfloatht\advance\@tempdima\@floatht
- \@chkdblfloatht\advance\@tempdima\tw@\@floatht
- \@tempdimb\ht\@currbox\advance\@tempdimb\dp\@currbox
- \advance\@tempdimb
- \ifdim\@floatht>\z@ \dbltextfloatsep\else\dblfloatsep\fi
- \multiply\@tempdimb\tw@ \advance\@tempdima\@tempdimb
- \ifdim\@tempdima>\tw@\textheight
- \@tempswafalse
- \else
- \@tempswatrue
- \fi
-}
-\def\tmp@comflelt#1{%
- \setbox\@tempboxa
- \vbox{\unvbox\@tempboxa\copy #1\vskip\floatsep}%
-}
-\def\tmp@comdblflelt#1{%
- \setbox\@tempboxa
- \vbox{\unvbox\@tempboxa\copy #1\vskip\dblfloatsep}%
-}
-\def\L@chkfloatht{\@floatht\z@
- \ifx\L@toplist\@empty\else
- \let\@elt\tmp@comflelt\setbox\@tempboxa\vbox{}\L@toplist
- \setbox\@ne\vbox{\boxmaxdepth\maxdepth
- \unvbox\@tempboxa\vskip-\floatsep\topfigrule\vskip\textfloatsep
- }%
- \let\@elt\relax \advance\@floatht\ht\@ne \advance\@floatht\dp\@ne
- \fi
- \ifx\L@botlist\@empty\else
- \let\@elt\tmp@comflelt\setbox\@tempboxa\vbox{}\L@botlist
- \setbox\@ne\vbox{\boxmaxdepth\maxdepth
- \vskip\textfloatsep\botfigrule\unvbox\@tempboxa\vskip-\floatsep
- }%
- \let\@elt\relax \advance\@floatht\ht\@ne \advance\@floatht\dp\@ne
- \fi
- \global\@floatht\@floatht
-}
-\def\R@chkfloatht{\@floatht\z@
- \ifx\R@toplist\@empty\else
- \let\@elt\tmp@comflelt\setbox\@tempboxa\vbox{}\R@toplist
- \setbox\@ne\vbox{\boxmaxdepth\maxdepth
- \unvbox\@tempboxa\vskip-\floatsep\topfigrule\vskip\textfloatsep
- }%
- \let\@elt\relax \advance\@floatht\ht\@ne \advance\@floatht\dp\@ne
- \fi
- \ifx\R@botlist\@empty\else
- \let\@elt\tmp@comflelt\setbox\@tempboxa\vbox{}\R@botlist
- \setbox\@ne\vbox{\boxmaxdepth\maxdepth
- \vskip\textfloatsep\botfigrule\unvbox\@tempboxa\vskip-\floatsep
- }%
- \let\@elt\relax \advance\@floatht\ht\@ne \advance\@floatht\dp\@ne
- \fi
- \global\@floatht\@floatht
-}
-\def\@chkdblfloatht{\@floatht\z@
- \ifx\@dbltoplist\@empty\else
- \let\@elt\tmp@comdblflelt\setbox\@tempboxa\vbox{}\@dbltoplist
- \setbox\@ne\vbox{\boxmaxdepth\maxdepth
- \unvbox\@tempboxa
- \vskip-\dblfloatsep
- \dblfigrule
- \vskip\dbltextfloatsep
- }%
- \let\@elt\relax \advance\@floatht\ht\@ne \advance\@floatht\dp\@ne
- \fi
- \ifx\@dblbotlist\@empty\else
- \let\@elt\tmp@comdblflelt\setbox\@tempboxa\vbox{}\@dblbotlist
- \setbox\@ne\vbox{\boxmaxdepth\maxdepth
- \vskip\dbltextfloatsep
- \dblfigrule
- \unvbox\@tempboxa
- \vskip-\dblfloatsep
- }%
- \let\@elt\relax \advance\@floatht\ht\@ne \advance\@floatht\dp\@ne
- \fi
- \global\@floatht\@floatht
-}
-\global\newdimen\@fixht
-\global\newdimen\@rightfixht
-\def\@combinefloats{%
- %%\boxmaxdepth\maxdepth
- \if@twocolumn
- \if@firstcolumn
- \else
- \@fixht\ht\@leftcolumn \advance\@fixht\dp\@leftcolumn
- \@chkdblfloatht \@tempdima\@floatht
- \L@chkfloatht \advance\@tempdima\@floatht
- \advance\@fixht\@tempdima
- \ifdim\@fixht>\textheight
- \@fixht\textheight
- \advance\@fixht-\@tempdima
- \advance\@fixht\maxdepth
- \vbadness=\@M \splittopskip=\topskip \splitmaxdepth=\maxdepth
- \setbox\z@=\vsplit\@leftcolumn to\@fixht
- \advance\@fixht-\maxdepth
- \@tempdima\baselineskip \advance\@tempdima-\topskip
- \setbox\@outputbox=\vbox{%
- \ifvoid\@leftcolumn
- \else
- \unvbox\@leftcolumn\vskip\@tempdima
- \fi\relax
- \unvbox\@outputbox}% \vss moved from here
- \setbox\@leftcolumn=\vbox to\@fixht{\unvbox\z@\vss}% to here (2017/05/01)
- \fi
- \@fixht\ht\@leftcolumn
- \advance\@fixht\dp\@leftcolumn \advance\@fixht\@floatht
- \@rightfixht\ht\@outputbox \advance\@rightfixht\dp\@outputbox
- \@chkdblfloatht \@tempdima\@floatht
- \R@chkfloatht \advance\@tempdima\@floatht
- \advance\@rightfixht\@tempdima
- \ifdim\@rightfixht>\textheight
- \@rightfixht\textheight
- \advance\@rightfixht-\@tempdima
- \advance\@rightfixht\maxdepth
- \vbadness=\@M \splittopskip=\topskip \splitmaxdepth=\maxdepth
- \setbox\z@=\vsplit\@outputbox to\@rightfixht
- \advance\@rightfixht-\maxdepth
- \unvbox\@outputbox
- \setbox\@outputbox=\vbox to\@rightfixht{\unvbox\z@\vss}%
- \fi
- \@rightfixht\ht\@outputbox
- \advance\@rightfixht\dp\@outputbox \advance\@rightfixht\@floatht
- \ifx\L@toplist\@empty\else\L@cflt\fi
- \ifx\L@botlist\@empty\else\L@cflb\fi
- \ifx\R@toplist\@empty\else\R@cflt\fi
- \ifx\R@botlist\@empty\else\R@cflb\fi
- \fi
- \else
- \ifx\@toplist\@empty\else\@cflt\fi
- \ifx\@botlist\@empty\else\@cflb\fi
- \fi
-}
-\def\L@cflt{%
- \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\L@toplist
- \setbox\@leftcolumn\vbox to\@fixht{\boxmaxdepth\maxdepth
- \unvbox\@tempboxa
- \vskip-\floatsep\topfigrule\vskip\textfloatsep\unvbox\@leftcolumn
- \vss}%
- \let\@elt\relax
- \xdef\@freelist{\@freelist\L@toplist}\global\let\L@toplist\@empty
- \@colht\@fixht
-}
-\def\L@cflb{%
- \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\L@botlist
- \setbox\@leftcolumn\vbox to\@fixht{\boxmaxdepth\maxdepth
- \unvbox\@leftcolumn
- \vskip\textfloatsep\botfigrule\unvbox\@tempboxa\vskip-\floatsep
- \vss}%
- \let\@elt\relax
- \xdef\@freelist{\@freelist\L@botlist}\global\let\L@botlist\@empty
- \@colht\@fixht
-}
-\def\R@cflt{%
- \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\R@toplist
- \setbox\@outputbox\vbox to\@rightfixht{\boxmaxdepth\maxdepth
- \unvbox\@tempboxa
- \vskip-\floatsep\topfigrule\vskip\textfloatsep\unvbox\@outputbox
- \vss}%
- \let\@elt\relax
- \xdef\@freelist{\@freelist\R@toplist}\global\let\R@toplist\@empty
- \@colht\@rightfixht
-}
-\def\R@cflb{%
- \let\@elt\@comflelt\setbox\@tempboxa\vbox{}\R@botlist
- \setbox\@outputbox\vbox to\@rightfixht{\boxmaxdepth\maxdepth
- \unvbox\@outputbox
- \vskip\textfloatsep\botfigrule\unvbox\@tempboxa\vskip-\floatsep
- \vss}%
- \let\@elt\relax
- \xdef\@freelist{\@freelist\R@botlist}\global\let\R@botlist\@empty
- \@colht\@rightfixht
-}
-\def\@combinedblfloats{%
- \ifx\@dbltoplist\@empty
- \else
- \let\@elt\@comdblflelt\setbox\@tempboxa\vbox{}\@dbltoplist
- \setbox\@outputbox\vbox{\boxmaxdepth\maxdepth
- \unvbox\@tempboxa
- \vskip-\dblfloatsep
- \dblfigrule
- \vskip\dbltextfloatsep
- \box\@outputbox}%
- \let\@elt\relax\xdef\@freelist{\@freelist\@dbltoplist}%
- \global\let\@dbltoplist\@empty
- \fi
- \ifx\@dblbotlist\@empty
- \else
- \let\@elt\@comdblflelt\setbox\@tempboxa\vbox{}\@dblbotlist
- \setbox\@outputbox\vbox{\boxmaxdepth\maxdepth
- \box\@outputbox
- \vskip\dbltextfloatsep
- \dblfigrule
- \unvbox\@tempboxa
- \vskip-\dblfloatsep
- }%
- \let\@elt\relax\xdef\@freelist{\@freelist\@dblbotlist}%
- \global\let\@dblbotlist\@empty
- \fi
- \global\setbox\@outputbox\vbox to\textheight{\unvbox\@outputbox}%
-}
-\newif\if@balance \@balancefalse
-\newbox\@combinebox
-\def\@outputdblcol{%
- \if@firstcolumn
- \global\@firstcolumnfalse
- \global\setbox\@leftcolumn\box\@outputbox
- \@colht\textheight
- \@chkdblfloatht\global\advance\@colht-\@floatht
- \else
- \global\@firstcolumntrue
- \if@balance % $B:81&%+%i%`$r6QEy$KJ,3d(B
- \@tempdima\baselineskip
- \advance\@tempdima-\topskip
- % $BO"7k(B
- \setbox\@combinebox=\vbox{%
- \unvbox\@leftcolumn\vskip\@tempdima\unvbox\@outputbox}%
- \@tempdima\ht\@combinebox
- \advance\@tempdima\dp\@combinebox
- \divide\@tempdima\tw@
- % $BJ,3d(B
- \vbadness=\@M \splittopskip=\topskip \splitmaxdepth=\maxdepth
- \setbox\@leftcolumn=\vsplit\@combinebox to\@tempdima
- \setbox\@outputbox=\vtop{\unvbox\@combinebox}
- \setbox\@leftcolumn=\vtop{\unvbox\@leftcolumn}
- \fi
- % $B@07A(B
- \@tempdima\ht\@leftcolumn
- \setbox\@outputbox\vbox to\@tempdima{%
- \hb@xt@\textwidth{%
- \hb@xt@\columnwidth{%
- \vbox to\@tempdima{\box\@leftcolumn\vss}\hss}%
- \hfil
- \vrule width\columnseprule
- \hfil
- \hb@xt@\columnwidth{%
- \vbox to\@tempdima{\box\@outputbox\vss}\hss}%
- }%
- \vss
- }%
- \@combinedblfloats
- \@outputpage
- \begingroup
- \@dblfloatplacement
- \@startdblcolumn
- \@whilesw\if@fcolmade \fi{\@outputpage\@startdblcolumn}%
- \endgroup
- \fi
- \global\@balancefalse
-}
-\def\@startdblcolumn{%
- \global\@colht\textheight
- \@tryfcolumn\@dbldeferlist
- \if@fcolmade
- \else
- \begingroup
- \let\reserved@b\@dbldeferlist
- \global\let\@dbldeferlist\@empty
- \let\@elt\@sdblcolelt
- \reserved@b
- \endgroup
- \fi
- \@chkdblfloatht
- \global\advance\@colht-\@floatht
-}
-\def\@doclearpage{%
- \ifvoid\footins
- \setbox\@tempboxa\vsplit\@cclv to\z@ \unvbox\@tempboxa
- \setbox\@tempboxa\box\@cclv
- \xdef\@deferlist{%
- \L@toplist\R@toplist\L@botlist\R@botlist\@deferlist}%
- \global\let\L@toplist\@empty % changed from \@toplist
- \global\let\R@toplist\@empty % added
- \global\let\L@botlist\@empty % changed from \@botlist
- \global\let\R@botlist\@empty % added
- \global\@colroom\@colht
- \ifx\@currlist\@empty
- \else
- \@latexerr{Float(s) lost}\@ehb
- \global\let\@currlist\@empty
- \fi
- \@makefcolumn\@deferlist
- \@whilesw\if@fcolmade \fi{\@opcol\@makefcolumn\@deferlist}%
- \if@twocolumn
- \if@firstcolumn
- % added \@dblbotlist
- \xdef\@dbldeferlist{\@dbltoplist\@dblbotlist\@dbldeferlist}%
- \global\let\@dbltoplist\@empty
- \global\let\@dblbotlist\@empty % added
- \global\@colht\textheight
- \begingroup
- \@dblfloatplacement
- \@makefcolumn\@dbldeferlist
- \@whilesw\if@fcolmade \fi{\@outputpage
- \@makefcolumn\@dbldeferlist}%
- \endgroup
- \else
- \vbox{}\clearpage
- \fi
- \fi
- \else
- \setbox\@cclv\vbox{\box\@cclv\vfil}%
- \@makecol\@opcol
- \clearpage
- \fi
-}
-\long\def\@topnewpage[#1]{%
- %\@nodocument
- \@next\@currbox\@freelist{}{}%
- \global\setbox\@currbox
- \color@vbox
- \normalcolor
- \vbox{\hsize\textwidth
- \@parboxrestore
- \col@number\@ne
- #1%
- \vskip-\dbltextfloatsep}%
- \color@endbox
- \ifdim\ht\@currbox>\textheight
- \ht\@currbox\textheight
- \fi
- \global\count\@currbox\tw@
- \@tempdima-\ht\@currbox
- \advance\@tempdima-\dbltextfloatsep
- \global\advance\@colht\@tempdima
- \ifx\@dbltoplist\@empty
- \else
- \@latexerr{Float(s) lost}\@ehb
- \let\@dbltoplist\@empty
- \fi
- \@cons\@dbltoplist\@currbox
- \global\@dbltopnum\m@ne
- \global\@dblbotnum\m@ne % added
- \ifdim\@colht<2.5\baselineskip
- \@latex@warning@no@line {Optional argument of \noexpand\twocolumn
- too tall on page \thepage}%
- \@emptycol
- \if@firstcolumn
- \else
- \@emptycol
- \fi
- \else
- \global\vsize\@colht
- \global\@colroom\@colht
- \@floatplacement
- \fi
- %\global\@dbltoproom\maxdimen
- %\global\@dblbotroom\maxdimen
- %\@addtodblcol
-}
-\def\balancenewpage{\par\vfil\global\@balancetrue\penalty-\@M}
-\def\balanceclearpage{\balancenewpage
- \write\m@ne{}\vbox{}\global\@balancetrue\penalty-\@Mi}
-\endinput
-%%
-%% End of file `nidanfloat.sty'.
diff --git a/Master/texmf-dist/tex/platex/base/oldpfont.sty b/Master/texmf-dist/tex/platex/base/oldpfont.sty
index 62959a461ba..268814fa58b 100644
--- a/Master/texmf-dist/tex/platex/base/oldpfont.sty
+++ b/Master/texmf-dist/tex/platex/base/oldpfont.sty
@@ -7,7 +7,7 @@
%% pl209.dtx (with options: `oldfonts')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/platex/base/pfltrace.sty b/Master/texmf-dist/tex/platex/base/pfltrace.sty
index 06459d11a23..a415580d4c8 100644
--- a/Master/texmf-dist/tex/platex/base/pfltrace.sty
+++ b/Master/texmf-dist/tex/platex/base/pfltrace.sty
@@ -7,7 +7,7 @@
%% plcore.dtx (with options: `fltrace,trace')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/platex/base/pl209.def b/Master/texmf-dist/tex/platex/base/pl209.def
index 68376e34600..d80c2cfe120 100644
--- a/Master/texmf-dist/tex/platex/base/pl209.def
+++ b/Master/texmf-dist/tex/platex/base/pl209.def
@@ -7,7 +7,7 @@
%% pl209.dtx (with options: `pl209')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/platex/base/platex.ltx b/Master/texmf-dist/tex/platex/base/platex.ltx
index 37c4e0d7eb4..b36a4958e81 100644
--- a/Master/texmf-dist/tex/platex/base/platex.ltx
+++ b/Master/texmf-dist/tex/platex/base/platex.ltx
@@ -7,7 +7,7 @@
%% platex.dtx (with options: `plcore')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -23,6 +23,11 @@
**************************}
\makeatletter
\input plcore.ltx
+\InputIfFileExists{pldefs.cfg}
+ {\typeout{*************************************^^J%
+ * Local config file pldefs.cfg used^^J%
+ *************************************}}%
+ {\input{pldefs.ltx}}
\the\everyjob
\everyjob\expandafter{%
\the\everyjob
diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty
index 7f81f324a97..9ff963103b1 100644
--- a/Master/texmf-dist/tex/platex/base/platexrelease.sty
+++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty
@@ -9,7 +9,7 @@
%% plfonts.dtx (with options: `platexrelease')
%% plcore.dtx (with options: `platexrelease')
%%
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -18,8 +18,16 @@
\edef\p@known@latexreleaseversion
{2017/04/15}
\edef\platexreleaseversion
- {2017/10/28}
-\def\plIncludeInRelease#1{\kernel@ifnextchar[%
+ {2018/03/09}
+\newif\if@plincludeinrelease
+\@plincludeinreleasefalse
+\def\plIncludeInRelease#1{%
+ \if@plincludeinrelease
+ \PackageError{platexrelease}
+ {mis-matched \string\plIncludeInRelease}{}%
+ \@plincludeinreleasefalse
+ \fi
+ \kernel@ifnextchar[%
{\@plIncludeInRelease{#1}}
{\@plIncludeInRelease{#1}[#1]}}
\def\@plIncludeInRelease#1[#2]{\@plIncludeInRele@se{#2}}
@@ -32,6 +40,7 @@
\expandafter\expandafter\expandafter\@gobble@plIncludeInRelease
\else
\GenericInfo{}{Applying: \the\toks@}%
+ \@plincludeinreleasetrue
\expandafter\let\csname\string#2+\@currname+plIIR\endcsname\@empty
\fi
\else
@@ -39,12 +48,28 @@
\expandafter\@gobble@plIncludeInRelease
\fi
}
-\long\def\@gobble@plIncludeInRelease#1\plEndIncludeInRelease{}
-\let\plEndIncludeInRelease\relax
+\def\plEndIncludeInRelease{%
+ \if@plincludeinrelease
+ \@plincludeinreleasefalse
+ \else
+ \PackageError{platexrelease}
+ {mis-matched \string\plEndIncludeInRelease}{}%
+ \fi}
+\long\def\@gobble@plIncludeInRelease#1\plEndIncludeInRelease{%
+ \@plincludeinreleasefalse
+ \@check@plIncludeInRelease#1\plIncludeInRelease
+ \@check@plIncludeInRelease\@end@check@plIncludeInRelease}
+\long\def\@check@plIncludeInRelease#1\plIncludeInRelease
+ #2#3\@end@check@plIncludeInRelease{%
+ \ifx\@check@plIncludeInRelease#2\else
+ \PackageError{platexrelease}
+ {skipped \string\plIncludeInRelease}{}%
+ \fi}
%% File: platexrelease.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{platexrelease}
- [2018/01/27 v1.0j latexrelease support for pLaTeX Kernel]
+ [2018/01/27 v1.0k latexrelease support for pLaTeX Kernel
+ (including releases up to \platexreleaseversion)]
\RequirePackageWithOptions{latexrelease}
\ifnum\expandafter\@parse@version\latexreleaseversion//00\@nil
>\expandafter\@parse@version\p@known@latexreleaseversion//00\@nil
@@ -522,6 +547,25 @@ of this package available from CTAN}
\def\<{\inhibitglue}
\plEndIncludeInRelease
%% File: plcore.dtx
+\plIncludeInRelease{2018/03/09}%
+ {\removejfmglue}{Macro added}%
+\ifx\lastnodesubtype\@undefined
+ \let\removejfmglue\@undefined
+\else
+ \def\pltx@gluetype{11}
+ \def\pltx@jfmgluesubtype{21}
+ \protected\def\removejfmglue{%
+ \ifnum\lastnodetype=\pltx@gluetype\relax
+ \ifnum\lastnodesubtype=\pltx@jfmgluesubtype\relax
+ \unskip
+ \fi
+ \fi}
+\fi
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}%
+ {\removejfmglue}{Macro added}%
+\let\removejfmglue\@undefined
+\plEndIncludeInRelease
\plIncludeInRelease{2017/10/28}{\@no@lnbk}
{Break before prebreakpenalty}%
\def\@no@lnbk #1[#2]{%
@@ -1126,6 +1170,58 @@ of this package available from CTAN}
\@startfield
\strut}
\plEndIncludeInRelease
+\plIncludeInRelease{2018/03/09}{\@tabclassz}
+ {Inhibit JFM glue in tabular cells}%
+\ifx\removejfmglue\@undefined
+\def\@tabclassz{%
+ \ifcase\@lastchclass
+ \@acolampacol
+ \or
+ \@ampacol
+ \or
+ \or
+ \or
+ \@addamp
+ \or
+ \@acolampacol
+ \or
+ \@firstampfalse\@acol
+ \fi
+ \edef\@preamble{%
+ \@preamble{%
+ \ifcase\@chnum
+ \hfil\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % c
+ \or
+ \hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}\hfil % l
+ \or
+ \hfil\hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}% % r
+ \fi}}}
+\else
+\def\@tabclassz{%
+ \ifcase\@lastchclass
+ \@acolampacol
+ \or
+ \@ampacol
+ \or
+ \or
+ \or
+ \@addamp
+ \or
+ \@acolampacol
+ \or
+ \@firstampfalse\@acol
+ \fi
+ \edef\@preamble{%
+ \@preamble{%
+ \ifcase\@chnum
+ \hfil\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue\hfil % c
+ \or
+ \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue\hfil % l
+ \or
+ \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue % r
+ \fi}}}
+\fi
+\plEndIncludeInRelease
\plIncludeInRelease{2017/09/26}{\@tabclassz}
{Inhibit JFM glue in tabular cells}%
\def\@tabclassz{%
@@ -1204,6 +1300,11 @@ of this package available from CTAN}
\hfil\hskip1sp\ignorespaces\@sharp\unskip
\fi}}}
\plEndIncludeInRelease
+\plIncludeInRelease{2018/03/09}{\@classv}
+ {Inhibit JFM glue in tabular cells}%
+\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\pltx@next@inhibitglue\ignorespaces
+\@sharp\unskip\@endpbox}}
+\plEndIncludeInRelease
\plIncludeInRelease{2017/07/29}{\@classv}
{Inhibit JFM glue in tabular cells}%
\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces
@@ -1214,6 +1315,19 @@ of this package available from CTAN}
\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\ignorespaces
\@sharp\@endpbox}}
\plEndIncludeInRelease
+\plIncludeInRelease{2018/03/09}{\pltx@next@inhibitglue}
+ {Add \pltx@next@inhibitglue}%
+\protected\def\pltx@next@inhibitglue{%
+ \ifhmode\inhibitglue\else
+ \edef\@tempa{\everypar{\inhibitglue
+ \everypar{\unexpanded\expandafter{\the\everypar}}%
+ \unexpanded\expandafter{\the\everypar}}}%
+ \@tempa\fi}
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}{\pltx@next@inhibitglue}
+ {Add \pltx@next@inhibitglue}%
+\let\pltx@next@inhibitglue\@undefined
+\plEndIncludeInRelease
\plIncludeInRelease{2016/04/17}{\@tabular}
{Remove extra \xkanjiskip}%
\def\@tabular{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol
@@ -1294,6 +1408,21 @@ of this package available from CTAN}
\ifmmode\@@underline{#1}%
\else $\@@underline{\hbox{#1}}\m@th$\relax\fi}
\plEndIncludeInRelease
+\plIncludeInRelease{2018/03/09}%
+ {\e@alloc@chardef}{Extended Allocation (FAM256)}%
+\ifx\omathchar\@undefined
+ \ifx\widowpenalties\@undefined
+ \mathchardef\e@alloc@top=255
+ \let\e@alloc@chardef\chardef
+ \else
+ \mathchardef\e@alloc@top=32767
+ \let\e@alloc@chardef\mathchardef
+ \fi
+\else
+ \omathchardef\e@alloc@top=65535
+ \let\e@alloc@chardef\omathchardef
+\fi
+\plEndIncludeInRelease
\plIncludeInRelease{2016/11/29}%
{\e@alloc@chardef}{Extended Allocation (FAM256)}%
\ifx\omathchar\@undefined
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx
index 000ae2fb325..288406422f2 100644
--- a/Master/texmf-dist/tex/platex/base/plcore.ltx
+++ b/Master/texmf-dist/tex/platex/base/plcore.ltx
@@ -10,7 +10,7 @@
%% plvers.dtx (with options: `plfinal')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -18,10 +18,18 @@
%% File: plvers.dtx
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
- {2017/10/28}
-\def\ppatch@level{4}
+ {2018/03/09}
+\def\ppatch@level{0}
\edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}% save LaTeX banner
-\def\plIncludeInRelease#1{\kernel@ifnextchar[%
+\newif\if@plincludeinrelease
+\@plincludeinreleasefalse
+\def\plIncludeInRelease#1{%
+ \if@plincludeinrelease
+ \PackageError{platexrelease}
+ {mis-matched \string\plIncludeInRelease}{}%
+ \@plincludeinreleasefalse
+ \fi
+ \kernel@ifnextchar[%
{\@plIncludeInRelease{#1}}
{\@plIncludeInRelease{#1}[#1]}}
\def\@plIncludeInRelease#1[#2]{\@plIncludeInRele@se{#2}}
@@ -34,6 +42,7 @@
\expandafter\expandafter\expandafter\@gobble@plIncludeInRelease
\else
\GenericInfo{}{Applying: \the\toks@}%
+ \@plincludeinreleasetrue
\expandafter\let\csname\string#2+\@currname+plIIR\endcsname\@empty
\fi
\else
@@ -41,8 +50,23 @@
\expandafter\@gobble@plIncludeInRelease
\fi
}
-\long\def\@gobble@plIncludeInRelease#1\plEndIncludeInRelease{}
-\let\plEndIncludeInRelease\relax
+\def\plEndIncludeInRelease{%
+ \if@plincludeinrelease
+ \@plincludeinreleasefalse
+ \else
+ \PackageError{platexrelease}
+ {mis-matched \string\plEndIncludeInRelease}{}%
+ \fi}
+\long\def\@gobble@plIncludeInRelease#1\plEndIncludeInRelease{%
+ \@plincludeinreleasefalse
+ \@check@plIncludeInRelease#1\plIncludeInRelease
+ \@check@plIncludeInRelease\@end@check@plIncludeInRelease}
+\long\def\@check@plIncludeInRelease#1\plIncludeInRelease
+ #2#3\@end@check@plIncludeInRelease{%
+ \ifx\@check@plIncludeInRelease#2\else
+ \PackageError{platexrelease}
+ {skipped \string\plIncludeInRelease}{}%
+ \fi}
%% File: plfonts.dtx
\let\k@encoding\@empty
\let\ck@encoding\@empty
@@ -659,11 +683,6 @@
\pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi
{\@firstoftwo}{\@secondoftwo}%
}{\@secondoftwo}}
-\InputIfFileExists{pldefs.cfg}
- {\typeout{*************************************^^J%
- * Local config file pldefs.cfg used^^J%
- *************************************}}%
- {\input{pldefs.ltx}}
%% File: plcore.dtx
\def\NeedsTeXFormat#1{%
\def\reserved@a{#1}%
@@ -693,6 +712,18 @@
\def\documentstyle{%
\makeatletter\input{pl209.def}\makeatother
\documentclass}
+\ifx\lastnodesubtype\@undefined
+ \let\removejfmglue\@undefined
+\else
+ \def\pltx@gluetype{11}
+ \def\pltx@jfmgluesubtype{21}
+ \protected\def\removejfmglue{%
+ \ifnum\lastnodetype=\pltx@gluetype\relax
+ \ifnum\lastnodesubtype=\pltx@jfmgluesubtype\relax
+ \unskip
+ \fi
+ \fi}
+\fi
\def\cleardoublepage{\clearpage\if@twoside
\ifodd\c@page
\iftdir
@@ -1023,6 +1054,7 @@
\newcommand\printglossary{\@input@{\jobname.gls}}
\newcount\hour
\newcount\minute
+\ifx\removejfmglue\@undefined
\def\@tabclassz{%
\ifcase\@lastchclass
\@acolampacol
@@ -1046,8 +1078,39 @@
\or
\hfil\hskip1sp\mbox{\inhibitglue\ignorespaces\@sharp\unskip}% % r
\fi}}}
-\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\mbox{}\inhibitglue\ignorespaces
+\else
+\def\@tabclassz{%
+ \ifcase\@lastchclass
+ \@acolampacol
+ \or
+ \@ampacol
+ \or
+ \or
+ \or
+ \@addamp
+ \or
+ \@acolampacol
+ \or
+ \@firstampfalse\@acol
+ \fi
+ \edef\@preamble{%
+ \@preamble{%
+ \ifcase\@chnum
+ \hfil\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue\hfil % c
+ \or
+ \hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue\hfil % l
+ \or
+ \hfil\hskip1sp\inhibitglue\ignorespaces\@sharp\unskip\removejfmglue % r
+ \fi}}}
+\fi
+\def\@classv{\@addtopreamble{\@startpbox{\@nextchar}\pltx@next@inhibitglue\ignorespaces
\@sharp\unskip\@endpbox}}
+\protected\def\pltx@next@inhibitglue{%
+ \ifhmode\inhibitglue\else
+ \edef\@tempa{\everypar{\inhibitglue
+ \everypar{\unexpanded\expandafter{\the\everypar}}%
+ \unexpanded\expandafter{\the\everypar}}}%
+ \@tempa\fi}
\def\@tabular{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol
\let\@classz\@tabclassz
\let\@classiv\@tabclassiv \let\\\@tabularcr\@tabarray}
@@ -1085,13 +1148,8 @@
\let\e@alloc@chardef\mathchardef
\fi
\else
- \ifx\enablecjktoken\@undefined % pTeX
\omathchardef\e@alloc@top=65535
\let\e@alloc@chardef\omathchardef
- \else % upTeX
- \chardef\e@alloc@top=65535
- \let\e@alloc@chardef\chardef
- \fi
\fi
\ifx\omathchar\@undefined
\chardef\e@mathgroup@top=16 % LaTeX2e kernel standard
diff --git a/Master/texmf-dist/tex/platex/base/pldefs.ltx b/Master/texmf-dist/tex/platex/base/pldefs.ltx
index 147f0190c5a..8e9db2bb726 100644
--- a/Master/texmf-dist/tex/platex/base/pldefs.ltx
+++ b/Master/texmf-dist/tex/platex/base/pldefs.ltx
@@ -7,14 +7,14 @@
%% plfonts.dtx (with options: `pldefs,xpt')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
%%
%% File: plfonts.dtx
\ProvidesFile{pldefs.ltx}
- [2017/11/06 v1.6j pLaTeX Kernel (Default settings)]
+ [2018/02/04 v1.6l pLaTeX Kernel (Default settings)]
\DeclareKanjiEncodingDefaults{}{}
\DeclareErrorKanjiFont{JY1}{mc}{m}{n}{10}
\DeclareYokoKanjiEncoding{JY1}{}{}
diff --git a/Master/texmf-dist/tex/platex/base/plext.sty b/Master/texmf-dist/tex/platex/base/plext.sty
index fc28a40f256..91b85699afd 100644
--- a/Master/texmf-dist/tex/platex/base/plext.sty
+++ b/Master/texmf-dist/tex/platex/base/plext.sty
@@ -7,7 +7,7 @@
%% plext.dtx (with options: `package')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/platex/base/plnews.cls b/Master/texmf-dist/tex/platex/base/plnews.cls
new file mode 100644
index 00000000000..a39b6cbb991
--- /dev/null
+++ b/Master/texmf-dist/tex/platex/base/plnews.cls
@@ -0,0 +1,100 @@
+\NeedsTeXFormat{pLaTeX2e}
+\ProvidesClass{plnews}[1997/02/01 v1.0a Standard pLaTeX class]
+
+\InputIfFileExists{polnews.cfg}%
+ {\ClassInfo{plnews}{Using local configuration file}}%
+ {\ClassInfo{plnews}{No local configuration file}}
+
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{plnews}}
+\ProcessOptions
+\LoadClass[a4j,twocolumn,oneside]{jarticle}
+\RequirePackage{shortvrb}
+\MakeShortVerb{\|}
+\setlength{\footskip}{15mm}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \maketitle parameters.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\title{p\LaTeX~$B%K%e!<%9(B}
+\newcommand{\@titlefont}{\normalfont\Huge}
+
+\newcommand{\publicationmonth}{\renewcommand{\@month}}
+\newcommand{\@month}{\ClassError{ltnews}
+ {No \protect\publicationmonth~given}\@eha}
+
+\newcommand{\publicationyear}{\renewcommand{\@year}}
+\newcommand{\@year}{\ClassError{ltnews}
+ {No \protect\publicationyear~given}\@eha}
+
+\newcommand{\publicationissue}{\renewcommand{\@issue}}
+\newcommand{\@issue}{\ClassError{ltnews}
+ {No \protect\publicationissue~given}\@eha}
+\newcommand{\issuename}{Issue}
+
+\renewcommand{\maketitle}{%
+ \twocolumn[{%
+ \parbox[t][7\baselineskip]{\textwidth}{%
+ \@titlefont\@title\hspace{3mm}%
+ \normalsize $BBh(B{\@issue}$B9f(B\\[\medskipamount]
+ \normalfont{\@year}$BG/(B{\@month}$B7n(B~$BH/9T(B\\
+ $B:n@.<T!'(B\begin{tabular}[t]{l}
+ \@author
+ \end{tabular}%
+ }%
+ }]%
+}
+
+\newcommand{\ps@titlepage}{%
+ \renewcommand{\@oddhead}{\hfill}%
+ \renewcommand{\@evenhead}{\hfill}%
+ \renewcommand{\@oddfoot}{\@title~$BBh(B{\@issue}$B9f(B\hfil\thepage}%
+ \renewcommand{\@evenfoot}{\@title~$BBh(B{\@issue}$B9f(B\hfil\thepage}%
+}
+\pagestyle{titlepage}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Sectioning
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\renewcommand{\section}{%
+ \@startsection{section}{1}{\z@}
+ {1.5\Cvs \@plus.6\Cvs \@minus.2\Cvs}%
+ {.5\Cvs \@plus.3\Cvs}{\reset@font\Large\bfseries}
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Page Layout
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\setlength{\topmargin}{0pt}
+\setlength{\headheight}{0pt}
+\setlength{\headsep}{0pt}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% itemize
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\renewenvironment{itemize}
+ {\ifnum \@itemdepth >3\relax\@toodeep\else
+ \advance\@itemdepth\@ne
+ \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
+ \expandafter
+ \list{\csname \@itemitem\endcsname}{%
+ \iftdir
+ \ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
+ \else\topsep\z@\fi
+ \labelwidth1zw \labelsep.3zw
+ \ifnum \@itemdepth =\@ne \leftmargin1zw\relax
+ \else\leftmargin\leftskip\fi
+ \advance\leftmargin 1zw
+ \fi
+ \parskip\z@ \itemsep\z@ \parsep\z@ % KN 1998/08/10
+ \def\makelabel##1{\hss\llap{##1}}}%
+ \fi}{\endlist}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% misc.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\file#1{\textsf{#1}}
+\def\option#1{\texttt{#1}}
+\xspcode"5C=3 % \
+\xspcode"3C=3 % <
+\xspcode"3E=3 % >
+
+\endinput
diff --git a/Master/texmf-dist/tex/platex/base/ptrace.sty b/Master/texmf-dist/tex/platex/base/ptrace.sty
index 013b7af7976..7f7d3836922 100644
--- a/Master/texmf-dist/tex/platex/base/ptrace.sty
+++ b/Master/texmf-dist/tex/platex/base/ptrace.sty
@@ -7,7 +7,7 @@
%% plfonts.dtx (with options: `trace')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/platex/base/tarticle.cls b/Master/texmf-dist/tex/platex/base/tarticle.cls
index 6593e6798e8..4fa11a3d2c1 100644
--- a/Master/texmf-dist/tex/platex/base/tarticle.cls
+++ b/Master/texmf-dist/tex/platex/base/tarticle.cls
@@ -7,7 +7,7 @@
%% jclasses.dtx (with options: `article,tate')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{tarticle}
- [2017/09/19 v1.7g
+ [2018/02/04 v1.7h
Standard pLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -124,6 +124,7 @@
\ProcessOptions\relax
\input{tsize1\@ptsize.clo}
\RequirePackage{plext}
+\def\Cjascale{0.962216}
\if@stysize
\setlength\columnsep{3\Cwd}
\else
diff --git a/Master/texmf-dist/tex/platex/base/tarticle.sty b/Master/texmf-dist/tex/platex/base/tarticle.sty
index 16792d49e90..60de890cf69 100644
--- a/Master/texmf-dist/tex/platex/base/tarticle.sty
+++ b/Master/texmf-dist/tex/platex/base/tarticle.sty
@@ -7,7 +7,7 @@
%% pl209.dtx (with options: `style,tarticle')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/platex/base/tascmac.sty b/Master/texmf-dist/tex/platex/base/tascmac.sty
deleted file mode 100644
index 207bf51bd72..00000000000
--- a/Master/texmf-dist/tex/platex/base/tascmac.sty
+++ /dev/null
@@ -1,276 +0,0 @@
-%%
-%% This is file `tascmac.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% ascmac.dtx (with options: `tascmac')
-%%
-%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
-%%
-%% This file is part of the pLaTeX2e system (community edition).
-%% -------------------------------------------------------------
-%%
-%% "tascmac" document style option for tate gumi.
-%%
-%% Original version:
-%% Copyright (C) by 1993, ASCII Corporation & Impress Corporation.
-%% (Last update: 2006/07/14)
-%% Modified by Japanese TeX Development Community, since 2016.
-%%
-%% (ChangeLog has moved to the source file ``ascmac.dtx'')
-%%
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tascmac}
- [2017/12/17 v2.0f
- ascmac package (community edition)
- ]
-%%
-%% Originally `ascmac' and `tascmac' can be used only in
-%% pLaTeX, upLaTeX or LuaLaTeX with LuaTeX-ja support.
-%% We (texjporg) started to support other engines, such as
-%% pdfLaTeX, XeLaTeX and LuaLaTeX (even without LuaTeX-ja).
-%%
-\newif\ifascmac@ptex \ascmac@ptextrue
-\ifx\kanjiskip\@undefined
- \@ifpackageloaded{luatexja}{%
- \PackageInfo{tascmac}{%
- Patch from LuaTeX-ja will be applied}%
- }{%
- \PackageInfo{tascmac}{%
- Assuming pdfLaTeX, XeLaTeX or LuaLaTeX}%
- \ascmac@ptexfalse
- }%
-\fi
-\chardef\ascmac@q@catcode=\catcode`\Q\relax
-\ifascmac@ptex
- \catcode`\Q=9\relax
-\else
- \catcode`\Q=14\relax
-\fi
-%%
-%% Use Type1 font for ascgrp (pdfLaTeX, LuaLaTeX)
-\ifascmac@ptex\else
- \ifx\pdfextension\@undefined
- \ifx\pdfmapline\@undefined\else
- % pdfTeX, LuaTeX (<=0.81)
- \pdfmapline{+ascgrp <ascgrp.pfb}
- \pdfmapline{+ascii10 <ascii10.pfb}
- \pdfmapline{+ascii36 <ascii36.pfb}
- \fi
- \else
- % LuaTeX (>=0.85)
- \pdfextension mapline{+ascgrp <ascgrp.pfb}
- \pdfextension mapline{+ascii10 <ascii10.pfb}
- \pdfextension mapline{+ascii36 <ascii36.pfb}
- \fi
-\fi
-%%
-%% ascmac.sty 10/28 '88
-%% ASCII special macros
-Q \ifx\@savetbaselineshift\@undefined \newdimen\@savetbaselineshift \fi
-Q \ifx\@saveybaselineshift\@undefined \newdimen\@saveybaselineshift \fi
-%%
-%% ASCII logo
-\def\@@ASCII#1#2#3{\shortstack{#1 ASCII \\[#3]
- \fontsize{#2}{\z@}\usefont{OT1}{cmss}{m}{n}ASCII CORPORATION}}
-\def\ascii{\@ifundefined{@ascii}{\font\@ascii=ascii10 scaled \magstep4}{}%
- \@@ASCII\@ascii{5pt}{-6pt}}
-\def\Ascii{\@ifundefined{@Ascii}{\font\@Ascii=ascii10 scaled \magstep5}{}%
- \@@ASCII\@Ascii{6pt}{-7pt}}
-\def\ASCII{\@ifundefined{@ASCII}{\font\@ASCII=ascii36}{}%
- \@@ASCII\@ASCII{9pt}{-9pt}}
-%%
-%% boxnote environment
-\font\@ascgrp=ascgrp
-\newbox\scb@x \newbox\scscb@x
-\newdimen\@bw\newbox\@nbox\newbox\@nbody
-\def\boxnote{\par\vspace{.3\baselineskip}%
-Q \@saveybaselineshift\ybaselineshift\ybaselineshift\z@
-Q \@savetbaselineshift\tbaselineshift\tbaselineshift\z@
- \setbox\@nbox=\hbox{\@ascgrp\vrule width1.08pt depth35pt b\hss a\hss b}
- \@whiledim \wd\@nbox<\hsize \do{
- \setbox\@nbox=\hbox{\@ascgrp\unhbox\@nbox \hss a\hss b}}
- \setbox\@nbox=\hbox to\hsize{\@ascgrp\unhbox\@nbox \hss a\hss b%
- \vrule width1.08pt depth35pt}
- \@bw=\wd\@nbox\advance\@bw -40pt
- \begin{lrbox}{\@nbody}\begin{minipage}{\@bw}% (KN:1998/02/27)
-Q \ybaselineshift\@saveybaselineshift \tbaselineshift\@savetbaselineshift
-}%
-\def\endboxnote{\end{minipage}\end{lrbox}%
- \vbox{\parindent=0pt\offinterlineskip\copy\@nbox
- \hbox to\wd\@nbox{\vrule width1.08pt\hfil\box\@nbody\hfil\vrule width1.08pt}
- \hbox to\wd\@nbox{\vrule width1.08pt height15pt\hfil
- \vrule width1.08pt height15pt}\hrule height1.08pt}}
-%%
-%% screen environment
-\newdimen\@scw
-\def\@hobox#1#2#3{\hbox to\@scw{\oval(#3,#3)[#1]\hfil\oval(#3,#3)[#2]%
- \dimen\z@=#3\unitlength\advance\dimen\z@\@wholewidth
- \vrule\@width\z@\@height\z@\@depth.5\dimen\z@}}
-\def\@vrf@#1#2{\vskip#1\leaders\vrule width#2\vfil\vskip#1}
-\def\screen{%
-Q \@saveybaselineshift\ybaselineshift \ybaselineshift\z@
-Q \@savetbaselineshift\tbaselineshift \tbaselineshift\z@
- \@ifnextchar[{\@screen}{\@screen[0]}}
-\def\@screen[#1]{\ifcase#1\def\@r{20}\def\@s{9.8pt}\def\@sx{10pt}\or
- \def\@r{18}\def\@s{8.8pt}\def\@sx{9pt}\or
- \def\@r{16}\def\@s{7.8pt}\def\@sx{8pt}\or
- \def\@r{14}\def\@s{6.8pt}\def\@sx{7pt}\or
- \def\@r{12}\def\@s{5.8pt}\def\@sx{6pt}\or
- \def\@r{10}\def\@s{4.8pt}\def\@sx{5pt}\or
- \def\@r{8}\def\@s{3.8pt}\def\@sx{4pt}\or
- \def\@r{6}\def\@s{2.8pt}\def\@sx{3pt}\else
- \def\@r{4}\def\@s{1.8pt}\def\@sx{2pt}\fi
- \par\vspace{.3\baselineskip}\@scw\linewidth \advance\@scw -\@r pt
- \setbox\scb@x=\hbox to\@scw\bgroup\begin{minipage}{\@scw}% (KN:1998/02/27)
-Q \ybaselineshift\@saveybaselineshift \tbaselineshift\@savetbaselineshift
-}%
-\def\endscreen{\end{minipage}\egroup%
- \setbox\scscb@x=\hbox to\linewidth{\hfil\vbox{\offinterlineskip%
- \thinlines\setlength{\unitlength}{1pt}\hrule\kern\@s%
- \@hobox{tl}{tr}{\@r}\kern-\@sx\box\scb@x\@hobox{bl}{br}{\@r}%
- \kern-.4pt\hrule}\hfil}\dimen0=\ht\scscb@x%
- \dimen2=\@sx\advance\dimen2 .2pt
- \noindent\hbox to\linewidth{\hbox to.2pt{\vbox to\dimen0{\@vrf@{\dimen2}{.4pt}}%
- \hss}\box\scscb@x\hbox to.2pt{\hss\vbox to\dimen0{\@vrf@{\dimen2}{.4pt}}}\hss}}%
-%%
-%% itembox environment
-%% replace \box0 with \@iboxstr; thanks FTEXers (1998/11/27)
-\newdimen\@itemh\newtoks\@iboxpos\newbox\@iboxstr
-\def\@hleader{\leaders\hrule height .8pt\hfil}
-\def\itembox{\@ifnextchar[{\@itembox}{\@itembox[c]}}
-\def\@itembox[#1]#2{%
-Q \@saveybaselineshift\ybaselineshift\ybaselineshift\z@
-Q \@savetbaselineshift\tbaselineshift\tbaselineshift\z@
- \par\vspace{.3\baselineskip}%
- \setbox\@iboxstr=\hbox{%
-Q \ybaselineshift\@saveybaselineshift \tbaselineshift\@savetbaselineshift
- #2}%
- \@itemh\ht\@iboxstr\advance\@itemh\dp\@iboxstr
- \vspace{.5\@itemh}\bgroup\@scw\linewidth
- \advance\@scw-20pt\@iboxpos={#1}%
- \setbox\scb@x=\hbox to\@scw\bgroup\begin{minipage}{\@scw}%
-Q \ybaselineshift\@saveybaselineshift
-Q \tbaselineshift\@savetbaselineshift% (KN:1998/02/27)
- \vspace*{.5\@itemh}}%
-\def\enditembox{\end{minipage}\egroup%
- \setbox\scscb@x=\hbox to\linewidth{\hfil\vbox{\offinterlineskip%
- \thicklines\setlength{\unitlength}{1pt}%
- \hbox to\@scw{\if l\the\@iboxpos\else\@hleader\fi
- \space\vbox to.8pt{\vss\hbox{\box\@iboxstr}\vss}%
- \space\if r\the\@iboxpos\else \@hleader\fi}\kern9.6pt
- \@hobox{tl}{tr}{20}\kern-10pt\box\scb@x\@hobox{bl}{br}{20}%
- \kern-.8pt\hrule height.8pt}\hfil}\dimen0=\ht\scscb@x%
- \noindent\hbox to\linewidth{\hbox to.4pt{\vbox to\dimen0{\@vrf@{10.4pt}{.8pt}}%
- \hss}\box\scscb@x\hbox to.4pt{\hss\vbox to\dimen0{\@vrf@{10.4pt}{.8pt}}}%
- \hss}\egroup}
-%%
-%% \keytop
-\def\keytop{\@ifnextchar[{\@keytop}{\@keytop[d]}}
-\def\@keytop[#1]#2{%
- {\setbox0=\hbox{\shortstack{#2}}%
-Q \ybaselineshift\z@ \tbaselineshift\z@
- \dimen0=\wd0\advance\dimen0 5pt\dimen1=\dp0\advance\dimen1 2.5pt%
- \setbox\scscb@x=\hbox to\dimen0{%
-Q \iftdir\tate\else\yoko\fi
- \@scw\wd0\hfil\vtop{\offinterlineskip
- \thinlines\setlength{\unitlength}{1pt}\hrule\kern2.3pt\@hobox{tl}{tr}5%
- \kern-2.4pt\box0\@hobox{bl}{br}5\kern-.4pt\hrule}\hfil}%
- \dimen0=\dp\scscb@x\advance\dimen0 -.4pt
- \setbox0=\vbox{\hbox{\hbox to.2pt{\vtop to\dimen0{\@vrf@{2.3pt}{.4pt}}\hss}%
- \box\scscb@x\hbox to.2pt{\hss\vtop to\dimen0{\@vrf@{2.3pt}{.4pt}}}}}%
- \if #1c\mbox{}$\vcenter{\box0}$\mbox{}\else
- \if #1t\else\if #1b\boxmaxdepth=0pt\else
- \boxmaxdepth=\dimen1\fi\fi \mbox{}\vbox{\box0}\fi}}
-%%
-%% \yen
-\def\yen{\leavevmode\hbox{%
-Q \iftdir\yoko\fi
- \setbox0=\hbox{Y}Y\kern-.97\wd0\vbox{\hrule height.1ex width.98\wd0
- \kern.33ex\hrule height.1ex width.98\wd0\kern.45ex}}}
-%%
-%% return-key
-\begingroup
-\def\ascmac@definable{\PackageInfo{ascmac}{Command
- \@backslashchar\reserved@a\space already defined, but
- compatible with\MessageBreak ascmac package, overwriting}}
-\def\ascmac@check#1{\ifx#1\@undefined\else\ascmac@parse{#1}\fi}
-\def\ascmac@parse#1{\edef\reserved@a{\expandafter\@gobble\string #1}%
- \edef\ascmac@parse@tmp{\meaning#1 \string\@ascgrp}%
- \expandafter\ascmac@parse@i\ascmac@parse@tmp\@nil}
-\expandafter\def\expandafter\ascmac@parse@i
- \expandafter#\expandafter1\string\@ascgrp#2\@nil{\ifx\relax#2\relax
- \@notdefinable\else\ascmac@definable\fi}
-\ascmac@check{\Return}
-\endgroup
-\def\return{\leavevmode\hbox{%
-Q \iftdir\yoko\fi
- \@ascgrp\char"20}}
-\def\Return{\leavevmode\hbox{%
-Q \iftdir\yoko\fi
- \@ascgrp @}}
-%%
-%% \mask
-\newbox\@bwsp \newbox\@@bwsp\newcount\@bcal
-\def\setdim@#1#2{\@bcal=#2\divide#1\@bcal\multiply#1\@bcal\advance#1 1.001#2}
-\def\mask#1#2{{\setbox\@bwsp=\hbox{#1}%
- \setbox0=\hbox{%
-Q \ybaselineshift\z@\tbaselineshift\z@
- \@ascgrp#2}%
- \dimen0=\wd\@bwsp\dimen1=\ht\@bwsp\advance\dimen1\dp\@bwsp\dimen2=-\dimen1
- \setdim@{\dimen0}{\wd0}\setdim@{\dimen1}{\ht0}%
- \setbox\@@bwsp=\hbox to\dimen0{\leaders
- \vtop to\dimen1{\leaders\box0\vfil}\hfil}%
- \advance\dimen2\dp\@@bwsp\divide\dimen2 2
- \advance\dimen2\dp\@bwsp\boxmaxdepth=\dimen2
- \setbox\@@bwsp=\vbox{\box\@@bwsp}%
- \mbox{}\hbox to\wd\@@bwsp{\hbox to0pt{\box\@@bwsp\hss}\hss\unhbox\@bwsp\hss}}}
-%%
-%% \Maskbox{width}{height}{mask_char}{pos}{rule_wid}{body}
-%% \maskbox{width}{height}{mask_char}{pos}{body}
-\def\@setdim#1#2{\@bcal=#2\divide#1\@bcal\multiply#1\@bcal\advance#1 .001#2}
-\def\Maskbox#1#2#3#4#5#6{{%
- \setbox0=\hbox{%
-Q \ybaselineshift\z@\tbaselineshift\z@
- \@ascgrp#3}%
- \dimen0=#1\@setdim{\dimen0}{\wd0}\dimen1=#2\@setdim{\dimen1}{\ht0}%
- \ifx#4c\skip0=0pt plus1fil\skip1=\skip0\fi
- \ifx#4r\skip0=0pt plus1fil\skip1=0pt\fi
- \ifx#4l\skip1=0pt plus1fil\skip0=0pt\fi
- \leavevmode
- \hbox{\hbox to0pt{\hbox to\dimen0{\leaders\vbox to\dimen1{\leaders
- \box0\vfil}\hfil}\hss}%
- \vrule width#5\vbox to\dimen1{\hrule height#5\vfil
- \dimen3=#5\advance\dimen0-2\dimen3\advance\dimen0 .15pt
- \hbox to\dimen0{\hskip\skip0\relax#6\hskip\skip1}%
- \vfil\hrule height#5}\vrule width#5}}}
-\def\maskbox#1#2#3#4#5{\Maskbox{#1}{#2}{#3}{#4}{0pt}{#5}}
-%%
-%% shadebox environment
-\newdimen\shaderule\shaderule 5pt
-\def\shadebox{\par\vspace{.3\baselineskip}%
-Q \@saveybaselineshift\ybaselineshift\ybaselineshift\z@
-Q \@savetbaselineshift\tbaselineshift\tbaselineshift\z@
- \dimen0\linewidth \advance\dimen0-20pt
- \advance\dimen0-2\fboxrule \advance\dimen0-\shaderule
- \setbox\@tempboxa=\hbox\bgroup\minipage{\dimen0}%
-Q \ybaselineshift\@saveybaselineshift \tbaselineshift\@savetbaselineshift
-}
-\def\endshadebox{\endminipage\egroup\dimen0=10pt
- \setbox\@tempboxa=\hbox{\kern\dimen0\unhbox\@tempboxa\kern\dimen0}%
- \setbox0=\vbox{\hrule \@height \fboxrule
- \hbox{\vrule \@width \fboxrule
- \vbox{\vskip\fboxsep \box\@tempboxa\vskip\fboxsep}%
- \vrule \@width \fboxrule}\hrule \@height \fboxrule}%
- \dimen0=\ht0 \advance\dimen0-\shaderule
- \hbox{\hbox to \shaderule{\copy0\hss}\kern 0pt
- \vrule width\wd0 height0pt depth\shaderule\hskip-\shaderule
- \vrule width\shaderule height\dimen0}}
-%%
-\catcode`\Q=\ascmac@q@catcode\relax
-%%
-\endinput
-%%
-%% End of file `tascmac.sty'.
diff --git a/Master/texmf-dist/tex/platex/base/tbk10.clo b/Master/texmf-dist/tex/platex/base/tbk10.clo
index 63abc5d77ba..90bb23e8cad 100644
--- a/Master/texmf-dist/tex/platex/base/tbk10.clo
+++ b/Master/texmf-dist/tex/platex/base/tbk10.clo
@@ -7,7 +7,7 @@
%% jclasses.dtx (with options: `10pt,bk,tate')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{tbk10.clo}
- [2017/09/19 v1.7g
+ [2018/02/04 v1.7h
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
diff --git a/Master/texmf-dist/tex/platex/base/tbk11.clo b/Master/texmf-dist/tex/platex/base/tbk11.clo
index 5ee9207b0cd..e6acf9c2fb1 100644
--- a/Master/texmf-dist/tex/platex/base/tbk11.clo
+++ b/Master/texmf-dist/tex/platex/base/tbk11.clo
@@ -7,7 +7,7 @@
%% jclasses.dtx (with options: `11pt,bk,tate')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{tbk11.clo}
- [2017/09/19 v1.7g
+ [2018/02/04 v1.7h
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
diff --git a/Master/texmf-dist/tex/platex/base/tbk12.clo b/Master/texmf-dist/tex/platex/base/tbk12.clo
index 4beae15759e..ca99d207471 100644
--- a/Master/texmf-dist/tex/platex/base/tbk12.clo
+++ b/Master/texmf-dist/tex/platex/base/tbk12.clo
@@ -7,7 +7,7 @@
%% jclasses.dtx (with options: `12pt,bk,tate')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{tbk12.clo}
- [2017/09/19 v1.7g
+ [2018/02/04 v1.7h
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
diff --git a/Master/texmf-dist/tex/platex/base/tbook.cls b/Master/texmf-dist/tex/platex/base/tbook.cls
index 97be3c3a64e..a2555dacbbf 100644
--- a/Master/texmf-dist/tex/platex/base/tbook.cls
+++ b/Master/texmf-dist/tex/platex/base/tbook.cls
@@ -7,7 +7,7 @@
%% jclasses.dtx (with options: `book,tate')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{tbook}
- [2017/09/19 v1.7g
+ [2018/02/04 v1.7h
Standard pLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -134,6 +134,7 @@
\ProcessOptions\relax
\input{tbk1\@ptsize.clo}
\RequirePackage{plext}
+\def\Cjascale{0.962216}
\if@stysize
\setlength\columnsep{3\Cwd}
\else
diff --git a/Master/texmf-dist/tex/platex/base/tbook.sty b/Master/texmf-dist/tex/platex/base/tbook.sty
index 32cb5c4d80c..c3c463b5e61 100644
--- a/Master/texmf-dist/tex/platex/base/tbook.sty
+++ b/Master/texmf-dist/tex/platex/base/tbook.sty
@@ -7,7 +7,7 @@
%% pl209.dtx (with options: `style,tbook')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/platex/base/treport.cls b/Master/texmf-dist/tex/platex/base/treport.cls
index a658d82c974..f1d9f0f1a63 100644
--- a/Master/texmf-dist/tex/platex/base/treport.cls
+++ b/Master/texmf-dist/tex/platex/base/treport.cls
@@ -7,7 +7,7 @@
%% jclasses.dtx (with options: `report,tate')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{treport}
- [2017/09/19 v1.7g
+ [2018/02/04 v1.7h
Standard pLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -132,6 +132,7 @@
\ProcessOptions\relax
\input{tsize1\@ptsize.clo}
\RequirePackage{plext}
+\def\Cjascale{0.962216}
\if@stysize
\setlength\columnsep{3\Cwd}
\else
diff --git a/Master/texmf-dist/tex/platex/base/treport.sty b/Master/texmf-dist/tex/platex/base/treport.sty
index 0d4d2c141f8..2496da513f5 100644
--- a/Master/texmf-dist/tex/platex/base/treport.sty
+++ b/Master/texmf-dist/tex/platex/base/treport.sty
@@ -7,7 +7,7 @@
%% pl209.dtx (with options: `style,treport')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/platex/base/tsize10.clo b/Master/texmf-dist/tex/platex/base/tsize10.clo
index 0e9eb115ed0..986f4a10d9d 100644
--- a/Master/texmf-dist/tex/platex/base/tsize10.clo
+++ b/Master/texmf-dist/tex/platex/base/tsize10.clo
@@ -7,7 +7,7 @@
%% jclasses.dtx (with options: `10pt,tate')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{tsize10.clo}
- [2017/09/19 v1.7g
+ [2018/02/04 v1.7h
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
diff --git a/Master/texmf-dist/tex/platex/base/tsize11.clo b/Master/texmf-dist/tex/platex/base/tsize11.clo
index cc790c8e81d..aaea97795be 100644
--- a/Master/texmf-dist/tex/platex/base/tsize11.clo
+++ b/Master/texmf-dist/tex/platex/base/tsize11.clo
@@ -7,7 +7,7 @@
%% jclasses.dtx (with options: `11pt,tate')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{tsize11.clo}
- [2017/09/19 v1.7g
+ [2018/02/04 v1.7h
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
diff --git a/Master/texmf-dist/tex/platex/base/tsize12.clo b/Master/texmf-dist/tex/platex/base/tsize12.clo
index ce85b7e1d18..33d26eea759 100644
--- a/Master/texmf-dist/tex/platex/base/tsize12.clo
+++ b/Master/texmf-dist/tex/platex/base/tsize12.clo
@@ -7,7 +7,7 @@
%% jclasses.dtx (with options: `12pt,tate')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016 Japanese TeX Development Community
+%% Copyright (c) 2016-2018 Japanese TeX Development Community
%%
%% This file is part of the pLaTeX2e system (community edition).
%% -------------------------------------------------------------
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{tsize12.clo}
- [2017/09/19 v1.7g
+ [2018/02/04 v1.7h
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%