CTAN sync 202105310300

8 files changed, 121 insertions, 10 deletions

diff --git a/language/japanese/pxjahyper/README-ja.md b/language/japanese/pxjahyper/README-ja.md
index 14c1a44e1c..73a6d0f554 100644
--- a/language/japanese/pxjahyper/README-ja.md
+++ b/language/japanese/pxjahyper/README-ja.md
@@ -70,6 +70,10 @@ pxjahyper-enc パッケージ ー 文字コード設定
 更新履歴
 --------
 
+  * Version 0.9b 〈2021/05/29〉
+      - PDF 文字列中で pxbabel の `\UTFJ` をサポート。
+      - モジュール pxjahyper-uni.def を追加。
+
   * Version 0.9a 〈2021/05/11〉
       - バグ修正。
 
diff --git a/language/japanese/pxjahyper/README.md b/language/japanese/pxjahyper/README.md
index 439a0629b1..d10519799f 100644
--- a/language/japanese/pxjahyper/README.md
+++ b/language/japanese/pxjahyper/README.md
@@ -52,6 +52,7 @@ the PDF strings in the output DVI file.
 Revision History
 ----------------
 
+  * Version 0.9b 〈2021/05/29〉
   * Version 0.9a 〈2021/05/11〉
   * Version 0.9  〈2021/05/10〉
   * Version 0.8  〈2021/05/05〉
diff --git a/language/japanese/pxjahyper/pxjahyper-ajm.def b/language/japanese/pxjahyper/pxjahyper-ajm.def
index 60a00b1058..976439c0ff 100644
--- a/language/japanese/pxjahyper/pxjahyper-ajm.def
+++ b/language/japanese/pxjahyper/pxjahyper-ajm.def
@@ -11,7 +11,7 @@
 
 %% package declaration
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesFile{pxjahyper-ajm.def}[2021/05/11 v0.9a]
+\ProvidesFile{pxjahyper-ajm.def}[2021/05/29 v0.9b]
 
 %% avoid multiple loading
 \csname pxjahyperajmLoaded\endcsname
diff --git a/language/japanese/pxjahyper/pxjahyper-enc.sty b/language/japanese/pxjahyper/pxjahyper-enc.sty
index 30fb2845b7..fc33bc6fa3 100644
--- a/language/japanese/pxjahyper/pxjahyper-enc.sty
+++ b/language/japanese/pxjahyper/pxjahyper-enc.sty
@@ -10,7 +10,7 @@
 
 %% package declaration
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxjahyper-enc}[2021/05/11 v0.9a]
+\ProvidesPackage{pxjahyper-enc}[2021/05/29 v0.9b]
 \def\pxhe@pkgname{pxjahyper-enc}
 \providecommand{\bxDebug}[1]{}
 
