summaryrefslogtreecommitdiff
path: root/language
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-02-14 03:00:50 +0000
committerNorbert Preining <norbert@preining.info>2021-02-14 03:00:50 +0000
commit8c6ca435b3bc584eb3efe8e52417fb989e677789 (patch)
tree08bae5450fe9e553e2b28cb984cae56e8d9e0990 /language
parent3d0d4d2ed250339f704c23ea8f24670c70d5981f (diff)
CTAN sync 202102140300
Diffstat (limited to 'language')
-rw-r--r--language/japanese/platex-tools/LICENSE2
-rw-r--r--language/japanese/platex-tools/README.md2
-rw-r--r--language/japanese/platex-tools/pxatbegshi.pdfbin72780 -> 73216 bytes
-rw-r--r--language/japanese/platex-tools/pxatbegshi.sty39
-rw-r--r--language/japanese/platex-tools/pxatbegshi.tex5
-rw-r--r--language/japanese/platex-tools/pxeverysel.pdfbin53283 -> 61132 bytes
-rw-r--r--language/japanese/platex-tools/pxeverysel.sty32
-rw-r--r--language/japanese/platex-tools/pxeverysel.tex7
-rw-r--r--language/japanese/platex-tools/pxeveryshi.pdfbin51299 -> 52815 bytes
-rw-r--r--language/japanese/platex-tools/pxeveryshi.sty32
-rw-r--r--language/japanese/platex-tools/pxeveryshi.tex5
-rw-r--r--language/japanese/platex/LICENSE2
-rw-r--r--language/japanese/platex/README.md2
-rw-r--r--language/japanese/platex/platexrelease.dtx23
-rw-r--r--language/japanese/platex/platexrelease.pdfbin107343 -> 107870 bytes
-rw-r--r--language/japanese/platex/pldoc.pdfbin856411 -> 868006 bytes
-rw-r--r--language/japanese/platex/plfonts.dtx307
-rw-r--r--language/japanese/platex/plvers.dtx2
-rw-r--r--language/japanese/plautopatch/LICENSE2
-rw-r--r--language/japanese/plautopatch/README.md2
-rw-r--r--language/japanese/plautopatch/plautopatch-ja.pdfbin89899 -> 89871 bytes
-rw-r--r--language/japanese/plautopatch/plautopatch-ja.tex3
-rw-r--r--language/japanese/plautopatch/plautopatch.pdfbin37003 -> 37057 bytes
-rw-r--r--language/japanese/plautopatch/plautopatch.sty12
-rw-r--r--language/japanese/plautopatch/plautopatch.tex3
-rw-r--r--language/japanese/pxjahyper/LICENSE2
-rw-r--r--language/japanese/pxjahyper/README-ja.md4
-rw-r--r--language/japanese/pxjahyper/README.md1
-rw-r--r--language/japanese/pxjahyper/pxjahyper-ajm.def4
-rw-r--r--language/japanese/pxjahyper/pxjahyper-enc.sty4
-rw-r--r--language/japanese/pxjahyper/pxjahyper.pdfbin116641 -> 116383 bytes
-rw-r--r--language/japanese/pxjahyper/pxjahyper.sty141
-rw-r--r--language/japanese/pxjahyper/pxjahyper.tex4
33 files changed, 513 insertions, 129 deletions
diff --git a/language/japanese/platex-tools/LICENSE b/language/japanese/platex-tools/LICENSE
index 9661ce7b8d..ecbe9e9df9 100644
--- a/language/japanese/platex-tools/LICENSE
+++ b/language/japanese/platex-tools/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016-2020 Hironobu Yamashita
+Copyright (c) 2016-2021 Hironobu Yamashita
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/language/japanese/platex-tools/README.md b/language/japanese/platex-tools/README.md
index 99a92286e7..a0f2b36d1a 100644
--- a/language/japanese/platex-tools/README.md
+++ b/language/japanese/platex-tools/README.md
@@ -83,6 +83,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
## Release Date
-2020-10-14
+2021-02-13
Hironobu Yamashita
diff --git a/language/japanese/platex-tools/pxatbegshi.pdf b/language/japanese/platex-tools/pxatbegshi.pdf
index f43e6c22f1..6ab8a2fa8b 100644
--- a/language/japanese/platex-tools/pxatbegshi.pdf
+++ b/language/japanese/platex-tools/pxatbegshi.pdf
Binary files differ
diff --git a/language/japanese/platex-tools/pxatbegshi.sty b/language/japanese/platex-tools/pxatbegshi.sty
index 3c8a830415..856b95eb44 100644
--- a/language/japanese/platex-tools/pxatbegshi.sty
+++ b/language/japanese/platex-tools/pxatbegshi.sty
@@ -30,29 +30,42 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{pxatbegshi}
- [2020/09/25 v0.7 Patch to atbegshi for (u)pLaTeX]
-
-%% preparations
-\def\pxabgs@pkgname{pxatbegshi}
-\def\pxabgs@warn{\PackageWarningNoLine\pxabgs@pkgname}
-
-%% load it
-\RequirePackage{atbegshi}
+ [2021/02/13 v0.7b Patch to atbegshi for (u)pLaTeX]
%% Since LaTeX2e 2020-10-01, atbegshi.sty is merely
%% an emulation by atbegshi-ltx.sty from ltshipout.dtx.
-%% The new code does NOT define \AtBegShi@Output,
-%% so we can detect it!
-\ifx\AtBegShi@Output\@undefined
- %% pLaTeX2e 2020-10-01 natively supports the situation
- \PackageInfo{pxatbegshi}{This package is no longer needed}
+\chardef\pxabgs@status=\z@
+\ifx\IfHookExistsTF\@undefined\else % >= LaTeX2e 2020-10-01
+ \IfHookExistsTF{shipout/before}{% % >= LaTeX2e 2020-10-01
+ \chardef\pxabgs@status=\@ne
+ }{}
+\fi
+\ifnum\pxabgs@status=\@ne
+ % if LaTeX2e and pLaTeX2e are inconsistent, raise an error!
+ \@ifl@t@r\pfmtversion{2020/10/01}{%
+ \PackageInfo{pxatbegshi}{This package is no longer needed}%
+ }{%
+ \PackageError{pxatbegshi}{Inconsistent LaTeX2e/pLaTeX2e combination}\@ehc
+ }%
+ \RequirePackage{atbegshi}% input anyway
\expandafter\endinput
\fi
%% The rest of this package is meant for
%% LaTeX2e 2020-02-02 PL5 or older.
+\RequirePackage{atbegshi}
+
+\ifx\AtBegShi@Output\@undefined
+ \PackageError{pxatbegshi}{This should not happen}\@ehc
+ \expandafter\endinput
+\fi
+
+%% preparations
+\def\pxabgs@pkgname{pxatbegshi}
+\def\pxabgs@warn{\PackageWarningNoLine\pxabgs@pkgname}
+
%% internal macros are locally effective
\begingroup
diff --git a/language/japanese/platex-tools/pxatbegshi.tex b/language/japanese/platex-tools/pxatbegshi.tex
index e3d34cda14..0b1b326835 100644
--- a/language/japanese/platex-tools/pxatbegshi.tex
+++ b/language/japanese/platex-tools/pxatbegshi.tex
@@ -51,8 +51,9 @@ p\LaTeX の縦組クラス(tarticle.clsなど)で使うとエラーが出て
\end{quote}
と明言します(例:\verb+aminophen/platex-tools#15+)。
-\pLaTeXe~2020-10-01以降では、同等の機能が\pLaTeXe{}カーネルに
-存在するため、\textsf{pxatbegshi}パッケージは何もしません。
+\LaTeXe~2020-10-01以降では、\textsf{atbegshi}と同等の機能がカーネルに
+実装されていて、その対処は\pLaTeXe{}カーネルでなされます。
+この場合、\textsf{pxatbegshi}パッケージは何もしません。
\newpage
\section{使いかた}
diff --git a/language/japanese/platex-tools/pxeverysel.pdf b/language/japanese/platex-tools/pxeverysel.pdf
index 01e9e6e09a..3ccbda227e 100644
--- a/language/japanese/platex-tools/pxeverysel.pdf
+++ b/language/japanese/platex-tools/pxeverysel.pdf
Binary files differ
diff --git a/language/japanese/platex-tools/pxeverysel.sty b/language/japanese/platex-tools/pxeverysel.sty
index 5c00f1830f..8a1a9b5ead 100644
--- a/language/japanese/platex-tools/pxeverysel.sty
+++ b/language/japanese/platex-tools/pxeverysel.sty
@@ -8,14 +8,40 @@
% by courtesy of the original author.
% https://github.com/aminophen/platex-tools
%
+% --------------------------------------------------------------------
+% [Note]
+% Update: version 2021/02/13 v0.9a does nothing, since
+% pLaTeX2e 2021-??-?? will support the situation natively.
+% --------------------------------------------------------------------
+%
%% package declaration
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pxeverysel}
- [2018/10/28 v0.9 Patch to everysel for (u)pLaTeX]
+ [2021/02/13 v0.9b Patch to everysel for (u)pLaTeX]
+
+%% Since LaTeX2e 2021-05-01, everysel.sty is merely
+%% an emulation by everysel-ltx.sty from firstaid.
+
+\chardef\pxys@status=\z@
+\ifx\IfHookExistsTF\@undefined\else % >= LaTeX2e 2020-10-01
+ \IfHookExistsTF{selectfont}{% % >= LaTeX2e 2021-05-01
+ \chardef\pxys@status=\@ne
+ }{}
+\fi
+\ifnum\pxys@status=\@ne
+ % if LaTeX2e and pLaTeX2e are inconsistent, raise an error!
+ \ifx\delayed@k@adjustment\@undefined
+ \PackageError{pxeverysel}{Inconsistent LaTeX2e/pLaTeX2e combination}\@ehc
+ \else
+ \PackageInfo{pxeverysel}{This package is no longer needed}%
+ \fi
+ \RequirePackage{everysel}% input anyway
+ \expandafter\endinput
+\fi
-%% previous code for ctex support has been removed in v0.5,
-%% as ctex has depended on pxeverysel since 2016/12/27 v2.4.7
+%% The rest of this package is meant for
+%% LaTeX2e 2020-10-01 PL4 or older.
%% in case it's too late ...
\@ifpackageloaded{everysel}{%
diff --git a/language/japanese/platex-tools/pxeverysel.tex b/language/japanese/platex-tools/pxeverysel.tex
index ab46087954..56b1076ffe 100644
--- a/language/japanese/platex-tools/pxeverysel.tex
+++ b/language/japanese/platex-tools/pxeverysel.tex
@@ -36,6 +36,13 @@ Martin Schr\"oder氏による\textsf{everysel}パッケージをp\LaTeX で
この\textsf{pxeverysel}パッケージを読み込むことで、p\LaTeX でも
\textsf{everysel}パッケージを使えるようになります。
+\LaTeXe~2021-05-01以降では、\textsf{everysel}と同等の機能がカーネルに
+実装されていて、その対処は\pLaTeXe{}カーネルでなされます。
+この場合、\textsf{pxeverysel}パッケージは何もしません。
+
+\newpage
+\section{使いかた}
+
使いかたは、\textsf{everysel}パッケージの代わりに、あるいは
\textsf{everysel}パッケージに追加して、\textsf{pxeverysel}パッケージを
読み込むだけです\footnote{稀に\\\texttt{%
diff --git a/language/japanese/platex-tools/pxeveryshi.pdf b/language/japanese/platex-tools/pxeveryshi.pdf
index 35418cd977..449c93f8e3 100644
--- a/language/japanese/platex-tools/pxeveryshi.pdf
+++ b/language/japanese/platex-tools/pxeveryshi.pdf
Binary files differ
diff --git a/language/japanese/platex-tools/pxeveryshi.sty b/language/japanese/platex-tools/pxeveryshi.sty
index 23bbd8abe0..0b7144a53a 100644
--- a/language/japanese/platex-tools/pxeveryshi.sty
+++ b/language/japanese/platex-tools/pxeveryshi.sty
@@ -15,25 +15,41 @@
% --------------------------------------------------------------------
%
-\NeedsTeXFormat{pLaTeX2e}
+%% package declaration
+\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pxeveryshi}
- [2020/09/25 v0.2 everyshi package for pLaTeX]
-\RequirePackageWithOptions{everyshi}
+ [2021/02/13 v0.2b everyshi package for (u)pLaTeX]
%% Since LaTeX2e 2020-10-01, everyshi.sty is merely
%% an emulation by everyshi-ltx.sty from ltshipout.dtx.
-%% The new code does NOT define \@EveryShipout@Output,
-%% so we can detect it!
-\ifx\@EveryShipout@Output\@undefined
- %% pLaTeX2e 2020-10-01 natively supports the situation
- \PackageInfo{pxeveryshi}{This package is no longer needed}
+\chardef\pxevsh@status=\z@
+\ifx\IfHookExistsTF\@undefined\else % >= LaTeX2e 2020-10-01
+ \IfHookExistsTF{shipout/before}{% % >= LaTeX2e 2020-10-01
+ \chardef\pxevsh@status=\@ne
+ }{}
+\fi
+\ifnum\pxevsh@status=\@ne
+ % if LaTeX2e and pLaTeX2e are inconsistent, raise an error!
+ \@ifl@t@r\pfmtversion{2020/10/01}{%
+ \PackageInfo{pxeveryshi}{This package is no longer needed}%
+ }{%
+ \PackageError{pxeveryshi}{Inconsistent LaTeX2e/pLaTeX2e combination}\@ehc
+ }%
+ \RequirePackageWithOptions{everyshi}% input anyway
\expandafter\endinput
\fi
%% The rest of this package is meant for
%% LaTeX2e 2020-02-02 PL5 or older.
+\RequirePackageWithOptions{everyshi}
+
+\ifx\@EveryShipout@Output\@undefined
+ \PackageError{pxeveryshi}{This should not happen}\@ehc
+ \expandafter\endinput
+\fi
+
\def\@EveryShipout@Output{%
\setbox8\vbox{%
\yoko
diff --git a/language/japanese/platex-tools/pxeveryshi.tex b/language/japanese/platex-tools/pxeveryshi.tex
index 598fba6a5b..0c5e2e5e9f 100644
--- a/language/japanese/platex-tools/pxeveryshi.tex
+++ b/language/japanese/platex-tools/pxeveryshi.tex
@@ -44,8 +44,9 @@ p\LaTeX の縦組クラス(tarticle.clsなど)で使うとエラーが出て
\textsf{everyshi}パッケージ(およびこれに依存するパッケージ)が
使えるようになります。
-\pLaTeXe~2020-10-01以降では、同等の機能が\pLaTeXe{}カーネルに
-存在するため、\textsf{pxeveryshi}パッケージは何もしません。
+\LaTeXe~2020-10-01以降では、\textsf{everyshi}と同等の機能がカーネルに
+実装されていて、その対処は\pLaTeXe{}カーネルでなされます。
+この場合、\textsf{pxeveryshi}パッケージは何もしません。
\section{使いかた}
diff --git a/language/japanese/platex/LICENSE b/language/japanese/platex/LICENSE
index cd23b4d446..b971bf78fc 100644
--- a/language/japanese/platex/LICENSE
+++ b/language/japanese/platex/LICENSE
@@ -1,5 +1,5 @@
Copyright (c) 2010 ASCII MEDIA WORKS
-Copyright (c) 2016-2020 Japanese TeX Development Community
+Copyright (c) 2016-2021 Japanese TeX Development Community
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/language/japanese/platex/README.md b/language/japanese/platex/README.md
index 404e056c3a..e7ebff5443 100644
--- a/language/japanese/platex/README.md
+++ b/language/japanese/platex/README.md
@@ -64,6 +64,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
## Release Date
-2020-10-07
+2021-02-13
Japanese TeX Development Community
diff --git a/language/japanese/platex/platexrelease.dtx b/language/japanese/platex/platexrelease.dtx
index e76a387e2e..842217c07c 100644
--- a/language/japanese/platex/platexrelease.dtx
+++ b/language/japanese/platex/platexrelease.dtx
@@ -1,7 +1,7 @@
% \iffalse meta-comment
%% File: platexrelease.dtx
%
-% Copyright (c) 2016-2020 Japanese TeX Development Community
+% Copyright (c) 2016-2021 Japanese TeX Development Community
%
% This file is part of the pLaTeX2e system (community edition).
% -------------------------------------------------------------
@@ -28,10 +28,12 @@
% (sync with latexrelease.dtx 2017/12/17 v1.0i)}
% \changes{v1.0l}{2018/04/06}{Drop an extra period in warning message
% (sync with latexrelease.dtx 2018/02/18 v1.0j)}
-% \changes{v1.0m}{2018/05/22}{reset \cs{\requestedLaTeXdate} for
+% \changes{v1.0m}{2018/05/22}{reset \cs{requestedpLaTeXdate} for
% current and latest options
% (sync with latexrelease.dtx 2018/05/08 v1.0k)}
% \changes{v1.0n}{2020/03/28}{$B@h$K(Blatexrelease$B$,FI$_9~$^$l$F$$$?$i7Y9p(B}
+% \changes{v1.0o}{2021/02/13}{\cs{sourcepLaTeXdate} added
+% (sync with latexrelease.dtx 2021/01/23 v1.0l)}
% \fi
%
% \iffalse
@@ -41,7 +43,7 @@
\ProvidesFile{platexrelease.dtx}
%</driver>
%<platexrelease>\ProvidesPackage{platexrelease}
- [2020/03/28 v1.0n latexrelease support for pLaTeX Kernel
+ [2021/02/13 v1.0o latexrelease support for pLaTeX Kernel
(including releases up to \platexreleaseversion)]
%<*driver>
\documentclass{jltxdoc}
@@ -200,7 +202,7 @@
% \section{$B%3!<%I(B}
%
% \Lpack{platexrelease}$B%Q%C%1!<%8$,FI$_9~$^$l$^$7$?$N$G!"(B
-% $B8zN(2=$N$?$a(B|\begin{document|$B$G$N3NG'%3!<%I$rL58z2=$7$^$9!#(B
+% $B8zN(2=$N$?$a(B|\begin{document}|$B$G$N3NG'%3!<%I$rL58z2=$7$^$9!#(B
% $B!J(B\file{plvers.dtx}$B$N(B2020/03/28 v1.1u$B0J9_!K!#(B
% \begin{macrocode}
%<*platexrelease>
@@ -233,9 +235,19 @@
\fi
% \end{macrocode}
%
+% \begin{macro}{\sourcepLaTeXdate}
+% $B85!9$N%U%)!<%^%C%H$NF|IU$rJ]B8$7$^$9!#(B
+% \changes{v1.0o}{2021/02/13}{\cs{sourcepLaTeXdate} added
+% (sync with latexrelease.dtx 2021/01/23 v1.0l)}
+% \begin{macrocode}
+\edef\sourcepLaTeXdate{%
+ \expandafter\@parse@version\pfmtversion//00\@nil}
+% \end{macrocode}
+% \end{macro}
+%
% \Lpack{platexrelease}$B%Q%C%1!<%8$N%*%W%7%g%s$rDj5A$7$^$9!#%3!<%I$O(B
% \Lpack{latexrelease}$B$N$b$N$r(Bp\LaTeXe{}$BMQ$K=q$-49$($?$b$N$G$9!#(B
-% \changes{v1.0m}{2018/05/22}{reset \cs{\requestedLaTeXdate} for
+% \changes{v1.0m}{2018/05/22}{reset \cs{requestedpLaTeXdate} for
% current and latest options
% (sync with latexrelease.dtx 2018/05/08 v1.0k)}
% \begin{macrocode}
@@ -339,6 +351,7 @@ of this package available from CTAN}
some critical bugs. We advise you to\MessageBreak
select another format date}
\plIncludeInRelease{2017/10/28}{\PackageWarning}{pLaTeX Info}%
+ % * <2020-10-01>+2 (prepare for LaTeX2e <2021-05-01>)
% * <2020-10-01>+1
% * <2020-10-01>
% * <2020-04-12>
diff --git a/language/japanese/platex/platexrelease.pdf b/language/japanese/platex/platexrelease.pdf
index 6addbab84c..2100e9cc62 100644
--- a/language/japanese/platex/platexrelease.pdf
+++ b/language/japanese/platex/platexrelease.pdf
Binary files differ
diff --git a/language/japanese/platex/pldoc.pdf b/language/japanese/platex/pldoc.pdf
index 83368ed5e7..ba12e12781 100644
--- a/language/japanese/platex/pldoc.pdf
+++ b/language/japanese/platex/pldoc.pdf
Binary files differ
diff --git a/language/japanese/platex/plfonts.dtx b/language/japanese/platex/plfonts.dtx
index 2ccf9c3790..9eae7852a1 100644
--- a/language/japanese/platex/plfonts.dtx
+++ b/language/japanese/platex/plfonts.dtx
@@ -3,7 +3,7 @@
%
% Copyright 1994-2006 ASCII Corporation.
% Copyright (c) 2010 ASCII MEDIA WORKS
-% Copyright (c) 2016-2020 Japanese TeX Development Community
+% Copyright (c) 2016-2021 Japanese TeX Development Community
%
% This file is part of the pLaTeX2e system (community edition).
% -------------------------------------------------------------
@@ -167,13 +167,21 @@
% \changes{v1.7h}{2020/09/28}{New hook management interface
% (sync with ltfssini.dtx 2020/08/21 v3.2b)}
% \changes{v1.7i}{2020/10/07}{$B%U%C%/%7%9%F%`$NM-L5H=Dj$r2~NI(B}
+% \changes{v1.7j}{2020/12/29}{Drop ``m'' for latex2e issue 453
+% (sync with ltfssbas.dtx 2020/12/10 v3.2h)}
+% \changes{v1.7k}{2021/01/10}{Distangle series and shape update (latex2e/444)
+% (sync with ltfssaxes.dtx 2020/12/22 v1.0h)}
+% \changes{v1.7k}{2021/01/10}{Execute delayed series and shape updates (latex2e/444)
+% (sync with ltfsstrc.dtx 2020/12/22 v3.0n)}
+% \changes{v1.7k}{2021/01/10}{Adjust start values for series and shape (latex2e/444)
+% (sync with ltfssini.dtx 2020/12/06 v3.2f)}
% \fi
%
% \iffalse
%<*driver>
\NeedsTeXFormat{pLaTeX2e}
% \fi
-\ProvidesFile{plfonts.dtx}[2020/10/07 v1.7i pLaTeX New Font Selection Scheme]
+\ProvidesFile{plfonts.dtx}[2021/01/10 v1.7k pLaTeX New Font Selection Scheme]
% \iffalse
\documentclass{jltxdoc}
\GetFileInfo{plfonts.dtx}
@@ -306,7 +314,7 @@
%<*trace>
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{ptrace}
- [2020/03/26 v1.7e Standard pLaTeX package (font tracing)]
+ [2021/01/10 v1.7k Standard pLaTeX package (font tracing)]
\RequirePackageWithOptions{tracefnt}
%</trace>
% \end{macrocode}
@@ -1779,7 +1787,7 @@
%
% \subsubsection{$B%U%)%s%H$NA*Br(B}
% \begin{macro}{\selectfont}
-% |\selectfont|$B$N%*%j%8%J%k$+$i$NJQ99ItJ,$O!"<!$N#3E@$G$9!#(B
+% |\selectfont|$B$N%*%j%8%J%k$+$i$NJQ99ItJ,$O!"<!$N(B3$BE@$G$9!#(B
% \begin{itemize}
% \item $BOBJ8=qBN$rJQ99$9$kItJ,(B
% \item $B=>B0=qBN$KJQ99$9$kItJ,(B
@@ -1790,13 +1798,121 @@
% \changes{v1.2}{1995/11/22}{$B%(%i!<%U%)%s%H$KBP1~$7$?(B}
% \changes{v1.3n}{2004/08/10}{$BOBJ8%(%s%3!<%G%#%s%0$N@Z$jBX$($rM-8z2=(B}
% \changes{v1.7e}{2020/03/26}{$B=D2#%(%s%3!<%G%#%s%0$N%;%C%H2=3NG'(B}
-% |\selectfont|$B%3%^%s%I$O!"$^$:!"OBJ8%U%)%s%H$r@Z$jBX$($^$9!#(B
% \begin{macrocode}
%</plcore>
%<platexrelease|trace>\plIncludeInRelease{2020/04/12}{\selectfont}
%<platexrelease|trace> {Check \KanjiEncodingPair}%
%<*plcore|platexrelease|trace>
+\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN
+%%
+\DeclareRobustCommand\selectfont{%
+ \let\tmp@error@fontshape\error@fontshape
+ \let\error@fontshape\error@kfontshape
+ \edef\tmp@item{{\k@encoding}}%
+ \expandafter\expandafter\expandafter
+ \inlist@\expandafter\tmp@item\expandafter{\kyenc@list}%
+ \ifin@
+ \let\cy@encoding\k@encoding
+ \ensure@KanjiEncodingPair{t}%
+ \edef\ct@encoding{\csname t@enc@\k@encoding\endcsname}%
+ \else
+ \expandafter\expandafter\expandafter
+ \inlist@\expandafter\tmp@item\expandafter{\ktenc@list}%
+ \ifin@
+ \let\ct@encoding\k@encoding
+ \ensure@KanjiEncodingPair{y}%
+ \edef\cy@encoding{\csname y@enc@\k@encoding\endcsname}%
+ \else
+ \@latex@error{KANJI Encoding scheme `\k@encoding' unknown}\@eha
+ \fi
+ \fi
+ \let\font\tfont
+ \let\k@encoding\ct@encoding
+ \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}%
+ \pickup@font
+ \font@name
+ \let\font\jfont
+ \let\k@encoding\cy@encoding
+ \xdef\font@name{\csname\curr@kfontshape/\f@size\endcsname}%
+ \pickup@font
+ \font@name
+ \expandafter\def\expandafter\k@encoding\tmp@item
+ \kenc@update
+ \let\error@fontshape\tmp@error@fontshape
+ \if@knjcmd \@knjcmdfalse
+ \expandafter\ifx
+ \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname\relax
+ \expandafter\ifx
+ \csname rel@\k@encoding/\k@family/\k@series/all\endcsname\relax
+ \else
+ \csname rel@\k@encoding/\k@family/\k@series/all\endcsname
+ \fi
+ \else
+ \csname rel@\k@encoding/\k@family/\k@series/\k@shape\endcsname
+ \fi
+ \fi
+ \let\font\afont
+ \xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}%
+ \pickup@font
+ \font@name
+%<trace> \ifnum \tracingfonts>\tw@
+%<trace> \@font@info{Roman:Switching to \font@name}\fi
+ \enc@update
+ \ifx\f@linespread\baselinestretch \else
+ \set@fontsize\baselinestretch\f@size\f@baselineskip
+ \fi
+ \size@update}
+%%
+\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+%%
\DeclareRobustCommand\selectfont{%
+% \end{macrocode}
+% $B:G=i$K!"CY$i$;$F$$$?%7%j!<%:!&%7%'%$%W$NCM99?7$r9T$$$^$9!#(B
+% \changes{v1.7k}{2021/01/10}{Execute delayed series and shape updates (latex2e/444)
+% (sync with ltfsstrc.dtx 2020/12/22 v3.0n)}
+% \begin{macrocode}
+ % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n BEGIN
+ \ifx\delayed@k@adjustment\@empty
+ \else
+ \let\k@shape@saved\k@shape
+ \let\k@series@saved\k@series
+ \delayed@k@adjustment
+ \begingroup\let\f@encoding\k@encoding\let\f@family\k@family
+ \maybe@load@fontshape\endgroup
+ \ifcsname \k@encoding/\k@family/\k@series/\k@shape \endcsname
+ \else
+ \let\k@shape\k@shape@saved
+ \let\k@series\k@series@saved
+ \let\delayed@merge@kanji@shape\merge@kanji@shape
+ \let\delayed@merge@kanji@series\merge@kanji@series
+ \delayed@k@adjustment
+ \let\delayed@merge@kanji@shape\merge@kanji@shape@without@substitution
+ \let\delayed@merge@kanji@series\merge@kanji@series@without@substitution
+ \fi
+ \let\delayed@k@adjustment\@empty
+ \fi
+ \ifx\delayed@f@adjustment\@empty
+ \else
+ \let\f@shape@saved\f@shape
+ \let\f@series@saved\f@series
+ \delayed@f@adjustment
+ \maybe@load@fontshape
+ \ifcsname \f@encoding/\f@family/\f@series/\f@shape \endcsname
+ \else
+ \let\f@shape\f@shape@saved
+ \let\f@series\f@series@saved
+ \let\delayed@merge@font@shape\merge@font@shape
+ \let\delayed@merge@font@series\merge@font@series
+ \delayed@f@adjustment
+ \let\delayed@merge@font@shape\merge@font@shape@without@substitution
+ \let\delayed@merge@font@series\merge@font@series@without@substitution
+ \fi
+ \let\delayed@f@adjustment\@empty
+ \fi
+ % !! sync with ltfsstrc.dtx 2020/12/22 v3.0n END
+% \end{macrocode}
+% p\LaTeXe{}$B$N(B|\selectfont|$B%3%^%s%I$O!"$^$:!"OBJ8%U%)%s%H$r@Z$jBX$($^$9!#(B
+% \begin{macrocode}
\let\tmp@error@fontshape\error@fontshape
\let\error@fontshape\error@kfontshape
\edef\tmp@item{{\k@encoding}}%
@@ -1855,15 +1971,13 @@
\xdef\font@name{\csname\curr@fontshape/\f@size\endcsname}%
\pickup@font
\font@name
-%<trace> \ifnum \tracingfonts>\tw@
-%<trace> \@font@info{Roman:Switching to \font@name}\fi
+ \UseHook{selectfont}% since LaTeX2e 2021-05-01
\enc@update
% \end{macrocode}
% $B:G8e$K!"%5%$%:$,JQ99$5$l$F$$$l$P!"%Y!<%9%i%$%s$ND4@0$J$I$r9T$J$$$^$9!#(B
% $B1Q8lHG$N(B|\selectfont|$B$G$O:G=i$K9T$J$C$F$$$^$9$,!"(B
% p\LaTeXe{}$B$G$O%Y!<%9%i%$%s%7%U%H$ND4@0$r$9$k$?$a$K!"(B
% $B=qBN$r3NDj$7$J$1$l$P$J$i$J$$$?$a!"0lHV:G8e$K9T$J$$$^$9(B
-%
% \changes{v1.1b}{1995/04/26}{$B%Y!<%9%i%$%s$ND4@0$r%5%$%:JQ99;~$K(B
% $B9T$J$&$h$&$K$7$?(B}
% \begin{macrocode}
@@ -1871,6 +1985,8 @@
\set@fontsize\baselinestretch\f@size\f@baselineskip
\fi
\size@update}
+%%
+\fi % --- for >= 2021-05-01 END
%</plcore|platexrelease|trace>
%<platexrelease|trace>\plEndIncludeInRelease
%<platexrelease|trace>\plIncludeInRelease{0000/00/00}{\selectfont}
@@ -2510,6 +2626,21 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\delayed@k@adjustment}
+% \LaTeXe~2021-05-01$B$GDI2C$5$l$?(B|\delayed@f@adjustment|$B$NOBJ8HG$G$9!#(B
+% \changes{v1.7k}{2021/01/10}{Distangle series and shape update (latex2e/444)
+% (sync with ltfssaxes.dtx 2020/12/22 v1.0h)}
+% \begin{macrocode}
+%<*plcore|platexrelease>
+\ifx\delayed@f@adjustment\@undefined % old
+ \let\delayed@k@adjustment\@undefined
+\else % 2021-05-01
+ \let\delayed@k@adjustment\@empty
+\fi
+%</plcore|platexrelease>
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\romanseries}
% \begin{macro}{\kanjiseries}
% \begin{macro}{\fontseries}
@@ -2519,6 +2650,10 @@
% 2019$BG/$^$G$OL5>r7o$K;XDj$5$l$?$H$*$j$N%7%j!<%:$rA*Br$7$F$$$^$7$?$,!"(B
% \LaTeXe~2020-02-02$B0J9_$G$O!"(B|\DeclareFontSeriesChangeRule|$B$K$h$C$F(B
% $B@k8@$5$l$?!V%7%j!<%:99?75,B'!W$K4p$E$-%7%j!<%:$rA*Br$7$^$9!#(B
+%
+% \LaTeXe~2021-05-01$B0J9_$G$O!"%7%j!<%:$N99?7$r(B|\selectfont|$B$^$GCY$i$;$^$9!#(B
+% \changes{v1.7k}{2021/01/10}{Distangle series and shape update (latex2e/444)
+% (sync with ltfssaxes.dtx 2020/12/22 v1.0h)}
% \begin{macrocode}
%<*plcore|platexrelease>
\ifx\fontseriesforce\@undefined % old
@@ -2526,9 +2661,19 @@
\DeclareRobustCommand\kanjiseries[1]{\edef\k@series{#1}}
\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}
\else % 2020-02-02
+\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN
\DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse\merge@font@series{#1}}
\DeclareRobustCommand\kanjiseries[1]{\@forced@seriesfalse\merge@kanji@series{#1}}
\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}
+\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+\DeclareRobustCommand\romanseries[1]{\@forced@seriesfalse
+ \expandafter\def\expandafter\delayed@f@adjustment\expandafter
+ {\delayed@f@adjustment\delayed@merge@font@series{#1}}}
+\DeclareRobustCommand\kanjiseries[1]{\@forced@seriesfalse
+ \expandafter\def\expandafter\delayed@k@adjustment\expandafter
+ {\delayed@k@adjustment\delayed@merge@kanji@series{#1}}}
+\DeclareRobustCommand\fontseries[1]{\kanjiseries{#1}\romanseries{#1}}
+\fi % --- for >= 2021-05-01 END
\fi
% \end{macrocode}
% \end{macro}
@@ -2548,9 +2693,19 @@
\let\romanseriesforce\@undefined
\let\kanjiseriesforce\@undefined
\else % 2020-02-02
+\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN
\DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue\edef\f@series{#1}}
\DeclareRobustCommand\kanjiseriesforce[1]{\@forced@seriestrue\edef\k@series{#1}}
\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}}
+\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+\DeclareRobustCommand\romanseriesforce[1]{\@forced@seriestrue
+ \expandafter\def\expandafter\delayed@f@adjustment\expandafter
+ {\delayed@f@adjustment\edef\f@series{#1}}}
+\DeclareRobustCommand\kanjiseriesforce[1]{\@forced@seriestrue
+ \expandafter\def\expandafter\delayed@k@adjustment\expandafter
+ {\delayed@k@adjustment\edef\k@series{#1}}}
+\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}}
+\fi % --- for >= 2021-05-01 END
\fi
% \end{macrocode}
% \end{macro}
@@ -2584,8 +2739,13 @@
% \begin{macrocode}
\set@target@series@kanji{#2}%
\else
+%^^A [TODO] BEGIN
+%^^A LaTeX2e 2021-05-01 $B$G$O(B |\maybe@load@fontshape| $B$O:o=|$5$l$k!#(B
+%^^A $BM}M3!'=hM}$,(B |\selectfont| $B$^$GCY$l$k$N$GITMW$H$N$3$H!#(B
+%^^A $B$7$+$7!"$J$<$+(B ltfssaxes.dtx $B$G(B rollback $B$NBP=h$,L5$$$h$&$J!)(B
\begingroup\let\f@encoding\k@encoding\let\f@family\k@family
\maybe@load@fontshape\endgroup
+%^^A [TODO] END
\edef\reserved@a{\k@encoding /\k@family /#1/\k@shape}%
\ifcsname \reserved@a \endcsname
% \end{macrocode}
@@ -2614,6 +2774,40 @@
\series@maybe@drop@one@m\k@series\k@series
}
\fi
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\merge@kanji@series@without@substitution}
+% \begin{macro}{\merge@kanji@series@without@substitution@}
+% \begin{macro}{\delayed@merge@kanji@series}
+% \cs{merge@font@series@without@substitution}$B$NOBJ8HG$G$9!#(B
+% \changes{v1.7k}{2021/01/10}{Distangle series and shape update (latex2e/444)
+% (sync with ltfssaxes.dtx 2020/12/22 v1.0h)}
+% \begin{macrocode}
+\ifx\merge@font@series@without@substitution\@undefined % old
+\let\merge@kanji@series@without@substitution\@undefined
+\let\merge@kanji@series@without@substitution@\@undefined
+\let\delayed@merge@kanji@series\@undefined
+\else % 2021-05-01
+\def\merge@kanji@series@without@substitution#1{%
+ \expandafter\expandafter\expandafter
+ \merge@kanji@series@without@substitution@
+ \csname series@\k@series @#1\endcsname
+ {#1}%
+ \@nil
+}
+\def\merge@kanji@series@without@substitution@#1#2#3\@nil{%
+ \def\reserved@a{#3}%
+ \ifx\reserved@a\@empty
+ \set@target@series@kanji{#2}%
+ \else
+ \set@target@series@kanji{#1}%
+ \fi
+}
+\let\delayed@merge@kanji@series\merge@kanji@series@without@substitution
+\fi
%</plcore|platexrelease>
% \end{macrocode}
% \end{macro}
@@ -2667,6 +2861,10 @@
% 2019$BG/$^$G$OL5>r7o$K;XDj$5$l$?$H$*$j$N%7%'%$%W$rA*Br$7$F$$$^$7$?$,!"(B
% \LaTeXe~2020-02-02$B0J9_$G$O!"(B|\DeclareFontShapeChangeRule|$B$K$h$C$F(B
% $B@k8@$5$l$?!V%7%'%$%W99?75,B'!W$K4p$E$-%7%'%$%W$rA*Br$7$^$9!#(B
+%
+% \LaTeXe~2021-05-01$B0J9_$G$O!"%7%'%$%W$N99?7$r(B|\selectfont|$B$^$GCY$i$;$^$9!#(B
+% \changes{v1.7k}{2021/01/10}{Distangle series and shape update (latex2e/444)
+% (sync with ltfssaxes.dtx 2020/12/22 v1.0h)}
% \begin{macrocode}
%<platexrelease>\plIncludeInRelease{2020/04/12}{\fontshape}
%<platexrelease> {No \k@shape update if unavailable}%
@@ -2679,12 +2877,25 @@
\edef\f@shape{#1}%
}
\else % 2020-02-02
+\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN
\DeclareRobustCommand\romanshape[1]{\merge@font@shape{#1}}
\DeclareRobustCommand\kanjishape[1]{\merge@kanji@shape{#1}}
\DeclareRobustCommand\fontshape[1]{%
\@shape@roman@kanjitrue
\kanjishape{#1}\romanshape{#1}%
\@shape@roman@kanjifalse}
+\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+\DeclareRobustCommand\romanshape[1]{%
+ \expandafter\def\expandafter\delayed@f@adjustment\expandafter
+ {\delayed@f@adjustment\delayed@merge@font@shape{#1}}}
+\DeclareRobustCommand\kanjishape[1]{%
+ \expandafter\def\expandafter\delayed@k@adjustment\expandafter
+ {\delayed@k@adjustment\delayed@merge@kanji@shape{#1}}}
+\DeclareRobustCommand\fontshape[1]{%
+ \@shape@roman@kanjitrue
+ \kanjishape{#1}\romanshape{#1}%
+ \@shape@roman@kanjifalse}
+\fi % --- for >= 2021-05-01 END
\fi
%</plcore|platexrelease>
%<platexrelease>\plEndIncludeInRelease
@@ -2719,12 +2930,27 @@
\let\romanshapeforce\@undefined
\let\kanjishapeforce\@undefined
\else % 2020-02-02
+\ifx\delayed@f@adjustment\@undefined % --- for <= 2020-10-01 BEGIN
\DeclareRobustCommand\romanshapeforce[1]{\edef\f@shape{#1}}
\DeclareRobustCommand\kanjishapeforce[1]{\edef\k@shape{#1}}
\DeclareRobustCommand\fontshapeforce[1]{%
\set@safe@kanji@shape{#1}{}%
\edef\f@shape{#1}%
}
+\else % --- for <= 2020-10-01 END & for >= 2021-05-01 BEGIN
+\DeclareRobustCommand\romanshapeforce[1]{%
+ \expandafter\def\expandafter\delayed@f@adjustment\expandafter
+ {\delayed@f@adjustment\edef\f@shape{#1}}}
+\DeclareRobustCommand\kanjishapeforce[1]{%
+ \expandafter\def\expandafter\delayed@k@adjustment\expandafter
+ {\delayed@k@adjustment\edef\k@shape{#1}}}
+\DeclareRobustCommand\fontshapeforce[1]{%
+ \expandafter\def\expandafter\delayed@k@adjustment\expandafter
+ {\delayed@k@adjustment\set@safe@kanji@shape{#1}{}}%
+ \expandafter\def\expandafter\delayed@f@adjustment\expandafter
+ {\delayed@f@adjustment\edef\f@shape{#1}}%
+}
+\fi % --- for >= 2021-05-01 END
\fi
%</plcore|platexrelease>
%<platexrelease>\plEndIncludeInRelease
@@ -2776,8 +3002,13 @@
\edef\k@shape{#2}%
\fi
\else
+%^^A [TODO] BEGIN
+%^^A LaTeX2e 2021-05-01 $B$G$O(B |\maybe@load@fontshape| $B$O:o=|$5$l$k!#(B
+%^^A $BM}M3!'=hM}$,(B |\selectfont| $B$^$GCY$l$k$N$GITMW$H$N$3$H!#(B
+%^^A $B$7$+$7!"$J$<$+(B ltfssaxes.dtx $B$G(B rollback $B$NBP=h$,L5$$$h$&$J!)(B
\begingroup\let\f@encoding\k@encoding\let\f@family\k@family
\maybe@load@fontshape\endgroup
+%^^A [TODO] END
\edef\reserved@a{\k@encoding /\k@family /\k@series/#1}%
\ifcsname \reserved@a\endcsname
% \end{macrocode}
@@ -2851,6 +3082,42 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\merge@kanji@shape@without@substitution}
+% \begin{macro}{\merge@kanji@shape@without@substitution@}
+% \begin{macro}{\delayed@merge@kanji@shape}
+% \cs{merge@font@shape@without@substitution}$B$NOBJ8HG$G$9!#(B
+% \changes{v1.7k}{2021/01/10}{Distangle series and shape update (latex2e/444)
+% (sync with ltfssaxes.dtx 2020/12/22 v1.0h)}
+% \begin{macrocode}
+%<*plcore|platexrelease>
+\ifx\merge@font@shape@without@substitution\@undefined % old
+\let\merge@kanji@shape@without@substitution\@undefined
+\let\merge@kanji@shape@without@substitution@\@undefined
+\let\delayed@merge@kanji@shape\@undefined
+\else % 2021-05-01
+\def\merge@kanji@shape@without@substitution#1{%
+ \expandafter\expandafter\expandafter
+ \merge@kanji@shape@without@substitution@
+ \csname shape@\k@shape @#1\endcsname
+ {#1}%
+ \@nil
+}
+\def\merge@kanji@shape@without@substitution@#1#2#3\@nil{%
+ \def\reserved@a{#3}%
+ \ifx\reserved@a\@empty
+ \edef\k@shape{#2}%
+ \else
+ \edef\k@shape{#1}%
+ \fi
+}
+\let\delayed@merge@kanji@shape\merge@kanji@shape@without@substitution
+\fi
+%</plcore|platexrelease>
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
% \begin{macro}{\set@safe@kanji@shape}
% \begin{macro}{\@kanji@shape@nochange@info}
% $BOBJ8%7%'!<%W$,MxMQ2DG=$+$I$&$+M=$a%A%'%C%/$7$F$+$i@_Dj$7$^$9!#(B
@@ -2896,10 +3163,13 @@
% (sync with ltfssbas.dtx 2019/08/27 v3.2d)}
% \changes{v1.6v}{2020/02/01}{Don't call \cs{fontseries} or \cs{fontshape}
% (sync with ltfssbas.dtx 2019/12/17 v3.2e)}
+% \changes{v1.7j}{2020/12/29}{Drop ``m'' for latex2e issue 453
+% (sync with ltfssbas.dtx 2020/12/10 v3.2h)}
% \begin{macrocode}
%<platexrelease>\plIncludeInRelease{2020/02/02}{\usefont}
%<platexrelease> {Don't call \fontseries or \fontshape}%
%<*plcore|platexrelease>
+\ifx\set@target@series\@undefined
\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}%
\edef\k@family{#2}%
\edef\k@series{#3}%
@@ -2910,6 +3180,18 @@
\edef\f@series{#3}%
\edef\f@shape{#4}\selectfont
\ignorespaces}
+\else
+\DeclareRobustCommand\usekanji[4]{\kanjiencoding{#1}%
+ \edef\k@family{#2}%
+ \set@target@series@kanji{#3}%
+ \edef\k@shape{#4}\selectfont
+ \ignorespaces}
+\DeclareRobustCommand\useroman[4]{\romanencoding{#1}%
+ \edef\f@family{#2}%
+ \set@target@series{#3}%
+ \edef\f@shape{#4}\selectfont
+ \ignorespaces}
+\fi
\DeclareRobustCommand\usefont[4]{%
\edef\tmp@item{{#1}}%
\expandafter\expandafter\expandafter
@@ -4424,17 +4706,18 @@
% \begin{macrocode}
%<*pldefs>
\ProvidesFile{pldefs.ltx}
- [2020/02/01 v1.6v pLaTeX Kernel (Default settings)]
+ [2021/01/10 v1.7k pLaTeX Kernel (Default settings)]
%</pldefs>
% \end{macrocode}
%
% \subsection{$B%F%-%9%H%U%)%s%H(B}
% $B%F%-%9%H%U%)%s%H$N$?$a$NB0@-$d%(%i!<=qBN$J$I$N@k8@$G$9!#(B
% p\LaTeX{}$B$N%G%U%)%k%H$N2#AH%(%s%3!<%I$O(BJY1$B!"=DAH%(%s%3!<%I$O(BJT1$B$H$7$^$9!#(B
-%
% \changes{v1.6s}{2019/08/13}{Explicitly set some defaults
% after \cs{DeclareErrorKanjiFont} change
% (sync with ltfssini.dtx 2019/07/09 v3.1c)}
+% \changes{v1.7k}{2021/01/10}{Adjust start values for series and shape (latex2e/444)
+% (sync with ltfssini.dtx 2020/12/06 v3.2f)}
% \noindent
% $B=D2#%(%s%3!<%I6&DL!'(B
% \begin{macrocode}
@@ -4442,8 +4725,8 @@
\DeclareKanjiEncodingDefaults{}{}
\DeclareErrorKanjiFont{JY1}{mc}{m}{n}{10}
\kanjifamily{mc}
-\kanjiseries{m}
-\kanjishape{n}
+\def\k@series{m} % \kanjiseries{m}
+\def\k@shape{n} % \kanjishape{n}
\fontsize{10}{10}
% \end{macrocode}
% $B2#AH%(%s%3!<%I!'(B
diff --git a/language/japanese/platex/plvers.dtx b/language/japanese/platex/plvers.dtx
index 9ee65a4004..ee268af6a3 100644
--- a/language/japanese/platex/plvers.dtx
+++ b/language/japanese/platex/plvers.dtx
@@ -197,7 +197,7 @@
{2020-10-01}
%</plcore|platexrelease>
%<*plcore>
-\def\ppatch@level{1}
+\def\ppatch@level{2}
%</plcore>
% \end{macrocode}
% \end{macro}
diff --git a/language/japanese/plautopatch/LICENSE b/language/japanese/plautopatch/LICENSE
index 1504ecfb7d..cc115568ea 100644
--- a/language/japanese/plautopatch/LICENSE
+++ b/language/japanese/plautopatch/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2018-2020 Hironobu Yamashita
+Copyright (c) 2018-2021 Hironobu Yamashita
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/language/japanese/plautopatch/README.md b/language/japanese/plautopatch/README.md
index 5a4caf13dd..a65d7d4841 100644
--- a/language/japanese/plautopatch/README.md
+++ b/language/japanese/plautopatch/README.md
@@ -94,6 +94,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
## Release Date
-2020-11-26
+2021-02-13
Hironobu Yamashita
diff --git a/language/japanese/plautopatch/plautopatch-ja.pdf b/language/japanese/plautopatch/plautopatch-ja.pdf
index 11f173810f..f1252282d2 100644
--- a/language/japanese/plautopatch/plautopatch-ja.pdf
+++ b/language/japanese/plautopatch/plautopatch-ja.pdf
Binary files differ
diff --git a/language/japanese/plautopatch/plautopatch-ja.tex b/language/japanese/plautopatch/plautopatch-ja.tex
index 2d8840c8fa..1bd9fcb59e 100644
--- a/language/japanese/plautopatch/plautopatch-ja.tex
+++ b/language/japanese/plautopatch/plautopatch-ja.tex
@@ -170,11 +170,12 @@ p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの
\item 2020/05/05 v0.9f \textsf{collcell}のサポート
\item 2020/05/25 v0.9g \textsf{pxjahyper}の自動読込
\item 2020/09/13 v0.9h \LaTeXe~2020-10-01では\textsf{filehook}非依存に
- \item 2020/09/25 v0.9i \textsf{pxeveryshi}と\textsf{pxatbegshi}を不要に
+ \item 2020/09/25 v0.9i \textsf{pxeveryshi}と\textsf{pxatbegshi}を不要に(\LaTeXe~2020-10-01対応)
\item 2020/09/27 v0.9j \textsf{eso-pic}のサポート(要\LaTeXe~2020-10-01)
\item 2020/10/14 v0.9k トンボ関連パッチを\textsf{gentombow}へ移動
\item 2020/10/21 v0.9l \verb+\plautopatchdisable+が機能しなかったバグを修正
\item 2020/11/26 v0.9m \textsf{pgf}最新版に追随
+ \item 2021/02/13 v0.9n \textsf{pxeverysel}を不要に(\LaTeXe~2021-05-01対応)
\end{itemize}
\end{document}
diff --git a/language/japanese/plautopatch/plautopatch.pdf b/language/japanese/plautopatch/plautopatch.pdf
index 01a0d55646..8eb4421340 100644
--- a/language/japanese/plautopatch/plautopatch.pdf
+++ b/language/japanese/plautopatch/plautopatch.pdf
Binary files differ
diff --git a/language/japanese/plautopatch/plautopatch.sty b/language/japanese/plautopatch/plautopatch.sty
index 60904f0988..0ab3bfeacf 100644
--- a/language/japanese/plautopatch/plautopatch.sty
+++ b/language/japanese/plautopatch/plautopatch.sty
@@ -8,7 +8,7 @@
\NeedsTeXFormat{LaTeX2e}% not pLaTeX2e on purpose!
\ProvidesPackage{plautopatch}
- [2020/11/26 v0.9m Automated patches for pLaTeX/upLaTeX]
+ [2021/02/13 v0.9n Automated patches for pLaTeX/upLaTeX]
\ifx\pfmtname\@undefined
\PackageInfo{plautopatch}{%
@@ -218,13 +218,17 @@
\platpc@patch@after{collcell}{plcollcell}% (maintained here!)
% --- in most cases, pxeverysel can be safely loaded even after everysel
% --- but it can fail when \AtBeginDocument{everysel} is involved
-\platpc@patch@before{everysel}{pxeverysel}% platex-tools
-% --- since LaTeX2e 2020-10-01, everyshi.sty is merely
+% --- [Update] since LaTeX2e 2021-05-01, everysel.sty is merely
+% --- an emulation by everysel-ltx.sty from firstaid,
+% --- which is supported by pLaTeX2e kernel natively
+\@ifl@t@r{\fmtversion}{2021/05/01}{}%
+ {\platpc@patch@before{everysel}{pxeverysel}}% platex-tools
+% --- [Update] since LaTeX2e 2020-10-01, everyshi.sty is merely
% --- an emulation by everyshi-ltx.sty from ltshipout.dtx,
% --- which is supported by pLaTeX2e kernel natively
\@ifl@t@r{\fmtversion}{2020/10/01}{}%
{\platpc@patch@after{everyshi}{pxeveryshi}}% platex-tools
-% --- since LaTeX2e 2020-10-01, atbegshi.sty is merely
+% --- [Update] since LaTeX2e 2020-10-01, atbegshi.sty is merely
% --- an emulation by atbegshi-ltx.sty from ltshipout.dtx,
% --- which is supported by pLaTeX2e kernel natively
\@ifl@t@r{\fmtversion}{2020/10/01}{}%
diff --git a/language/japanese/plautopatch/plautopatch.tex b/language/japanese/plautopatch/plautopatch.tex
index 0714e80b42..93aa90f230 100644
--- a/language/japanese/plautopatch/plautopatch.tex
+++ b/language/japanese/plautopatch/plautopatch.tex
@@ -172,11 +172,12 @@ a comma-separated list of them:
\item 2020/05/05 v0.9f Add support for \textsf{collcell}
\item 2020/05/25 v0.9g Automatically load \textsf{pxjahyper}
\item 2020/09/13 v0.9h No dependency for \textsf{filehook} on \LaTeXe~2020-10-01
- \item 2020/09/25 v0.9i Do not require \textsf{pxeveryshi} and \textsf{pxatbegshi}
+ \item 2020/09/25 v0.9i Do not require \textsf{pxeveryshi} and \textsf{pxatbegshi} on \LaTeXe~2020-10-01
\item 2020/09/27 v0.9j Add support for \textsf{eso-pic} (\LaTeXe~2020-10-01 required)
\item 2020/10/14 v0.9k Move tombow-related patches to \textsf{gentombow}
\item 2020/10/21 v0.9l Bug fix for \verb+\plautopatchdisable+
\item 2020/11/26 v0.9m Adapt to latest \textsf{pgf}
+ \item 2021/02/13 v0.9n Do not require \textsf{pxeverysel} on \LaTeXe~2021-05-01
\end{itemize}
\end{document}
diff --git a/language/japanese/pxjahyper/LICENSE b/language/japanese/pxjahyper/LICENSE
index 5ff0288550..58cd49d31d 100644
--- a/language/japanese/pxjahyper/LICENSE
+++ b/language/japanese/pxjahyper/LICENSE
@@ -1,6 +1,6 @@
The MIT License
-Copyright (c) 2012-2020 Takayuki YATO (aka. "ZR")
+Copyright (c) 2012-2021 Takayuki YATO (aka. "ZR")
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/language/japanese/pxjahyper/README-ja.md b/language/japanese/pxjahyper/README-ja.md
index f9126c84ed..6466183123 100644
--- a/language/japanese/pxjahyper/README-ja.md
+++ b/language/japanese/pxjahyper/README-ja.md
@@ -70,6 +70,10 @@ pxjahyper-enc パッケージ ー 文字コード設定
更新履歴
--------
+ * Version 0.7 〈2021/02/13〉
+ - 「upLaTeX での hyperref の `unicode` 指定への対応」を正式サポート
+ の扱いとする。一部の正常動作しなかった機能についても対応させる。
+
* Version 0.6a 〈2020/10/10〉
- pxjahyper-enc:`dvips` 指定時はエラーでなく警告を出す。
diff --git a/language/japanese/pxjahyper/README.md b/language/japanese/pxjahyper/README.md
index 476d97749e..e0fcf3072d 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.7 〈2021/02/13〉
* Version 0.6a 〈2020/10/10〉
* Version 0.6 〈2020/10/05〉
* Version 0.5b 〈2020/10/04〉
diff --git a/language/japanese/pxjahyper/pxjahyper-ajm.def b/language/japanese/pxjahyper/pxjahyper-ajm.def
index b4b00f5d79..ff6683c71c 100644
--- a/language/japanese/pxjahyper/pxjahyper-ajm.def
+++ b/language/japanese/pxjahyper/pxjahyper-ajm.def
@@ -1,7 +1,7 @@
%%
%% This is file 'pxjahyper-ajm.def'.
%%
-%% Copyright (c) 2012-2020 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2012-2021 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}[2020/10/10 v0.6]
+\ProvidesFile{pxjahyper-ajm.def}[2021/02/13 v0.7]
%% avoid multiple loading
\csname pxjahyperajmLoaded\endcsname
diff --git a/language/japanese/pxjahyper/pxjahyper-enc.sty b/language/japanese/pxjahyper/pxjahyper-enc.sty
index 3b9583a766..b8724de638 100644
--- a/language/japanese/pxjahyper/pxjahyper-enc.sty
+++ b/language/japanese/pxjahyper/pxjahyper-enc.sty
@@ -1,7 +1,7 @@
%%
%% This is file 'pxjahyper-enc.sty'.
%%
-%% Copyright (c) 2012-2020 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2012-2021 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxjahyper-enc}[2020/10/10 v0.6a]
+\ProvidesPackage{pxjahyper-enc}[2021/02/13 v0.7]
\def\pxhe@pkgname{pxjahyper-enc}
\providecommand{\bxDebug}[1]{}
diff --git a/language/japanese/pxjahyper/pxjahyper.pdf b/language/japanese/pxjahyper/pxjahyper.pdf
index 74f354527f..a4ce575c7f 100644
--- a/language/japanese/pxjahyper/pxjahyper.pdf
+++ b/language/japanese/pxjahyper/pxjahyper.pdf
Binary files differ
diff --git a/language/japanese/pxjahyper/pxjahyper.sty b/language/japanese/pxjahyper/pxjahyper.sty
index 9a89a338ef..f7a8699dc4 100644
--- a/language/japanese/pxjahyper/pxjahyper.sty
+++ b/language/japanese/pxjahyper/pxjahyper.sty
@@ -1,7 +1,7 @@
%%
%% This is file 'pxjahyper.sty'.
%%
-%% Copyright (c) 2012-2020 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2012-2021 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,34 +10,32 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxjahyper}[2020/10/10 v0.6a]
+\ProvidesPackage{pxjahyper}[2021/02/13 v0.7]
+\def\pxhy@pkgname{pxjahyper}
+\providecommand{\bxDebug}[1]{}
+
+%--------------------------------------- Preparations
%% error messages
-\def\pxhy@pkgname{pxjahyper}
-\def\pxhy@warn{\PackageWarningNoLine\pxhy@pkgname}
\def\pxhy@error{\PackageError\pxhy@pkgname}
-\@onlypreamble\pxhy@fatal
-\def\pxhy@fatal#1#2{%
- \PackageError\pxhy@pkgname
- {#1}%
- {#2Package loading is aborted right now.}%
+\@onlypreamble\pxhy@eh@fatal
+\def\pxhy@eh@fatal{%
+ Package loading is aborted right now.\MessageBreak\@ehc
}
-\providecommand{\bxDebug}[1]{}
%% packages
\RequirePackage{ltxcmds}[2011/08/22]% v1.21
-%% globals
+%% variables
\newif\ifpxhy@ptex
\newif\ifpxhy@uptex
\newif\ifpxhy@etex
\newif\ifpxhy@etoolbox
\newif\ifpxhy@new@hook@system
-\let\pxhy@jcode\@undefined
\newif\ifpxhy@tounicode
\newif\ifpxhy@zerox
\newif\ifpxhy@bigcode
-\let\pxhy@bigcode\relax
+\let\pxhy@bigcode@given\relax
\chardef\pxhy@driver@none=0
\chardef\pxhy@driver@dvipdfmx=1
\let\pxhy@driver\@undefined
@@ -76,11 +74,13 @@
\DeclareOption{noout2uni}{%
\pxhy@zeroxfalse
}
+\pxhy@bigcodetrue
\DeclareOption{bigcode}{%
- \let\pxhy@bigcode=t%
+ \pxhy@bigcodetrue
+ \let\pxhy@bigcode@given=t
}
\DeclareOption{nobigcode}{%
- \let\pxhy@bigcode=f%
+ \pxhy@bigcodefalse
}
\DeclareOption{jacommentline}{%
\pxhy@jacommentlinetrue
@@ -119,7 +119,8 @@
%% The hyperref package must be loaded in advance.
\@ifpackageloaded{hyperref}{}{%else
- \pxhy@fatal{'hyperref' not yet loaded}{}%
+ \pxhy@error{Package 'hyperref' is not yet loaded}
+ {\pxhy@eh@fatal}%
\endinput
}
@@ -136,8 +137,8 @@
\fi
\ifnum0\ifpxhy@hy@unicode1\fi\if@tempswa1\fi=1
\PackageError\pxhy@pkgname
- {You must not change the encoding setting (e.g.\MessageBreak
- 'unicode) of hyperref after pxjahyper is loaded}%
+ {You must not change the encoding setting of hyperref\MessageBreak
+ (e.g. 'unicode') after pxjahyper is loaded}%
{\@ehc}%
\fi
}
@@ -166,47 +167,31 @@
\pxhy@check\kanjiskip{\pxhy@ptextrue}
\pxhy@check\forcecjktoken{\pxhy@uptextrue}
\ifpxhy@ptex\else
- \pxhy@fatal{Unknown engine used!!!}{}
+ \pxhy@error{Unknown engine used}%
+ {\pxhy@eh@fatal}
\expandafter\endinput
\fi
%% Check for the new hook system.
\@ifl@t@r\fmtversion{2020/10/01}{\pxhy@new@hook@systemtrue}{}
-%% Check the internal jcode.
-\ifnum \jis"2121="8140
- \let\pxhy@jcode=s\relax
-\else\ifnum\jis"2121="A1A1
- \let\pxhy@jcode=e\relax
-\else\ifnum\jis"2121="3000
- \let\pxhy@jcode=u\relax
-\fi\fi\fi
-\ifx\pxhy@jcode\@undefined
- \pxhy@fatal{Unknown internal kanji code!!!}{}
- \expandafter\endinput
-\fi
-
%% adjustment
% upTeX not in unicode is not seen as upTeX.
-\if u\pxhy@jcode\else
+\ifnum\jis"2121="3000 \else
\pxhy@uptexfalse
\fi
% out2uni cannot be used with upTeX.
\ifpxhy@uptex \ifpxhy@zerox
- \pxhy@warn{out2uni is invalid in upTeX}
+ \PackageWarningNoLine\pxhy@pkgname
+ {out2uni is invalid in upTeX}
\pxhy@zeroxfalse
\fi\fi
% bigcode cannot be used without upTeX.
-\if t\pxhy@bigcode
- \ifpxhy@uptex
- \pxhy@bigcodetrue
- \else
- \pxhy@warn{bigcode is invalid without upTeX}
- \fi
-\else\if f\pxhy@bigcode
-\else
- \ifpxhy@uptex
- \pxhy@bigcodetrue
+\ifpxhy@bigcode \ifpxhy@uptex\else
+ \pxhy@bigcodefalse
+ \ifx t\pxhy@bigcode@given
+ \PackageWarningNoLine\pxhy@pkgname
+ {bigcode is invalid without upTeX}
\fi
\fi\fi
% out2uni disables tounicode.
@@ -215,7 +200,10 @@
\fi
% hyperref 'unicode' is allowed only on upLaTeX.
\ifnum0\ifpxhy@hy@unicode\ifpxhy@uptex\else1\fi\fi>\z@
- \pxhy@fatal{hyperref 'unicode' mode is not supported}{}%
+ \PackageError\pxhy@pkgname
+ {The hyperref 'unicode' mode is not supported\MessageBreak
+ on the pTeX engine}%
+ {\pxhy@eh@fatal}%
\expandafter\endinput
\fi
% otfmacros forces use of otfcid.
@@ -238,7 +226,8 @@ 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@jcode = \meaning\pxhy@jcode^^J%
+ifpxhy@hy@unicode = \ifpxhy@hy@unicode true\else false\fi^^J%
+pxhy@bigcode = \ifpxhy@bigcode true\else false\fi^^J%
pxhy@tounicode = \ifpxhy@tounicode true\else false\fi^^J%
pxhy@zerox = \ifpxhy@zerox true\else false\fi^^J%
pxhy@driver = \the\pxhy@driver^^J%
@@ -248,10 +237,10 @@ pxhy@driver = \the\pxhy@driver^^J%
%% unique tokens
\def\pxhy@end{\pxhy@end@}
+\def\pxhy@mt{\pxhy@mt@}
\let\pxhy@mk\indent % unexpandable
%% \pxhy@begin@dvi@hook{<text>}
-%% \pxhy@begin@dvi@enc@hook{<text>}
\ifpxhy@new@hook@system
\def\pxhy@begin@dvi@hook#1{%
\AddToHook{shipout/firstpage}{#1}%
@@ -351,10 +340,15 @@ pxhy@driver = \the\pxhy@driver^^J%
%--------------------------------------- Hooks to pdfstringdef
+%% constants
\def\pxhy@uc@REPL{FFFD}
\def\pxhy@uc@XNAC{FDD1} % not-a-char codepoint used as marker
+
+%% variables
+\let\pxhy@str\relax
+
+%% \pxhy@burst-`>...
\let\pxhy@burst\romannumeral
-\let\pxhy@nxend\indent
%% \pxhy@uchex{<hex>}
% The entity of the code-value input function. If the input
@@ -362,19 +356,19 @@ pxhy@driver = \the\pxhy@driver^^J%
% \pxhy@uchex@res in 4-6 digits; otherwise passes FFFD to
% \pxhy@uchex@res.
\def\pxhy@uchex#1{%
- \expandafter\pxhy@uchex@a\pxhy@burst-`>#1\pxhy@nxend
+ \expandafter\pxhy@uchex@a\pxhy@burst-`>#1\pxhy@mk
}
\edef\pxhy@uchex@err{%
\noexpand\pxhy@uchex@res{\pxhy@uc@REPL}%
}
-\def\pxhy@uchex@a#1#2\pxhy@nxend{%
+\def\pxhy@uchex@a#1#2\pxhy@mk{%
\ifnum2<"1#1
- \expandafter\pxhy@uchex@b\romannumeral-"#1#2\pxhy@nxend{#1#2}%
+ \expandafter\pxhy@uchex@b\romannumeral-"#1#2\pxhy@mk{#1#2}%
\else \pxhy@uchex@err
\fi
}
-\def\pxhy@uchex@b#1\pxhy@nxend#2{%
- \ifx\pxhy@empty#1\pxhy@empty
+\def\pxhy@uchex@b#1\pxhy@mk#2{%
+ \ifx\pxhy@mt#1\pxhy@mt
\ifnum"#2>"10FFFF
\pxhy@uchex@err
\else\ifnum"#2>"FFF
@@ -408,6 +402,15 @@ pxhy@driver = \the\pxhy@driver^^J%
\let\UTFT\pxhy@uchex
}
+ \ifpxhy@hy@unicode %<*unicode>
+
+ %% \pxhy@uchex@res
+ \def\pxhy@uchex@res#1{%
+ \unichar{"#1}%
+ }
+
+ \else %<!*unicode>
+
%BEGIN-- in the following block #1 means the marker
\def\pxhy@next#1{% #1=marker
%% \pxhy@uchex@res
@@ -422,7 +425,7 @@ pxhy@driver = \the\pxhy@driver^^J%
\pxhy@posthook@b##1%
}%
\def\pxhy@posthook@a##1#1##2\pxhy@end{%
- \ifx\pxhy@empty##2\pxhy@empty
+ \ifx\pxhy@mt##2\pxhy@mt
\expandafter\@gobbletwo
\fi
}%
@@ -432,7 +435,7 @@ pxhy@driver = \the\pxhy@driver^^J%
\global\let##1=\pxhy@str
}%
\def\pxhy@posthook@c##1#1##2>{%
- \ifx\pxhy@empty##2\pxhy@empty
+ \ifx\pxhy@mt##2\pxhy@mt
\edef\pxhy@str{\pxhy@str##1}%
\else
\pxhy@get@jchar{"##2}%
@@ -456,6 +459,8 @@ pxhy@driver = \the\pxhy@driver^^J%
\pxhy@next
\endgroup
+ \fi %</unicode>
+
\else\ifpxhy@zerox %<*!upTeX>
%% \pxhy@uchex@res
@@ -565,13 +570,18 @@ pxhy@driver = \the\pxhy@driver^^J%
\fi
%--------------------------------------- Redefine text commands for PD1
+%% \pxhy@pdfenc
+\edef\pxhy@pdfenc{%
+ \ifpxhy@hy@unicode PU\else PD1\fi
+}
+
\ifnum\pxhy@driver=\pxhy@driver@dvipdfmx %<*dvipdfmx>
%%<+> \pxDeclarePdfTextCommand{\CS}{<jis>}{<ucs>}
\@onlypreamble\pxDeclarePdfTextCommand
\newcommand*\pxDeclarePdfTextCommand[3]{%
\pxhy@decl@pdf@tc{#2}{#3}%
- {\DeclareTextCommand{#1}{PD1}}%
+ {\DeclareTextCommand{#1}{\pxhy@pdfenc}}%
{\pxhy@revoke@pdf@tc{#1}}%
}
@@ -579,7 +589,7 @@ pxhy@driver = \the\pxhy@driver^^J%
\@onlypreamble\pxDeclarePdfTextComposite
\newcommand*\pxDeclarePdfTextComposite[4]{%
\pxhy@decl@pdf@tc{#3}{#4}%
- {\DeclareTextCompositeCommand{#1}{PD1}{#2}}%
+ {\DeclareTextCompositeCommand{#1}{\pxhy@pdfenc}{#2}}%
{\pxhy@revoke@pdf@tcc{#1}{#2}}%
}
@@ -595,8 +605,8 @@ pxhy@driver = \the\pxhy@driver^^J%
%% \pxhy@revoke@pdf@tc
\@onlypreamble\pxhy@revoke@pdf@tc
\def\pxhy@revoke@pdf@tc#1{%
- \expandafter\let\csname PD1\string#1\endcsname\@undefined
- \pxhy@make@txtcmd\pxhy@tmpa{PD1}#1%
+ \expandafter\let\csname\pxhy@pdfenc\string#1\endcsname\@undefined
+ \pxhy@make@txtcmd\pxhy@tmpa{\pxhy@pdfenc}#1%
\ifx#1\pxhy@tmpa
\pxhy@make@txtcmd#1?#1%
\fi
@@ -612,8 +622,8 @@ pxhy@driver = \the\pxhy@driver^^J%
%% \pxhy@revoke@pdf@tcc
\@onlypreamble\pxhy@revoke@pdf@tc
\def\pxhy@revoke@pdf@tcc#1#2{%
- \expandafter\let\csname\string\PD1\string#1-\string#2%
- \endcsname\@undefined
+ \expandafter\let\csname\@backslashchar\pxhy@pdfenc
+ \string#1-\string#2\endcsname\@undefined
}
%% \pxhy@decl@pdf@tc
@@ -663,6 +673,7 @@ pxhy@driver = \the\pxhy@driver^^J%
\fi %</upTeX>
%%%%%%%%%%%%%%%%%%%% the definitions
+\ifpxhy@hy@unicode\else %<!*unicode>
% JIS X 0213 does not distinguish the following pairs:
% - circumflex(U+02C6) and asciicircum(U+005E)
@@ -831,7 +842,7 @@ pxhy@driver = \the\pxhy@driver^^J%
\pxDeclarePdfTextCommand{\th}{}{00FE}
\pxDeclarePdfTextComposite{\"}{y}{}{00FF}
\pxDeclarePdfTextCommand{\textcelsius}{216E}{2103}
-%%%%%%%%
+%%
%%[B] Aliases to [A].
%\pxDeclarePdfTextCommand{\copyright}{}{00A9}
@@ -1070,12 +1081,14 @@ pxhy@driver = \the\pxhy@driver^^J%
\fi
\fi
+\fi %</unicode>
+%%%%%%%%%%%%%%%%%%%% done
+
%--------------------------------------- Enable hyperref unicode
\ifpxhy@hy@unicode
\PackageInfo\pxhy@pkgname
- {The setup for hyperref 'unicode' is applied.\MessageBreak
- (Note that this feature is experimental.)\@gobbletwo}
+ {The setup for hyperref 'unicode' is applied.\@gobbletwo}
%% The following code is taken from hyperref.sty.
%%%%BEGIN
diff --git a/language/japanese/pxjahyper/pxjahyper.tex b/language/japanese/pxjahyper/pxjahyper.tex
index 87b782970b..4c121b1438 100644
--- a/language/japanese/pxjahyper/pxjahyper.tex
+++ b/language/japanese/pxjahyper/pxjahyper.tex
@@ -6,8 +6,8 @@
\MakeShortVerb{\|}
\usepackage{bxtexlogo}
\bxtexlogoimport{*}
-\newcommand{\PkgVersion}{0.6a}
-\newcommand{\PkgDate}{2020/10/10}
+\newcommand{\PkgVersion}{0.7}
+\newcommand{\PkgDate}{2021/02/13}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$}
\newcommand{\Note}{\par\noindent ※}