From 7e94d861f2b24f29d8fad18a7160e8f3644fe2ea Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 27 Sep 2020 21:26:18 +0000 Subject: platex-tools (27sep20) git-svn-id: svn://tug.org/texlive/trunk@56451 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/platex-tools/plarray.sty | 4 +-- .../tex/latex/platex-tools/plextarray.sty | 4 +-- .../tex/latex/platex-tools/plextdelarray.sty | 2 +- .../tex/latex/platex-tools/pxatbegshi.sty | 26 ++++++++++++++++--- .../tex/latex/platex-tools/pxeveryshi.sty | 29 +++++++++++++++++++--- .../tex/latex/platex-tools/pxmulticol.sty | 2 +- .../texmf-dist/tex/latex/platex-tools/pxxspace.sty | 4 +-- 7 files changed, 55 insertions(+), 16 deletions(-) (limited to 'Master/texmf-dist/tex/latex/platex-tools') diff --git a/Master/texmf-dist/tex/latex/platex-tools/plarray.sty b/Master/texmf-dist/tex/latex/platex-tools/plarray.sty index 8c797ef59ce..52ff536d540 100644 --- a/Master/texmf-dist/tex/latex/platex-tools/plarray.sty +++ b/Master/texmf-dist/tex/latex/platex-tools/plarray.sty @@ -7,9 +7,9 @@ % % This package is expected to be compatible with % * array.sty in latex-tools -% (2016/10/06 v2.4d -- 2018/11/13 v2.4j) +% (2016/10/06 v2.4d -- 2019/08/31 v2.4l) % * plcore.ltx in platex -% (2001/09/26 v1.2a -- 2018/09/02 v1.3) +% (2001/09/26 v1.2a -- 2020/03/05 v1.3e) % \NeedsTeXFormat{pLaTeX2e} diff --git a/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty b/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty index 1e706d9a75d..a1f38056782 100644 --- a/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty +++ b/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty @@ -7,9 +7,9 @@ % % This package is expected to be compatible with % * array.sty in latex-tools -% (2016/10/06 v2.4d -- 2018/11/13 v2.4j) +% (2016/10/06 v2.4d -- 2019/08/31 v2.4l) % * plext.sty in platex -% (2001/09/26 v1.2 -- 2018/10/07 v1.2k) +% (2001/09/26 v1.2 -- 2019/09/29 v1.2l) % Largely based on lltjext.sty from LuaTeX-ja project. % diff --git a/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty b/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty index 1c6b097c2c9..03008c193e6 100644 --- a/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty +++ b/Master/texmf-dist/tex/latex/platex-tools/plextdelarray.sty @@ -9,7 +9,7 @@ % * delarray.sty in latex-tools % (2014/10/28 v1.01) % * plext.sty in platex -% (2001/09/26 v1.2 -- 2018/10/07 v1.2k) +% (2001/09/26 v1.2 -- 2019/09/29 v1.2l) % \NeedsTeXFormat{pLaTeX2e} diff --git a/Master/texmf-dist/tex/latex/platex-tools/pxatbegshi.sty b/Master/texmf-dist/tex/latex/platex-tools/pxatbegshi.sty index bbe8c49ac3f..3c8a8304154 100644 --- a/Master/texmf-dist/tex/latex/platex-tools/pxatbegshi.sty +++ b/Master/texmf-dist/tex/latex/platex-tools/pxatbegshi.sty @@ -18,13 +18,19 @@ % the original code (2018/09/21 v0.3), which was largely based on % H. Kitagawa's on GitHub:texjporg/tex-jp-build#21. % -- concept: execute all hooks inside yoko direction \vbox -% -------------------------------------------------- +% +% Update: version 2020/09/09 v0.6 supports LaTeX2e 2020-10-01 +% based on a method proposed by H. Kitagawa in lltjp-atbegshi.sty. +% +% Update: version 2020/09/25 v0.7 does nothing, since +% pLaTeX2e 2020-10-01 will support the situation natively. +% -------------------------------------------------------------------- % %% package declaration \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{pxatbegshi} - [2019/09/07 v0.5 Patch to atbegshi for (u)pLaTeX] + [2020/09/25 v0.7 Patch to atbegshi for (u)pLaTeX] %% preparations \def\pxabgs@pkgname{pxatbegshi} @@ -33,6 +39,20 @@ %% load it \RequirePackage{atbegshi} +%% Since LaTeX2e 2020-10-01, atbegshi.sty is merely +%% an emulation by atbegshi-ltx.sty from ltshipout.dtx. +%% The new code does NOT define \AtBegShi@Output, +%% so we can detect it! + +\ifx\AtBegShi@Output\@undefined + %% pLaTeX2e 2020-10-01 natively supports the situation + \PackageInfo{pxatbegshi}{This package is no longer needed} + \expandafter\endinput +\fi + +%% The rest of this package is meant for +%% LaTeX2e 2020-02-02 PL5 or older. + %% internal macros are locally effective \begingroup @@ -56,8 +76,6 @@ %--------------------------------------- -% concept: execute all hooks inside yoko direction \vbox - % prepare \let\pxabgs@AtBegShi@Output\AtBegShi@Output % try first patch diff --git a/Master/texmf-dist/tex/latex/platex-tools/pxeveryshi.sty b/Master/texmf-dist/tex/latex/platex-tools/pxeveryshi.sty index 8a534095d96..23bbd8abe0e 100644 --- a/Master/texmf-dist/tex/latex/platex-tools/pxeveryshi.sty +++ b/Master/texmf-dist/tex/latex/platex-tools/pxeveryshi.sty @@ -1,18 +1,39 @@ % % pxeveryshi.sty -% written by Takayuki Yato (ZR) +% originally written by Takayuki Yato (ZR) +% and modified by Hironobu Yamashita % % This package is distributed as part of the platex-tools bundle % maintained by Hironobu Yamashita % by courtesy of the original author. % https://github.com/aminophen/platex-tools % +% -------------------------------------------------------------------- +% [Note] +% Update: version 2020/09/25 v0.2 does nothing, since +% pLaTeX2e 2020-10-01 will support the situation natively. +% -------------------------------------------------------------------- +% \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{pxeveryshi} - [2012/05/19 v0.1 everyshi package for pLaTeX] + [2020/09/25 v0.2 everyshi package for pLaTeX] \RequirePackageWithOptions{everyshi} -% + +%% Since LaTeX2e 2020-10-01, everyshi.sty is merely +%% an emulation by everyshi-ltx.sty from ltshipout.dtx. +%% The new code does NOT define \@EveryShipout@Output, +%% so we can detect it! + +\ifx\@EveryShipout@Output\@undefined + %% pLaTeX2e 2020-10-01 natively supports the situation + \PackageInfo{pxeveryshi}{This package is no longer needed} + \expandafter\endinput +\fi + +%% The rest of this package is meant for +%% LaTeX2e 2020-02-02 PL5 or older. + \def\@EveryShipout@Output{% \setbox8\vbox{% \yoko @@ -23,6 +44,6 @@ \gdef\@EveryShipout@AtNextHook{}% \@EveryShipout@Org@Shipout\box\@cclv } -% + \endinput %% EOF diff --git a/Master/texmf-dist/tex/latex/platex-tools/pxmulticol.sty b/Master/texmf-dist/tex/latex/platex-tools/pxmulticol.sty index 63274eb94e4..2b0c3af4ddd 100644 --- a/Master/texmf-dist/tex/latex/platex-tools/pxmulticol.sty +++ b/Master/texmf-dist/tex/latex/platex-tools/pxmulticol.sty @@ -7,7 +7,7 @@ % % This package is expected to be compatible with % * multicol.sty in latex-tools -% (1995/10/19 v1.5l -- 2018/04/01 v1.8r) +% (1995/10/19 v1.5l -- 2019/12/09 v1.8y) % \NeedsTeXFormat{pLaTeX2e} diff --git a/Master/texmf-dist/tex/latex/platex-tools/pxxspace.sty b/Master/texmf-dist/tex/latex/platex-tools/pxxspace.sty index 1a8207536c2..384a157be62 100644 --- a/Master/texmf-dist/tex/latex/platex-tools/pxxspace.sty +++ b/Master/texmf-dist/tex/latex/platex-tools/pxxspace.sty @@ -24,14 +24,14 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{pxxspace} - [2019/04/30 v0.2 Patch for xspace for pLaTeX/upLaTeX] + [2019/09/23 v0.2a Patch for xspace for pLaTeX/upLaTeX] \def\pxxs@pkgname{pxxspace} %--------------------------------------- preparations %% e-TeX is required \RequirePackage{etoolbox}[2011/01/03]% v2.1 -\ifx\numdef\@undefined \endinput \fi +\ifx\numdef\@undefined \expandafter\endinput \fi %% packages \RequirePackage{xspace}[2009/10/20]% v1.13 -- cgit v1.2.3