summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-10-14 21:45:03 +0000
committerKarl Berry <karl@freefriends.org>2020-10-14 21:45:03 +0000
commit3ff190b96a3589b168c11cec5d03498ac618faed (patch)
treee99597351dcf4cd9c402e888cbaf0c1553491e97 /Master/texmf-dist
parent0ef3dcb3c18808eb4d84c959d8d91b1a121c1821 (diff)
pxjahyper (14oct20)
git-svn-id: svn://tug.org/texlive/trunk@56662 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/platex/pxjahyper/README-ja.md12
-rw-r--r--Master/texmf-dist/doc/platex/pxjahyper/README.md1
-rw-r--r--Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex4
-rw-r--r--Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-ajm.def2
-rw-r--r--Master/texmf-dist/tex/platex/pxjahyper/pxjahyper-enc.sty9
-rw-r--r--Master/texmf-dist/tex/platex/pxjahyper/pxjahyper.sty32
6 files changed, 16 insertions, 44 deletions
diff --git a/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md b/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md
index bacc24b43fb..f9126c84eda 100644
--- a/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md
+++ b/Master/texmf-dist/doc/platex/pxjahyper/README-ja.md
@@ -49,12 +49,11 @@ pxjahyper-enc パッケージ ー 文字コード設定
### パッケージオプション
-※オプション無しでの読込が望ましい。一応グローバルのドライバオプション
-に反応するが、これについても「ドライバ指定が dvipdfmx である場合にのみ
-読み込む」のが望ましい。
+※オプション無しでの読込が望ましいが、一応グローバルのドライバオプション
+に反応するようにしている。
- * ドライバオプション:`dvipdfmx`/`dvips`/`nodvidriver` があり、`dvips`
- はエラーになり、`nodvidriver` はパッケージの機能を無効化する。
+ * ドライバオプション:`dvipdfmx`/`dvips`/`nodvidriver` があり、
+ `dvipdfmx` 以外を指定した場合はパッケージの機能を無効化する。
### 機能
@@ -71,6 +70,9 @@ pxjahyper-enc パッケージ ー 文字コード設定
更新履歴
--------
+ * Version 0.6a 〈2020/10/10〉
+ - pxjahyper-enc:`dvips` 指定時はエラーでなく警告を出す。
+
* Version 0.6 〈2020/10/05〉
- pxjahyper-enc パッケージを追加した。
- `otfmacros` オプションを既定で有効にする。
diff --git a/Master/texmf-dist/doc/platex/pxjahyper/README.md b/Master/texmf-dist/doc/platex/pxjahyper/README.md
index c7201e43d64..476d97749e6 100644
--- a/Master/texmf-dist/doc/platex/pxjahyper/README.md
+++ b/Master/texmf-dist/doc/platex/pxjahyper/README.md
@@ -52,6 +52,7 @@ the PDF strings in the output DVI file.
Revision History
----------------
+ * Version 0.6a 〈2020/10/10〉
* Version 0.6 〈2020/10/05〉
* Version 0.5b 〈2020/10/04〉
* Version 0.5a 〈2020/09/27〉
diff --git a/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex b/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex
index c903300952b..87b782970b5 100644
--- a/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex
+++ b/Master/texmf-dist/doc/platex/pxjahyper/pxjahyper.tex
@@ -6,8 +6,8 @@
\MakeShortVerb{\|}
\usepackage{bxtexlogo}
\bxtexlogoimport{*}
-\newcommand{\PkgVersion}{0.6}
-\newcommand{\PkgDate}{2020/10/05}
+\newcommand{\PkgVersion}{0.6a}
+\newcommand{\PkgDate}{2020/10/10}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$}
\newcommand{\Note}{\par\noindent ※}
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{<text>}
-\def\pxhy@out@special#1{%
- \edef\pxhy@tmpa{%
- \noexpand\pxhy@begin@dvi@enc@hook{\special{#1}}%
- }\pxhy@tmpa
-}
-
%% \pxhy@begin@dvi@hook{<text>}
%% \pxhy@begin@dvi@enc@hook{<text>}
\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 %</dvipdfmx>
\fi