texlive[59404] Master/texmf-dist: platex (31may21)
commits+karl at tug.org
commits+karl at tug.org
Mon May 31 22:22:08 CEST 2021
Revision: 59404
http://tug.org/svn/texlive?view=revision&revision=59404
Author: karl
Date: 2021-05-31 22:22:08 +0200 (Mon, 31 May 2021)
Log Message:
-----------
platex (31may21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/platex/base/README.md
trunk/Master/texmf-dist/doc/platex/base/platex-en.pdf
trunk/Master/texmf-dist/doc/platex/base/platex.pdf
trunk/Master/texmf-dist/doc/platex/base/platexrelease.pdf
trunk/Master/texmf-dist/doc/platex/base/pldoc.pdf
trunk/Master/texmf-dist/source/platex/base/kinsoku.dtx
trunk/Master/texmf-dist/source/platex/base/platex.dtx
trunk/Master/texmf-dist/source/platex/base/platexrelease.dtx
trunk/Master/texmf-dist/source/platex/base/plcore.dtx
trunk/Master/texmf-dist/source/platex/base/plfonts.dtx
trunk/Master/texmf-dist/source/platex/base/plvers.dtx
trunk/Master/texmf-dist/tex/platex/base/kinsoku.tex
trunk/Master/texmf-dist/tex/platex/base/platex.ltx
trunk/Master/texmf-dist/tex/platex/base/platexrelease.sty
trunk/Master/texmf-dist/tex/platex/base/plcore.ltx
trunk/Master/texmf-dist/tex/platex/base/ptrace.sty
Modified: trunk/Master/texmf-dist/doc/platex/base/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/platex/base/README.md 2021-05-31 20:21:46 UTC (rev 59403)
+++ trunk/Master/texmf-dist/doc/platex/base/README.md 2021-05-31 20:22:08 UTC (rev 59404)
@@ -64,6 +64,6 @@
## Release Date
-2021-02-13
+2021-05-31
Japanese TeX Development Community
Modified: trunk/Master/texmf-dist/doc/platex/base/platex-en.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/platex/base/platex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/platex/base/platexrelease.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/platex/base/pldoc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/platex/base/kinsoku.dtx
===================================================================
--- trunk/Master/texmf-dist/source/platex/base/kinsoku.dtx 2021-05-31 20:21:46 UTC (rev 59403)
+++ trunk/Master/texmf-dist/source/platex/base/kinsoku.dtx 2021-05-31 20:22:08 UTC (rev 59404)
@@ -3,7 +3,7 @@
%
% Copyright 1995 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).
% -------------------------------------------------------------
@@ -18,6 +18,7 @@
% \changes{v1.0b}{2017/08/05}{$B!s!"!u!"(B\%$B!"(B\&$B$N6XB'%Z%J%k%F%#$,(B
% $B8m$C$F$$$?$N$r=$@5!J(Bpost $\rightarrow$ pre$B!K(B}
% \changes{v1.0c}{2020/09/28}{$B!*$N(B\cs{inhibitxspcode}$B$r at _Dj(B}
+% \changes{v1.0d}{2021/03/04}{$B!'$N(B\cs{inhibitxspcode}$B$H(B:$B$N(B\cs{xspcode}$B$r at _Dj(B}
% \fi
%
% \setcounter{StandardModuleDepth}{1}
@@ -28,7 +29,7 @@
\NeedsTeXFormat{pLaTeX2e}
% \fi
\ProvidesFile{kinsoku.dtx}
- [2020/09/28 v1.0c pLaTeX Kernel (community edition)]
+ [2021/03/04 v1.0d pLaTeX Kernel (community edition)]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{kinsoku.dtx}
@@ -186,6 +187,7 @@
% \end{tabular}
% \end{center}
%
+% \changes{v1.0d}{2021/03/04}{:$B$N(B\cs{xspcode}$B$r at _Dj(B}
% \begin{macrocode}
\xspcode`(=1
\xspcode`)=2
@@ -193,6 +195,7 @@
\xspcode`]=2
\xspcode``=1
\xspcode`'=2
+\xspcode`:=2
\xspcode`;=2
\xspcode`,=2
\xspcode`.=2
@@ -351,11 +354,13 @@
% \end{center}
%
% \changes{v1.0c}{2020/09/28}{$B!*$N(B\cs{inhibitxspcode}$B$r at _Dj(B}
+% \changes{v1.0d}{2021/03/04}{$B!'$N(B\cs{inhibitxspcode}$B$r at _Dj(B}
% \begin{macrocode}
\inhibitxspcode`$B!"(B=1
\inhibitxspcode`$B!#(B=1
\inhibitxspcode`$B!$(B=1
\inhibitxspcode`$B!%(B=1
+\inhibitxspcode`$B!'(B=1
\inhibitxspcode`$B!((B=1
\inhibitxspcode`$B!)(B=1
\inhibitxspcode`$B!*(B=1
Modified: trunk/Master/texmf-dist/source/platex/base/platex.dtx
===================================================================
--- trunk/Master/texmf-dist/source/platex/base/platex.dtx 2021-05-31 20:21:46 UTC (rev 59403)
+++ trunk/Master/texmf-dist/source/platex/base/platex.dtx 2021-05-31 20:22:08 UTC (rev 59404)
@@ -3,7 +3,7 @@
%
% Copyright 1995,1996 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).
% -------------------------------------------------------------
@@ -88,6 +88,8 @@
% \changes{v1.1}{2020/03/24}{$B%I%-%e%a%s%H$r99?7(B}
% \changes{v1.1a}{2020/09/26}{\file{plexpl3.dtx}$B$rDI2C(B}
% \changes{v1.1b}{2020/09/28}{defs$BFI9~8e$K%U%C%/DI2C(B}
+% \changes{v1.1c}{2021/02/25}{\file{latex.ltx}$B$NFI9~%A%'%C%/(B}
+% \changes{v1.1d}{2021/03/14}{expl3$B%3%^%s%I$r0u;z$G$-$k$h$&$K(B}
%\else
% \changes{v1.0}{1995/05/08}{first edition}
% \changes{v1.0a}{1995/08/25}{Added 'Compatibility', `Usage of \dst{}'
@@ -134,6 +136,8 @@
% \changes{v1.1}{2020/03/24}{Update document.}
% \changes{v1.1a}{2020/09/26}{Add \file{plexpl3.dtx}}
% \changes{v1.1b}{2020/09/28}{Add hook after loading defs}
+% \changes{v1.1c}{2021/02/25}{Check for \file{latex.ltx} status}
+% \changes{v1.1d}{2021/03/14}{Print expl3 commands correctly}
%\fi
% \fi
%
@@ -141,7 +145,7 @@
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{platex.dtx}[2020/09/28 v1.1b pLaTeX document file]
+\ProvidesFile{platex.dtx}[2021/03/14 v1.1d pLaTeX document file]
% \iffalse
\documentclass{jltxdoc}
\usepackage{plext}
@@ -491,8 +495,8 @@
%
%\ifJAPANESE
% \file{latex.ltx}$B$rFI$_9~$_$^$9!#(B
-% \TeX\ Live$B$NI8=`E*%$%s%9%H!<%k$G$O!"$3$NCf$G(BBabel$BM3Mh$N%O%$%U%M!<%7%g%s!&(B
-% $B%Q%?!<%s(B\file{hyphen.cfg}$B$,FI$_9~$^$l$k$O$:$G$9!#(B
+% \TeX\ Live$B$NI8=`E*%$%s%9%H!<%k$G$O!"$3$NCf$G(BBabel$BM3Mh$N(B
+% $B%O%$%U%M!<%7%g%s!&%Q%?!<%s(B\file{hyphen.cfg}$B$,FI$_9~$^$l$k$O$:$G$9!#(B
% \changes{v1.0g}{2016/05/07}{$B%U%)!<%^%C%H:n at .;~$K(B\LaTeX{}$B$N%P%J!<$r0lC6J]B8(B}
% \changes{v1.0n}{2016/09/14}{\LaTeX{}$B$N%P%J!<$NJ]B8$7$+$?$r2~NI(B}
% \changes{v1.0p}{2017/11/11}{\LaTeX{}$B$N%P%J!<$rJ]B8$9$k%3!<%I$r(B
@@ -511,6 +515,24 @@
% \end{macrocode}
%
%\ifJAPANESE
+% $B$3$N;~E@$G(B|\typeout|$B$,L$Dj5A$J$i!"(B\LaTeX{}$B%+!<%M%k$NFI$_9~$_$K(B
+% $B<:GT$7$F$$$^$9$N$G!"6/@)=*N;$7$^$9!J(B\LaTeXe\ 2017/01/01$B0J9_$r(B
+% $BHs(B\eTeX{}$B3HD%$G%U%)!<%^%C%H:n at .$7$h$&$H$7$?>l9g$J$I!K!#(B
+% \changes{v1.1c}{2021/02/25}{\file{latex.ltx}$B$NFI9~%A%'%C%/(B}
+%\else
+% If |\typeout| is still undefined, the input of \LaTeX~kernel
+% should have failed; abort now.
+% \changes{v1.1c}{2021/02/25}{Check for \file{latex.ltx} status}
+%\fi
+% \begin{macrocode}
+\ifx\typeout\undefined
+ \errhelp{Please reinstall LaTeX, or check e-TeX availability.}%
+ \errmessage{Failed to load `latex.ltx' properly}%
+ \expandafter\end
+\fi
+% \end{macrocode}
+%
+%\ifJAPANESE
% \file{plcore.ltx}$B$rFI$_9~$_$^$9!#(B
%\else
% Load \file{plcore.ltx}.
@@ -1090,13 +1112,20 @@
% $BJ8=q%/%i%9$K$O!"(B\file{jltxdoc}$B%/%i%9$rMQ$$$^$9!#(B
% \file{plext.dtx}$B$NCf$G%5%s%W%k$rAH$_N)$F$F$$$^$9$N$G!"(B
% \file{plext}$B%Q%C%1!<%8$,I,MW$G$9!#(B
+% \changes{v1.1d}{2021/03/14}{expl3$B%3%^%s%I$r0u;z$G$-$k$h$&$K(B}
%\else
% We use \file{jltxdoc} class; we also require \file{plext} package,
% since \file{plext.dtx} contains several examples of partial
% vertical writing.
+% \changes{v1.1d}{2021/03/14}{Print expl3 commands correctly}
%\fi
% \begin{macrocode}
\documentclass{jltxdoc}
+\makeatletter
+\def\macro{\begingroup
+ \catcode`\\12 \catcode`\_12
+ \MakePrivateLetters \m at cro@ \iftrue}
+\makeatother
\usepackage{plext}
\listfiles
Modified: trunk/Master/texmf-dist/source/platex/base/platexrelease.dtx
===================================================================
--- trunk/Master/texmf-dist/source/platex/base/platexrelease.dtx 2021-05-31 20:21:46 UTC (rev 59403)
+++ trunk/Master/texmf-dist/source/platex/base/platexrelease.dtx 2021-05-31 20:22:08 UTC (rev 59404)
@@ -351,7 +351,8 @@
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>)
+ % * <2021-06-01>
+ % * <2020-10-01>+2
% * <2020-10-01>+1
% * <2020-10-01>
% * <2020-04-12>
Modified: trunk/Master/texmf-dist/source/platex/base/plcore.dtx
===================================================================
--- trunk/Master/texmf-dist/source/platex/base/plcore.dtx 2021-05-31 20:21:46 UTC (rev 59403)
+++ trunk/Master/texmf-dist/source/platex/base/plcore.dtx 2021-05-31 20:22:08 UTC (rev 59404)
@@ -3,7 +3,7 @@
%
% Copyright 1994-2001 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).
% -------------------------------------------------------------
@@ -113,9 +113,9 @@
% \changes{v1.3}{2018/09/02}{\file{platexrelease}$B%P%0=$@5(B}
% \changes{v1.3a}{2018/10/31}{\LaTeXe{}$B$H(Bp\LaTeXe{}$B$N99?7%?%$%_%s%0$:$lBP:v$r(B
% \file{plvers.dtx} (plfinal) $B$+$i(B\file{plcore.dtx}$B$X0\F0!"(Blatexrelease$BBP:v(B
-% (sync with ltfinal 2018/08/24 v2.1f)}
+% (sync with ltfinal.dtx 2018/08/24 v2.1f)}
% \changes{v1.3b}{2019/02/08}{$BCf1{B7$($N%;%k$G$N(B\cs{unskip}$BBP:v(B
-% (sync with lttab 2018/12/30 v1.1p)}
+% (sync with lttab.dtx 2018/12/30 v1.1p)}
% \changes{v1.3c}{2019/09/16}{Make \cs{AtBeginDvi} robust
% (sync with ltoutput.dtx 2019/08/27 v1.4e)}
% \changes{v1.3c}{2019/09/16}{Make \cs{underline} robust
@@ -126,11 +126,14 @@
% \changes{v1.3e}{2020/03/05}{$B9g;z=hM}$rM^;_$7$D$D(B\cs{xkanjiskip}$B$OA^F~(B}
% \changes{v1.3f}{2020/09/26}{\cs{AtBeginDvi}$B$r:FDj5A$7$J$$(B
% (checked ltshipout.dtx 2020/09/21 v1.0c)}
-% \changes{v1.3f}{2020/09/26}{\cs{__shipout_execute_cont:}$B$r:FDj5A(B
+% \changes{v1.3f}{2020/09/26}{\cs{\_\_shipout_execute_cont:}$B$r:FDj5A(B
% (checked ltshipout.dtx 2020/09/21 v1.0c)}
% \changes{v1.3g}{2020/09/28}{$B=DAH$G6u$N%U%m!<%H$@$1$N%Z!<%8$N(B
% $B%U%C%?(B(Issue 78)}
% \changes{v1.3g}{2020/09/28}{\file{plexpl3}$B$GDj5A$7$?L?Na$r;HMQ(B}
+% \changes{v1.3h}{2021/03/14}{\LaTeXe~2021-06-01$B$KH<$&=$@5(B}
+% \changes{v1.3i}{2021/03/25}{\cs{@outputpage}, \cs{@vtryfc}$B$G$N!"Hs2#AH;~$K$*$1$k(B
+% \cs{@outputbox}$B$N@#K!Jd at 5$N%3!<%I$rJLL?Na$H$7$F at Z$j=P$7$?(B}
% \fi
%
% \iffalse
@@ -137,7 +140,7 @@
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{plcore.dtx}[2020/09/28 v1.3g pLaTeX core file]
+\ProvidesFile{plcore.dtx}[2021/03/25 v1.3i pLaTeX core file]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plcore.dtx}
@@ -501,6 +504,40 @@
%</fltrace>
% \end{macrocode}
%
+% \begin{macro}{\pltx at adjust@wd at outputbox}
+% |\@outputpage|$BFb$G<B9T$5$l$F$$$?(B
+% \begin{quote}
+% $B=DAH$N:]$K(B|\@outputbox|$B$NFbMF$,6u$N%\%C%/%9$@$1$N>l9g$K!"(B|\wd\@outputbox|$B$,(B
+% 0pt$B$K$J$C$F$7$^$$!"7k2L$H$7$F%U%C%?$N0LCV$,$/$k$C$F$7$^$C$F$$$?!#(B
+% 0$B$N(B|\hskip|$B$rH/@8$5$;$k$H(B|\wd\@outputbox|$B$NCM$,4|BT$7$?$b$N$H$J$k$N$G!"(B
+% $B=DAH$N>l9g$O$=$NJ}K!$GBP=h$9$k!#(B
+%
+% $B$?$@$7!"(B0$B$N(B|\hskip|$B$rH/@8$5$;$k$H$-!"?eJ?%b!<%I$KF~$C$F$7$^$&$H!"$?$H$($P(B
+% longtable$B%Q%C%1!<%8$r;HMQ$7$FI=AHESCf$G2~%Z!<%8$9$k$H$-$K(B|\par -> {\vskip}|$B$N(B
+% $BL58B%k!<%W$,5/$-$F$7$^$$$^$9!#$=$3$G!"(B|\vbox|$B$NCf$GH/@8$5$;$^$9!#(B
+% \end{quote}
+% $B$H$$$&=hM}$r<h$j=P$7$?$b$N$G$9!#(B
+%
+% \LaTeXe~2021-06-01$B$G$OCJMn3+;O;~$N(B``para/*''$B%U%C%/$,<BAu$5$l$^$9$,!"(B
+% $B$=$l$r0l;~E*$KL58z2=$9$k$?$a$K!V%W%j%_%F%#%V$H$7$F$N!W(B|\everypar|$B$r(B
+% |\pdfprimitive\everypar|$B$H$7$F8F$S=P$7$F$$$^$9!#(B
+% \begin{macrocode}
+%<*plcore|platexrelease>
+\def\pltx at adjust@wd at outputbox{%
+ \ifydir\else\vbox{\pdfprimitive\everypar{}\hskip\z@}\fi}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\pltx at adjust@wd at outputbox@vtryfc}
+% |\pltx at adjust@wd at outputbox|$B$HF1MM$N=hM}$G$9$,!"(B|\@vtryfc|$B$G$O(B
+% |\vbox|$B$N0LCV$,0[$J$j$^$9!#(B
+% \begin{macrocode}
+\def\pltx at adjust@wd at outputbox@vtryfc{%
+ \ifydir\else\pdfprimitive\everypar{}\hskip\z@\fi}
+%</plcore|platexrelease>
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\@makecol}
% $B$3$N%^%/%m$,AH$_N)$F$kItJ,$NCf?4$H$J$j$^$9!#(B
% \file{ltoutput.dtx}$B$GDj5A$5$l$F$$$k$b$N$G$9!#(B
@@ -551,14 +588,11 @@
\dimen@ \dp\@outputbox
\unvbox \@outputbox
% \end{macrocode}
-% $B=DAH$N:]$K(B|\@outputbox|$B$NFbMF$,6u$N%\%C%/%9$@$1$N>l9g$K!"(B|\wd\@outputbox|$B$,(B
-% 0pt$B$K$J$C$F$7$^$$!"7k2L$H$7$F%U%C%?$N0LCV$,$/$k$C$F$7$^$C$F$$$?!#(B
-% 0$B$N(B|\hskip|$B$rH/@8$5$;$k$H(B|\wd\@outputbox|$B$NCM$,4|BT$7$?$b$N$H$J$k$N$G!"(B
-% $B=DAH$N>l9g$O$=$NJ}K!$GBP=h$9$k!#(B
-%
-% $B$?$@$7!"(B0$B$N(B|\hskip|$B$rH/@8$5$;$k$H$-!"?eJ?%b!<%I$KF~$C$F$7$^$&$H!"$?$H$($P(B
-% longtable$B%Q%C%1!<%8$r;HMQ$7$FI=AHESCf$G2~%Z!<%8$9$k$H$-$K(B|\par -> {\vskip}|$B$N(B
-% $BL58B%k!<%W$,5/$-$F$7$^$$$^$9!#$=$3$G!"(B|\vbox|$B$NCf$GH/@8$5$;$^$9!#(B
+% $B<!$N9T$O0JA0$O(B
+%\begin{verbatim}
+%\iftdir\vbox{\hskip\z@}\fi
+%\end{verbatim}
+% $B$G$7$?$,!"(B|\pltx at adjust@wd at outputbox|$B$H$7$F at Z$j=P$7$^$7$?!#(B
% \changes{v1.1j}{2001/05/10}{\cs{@makecol}$B$GAH$_N)$F$i$l$k(B
% \cs{@outputbox}$B$NBg$-$5$,!"=DAH$GCf?H$,6u$N%\%C%/%9$@$1$N>l9g$bE, at 5$K$J$k(B
% $B$h$&$K=$@5(B}
@@ -566,8 +600,10 @@
% $B$h$&$K$9$k(B\texttt{\cs{vskip}~-\cs{dimen@}}$B$,=DAH%b!<%I$G$OL58z$K$J$C$F$$$?$N$G=$@5(B}
% \changes{v1.2h}{2016/09/01}{$B=DAH$G(Blongtable$B%Q%C%1!<%8$r;H$C$FI=AH$NESCf$G2~%Z!<%8(B
% $B$9$k$H$-L58B%k!<%W$,5/$3$kLdBj$KBP=h(B(Issue 21)}
+% \changes{v1.3i}{2021/03/25}{$BHs2#AH;~$K$*$1$k(B
+% \cs{@outputbox}$B$N@#K!Jd at 5$N%3!<%I$r(B\cs{pltx at adjust@wd at outputbox}$B$H$7$F at Z$j=P$7$?(B}
% \begin{macrocode}
- \iftdir\vbox{\hskip\z@}\fi
+ \pltx at adjust@wd at outputbox
\vskip -\dimen@
\@textbottom
}%
@@ -822,15 +858,18 @@
% $B$=$l$h$j at N$NHG$G$O6uGr%Z!<%8$OH/@8$7$^$;$s!#(B
%
% $BBP:vJ}K!$O!"(B\file{ltoutput.dtx}$B$GDj5A$5$l$F$$$k(B|\@vtryfc|$B$K(B
-% |\ifydir\else\hskip\z@\fi|$B$NDI2C$G$9!J(B|\@makecol|$B$HF1MM!K!#(B
+% |\ifydir\else\hskip\z@\fi|$B$NDI2C$G$9!J(B|\@makecol|$B$HF1MM!K$,!"(B
+% $BJLL?Na(B|\pltx at adjust@wd at outputbox@vtryfc|$B$H$7$F at Z$j=P$7$^$7$?!#(B
% \changes{v1.3g}{2020/09/28}{$B=DAH$G6u$N%U%m!<%H$@$1$N%Z!<%8$N(B
% $B%U%C%?(B(Issue 78)}
+% \changes{v1.3i}{2021/03/25}{$BHs2#AH;~$K$*$1$k(B
+% \cs{@outputbox}$B$N@#K!Jd at 5$N%3!<%I$r(B\cs{pltx at adjust@wd at outputbox@vtryfc}$B$H$7$F at Z$j=P$7$?(B}
% \begin{macrocode}
%<platexrelease>\plIncludeInRelease{2020/10/01}{\@vtryfc}
%<platexrelease> {Empty float}%
%<*plcore|platexrelease>
\def\@vtryfc #1{%
- \global\setbox\@outputbox\vbox{\ifydir\else\hskip\z@\fi}%
+ \global\setbox\@outputbox\vbox{\pltx at adjust@wd at outputbox@vtryfc}%
\let\@elt\@wtryfc
\@flsucceed
\global\setbox\@outputbox \vbox to\@colht{%
@@ -1586,7 +1625,7 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{shipout-execute-cont}
+% \begin{macro}{\__shipout_execute_cont:}
% \LaTeXe~2020-10-01$B0J9_!'(B\file{ltshipout.dtx}$B$,%Y!<%9$G$9!#(B
% $B$?$@$7!"=DAH%/%i%9$G$bDL$k$h$&$K$9$k$?$a!"0J2<$NJ}K!$r:N$j$^$9!#(B
% \begin{itemize}
@@ -1645,6 +1684,38 @@
}
}
\fi:
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\__shipout_execute_nohooks_cont:}
+% \LaTeXe~2021-06-01$B$G$O!"F1MM$N=hM}$,(B|\__shipout_execute_nohooks_cont:|$B$K$b(B
+% $BI,MW$J$N$G!"$=$l$r9T$$$^$9!#(B
+% \changes{v1.3h}{2021/03/14}{\LaTeXe~2021-06-01$B$G$O(B
+% \cs{\_\_shipout\_execute\_nohooks\_cont:}$B$,DI2C$5$l$?(B}
+% \begin{macrocode}
+\if_cs_exist:N \__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 {
+ \vbox_set:Nn \l__shipout_raw_box
+ {
+ \platex_direction_yoko:
+ \box_use:N \l__shipout_raw_box
+ }
+ }
+ \platex_if_direction_yoko:TF {
+ \__platex_original_shipout_execute_nohooks_cont:
+ }{
+ \vbox_set:Nn \l__platex_shipout_dummy_box
+ {
+ \platex_direction_yoko:
+ \__platex_original_shipout_execute_nohooks_cont:
+ }
+ }
+ }
+\fi:
\ExplSyntaxOff
\fi %--- expl3 available END
%</plcore|platexrelease>
@@ -1811,9 +1882,11 @@
% $B;H$($k$h$&$K:FDj5A$5$l$^$9!#(B
%
% \changes{v1.0a}{1995/04/07}{$BAHJ}8~$NH=Dj$r%\%C%/%9$N30$G$9$k$h$&$K$7$?(B}
+% \changes{v1.3h}{2021/03/14}{\LaTeXe~2021-06-01$B$G$O(B\cs{par}$B$,F~$k(B
+% (sync with ltfloat.dtx 2021/02/10 v1.2e)}
% \begin{macrocode}
-%<platexrelease>\plIncludeInRelease{2016/09/08}{\@footnotetext}
-%<platexrelease> {Allow break after \footnote (more fix)}%
+%<platexrelease>\plIncludeInRelease{2021/06/01}{\@footnotetext}
+%<platexrelease> {Adapt to ltfloat.dtx (2021-03-03 v1.2f)}%
%<*plcore|platexrelease>
% \end{macrocode}
% \begin{macrocode}
@@ -1831,6 +1904,7 @@
\color at begingroup
\@makefntext{%
\rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+ \par
% \end{macrocode}
%
% p\TeX{}$B$G$O(B|\insert|$B$ND>8e$KOBJ8J8;z$,Mh$?>l9g!"$=$3$G$N2~9T$O5v$5$l$J$$(B
@@ -1853,6 +1927,28 @@
% \begin{macrocode}
%</plcore|platexrelease>
%<platexrelease>\plEndIncludeInRelease
+%<platexrelease>\plIncludeInRelease{2016/09/08}{\@footnotetext}
+%<platexrelease> {Allow break after \footnote (more fix)}%
+%<platexrelease>\long\def\@footnotetext#1{%
+%<platexrelease> \ifydir\def\@tempa{\yoko}\else\def\@tempa{\tate}\fi
+%<platexrelease> \insert\footins{\@tempa%
+%<platexrelease> \reset at font\footnotesize
+%<platexrelease> \interlinepenalty\interfootnotelinepenalty
+%<platexrelease> \splittopskip\footnotesep
+%<platexrelease> \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+%<platexrelease> \hsize\columnwidth \@parboxrestore
+%<platexrelease> \protected at edef\@currentlabel{%
+%<platexrelease> \csname p at footnote\endcsname\@thefnmark
+%<platexrelease> }%
+%<platexrelease> \color at begingroup
+%<platexrelease> \@makefntext{%
+%<platexrelease> \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+%<platexrelease> \color at endgroup}\ifhmode\null\fi
+%<platexrelease> \ifnum\pltx at foot@penalty=\z@\else
+%<platexrelease> \penalty\pltx at foot@penalty
+%<platexrelease> \pltx at foot@penalty\z@
+%<platexrelease> \fi}
+%<platexrelease>\plEndIncludeInRelease
%<platexrelease>\plIncludeInRelease{2016/09/03}{\@footnotetext}
%<platexrelease> {Allow break after \footnote}%
%<platexrelease>\long\def\@footnotetext#1{%
@@ -2194,7 +2290,7 @@
% $B$J$C$F$$$?%P%0$r=$@5(B}
% \changes{v1.2x}{2018/03/01}{\cs{removejfmglue}$B$,$"$l$PMxMQ$9$k$h$&$K$7$?(B}
% \changes{v1.3b}{2019/02/08}{$BCf1{B7$($N%;%k$G$N(B\cs{unskip}$BBP:v(B
-% (sync with lttab 2018/12/30 v1.1p)}
+% (sync with lttab.dtx 2018/12/30 v1.1p)}
% ^^A $B$J$<$+(B v1.3b $B$NJQ99$OK\2H(B latexrelease $B$K4^$^$l$J$$$N$G$=$l$K9g$o$;$?(B
% \begin{macrocode}
%</plcore>
@@ -2698,7 +2794,7 @@
% \section{\LaTeXe{}$B$H(Bp\LaTeXe{}$B$N99?7%?%$%_%s%0$:$lBP:v(B}
% \changes{v1.3a}{2018/10/31}{\LaTeXe{}$B$H(Bp\LaTeXe{}$B$N99?7%?%$%_%s%0$:$lBP:v$r(B
% \file{plvers.dtx} (plfinal) $B$+$i(B\file{plcore.dtx}$B$X0\F0!"(Blatexrelease$BBP:v(B
-% (sync with ltfinal 2018/08/24 v2.1f)}
+% (sync with ltfinal.dtx 2018/08/24 v2.1f)}
%
% \begin{macro}{\l at nohyphenation}
% $BDL>o$O(BBabel$B$N%O%$%U%M!<%7%g%sDj5A$K$h$jDs6!$5$l$k%Q%i%a!<%?$G$9!#(B
Modified: trunk/Master/texmf-dist/source/platex/base/plfonts.dtx
===================================================================
--- trunk/Master/texmf-dist/source/platex/base/plfonts.dtx 2021-05-31 20:21:46 UTC (rev 59403)
+++ trunk/Master/texmf-dist/source/platex/base/plfonts.dtx 2021-05-31 20:22:08 UTC (rev 59404)
@@ -175,6 +175,15 @@
% (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)}
+% \changes{v1.7l}{2021/05/23}{Unconditionally switch to the requested
+% font face (latex2e/444)
+% (sync with ltfssbas.dtx 2021/04/26 v3.2i)}
+% \changes{v1.7l}{2021/05/23}{Unconditionally switch to the requested
+% font face (latex2e/444)
+% (sync with ltfssini.dtx 2021/04/26 v3.2h)}
+% \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)}
% \fi
%
% \iffalse
@@ -181,7 +190,7 @@
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{plfonts.dtx}[2021/01/10 v1.7k pLaTeX New Font Selection Scheme]
+\ProvidesFile{plfonts.dtx}[2021/05/23 v1.7l pLaTeX New Font Selection Scheme]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plfonts.dtx}
@@ -1863,7 +1872,7 @@
\fi
\size at update}
%%
-\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
%%
\DeclareRobustCommand\selectfont{%
% \end{macrocode}
@@ -1870,8 +1879,11 @@
% $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)}
+% \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)}
% \begin{macrocode}
- % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n BEGIN
+ % !! sync with ltfsstrc.dtx 2021/04/26 v3.0o BEGIN
\ifx\delayed at k@adjustment\@empty
\else
\let\k at shape@saved\k at shape
@@ -1909,7 +1921,8 @@
\fi
\let\delayed at f@adjustment\@empty
\fi
- % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n END
+ \@forced at seriesfalse
+ % !! 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 at Z$jBX$($^$9!#(B
% \begin{macrocode}
@@ -1971,7 +1984,7 @@
\xdef\font at name{\csname\curr at fontshape/\f at size\endcsname}%
\pickup at font
\font at name
- \UseHook{selectfont}% since LaTeX2e 2021-05-01
+ \UseHook{selectfont}% since LaTeX2e 2021-06-01
\enc at update
% \end{macrocode}
% $B:G8e$K!"%5%$%:$,JQ99$5$l$F$$$l$P!"%Y!<%9%i%$%s$ND4 at 0$J$I$r9T$J$$$^$9!#(B
@@ -1986,7 +1999,7 @@
\fi
\size at update}
%%
-\fi % --- for >= 2021-05-01 END
+\fi % --- for >= 2021-06-01 END
%</plcore|platexrelease|trace>
%<platexrelease|trace>\plEndIncludeInRelease
%<platexrelease|trace>\plIncludeInRelease{0000/00/00}{\selectfont}
@@ -2627,7 +2640,7 @@
% \end{macro}
%
% \begin{macro}{\delayed at k@adjustment}
-% \LaTeXe~2021-05-01$B$GDI2C$5$l$?(B|\delayed at f@adjustment|$B$NOBJ8HG$G$9!#(B
+% \LaTeXe~2021-06-01$B$GDI2C$5$l$?(B|\delayed at 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}
@@ -2634,7 +2647,7 @@
%<*plcore|platexrelease>
\ifx\delayed at f@adjustment\@undefined % old
\let\delayed at k@adjustment\@undefined
-\else % 2021-05-01
+\else % 2021-06-01
\let\delayed at k@adjustment\@empty
\fi
%</plcore|platexrelease>
@@ -2651,7 +2664,7 @@
% \LaTeXe~2020-02-02$B0J9_$G$O!"(B|\DeclareFontSeriesChangeRule|$B$K$h$C$F(B
% $B at 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
+% \LaTeXe~2021-06-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}
@@ -2665,7 +2678,7 @@
\DeclareRobustCommand\romanseries[1]{\@forced at seriesfalse\merge at font@series{#1}}
\DeclareRobustCommand\kanjiseries[1]{\@forced at seriesfalse\merge at kanji@series{#1}}
\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}
-\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
\DeclareRobustCommand\romanseries[1]{\@forced at seriesfalse
\expandafter\def\expandafter\delayed at f@adjustment\expandafter
{\delayed at f@adjustment\delayed at merge@font at series{#1}}}
@@ -2673,7 +2686,7 @@
\expandafter\def\expandafter\delayed at k@adjustment\expandafter
{\delayed at k@adjustment\delayed at merge@kanji at series{#1}}}
\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}
-\fi % --- for >= 2021-05-01 END
+\fi % --- for >= 2021-06-01 END
\fi
% \end{macrocode}
% \end{macro}
@@ -2697,7 +2710,7 @@
\DeclareRobustCommand\romanseriesforce[1]{\@forced at seriestrue\edef\f at series{#1}}
\DeclareRobustCommand\kanjiseriesforce[1]{\@forced at seriestrue\edef\k at series{#1}}
\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}}
-\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
\DeclareRobustCommand\romanseriesforce[1]{\@forced at seriestrue
\expandafter\def\expandafter\delayed at f@adjustment\expandafter
{\delayed at f@adjustment\edef\f at series{#1}}}
@@ -2705,7 +2718,7 @@
\expandafter\def\expandafter\delayed at k@adjustment\expandafter
{\delayed at k@adjustment\edef\k at series{#1}}}
\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}}
-\fi % --- for >= 2021-05-01 END
+\fi % --- for >= 2021-06-01 END
\fi
% \end{macrocode}
% \end{macro}
@@ -2740,7 +2753,7 @@
\set at target@series at kanji{#2}%
\else
%^^A [TODO] BEGIN
-%^^A LaTeX2e 2021-05-01 $B$G$O(B |\maybe at load@fontshape| $B$O:o=|$5$l$k!#(B
+%^^A LaTeX2e 2021-06-01 $B$G$O(B |\maybe at 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 at encoding\k at encoding\let\f at family\k at family
@@ -2790,7 +2803,7 @@
\let\merge at kanji@series at without@substitution\@undefined
\let\merge at kanji@series at without@substitution@\@undefined
\let\delayed at merge@kanji at series\@undefined
-\else % 2021-05-01
+\else % 2021-06-01
\def\merge at kanji@series at without@substitution#1{%
\expandafter\expandafter\expandafter
\merge at kanji@series at without@substitution@
@@ -2862,7 +2875,7 @@
% \LaTeXe~2020-02-02$B0J9_$G$O!"(B|\DeclareFontShapeChangeRule|$B$K$h$C$F(B
% $B at 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
+% \LaTeXe~2021-06-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}
@@ -2884,7 +2897,7 @@
\@shape at roman@kanjitrue
\kanjishape{#1}\romanshape{#1}%
\@shape at roman@kanjifalse}
-\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
\DeclareRobustCommand\romanshape[1]{%
\expandafter\def\expandafter\delayed at f@adjustment\expandafter
{\delayed at f@adjustment\delayed at merge@font at shape{#1}}}
@@ -2895,7 +2908,7 @@
\@shape at roman@kanjitrue
\kanjishape{#1}\romanshape{#1}%
\@shape at roman@kanjifalse}
-\fi % --- for >= 2021-05-01 END
+\fi % --- for >= 2021-06-01 END
\fi
%</plcore|platexrelease>
%<platexrelease>\plEndIncludeInRelease
@@ -2937,7 +2950,7 @@
\set at safe@kanji at shape{#1}{}%
\edef\f at shape{#1}%
}
-\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
\DeclareRobustCommand\romanshapeforce[1]{%
\expandafter\def\expandafter\delayed at f@adjustment\expandafter
{\delayed at f@adjustment\edef\f at shape{#1}}}
@@ -2950,7 +2963,7 @@
\expandafter\def\expandafter\delayed at f@adjustment\expandafter
{\delayed at f@adjustment\edef\f at shape{#1}}%
}
-\fi % --- for >= 2021-05-01 END
+\fi % --- for >= 2021-06-01 END
\fi
%</plcore|platexrelease>
%<platexrelease>\plEndIncludeInRelease
@@ -3003,7 +3016,7 @@
\fi
\else
%^^A [TODO] BEGIN
-%^^A LaTeX2e 2021-05-01 $B$G$O(B |\maybe at load@fontshape| $B$O:o=|$5$l$k!#(B
+%^^A LaTeX2e 2021-06-01 $B$G$O(B |\maybe at 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 at encoding\k at encoding\let\f at family\k at family
@@ -3094,7 +3107,7 @@
\let\merge at kanji@shape at without@substitution\@undefined
\let\merge at kanji@shape at without@substitution@\@undefined
\let\delayed at merge@kanji at shape\@undefined
-\else % 2021-05-01
+\else % 2021-06-01
\def\merge at kanji@shape at without@substitution#1{%
\expandafter\expandafter\expandafter
\merge at kanji@shape at without@substitution@
@@ -3165,11 +3178,14 @@
% (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)}
+% \changes{v1.7l}{2021/05/23}{Unconditionally switch to the requested
+% font face (latex2e/444)
+% (sync with ltfssbas.dtx 2021/04/26 v3.2i)}
% \begin{macrocode}
%<platexrelease>\plIncludeInRelease{2020/02/02}{\usefont}
%<platexrelease> {Don't call \fontseries or \fontshape}%
%<*plcore|platexrelease>
-\ifx\set at target@series\@undefined
+\ifx\set at target@series\@undefined % old
\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}%
\edef\k at family{#2}%
\edef\k at series{#3}%
@@ -3180,7 +3196,8 @@
\edef\f at series{#3}%
\edef\f at shape{#4}\selectfont
\ignorespaces}
-\else
+\else % 2020-02-02
+\ifx\delayed at f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN
\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}%
\edef\k at family{#2}%
\set at target@series at kanji{#3}%
@@ -3191,7 +3208,23 @@
\set at target@series{#3}%
\edef\f at shape{#4}\selectfont
\ignorespaces}
-\fi
+\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
+\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}%
+ \edef\k at family{#2}%
+ \set at target@series at kanji{#3}%
+ \edef\k at shape{#4}%
+ \let\delayed at k@adjustment\@empty
+ \selectfont
+ \ignorespaces}
+\DeclareRobustCommand\useroman[4]{\romanencoding{#1}%
+ \edef\f at family{#2}%
+ \set at target@series{#3}%
+ \edef\f at shape{#4}%
+ \let\delayed at f@adjustment\@empty
+ \selectfont
+ \ignorespaces}
+\fi % --- for >= 2021-06-01 END
+\fi % done
\DeclareRobustCommand\usefont[4]{%
\edef\tmp at item{{#1}}%
\expandafter\expandafter\expandafter
@@ -3260,6 +3293,9 @@
% \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.7l}{2021/05/23}{Unconditionally switch to the requested
+% font face (latex2e/444)
+% (sync with ltfssini.dtx 2021/04/26 v3.2h)}
% \begin{macrocode}
%<platexrelease>\plIncludeInRelease{2020/04/12}{\normalfont}
%<platexrelease> {Use \@defaultfamilyhook}%
@@ -3292,6 +3328,7 @@
}
\fi % done
\else % --- for <= 2020-02-02 END & for >= 2020-10-01 BEGIN
+\ifx\delayed at f@adjustment\@undefined % --- for == 2020-10-01 BEGIN
%<platexrelease>\DeclareRobustCommand\normalfont{%
%<platexrelease> \fontencoding\encodingdefault
%<platexrelease> \edef\f at family{\familydefault}%
@@ -3306,6 +3343,24 @@
\edef\k at series{\kanjiseriesdefault}%
\edef\k at shape{\kanjishapedefault}%
}
+\else % --- for == 2020-10-01 END & for >= 2021-06-01 BEGIN
+%<platexrelease>\DeclareRobustCommand\normalfont{%
+%<platexrelease> \fontencoding\encodingdefault
+%<platexrelease> \edef\f at family{\familydefault}%
+%<platexrelease> \edef\f at series{\seriesdefault}%
+%<platexrelease> \edef\f at shape{\shapedefault}%
+%<platexrelease> \let\delayed at f@adjustment\@empty
+%<platexrelease> \UseHook{normalfont}%
+%<platexrelease> \@defaultfamilyhook % hookname from 2020/02 will vanish
+%<platexrelease> \selectfont}
+\AddToHook{normalfont}{%
+ \kanjiencoding{\kanjiencodingdefault}%
+ \edef\k at family{\kanjifamilydefault}%
+ \edef\k at series{\kanjiseriesdefault}%
+ \edef\k at shape{\kanjishapedefault}%
+ \let\delayed at k@adjustment\@empty
+}
+\fi % --- for >= 2021-06-01 END
\fi % --- for >= 2020-10-01 END
\adjustbaseline
\let\reset at font\normalfont
Modified: trunk/Master/texmf-dist/source/platex/base/plvers.dtx
===================================================================
--- trunk/Master/texmf-dist/source/platex/base/plvers.dtx 2021-05-31 20:21:46 UTC (rev 59403)
+++ trunk/Master/texmf-dist/source/platex/base/plvers.dtx 2021-05-31 20:22:08 UTC (rev 59404)
@@ -3,7 +3,7 @@
%
% Copyright 1995-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).
% -------------------------------------------------------------
@@ -194,10 +194,10 @@
%</plcore>
%<platexrelease>\edef\platexreleaseversion
%<*plcore|platexrelease>
- {2020-10-01}
+ {2021-06-01}
%</plcore|platexrelease>
%<*plcore>
-\def\ppatch at level{2}
+\def\ppatch at level{0}
%</plcore>
% \end{macrocode}
% \end{macro}
Modified: trunk/Master/texmf-dist/tex/platex/base/kinsoku.tex
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/kinsoku.tex 2021-05-31 20:21:46 UTC (rev 59403)
+++ trunk/Master/texmf-dist/tex/platex/base/kinsoku.tex 2021-05-31 20:22:08 UTC (rev 59404)
@@ -110,6 +110,7 @@
\xspcode`]=2
\xspcode``=1
\xspcode`'=2
+\xspcode`:=2
\xspcode`;=2
\xspcode`,=2
\xspcode`.=2
@@ -245,6 +246,7 @@
\inhibitxspcode`$B!#(B=1
\inhibitxspcode`$B!$(B=1
\inhibitxspcode`$B!%(B=1
+\inhibitxspcode`$B!'(B=1
\inhibitxspcode`$B!((B=1
\inhibitxspcode`$B!)(B=1
\inhibitxspcode`$B!*(B=1
Modified: trunk/Master/texmf-dist/tex/platex/base/platex.ltx
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/platex.ltx 2021-05-31 20:21:46 UTC (rev 59403)
+++ trunk/Master/texmf-dist/tex/platex/base/platex.ltx 2021-05-31 20:22:08 UTC (rev 59404)
@@ -16,6 +16,11 @@
\let\orgdump\dump
\let\dump\relax
\input latex.ltx
+\ifx\typeout\undefined
+ \errhelp{Please reinstall LaTeX, or check e-TeX availability.}%
+ \errmessage{Failed to load `latex.ltx' properly}%
+ \expandafter\end
+\fi
\typeout{**************************^^J%
*^^J%
* making pLaTeX format^^J%
Modified: trunk/Master/texmf-dist/tex/platex/base/platexrelease.sty
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/platexrelease.sty 2021-05-31 20:21:46 UTC (rev 59403)
+++ trunk/Master/texmf-dist/tex/platex/base/platexrelease.sty 2021-05-31 20:22:08 UTC (rev 59404)
@@ -20,7 +20,7 @@
\edef\p at known@latexreleaseversion
{2020-10-01}
\edef\platexreleaseversion
- {2020-10-01}
+ {2021-06-01}
\newif\if at plincludeinrelease
\@plincludeinreleasefalse
\def\plIncludeInRelease#1{%
@@ -146,7 +146,8 @@
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>)
+ % * <2021-06-01>
+ % * <2020-10-01>+2
% * <2020-10-01>+1
% * <2020-10-01>
% * <2020-04-12>
@@ -770,10 +771,10 @@
\fi
\size at update}
%%
-\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
%%
\DeclareRobustCommand\selectfont{%
- % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n BEGIN
+ % !! sync with ltfsstrc.dtx 2021/04/26 v3.0o BEGIN
\ifx\delayed at k@adjustment\@empty
\else
\let\k at shape@saved\k at shape
@@ -811,7 +812,8 @@
\fi
\let\delayed at f@adjustment\@empty
\fi
- % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n END
+ \@forced at seriesfalse
+ % !! sync with ltfsstrc.dtx 2021/04/26 v3.0o END
\let\tmp at error@fontshape\error at fontshape
\let\error at fontshape\error at kfontshape
\edef\tmp at item{{\k at encoding}}%
@@ -861,7 +863,7 @@
\xdef\font at name{\csname\curr at fontshape/\f at size\endcsname}%
\pickup at font
\font at name
- \UseHook{selectfont}% since LaTeX2e 2021-05-01
+ \UseHook{selectfont}% since LaTeX2e 2021-06-01
\enc at update
\ifx\f at linespread\baselinestretch \else
\set at fontsize\baselinestretch\f at size\f at baselineskip
@@ -868,7 +870,7 @@
\fi
\size at update}
%%
-\fi % --- for >= 2021-05-01 END
+\fi % --- for >= 2021-06-01 END
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\selectfont}
{ASCII Corporation original}%
@@ -1077,7 +1079,7 @@
\fi
\ifx\delayed at f@adjustment\@undefined % old
\let\delayed at k@adjustment\@undefined
-\else % 2021-05-01
+\else % 2021-06-01
\let\delayed at k@adjustment\@empty
\fi
\ifx\fontseriesforce\@undefined % old
@@ -1089,7 +1091,7 @@
\DeclareRobustCommand\romanseries[1]{\@forced at seriesfalse\merge at font@series{#1}}
\DeclareRobustCommand\kanjiseries[1]{\@forced at seriesfalse\merge at kanji@series{#1}}
\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}
-\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
\DeclareRobustCommand\romanseries[1]{\@forced at seriesfalse
\expandafter\def\expandafter\delayed at f@adjustment\expandafter
{\delayed at f@adjustment\delayed at merge@font at series{#1}}}
@@ -1097,7 +1099,7 @@
\expandafter\def\expandafter\delayed at k@adjustment\expandafter
{\delayed at k@adjustment\delayed at merge@kanji at series{#1}}}
\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}
-\fi % --- for >= 2021-05-01 END
+\fi % --- for >= 2021-06-01 END
\fi
\ifx\fontseriesforce\@undefined % old
\let\romanseriesforce\@undefined
@@ -1107,7 +1109,7 @@
\DeclareRobustCommand\romanseriesforce[1]{\@forced at seriestrue\edef\f at series{#1}}
\DeclareRobustCommand\kanjiseriesforce[1]{\@forced at seriestrue\edef\k at series{#1}}
\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}}
-\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
\DeclareRobustCommand\romanseriesforce[1]{\@forced at seriestrue
\expandafter\def\expandafter\delayed at f@adjustment\expandafter
{\delayed at f@adjustment\edef\f at series{#1}}}
@@ -1115,7 +1117,7 @@
\expandafter\def\expandafter\delayed at k@adjustment\expandafter
{\delayed at k@adjustment\edef\k at series{#1}}}
\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}}
-\fi % --- for >= 2021-05-01 END
+\fi % --- for >= 2021-06-01 END
\fi
\ifx\fontseriesforce\@undefined % old
\let\merge at kanji@series\@undefined
@@ -1159,7 +1161,7 @@
\let\merge at kanji@series at without@substitution\@undefined
\let\merge at kanji@series at without@substitution@\@undefined
\let\delayed at merge@kanji at series\@undefined
-\else % 2021-05-01
+\else % 2021-06-01
\def\merge at kanji@series at without@substitution#1{%
\expandafter\expandafter\expandafter
\merge at kanji@series at without@substitution@
@@ -1195,7 +1197,7 @@
\@shape at roman@kanjitrue
\kanjishape{#1}\romanshape{#1}%
\@shape at roman@kanjifalse}
-\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
\DeclareRobustCommand\romanshape[1]{%
\expandafter\def\expandafter\delayed at f@adjustment\expandafter
{\delayed at f@adjustment\delayed at merge@font at shape{#1}}}
@@ -1206,7 +1208,7 @@
\@shape at roman@kanjitrue
\kanjishape{#1}\romanshape{#1}%
\@shape at roman@kanjifalse}
-\fi % --- for >= 2021-05-01 END
+\fi % --- for >= 2021-06-01 END
\fi
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\fontshape}
@@ -1234,7 +1236,7 @@
\set at safe@kanji at shape{#1}{}%
\edef\f at shape{#1}%
}
-\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
\DeclareRobustCommand\romanshapeforce[1]{%
\expandafter\def\expandafter\delayed at f@adjustment\expandafter
{\delayed at f@adjustment\edef\f at shape{#1}}}
@@ -1247,7 +1249,7 @@
\expandafter\def\expandafter\delayed at f@adjustment\expandafter
{\delayed at f@adjustment\edef\f at shape{#1}}%
}
-\fi % --- for >= 2021-05-01 END
+\fi % --- for >= 2021-06-01 END
\fi
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\fontshapeforce}
@@ -1346,7 +1348,7 @@
\let\merge at kanji@shape at without@substitution\@undefined
\let\merge at kanji@shape at without@substitution@\@undefined
\let\delayed at merge@kanji at shape\@undefined
-\else % 2021-05-01
+\else % 2021-06-01
\def\merge at kanji@shape at without@substitution#1{%
\expandafter\expandafter\expandafter
\merge at kanji@shape at without@substitution@
@@ -1387,7 +1389,7 @@
\plEndIncludeInRelease
\plIncludeInRelease{2020/02/02}{\usefont}
{Don't call \fontseries or \fontshape}%
-\ifx\set at target@series\@undefined
+\ifx\set at target@series\@undefined % old
\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}%
\edef\k at family{#2}%
\edef\k at series{#3}%
@@ -1398,7 +1400,8 @@
\edef\f at series{#3}%
\edef\f at shape{#4}\selectfont
\ignorespaces}
-\else
+\else % 2020-02-02
+\ifx\delayed at f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN
\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}%
\edef\k at family{#2}%
\set at target@series at kanji{#3}%
@@ -1409,7 +1412,23 @@
\set at target@series{#3}%
\edef\f at shape{#4}\selectfont
\ignorespaces}
-\fi
+\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
+\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}%
+ \edef\k at family{#2}%
+ \set at target@series at kanji{#3}%
+ \edef\k at shape{#4}%
+ \let\delayed at k@adjustment\@empty
+ \selectfont
+ \ignorespaces}
+\DeclareRobustCommand\useroman[4]{\romanencoding{#1}%
+ \edef\f at family{#2}%
+ \set at target@series{#3}%
+ \edef\f at shape{#4}%
+ \let\delayed at f@adjustment\@empty
+ \selectfont
+ \ignorespaces}
+\fi % --- for >= 2021-06-01 END
+\fi % done
\DeclareRobustCommand\usefont[4]{%
\edef\tmp at item{{#1}}%
\expandafter\expandafter\expandafter
@@ -1483,6 +1502,7 @@
}
\fi % done
\else % --- for <= 2020-02-02 END & for >= 2020-10-01 BEGIN
+\ifx\delayed at f@adjustment\@undefined % --- for == 2020-10-01 BEGIN
\DeclareRobustCommand\normalfont{%
\fontencoding\encodingdefault
\edef\f at family{\familydefault}%
@@ -1497,6 +1517,24 @@
\edef\k at series{\kanjiseriesdefault}%
\edef\k at shape{\kanjishapedefault}%
}
+\else % --- for == 2020-10-01 END & for >= 2021-06-01 BEGIN
+\DeclareRobustCommand\normalfont{%
+ \fontencoding\encodingdefault
+ \edef\f at family{\familydefault}%
+ \edef\f at series{\seriesdefault}%
+ \edef\f at shape{\shapedefault}%
+ \let\delayed at f@adjustment\@empty
+ \UseHook{normalfont}%
+ \@defaultfamilyhook % hookname from 2020/02 will vanish
+ \selectfont}
+\AddToHook{normalfont}{%
+ \kanjiencoding{\kanjiencodingdefault}%
+ \edef\k at family{\kanjifamilydefault}%
+ \edef\k at series{\kanjiseriesdefault}%
+ \edef\k at shape{\kanjishapedefault}%
+ \let\delayed at k@adjustment\@empty
+}
+\fi % --- for >= 2021-06-01 END
\fi % --- for >= 2020-10-01 END
\adjustbaseline
\let\reset at font\normalfont
@@ -2376,6 +2414,10 @@
\fi
\fi}
\plEndIncludeInRelease
+\def\pltx at adjust@wd at outputbox{%
+ \ifydir\else\vbox{\pdfprimitive\everypar{}\hskip\z@}\fi}
+\def\pltx at adjust@wd at outputbox@vtryfc{%
+ \ifydir\else\pdfprimitive\everypar{}\hskip\z@\fi}
\plIncludeInRelease{2017/04/08}{\@makecol}
{Take into account depth of footnote}%
\gdef\@makecol{%
@@ -2407,7 +2449,7 @@
\@texttop
\dimen@ \dp\@outputbox
\unvbox \@outputbox
- \iftdir\vbox{\hskip\z@}\fi
+ \pltx at adjust@wd at outputbox
\vskip -\dimen@
\@textbottom
}%
@@ -2512,7 +2554,7 @@
\plIncludeInRelease{2020/10/01}{\@vtryfc}
{Empty float}%
\def\@vtryfc #1{%
- \global\setbox\@outputbox\vbox{\ifydir\else\hskip\z@\fi}%
+ \global\setbox\@outputbox\vbox{\pltx at adjust@wd at outputbox@vtryfc}%
\let\@elt\@wtryfc
\@flsucceed
\global\setbox\@outputbox \vbox to\@colht{%
@@ -3011,6 +3053,29 @@
}
}
\fi:
+\if_cs_exist:N \__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 {
+ \vbox_set:Nn \l__shipout_raw_box
+ {
+ \platex_direction_yoko:
+ \box_use:N \l__shipout_raw_box
+ }
+ }
+ \platex_if_direction_yoko:TF {
+ \__platex_original_shipout_execute_nohooks_cont:
+ }{
+ \vbox_set:Nn \l__platex_shipout_dummy_box
+ {
+ \platex_direction_yoko:
+ \__platex_original_shipout_execute_nohooks_cont:
+ }
+ }
+ }
+\fi:
\ExplSyntaxOff
\fi %--- expl3 available END
\plEndIncludeInRelease
@@ -3077,6 +3142,29 @@
{\protected at xdef\@thefnmark{\thempfn}%
\@footnotetext}}
\plEndIncludeInRelease
+\plIncludeInRelease{2021/06/01}{\@footnotetext}
+ {Adapt to ltfloat.dtx (2021-03-03 v1.2f)}%
+\long\def\@footnotetext#1{%
+ \ifydir\def\@tempa{\yoko}\else\def\@tempa{\tate}\fi
+ \insert\footins{\@tempa%
+ \reset at font\footnotesize
+ \interlinepenalty\interfootnotelinepenalty
+ \splittopskip\footnotesep
+ \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+ \hsize\columnwidth \@parboxrestore
+ \protected at edef\@currentlabel{%
+ \csname p at footnote\endcsname\@thefnmark
+ }%
+ \color at begingroup
+ \@makefntext{%
+ \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+ \par
+ \color at endgroup}\ifhmode\null\fi
+ \ifnum\pltx at foot@penalty=\z@\else
+ \penalty\pltx at foot@penalty
+ \pltx at foot@penalty\z@
+ \fi}
+\plEndIncludeInRelease
\plIncludeInRelease{2016/09/08}{\@footnotetext}
{Allow break after \footnote (more fix)}%
\long\def\@footnotetext#1{%
Modified: trunk/Master/texmf-dist/tex/platex/base/plcore.ltx
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/plcore.ltx 2021-05-31 20:21:46 UTC (rev 59403)
+++ trunk/Master/texmf-dist/tex/platex/base/plcore.ltx 2021-05-31 20:22:08 UTC (rev 59404)
@@ -34,8 +34,8 @@
\fi
\def\pfmtname{pLaTeX2e}
\def\pfmtversion
- {2020-10-01}
-\def\ppatch at level{2}
+ {2021-06-01}
+\def\ppatch at level{0}
\edef\platexBANNER{\noexpand\platexNILa
\the\everyjob % LaTeX banner and delayed codes
\noexpand\platexNILb}
@@ -639,10 +639,10 @@
\fi
\size at update}
%%
-\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
%%
\DeclareRobustCommand\selectfont{%
- % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n BEGIN
+ % !! sync with ltfsstrc.dtx 2021/04/26 v3.0o BEGIN
\ifx\delayed at k@adjustment\@empty
\else
\let\k at shape@saved\k at shape
@@ -680,7 +680,8 @@
\fi
\let\delayed at f@adjustment\@empty
\fi
- % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n END
+ \@forced at seriesfalse
+ % !! sync with ltfsstrc.dtx 2021/04/26 v3.0o END
\let\tmp at error@fontshape\error at fontshape
\let\error at fontshape\error at kfontshape
\edef\tmp at item{{\k at encoding}}%
@@ -730,7 +731,7 @@
\xdef\font at name{\csname\curr at fontshape/\f at size\endcsname}%
\pickup at font
\font at name
- \UseHook{selectfont}% since LaTeX2e 2021-05-01
+ \UseHook{selectfont}% since LaTeX2e 2021-06-01
\enc at update
\ifx\f at linespread\baselinestretch \else
\set at fontsize\baselinestretch\f at size\f at baselineskip
@@ -737,7 +738,7 @@
\fi
\size at update}
%%
-\fi % --- for >= 2021-05-01 END
+\fi % --- for >= 2021-06-01 END
\def\set at fontsize#1#2#3{%
\@defaultunits\@tempdimb#2pt\relax\@nnil
\edef\f at size{\strip at pt\@tempdimb}%
@@ -939,7 +940,7 @@
\fi
\ifx\delayed at f@adjustment\@undefined % old
\let\delayed at k@adjustment\@undefined
-\else % 2021-05-01
+\else % 2021-06-01
\let\delayed at k@adjustment\@empty
\fi
\ifx\fontseriesforce\@undefined % old
@@ -951,7 +952,7 @@
\DeclareRobustCommand\romanseries[1]{\@forced at seriesfalse\merge at font@series{#1}}
\DeclareRobustCommand\kanjiseries[1]{\@forced at seriesfalse\merge at kanji@series{#1}}
\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}
-\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
\DeclareRobustCommand\romanseries[1]{\@forced at seriesfalse
\expandafter\def\expandafter\delayed at f@adjustment\expandafter
{\delayed at f@adjustment\delayed at merge@font at series{#1}}}
@@ -959,7 +960,7 @@
\expandafter\def\expandafter\delayed at k@adjustment\expandafter
{\delayed at k@adjustment\delayed at merge@kanji at series{#1}}}
\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}
-\fi % --- for >= 2021-05-01 END
+\fi % --- for >= 2021-06-01 END
\fi
\ifx\fontseriesforce\@undefined % old
\let\romanseriesforce\@undefined
@@ -969,7 +970,7 @@
\DeclareRobustCommand\romanseriesforce[1]{\@forced at seriestrue\edef\f at series{#1}}
\DeclareRobustCommand\kanjiseriesforce[1]{\@forced at seriestrue\edef\k at series{#1}}
\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}}
-\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
\DeclareRobustCommand\romanseriesforce[1]{\@forced at seriestrue
\expandafter\def\expandafter\delayed at f@adjustment\expandafter
{\delayed at f@adjustment\edef\f at series{#1}}}
@@ -977,7 +978,7 @@
\expandafter\def\expandafter\delayed at k@adjustment\expandafter
{\delayed at k@adjustment\edef\k at series{#1}}}
\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}}
-\fi % --- for >= 2021-05-01 END
+\fi % --- for >= 2021-06-01 END
\fi
\ifx\fontseriesforce\@undefined % old
\let\merge at kanji@series\@undefined
@@ -1021,7 +1022,7 @@
\let\merge at kanji@series at without@substitution\@undefined
\let\merge at kanji@series at without@substitution@\@undefined
\let\delayed at merge@kanji at series\@undefined
-\else % 2021-05-01
+\else % 2021-06-01
\def\merge at kanji@series at without@substitution#1{%
\expandafter\expandafter\expandafter
\merge at kanji@series at without@substitution@
@@ -1055,7 +1056,7 @@
\@shape at roman@kanjitrue
\kanjishape{#1}\romanshape{#1}%
\@shape at roman@kanjifalse}
-\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
\DeclareRobustCommand\romanshape[1]{%
\expandafter\def\expandafter\delayed at f@adjustment\expandafter
{\delayed at f@adjustment\delayed at merge@font at shape{#1}}}
@@ -1066,7 +1067,7 @@
\@shape at roman@kanjitrue
\kanjishape{#1}\romanshape{#1}%
\@shape at roman@kanjifalse}
-\fi % --- for >= 2021-05-01 END
+\fi % --- for >= 2021-06-01 END
\fi
\ifx\fontshapeforce\@undefined % old
\let\romanshapeforce\@undefined
@@ -1079,7 +1080,7 @@
\set at safe@kanji at shape{#1}{}%
\edef\f at shape{#1}%
}
-\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
\DeclareRobustCommand\romanshapeforce[1]{%
\expandafter\def\expandafter\delayed at f@adjustment\expandafter
{\delayed at f@adjustment\edef\f at shape{#1}}}
@@ -1092,7 +1093,7 @@
\expandafter\def\expandafter\delayed at f@adjustment\expandafter
{\delayed at f@adjustment\edef\f at shape{#1}}%
}
-\fi % --- for >= 2021-05-01 END
+\fi % --- for >= 2021-06-01 END
\fi
\ifx\fontseriesforce\@undefined % old
\let\merge at kanji@shape\@undefined
@@ -1140,7 +1141,7 @@
\let\merge at kanji@shape at without@substitution\@undefined
\let\merge at kanji@shape at without@substitution@\@undefined
\let\delayed at merge@kanji at shape\@undefined
-\else % 2021-05-01
+\else % 2021-06-01
\def\merge at kanji@shape at without@substitution#1{%
\expandafter\expandafter\expandafter
\merge at kanji@shape at without@substitution@
@@ -1171,7 +1172,7 @@
\@font at info{Kanji font shape `#1' undefined\MessageBreak
No change}%
}
-\ifx\set at target@series\@undefined
+\ifx\set at target@series\@undefined % old
\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}%
\edef\k at family{#2}%
\edef\k at series{#3}%
@@ -1182,7 +1183,8 @@
\edef\f at series{#3}%
\edef\f at shape{#4}\selectfont
\ignorespaces}
-\else
+\else % 2020-02-02
+\ifx\delayed at f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN
\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}%
\edef\k at family{#2}%
\set at target@series at kanji{#3}%
@@ -1193,7 +1195,23 @@
\set at target@series{#3}%
\edef\f at shape{#4}\selectfont
\ignorespaces}
-\fi
+\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
+\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}%
+ \edef\k at family{#2}%
+ \set at target@series at kanji{#3}%
+ \edef\k at shape{#4}%
+ \let\delayed at k@adjustment\@empty
+ \selectfont
+ \ignorespaces}
+\DeclareRobustCommand\useroman[4]{\romanencoding{#1}%
+ \edef\f at family{#2}%
+ \set at target@series{#3}%
+ \edef\f at shape{#4}%
+ \let\delayed at f@adjustment\@empty
+ \selectfont
+ \ignorespaces}
+\fi % --- for >= 2021-06-01 END
+\fi % done
\DeclareRobustCommand\usefont[4]{%
\edef\tmp at item{{#1}}%
\expandafter\expandafter\expandafter
@@ -1222,6 +1240,7 @@
}
\fi % done
\else % --- for <= 2020-02-02 END & for >= 2020-10-01 BEGIN
+\ifx\delayed at f@adjustment\@undefined % --- for == 2020-10-01 BEGIN
\AddToHook{normalfont}{%
\kanjiencoding{\kanjiencodingdefault}%
\edef\k at family{\kanjifamilydefault}%
@@ -1228,6 +1247,15 @@
\edef\k at series{\kanjiseriesdefault}%
\edef\k at shape{\kanjishapedefault}%
}
+\else % --- for == 2020-10-01 END & for >= 2021-06-01 BEGIN
+\AddToHook{normalfont}{%
+ \kanjiencoding{\kanjiencodingdefault}%
+ \edef\k at family{\kanjifamilydefault}%
+ \edef\k at series{\kanjiseriesdefault}%
+ \edef\k at shape{\kanjishapedefault}%
+ \let\delayed at k@adjustment\@empty
+}
+\fi % --- for >= 2021-06-01 END
\fi % --- for >= 2020-10-01 END
\adjustbaseline
\let\reset at font\normalfont
@@ -1780,6 +1808,10 @@
\unskip \reserved at e {\reserved at f#1}\nobreak \hfil \break \null
\ignorespaces
\fi}
+\def\pltx at adjust@wd at outputbox{%
+ \ifydir\else\vbox{\pdfprimitive\everypar{}\hskip\z@}\fi}
+\def\pltx at adjust@wd at outputbox@vtryfc{%
+ \ifydir\else\pdfprimitive\everypar{}\hskip\z@\fi}
\gdef\@makecol{%
\setbox\@outputbox\box\@cclv%
\let\@elt\relax % added on LaTeX (ltoutput.dtx 2003/12/16 v1.2k)
@@ -1809,7 +1841,7 @@
\@texttop
\dimen@ \dp\@outputbox
\unvbox \@outputbox
- \iftdir\vbox{\hskip\z@}\fi
+ \pltx at adjust@wd at outputbox
\vskip -\dimen@
\@textbottom
}%
@@ -1866,7 +1898,7 @@
\ifvbox\@kludgeins\insert\@kludgeins{\unvbox\@kludgeins}\fi
}
\def\@vtryfc #1{%
- \global\setbox\@outputbox\vbox{\ifydir\else\hskip\z@\fi}%
+ \global\setbox\@outputbox\vbox{\pltx at adjust@wd at outputbox@vtryfc}%
\let\@elt\@wtryfc
\@flsucceed
\global\setbox\@outputbox \vbox to\@colht{%
@@ -2084,6 +2116,29 @@
}
}
\fi:
+\if_cs_exist:N \__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 {
+ \vbox_set:Nn \l__shipout_raw_box
+ {
+ \platex_direction_yoko:
+ \box_use:N \l__shipout_raw_box
+ }
+ }
+ \platex_if_direction_yoko:TF {
+ \__platex_original_shipout_execute_nohooks_cont:
+ }{
+ \vbox_set:Nn \l__platex_shipout_dummy_box
+ {
+ \platex_direction_yoko:
+ \__platex_original_shipout_execute_nohooks_cont:
+ }
+ }
+ }
+\fi:
\ExplSyntaxOff
\fi %--- expl3 available END
\renewcommand\@makefnmark{%
@@ -2119,6 +2174,7 @@
\color at begingroup
\@makefntext{%
\rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}%
+ \par
\color at endgroup}\ifhmode\null\fi
\ifnum\pltx at foot@penalty=\z@\else
\penalty\pltx at foot@penalty
Modified: trunk/Master/texmf-dist/tex/platex/base/ptrace.sty
===================================================================
--- trunk/Master/texmf-dist/tex/platex/base/ptrace.sty 2021-05-31 20:21:46 UTC (rev 59403)
+++ trunk/Master/texmf-dist/tex/platex/base/ptrace.sty 2021-05-31 20:22:08 UTC (rev 59404)
@@ -79,10 +79,10 @@
\fi
\size at update}
%%
-\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN
%%
\DeclareRobustCommand\selectfont{%
- % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n BEGIN
+ % !! sync with ltfsstrc.dtx 2021/04/26 v3.0o BEGIN
\ifx\delayed at k@adjustment\@empty
\else
\let\k at shape@saved\k at shape
@@ -120,7 +120,8 @@
\fi
\let\delayed at f@adjustment\@empty
\fi
- % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n END
+ \@forced at seriesfalse
+ % !! sync with ltfsstrc.dtx 2021/04/26 v3.0o END
\let\tmp at error@fontshape\error at fontshape
\let\error at fontshape\error at kfontshape
\edef\tmp at item{{\k at encoding}}%
@@ -170,7 +171,7 @@
\xdef\font at name{\csname\curr at fontshape/\f at size\endcsname}%
\pickup at font
\font at name
- \UseHook{selectfont}% since LaTeX2e 2021-05-01
+ \UseHook{selectfont}% since LaTeX2e 2021-06-01
\enc at update
\ifx\f at linespread\baselinestretch \else
\set at fontsize\baselinestretch\f at size\f at baselineskip
@@ -177,7 +178,7 @@
\fi
\size at update}
%%
-\fi % --- for >= 2021-05-01 END
+\fi % --- for >= 2021-06-01 END
\plEndIncludeInRelease
\plIncludeInRelease{0000/00/00}{\selectfont}
{ASCII Corporation original}%
More information about the tex-live-commits
mailing list.