From d7b4bf25c731eaaa8cf7fa74ba1d452e67af0862 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 31 May 2021 20:22:08 +0000 Subject: platex (31may21) git-svn-id: svn://tug.org/texlive/trunk@59404 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/platex/base/README.md | 2 +- Master/texmf-dist/doc/platex/base/platex-en.pdf | Bin 147796 -> 148274 bytes Master/texmf-dist/doc/platex/base/platex.pdf | Bin 251862 -> 253604 bytes .../texmf-dist/doc/platex/base/platexrelease.pdf | Bin 107870 -> 107850 bytes Master/texmf-dist/doc/platex/base/pldoc.pdf | Bin 868006 -> 874061 bytes Master/texmf-dist/source/platex/base/kinsoku.dtx | 9 +- Master/texmf-dist/source/platex/base/platex.dtx | 37 +++++- .../source/platex/base/platexrelease.dtx | 3 +- Master/texmf-dist/source/platex/base/plcore.dtx | 138 +++++++++++++++++---- Master/texmf-dist/source/platex/base/plfonts.dtx | 105 ++++++++++++---- Master/texmf-dist/source/platex/base/plvers.dtx | 6 +- Master/texmf-dist/tex/platex/base/kinsoku.tex | 2 + Master/texmf-dist/tex/platex/base/platex.ltx | 5 + .../texmf-dist/tex/platex/base/platexrelease.sty | 134 ++++++++++++++++---- Master/texmf-dist/tex/platex/base/plcore.ltx | 102 +++++++++++---- Master/texmf-dist/tex/platex/base/ptrace.sty | 11 +- 16 files changed, 446 insertions(+), 108 deletions(-) diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md index e7ebff5443f..5be373b97e3 100644 --- a/Master/texmf-dist/doc/platex/base/README.md +++ b/Master/texmf-dist/doc/platex/base/README.md @@ -64,6 +64,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2021-02-13 +2021-05-31 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/platex/base/platex-en.pdf b/Master/texmf-dist/doc/platex/base/platex-en.pdf index 722c360f9b2..45b1caaea3c 100644 Binary files a/Master/texmf-dist/doc/platex/base/platex-en.pdf and b/Master/texmf-dist/doc/platex/base/platex-en.pdf differ diff --git a/Master/texmf-dist/doc/platex/base/platex.pdf b/Master/texmf-dist/doc/platex/base/platex.pdf index 8d6e3fd37a2..8430fd658ba 100644 Binary files a/Master/texmf-dist/doc/platex/base/platex.pdf and b/Master/texmf-dist/doc/platex/base/platex.pdf differ diff --git a/Master/texmf-dist/doc/platex/base/platexrelease.pdf b/Master/texmf-dist/doc/platex/base/platexrelease.pdf index 2100e9cc629..bac4a2ede2d 100644 Binary files a/Master/texmf-dist/doc/platex/base/platexrelease.pdf and b/Master/texmf-dist/doc/platex/base/platexrelease.pdf differ diff --git a/Master/texmf-dist/doc/platex/base/pldoc.pdf b/Master/texmf-dist/doc/platex/base/pldoc.pdf index ba12e12781e..dd1ddb4887b 100644 Binary files a/Master/texmf-dist/doc/platex/base/pldoc.pdf and b/Master/texmf-dist/doc/platex/base/pldoc.pdf differ 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}{%、&、\%、\&の禁則ペナルティが % 誤っていたのを修正(post $\rightarrow$ pre)} % \changes{v1.0c}{2020/09/28}{!の\cs{inhibitxspcode}を設定} +% \changes{v1.0d}{2021/03/04}{:の\cs{inhibitxspcode}と:の\cs{xspcode}を設定} % \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}{:の\cs{xspcode}を設定} % \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}{!の\cs{inhibitxspcode}を設定} +% \changes{v1.0d}{2021/03/04}{:の\cs{inhibitxspcode}を設定} % \begin{macrocode} \inhibitxspcode`、=1 \inhibitxspcode`。=1 \inhibitxspcode`,=1 \inhibitxspcode`.=1 +\inhibitxspcode`:=1 \inhibitxspcode`;=1 \inhibitxspcode`?=1 \inhibitxspcode`!=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}{ドキュメントを更新} % \changes{v1.1a}{2020/09/26}{\file{plexpl3.dtx}を追加} % \changes{v1.1b}{2020/09/28}{defs読込後にフック追加} +% \changes{v1.1c}{2021/02/25}{\file{latex.ltx}の読込チェック} +% \changes{v1.1d}{2021/03/14}{expl3コマンドを印字できるように} %\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}を読み込みます。 -% \TeX\ Liveの標準的インストールでは、この中でBabel由来のハイフネーション・ -% パターン\file{hyphen.cfg}が読み込まれるはずです。 +% \TeX\ Liveの標準的インストールでは、この中でBabel由来の +% ハイフネーション・パターン\file{hyphen.cfg}が読み込まれるはずです。 % \changes{v1.0g}{2016/05/07}{フォーマット作成時に\LaTeX{}のバナーを一旦保存} % \changes{v1.0n}{2016/09/14}{\LaTeX{}のバナーの保存しかたを改良} % \changes{v1.0p}{2017/11/11}{\LaTeX{}のバナーを保存するコードを @@ -511,6 +515,24 @@ % \end{macrocode} % %\ifJAPANESE +% この時点で|\typeout|が未定義なら、\LaTeX{}カーネルの読み込みに +% 失敗していますので、強制終了します(\LaTeXe\ 2017/01/01以降を +% 非\eTeX{}拡張でフォーマット作成しようとした場合など)。 +% \changes{v1.1c}{2021/02/25}{\file{latex.ltx}の読込チェック} +%\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}を読み込みます。 %\else % Load \file{plcore.ltx}. @@ -1090,13 +1112,20 @@ % 文書クラスには、\file{jltxdoc}クラスを用います。 % \file{plext.dtx}の中でサンプルを組み立てていますので、 % \file{plext}パッケージが必要です。 +% \changes{v1.1d}{2021/03/14}{expl3コマンドを印字できるように} %\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}バグ修正} % \changes{v1.3a}{2018/10/31}{\LaTeXe{}とp\LaTeXe{}の更新タイミングずれ対策を % \file{plvers.dtx} (plfinal) から\file{plcore.dtx}へ移動、latexrelease対策 -% (sync with ltfinal 2018/08/24 v2.1f)} +% (sync with ltfinal.dtx 2018/08/24 v2.1f)} % \changes{v1.3b}{2019/02/08}{中央揃えのセルでの\cs{unskip}対策 -% (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}{合字処理を抑止しつつ\cs{xkanjiskip}は挿入} % \changes{v1.3f}{2020/09/26}{\cs{AtBeginDvi}を再定義しない % (checked ltshipout.dtx 2020/09/21 v1.0c)} -% \changes{v1.3f}{2020/09/26}{\cs{__shipout_execute_cont:}を再定義 +% \changes{v1.3f}{2020/09/26}{\cs{\_\_shipout_execute_cont:}を再定義 % (checked ltshipout.dtx 2020/09/21 v1.0c)} % \changes{v1.3g}{2020/09/28}{縦組で空のフロートだけのページの % フッタ(Issue 78)} % \changes{v1.3g}{2020/09/28}{\file{plexpl3}で定義した命令を使用} +% \changes{v1.3h}{2021/03/14}{\LaTeXe~2021-06-01に伴う修正} +% \changes{v1.3i}{2021/03/25}{\cs{@outputpage}, \cs{@vtryfc}での、非横組時における +% \cs{@outputbox}の寸法補正のコードを別命令として切り出した} % \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|内で実行されていた +% \begin{quote} +% 縦組の際に|\@outputbox|の内容が空のボックスだけの場合に、|\wd\@outputbox|が +% 0ptになってしまい、結果としてフッタの位置がくるってしまっていた。 +% 0の|\hskip|を発生させると|\wd\@outputbox|の値が期待したものとなるので、 +% 縦組の場合はその方法で対処する。 +% +% ただし、0の|\hskip|を発生させるとき、水平モードに入ってしまうと、たとえば +% longtableパッケージを使用して表組途中で改ページするときに|\par -> {\vskip}|の +% 無限ループが起きてしまいます。そこで、|\vbox|の中で発生させます。 +% \end{quote} +% という処理を取り出したものです。 +% +% \LaTeXe~2021-06-01では段落開始時の``para/*''フックが実装されますが、 +% それを一時的に無効化するために「プリミティブとしての」|\everypar|を +% |\pdfprimitive\everypar|として呼び出しています。 +% \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|と同様の処理ですが、|\@vtryfc|では +% |\vbox|の位置が異なります。 +% \begin{macrocode} +\def\pltx@adjust@wd@outputbox@vtryfc{% + \ifydir\else\pdfprimitive\everypar{}\hskip\z@\fi} +% +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\@makecol} % このマクロが組み立てる部分の中心となります。 % \file{ltoutput.dtx}で定義されているものです。 @@ -551,14 +588,11 @@ \dimen@ \dp\@outputbox \unvbox \@outputbox % \end{macrocode} -% 縦組の際に|\@outputbox|の内容が空のボックスだけの場合に、|\wd\@outputbox|が -% 0ptになってしまい、結果としてフッタの位置がくるってしまっていた。 -% 0の|\hskip|を発生させると|\wd\@outputbox|の値が期待したものとなるので、 -% 縦組の場合はその方法で対処する。 -% -% ただし、0の|\hskip|を発生させるとき、水平モードに入ってしまうと、たとえば -% longtableパッケージを使用して表組途中で改ページするときに|\par -> {\vskip}|の -% 無限ループが起きてしまいます。そこで、|\vbox|の中で発生させます。 +% 次の行は以前は +%\begin{verbatim} +%\iftdir\vbox{\hskip\z@}\fi +%\end{verbatim} +% でしたが、|\pltx@adjust@wd@outputbox|として切り出しました。 % \changes{v1.1j}{2001/05/10}{\cs{@makecol}で組み立てられる % \cs{@outputbox}の大きさが、縦組で中身が空のボックスだけの場合も適正になる % ように修正} @@ -566,8 +600,10 @@ % ようにする\texttt{\cs{vskip}~-\cs{dimen@}}が縦組モードでは無効になっていたので修正} % \changes{v1.2h}{2016/09/01}{縦組でlongtableパッケージを使って表組の途中で改ページ % するとき無限ループが起こる問題に対処(Issue 21)} +% \changes{v1.3i}{2021/03/25}{非横組時における +% \cs{@outputbox}の寸法補正のコードを\cs{pltx@adjust@wd@outputbox}として切り出した} % \begin{macrocode} - \iftdir\vbox{\hskip\z@}\fi + \pltx@adjust@wd@outputbox \vskip -\dimen@ \@textbottom }% @@ -822,15 +858,18 @@ % それより昔の版では空白ページは発生しません。 % % 対策方法は、\file{ltoutput.dtx}で定義されている|\@vtryfc|に -% |\ifydir\else\hskip\z@\fi|の追加です(|\@makecol|と同様)。 +% |\ifydir\else\hskip\z@\fi|の追加です(|\@makecol|と同様)が、 +% 別命令|\pltx@adjust@wd@outputbox@vtryfc|として切り出しました。 % \changes{v1.3g}{2020/09/28}{縦組で空のフロートだけのページの % フッタ(Issue 78)} +% \changes{v1.3i}{2021/03/25}{非横組時における +% \cs{@outputbox}の寸法補正のコードを\cs{pltx@adjust@wd@outputbox@vtryfc}として切り出した} % \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以降:\file{ltshipout.dtx}がベースです。 % ただし、縦組クラスでも通るようにするため、以下の方法を採ります。 % \begin{itemize} @@ -1645,6 +1684,38 @@ } } \fi: +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\__shipout_execute_nohooks_cont:} +% \LaTeXe~2021-06-01では、同様の処理が|\__shipout_execute_nohooks_cont:|にも +% 必要なので、それを行います。 +% \changes{v1.3h}{2021/03/14}{\LaTeXe~2021-06-01では +% \cs{\_\_shipout\_execute\_nohooks\_cont:}が追加された} +% \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 @@ % 使えるように再定義されます。 % % \changes{v1.0a}{1995/04/07}{組方向の判定をボックスの外でするようにした} +% \changes{v1.3h}{2021/03/14}{\LaTeXe~2021-06-01では\cs{par}が入る +% (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{}では|\insert|の直後に和文文字が来た場合、そこでの改行は許されない @@ -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 @@ % なっていたバグを修正} % \changes{v1.2x}{2018/03/01}{\cs{removejfmglue}があれば利用するようにした} % \changes{v1.3b}{2019/02/08}{中央揃えのセルでの\cs{unskip}対策 -% (sync with lttab 2018/12/30 v1.1p)} +% (sync with lttab.dtx 2018/12/30 v1.1p)} % ^^A なぜか v1.3b の変更は本家 latexrelease に含まれないのでそれに合わせた % \begin{macrocode} % @@ -2698,7 +2794,7 @@ % \section{\LaTeXe{}とp\LaTeXe{}の更新タイミングずれ対策} % \changes{v1.3a}{2018/10/31}{\LaTeXe{}とp\LaTeXe{}の更新タイミングずれ対策を % \file{plvers.dtx} (plfinal) から\file{plcore.dtx}へ移動、latexrelease対策 -% (sync with ltfinal 2018/08/24 v2.1f)} +% (sync with ltfinal.dtx 2018/08/24 v2.1f)} % % \begin{macro}{\l@nohyphenation} % 通常はBabelのハイフネーション定義により提供されるパラメータです。 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} % 最初に、遅らせていたシリーズ・シェイプの値更新を行います。 % \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{}の|\selectfont|コマンドは、まず、和文フォントを切り替えます。 % \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} % 最後に、サイズが変更されていれば、ベースラインの調整などを行ないます。 @@ -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で追加された|\delayed@f@adjustment|の和文版です。 +% \LaTeXe~2021-06-01で追加された|\delayed@f@adjustment|の和文版です。 % \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以降では、|\DeclareFontSeriesChangeRule|によって % 宣言された「シリーズ更新規則」に基づきシリーズを選択します。 % -% \LaTeXe~2021-05-01以降では、シリーズの更新を|\selectfont|まで遅らせます。 +% \LaTeXe~2021-06-01以降では、シリーズの更新を|\selectfont|まで遅らせます。 % \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 では |\maybe@load@fontshape| は削除される。 +%^^A LaTeX2e 2021-06-01 では |\maybe@load@fontshape| は削除される。 %^^A 理由:処理が |\selectfont| まで遅れるので不要とのこと。 %^^A しかし、なぜか ltfssaxes.dtx で rollback の対処が無いような? \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以降では、|\DeclareFontShapeChangeRule|によって % 宣言された「シェイプ更新規則」に基づきシェイプを選択します。 % -% \LaTeXe~2021-05-01以降では、シェイプの更新を|\selectfont|まで遅らせます。 +% \LaTeXe~2021-06-01以降では、シェイプの更新を|\selectfont|まで遅らせます。 % \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 では |\maybe@load@fontshape| は削除される。 +%^^A LaTeX2e 2021-06-01 では |\maybe@load@fontshape| は削除される。 %^^A 理由:処理が |\selectfont| まで遅れるので不要とのこと。 %^^A しかし、なぜか ltfssaxes.dtx で rollback の対処が無いような? \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}{フックシステムの有無判定を改良} +% \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/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 @@ % %\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/Master/texmf-dist/tex/platex/base/kinsoku.tex b/Master/texmf-dist/tex/platex/base/kinsoku.tex index 6f4efdfa743..9a82378d674 100644 --- a/Master/texmf-dist/tex/platex/base/kinsoku.tex +++ b/Master/texmf-dist/tex/platex/base/kinsoku.tex @@ -110,6 +110,7 @@ \xspcode`]=2 \xspcode``=1 \xspcode`'=2 +\xspcode`:=2 \xspcode`;=2 \xspcode`,=2 \xspcode`.=2 @@ -245,6 +246,7 @@ \inhibitxspcode`。=1 \inhibitxspcode`,=1 \inhibitxspcode`.=1 +\inhibitxspcode`:=1 \inhibitxspcode`;=1 \inhibitxspcode`?=1 \inhibitxspcode`!=1 diff --git a/Master/texmf-dist/tex/platex/base/platex.ltx b/Master/texmf-dist/tex/platex/base/platex.ltx index 5da596fcaca..e5391881eb3 100644 --- a/Master/texmf-dist/tex/platex/base/platex.ltx +++ b/Master/texmf-dist/tex/platex/base/platex.ltx @@ -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% diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index 5c4d898c4f0..363f98c29d5 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -20,7 +20,7 @@ \edef\p@known@latexreleaseversion {2020-10-01} \edef\platexreleaseversion - {2020-10-01} + {2021-06-01} \newif\if@plincludeinrelease \@plincludeinreleasefalse \def\plIncludeInRelease#1{% @@ -146,7 +146,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> @@ -770,10 +771,10 @@ of this package available from CTAN} \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{% - % !! 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 @@ -811,7 +812,8 @@ of this package available from CTAN} \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 \let\tmp@error@fontshape\error@fontshape \let\error@fontshape\error@kfontshape \edef\tmp@item{{\k@encoding}}% @@ -861,14 +863,14 @@ of this package available from CTAN} \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}% \pickup@font \font@name - \UseHook{selectfont}% since LaTeX2e 2021-05-01 + \UseHook{selectfont}% since LaTeX2e 2021-06-01 \enc@update \ifx\f@linespread\baselinestretch \else \set@fontsize\baselinestretch\f@size\f@baselineskip \fi \size@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 @@ of this package available from CTAN} \fi \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 \ifx\fontseriesforce\@undefined % old @@ -1089,7 +1091,7 @@ of this package available from CTAN} \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}}} @@ -1097,7 +1099,7 @@ of this package available from CTAN} \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 \ifx\fontseriesforce\@undefined % old \let\romanseriesforce\@undefined @@ -1107,7 +1109,7 @@ of this package available from CTAN} \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}}} @@ -1115,7 +1117,7 @@ of this package available from CTAN} \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 \ifx\fontseriesforce\@undefined % old \let\merge@kanji@series\@undefined @@ -1159,7 +1161,7 @@ of this package available from CTAN} \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@ @@ -1195,7 +1197,7 @@ of this package available from CTAN} \@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}}} @@ -1206,7 +1208,7 @@ of this package available from CTAN} \@shape@roman@kanjitrue \kanjishape{#1}\romanshape{#1}% \@shape@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 @@ of this package available from CTAN} \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}}} @@ -1247,7 +1249,7 @@ of this package available from CTAN} \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 \plIncludeInRelease{0000/00/00}{\fontshapeforce} @@ -1346,7 +1348,7 @@ of this package available from CTAN} \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@ @@ -1387,7 +1389,7 @@ of this package available from CTAN} \plEndIncludeInRelease \plIncludeInRelease{2020/02/02}{\usefont} {Don't call \fontseries or \fontshape}% -\ifx\set@target@series\@undefined +\ifx\set@target@series\@undefined % old \DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}% \edef\k@family{#2}% \edef\k@series{#3}% @@ -1398,7 +1400,8 @@ of this package available from CTAN} \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}% @@ -1409,7 +1412,23 @@ of this package available from CTAN} \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 @@ -1483,6 +1502,7 @@ of this package available from CTAN} } \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}% @@ -1497,6 +1517,24 @@ of this package available from CTAN} \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 @@ -2376,6 +2414,10 @@ of this package available from CTAN} \fi \fi} \plEndIncludeInRelease +\def\pltx@adjust@wd@outputbox{% + \ifydir\else\vbox{\pdfprimitive\everypar{}\hskip\z@}\fi} +\def\pltx@adjust@wd@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 @@ of this package available from CTAN} \@texttop \dimen@ \dp\@outputbox \unvbox \@outputbox - \iftdir\vbox{\hskip\z@}\fi + \pltx@adjust@wd@outputbox \vskip -\dimen@ \@textbottom }% @@ -2512,7 +2554,7 @@ of this package available from CTAN} \plIncludeInRelease{2020/10/01}{\@vtryfc} {Empty float}% \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{% @@ -3011,6 +3053,29 @@ of this package available from CTAN} } } \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 @@ of this package available from CTAN} {\protected@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@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}% + \par + \color@endgroup}\ifhmode\null\fi + \ifnum\pltx@foot@penalty=\z@\else + \penalty\pltx@foot@penalty + \pltx@foot@penalty\z@ + \fi} +\plEndIncludeInRelease \plIncludeInRelease{2016/09/08}{\@footnotetext} {Allow break after \footnote (more fix)}% \long\def\@footnotetext#1{% diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index 400d8d27003..1c8ae656147 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -34,8 +34,8 @@ \fi \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2020-10-01} -\def\ppatch@level{2} + {2021-06-01} +\def\ppatch@level{0} \edef\platexBANNER{\noexpand\platexNILa \the\everyjob % LaTeX banner and delayed codes \noexpand\platexNILb} @@ -639,10 +639,10 @@ \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{% - % !! 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 @@ -680,7 +680,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 \let\tmp@error@fontshape\error@fontshape \let\error@fontshape\error@kfontshape \edef\tmp@item{{\k@encoding}}% @@ -730,14 +731,14 @@ \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 \ifx\f@linespread\baselinestretch \else \set@fontsize\baselinestretch\f@size\f@baselineskip \fi \size@update} %% -\fi % --- for >= 2021-05-01 END +\fi % --- for >= 2021-06-01 END \def\set@fontsize#1#2#3{% \@defaultunits\@tempdimb#2pt\relax\@nnil \edef\f@size{\strip@pt\@tempdimb}% @@ -939,7 +940,7 @@ \fi \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 \ifx\fontseriesforce\@undefined % old @@ -951,7 +952,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}}} @@ -959,7 +960,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 \ifx\fontseriesforce\@undefined % old \let\romanseriesforce\@undefined @@ -969,7 +970,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}}} @@ -977,7 +978,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 \ifx\fontseriesforce\@undefined % old \let\merge@kanji@series\@undefined @@ -1021,7 +1022,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@ @@ -1055,7 +1056,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}}} @@ -1066,7 +1067,7 @@ \@shape@roman@kanjitrue \kanjishape{#1}\romanshape{#1}% \@shape@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@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}}} @@ -1092,7 +1093,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 \ifx\fontseriesforce\@undefined % old \let\merge@kanji@shape\@undefined @@ -1140,7 +1141,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@ @@ -1171,7 +1172,7 @@ \@font@info{Kanji font shape `#1' undefined\MessageBreak No change}% } -\ifx\set@target@series\@undefined +\ifx\set@target@series\@undefined % old \DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}% \edef\k@family{#2}% \edef\k@series{#3}% @@ -1182,7 +1183,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}% @@ -1193,7 +1195,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 @@ -1222,12 +1240,22 @@ } \fi % done \else % --- for <= 2020-02-02 END & for >= 2020-10-01 BEGIN +\ifx\delayed@f@adjustment\@undefined % --- for == 2020-10-01 BEGIN \AddToHook{normalfont}{% \kanjiencoding{\kanjiencodingdefault}% \edef\k@family{\kanjifamilydefault}% \edef\k@series{\kanjiseriesdefault}% \edef\k@shape{\kanjishapedefault}% } +\else % --- for == 2020-10-01 END & for >= 2021-06-01 BEGIN +\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 @@ -1780,6 +1808,10 @@ \unskip \reserved@e {\reserved@f#1}\nobreak \hfil \break \null \ignorespaces \fi} +\def\pltx@adjust@wd@outputbox{% + \ifydir\else\vbox{\pdfprimitive\everypar{}\hskip\z@}\fi} +\def\pltx@adjust@wd@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@adjust@wd@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@adjust@wd@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@begingroup \@makefntext{% \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% + \par \color@endgroup}\ifhmode\null\fi \ifnum\pltx@foot@penalty=\z@\else \penalty\pltx@foot@penalty diff --git a/Master/texmf-dist/tex/platex/base/ptrace.sty b/Master/texmf-dist/tex/platex/base/ptrace.sty index aa077eee6ad..d9231d3e33e 100644 --- a/Master/texmf-dist/tex/platex/base/ptrace.sty +++ b/Master/texmf-dist/tex/platex/base/ptrace.sty @@ -79,10 +79,10 @@ \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{% - % !! 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 @@ -120,7 +120,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 \let\tmp@error@fontshape\error@fontshape \let\error@fontshape\error@kfontshape \edef\tmp@item{{\k@encoding}}% @@ -170,14 +171,14 @@ \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 \ifx\f@linespread\baselinestretch \else \set@fontsize\baselinestretch\f@size\f@baselineskip \fi \size@update} %% -\fi % --- for >= 2021-05-01 END +\fi % --- for >= 2021-06-01 END \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\selectfont} {ASCII Corporation original}% -- cgit v1.2.3