From d585ac5e31d316918ef296d56105b164c2e0b65b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 30 Sep 2020 21:25:54 +0000 Subject: platex (30sep20) git-svn-id: svn://tug.org/texlive/trunk@56486 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/platex/base/README.md | 2 +- Master/texmf-dist/doc/platex/base/exppl2e.pdf | Bin 143281 -> 137664 bytes Master/texmf-dist/doc/platex/base/platex-en.pdf | Bin 146951 -> 147101 bytes Master/texmf-dist/doc/platex/base/platex.pdf | Bin 250767 -> 251155 bytes .../texmf-dist/doc/platex/base/platexrelease.pdf | Bin 107343 -> 107347 bytes Master/texmf-dist/doc/platex/base/pldoc.pdf | Bin 836874 -> 852589 bytes Master/texmf-dist/source/platex/base/Makefile | 7 +- Master/texmf-dist/source/platex/base/jclasses.dtx | 19 +- Master/texmf-dist/source/platex/base/kinsoku.dtx | 8 +- Master/texmf-dist/source/platex/base/platex.dtx | 16 +- .../source/platex/base/platexrelease.ins | 3 +- Master/texmf-dist/source/platex/base/plcore.dtx | 206 ++++++++++++++-- Master/texmf-dist/source/platex/base/plexpl3.dtx | 125 ++++++++++ Master/texmf-dist/source/platex/base/plfmt.ins | 5 +- Master/texmf-dist/source/platex/base/plfonts.dtx | 258 +++++++++++++++------ Master/texmf-dist/source/platex/base/plnewsc15.tex | 126 ++++++++++ Master/texmf-dist/source/platex/base/plvers.dtx | 22 +- Master/texmf-dist/tex/platex/base/exppl2e.sty | 60 +---- Master/texmf-dist/tex/platex/base/jarticle.cls | 8 +- Master/texmf-dist/tex/platex/base/jbk10.clo | 2 +- Master/texmf-dist/tex/platex/base/jbk11.clo | 2 +- Master/texmf-dist/tex/platex/base/jbk12.clo | 2 +- Master/texmf-dist/tex/platex/base/jbook.cls | 8 +- Master/texmf-dist/tex/platex/base/jreport.cls | 8 +- Master/texmf-dist/tex/platex/base/jsize10.clo | 2 +- Master/texmf-dist/tex/platex/base/jsize11.clo | 2 +- Master/texmf-dist/tex/platex/base/jsize12.clo | 2 +- Master/texmf-dist/tex/platex/base/jt1gt.fd | 2 +- Master/texmf-dist/tex/platex/base/jt1mc.fd | 2 +- Master/texmf-dist/tex/platex/base/jy1gt.fd | 2 +- Master/texmf-dist/tex/platex/base/jy1mc.fd | 2 +- Master/texmf-dist/tex/platex/base/kinsoku.tex | 3 +- Master/texmf-dist/tex/platex/base/pfltrace.sty | 2 +- Master/texmf-dist/tex/platex/base/platex.ltx | 3 +- .../texmf-dist/tex/platex/base/platexrelease.sty | 252 +++++++++++++++----- Master/texmf-dist/tex/platex/base/plcore.ltx | 212 +++++++++++++---- Master/texmf-dist/tex/platex/base/pldefs.ltx | 2 +- Master/texmf-dist/tex/platex/base/plexpl3.ltx | 41 ++++ Master/texmf-dist/tex/platex/base/plexpl3.sty | 23 ++ Master/texmf-dist/tex/platex/base/plext.sty | 2 +- Master/texmf-dist/tex/platex/base/ptrace.sty | 2 +- Master/texmf-dist/tex/platex/base/tarticle.cls | 8 +- Master/texmf-dist/tex/platex/base/tbk10.clo | 2 +- Master/texmf-dist/tex/platex/base/tbk11.clo | 2 +- Master/texmf-dist/tex/platex/base/tbk12.clo | 2 +- Master/texmf-dist/tex/platex/base/tbook.cls | 8 +- Master/texmf-dist/tex/platex/base/treport.cls | 8 +- Master/texmf-dist/tex/platex/base/tsize10.clo | 2 +- Master/texmf-dist/tex/platex/base/tsize11.clo | 2 +- Master/texmf-dist/tex/platex/base/tsize12.clo | 2 +- 50 files changed, 1171 insertions(+), 308 deletions(-) create mode 100644 Master/texmf-dist/source/platex/base/plexpl3.dtx create mode 100644 Master/texmf-dist/source/platex/base/plnewsc15.tex create mode 100644 Master/texmf-dist/tex/platex/base/plexpl3.ltx create mode 100644 Master/texmf-dist/tex/platex/base/plexpl3.sty diff --git a/Master/texmf-dist/doc/platex/base/README.md b/Master/texmf-dist/doc/platex/base/README.md index 8b3ea2ba2a2..939337e9f2c 100644 --- a/Master/texmf-dist/doc/platex/base/README.md +++ b/Master/texmf-dist/doc/platex/base/README.md @@ -64,6 +64,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2020-04-12 +2020-09-30 Japanese TeX Development Community diff --git a/Master/texmf-dist/doc/platex/base/exppl2e.pdf b/Master/texmf-dist/doc/platex/base/exppl2e.pdf index c5bf43b7425..f015c22b6e0 100644 Binary files a/Master/texmf-dist/doc/platex/base/exppl2e.pdf and b/Master/texmf-dist/doc/platex/base/exppl2e.pdf differ diff --git a/Master/texmf-dist/doc/platex/base/platex-en.pdf b/Master/texmf-dist/doc/platex/base/platex-en.pdf index 4506439d354..cabe7485d56 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 04b14d242d0..53797d39cc9 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 a0f59656508..d15e1e6ac0d 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 c4041d1bfbd..db9bc1fc324 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/Makefile b/Master/texmf-dist/source/platex/base/Makefile index fdabfd5d4f2..e89d976fca2 100644 --- a/Master/texmf-dist/source/platex/base/Makefile +++ b/Master/texmf-dist/source/platex/base/Makefile @@ -15,10 +15,10 @@ all: $(STRIPTARGET) $(PDFTARGET) PLFMT = platex.ltx plcore.ltx kinsoku.tex pldefs.ltx \ jy1mc.fd jy1gt.fd jt1mc.fd jt1gt.fd plext.sty \ - ptrace.sty pfltrace.sty + ptrace.sty pfltrace.sty plexpl3.sty plexpl3.ltx PLFMT_SRC = platex.dtx plvers.dtx plfonts.dtx plcore.dtx \ - kinsoku.dtx plext.dtx + kinsoku.dtx plext.dtx plexpl3.dtx PLCLS = jarticle.cls jreport.cls jbook.cls jsize10.clo \ jsize11.clo jsize12.clo jbk10.clo jbk11.clo jbk12.clo \ @@ -40,8 +40,7 @@ INTRODOC_SRC = platex.dtx PLRELDOC_SRC = platexrelease.dtx -PLDOC_SRC = platex.dtx plvers.dtx plfonts.dtx plcore.dtx plext.dtx \ - pl209.dtx kinsoku.dtx jclasses.dtx jltxdoc.dtx +PLDOC_SRC = $(PLFMT_SRC) $(PLCLS_SRC) $(PL209_SRC) jltxdoc.dtx platex.ltx: $(PLFMT_SRC) rm -f $(PLFMT) diff --git a/Master/texmf-dist/source/platex/base/jclasses.dtx b/Master/texmf-dist/source/platex/base/jclasses.dtx index 1ac4a591d20..d8edc5fa263 100644 --- a/Master/texmf-dist/source/platex/base/jclasses.dtx +++ b/Master/texmf-dist/source/platex/base/jclasses.dtx @@ -105,6 +105,9 @@ % (sync with classes.dtx 2019/10/25 v1.4k)} % \changes{v1.8e}{2020/01/03}{Normalize label fonts % (sync with classes.dtx 2019/12/20 v1.4l)} +% \changes{v1.8f}{2020/09/30}{add a fourth argument for better +% hyperref compability +% (sync with ltsect.dtx 2020/07/27 v1.1e)} % \fi % % \iffalse @@ -134,7 +137,7 @@ %<11pt&bk>\ProvidesFile{tbk11.clo} %<12pt&bk>\ProvidesFile{tbk12.clo} % - [2020/01/03 v1.8e + [2020/09/30 v1.8f % Standard pLaTeX class] %<10pt|11pt|12pt> Standard pLaTeX file (size option)] %<*driver> @@ -3997,21 +4000,23 @@ % % \begin{macro}{\addcontentsline} % 縦組の場合にページ番号を|\rensuji|で囲むように変更します。 -% ^^A 横組のときにも`|\rensuji|'コマンドが出力されますが、 -% ^^A このコマンドによる影響はありません。 % % このマクロは\file{ltsect.dtx}で定義されています。 +% ^^A 命令 |\addcontentsline| と |\addtocontents| を組み合わせ % \changes{v1.8a}{2018/10/25}{ファイル書き出し時の行末文字対策 % (sync with ltsect.dtx 2018/09/26 v1.1c)} +% \changes{v1.8f}{2020/09/30}{add a fourth argument for better +% hyperref compability +% (sync with ltsect.dtx 2020/07/27 v1.1e)} % \begin{macrocode} \providecommand*\protected@file@percent{} \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble -% \@temptokena{\rensuji{\thepage}}}% -% \@temptokena{\thepage}}% - {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}% +% \@temptokena{\rensuji{\thepage}}% +% \@temptokena{\thepage}% + }{\string\@writefile{#1}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}{}% \protected@file@percent}}% } % \end{macrocode} diff --git a/Master/texmf-dist/source/platex/base/kinsoku.dtx b/Master/texmf-dist/source/platex/base/kinsoku.dtx index e59aa35056d..6f5d1de5e35 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-2017 Japanese TeX Development Community +% Copyright (c) 2016-2020 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -17,6 +17,7 @@ % のために128--256の文字を\texttt{\cs{xspcode}=3}に設定} % \changes{v1.0b}{2017/08/05}{%、&、\%、\&の禁則ペナルティが % 誤っていたのを修正(post $\rightarrow$ pre)} +% \changes{v1.0c}{2020/09/28}{!の\cs{inhibitxspcode}を設定} % \fi % % \setcounter{StandardModuleDepth}{1} @@ -26,7 +27,8 @@ %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{kinsoku.dtx}[2017/08/05 v1.0b pLaTeX Kernel (community edition)] +\ProvidesFile{kinsoku.dtx} + [2020/09/28 v1.0c pLaTeX Kernel (community edition)] % \iffalse \documentclass{jltxdoc} \GetFileInfo{kinsoku.dtx} @@ -348,6 +350,7 @@ % \end{tabular} % \end{center} % +% \changes{v1.0c}{2020/09/28}{!の\cs{inhibitxspcode}を設定} % \begin{macrocode} \inhibitxspcode`、=1 \inhibitxspcode`。=1 @@ -355,6 +358,7 @@ \inhibitxspcode`.=1 \inhibitxspcode`;=1 \inhibitxspcode`?=1 +\inhibitxspcode`!=1 \inhibitxspcode`)=1 \inhibitxspcode`(=2 \inhibitxspcode`]=1 diff --git a/Master/texmf-dist/source/platex/base/platex.dtx b/Master/texmf-dist/source/platex/base/platex.dtx index fd595fe8334..b1dd3b368a0 100644 --- a/Master/texmf-dist/source/platex/base/platex.dtx +++ b/Master/texmf-dist/source/platex/base/platex.dtx @@ -86,6 +86,8 @@ % \changes{v1.0y}{2018/09/22}{最終更新日を\file{pldoc.pdf}に表示} % \changes{v1.0z}{2019/09/29}{タイポ修正} % \changes{v1.1}{2020/03/24}{ドキュメントを更新} +% \changes{v1.1a}{2020/09/26}{\file{plexpl3.dtx}を追加} +% \changes{v1.1b}{2020/09/28}{defs読込後にフック追加} %\else % \changes{v1.0}{1995/05/08}{first edition} % \changes{v1.0a}{1995/08/25}{Added 'Compatibility', `Usage of \dst{}' @@ -130,6 +132,8 @@ % \changes{v1.0y}{2018/09/22}{Show last update info on \file{pldoc.pdf}} % \changes{v1.0z}{2019/09/29}{Fix typos in document.} % \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} %\fi % \fi % @@ -137,7 +141,7 @@ %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{platex.dtx}[2020/03/24 v1.1 pLaTeX document file] +\ProvidesFile{platex.dtx}[2020/09/28 v1.1b pLaTeX document file] % \iffalse \documentclass{jltxdoc} \usepackage{plext} @@ -527,14 +531,18 @@ % \TeX{}の入力ファイル検索パスに設定されている % ディレクトリに\file{pldefs.cfg}ファイルがある場合は、 % そのファイルを使います。 +% 読み込み後にコードが実行されるかもしれません。 % \changes{v1.0s}{2017/12/05}{デフォルト設定ファイルの読み込みを % \file{plcore.ltx}から\file{platex.ltx}へ移動} +% \changes{v1.1b}{2020/09/28}{defs読込後にフック追加} %\else % Load font-related default settings, \file{pldefs.ltx}. % If a file \file{pldefs.cfg} is found, then that file will be % used instead. +% Some code may be executed after loading. % \changes{v1.0s}{2017/12/05}{Moved loading default settings % from \file{plcore.ltx} to \file{platex.ltx}} +% \changes{v1.1b}{2020/09/28}{Add hook after loading defs} %\fi % \begin{macrocode} \InputIfFileExists{pldefs.cfg} @@ -542,6 +550,7 @@ * Local config file pldefs.cfg used^^J% *************************************}}% {\input{pldefs.ltx}} +\ifx\code@after@pldefs\@undefined\else \code@after@pldefs \fi % \end{macrocode} % %\ifJAPANESE @@ -1264,6 +1273,7 @@ all others indicate the places where it is used.} \let\ProvidesClass\ProvidesFile \let\ProvidesPackage\ProvidesFile \input{plvers.dtx} + \input{plexpl3.dtx} \input{plfonts.dtx} \input{plcore.dtx} \input{plext.dtx} @@ -1279,8 +1289,10 @@ all others indicate the places where it is used.} % \end{macrocode} %\ifJAPANESE % ここからが本文ページとなります。 +% \changes{v1.1a}{2020/09/26}{\file{plexpl3.dtx}を追加} %\else % Here starts the document body. +% \changes{v1.1a}{2020/09/26}{Add \file{plexpl3.dtx}} %\fi % \begin{macrocode} \begin{document} @@ -1293,6 +1305,8 @@ all others indicate the places where it is used.} \DocInclude{plvers} % pLaTeX version +\DocInclude{plexpl3} % additions to expl3 + \DocInclude{plfonts} % NFSS2 commands \DocInclude{plcore} % kernel commands diff --git a/Master/texmf-dist/source/platex/base/platexrelease.ins b/Master/texmf-dist/source/platex/base/platexrelease.ins index d7b49dc39bd..7b4d7df208f 100644 --- a/Master/texmf-dist/source/platex/base/platexrelease.ins +++ b/Master/texmf-dist/source/platex/base/platexrelease.ins @@ -7,7 +7,7 @@ \preamble -Copyright (c) 2016-2018 Japanese TeX Development Community +Copyright (c) 2016-2020 Japanese TeX Development Community This file is part of the pLaTeX2e system (community edition). ------------------------------------------------------------- @@ -18,6 +18,7 @@ This file is part of the pLaTeX2e system (community edition). \file{platexrelease.sty}{ \from{plvers.dtx}{platexrelease} \from{platexrelease.dtx}{platexrelease} + \from{plexpl3.dtx}{platexrelease} \from{plfonts.dtx}{platexrelease} \from{plcore.dtx}{platexrelease}} } diff --git a/Master/texmf-dist/source/platex/base/plcore.dtx b/Master/texmf-dist/source/platex/base/plcore.dtx index 25f31fbe2c5..a56b737c055 100644 --- a/Master/texmf-dist/source/platex/base/plcore.dtx +++ b/Master/texmf-dist/source/platex/base/plcore.dtx @@ -124,13 +124,20 @@ % FAM256拡張ありの場合に限りレジスタ数が65536個のため。} % \changes{v1.3d}{2019/10/19}{コピー忘れ} % \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:}を再定義 +% (checked ltshipout.dtx 2020/09/21 v1.0c)} +% \changes{v1.3g}{2020/09/28}{縦組で空のフロートだけのページの +% フッタ(Issue 78)} +% \changes{v1.3g}{2020/09/28}{\file{plexpl3}で定義した命令を使用} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plcore.dtx}[2020/03/05 v1.3e pLaTeX core file] +\ProvidesFile{plcore.dtx}[2020/09/28 v1.3g pLaTeX core file] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plcore.dtx} @@ -156,6 +163,7 @@ % \item 改行 % \item オブジェクトの出力順序 % \item トンボ +% \item 出力ルーチン % \item 脚注マクロ % \item 相互参照 % \item 疑似タイプ入力 @@ -786,6 +794,70 @@ \unvbox\footins}\fi \ifvbox\@kludgeins\insert\@kludgeins{\unvbox\@kludgeins}\fi } +% +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\@vtryfc} +% \LaTeXe\ 2017/01/01以降では、例えば +%\begin{verbatim} +% \documentclass{tarticle} +% \begin{document} +% \begin{figure} +% \end{figure} +% \clearpage +% a +% \end{document} +%\end{verbatim} +% のようにすると「空のフロート」だけの空白ページが発生します。 +% このとき、縦組クラスではフッタが持ち上がってしまうので、 +% 対策します。(Issue \#78) +% +% なお、\LaTeXe\ 2015/01/01--2016/03/31 patch level 3では +%\begin{verbatim} +% ! Output loop---100 consecutive dead cycles. +%\end{verbatim} +% のエラーが出ていました。 +% それより昔の版では空白ページは発生しません。 +% +% 対策方法は、\file{ltoutput.dtx}で定義されている|\@vtryfc|に +% |\ifydir\else\hskip\z@\fi|の追加です(|\@makecol|と同様)。 +% \changes{v1.3g}{2020/09/28}{縦組で空のフロートだけのページの +% フッタ(Issue 78)} +% \begin{macrocode} +%\plIncludeInRelease{2020/10/01}{\@vtryfc} +% {Empty float}% +%<*plcore|platexrelease> +\def\@vtryfc #1{% + \global\setbox\@outputbox\vbox{\ifydir\else\hskip\z@\fi}% + \let\@elt\@wtryfc + \@flsucceed + \global\setbox\@outputbox \vbox to\@colht{% + \vskip \@fptop + \vskip -\@fpsep + \unvbox \@outputbox + \vskip \@fpbot}% + \let\@elt\relax + \xdef #1{\@failedlist\@flfail}% + \xdef\@freelist{\@freelist\@flsucceed}} +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\@vtryfc} +% {LaTeX2e original}% +%\def\@vtryfc #1{% +% \global\setbox\@outputbox\vbox{}% +% \let\@elt\@wtryfc +% \@flsucceed +% \global\setbox\@outputbox \vbox to\@colht{% +% \vskip \@fptop +% \vskip -\@fpsep +% \unvbox \@outputbox +% \vskip \@fpbot}% +% \let\@elt\relax +% \xdef #1{\@failedlist\@flfail}% +% \xdef\@freelist{\@freelist\@flsucceed}} +%\plEndIncludeInRelease % \end{macrocode} % \end{macro} % @@ -798,6 +870,7 @@ % |\iftombow|はトンボを出力するかどうか、|\iftombowdate|はDVIを作成した % 日付をトンボの脇に出力するかどうかを示すために用います。 % \begin{macrocode} +%<*plcore> \newif\iftombow \tombowfalse \newif\iftombowdate \tombowdatetrue % \end{macrocode} @@ -1139,7 +1212,7 @@ % \end{macro} % \end{macro} % -% \begin{macro}{\@tombowreset@@paper} +% \begin{macro}{\@tombowreset@@paper} % トンボ出力オプションが指定されている場合に % 用紙サイズを再設定する命令です。 % |\@outputpage|へ加える変更を簡潔にするため、分離した上で @@ -1169,17 +1242,21 @@ %\plEndIncludeInRelease %<*plcore> % \end{macrocode} -% \end{macro} +% \end{macro} % -% \begin{macro}{\@shipoutsetup} +% +% \subsection{出力ルーチン} +% ここで実際にトンボを出力します。 +% +% \begin{macro}{\@shipoutsetup} % \changes{v1.1i}{1998/02/03}{Command removed} % |\@outputpage|内に挿入したので削除しました。 -% \end{macro} +% \end{macro} % % \begin{macro}{\@outputpage} % |\textwidth|と|\textheight|の交換は、|\@shipoutsetup|内では行ないません。 % なぜなら、|\@shipoutsetup|マクロが実行されるときは、 -% |\shipout|されるvboxの中であり、このときは横組モードですので、 +% |\shipout|される|\vbox|の中であり、このときは横組モードですので、 % つねに|\iftdir|は偽と判断され、縦と横のサイズを交換できないからです。 % % なお、この変更をローカルなものにするために、 @@ -1434,6 +1511,10 @@ % \end{macro} % % \begin{macro}{\AtBeginDvi} +% \LaTeXe{}のバージョンが2020-02-02までの場合: +% |\AtBeginDvi|が「|\unvbox|してから再び|\vbox|する」という動作のため、 +% 再定義が必要です。 +% \begin{quote} % p\LaTeX{}の出力ルーチンの|\@outputpage|では、|\shipout|するvboxの中身に % |\yoko|を指定しています。このため、|\AtBeginDocument{\AtBeginDvi{}}|という % コードを書くと\texttt{Incompatible direction list can't be unboxed.}という @@ -1445,40 +1526,137 @@ % |\@begindvibox|は(空でない限り)常に横組でなければならない % \end{center} % と仮定します。この仮定に従い、|\AtBeginDvi|を再定義します。 +% \end{quote} % \changes{v1.2f}{2016/06/30}{\cs{@begindvibox}を常に横組に} % \changes{v1.3c}{2019/09/16}{Make \cs{AtBeginDvi} robust % (sync with ltoutput.dtx 2019/08/27 v1.4e)} +% +% \LaTeXe~2020-10-01以降:|\AtBeginDvi|はフックにどんどんコードを追加して +% いくだけですので、再定義は不要です。一方、代わりに +% |\__shipout_execute_cont:|を再定義する必要があります。 +% \changes{v1.3f}{2020/09/26}{\cs{AtBeginDvi}を再定義しない +% (checked ltshipout.dtx 2020/09/21 v1.0c)} % \begin{macrocode} % -%\plIncludeInRelease{2019/10/01}{\AtBeginDvi} -% {Make robust}% +%\plIncludeInRelease{2020/10/01}{\AtBeginDvi} +% {Adapt to new shipout code}% %<*plcore|platexrelease> +\chardef\pltx@AtBeginDvi@untouched\z@ +% for LaTeX2e 2020-10-01 or later +\ifdefined\ExplSyntaxOn %--- expl3 available BEGIN +\ExplSyntaxOn +\if_cs_exist:N \__shipout_add_firstpage_material:Nn + \chardef\pltx@AtBeginDvi@untouched\@ne +%\DeclareRobustCommand \AtBeginDvi +% {\__shipout_add_firstpage_material:Nn \AtBeginDvi} +\fi: +\ExplSyntaxOff +\fi %--- expl3 available END +% for LaTeX2e 2020-02-02 PL5 or older +\ifnum\pltx@AtBeginDvi@untouched>\z@\else \DeclareRobustCommand \AtBeginDvi [1]{% \global \setbox \@begindvibox - \vbox{\yoko \unvbox \@begindvibox #1}% -} + \vbox{\yoko \unvbox \@begindvibox #1}}% +\fi +% done +\let\pltx@AtBeginDvi@untouched\@undefined % %\plEndIncludeInRelease +%\plIncludeInRelease{2019/10/01}{\AtBeginDvi} +% {Make robust}% +%\DeclareRobustCommand \AtBeginDvi [1]{% +% \global \setbox \@begindvibox +% \vbox{\yoko \unvbox \@begindvibox #1}} +%\plEndIncludeInRelease %\plIncludeInRelease{2016/07/01}{\AtBeginDvi} % {Fix for incompatible direction}% %\def \AtBeginDvi #1{% % \global \setbox \@begindvibox -% \vbox{\yoko \unvbox \@begindvibox #1}% -%} +% \vbox{\yoko \unvbox \@begindvibox #1}} %\expandafter \let \csname AtBeginDvi \endcsname \@undefined %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\AtBeginDvi} % {LaTeX2e original}% %\def \AtBeginDvi #1{% % \global \setbox \@begindvibox -% \vbox{\unvbox \@begindvibox #1}% -%} +% \vbox{\unvbox \@begindvibox #1}} %\expandafter \let \csname AtBeginDvi \endcsname \@undefined %\plEndIncludeInRelease %<*plcore> % \end{macrocode} % \end{macro} % +% \begin{macro}{shipout-execute-cont} +% \LaTeXe~2020-10-01以降:\file{ltshipout.dtx}がベースです。 +% ただし、縦組クラスでも通るようにするため、以下の方法を採ります。 +% \begin{itemize} +% \item |\shipout|実行時の組方向が横組なら、|\yoko|を実行せずそのまま。 +% \item 横組でない場合は|\__shipout_execute_cont:|を横組ボックス\\ +% |\l__platex_shipout_dummy_box|で括って実行する(※)。 +% \item |\l_shipout_box|が横組でない場合は事前に横組化する。 +% \end{itemize} +% 注意:上記※の実装により、縦組クラスでは +% 「|\AtBeginShipout|の中身が外部垂直モードで実行されること」を +% 想定した使用(例:platex-tools issue \#15)はサポートされません。 +% ^^A 従来の\file{pxatbegshi}パッケージにも同様の制約がありました。 +% ^^A 本当は、処理終了時に|\box\l__platex_shipout_dummy_box|して +% ^^A メイン垂直リストに中身を戻したいのですが、 +% ^^A なぜか無限ループが起きるため実行していません。 +% \changes{v1.3f}{2020/09/26}{\cs{shipout-execute-cont}を再定義 +% (checked ltshipout.dtx 2020/09/21 v1.0c)} +% \changes{v1.3g}{2020/09/28}{\file{plexpl3}で定義した命令を使用} +% \begin{macrocode} +% +%\plIncludeInRelease{2020/10/01}{\__shipout_execute_cont:} +% {Adapt to new shipout code}% +%<*plcore|platexrelease> +\ifdefined\ExplSyntaxOn %--- expl3 available BEGIN +\ExplSyntaxOn +\if_cs_exist:N \__shipout_execute_cont: +\cs_new_eq:NN \__platex_original_shipout_execute_cont: \__shipout_execute_cont: +\box_new:N \l__platex_shipout_dummy_box +\cs_set:Npn \__shipout_execute_cont: + { + % if \l_shipout_box is not a \yoko-box (= horizontal writing), + % then make it a \yoko-box behorehand. + \platex_if_box_yoko:NF \l_shipout_box { + \vbox_set:Nn \l_shipout_box + { + \platex_direction_yoko: + \box_use:N \l_shipout_box + } + } + % if the current direction is not \yoko, + % then enclose \__shipout_execute_cont: with + % a dummy \yoko-box named \l__platex_shipout_dummy_box. + \platex_if_direction_yoko:TF { + \__platex_original_shipout_execute_cont: + }{ + \vbox_set:Nn \l__platex_shipout_dummy_box + { + \platex_direction_yoko: + \__platex_original_shipout_execute_cont: + } + % [Limitation] the code above may discard some contents, + % so we'd like to put it back by \box\l__platex_shipout_dummy_box. + % however, an infinite loop occurs if we uncomment the line below + % so we can't. + %\box_use:N \l__platex_shipout_dummy_box + } + } +\fi: +\ExplSyntaxOff +\fi %--- expl3 available END +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\__shipout_execute_cont:} +% {LaTeX2e original}% +%% do nothing +%\plEndIncludeInRelease +%<*plcore> +% \end{macrocode} +% \end{macro} +% % % \subsection{脚注マクロ} % 脚注を組み立てる部分のマクロを再定義します。 diff --git a/Master/texmf-dist/source/platex/base/plexpl3.dtx b/Master/texmf-dist/source/platex/base/plexpl3.dtx new file mode 100644 index 00000000000..e023cd33033 --- /dev/null +++ b/Master/texmf-dist/source/platex/base/plexpl3.dtx @@ -0,0 +1,125 @@ +% \iffalse meta-comment +%% File: plexpl3.dtx +% +% Copyright (c) 2020 Japanese TeX Development Community +% +% This file is part of the pLaTeX2e system (community edition). +% ------------------------------------------------------------- +% +% \fi +% +% +% \iffalse +% \changes{v1.0}{2020/09/28}{初版:p\TeX{}の条件文を定義} +% \fi +% +% \iffalse +%<*driver> +\NeedsTeXFormat{pLaTeX2e} +\ProvidesFile{plexpl3.dtx}[2020/09/28 v1.0 expl3 additions] +\documentclass{jltxdoc} +\GetFileInfo{plexpl3.dtx} +\author{Japanese \TeX\ Development Community} +\title{The \textsf{plexpl3} package} +\date{作成日:\filedate} +\begin{document} + \newcommand\Lpack[1]{\textsf{#1}} + \maketitle + \DocInput{\filename} +\end{document} +% +% \fi +% +% \LaTeX3 (expl3)で用意されていない「p\TeX{}系列の独自機能」を +% expl3の文法で使えるようにするコードです。 +% p\LaTeXe~2020-10-01で新設しました。 +% +% \setcounter{StandardModuleDepth}{1} +% \StopEventually{} +% +% \section{コード} +% +% パッケージとして宣言します。 +% これで、p\LaTeXe~2020-04-12以前でも +% \file{plexpl3.sty}と\file{plexpl3.ltx}だけ +% 入手すれば同等の機能が使えます。 +% \begin{macrocode} +%<*package> +\NeedsTeXFormat{pLaTeX2e} +\RequirePackage{expl3} +\ProvidesExplPackage{plexpl3}{2020-09-28}{1.0} + {pTeX/upTeX-specific additions to expl3} +% +% \end{macrocode} +% +% \LaTeXe~2020-02-02以降では\file{expl3}が標準で +% フォーマットに読み込まれています。この場合は +% \file{plexpl3}の機能をフォーマットに取り込みます。 +% \begin{macrocode} +%\ifdefined\ExplSyntaxOn %--- expl3 available BEGIN +%\ExplSyntaxOn +%<*plcore|package> +\input plexpl3.ltx +% +%\ExplSyntaxOff +%\fi %--- expl3 available END +% \end{macrocode} +% +% \file{platexrelease}のroll-forwardにも登録します。 +% \begin{macrocode} +%\plIncludeInRelease{2020/10/01}% +% {plexpl3}{Pre-load plexpl3}% +%\RequirePackage{plexpl3} +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}% +% {plexpl3}{Not loading plexpl3}% +%% Nothing to do +%\plEndIncludeInRelease +% \end{macrocode} +% +% 以下のコードは\file{plexpl3.ltx}に書き出します。 +% フォーマットとパッケージからの重複読み込みは禁止します。 +% \begin{macrocode} +%<*code> +\cs_if_exist:NT \__platex_expl_loaded: + { + \GenericInfo{} + {Skipping:~ plexpl3~ code~ already~ part~ of~ the~ format}% + \endinput + } +\cs_new:Npn \__platex_expl_loaded: { } +% \end{macrocode} +% +% \section{p\TeX{}系列の条件文} +% +% p\TeX{}系列の条件文をexpl3の文法にします。 +% \changes{v1.0}{2020/09/28}{初版:p\TeX{}の条件文を定義} +% \begin{macrocode} +%% additions to l3box.dtx: writing directions (pTeX/upTeX-specific) +\cs_set_eq:NN \platex_direction_yoko: \tex_yoko:D +\cs_set_eq:NN \platex_direction_tate: \tex_tate:D +\cs_set_eq:NN \platex_direction_dtou: \tex_dtou:D +% +\prg_new_conditional:Npnn \platex_if_direction_yoko: { p, T, F, TF } + { \tex_ifydir:D \prg_return_true: \else: \prg_return_false: \fi: } +\prg_new_conditional:Npnn \platex_if_direction_tate: { p, T, F, TF } + { \tex_iftdir:D \prg_return_true: \else: \prg_return_false: \fi: } +\prg_new_conditional:Npnn \platex_if_direction_dtou: { p, T, F, TF } + { \tex_ifddir:D \prg_return_true: \else: \prg_return_false: \fi: } +% +\prg_new_conditional:Npnn \platex_if_box_yoko:N #1 { p, T, F, TF } + { \tex_ifybox:D #1 \prg_return_true: \else: \prg_return_false: \fi: } +\prg_new_conditional:Npnn \platex_if_box_tate:N #1 { p, T, F, TF } + { \tex_iftbox:D #1 \prg_return_true: \else: \prg_return_false: \fi: } +\prg_new_conditional:Npnn \platex_if_box_dtou:N #1 { p, T, F, TF } + { \tex_ifdbox:D #1 \prg_return_true: \else: \prg_return_false: \fi: } +% \end{macrocode} +% +% 以上です。 +% \begin{macrocode} +% +% \end{macrocode} +% +% \Finale +% +\endinput diff --git a/Master/texmf-dist/source/platex/base/plfmt.ins b/Master/texmf-dist/source/platex/base/plfmt.ins index bd64099ef5b..0d23101cba0 100644 --- a/Master/texmf-dist/source/platex/base/plfmt.ins +++ b/Master/texmf-dist/source/platex/base/plfmt.ins @@ -8,7 +8,7 @@ \preamble Copyright (c) 2010 ASCII MEDIA WORKS -Copyright (c) 2016-2018 Japanese TeX Development Community +Copyright (c) 2016-2020 Japanese TeX Development Community This file is part of the pLaTeX2e system (community edition). ------------------------------------------------------------- @@ -18,6 +18,7 @@ This file is part of the pLaTeX2e system (community edition). \generate{ \file{platex.ltx}{\from{platex.dtx}{plcore}} \file{plcore.ltx}{\from{plvers.dtx}{plcore} + \from{plexpl3.dtx}{plcore} \from{plfonts.dtx}{plcore} \from{plcore.dtx}{plcore} \from{plvers.dtx}{plfinal}} @@ -30,6 +31,8 @@ This file is part of the pLaTeX2e system (community edition). \file{plext.sty}{\from{plext.dtx}{package}} \file{ptrace.sty}{\from{plfonts.dtx}{trace}} \file{pfltrace.sty}{\from{plcore.dtx}{fltrace,trace}} + \file{plexpl3.sty}{\from{plexpl3.dtx}{package}} + \file{plexpl3.ltx}{\from{plexpl3.dtx}{code}} } \endbatchfile diff --git a/Master/texmf-dist/source/platex/base/plfonts.dtx b/Master/texmf-dist/source/platex/base/plfonts.dtx index 12efc700e84..e68de15a597 100644 --- a/Master/texmf-dist/source/platex/base/plfonts.dtx +++ b/Master/texmf-dist/source/platex/base/plfonts.dtx @@ -160,13 +160,19 @@ % \changes{v1.7f}{2020/04/07}{Support legacy use of \cs{bfdefault} % and \cs{mddefault}, use \cs{@setYYseriesdefaultshook} % (sync with ltfssini.dtx 2020/03/19 v3.1k and 2020/04/06 v3.1m)} +% \changes{v1.7g}{2020/04/14}{Small update for speed. +% (sync with ltfssdcl.dtx 2020/04/13 v3.0v)} +% \changes{v1.7h}{2020/09/28}{Handling \cs{seriesdefault} changes +% (sync with ltfssini.dtx 2020/04/13 v3.1n)} +% \changes{v1.7h}{2020/09/28}{New hook management interface +% (sync with ltfssini.dtx 2020/08/21 v3.2b)} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plfonts.dtx}[2020/04/07 v1.7f pLaTeX New Font Selection Scheme] +\ProvidesFile{plfonts.dtx}[2020/09/28 v1.7h pLaTeX New Font Selection Scheme] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plfonts.dtx} @@ -2966,10 +2972,15 @@ % なりました。ltfssini.dtx 1995/10/16 v3.0fの変更も参考。) % \changes{v1.7a}{2020/03/06}{\cs{@defaultfamilyhook}を活用 % (sync with ltfssini.dtx 2020/02/10 v3.1h)} +% +% \LaTeXe~2020-10-01では|\AddToHook|が使えます。 +% \changes{v1.7h}{2020/09/28}{New hook management interface +% (sync with ltfssini.dtx 2020/08/21 v3.2b)} % \begin{macrocode} %\plIncludeInRelease{2020/04/12}{\normalfont} % {Use \@defaultfamilyhook}% %<*plcore|platexrelease> +\ifx\AddToHook\@undefined % --- for 2020-02-02 or older BEGIN \ifx\@defaultfamilyhook\@undefined % old \DeclareRobustCommand\normalfont{% \kanjiencoding{\kanjiencodingdefault}% @@ -2995,7 +3006,23 @@ \edef\k@series{\kanjiseriesdefault}% \edef\k@shape{\kanjishapedefault}% } -\fi +\fi % done +\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN +%\DeclareRobustCommand\normalfont{% +% \fontencoding\encodingdefault +% \edef\f@family{\familydefault}% +% \edef\f@series{\seriesdefault}% +% \edef\f@shape{\shapedefault}% +% \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}% +} +\fi % --- for 2020-10-01 END \adjustbaseline \let\reset@font\normalfont % @@ -3071,7 +3098,7 @@ % % \begin{macro}{\expand@font@defaults} % ファミリのデフォルトを完全展開します。 -% まず、オリジナルの\LaTeX{}の定義(ltfssini.dtx 2020/04/06 v3.1m以降)を +% まず、オリジナルの\LaTeX{}の定義(ltfssini.dtx 2020/08/21 v3.2b以降)を % 載せておきます。 % \begin{macrocode} %\def\expand@font@defaults{% @@ -3080,71 +3107,93 @@ % \edef\ttdef@ult{\ttdefault}% % \series@maybe@drop@one@m\bfdefault\bfdef@ult % !! changed 2020/02/25 v3.1j % \series@maybe@drop@one@m\mddefault\mddef@ult % !! changed 2020/02/25 v3.1j -% \edef\famdef@ult{\familydefault}% -% \@expandfontdefaultshook % !! added 2020/04/06 v3.1m +% %\edef\famdef@ult{\familydefault}% !! deleted 2020/04/13 v3.1n +% %\@expandfontdefaultshook % !! only in 2020/04/06 v3.1m +% \UseHook{expand@font@defaults}% !! new in 2020/08/21 v3.2b %} % \end{macrocode} % p\LaTeX{}では、以下のコードを末尾に追加します。 -% ^^A ltfssini.dtx 2020/04/06 v3.1m に基づけば |\@expandfontdefaultshook| を -% ^^A 使うこともできるが、とりあえず |\g@addto@macro| で末尾追加で問題ない。 -% \begin{macrocode} -\ifx\expand@font@defaults\@undefined\else % 2020-02-02 +% \file{ltfssini.dtx} 2020/04/13 v3.1nで|latex3/latex2e#315|対策が +% 入りましたので、その前後で|\expand@font@defaults|および +% |\init@series@setup|への追加内容が変わります。 +% ^^A 従来は |\init@series@setup| から呼び出される +% ^^A |\expand@font@defaults| が |\famdef@ult| を設定していた。 +% ^^A 新版は |\init@series@setup| からもはや +% ^^A |\expand@font@defaults| は呼び出さず、代わりに +% ^^A |\init@series@setup| で一度 |\reset@font| を実行し、 +% ^^A それに基づいて |\seriesdefault| を設定する。 +% \changes{v1.7h}{2020/09/28}{New hook management interface +% (sync with ltfssini.dtx 2020/08/21 v3.2b)} +% \begin{macrocode} +\ifx\expand@font@defaults\@undefined\else %<*2020-02-02|2020-10-01> +\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN \g@addto@macro\expand@font@defaults{% \edef\mcdef@ult{\mcdefault}% \edef\gtdef@ult{\gtdefault}% \edef\kanjidef@ult{\kanjifamilydefault}% } -\fi +\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN +\AddToHook{expand@font@defaults}{% + \edef\mcdef@ult{\mcdefault}% + \edef\gtdef@ult{\gtdefault}% + %\edef\kanjidef@ult{\kanjifamilydefault}% !! sync with 2020/04/13 v3.1n +} +\fi % --- for 2020-10-01 END +\fi % % \end{macrocode} -% % \end{macro} % % \begin{macro}{\bfseries} % \begin{macro}{\mdseries} % ファミリごとの設定値を参照します。 -% まず、オリジナルの\LaTeX{}の定義(ltfssini.dtx 2020/04/06 v3.1m以降)を +% まず、オリジナルの\LaTeX{}の定義(ltfssini.dtx 2020/09/30 v3.2d以降)を % 載せておきます。 % \begin{macrocode} %\DeclareRobustCommand\bfseries{% % \not@math@alphabet\bfseries\mathbf % \expand@font@defaults -% \ifx\bfdefault\bfdefault@previous\else +% \ifx\bfdefault\bfdefault@previous\else % new in 2020/03/19 v3.1k % \expandafter\def\expandafter\bfdefault % \expandafter{\bfdefault\@empty}% -% \let\bfseries@previous\bfdefault +% \let\bfdefault@previous\bfdefault % bugfix in 2020/09/30 v3.2d % \let\bfseries@rm\bfdef@ult % \let\bfseries@sf\bfdef@ult % \let\bfseries@tt\bfdef@ult -% \@setbfseriesdefaultshook % !! added 2020/04/06 v3.1m +% %\@setbfseriesdefaultshook % !! only in 2020/04/06 v3.1m +% \UseHook{bfseries/defaults}% !! new in 2020/08/21 v3.2b % \fi % \ifx\f@family\rmdef@ult \fontseries\bfseries@rm % \else\ifx\f@family\sfdef@ult \fontseries\bfseries@sf % \else\ifx\f@family\ttdef@ult \fontseries\bfseries@tt % \else \fontseries\bfdefault % \fi\fi\fi +% \UseHook{bfseries}% !! new in 2020/08/21 v3.2b % \selectfont %} %\DeclareRobustCommand\mdseries{% % \not@math@alphabet\mdseries\relax % \expand@font@defaults -% \ifx\mddefault\mddefault@previous\else +% \ifx\mddefault\mddefault@previous\else % new in 2020/03/19 v3.1k % \expandafter\def\expandafter\mddefault % \expandafter{\mddefault\@empty}% -% \let\mdseries@previous\mddefault +% \let\mddefault@previous\mddefault % bugfix in 2020/09/30 v3.2d % \let\mdseries@rm\mddef@ult % \let\mdseries@sf\mddef@ult % \let\mdseries@tt\mddef@ult -% \@setmdseriesdefaultshook % !! added 2020/04/06 v3.1m +% %\@setmdseriesdefaultshook % !! only in 2020/04/06 v3.1m +% \UseHook{mdseries/defaults}% !! new in 2020/08/21 v3.2b % \fi % \ifx\f@family\rmdef@ult \fontseries\mdseries@rm % \else\ifx\f@family\sfdef@ult \fontseries\mdseries@sf % \else\ifx\f@family\ttdef@ult \fontseries\mdseries@tt % \else \fontseries\mddefault % \fi\fi\fi +% \UseHook{mdseries}% !! new in 2020/08/21 v3.2b % \selectfont %} % \end{macrocode} % 以下でp\LaTeX{}用に再定義します。 +% まず\LaTeXe~2020-02-02ベース。 % \changes{v1.6y}{2020/02/24}{Make the \cs{ifx} selection outside of % \cs{fontseries} argument so that it is not done several times % (sync with ltfssini.dtx 2020/02/18 v3.1i)} @@ -3152,61 +3201,82 @@ % and \cs{mddefault}, use \cs{@setYYseriesdefaultshook} % (sync with ltfssini.dtx 2020/03/19 v3.1k and 2020/04/06 v3.1m)} % \begin{macrocode} -\ifx\bfseries@rm\@undefined % old -\let\pltx@fontseries@saved\@undefined -\let\pltx@patch@bfseries\@undefined -\let\pltx@patch@mdseries\@undefined -\else % 2020-02-02 -\let\pltx@fontseries@saved\fontseries -\def\pltx@patch@bfseries\not@math@alphabet#1#2#3\selectfont{% - \long\expandafter\def\csname bfseries \endcsname{% - \not@math@alphabet#1#2% should be \bfseries\mathbf - % \fontseries of pLaTeX tries to change both Latin and Japanese; - % here we want only Latin, so use \romanseries - \let\fontseries\romanseries - #3% contains \fontseries and \@setbfseriesdefaultshook - \let\fontseries\pltx@fontseries@saved % recover +\ifx\bfseries@rm\@undefined\else %<*2020-02-02|2020-10-01> +\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN +\DeclareRobustCommand\bfseries{% + \not@math@alphabet\bfseries\mathbf + \expand@font@defaults + % changed \fontseries -> \romanseries + \ifx\f@family\rmdef@ult \romanseries\bfseries@rm + \else\ifx\f@family\sfdef@ult \romanseries\bfseries@sf + \else\ifx\f@family\ttdef@ult \romanseries\bfseries@tt + \else \romanseries\bfdefault + \fi\fi\fi +% \end{macrocode} +% ここからがp\LaTeX{}による追加コードです。 +% \begin{macrocode} % changed \fontseries -> \kanjiseries \ifx\k@family\mcdef@ult \kanjiseries\bfseries@mc \else\ifx\k@family\gtdef@ult \kanjiseries\bfseries@gt \else \kanjiseries\bfdefault \fi\fi +% \end{macrocode} +% ここまで。 +% \begin{macrocode} \selectfont - }% -} -\ifx\@setbfseriesdefaultshook\@undefined\else -\g@addto@macro\@setbfseriesdefaultshook{% - \let\bfseries@mc\bfdef@ult - \let\bfseries@gt\bfdef@ult } -\fi -\expandafter\expandafter\expandafter - \pltx@patch@bfseries\csname bfseries \endcsname -\def\pltx@patch@mdseries\not@math@alphabet#1#2#3\selectfont{% - \long\expandafter\def\csname mdseries \endcsname{% - \not@math@alphabet#1#2% should be \mdseries\relax - % \fontseries of pLaTeX tries to change both Latin and Japanese; - % here we want only Latin, so use \romanseries - \let\fontseries\romanseries - #3% contains \fontseries and \@setmdseriesdefaultshook - \let\fontseries\pltx@fontseries@saved % recover +\DeclareRobustCommand\mdseries{% + \not@math@alphabet\mdseries\relax + \expand@font@defaults + % changed \fontseries -> \romanseries + \ifx\f@family\rmdef@ult \romanseries\mdseries@rm + \else\ifx\f@family\sfdef@ult \romanseries\mdseries@sf + \else\ifx\f@family\ttdef@ult \romanseries\mdseries@tt + \else \romanseries\mddefault + \fi\fi\fi +% \end{macrocode} +% ここからがp\LaTeX{}による追加コードです。 +% \begin{macrocode} % changed \fontseries -> \kanjiseries \ifx\k@family\mcdef@ult \kanjiseries\mdseries@mc \else\ifx\k@family\gtdef@ult \kanjiseries\mdseries@gt \else \kanjiseries\mddefault \fi\fi +% \end{macrocode} +% ここまで。 +% \begin{macrocode} \selectfont - }% } -\ifx\@setmdseriesdefaultshook\@undefined\else -\g@addto@macro\@setmdseriesdefaultshook{% +% \end{macrocode} +% 次に\LaTeXe~2020-10-01ベース。|\AddToHook|で十分です。 +% \changes{v1.7h}{2020/09/28}{New hook management interface +% (sync with ltfssini.dtx 2020/08/21 v3.2b)} +% \begin{macrocode} +\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN +\AddToHook{bfseries/defaults}{% + \let\bfseries@mc\bfdef@ult + \let\bfseries@gt\bfdef@ult +} +\AddToHook{bfseries}{% + % changed \fontseries -> \kanjiseries + \ifx\k@family\mcdef@ult \kanjiseries\bfseries@mc + \else\ifx\k@family\gtdef@ult \kanjiseries\bfseries@gt + \else \kanjiseries\bfdefault + \fi\fi +} +\AddToHook{mdseries/defaults}{% \let\mdseries@mc\mddef@ult \let\mdseries@gt\mddef@ult } -\fi -\expandafter\expandafter\expandafter - \pltx@patch@mdseries\csname mdseries \endcsname -\fi +\AddToHook{mdseries}{% + % changed \fontseries -> \kanjiseries + \ifx\k@family\mcdef@ult \kanjiseries\mdseries@mc + \else\ifx\k@family\gtdef@ult \kanjiseries\mdseries@gt + \else \kanjiseries\mddefault + \fi\fi +} +\fi % --- for 2020-10-01 END +\fi % % \end{macrocode} % \end{macro} % \end{macro} @@ -3333,23 +3403,32 @@ % % \begin{macro}{\init@series@setup} % |\begin{document}|で実行される初期化です。 -% まず、オリジナルの\LaTeX{}の定義を載せておきます。 +% まず、オリジナルの\LaTeX{}の定義(ltfssini.dtx 2020/04/13 v3.1n以降)を +% 載せておきます。 % \begin{macrocode} %\def\init@series@setup{% % \ifx\bfseries@rm@kernel\bfseries@rm -% \expandafter\in@\expandafter{\rmdefault}{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}% +% \expandafter\in@\expandafter{\rmdefault}% +% {cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}% % \ifin@ \else \def\bfseries@rm{b}\fi\fi % \ifx\bfseries@sf@kernel\bfseries@sf -% \expandafter\in@\expandafter{\sfdefault}{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}% +% \expandafter\in@\expandafter{\sfdefault}% +% {cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}% % \ifin@ \else \def\bfseries@sf{b}\fi\fi % \ifx\bfseries@tt@kernel\bfseries@tt -% \expandafter\in@\expandafter{\ttdefault}{cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}% +% \expandafter\in@\expandafter{\ttdefault}% +% {cmr,cmss,cmtt,lcmss,lcmtt,lmr,lmss,lmtt}% % \ifin@ \else \def\bfseries@tt{b}\fi\fi -% \expand@font@defaults -% \ifx\famdef@ult\rmdef@ult \rmfamily -% \else\ifx\famdef@ult\sfdef@ult \sffamily -% \else\ifx\famdef@ult\ttdef@ult \ttfamily -% \fi\fi\fi +% %\expand@font@defaults % !! deleted in 2020/04/13 v3.1n BEGIN +% %\ifx\famdef@ult\rmdef@ult \rmfamily % !! CONT +% %\else\ifx\famdef@ult\sfdef@ult \sffamily % !! CONT +% %\else\ifx\famdef@ult\ttdef@ult \ttfamily % !! CONT +% %\fi\fi\fi % !! deleted in 2020/04/13 v3.1n END +% \reset@font % !! added in 2020/04/13 v3.1n BEGIN +% \ifx\seriesdefault\seriesdefault@kernel % !! CONT +% \mdseries % !! CONT +% \let\seriesdefault\f@series % !! CONT +% \fi % !! added in 2020/04/13 v3.1n END %}% % \end{macrocode} % ここからがp\LaTeX{}による追加コードです。 @@ -3360,16 +3439,51 @@ % \end{itemize} % になることに注意します。 % \changes{v1.6w}{2020/02/03}{巻き戻しのバグ修正} +% \changes{v1.7h}{2020/09/28}{Handling \cs{seriesdefault} changes +% (sync with ltfssini.dtx 2020/04/13 v3.1n)} % \begin{macrocode} -\expandafter\ifx\csname init@series@setup\endcsname\relax\else % 2020-02-02 +\expandafter\ifx\csname init@series@setup\endcsname\relax +\else %<*2020-02-02|2020-10-01> +\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN \g@addto@macro\init@series@setup{% \ifx\kanjidef@ult\mcdef@ult \mcfamily \else\ifx\kanjidef@ult\gtdef@ult \gtfamily \fi\fi }% -\fi +\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN +\g@addto@macro\init@series@setup{% + % !! sync with 2020/04/13 v3.1n BEGIN + \ifx\kanjiseriesdefault\kanjiseriesdefault@kernel + \mdseries + \let\kanjiseriesdefault\k@series + \fi + % !! sync with 2020/04/13 v3.1n END +}% +\fi % --- for 2020-10-01 END +\fi % +% \end{macrocode} +% \end{macro} +% +% +% \begin{macro}{\kanjiseriesdefault} +% \begin{macro}{\kanjiseriesdefault@kernel} +% |\kanjiseriesdefault|が\file{pldefs.ltx}または\file{pldefs.cfg}で +% 定義された後に、その末尾に|\@empty|を追加します。 +% これは展開時に消滅しますが、文書のプリアンブルで別の値に +% 変更されたかどうか検知できるようになります。 +% \changes{v1.7h}{2020/09/28}{Handling \cs{seriesdefault} changes +% (sync with ltfssini.dtx 2020/04/13 v3.1n)} +% \begin{macrocode} +\ifx\AddToHook\@undefined +\else % --- for LaTeX2e 2020-10-01 or later BEGIN +\def\code@after@pldefs{% +\expandafter\def\expandafter\kanjiseriesdefault + \expandafter{\kanjiseriesdefault\@empty} +\let\kanjiseriesdefault@kernel\kanjiseriesdefault} +\fi % --- for LaTeX2e 2020-10-01 or later END % \end{macrocode} % \end{macro} +% \end{macro} % % % \begin{macro}{\mcfamily} @@ -3593,14 +3707,16 @@ % 文書の先頭で、和文デフォルトフォントの変更が反映されないのを修正します。 % \changes{v1.3g}{1999/04/05}{plpatch.ltxの内容を反映。 % ありがとう、山本さん。} +% \changes{v1.7g}{2020/04/14}{Small update for speed. +% (sync with ltfssdcl.dtx 2020/04/13 v3.0v)} % \begin{macrocode} %<*plcore> \let\romanprocess@table\process@table \def\kanjiprocess@table{% - \kanjiencoding{\kanjiencodingdefault}% - \kanjifamily{\kanjifamilydefault}% - \kanjiseries{\kanjiseriesdefault}% - \kanjishape{\kanjishapedefault}% + \kanjiencoding\kanjiencodingdefault + \edef\k@family{\kanjifamilydefault}% + \edef\k@series{\kanjiseriesdefault}% + \edef\k@shape{\kanjishapedefault}% } \def\process@table{% \romanprocess@table diff --git a/Master/texmf-dist/source/platex/base/plnewsc15.tex b/Master/texmf-dist/source/platex/base/plnewsc15.tex new file mode 100644 index 00000000000..9a8d3954afa --- /dev/null +++ b/Master/texmf-dist/source/platex/base/plnewsc15.tex @@ -0,0 +1,126 @@ +%% <2020-10-01> +\documentclass{plnews} + +\publicationyear{2020}% 発行年 +\publicationmonth{10}% 発行月 +\publicationissue{c15}% 番号 +\author{日本語\TeX{}開発コミュニティ(\texttt{https://texjp.org/})} + +\def\cs#1{\texttt{\char92\nobreak #1}} +\def\pTeX{p\kern-.15em\TeX} +\def\eTeX{$\varepsilon$-\TeX} +\def\epTeX{$\varepsilon$-\pTeX} +\def\pLaTeX{p\kern-.05em\LaTeX} +\def\pLaTeXe{p\kern-.05em\LaTeXe} +\xspcode`\\=1 + +\begin{document} + +\maketitle + +コミュニティ版\pLaTeXe\ \texttt{<2020-10-01>}について、 +\pLaTeXe\ \texttt{<2020-04-12>}からの更新箇所を +まとめました。u\pLaTeXe{}も同時に更新してください。 + + +\section{\LaTeXe\ \texttt{<2020-10-01>}対応} +→参考:|texjporg/platex#94| + +新しい\LaTeXe\ \texttt{<2020-10-01>}では、 +フックの方式(A hook management system)が一般化されました +(\file{ltnews32}, \file{lthooks-doc}も参照)。 +古くから個別に定義されていたフック(|\@begindocumenthook|等)や +\LaTeXe\ \texttt{<2020-02-02>}で追加されたNFSSのフック +(|\@defaultfamilyhook|, |\@sffamilyhook|等)も再構成されたため、 +対応を施しました。 + +さらに、ページ出力に関わるコマンドも一新されました +(\file{ltnews32}, \file{ltshipout-doc}も参照)。特に +\begin{itemize} +\item |\AtBeginDvi|の定義変更 +\item |atbegshi|/|everyshi|相当の機能のカーネル化 +\end{itemize} +が\pLaTeXe{}にも影響しますので、対応を施しました。 +これにより、|pxatbegshi|/|pxeveryshi|パッケージに相当する +機能(|plautopatch|パッケージも参照)が\pLaTeXe{}カーネルに +取り込まれたことになります。 + +注意:実装上の都合により、縦組クラスでは +「|\AtBeginShipout|の中身が外部垂直モードで実行されること」を +想定した使用は\emph{サポートされません}。 +(例:|aminophen/platex-tools#15|) + + +\section{新NFSSの追加修正} +前回の\LaTeXe\ \texttt{<2020-02-02>}で大幅に拡張された +NFSS(フォント選択の仕組み)の新機能について、 +\LaTeXe\ \texttt{<2020-10-01>}で追加修正が入りましたので +追随しました。(参考:|latex3/latex2e#315|) + +具体的には「|\DeclareFontSeriesDefault|の指定が +|\normalfont|に反映されない問題」への修正です。 +再現例は以下を参照してください。 +\begin{verbatim} + % roman-default = roman-medium + % 明朝のデフォルト=明朝の中字 + \documentclass{article} + % roman-medium-default -> roman-bold + % 明朝の中字のデフォルト→明朝の太字へ + % ※明朝の太字はゴシックの中字に置換される + \DeclareFontSeriesDefault[rm]{md}{b} + \DeclareFontSeriesDefault[mc]{md}{b} + \begin{document} + roman-default is bold + 明朝のデフォルトは太字になった + + \normalfont % 2020-02-02: 太字にならなかった + roman-default is bold? + 明朝のデフォルトは太字になったか? + + \mdseries + roman-medium is bold + 明朝のミディアムは太字になった + \end{document} +\end{verbatim} + + +\section{expl3文法の\pLaTeX{}版} +\LaTeXe\ \texttt{<2020-02-02>}でexpl3がフォーマットに +組み込まれたことを受け、 +\pLaTeX{}でも\pTeX{}系列の追加機能をexpl3文法に則って +利用しやすくするため、本リリースで新設しました。 +\pLaTeXe\ \texttt{<2020-10-01>}では、この機能を +フォーマットに組み込んであります。 + +現時点では、組方向変更(|\tate|等)と組方向判定(|\iftdir|等)を +ラップするコマンドを用意してあります。詳細は +\file{pldoc.pdf}の``plexpl3.dtx''の節を参照してください。 + + +\section{バグ修正} +\begin{itemize} + \item \LaTeXe~2017/01/01以降で空のフロートだけのページが + 発生した場合、縦組クラスではフッタの位置が持ち上がっていたので + 修正しました。(|#78|) + \item 禁則パラメータ設定ファイル(kinsoku.tex)に + |\inhibitxspcode`!=1|の設定が抜けていたので追加しました。 + (|ptex-base#8|) +\end{itemize} + + +\section{開発版のテストのお願い} +今後\pLaTeX{}に導入するかもしれない修正パッチや仕様変更のテストに +ご協力ください。\TeX{}ファイルの冒頭(|\documentclass|より前)で +\begin{verbatim} + \RequirePackage{exppl2e} +\end{verbatim} +と書くことで、現在の開発版をテストすることができます。 +詳細は\file{exppl2e.pdf}を参照してください。ここには、 +その他の\pLaTeXe{}の既知の制約事項も記載しています。 +\TeX\ ForumやGitHubのIssueでのバグ報告やご意見を歓迎します。 +\begin{itemize} +\item \texttt{https://github.com/texjporg/platex} +\item \texttt{https://github.com/texjporg/uplatex} +\end{itemize} + +\end{document} diff --git a/Master/texmf-dist/source/platex/base/plvers.dtx b/Master/texmf-dist/source/platex/base/plvers.dtx index e85d8dca5d0..af39ab9dc09 100644 --- a/Master/texmf-dist/source/platex/base/plvers.dtx +++ b/Master/texmf-dist/source/platex/base/plvers.dtx @@ -96,12 +96,14 @@ % \changes{v1.1s}{2020/03/14}{\LaTeX\ \texttt{!<2020-02-02!> PL5}版対応確認} % \changes{v1.1t}{2020/03/25}{バナーの再構築を効率化} % \changes{v1.1u}{2020/03/28}{latexrelease利用時の警告を早めた} +% \changes{v1.1v}{2020/09/28}{新しいフックを活用} +% \changes{v1.1w}{2020/09/30}{\LaTeX\ \texttt{!<2020-10-01!>}版対応確認} % \fi % % \iffalse %<*driver> % \fi -\ProvidesFile{plvers.dtx}[2020/03/28 v1.1u pLaTeX Kernel (Version Info)] +\ProvidesFile{plvers.dtx}[2020/09/30 v1.1w pLaTeX Kernel (Version Info)] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plvers.dtx} @@ -141,6 +143,7 @@ % \changes{v1.1q}{2019/10/01}{\LaTeX\ \texttt{!<2019-10-01!>}版対応確認} % \changes{v1.1r}{2020/02/01}{\LaTeX\ \texttt{!<2020-02-02!>}版対応確認} % \changes{v1.1s}{2020/03/14}{\LaTeX\ \texttt{!<2020-02-02!> PL5}版対応確認} +% \changes{v1.1w}{2020/09/30}{\LaTeX\ \texttt{!<2020-10-01!>}版対応確認} % \begin{macrocode} %<*2ekernel> %\def\fmtname{LaTeX2e} @@ -149,7 +152,7 @@ %\edef\latexreleaseversion %\edef\p@known@latexreleaseversion %<*2ekernel|latexrelease|platexrelease> - {2020-02-02} + {2020-10-01} % % \end{macrocode} % @@ -190,7 +193,7 @@ % %\edef\platexreleaseversion %<*plcore|platexrelease> - {2020-04-12} + {2020-10-01} % %<*plcore> \def\ppatch@level{0} @@ -441,7 +444,7 @@ % 上書きされ、動作が壊れてしまいますので、警告を出します。 % \changes{v1.0s}{2016/02/01}{latexrelease利用時に警告を出すようにした} % -% 以前は|\AtBeginDocument|を使って|\@begindocumenthook|の末尾に +% 当初は|\AtBeginDocument|を使って|\@begindocumenthook|の末尾に % 警告文を入れていましたが、\LaTeXe~2020-02-02以降に付属の % latexreleaseパッケージで巻き戻すとフックの実行より早い段階 % (具体的には|\process@table|内の|\kanjiprocess@table|実行中)で @@ -453,14 +456,25 @@ % ^^A 上書きされているはずであり、|\kanjiprocess@table|は % ^^A 実行されないのでエラーは出ない。 % \changes{v1.1u}{2020/03/28}{latexrelease利用時の警告を早めた} +% +% \LaTeXe~2020-10-01以降では|\process@table|より早く実行される +% フックが用意されたので、これを利用します。 +% \changes{v1.1v}{2020/09/28}{新しいフックを活用} % \begin{macrocode} %<*plfinal> +\ifx\AddToHook\@undefined +% for LaTeX2e 2020-02-02 PL5 or older \expandafter\def\expandafter\process@table\expandafter{% \expandafter\p@warn@latexrelease\process@table} \begingroup \toks@\expandafter{\expandafter\p@warn@latexrelease\@begindocumenthook} \xdef\@begindocumenthook{\the\toks@} \endgroup +\else +% for LaTeX2e 2020-10-01 or later +\AddToHook{begindocument/before}{\p@warn@latexrelease} +\fi +% \def\p@warn@latexrelease{% \ifx\latexreleaseversion\@undefined\else \ifx\platexreleaseversion\@undefined diff --git a/Master/texmf-dist/tex/platex/base/exppl2e.sty b/Master/texmf-dist/tex/platex/base/exppl2e.sty index b5fc0cc2f36..3daa697b270 100644 --- a/Master/texmf-dist/tex/platex/base/exppl2e.sty +++ b/Master/texmf-dist/tex/platex/base/exppl2e.sty @@ -34,7 +34,7 @@ % case 1: This file must be a normal package \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{exppl2e} - [2020/02/10 v1.1g Experimental pLaTeX2e features] + [2020/09/28 v1.1h Experimental pLaTeX2e features] \PackageWarningNoLine{exppl2e}{% This is the unstable, experimental part of pLaTeX2e.\MessageBreak This package may contain:\MessageBreak @@ -238,58 +238,6 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% \section{空のページ} -% -% 現時点では保留しています。 -% 参考:GitHub:texjporg/platex\#78 -% -% \LaTeXe\ 2017/01/01以降では、例えば -%\begin{verbatim} -% \documentclass{tarticle} -% \begin{document} -% \begin{figure} -% \end{figure} -% \clearpage -% a -% \end{document} -%\end{verbatim} -% のようにすると「空のフロート」だけの空白ページを発生させることが -% できます。この場合、縦組クラスを用いているとフッタが持ち上がります。 -% -% なお、\LaTeXe\ 2015/01/01〜2016/03/31 patch level 3では -%\begin{verbatim} -% ! Output loop---100 consecutive dead cycles. -%\end{verbatim} -% のエラーが出て、それ以前では空白ページは発生しません。 -% -% フロートでない空白ページでページフッタが持ち上がる問題へは、 -% |\@makecol|の|\iftdir\vbox{\hskip\z@}\fi|で対処してありますが、 -% フロートがある空白ページでは|\@makecol|が呼ばれないことから -% 対策が効いていません。ただ、フロートが空である状況は -% 元々不自然なので、現在はサポートしていません。 -% -% もし対策することになれば、下記のコードを使用します。 -% \begin{macro}{\@vtryfc} -% \file{ltoutput.dtx}で定義されている|\@vtryfc|に -% |\iftdir\hskip\z@\fi|を追加してあります。 -% \begin{macrocode} -\def\@vtryfc #1{% - \global\setbox\@outputbox\vbox{\iftdir\hskip\z@\fi}% - \let\@elt\@wtryfc - \@flsucceed - \global\setbox\@outputbox \vbox to\@colht{% - \vskip \@fptop - \vskip -\@fpsep - \unvbox \@outputbox - \vskip \@fpbot}% - \let\@elt\relax - \xdef #1{\@failedlist\@flfail}% - \xdef\@freelist{\@freelist\@flsucceed}} -% \end{macrocode} -% \end{macro} -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% % \section{支柱} % % \begin{macro}{\strut} @@ -360,6 +308,12 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % +% \section{空のフロートだけのページ} +% +% 2020/10/01に導入済み。 +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % \section{\cs{textunderscore}のベースライン補正} % % 2017/04/08に導入済み。 diff --git a/Master/texmf-dist/tex/platex/base/jarticle.cls b/Master/texmf-dist/tex/platex/base/jarticle.cls index 12b9418f537..13ca8d292d3 100644 --- a/Master/texmf-dist/tex/platex/base/jarticle.cls +++ b/Master/texmf-dist/tex/platex/base/jarticle.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jarticle} - [2020/01/03 v1.8e + [2020/09/30 v1.8f Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -670,9 +670,9 @@ \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble - \@temptokena{\thepage}}% - {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}% + \@temptokena{\thepage}% + }{\string\@writefile{#1}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}{}% \protected@file@percent}}% } \newcommand{\tableofcontents}{% diff --git a/Master/texmf-dist/tex/platex/base/jbk10.clo b/Master/texmf-dist/tex/platex/base/jbk10.clo index bded2cab3e0..5e92274b19d 100644 --- a/Master/texmf-dist/tex/platex/base/jbk10.clo +++ b/Master/texmf-dist/tex/platex/base/jbk10.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk10.clo} - [2020/01/03 v1.8e + [2020/09/30 v1.8f Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/platex/base/jbk11.clo b/Master/texmf-dist/tex/platex/base/jbk11.clo index 2a8bce9fc31..4f1a1ae2887 100644 --- a/Master/texmf-dist/tex/platex/base/jbk11.clo +++ b/Master/texmf-dist/tex/platex/base/jbk11.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk11.clo} - [2020/01/03 v1.8e + [2020/09/30 v1.8f Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/platex/base/jbk12.clo b/Master/texmf-dist/tex/platex/base/jbk12.clo index 63a2bbf5a28..38e91b811c5 100644 --- a/Master/texmf-dist/tex/platex/base/jbk12.clo +++ b/Master/texmf-dist/tex/platex/base/jbk12.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk12.clo} - [2020/01/03 v1.8e + [2020/09/30 v1.8f Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/platex/base/jbook.cls b/Master/texmf-dist/tex/platex/base/jbook.cls index 7f2cc142027..c28a29ddba3 100644 --- a/Master/texmf-dist/tex/platex/base/jbook.cls +++ b/Master/texmf-dist/tex/platex/base/jbook.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jbook} - [2020/01/03 v1.8e + [2020/09/30 v1.8f Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -763,9 +763,9 @@ \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble - \@temptokena{\thepage}}% - {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}% + \@temptokena{\thepage}% + }{\string\@writefile{#1}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}{}% \protected@file@percent}}% } \newcommand{\tableofcontents}{% diff --git a/Master/texmf-dist/tex/platex/base/jreport.cls b/Master/texmf-dist/tex/platex/base/jreport.cls index aa0c768953f..b39b137e9db 100644 --- a/Master/texmf-dist/tex/platex/base/jreport.cls +++ b/Master/texmf-dist/tex/platex/base/jreport.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jreport} - [2020/01/03 v1.8e + [2020/09/30 v1.8f Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -759,9 +759,9 @@ \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble - \@temptokena{\thepage}}% - {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}% + \@temptokena{\thepage}% + }{\string\@writefile{#1}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}{}% \protected@file@percent}}% } \newcommand{\tableofcontents}{% diff --git a/Master/texmf-dist/tex/platex/base/jsize10.clo b/Master/texmf-dist/tex/platex/base/jsize10.clo index 93e8f2913a3..926f19d3fce 100644 --- a/Master/texmf-dist/tex/platex/base/jsize10.clo +++ b/Master/texmf-dist/tex/platex/base/jsize10.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize10.clo} - [2020/01/03 v1.8e + [2020/09/30 v1.8f Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/Master/texmf-dist/tex/platex/base/jsize11.clo b/Master/texmf-dist/tex/platex/base/jsize11.clo index 2775160ebfd..44d1795883d 100644 --- a/Master/texmf-dist/tex/platex/base/jsize11.clo +++ b/Master/texmf-dist/tex/platex/base/jsize11.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize11.clo} - [2020/01/03 v1.8e + [2020/09/30 v1.8f Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/Master/texmf-dist/tex/platex/base/jsize12.clo b/Master/texmf-dist/tex/platex/base/jsize12.clo index 66c7c8a7b9d..46d0ea82ec1 100644 --- a/Master/texmf-dist/tex/platex/base/jsize12.clo +++ b/Master/texmf-dist/tex/platex/base/jsize12.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize12.clo} - [2020/01/03 v1.8e + [2020/09/30 v1.8f Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/Master/texmf-dist/tex/platex/base/jt1gt.fd b/Master/texmf-dist/tex/platex/base/jt1gt.fd index 7786551eb1a..726350c98dc 100644 --- a/Master/texmf-dist/tex/platex/base/jt1gt.fd +++ b/Master/texmf-dist/tex/platex/base/jt1gt.fd @@ -7,7 +7,7 @@ %% plfonts.dtx (with options: `JT1gt') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2020 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/platex/base/jt1mc.fd b/Master/texmf-dist/tex/platex/base/jt1mc.fd index 881002be513..cbeb27c08d3 100644 --- a/Master/texmf-dist/tex/platex/base/jt1mc.fd +++ b/Master/texmf-dist/tex/platex/base/jt1mc.fd @@ -7,7 +7,7 @@ %% plfonts.dtx (with options: `JT1mc') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2020 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/platex/base/jy1gt.fd b/Master/texmf-dist/tex/platex/base/jy1gt.fd index 1a209828462..f9590c9b5cc 100644 --- a/Master/texmf-dist/tex/platex/base/jy1gt.fd +++ b/Master/texmf-dist/tex/platex/base/jy1gt.fd @@ -7,7 +7,7 @@ %% plfonts.dtx (with options: `JY1gt') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2020 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/platex/base/jy1mc.fd b/Master/texmf-dist/tex/platex/base/jy1mc.fd index 00cd00e1b08..f17c99f5645 100644 --- a/Master/texmf-dist/tex/platex/base/jy1mc.fd +++ b/Master/texmf-dist/tex/platex/base/jy1mc.fd @@ -7,7 +7,7 @@ %% plfonts.dtx (with options: `JY1mc') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2020 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/platex/base/kinsoku.tex b/Master/texmf-dist/tex/platex/base/kinsoku.tex index c6ef58789c3..6f4efdfa743 100644 --- a/Master/texmf-dist/tex/platex/base/kinsoku.tex +++ b/Master/texmf-dist/tex/platex/base/kinsoku.tex @@ -7,7 +7,7 @@ %% kinsoku.dtx (with options: `plcore') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2020 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -247,6 +247,7 @@ \inhibitxspcode`.=1 \inhibitxspcode`;=1 \inhibitxspcode`?=1 +\inhibitxspcode`!=1 \inhibitxspcode`)=1 \inhibitxspcode`(=2 \inhibitxspcode`]=1 diff --git a/Master/texmf-dist/tex/platex/base/pfltrace.sty b/Master/texmf-dist/tex/platex/base/pfltrace.sty index a415580d4c8..4123204892c 100644 --- a/Master/texmf-dist/tex/platex/base/pfltrace.sty +++ b/Master/texmf-dist/tex/platex/base/pfltrace.sty @@ -7,7 +7,7 @@ %% plcore.dtx (with options: `fltrace,trace') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2020 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/platex/base/platex.ltx b/Master/texmf-dist/tex/platex/base/platex.ltx index 171db8345f3..5da596fcaca 100644 --- a/Master/texmf-dist/tex/platex/base/platex.ltx +++ b/Master/texmf-dist/tex/platex/base/platex.ltx @@ -7,7 +7,7 @@ %% platex.dtx (with options: `plcore') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2020 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -28,6 +28,7 @@ * Local config file pldefs.cfg used^^J% *************************************}}% {\input{pldefs.ltx}} +\ifx\code@after@pldefs\@undefined\else \code@after@pldefs \fi \everyjob\expandafter{% \the\everyjob \IfFileExists{platex.cfg}{% diff --git a/Master/texmf-dist/tex/platex/base/platexrelease.sty b/Master/texmf-dist/tex/platex/base/platexrelease.sty index 4199b306e55..95f5ee2d122 100644 --- a/Master/texmf-dist/tex/platex/base/platexrelease.sty +++ b/Master/texmf-dist/tex/platex/base/platexrelease.sty @@ -6,19 +6,20 @@ %% %% plvers.dtx (with options: `platexrelease') %% platexrelease.dtx (with options: `platexrelease') +%% plexpl3.dtx (with options: `platexrelease') %% plfonts.dtx (with options: `platexrelease') %% plcore.dtx (with options: `platexrelease') %% -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2020 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- %% %% File: plvers.dtx \edef\p@known@latexreleaseversion - {2020-02-02} + {2020-10-01} \edef\platexreleaseversion - {2020-04-12} + {2020-10-01} \newif\if@plincludeinrelease \@plincludeinreleasefalse \def\plIncludeInRelease#1{% @@ -202,6 +203,15 @@ of this package available from CTAN} \plIncludeInRelease{0000/00/00}{\PackageWarning}{pLaTeX Info}% % * <2006/11/10> \plEndIncludeInRelease +%% File: plexpl3.dtx +\plIncludeInRelease{2020/10/01}% + {plexpl3}{Pre-load plexpl3}% +\RequirePackage{plexpl3} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}% + {plexpl3}{Not loading plexpl3}% +% Nothing to do +\plEndIncludeInRelease %% File: plfonts.dtx \plIncludeInRelease{2020/04/12}{\inlist@} {Detokenize}% @@ -1224,6 +1234,7 @@ of this package available from CTAN} \plEndIncludeInRelease \plIncludeInRelease{2020/04/12}{\normalfont} {Use \@defaultfamilyhook}% +\ifx\AddToHook\@undefined % --- for 2020-02-02 or older BEGIN \ifx\@defaultfamilyhook\@undefined % old \DeclareRobustCommand\normalfont{% \kanjiencoding{\kanjiencodingdefault}% @@ -1249,7 +1260,23 @@ of this package available from CTAN} \edef\k@series{\kanjiseriesdefault}% \edef\k@shape{\kanjishapedefault}% } -\fi +\fi % done +\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN +\DeclareRobustCommand\normalfont{% + \fontencoding\encodingdefault + \edef\f@family{\familydefault}% + \edef\f@series{\seriesdefault}% + \edef\f@shape{\shapedefault}% + \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}% +} +\fi % --- for 2020-10-01 END \adjustbaseline \let\reset@font\normalfont \plEndIncludeInRelease @@ -1294,68 +1321,80 @@ of this package available from CTAN} \edef\mdseries@mc{\mddefault}% m \edef\mdseries@gt{\mddefault}% m \fi -\ifx\expand@font@defaults\@undefined\else % 2020-02-02 +\ifx\expand@font@defaults\@undefined\else %<*2020-02-02|2020-10-01> +\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN \g@addto@macro\expand@font@defaults{% \edef\mcdef@ult{\mcdefault}% \edef\gtdef@ult{\gtdefault}% \edef\kanjidef@ult{\kanjifamilydefault}% } -\fi -\ifx\bfseries@rm\@undefined % old -\let\pltx@fontseries@saved\@undefined -\let\pltx@patch@bfseries\@undefined -\let\pltx@patch@mdseries\@undefined -\else % 2020-02-02 -\let\pltx@fontseries@saved\fontseries -\def\pltx@patch@bfseries\not@math@alphabet#1#2#3\selectfont{% - \long\expandafter\def\csname bfseries \endcsname{% - \not@math@alphabet#1#2% should be \bfseries\mathbf - % \fontseries of pLaTeX tries to change both Latin and Japanese; - % here we want only Latin, so use \romanseries - \let\fontseries\romanseries - #3% contains \fontseries and \@setbfseriesdefaultshook - \let\fontseries\pltx@fontseries@saved % recover +\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN +\AddToHook{expand@font@defaults}{% + \edef\mcdef@ult{\mcdefault}% + \edef\gtdef@ult{\gtdefault}% + %\edef\kanjidef@ult{\kanjifamilydefault}% !! sync with 2020/04/13 v3.1n +} +\fi % --- for 2020-10-01 END +\fi % +\ifx\bfseries@rm\@undefined\else %<*2020-02-02|2020-10-01> +\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN +\DeclareRobustCommand\bfseries{% + \not@math@alphabet\bfseries\mathbf + \expand@font@defaults + % changed \fontseries -> \romanseries + \ifx\f@family\rmdef@ult \romanseries\bfseries@rm + \else\ifx\f@family\sfdef@ult \romanseries\bfseries@sf + \else\ifx\f@family\ttdef@ult \romanseries\bfseries@tt + \else \romanseries\bfdefault + \fi\fi\fi % changed \fontseries -> \kanjiseries \ifx\k@family\mcdef@ult \kanjiseries\bfseries@mc \else\ifx\k@family\gtdef@ult \kanjiseries\bfseries@gt \else \kanjiseries\bfdefault \fi\fi \selectfont - }% } -\ifx\@setbfseriesdefaultshook\@undefined\else -\g@addto@macro\@setbfseriesdefaultshook{% - \let\bfseries@mc\bfdef@ult - \let\bfseries@gt\bfdef@ult -} -\fi -\expandafter\expandafter\expandafter - \pltx@patch@bfseries\csname bfseries \endcsname -\def\pltx@patch@mdseries\not@math@alphabet#1#2#3\selectfont{% - \long\expandafter\def\csname mdseries \endcsname{% - \not@math@alphabet#1#2% should be \mdseries\relax - % \fontseries of pLaTeX tries to change both Latin and Japanese; - % here we want only Latin, so use \romanseries - \let\fontseries\romanseries - #3% contains \fontseries and \@setmdseriesdefaultshook - \let\fontseries\pltx@fontseries@saved % recover +\DeclareRobustCommand\mdseries{% + \not@math@alphabet\mdseries\relax + \expand@font@defaults + % changed \fontseries -> \romanseries + \ifx\f@family\rmdef@ult \romanseries\mdseries@rm + \else\ifx\f@family\sfdef@ult \romanseries\mdseries@sf + \else\ifx\f@family\ttdef@ult \romanseries\mdseries@tt + \else \romanseries\mddefault + \fi\fi\fi % changed \fontseries -> \kanjiseries \ifx\k@family\mcdef@ult \kanjiseries\mdseries@mc \else\ifx\k@family\gtdef@ult \kanjiseries\mdseries@gt \else \kanjiseries\mddefault \fi\fi \selectfont - }% } -\ifx\@setmdseriesdefaultshook\@undefined\else -\g@addto@macro\@setmdseriesdefaultshook{% +\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN +\AddToHook{bfseries/defaults}{% + \let\bfseries@mc\bfdef@ult + \let\bfseries@gt\bfdef@ult +} +\AddToHook{bfseries}{% + % changed \fontseries -> \kanjiseries + \ifx\k@family\mcdef@ult \kanjiseries\bfseries@mc + \else\ifx\k@family\gtdef@ult \kanjiseries\bfseries@gt + \else \kanjiseries\bfdefault + \fi\fi +} +\AddToHook{mdseries/defaults}{% \let\mdseries@mc\mddef@ult \let\mdseries@gt\mddef@ult } -\fi -\expandafter\expandafter\expandafter - \pltx@patch@mdseries\csname mdseries \endcsname -\fi +\AddToHook{mdseries}{% + % changed \fontseries -> \kanjiseries + \ifx\k@family\mcdef@ult \kanjiseries\mdseries@mc + \else\ifx\k@family\gtdef@ult \kanjiseries\mdseries@gt + \else \kanjiseries\mddefault + \fi\fi +} +\fi % --- for 2020-10-01 END +\fi % \ifx\prepare@family@series@update\@undefined % old \let\prepare@family@series@update@kanji\@undefined \let\@meta@family@list@kanji\@undefined @@ -1435,13 +1474,32 @@ of this package available from CTAN} \fi } \fi -\expandafter\ifx\csname init@series@setup\endcsname\relax\else % 2020-02-02 +\expandafter\ifx\csname init@series@setup\endcsname\relax +\else %<*2020-02-02|2020-10-01> +\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN \g@addto@macro\init@series@setup{% \ifx\kanjidef@ult\mcdef@ult \mcfamily \else\ifx\kanjidef@ult\gtdef@ult \gtfamily \fi\fi }% -\fi +\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN +\g@addto@macro\init@series@setup{% + % !! sync with 2020/04/13 v3.1n BEGIN + \ifx\kanjiseriesdefault\kanjiseriesdefault@kernel + \mdseries + \let\kanjiseriesdefault\k@series + \fi + % !! sync with 2020/04/13 v3.1n END +}% +\fi % --- for 2020-10-01 END +\fi % +\ifx\AddToHook\@undefined +\else % --- for LaTeX2e 2020-10-01 or later BEGIN +\def\code@after@pldefs{% +\expandafter\def\expandafter\kanjiseriesdefault + \expandafter{\kanjiseriesdefault\@empty} +\let\kanjiseriesdefault@kernel\kanjiseriesdefault} +\fi % --- for LaTeX2e 2020-10-01 or later END \ifx\prepare@family@series@update@kanji\@undefined % old \DeclareRobustCommand\mcfamily {\not@math@alphabet\mcfamily\mathmc @@ -2231,6 +2289,36 @@ of this package available from CTAN} \global \maxdepth \@maxdepth } \plEndIncludeInRelease +\plIncludeInRelease{2020/10/01}{\@vtryfc} + {Empty float}% +\def\@vtryfc #1{% + \global\setbox\@outputbox\vbox{\ifydir\else\hskip\z@\fi}% + \let\@elt\@wtryfc + \@flsucceed + \global\setbox\@outputbox \vbox to\@colht{% + \vskip \@fptop + \vskip -\@fpsep + \unvbox \@outputbox + \vskip \@fpbot}% + \let\@elt\relax + \xdef #1{\@failedlist\@flfail}% + \xdef\@freelist{\@freelist\@flsucceed}} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\@vtryfc} + {LaTeX2e original}% +\def\@vtryfc #1{% + \global\setbox\@outputbox\vbox{}% + \let\@elt\@wtryfc + \@flsucceed + \global\setbox\@outputbox \vbox to\@colht{% + \vskip \@fptop + \vskip -\@fpsep + \unvbox \@outputbox + \vskip \@fpbot}% + \let\@elt\relax + \xdef #1{\@failedlist\@flfail}% + \xdef\@freelist{\@freelist\@flsucceed}} +\plEndIncludeInRelease \plIncludeInRelease{2018/05/20}{\@tombowbleed}{Macro added}% \def\@tombowbleed{3mm} \plEndIncludeInRelease @@ -2627,29 +2715,89 @@ of this package available from CTAN} \let\firstmark\botmark } \plEndIncludeInRelease +\plIncludeInRelease{2020/10/01}{\AtBeginDvi} + {Adapt to new shipout code}% +\chardef\pltx@AtBeginDvi@untouched\z@ +\ifdefined\ExplSyntaxOn %--- expl3 available BEGIN +\ExplSyntaxOn +\if_cs_exist:N \__shipout_add_firstpage_material:Nn + \chardef\pltx@AtBeginDvi@untouched\@ne +\DeclareRobustCommand \AtBeginDvi + {\__shipout_add_firstpage_material:Nn \AtBeginDvi} +\fi: +\ExplSyntaxOff +\fi %--- expl3 available END +\ifnum\pltx@AtBeginDvi@untouched>\z@\else +\DeclareRobustCommand \AtBeginDvi [1]{% + \global \setbox \@begindvibox + \vbox{\yoko \unvbox \@begindvibox #1}}% +\fi +\let\pltx@AtBeginDvi@untouched\@undefined +\plEndIncludeInRelease \plIncludeInRelease{2019/10/01}{\AtBeginDvi} {Make robust}% \DeclareRobustCommand \AtBeginDvi [1]{% \global \setbox \@begindvibox - \vbox{\yoko \unvbox \@begindvibox #1}% -} + \vbox{\yoko \unvbox \@begindvibox #1}} \plEndIncludeInRelease \plIncludeInRelease{2016/07/01}{\AtBeginDvi} {Fix for incompatible direction}% \def \AtBeginDvi #1{% \global \setbox \@begindvibox - \vbox{\yoko \unvbox \@begindvibox #1}% -} + \vbox{\yoko \unvbox \@begindvibox #1}} \expandafter \let \csname AtBeginDvi \endcsname \@undefined \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\AtBeginDvi} {LaTeX2e original}% \def \AtBeginDvi #1{% \global \setbox \@begindvibox - \vbox{\unvbox \@begindvibox #1}% -} + \vbox{\unvbox \@begindvibox #1}} \expandafter \let \csname AtBeginDvi \endcsname \@undefined \plEndIncludeInRelease +\plIncludeInRelease{2020/10/01}{\__shipout_execute_cont:} + {Adapt to new shipout code}% +\ifdefined\ExplSyntaxOn %--- expl3 available BEGIN +\ExplSyntaxOn +\if_cs_exist:N \__shipout_execute_cont: +\cs_new_eq:NN \__platex_original_shipout_execute_cont: \__shipout_execute_cont: +\box_new:N \l__platex_shipout_dummy_box +\cs_set:Npn \__shipout_execute_cont: + { + % if \l_shipout_box is not a \yoko-box (= horizontal writing), + % then make it a \yoko-box behorehand. + \platex_if_box_yoko:NF \l_shipout_box { + \vbox_set:Nn \l_shipout_box + { + \platex_direction_yoko: + \box_use:N \l_shipout_box + } + } + % if the current direction is not \yoko, + % then enclose \__shipout_execute_cont: with + % a dummy \yoko-box named \l__platex_shipout_dummy_box. + \platex_if_direction_yoko:TF { + \__platex_original_shipout_execute_cont: + }{ + \vbox_set:Nn \l__platex_shipout_dummy_box + { + \platex_direction_yoko: + \__platex_original_shipout_execute_cont: + } + % [Limitation] the code above may discard some contents, + % so we'd like to put it back by \box\l__platex_shipout_dummy_box. + % however, an infinite loop occurs if we uncomment the line below + % so we can't. + %\box_use:N \l__platex_shipout_dummy_box + } + } +\fi: +\ExplSyntaxOff +\fi %--- expl3 available END +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\__shipout_execute_cont:} + {LaTeX2e original}% +% do nothing +\plEndIncludeInRelease \plIncludeInRelease{2016/04/17}{\@makefnmark} {Remove extra \xkanjiskip}% \renewcommand\@makefnmark{% diff --git a/Master/texmf-dist/tex/platex/base/plcore.ltx b/Master/texmf-dist/tex/platex/base/plcore.ltx index 6c9eb8ef549..97f42e307b2 100644 --- a/Master/texmf-dist/tex/platex/base/plcore.ltx +++ b/Master/texmf-dist/tex/platex/base/plcore.ltx @@ -5,12 +5,13 @@ %% The original source files were: %% %% plvers.dtx (with options: `plcore') +%% plexpl3.dtx (with options: `plcore') %% plfonts.dtx (with options: `plcore') %% plcore.dtx (with options: `plcore') %% plvers.dtx (with options: `plfinal') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2020 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- @@ -33,7 +34,7 @@ \fi \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2020-04-12} + {2020-10-01} \def\ppatch@level{0} \edef\platexBANNER{\noexpand\platexNILa \the\everyjob % LaTeX banner and delayed codes @@ -98,6 +99,12 @@ \PackageError{platexrelease} {skipped \string\plIncludeInRelease\space for tag \string#2}{}% \fi} +%% File: plexpl3.dtx +\ifdefined\ExplSyntaxOn %--- expl3 available BEGIN +\ExplSyntaxOn +\input plexpl3.ltx +\ExplSyntaxOff +\fi %--- expl3 available END %% File: plfonts.dtx \let\k@encoding\@empty \let\ck@encoding\@empty @@ -980,6 +987,7 @@ \ifin@ \usekanji{#1}{#2}{#3}{#4}% \else\useroman{#1}{#2}{#3}{#4}% \fi} +\ifx\AddToHook\@undefined % --- for 2020-02-02 or older BEGIN \ifx\@defaultfamilyhook\@undefined % old \DeclareRobustCommand\normalfont{% \kanjiencoding{\kanjiencodingdefault}% @@ -998,7 +1006,15 @@ \edef\k@series{\kanjiseriesdefault}% \edef\k@shape{\kanjishapedefault}% } -\fi +\fi % done +\else % --- for 2020-02-02 or older END & for 2020-10-01 BEGIN +\AddToHook{normalfont}{% + \kanjiencoding{\kanjiencodingdefault}% + \edef\k@family{\kanjifamilydefault}% + \edef\k@series{\kanjiseriesdefault}% + \edef\k@shape{\kanjishapedefault}% +} +\fi % --- for 2020-10-01 END \adjustbaseline \let\reset@font\normalfont \ifx\bfseries@rm\@undefined % old @@ -1012,68 +1028,80 @@ \edef\mdseries@mc{\mddefault}% m \edef\mdseries@gt{\mddefault}% m \fi -\ifx\expand@font@defaults\@undefined\else % 2020-02-02 +\ifx\expand@font@defaults\@undefined\else %<*2020-02-02|2020-10-01> +\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN \g@addto@macro\expand@font@defaults{% \edef\mcdef@ult{\mcdefault}% \edef\gtdef@ult{\gtdefault}% \edef\kanjidef@ult{\kanjifamilydefault}% } -\fi -\ifx\bfseries@rm\@undefined % old -\let\pltx@fontseries@saved\@undefined -\let\pltx@patch@bfseries\@undefined -\let\pltx@patch@mdseries\@undefined -\else % 2020-02-02 -\let\pltx@fontseries@saved\fontseries -\def\pltx@patch@bfseries\not@math@alphabet#1#2#3\selectfont{% - \long\expandafter\def\csname bfseries \endcsname{% - \not@math@alphabet#1#2% should be \bfseries\mathbf - % \fontseries of pLaTeX tries to change both Latin and Japanese; - % here we want only Latin, so use \romanseries - \let\fontseries\romanseries - #3% contains \fontseries and \@setbfseriesdefaultshook - \let\fontseries\pltx@fontseries@saved % recover +\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN +\AddToHook{expand@font@defaults}{% + \edef\mcdef@ult{\mcdefault}% + \edef\gtdef@ult{\gtdefault}% + %\edef\kanjidef@ult{\kanjifamilydefault}% !! sync with 2020/04/13 v3.1n +} +\fi % --- for 2020-10-01 END +\fi % +\ifx\bfseries@rm\@undefined\else %<*2020-02-02|2020-10-01> +\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN +\DeclareRobustCommand\bfseries{% + \not@math@alphabet\bfseries\mathbf + \expand@font@defaults + % changed \fontseries -> \romanseries + \ifx\f@family\rmdef@ult \romanseries\bfseries@rm + \else\ifx\f@family\sfdef@ult \romanseries\bfseries@sf + \else\ifx\f@family\ttdef@ult \romanseries\bfseries@tt + \else \romanseries\bfdefault + \fi\fi\fi % changed \fontseries -> \kanjiseries \ifx\k@family\mcdef@ult \kanjiseries\bfseries@mc \else\ifx\k@family\gtdef@ult \kanjiseries\bfseries@gt \else \kanjiseries\bfdefault \fi\fi \selectfont - }% -} -\ifx\@setbfseriesdefaultshook\@undefined\else -\g@addto@macro\@setbfseriesdefaultshook{% - \let\bfseries@mc\bfdef@ult - \let\bfseries@gt\bfdef@ult } -\fi -\expandafter\expandafter\expandafter - \pltx@patch@bfseries\csname bfseries \endcsname -\def\pltx@patch@mdseries\not@math@alphabet#1#2#3\selectfont{% - \long\expandafter\def\csname mdseries \endcsname{% - \not@math@alphabet#1#2% should be \mdseries\relax - % \fontseries of pLaTeX tries to change both Latin and Japanese; - % here we want only Latin, so use \romanseries - \let\fontseries\romanseries - #3% contains \fontseries and \@setmdseriesdefaultshook - \let\fontseries\pltx@fontseries@saved % recover +\DeclareRobustCommand\mdseries{% + \not@math@alphabet\mdseries\relax + \expand@font@defaults + % changed \fontseries -> \romanseries + \ifx\f@family\rmdef@ult \romanseries\mdseries@rm + \else\ifx\f@family\sfdef@ult \romanseries\mdseries@sf + \else\ifx\f@family\ttdef@ult \romanseries\mdseries@tt + \else \romanseries\mddefault + \fi\fi\fi % changed \fontseries -> \kanjiseries \ifx\k@family\mcdef@ult \kanjiseries\mdseries@mc \else\ifx\k@family\gtdef@ult \kanjiseries\mdseries@gt \else \kanjiseries\mddefault \fi\fi \selectfont - }% } -\ifx\@setmdseriesdefaultshook\@undefined\else -\g@addto@macro\@setmdseriesdefaultshook{% +\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN +\AddToHook{bfseries/defaults}{% + \let\bfseries@mc\bfdef@ult + \let\bfseries@gt\bfdef@ult +} +\AddToHook{bfseries}{% + % changed \fontseries -> \kanjiseries + \ifx\k@family\mcdef@ult \kanjiseries\bfseries@mc + \else\ifx\k@family\gtdef@ult \kanjiseries\bfseries@gt + \else \kanjiseries\bfdefault + \fi\fi +} +\AddToHook{mdseries/defaults}{% \let\mdseries@mc\mddef@ult \let\mdseries@gt\mddef@ult } -\fi -\expandafter\expandafter\expandafter - \pltx@patch@mdseries\csname mdseries \endcsname -\fi +\AddToHook{mdseries}{% + % changed \fontseries -> \kanjiseries + \ifx\k@family\mcdef@ult \kanjiseries\mdseries@mc + \else\ifx\k@family\gtdef@ult \kanjiseries\mdseries@gt + \else \kanjiseries\mddefault + \fi\fi +} +\fi % --- for 2020-10-01 END +\fi % \ifx\prepare@family@series@update\@undefined % old \let\prepare@family@series@update@kanji\@undefined \let\@meta@family@list@kanji\@undefined @@ -1153,13 +1181,32 @@ \fi } \fi -\expandafter\ifx\csname init@series@setup\endcsname\relax\else % 2020-02-02 +\expandafter\ifx\csname init@series@setup\endcsname\relax +\else %<*2020-02-02|2020-10-01> +\ifx\AddToHook\@undefined % --- for 2020-02-02 BEGIN \g@addto@macro\init@series@setup{% \ifx\kanjidef@ult\mcdef@ult \mcfamily \else\ifx\kanjidef@ult\gtdef@ult \gtfamily \fi\fi }% -\fi +\else % --- for 2020-02-02 END & for 2020-10-01 BEGIN +\g@addto@macro\init@series@setup{% + % !! sync with 2020/04/13 v3.1n BEGIN + \ifx\kanjiseriesdefault\kanjiseriesdefault@kernel + \mdseries + \let\kanjiseriesdefault\k@series + \fi + % !! sync with 2020/04/13 v3.1n END +}% +\fi % --- for 2020-10-01 END +\fi % +\ifx\AddToHook\@undefined +\else % --- for LaTeX2e 2020-10-01 or later BEGIN +\def\code@after@pldefs{% +\expandafter\def\expandafter\kanjiseriesdefault + \expandafter{\kanjiseriesdefault\@empty} +\let\kanjiseriesdefault@kernel\kanjiseriesdefault} +\fi % --- for LaTeX2e 2020-10-01 or later END \ifx\prepare@family@series@update@kanji\@undefined % old \DeclareRobustCommand\mcfamily {\not@math@alphabet\mcfamily\mathmc @@ -1317,10 +1364,10 @@ \pltx@reset@catcode@trick \let\romanprocess@table\process@table \def\kanjiprocess@table{% - \kanjiencoding{\kanjiencodingdefault}% - \kanjifamily{\kanjifamilydefault}% - \kanjiseries{\kanjiseriesdefault}% - \kanjishape{\kanjishapedefault}% + \kanjiencoding\kanjiencodingdefault + \edef\k@family{\kanjifamilydefault}% + \edef\k@series{\kanjiseriesdefault}% + \edef\k@shape{\kanjishapedefault}% } \def\process@table{% \romanprocess@table @@ -1605,6 +1652,18 @@ \unvbox\footins}\fi \ifvbox\@kludgeins\insert\@kludgeins{\unvbox\@kludgeins}\fi } +\def\@vtryfc #1{% + \global\setbox\@outputbox\vbox{\ifydir\else\hskip\z@\fi}% + \let\@elt\@wtryfc + \@flsucceed + \global\setbox\@outputbox \vbox to\@colht{% + \vskip \@fptop + \vskip -\@fpsep + \unvbox \@outputbox + \vskip \@fpbot}% + \let\@elt\relax + \xdef #1{\@failedlist\@flfail}% + \xdef\@freelist{\@freelist\@flsucceed}} \newif\iftombow \tombowfalse \newif\iftombowdate \tombowdatetrue \newdimen\@tombowwidth @@ -1763,10 +1822,57 @@ \stepcounter{page}% \let\firstmark\botmark } +\chardef\pltx@AtBeginDvi@untouched\z@ +\ifdefined\ExplSyntaxOn %--- expl3 available BEGIN +\ExplSyntaxOn +\if_cs_exist:N \__shipout_add_firstpage_material:Nn + \chardef\pltx@AtBeginDvi@untouched\@ne +\fi: +\ExplSyntaxOff +\fi %--- expl3 available END +\ifnum\pltx@AtBeginDvi@untouched>\z@\else \DeclareRobustCommand \AtBeginDvi [1]{% \global \setbox \@begindvibox - \vbox{\yoko \unvbox \@begindvibox #1}% -} + \vbox{\yoko \unvbox \@begindvibox #1}}% +\fi +\let\pltx@AtBeginDvi@untouched\@undefined +\ifdefined\ExplSyntaxOn %--- expl3 available BEGIN +\ExplSyntaxOn +\if_cs_exist:N \__shipout_execute_cont: +\cs_new_eq:NN \__platex_original_shipout_execute_cont: \__shipout_execute_cont: +\box_new:N \l__platex_shipout_dummy_box +\cs_set:Npn \__shipout_execute_cont: + { + % if \l_shipout_box is not a \yoko-box (= horizontal writing), + % then make it a \yoko-box behorehand. + \platex_if_box_yoko:NF \l_shipout_box { + \vbox_set:Nn \l_shipout_box + { + \platex_direction_yoko: + \box_use:N \l_shipout_box + } + } + % if the current direction is not \yoko, + % then enclose \__shipout_execute_cont: with + % a dummy \yoko-box named \l__platex_shipout_dummy_box. + \platex_if_direction_yoko:TF { + \__platex_original_shipout_execute_cont: + }{ + \vbox_set:Nn \l__platex_shipout_dummy_box + { + \platex_direction_yoko: + \__platex_original_shipout_execute_cont: + } + % [Limitation] the code above may discard some contents, + % so we'd like to put it back by \box\l__platex_shipout_dummy_box. + % however, an infinite loop occurs if we uncomment the line below + % so we can't. + %\box_use:N \l__platex_shipout_dummy_box + } + } +\fi: +\ExplSyntaxOff +\fi %--- expl3 available END \renewcommand\@makefnmark{% \ifydir \hbox{}\hbox{\@textsuperscript{\normalfont\@thefnmark}}\hbox{}% \else\hbox{\yoko\@textsuperscript{\normalfont\@thefnmark}}\fi} @@ -1960,12 +2066,16 @@ \let\document@default@language\m@ne \fi %% File: plvers.dtx +\ifx\AddToHook\@undefined \expandafter\def\expandafter\process@table\expandafter{% \expandafter\p@warn@latexrelease\process@table} \begingroup \toks@\expandafter{\expandafter\p@warn@latexrelease\@begindocumenthook} \xdef\@begindocumenthook{\the\toks@} \endgroup +\else +\AddToHook{begindocument/before}{\p@warn@latexrelease} +\fi \def\p@warn@latexrelease{% \ifx\latexreleaseversion\@undefined\else \ifx\platexreleaseversion\@undefined diff --git a/Master/texmf-dist/tex/platex/base/pldefs.ltx b/Master/texmf-dist/tex/platex/base/pldefs.ltx index f26203afb09..2c6ab55b8e6 100644 --- a/Master/texmf-dist/tex/platex/base/pldefs.ltx +++ b/Master/texmf-dist/tex/platex/base/pldefs.ltx @@ -7,7 +7,7 @@ %% plfonts.dtx (with options: `pldefs,xpt') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2020 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/platex/base/plexpl3.ltx b/Master/texmf-dist/tex/platex/base/plexpl3.ltx new file mode 100644 index 00000000000..6c591ba6ba9 --- /dev/null +++ b/Master/texmf-dist/tex/platex/base/plexpl3.ltx @@ -0,0 +1,41 @@ +%% +%% This is file `plexpl3.ltx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% plexpl3.dtx (with options: `code') +%% +%% Copyright (c) 2010 ASCII MEDIA WORKS +%% Copyright (c) 2016-2020 Japanese TeX Development Community +%% +%% This file is part of the pLaTeX2e system (community edition). +%% ------------------------------------------------------------- +%% +%% File: plexpl3.dtx +\cs_if_exist:NT \__platex_expl_loaded: + { + \GenericInfo{} + {Skipping:~ plexpl3~ code~ already~ part~ of~ the~ format}% + \endinput + } +\cs_new:Npn \__platex_expl_loaded: { } +%% additions to l3box.dtx: writing directions (pTeX/upTeX-specific) +\cs_set_eq:NN \platex_direction_yoko: \tex_yoko:D +\cs_set_eq:NN \platex_direction_tate: \tex_tate:D +\cs_set_eq:NN \platex_direction_dtou: \tex_dtou:D +\prg_new_conditional:Npnn \platex_if_direction_yoko: { p, T, F, TF } + { \tex_ifydir:D \prg_return_true: \else: \prg_return_false: \fi: } +\prg_new_conditional:Npnn \platex_if_direction_tate: { p, T, F, TF } + { \tex_iftdir:D \prg_return_true: \else: \prg_return_false: \fi: } +\prg_new_conditional:Npnn \platex_if_direction_dtou: { p, T, F, TF } + { \tex_ifddir:D \prg_return_true: \else: \prg_return_false: \fi: } +\prg_new_conditional:Npnn \platex_if_box_yoko:N #1 { p, T, F, TF } + { \tex_ifybox:D #1 \prg_return_true: \else: \prg_return_false: \fi: } +\prg_new_conditional:Npnn \platex_if_box_tate:N #1 { p, T, F, TF } + { \tex_iftbox:D #1 \prg_return_true: \else: \prg_return_false: \fi: } +\prg_new_conditional:Npnn \platex_if_box_dtou:N #1 { p, T, F, TF } + { \tex_ifdbox:D #1 \prg_return_true: \else: \prg_return_false: \fi: } +\endinput +%% +%% End of file `plexpl3.ltx'. diff --git a/Master/texmf-dist/tex/platex/base/plexpl3.sty b/Master/texmf-dist/tex/platex/base/plexpl3.sty new file mode 100644 index 00000000000..456a734fac1 --- /dev/null +++ b/Master/texmf-dist/tex/platex/base/plexpl3.sty @@ -0,0 +1,23 @@ +%% +%% This is file `plexpl3.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% plexpl3.dtx (with options: `package') +%% +%% Copyright (c) 2010 ASCII MEDIA WORKS +%% Copyright (c) 2016-2020 Japanese TeX Development Community +%% +%% This file is part of the pLaTeX2e system (community edition). +%% ------------------------------------------------------------- +%% +%% File: plexpl3.dtx +\NeedsTeXFormat{pLaTeX2e} +\RequirePackage{expl3} +\ProvidesExplPackage{plexpl3}{2020-09-28}{1.0} + {pTeX/upTeX-specific additions to expl3} +\input plexpl3.ltx +\endinput +%% +%% End of file `plexpl3.sty'. diff --git a/Master/texmf-dist/tex/platex/base/plext.sty b/Master/texmf-dist/tex/platex/base/plext.sty index e69f58c05a8..26c09cacc30 100644 --- a/Master/texmf-dist/tex/platex/base/plext.sty +++ b/Master/texmf-dist/tex/platex/base/plext.sty @@ -7,7 +7,7 @@ %% plext.dtx (with options: `package') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2020 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/platex/base/ptrace.sty b/Master/texmf-dist/tex/platex/base/ptrace.sty index dda02ecb82a..7a4963606f5 100644 --- a/Master/texmf-dist/tex/platex/base/ptrace.sty +++ b/Master/texmf-dist/tex/platex/base/ptrace.sty @@ -7,7 +7,7 @@ %% plfonts.dtx (with options: `trace') %% %% Copyright (c) 2010 ASCII MEDIA WORKS -%% Copyright (c) 2016-2018 Japanese TeX Development Community +%% Copyright (c) 2016-2020 Japanese TeX Development Community %% %% This file is part of the pLaTeX2e system (community edition). %% ------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/platex/base/tarticle.cls b/Master/texmf-dist/tex/platex/base/tarticle.cls index 82809f3a079..6e8244dcf5e 100644 --- a/Master/texmf-dist/tex/platex/base/tarticle.cls +++ b/Master/texmf-dist/tex/platex/base/tarticle.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{tarticle} - [2020/01/03 v1.8e + [2020/09/30 v1.8f Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -674,9 +674,9 @@ \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble - \@temptokena{\rensuji{\thepage}}}% - {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}% + \@temptokena{\rensuji{\thepage}}% + }{\string\@writefile{#1}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}{}% \protected@file@percent}}% } \newcommand{\tableofcontents}{% diff --git a/Master/texmf-dist/tex/platex/base/tbk10.clo b/Master/texmf-dist/tex/platex/base/tbk10.clo index b08eb4e4008..c382bf6fd5b 100644 --- a/Master/texmf-dist/tex/platex/base/tbk10.clo +++ b/Master/texmf-dist/tex/platex/base/tbk10.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk10.clo} - [2020/01/03 v1.8e + [2020/09/30 v1.8f Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/Master/texmf-dist/tex/platex/base/tbk11.clo b/Master/texmf-dist/tex/platex/base/tbk11.clo index 087a8a0919e..5cd458f65fe 100644 --- a/Master/texmf-dist/tex/platex/base/tbk11.clo +++ b/Master/texmf-dist/tex/platex/base/tbk11.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk11.clo} - [2020/01/03 v1.8e + [2020/09/30 v1.8f Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/Master/texmf-dist/tex/platex/base/tbk12.clo b/Master/texmf-dist/tex/platex/base/tbk12.clo index d886e64c76d..8b0ebbe4a98 100644 --- a/Master/texmf-dist/tex/platex/base/tbk12.clo +++ b/Master/texmf-dist/tex/platex/base/tbk12.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk12.clo} - [2020/01/03 v1.8e + [2020/09/30 v1.8f Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff --git a/Master/texmf-dist/tex/platex/base/tbook.cls b/Master/texmf-dist/tex/platex/base/tbook.cls index f9038bb0de6..b7691a5bee3 100644 --- a/Master/texmf-dist/tex/platex/base/tbook.cls +++ b/Master/texmf-dist/tex/platex/base/tbook.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{tbook} - [2020/01/03 v1.8e + [2020/09/30 v1.8f Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -767,9 +767,9 @@ \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble - \@temptokena{\rensuji{\thepage}}}% - {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}% + \@temptokena{\rensuji{\thepage}}% + }{\string\@writefile{#1}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}{}% \protected@file@percent}}% } \newcommand{\tableofcontents}{% diff --git a/Master/texmf-dist/tex/platex/base/treport.cls b/Master/texmf-dist/tex/platex/base/treport.cls index 857c8340190..283dcbe7b70 100644 --- a/Master/texmf-dist/tex/platex/base/treport.cls +++ b/Master/texmf-dist/tex/platex/base/treport.cls @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{treport} - [2020/01/03 v1.8e + [2020/09/30 v1.8f Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -763,9 +763,9 @@ \def\addcontentsline#1#2#3{% \protected@write\@auxout {\let\label\@gobble \let\index\@gobble \let\glossary\@gobble - \@temptokena{\rensuji{\thepage}}}% - {\string\@writefile{#1}% - {\protect\contentsline{#2}{#3}{\the\@temptokena}% + \@temptokena{\rensuji{\thepage}}% + }{\string\@writefile{#1}% + {\protect\contentsline{#2}{#3}{\the\@temptokena}{}% \protected@file@percent}}% } \newcommand{\tableofcontents}{% diff --git a/Master/texmf-dist/tex/platex/base/tsize10.clo b/Master/texmf-dist/tex/platex/base/tsize10.clo index 5357beed5fa..e61f5032ce3 100644 --- a/Master/texmf-dist/tex/platex/base/tsize10.clo +++ b/Master/texmf-dist/tex/platex/base/tsize10.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize10.clo} - [2020/01/03 v1.8e + [2020/09/30 v1.8f Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/Master/texmf-dist/tex/platex/base/tsize11.clo b/Master/texmf-dist/tex/platex/base/tsize11.clo index 115ded6e317..7de78f937c4 100644 --- a/Master/texmf-dist/tex/platex/base/tsize11.clo +++ b/Master/texmf-dist/tex/platex/base/tsize11.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize11.clo} - [2020/01/03 v1.8e + [2020/09/30 v1.8f Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/Master/texmf-dist/tex/platex/base/tsize12.clo b/Master/texmf-dist/tex/platex/base/tsize12.clo index 7039885f667..002e7502f1b 100644 --- a/Master/texmf-dist/tex/platex/base/tsize12.clo +++ b/Master/texmf-dist/tex/platex/base/tsize12.clo @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize12.clo} - [2020/01/03 v1.8e + [2020/09/30 v1.8f Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% -- cgit v1.2.3