From 4fe34106a5af5140d956b4973183481d9bd15866 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 13 Feb 2021 22:16:52 +0000 Subject: platex-tools (13feb21) git-svn-id: svn://tug.org/texlive/trunk@57729 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/platex-tools/LICENSE | 2 +- Master/texmf-dist/doc/latex/platex-tools/README.md | 2 +- .../doc/latex/platex-tools/pxatbegshi.pdf | Bin 72780 -> 73216 bytes .../doc/latex/platex-tools/pxatbegshi.tex | 5 +-- .../doc/latex/platex-tools/pxeverysel.pdf | Bin 53283 -> 61132 bytes .../doc/latex/platex-tools/pxeverysel.tex | 7 ++++ .../doc/latex/platex-tools/pxeveryshi.pdf | Bin 51299 -> 52815 bytes .../doc/latex/platex-tools/pxeveryshi.tex | 5 +-- .../tex/latex/platex-tools/pxatbegshi.sty | 39 ++++++++++++++------- .../tex/latex/platex-tools/pxeverysel.sty | 32 +++++++++++++++-- .../tex/latex/platex-tools/pxeveryshi.sty | 32 ++++++++++++----- 11 files changed, 94 insertions(+), 30 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/platex-tools/LICENSE b/Master/texmf-dist/doc/latex/platex-tools/LICENSE index 9661ce7b8d1..ecbe9e9df98 100644 --- a/Master/texmf-dist/doc/latex/platex-tools/LICENSE +++ b/Master/texmf-dist/doc/latex/platex-tools/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2016-2020 Hironobu Yamashita +Copyright (c) 2016-2021 Hironobu Yamashita All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Master/texmf-dist/doc/latex/platex-tools/README.md b/Master/texmf-dist/doc/latex/platex-tools/README.md index 99a92286e7a..a0f2b36d1ab 100644 --- a/Master/texmf-dist/doc/latex/platex-tools/README.md +++ b/Master/texmf-dist/doc/latex/platex-tools/README.md @@ -83,6 +83,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)). ## Release Date -2020-10-14 +2021-02-13 Hironobu Yamashita diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.pdf b/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.pdf index f43e6c22f18..6ab8a2fa8b1 100644 Binary files a/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.pdf and b/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.pdf differ diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.tex b/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.tex index e3d34cda14a..0b1b326835e 100644 --- a/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.tex +++ b/Master/texmf-dist/doc/latex/platex-tools/pxatbegshi.tex @@ -51,8 +51,9 @@ p\LaTeX の縦組クラス(tarticle.clsなど)で使うとエラーが出て \end{quote} と明言します(例:\verb+aminophen/platex-tools#15+)。 -\pLaTeXe~2020-10-01以降では、同等の機能が\pLaTeXe{}カーネルに -存在するため、\textsf{pxatbegshi}パッケージは何もしません。 +\LaTeXe~2020-10-01以降では、\textsf{atbegshi}と同等の機能がカーネルに +実装されていて、その対処は\pLaTeXe{}カーネルでなされます。 +この場合、\textsf{pxatbegshi}パッケージは何もしません。 \newpage \section{使いかた} diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.pdf b/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.pdf index 01e9e6e09a9..3ccbda227ee 100644 Binary files a/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.pdf and b/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.pdf differ diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.tex b/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.tex index ab460879545..56b1076ffec 100644 --- a/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.tex +++ b/Master/texmf-dist/doc/latex/platex-tools/pxeverysel.tex @@ -36,6 +36,13 @@ Martin Schr\"oder氏による\textsf{everysel}パッケージをp\LaTeX で この\textsf{pxeverysel}パッケージを読み込むことで、p\LaTeX でも \textsf{everysel}パッケージを使えるようになります。 +\LaTeXe~2021-05-01以降では、\textsf{everysel}と同等の機能がカーネルに +実装されていて、その対処は\pLaTeXe{}カーネルでなされます。 +この場合、\textsf{pxeverysel}パッケージは何もしません。 + +\newpage +\section{使いかた} + 使いかたは、\textsf{everysel}パッケージの代わりに、あるいは \textsf{everysel}パッケージに追加して、\textsf{pxeverysel}パッケージを 読み込むだけです\footnote{稀に\\\texttt{% diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.pdf b/Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.pdf index 35418cd9774..449c93f8e32 100644 Binary files a/Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.pdf and b/Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.pdf differ diff --git a/Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.tex b/Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.tex index 598fba6a5b8..0c5e2e5e9f0 100644 --- a/Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.tex +++ b/Master/texmf-dist/doc/latex/platex-tools/pxeveryshi.tex @@ -44,8 +44,9 @@ p\LaTeX の縦組クラス(tarticle.clsなど)で使うとエラーが出て \textsf{everyshi}パッケージ(およびこれに依存するパッケージ)が 使えるようになります。 -\pLaTeXe~2020-10-01以降では、同等の機能が\pLaTeXe{}カーネルに -存在するため、\textsf{pxeveryshi}パッケージは何もしません。 +\LaTeXe~2020-10-01以降では、\textsf{everyshi}と同等の機能がカーネルに +実装されていて、その対処は\pLaTeXe{}カーネルでなされます。 +この場合、\textsf{pxeveryshi}パッケージは何もしません。 \section{使いかた} 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 -- cgit v1.2.3