summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/platex/base/plcore.ltx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/platex/base/plcore.ltx')
-rw-r--r--Master/texmf-dist/tex/platex/base/plcore.ltx36
1 files changed, 24 insertions, 12 deletions
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