diff options
author | Karl Berry <karl@freefriends.org> | 2018-04-07 20:56:23 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-04-07 20:56:23 +0000 |
commit | 5701e62841cb98a03c4f207f4d9d8c803b1c38b9 (patch) | |
tree | 9f1666de03b948074238a12a9a10dafa8f2816b2 /Master/texmf-dist/tex | |
parent | 70d5fea8af99c5bb4c6f4613787a7c714220369e (diff) |
platex (7apr18)
git-svn-id: svn://tug.org/texlive/trunk@47353 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/platex/base/exppl2e.sty | 22 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/base/jbook.cls | 14 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/base/jreport.cls | 14 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/base/platexrelease.sty | 93 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/base/plcore.ltx | 70 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/base/tbook.cls | 14 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/base/treport.cls | 14 |
7 files changed, 191 insertions, 50 deletions
diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty index ed4430d05a3..afdc6718398 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} - [2018/03/12 v1.0t Experimental pLaTeX2e features] + [2018/04/06 v1.0u Experimental pLaTeX2e features] \PackageWarningNoLine{exppl2e}{% This is the unstable, experimental part of pLaTeX2e.\MessageBreak This package may contain:\MessageBreak @@ -359,6 +359,26 @@ % % $B$5$i$J$k=$@5$b(Bp\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B % +% \begin{macro}{\@setref@} +% $B$5$i$K!";2>H$7$?7k2L$,!V6u!W$N>l9g(B +%\begin{verbatim} +% \documentclass{article} +% \pagenumbering{gobble} +% \begin{document} +% \pageref{a}\label{a} +% \end{document} +%\end{verbatim} +% $B$KAj8_;2>H$,<}B+$7$J$/$J$k$N$rKI$0$?$a!"?eJ?%b!<%I0J30$G$O(B +% $B$d$O$j(B|\null|$B$rH/9T$7$F$_$^$9!#(B +% \begin{macrocode} +%\def\@setref@{\ifhmode\spacefactor\@m\else\null\fi} +% \end{macrocode} +% \end{macro} +% $B$3$N%3!<%I$O!"(Bemath$B$N(B|\marusuuref|$B$N$h$&$J(B +% $B!V(B|\ref|$B$r;H$C$F;2>H@h$NHV9f$@$1$r<hF@$9$k!W(B +% $B$H$$$&%^%/%m$NF0:n$K!J?bD>%b!<%I$G;H$&>l9g$J$I!K1F6A$9$k$?$a!"(B +% $B$R$H$^$:%3%a%s%H%"%&%H$7$F$*$-$^$9!#(B +% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % \section{$B5SCm$H%\%H%`%U%m!<%H$N=g=x$*$h$S?bD>0LCV(B} diff --git a/Master/texmf-dist/tex/platex/base/jbook.cls b/Master/texmf-dist/tex/platex/base/jbook.cls index ae4cef59e17..9d8c8f0a0ab 100644 --- a/Master/texmf-dist/tex/platex/base/jbook.cls +++ b/Master/texmf-dist/tex/platex/base/jbook.cls @@ -461,13 +461,13 @@ \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside - \if@openleft %% \if@openleft added (2017/02/15) - \null\thispagestyle{empty}\newpage - \else\if@openright %% \if@openright added (2016/12/18) - \null\thispagestyle{empty}\newpage - \fi\fi %% added (2016/12/18, 2017/02/15) - \fi + \if@twoside + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi\fi %% added (2016/12/18, 2017/02/15) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% \if@openleft \cleardoublepage \else diff --git a/Master/texmf-dist/tex/platex/base/jreport.cls b/Master/texmf-dist/tex/platex/base/jreport.cls index e6541e5929e..2979b63fffe 100644 --- a/Master/texmf-dist/tex/platex/base/jreport.cls +++ b/Master/texmf-dist/tex/platex/base/jreport.cls @@ -461,13 +461,13 @@ \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside - \if@openleft %% \if@openleft added (2017/02/15) - \null\thispagestyle{empty}\newpage - \else\if@openright %% \if@openright added (2016/12/18) - \null\thispagestyle{empty}\newpage - \fi\fi %% added (2016/12/18, 2017/02/15) - \fi + \if@twoside + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi\fi %% added (2016/12/18, 2017/02/15) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% \if@openleft \cleardoublepage \else diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index 619c40ecb90..f11e6f6a556 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -16,9 +16,9 @@ %% %% File: plvers.dtx \edef\p@known@latexreleaseversion - {2017/04/15} + {2018-04-01} \edef\platexreleaseversion - {2018/03/09} + {2018-04-01} \newif\if@plincludeinrelease \@plincludeinreleasefalse \def\plIncludeInRelease#1{% @@ -68,7 +68,7 @@ %% File: platexrelease.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{platexrelease} - [2018/01/27 v1.0k latexrelease support for pLaTeX Kernel + [2018/04/06 v1.0l latexrelease support for pLaTeX Kernel (including releases up to \platexreleaseversion)] \RequirePackageWithOptions{latexrelease} \ifnum\expandafter\@parse@version\latexreleaseversion//00\@nil @@ -94,7 +94,7 @@ \ifx\reserved@b\@empty\else \PackageError{platexrelease}% {Unexpected option \requestedplpatchdate}% - {The option must be of the form yyyy/mm/dd}% + {The option must be of the form yyyy/mm/dd or yyyy-mm-dd}% \fi} \afterassignment\reserved@a \count@\expandafter @@ -103,7 +103,7 @@ \expandafter\@parse@version\pfmtversion//00\@nil} \ifnum\requestedpLaTeXdate=\currentpLaTeXdate \PackageWarningNoLine{platexrelease}{% - Current format date selected, no patches applied.} + Current format date selected, no patches applied} \expandafter\endinput \fi \ifnum\currentpLaTeXdate @@ -131,6 +131,7 @@ of this package available from CTAN} some critical bugs. We advise you to\MessageBreak select another format date} \plIncludeInRelease{2017/10/28}{\PackageWarning}{pLaTeX Info}% + % * <2018-04-01> % * <2018/03/09>+1 % * <2018/03/09> % * <2017/10/28>+4 @@ -220,6 +221,75 @@ of this package available from CTAN} {Add \ystrut}% \let\ystrut\@undefined \plEndIncludeInRelease +\plIncludeInRelease{2018/04/01}{\DeclareFontEncoding@} + {UTF-8 Encoding}% +\def\DeclareFontEncoding@#1#2#3{% + \expandafter + \ifx\csname T@#1\endcsname\relax + \def\cdp@elt{\noexpand\cdp@elt}% + \xdef\cdp@list{\cdp@list\cdp@elt{#1}% + {\default@family}{\default@series}% + {\default@shape}}% + \expandafter\let\csname#1-cmd\endcsname\@changed@cmd + \def\enc@elt{\noexpand\enc@elt}% + \xdef\fenc@list{\fenc@list\enc@elt<#1>}% + \else + \@font@info{Redeclaring font encoding #1}% + \fi + \global\@namedef{T@#1}{#2}% + \global\@namedef{M@#1}{\default@M#3}% + \xdef\LastDeclaredEncoding{#1}% + } +\let\DeclareFontEncoding@saved\DeclareFontEncoding@ +\ifx\IeC\@undefined\else +\def\DeclareFontEncoding@#1#2#3{% + \expandafter + \ifx\csname T@#1\endcsname\relax + \def\cdp@elt{\noexpand\cdp@elt}% + \xdef\cdp@list{\cdp@list\cdp@elt{#1}% + {\default@family}{\default@series}% + {\default@shape}}% + \expandafter\let\csname#1-cmd\endcsname\@changed@cmd + \begingroup + \wlog{Now handling font encoding #1 ...}% + \lowercase{% + \InputIfFileExists{#1enc.dfu}}% + {\wlog{... processing UTF-8 mapping file for font % + encoding #1}}% + {\wlog{... no UTF-8 mapping file for font encoding #1}}% + \endgroup + \def\enc@elt{\noexpand\enc@elt}% + \xdef\fenc@list{\fenc@list\enc@elt<#1>}% + \else + \@font@info{Redeclaring font encoding #1}% + \fi + \global\@namedef{T@#1}{#2}% + \global\@namedef{M@#1}{\default@M#3}% + \xdef\LastDeclaredEncoding{#1}% + } +\fi +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\DeclareFontEncoding@} + {UTF-8 Encoding}% +\def\DeclareFontEncoding@#1#2#3{% + \expandafter + \ifx\csname T@#1\endcsname\relax + \def\cdp@elt{\noexpand\cdp@elt}% + \xdef\cdp@list{\cdp@list\cdp@elt{#1}% + {\default@family}{\default@series}% + {\default@shape}}% + \expandafter\let\csname#1-cmd\endcsname\@changed@cmd + \def\enc@elt{\noexpand\enc@elt}% + \xdef\fenc@list{\fenc@list\enc@elt<#1>}% + \else + \@font@info{Redeclaring font encoding #1}% + \fi + \global\@namedef{T@#1}{#2}% + \global\@namedef{M@#1}{\default@M#3}% + \xdef\LastDeclaredEncoding{#1}% + } +\let\DeclareFontEncoding@saved\@undefined +\plEndIncludeInRelease \plIncludeInRelease{2017/04/08}{\set@fontsize} {Construct \ystrutbox}% \def\set@fontsize#1#2#3{% @@ -554,8 +624,17 @@ of this package available from CTAN} \ifx\lastnodesubtype\@undefined \let\removejfmglue\@undefined \else - \def\pltx@gluetype{11} - \def\pltx@jfmgluesubtype{21} + \setbox0\hbox{% + \ifdefined\ucs %% upTeX check + \jfont\tenmin=upjisr-h at 9.62216pt + \else + \jfont\tenmin=min10 + \fi\tenmin + \char\jis"214B\null\setbox0\lastbox + \global\chardef\pltx@gluetype\lastnodetype + \global\chardef\pltx@jfmgluesubtype\lastnodesubtype + } + \setbox0=\box\voidb@x \protected\def\removejfmglue{% \ifnum\lastnodetype=\pltx@gluetype\relax \ifnum\lastnodesubtype=\pltx@jfmgluesubtype\relax diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index 8d723a272a8..b81e7669f1f 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -16,10 +16,25 @@ %% ------------------------------------------------------------- %% %% File: plvers.dtx +\ifx\fmtversion\@undefined + \errhelp{Please reinstall LaTeX.}% + \errmessage{This cannot happen!^^JYour file `latex.ltx' + might be broken}\@@end +\else + \ifnum\expandafter\@parse@version\fmtversion//00\@nil<20170415 + \errhelp{Please update your TeX installation; if not available, + obtain it^^Jmanually from CTAN + (https://ctan.org/pkg/latex-base) or from^^JGitHub + (https://github.com/latex3/latex2e).}% + \errmessage{This version of pLaTeX2e requires LaTeX2e 2017-04-15 + or newer!^^JObtain a newer version of `latex', + otherwise pLaTeX2e setup will^^Jnever succeed}\@@end + \fi +\fi \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2018/03/09} -\def\ppatch@level{1} + {2018-04-01} +\def\ppatch@level{0} \edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}% save LaTeX banner \newif\if@plincludeinrelease \@plincludeinreleasefalse @@ -143,6 +158,34 @@ \global\@namedef{M@#1}{\default@M#3}% \xdef\LastDeclaredEncoding{#1}% } +\let\DeclareFontEncoding@saved\DeclareFontEncoding@ +\ifx\IeC\@undefined\else +\def\DeclareFontEncoding@#1#2#3{% + \expandafter + \ifx\csname T@#1\endcsname\relax + \def\cdp@elt{\noexpand\cdp@elt}% + \xdef\cdp@list{\cdp@list\cdp@elt{#1}% + {\default@family}{\default@series}% + {\default@shape}}% + \expandafter\let\csname#1-cmd\endcsname\@changed@cmd + \begingroup + \wlog{Now handling font encoding #1 ...}% + \lowercase{% + \InputIfFileExists{#1enc.dfu}}% + {\wlog{... processing UTF-8 mapping file for font % + encoding #1}}% + {\wlog{... no UTF-8 mapping file for font encoding #1}}% + \endgroup + \def\enc@elt{\noexpand\enc@elt}% + \xdef\fenc@list{\fenc@list\enc@elt<#1>}% + \else + \@font@info{Redeclaring font encoding #1}% + \fi + \global\@namedef{T@#1}{#2}% + \global\@namedef{M@#1}{\default@M#3}% + \xdef\LastDeclaredEncoding{#1}% + } +\fi \def\DeclareKanjiEncoding#1{% \@latex@warning{% The \string\DeclareKanjiEncoding\space is obsoleted command. Please use @@ -715,8 +758,17 @@ \ifx\lastnodesubtype\@undefined \let\removejfmglue\@undefined \else - \def\pltx@gluetype{11} - \def\pltx@jfmgluesubtype{21} + \setbox0\hbox{% + \ifdefined\ucs %% upTeX check + \jfont\tenmin=upjisr-h at 9.62216pt + \else + \jfont\tenmin=min10 + \fi\tenmin + \char\jis"214B\null\setbox0\lastbox + \global\chardef\pltx@gluetype\lastnodetype + \global\chardef\pltx@jfmgluesubtype\lastnodesubtype + } + \setbox0=\box\voidb@x \protected\def\removejfmglue{% \ifnum\lastnodetype=\pltx@gluetype\relax \ifnum\lastnodesubtype=\pltx@jfmgluesubtype\relax @@ -1157,10 +1209,6 @@ \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\typeout#1\typeout#2#3\relax{#1} \toks0=\expandafter\expandafter\expandafter{% @@ -1184,12 +1232,6 @@ \global\everyjob\expandafter{\platexBANNER}% \endgroup \let\platexBANNER=\@undefined -\ifx\l@nohyphenation \@undefined - \newlanguage\l@nohyphenation -\fi -\ifx\document@default@language \@undefined - \let\document@default@language\m@ne -\fi \AtBeginDocument{% \@ifpackageloaded{latexrelease}{% \@ifpackageloaded{platexrelease}{}{% diff --git a/Master/texmf-dist/tex/platex/base/tbook.cls b/Master/texmf-dist/tex/platex/base/tbook.cls index a2555dacbbf..7361af9b65a 100644 --- a/Master/texmf-dist/tex/platex/base/tbook.cls +++ b/Master/texmf-dist/tex/platex/base/tbook.cls @@ -465,13 +465,13 @@ \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside - \if@openleft %% \if@openleft added (2017/02/15) - \null\thispagestyle{empty}\newpage - \else\if@openright %% \if@openright added (2016/12/18) - \null\thispagestyle{empty}\newpage - \fi\fi %% added (2016/12/18, 2017/02/15) - \fi + \if@twoside + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi\fi %% added (2016/12/18, 2017/02/15) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% \if@openleft \cleardoublepage \else diff --git a/Master/texmf-dist/tex/platex/base/treport.cls b/Master/texmf-dist/tex/platex/base/treport.cls index f1d9f0f1a63..712bd02dd1d 100644 --- a/Master/texmf-dist/tex/platex/base/treport.cls +++ b/Master/texmf-dist/tex/platex/base/treport.cls @@ -465,13 +465,13 @@ \Huge\bfseries#1\par}% \@endpart} \def\@endpart{\vfil\newpage - \if@twoside - \if@openleft %% \if@openleft added (2017/02/15) - \null\thispagestyle{empty}\newpage - \else\if@openright %% \if@openright added (2016/12/18) - \null\thispagestyle{empty}\newpage - \fi\fi %% added (2016/12/18, 2017/02/15) - \fi + \if@twoside + \if@openleft %% \if@openleft added (2017/02/15) + \null\thispagestyle{empty}\newpage + \else\if@openright %% \if@openright added (2016/12/18) + \null\thispagestyle{empty}\newpage + \fi\fi %% added (2016/12/18, 2017/02/15) + \fi \if@tempswa\twocolumn\fi} \newcommand{\chapter}{% \if@openleft \cleardoublepage \else |