From 0f69e2fd4a9928663f0cc64b8cac1f0d8baee9d6 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 1 Jun 2021 03:00:58 +0000 Subject: CTAN sync 202106010300 --- language/japanese/platex-tools/README.md | 2 +- language/japanese/platex-tools/plarray.sty | 2 +- language/japanese/platex-tools/pldocverb.sty | 2 +- language/japanese/platex-tools/pxatbegshi.pdf | Bin 73216 -> 73233 bytes language/japanese/platex-tools/pxatbegshi.sty | 8 +- language/japanese/platex-tools/pxeverysel.pdf | Bin 61132 -> 61143 bytes language/japanese/platex-tools/pxeverysel.sty | 14 +-- language/japanese/platex-tools/pxeverysel.tex | 2 +- language/japanese/platex-tools/pxeveryshi.pdf | Bin 52720 -> 52975 bytes language/japanese/platex-tools/pxeveryshi.sty | 8 +- language/japanese/platex-tools/pxftnright.pdf | Bin 52774 -> 52592 bytes language/japanese/platex-tools/pxftnright.sty | 19 +++- language/japanese/platex/README.md | 2 +- language/japanese/platex/kinsoku.dtx | 9 +- language/japanese/platex/platex-en.pdf | Bin 147796 -> 148274 bytes language/japanese/platex/platex.dtx | 37 +++++- language/japanese/platex/platex.pdf | Bin 251862 -> 253604 bytes language/japanese/platex/platexrelease.dtx | 3 +- language/japanese/platex/platexrelease.pdf | Bin 107870 -> 107850 bytes language/japanese/platex/plcore.dtx | 138 +++++++++++++++++++---- language/japanese/platex/pldoc.pdf | Bin 868006 -> 874061 bytes language/japanese/platex/plfonts.dtx | 105 +++++++++++++---- language/japanese/platex/plvers.dtx | 6 +- language/japanese/plautopatch/README.md | 2 +- language/japanese/plautopatch/plarydshln.sty | 2 +- language/japanese/plautopatch/plautopatch-ja.pdf | Bin 94973 -> 95758 bytes language/japanese/plautopatch/plautopatch-ja.tex | 3 +- language/japanese/plautopatch/plautopatch.pdf | Bin 39858 -> 40136 bytes language/japanese/plautopatch/plautopatch.sty | 6 +- language/japanese/plautopatch/plautopatch.tex | 3 +- language/japanese/plautopatch/pxstfloats.sty | 25 +++- language/japanese/ptex-base/LICENSE | 2 +- language/japanese/ptex-base/README.md | 2 +- language/japanese/ptex-base/kinsoku.tex | 4 +- language/japanese/uptex-base/LICENSE | 4 +- language/japanese/uptex-base/README.md | 2 +- language/japanese/uptex-base/ukinsoku.tex | 4 +- 37 files changed, 311 insertions(+), 105 deletions(-) (limited to 'language/japanese') diff --git a/language/japanese/platex-tools/README.md b/language/japanese/platex-tools/README.md index 797239589e..2322b81cda 100644 --- a/language/japanese/platex-tools/README.md +++ b/language/japanese/platex-tools/README.md @@ -83,6 +83,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2021-05-15 +2021-05-31 Hironobu Yamashita diff --git a/language/japanese/platex-tools/plarray.sty b/language/japanese/platex-tools/plarray.sty index 2629e52bca..8ec7b8092c 100644 --- a/language/japanese/platex-tools/plarray.sty +++ b/language/japanese/platex-tools/plarray.sty @@ -9,7 +9,7 @@ % * array.sty in latex-tools % (2016/10/06 v2.4d -- 2020/10/01 v2.5c) % * plcore.ltx in platex -% (2001/09/26 v1.2a -- 2020/09/28 v1.3g) +% (2001/09/26 v1.2a -- 2021/03/25 v1.3i) % \NeedsTeXFormat{pLaTeX2e} diff --git a/language/japanese/platex-tools/pldocverb.sty b/language/japanese/platex-tools/pldocverb.sty index c3b7ec7050..816db56b95 100644 --- a/language/japanese/platex-tools/pldocverb.sty +++ b/language/japanese/platex-tools/pldocverb.sty @@ -9,7 +9,7 @@ % * doc.sty % (2004/02/09 v2.1b -- 2020/06/15 v2.1m) % * plcore.ltx in platex -% (2001/09/26 v1.2a -- 2020/03/05 v1.3e) +% (2001/09/26 v1.2a -- 2021/03/25 v1.3i) % %% package declaration diff --git a/language/japanese/platex-tools/pxatbegshi.pdf b/language/japanese/platex-tools/pxatbegshi.pdf index 6ab8a2fa8b..3e1a1f67eb 100644 Binary files a/language/japanese/platex-tools/pxatbegshi.pdf and b/language/japanese/platex-tools/pxatbegshi.pdf differ diff --git a/language/japanese/platex-tools/pxatbegshi.sty b/language/japanese/platex-tools/pxatbegshi.sty index 856b95eb44..77e00d6a54 100644 --- a/language/japanese/platex-tools/pxatbegshi.sty +++ b/language/japanese/platex-tools/pxatbegshi.sty @@ -30,17 +30,13 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{pxatbegshi} - [2021/02/13 v0.7b Patch to atbegshi for (u)pLaTeX] + [2021/05/31 v0.7c Patch to atbegshi for (u)pLaTeX] %% Since LaTeX2e 2020-10-01, atbegshi.sty is merely %% an emulation by atbegshi-ltx.sty from ltshipout.dtx. \chardef\pxabgs@status=\z@ -\ifx\IfHookExistsTF\@undefined\else % >= LaTeX2e 2020-10-01 - \IfHookExistsTF{shipout/before}{% % >= LaTeX2e 2020-10-01 - \chardef\pxabgs@status=\@ne - }{} -\fi +\@ifl@t@r\fmtversion{2020/10/01}{\chardef\pxabgs@status=\@ne}{} \ifnum\pxabgs@status=\@ne % if LaTeX2e and pLaTeX2e are inconsistent, raise an error! \@ifl@t@r\pfmtversion{2020/10/01}{% diff --git a/language/japanese/platex-tools/pxeverysel.pdf b/language/japanese/platex-tools/pxeverysel.pdf index 3ccbda227e..6894e86bcb 100644 Binary files a/language/japanese/platex-tools/pxeverysel.pdf and b/language/japanese/platex-tools/pxeverysel.pdf differ diff --git a/language/japanese/platex-tools/pxeverysel.sty b/language/japanese/platex-tools/pxeverysel.sty index 8a1a9b5ead..d25e552a7f 100644 --- a/language/japanese/platex-tools/pxeverysel.sty +++ b/language/japanese/platex-tools/pxeverysel.sty @@ -10,25 +10,21 @@ % % -------------------------------------------------------------------- % [Note] -% Update: version 2021/02/13 v0.9a does nothing, since -% pLaTeX2e 2021-??-?? will support the situation natively. +% Update: since version 2021/02/13 v0.9a, this package does nothing, +% as pLaTeX2e 2021-06-01 will support the situation natively. % -------------------------------------------------------------------- % %% package declaration \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pxeverysel} - [2021/02/13 v0.9b Patch to everysel for (u)pLaTeX] + [2021/05/31 v0.9c Patch to everysel for (u)pLaTeX] -%% Since LaTeX2e 2021-05-01, everysel.sty is merely +%% Since LaTeX2e 2021-06-01, everysel.sty is merely %% an emulation by everysel-ltx.sty from firstaid. \chardef\pxys@status=\z@ -\ifx\IfHookExistsTF\@undefined\else % >= LaTeX2e 2020-10-01 - \IfHookExistsTF{selectfont}{% % >= LaTeX2e 2021-05-01 - \chardef\pxys@status=\@ne - }{} -\fi +\@ifl@t@r\fmtversion{2021/06/01}{\chardef\pxys@status=\@ne}{} \ifnum\pxys@status=\@ne % if LaTeX2e and pLaTeX2e are inconsistent, raise an error! \ifx\delayed@k@adjustment\@undefined diff --git a/language/japanese/platex-tools/pxeverysel.tex b/language/japanese/platex-tools/pxeverysel.tex index 56b1076ffe..156fa720e7 100644 --- a/language/japanese/platex-tools/pxeverysel.tex +++ b/language/japanese/platex-tools/pxeverysel.tex @@ -36,7 +36,7 @@ Martin Schr\"oder氏による\textsf{everysel}パッケージをp\LaTeX で この\textsf{pxeverysel}パッケージを読み込むことで、p\LaTeX でも \textsf{everysel}パッケージを使えるようになります。 -\LaTeXe~2021-05-01以降では、\textsf{everysel}と同等の機能がカーネルに +\LaTeXe~2021-06-01以降では、\textsf{everysel}と同等の機能がカーネルに 実装されていて、その対処は\pLaTeXe{}カーネルでなされます。 この場合、\textsf{pxeverysel}パッケージは何もしません。 diff --git a/language/japanese/platex-tools/pxeveryshi.pdf b/language/japanese/platex-tools/pxeveryshi.pdf index 141af32035..1e1e1ced15 100644 Binary files a/language/japanese/platex-tools/pxeveryshi.pdf and b/language/japanese/platex-tools/pxeveryshi.pdf differ diff --git a/language/japanese/platex-tools/pxeveryshi.sty b/language/japanese/platex-tools/pxeveryshi.sty index a1374373e2..5142e49043 100644 --- a/language/japanese/platex-tools/pxeveryshi.sty +++ b/language/japanese/platex-tools/pxeveryshi.sty @@ -18,17 +18,13 @@ %% package declaration \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pxeveryshi} - [2021/05/15 v0.2c everyshi package for (u)pLaTeX] + [2021/05/31 v0.2d everyshi package for (u)pLaTeX] %% Since LaTeX2e 2020-10-01, everyshi.sty is merely %% an emulation by everyshi-ltx.sty from ltshipout.dtx. \chardef\pxevsh@status=\z@ -\ifx\IfHookExistsTF\@undefined\else % >= LaTeX2e 2020-10-01 - \IfHookExistsTF{shipout/before}{% % >= LaTeX2e 2020-10-01 - \chardef\pxevsh@status=\@ne - }{} -\fi +\@ifl@t@r\fmtversion{2020/10/01}{\chardef\pxevsh@status=\@ne}{} \ifnum\pxevsh@status=\@ne % if LaTeX2e and pLaTeX2e are inconsistent, raise an error! \@ifl@t@r\pfmtversion{2020/10/01}{% diff --git a/language/japanese/platex-tools/pxftnright.pdf b/language/japanese/platex-tools/pxftnright.pdf index 29ee0a1246..4119597606 100644 Binary files a/language/japanese/platex-tools/pxftnright.pdf and b/language/japanese/platex-tools/pxftnright.pdf differ diff --git a/language/japanese/platex-tools/pxftnright.sty b/language/japanese/platex-tools/pxftnright.sty index 2b5d4382b4..e6766fcef7 100644 --- a/language/japanese/platex-tools/pxftnright.sty +++ b/language/japanese/platex-tools/pxftnright.sty @@ -7,6 +7,8 @@ % % This package `pxftnright' is based on: % * ftnright.sty in latex-tools (2014/10/28 v1.1f) +% * plcore.ltx in platex +% (2001/09/26 v1.2a -- 2021/03/25 v1.3i) % % Problems with ftnright to use with pLaTeX: % * \@startcolumn is redefined @@ -23,7 +25,7 @@ \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{pxftnright} - [2017/02/28 v1.1 footnote layout package for pLaTeX] + [2021/05/24 v1.1a footnote layout package for pLaTeX] %% save \@makefntext definition from pLaTeX class \@ifpackageloaded{ftnright}{% @@ -37,7 +39,18 @@ \RequirePackage{ftnright} %% patches for ftnright to work fine with pLaTeX -%% This code is based on pLaTeX2e 2017/04/08 community ed. +%% This code is based on pLaTeX2e 2021-06-01 community ed. + +\ifx\pltx@adjust@wd@outputbox\@undefined + % pLaTeX2e <2020-10-01>+2 or older + \ifx\pdfprimitive\@undefined % just in case ... + \def\pltx@adjust@wd@outputbox{% + \ifydir\else\vbox{\hskip\z@}\fi} + \else % same as plcore.dtx 2021/03/25 v1.3i + \def\pltx@adjust@wd@outputbox{% + \ifydir\else\vbox{\pdfprimitive\everypar{}\hskip\z@}\fi} + \fi +\fi \def\@startcolumn{% \ifx\@deferlist\@empty @@ -122,7 +135,7 @@ \@texttop \dimen@ \dp\@outputbox \unvbox \@outputbox - \iftdir\vbox{\hskip\z@}\fi %%% pLaTeX + \pltx@adjust@wd@outputbox %%% pLaTeX \vskip -\dimen@ \@textbottom}% \fi diff --git a/language/japanese/platex/README.md b/language/japanese/platex/README.md index e7ebff5443..5be373b97e 100644 --- a/language/japanese/platex/README.md +++ b/language/japanese/platex/README.md @@ -64,6 +64,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2021-02-13 +2021-05-31 Japanese TeX Development Community diff --git a/language/japanese/platex/kinsoku.dtx b/language/japanese/platex/kinsoku.dtx index 6f5d1de5e3..8be6b33a20 100644 --- a/language/japanese/platex/kinsoku.dtx +++ b/language/japanese/platex/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/language/japanese/platex/platex-en.pdf b/language/japanese/platex/platex-en.pdf index 722c360f9b..45b1caaea3 100644 Binary files a/language/japanese/platex/platex-en.pdf and b/language/japanese/platex/platex-en.pdf differ diff --git a/language/japanese/platex/platex.dtx b/language/japanese/platex/platex.dtx index 77e5e036d4..37ac40893f 100644 --- a/language/japanese/platex/platex.dtx +++ b/language/japanese/platex/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/language/japanese/platex/platex.pdf b/language/japanese/platex/platex.pdf index 8d6e3fd37a..8430fd658b 100644 Binary files a/language/japanese/platex/platex.pdf and b/language/japanese/platex/platex.pdf differ diff --git a/language/japanese/platex/platexrelease.dtx b/language/japanese/platex/platexrelease.dtx index 842217c07c..78bda1bf64 100644 --- a/language/japanese/platex/platexrelease.dtx +++ b/language/japanese/platex/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/language/japanese/platex/platexrelease.pdf b/language/japanese/platex/platexrelease.pdf index 2100e9cc62..bac4a2ede2 100644 Binary files a/language/japanese/platex/platexrelease.pdf and b/language/japanese/platex/platexrelease.pdf differ diff --git a/language/japanese/platex/plcore.dtx b/language/japanese/platex/plcore.dtx index a56b737c05..6e61ab38c9 100644 --- a/language/japanese/platex/plcore.dtx +++ b/language/japanese/platex/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 @@ % % \end{macrocode} % +% \begin{macro}{\pltx@adjust@wd@outputbox} +% |\@outputpage|$BFb$Gl9g$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 +\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} +% +% \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 +% $Bl9g$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} %\plIncludeInRelease{2020/10/01}{\@vtryfc} % {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 % @@ -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} -%\plIncludeInRelease{2016/09/08}{\@footnotetext} -% {Allow break after \footnote (more fix)}% +%\plIncludeInRelease{2021/06/01}{\@footnotetext} +% {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} % %\plEndIncludeInRelease +%\plIncludeInRelease{2016/09/08}{\@footnotetext} +% {Allow break after \footnote (more fix)}% +%\long\def\@footnotetext#1{% +% \ifydir\def\@tempa{\yoko}\else\def\@tempa{\tate}\fi +% \insert\footins{\@tempa% +% \reset@font\footnotesize +% \interlinepenalty\interfootnotelinepenalty +% \splittopskip\footnotesep +% \splitmaxdepth \dp\strutbox \floatingpenalty \@MM +% \hsize\columnwidth \@parboxrestore +% \protected@edef\@currentlabel{% +% \csname p@footnote\endcsname\@thefnmark +% }% +% \color@begingroup +% \@makefntext{% +% \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% +% \color@endgroup}\ifhmode\null\fi +% \ifnum\pltx@foot@penalty=\z@\else +% \penalty\pltx@foot@penalty +% \pltx@foot@penalty\z@ +% \fi} +%\plEndIncludeInRelease %\plIncludeInRelease{2016/09/03}{\@footnotetext} % {Allow break after \footnote}% %\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} % @@ -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/language/japanese/platex/pldoc.pdf b/language/japanese/platex/pldoc.pdf index ba12e12781..dd1ddb4887 100644 Binary files a/language/japanese/platex/pldoc.pdf and b/language/japanese/platex/pldoc.pdf differ diff --git a/language/japanese/platex/plfonts.dtx b/language/japanese/platex/plfonts.dtx index 9eae7852a1..4474d8a36e 100644 --- a/language/japanese/platex/plfonts.dtx +++ b/language/japanese/platex/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 % %\plEndIncludeInRelease %\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 % @@ -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 % %\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 % %\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} %\plIncludeInRelease{2020/02/02}{\usefont} % {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} %\plIncludeInRelease{2020/04/12}{\normalfont} % {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 %\DeclareRobustCommand\normalfont{% % \fontencoding\encodingdefault % \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 +%\DeclareRobustCommand\normalfont{% +% \fontencoding\encodingdefault +% \edef\f@family{\familydefault}% +% \edef\f@series{\seriesdefault}% +% \edef\f@shape{\shapedefault}% +% \let\delayed@f@adjustment\@empty +% \UseHook{normalfont}% +% \@defaultfamilyhook % hookname from 2020/02 will vanish +% \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/language/japanese/platex/plvers.dtx b/language/japanese/platex/plvers.dtx index ee268af6a3..2bacd24553 100644 --- a/language/japanese/platex/plvers.dtx +++ b/language/japanese/platex/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 @@ % %\edef\platexreleaseversion %<*plcore|platexrelease> - {2020-10-01} + {2021-06-01} % %<*plcore> -\def\ppatch@level{2} +\def\ppatch@level{0} % % \end{macrocode} % \end{macro} diff --git a/language/japanese/plautopatch/README.md b/language/japanese/plautopatch/README.md index 2ac89c48a2..a1ccd97b7a 100644 --- a/language/japanese/plautopatch/README.md +++ b/language/japanese/plautopatch/README.md @@ -94,6 +94,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2021-05-15 +2021-05-31 Hironobu Yamashita diff --git a/language/japanese/plautopatch/plarydshln.sty b/language/japanese/plautopatch/plarydshln.sty index b84c27df01..a2bef7a286 100644 --- a/language/japanese/plautopatch/plarydshln.sty +++ b/language/japanese/plautopatch/plarydshln.sty @@ -9,7 +9,7 @@ % * arydshln.sty % (2004/08/31 v1.71 -- 2019/02/21 v1.76) % * plcore.ltx in platex -% (2001/09/26 v1.2a -- 2020/03/05 v1.3e) +% (2001/09/26 v1.2a -- 2021/03/25 v1.3i) % %% package declaration diff --git a/language/japanese/plautopatch/plautopatch-ja.pdf b/language/japanese/plautopatch/plautopatch-ja.pdf index cd79d8b1b3..a842205070 100644 Binary files a/language/japanese/plautopatch/plautopatch-ja.pdf and b/language/japanese/plautopatch/plautopatch-ja.pdf differ diff --git a/language/japanese/plautopatch/plautopatch-ja.tex b/language/japanese/plautopatch/plautopatch-ja.tex index 020869c633..c6edbdf860 100644 --- a/language/japanese/plautopatch/plautopatch-ja.tex +++ b/language/japanese/plautopatch/plautopatch-ja.tex @@ -189,8 +189,9 @@ \item 2020/10/14 v0.9k トンボ関連パッチを\textsf{gentombow}へ移動 \item 2020/10/21 v0.9l \verb+\plautopatchdisable+が機能しなかったバグを修正 \item 2020/11/26 v0.9m \textsf{pgf}最新版に追随 - \item 2021/02/13 v0.9n \textsf{pxeverysel}を不要に(\LaTeXe~2021-05-01対応) + \item 2021/02/13 v0.9n \textsf{pxeverysel}を不要に(\LaTeXe{}開発版対応) \item 2021/05/15 v0.9o \textsf{pxjahyper}の読込を遅延させない + \item 2021/05/31 v0.9p \LaTeXe~2021-06-01への準備 \end{itemize} \end{document} diff --git a/language/japanese/plautopatch/plautopatch.pdf b/language/japanese/plautopatch/plautopatch.pdf index aa83abe9ab..4022f6d9c8 100644 Binary files a/language/japanese/plautopatch/plautopatch.pdf and b/language/japanese/plautopatch/plautopatch.pdf differ diff --git a/language/japanese/plautopatch/plautopatch.sty b/language/japanese/plautopatch/plautopatch.sty index 72d7327c0f..bc1c794f42 100644 --- a/language/japanese/plautopatch/plautopatch.sty +++ b/language/japanese/plautopatch/plautopatch.sty @@ -8,7 +8,7 @@ \NeedsTeXFormat{LaTeX2e}% not pLaTeX2e on purpose! \ProvidesPackage{plautopatch} - [2021/05/15 v0.9o Automated patches for pLaTeX/upLaTeX] + [2021/05/31 v0.9p Automated patches for pLaTeX/upLaTeX] \ifx\pfmtname\@undefined \PackageInfo{plautopatch}{% @@ -218,10 +218,10 @@ \platpc@patch@after{collcell}{plcollcell}% (maintained here!) % --- in most cases, pxeverysel can be safely loaded even after everysel % --- but it can fail when \AtBeginDocument{everysel} is involved -% --- [Update] since LaTeX2e 2021-05-01, everysel.sty is merely +% --- [Update] since LaTeX2e 2021-06-01, everysel.sty is merely % --- an emulation by everysel-ltx.sty from firstaid, % --- which is supported by pLaTeX2e kernel natively -\@ifl@t@r{\fmtversion}{2021/05/01}{}% +\@ifl@t@r{\fmtversion}{2021/06/01}{}% {\platpc@patch@before{everysel}{pxeverysel}}% platex-tools % --- [Update] since LaTeX2e 2020-10-01, everyshi.sty is merely % --- an emulation by everyshi-ltx.sty from ltshipout.dtx, diff --git a/language/japanese/plautopatch/plautopatch.tex b/language/japanese/plautopatch/plautopatch.tex index 9f820d3b34..e61fefbfb4 100644 --- a/language/japanese/plautopatch/plautopatch.tex +++ b/language/japanese/plautopatch/plautopatch.tex @@ -188,8 +188,9 @@ a comma-separated list of them: \item 2020/10/14 v0.9k Move tombow-related patches to \textsf{gentombow} \item 2020/10/21 v0.9l Bug fix for \verb+\plautopatchdisable+ \item 2020/11/26 v0.9m Adapt to latest \textsf{pgf} - \item 2021/02/13 v0.9n Do not require \textsf{pxeverysel} on \LaTeXe~2021-05-01 + \item 2021/02/13 v0.9n Do not require \textsf{pxeverysel} on \LaTeXe~develop \item 2021/05/15 v0.9o Do not delay \textsf{pxjahyper} loading + \item 2021/05/31 v0.9p Prepare for \LaTeXe~2021-06-01 \end{itemize} \end{document} diff --git a/language/japanese/plautopatch/pxstfloats.sty b/language/japanese/plautopatch/pxstfloats.sty index 2698407f1f..95769fc0c4 100644 --- a/language/japanese/plautopatch/pxstfloats.sty +++ b/language/japanese/plautopatch/pxstfloats.sty @@ -8,18 +8,31 @@ % % This package is expected to be compatible with % * stfloats.sty in sttools -% 2012/05/29 v1.1 -- 2017/03/27 v3.3 +% (2012/05/29 v1.1 -- 2017/03/27 v3.3) +% * plcore.ltx in platex +% (2001/09/26 v1.2a -- 2021/03/25 v1.3i) % Many thanks to lltjp-stfloats.sty in LuaTeX-ja project. % \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{pxstfloats} - [2017/02/19 v0.2 stfloats package for pLaTeX] + [2021/05/24 v0.2a stfloats package for pLaTeX] \RequirePackage{stfloats} +\ifx\pltx@adjust@wd@outputbox\@undefined + % pLaTeX2e <2020-10-01>+2 or older + \ifx\pdfprimitive\@undefined % just in case ... + \def\pltx@adjust@wd@outputbox{% + \ifydir\else\vbox{\hskip\z@}\fi} + \else % same as plcore.dtx 2021/03/25 v1.3i + \def\pltx@adjust@wd@outputbox{% + \ifydir\else\vbox{\pdfprimitive\everypar{}\hskip\z@}\fi} + \fi +\fi + %% mostly based on \fn@makecol in stfloats.sty, and %% the additions for supporting pLaTeX are based on -%% pLaTeX2e 2017/04/08 community ed. +%% pLaTeX2e 2021-06-01 community ed. %% the code is essentially compatible with %% fnpos.sty (yafoot) 1999/07/14 v1.0 %% |\makeFNmid| + |\makeFNbelow| status. @@ -49,7 +62,7 @@ \@texttop \dimen@ \dp\@outputbox \unvbox \@outputbox - \iftdir\vbox{\hskip\z@}\fi %% for pLaTeX + \pltx@adjust@wd@outputbox %% for pLaTeX \vskip -\dimen@ \@textbottom }% @@ -59,7 +72,7 @@ %% mostly based on \@makecol in latex.ltx, and %% the additions for supporting pLaTeX are based on -%% pLaTeX2e 2017/04/08 community ed. +%% pLaTeX2e 2021-06-01 community ed. %% the code is essentially compatible with %% fnpos.sty (yafoot) 1999/07/14 v1.0 %% |\makeFNmid| + |\makeFNabove| status. @@ -89,7 +102,7 @@ \@texttop \dimen@ \dp\@outputbox \unvbox \@outputbox - \iftdir\vbox{\hskip\z@}\fi %% for pLaTeX + \pltx@adjust@wd@outputbox %% for pLaTeX \vskip -\dimen@ \@textbottom }% diff --git a/language/japanese/ptex-base/LICENSE b/language/japanese/ptex-base/LICENSE index 1955037a7b..dfb12d3800 100644 --- a/language/japanese/ptex-base/LICENSE +++ b/language/japanese/ptex-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/language/japanese/ptex-base/README.md b/language/japanese/ptex-base/README.md index 393284f8b7..c0d4047c25 100644 --- a/language/japanese/ptex-base/README.md +++ b/language/japanese/ptex-base/README.md @@ -25,6 +25,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2020-09-30 +2021-05-31 Japanese TeX Development Community diff --git a/language/japanese/ptex-base/kinsoku.tex b/language/japanese/ptex-base/kinsoku.tex index e056e34da9..879492ad13 100644 --- a/language/japanese/ptex-base/kinsoku.tex +++ b/language/japanese/ptex-base/kinsoku.tex @@ -1,4 +1,4 @@ -% (Last update: 2020/09/28 texjporg) +% (Last update: 2021/03/04 texjporg) % % $B9TF,!"9TKv6XB'%Q%i%a!<%?(B % @@ -103,6 +103,7 @@ \xspcode`]=2 \xspcode``=1 \xspcode`'=2 +\xspcode`:=2 \xspcode`;=2 \xspcode`,=2 \xspcode`.=2 @@ -241,6 +242,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 diff --git a/language/japanese/uptex-base/LICENSE b/language/japanese/uptex-base/LICENSE index ef63725348..3d3c0508a8 100644 --- a/language/japanese/uptex-base/LICENSE +++ b/language/japanese/uptex-base/LICENSE @@ -1,6 +1,6 @@ Copyright (c) 2010 ASCII MEDIA WORKS -Copyright (c) 2016-2020 Takuji Tanaka -Copyright (c) 2016-2020 Japanese TeX Development Community +Copyright (c) 2016-2021 Takuji Tanaka +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/language/japanese/uptex-base/README.md b/language/japanese/uptex-base/README.md index d295f615a9..cacae36628 100644 --- a/language/japanese/uptex-base/README.md +++ b/language/japanese/uptex-base/README.md @@ -17,6 +17,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2020-10-31 +2021-05-31 Japanese TeX Development Community diff --git a/language/japanese/uptex-base/ukinsoku.tex b/language/japanese/uptex-base/ukinsoku.tex index 77dab250b3..a48a2ba675 100644 --- a/language/japanese/uptex-base/ukinsoku.tex +++ b/language/japanese/uptex-base/ukinsoku.tex @@ -1,4 +1,4 @@ -%% (Last update: 2020/09/28 ttk, texjporg) +%% (Last update: 2021/03/04 ttk, texjporg) %% \ifnum\ucs"3000="3000 \else \errhelp{Please try to run (e)uptex with option @@ -185,6 +185,7 @@ \xspcode`]=2 \xspcode``=1 \xspcode`'=2 +\xspcode`:=2 \xspcode`;=2 \xspcode`,=2 \xspcode`.=2 @@ -323,6 +324,7 @@ \inhibitxspcode`。=1 \inhibitxspcode`,=1 \inhibitxspcode`.=1 +\inhibitxspcode`:=1 \inhibitxspcode`;=1 \inhibitxspcode`?=1 \inhibitxspcode`!=1 -- cgit v1.2.3