From fe49338ab8a18471c6e5a2ff67e6e68109232fcd Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 5 Oct 2017 00:41:31 +0000
Subject: pxchfon (4oct17)

git-svn-id: svn://tug.org/texlive/trunk@45471 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty  | 19 ++++++++++++++-----
 Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty |  4 ++--
 2 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'Master/texmf-dist/tex')

diff --git a/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty b/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
index d9c84cc6704..9cb4577b1b2 100644
--- a/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
+++ b/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
@@ -10,7 +10,7 @@
 
 %% package declaration
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxchfon}[2017/09/09 v1.1a]
+\ProvidesPackage{pxchfon}[2017/10/04 v1.1b]
 \def\pxcz@pkgname{pxchfon}
 
 %% preparations
@@ -1251,7 +1251,8 @@
   \@for\pxcz@x:={#1}\do{%
     \expandafter\ifx\csname pxcz@FS/\pxcz@x\endcsname\@empty
       \pxcz@okfalse \fi}}
-\AtBeginDocument{%
+\@onlypreamble\pxcz@doc@hook
+\def\pxcz@doc@hook{%
   \pxcz@user@hook
   \ifx\pxcz@file@preset\relax\else
     \pxcz@do@file@preset
@@ -1279,15 +1280,22 @@
     \ifpxcz@ok \pxcz@decl@relfont\gtdefault{cfjas}{eb}\fi
     \pxcz@addtospec{ALPHA}%
   \fi
-  \ifpxcz@uptex \pxcz@addtospec{UPSTD}%
-  \else         \pxcz@addtospec{STD}%
+  \ifpxcz@uptex\else
+    \pxcz@addtospec{STD}%
+  \fi
+  \ifnum0\ifnum\pxcz@legacycode=\pxcz@legacycode@replace 1\fi
+         \ifpxcz@uptex 1\fi >\z@
+    \pxcz@addtospec{UPSTD}%
   \fi
   \ifpxcz@otf
     \@ifpackageloaded{otf}{\pxcz@otftrue}{\pxcz@otffalse}%
     \@ifpackageloaded{utf}{\pxcz@utftrue}{\pxcz@utffalse}%
   \fi
   \ifpxcz@otf
-    \ifpxcz@uptex \pxcz@addtospec{UPOTF}\fi
+    \ifnum0\ifnum\pxcz@legacycode=\pxcz@legacycode@replace 1\fi
+           \ifpxcz@uptex 1\fi >\z@
+      \pxcz@addtospec{UPOTF}%
+    \fi
     \pxcz@addtospec{OTF}%
   \fi
   \ifpxcz@utf \pxcz@addtospec{UTF}%
@@ -1312,6 +1320,7 @@
     \pxcz@do@dumpmap@tl
   \fi
 }
+\AtBeginDocument{\pxcz@doc@hook}
 
 %% \pxcz@decl@relfont
 \@onlypreamble\pxcz@decl@relfont
diff --git a/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty b/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty
index 9a79347b094..e4d70996d42 100644
--- a/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty
+++ b/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty
@@ -10,7 +10,7 @@
 
 %% package declaration
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxjafont}[2017/09/09 v1.1a]
+\ProvidesPackage{pxjafont}[2017/10/04 v1.1b]
 %% show warning
 \PackageWarning{pxchfon}
  {!!!!!!!!!!!! IMPORTANT WARNING !!!!!!!!!!!!\MessageBreak
@@ -19,6 +19,6 @@
   The warning is issued}
 %% delegate
 \let\pxAliasedPxjafont=t
-\RequirePackageWithOptions{pxchfon}[2017/09/09]
+\RequirePackageWithOptions{pxchfon}[]
 \endinput
 %% EOF
-- 
cgit v1.2.3