From 57d9620a275079e25e21b8b157f4749279511d20 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 27 Oct 2018 21:38:32 +0000 Subject: platex-tools (27oct18) git-svn-id: svn://tug.org/texlive/trunk@49002 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/platex-tools/plarray.sty | 10 +++------ .../tex/latex/platex-tools/plextarray.sty | 6 ++--- .../tex/latex/platex-tools/pxeverysel.sty | 26 ++++++++++++++++++++-- 3 files changed, 29 insertions(+), 13 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 4dd658f2cf6..111592705e2 100644 --- a/Master/texmf-dist/tex/latex/platex-tools/plarray.sty +++ b/Master/texmf-dist/tex/latex/platex-tools/plarray.sty @@ -14,15 +14,13 @@ \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{plarray} - [2018/09/20 v0.1g Tabular extension package for pLaTeX/upLaTeX] + [2018/10/27 v0.1h Tabular extension package for pLaTeX/upLaTeX] \RequirePackage{array} %% patching internal code for array.sty % %% remove extra \xkanjiskip (pLaTeX2e 2016/04/17) -\@ifl@t@r{\pfmtversion}{2016/04/17} - {\expandafter\@firstofone} - {\expandafter\@gobble} +\@ifl@t@r{\pfmtversion}{2016/04/17}{\@firstofone}{\@gobble} {% = for pLaTeX2e 2016/04/17 or newer \def\@tabular{% \leavevmode \null @@ -34,9 +32,7 @@ }% = % %% inhibit JFM glue around tabular cell components (pLaTeX2e 2018/03/09) -\@ifl@t@r{\pfmtversion}{2017/07/29} - {\expandafter\@firstofone} - {\expandafter\@gobble} +\@ifl@t@r{\pfmtversion}{2017/07/29}{\@firstofone}{\@gobble} {% = for pLaTeX2e 2017/07/29 or newer % first, provide old definition; there are some known incompatibility % compared to LaTeX, pLaTeX or array diff --git a/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty b/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty index 3e1f3c207c6..ee08eb0bbd7 100644 --- a/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty +++ b/Master/texmf-dist/tex/latex/platex-tools/plextarray.sty @@ -15,7 +15,7 @@ \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{plextarray} - [2018/09/20 v1.1c Tabular extension package for plext and array] + [2018/10/27 v1.1d Tabular extension package for plext and array] \RequirePackage{plext} \RequirePackage{plarray} @@ -36,9 +36,7 @@ %% patching internal code for array.sty and plext.sty % -\@ifpackagelater{array}{2018/09/13} - {\expandafter\@firstoftwo} - {\expandafter\@secondoftwo} +\@ifpackagelater{array}{2018/09/13}{\@firstoftwo}{\@secondoftwo} {% = for 2018/09/13 v2.4i or newer \def\@startpbox#1{\bgroup \color@begingroup diff --git a/Master/texmf-dist/tex/latex/platex-tools/pxeverysel.sty b/Master/texmf-dist/tex/latex/platex-tools/pxeverysel.sty index c18b6f3bdf5..447f42876f2 100644 --- a/Master/texmf-dist/tex/latex/platex-tools/pxeverysel.sty +++ b/Master/texmf-dist/tex/latex/platex-tools/pxeverysel.sty @@ -12,16 +12,37 @@ %% package declaration \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pxeverysel} - [2017/03/02 v0.6 Patch to everysel for (u)pLaTeX] + [2018/10/27 v0.8 Patch to everysel for (u)pLaTeX] %% previous code for ctex support has been removed in v0.5, %% as ctex has depended on pxeverysel since 2016/12/27 v2.4.7 +%% in case it's too late ... +\@ifpackageloaded{everysel}{% + % everysel.sty removes \@EverySelectfont@Init once it is used + \ifx\@EverySelectfont@Init\undefined + \PackageError{pxeverysel}{% + Patch too late!\MessageBreak + Load pxeverysel earlier}\@ehc +}{} + %% preparations \def\pxys@pkgname{pxeverysel} \def\pxys@warn{\PackageWarningNoLine\pxys@pkgname} -%% load it +%% load it, but ensure that \@EverySelectfont@Init is not executed +% [Note] everysel.sty contains +% \AtBeginDocument{\@EverySelectfont@Init} +% at the end. In most cases, the execution is actually delayed; +% however, +% \AtBeginDocument{everysel} (e.g. found in sidecap.sty) +% can execute it immediately. In this case, delay it until the +% end of pxeverysel.sty. +\ifx\AtBeginDocument\@firstofone + \def\pxys@begindocumenthook{\let\AtBeginDocument\@firstofone} + \def\AtBeginDocument{\g@addto@macro\pxys@begindocumenthook} + \AtEndOfPackage{\pxys@begindocumenthook} +\fi \RequirePackage{everysel} %% support for (u)pLaTeX font tracing @@ -141,5 +162,6 @@ \expandafter\let\csname selectfont \endcsname\pxys@selectfont} %--------------------------------------- done + \endinput %% EOF -- cgit v1.2.3