summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-04-09 21:13:34 +0000
committerKarl Berry <karl@freefriends.org>2018-04-09 21:13:34 +0000
commit09892371285b54a48432b38d74ac45a42e551533 (patch)
tree74255a211ced0e7cc358a326eabedee18816d818
parent64148e3d6a1dc9816f6421f15c0777c7e477773b (diff)
platex (9apr18)
git-svn-id: svn://tug.org/texlive/trunk@47402 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/platex-en.pdfbin146679 -> 146740 bytes
-rw-r--r--Master/texmf-dist/doc/platex/base/platex.pdfbin280616 -> 281613 bytes
-rw-r--r--Master/texmf-dist/doc/platex/base/pldoc.pdfbin799983 -> 800948 bytes
-rw-r--r--Master/texmf-dist/source/platex/base/platex.dtx23
-rw-r--r--Master/texmf-dist/source/platex/base/plfonts.dtx20
-rw-r--r--Master/texmf-dist/source/platex/base/plvers.dtx12
-rw-r--r--Master/texmf-dist/tex/platex/base/platex.ltx1
-rw-r--r--Master/texmf-dist/tex/platex/base/plcore.ltx55
9 files changed, 76 insertions, 37 deletions
diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md
index 8c00743fec4..110429fbba5 100644
--- a/Master/texmf-dist/doc/platex/base/README.md
+++ b/Master/texmf-dist/doc/platex/base/README.md
@@ -61,6 +61,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
## Release Date
-2018-04-07
+2018-04-08
Japanese TeX Development Community
diff --git a/Master/texmf-dist/doc/platex/base/platex-en.pdf b/Master/texmf-dist/doc/platex/base/platex-en.pdf
index 00c0e6db82f..986e4e12ff2 100644
--- a/Master/texmf-dist/doc/platex/base/platex-en.pdf
+++ b/Master/texmf-dist/doc/platex/base/platex-en.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 b49b3758e92..d8a60720c38 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 a1b3aa37611..72ec95bdfa6 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/platex.dtx b/Master/texmf-dist/source/platex/base/platex.dtx
index febb8d0d65b..e3328e99796 100644
--- a/Master/texmf-dist/source/platex/base/platex.dtx
+++ b/Master/texmf-dist/source/platex/base/platex.dtx
@@ -78,6 +78,8 @@
% \changes{v1.0t}{2018/02/07}{ascmac$B%Q%C%1!<%8$rFHN)$5$;$?(B}
% \changes{v1.0u}{2018/02/18}{nidanfloat$B%Q%C%1!<%8$rFHN)$5$;$?(B}
% \changes{v1.0v}{2018/04/06}{$B:G?7$N(Bsource2e$B$X$NDI?o(B}
+% \changes{v1.0w}{2018/04/08}{$B0BA4$N$?$a%U%)!<%^%C%H:n@.;~$N(B
+% $B%P%J!<I=<($r$d$a$?(B}
%\else
% \changes{v1.0}{1995/05/08}{first edition}
% \changes{v1.0a}{1995/08/25}{Added 'Compatibility', `Usage of \dst{}'
@@ -114,6 +116,8 @@
% \changes{v1.0t}{2018/02/07}{Moved ascmac package to separate bundle}
% \changes{v1.0u}{2018/02/18}{Moved nidanfloat package to separate bundle}
% \changes{v1.0v}{2018/04/06}{Sync with the latest \file{source2e.tex}}
+% \changes{v1.0w}{2018/04/08}{Stop showing banner during
+% format generation for safety}
%\fi
% \fi
%
@@ -121,7 +125,7 @@
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{platex.dtx}[2018/04/06 v1.0v pLaTeX document file]
+\ProvidesFile{platex.dtx}[2018/04/08 v1.0w pLaTeX document file]
% \iffalse
\documentclass{jltxdoc}
\usepackage{plext}
@@ -513,14 +517,21 @@
% \end{macrocode}
%
%\ifJAPANESE
-% $B%U%)!<%^%C%H:n@.;~$K(B\pLaTeX{}$B$N%P!<%8%g%s$,$o$+$k$h$&$K!"(B
-% $BC<Kv$KI=<($7$^$9!#(B
+% $B0JA0$N%P!<%8%g%s$G$O!"%U%)!<%^%C%H:n@.;~$K(B\pLaTeX{}$B$N%P!<%8%g%s$,(B
+% $B$o$+$k$h$&$K!"C<Kv$KI=<($7$F$$$^$7$?$,!"(B|\everyjob| $B$K%P%J!<I=<((B
+% $B0J30$N%3!<%I$,4^$^$l$k2DG=@-$r9MN8$7!"0BA4$N$?$a$d$a$^$7$?!#(B
+% \changes{v1.0w}{2018/04/08}{$B0BA4$N$?$a%U%)!<%^%C%H:n@.;~$N(B
+% $B%P%J!<I=<($r$d$a$?(B}
%\else
-% Display \pLaTeX\ version on the terminal, so that
-% it can be easily recognized during format creation.
+% In the previous version, we displayed \pLaTeX\ version
+% on the terminal, so that it can be easily recognized
+% during format creation; however |\everyjob| can contain
+% any code other than showing a banner, so now disabled.
+% \changes{v1.0w}{2018/04/08}{Stop showing banner during
+% format generation for safety}
%\fi
% \begin{macrocode}
-\the\everyjob
+%\the\everyjob
% \end{macrocode}
%
%\ifJAPANESE
diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx
index f4a502ffadc..7c2e6cde393 100644
--- a/Master/texmf-dist/source/platex/base/plfonts.dtx
+++ b/Master/texmf-dist/source/platex/base/plfonts.dtx
@@ -80,13 +80,15 @@
% \changes{v1.6n}{2018/04/06}{\cs{UseRawInputEncoding}$B$G;H$o$l$k(B
% \cs{DeclareFontEncoding@}$B$NJ]B8HG$bDj5A(B
% (sync with ltfinal.dtx 2018/04/06 v2.1b)}
+% \changes{v1.6o}{2018/04/08}{Delay full UTF-8 handling to \cs{everyjob}
+% (sync with ltfinal.dtx 2018/04/08 v2.1d)}
% \fi
%
% \iffalse
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{plfonts.dtx}[2018/04/06 v1.6n pLaTeX New Font Selection Scheme]
+\ProvidesFile{plfonts.dtx}[2018/04/08 v1.6o pLaTeX New Font Selection Scheme]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plfonts.dtx}
@@ -697,6 +699,22 @@
\global\@namedef{M@#1}{\default@M#3}%
\xdef\LastDeclaredEncoding{#1}%
}
+% \end{macrocode}
+% $B$5$i$K!"(B\LaTeXe\ 2018-04-01 Patch level 2$B$G(B
+% $B!V%3%^%s%I%i%$%s0z?t$K(BUnicode$BJ8;z$,;H$o$l$?>l9g$X$NBP=h!W(B
+% $B$,2C$($i$l$^$7$?$N$G!"$=$l$KDI?o$7$^$9!#(B
+% \changes{v1.6o}{2018/04/08}{Delay full UTF-8 handling to \cs{everyjob}
+% (sync with ltfinal.dtx 2018/04/08 v2.1d)}
+% \begin{macrocode}
+%<plcore>\ifx\UTFviii@two@octets@@\@undefined\else
+%<plcore> \everyjob\expandafter{\the\everyjob
+%<plcore> \let\UTFviii@two@octets\UTFviii@two@octets@@
+%<plcore> \let\UTFviii@three@octets\UTFviii@three@octets@@
+%<plcore> \let\UTFviii@four@octets\UTFviii@four@octets@@
+%<plcore> }
+%<plcore>\fi
+% \end{macrocode}
+% \begin{macrocode}
\fi
%</plcore|platexrelease>
%<platexrelease>\plEndIncludeInRelease
diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx
index d407f35107b..1b24ce7f421 100644
--- a/Master/texmf-dist/source/platex/base/plvers.dtx
+++ b/Master/texmf-dist/source/platex/base/plvers.dtx
@@ -68,12 +68,14 @@
% (sync with ltvers 2018/01/08 v1.1a)}
% \changes{v1.1i}{2018/03/31}{\LaTeXe\ 2017-04-15$B0J9_I,?\(B}
% \changes{v1.1j}{2018/04/07}{\LaTeX\ \texttt{!<2018-04-01!>}$BHGBP1~3NG'(B}
+% \changes{v1.1k}{2018/04/08}{$B%P%J!<D4@a$N%3!<%I$r:G8e(B(plfinal)$B$G$O$J$/(B
+% $B:G=i(B(plcore)$B$KAa$a$?(B}
% \fi
%
% \iffalse
%<*driver>
% \fi
-\ProvidesFile{plvers.dtx}[2018/04/07 v1.1j pLaTeX Kernel (Version Info)]
+\ProvidesFile{plvers.dtx}[2018/04/08 v1.1k pLaTeX Kernel (Version Info)]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plvers.dtx}
@@ -168,7 +170,7 @@
{2018-04-01}
%</plcore|platexrelease>
%<*plcore>
-\def\ppatch@level{0}
+\def\ppatch@level{1}
%</plcore>
% \end{macrocode}
% \end{macro}
@@ -282,8 +284,10 @@
% \changes{v1.1d}{2017/09/24}{$B%Q%C%A%l%Y%k$,Ii$N?t$N>l9g$r(Bpre-release$B07$$$X(B}
% \changes{v1.1g}{2017/12/04}{\pLaTeX{}$B$N%P%J!<$NDj5A;~$K(B
% \cs{pfmtname}, \cs{pfmtversion}, \cs{ppatch@level}$B$rE83+$7$J$$$h$&$K(B}
+% \changes{v1.1k}{2018/04/08}{$B%P%J!<D4@a$N%3!<%I$r:G8e(B(plfinal)$B$G$O$J$/(B
+% $B:G=i(B(plcore)$B$KAa$a$?(B}
% \begin{macrocode}
-%<*plfinal>
+%<*plcore>
%\ifx\ppatch@level\@undefined % fallback if undefined in pLaTeX
% \def\ppatch@level{0}\fi
\begingroup
@@ -319,7 +323,7 @@
\global\everyjob\expandafter{\platexBANNER}%
\endgroup
\let\platexBANNER=\@undefined
-%</plfinal>
+%</plcore>
% \end{macrocode}
% \end{macro}
%
diff --git a/Master/texmf-dist/tex/platex/base/platex.ltx b/Master/texmf-dist/tex/platex/base/platex.ltx
index b36a4958e81..171db8345f3 100644
--- a/Master/texmf-dist/tex/platex/base/platex.ltx
+++ b/Master/texmf-dist/tex/platex/base/platex.ltx
@@ -28,7 +28,6 @@
* Local config file pldefs.cfg used^^J%
*************************************}}%
{\input{pldefs.ltx}}
-\the\everyjob
\everyjob\expandafter{%
\the\everyjob
\IfFileExists{platex.cfg}{%
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx
index b81e7669f1f..5725e1c5cf4 100644
--- a/Master/texmf-dist/tex/platex/base/plcore.ltx
+++ b/Master/texmf-dist/tex/platex/base/plcore.ltx
@@ -34,8 +34,31 @@
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
{2018-04-01}
-\def\ppatch@level{0}
+\def\ppatch@level{1}
\edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}% save LaTeX banner
+\begingroup
+ \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#1}
+ \toks0=\expandafter\expandafter\expandafter{%
+ \expandafter\parse@@BANNER\platexBANNER}
+ \ifnum\ppatch@level=0
+ \toks2={\pfmtname\space<\pfmtversion>\space}%
+ \else\ifnum\ppatch@level>0
+ \toks2={\pfmtname\space<\pfmtversion>+\ppatch@level\space}%
+ \else
+ \toks2={\pfmtname\space<\pfmtversion>-pre\ppatch@level\space}%
+ \fi\fi
+ \edef\platexBANNER{\the\toks2 (based on \the\toks0)}
+ \global\everyjob\expandafter{%
+ \expandafter\typeout\expandafter{\platexBANNER}}%
+\endgroup
+\begingroup
+ \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#2}
+ \toks0=\expandafter\expandafter\expandafter{%
+ \expandafter\parse@@BANNER\platexBANNER}
+ \edef\platexBANNER{\the\everyjob \noexpand\typeout{\the\toks0}}
+ \global\everyjob\expandafter{\platexBANNER}%
+\endgroup
+\let\platexBANNER=\@undefined
\newif\if@plincludeinrelease
\@plincludeinreleasefalse
\def\plIncludeInRelease#1{%
@@ -185,6 +208,13 @@
\global\@namedef{M@#1}{\default@M#3}%
\xdef\LastDeclaredEncoding{#1}%
}
+\ifx\UTFviii@two@octets@@\@undefined\else
+ \everyjob\expandafter{\the\everyjob
+ \let\UTFviii@two@octets\UTFviii@two@octets@@
+ \let\UTFviii@three@octets\UTFviii@three@octets@@
+ \let\UTFviii@four@octets\UTFviii@four@octets@@
+ }
+\fi
\fi
\def\DeclareKanjiEncoding#1{%
\@latex@warning{%
@@ -1209,29 +1239,6 @@
\mathchardef\e@mathgroup@top=256 % for e-pTeX FAM256 patched
\fi
%% File: plvers.dtx
-\begingroup
- \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#1}
- \toks0=\expandafter\expandafter\expandafter{%
- \expandafter\parse@@BANNER\platexBANNER}
- \ifnum\ppatch@level=0
- \toks2={\pfmtname\space<\pfmtversion>\space}%
- \else\ifnum\ppatch@level>0
- \toks2={\pfmtname\space<\pfmtversion>+\ppatch@level\space}%
- \else
- \toks2={\pfmtname\space<\pfmtversion>-pre\ppatch@level\space}%
- \fi\fi
- \edef\platexBANNER{\the\toks2 (based on \the\toks0)}
- \global\everyjob\expandafter{%
- \expandafter\typeout\expandafter{\platexBANNER}}%
-\endgroup
-\begingroup
- \def\parse@@BANNER\typeout#1\typeout#2#3\relax{#2}
- \toks0=\expandafter\expandafter\expandafter{%
- \expandafter\parse@@BANNER\platexBANNER}
- \edef\platexBANNER{\the\everyjob \noexpand\typeout{\the\toks0}}
- \global\everyjob\expandafter{\platexBANNER}%
-\endgroup
-\let\platexBANNER=\@undefined
\AtBeginDocument{%
\@ifpackageloaded{latexrelease}{%
\@ifpackageloaded{platexrelease}{}{%