summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/platex-tools
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-02-13 22:16:52 +0000
committerKarl Berry <karl@freefriends.org>2021-02-13 22:16:52 +0000
commit4fe34106a5af5140d956b4973183481d9bd15866 (patch)
tree67a697a5f2ed0ac26a53297aaef3d4cae5abd4f2 /Master/texmf-dist/tex/latex/platex-tools
parent18ec00f52d65e670a71aef21a491abb0bdec92f7 (diff)
platex-tools (13feb21)
git-svn-id: svn://tug.org/texlive/trunk@57729 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/platex-tools')
-rw-r--r--Master/texmf-dist/tex/latex/platex-tools/pxatbegshi.sty39
-rw-r--r--Master/texmf-dist/tex/latex/platex-tools/pxeverysel.sty32
-rw-r--r--Master/texmf-dist/tex/latex/platex-tools/pxeveryshi.sty32
3 files changed, 79 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/platex-tools/pxatbegshi.sty b/Master/texmf-dist/tex/latex/platex-tools/pxatbegshi.sty
index 3c8a8304154..856b95eb44d 100644
--- a/Master/texmf-dist/tex/latex/platex-tools/pxatbegshi.sty
+++ b/Master/texmf-dist/tex/latex/platex-tools/pxatbegshi.sty
@@ -30,29 +30,42 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{pxatbegshi}
- [2020/09/25 v0.7 Patch to atbegshi for (u)pLaTeX]
-
-%% preparations
-\def\pxabgs@pkgname{pxatbegshi}
-\def\pxabgs@warn{\PackageWarningNoLine\pxabgs@pkgname}
-
-%% load it
-\RequirePackage{atbegshi}
+ [2021/02/13 v0.7b Patch to atbegshi for (u)pLaTeX]
%% 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}
+\chardef\pxabgs@status=\z@
+\ifx\IfHookExistsTF\@undefined\else % >= LaTeX2e 2020-10-01
+ \IfHookExistsTF{shipout/before}{% % >= LaTeX2e 2020-10-01
+ \chardef\pxabgs@status=\@ne
+ }{}
+\fi
+\ifnum\pxabgs@status=\@ne
+ % if LaTeX2e and pLaTeX2e are inconsistent, raise an error!
+ \@ifl@t@r\pfmtversion{2020/10/01}{%
+ \PackageInfo{pxatbegshi}{This package is no longer needed}%
+ }{%
+ \PackageError{pxatbegshi}{Inconsistent LaTeX2e/pLaTeX2e combination}\@ehc
+ }%
+ \RequirePackage{atbegshi}% input anyway
\expandafter\endinput
\fi
%% The rest of this package is meant for
%% LaTeX2e 2020-02-02 PL5 or older.
+\RequirePackage{atbegshi}
+
+\ifx\AtBegShi@Output\@undefined
+ \PackageError{pxatbegshi}{This should not happen}\@ehc
+ \expandafter\endinput
+\fi
+
+%% preparations
+\def\pxabgs@pkgname{pxatbegshi}
+\def\pxabgs@warn{\PackageWarningNoLine\pxabgs@pkgname}
+
%% internal macros are locally effective
\begingroup
diff --git a/Master/texmf-dist/tex/latex/platex-tools/pxeverysel.sty b/Master/texmf-dist/tex/latex/platex-tools/pxeverysel.sty
index 5c00f1830f2..8a1a9b5eade 100644
--- a/Master/texmf-dist/tex/latex/platex-tools/pxeverysel.sty
+++ b/Master/texmf-dist/tex/latex/platex-tools/pxeverysel.sty
@@ -8,14 +8,40 @@
% by courtesy of the original author.
% https://github.com/aminophen/platex-tools
%
+% --------------------------------------------------------------------
+% [Note]
+% Update: version 2021/02/13 v0.9a does nothing, since
+% pLaTeX2e 2021-??-?? will support the situation natively.
+% --------------------------------------------------------------------
+%
%% package declaration
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pxeverysel}
- [2018/10/28 v0.9 Patch to everysel for (u)pLaTeX]
+ [2021/02/13 v0.9b Patch to everysel for (u)pLaTeX]
+
+%% Since LaTeX2e 2021-05-01, everysel.sty is merely
+%% an emulation by everysel-ltx.sty from firstaid.
+
+\chardef\pxys@status=\z@
+\ifx\IfHookExistsTF\@undefined\else % >= LaTeX2e 2020-10-01
+ \IfHookExistsTF{selectfont}{% % >= LaTeX2e 2021-05-01
+ \chardef\pxys@status=\@ne
+ }{}
+\fi
+\ifnum\pxys@status=\@ne
+ % if LaTeX2e and pLaTeX2e are inconsistent, raise an error!
+ \ifx\delayed@k@adjustment\@undefined
+ \PackageError{pxeverysel}{Inconsistent LaTeX2e/pLaTeX2e combination}\@ehc
+ \else
+ \PackageInfo{pxeverysel}{This package is no longer needed}%
+ \fi
+ \RequirePackage{everysel}% input anyway
+ \expandafter\endinput
+\fi
-%% previous code for ctex support has been removed in v0.5,
-%% as ctex has depended on pxeverysel since 2016/12/27 v2.4.7
+%% The rest of this package is meant for
+%% LaTeX2e 2020-10-01 PL4 or older.
%% in case it's too late ...
\@ifpackageloaded{everysel}{%
diff --git a/Master/texmf-dist/tex/latex/platex-tools/pxeveryshi.sty b/Master/texmf-dist/tex/latex/platex-tools/pxeveryshi.sty
index 23bbd8abe0e..0b7144a53af 100644
--- a/Master/texmf-dist/tex/latex/platex-tools/pxeveryshi.sty
+++ b/Master/texmf-dist/tex/latex/platex-tools/pxeveryshi.sty
@@ -15,25 +15,41 @@
% --------------------------------------------------------------------
%
-\NeedsTeXFormat{pLaTeX2e}
+%% package declaration
+\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pxeveryshi}
- [2020/09/25 v0.2 everyshi package for pLaTeX]
-\RequirePackageWithOptions{everyshi}
+ [2021/02/13 v0.2b everyshi package for (u)pLaTeX]
%% 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}
+\chardef\pxevsh@status=\z@
+\ifx\IfHookExistsTF\@undefined\else % >= LaTeX2e 2020-10-01
+ \IfHookExistsTF{shipout/before}{% % >= LaTeX2e 2020-10-01
+ \chardef\pxevsh@status=\@ne
+ }{}
+\fi
+\ifnum\pxevsh@status=\@ne
+ % if LaTeX2e and pLaTeX2e are inconsistent, raise an error!
+ \@ifl@t@r\pfmtversion{2020/10/01}{%
+ \PackageInfo{pxeveryshi}{This package is no longer needed}%
+ }{%
+ \PackageError{pxeveryshi}{Inconsistent LaTeX2e/pLaTeX2e combination}\@ehc
+ }%
+ \RequirePackageWithOptions{everyshi}% input anyway
\expandafter\endinput
\fi
%% The rest of this package is meant for
%% LaTeX2e 2020-02-02 PL5 or older.
+\RequirePackageWithOptions{everyshi}
+
+\ifx\@EveryShipout@Output\@undefined
+ \PackageError{pxeveryshi}{This should not happen}\@ehc
+ \expandafter\endinput
+\fi
+
\def\@EveryShipout@Output{%
\setbox8\vbox{%
\yoko