diff options
Diffstat (limited to 'Master/texmf-dist/source/platex')
| -rw-r--r-- | Master/texmf-dist/source/platex/base/kinsoku.dtx | 9 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/platex.dtx | 37 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/platexrelease.dtx | 3 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plcore.dtx | 138 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plfonts.dtx | 105 | ||||
| -rw-r--r-- | Master/texmf-dist/source/platex/base/plvers.dtx | 6 |
6 files changed, 242 insertions, 56 deletions
diff --git a/Master/texmf-dist/source/platex/base/kinsoku.dtx b/Master/texmf-dist/source/platex/base/kinsoku.dtx index 6f5d1de5e35..8be6b33a203 100644 --- a/Master/texmf-dist/source/platex/base/kinsoku.dtx +++ b/Master/texmf-dist/source/platex/base/kinsoku.dtx @@ -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@_Dj(B} +% \changes{v1.0d}{2021/03/04}{$B!'$N(B\cs{inhibitxspcode}$B$H(B:$B$N(B\cs{xspcode}$B$r@_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@_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@_Dj(B} +% \changes{v1.0d}{2021/03/04}{$B!'$N(B\cs{inhibitxspcode}$B$r@_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 diff --git a/Master/texmf-dist/source/platex/base/platex.dtx b/Master/texmf-dist/source/platex/base/platex.dtx index 77e5e036d41..37ac40893fa 100644 --- a/Master/texmf-dist/source/platex/base/platex.dtx +++ b/Master/texmf-dist/source/platex/base/platex.dtx @@ -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@.;~$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@.$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@cro@ \iftrue} +\makeatother \usepackage{plext} \listfiles diff --git a/Master/texmf-dist/source/platex/base/platexrelease.dtx b/Master/texmf-dist/source/platex/base/platexrelease.dtx index 842217c07cc..78bda1bf649 100644 --- a/Master/texmf-dist/source/platex/base/platexrelease.dtx +++ b/Master/texmf-dist/source/platex/base/platexrelease.dtx @@ -351,7 +351,8 @@ 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>) + % * <2021-06-01> + % * <2020-10-01>+2 % * <2020-10-01>+1 % * <2020-10-01> % * <2020-04-12> diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx index a56b737c055..6e61ab38c94 100644 --- a/Master/texmf-dist/source/platex/base/plcore.dtx +++ b/Master/texmf-dist/source/platex/base/plcore.dtx @@ -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,18 +126,21 @@ % \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@5$N%3!<%I$rJLL?Na$H$7$F@Z$j=P$7$?(B} % \fi % % \iffalse %<*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@adjust@wd@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@adjust@wd@outputbox{% + \ifydir\else\vbox{\pdfprimitive\everypar{}\hskip\z@}\fi} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\pltx@adjust@wd@outputbox@vtryfc} +% |\pltx@adjust@wd@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@adjust@wd@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@adjust@wd@outputbox|$B$H$7$F@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,@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@5$N%3!<%I$r(B\cs{pltx@adjust@wd@outputbox}$B$H$7$F@Z$j=P$7$?(B} % \begin{macrocode} - \iftdir\vbox{\hskip\z@}\fi + \pltx@adjust@wd@outputbox \vskip -\dimen@ \@textbottom }% @@ -822,15 +858,18 @@ % $B$=$l$h$j@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@adjust@wd@outputbox@vtryfc|$B$H$7$F@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@5$N%3!<%I$r(B\cs{pltx@adjust@wd@outputbox@vtryfc}$B$H$7$F@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@adjust@wd@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@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@font\footnotesize +%<platexrelease> \interlinepenalty\interfootnotelinepenalty +%<platexrelease> \splittopskip\footnotesep +%<platexrelease> \splitmaxdepth \dp\strutbox \floatingpenalty \@MM +%<platexrelease> \hsize\columnwidth \@parboxrestore +%<platexrelease> \protected@edef\@currentlabel{% +%<platexrelease> \csname p@footnote\endcsname\@thefnmark +%<platexrelease> }% +%<platexrelease> \color@begingroup +%<platexrelease> \@makefntext{% +%<platexrelease> \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% +%<platexrelease> \color@endgroup}\ifhmode\null\fi +%<platexrelease> \ifnum\pltx@foot@penalty=\z@\else +%<platexrelease> \penalty\pltx@foot@penalty +%<platexrelease> \pltx@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@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 diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx index 9eae7852a17..4474d8a36e5 100644 --- a/Master/texmf-dist/source/platex/base/plfonts.dtx +++ b/Master/texmf-dist/source/platex/base/plfonts.dtx @@ -175,13 +175,22 @@ % (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 %<*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,15 +1872,18 @@ \fi \size@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} % $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@k@adjustment\@empty \else \let\k@shape@saved\k@shape @@ -1909,7 +1921,8 @@ \fi \let\delayed@f@adjustment\@empty \fi - % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n END + \@forced@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@Z$jBX$($^$9!#(B % \begin{macrocode} @@ -1971,7 +1984,7 @@ \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}% \pickup@font \font@name - \UseHook{selectfont}% since LaTeX2e 2021-05-01 + \UseHook{selectfont}% since LaTeX2e 2021-06-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 @@ -1986,7 +1999,7 @@ \fi \size@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,14 +2640,14 @@ % \end{macro} % % \begin{macro}{\delayed@k@adjustment} -% \LaTeXe~2021-05-01$B$GDI2C$5$l$?(B|\delayed@f@adjustment|$B$NOBJ8HG$G$9!#(B +% \LaTeXe~2021-06-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 +\else % 2021-06-01 \let\delayed@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@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@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 +\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN \DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse \expandafter\def\expandafter\delayed@f@adjustment\expandafter {\delayed@f@adjustment\delayed@merge@font@series{#1}}} @@ -2673,7 +2686,7 @@ \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 % --- for >= 2021-06-01 END \fi % \end{macrocode} % \end{macro} @@ -2697,7 +2710,7 @@ \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 +\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN \DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue \expandafter\def\expandafter\delayed@f@adjustment\expandafter {\delayed@f@adjustment\edef\f@series{#1}}} @@ -2705,7 +2718,7 @@ \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 % --- for >= 2021-06-01 END \fi % \end{macrocode} % \end{macro} @@ -2740,7 +2753,7 @@ \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 LaTeX2e 2021-06-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 @@ -2790,7 +2803,7 @@ \let\merge@kanji@series@without@substitution\@undefined \let\merge@kanji@series@without@substitution@\@undefined \let\delayed@merge@kanji@series\@undefined -\else % 2021-05-01 +\else % 2021-06-01 \def\merge@kanji@series@without@substitution#1{% \expandafter\expandafter\expandafter \merge@kanji@series@without@substitution@ @@ -2862,7 +2875,7 @@ % \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 +% \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@roman@kanjitrue \kanjishape{#1}\romanshape{#1}% \@shape@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@f@adjustment\expandafter {\delayed@f@adjustment\delayed@merge@font@shape{#1}}} @@ -2895,7 +2908,7 @@ \@shape@roman@kanjitrue \kanjishape{#1}\romanshape{#1}% \@shape@roman@kanjifalse} -\fi % --- for >= 2021-05-01 END +\fi % --- for >= 2021-06-01 END \fi %</plcore|platexrelease> %<platexrelease>\plEndIncludeInRelease @@ -2937,7 +2950,7 @@ \set@safe@kanji@shape{#1}{}% \edef\f@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@f@adjustment\expandafter {\delayed@f@adjustment\edef\f@shape{#1}}} @@ -2950,7 +2963,7 @@ \expandafter\def\expandafter\delayed@f@adjustment\expandafter {\delayed@f@adjustment\edef\f@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@load@fontshape| $B$O:o=|$5$l$k!#(B +%^^A LaTeX2e 2021-06-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 @@ -3094,7 +3107,7 @@ \let\merge@kanji@shape@without@substitution\@undefined \let\merge@kanji@shape@without@substitution@\@undefined \let\delayed@merge@kanji@shape\@undefined -\else % 2021-05-01 +\else % 2021-06-01 \def\merge@kanji@shape@without@substitution#1{% \expandafter\expandafter\expandafter \merge@kanji@shape@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@target@series\@undefined +\ifx\set@target@series\@undefined % old \DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}% \edef\k@family{#2}% \edef\k@series{#3}% @@ -3180,7 +3196,8 @@ \edef\f@series{#3}% \edef\f@shape{#4}\selectfont \ignorespaces} -\else +\else % 2020-02-02 +\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN \DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}% \edef\k@family{#2}% \set@target@series@kanji{#3}% @@ -3191,7 +3208,23 @@ \set@target@series{#3}% \edef\f@shape{#4}\selectfont \ignorespaces} -\fi +\else % --- for <= 2020-10-01 END & for >= 2021-06-01 BEGIN +\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}% + \edef\k@family{#2}% + \set@target@series@kanji{#3}% + \edef\k@shape{#4}% + \let\delayed@k@adjustment\@empty + \selectfont + \ignorespaces} +\DeclareRobustCommand\useroman[4]{\romanencoding{#1}% + \edef\f@family{#2}% + \set@target@series{#3}% + \edef\f@shape{#4}% + \let\delayed@f@adjustment\@empty + \selectfont + \ignorespaces} +\fi % --- for >= 2021-06-01 END +\fi % done \DeclareRobustCommand\usefont[4]{% \edef\tmp@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@f@adjustment\@undefined % --- for == 2020-10-01 BEGIN %<platexrelease>\DeclareRobustCommand\normalfont{% %<platexrelease> \fontencoding\encodingdefault %<platexrelease> \edef\f@family{\familydefault}% @@ -3306,6 +3343,24 @@ \edef\k@series{\kanjiseriesdefault}% \edef\k@shape{\kanjishapedefault}% } +\else % --- for == 2020-10-01 END & for >= 2021-06-01 BEGIN +%<platexrelease>\DeclareRobustCommand\normalfont{% +%<platexrelease> \fontencoding\encodingdefault +%<platexrelease> \edef\f@family{\familydefault}% +%<platexrelease> \edef\f@series{\seriesdefault}% +%<platexrelease> \edef\f@shape{\shapedefault}% +%<platexrelease> \let\delayed@f@adjustment\@empty +%<platexrelease> \UseHook{normalfont}% +%<platexrelease> \@defaultfamilyhook % hookname from 2020/02 will vanish +%<platexrelease> \selectfont} +\AddToHook{normalfont}{% + \kanjiencoding{\kanjiencodingdefault}% + \edef\k@family{\kanjifamilydefault}% + \edef\k@series{\kanjiseriesdefault}% + \edef\k@shape{\kanjishapedefault}% + \let\delayed@k@adjustment\@empty +} +\fi % --- for >= 2021-06-01 END \fi % --- for >= 2020-10-01 END \adjustbaseline \let\reset@font\normalfont diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx index ee268af6a32..2bacd245538 100644 --- a/Master/texmf-dist/source/platex/base/plvers.dtx +++ b/Master/texmf-dist/source/platex/base/plvers.dtx @@ -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@level{2} +\def\ppatch@level{0} %</plcore> % \end{macrocode} % \end{macro} |