From fe49338ab8a18471c6e5a2ff67e6e68109232fcd Mon Sep 17 00:00:00 2001 From: Karl Berry 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/doc/platex/pxchfon/README-ja.md | 2 ++ Master/texmf-dist/doc/platex/pxchfon/README.md | 2 ++ Master/texmf-dist/doc/platex/pxchfon/pxchfon.pdf | Bin 283660 -> 283693 bytes Master/texmf-dist/doc/platex/pxchfon/pxchfon.tex | 4 ++-- Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty | 19 ++++++++++++++----- Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty | 4 ++-- 6 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Master/texmf-dist/doc/platex/pxchfon/README-ja.md b/Master/texmf-dist/doc/platex/pxchfon/README-ja.md index 704193c9687..7dc1926cfb1 100644 --- a/Master/texmf-dist/doc/platex/pxchfon/README-ja.md +++ b/Master/texmf-dist/doc/platex/pxchfon/README-ja.md @@ -62,6 +62,8 @@ MITライセンスの下で配布される。 更新履歴 -------- + * Version 1.1b ‹2017/10/04› + - バグ修正。 * Version 1.1a ‹2017/09/09› - オプション `unicode(*)-fwid` を追加。 - (試験的)“legacycode”関連オプションを追加。 diff --git a/Master/texmf-dist/doc/platex/pxchfon/README.md b/Master/texmf-dist/doc/platex/pxchfon/README.md index ea3fc150565..116086f737a 100644 --- a/Master/texmf-dist/doc/platex/pxchfon/README.md +++ b/Master/texmf-dist/doc/platex/pxchfon/README.md @@ -38,6 +38,8 @@ This package is distributed under the MIT License. Revision History ---------------- + * Version 1.1b ‹2017/10/04› + - Bug fix. * Version 1.1a ‹2017/09/09› - Options `unicode(*)-fwid`. - (experimental) Some“legacycode”-related options. diff --git a/Master/texmf-dist/doc/platex/pxchfon/pxchfon.pdf b/Master/texmf-dist/doc/platex/pxchfon/pxchfon.pdf index cc0e51fd4bf..4c72dbc58ed 100644 Binary files a/Master/texmf-dist/doc/platex/pxchfon/pxchfon.pdf and b/Master/texmf-dist/doc/platex/pxchfon/pxchfon.pdf differ diff --git a/Master/texmf-dist/doc/platex/pxchfon/pxchfon.tex b/Master/texmf-dist/doc/platex/pxchfon/pxchfon.tex index 0daf5979717..8dc90e0a2c1 100644 --- a/Master/texmf-dist/doc/platex/pxchfon/pxchfon.tex +++ b/Master/texmf-dist/doc/platex/pxchfon/pxchfon.tex @@ -10,8 +10,8 @@ \usepackage{metalogo} \usepackage{shortvrb} \MakeShortVerb{\|} -\newcommand{\PkgVersion}{1.1a} -\newcommand{\PkgDate}{2017/09/09} +\newcommand{\PkgVersion}{1.1b} +\newcommand{\PkgDate}{2017/10/04} \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/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