2 files changed, 19 insertions, 14 deletions
diff --git a/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty b/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
index 4c0cab8d312..23b76158e65 100644
--- a/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
+++ b/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file 'pxchfon.sty'.
 %%
-%% Copyright (c) 2019 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2009-2020 Takayuki YATO (aka. "ZR")
 %%   GitHub:   https://github.com/zr-tex8r
 %%   Twitter:  @zr_tex8r
 %%
@@ -10,7 +10,7 @@
 
 %% package declaration
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxchfon}[2019/11/22 v1.7a]
+\ProvidesPackage{pxchfon}[2020/02/01 v1.7b]
 \def\pxcz@pkgname{pxchfon}
 
 %--------------------------------------- general
@@ -1267,18 +1267,20 @@
 \fi
 
 %%<*> \diruni
-\DeclareRobustCommand*{\diruni}{%
-  \not@math@alphabet\diruni\relax
-  \ifx\cy@encoding\pxcz@JYn % if in standard Japanese encoding
-    \expandafter\let\csname UTF \endcsname\pxcz@du@UTF
-    \fontshape{diruni}\selectfont
-  \fi
-}
+\@ifdefinable{\diruni}{%
+  \DeclareRobustCommand*{\diruni}{%
+    \not@math@alphabet\diruni\relax
+    \ifx\cy@encoding\pxcz@JYn % if in standard Japanese encoding
+      \expandafter\let\csname UTF \endcsname\pxcz@du@UTF
+      \kanjishape{diruni}\selectfont
+    \fi
+  }}
 
 %%<*> \textdiruni{<text>}
-\newcommand*{\textdiruni}[1]{%
-  \relax\ifmmode\hbox\fi{\diruni#1}%
-}
+\@ifdefinable{\textdiruni}{%
+  \DeclareRobustCommand*{\textdiruni}[1]{%
+    \relax\ifmmode\hbox\fi{\diruni#1}%
+  }}
 
 %% \pxcz@du@UTF
 \def\pxcz@du@UTF#1{%
@@ -1462,7 +1464,10 @@
 
 %% check for textcomp
 \newif\ifpxcz@textcomp
-\@ifpackageloaded{textcomp}{\pxcz@textcomptrue}{}
+\ifx\DeclareEncodingSubset\@undefined\else
+  \expandafter\ifx\csname T@TS1\endcsname\relax\else
+    \pxcz@textcomptrue
+\fi\fi
 
 %% \pxcz@afont@enc@list
 \def\pxcz@afont@enc@list{OT1,T1}
diff --git a/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty b/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty
index ad79f5bcbdb..1b243e9893d 100644
--- a/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty
+++ b/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty
@@ -1,7 +1,7 @@
 %%
 %% This is file 'pxjafont.sty'.
 %%
-%% Copyright (c) 2019 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2009-2020 Takayuki YATO (aka. "ZR")
 %%   GitHub:   https://github.com/zr-tex8r
 %%   Twitter:  @zr_tex8r
 %%