diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/platex/base/README.md | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/platex/base/pldoc.pdf | bin | 876418 -> 876791 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plfonts.dtx | 107 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plvers.dtx | 12 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/platex/base/platexrelease.sty | 65 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/platex/base/plcore.ltx | 69 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/platex/base/ptrace.sty | 43 |
7 files changed, 177 insertions, 121 deletions
diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md index 05a372d3230..910b447fd89 100644 --- a/Master/texmf-dist/doc/platex/base/README.md +++ b/Master/texmf-dist/doc/platex/base/README.md @@ -64,6 +64,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2021-06-04 +2021-06-27 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/platex/base/pldoc.pdf b/Master/texmf-dist/doc/platex/base/pldoc.pdf Binary files differindex 50eecd8a587..a5d49237bb0 100644 --- a/Master/texmf-dist/doc/platex/base/pldoc.pdf +++ b/Master/texmf-dist/doc/platex/base/pldoc.pdf diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx index a46eb001015..8dd162c91b0 100644 --- a/Master/texmf-dist/source/platex/base/plfonts.dtx +++ b/Master/texmf-dist/source/platex/base/plfonts.dtx @@ -186,13 +186,16 @@ % (sync with ltfsstrc.dtx 2021/04/26 v3.0o)} % \changes{v1.7m}{2021/06/04}{latex2e/444$BBP1~!'(B\cs{@shape@roman@kanji}$B%U%i%0(B % $B$r(B\cs{delayed@k@adjustment}$B$NCf$GJQ99(B/$BI|5"$9$k(B} +% \changes{v1.7n}{2021/06/27}{$B=>B02$J8$N%7%j!<%:$H%7%'!<%W99?7$r(B +% $BH?1G$9$k$h$&$K=$@5(B} +% \changes{v1.7n}{2021/06/27}{$BOB2$J8$N(Bforced@series$B%U%i%0$rJ,N%(B} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plfonts.dtx}[2021/06/04 v1.7m pLaTeX New Font Selection Scheme] +\ProvidesFile{plfonts.dtx}[2021/06/27 v1.7n pLaTeX New Font Selection Scheme] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plfonts.dtx} @@ -325,7 +328,7 @@ %<*trace> \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{ptrace} - [2021/06/04 v1.7m Standard pLaTeX package (font tracing)] + [2021/06/27 v1.7n Standard pLaTeX package (font tracing)] \RequirePackageWithOptions{tracefnt} %</trace> % \end{macrocode} @@ -1878,12 +1881,16 @@ %% \DeclareRobustCommand\selectfont{% % \end{macrocode} -% $B:G=i$K!"CY$i$;$F$$$?%7%j!<%:!&%7%'%$%W$NCM99?7$r9T$$$^$9!#(B +% $B:G=i$KOBJ8$N=hM}$r40N;$5$;$F$+$i!"2$J8!J=>B02$J8$+$b$7$l$^$;$s!K$N(B +% $B=hM}$KF~$kI,MW$,$"$j$^$9!#$=$l$>$l$G!VCY$i$;$F$$$?%7%j!<%:!&%7%'%$%W$N(B +% $BCM99?7"*%U%)%s%H$N@Z$jBX$(!W$r9T$$$^$9!#(B % \changes{v1.7k}{2021/01/10}{Execute delayed series and shape updates (latex2e/444) % (sync with ltfsstrc.dtx 2020/12/22 v3.0n)} % \changes{v1.7l}{2021/05/23}{Unset the forced series boolean when reaching % \cs{selectfont} (latex2e/444) % (sync with ltfsstrc.dtx 2021/04/26 v3.0o)} +% +% $BOBJ8!'CY$i$;$F$$$?%7%j!<%:!&%7%'%$%W$NCM99?7!#(B % \begin{macrocode} % !! sync with ltfsstrc.dtx 2021/04/26 v3.0o BEGIN \ifx\delayed@k@adjustment\@empty @@ -1905,28 +1912,10 @@ \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 % \end{macrocode} -% p\LaTeXe{}$B$N(B|\selectfont|$B%3%^%s%I$O!"$^$:!"OBJ8%U%)%s%H$r@Z$jBX$($^$9!#(B +% $BOBJ8!'%U%)%s%H$N@Z$jBX$(!#(B % \begin{macrocode} \let\tmp@error@fontshape\error@fontshape \let\error@fontshape\error@kfontshape @@ -1962,10 +1951,17 @@ \kenc@update \let\error@fontshape\tmp@error@fontshape % \end{macrocode} -% $B<!$K!"(B|\if@knjcmd|$B$,??$N>l9g!"(B -% $B2$J8=qBN$r8=:_$NOBJ8=qBN$K4XO"IU$1$5$l$?%U%)%s%H$KJQ$($^$9!#(B -% $B$3$N%U%i%0$O(B|\userelfont|$B%3%^%s%I$K$h$C$F(B\emph{$B??(B}$B$H$J$j$^$9!#(B -% $B$3$N%U%i%0$O$3$3$G:F$S!"(B\emph{$B56(B}$B$K@_Dj$5$l$^$9!#(B +% $B0J>e$G!"OBJ8$N=hM}$,40N;!#(B +% +% $B=>B02$J8$r;H$&!J(B|\if@knjcmd|$B$,??$N!K>l9g$O!"OBJ8=qBN$,3NDj$7$?(B +% $B$3$NCJ3,$G!V4XO"IU$1$5$l$?2$J8=qBN!W$KCM$r99?7$7$^$9!#(B +% |\rel@../../../..| $B$G(B |\romanseries| $B$H(B |\romanshape| $B$,<B9T(B +% $B$5$l$k!J$9$J$o$A(B |\delayed@f@adjustment| $B$KDI2C$,F~$k!K$3$H$K(B +% $BCm0U$7$F$/$@$5$$!#(B +% $B$J$*!"(B|\if@knjcmd|$B%U%i%0$O(B|\userelfont|$B%3%^%s%I$K$h$C$F(B +% \emph{$B??(B}$B$H$J$j!"0J2<$G:F$S(B\emph{$B56(B}$B$K%j%;%C%H$5$l$^$9!#(B +% \changes{v1.7n}{2021/06/27}{$B=>B02$J8$N%7%j!<%:$H%7%'!<%W99?7$r(B +% $BH?1G$9$k$h$&$K=$@5(B} % \begin{macrocode} \if@knjcmd \@knjcmdfalse \expandafter\ifx @@ -1980,7 +1976,31 @@ \fi \fi % \end{macrocode} -% $B$=$7$F!"2$J8%U%)%s%H$r@Z$jBX$($^$9!#(B +% $B2$J8!'CY$i$;$F$$$?%7%j!<%:!&%7%'%$%W$NCM99?7!#(B +% \begin{macrocode} + % !! 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 +% \end{macrocode} +% $B2$J8!'%U%)%s%H$N@Z$jBX$(!#(B % \begin{macrocode} \let\font\afont \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}% @@ -2656,6 +2676,21 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\if@forced@series@kanji} +% \LaTeXe~2020-02-02 PL3$B$GDI2C$5$l$?(B|\if@forced@series|$B%U%i%0$NOBJ8HG$G$9!#(B +% \changes{v1.7n}{2021/06/27}{$BOB2$J8$N(Bforced@series$B%U%i%0$rJ,N%(B} +% \begin{macrocode} +%<*plcore|platexrelease> +\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 +%</plcore|platexrelease> +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\romanseries} % \begin{macro}{\kanjiseries} % \begin{macro}{\fontseries} @@ -2678,13 +2713,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}} @@ -2710,13 +2745,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}} @@ -2862,7 +2897,9 @@ % $BOBJ8%7%'%$%WL$Dj5A$N>l9g$O(B\cs{k@shape}$B$r99?7$7$J$$$h$&$KJQ99(B} % \begin{macrocode} %<*plcore|platexrelease> -\newif\if@shape@roman@kanji +\ifx\@shape@roman@kanjitrue\@undefined % just in case + \expandafter\newif\csname if@shape@roman@kanji\endcsname +\fi %</plcore|platexrelease> % \end{macrocode} % \end{macro} @@ -3676,7 +3713,7 @@ ~\fi } \def\prepare@family@series@update@kanji#1#2{% -~\if@forced@series +~\if@forced@series@kanji %<+debug> \series@change@debug{No series preparation (forced \k@series)\on@line}% ~ \kanjifamily#2% ~\else @@ -3980,7 +4017,7 @@ ~\fi } \def\prepare@family@series@update@kanji#1#2{% -~\if@forced@series +~\if@forced@series@kanji %<+debug> \series@change@debug{No series preparation (forced \k@series)\on@line}% ~ \kanjifamily#2% ~\else diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx index 8b509580f87..6442add1a2c 100644 --- a/Master/texmf-dist/source/platex/base/plvers.dtx +++ b/Master/texmf-dist/source/platex/base/plvers.dtx @@ -99,12 +99,13 @@ % \changes{v1.1v}{2020/09/28}{$B?7$7$$%U%C%/$r3hMQ(B} % \changes{v1.1w}{2020/09/30}{\LaTeX\ \texttt{!<2020-10-01!>}$BHGBP1~3NG'(B} % \changes{v1.1x}{2020/10/07}{$B%U%C%/%7%9%F%`$,MxMQ2DG=$+$I$&$+H=Dj(B} +% \changes{v1.1y}{2021/06/27}{\LaTeX\ \texttt{!<2021-06-01!>}$BHG$[$\BP1~(B} % \fi % % \iffalse %<*driver> % \fi -\ProvidesFile{plvers.dtx}[2020/10/07 v1.1x pLaTeX Kernel (Version Info)] +\ProvidesFile{plvers.dtx}[2021/06/27 v1.1y pLaTeX Kernel (Version Info)] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plvers.dtx} @@ -145,6 +146,7 @@ % \changes{v1.1r}{2020/02/01}{\LaTeX\ \texttt{!<2020-02-02!>}$BHGBP1~3NG'(B} % \changes{v1.1s}{2020/03/14}{\LaTeX\ \texttt{!<2020-02-02!> PL5}$BHGBP1~3NG'(B} % \changes{v1.1w}{2020/09/30}{\LaTeX\ \texttt{!<2020-10-01!>}$BHGBP1~3NG'(B} +% \changes{v1.1y}{2021/06/27}{\LaTeX\ \texttt{!<2021-06-01!>}$BHG$[$\BP1~(B} % \begin{macrocode} %<*2ekernel> %\def\fmtname{LaTeX2e} @@ -153,7 +155,7 @@ %<latexrelease>\edef\latexreleaseversion %<platexrelease>\edef\p@known@latexreleaseversion %<*2ekernel|latexrelease|platexrelease> - {2020-10-01} + {2021-06-01} %</2ekernel|latexrelease|platexrelease> % \end{macrocode} % @@ -197,7 +199,7 @@ {2021-06-01} %</plcore|platexrelease> %<*plcore> -\def\ppatch@level{1} +\def\ppatch@level{2} %</plcore> % \end{macrocode} % \end{macro} @@ -496,10 +498,6 @@ \else % for LaTeX2e 2020-10-01 or later \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{% diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index f9c86d0ad30..5c18d5eaf4f 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -18,7 +18,7 @@ %% %% File: plvers.dtx \edef\p@known@latexreleaseversion - {2020-10-01} + {2021-06-01} \edef\platexreleaseversion {2021-06-01} \newif\if@plincludeinrelease @@ -794,25 +794,7 @@ of this package available from CTAN} \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 @@ -859,6 +841,27 @@ of this package available from CTAN} \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 @@ -1082,6 +1085,12 @@ of this package available from CTAN} \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}} @@ -1089,13 +1098,13 @@ of this package available from CTAN} \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}} @@ -1107,13 +1116,13 @@ of this package available from CTAN} \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}} @@ -1179,7 +1188,9 @@ of this package available from CTAN} } \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 \plIncludeInRelease{2020/04/12}{\fontshape} {No \k@shape update if unavailable}% \ifx\fontshapeforce\@undefined % old @@ -1684,7 +1695,7 @@ of this package available from CTAN} ~\fi } \def\prepare@family@series@update@kanji#1#2{% -~\if@forced@series +~\if@forced@series@kanji ~ \kanjifamily#2% ~\else \expand@font@defaults @@ -1864,7 +1875,7 @@ of this package available from CTAN} ~\fi } \def\prepare@family@series@update@kanji#1#2{% -~\if@forced@series +~\if@forced@series@kanji ~ \kanjifamily#2% ~\else \expand@font@defaults 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 diff --git a/Master/texmf-dist/tex/platex/base/ptrace.sty b/Master/texmf-dist/tex/platex/base/ptrace.sty index 80047ba76fe..ff05f63a968 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/06/04 v1.7m Standard pLaTeX package (font tracing)] + [2021/06/27 v1.7n Standard pLaTeX package (font tracing)] \RequirePackageWithOptions{tracefnt} \plIncludeInRelease{2020/04/12}{\selectfont} {Check \KanjiEncodingPair}% @@ -102,25 +102,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 @@ -167,6 +149,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 |