texlive[59116] Master/texmf-dist: pxjahyper (7may21)
commits+karl at tug.org
commits+karl at tug.org
Fri May 7 22:14:04 CEST 2021
Revision: 59116
http://tug.org/svn/texlive?view=revision&revision=59116
Author: karl
Date: 2021-05-07 22:14:04 +0200 (Fri, 07 May 2021)
Log Message:
-----------
pxjahyper (7may21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md
trunk/Master/texmf-dist/doc/platex/pxjahyper/README.md
trunk/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.pdf
trunk/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex
trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def
trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty
trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty
Modified: trunk/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md
===================================================================
--- trunk/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md 2021-05-07 20:13:46 UTC (rev 59115)
+++ trunk/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md 2021-05-07 20:14:04 UTC (rev 59116)
@@ -70,6 +70,11 @@
更新履歴
--------
+ * Version 0.8 〈2021/05/05〉
+ - japanese-otf パッケージに対する実行のタイミングをパッケージ読込
+ の直後に変更した。
+ - (試験的) `(no)papersize` オプション。
+
* Version 0.7b 〈2021/02/26〉
- バグ修正。
Modified: trunk/Master/texmf-dist/doc/platex/pxjahyper/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/platex/pxjahyper/README.md 2021-05-07 20:13:46 UTC (rev 59115)
+++ trunk/Master/texmf-dist/doc/platex/pxjahyper/README.md 2021-05-07 20:14:04 UTC (rev 59116)
@@ -52,6 +52,7 @@
Revision History
----------------
+ * Version 0.8 〈2021/05/05〉
* Version 0.7b 〈2021/02/26〉
* Version 0.7a 〈2021/02/23〉
* Version 0.7 〈2021/02/13〉
Modified: trunk/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex
===================================================================
--- trunk/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex 2021-05-07 20:13:46 UTC (rev 59115)
+++ trunk/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex 2021-05-07 20:14:04 UTC (rev 59116)
@@ -6,8 +6,8 @@
\MakeShortVerb{\|}
\usepackage{bxtexlogo}
\bxtexlogoimport{*}
-\newcommand{\PkgVersion}{0.7b}
-\newcommand{\PkgDate}{2021/02/26}
+\newcommand{\PkgVersion}{0.8}
+\newcommand{\PkgDate}{2021/05/05}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$}
\newcommand{\Note}{\par\noindent ※}
Modified: trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def
===================================================================
--- trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def 2021-05-07 20:13:46 UTC (rev 59115)
+++ trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def 2021-05-07 20:14:04 UTC (rev 59116)
@@ -11,7 +11,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesFile{pxjahyper-ajm.def}[2021/02/26 v0.7b]
+\ProvidesFile{pxjahyper-ajm.def}[2021/05/05 v0.8]
%% avoid multiple loading
\csname pxjahyperajmLoaded\endcsname
@@ -645,7 +645,7 @@
%% ad-hoc redefinitions
\pxhy at DeclareMacro{DKunoji}{\UTF{3032}}
-\pxhy at DeclareMacro{KunojiwithBou}{\UTF{3032}}
+\pxhy at DeclareMacro{DKunojiwithBou}{\UTF{3032}}
\pxhy at DeclareMacro{Kunoji}{\UTF{3031}}
\pxhy at DeclareMacro{KunojiwithBou}{\UTF{3031}}
\pxhy at DeclareMacro{Yusuriten}{\CID{16193}}
Modified: trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty
===================================================================
--- trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty 2021-05-07 20:13:46 UTC (rev 59115)
+++ trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty 2021-05-07 20:14:04 UTC (rev 59116)
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxjahyper-enc}[2021/02/26 v0.7b]
+\ProvidesPackage{pxjahyper-enc}[2021/05/05 v0.8]
\def\pxhe at pkgname{pxjahyper-enc}
\providecommand{\bxDebug}[1]{}
Modified: trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty
===================================================================
--- trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty 2021-05-07 20:13:46 UTC (rev 59115)
+++ trunk/Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty 2021-05-07 20:14:04 UTC (rev 59116)
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxjahyper}[2021/02/26 v0.7b]
+\ProvidesPackage{pxjahyper}[2021/05/05 v0.8]
\def\pxhy at pkgname{pxjahyper}
\providecommand{\bxDebug}[1]{}
@@ -36,6 +36,7 @@
\newif\ifpxhy at zerox
\newif\ifpxhy at bigcode
\let\pxhy at bigcode@given\relax
+\newif\ifpxhy at papersize
\chardef\pxhy at driver@none=0
\chardef\pxhy at driver@dvipdfmx=1
\let\pxhy at driver\@undefined
@@ -74,6 +75,12 @@
\DeclareOption{noout2uni}{%
\pxhy at zeroxfalse
}
+\DeclareOption{papersize}{%
+ \pxhy at papersizetrue
+}
+\DeclareOption{nopapersize}{%
+ \pxhy at papersizefalse
+}
\pxhy at bigcodetrue
\DeclareOption{bigcode}{%
\pxhy at bigcodetrue
@@ -198,6 +205,10 @@
\ifpxhy at zerox
\pxhy at tounicodefalse
\fi
+%% pxhy at papersize switch
+\ifnum\pxhy at driver=\pxhy at driver@none
+ \pxhy at papersizefalse
+\fi
% hyperref 'unicode' is allowed only on upLaTeX.
\ifnum0\ifpxhy at hy@unicode\ifpxhy at uptex\else1\fi\fi>\z@
\PackageError\pxhy at pkgname
@@ -271,6 +282,20 @@
\let\pxhy at forcecjktoken\relax
\fi
+%% \pxhy at hook@after at package{<package-name>}{<code>}
+\@onlypreamble\pxhy at hook@after at package
+\def\pxhy at hook@after at package#1#2{%
+ \ifpxhy at new@hook at system
+ \@ifpackageloaded{#1}{#2}{%
+ \AddToHook{package/after/#1}{#2}%
+ }%
+ \else
+ \AtBeginDocument{%
+ \@ifpackageloaded{#1}{#2}{}%
+ }%
+ \fi
+}
+
%--------------------------------------- Helpers (e-TeX)
\ifpxhy at etex
@@ -308,6 +333,7 @@
\fi
%--------------------------------------- Papersize special adjustment
+\ifpxhy at papersize %<*papersize>
% When the magnification is in effect (i.e. \mag<>1000), hyperref
% emits a papersize special with wrong value. (dvipdfmx interprets
@@ -338,6 +364,7 @@
\fi
\fi
+\fi %</papersize>
%--------------------------------------- Hooks to pdfstringdef
%% constants
@@ -482,11 +509,11 @@
%--------------------------------------- Support for 'otfcid'
\ifpxhy at otfcid
-%% variables
+%% \pxhy at otfcid@disabled
+% Holds the message if otfcid/otfmacros is unavailable;
+% otherwise equals to \relax.
\@onlypreamble\pxhy at otfcid@disabled
\let\pxhy at otfcid@disabled\relax
-
-%% preparation
\ifpxhy at etoolbox
% check if bxjatoucs is available
\IfFileExists{bxjatoucs.sty}{%
@@ -508,10 +535,10 @@
e-TeX extension is unavailable%
}
\fi\fi
+
%% annihilate the ajmacros's own pdfstring process
\ifpxhy at otfmacros\ifx\pxhy at otfcid@disabled\relax
\let\ajRedefine at ajCommands\relax
- \AtBeginDocument{\let\ajRedefine at ajCommands\relax}
\fi\fi
%% \pxhy at CID{<cid>}
@@ -535,11 +562,25 @@
%% \pxhy at dispatch@otfcid
\@onlypreamble\pxhy at dispatch@otfcid
\def\pxhy at dispatch@otfcid{%
- \pdfstringdefDisableCommands{%
- \let\CID\pxhy at CID
- }%
- \ifpxhy at otfmacros
- \ifx\ajSnowman\@undefined\else % ajmacros is loaded
+ \global\let\pxhy at dispatch@otfcid\relax
+ \ifx\pxhy at otfcid@disabled\relax % available!
+ \pdfstringdefDisableCommands{%
+ \let\CID\pxhy at CID
+ }%
+ \else
+ \PackageWarningNoLine\pxhy at pkgname
+ {Option 'otfcid'/'otfmacros' is disabled, because\MessageBreak
+ \pxhy at otfcid@disabled}%
+ \pxhy at otfcidfalse
+ \fi
+}
+
+%% \pxhy at dispatch@otfmacros
+\@onlypreamble\pxhy at dispatch@otfmacros
+\def\pxhy at dispatch@otfmacros{%
+ \global\let\pxhy at dispatch@otfmacros\relax
+ \ifx\pxhy at otfcid@disabled\relax % available!
+ \let\ajRedefine at ajCommands\relax
\chardef\pxhy at tmp@orgcc=\catcode`\@
\makeatletter
\InputIfFileExists{pxjahyper-ajm.def}{%
@@ -550,23 +591,15 @@
{File 'pxjahyper-ajm.def' not found\@gobble}%
}%
\catcode`\@=\pxhy at tmp@orgcc
- \fi
+ \else \pxhy at otfmacrosfalse
\fi
}
-%% begin-document hook
-\AtBeginDocument{%
- \@ifpackageloaded{otf}{%
- \ifx\pxhy at otfcid@disabled\relax % available!
- \pxhy at dispatch@otfcid
- \else
- \PackageWarningNoLine\pxhy at pkgname
- {Option 'otfcid'/'otfmacros' is disabled, because\MessageBreak
- \pxhy at otfcid@disabled}%
- \pxhy at otfcidfalse
- \fi
- }{}%
-}
+%% enable hooks
+\pxhy at hook@after at package{otf}{\pxhy at dispatch@otfcid}
+\ifpxhy at otfmacros
+ \pxhy at hook@after at package{ajmacros}{\pxhy at dispatch@otfmacros}
+\fi
\fi
%--------------------------------------- Redefine text commands for PD1
More information about the tex-live-commits
mailing list.