From 0d8e2586327cc5039b02ba5e1b163a4c0ea9415b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 16 Mar 2022 21:00:13 +0000 Subject: pxjahyper (16mar22) git-svn-id: svn://tug.org/texlive/trunk@62736 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/platex/pxjahyper/pxjahyper-ajm.def | 4 ++-- .../tex/platex/pxjahyper/pxjahyper-enc.sty | 4 ++-- .../tex/platex/pxjahyper/pxjahyper-uni.def | 4 ++-- .../texmf-dist/tex/platex/pxjahyper/pxjahyper.sty | 28 ++++++++++++++-------- 4 files changed, 24 insertions(+), 16 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def index cb8cbd28af4..f4f0f427e21 100644 --- a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def +++ b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def @@ -1,7 +1,7 @@ %% %% This is file 'pxjahyper-ajm.def'. %% -%% Copyright (c) 2012-2021 Takayuki YATO (aka. "ZR") +%% Copyright (c) 2012-2022 Takayuki YATO (aka. "ZR") %% GitHub: https://github.com/zr-tex8r %% Twitter: @zr_tex8r %% @@ -11,7 +11,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesFile{pxjahyper-ajm.def}[2021/06/06 v0.9c] +\ProvidesFile{pxjahyper-ajm.def}[2022/03/15 v0.9d] %% avoid multiple loading \csname pxjahyperajmLoaded\endcsname diff --git a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty index f51dc75e783..1e2ae71bb52 100644 --- a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty +++ b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty @@ -1,7 +1,7 @@ %% %% This is file 'pxjahyper-enc.sty'. %% -%% Copyright (c) 2012-2021 Takayuki YATO (aka. "ZR") +%% Copyright (c) 2012-2022 Takayuki YATO (aka. "ZR") %% GitHub: https://github.com/zr-tex8r %% Twitter: @zr_tex8r %% @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{pxjahyper-enc}[2021/06/06 v0.9c] +\ProvidesPackage{pxjahyper-enc}[2022/03/15 v0.9d] \def\pxhe@pkgname{pxjahyper-enc} \providecommand{\bxDebug}[1]{} diff --git a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def index c05b0369f7d..0b1019fbb98 100644 --- a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def +++ b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-uni.def @@ -1,7 +1,7 @@ %% %% This is file 'pxjahyper-uni.def'. %% -%% Copyright (c) 2012-2021 Takayuki YATO (aka. "ZR") +%% Copyright (c) 2012-2022 Takayuki YATO (aka. "ZR") %% GitHub: https://github.com/zr-tex8r %% Twitter: @zr_tex8r %% @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesFile{pxjahyper-uni.def}[2021/06/06 v0.9c] +\ProvidesFile{pxjahyper-uni.def}[2022/03/15 v0.9d] \providecommand{\bxDebug}[1]{} %--------------------------------------- environment check diff --git a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty index 486792b8d7e..47a913f8ee8 100644 --- a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty +++ b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty @@ -1,7 +1,7 @@ %% %% This is file 'pxjahyper.sty'. %% -%% Copyright (c) 2012-2021 Takayuki YATO (aka. "ZR") +%% Copyright (c) 2012-2022 Takayuki YATO (aka. "ZR") %% GitHub: https://github.com/zr-tex8r %% Twitter: @zr_tex8r %% @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{pxjahyper}[2021/06/06 v0.9c] +\ProvidesPackage{pxjahyper}[2022/03/15 v0.9d] \def\pxhy@pkgname{pxjahyper} \providecommand{\bxDebug}[1]{} @@ -31,7 +31,7 @@ \newif\ifpxhy@uptex \newif\ifpxhy@etex \newif\ifpxhy@etoolbox -\newif\ifpxhy@new@hook@system +\chardef\pxhy@hook@system=0 \newif\ifpxhy@tounicode \newif\ifpxhy@uniescape \newif\ifpxhy@bigcode @@ -208,7 +208,11 @@ \fi %% Check for the new hook system. -\@ifl@t@r\fmtversion{2020/10/01}{\pxhy@new@hook@systemtrue}{} +\@ifl@t@r\fmtversion{2021/11/15}{% + \chardef\pxhy@hook@system=2 +}{\@ifl@t@r\fmtversion{2020/02/02}{% + \chardef\pxhy@hook@system=1 +}{}} %% adjustment % upTeX not in unicode is not seen as upTeX. @@ -280,7 +284,7 @@ pxhy@ptex = \ifpxhy@ptex true\else false\fi^^J% pxhy@uptex = \ifpxhy@uptex true\else false\fi^^J% pxhy@etex = \ifpxhy@etex true\else false\fi^^J% pxhy@etoolbox = \ifpxhy@etoolbox true\else false\fi^^J% -pxhy@new@hook@system = \ifpxhy@new@hook@system true\else false\fi^^J% +pxhy@hook@system = \the\pxhy@hook@system^^J% ifpxhy@hy@unicode = \ifpxhy@hy@unicode true\else false\fi^^J% pxhy@bigcode = \ifpxhy@bigcode true\else false\fi^^J% pxhy@driver = \the\pxhy@driver^^J% @@ -298,7 +302,7 @@ pxhy@textcmd = \ifpxhy@textcmd true\else false\fi^^J% \let\pxhy@mk\indent % unexpandable %% \pxhy@begin@dvi@hook{} -\ifpxhy@new@hook@system +\ifnum\pxhy@hook@system>0 \def\pxhy@begin@dvi@hook#1{% \AddToHook{shipout/firstpage}{#1}% } @@ -335,13 +339,17 @@ pxhy@textcmd = \ifpxhy@textcmd true\else false\fi^^J% %% \pxhy@hook@after@package{}{} \@onlypreamble\pxhy@hook@after@package \def\pxhy@hook@after@package#1#2{% - \ifpxhy@new@hook@system + \ifcase\pxhy@hook@system + \AtBeginDocument{% + \@ifpackageloaded{#1}{#2}{}% + }% + \or \@ifpackageloaded{#1}{#2}{% \AddToHook{package/after/#1}{#2}% }% - \else - \AtBeginDocument{% - \@ifpackageloaded{#1}{#2}{}% + \or + \@ifpackageloaded{#1}{#2}{% + \AddToHook{package/#1/after}{#2}% }% \fi } -- cgit v1.2.3