summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/platex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-02-04 22:15:56 +0000
committerKarl Berry <karl@freefriends.org>2020-02-04 22:15:56 +0000
commit10bcce67add0043ed944bb311723cf681f6ab832 (patch)
treea12d4070ea68a735e3fbd98b68dfb07952becd39 /Master/texmf-dist/tex/platex
parent0d6d3d58752320a0b2ab7a41555048566e23f03c (diff)
platex (4feb20)
git-svn-id: svn://tug.org/texlive/trunk@53668 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex')
-rw-r--r--Master/texmf-dist/tex/platex/base/platexrelease.sty5
-rw-r--r--Master/texmf-dist/tex/platex/base/plcore.ltx7
2 files changed, 7 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty
index 58af8193acc..20c8a9f2920 100644
--- a/Master/texmf-dist/tex/platex/base/platexrelease.sty
+++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty
@@ -575,7 +575,8 @@ of this package available from CTAN}
\ifx\@reserveda\@empty
\edef\k@shape{#2}%
\else
- \maybe@load@fontshape
+ \begingroup\let\f@encoding\k@encoding\let\f@family\k@family
+ \maybe@load@fontshape\endgroup
\edef\@reserveda{\k@encoding /\k@family /\k@series/#1}%
\ifcsname \@reserveda\endcsname
\edef\k@shape{#1}%
@@ -787,7 +788,7 @@ of this package available from CTAN}
\fi
}
\fi
-\ifx\init@series@setup\@undefined\else % 2020-02-02
+\expandafter\ifx\csname init@series@setup\endcsname\relax\else % 2020-02-02
\g@addto@macro\init@series@setup{%
\ifx\kanjidef@ult\mcdef@ult \mcfamily
\else\ifx\kanjidef@ult\gtdef@ult \gtfamily
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx
index e9ad50530b3..a5695148038 100644
--- a/Master/texmf-dist/tex/platex/base/plcore.ltx
+++ b/Master/texmf-dist/tex/platex/base/plcore.ltx
@@ -34,7 +34,7 @@
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
{2020-02-02}
-\def\ppatch@level{0}
+\def\ppatch@level{1}
\edef\platexBANNER{\noexpand\platexNILa
\the\everyjob % LaTeX banner and delayed codes
\noexpand\platexNILb}
@@ -764,7 +764,8 @@
\ifx\@reserveda\@empty
\edef\k@shape{#2}%
\else
- \maybe@load@fontshape
+ \begingroup\let\f@encoding\k@encoding\let\f@family\k@family
+ \maybe@load@fontshape\endgroup
\edef\@reserveda{\k@encoding /\k@family /\k@series/#1}%
\ifcsname \@reserveda\endcsname
\edef\k@shape{#1}%
@@ -920,7 +921,7 @@
\fi
}
\fi
-\ifx\init@series@setup\@undefined\else % 2020-02-02
+\expandafter\ifx\csname init@series@setup\endcsname\relax\else % 2020-02-02
\g@addto@macro\init@series@setup{%
\ifx\kanjidef@ult\mcdef@ult \mcfamily
\else\ifx\kanjidef@ult\gtdef@ult \gtfamily