diff --git a/language/japanese/pxjahyper/pxjahyper-uni.def b/language/japanese/pxjahyper/pxjahyper-uni.def
new file mode 100644
index 0000000000..54671ca190
--- /dev/null
+++ b/language/japanese/pxjahyper/pxjahyper-uni.def
@@ -0,0 +1,104 @@
+%%
+%% This is file 'pxjahyper-uni.def'.
+%% 
+%% Copyright (c) 2012-2021 Takayuki YATO (aka. "ZR")
+%%   GitHub:   https://github.com/zr-tex8r
+%%   Twitter:  @zr_tex8r
+%%
+%% This package is distributed under the MIT License.
+%%
+
+%% package declaration
+\NeedsTeXFormat{pLaTeX2e}
+\ProvidesFile{pxjahyper-uni.def}[2021/05/29 v0.9b]
+\providecommand{\bxDebug}[1]{}
+
+%--------------------------------------- environment check
+
+\@ifpackageloaded{hyperref}{}{%else
+  \bxDebug{pxjahyper-uni: hyperref not yet loaded}%
+  \endinput}
+
+%% if already redefined, then okay
+\def\pxhy@tmpa#1{\@backslashchar 000#1}
+\ifx\HyPsd@Char\pxhy@tmpa\else
+  \bxDebug{pxjahyper-uni: already redefined}
+  \let\jsCheckHyperrefUnicode\@empty
+\expandafter\endinput\fi\relax
+
+%% if this is pTeX and pxjatoucs is not loaded, then quit
+\if \ifnum\jis"2121="3000 F%
+    \else\ifx\bxjaSjisToUcs\@undefined T\else F%
+    \fi\fi T%
+  \bxDebug{pxjahyper-uni: bxjatoucs not yet loaded}
+\expandafter\endinput\fi\relax
+
+%--------------------------------------- the patch
+
+%% The following code is taken from hyperref.sty.
+%%%%BEGIN
+  \def\HyPsd@Char#1{%
+    \ifnum`#1<128 %
+      \@backslashchar 000#1%
+    \else
+      \ifnum`#1<65536 %
+        \expandafter\HyPsd@CharTwoByte\number`#1!%
+      \else
+        \expandafter\expandafter\expandafter\HyPsd@CharSurrogate
+        \intcalcSub{`#1}{65536}!%
+      \fi
+    \fi
+  }%
+  \def\HyPsd@CharTwoByte#1!{%
+    \expandafter\expandafter\expandafter\HyPsd@CharOctByte
+    \IntCalcDiv#1!256!!%
+    \expandafter\expandafter\expandafter\HyPsd@CharOctByte
+    \IntCalcMod#1!256!!%
+  }%
+  \def\HyPsd@CharOctByte#1!{%
+    \@backslashchar
+    \IntCalcDiv#1!64!%
+    \intcalcDiv{\IntCalcMod#1!64!}{8}%
+    \IntCalcMod#1!8!%
+  }%
+  \def\HyPsd@CharSurrogate#1!{%
+    \@backslashchar 33%
+    \IntCalcDiv#1!262144!%
+    \expandafter\expandafter\expandafter\HyPsd@CharOctByte
+    \intcalcDiv{\IntCalcMod#1!262144!}{1024}!%
+    \@backslashchar 33%
+    \expandafter\expandafter\expandafter\IntCalcAdd
+    \intcalcDiv{\IntCalcMod#1!1024!}{256}!4!%
+    \expandafter\expandafter\expandafter\HyPsd@CharOctByte
+    \IntCalcMod#1!256!!%
+  }%
+%%%%END
+
+\ifnum\jis"2121="3000 \else             %<*pTeX>
+  \def\HyPsd@Char#1{%
+    \ifnum`#1<128 %
+      \@backslashchar 000#1%
+    \else\ifnum`#1<256 %
+      \expandafter\HyPsd@CharTwoByte\number`#1!%
+    \else
+      \expandafter\HyPsd@CharTwoByte\number\pxhy@to@ucs{`#1}!%
+    \fi\fi
+  }%
+  \def\pxhy@to@ucs#1{"FFFD}
+  \ifnum\jis"2121="8140 % sjis
+    \let\pxhy@to@ucs\bxjaSjisToUcs
+  \else\ifnum\jis"2121="A1A1 % euc
+    \let\pxhy@to@ucs\bxjaEucToUcs
+  \fi\fi
+\fi                                     %</pTeX>
+
+%% set flag
+\let\pxHyperrefUnicodePatched=t
+\bxDebug{pxjahyper-uni: patched}
+
+%% disable the verification of bxjscls
+\let\jsCheckHyperrefUnicode\@empty
+
+%--------------------------------------- done
+\endinput
+%% EOF
diff --git a/language/japanese/pxjahyper/pxjahyper.pdf b/language/japanese/pxjahyper/pxjahyper.pdf
index 586bdacd1f..02224f5d8b 100644
--- a/language/japanese/pxjahyper/pxjahyper.pdf
+++ b/language/japanese/pxjahyper/pxjahyper.pdf
diff --git a/language/japanese/pxjahyper/pxjahyper.sty b/language/japanese/pxjahyper/pxjahyper.sty
index 62705205c7..f23d94a223 100644
--- a/language/japanese/pxjahyper/pxjahyper.sty
+++ b/language/japanese/pxjahyper/pxjahyper.sty
@@ -10,7 +10,7 @@
 
 %% package declaration
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxjahyper}[2021/05/11 v0.9a]
+\ProvidesPackage{pxjahyper}[2021/05/29 v0.9b]
 \def\pxhy@pkgname{pxjahyper}
 \providecommand{\bxDebug}[1]{}
 
@@ -666,6 +666,9 @@ pxhy@textcmd = \ifpxhy@textcmd true\else false\fi^^J%
 \ifx\pxhy@Ux\@undefined\else
   \pdfstringdefDisableCommands{%
     \let\Ux\pxhy@Ux
+    % bxbase
+    \let\bxUx\pxhy@Ux
+    \let\bxUI\pxhy@Ux
   }
 \fi
 
@@ -696,6 +699,8 @@ pxhy@textcmd = \ifpxhy@textcmd true\else false\fi^^J%
     \let\UTFK\pxhy@UTF
     \let\UTFC\pxhy@UTF
     \let\UTFT\pxhy@UTF
+    % pxbabel
+    \let\pxUTFJ\pxhy@UTF
   }
 }
 
diff --git a/language/japanese/pxjahyper/pxjahyper.tex b/language/japanese/pxjahyper/pxjahyper.tex
index f0f2fa15ca..aaf7e2cb65 100644
--- a/language/japanese/pxjahyper/pxjahyper.tex
+++ b/language/japanese/pxjahyper/pxjahyper.tex
@@ -6,8 +6,8 @@
 \MakeShortVerb{\|}
 \usepackage{bxtexlogo}
 \bxtexlogoimport{*}
-\newcommand{\PkgVersion}{0.9a}
-\newcommand{\PkgDate}{2021/05/11}
+\newcommand{\PkgVersion}{0.9b}
+\newcommand{\PkgDate}{2021/05/29}
 \newcommand{\Pkg}[1]{\textsf{#1}}
 \newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$}
 \newcommand{\Note}{\par\noindent ※}
@@ -107,12 +107,9 @@
   |bigcode| の否定。
   \Note 0.3a版より既定を |bigcode| に変更した。
 \item |papersize|（既定）\Means
-  {\upTeX}でのToUnicode CMapとして既定のUTF8-UCSの代わりに\ 
-  UTF8-UTF16を用いる。
-  （当該のファイルが存在する必要がある。）
+  papersize specialの補正を有効にする。
 \item |nopapersize|\Means
-  |bigcode| の否定。
-  \Note 0.3a版より既定を |bigcode| に変更した。
+  |papersize| の否定。
 \end{itemize}
 
 %===========================================================