summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/platex/base/plcore.ltx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-12-06 23:54:32 +0000
committerKarl Berry <karl@freefriends.org>2017-12-06 23:54:32 +0000
commit1af85f82c48d00dfbf27a720ea711d12e27895e8 (patch)
tree0bb3181cd43a6a5d2d325206195f65c3784f99f5 /Master/texmf-dist/tex/platex/base/plcore.ltx
parentb0705239ae82574e1415ec6398074121d41bcb32 (diff)
platex (7dec17)
git-svn-id: svn://tug.org/texlive/trunk@45999 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex/base/plcore.ltx')
-rw-r--r--Master/texmf-dist/tex/platex/base/plcore.ltx60
1 files changed, 26 insertions, 34 deletions
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx
index a22cbc9e952..0c5fbf0477b 100644
--- a/Master/texmf-dist/tex/platex/base/plcore.ltx
+++ b/Master/texmf-dist/tex/platex/base/plcore.ltx
@@ -19,21 +19,22 @@
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
{2017/10/28}
-\def\ppatch@level{2}
+\def\ppatch@level{3}
+\edef\platexBANNER{\the\everyjob\noexpand\typeout{}\relax}% save LaTeX banner
\def\plIncludeInRelease#1{\kernel@ifnextchar[%
{\@plIncludeInRelease{#1}}
{\@plIncludeInRelease{#1}[#1]}}
\def\@plIncludeInRelease#1[#2]{\@plIncludeInRele@se{#2}}
\def\@plIncludeInRele@se#1#2#3{%
\toks@{[#1] #3}%
- \expandafter\ifx\csname\string#2+\@currname+IIR\endcsname\relax
+ \expandafter\ifx\csname\string#2+\@currname+plIIR\endcsname\relax
\ifnum\expandafter\@parse@version#1//00\@nil
>\expandafter\@parse@version\pfmtversion//00\@nil
\GenericInfo{}{Skipping: \the\toks@}%
\expandafter\expandafter\expandafter\@gobble@plIncludeInRelease
\else
\GenericInfo{}{Applying: \the\toks@}%
- \expandafter\let\csname\string#2+\@currname+IIR\endcsname\@empty
+ \expandafter\let\csname\string#2+\@currname+plIIR\endcsname\@empty
\fi
\else
\GenericInfo{}{Already applied: \the\toks@}%
@@ -45,8 +46,8 @@
%% File: plfonts.dtx
\let\k@encoding\@empty
\let\ck@encoding\@empty
-\def\cy@encoding{JY1}
-\def\ct@encoding{JT1}
+\let\cy@encoding\@empty
+\let\ct@encoding\@empty
\let\k@family\@empty
\let\k@series\@empty
\let\k@shape\@empty
@@ -194,6 +195,7 @@
\let\default@KT\@empty
\let\default@KM\@empty
\@onlypreamble\DeclareKanjiEncodingDefaults
+\def\KanjiEncodingPair#1#2{\@namedef{t@enc@#1}{#2}\@namedef{y@enc@#2}{#1}}
\def\DeclareFontFamily#1#2#3{%
\@ifundefined{T@#1}%
{\@latex@error{Encoding scheme `#1' unknown}\@eha}%
@@ -417,8 +419,6 @@
\set@fontsize\baselinestretch\f@size\f@baselineskip
\fi
\size@update}
-\def\KanjiEncodingPair#1#2{\@namedef{t@enc@#1}{#2}\@namedef{y@enc@#2}{#1}}
-\KanjiEncodingPair{JY1}{JT1}
\def\set@fontsize#1#2#3{%
\@defaultunits\@tempdimb#2pt\relax\@nnil
\edef\f@size{\strip@pt\@tempdimb}%
@@ -1118,35 +1118,27 @@
\def\ppatch@level{0}\fi
\begingroup
\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 \expandafter\parse@@BANNER\platexBANNER)}}%
- \else\ifnum\ppatch@level>0
- \everyjob{\noexpand\typeout{%
- \pfmtname\space<\pfmtversion>+\ppatch@level\space
- (based on \expandafter\parse@@BANNER\platexBANNER)}}%
- \else
- \everyjob{\noexpand\typeout{%
- \pfmtname\space<\pfmtversion>-pre\ppatch@level\space
- (based on \expandafter\parse@@BANNER\platexBANNER)}}%
- \fi\fi
- }
-\expandafter
-\endgroup \platexTMP
+ \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}
- \edef\platexTMP{%
- \the\everyjob\noexpand\typeout{\expandafter\parse@@BANNER\platexBANNER}%
- }
- \everyjob=\expandafter{\platexTMP}%
- \edef\platexTMP{%
- \noexpand\let\noexpand\platexBANNER=\noexpand\@undefined
- \noexpand\everyjob={\the\everyjob}%
- }
- \expandafter
-\endgroup \platexTMP
+ \toks0=\expandafter\expandafter\expandafter{%
+ \expandafter\parse@@BANNER\platexBANNER}
+ \edef\platexBANNER{\the\everyjob \noexpand\typeout{\the\toks0}}
+ \global\everyjob\expandafter{\platexBANNER}%
+\endgroup
+\let\platexBANNER=\@undefined
\ifx\l@nohyphenation \@undefined
\newlanguage\l@nohyphenation
\fi