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/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 +- 33 files changed, 480 insertions(+), 202 deletions(-) create mode 100644 Master/texmf-dist/tex/platex/base/plexpl3.ltx create mode 100644 Master/texmf-dist/tex/platex/base/plexpl3.sty (limited to 'Master/texmf-dist/tex/platex') 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