From 3ff190b96a3589b168c11cec5d03498ac618faed Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 14 Oct 2020 21:45:03 +0000 Subject: pxjahyper (14oct20) git-svn-id: svn://tug.org/texlive/trunk@56662 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/platex/pxjahyper/pxjahyper-ajm.def | 2 +- .../tex/platex/pxjahyper/pxjahyper-enc.sty | 9 +++--- .../texmf-dist/tex/platex/pxjahyper/pxjahyper.sty | 32 +--------------------- 3 files changed, 6 insertions(+), 37 deletions(-) (limited to 'Master/texmf-dist/tex/platex') diff --git a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def index a8897d9c5ca..b4b00f5d792 100644 --- a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def +++ b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def @@ -11,7 +11,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesFile{pxjahyper-ajm.def}[2020/10/04 v0.5b] +\ProvidesFile{pxjahyper-ajm.def}[2020/10/10 v0.6] %% 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 51468dc23ca..3b9583a766a 100644 --- a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty +++ b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{pxjahyper-enc}[2020/10/05 v0.6-pre] +\ProvidesPackage{pxjahyper-enc}[2020/10/10 v0.6a] \def\pxhe@pkgname{pxjahyper-enc} \providecommand{\bxDebug}[1]{} @@ -61,10 +61,9 @@ %% check \ifx d\pxhe@driver\else - \ifx 0\pxhe@driver\else - \PackageError\pxhe@pkgname - {Bad driver option} - {Package loading is aborted right now.} + \ifx s\pxhe@driver + \PackageWarningNoLine\pxhe@pkgname + {Unsupported driver (dvips)} \fi \let\pxhe@begin@dvi@hook\@gobble \expandafter\endinput\fi\relax diff --git a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty index 0a79f7fe03e..9a89a338efc 100644 --- a/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty +++ b/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{pxjahyper}[2020/10/05 v0.6-pre] +\ProvidesPackage{pxjahyper}[2020/10/10 v0.6a] %% error messages \def\pxhy@pkgname{pxjahyper} @@ -250,13 +250,6 @@ pxhy@driver = \the\pxhy@driver^^J% \def\pxhy@end{\pxhy@end@} \let\pxhy@mk\indent % unexpandable -%% \pxhy@out@special{} -\def\pxhy@out@special#1{% - \edef\pxhy@tmpa{% - \noexpand\pxhy@begin@dvi@enc@hook{\special{#1}}% - }\pxhy@tmpa -} - %% \pxhy@begin@dvi@hook{} %% \pxhy@begin@dvi@enc@hook{} \ifpxhy@new@hook@system @@ -264,19 +257,8 @@ pxhy@driver = \the\pxhy@driver^^J% \AddToHook{shipout/firstpage}{#1}% } \DeclareHookRule{shipout/firstpage}{.}{>}{hyperref} - \def\pxhy@begin@dvi@enc@hook#1{% only once - \AddToHook{shipout/firstpage}[./enc]{#1}% - \DeclareHookRule{shipout/firstpage}{./enc}{<}{hyperref}% - } \else \RequirePackage{atbegshi}[2011/10/05]% v1.16 -\def\pxhy@begin@dvi@enc@hook#1{% - \begingroup - \toks\z@{#1}% - \toks\tw@\expandafter{\AtBegShi@HookFirst}% - \xdef\AtBegShi@HookFirst{\the\toks@\the\toks\tw@}% - \endgroup -} \def\pxhy@begin@dvi@hook#1{% \AtBeginShipoutFirst{#1}% } @@ -331,20 +313,8 @@ pxhy@driver = \the\pxhy@driver^^J% \ifnum\pxhy@driver=\pxhy@driver@dvipdfmx %<*dvipdfmx> %% dvipdfmx - \IfFileExists{pxjahyper-enc.sty}{% FIXME: TRANSIENT CODE \RequirePackage{pxjahyper-enc}[]% \ifpxhy@bigcode\else \suppressbigcode \fi - }{%else - \if e\pxhy@jcode % euc - \pxhy@out@special{pdf:tounicode EUC-UCS2} - \else\if s\pxhy@jcode % sjis - \pxhy@out@special{pdf:tounicode 90ms-RKSJ-UCS2} - \else\ifpxhy@bigcode % ucs, bigcode - \pxhy@out@special{pdf:tounicode UTF8-UTF16} - \else - \pxhy@out@special{pdf:tounicode UTF8-UCS2} - \fi\fi\fi - }% \fi % \fi -- cgit v1.2.3