From 09892371285b54a48432b38d74ac45a42e551533 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 9 Apr 2018 21:13:34 +0000 Subject: platex (9apr18) git-svn-id: svn://tug.org/texlive/trunk@47402 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/platex/base/platex.ltx | 1 - Master/texmf-dist/tex/platex/base/plcore.ltx | 55 ++++++++++++++++------------ 2 files changed, 31 insertions(+), 25 deletions(-) (limited to 'Master/texmf-dist/tex/platex/base') 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}{}{% -- cgit v1.2.3