diff options
Diffstat (limited to 'Master/texmf-dist/tex/platex/base/plcore.ltx')
-rw-r--r-- | Master/texmf-dist/tex/platex/base/plcore.ltx | 69 |
1 files changed, 38 insertions, 31 deletions
diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index 595d6e6198c..66dca03b294 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{1} +\def\ppatch@level{2} \edef\platexBANNER{\noexpand\platexNILa \the\everyjob % LaTeX banner and delayed codes \noexpand\platexNILb} @@ -662,25 +662,7 @@ \fi \let\delayed@k@adjustment\@empty \fi - \ifx\delayed@f@adjustment\@empty - \else - \let\f@shape@saved\f@shape - \let\f@series@saved\f@series - \delayed@f@adjustment - \maybe@load@fontshape - \ifcsname \f@encoding/\f@family/\f@series/\f@shape \endcsname - \else - \let\f@shape\f@shape@saved - \let\f@series\f@series@saved - \let\delayed@merge@font@shape\merge@font@shape - \let\delayed@merge@font@series\merge@font@series - \delayed@f@adjustment - \let\delayed@merge@font@shape\merge@font@shape@without@substitution - \let\delayed@merge@font@series\merge@font@series@without@substitution - \fi - \let\delayed@f@adjustment\@empty - \fi - \@forced@seriesfalse + \@forced@series@kanjifalse % !! sync with ltfsstrc.dtx 2021/04/26 v3.0o END \let\tmp@error@fontshape\error@fontshape \let\error@fontshape\error@kfontshape @@ -727,6 +709,27 @@ \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname \fi \fi + % !! sync with ltfsstrc.dtx 2021/04/26 v3.0o BEGIN + \ifx\delayed@f@adjustment\@empty + \else + \let\f@shape@saved\f@shape + \let\f@series@saved\f@series + \delayed@f@adjustment + \maybe@load@fontshape + \ifcsname \f@encoding/\f@family/\f@series/\f@shape \endcsname + \else + \let\f@shape\f@shape@saved + \let\f@series\f@series@saved + \let\delayed@merge@font@shape\merge@font@shape + \let\delayed@merge@font@series\merge@font@series + \delayed@f@adjustment + \let\delayed@merge@font@shape\merge@font@shape@without@substitution + \let\delayed@merge@font@series\merge@font@series@without@substitution + \fi + \let\delayed@f@adjustment\@empty + \fi + \@forced@seriesfalse + % !! sync with ltfsstrc.dtx 2021/04/26 v3.0o END \let\font\afont \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}% \pickup@font @@ -943,6 +946,12 @@ \else % 2021-06-01 \let\delayed@k@adjustment\@empty \fi +\ifx\@forced@seriestrue\@undefined % old + \let\@forced@series@kanjifalse\@undefined + \let\@forced@series@kanjitrue\@undefined +\else % 2020-02-02 PL3 or later + \expandafter\newif\csname if@forced@series@kanji\endcsname +\fi \ifx\fontseriesforce\@undefined % old \DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}} \DeclareRobustCommand\kanjiseries[1]{\edef\k@series{#1}} @@ -950,13 +959,13 @@ \else % 2020-02-02 \ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN \DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse\merge@font@series{#1}} -\DeclareRobustCommand\kanjiseries[1]{\@forced@seriesfalse\merge@kanji@series{#1}} +\DeclareRobustCommand\kanjiseries[1]{\@forced@series@kanjifalse\merge@kanji@series{#1}} \DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} \else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN \DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse \expandafter\def\expandafter\delayed@f@adjustment\expandafter {\delayed@f@adjustment\delayed@merge@font@series{#1}}} -\DeclareRobustCommand\kanjiseries[1]{\@forced@seriesfalse +\DeclareRobustCommand\kanjiseries[1]{\@forced@series@kanjifalse \expandafter\def\expandafter\delayed@k@adjustment\expandafter {\delayed@k@adjustment\delayed@merge@kanji@series{#1}}} \DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} @@ -968,13 +977,13 @@ \else % 2020-02-02 \ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN \DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue\edef\f@series{#1}} -\DeclareRobustCommand\kanjiseriesforce[1]{\@forced@seriestrue\edef\k@series{#1}} +\DeclareRobustCommand\kanjiseriesforce[1]{\@forced@series@kanjitrue\edef\k@series{#1}} \DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}} \else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN \DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue \expandafter\def\expandafter\delayed@f@adjustment\expandafter {\delayed@f@adjustment\edef\f@series{#1}}} -\DeclareRobustCommand\kanjiseriesforce[1]{\@forced@seriestrue +\DeclareRobustCommand\kanjiseriesforce[1]{\@forced@series@kanjitrue \expandafter\def\expandafter\delayed@k@adjustment\expandafter {\delayed@k@adjustment\edef\k@series{#1}}} \DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}} @@ -1040,7 +1049,9 @@ } \let\delayed@merge@kanji@series\merge@kanji@series@without@substitution \fi -\newif\if@shape@roman@kanji +\ifx\@shape@roman@kanjitrue\@undefined % just in case + \expandafter\newif\csname if@shape@roman@kanji\endcsname +\fi \ifx\fontshapeforce\@undefined % old \DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}} \DeclareRobustCommand\kanjishape[1]{\edef\k@shape{#1}} @@ -1374,7 +1385,7 @@ ~\fi } \def\prepare@family@series@update@kanji#1#2{% -~\if@forced@series +~\if@forced@series@kanji ~ \kanjifamily#2% ~\else \expand@font@defaults @@ -1556,7 +1567,7 @@ ~\fi } \def\prepare@family@series@update@kanji#1#2{% -~\if@forced@series +~\if@forced@series@kanji ~ \kanjifamily#2% ~\else \expand@font@defaults @@ -2352,10 +2363,6 @@ \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 |