diff options
author | Karl Berry <karl@freefriends.org> | 2016-11-29 23:10:13 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-11-29 23:10:13 +0000 |
commit | 50af93dae9406f214b5d201358f644f50ba8a647 (patch) | |
tree | 2a391bbfcd2feb0476185a11de68b0ef474e7e72 /Master/texmf-dist/tex | |
parent | 1741a29b754b38b1fc490e01f12b7b32493207f9 (diff) |
platex (29nov16)
git-svn-id: svn://tug.org/texlive/trunk@42603 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
24 files changed, 339 insertions, 207 deletions
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}% |