diff options
| -rw-r--r-- | Master/texmf-dist/doc/platex/base/LICENSE | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/platex/base/README.md | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/platex/base/platexrelease.pdf | bin | 107343 -> 107870 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/platex/base/pldoc.pdf | bin | 856411 -> 868006 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/platexrelease.dtx | 23 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plfonts.dtx | 307 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plvers.dtx | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/platex/base/platexrelease.sty | 217 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/platex/base/plcore.ltx | 214 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/platex/base/pldefs.ltx | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/platex/base/ptrace.sty | 104 |
11 files changed, 851 insertions, 26 deletions
diff --git a/Master/texmf-dist/doc/platex/base/LICENSE b/Master/texmf-dist/doc/platex/base/LICENSE index cd23b4d446f..b971bf78fcf 100644 --- a/Master/texmf-dist/doc/platex/base/LICENSE +++ b/Master/texmf-dist/doc/platex/base/LICENSE @@ -1,5 +1,5 @@ Copyright (c) 2010 ASCII MEDIA WORKS -Copyright (c) 2016-2020 Japanese TeX Development Community +Copyright (c) 2016-2021 Japanese TeX Development Community All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md index 404e056c3ad..e7ebff5443f 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 -2020-10-07 +2021-02-13 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/platex/base/platexrelease.pdf b/Master/texmf-dist/doc/platex/base/platexrelease.pdf Binary files differindex 6addbab84cf..2100e9cc629 100644 --- a/Master/texmf-dist/doc/platex/base/platexrelease.pdf +++ b/Master/texmf-dist/doc/platex/base/platexrelease.pdf diff --git a/Master/texmf-dist/doc/platex/base/pldoc.pdf b/Master/texmf-dist/doc/platex/base/pldoc.pdf Binary files differindex 83368ed5e7c..ba12e12781e 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/platexrelease.dtx b/Master/texmf-dist/source/platex/base/platexrelease.dtx index e76a387e2e8..842217c07cc 100644 --- a/Master/texmf-dist/source/platex/base/platexrelease.dtx +++ b/Master/texmf-dist/source/platex/base/platexrelease.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment %% File: platexrelease.dtx % -% Copyright (c) 2016-2020 Japanese TeX Development Community +% Copyright (c) 2016-2021 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -28,10 +28,12 @@ % (sync with latexrelease.dtx 2017/12/17 v1.0i)} % \changes{v1.0l}{2018/04/06}{Drop an extra period in warning message % (sync with latexrelease.dtx 2018/02/18 v1.0j)} -% \changes{v1.0m}{2018/05/22}{reset \cs{\requestedLaTeXdate} for +% \changes{v1.0m}{2018/05/22}{reset \cs{requestedpLaTeXdate} for % current and latest options % (sync with latexrelease.dtx 2018/05/08 v1.0k)} % \changes{v1.0n}{2020/03/28}{$B@h$K(Blatexrelease$B$,FI$_9~$^$l$F$$$?$i7Y9p(B} +% \changes{v1.0o}{2021/02/13}{\cs{sourcepLaTeXdate} added +% (sync with latexrelease.dtx 2021/01/23 v1.0l)} % \fi % % \iffalse @@ -41,7 +43,7 @@ \ProvidesFile{platexrelease.dtx} %</driver> %<platexrelease>\ProvidesPackage{platexrelease} - [2020/03/28 v1.0n latexrelease support for pLaTeX Kernel + [2021/02/13 v1.0o latexrelease support for pLaTeX Kernel (including releases up to \platexreleaseversion)] %<*driver> \documentclass{jltxdoc} @@ -200,7 +202,7 @@ % \section{$B%3!<%I(B} % % \Lpack{platexrelease}$B%Q%C%1!<%8$,FI$_9~$^$l$^$7$?$N$G!"(B -% $B8zN(2=$N$?$a(B|\begin{document|$B$G$N3NG'%3!<%I$rL58z2=$7$^$9!#(B +% $B8zN(2=$N$?$a(B|\begin{document}|$B$G$N3NG'%3!<%I$rL58z2=$7$^$9!#(B % $B!J(B\file{plvers.dtx}$B$N(B2020/03/28 v1.1u$B0J9_!K!#(B % \begin{macrocode} %<*platexrelease> @@ -233,9 +235,19 @@ \fi % \end{macrocode} % +% \begin{macro}{\sourcepLaTeXdate} +% $B85!9$N%U%)!<%^%C%H$NF|IU$rJ]B8$7$^$9!#(B +% \changes{v1.0o}{2021/02/13}{\cs{sourcepLaTeXdate} added +% (sync with latexrelease.dtx 2021/01/23 v1.0l)} +% \begin{macrocode} +\edef\sourcepLaTeXdate{% + \expandafter\@parse@version\pfmtversion//00\@nil} +% \end{macrocode} +% \end{macro} +% % \Lpack{platexrelease}$B%Q%C%1!<%8$N%*%W%7%g%s$rDj5A$7$^$9!#%3!<%I$O(B % \Lpack{latexrelease}$B$N$b$N$r(Bp\LaTeXe{}$BMQ$K=q$-49$($?$b$N$G$9!#(B -% \changes{v1.0m}{2018/05/22}{reset \cs{\requestedLaTeXdate} for +% \changes{v1.0m}{2018/05/22}{reset \cs{requestedpLaTeXdate} for % current and latest options % (sync with latexrelease.dtx 2018/05/08 v1.0k)} % \begin{macrocode} @@ -339,6 +351,7 @@ of this package available from CTAN} some critical bugs. We advise you to\MessageBreak select another format date} \plIncludeInRelease{2017/10/28}{\PackageWarning}{pLaTeX Info}% + % * <2020-10-01>+2 (prepare for LaTeX2e <2021-05-01>) % * <2020-10-01>+1 % * <2020-10-01> % * <2020-04-12> diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx index 2ccf9c3790b..9eae7852a17 100644 --- a/Master/texmf-dist/source/platex/base/plfonts.dtx +++ b/Master/texmf-dist/source/platex/base/plfonts.dtx @@ -3,7 +3,7 @@ % % Copyright 1994-2006 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016-2020 Japanese TeX Development Community +% Copyright (c) 2016-2021 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -167,13 +167,21 @@ % \changes{v1.7h}{2020/09/28}{New hook management interface % (sync with ltfssini.dtx 2020/08/21 v3.2b)} % \changes{v1.7i}{2020/10/07}{$B%U%C%/%7%9%F%`$NM-L5H=Dj$r2~NI(B} +% \changes{v1.7j}{2020/12/29}{Drop ``m'' for latex2e issue 453 +% (sync with ltfssbas.dtx 2020/12/10 v3.2h)} +% \changes{v1.7k}{2021/01/10}{Distangle series and shape update (latex2e/444) +% (sync with ltfssaxes.dtx 2020/12/22 v1.0h)} +% \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.7k}{2021/01/10}{Adjust start values for series and shape (latex2e/444) +% (sync with ltfssini.dtx 2020/12/06 v3.2f)} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plfonts.dtx}[2020/10/07 v1.7i pLaTeX New Font Selection Scheme] +\ProvidesFile{plfonts.dtx}[2021/01/10 v1.7k pLaTeX New Font Selection Scheme] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plfonts.dtx} @@ -306,7 +314,7 @@ %<*trace> \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{ptrace} - [2020/03/26 v1.7e Standard pLaTeX package (font tracing)] + [2021/01/10 v1.7k Standard pLaTeX package (font tracing)] \RequirePackageWithOptions{tracefnt} %</trace> % \end{macrocode} @@ -1779,7 +1787,7 @@ % % \subsubsection{$B%U%)%s%H$NA*Br(B} % \begin{macro}{\selectfont} -% |\selectfont|$B$N%*%j%8%J%k$+$i$NJQ99ItJ,$O!"<!$N#3E@$G$9!#(B +% |\selectfont|$B$N%*%j%8%J%k$+$i$NJQ99ItJ,$O!"<!$N(B3$BE@$G$9!#(B % \begin{itemize} % \item $BOBJ8=qBN$rJQ99$9$kItJ,(B % \item $B=>B0=qBN$KJQ99$9$kItJ,(B @@ -1790,13 +1798,121 @@ % \changes{v1.2}{1995/11/22}{$B%(%i!<%U%)%s%H$KBP1~$7$?(B} % \changes{v1.3n}{2004/08/10}{$BOBJ8%(%s%3!<%G%#%s%0$N@Z$jBX$($rM-8z2=(B} % \changes{v1.7e}{2020/03/26}{$B=D2#%(%s%3!<%G%#%s%0$N%;%C%H2=3NG'(B} -% |\selectfont|$B%3%^%s%I$O!"$^$:!"OBJ8%U%)%s%H$r@Z$jBX$($^$9!#(B % \begin{macrocode} %</plcore> %<platexrelease|trace>\plIncludeInRelease{2020/04/12}{\selectfont} %<platexrelease|trace> {Check \KanjiEncodingPair}% %<*plcore|platexrelease|trace> +\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN +%% +\DeclareRobustCommand\selectfont{% + \let\tmp@error@fontshape\error@fontshape + \let\error@fontshape\error@kfontshape + \edef\tmp@item{{\k@encoding}}% + \expandafter\expandafter\expandafter + \inlist@\expandafter\tmp@item\expandafter{\kyenc@list}% + \ifin@ + \let\cy@encoding\k@encoding + \ensure@KanjiEncodingPair{t}% + \edef\ct@encoding{\csname t@enc@\k@encoding\endcsname}% + \else + \expandafter\expandafter\expandafter + \inlist@\expandafter\tmp@item\expandafter{\ktenc@list}% + \ifin@ + \let\ct@encoding\k@encoding + \ensure@KanjiEncodingPair{y}% + \edef\cy@encoding{\csname y@enc@\k@encoding\endcsname}% + \else + \@latex@error{KANJI Encoding scheme `\k@encoding' unknown}\@eha + \fi + \fi + \let\font\tfont + \let\k@encoding\ct@encoding + \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}% + \pickup@font + \font@name + \let\font\jfont + \let\k@encoding\cy@encoding + \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}% + \pickup@font + \font@name + \expandafter\def\expandafter\k@encoding\tmp@item + \kenc@update + \let\error@fontshape\tmp@error@fontshape + \if@knjcmd \@knjcmdfalse + \expandafter\ifx + \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname\relax + \expandafter\ifx + \csname rel@\k@encoding/\k@family/\k@series/all\endcsname\relax + \else + \csname rel@\k@encoding/\k@family/\k@series/all\endcsname + \fi + \else + \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname + \fi + \fi + \let\font\afont + \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}% + \pickup@font + \font@name +%<trace> \ifnum \tracingfonts>\tw@ +%<trace> \@font@info{Roman:Switching to \font@name}\fi + \enc@update + \ifx\f@linespread\baselinestretch \else + \set@fontsize\baselinestretch\f@size\f@baselineskip + \fi + \size@update} +%% +\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN +%% \DeclareRobustCommand\selectfont{% +% \end{macrocode} +% $B:G=i$K!"CY$i$;$F$$$?%7%j!<%:!&%7%'%$%W$NCM99?7$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)} +% \begin{macrocode} + % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n BEGIN + \ifx\delayed@k@adjustment\@empty + \else + \let\k@shape@saved\k@shape + \let\k@series@saved\k@series + \delayed@k@adjustment + \begingroup\let\f@encoding\k@encoding\let\f@family\k@family + \maybe@load@fontshape\endgroup + \ifcsname \k@encoding/\k@family/\k@series/\k@shape \endcsname + \else + \let\k@shape\k@shape@saved + \let\k@series\k@series@saved + \let\delayed@merge@kanji@shape\merge@kanji@shape + \let\delayed@merge@kanji@series\merge@kanji@series + \delayed@k@adjustment + \let\delayed@merge@kanji@shape\merge@kanji@shape@without@substitution + \let\delayed@merge@kanji@series\merge@kanji@series@without@substitution + \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 + % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n END +% \end{macrocode} +% p\LaTeXe{}$B$N(B|\selectfont|$B%3%^%s%I$O!"$^$:!"OBJ8%U%)%s%H$r@Z$jBX$($^$9!#(B +% \begin{macrocode} \let\tmp@error@fontshape\error@fontshape \let\error@fontshape\error@kfontshape \edef\tmp@item{{\k@encoding}}% @@ -1855,15 +1971,13 @@ \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}% \pickup@font \font@name -%<trace> \ifnum \tracingfonts>\tw@ -%<trace> \@font@info{Roman:Switching to \font@name}\fi + \UseHook{selectfont}% since LaTeX2e 2021-05-01 \enc@update % \end{macrocode} % $B:G8e$K!"%5%$%:$,JQ99$5$l$F$$$l$P!"%Y!<%9%i%$%s$ND4@0$J$I$r9T$J$$$^$9!#(B % $B1Q8lHG$N(B|\selectfont|$B$G$O:G=i$K9T$J$C$F$$$^$9$,!"(B % p\LaTeXe{}$B$G$O%Y!<%9%i%$%s%7%U%H$ND4@0$r$9$k$?$a$K!"(B % $B=qBN$r3NDj$7$J$1$l$P$J$i$J$$$?$a!"0lHV:G8e$K9T$J$$$^$9(B -% % \changes{v1.1b}{1995/04/26}{$B%Y!<%9%i%$%s$ND4@0$r%5%$%:JQ99;~$K(B % $B9T$J$&$h$&$K$7$?(B} % \begin{macrocode} @@ -1871,6 +1985,8 @@ \set@fontsize\baselinestretch\f@size\f@baselineskip \fi \size@update} +%% +\fi % --- for >= 2021-05-01 END %</plcore|platexrelease|trace> %<platexrelease|trace>\plEndIncludeInRelease %<platexrelease|trace>\plIncludeInRelease{0000/00/00}{\selectfont} @@ -2510,6 +2626,21 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\delayed@k@adjustment} +% \LaTeXe~2021-05-01$B$GDI2C$5$l$?(B|\delayed@f@adjustment|$B$NOBJ8HG$G$9!#(B +% \changes{v1.7k}{2021/01/10}{Distangle series and shape update (latex2e/444) +% (sync with ltfssaxes.dtx 2020/12/22 v1.0h)} +% \begin{macrocode} +%<*plcore|platexrelease> +\ifx\delayed@f@adjustment\@undefined % old + \let\delayed@k@adjustment\@undefined +\else % 2021-05-01 + \let\delayed@k@adjustment\@empty +\fi +%</plcore|platexrelease> +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\romanseries} % \begin{macro}{\kanjiseries} % \begin{macro}{\fontseries} @@ -2519,6 +2650,10 @@ % 2019$BG/$^$G$OL5>r7o$K;XDj$5$l$?$H$*$j$N%7%j!<%:$rA*Br$7$F$$$^$7$?$,!"(B % \LaTeXe~2020-02-02$B0J9_$G$O!"(B|\DeclareFontSeriesChangeRule|$B$K$h$C$F(B % $B@k8@$5$l$?!V%7%j!<%:99?75,B'!W$K4p$E$-%7%j!<%:$rA*Br$7$^$9!#(B +% +% \LaTeXe~2021-05-01$B0J9_$G$O!"%7%j!<%:$N99?7$r(B|\selectfont|$B$^$GCY$i$;$^$9!#(B +% \changes{v1.7k}{2021/01/10}{Distangle series and shape update (latex2e/444) +% (sync with ltfssaxes.dtx 2020/12/22 v1.0h)} % \begin{macrocode} %<*plcore|platexrelease> \ifx\fontseriesforce\@undefined % old @@ -2526,9 +2661,19 @@ \DeclareRobustCommand\kanjiseries[1]{\edef\k@series{#1}} \DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} \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\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} +\else % --- for <= 2020-10-01 END & for >= 2021-05-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 + \expandafter\def\expandafter\delayed@k@adjustment\expandafter + {\delayed@k@adjustment\delayed@merge@kanji@series{#1}}} +\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} +\fi % --- for >= 2021-05-01 END \fi % \end{macrocode} % \end{macro} @@ -2548,9 +2693,19 @@ \let\romanseriesforce\@undefined \let\kanjiseriesforce\@undefined \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\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}} +\else % --- for <= 2020-10-01 END & for >= 2021-05-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 + \expandafter\def\expandafter\delayed@k@adjustment\expandafter + {\delayed@k@adjustment\edef\k@series{#1}}} +\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}} +\fi % --- for >= 2021-05-01 END \fi % \end{macrocode} % \end{macro} @@ -2584,8 +2739,13 @@ % \begin{macrocode} \set@target@series@kanji{#2}% \else +%^^A [TODO] BEGIN +%^^A LaTeX2e 2021-05-01 $B$G$O(B |\maybe@load@fontshape| $B$O:o=|$5$l$k!#(B +%^^A $BM}M3!'=hM}$,(B |\selectfont| $B$^$GCY$l$k$N$GITMW$H$N$3$H!#(B +%^^A $B$7$+$7!"$J$<$+(B ltfssaxes.dtx $B$G(B rollback $B$NBP=h$,L5$$$h$&$J!)(B \begingroup\let\f@encoding\k@encoding\let\f@family\k@family \maybe@load@fontshape\endgroup +%^^A [TODO] END \edef\reserved@a{\k@encoding /\k@family /#1/\k@shape}% \ifcsname \reserved@a \endcsname % \end{macrocode} @@ -2614,6 +2774,40 @@ \series@maybe@drop@one@m\k@series\k@series } \fi +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\merge@kanji@series@without@substitution} +% \begin{macro}{\merge@kanji@series@without@substitution@} +% \begin{macro}{\delayed@merge@kanji@series} +% \cs{merge@font@series@without@substitution}$B$NOBJ8HG$G$9!#(B +% \changes{v1.7k}{2021/01/10}{Distangle series and shape update (latex2e/444) +% (sync with ltfssaxes.dtx 2020/12/22 v1.0h)} +% \begin{macrocode} +\ifx\merge@font@series@without@substitution\@undefined % old +\let\merge@kanji@series@without@substitution\@undefined +\let\merge@kanji@series@without@substitution@\@undefined +\let\delayed@merge@kanji@series\@undefined +\else % 2021-05-01 +\def\merge@kanji@series@without@substitution#1{% + \expandafter\expandafter\expandafter + \merge@kanji@series@without@substitution@ + \csname series@\k@series @#1\endcsname + {#1}% + \@nil +} +\def\merge@kanji@series@without@substitution@#1#2#3\@nil{% + \def\reserved@a{#3}% + \ifx\reserved@a\@empty + \set@target@series@kanji{#2}% + \else + \set@target@series@kanji{#1}% + \fi +} +\let\delayed@merge@kanji@series\merge@kanji@series@without@substitution +\fi %</plcore|platexrelease> % \end{macrocode} % \end{macro} @@ -2667,6 +2861,10 @@ % 2019$BG/$^$G$OL5>r7o$K;XDj$5$l$?$H$*$j$N%7%'%$%W$rA*Br$7$F$$$^$7$?$,!"(B % \LaTeXe~2020-02-02$B0J9_$G$O!"(B|\DeclareFontShapeChangeRule|$B$K$h$C$F(B % $B@k8@$5$l$?!V%7%'%$%W99?75,B'!W$K4p$E$-%7%'%$%W$rA*Br$7$^$9!#(B +% +% \LaTeXe~2021-05-01$B0J9_$G$O!"%7%'%$%W$N99?7$r(B|\selectfont|$B$^$GCY$i$;$^$9!#(B +% \changes{v1.7k}{2021/01/10}{Distangle series and shape update (latex2e/444) +% (sync with ltfssaxes.dtx 2020/12/22 v1.0h)} % \begin{macrocode} %<platexrelease>\plIncludeInRelease{2020/04/12}{\fontshape} %<platexrelease> {No \k@shape update if unavailable}% @@ -2679,12 +2877,25 @@ \edef\f@shape{#1}% } \else % 2020-02-02 +\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN \DeclareRobustCommand\romanshape[1]{\merge@font@shape{#1}} \DeclareRobustCommand\kanjishape[1]{\merge@kanji@shape{#1}} \DeclareRobustCommand\fontshape[1]{% \@shape@roman@kanjitrue \kanjishape{#1}\romanshape{#1}% \@shape@roman@kanjifalse} +\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN +\DeclareRobustCommand\romanshape[1]{% + \expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\delayed@merge@font@shape{#1}}} +\DeclareRobustCommand\kanjishape[1]{% + \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} +\fi % --- for >= 2021-05-01 END \fi %</plcore|platexrelease> %<platexrelease>\plEndIncludeInRelease @@ -2719,12 +2930,27 @@ \let\romanshapeforce\@undefined \let\kanjishapeforce\@undefined \else % 2020-02-02 +\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN \DeclareRobustCommand\romanshapeforce[1]{\edef\f@shape{#1}} \DeclareRobustCommand\kanjishapeforce[1]{\edef\k@shape{#1}} \DeclareRobustCommand\fontshapeforce[1]{% \set@safe@kanji@shape{#1}{}% \edef\f@shape{#1}% } +\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN +\DeclareRobustCommand\romanshapeforce[1]{% + \expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\edef\f@shape{#1}}} +\DeclareRobustCommand\kanjishapeforce[1]{% + \expandafter\def\expandafter\delayed@k@adjustment\expandafter + {\delayed@k@adjustment\edef\k@shape{#1}}} +\DeclareRobustCommand\fontshapeforce[1]{% + \expandafter\def\expandafter\delayed@k@adjustment\expandafter + {\delayed@k@adjustment\set@safe@kanji@shape{#1}{}}% + \expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\edef\f@shape{#1}}% +} +\fi % --- for >= 2021-05-01 END \fi %</plcore|platexrelease> %<platexrelease>\plEndIncludeInRelease @@ -2776,8 +3002,13 @@ \edef\k@shape{#2}% \fi \else +%^^A [TODO] BEGIN +%^^A LaTeX2e 2021-05-01 $B$G$O(B |\maybe@load@fontshape| $B$O:o=|$5$l$k!#(B +%^^A $BM}M3!'=hM}$,(B |\selectfont| $B$^$GCY$l$k$N$GITMW$H$N$3$H!#(B +%^^A $B$7$+$7!"$J$<$+(B ltfssaxes.dtx $B$G(B rollback $B$NBP=h$,L5$$$h$&$J!)(B \begingroup\let\f@encoding\k@encoding\let\f@family\k@family \maybe@load@fontshape\endgroup +%^^A [TODO] END \edef\reserved@a{\k@encoding /\k@family /\k@series/#1}% \ifcsname \reserved@a\endcsname % \end{macrocode} @@ -2851,6 +3082,42 @@ % \end{macro} % \end{macro} % +% \begin{macro}{\merge@kanji@shape@without@substitution} +% \begin{macro}{\merge@kanji@shape@without@substitution@} +% \begin{macro}{\delayed@merge@kanji@shape} +% \cs{merge@font@shape@without@substitution}$B$NOBJ8HG$G$9!#(B +% \changes{v1.7k}{2021/01/10}{Distangle series and shape update (latex2e/444) +% (sync with ltfssaxes.dtx 2020/12/22 v1.0h)} +% \begin{macrocode} +%<*plcore|platexrelease> +\ifx\merge@font@shape@without@substitution\@undefined % old +\let\merge@kanji@shape@without@substitution\@undefined +\let\merge@kanji@shape@without@substitution@\@undefined +\let\delayed@merge@kanji@shape\@undefined +\else % 2021-05-01 +\def\merge@kanji@shape@without@substitution#1{% + \expandafter\expandafter\expandafter + \merge@kanji@shape@without@substitution@ + \csname shape@\k@shape @#1\endcsname + {#1}% + \@nil +} +\def\merge@kanji@shape@without@substitution@#1#2#3\@nil{% + \def\reserved@a{#3}% + \ifx\reserved@a\@empty + \edef\k@shape{#2}% + \else + \edef\k@shape{#1}% + \fi +} +\let\delayed@merge@kanji@shape\merge@kanji@shape@without@substitution +\fi +%</plcore|platexrelease> +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% % \begin{macro}{\set@safe@kanji@shape} % \begin{macro}{\@kanji@shape@nochange@info} % $BOBJ8%7%'!<%W$,MxMQ2DG=$+$I$&$+M=$a%A%'%C%/$7$F$+$i@_Dj$7$^$9!#(B @@ -2896,10 +3163,13 @@ % (sync with ltfssbas.dtx 2019/08/27 v3.2d)} % \changes{v1.6v}{2020/02/01}{Don't call \cs{fontseries} or \cs{fontshape} % (sync with ltfssbas.dtx 2019/12/17 v3.2e)} +% \changes{v1.7j}{2020/12/29}{Drop ``m'' for latex2e issue 453 +% (sync with ltfssbas.dtx 2020/12/10 v3.2h)} % \begin{macrocode} %<platexrelease>\plIncludeInRelease{2020/02/02}{\usefont} %<platexrelease> {Don't call \fontseries or \fontshape}% %<*plcore|platexrelease> +\ifx\set@target@series\@undefined \DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}% \edef\k@family{#2}% \edef\k@series{#3}% @@ -2910,6 +3180,18 @@ \edef\f@series{#3}% \edef\f@shape{#4}\selectfont \ignorespaces} +\else +\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}% + \edef\k@family{#2}% + \set@target@series@kanji{#3}% + \edef\k@shape{#4}\selectfont + \ignorespaces} +\DeclareRobustCommand\useroman[4]{\romanencoding{#1}% + \edef\f@family{#2}% + \set@target@series{#3}% + \edef\f@shape{#4}\selectfont + \ignorespaces} +\fi \DeclareRobustCommand\usefont[4]{% \edef\tmp@item{{#1}}% \expandafter\expandafter\expandafter @@ -4424,17 +4706,18 @@ % \begin{macrocode} %<*pldefs> \ProvidesFile{pldefs.ltx} - [2020/02/01 v1.6v pLaTeX Kernel (Default settings)] + [2021/01/10 v1.7k pLaTeX Kernel (Default settings)] %</pldefs> % \end{macrocode} % % \subsection{$B%F%-%9%H%U%)%s%H(B} % $B%F%-%9%H%U%)%s%H$N$?$a$NB0@-$d%(%i!<=qBN$J$I$N@k8@$G$9!#(B % p\LaTeX{}$B$N%G%U%)%k%H$N2#AH%(%s%3!<%I$O(BJY1$B!"=DAH%(%s%3!<%I$O(BJT1$B$H$7$^$9!#(B -% % \changes{v1.6s}{2019/08/13}{Explicitly set some defaults % after \cs{DeclareErrorKanjiFont} change % (sync with ltfssini.dtx 2019/07/09 v3.1c)} +% \changes{v1.7k}{2021/01/10}{Adjust start values for series and shape (latex2e/444) +% (sync with ltfssini.dtx 2020/12/06 v3.2f)} % \noindent % $B=D2#%(%s%3!<%I6&DL!'(B % \begin{macrocode} @@ -4442,8 +4725,8 @@ \DeclareKanjiEncodingDefaults{}{} \DeclareErrorKanjiFont{JY1}{mc}{m}{n}{10} \kanjifamily{mc} -\kanjiseries{m} -\kanjishape{n} +\def\k@series{m} % \kanjiseries{m} +\def\k@shape{n} % \kanjishape{n} \fontsize{10}{10} % \end{macrocode} % $B2#AH%(%s%3!<%I!'(B diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx index 9ee65a40041..ee268af6a32 100644 --- a/Master/texmf-dist/source/platex/base/plvers.dtx +++ b/Master/texmf-dist/source/platex/base/plvers.dtx @@ -197,7 +197,7 @@ {2020-10-01} %</plcore|platexrelease> %<*plcore> -\def\ppatch@level{1} +\def\ppatch@level{2} %</plcore> % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index b54874f3f00..5c4d898c4f0 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -71,7 +71,7 @@ %% File: platexrelease.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{platexrelease} - [2020/03/28 v1.0n latexrelease support for pLaTeX Kernel + [2021/02/13 v1.0o latexrelease support for pLaTeX Kernel (including releases up to \platexreleaseversion)] \ifx\p@warn@latexrelease\@undefined\else \let\p@warn@latexrelease\relax @@ -88,6 +88,8 @@ Version of `latexrelease' is newer than\MessageBreak what `platexrelease' knows} \fi +\edef\sourcepLaTeXdate{% + \expandafter\@parse@version\pfmtversion//00\@nil} \DeclareOption*{% \def\@plIncludeInRelease#1[#2]{\@plIncludeInRele@se{#1}}% \let\requestedplpatchdate\CurrentOption} @@ -144,6 +146,7 @@ of this package available from CTAN} some critical bugs. We advise you to\MessageBreak select another format date} \plIncludeInRelease{2017/10/28}{\PackageWarning}{pLaTeX Info}% + % * <2020-10-01>+2 (prepare for LaTeX2e <2021-05-01>) % * <2020-10-01>+1 % * <2020-10-01> % * <2020-04-12> @@ -709,7 +712,106 @@ of this package available from CTAN} \plEndIncludeInRelease \plIncludeInRelease{2020/04/12}{\selectfont} {Check \KanjiEncodingPair}% +\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN +%% +\DeclareRobustCommand\selectfont{% + \let\tmp@error@fontshape\error@fontshape + \let\error@fontshape\error@kfontshape + \edef\tmp@item{{\k@encoding}}% + \expandafter\expandafter\expandafter + \inlist@\expandafter\tmp@item\expandafter{\kyenc@list}% + \ifin@ + \let\cy@encoding\k@encoding + \ensure@KanjiEncodingPair{t}% + \edef\ct@encoding{\csname t@enc@\k@encoding\endcsname}% + \else + \expandafter\expandafter\expandafter + \inlist@\expandafter\tmp@item\expandafter{\ktenc@list}% + \ifin@ + \let\ct@encoding\k@encoding + \ensure@KanjiEncodingPair{y}% + \edef\cy@encoding{\csname y@enc@\k@encoding\endcsname}% + \else + \@latex@error{KANJI Encoding scheme `\k@encoding' unknown}\@eha + \fi + \fi + \let\font\tfont + \let\k@encoding\ct@encoding + \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}% + \pickup@font + \font@name + \let\font\jfont + \let\k@encoding\cy@encoding + \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}% + \pickup@font + \font@name + \expandafter\def\expandafter\k@encoding\tmp@item + \kenc@update + \let\error@fontshape\tmp@error@fontshape + \if@knjcmd \@knjcmdfalse + \expandafter\ifx + \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname\relax + \expandafter\ifx + \csname rel@\k@encoding/\k@family/\k@series/all\endcsname\relax + \else + \csname rel@\k@encoding/\k@family/\k@series/all\endcsname + \fi + \else + \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname + \fi + \fi + \let\font\afont + \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}% + \pickup@font + \font@name + \enc@update + \ifx\f@linespread\baselinestretch \else + \set@fontsize\baselinestretch\f@size\f@baselineskip + \fi + \size@update} +%% +\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN +%% \DeclareRobustCommand\selectfont{% + % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n BEGIN + \ifx\delayed@k@adjustment\@empty + \else + \let\k@shape@saved\k@shape + \let\k@series@saved\k@series + \delayed@k@adjustment + \begingroup\let\f@encoding\k@encoding\let\f@family\k@family + \maybe@load@fontshape\endgroup + \ifcsname \k@encoding/\k@family/\k@series/\k@shape \endcsname + \else + \let\k@shape\k@shape@saved + \let\k@series\k@series@saved + \let\delayed@merge@kanji@shape\merge@kanji@shape + \let\delayed@merge@kanji@series\merge@kanji@series + \delayed@k@adjustment + \let\delayed@merge@kanji@shape\merge@kanji@shape@without@substitution + \let\delayed@merge@kanji@series\merge@kanji@series@without@substitution + \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 + % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n END \let\tmp@error@fontshape\error@fontshape \let\error@fontshape\error@kfontshape \edef\tmp@item{{\k@encoding}}% @@ -759,11 +861,14 @@ of this package available from CTAN} \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}% \pickup@font \font@name + \UseHook{selectfont}% since LaTeX2e 2021-05-01 \enc@update \ifx\f@linespread\baselinestretch \else \set@fontsize\baselinestretch\f@size\f@baselineskip \fi \size@update} +%% +\fi % --- for >= 2021-05-01 END \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\selectfont} {ASCII Corporation original}% @@ -970,22 +1075,47 @@ of this package available from CTAN} \else \pltx@temp@catcode@ix % reveal if-tokens \fi +\ifx\delayed@f@adjustment\@undefined % old + \let\delayed@k@adjustment\@undefined +\else % 2021-05-01 + \let\delayed@k@adjustment\@empty +\fi \ifx\fontseriesforce\@undefined % old \DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}} \DeclareRobustCommand\kanjiseries[1]{\edef\k@series{#1}} \DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} \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\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} +\else % --- for <= 2020-10-01 END & for >= 2021-05-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 + \expandafter\def\expandafter\delayed@k@adjustment\expandafter + {\delayed@k@adjustment\delayed@merge@kanji@series{#1}}} +\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} +\fi % --- for >= 2021-05-01 END \fi \ifx\fontseriesforce\@undefined % old \let\romanseriesforce\@undefined \let\kanjiseriesforce\@undefined \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\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}} +\else % --- for <= 2020-10-01 END & for >= 2021-05-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 + \expandafter\def\expandafter\delayed@k@adjustment\expandafter + {\delayed@k@adjustment\edef\k@series{#1}}} +\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}} +\fi % --- for >= 2021-05-01 END \fi \ifx\fontseriesforce\@undefined % old \let\merge@kanji@series\@undefined @@ -1025,6 +1155,28 @@ of this package available from CTAN} \series@maybe@drop@one@m\k@series\k@series } \fi +\ifx\merge@font@series@without@substitution\@undefined % old +\let\merge@kanji@series@without@substitution\@undefined +\let\merge@kanji@series@without@substitution@\@undefined +\let\delayed@merge@kanji@series\@undefined +\else % 2021-05-01 +\def\merge@kanji@series@without@substitution#1{% + \expandafter\expandafter\expandafter + \merge@kanji@series@without@substitution@ + \csname series@\k@series @#1\endcsname + {#1}% + \@nil +} +\def\merge@kanji@series@without@substitution@#1#2#3\@nil{% + \def\reserved@a{#3}% + \ifx\reserved@a\@empty + \set@target@series@kanji{#2}% + \else + \set@target@series@kanji{#1}% + \fi +} +\let\delayed@merge@kanji@series\merge@kanji@series@without@substitution +\fi \newif\if@shape@roman@kanji \plIncludeInRelease{2020/04/12}{\fontshape} {No \k@shape update if unavailable}% @@ -1036,12 +1188,25 @@ of this package available from CTAN} \edef\f@shape{#1}% } \else % 2020-02-02 +\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN \DeclareRobustCommand\romanshape[1]{\merge@font@shape{#1}} \DeclareRobustCommand\kanjishape[1]{\merge@kanji@shape{#1}} \DeclareRobustCommand\fontshape[1]{% \@shape@roman@kanjitrue \kanjishape{#1}\romanshape{#1}% \@shape@roman@kanjifalse} +\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN +\DeclareRobustCommand\romanshape[1]{% + \expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\delayed@merge@font@shape{#1}}} +\DeclareRobustCommand\kanjishape[1]{% + \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} +\fi % --- for >= 2021-05-01 END \fi \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\fontshape} @@ -1062,12 +1227,27 @@ of this package available from CTAN} \let\romanshapeforce\@undefined \let\kanjishapeforce\@undefined \else % 2020-02-02 +\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN \DeclareRobustCommand\romanshapeforce[1]{\edef\f@shape{#1}} \DeclareRobustCommand\kanjishapeforce[1]{\edef\k@shape{#1}} \DeclareRobustCommand\fontshapeforce[1]{% \set@safe@kanji@shape{#1}{}% \edef\f@shape{#1}% } +\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN +\DeclareRobustCommand\romanshapeforce[1]{% + \expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\edef\f@shape{#1}}} +\DeclareRobustCommand\kanjishapeforce[1]{% + \expandafter\def\expandafter\delayed@k@adjustment\expandafter + {\delayed@k@adjustment\edef\k@shape{#1}}} +\DeclareRobustCommand\fontshapeforce[1]{% + \expandafter\def\expandafter\delayed@k@adjustment\expandafter + {\delayed@k@adjustment\set@safe@kanji@shape{#1}{}}% + \expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\edef\f@shape{#1}}% +} +\fi % --- for >= 2021-05-01 END \fi \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\fontshapeforce} @@ -1162,6 +1342,28 @@ of this package available from CTAN} } \fi \plEndIncludeInRelease +\ifx\merge@font@shape@without@substitution\@undefined % old +\let\merge@kanji@shape@without@substitution\@undefined +\let\merge@kanji@shape@without@substitution@\@undefined +\let\delayed@merge@kanji@shape\@undefined +\else % 2021-05-01 +\def\merge@kanji@shape@without@substitution#1{% + \expandafter\expandafter\expandafter + \merge@kanji@shape@without@substitution@ + \csname shape@\k@shape @#1\endcsname + {#1}% + \@nil +} +\def\merge@kanji@shape@without@substitution@#1#2#3\@nil{% + \def\reserved@a{#3}% + \ifx\reserved@a\@empty + \edef\k@shape{#2}% + \else + \edef\k@shape{#1}% + \fi +} +\let\delayed@merge@kanji@shape\merge@kanji@shape@without@substitution +\fi \plIncludeInRelease{2020/04/12}{\set@safe@kanji@shape} {No \k@shape update if unavailable}% \def\set@safe@kanji@shape#1#2{% @@ -1185,6 +1387,7 @@ of this package available from CTAN} \plEndIncludeInRelease \plIncludeInRelease{2020/02/02}{\usefont} {Don't call \fontseries or \fontshape}% +\ifx\set@target@series\@undefined \DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}% \edef\k@family{#2}% \edef\k@series{#3}% @@ -1195,6 +1398,18 @@ of this package available from CTAN} \edef\f@series{#3}% \edef\f@shape{#4}\selectfont \ignorespaces} +\else +\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}% + \edef\k@family{#2}% + \set@target@series@kanji{#3}% + \edef\k@shape{#4}\selectfont + \ignorespaces} +\DeclareRobustCommand\useroman[4]{\romanencoding{#1}% + \edef\f@family{#2}% + \set@target@series{#3}% + \edef\f@shape{#4}\selectfont + \ignorespaces} +\fi \DeclareRobustCommand\usefont[4]{% \edef\tmp@item{{#1}}% \expandafter\expandafter\expandafter diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index b3189fc5399..400d8d27003 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 {2020-10-01} -\def\ppatch@level{1} +\def\ppatch@level{2} \edef\platexBANNER{\noexpand\platexNILa \the\everyjob % LaTeX banner and delayed codes \noexpand\platexNILb} @@ -581,7 +581,106 @@ } \newif\if@knjcmd \DeclareRobustCommand\userelfont{\@knjcmdtrue} +\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN +%% +\DeclareRobustCommand\selectfont{% + \let\tmp@error@fontshape\error@fontshape + \let\error@fontshape\error@kfontshape + \edef\tmp@item{{\k@encoding}}% + \expandafter\expandafter\expandafter + \inlist@\expandafter\tmp@item\expandafter{\kyenc@list}% + \ifin@ + \let\cy@encoding\k@encoding + \ensure@KanjiEncodingPair{t}% + \edef\ct@encoding{\csname t@enc@\k@encoding\endcsname}% + \else + \expandafter\expandafter\expandafter + \inlist@\expandafter\tmp@item\expandafter{\ktenc@list}% + \ifin@ + \let\ct@encoding\k@encoding + \ensure@KanjiEncodingPair{y}% + \edef\cy@encoding{\csname y@enc@\k@encoding\endcsname}% + \else + \@latex@error{KANJI Encoding scheme `\k@encoding' unknown}\@eha + \fi + \fi + \let\font\tfont + \let\k@encoding\ct@encoding + \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}% + \pickup@font + \font@name + \let\font\jfont + \let\k@encoding\cy@encoding + \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}% + \pickup@font + \font@name + \expandafter\def\expandafter\k@encoding\tmp@item + \kenc@update + \let\error@fontshape\tmp@error@fontshape + \if@knjcmd \@knjcmdfalse + \expandafter\ifx + \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname\relax + \expandafter\ifx + \csname rel@\k@encoding/\k@family/\k@series/all\endcsname\relax + \else + \csname rel@\k@encoding/\k@family/\k@series/all\endcsname + \fi + \else + \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname + \fi + \fi + \let\font\afont + \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}% + \pickup@font + \font@name + \enc@update + \ifx\f@linespread\baselinestretch \else + \set@fontsize\baselinestretch\f@size\f@baselineskip + \fi + \size@update} +%% +\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN +%% \DeclareRobustCommand\selectfont{% + % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n BEGIN + \ifx\delayed@k@adjustment\@empty + \else + \let\k@shape@saved\k@shape + \let\k@series@saved\k@series + \delayed@k@adjustment + \begingroup\let\f@encoding\k@encoding\let\f@family\k@family + \maybe@load@fontshape\endgroup + \ifcsname \k@encoding/\k@family/\k@series/\k@shape \endcsname + \else + \let\k@shape\k@shape@saved + \let\k@series\k@series@saved + \let\delayed@merge@kanji@shape\merge@kanji@shape + \let\delayed@merge@kanji@series\merge@kanji@series + \delayed@k@adjustment + \let\delayed@merge@kanji@shape\merge@kanji@shape@without@substitution + \let\delayed@merge@kanji@series\merge@kanji@series@without@substitution + \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 + % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n END \let\tmp@error@fontshape\error@fontshape \let\error@fontshape\error@kfontshape \edef\tmp@item{{\k@encoding}}% @@ -631,11 +730,14 @@ \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}% \pickup@font \font@name + \UseHook{selectfont}% since LaTeX2e 2021-05-01 \enc@update \ifx\f@linespread\baselinestretch \else \set@fontsize\baselinestretch\f@size\f@baselineskip \fi \size@update} +%% +\fi % --- for >= 2021-05-01 END \def\set@fontsize#1#2#3{% \@defaultunits\@tempdimb#2pt\relax\@nnil \edef\f@size{\strip@pt\@tempdimb}% @@ -835,22 +937,47 @@ \else \pltx@temp@catcode@ix % reveal if-tokens \fi +\ifx\delayed@f@adjustment\@undefined % old + \let\delayed@k@adjustment\@undefined +\else % 2021-05-01 + \let\delayed@k@adjustment\@empty +\fi \ifx\fontseriesforce\@undefined % old \DeclareRobustCommand\romanseries[1]{\edef\f@series{#1}} \DeclareRobustCommand\kanjiseries[1]{\edef\k@series{#1}} \DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} \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\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} +\else % --- for <= 2020-10-01 END & for >= 2021-05-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 + \expandafter\def\expandafter\delayed@k@adjustment\expandafter + {\delayed@k@adjustment\delayed@merge@kanji@series{#1}}} +\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}} +\fi % --- for >= 2021-05-01 END \fi \ifx\fontseriesforce\@undefined % old \let\romanseriesforce\@undefined \let\kanjiseriesforce\@undefined \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\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}} +\else % --- for <= 2020-10-01 END & for >= 2021-05-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 + \expandafter\def\expandafter\delayed@k@adjustment\expandafter + {\delayed@k@adjustment\edef\k@series{#1}}} +\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}} +\fi % --- for >= 2021-05-01 END \fi \ifx\fontseriesforce\@undefined % old \let\merge@kanji@series\@undefined @@ -890,6 +1017,28 @@ \series@maybe@drop@one@m\k@series\k@series } \fi +\ifx\merge@font@series@without@substitution\@undefined % old +\let\merge@kanji@series@without@substitution\@undefined +\let\merge@kanji@series@without@substitution@\@undefined +\let\delayed@merge@kanji@series\@undefined +\else % 2021-05-01 +\def\merge@kanji@series@without@substitution#1{% + \expandafter\expandafter\expandafter + \merge@kanji@series@without@substitution@ + \csname series@\k@series @#1\endcsname + {#1}% + \@nil +} +\def\merge@kanji@series@without@substitution@#1#2#3\@nil{% + \def\reserved@a{#3}% + \ifx\reserved@a\@empty + \set@target@series@kanji{#2}% + \else + \set@target@series@kanji{#1}% + \fi +} +\let\delayed@merge@kanji@series\merge@kanji@series@without@substitution +\fi \newif\if@shape@roman@kanji \ifx\fontshapeforce\@undefined % old \DeclareRobustCommand\romanshape[1]{\edef\f@shape{#1}} @@ -899,23 +1048,51 @@ \edef\f@shape{#1}% } \else % 2020-02-02 +\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN \DeclareRobustCommand\romanshape[1]{\merge@font@shape{#1}} \DeclareRobustCommand\kanjishape[1]{\merge@kanji@shape{#1}} \DeclareRobustCommand\fontshape[1]{% \@shape@roman@kanjitrue \kanjishape{#1}\romanshape{#1}% \@shape@roman@kanjifalse} +\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN +\DeclareRobustCommand\romanshape[1]{% + \expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\delayed@merge@font@shape{#1}}} +\DeclareRobustCommand\kanjishape[1]{% + \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} +\fi % --- for >= 2021-05-01 END \fi \ifx\fontshapeforce\@undefined % old \let\romanshapeforce\@undefined \let\kanjishapeforce\@undefined \else % 2020-02-02 +\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN \DeclareRobustCommand\romanshapeforce[1]{\edef\f@shape{#1}} \DeclareRobustCommand\kanjishapeforce[1]{\edef\k@shape{#1}} \DeclareRobustCommand\fontshapeforce[1]{% \set@safe@kanji@shape{#1}{}% \edef\f@shape{#1}% } +\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN +\DeclareRobustCommand\romanshapeforce[1]{% + \expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\edef\f@shape{#1}}} +\DeclareRobustCommand\kanjishapeforce[1]{% + \expandafter\def\expandafter\delayed@k@adjustment\expandafter + {\delayed@k@adjustment\edef\k@shape{#1}}} +\DeclareRobustCommand\fontshapeforce[1]{% + \expandafter\def\expandafter\delayed@k@adjustment\expandafter + {\delayed@k@adjustment\set@safe@kanji@shape{#1}{}}% + \expandafter\def\expandafter\delayed@f@adjustment\expandafter + {\delayed@f@adjustment\edef\f@shape{#1}}% +} +\fi % --- for >= 2021-05-01 END \fi \ifx\fontseriesforce\@undefined % old \let\merge@kanji@shape\@undefined @@ -959,6 +1136,28 @@ \fi } \fi +\ifx\merge@font@shape@without@substitution\@undefined % old +\let\merge@kanji@shape@without@substitution\@undefined +\let\merge@kanji@shape@without@substitution@\@undefined +\let\delayed@merge@kanji@shape\@undefined +\else % 2021-05-01 +\def\merge@kanji@shape@without@substitution#1{% + \expandafter\expandafter\expandafter + \merge@kanji@shape@without@substitution@ + \csname shape@\k@shape @#1\endcsname + {#1}% + \@nil +} +\def\merge@kanji@shape@without@substitution@#1#2#3\@nil{% + \def\reserved@a{#3}% + \ifx\reserved@a\@empty + \edef\k@shape{#2}% + \else + \edef\k@shape{#1}% + \fi +} +\let\delayed@merge@kanji@shape\merge@kanji@shape@without@substitution +\fi \def\set@safe@kanji@shape#1#2{% \edef\reserved@b{\k@encoding /\k@family /\k@series/#1}% \ifcsname \reserved@b\endcsname @@ -972,6 +1171,7 @@ \@font@info{Kanji font shape `#1' undefined\MessageBreak No change}% } +\ifx\set@target@series\@undefined \DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}% \edef\k@family{#2}% \edef\k@series{#3}% @@ -982,6 +1182,18 @@ \edef\f@series{#3}% \edef\f@shape{#4}\selectfont \ignorespaces} +\else +\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}% + \edef\k@family{#2}% + \set@target@series@kanji{#3}% + \edef\k@shape{#4}\selectfont + \ignorespaces} +\DeclareRobustCommand\useroman[4]{\romanencoding{#1}% + \edef\f@family{#2}% + \set@target@series{#3}% + \edef\f@shape{#4}\selectfont + \ignorespaces} +\fi \DeclareRobustCommand\usefont[4]{% \edef\tmp@item{{#1}}% \expandafter\expandafter\expandafter diff --git a/Master/texmf-dist/tex/platex/base/pldefs.ltx b/Master/texmf-dist/tex/platex/base/pldefs.ltx index 2c6ab55b8e6..f19c3054ed7 100644 --- a/Master/texmf-dist/tex/platex/base/pldefs.ltx +++ b/Master/texmf-dist/tex/platex/base/pldefs.ltx @@ -14,12 +14,12 @@ %% %% File: plfonts.dtx \ProvidesFile{pldefs.ltx} - [2020/02/01 v1.6v pLaTeX Kernel (Default settings)] + [2021/01/10 v1.7k pLaTeX Kernel (Default settings)] \DeclareKanjiEncodingDefaults{}{} \DeclareErrorKanjiFont{JY1}{mc}{m}{n}{10} \kanjifamily{mc} -\kanjiseries{m} -\kanjishape{n} +\def\k@series{m} % \kanjiseries{m} +\def\k@shape{n} % \kanjishape{n} \fontsize{10}{10} \DeclareYokoKanjiEncoding{JY1}{}{} \DeclareKanjiSubstitution{JY1}{mc}{m}{n} diff --git a/Master/texmf-dist/tex/platex/base/ptrace.sty b/Master/texmf-dist/tex/platex/base/ptrace.sty index 7a4963606f5..aa077eee6ad 100644 --- a/Master/texmf-dist/tex/platex/base/ptrace.sty +++ b/Master/texmf-dist/tex/platex/base/ptrace.sty @@ -15,10 +15,12 @@ %% File: plfonts.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{ptrace} - [2020/03/26 v1.7e Standard pLaTeX package (font tracing)] + [2021/01/10 v1.7k Standard pLaTeX package (font tracing)] \RequirePackageWithOptions{tracefnt} \plIncludeInRelease{2020/04/12}{\selectfont} {Check \KanjiEncodingPair}% +\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN +%% \DeclareRobustCommand\selectfont{% \let\tmp@error@fontshape\error@fontshape \let\error@fontshape\error@kfontshape @@ -76,6 +78,106 @@ \set@fontsize\baselinestretch\f@size\f@baselineskip \fi \size@update} +%% +\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN +%% +\DeclareRobustCommand\selectfont{% + % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n BEGIN + \ifx\delayed@k@adjustment\@empty + \else + \let\k@shape@saved\k@shape + \let\k@series@saved\k@series + \delayed@k@adjustment + \begingroup\let\f@encoding\k@encoding\let\f@family\k@family + \maybe@load@fontshape\endgroup + \ifcsname \k@encoding/\k@family/\k@series/\k@shape \endcsname + \else + \let\k@shape\k@shape@saved + \let\k@series\k@series@saved + \let\delayed@merge@kanji@shape\merge@kanji@shape + \let\delayed@merge@kanji@series\merge@kanji@series + \delayed@k@adjustment + \let\delayed@merge@kanji@shape\merge@kanji@shape@without@substitution + \let\delayed@merge@kanji@series\merge@kanji@series@without@substitution + \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 + % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n END + \let\tmp@error@fontshape\error@fontshape + \let\error@fontshape\error@kfontshape + \edef\tmp@item{{\k@encoding}}% + \expandafter\expandafter\expandafter + \inlist@\expandafter\tmp@item\expandafter{\kyenc@list}% + \ifin@ + \let\cy@encoding\k@encoding + \ensure@KanjiEncodingPair{t}% + \edef\ct@encoding{\csname t@enc@\k@encoding\endcsname}% + \else + \expandafter\expandafter\expandafter + \inlist@\expandafter\tmp@item\expandafter{\ktenc@list}% + \ifin@ + \let\ct@encoding\k@encoding + \ensure@KanjiEncodingPair{y}% + \edef\cy@encoding{\csname y@enc@\k@encoding\endcsname}% + \else + \@latex@error{KANJI Encoding scheme `\k@encoding' unknown}\@eha + \fi + \fi + \let\font\tfont + \let\k@encoding\ct@encoding + \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}% + \pickup@font + \font@name + \let\font\jfont + \let\k@encoding\cy@encoding + \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}% + \pickup@font + \font@name + \expandafter\def\expandafter\k@encoding\tmp@item + \kenc@update + \let\error@fontshape\tmp@error@fontshape + \if@knjcmd \@knjcmdfalse + \expandafter\ifx + \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname\relax + \expandafter\ifx + \csname rel@\k@encoding/\k@family/\k@series/all\endcsname\relax + \else + \csname rel@\k@encoding/\k@family/\k@series/all\endcsname + \fi + \else + \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname + \fi + \fi + \let\font\afont + \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}% + \pickup@font + \font@name + \UseHook{selectfont}% since LaTeX2e 2021-05-01 + \enc@update + \ifx\f@linespread\baselinestretch \else + \set@fontsize\baselinestretch\f@size\f@baselineskip + \fi + \size@update} +%% +\fi % --- for >= 2021-05-01 END \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\selectfont} {ASCII Corporation original}% |