summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/platex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-06-04 20:14:02 +0000
committerKarl Berry <karl@freefriends.org>2021-06-04 20:14:02 +0000
commitc3d8132256107735a8124d1ed5526205f3a211d3 (patch)
treec0bcaefc692a6baf8dac5d49f1ace9a4e3d9235f /Master/texmf-dist/tex/platex
parent5f80450fa25593c59708d5c298be2b623171303c (diff)
platex (4jun21)
git-svn-id: svn://tug.org/texlive/trunk@59463 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex')
-rw-r--r--Master/texmf-dist/tex/platex/base/platexrelease.sty30
-rw-r--r--Master/texmf-dist/tex/platex/base/plcore.ltx36
-rw-r--r--Master/texmf-dist/tex/platex/base/ptrace.sty2
3 files changed, 44 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty
index 363f98c29d5..f9c86d0ad30 100644
--- a/Master/texmf-dist/tex/platex/base/platexrelease.sty
+++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty
@@ -1205,9 +1205,10 @@ of this package available from CTAN}
\expandafter\def\expandafter\delayed@k@adjustment\expandafter
{\delayed@k@adjustment\delayed@merge@kanji@shape{#1}}}
\DeclareRobustCommand\fontshape[1]{%
- \@shape@roman@kanjitrue
- \kanjishape{#1}\romanshape{#1}%
- \@shape@roman@kanjifalse}
+ \romanshape{#1}%
+ \expandafter\def\expandafter\delayed@k@adjustment\expandafter
+ {\delayed@k@adjustment\@shape@roman@kanjitrue
+ \delayed@merge@kanji@shape{#1}\@shape@roman@kanjifalse}}
\fi % --- for >= 2021-06-01 END
\fi
\plEndIncludeInRelease
@@ -3020,9 +3021,14 @@ of this package available from CTAN}
{Adapt to new shipout code}%
\ifdefined\ExplSyntaxOn %--- expl3 available BEGIN
\ExplSyntaxOn
-\if_cs_exist:N \__shipout_execute_cont:
-\cs_new_eq:NN \__platex_original_shipout_execute_cont: \__shipout_execute_cont:
-\box_new:N \l__platex_shipout_dummy_box
+\cs_if_exist:NT \__shipout_execute_cont: { %--- IF LEVEL 1 BEGIN
+\cs_if_exist:NF \__platex_original_shipout_execute_cont: {
+ \cs_new_eq:NN \__platex_original_shipout_execute_cont:
+ \__shipout_execute_cont:
+ }
+\cs_if_exist:NF \l__platex_shipout_dummy_box {
+ \box_new:N \l__platex_shipout_dummy_box
+ }
\cs_set:Npn \__shipout_execute_cont:
{
% if \l_shipout_box is not a \yoko-box (= horizontal writing),
@@ -3052,10 +3058,12 @@ of this package available from CTAN}
%\box_use:N \l__platex_shipout_dummy_box
}
}
-\fi:
-\if_cs_exist:N \__shipout_execute_nohooks_cont:
-\cs_new_eq:NN \__platex_original_shipout_execute_nohooks_cont:
- \__shipout_execute_nohooks_cont:
+} %--- IF LEVEL 1 END
+\cs_if_exist:NT \__shipout_execute_nohooks_cont: { %--- IF LEVEL 1 BEGIN
+\cs_if_exist:NF \__platex_original_shipout_execute_nohooks_cont: {
+ \cs_new_eq:NN \__platex_original_shipout_execute_nohooks_cont:
+ \__shipout_execute_nohooks_cont:
+ }
\cs_set:Npn \__shipout_execute_nohooks_cont:
{
\platex_if_box_yoko:NF \l__shipout_raw_box {
@@ -3075,7 +3083,7 @@ of this package available from CTAN}
}
}
}
-\fi:
+} %--- IF LEVEL 1 END
\ExplSyntaxOff
\fi %--- expl3 available END
\plEndIncludeInRelease
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx
index 1c8ae656147..595d6e6198c 100644
--- a/Master/texmf-dist/tex/platex/base/plcore.ltx
+++ b/Master/texmf-dist/tex/platex/base/plcore.ltx
@@ -35,7 +35,7 @@
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
{2021-06-01}
-\def\ppatch@level{0}
+\def\ppatch@level{1}
\edef\platexBANNER{\noexpand\platexNILa
\the\everyjob % LaTeX banner and delayed codes
\noexpand\platexNILb}
@@ -1064,9 +1064,10 @@
\expandafter\def\expandafter\delayed@k@adjustment\expandafter
{\delayed@k@adjustment\delayed@merge@kanji@shape{#1}}}
\DeclareRobustCommand\fontshape[1]{%
- \@shape@roman@kanjitrue
- \kanjishape{#1}\romanshape{#1}%
- \@shape@roman@kanjifalse}
+ \romanshape{#1}%
+ \expandafter\def\expandafter\delayed@k@adjustment\expandafter
+ {\delayed@k@adjustment\@shape@roman@kanjitrue
+ \delayed@merge@kanji@shape{#1}\@shape@roman@kanjifalse}}
\fi % --- for >= 2021-06-01 END
\fi
\ifx\fontshapeforce\@undefined % old
@@ -2083,9 +2084,14 @@
\let\pltx@AtBeginDvi@untouched\@undefined
\ifdefined\ExplSyntaxOn %--- expl3 available BEGIN
\ExplSyntaxOn
-\if_cs_exist:N \__shipout_execute_cont:
-\cs_new_eq:NN \__platex_original_shipout_execute_cont: \__shipout_execute_cont:
-\box_new:N \l__platex_shipout_dummy_box
+\cs_if_exist:NT \__shipout_execute_cont: { %--- IF LEVEL 1 BEGIN
+\cs_if_exist:NF \__platex_original_shipout_execute_cont: {
+ \cs_new_eq:NN \__platex_original_shipout_execute_cont:
+ \__shipout_execute_cont:
+ }
+\cs_if_exist:NF \l__platex_shipout_dummy_box {
+ \box_new:N \l__platex_shipout_dummy_box
+ }
\cs_set:Npn \__shipout_execute_cont:
{
% if \l_shipout_box is not a \yoko-box (= horizontal writing),
@@ -2115,10 +2121,12 @@
%\box_use:N \l__platex_shipout_dummy_box
}
}
-\fi:
-\if_cs_exist:N \__shipout_execute_nohooks_cont:
-\cs_new_eq:NN \__platex_original_shipout_execute_nohooks_cont:
- \__shipout_execute_nohooks_cont:
+} %--- IF LEVEL 1 END
+\cs_if_exist:NT \__shipout_execute_nohooks_cont: { %--- IF LEVEL 1 BEGIN
+\cs_if_exist:NF \__platex_original_shipout_execute_nohooks_cont: {
+ \cs_new_eq:NN \__platex_original_shipout_execute_nohooks_cont:
+ \__shipout_execute_nohooks_cont:
+ }
\cs_set:Npn \__shipout_execute_nohooks_cont:
{
\platex_if_box_yoko:NF \l__shipout_raw_box {
@@ -2138,7 +2146,7 @@
}
}
}
-\fi:
+} %--- IF LEVEL 1 END
\ExplSyntaxOff
\fi %--- expl3 available END
\renewcommand\@makefnmark{%
@@ -2344,6 +2352,10 @@
\endgroup
\else
\AddToHook{begindocument/before}{\p@warn@latexrelease}
+%%% temporary workaround: see latex3/latex2e#577
+\AddToHook{package/before/latexrelease}{\let\saved@pathstack\@kernel@currpathstack}
+\AddToHook{package/after/latexrelease}{\let\@kernel@currpathstack\saved@pathstack}
+%%% [TODO] remove the above when fixed!
\fi
\def\p@warn@latexrelease{%
\ifx\latexreleaseversion\@undefined\else
diff --git a/Master/texmf-dist/tex/platex/base/ptrace.sty b/Master/texmf-dist/tex/platex/base/ptrace.sty
index d9231d3e33e..80047ba76fe 100644
--- a/Master/texmf-dist/tex/platex/base/ptrace.sty
+++ b/Master/texmf-dist/tex/platex/base/ptrace.sty
@@ -15,7 +15,7 @@
%% File: plfonts.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{ptrace}
- [2021/01/10 v1.7k Standard pLaTeX package (font tracing)]
+ [2021/06/04 v1.7m Standard pLaTeX package (font tracing)]
\RequirePackageWithOptions{tracefnt}
\plIncludeInRelease{2020/04/12}{\selectfont}
{Check \KanjiEncodingPair}%