summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-11-29 23:10:13 +0000
committerKarl Berry <karl@freefriends.org>2016-11-29 23:10:13 +0000
commit50af93dae9406f214b5d201358f644f50ba8a647 (patch)
tree2a391bbfcd2feb0476185a11de68b0ef474e7e72
parent1741a29b754b38b1fc490e01f12b7b32493207f9 (diff)
platex (29nov16)
git-svn-id: svn://tug.org/texlive/trunk@42603 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/platex/base/README.md2
-rw-r--r--Master/texmf-dist/doc/platex/base/exppl2e.pdfbin128621 -> 141275 bytes
-rw-r--r--Master/texmf-dist/doc/platex/base/platex.pdfbin261815 -> 262612 bytes
-rw-r--r--Master/texmf-dist/doc/platex/base/pldoc.pdfbin690414 -> 703332 bytes
-rw-r--r--Master/texmf-dist/source/platex/base/Makefile4
-rw-r--r--Master/texmf-dist/source/platex/base/jclasses.dtx193
-rw-r--r--Master/texmf-dist/source/platex/base/pl209.dtx2
-rw-r--r--Master/texmf-dist/source/platex/base/platex.dtx49
-rw-r--r--Master/texmf-dist/source/platex/base/plcore.dtx114
-rw-r--r--Master/texmf-dist/source/platex/base/plext.dtx72
-rw-r--r--Master/texmf-dist/source/platex/base/plfonts.dtx4
-rw-r--r--Master/texmf-dist/source/platex/base/plnewsc04.tex113
-rw-r--r--Master/texmf-dist/source/platex/base/plnewsc05.tex87
-rw-r--r--Master/texmf-dist/source/platex/base/plvers.dtx34
-rw-r--r--Master/texmf-dist/tex/platex/base/exppl2e.sty58
-rw-r--r--Master/texmf-dist/tex/platex/base/jarticle.cls56
-rw-r--r--Master/texmf-dist/tex/platex/base/jbk10.clo2
-rw-r--r--Master/texmf-dist/tex/platex/base/jbk11.clo2
-rw-r--r--Master/texmf-dist/tex/platex/base/jbk12.clo2
-rw-r--r--Master/texmf-dist/tex/platex/base/jbook.cls58
-rw-r--r--Master/texmf-dist/tex/platex/base/jreport.cls56
-rw-r--r--Master/texmf-dist/tex/platex/base/jsize10.clo2
-rw-r--r--Master/texmf-dist/tex/platex/base/jsize11.clo2
-rw-r--r--Master/texmf-dist/tex/platex/base/jsize12.clo2
-rw-r--r--Master/texmf-dist/tex/platex/base/pfltrace.sty1
-rw-r--r--Master/texmf-dist/tex/platex/base/platex.ltx2
-rw-r--r--Master/texmf-dist/tex/platex/base/platexrelease.sty53
-rw-r--r--Master/texmf-dist/tex/platex/base/plcore.ltx36
-rw-r--r--Master/texmf-dist/tex/platex/base/plext.sty32
-rw-r--r--Master/texmf-dist/tex/platex/base/tarticle.cls56
-rw-r--r--Master/texmf-dist/tex/platex/base/tbk10.clo2
-rw-r--r--Master/texmf-dist/tex/platex/base/tbk11.clo2
-rw-r--r--Master/texmf-dist/tex/platex/base/tbk12.clo2
-rw-r--r--Master/texmf-dist/tex/platex/base/tbook.cls58
-rw-r--r--Master/texmf-dist/tex/platex/base/treport.cls56
-rw-r--r--Master/texmf-dist/tex/platex/base/tsize10.clo2
-rw-r--r--Master/texmf-dist/tex/platex/base/tsize11.clo2
-rw-r--r--Master/texmf-dist/tex/platex/base/tsize12.clo2
38 files changed, 922 insertions, 298 deletions
diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md
index 428827c9b9f..8f950b6d845 100644
--- a/Master/texmf-dist/doc/platex/base/README.md
+++ b/Master/texmf-dist/doc/platex/base/README.md
@@ -65,6 +65,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
## Release Date
-2016-09-08
+2016-11-29
Japanese TeX Development Community
diff --git a/Master/texmf-dist/doc/platex/base/exppl2e.pdf b/Master/texmf-dist/doc/platex/base/exppl2e.pdf
index 7348f6e1844..f301efb6627 100644
--- a/Master/texmf-dist/doc/platex/base/exppl2e.pdf
+++ b/Master/texmf-dist/doc/platex/base/exppl2e.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/platex/base/platex.pdf b/Master/texmf-dist/doc/platex/base/platex.pdf
index b84fec7fe7f..3d42585716a 100644
--- a/Master/texmf-dist/doc/platex/base/platex.pdf
+++ b/Master/texmf-dist/doc/platex/base/platex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/platex/base/pldoc.pdf b/Master/texmf-dist/doc/platex/base/pldoc.pdf
index fbc4e1208b8..4053c3a5b6a 100644
--- a/Master/texmf-dist/doc/platex/base/pldoc.pdf
+++ b/Master/texmf-dist/doc/platex/base/pldoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/platex/base/Makefile b/Master/texmf-dist/source/platex/base/Makefile
index 27df4689f15..e15431380d9 100644
--- a/Master/texmf-dist/source/platex/base/Makefile
+++ b/Master/texmf-dist/source/platex/base/Makefile
@@ -82,11 +82,11 @@ tascmac.sty: $(ASCMAC_SRC)
jltxdoc.cls: jltxdoc.dtx
rm -f jltxdoc.cls pldoc.tex Xins.ins
platex $(KANJI) pldocs.ins
- rm pldoc.tex Xins.ins
+ rm pldocs.log pldoc.tex Xins.ins
platex.dvi: $(INTRODOC_SRC)
platex $(KANJI) platex.dtx
- mendex -f -s gglo.ist -o platex.gls platex.glo
+ mendex -J -f -s gglo.ist -o platex.gls platex.glo
platex $(KANJI) platex.dtx
rm platex.aux platex.log
rm platex.glo platex.gls platex.ilg
diff --git a/Master/texmf-dist/source/platex/base/jclasses.dtx b/Master/texmf-dist/source/platex/base/jclasses.dtx
index 70e7704f561..94281509de7 100644
--- a/Master/texmf-dist/source/platex/base/jclasses.dtx
+++ b/Master/texmf-dist/source/platex/base/jclasses.dtx
@@ -58,6 +58,24 @@
% \cs{section},\cs{subsection},\cs{subsubsection}$B$NA08e6u$-$N?-=LI}$r=$@5!#(B
% ($B$"$j$,$H$&$4$6$$$^$9!"NkLZ$?!w(BMILN$B$5$s(B)}
% \changes{v1.6}{2006/06/27}{$B%U%)%s%H%3%^%s%I$r=$@5!#$"$j$,$H$&!"(Bymt$B$5$s!#(B}
+% \changes{v1.7}{2016/11/12}{$B%I%-%e%a%s%H$KH?$7$F(B\cs{@maketitle}$B$,(B
+% $B6u$K$J$C$F$$$J$+$C$?$N$r=$@5(B}
+% \changes{v1.7}{2016/11/12}{use \cs{@width} (sync with classes.dtx v1.3a)}
+% \changes{v1.7}{2016/11/12}{Replaced all \cs{hbox to} by
+% \cs{hb@xt@} (sync with classes.dtx v1.3a)}
+% \changes{v1.7}{2016/11/12}{Moved \cs{@mkboth} out of heading
+% arg (sync with classes.dtx v1.4c)}
+% \changes{v1.7}{2016/11/12}{\cs{columnsep}$B$H(B\cs{columnseprule}$B$N(B
+% $BJQ99$r8e$m$K0\F0(B(sync with classes.dtx v1.4f)}
+% \changes{v1.7a}{2016/11/16}{Check \texttt{@noskipsec} switch and
+% possibly force horizontal mode (sync with classes.dtx v1.4a)}
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
+% \changes{v1.7a}{2016/11/16}{Added \cs{nobreak} for
+% latex/2343 (sync with ltsect.dtx v1.0z)}
+% \changes{v1.7a}{2016/11/16}{Use \cs{expandafter}
+% (sync with ltlists.dtx v1.0j)}
+% \changes{v1.7b}{2016/11/22}{$BJdB-%I%-%e%a%s%H$rDI2C(B}
% \fi
%
% \iffalse
@@ -87,7 +105,7 @@
%<11pt&bk>\ProvidesFile{tbk11.clo}
%<12pt&bk>\ProvidesFile{tbk12.clo}
%</tate>
- [2006/06/27 v1.6
+ [2016/11/22 v1.7b
%<article|report|book> Standard pLaTeX class]
%<10pt|11pt|12pt> Standard pLaTeX file (size option)]
%<*driver>
@@ -551,7 +569,7 @@
% \begin{macro}{\Cwd}
% \begin{macro}{\Cvs}
% \begin{macro}{\Chs}
-% $B4p=`$H$J$kD9$5$N@_Dj$r$7$^$9!#$3$l$i$N%Q%i%a!<%?$O(B\file{platex.dtx}$B$GDj5A(B
+% $B4p=`$H$J$kD9$5$N@_Dj$r$7$^$9!#$3$l$i$N%Q%i%a!<%?$O(B\file{plfonts.dtx}$B$GDj5A(B
% $B$5$l$F$$$^$9!#(B
% \begin{macrocode}
\setbox0\hbox{\char\euc"A1A1}%
@@ -1590,7 +1608,7 @@
%
% \section{$B%Z!<%8%9%?%$%k(B}\label{sec:pagestyle}
% p\LaTeXe{}$B$G$O!"$D$.$N(B6$B<oN`$N%Z!<%8%9%?%$%k$r;HMQ$G$-$^$9!#(B
-% \pstyle{empty}$B$O(B\file{latex.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
+% \pstyle{empty}$B$O(B\file{ltpage.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
%
% \begin{tabular}{ll}
% empty & $B%X%C%@$K$b%U%C%?$K$b=PNO$7$J$$(B\\
@@ -1611,10 +1629,10 @@
%
% \DeleteShortVerb{\|}
% \begin{tabular}{ll}
-% |\@oddhead| & $B4q?t%Z!<%8$N%X%C%@$r=PNO(B\\
-% |\@oddfoot| & $B4q?t%Z!<%8$N%U%C%?$r=PNO(B\\
-% |\@evenhead| & $B6v?t%Z!<%8$N%X%C%@$r=PNO(B\\
-% |\@evenfoot| & $B6v?t%Z!<%8$N%U%C%?$r=PNO(B\\
+% \cs{@oddhead} & $B4q?t%Z!<%8$N%X%C%@$r=PNO(B\\
+% \cs{@oddfoot} & $B4q?t%Z!<%8$N%U%C%?$r=PNO(B\\
+% \cs{@evenhead} & $B6v?t%Z!<%8$N%X%C%@$r=PNO(B\\
+% \cs{@evenfoot} & $B6v?t%Z!<%8$N%U%C%?$r=PNO(B\\
% \end{tabular}
% \MakeShortVerb{\|}
%
@@ -1661,9 +1679,9 @@
% \changes{v1.0a}{1995/08/30}{$BCl$N=qBN$,%N%s%V%k$K1F6A$9$k%P%0$N=$@5(B}
%
% \subsection{plain$B%Z!<%8%9%?%$%k(B}
-% \pstyle{jpl@in}$B$K(B|\let|$B$9$k$?$a$K!"$3$3$GDj5A$r$7$^$9!#(B
%
% \begin{macro}{\ps@plain}
+% \pstyle{jpl@in}$B$K(B|\let|$B$9$k$?$a$K!"$3$3$GDj5A$r$7$^$9!#(B
% \begin{macrocode}
\def\ps@plain{\let\@mkboth\@gobbletwo
\let\ps@jpl@in\ps@plain
@@ -1675,6 +1693,8 @@
% \end{macro}
%
% \subsection{jpl@in$B%Z!<%8%9%?%$%k(B}
+%
+% \begin{macro}{\ps@jpl@in}
% \changes{v1.0d}{1996/02/29}{\pstyle{jpl@in}$B$N=i4|CM$rDj5A(B}
%
% \pstyle{jpl@in}$B%9%?%$%k$O!"%/%i%9%U%!%$%kFbIt$G;HMQ$9$k$b$N$G$9!#(B
@@ -1690,8 +1710,6 @@
% $B=PNO$5$l$^$9!#(B
%
% $B$3$3$G!"Dj5A$r$7$F$$$k$N$O!"$=$N=i4|CM$G$9!#(B
-%
-% \begin{macro}{\ps@jpl@in}
% \begin{macrocode}
\let\ps@jpl@in\ps@plain
% \end{macrocode}
@@ -1901,10 +1919,10 @@
% \subsubsection{$BI=Bj(B}
%
% \begin{macro}{\title}
-% \begin{macro}{\autor}
+% \begin{macro}{\author}
% \begin{macro}{\date}
% $BJ8=q$N%?%$%H%k!"Cx<T!"F|IU$N>pJs$N$?$a$N!"(B
-% $B$3$l$i$N#3$D$N%3%^%s%I$O(B\file{latex.dtx}$B$GDs6!$5$l$F$$$^$9!#(B
+% $B$3$l$i$N#3$D$N%3%^%s%I$O(B\file{ltsect.dtx}$B$GDs6!$5$l$F$$$^$9!#(B
% $B$3$l$i$N%3%^%s%I$O<!$N$h$&$KDj5A$5$l$F$$$^$9!#(B
% \begin{macrocode}
%\newcommand*{\title}[1]{\gdef\@title{#1}}
@@ -2043,11 +2061,11 @@
\else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
%<*tate>
\long\def\@makefntext##1{\parindent 1zw\noindent
- \hbox to 2zw{\hss\@makefnmark}##1}%
+ \hb@xt@ 2zw{\hss\@makefnmark}##1}%
%</tate>
%<*yoko>
\long\def\@makefntext##1{\parindent 1em\noindent
- \hbox to1.8em{\hss$\m@th^{\@thefnmark}$}##1}%
+ \hb@xt@1.8em{\hss$\m@th^{\@thefnmark}$}##1}%
%</yoko>
\if@twocolumn
\ifnum \col@number=\@ne \@maketitle
@@ -2063,11 +2081,14 @@
% $B$3$3$G%0%k!<%W$rJD$8!"(B\Lcount{footnote}$B%+%&%s%?$r%j%;%C%H$7!"(B
% |\thanks|, |\maketitle|, |\@maketitle|$B$rL58z$K$7!"(B
% $B$$$/$D$+$NFbIt%^%/%m$r6u$K$7$F3JG<NN0h$r@aLs$7$^$9!#(B
+% \changes{v1.7}{2016/11/12}{$B%I%-%e%a%s%H$KH?$7$F(B\cs{@maketitle}$B$,(B
+% $B6u$K$J$C$F$$$J$+$C$?$N$r=$@5(B}
% \begin{macrocode}
\endgroup
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
+ \global\let\@maketitle\relax
\global\let\p@thanks\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
@@ -2152,7 +2173,7 @@
% \begin{macro}{\subparagraphmark}
% |\...mark|$B%3%^%s%I$r=i4|2=$7$^$9!#$3$l$i$N%3%^%s%I$O%Z!<%8%9%?%$%k$N(B
% $BDj5A$G;H$o$l$^$9!JBh(B\ref{sec:pagestyle}$B@a;2>H!K!#(B
-% $B$3$l$i$N$?$$$F$$$N%3%^%s%I$O(B\file{latex.dtx}$B$G$9$G$KDj5A$5$l$F$$$^$9!#(B
+% $B$3$l$i$N$?$$$F$$$N%3%^%s%I$O(B\file{ltsect.dtx}$B$G$9$G$KDj5A$5$l$F$$$^$9!#(B
% \begin{macrocode}
%<!article>\newcommand*{\chaptermark}[1]{}
%\newcommand*{\sectionmark}[1]{}
@@ -2299,13 +2320,25 @@
% \begin{macro}{\mainmatter}
% \begin{macro}{\backmatter}
% \changes{v1.1}{1997/01/15}{\cs{frontmatter}, \cs{mainmatter}, \cs{backmatter}
-% $B$r(B\LaTeX\ $B$NDj5A$K=$@5(B}
+% $B$r(B\LaTeX{}$B$NDj5A$K=$@5(B}
% $B0l:}$NK\$OO@M}E*$K#3$D$KJ,3d$5$l$^$9!#(B
% $BI=Bj$dL\<!$d!V$O$8$a$K!W$"$k$$$O8"Mx$J$I$NA0IU$1!"(B
% $B$=$7$FK\J8!"$=$l$+$iMQ8l=8$d:w0z$d1|IU$1$J$I$N8eIU$1$G$9!#(B
+%
+% \emph{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$K$h$kJdB-(B}$B!'(B
+% \LaTeX{}$B$N(Bclasses.dtx$B$O!"(B1996/05/26 (v1.3r)$B$H(B1998/05/05 (v1.3y)$B$N(B
+% $B7W(B2$B2s!"(B|\frontmatter|$B$H(B|\mainmatter|$B$NDj5A$r=$@5$7$F$$$^$9!#0l2sL\$O(B
+% $B$3$l$i$NL?Na$r(B|openany|$B%*%W%7%g%s$K1~$8$F@Z$jBX$(!"Fs2sL\$O$=$l$r(B
+% $B85$KLa$7$F$$$^$9!#%"%9%-!<$K$h$k(Bjclasses.dtx$B$O!"(B1997/01/15$B$K(B
+% $B0l2sL\$N=$@5$KDI?o$7$^$7$?$,!"Fs2sL\$N=$@5$K$ODI?o$7$F$$$^$;$s!#(B
+% $B%3%_%e%K%F%#HG$G$O!"%"%9%-!<$K$h$k;EMM$r0];}$9$k$3$H$H$7!"(B
+% |openany|$B%*%W%7%g%s$N>l9g$O(B|\cleardoublepage|$B$G$O$J$/(B|\clearpage|$B$,(B
+% $BH/9T$5$l$^$9!#$b$7(B|\cleardoublepage|$B$,5/$-$F$[$7$$>l9g$K$O!"(B
+% $BL@<(E*$KA^F~$7$F$/$@$5$$!#!J;29M!'(Blatex/2754$B!K(B
+% \changes{v1.7b}{2016/11/22}{$BJdB-%I%-%e%a%s%H$rDI2C(B}
% \begin{macrocode}
%<*book>
-\newcommand\frontmatter{%
+\newcommand{\frontmatter}{%
\if@openright \cleardoublepage \else \clearpage \fi
\@mainmatterfalse\pagenumbering{roman}}
\newcommand{\mainmatter}{%
@@ -2377,11 +2410,19 @@
%
% article$B%/%i%9$N>l9g$O!"4JC1$G$9!#(B
%
-% $B?7$7$$CJMn$r3+;O$7!">.$5$J6uGr$rF~$l!"CJMn8e$N%$%s%G%s%H$r$7$J$$$h$&$K$7!"(B
-% |\secdef|$B$G:n@.$7$^$9!#(B
+% $B?7$7$$CJMn$r3+;O$7!">.$5$J6uGr$rF~$l!"CJMn8e$N%$%s%G%s%H$r9T$$!"(B
+% |\secdef|$B$G:n@.$7$^$9!#!J%"%9%-!<$K$h$k85$N%I%-%e%a%s%H$K$O(B
+% $B!VCJMn8e$N%$%s%G%s%H$r$7$J$$$h$&$K$7!W$H=q$+$l$F$$$^$7$?$,!"(B
+% $B<B:]$N%3!<%I$G$OCJMn8e$N%$%s%G%s%H$r9T$C$F$$$^$7$?!#$=$3$G(B
+% $BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#$O!"%I%-%e%a%s%H$r%3!<%I$K9g$o$;$F(B
+% $B!VCJMn8e$N%$%s%G%s%H$r9T$$!W$X$H=$@5$7$^$7$?!#!K(B
+% \changes{v1.7a}{2016/11/16}{Check \texttt{@noskipsec} switch and
+% possibly force horizontal mode (sync with classes.dtx v1.4a)}
% \begin{macrocode}
%<*article>
-\newcommand{\part}{\par\addvspace{4ex}%
+\newcommand{\part}{%
+ \if@noskipsec \leavevmode \fi
+ \par\addvspace{4ex}%
\@afterindenttrue
\secdef\@part\@spart}
%</article>
@@ -2411,6 +2452,8 @@
%
% article$B%/%i%9$N>l9g$O!"(B\Lcount{secnumdepth}$B$,(B$-1$$B$h$j$bBg$-$$$H$-!"(B
% $B8+=P$7HV9f$rIU$1$^$9!#$3$N%+%&%s%?$,(B$-1$$B0J2<$N>l9g$K$OIU$1$^$;$s!#(B
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
% \begin{macrocode}
%<*article>
\def\@part[#1]#2{%
@@ -2423,7 +2466,7 @@
\fi
\markboth{}{}%
{\parindent\z@\raggedright
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\ifnum \c@secnumdepth >\m@ne
\Large\bfseries\prepartname\thepart\postpartname
\par\nobreak
@@ -2448,7 +2491,7 @@
\fi
\markboth{}{}%
{\centering
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\ifnum \c@secnumdepth >-2\relax
\huge\bfseries\prepartname\thepart\postpartname
\par\vskip20\p@
@@ -2461,11 +2504,13 @@
%
% \begin{macro}{\@spart}
% $B$3$N%^%/%m$O!"HV9f$rIU$1$J$$$H$-$NBN:[$G$9!#(B
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
% \begin{macrocode}
%<*article>
\def\@spart#1{{%
\parindent\z@\raggedright
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\huge\bfseries#1\par}%
\nobreak\vskip3ex\@afterheading}
%</article>
@@ -2476,7 +2521,7 @@
%<*report|book>
\def\@spart#1{{%
\centering
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\Huge\bfseries#1\par}%
\@endpart}
%</report|book>
@@ -2555,12 +2600,14 @@
% $B8+=P$7J8;zNs$b>C$($F$7$^$&$N$r=$@5(B}
% \changes{v1.2}{2001/09/04}{\cs{chapter}$B$N=PNO0LCV$,%"%9%?%j%9%/7A<0$H(B
% $B$=$&$G$J$$$H$-$H0c$&$N$r=$@5(B($B$"$j$,$H$&!"NkLZ!wDE$5$s(B)}
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
% \begin{macrocode}
\def\@makechapterhead#1{\hbox{}%
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset@font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\ifnum \c@secnumdepth >\m@ne
\setlength\@tempdima{\linewidth}%
@@ -2591,12 +2638,14 @@
% $BHV9f$rIU$1$J$$>l9g$N7A<0$G$9!#(B
% \changes{v1.2}{2001/09/04}{\cs{chapter}$B$N=PNO0LCV$,%"%9%?%j%9%/7A<0$H(B
% $B$=$&$G$J$$$H$-$H0c$&$N$r=$@5(B($B$"$j$,$H$&!"NkLZ!wDE$5$s(B)}
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
% \begin{macrocode}
\def\@makeschapterhead#1{\hbox{}%
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset@font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\setlength\@tempdima{\linewidth}%
\vtop{\hsize\@tempdima#1}}\vskip3\Cvs}
@@ -2608,42 +2657,50 @@
%
% \begin{macro}{\section}
% $B8+=P$7$NA08e$K6uGr$rIU$1!"(B|\Large\bfseries|$B$G=PNO$r$7$^$9!#(B
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
% \begin{macrocode}
\newcommand{\section}{\@startsection{section}{1}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\Large\bfseries}}
+ {\normalfont\Large\bfseries}}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\subsection}
% $B8+=P$7$NA08e$K6uGr$rIU$1!"(B|\large\bfseries|$B$G=PNO$r$7$^$9!#(B
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
% \begin{macrocode}
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\large\bfseries}}
+ {\normalfont\large\bfseries}}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\subsubsection}
% $B8+=P$7$NA08e$K6uGr$rIU$1!"(B|\normalsize\bfseries|$B$G=PNO$r$7$^$9!#(B
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
% \begin{macrocode}
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\paragraph}
% $B8+=P$7$NA0$K6uGr$rIU$1!"(B|\normalsize\bfseries|$B$G=PNO$r$7$^$9!#(B
% $B8+=P$7$N8e$m$G2~9T$5$l$^$;$s!#(B
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
% \begin{macrocode}
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
% \end{macrocode}
% \end{macro}
%
@@ -2651,10 +2708,12 @@
% $B8+=P$7$NA0$K6uGr$rIU$1!"(B|\normalsize\bfseries|$B$G=PNO$r$7$^$9!#(B
% $B8+=P$7$N8e$m$G2~9T$5$l$^$;$s!#(B
% \begin{macrocode}
+% \changes{v1.7a}{2016/11/16}{replace \cs{reset@font} with
+% \cs{normalfont} (sync with classes.dtx v1.3c)}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
% \end{macrocode}
% \end{macro}
%
@@ -2949,13 +3008,15 @@
% \changes{v1.1q}{1999/05/18}{$B=DAH;~$N$_$K@_Dj$9$k$h$&$K$7$?(B}
% $B%H%C%W%l%Y%k$G;H$o$l$?$H$-$K!":G=i$H:G8e$KH>9TJ,$N%9%Z!<%9$r3+$1$k$h$&$K!"(B
% $BJQ99$7$^$9!#$3$N4D6-$O!"(B\file{ltlists.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
+% \changes{v1.7a}{2016/11/16}{Use \cs{expandafter}
+% (sync with ltlists.dtx v1.0j)}
%
% \begin{macrocode}
\renewenvironment{enumerate}
{\ifnum \@enumdepth >\thr@@\@toodeep\else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \list{\csname label\@enumctr\endcsname}{%
+ \expandafter \list \csname label\@enumctr\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -3002,13 +3063,14 @@
% \changes{v1.0e}{1996/03/14}{$B=DAH;~$N$_$K@_Dj$9$k$h$&$K$7$?(B}
% $B%H%C%W%l%Y%k$G;H$o$l$?$H$-$K!":G=i$H:G8e$KH>9TJ,$N%9%Z!<%9$r3+$1$k$h$&$K!"(B
% $BJQ99$7$^$9!#$3$N4D6-$O!"(B\file{ltlists.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
+% \changes{v1.7a}{2016/11/16}{Use \cs{expandafter}
+% (sync with ltlists.dtx v1.0j)}
% \begin{macrocode}
\renewenvironment{itemize}
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list{\csname \@itemitem\endcsname}{%
+ \expandafter \list \csname \@itemitem\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -3279,7 +3341,7 @@
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
% \end{macrocode}
@@ -3581,7 +3643,7 @@
% |\numberline|$B%^%/%m$r:FDj5A$7$^$9!#(B
% \begin{macrocode}
\newdimen\@lnumwidth
-\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
+\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -3590,6 +3652,8 @@
% $BL\<!$N3F9T4V$K(B|\toclineskip|$B$rF~$l$k$h$&$KJQ99$7$^$9!#(B
% $B$3$N%^%/%m$O(B\file{ltsect.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
% \changes{v1.3}{2001/10/04}{$BBh#50z?t$N=qBN$r(B\cs{rmfamily}$B$+$i(B\cs{normalfont}$B$KJQ99(B}
+% \changes{v1.7a}{2016/11/16}{Added \cs{nobreak} for
+% latex/2343 (sync with ltsect.dtx v1.0z)}
% \begin{macrocode}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c@tocdepth \else
@@ -3599,7 +3663,7 @@
\interlinepenalty\@M
\leavevmode
\@lnumwidth #3\relax
- \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
+ \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m@th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
@@ -3640,6 +3704,11 @@
%</report|book>
%<article> \section*{\contentsname
%<!article> \chapter*{\contentsname
+% \end{macrocode}
+% |\tableofcontents|$B$G$O!"(B|\@mkboth|$B$O(Bheading$B$NCf$KF~$l$F$"$j$^$9!#(B
+% $B$[$+$NL?Na!J(B|\listoffigures|$B$J$I!K$K$D$$$F$O!"(B|\@mkboth|$B$O(Bheading$B$N(B
+% $B30$K=P$7$F$"$j$^$9!#$3$l$O(B\LaTeX $B$N(B\file{classes.dtx}$B$K9g$o$;$F$$$^$9!#(B
+% \begin{macrocode}
\@mkboth{\contentsname}{\contentsname}%
}\@starttoc{toc}%
%<report|book> \if@restonecol\twocolumn\fi
@@ -3661,7 +3730,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb@xt@\@pnumwidth{\hss#2}}\par
\nobreak
%<article> \if@compatibility
\global\@nobreaktrue
@@ -3685,7 +3754,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{4zw}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss#2}\par
\penalty\@highpenalty
\endgroup
\fi}
@@ -3706,7 +3775,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{1.5em}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss#2}\par
\endgroup
\fi}
%</article>
@@ -3765,15 +3834,17 @@
%
% \begin{macro}{\listoffigures}
% $B?^$N0lMw$r:n@.$7$^$9!#(B
+% \changes{v1.7}{2016/11/12}{Moved \cs{@mkboth} out of heading
+% arg (sync with classes.dtx v1.4c)}
% \begin{macrocode}
\newcommand{\listoffigures}{%
%<*report|book>
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listfigurename
+ \chapter*{\listfigurename}%
%</report|book>
-%<article> \section*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+%<article> \section*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
%<report|book> \if@restonecol\twocolumn\fi
}
@@ -3791,15 +3862,17 @@
% \begin{macro}{\listoftables}
% \changes{v1.0c}{1995/12/28}{fix the \cs{listoftable} typo.}
% $BI=$N0lMw$r:n@.$7$^$9!#(B
+% \changes{v1.7}{2016/11/12}{Moved \cs{@mkboth} out of heading
+% arg (sync with classes.dtx v1.4c)}
% \begin{macrocode}
\newcommand{\listoftables}{%
%<*report|book>
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listtablename
+ \chapter*{\listtablename}%
%</report|book>
-%<article> \section*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+%<article> \section*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
%<report|book> \if@restonecol\twocolumn\fi
}
@@ -3833,10 +3906,12 @@
%
% \begin{environment}{thebibliography}
% $B;29MJ88%$d4XO"?^=q$N%j%9%H$r:n@.$7$^$9!#(B
+% \changes{v1.7}{2016/11/12}{Moved \cs{@mkboth} out of heading
+% arg (sync with classes.dtx v1.4c)}
% \begin{macrocode}
\newenvironment{thebibliography}[1]
-%<article>{\section*{\refname\@mkboth{\refname}{\refname}}%
-%<report|book>{\chapter*{\bibname\@mkboth{\bibname}{\bibname}}%
+%<article>{\section*{\refname}\@mkboth{\refname}{\refname}%
+%<report|book>{\chapter*{\bibname}\@mkboth{\bibname}{\bibname}%
\list{\@biblabel{\@arabic\c@enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -3877,7 +3952,7 @@
%
% \begin{macro}{\@cite}
% The output of the |\cite| command is produced by this macro. The
-% default from \file{latex.dtx} is used.
+% default from \file{ltbibl.dtx} is used.
% \begin{macrocode}
% \renewcommand*{\@cite}[1]{[#1]}
% \end{macrocode}
@@ -3893,12 +3968,19 @@
% \begin{macrocode}
\newenvironment{theindex}
{\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
%<article> \twocolumn[\section*{\indexname}]%
%<report|book> \twocolumn[\@makeschapterhead{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl@in}\parindent\z@
+% \end{macrocode}
+% $B%Q%i%a!<%?(B|\columnseprule|$B$H(B|\columnsep|$B$NJQ99$O!"(B|\twocolumn|$B$,(B
+% $B<B9T$5$l$?8e$G$J$1$l$P$J$j$^$;$s!#$=$&$7$J$$$H!":w0z$NA0$N%Z!<%8(B
+% $B$K$b1F6A$7$F$7$^$&$?$a$G$9!#(B
+% \changes{v1.7}{2016/11/12}{\cs{columnsep}$B$H(B\cs{columnseprule}$B$N(B
+% $BJQ99$r8e$m$K0\F0(B(sync with classes.dtx v1.4f)}
+% \begin{macrocode}
\parskip\z@ \@plus .3\p@\relax
+ \columnseprule\z@ \columnsep 35\p@
\let\item\@idxitem}
{\if@restonecol\onecolumn\else\clearpage\fi}
% \end{macrocode}
@@ -3929,11 +4011,12 @@
%
% \begin{macro}{\footnoterule}
% $BK\J8$H5SCm$N4V$K0z$+$l$k7S@~$G$9!#(B
+% \changes{v1.7}{2016/11/12}{use \cs{@width} (sync with classes.dtx v1.3a)}
% \begin{macrocode}
\renewcommand{\footnoterule}{%
\kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \hrule\@width.4\columnwidth
+ \kern2.6\p@}
% \end{macrocode}
% \end{macro}
%
@@ -3948,14 +4031,16 @@
% $B$3$N%^%/%m$K$7$?$,$C$F5SCm$,AH$^$l$^$9!#(B
%
% |\@makefnmark|$B$O5SCm5-9f$rAH$_N)$F$k%^%/%m$G$9!#(B
+% \changes{v1.7}{2016/11/12}{Replaced all \cs{hbox to} by
+% \cs{hb@xt@} (sync with classes.dtx v1.3a)}
% \begin{macrocode}
%<*tate>
\newcommand\@makefntext[1]{\parindent 1zw
- \noindent\hbox to 2zw{\hss\@makefnmark}#1}
+ \noindent\hb@xt@ 2zw{\hss\@makefnmark}#1}
%</tate>
%<*yoko>
\newcommand\@makefntext[1]{\parindent 1em
- \noindent\hbox to 1.8em{\hss\@makefnmark}#1}
+ \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1}
%</yoko>
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/source/platex/base/pl209.dtx b/Master/texmf-dist/source/platex/base/pl209.dtx
index a10dee36fe2..104ff0ea6cb 100644
--- a/Master/texmf-dist/source/platex/base/pl209.dtx
+++ b/Master/texmf-dist/source/platex/base/pl209.dtx
@@ -48,7 +48,7 @@
% \begin{center}
% \begin{tabular}{ll}
% pl209 & \file{pl209.def}$B%U%!%$%k$r@8@.(B\\
-% oldfonts & \file{oldpfonts.sty}$B$r@8@.(B\\
+% oldfonts & \file{oldpfont.sty}$B$r@8@.(B\\
% style &
% \begin{tabular}[t]{ll}
% jarticle & \file{jarticle.sty}$B%U%!%$%k$r@8@.(B \\
diff --git a/Master/texmf-dist/source/platex/base/platex.dtx b/Master/texmf-dist/source/platex/base/platex.dtx
index 45ff4ae87b9..f54a366a44d 100644
--- a/Master/texmf-dist/source/platex/base/platex.dtx
+++ b/Master/texmf-dist/source/platex/base/platex.dtx
@@ -42,13 +42,14 @@
% \changes{v1.0l}{2016/06/19}{$B%Q%C%A%l%Y%k$r(B\file{plvers.dtx}$B$+$i<hF@(B}
% \changes{v1.0m}{2016/08/26}{\file{platex.cfg}$B$NFI$_9~$_$r(B
% \file{plcore.ltx}$B$+$i(B\file{platex.ltx}$B$X0\F0(B}
+% \changes{v1.0n}{2016/09/14}{\LaTeX{}$B$N%P%J!<$NJ]B8$7$+$?$r2~NI(B}
% \fi
%
% \iffalse
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{platex.dtx}[2016/08/26 v1.0m pLaTeX document file]
+\ProvidesFile{platex.dtx}[2016/09/14 v1.0n pLaTeX document file]
% \iffalse
\documentclass{jltxdoc}
\usepackage{plext}
@@ -235,11 +236,53 @@
\let\dump\relax
% \end{macrocode}
%
-% \file{latex.ltx}$B$rFI$_9~$_!"5/F0;~$N%P%J!<$rJ]B8$7$^$9!#(B
+% \file{latex.ltx}$B$rFI$_9~$_!"5/F0;~$N%P%J!<$rJ]B8$7$^$9!#(B\TeX\ Live$B$NI8=`E*(B
+% $B%$%s%9%H!<%k$G$O!"$3$NCf$G(BBabel$BM3Mh$N%O%$%U%M!<%7%g%s!&%Q%?!<%s(B
+% \file{hyphen.cfg}$B$,FI$_9~$^$l!"$=$N%P!<%8%g%s$b4^$a$FJ]B8$5$l$k$O$:$G$9!#(B
+%
+%\iffalse
+% 2016/05/07$B$N<BAu$G$O!"(B\file{platex.ltx}$B$N$J$+$G(B
+%\begin{verbatim}
+% \edef\platexBANNER{\the\everyjob}
+%\end{verbatim}
+% $B$H$7$F%P%J!<$rJ]B8$7!"$3$NFbMF$,(B
+%\begin{verbatim}
+% \typeout{LaTeX2e version}\typeout{Babel version}
+%\end{verbatim}
+% $B$H$$$&(B4$B$D$N%H!<%/%s$+$i@.$k$H2>Dj$7$F!"(B\file{plcore.ltx}$B$N$J$+$G(B
+%\begin{verbatim}
+% \def\parse@@BANNER#1#2#3#4{#2}
+%\end{verbatim}
+% $B$N$h$&$K%Q!<%9$7$F$$$^$7$?!#$H$3$m$,!"$3$N!V(B4$B$D$N%H!<%/%s$+$i@.$k!W$H(B
+% $B$$$&2>Dj$O(BBabel$BM3Mh$N(B\file{hyphen.cfg}$B$r;HMQ$7$?>l9g$N$_@.$jN)$A!"(B
+% $B$=$l0J30$NFCJL$J(B\file{hyphen.cfg}$B$d(B\file{hyphen.ltx}$B$r;HMQ$7$?>l9g$K(B
+% $B%(%i!<$K$J$C$F$7$^$$$^$9!#(B
+% $B$=$3$G!"?7$?$K(B2016/09/14$B$N<BAu$G$O!"(B\file{platex.ltx}$B$N$J$+$G(B
+%\begin{verbatim}
+% \edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}
+%\end{verbatim}
+% $B$H$7$F%@%_!<$rDI2C$7$^$9!J(B|\relax|$B$O$?$@$N6h@Z$j%H!<%/%s$NLr3d!K!#(B
+% $B$3$&$9$k$H!"(B|\platexBANNER|$B$NFbMF$O!"(BBabel$B$N(B\file{hyphen.cfg}$B$N$H$-(B
+%\begin{verbatim}
+% \typeout{LaTeX2e version}\typeout{Babel version}\typeout{}\relax
+%\end{verbatim}
+% $B$H$J$j!"$=$l0J30$N$H$-(B
+%\begin{verbatim}
+% \typeout{LaTeX2e version}\typeout{}\relax
+%\end{verbatim}
+% $B$H$J$k$O$:$G$9!#$3$N$h$&$K!">/$J$/$H$b(B|\typeout|$B$,(B2$B2s4^$^$l$F$$$^$9(B
+% $B$N$G!"(B\file{plcore.ltx}$B$N$J$+$G(B
+%\begin{verbatim}
+% \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#1}
+%\end{verbatim}
+% $B$H%Q!<%9$9$k$3$H$,$G$-$k$h$&$K$J$j$^$9!#(B
+%\fi
+%
% \changes{v1.0g}{2016/05/07}{$B%U%)!<%^%C%H:n@.;~$K(B\LaTeX{}$B$N%P%J!<$r0lC6J]B8(B}
+% \changes{v1.0n}{2016/09/14}{\LaTeX{}$B$N%P%J!<$NJ]B8$7$+$?$r2~NI(B}
% \begin{macrocode}
\input latex.ltx
-\edef\platexBANNER{\the\everyjob}% save LaTeX banner
+\edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}% save LaTeX banner
% \end{macrocode}
%
% \file{plcore.ltx}$B$rFI$_9~$_!"$3$N(Bp\LaTeX{}$B$N%P!<%8%g%s$rI=<($7$^$9!#(B
diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx
index be449ca760e..0bb4c60b7d5 100644
--- a/Master/texmf-dist/source/platex/base/plcore.dtx
+++ b/Master/texmf-dist/source/platex/base/plcore.dtx
@@ -53,13 +53,14 @@
% $B$9$k$H$-L58B%k!<%W$,5/$3$kLdBj$KBP=h(B(Issue 21)}
% \changes{v1.2i}{2016/09/08}{v1.2g$B$N=$@5$GF~$l$?(B\cs{null}$B$,$^$:$+$C$?$N$G(B
% $B?eJ?%b!<%I$N$H$-$@$1H/9T$9$k$3$H$K$7$?(B(Issue 23)}
+% \changes{v1.2j}{2016/11/09}{FAM256$B%Q%C%AE,MQ(Be-p\TeX{}$B$KBP1~(B}
% \fi
%
% \iffalse
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{plcore.dtx}[2016/09/01 v1.2h pLaTeX core file]
+\ProvidesFile{plcore.dtx}[2016/11/09 v1.2j pLaTeX core file]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plcore.dtx}
@@ -443,6 +444,9 @@
}\vss}%
\fi
{\setbox \@tempboxa \box \@kludgeins}%
+%<*trace>
+ \fl@trace {kludgeins box made void}%
+%</trace>
}
%</plcore|fltrace>
% \end{macrocode}
@@ -1291,5 +1295,113 @@
% \end{macrocode}
% \end{macro}
%
+%
+% \section{e-p\TeX{}$B$G$N(BFAM256$B%Q%C%A$NMxMQ(B}
+%
+% \begin{macro}{\e@alloc@chardef}
+% \begin{macro}{\e@alloc@top}
+% \LaTeXe\ 2015/01/01$B0J9_!"3HD%%l%8%9%?$,$"$l$PMxMQ$9$k$h$&$K$J$C$F$$$^$9(B
+% $B$N$G!"(Be-p\TeX{}$B$N3HD%%l%8%9%?$rMxMQ$G$-$k$h$&$K@_Dj$7$^$9!#(B
+% \changes{v1.2j}{2016/11/09}{FAM256$B%Q%C%AE,MQ(Be-p\TeX{}$B$KBP1~(B}
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2016/11/29}%
+%<platexrelease> {\e@alloc@chardef}{Extended Allocation (FAM256)}%
+%<*plcore|platexrelease>
+% \end{macrocode}
+% \begin{macrocode}
+\ifx\omathchar\@undefined
+ \ifx\widowpenalties\@undefined
+% \end{macrocode}
+% $B%*%j%8%J%k$N(B\TeX{}$B$N>l9g!J3HD%$J$7$N%"%9%-!<(Bp\TeX{}$B$N>l9g!K!#(B
+% \begin{macrocode}
+ \mathchardef\e@alloc@top=255
+ \let\e@alloc@chardef\chardef
+ \else
+% \end{macrocode}
+% e-\TeX{}$B3HD%$G(B$2^{15}$$B8D$N%l%8%9%?$,MxMQ$G$-$^$9!#(B
+% ^^A $B!V(BFAM256$B$J$7$N(Be-(u)p\TeX{}$B!W$O;v<B>eB8:_$7$J$$$O$:!#(B
+% ^^A $B$?$@$7!"$?$H$($P(Be-(u)p\TeX{}$B$r%Y!<%9$K$7$?(B
+% ^^A p\TeX{}-ng (Asiatic pTeX)$B$O(Be-\TeX{}$B3HD%$r;}$C$F$$$F!"(B
+% ^^A FAM256$B%Q%C%A$OE,MQ$5$l$F$$$J$$$?$a!"$3$3$K3:Ev$9$k!#(B
+% ^^A cf: https://github.com/clerkma/ptex-ng
+% ^^A $B$J$*!"(Bp\TeX{}-ng$B$O(Be-p\TeX{}$B$HF1MM$K(Bpdf\TeX{}$B3HD%$N(B
+% ^^A $B0lIt!J(Be-p\TeX{}$B$HHO0O$,0lCW$7$J$$!K$r;}$C$F$$$k$3$H!"(B
+% ^^A $B$^$?(B|\lastnodechar|$B$J$I$N(Be-p\TeX{}$BFH<+$N%W%j%_%F%#%V$r(B
+% ^^A $B;}$C$F$$$J$$$3$H$K$bCm0U!#(B
+% \begin{macrocode}
+ \mathchardef\e@alloc@top=32767
+ \let\e@alloc@chardef\mathchardef
+ \fi
+\else
+% \end{macrocode}
+% FAM256$B%Q%C%A$,E,MQ$5$l$?(Be-p\TeX{}$B$N>l9g$O!"(B$2^{16}$$B8D$N%l%8%9%?$,MxMQ$G$-$^$9!#(B
+% \begin{macrocode}
+ \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
+% \end{macrocode}
+% \begin{macrocode}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2015/01/01}%
+%<platexrelease> {\e@alloc@chardef}{Extended Allocation (FAM256)}%
+%<platexrelease>\ifx\widowpenalties\@undefined
+%<platexrelease> \mathchardef\e@alloc@top=255
+%<platexrelease> \let\e@alloc@chardef\chardef
+%<platexrelease>\else
+%<platexrelease> \mathchardef\e@alloc@top=32767
+%<platexrelease> \let\e@alloc@chardef\mathchardef
+%<platexrelease>\fi
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}%
+%<platexrelease> {\e@alloc@chardef}{Extended Allocation (FAM256)}%
+%<platexrelease>\let\e@alloc@top\@undefined
+%<platexrelease>\let\e@alloc@chardef\@undefined
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\e@mathgroup@top}
+% 2015/01/01$B0J9_$N(B\LaTeXe{}$B%+!<%M%k$O!"(BXe\TeX{}$B$H(BLua\TeX{}$B$KBP$7$F?t<0(Bfam$B$N(B
+% $B>e8B$r(B16$B$+$i(B256$B$KA}$d$7$F$$$^$9!J(B|\Umathcode| $B$GH=Dj!K!#(B
+% FAM256$B%Q%C%A$,E,MQ$5$l$?(Be-p\TeX{}$B$G$bF1MM$K>e8B$r(B16$B$+$i(B256$B$KA}$d$7$^$9!#(B
+% $B$3$l$G(B
+%\begin{verbatim}
+% ! LaTeX Error: Too many math alphabets used in version normal.
+%\end{verbatim}
+% $B$,=P$K$/$/$J$k$O$:$G$9!#(B
+% \changes{v1.2j}{2016/11/09}{FAM256$B%Q%C%AE,MQ(Be-p\TeX{}$B$KBP1~(B}
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{2016/11/29}%
+%<platexrelease> {\e@mathgroup@top}{Extended Allocation (FAM256)}%
+%<*plcore|platexrelease>
+% \end{macrocode}
+% \begin{macrocode}
+\ifx\omathchar\@undefined
+ \chardef\e@mathgroup@top=16 % LaTeX2e kernel standard
+\else
+ \mathchardef\e@mathgroup@top=256 % for e-pTeX FAM256 patched
+\fi
+% \end{macrocode}
+% \begin{macrocode}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2015/01/01}%
+%<platexrelease> {\e@mathgroup@top}{Extended Allocation (FAM256)}%
+%<platexrelease>\chardef\e@mathgroup@top=16
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}%
+%<platexrelease> {\e@mathgroup@top}{Extended Allocation (FAM256)}%
+%<platexrelease>\let\e@mathgroup@top\@undefined
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+% \end{macro}
+%
% \Finale
\endinput
diff --git a/Master/texmf-dist/source/platex/base/plext.dtx b/Master/texmf-dist/source/platex/base/plext.dtx
index 656750435de..80a83b1a587 100644
--- a/Master/texmf-dist/source/platex/base/plext.dtx
+++ b/Master/texmf-dist/source/platex/base/plext.dtx
@@ -35,6 +35,21 @@
% \changes{v1.2a}{2016/08/20}{\cs{parbox}$BA08e$NM>J,$J(B\cs{xkanjiskip}$B$r:o=|(B}
% \changes{v1.2a}{2016/08/20}{$B2#AH$G(B\texttt{<t>}$B$r;XDj$7$?>l9g$K(B
% \cs{@arstrutbox}$B$rM>7W$K(B\cs{hbox}$B$KF~$l$F$$$?$N$r=$@5(B}
+% \changes{v1.2b}{2016/11/07}{$B2#AH$GCJMn$NF,$K(B\cs{rensuji}$B$r;H$($k(B
+% $B$h$&$K(B\cs{leavevmode}$B$rDI2C$7$F=$@5(B}
+% \changes{v1.2c}{2016/11/19}{Use \cs{setlength}, so that
+% calc extensions apply (sync with lttab.dtx v1.1j)}
+% \changes{v1.2c}{2016/11/19}{Use \cs{@setminpage}
+% (sync with ltboxes v1.1a)}
+% \changes{v1.2c}{2016/11/19}{put \cs{global} into definition
+% of \cs{@minipagefalse} (sync with ltboxes v1.0z)}
+% \changes{v1.2c}{2016/11/19}{Changed \cs{endgraf} to
+% \cs{@@par} (sync with ltboxes.dtx v1.0y)}
+% \changes{v1.2c}{2016/11/19}{Changed \cs{@empty} to \cs{relax} as
+% flag for natural width: pr/2975 (sync with ltboxes.dtx v1.1f)}
+% \changes{v1.2c}{2016/11/19}{Ensure \cs{@parboxto} holds the value
+% of \cs{@tempdimb} not the register itself (pr/3867)
+% (sync with ltboxes.dtx v1.1g)}
% \fi
%
% \iffalse
@@ -43,7 +58,7 @@
\ProvidesFile{plext.dtx}
%</driver>
%<package>\ProvidesPackage{plext}
- [2016/08/20 v1.2a pLaTeX package file (community edition)]
+ [2016/11/19 v1.2c pLaTeX package file (community edition)]
%<*driver>
\documentclass{jltxdoc}
\usepackage{plext}
@@ -183,8 +198,12 @@
% $B%"%9%?%j%9%/7A<0$N>l9g$O!"AHJ}8~%*%W%7%g%s$N8e$m$KI}$r;XDj$7$^$9!#(B
% \changes{v1.1d}{1995/11/10}{\cs{@tabular} to \cs{p@tabular}}
% \changes{v1.2a}{2016/08/20}{tabular$B4D6-A0$NM>J,$J(B\cs{xkanjiskip}$B$r:o=|(B}
+% \changes{v1.2c}{2016/11/19}{Use \cs{setlength}, so that
+% calc extensions apply (sync with lttab.dtx v1.1j)}
% \begin{macrocode}
-\def\@stabular<#1>#2{\def\@halignto{to#2}\p@tabular<#1>}
+\def\@stabular<#1>#2{%
+ \setlength\dimen@{#2}%
+ \edef\@halignto{to\the\dimen@}\p@tabular<#1>}
\def\p@tabular<#1>{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol
\let\@classz\@tabclassz
\let\@classiv\@tabclassiv \let\\\@tabularcr\p@tabarray<#1>}
@@ -623,7 +642,7 @@
% \subsection{$BCJMn%\%C%/%94D6-(B}
% minipage$B4D6-$H(B|\parbox|$B%3%^%s%I$b!"(Btabular$B4D6-$HF1$8$h$&$K!"(B
% $BAHJ}8~$r;XDj$9$k%*%W%7%g%s$rDI2C$7$F$"$j$^$9!#(B
-% $B$3$l$i$N%3%^%s%I$O!"(B\file{ltbox.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
+% $B$3$l$i$N%3%^%s%I$O!"(B\file{ltboxes.dtx}$B$GDj5A$5$l$F$$$^$9!#(B
%
% |\parbox|$B%3%^%s%I$OI}$@$1$G$J$/9b$5$b;XDj$G$-$k$h$&$K$J$C$F$$$^$9!#(B
% $B?7$7$$(B|\parbox|$B%3%^%s%I$K$D$$$F$N>\:Y$O!"(B\file{usrguide.tex}$B$r;2>H(B
@@ -641,17 +660,21 @@
%
% \begin{macro}{\X@minipage}
% $B0LCV%*%W%7%g%s$rD4$Y$^$9!#(B
+% \changes{v1.2c}{2016/11/19}{Changed \cs{@empty} to \cs{relax} as
+% flag for natural width: pr/2975 (sync with ltboxes.dtx v1.1f)}
% \begin{macrocode}
\def\X@minipage<#1>{\@ifnextchar[%]
- {\@iminipage<#1>}{\@iiiminipage<#1>{c}\@empty[s]}}
+ {\@iminipage<#1>}{\@iiiminipage<#1>{c}\relax[s]}}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\@iminipage}
% $B9b$5%*%W%7%g%s$rD4$Y$^$9!#(B
+% \changes{v1.2c}{2016/11/19}{Changed \cs{@empty} to \cs{relax} as
+% flag for natural width: pr/2975 (sync with ltboxes.dtx v1.1f)}
% \begin{macrocode}
\def\@iminipage<#1>[#2]{\@ifnextchar[%]
- {\@iiminipage<#1>{#2}}{\@iiiminipage<#1>{#2}\@empty[s]}}
+ {\@iiminipage<#1>{#2}}{\@iiiminipage<#1>{#2}\relax[s]}}
% \end{macrocode}
% \end{macro}
%
@@ -690,6 +713,8 @@
\if@rotsw \hsize\@tempdima\hbox\bgroup$\vbox\bgroup\fi
% \end{macrocode}
% \changes{v1.1c}{1995/09/11}{Add \cs{adjustbaseline}.}
+% \changes{v1.2c}{2016/11/19}{Use \cs{@setminpage}
+% (sync with ltboxes v1.1a)}
% \begin{macrocode}
\adjustbaseline
\color@begingroup
@@ -701,13 +726,14 @@
\let\@footnotetext\@mpfootnotetext
\let\@listdepth\@mplistdepth \@mplistdepth\z@
\@minipagerestore
- \global\@minipagetrue %% \global added 24 May 89
- \everypar{\global\@minipagefalse\everypar{}}}
+ \@setminipage}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\endminipage}
% minipage$B4D6-$N=*N;%3%^%s%I$G$9!#(B
+% \changes{v1.2c}{2016/11/19}{put \cs{global} into definition
+% of \cs{@minipagefalse} (sync with ltboxes v1.0z)}
% \begin{macrocode}
\def\endminipage{%
\par
@@ -718,7 +744,7 @@
\footnoterule
\unvbox\@mpfootins
\fi
- \global\@minipagefalse %% added 24 May 89
+ \@minipagefalse %% added 24 May 89
\color@endgroup
\if@rotsw \egroup\m@th$\egroup\fi
% \end{macrocode}
@@ -741,17 +767,21 @@
%
% \begin{macro}{\X@parbox}
% $B0LCV%*%W%7%g%s$rD4$Y$^$9!#(B
+% \changes{v1.2c}{2016/11/19}{Changed \cs{@empty} to \cs{relax} as
+% flag for natural width: pr/2975 (sync with ltboxes.dtx v1.1f)}
% \begin{macrocode}
\def\X@parbox<#1>{\@ifnextchar[%]
- {\@iparbox<#1>}{\@iiiparbox<#1>{c}\@empty[s]}}
+ {\@iparbox<#1>}{\@iiiparbox<#1>{c}\relax[s]}}
% \end{macrocode}
% \end{macro}
%
% \begin{macro}{\@iparbox}
% $B9b$5%*%W%7%g%s$rD4$Y$^$9!#(B
+% \changes{v1.2c}{2016/11/19}{Changed \cs{@empty} to \cs{relax} as
+% flag for natural width: pr/2975 (sync with ltboxes.dtx v1.1f)}
% \begin{macrocode}
\def\@iparbox<#1>[#2]{\@ifnextchar[%]
- {\@iiparbox<#1>{#2}}{\@iiiparbox<#1>{#2}\@empty[s]}}
+ {\@iiparbox<#1>{#2}}{\@iiiparbox<#1>{#2}\relax[s]}}
% \end{macrocode}
% \end{macro}
%
@@ -771,6 +801,13 @@
% minipage$B4D6-$HF1$8$h$&$K%0%k!<%T%s%0$r$7$^$9!#(B
% $B$3$N3g8L$HBP$K$J$k$N$O!"$3$N%^%/%m$N:G8e$N(B\cs{egroup}$B$G$9!#(B
% \changes{v1.2a}{2016/08/20}{\cs{parbox}$BA08e$NM>J,$J(B\cs{xkanjiskip}$B$r:o=|(B}
+% \changes{v1.2c}{2016/11/19}{Changed \cs{endgraf} to
+% \cs{@@par} (sync with ltboxes.dtx v1.0y)}
+% \changes{v1.2c}{2016/11/19}{Changed \cs{@empty} to \cs{relax} as
+% flag for natural width: pr/2975 (sync with ltboxes.dtx v1.1f)}
+% \changes{v1.2c}{2016/11/19}{Ensure \cs{@parboxto} holds the value
+% of \cs{@tempdimb} not the register itself (pr/3867)
+% (sync with ltboxes.dtx v1.1g)}
% \begin{macrocode}
\long\def\@iiiparbox<#1>#2#3[#4]#5#6{%
\leavevmode\null\bgroup
@@ -778,14 +815,14 @@
\fork@parbox@option<#1>[#2]%
\if@rotsw
\@begin@tempboxa\vbox{\box@dir\hsize\@tempdima
- \hbox{$\vbox{\@parboxrestore\adjustbaseline#6\endgraf}\m@th$}}%
+ \hbox{$\vbox{\@parboxrestore\adjustbaseline#6\@@par}\m@th$}}%
\else
\@begin@tempboxa\vbox{\box@dir
- \hsize\@tempdima\@parboxrestore\adjustbaseline#6\endgraf}%
+ \hsize\@tempdima\@parboxrestore\adjustbaseline#6\@@par}%
\fi
- \ifx\@empty#3\relax\else
+ \ifx\relax#3\relax\else
\setlength\@tempdimb{#3}%
- \def\@parboxto{to\@tempdimb}%
+ \edef\@parboxto{to\the\@tempdimb}%
\fi
\@begin@parbox\@parboxto{\box@dir\adjustbaseline
\let\hss\vss\let\unhbox\unvbox
@@ -1083,13 +1120,16 @@
% |\rensuji|$B$O!"(B|*|$B7A<0$+$I$&$+$rD4$Y$^$9!#(B
% |\@rensuji|$B$O!"0LCV%*%W%7%g%s$rD4$Y$^$9!#(B
% |\@@rensuji|$B$,(B|\rensuji|$B$NFbIt7A<0$G$9!#(B
+% \changes{v1.2b}{2016/11/07}{$B2#AH$GCJMn$NF,$K(B\cs{rensuji}$B$r;H$($k(B
+% $B$h$&$K(B\cs{leavevmode}$B$rDI2C$7$F=$@5(B}
% \begin{macrocode}
\DeclareRobustCommand\rensuji{%
\@ifstar{\not@advancelinetrue\@rensuji}{\@rensuji}}
\def\@rensuji{\@ifnextchar[{\@@rensuji}{\@@rensuji[c]}}
-\def\@@rensuji[#1]#2{\ifydir\hbox{#2}\else
- \hskip\rensujiskip
+\def\@@rensuji[#1]#2{%
\ifvmode\leavevmode\fi
+ \ifydir\hbox{#2}\else
+ \hskip\rensujiskip
\ifnot@advanceline\not@advancelinefalse\else
\setbox\z@\hbox{\yoko#2}%
\@tempdima\ht\z@ \advance\@tempdima\dp\z@
diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx
index 74c727272eb..c7a40e3cf50 100644
--- a/Master/texmf-dist/source/platex/base/plfonts.dtx
+++ b/Master/texmf-dist/source/platex/base/plfonts.dtx
@@ -303,7 +303,7 @@
% $B$3$N$H$-$N6qBNE*$JH=CG<j=g$K$D$$$F$O!"%(%s%3!<%IA*Br%3%^%s%I$d(B
% $B%U%!%_%jA*Br%3%^%s%I$J$I$NDj5A$r;2>H$7$F$/$@$5$$!#(B
%
-% \begin{macro}{\inlist}
+% \begin{macro}{\inlist@}
% $B<!$N%3%^%s%I$O!"%(%s%3!<%I$d%U%!%_%j$N%j%9%HFb$KBhFs0z?t$G;XDj$5$l$?J8;zNs(B
% $B$,$"$k$+$I$&$+$rD4$Y$k%^%/%m$G$9!#(B
% \begin{macrocode}
@@ -650,7 +650,7 @@
% \end{macro}
%
% \begin{macro}{\DeclareKanjiFamily}
-% $B2$J8%U%!%_%j$r@k8@$9$k$?$a$N%3%^%s%I$G$9!#(B
+% $BOBJ8%U%!%_%j$r@k8@$9$k$?$a$N%3%^%s%I$G$9!#(B
% \begin{macrocode}
\def\DeclareKanjiFamily#1#2#3{%
\@ifundefined{T@#1}%
diff --git a/Master/texmf-dist/source/platex/base/plnewsc04.tex b/Master/texmf-dist/source/platex/base/plnewsc04.tex
new file mode 100644
index 00000000000..eae01e41ce2
--- /dev/null
+++ b/Master/texmf-dist/source/platex/base/plnewsc04.tex
@@ -0,0 +1,113 @@
+%% <2016/09/08>
+\documentclass{plnews}
+\usepackage{plext} %%%% exppl2e $B$N@bL@MQ(B
+\usepackage{amsmath} %%%% exppl2e $B$N@bL@MQ(B
+
+\publicationyear{2016}% $BH/9TG/(B
+\publicationmonth{09}% $BH/9T7n(B
+\publicationissue{c4}% $BHV9f(B
+\author{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#!J(B\texttt{https://texjp.org/}$B!K(B}
+
+\def\pTeX{p\kern-.15em\TeX}
+\def\epTeX{$\varepsilon$-\pTeX}
+\def\pLaTeX{p\kern-.05em\LaTeX}
+\def\pLaTeXe{p\kern-.05em\LaTeXe}
+
+\begin{document}
+
+\maketitle
+
+\section{$B$3$NJ8=q$K$D$$$F(B}
+$B$3$NJ8=q$O%3%_%e%K%F%#HG(B\pLaTeXe\ \texttt{<2016/09/08>}$B$K$D$$$F!"(B
+\pLaTeXe\ \texttt{<2016/07/01>}$B$+$i$N99?72U=j$r$^$H$a$?$b$N$G$9!#(B
+
+
+\section{$B5SCmHV9f!J9g0u!KD>8e$N2~9T5v2D(B}
+\pLaTeX{}$B$G$O@N$+$i!"K\J8Cf$KG[CV$7$?5SCmHV9f!J9g0u$H$$$$$^$9!K$ND>8e$G2~9T$,(B
+$B5/$-$J$$$H$$$&LdBj$,$"$j$^$7$?!#$3$N$?$a!"9TKvIU6a$K9g0u$,Mh$?>l9g!"B3$/J8;z(B
+$B$,HGLL$r$O$_=P$7$F(B|Overfull|$B7Y9p$rH/$7$F$7$^$$$^$7$?(B\footnote{$B%3%_%e%K%F%#HG(B
+\pLaTeX{}$B$K0\9T$9$kD>A0$^$G!J(B2013--2015$BG/$K$+$1$F!K!"(B\pTeX{}$B$N;EMMJQ99$N$?$a(B
+$B9g0uA08e$K%"%-$,F~$C$F$*$j!J(B\file{plnewsc01.tex}$B;2>H!K!"$3$N4X78$G6vA3$K$b(B
+$B0l;~E*$K2~9T$,5/$-$F$$$^$7$?$,!"$3$l$,(B2016$BG/$K$O85$KLa$C$?$N$G$9!#(B}$B!#(B
+$B?7$7$$HG!J(B2016/09/03$B0J9_!K$G$O!"D>8e$,6gFIE@$J$I$G$J$$>l9g$K$O2~9T$,2DG=$J$h(B
+$B$&$K=$@5$7$^$7$?!J$3$N$H$-(B2016/09/03$B$K:.F~$7$?%P%0$O(B2016/09/08$B$G=$@5!K!#(B
+$B2~9T$K:]$7$F$O9g0uD>A0$N%Z%J%k%F%#CM$b9MN8$5$l$^$9(B(Issue 16)$B!#(B
+
+
+\section{$B5SCmHV9f!J9g0u!KD>A0$r%Y%?AH$K(B}
+$B=*$o$j3g8LN`$d6gE@N`$ND>8e$K5SCmHV9f!J9g0u!K$,B3$/>l9g!"$3$3$O%Y%?AH$K$9$k$N(B
+$B$,$h$$$H$5$l$F$$$^$9!#$=$3$G!"(B|\footnote|$B$H(B|\footnotemark|$B$K(B|\inhibitglue|$B$r(B
+$BDI2C$7$^$7$?!#$3$l$O!"1|B<$5$s$N(B\file{jsclasses}$B$HF1$8BP=h$G$9(B(Issue 16)$B!#(B
+
+
+\section{$B=DAH$G(B\file{longtable}$B;HMQ;~$NL58B%k!<%W2r>C(B}
+\file{longtable}$B%Q%C%1!<%8$O!"D9$$I=AH$NESCf$G2~%Z!<%8$9$k5!G=$rDs6!$9$k$b$N(B
+$B$G$9!#$3$l$r=DAH$G;H$&$H!"2~%Z!<%8$,5/$-$kI=AH$,$"$C$?>l9g$K!"(B
+$B!T=DAH%b!<%I!U$HI=<($7$?$^$^L58B%k!<%W$,5/$-$F%?%$%W%;%C%H$,=*N;$7$^$;$s$G$7(B
+$B$?(B(qa:12116, qa:12127, qa:20273, qa:20298)$B!#$3$N8=>]$r2r>C$7!"=DAH$G$b(B
+\file{longtable}$B%Q%C%1!<%8$,5!G=$9$k$h$&$K$7$^$7$?(B(Issue 21)$B!#(B
+
+
+\section{\file{ascmac}$B%Q%C%1!<%8$N(Bpdf\LaTeX{}$BEy$X$NBP1~(B}
+$B8E$$(Bp\LaTeX~2.09$B$G$O!"(B\file{ascmac.sty}$B$O2#AH@lMQ!&(B\file{tascmac.sty}$B$O(B
+$B=D2#N>BP1~$H$$$&$h$&$K%Q%C%1!<%8$,J,$+$l$F$$$^$7$?$,!"(Bp\LaTeXe{}$B$G$O$"$k;~E@(B
+$B$G(B\file{tascmac.sty}$B$K0lK\2=$7$F$$$^$7$?!#$7$+$7!"$3$N$?$a$K(Bpdf\LaTeX{}$B$J$I(B
+$B$G(B\file{ascmac}$B%Q%C%1!<%8$,;H$($J$/$J$C$F$7$^$$$^$7$?!J(B|\tbaselineshift|$BEy$r(B
+$B;HMQ$7$F$$$k$?$a!K!#:#2s!"(B\file{tascmac.sty}$B$K(Bpdf\LaTeX{}$B$J$I$KBP1~$7$?%3!<%I(B
+$B$rDI2C$7!":F$S%5%]!<%H$9$k$h$&$K3HD%$7$^$7$?!#(B
+
+
+\section{$B3+H/HG$N%F%9%H$N$*4j$$(B}
+$B:#8e(Bp\LaTeX{}$B$KF3F~$9$k$+$b$7$l$J$$=$@5%Q%C%A$d;EMMJQ99$N%F%9%H$K$46(NO$/$@(B
+$B$5$$!#(B\TeX{}$B%U%!%$%k$NKAF,!J(B|\documentclass|$B$h$jA0!K$G(B
+\begin{verbatim}
+\RequirePackage{exppl2e}
+\end{verbatim}
+$B$H=q$/$3$H$G!"8=:_$N3+H/HG$r%F%9%H$9$k$3$H$,$G$-$^$9!#(B
+$B8=:_$O!";YCl%3%^%s%I$GMQ$$$i$l$k(B|\strutbox|$B$N5sF0$K4X$9$k%Q%C%A!J<!$N%Z!<%8(B
+$B;2>H!K$H!"A02s$+$i0z$-B3$-!V%"%/%;%s%HJ8;z%Q%C%A!W$bF~$C$F$$$^$9!#(B
+
+$B>\:Y$O(B\file{exppl2e.pdf}$B$r;2>H$7$F$/$@$5$$!#%P%0Js9p$d$40U8+$r4?7^$7$^$9!#(B
+\TeX\ Forum$B$d(BGitHub$B$N(BIssue$B%7%9%F%`$,MxMQ$G$-$^$9!#(B
+\begin{itemize}
+\item \texttt{https://github.com/texjporg/platex}
+\item \texttt{https://github.com/texjporg/uplatex}
+\end{itemize}
+
+
+\clearpage
+\section{\texttt{\string\strutbox}$B%Q%C%A$K$D$$$F(B}
+$B8=:_$N(B\pLaTeX{}$B$G$O!"<g$K=DAH$G3$30@=$N(B\LaTeX{}$B%Q%C%1!<%8$r;HMQ$7$?>l9g$K(B
+$BIT2D2r$J5sF0$,H/@8$7$^$9!#$?$H$($P(B\file{amsmath}$B%Q%C%1!<%8$N(B|align|$B4D6-$r(B
+$B;H$&$H!"?t<0$N0LCV$d?t<0HV9f$,$:$l$F$7$^$$$^$9!#(B
+\begin{center}
+\setlength{\fboxsep}{10pt}
+\fbox{\begin{minipage}<t>{20zw}
+align$B4D6-!"(B\texttt{\&}$B$,(B1$B$D(B %% $B>/$7>e$X(B
+\begin{align}
+a_1 &= b_1+c_1\\
+a_2 &= b_2+c_2-d_2+e_2
+\end{align}
+align$B4D6-!"(B\texttt{\&}$B$J$7(B %% $BC<$KIU$/(B
+\begin{align}
+a_1=b_1+c_1
+\end{align}
+$BHf3SMQ$N(Bequation$B4D6-(B
+\begin{equation}
+a_1=b_1+c_1
+\end{equation}
+\end{minipage}}
+\end{center}
+$B$3$l$O!"(B\file{amsmath}$B$,;HMQ$7$F$$$k;YCl$NH"(B|\strutbox|$B$,!"(B\pLaTeX{}$B$G$O(B
+$B2#AH@lMQ$NH"$H$7$FAH$^$l$F$$$k$?$a$G$9!#8=:_$N(B\pLaTeX{}$B$G$O!"2#AH$N;YCl$O(B
+|\strutbox|$B!"=DAH$N;YCl$O(B|\tstrutbox|$B$H$$$&$h$&$K;H$$J,$1$J$1$l$P$J$j$^$;(B
+$B$s$,!"(B\pLaTeX{}$B@lMQ$H$$$&$o$1$G$O$J$$3$30@=(B\LaTeX{}$B%Q%C%1!<%8$,!"$9$Y$F(B
+$B$3$l$r9MN8$9$k$3$H$O:$Fq$G$7$g$&!#$[$+$K$b!"(B\file{array}$B%Q%C%1!<%8$d(B
+\file{longtable}$B%Q%C%1!<%8$G:n@.$9$kI=$N9T$N9b$5$J$I$G$b!";YCl$N@#K!$,$*$+(B
+$B$7$/$J$C$F$$$^$9!#(B
+
+$B$3$N$h$&$J>l9g$KBP=h$9$k$?$a!"$?$H$(%Q%C%1!<%8$,(B|\strutbox|$B$r8F$S=P$7$F$b!"(B
+$B=DAH$J$i$P=DAHMQ$N;YCl$G$"$k(B|\tstrutbox|$B$,JV$k$h$&$K$9$k!"$H$$$&$N$,!":#2s(B
+$B8!F$$7$F$$$k(B|\strutbox|$B%Q%C%A$G$9!#(B
+
+\end{document}
diff --git a/Master/texmf-dist/source/platex/base/plnewsc05.tex b/Master/texmf-dist/source/platex/base/plnewsc05.tex
new file mode 100644
index 00000000000..7042b65fe36
--- /dev/null
+++ b/Master/texmf-dist/source/platex/base/plnewsc05.tex
@@ -0,0 +1,87 @@
+%% <2016/11/29>
+\documentclass{plnews}
+
+\publicationyear{2016}% $BH/9TG/(B
+\publicationmonth{11}% $BH/9T7n(B
+\publicationissue{c5}% $BHV9f(B
+\author{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#!J(B\texttt{https://texjp.org/}$B!K(B}
+
+\def\pTeX{p\kern-.15em\TeX}
+\def\eTeX{$\varepsilon$-\TeX}
+\def\epTeX{$\varepsilon$-\pTeX}
+\def\pLaTeX{p\kern-.05em\LaTeX}
+\def\pLaTeXe{p\kern-.05em\LaTeXe}
+
+\begin{document}
+
+\maketitle
+
+$B$3$NJ8=q$O%3%_%e%K%F%#HG(B\pLaTeXe\ \texttt{<2016/11/29>}$B$K$D$$$F!"(B
+\pLaTeXe\ \texttt{<2016/09/08>}$B$+$i$N99?72U=j$r$^$H$a$?$b$N$G$9!#(B
+
+
+\section{\epTeX{}$B3HD%$N3hMQ(B}
+2015$BG/0J9_$N(B\LaTeX{}$B%+!<%M%k$O!"(B\eTeX{}$B$J$I$N%(%s%8%s3HD%$,MxMQ2DG=$J$i$PMxMQ(B
+$B$9$k$H$$$&J}?K$r$H$C$F$$$^$9!#(B\epTeX{}$B$N>l9g!"MxMQ2DG=$J?t<0%U%!%_%j$N>e8B$,(B
+16$B$+$i(B256$B$KA}$($F$$$^$9!JDL>N!V(BFAM256$B%Q%C%A!W!K$N$G!"(B\pLaTeX{}$B$G$O$3$l$r3hMQ(B
+$B$7$d$9$/$9$k@_Dj$r2C$($^$7$?!#(B
+$B?t<0MQ%"%k%U%!%Y%C%H$r;H$&$@$1$J$i!"(B|\DeclareMathAlphabet|$B$r$?$/$5$s;H$C$F$b(B
+\begin{verbatim}
+ ! LaTeX Error: Too many math alphabets
+ used in version normal.
+\end{verbatim}
+$B$H$$$&%(%i!<$,=P$K$/$/$J$k$O$:$G$9!#(B
+
+$B$J$*!"(B|\DeclareMathSymbol|$B$J$I$N5-9fN`$NDj5A$K;HMQ$9$kL?Na$O!"(B\LaTeX{}$B%+!<%M%k(B
+$B$G3HD%$,9T$o$l$F$$$^$;$s$N$G!"(B\pLaTeX{}$B$G$b3HD%$O9T$$$^$;$s!#%7%s%\%k%U%)%s%H(B
+$B$rB??t;HMQ$7$?$$>l9g$O!"JLES%3!<%I$r=q$/I,MW$,$"$j$^$9!J;29M!'(Beptexdoc.pdf$B!K!#(B
+
+
+\section{\file{jclasses}$B$N(B\file{classes}$B$X$NDI?o(B}
+\file{jclasses}$B!J(Bjarticle$B!"(Bjbook$B!"(Btarticle$B$J$I!K$N(B\pLaTeX{}$BI8=`%/%i%9$r!"85$H(B
+$B$J$C$?(B\file{classes}$B!J(Barticle$B!"(Bbook$B$J$I!K$K2C$($i$l$?%P%0=$@5$KDI?o$5$;$^$7$?!#(B
+
+$B<g$J=$@5$O0J2<$N$H$*$j$G$9!#(B
+\begin{itemize}
+\item |\listof{figures,tables}|$B!"(B|thebibliography|$B$G%X%C%@$K(B
+ $B!V?^L\<!!W$J$I$G$O$J$/D>A0$N%?%$%H%k$,F~$k$3$H$,$"$k%P%0$N=$@5(B
+\item $B:w0z$N0l$DA0$N%Z!<%8$G(B|\columnsep|$B$H(B|\columnseprule|$B$,K\Mh$h$jAa$/(B
+ $B%j%;%C%H$5$l$F$7$^$&%P%0$N=$@5(B
+\item |\part|$B$,A0$NJ8>O$+$i2~CJMn$5$l$J$+$C$?$j!"L\<!$N=g=x$,F~$lBX$o$C(B
+ $B$?$j$9$k%P%0$N=$@5(B
+\end{itemize}
+$B$J$*!"(B\file{classes}$B$G$O(B|\frontmatter|$B$H(B|\mainmatter|$B$N(B|openany|$B%*%W%7%g%s(B
+$B;XDj;~$N5sF0$,JQ99$5$l$F$$$^$9!J(B|openright|$B$H6&DL$K!"(B|\cleardoublepage|$B$9$k(B
+$B$h$&$K$J$j$^$7$?!K$,!"$3$NJQ99$X$NDI?o$O9T$$$^$;$s$G$7$?!#(B
+$B>\:Y$O(B\file{jclasses.dtx}$B$r;2>H$7$F$/$@$5$$!#(B
+
+
+\section{\file{plext}$B$N(B\LaTeX{}$B$X$NDI?o$H=$@5(B}
+\file{plext}$B%Q%C%1!<%8$,(B\LaTeX{}$B$+$i3HD%$7$?L?Na$KBP$7$F$b!"(B\LaTeX{}$BB&$N(B
+$B%P%0=$@5$X$NDI?o$r;\$7$^$7$?!#<g$J=$@5$O0J2<$N$H$*$j$G$9!#(B
+\begin{itemize}
+\item |\parbox|$B$N%*%W%7%g%s0z?tH=Dj$N2~A1(B
+\item |tabular*|$B$H(B|\parbox|$B$N@#K!<hF@%3!<%I$r2~A1(B
+\end{itemize}
+$B$^$?!"(B|\rensuji|$B$r2#AH$GCJMn$NF,$K;H$&$H@5$7$/F0:n$7$J$$%P%0$b=$@5$7$^$7$?!#(B
+
+
+\section{$B3+H/HG$N%F%9%H$N$*4j$$(B}
+$B:#8e(Bp\LaTeX{}$B$KF3F~$9$k$+$b$7$l$J$$=$@5%Q%C%A$d;EMMJQ99$N%F%9%H$K$46(NO$/$@(B
+$B$5$$!#(B\TeX{}$B%U%!%$%k$NKAF,!J(B|\documentclass|$B$h$jA0!K$G(B
+\begin{verbatim}
+ \RequirePackage{exppl2e}
+\end{verbatim}
+$B$H=q$/$3$H$G!"8=:_$N3+H/HG$r%F%9%H$9$k$3$H$,$G$-$^$9!#(B
+$B8=:_$O!"!V%"%/%;%s%HJ8;z%Q%C%A!W$H!V(B|\strutbox|$B%Q%C%A!W(B
+% $B%Y!<%9%i%$%sJd@5$,%<%m$G$J$$$H$-$N%"%/%;%s%H9g@.J8;z$r=$@5$9$k(B
+% $B;YCl$GMQ$$$i$l$k(B|\strutbox|$B$N=DAH;~5sF0$r=$@5$9$k(B
+$B$,F~$C$F$$$^$9!#>\:Y$O(B\file{exppl2e.pdf}$B$r;2>H$7$F$/$@$5$$!#(B
+$B%P%0Js9p$d$40U8+$r4?7^$7$^$9!#(B
+\TeX\ Forum$B$d(BGitHub$B$N(BIssue$B%7%9%F%`$,MxMQ$G$-$^$9!#(B
+\begin{itemize}
+\item \texttt{https://github.com/texjporg/platex}
+\item \texttt{https://github.com/texjporg/uplatex}
+\end{itemize}
+
+\end{document}
diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx
index c8fb285b010..da21dc6c688 100644
--- a/Master/texmf-dist/source/platex/base/plvers.dtx
+++ b/Master/texmf-dist/source/platex/base/plvers.dtx
@@ -49,12 +49,13 @@
% \changes{v1.0y}{2016/06/27}{\file{platex.cfg}$B$NFI$_9~$_$rDI2C(B}
% \changes{v1.0z}{2016/08/26}{\file{platex.cfg}$B$NFI$_9~$_$r(B
% \file{plcore.ltx}$B$+$i(B\file{platex.ltx}$B$X0\F0(B}
+% \changes{v1.1}{2016/09/14}{$B5/F0;~$N%P%J!<$r<hF@$9$k%3!<%I$r2~NI(B}
% \fi
%
% \iffalse
%<*driver>
% \fi
-\ProvidesFile{plvers.dtx}[2016/08/26 v1.0z pLaTeX Kernel (Version Info)]
+\ProvidesFile{plvers.dtx}[2016/09/14 v1.1 pLaTeX Kernel (Version Info)]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plvers.dtx}
@@ -118,7 +119,7 @@
%</plcore>
%<platexrelease>\edef\platexreleaseversion
%<*plcore|platexrelease>
- {2016/09/08}
+ {2016/11/29}
%</plcore|platexrelease>
%<*plcore>
\def\ppatch@level{0}
@@ -173,26 +174,31 @@
%
% $B5/F0;~$KI=<($5$l$kJ8;zNs$G$9!#(B
% \LaTeX{}$B$K%Q%C%A$,$"$F$i$l$F$$$k>l9g$O!"$=$l$bI=<($7$^$9!#(B
+%
+%\iffalse
+% $B$3$N<BAu$K$D$$$F$O(B\file{platex.dtx}$B$N%3%a%s%H$r;2>H!#(B(2016/09/14)
+%\fi
+%
% \changes{v1.0v}{2016/05/07}{$B5/F0;~$NJ8;zNs$r:G?7$N(B\LaTeX{}$B$K9g$o$;$?!#(B}
% \changes{v1.0w}{2016/05/12}{$B5/F0;~$NJ8;zNs$KF~$l$k(B\LaTeX{}$B$N%P!<%8%g%s$r(B
% $B85$N(B\LaTeX{}$B$N%P%J!<$+$i0z$-7Q$0$h$&$K2~NI(B}
+% \changes{v1.1}{2016/09/14}{$B5/F0;~$N%P%J!<$r<hF@$9$k%3!<%I$r2~NI(B}
% \begin{macrocode}
\ifx\patch@level\@undefined % fallback if undefined in LaTeX
\def\patch@level{0}\fi
\ifx\ppatch@level\@undefined % fallback if undefined in pLaTeX
\def\ppatch@level{0}\fi
\begingroup
- \def\parse@BANNER#1{\expandafter\parse@@BANNER#1}
- \def\parse@@BANNER#1#2#3#4{#2}
+ \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#1}
\edef\platexTMP{%
\ifnum\ppatch@level=0
\everyjob{\noexpand\typeout{%
\pfmtname\space<\pfmtversion>\space
- (based on \parse@BANNER{\platexBANNER})}}%
+ (based on \expandafter\parse@@BANNER\platexBANNER)}}%
\else
\everyjob{\noexpand\typeout{%
\pfmtname\space<\pfmtversion>+\ppatch@level\space
- (based on \parse@BANNER{\platexBANNER})}}%
+ (based on \expandafter\parse@@BANNER\platexBANNER)}}%
\fi
}
\expandafter
@@ -200,16 +206,22 @@
% \end{macrocode}
%
% p\LaTeX{}$B$O!"FH<+$N%O%$%U%M!<%7%g%s!&%Q%?!<%s$rDj5A$7$F$$$^$;$s!#(B
-% $BBe$o$j$K!"(B\LaTeX{}$B$,FI$_9~$s$G$$$k(BBabel$B%Q%C%1!<%8$N$b$N$,E,MQ$5$l$^$9!#(B
-% $B5/F0;~$NJ8;zNs$K$b(B\file{hyphen.cfg}$B$N%P!<%8%g%s$rH?1G$7$^$9!#(B
+% \TeX\ Live$B$NI8=`E*%$%s%9%H!<%k$G$O!"Be$o$j$K(B\LaTeX{}$B$,FI$_9~$s$G$$$k(B
+% Babel$B%Q%C%1!<%8$N$b$N$,E,MQ$5$l$k$O$:$G$9$+$i!"5/F0;~$NJ8;zNs$K$b(B
+% \file{hyphen.cfg}$B$N%P!<%8%g%s$rH?1G$7$^$9!J(BBabel$B%Q%C%1!<%8$N(B
+% \file{hyphen.cfg}$B$G$J$$>l9g$O!"2?$bI=<($5$l$:6u9T$K$J$k$O$:$G$9!K!#(B
+%
+%\iffalse
+% $B$3$N<BAu$K$D$$$F$O(B\file{platex.dtx}$B$N%3%a%s%H$r;2>H!#(B(2016/09/14)
+%\fi
+%
% \changes{v1.0w}{2016/05/12}{$B5/F0;~$NJ8;zNs$KF~$l$k(BBabel$B$N%P!<%8%g%s$r(B
% $B85$N(B\LaTeX{}$B$N%P%J!<$+$i<hF@$9$k%3!<%I$r(B\file{platex.ini}$B$+$i<h$jF~$l$?(B}
% \begin{macrocode}
\begingroup
- \def\parse@BANNER#1{\expandafter\parse@@BANNER#1}
- \def\parse@@BANNER#1#2#3#4{#4}
+ \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#2}
\edef\platexTMP{%
- \the\everyjob\noexpand\typeout{\parse@BANNER{\platexBANNER}}%
+ \the\everyjob\noexpand\typeout{\expandafter\parse@@BANNER\platexBANNER}%
}
\everyjob=\expandafter{\platexTMP}%
\edef\platexTMP{%
diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty
index 3eda0ea6b0b..1521d97cddd 100644
--- a/Master/texmf-dist/tex/platex/base/exppl2e.sty
+++ b/Master/texmf-dist/tex/platex/base/exppl2e.sty
@@ -34,7 +34,7 @@
% case 1: This file must be a normal package
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{exppl2e}
- [2016/09/03 v1.0e Experimental pLaTeX2e features]
+ [2016/11/29 v1.0h Experimental pLaTeX2e features]
\PackageWarningNoLine{exppl2e}{%
This is the unstable, experimental part of pLaTeX2e.\MessageBreak
This package may contain:\MessageBreak
@@ -380,6 +380,7 @@
% |\fontsize|$B%3%^%s%I$NFbIt7A<0$G$9!#(B
% $B%Y!<%9%i%$%s$N@_Dj$H!";YCl$N@_Dj$r9T$J$$$^$9!#(B
% \begin{macrocode}
+\def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi}
\def\set@fontsize#1#2#3{%
\@defaultunits\@tempdimb#2pt\relax\@nnil
\edef\f@size{\strip@pt\@tempdimb}%
@@ -406,7 +407,6 @@
\setbox\zstrutbox\hbox{\tate
\vrule\@width\z@
\@height.7\baselineskip \@depth.3\baselineskip}%
- \def\strutbox{\iftdir\tstrutbox\else\ystrutbox\fi}%
% \end{macrocode}
% $B%U%)%s%H%5%$%:$H%Y!<%9%i%$%s$K4X$9$k?GCG>pJs$r=PNO$7$^$9!#(B
% \begin{macrocode}
@@ -428,4 +428,58 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
+% \section{e-p\TeX{}$B$G$N(BFAM256$B%Q%C%A$NMxMQ(B}
+%
+% p\LaTeXe{}$B%+!<%M%k(B(2016/11/29)$B$KF3F~$7$?$?$a:o=|!#(B
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% \section{$B6/@)2~9T$H(B\cs{par}}
+%
+% \begin{macro}{\@gnewline}
+% $B=>Mh!"(Bp\LaTeX $B$G$O(B
+%\begin{verbatim}
+% $B$"$$$&$($*(B\\
+% $B!*$+$-$/$1$3(B
+%\end{verbatim}
+% $B$N$h$&$K9TF,6XB'J8;z$ND>A0$G6/@)2~9T$r9T$($k$h$&$K$9$k$?$a(B
+% |\null|$B$r(B|\@gnewline|$B%^%/%mFb$KA^F~$7$F$$$^$7$?!#(B
+%
+% $B$7$+$7!"$3$l$G$O(B|\\\par|$B$H=q$$$?>l9g$K(BUnderfull$B7Y9p$,=P$J$/$J$j(B
+% $B$^$9!J(B|tests/newline_par.tex|$B$r(B\texttt{latex}$B$H(B\texttt{platex}$B$G(B
+% $B=hM}$7$F$_$F$/$@$5$$!K$N$G!"(B|\null|$B$NBe$o$j$K(B|\hskip\z@|$B$r=E$M$k(B
+% $B7A$GBP1~$7$^$9!#(B
+%
+% $B$?$@$7!"=>Mh$N(B|\null|$B$rA^F~$7$?>l9g$H0[$J$j!"6/@)2~9T8e$N9TF,$K(B
+% JFM$B%0%k!=$,F~$i$J$/$J$j$^$9!#$3$l$O$`$7$m!"1|B<$5$s$N(Bjsclasses$B$G(B
+% $B9TF,$rE7%D%-$KD>$7$F$$$k$N$HF1$8$G$9$,!"(Bp\LaTeX{}$B$H$7$F$O5sF0$,(B
+% $BJQ2=$7$F$7$^$$$^$9$N$G!"$H$j$"$($:%3%a%s%H%"%&%H$7$F$*$-$^$9!#(B
+% \begin{macrocode}
+%<platexrelease>\plIncludeInRelease{????/??/??}{\@gnewline}
+%<platexrelease> {Restore Underfull warning for |\\\par|}%
+%<*plcore|platexrelease>
+%\def\@gnewline #1{%
+% \ifvmode
+% \@nolnerr
+% \else
+% \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \hskip \z@
+% \ignorespaces
+% \fi}
+%</plcore|platexrelease>
+%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{0000/00/00}{\@gnewline}
+%<platexrelease> {Restore Underfull warning for |\\\par|}%
+%<platexrelease>\def\@gnewline #1{%
+%<platexrelease> \ifvmode
+%<platexrelease> \@nolnerr
+%<platexrelease> \else
+%<platexrelease> \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null
+%<platexrelease> \ignorespaces
+%<platexrelease> \fi}
+%<platexrelease>\plEndIncludeInRelease
+% \end{macrocode}
+% \end{macro}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
\endinput
diff --git a/Master/texmf-dist/tex/platex/base/jarticle.cls b/Master/texmf-dist/tex/platex/base/jarticle.cls
index d999bd75644..3b38283f963 100644
--- a/Master/texmf-dist/tex/platex/base/jarticle.cls
+++ b/Master/texmf-dist/tex/platex/base/jarticle.cls
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jarticle}
- [2006/06/27 v1.6
+ [2016/11/22 v1.7b
Standard pLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -289,7 +289,7 @@
\def\@makefnmark{\hbox{\ifydir $\m@th^{\@thefnmark}$
\else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
\long\def\@makefntext##1{\parindent 1em\noindent
- \hbox to1.8em{\hss$\m@th^{\@thefnmark}$}##1}%
+ \hb@xt@1.8em{\hss$\m@th^{\@thefnmark}$}##1}%
\if@twocolumn
\ifnum \col@number=\@ne \@maketitle
\else \twocolumn[\@maketitle]%
@@ -304,6 +304,7 @@
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
+ \global\let\@maketitle\relax
\global\let\p@thanks\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
@@ -369,7 +370,9 @@
\thesubsubsection.\@arabic\c@paragraph}
\renewcommand{\thesubparagraph}{%
\theparagraph.\@arabic\c@subparagraph}
-\newcommand{\part}{\par\addvspace{4ex}%
+\newcommand{\part}{%
+ \if@noskipsec \leavevmode \fi
+ \par\addvspace{4ex}%
\@afterindenttrue
\secdef\@part\@spart}
\def\@part[#1]#2{%
@@ -382,7 +385,7 @@
\fi
\markboth{}{}%
{\parindent\z@\raggedright
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\ifnum \c@secnumdepth >\m@ne
\Large\bfseries\prepartname\thepart\postpartname
\par\nobreak
@@ -391,29 +394,29 @@
\nobreak\vskip3ex\@afterheading}
\def\@spart#1{{%
\parindent\z@\raggedright
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\huge\bfseries#1\par}%
\nobreak\vskip3ex\@afterheading}
\newcommand{\section}{\@startsection{section}{1}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\Large\bfseries}}
+ {\normalfont\Large\bfseries}}
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\large\bfseries}}
+ {\normalfont\large\bfseries}}
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\appendix}{\par
\setcounter{section}{0}%
\setcounter{subsection}{0}%
@@ -454,7 +457,7 @@
{\ifnum \@enumdepth >\thr@@\@toodeep\else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \list{\csname label\@enumctr\endcsname}{%
+ \expandafter \list \csname label\@enumctr\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -481,8 +484,7 @@
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list{\csname \@itemitem\endcsname}{%
+ \expandafter \list \csname \@itemitem\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -558,7 +560,7 @@
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
\setlength\arraycolsep{5\p@}
@@ -612,7 +614,7 @@
\newdimen\toclineskip
\setlength\toclineskip{\z@}
\newdimen\@lnumwidth
-\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
+\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c@tocdepth \else
\vskip\toclineskip \@plus.2\p@
@@ -621,7 +623,7 @@
\interlinepenalty\@M
\leavevmode
\@lnumwidth #3\relax
- \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
+ \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m@th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
@@ -650,7 +652,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb@xt@\@pnumwidth{\hss#2}}\par
\nobreak
\if@compatibility
\global\@nobreaktrue
@@ -667,7 +669,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{1.5em}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss#2}\par
\endgroup
\fi}
\newcommand*{\l@subsection} {\@dottedtocline{2}{1.5em}{2.3em}}
@@ -675,14 +677,14 @@
\newcommand*{\l@paragraph} {\@dottedtocline{4}{7.0em}{4.1em}}
\newcommand*{\l@subparagraph} {\@dottedtocline{5}{10em}{5em}}
\newcommand{\listoffigures}{%
- \section*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+ \section*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
}
\newcommand*{\l@figure}{\@dottedtocline{1}{1.5em}{2.3em}}
\newcommand{\listoftables}{%
- \section*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+ \section*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
}
\let\l@table\l@figure
@@ -690,7 +692,7 @@
\setlength\bibindent{1.5em}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\newenvironment{thebibliography}[1]
-{\section*{\refname\@mkboth{\refname}{\refname}}%
+{\section*{\refname}\@mkboth{\refname}{\refname}%
\list{\@biblabel{\@arabic\c@enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -710,11 +712,11 @@
\let\@openbib@code\@empty
\newenvironment{theindex}
{\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
\twocolumn[\section*{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl@in}\parindent\z@
\parskip\z@ \@plus .3\p@\relax
+ \columnseprule\z@ \columnsep 35\p@
\let\item\@idxitem}
{\if@restonecol\onecolumn\else\clearpage\fi}
\newcommand{\@idxitem}{\par\hangindent 40\p@}
@@ -723,10 +725,10 @@
\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
\renewcommand{\footnoterule}{%
\kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \hrule\@width.4\columnwidth
+ \kern2.6\p@}
\newcommand\@makefntext[1]{\parindent 1em
- \noindent\hbox to 1.8em{\hss\@makefnmark}#1}
+ \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1}
\newif\if$B@>Nq(B \$B@>Nq(Bfalse
\def\$B@>Nq(B{\$B@>Nq(Btrue}
\def\$BOBNq(B{\$B@>Nq(Bfalse}
diff --git a/Master/texmf-dist/tex/platex/base/jbk10.clo b/Master/texmf-dist/tex/platex/base/jbk10.clo
index 6392173bea0..85ae77ffae0 100644
--- a/Master/texmf-dist/tex/platex/base/jbk10.clo
+++ b/Master/texmf-dist/tex/platex/base/jbk10.clo
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{jbk10.clo}
- [2006/06/27 v1.6
+ [2016/11/22 v1.7b
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 6561becb3dd..ca260663a31 100644
--- a/Master/texmf-dist/tex/platex/base/jbk11.clo
+++ b/Master/texmf-dist/tex/platex/base/jbk11.clo
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{jbk11.clo}
- [2006/06/27 v1.6
+ [2016/11/22 v1.7b
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 84915f187ff..1b029ac5ac8 100644
--- a/Master/texmf-dist/tex/platex/base/jbk12.clo
+++ b/Master/texmf-dist/tex/platex/base/jbk12.clo
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{jbk12.clo}
- [2006/06/27 v1.6
+ [2016/11/22 v1.7b
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 55ffdb96300..79a8b9085fe 100644
--- a/Master/texmf-dist/tex/platex/base/jbook.cls
+++ b/Master/texmf-dist/tex/platex/base/jbook.cls
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jbook}
- [2006/06/27 v1.6
+ [2016/11/22 v1.7b
Standard pLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -315,7 +315,7 @@
\def\@makefnmark{\hbox{\ifydir $\m@th^{\@thefnmark}$
\else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
\long\def\@makefntext##1{\parindent 1em\noindent
- \hbox to1.8em{\hss$\m@th^{\@thefnmark}$}##1}%
+ \hb@xt@1.8em{\hss$\m@th^{\@thefnmark}$}##1}%
\if@twocolumn
\ifnum \col@number=\@ne \@maketitle
\else \twocolumn[\@maketitle]%
@@ -330,6 +330,7 @@
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
+ \global\let\@maketitle\relax
\global\let\p@thanks\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
@@ -378,7 +379,7 @@
\theparagraph.\@arabic\c@subparagraph}
\newcommand{\@chapapp}{\prechaptername}
\newcommand{\@chappos}{\postchaptername}
-\newcommand\frontmatter{%
+\newcommand{\frontmatter}{%
\if@openright \cleardoublepage \else \clearpage \fi
\@mainmatterfalse\pagenumbering{roman}}
\newcommand{\mainmatter}{%
@@ -403,7 +404,7 @@
\fi
\markboth{}{}%
{\centering
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\ifnum \c@secnumdepth >-2\relax
\huge\bfseries\prepartname\thepart\postpartname
\par\vskip20\p@
@@ -412,7 +413,7 @@
\@endpart}
\def\@spart#1{{%
\centering
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\Huge\bfseries#1\par}%
\@endpart}
\def\@endpart{\vfil\newpage
@@ -443,7 +444,7 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset@font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\ifnum \c@secnumdepth >\m@ne
\setlength\@tempdima{\linewidth}%
@@ -463,30 +464,30 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset@font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\setlength\@tempdima{\linewidth}%
\vtop{\hsize\@tempdima#1}}\vskip3\Cvs}
\newcommand{\section}{\@startsection{section}{1}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\Large\bfseries}}
+ {\normalfont\Large\bfseries}}
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\large\bfseries}}
+ {\normalfont\large\bfseries}}
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\appendix}{\par
\setcounter{chapter}{0}%
\setcounter{section}{0}%
@@ -529,7 +530,7 @@
{\ifnum \@enumdepth >\thr@@\@toodeep\else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \list{\csname label\@enumctr\endcsname}{%
+ \expandafter \list \csname label\@enumctr\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -556,8 +557,7 @@
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list{\csname \@itemitem\endcsname}{%
+ \expandafter \list \csname \@itemitem\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -635,7 +635,7 @@
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
\setlength\arraycolsep{5\p@}
@@ -691,7 +691,7 @@
\newdimen\toclineskip
\setlength\toclineskip{\z@}
\newdimen\@lnumwidth
-\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
+\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c@tocdepth \else
\vskip\toclineskip \@plus.2\p@
@@ -700,7 +700,7 @@
\interlinepenalty\@M
\leavevmode
\@lnumwidth #3\relax
- \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
+ \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m@th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
@@ -732,7 +732,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb@xt@\@pnumwidth{\hss#2}}\par
\nobreak
\global\@nobreaktrue
\everypar{\global\@nobreakfalse\everypar{}}%
@@ -747,7 +747,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{4zw}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss#2}\par
\penalty\@highpenalty
\endgroup
\fi}
@@ -759,8 +759,8 @@
\newcommand{\listoffigures}{%
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+ \chapter*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
\if@restonecol\twocolumn\fi
}
@@ -768,8 +768,8 @@
\newcommand{\listoftables}{%
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+ \chapter*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
\if@restonecol\twocolumn\fi
}
@@ -778,7 +778,7 @@
\setlength\bibindent{1.5em}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\newenvironment{thebibliography}[1]
-{\chapter*{\bibname\@mkboth{\bibname}{\bibname}}%
+{\chapter*{\bibname}\@mkboth{\bibname}{\bibname}%
\list{\@biblabel{\@arabic\c@enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -798,11 +798,11 @@
\let\@openbib@code\@empty
\newenvironment{theindex}
{\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
\twocolumn[\@makeschapterhead{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl@in}\parindent\z@
\parskip\z@ \@plus .3\p@\relax
+ \columnseprule\z@ \columnsep 35\p@
\let\item\@idxitem}
{\if@restonecol\onecolumn\else\clearpage\fi}
\newcommand{\@idxitem}{\par\hangindent 40\p@}
@@ -811,11 +811,11 @@
\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
\renewcommand{\footnoterule}{%
\kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \hrule\@width.4\columnwidth
+ \kern2.6\p@}
\@addtoreset{footnote}{chapter}
\newcommand\@makefntext[1]{\parindent 1em
- \noindent\hbox to 1.8em{\hss\@makefnmark}#1}
+ \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1}
\newif\if$B@>Nq(B \$B@>Nq(Bfalse
\def\$B@>Nq(B{\$B@>Nq(Btrue}
\def\$BOBNq(B{\$B@>Nq(Bfalse}
diff --git a/Master/texmf-dist/tex/platex/base/jreport.cls b/Master/texmf-dist/tex/platex/base/jreport.cls
index 42a7ce54efc..673d69658c3 100644
--- a/Master/texmf-dist/tex/platex/base/jreport.cls
+++ b/Master/texmf-dist/tex/platex/base/jreport.cls
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{jreport}
- [2006/06/27 v1.6
+ [2016/11/22 v1.7b
Standard pLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -303,7 +303,7 @@
\def\@makefnmark{\hbox{\ifydir $\m@th^{\@thefnmark}$
\else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
\long\def\@makefntext##1{\parindent 1em\noindent
- \hbox to1.8em{\hss$\m@th^{\@thefnmark}$}##1}%
+ \hb@xt@1.8em{\hss$\m@th^{\@thefnmark}$}##1}%
\if@twocolumn
\ifnum \col@number=\@ne \@maketitle
\else \twocolumn[\@maketitle]%
@@ -318,6 +318,7 @@
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
+ \global\let\@maketitle\relax
\global\let\p@thanks\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
@@ -404,7 +405,7 @@
\fi
\markboth{}{}%
{\centering
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\ifnum \c@secnumdepth >-2\relax
\huge\bfseries\prepartname\thepart\postpartname
\par\vskip20\p@
@@ -413,7 +414,7 @@
\@endpart}
\def\@spart#1{{%
\centering
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\Huge\bfseries#1\par}%
\@endpart}
\def\@endpart{\vfil\newpage
@@ -442,7 +443,7 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset@font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\ifnum \c@secnumdepth >\m@ne
\setlength\@tempdima{\linewidth}%
@@ -460,30 +461,30 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset@font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\setlength\@tempdima{\linewidth}%
\vtop{\hsize\@tempdima#1}}\vskip3\Cvs}
\newcommand{\section}{\@startsection{section}{1}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\Large\bfseries}}
+ {\normalfont\Large\bfseries}}
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\large\bfseries}}
+ {\normalfont\large\bfseries}}
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\appendix}{\par
\setcounter{chapter}{0}%
\setcounter{section}{0}%
@@ -526,7 +527,7 @@
{\ifnum \@enumdepth >\thr@@\@toodeep\else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \list{\csname label\@enumctr\endcsname}{%
+ \expandafter \list \csname label\@enumctr\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -553,8 +554,7 @@
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list{\csname \@itemitem\endcsname}{%
+ \expandafter \list \csname \@itemitem\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -632,7 +632,7 @@
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
\setlength\arraycolsep{5\p@}
@@ -688,7 +688,7 @@
\newdimen\toclineskip
\setlength\toclineskip{\z@}
\newdimen\@lnumwidth
-\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
+\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c@tocdepth \else
\vskip\toclineskip \@plus.2\p@
@@ -697,7 +697,7 @@
\interlinepenalty\@M
\leavevmode
\@lnumwidth #3\relax
- \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
+ \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m@th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
@@ -729,7 +729,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb@xt@\@pnumwidth{\hss#2}}\par
\nobreak
\global\@nobreaktrue
\everypar{\global\@nobreakfalse\everypar{}}%
@@ -744,7 +744,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{4zw}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss#2}\par
\penalty\@highpenalty
\endgroup
\fi}
@@ -756,8 +756,8 @@
\newcommand{\listoffigures}{%
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+ \chapter*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
\if@restonecol\twocolumn\fi
}
@@ -765,8 +765,8 @@
\newcommand{\listoftables}{%
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+ \chapter*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
\if@restonecol\twocolumn\fi
}
@@ -775,7 +775,7 @@
\setlength\bibindent{1.5em}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\newenvironment{thebibliography}[1]
-{\chapter*{\bibname\@mkboth{\bibname}{\bibname}}%
+{\chapter*{\bibname}\@mkboth{\bibname}{\bibname}%
\list{\@biblabel{\@arabic\c@enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -795,11 +795,11 @@
\let\@openbib@code\@empty
\newenvironment{theindex}
{\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
\twocolumn[\@makeschapterhead{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl@in}\parindent\z@
\parskip\z@ \@plus .3\p@\relax
+ \columnseprule\z@ \columnsep 35\p@
\let\item\@idxitem}
{\if@restonecol\onecolumn\else\clearpage\fi}
\newcommand{\@idxitem}{\par\hangindent 40\p@}
@@ -808,11 +808,11 @@
\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
\renewcommand{\footnoterule}{%
\kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \hrule\@width.4\columnwidth
+ \kern2.6\p@}
\@addtoreset{footnote}{chapter}
\newcommand\@makefntext[1]{\parindent 1em
- \noindent\hbox to 1.8em{\hss\@makefnmark}#1}
+ \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1}
\newif\if$B@>Nq(B \$B@>Nq(Bfalse
\def\$B@>Nq(B{\$B@>Nq(Btrue}
\def\$BOBNq(B{\$B@>Nq(Bfalse}
diff --git a/Master/texmf-dist/tex/platex/base/jsize10.clo b/Master/texmf-dist/tex/platex/base/jsize10.clo
index e8e91a691ec..78980e3fc9b 100644
--- a/Master/texmf-dist/tex/platex/base/jsize10.clo
+++ b/Master/texmf-dist/tex/platex/base/jsize10.clo
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{jsize10.clo}
- [2006/06/27 v1.6
+ [2016/11/22 v1.7b
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 e3f1cad21da..b1d9ec0b007 100644
--- a/Master/texmf-dist/tex/platex/base/jsize11.clo
+++ b/Master/texmf-dist/tex/platex/base/jsize11.clo
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{jsize11.clo}
- [2006/06/27 v1.6
+ [2016/11/22 v1.7b
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 33d10675a15..e045bc7a65a 100644
--- a/Master/texmf-dist/tex/platex/base/jsize12.clo
+++ b/Master/texmf-dist/tex/platex/base/jsize12.clo
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{jsize12.clo}
- [2006/06/27 v1.6
+ [2016/11/22 v1.7b
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
diff --git a/Master/texmf-dist/tex/platex/base/pfltrace.sty b/Master/texmf-dist/tex/platex/base/pfltrace.sty
index d7daa4ca196..8375b45e319 100644
--- a/Master/texmf-dist/tex/platex/base/pfltrace.sty
+++ b/Master/texmf-dist/tex/platex/base/pfltrace.sty
@@ -70,6 +70,7 @@
}\vss}%
\fi
{\setbox \@tempboxa \box \@kludgeins}%
+ \fl@trace {kludgeins box made void}%
}
\endinput
%%
diff --git a/Master/texmf-dist/tex/platex/base/platex.ltx b/Master/texmf-dist/tex/platex/base/platex.ltx
index e5ba0c13b4f..5d486ae53ef 100644
--- a/Master/texmf-dist/tex/platex/base/platex.ltx
+++ b/Master/texmf-dist/tex/platex/base/platex.ltx
@@ -16,7 +16,7 @@
\let\orgdump\dump
\let\dump\relax
\input latex.ltx
-\edef\platexBANNER{\the\everyjob}% save LaTeX banner
+\edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}% save LaTeX banner
\typeout{**************************^^J%
*^^J%
* making pLaTeX format^^J%
diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty
index da7f6381c20..659d26153aa 100644
--- a/Master/texmf-dist/tex/platex/base/platexrelease.sty
+++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty
@@ -18,7 +18,7 @@
\edef\p@known@latexreleaseversion
{2016/03/31}
\edef\platexreleaseversion
- {2016/09/08}
+ {2016/11/29}
\def\plIncludeInRelease#1{\kernel@ifnextchar[%
{\@plIncludeInRelease{#1}}
{\@plIncludeInRelease{#1}[#1]}}
@@ -631,6 +631,57 @@ of this package available from CTAN}
\ifmmode\@@underline{#1}%
\else $\@@underline{\hbox{#1}}\m@th$\relax\fi}
\plEndIncludeInRelease
+\plIncludeInRelease{2016/11/29}%
+ {\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
+ \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
+\plEndIncludeInRelease
+\plIncludeInRelease{2015/01/01}%
+ {\e@alloc@chardef}{Extended Allocation (FAM256)}%
+\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
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}%
+ {\e@alloc@chardef}{Extended Allocation (FAM256)}%
+\let\e@alloc@top\@undefined
+\let\e@alloc@chardef\@undefined
+\plEndIncludeInRelease
+\plIncludeInRelease{2016/11/29}%
+ {\e@mathgroup@top}{Extended Allocation (FAM256)}%
+\ifx\omathchar\@undefined
+ \chardef\e@mathgroup@top=16 % LaTeX2e kernel standard
+\else
+ \mathchardef\e@mathgroup@top=256 % for e-pTeX FAM256 patched
+\fi
+\plEndIncludeInRelease
+\plIncludeInRelease{2015/01/01}%
+ {\e@mathgroup@top}{Extended Allocation (FAM256)}%
+\chardef\e@mathgroup@top=16
+\plEndIncludeInRelease
+\plIncludeInRelease{0000/00/00}%
+ {\e@mathgroup@top}{Extended Allocation (FAM256)}%
+\let\e@mathgroup@top\@undefined
+\plEndIncludeInRelease
\endinput
%%
%% End of file `platexrelease.sty'.
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx
index 538c61d93c7..57453dce9d3 100644
--- a/Master/texmf-dist/tex/platex/base/plcore.ltx
+++ b/Master/texmf-dist/tex/platex/base/plcore.ltx
@@ -18,7 +18,7 @@
%% File: plvers.dtx
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
- {2016/09/08}
+ {2016/11/29}
\def\ppatch@level{0}
\def\plIncludeInRelease#1{\kernel@ifnextchar[%
{\@plIncludeInRelease{#1}}
@@ -1004,32 +1004,52 @@
\relax
\ifmmode\@@underline{#1}%
\else \leavevmode\null$\@@underline{\hbox{#1}}\m@th$\null\relax\fi}
+\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
+ \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
+\else
+ \mathchardef\e@mathgroup@top=256 % for e-pTeX FAM256 patched
+\fi
%% File: plvers.dtx
\ifx\patch@level\@undefined % fallback if undefined in LaTeX
\def\patch@level{0}\fi
\ifx\ppatch@level\@undefined % fallback if undefined in pLaTeX
\def\ppatch@level{0}\fi
\begingroup
- \def\parse@BANNER#1{\expandafter\parse@@BANNER#1}
- \def\parse@@BANNER#1#2#3#4{#2}
+ \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#1}
\edef\platexTMP{%
\ifnum\ppatch@level=0
\everyjob{\noexpand\typeout{%
\pfmtname\space<\pfmtversion>\space
- (based on \parse@BANNER{\platexBANNER})}}%
+ (based on \expandafter\parse@@BANNER\platexBANNER)}}%
\else
\everyjob{\noexpand\typeout{%
\pfmtname\space<\pfmtversion>+\ppatch@level\space
- (based on \parse@BANNER{\platexBANNER})}}%
+ (based on \expandafter\parse@@BANNER\platexBANNER)}}%
\fi
}
\expandafter
\endgroup \platexTMP
\begingroup
- \def\parse@BANNER#1{\expandafter\parse@@BANNER#1}
- \def\parse@@BANNER#1#2#3#4{#4}
+ \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#2}
\edef\platexTMP{%
- \the\everyjob\noexpand\typeout{\parse@BANNER{\platexBANNER}}%
+ \the\everyjob\noexpand\typeout{\expandafter\parse@@BANNER\platexBANNER}%
}
\everyjob=\expandafter{\platexTMP}%
\edef\platexTMP{%
diff --git a/Master/texmf-dist/tex/platex/base/plext.sty b/Master/texmf-dist/tex/platex/base/plext.sty
index fd30b518ee9..dd503892abc 100644
--- a/Master/texmf-dist/tex/platex/base/plext.sty
+++ b/Master/texmf-dist/tex/platex/base/plext.sty
@@ -15,7 +15,7 @@
%% File: plext.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{plext}
- [2016/08/20 v1.2a pLaTeX package file (community edition)]
+ [2016/11/19 v1.2c pLaTeX package file (community edition)]
\newif\if@rotsw
\def\array{\let\@acol\@arrayacol \let\@classz\@arrayclassz
\let\@classiv\@arrayclassiv
@@ -27,7 +27,9 @@
{\p@tabarray}{\p@tabarray<Z>}}
\def\X@tabular{\@ifnextchar<%>
{\p@tabular}{\p@tabular<Z>}}
-\def\@stabular<#1>#2{\def\@halignto{to#2}\p@tabular<#1>}
+\def\@stabular<#1>#2{%
+ \setlength\dimen@{#2}%
+ \edef\@halignto{to\the\dimen@}\p@tabular<#1>}
\def\p@tabular<#1>{\leavevmode \null\hbox \bgroup $\let\@acol\@tabacol
\let\@classz\@tabclassz
\let\@classiv\@tabclassiv \let\\\@tabularcr\p@tabarray<#1>}
@@ -252,9 +254,9 @@
\def\minipage{\@ifnextchar<%>
{\X@minipage}{\X@minipage<Z>}}
\def\X@minipage<#1>{\@ifnextchar[%]
- {\@iminipage<#1>}{\@iiiminipage<#1>{c}\@empty[s]}}
+ {\@iminipage<#1>}{\@iiiminipage<#1>{c}\relax[s]}}
\def\@iminipage<#1>[#2]{\@ifnextchar[%]
- {\@iiminipage<#1>{#2}}{\@iiiminipage<#1>{#2}\@empty[s]}}
+ {\@iiminipage<#1>{#2}}{\@iiiminipage<#1>{#2}\relax[s]}}
\def\@iiminipage<#1>#2[#3]{\@ifnextchar[%]
{\@iiiminipage<#1>{#2}{#3}}{\@iiiminipage<#1>{#2}{#3}[#2]}}
\def\@iiiminipage<#1>#2#3[#4]#5{%
@@ -284,8 +286,7 @@
\let\@footnotetext\@mpfootnotetext
\let\@listdepth\@mplistdepth \@mplistdepth\z@
\@minipagerestore
- \global\@minipagetrue %% \global added 24 May 89
- \everypar{\global\@minipagefalse\everypar{}}}
+ \@setminipage}
\def\endminipage{%
\par
\unskip
@@ -295,7 +296,7 @@
\footnoterule
\unvbox\@mpfootins
\fi
- \global\@minipagefalse %% added 24 May 89
+ \@minipagefalse %% added 24 May 89
\color@endgroup
\if@rotsw \egroup\m@th$\egroup\fi
\egroup
@@ -303,9 +304,9 @@
\def\parbox{\@ifnextchar<%>
{\X@parbox}{\X@parbox<Z>}}
\def\X@parbox<#1>{\@ifnextchar[%]
- {\@iparbox<#1>}{\@iiiparbox<#1>{c}\@empty[s]}}
+ {\@iparbox<#1>}{\@iiiparbox<#1>{c}\relax[s]}}
\def\@iparbox<#1>[#2]{\@ifnextchar[%]
- {\@iiparbox<#1>{#2}}{\@iiiparbox<#1>{#2}\@empty[s]}}
+ {\@iiparbox<#1>{#2}}{\@iiiparbox<#1>{#2}\relax[s]}}
\def\@iiparbox<#1>#2[#3]{\@ifnextchar[%]%
{\@iiiparbox<#1>{#2}{#3}}{\@iiiparbox<#1>{#2}{#3}[#2]}}
\long\def\@iiiparbox<#1>#2#3[#4]#5#6{%
@@ -314,14 +315,14 @@
\fork@parbox@option<#1>[#2]%
\if@rotsw
\@begin@tempboxa\vbox{\box@dir\hsize\@tempdima
- \hbox{$\vbox{\@parboxrestore\adjustbaseline#6\endgraf}\m@th$}}%
+ \hbox{$\vbox{\@parboxrestore\adjustbaseline#6\@@par}\m@th$}}%
\else
\@begin@tempboxa\vbox{\box@dir
- \hsize\@tempdima\@parboxrestore\adjustbaseline#6\endgraf}%
+ \hsize\@tempdima\@parboxrestore\adjustbaseline#6\@@par}%
\fi
- \ifx\@empty#3\relax\else
+ \ifx\relax#3\relax\else
\setlength\@tempdimb{#3}%
- \def\@parboxto{to\@tempdimb}%
+ \edef\@parboxto{to\the\@tempdimb}%
\fi
\@begin@parbox\@parboxto{\box@dir\adjustbaseline
\let\hss\vss\let\unhbox\unvbox
@@ -482,9 +483,10 @@
\DeclareRobustCommand\rensuji{%
\@ifstar{\not@advancelinetrue\@rensuji}{\@rensuji}}
\def\@rensuji{\@ifnextchar[{\@@rensuji}{\@@rensuji[c]}}
-\def\@@rensuji[#1]#2{\ifydir\hbox{#2}\else
- \hskip\rensujiskip
+\def\@@rensuji[#1]#2{%
\ifvmode\leavevmode\fi
+ \ifydir\hbox{#2}\else
+ \hskip\rensujiskip
\ifnot@advanceline\not@advancelinefalse\else
\setbox\z@\hbox{\yoko#2}%
\@tempdima\ht\z@ \advance\@tempdima\dp\z@
diff --git a/Master/texmf-dist/tex/platex/base/tarticle.cls b/Master/texmf-dist/tex/platex/base/tarticle.cls
index 6477ece89e0..258f8d010da 100644
--- a/Master/texmf-dist/tex/platex/base/tarticle.cls
+++ b/Master/texmf-dist/tex/platex/base/tarticle.cls
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{tarticle}
- [2006/06/27 v1.6
+ [2016/11/22 v1.7b
Standard pLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -293,7 +293,7 @@
\def\@makefnmark{\hbox{\ifydir $\m@th^{\@thefnmark}$
\else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
\long\def\@makefntext##1{\parindent 1zw\noindent
- \hbox to 2zw{\hss\@makefnmark}##1}%
+ \hb@xt@ 2zw{\hss\@makefnmark}##1}%
\if@twocolumn
\ifnum \col@number=\@ne \@maketitle
\else \twocolumn[\@maketitle]%
@@ -308,6 +308,7 @@
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
+ \global\let\@maketitle\relax
\global\let\p@thanks\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
@@ -373,7 +374,9 @@
\thesubsubsection$B!&(B\rensuji{\@arabic\c@paragraph}}
\renewcommand{\thesubparagraph}{%
\theparagraph$B!&(B\rensuji{\@arabic\c@subparagraph}}
-\newcommand{\part}{\par\addvspace{4ex}%
+\newcommand{\part}{%
+ \if@noskipsec \leavevmode \fi
+ \par\addvspace{4ex}%
\@afterindenttrue
\secdef\@part\@spart}
\def\@part[#1]#2{%
@@ -386,7 +389,7 @@
\fi
\markboth{}{}%
{\parindent\z@\raggedright
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\ifnum \c@secnumdepth >\m@ne
\Large\bfseries\prepartname\thepart\postpartname
\par\nobreak
@@ -395,29 +398,29 @@
\nobreak\vskip3ex\@afterheading}
\def\@spart#1{{%
\parindent\z@\raggedright
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\huge\bfseries#1\par}%
\nobreak\vskip3ex\@afterheading}
\newcommand{\section}{\@startsection{section}{1}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\Large\bfseries}}
+ {\normalfont\Large\bfseries}}
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\large\bfseries}}
+ {\normalfont\large\bfseries}}
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\appendix}{\par
\setcounter{section}{0}%
\setcounter{subsection}{0}%
@@ -458,7 +461,7 @@
{\ifnum \@enumdepth >\thr@@\@toodeep\else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \list{\csname label\@enumctr\endcsname}{%
+ \expandafter \list \csname label\@enumctr\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -485,8 +488,7 @@
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list{\csname \@itemitem\endcsname}{%
+ \expandafter \list \csname \@itemitem\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -562,7 +564,7 @@
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
\setlength\arraycolsep{5\p@}
@@ -616,7 +618,7 @@
\newdimen\toclineskip
\setlength\toclineskip{2\p@}
\newdimen\@lnumwidth
-\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
+\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c@tocdepth \else
\vskip\toclineskip \@plus.2\p@
@@ -625,7 +627,7 @@
\interlinepenalty\@M
\leavevmode
\@lnumwidth #3\relax
- \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
+ \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m@th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
@@ -654,7 +656,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb@xt@\@pnumwidth{\hss#2}}\par
\nobreak
\if@compatibility
\global\@nobreaktrue
@@ -671,7 +673,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{1.5em}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss#2}\par
\endgroup
\fi}
\newcommand*{\l@subsection} {\@dottedtocline{2}{1zw}{4zw}}
@@ -679,14 +681,14 @@
\newcommand*{\l@paragraph} {\@dottedtocline{4}{3zw}{8zw}}
\newcommand*{\l@subparagraph} {\@dottedtocline{5}{4zw}{9zw}}
\newcommand{\listoffigures}{%
- \section*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+ \section*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
}
\newcommand*{\l@figure}{\@dottedtocline{1}{1zw}{4zw}}
\newcommand{\listoftables}{%
- \section*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+ \section*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
}
\let\l@table\l@figure
@@ -694,7 +696,7 @@
\setlength\bibindent{1.5em}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\newenvironment{thebibliography}[1]
-{\section*{\refname\@mkboth{\refname}{\refname}}%
+{\section*{\refname}\@mkboth{\refname}{\refname}%
\list{\@biblabel{\@arabic\c@enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -714,11 +716,11 @@
\let\@openbib@code\@empty
\newenvironment{theindex}
{\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
\twocolumn[\section*{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl@in}\parindent\z@
\parskip\z@ \@plus .3\p@\relax
+ \columnseprule\z@ \columnsep 35\p@
\let\item\@idxitem}
{\if@restonecol\onecolumn\else\clearpage\fi}
\newcommand{\@idxitem}{\par\hangindent 40\p@}
@@ -727,10 +729,10 @@
\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
\renewcommand{\footnoterule}{%
\kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \hrule\@width.4\columnwidth
+ \kern2.6\p@}
\newcommand\@makefntext[1]{\parindent 1zw
- \noindent\hbox to 2zw{\hss\@makefnmark}#1}
+ \noindent\hb@xt@ 2zw{\hss\@makefnmark}#1}
\newif\if$B@>Nq(B \$B@>Nq(Bfalse
\def\$B@>Nq(B{\$B@>Nq(Btrue}
\def\$BOBNq(B{\$B@>Nq(Bfalse}
diff --git a/Master/texmf-dist/tex/platex/base/tbk10.clo b/Master/texmf-dist/tex/platex/base/tbk10.clo
index 40aeab193b2..ac9037fc6e6 100644
--- a/Master/texmf-dist/tex/platex/base/tbk10.clo
+++ b/Master/texmf-dist/tex/platex/base/tbk10.clo
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{tbk10.clo}
- [2006/06/27 v1.6
+ [2016/11/22 v1.7b
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 7ad84979e13..90fd84a193b 100644
--- a/Master/texmf-dist/tex/platex/base/tbk11.clo
+++ b/Master/texmf-dist/tex/platex/base/tbk11.clo
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{tbk11.clo}
- [2006/06/27 v1.6
+ [2016/11/22 v1.7b
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 1540bfea817..fba4457a085 100644
--- a/Master/texmf-dist/tex/platex/base/tbk12.clo
+++ b/Master/texmf-dist/tex/platex/base/tbk12.clo
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{tbk12.clo}
- [2006/06/27 v1.6
+ [2016/11/22 v1.7b
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 6eff68c3b33..446af36373e 100644
--- a/Master/texmf-dist/tex/platex/base/tbook.cls
+++ b/Master/texmf-dist/tex/platex/base/tbook.cls
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{tbook}
- [2006/06/27 v1.6
+ [2016/11/22 v1.7b
Standard pLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -319,7 +319,7 @@
\def\@makefnmark{\hbox{\ifydir $\m@th^{\@thefnmark}$
\else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
\long\def\@makefntext##1{\parindent 1zw\noindent
- \hbox to 2zw{\hss\@makefnmark}##1}%
+ \hb@xt@ 2zw{\hss\@makefnmark}##1}%
\if@twocolumn
\ifnum \col@number=\@ne \@maketitle
\else \twocolumn[\@maketitle]%
@@ -334,6 +334,7 @@
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
+ \global\let\@maketitle\relax
\global\let\p@thanks\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
@@ -382,7 +383,7 @@
\theparagraph$B!&(B\rensuji{\@arabic\c@subparagraph}}
\newcommand{\@chapapp}{\prechaptername}
\newcommand{\@chappos}{\postchaptername}
-\newcommand\frontmatter{%
+\newcommand{\frontmatter}{%
\if@openright \cleardoublepage \else \clearpage \fi
\@mainmatterfalse\pagenumbering{roman}}
\newcommand{\mainmatter}{%
@@ -407,7 +408,7 @@
\fi
\markboth{}{}%
{\centering
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\ifnum \c@secnumdepth >-2\relax
\huge\bfseries\prepartname\thepart\postpartname
\par\vskip20\p@
@@ -416,7 +417,7 @@
\@endpart}
\def\@spart#1{{%
\centering
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\Huge\bfseries#1\par}%
\@endpart}
\def\@endpart{\vfil\newpage
@@ -447,7 +448,7 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset@font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\ifnum \c@secnumdepth >\m@ne
\setlength\@tempdima{\linewidth}%
@@ -467,30 +468,30 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset@font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\setlength\@tempdima{\linewidth}%
\vtop{\hsize\@tempdima#1}}\vskip3\Cvs}
\newcommand{\section}{\@startsection{section}{1}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\Large\bfseries}}
+ {\normalfont\Large\bfseries}}
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\large\bfseries}}
+ {\normalfont\large\bfseries}}
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\appendix}{\par
\setcounter{chapter}{0}%
\setcounter{section}{0}%
@@ -533,7 +534,7 @@
{\ifnum \@enumdepth >\thr@@\@toodeep\else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \list{\csname label\@enumctr\endcsname}{%
+ \expandafter \list \csname label\@enumctr\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -560,8 +561,7 @@
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list{\csname \@itemitem\endcsname}{%
+ \expandafter \list \csname \@itemitem\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -639,7 +639,7 @@
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
\setlength\arraycolsep{5\p@}
@@ -695,7 +695,7 @@
\newdimen\toclineskip
\setlength\toclineskip{2\p@}
\newdimen\@lnumwidth
-\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
+\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c@tocdepth \else
\vskip\toclineskip \@plus.2\p@
@@ -704,7 +704,7 @@
\interlinepenalty\@M
\leavevmode
\@lnumwidth #3\relax
- \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
+ \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m@th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
@@ -736,7 +736,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb@xt@\@pnumwidth{\hss#2}}\par
\nobreak
\global\@nobreaktrue
\everypar{\global\@nobreakfalse\everypar{}}%
@@ -751,7 +751,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{4zw}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss#2}\par
\penalty\@highpenalty
\endgroup
\fi}
@@ -763,8 +763,8 @@
\newcommand{\listoffigures}{%
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+ \chapter*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
\if@restonecol\twocolumn\fi
}
@@ -772,8 +772,8 @@
\newcommand{\listoftables}{%
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+ \chapter*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
\if@restonecol\twocolumn\fi
}
@@ -782,7 +782,7 @@
\setlength\bibindent{1.5em}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\newenvironment{thebibliography}[1]
-{\chapter*{\bibname\@mkboth{\bibname}{\bibname}}%
+{\chapter*{\bibname}\@mkboth{\bibname}{\bibname}%
\list{\@biblabel{\@arabic\c@enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -802,11 +802,11 @@
\let\@openbib@code\@empty
\newenvironment{theindex}
{\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
\twocolumn[\@makeschapterhead{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl@in}\parindent\z@
\parskip\z@ \@plus .3\p@\relax
+ \columnseprule\z@ \columnsep 35\p@
\let\item\@idxitem}
{\if@restonecol\onecolumn\else\clearpage\fi}
\newcommand{\@idxitem}{\par\hangindent 40\p@}
@@ -815,11 +815,11 @@
\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
\renewcommand{\footnoterule}{%
\kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \hrule\@width.4\columnwidth
+ \kern2.6\p@}
\@addtoreset{footnote}{chapter}
\newcommand\@makefntext[1]{\parindent 1zw
- \noindent\hbox to 2zw{\hss\@makefnmark}#1}
+ \noindent\hb@xt@ 2zw{\hss\@makefnmark}#1}
\newif\if$B@>Nq(B \$B@>Nq(Bfalse
\def\$B@>Nq(B{\$B@>Nq(Btrue}
\def\$BOBNq(B{\$B@>Nq(Bfalse}
diff --git a/Master/texmf-dist/tex/platex/base/treport.cls b/Master/texmf-dist/tex/platex/base/treport.cls
index 8165c53459e..f5b0da97350 100644
--- a/Master/texmf-dist/tex/platex/base/treport.cls
+++ b/Master/texmf-dist/tex/platex/base/treport.cls
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{treport}
- [2006/06/27 v1.6
+ [2016/11/22 v1.7b
Standard pLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -307,7 +307,7 @@
\def\@makefnmark{\hbox{\ifydir $\m@th^{\@thefnmark}$
\else\hbox{\yoko$\m@th^{\@thefnmark}$}\fi}}%
\long\def\@makefntext##1{\parindent 1zw\noindent
- \hbox to 2zw{\hss\@makefnmark}##1}%
+ \hb@xt@ 2zw{\hss\@makefnmark}##1}%
\if@twocolumn
\ifnum \col@number=\@ne \@maketitle
\else \twocolumn[\@maketitle]%
@@ -322,6 +322,7 @@
\setcounter{footnote}{0}%
\global\let\thanks\relax
\global\let\maketitle\relax
+ \global\let\@maketitle\relax
\global\let\p@thanks\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
@@ -408,7 +409,7 @@
\fi
\markboth{}{}%
{\centering
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\ifnum \c@secnumdepth >-2\relax
\huge\bfseries\prepartname\thepart\postpartname
\par\vskip20\p@
@@ -417,7 +418,7 @@
\@endpart}
\def\@spart#1{{%
\centering
- \interlinepenalty\@M\reset@font
+ \interlinepenalty\@M\normalfont
\Huge\bfseries#1\par}%
\@endpart}
\def\@endpart{\vfil\newpage
@@ -446,7 +447,7 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset@font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\ifnum \c@secnumdepth >\m@ne
\setlength\@tempdima{\linewidth}%
@@ -464,30 +465,30 @@
\vskip2\Cvs
{\parindent\z@
\raggedright
- \reset@font\huge\bfseries
+ \normalfont\huge\bfseries
\leavevmode
\setlength\@tempdima{\linewidth}%
\vtop{\hsize\@tempdima#1}}\vskip3\Cvs}
\newcommand{\section}{\@startsection{section}{1}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\Large\bfseries}}
+ {\normalfont\Large\bfseries}}
\newcommand{\subsection}{\@startsection{subsection}{2}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\large\bfseries}}
+ {\normalfont\large\bfseries}}
\newcommand{\subsubsection}{\@startsection{subsubsection}{3}{\z@}%
{1.5\Cvs \@plus.5\Cvs \@minus.2\Cvs}%
{.5\Cvs \@plus.3\Cvs}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\paragraph}{\@startsection{paragraph}{4}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\subparagraph}{\@startsection{subparagraph}{5}{\z@}%
{3.25ex \@plus 1ex \@minus .2ex}%
{-1em}%
- {\reset@font\normalsize\bfseries}}
+ {\normalfont\normalsize\bfseries}}
\newcommand{\appendix}{\par
\setcounter{chapter}{0}%
\setcounter{section}{0}%
@@ -530,7 +531,7 @@
{\ifnum \@enumdepth >\thr@@\@toodeep\else
\advance\@enumdepth\@ne
\edef\@enumctr{enum\romannumeral\the\@enumdepth}%
- \list{\csname label\@enumctr\endcsname}{%
+ \expandafter \list \csname label\@enumctr\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -557,8 +558,7 @@
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
\edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
- \expandafter
- \list{\csname \@itemitem\endcsname}{%
+ \expandafter \list \csname \@itemitem\endcsname{%
\iftdir
\ifnum \@listdepth=\@ne \topsep.5\normalbaselineskip
\else\topsep\z@\fi
@@ -636,7 +636,7 @@
\else #1: #2\relax\par\fi
\else
\global \@minipagefalse
- \hbox to\hsize{\hfil\box\@tempboxa\hfil}%
+ \hb@xt@\hsize{\hfil\box\@tempboxa\hfil}%
\fi
\vskip\belowcaptionskip}
\setlength\arraycolsep{5\p@}
@@ -692,7 +692,7 @@
\newdimen\toclineskip
\setlength\toclineskip{2\p@}
\newdimen\@lnumwidth
-\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}}
+\def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}}
\def\@dottedtocline#1#2#3#4#5{%
\ifnum #1>\c@tocdepth \else
\vskip\toclineskip \@plus.2\p@
@@ -701,7 +701,7 @@
\interlinepenalty\@M
\leavevmode
\@lnumwidth #3\relax
- \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip
+ \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip
{#4}\nobreak
\leaders\hbox{$\m@th \mkern \@dotsep mu.\mkern \@dotsep mu$}%
\hfill\nobreak
@@ -733,7 +733,7 @@
{\leavevmode\large\bfseries
\setlength\@lnumwidth{4zw}%
#1\hfil\nobreak
- \hbox to\@pnumwidth{\hss#2}}\par
+ \hb@xt@\@pnumwidth{\hss#2}}\par
\nobreak
\global\@nobreaktrue
\everypar{\global\@nobreakfalse\everypar{}}%
@@ -748,7 +748,7 @@
\leavevmode\bfseries
\setlength\@lnumwidth{4zw}%
\advance\leftskip\@lnumwidth \hskip-\leftskip
- #1\nobreak\hfil\nobreak\hbox to\@pnumwidth{\hss#2}\par
+ #1\nobreak\hfil\nobreak\hb@xt@\@pnumwidth{\hss#2}\par
\penalty\@highpenalty
\endgroup
\fi}
@@ -760,8 +760,8 @@
\newcommand{\listoffigures}{%
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listfigurename
- \@mkboth{\listfigurename}{\listfigurename}}%
+ \chapter*{\listfigurename}%
+ \@mkboth{\listfigurename}{\listfigurename}%
\@starttoc{lof}%
\if@restonecol\twocolumn\fi
}
@@ -769,8 +769,8 @@
\newcommand{\listoftables}{%
\if@twocolumn\@restonecoltrue\onecolumn
\else\@restonecolfalse\fi
- \chapter*{\listtablename
- \@mkboth{\listtablename}{\listtablename}}%
+ \chapter*{\listtablename}%
+ \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
\if@restonecol\twocolumn\fi
}
@@ -779,7 +779,7 @@
\setlength\bibindent{1.5em}
\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em}
\newenvironment{thebibliography}[1]
-{\chapter*{\bibname\@mkboth{\bibname}{\bibname}}%
+{\chapter*{\bibname}\@mkboth{\bibname}{\bibname}%
\list{\@biblabel{\@arabic\c@enumiv}}%
{\settowidth\labelwidth{\@biblabel{#1}}%
\leftmargin\labelwidth
@@ -799,11 +799,11 @@
\let\@openbib@code\@empty
\newenvironment{theindex}
{\if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi
- \columnseprule\z@ \columnsep 35\p@
\twocolumn[\@makeschapterhead{\indexname}]%
\@mkboth{\indexname}{\indexname}%
\thispagestyle{jpl@in}\parindent\z@
\parskip\z@ \@plus .3\p@\relax
+ \columnseprule\z@ \columnsep 35\p@
\let\item\@idxitem}
{\if@restonecol\onecolumn\else\clearpage\fi}
\newcommand{\@idxitem}{\par\hangindent 40\p@}
@@ -812,11 +812,11 @@
\newcommand{\indexspace}{\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax}
\renewcommand{\footnoterule}{%
\kern-3\p@
- \hrule width .4\columnwidth
- \kern 2.6\p@}
+ \hrule\@width.4\columnwidth
+ \kern2.6\p@}
\@addtoreset{footnote}{chapter}
\newcommand\@makefntext[1]{\parindent 1zw
- \noindent\hbox to 2zw{\hss\@makefnmark}#1}
+ \noindent\hb@xt@ 2zw{\hss\@makefnmark}#1}
\newif\if$B@>Nq(B \$B@>Nq(Bfalse
\def\$B@>Nq(B{\$B@>Nq(Btrue}
\def\$BOBNq(B{\$B@>Nq(Bfalse}
diff --git a/Master/texmf-dist/tex/platex/base/tsize10.clo b/Master/texmf-dist/tex/platex/base/tsize10.clo
index 4fec08f1873..91da6e42af9 100644
--- a/Master/texmf-dist/tex/platex/base/tsize10.clo
+++ b/Master/texmf-dist/tex/platex/base/tsize10.clo
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{tsize10.clo}
- [2006/06/27 v1.6
+ [2016/11/22 v1.7b
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 235b63cc579..08c9a18bde3 100644
--- a/Master/texmf-dist/tex/platex/base/tsize11.clo
+++ b/Master/texmf-dist/tex/platex/base/tsize11.clo
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{tsize11.clo}
- [2006/06/27 v1.6
+ [2016/11/22 v1.7b
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 1da44debfdd..c7b6b638fac 100644
--- a/Master/texmf-dist/tex/platex/base/tsize12.clo
+++ b/Master/texmf-dist/tex/platex/base/tsize12.clo
@@ -15,7 +15,7 @@
%% File: jclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{tsize12.clo}
- [2006/06/27 v1.6
+ [2016/11/22 v1.7b
Standard pLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%