texlive[51164] Master/texmf-dist: pxchfon (19may19)

commits+karl at tug.org commits+karl at tug.org
Sun May 19 23:25:07 CEST 2019


Revision: 51164
          http://tug.org/svn/texlive?view=revision&revision=51164
Author:   karl
Date:     2019-05-19 23:25:06 +0200 (Sun, 19 May 2019)
Log Message:
-----------
pxchfon (19may19)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/platex/pxchfon/README-ja.md
    trunk/Master/texmf-dist/doc/platex/pxchfon/README.md
    trunk/Master/texmf-dist/doc/platex/pxchfon/pxchfon.pdf
    trunk/Master/texmf-dist/doc/platex/pxchfon/pxchfon.tex
    trunk/Master/texmf-dist/fonts/sfd/pxchfon/PXcjk0.sfd
    trunk/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty

Added Paths:
-----------
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjam-r-l5j.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjam-r-t1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjam-r-ts1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-b-l5j.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-b-t1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-b-ts1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-l-l5j.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-l-t1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-l-ts1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-r-l5j.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-r-t1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-r-ts1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-b-l5j.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-b-t1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-b-ts1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-r-l5j.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-r-t1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-r-ts1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-x-l5j.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-x-t1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-x-ts1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjam-r-t1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjam-r-ts1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-b-t1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-b-ts1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-l-t1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-l-ts1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-r-t1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-r-ts1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-b-t1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-b-ts1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-r-t1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-r-ts1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-x-t1.tfm
    trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-x-ts1.tfm
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjam-r-l5j.vf
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjam-r-t1.vf
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjam-r-ts1.vf
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-b-l5j.vf
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-b-t1.vf
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-b-ts1.vf
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-l-l5j.vf
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-l-t1.vf
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-l-ts1.vf
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-r-l5j.vf
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-r-t1.vf
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-r-ts1.vf
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-b-l5j.vf
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-b-t1.vf
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-b-ts1.vf
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-r-l5j.vf
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-r-t1.vf
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-r-ts1.vf
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-x-l5j.vf
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-x-t1.vf
    trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-x-ts1.vf

Modified: trunk/Master/texmf-dist/doc/platex/pxchfon/README-ja.md
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/platex/pxchfon/README.md
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/platex/pxchfon/pxchfon.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/platex/pxchfon/pxchfon.tex
===================================================================
--- trunk/Master/texmf-dist/doc/platex/pxchfon/pxchfon.tex	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/doc/platex/pxchfon/pxchfon.tex	2019-05-19 21:25:06 UTC (rev 51164)
@@ -1,6 +1,8 @@
 % 文字コードは UTF-8
 % uplatex で組版する
 \documentclass[uplatex,dvipdfmx,a4paper]{jsarticle}
+\usepackage[T1]{fontenc}
+\usepackage{lmodern,textcomp}
 \usepackage{color}
 \definecolor{myblue}{rgb}{0,0,0.75}
 \definecolor{mygreen}{rgb}{0,0.45,0}
@@ -10,8 +12,8 @@
 \usepackage{metalogo}
 \usepackage{shortvrb}
 \MakeShortVerb{\|}
-\newcommand{\PkgVersion}{1.4a}
-\newcommand{\PkgDate}{2019/03/24}
+\newcommand{\PkgVersion}{1.5}
+\newcommand{\PkgDate}{2019/05/15}
 \newcommand{\Pkg}[1]{\textsf{#1}}
 \newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$}
 \newcommand{\Note}{\par\noindent ※}
@@ -177,7 +179,7 @@
 \item \Strong{Unicode直接指定オプション}\Means
   一部または全部のフォントについて、エンコーディング指定方式を
   “Cmap指定”から“Unicode直接指定”に変更する。
-  |nodirectunicode|(既定)、|directunicode|、|directunicode*|、
+  |nounicode|(既定)、|directunicode|、|directunicode*|、
   |unicode*|、|unicode| の5種類の指定がある。
   \Note 詳細については\ref{sec:DirectUnicode}節を参照。
   \Note 一部のプリセット指定(|sourcehan|等)は
@@ -262,7 +264,10 @@
     避けたいので、|dumpmap(tl)| が指定された場合は、
     既定が |strictcsi| に変更される。
 \item |expert|(既定)\Means
-  Unicode直接指定の適用時に\Pkg{japanese-otf}の |expert| オプション
+  Unicode直接指定の適用時
+  \footnote{置換されていないウェイトはUnicode直接指定にならない。
+    (\ref{ssec:DirectUnicodeNotice}節の注意を参照。)}%
+  に\Pkg{japanese-otf}の |expert| オプション
   の機能を(可能な範囲で)エミュレートする。
   \Note \Pkg{japanese-otf}の |expert| が指定されない場合は無意味。
 \item |noexpert|\Means
@@ -270,8 +275,10 @@
   Unicode直接指定時には\Pkg{japanese-otf}の |expert| は無効になる。
 \item |glyphid|\Means
   GID指定入力(|\gid| 命令)の機能を有効にする。
-  \Note エンジンが{\upTeX}でかつUnicode直接指定が有効の場合に
-  のみ利用できる。
+  \Note エンジンが{\upTeX}でかつUnicode直接指定
+  \footnote{置換されていないウェイトはUnicode直接指定にならない。
+    (\ref{ssec:DirectUnicodeNotice}節の注意を参照。)}%
+  が有効の場合にのみ利用できる。
 \item |noglyphid|(既定)\Means
   |glyphid| の否定。
 \end{itemize}
@@ -1024,21 +1031,21 @@
 
 \paragraph{“Unicode直接指定”オプション}
 以下のパッケージオプションを指定することで
-Unicode直接指定が有効になる。
+Unicode直接指定の有効・無効を切り替えられる。
 
 \begin{itemize}
 \item |unicode|\Means
   全般的にUnicode直接指定を利用する。
-  最も理想的な設定であるが、現存の{\TeX} Live 2017では利用できない。
-  \Note dvipdfmxの20170918版以降({\TeX} Live 2018以降)が必要。
+  最も理想的な設定であるが、\Strong{{\TeX} Live 2018以降のdvipdfmx}%
+  (20170918版以降)が必要である。
 \item |unicode*|\Means
-  |unicode| と同様だが、{\TeX} Live 2017のdvipdfmaに対応するために
-  妥協を入れた(過渡的な)設定。
-  一部の約物・記号の出力が異常になる可能性がある。
-  \Note dvipdfmxの20170318版以降({\TeX} Live 2017以降)が必要。
+  {\TeX} Live 2017のdvipdfmx(20170318版)専用の\Strong{過渡的}な設定。
+  \Note 1.5版以降では\Strong{非推奨}であり、
+  将来的に廃止される予定である。
 \item |directunicode*|\Means
-  |unicode| と同様だが、古い({\TeX} Live 2016以前の)dvipdfmaに
-  対応するために、OpenType属性の指定を全く行わない設定。
+  全般的にUnicode直接指定を利用するが、
+  古い({\TeX} Live 2016以前の)dvipdfmxに
+  対応するために、OpenType属性の指定を全く行わない。
   つまり、入力のUnicode文字に対する既定のグリフが常に出力され、
   異体字の区別は全て無効になる。
 \item |directunicode|\Means
@@ -1068,36 +1075,52 @@
 \item |noto-jp|
 \end{itemize}
 
-\paragraph{特殊プリセット指定\<(過渡的)}
+\paragraph{特殊プリセット指定\<(非推奨)}
 
-現状の{\TeX} Live 2017のdvipdfmxで |unicode| が使えない
-という問題に対処するため、
-一部のプリセット指定について、
-「|unicode| を指定した理想的な状態を模倣する」
-特殊なプリセット設定を用意した。
-これらの設定はdvipdfmxの20170318版以降({\TeX} Live 2017以降)
-において使用できる。
+以下に挙げるプリセット設定は{\TeX} Live 2017%
+(dvipdfmx 20170318版)のために用意された特殊な設定である。
 
-本来使えないはずの設定を模倣するために、
-少々邪悪な細工を行ている。
+1.5版においてこれらのプリセットは\Strong{非推奨}となった。
+将来的には廃止される予定である。
+そのため、これらのプリセットを利用している場合は、
+\Strong{{\TeX}システムを更新}(dvipdfmxを20170918版以降に)した上で、
+“本来の正しい設定”に移行することを推奨する。
 
 \begin{itemize}
-\item |sourcehan+|、|sourcehan-otc+|、
-    |noto+|、|noto-otc+|\Means
-  これらの特殊プリセット指定は、対応する(|+| 無しの)
-  Unicode直接指定専用プリセットの設定を模倣する。
-  日本語用の一部のグリフを
-  日本語以外(繁体中国語等)のフォントに振り替えている。
-  従って、言語別OTF版のフォントファイルを利用する場合は、
-  原則的に全てのCJK言語の版を用意する必要がある。
+\item |sourcehan+|、|sourcehan-otc+|、|noto+|、|noto-otc+|:\\
+  →代わりに|+|無しの名前(|sourcehan| 等)を指定する。
+  \Note 前述の通り、|unicode| は自動的に補われる。
+  \Note 日本語版以外のフォントはもはや不要である。
 
-\item |yu-win10+|\Means
-  |yu-win10| に |unicode| を加えた設定を模倣する。
-  クオートの出力を正常にするため、クオートのグリフを
-  「Yu Gothic UI」フォントに振り替えている。
+\item |yu-win10+|:\\
+  →代わりに |yu-win10| と |unicode| を指定する。
 \end{itemize}
 
+%-------------------
+\subsection{Unicode直接指定に関する注意事項}
+\label{ssec:DirectUnicodeNotice}
 
+\begin{itemize}
+\item プリセット指定または |\set...font| 命令で
+  フォントを置換していないウェイトについては、
+  |unicode| 指定時であってもUnicode直接指定は効かない。
+  従って、そのようなウェイトはUnicode直接指定が想定する出力には
+  ならず、またUnicode直接指定を必要とする機能
+  (|expert| や |glyphid| の各オプション)
+  も使えない。
+\item 特に、|expert| については、
+  非置換のウェイトの動作が非常に複雑で解りにくい。
+  従って、|expert| を指定する場合は、全ファミリ・ウェイトについて
+  置換を指定することを推奨する
+  (これに反する場合は警告が出る)。
+\item 非埋込を指定したウェイトについてはUnicode直接指定が
+  無効になる。
+  この動作も非常に解りにくいため、
+  Unicode直接指定を用いる場合は、非埋込の指定をしないことを推奨する
+  (これに反する場合は警告が出る)。
+\end{itemize}
+
+
 %===========================================================
 \section{dvipdfmxのページ抜粋処理への対応}
 \label{sec:PageSelection}
@@ -1123,11 +1146,7 @@
 
 指定された和文フォントの半角部分からなる欧文フォントファミリとして
 OT1/cfjar(明朝)、OT1/cfjas(ゴシック)、OT1/cfjam(丸ゴシック)
-の3つ(以下では\Strong{CFJAファミリ}と総称する)を定義している
-\footnote{1.4版からはT1エンコーディングにもCFJAファミリを定義する。
-現状で対応しているのはOT1とT1のみであるので、欧文フォントの置換
-(\texttt{alphabet}や\texttt{relfont}オプション)
-を利用する文書は、欧文エンコーディングがOT1かT1である必要がある。}。
+の3つ(以下では\Strong{CFJAファミリ}と総称する)を定義している。
 その上で、CFJAファミリに対するマップ指定を和文と同じ方法で行っている。
 なお、CFJAファミリは内部ではOT1として扱われるが、
 実際にはOT1の一部のグリフしか持っていない。
@@ -1145,6 +1164,54 @@
 (cfjarを |\mcfamily| に、cfjasを |\gtfamily| に、
 cfjamを |\mgfamily| に対して)設定する。
 
+\paragraph{利用可能な欧文エンコーディング}
+現状で、CFJAファミリが対応している欧文エンコーディングは
+OT1、T1、TS1の3つである
+\footnote{1.4版でT1に“暫定対応”し、1.5版でT1とTS1に正式に対応した。}%
+(TS1は事前に\Pkg{textcomp}を読み込んだ場合にのみ有効)
+このため、欧文フォントの置換
+(\texttt{alphabet}や\texttt{relfont}オプション)
+を利用する文書は、欧文エンコーディングがOT1かT1である必要がある
+\footnote{TS1は記号用のエンコーディングであり、本文の既定の
+エンコーディングとして使うものではない。}。
+
+何れのエンコーディングを用いる場合でも、様々な理由により、利用できる
+文字の種類が限られている。
+\begin{enumerate}
+\item AJ1対応のOpenTypeフォントを指定して、かつ |usecmapforalphabet|
+  オプションを指定した場合、
+  以下の文字(でかつ当該の欧文エンコーディングに含まれるもの)が使える。
+  \Note AJ1対応フォント用のプリセット(|kozuka-pr6n| 等)を
+  指定した場合は |usecmapforalphabet| は自動的に有効になる。
+  \begin{itemize}
+  \item[a)] ASCII文字
+    \footnote{出力される文字の話であることに注意。
+      例えば、OT1やT1で \textsf{\textquotesingle}(U+0027)を
+      入力したときに出力される文字は \textsf{\textquoteright}(U+2019)
+      であり、これはASCII文字ではない。
+      なお、TS1はU+0027を含む。}%
+    およびen-ダッシュ(\textsf{--})。
+    \Note これらは半角幅である。
+  \item[b)] クオート(\textsf{`` '' ` '})。
+    \Note これらは和文用の全角幅の字形を、空きを詰めて半角幅で出力する。
+  \item[c)] em-ダッシュ(\textsf{---})。
+    \Note これらはU+2015の全角幅の字形をそのまま全角幅で出力する。
+  \end{itemize}
+\item 1以外の場合、
+  以下の文字(でかつ当該の欧文エンコーディングに含まれるもの)が使える。
+  \Note この場合、既定では欧文は |directunicode*| 相当の状態になる。
+  \begin{itemize}
+  \item 1項のa、b、cの文字はフォントが正しい幅
+    (aは半角、bとcは半角)の字形を持っていれば使える。
+  \item それ以外でも、Unicodeにある文字である大部分の文字は、
+    フォントが半角幅の字形を持っていれば使える。
+    \Note 半角幅のまま出力される。
+  \item |unicode| オプションを指定すると、正しい幅の字形を優先して
+    使おうとするため、既定の場合よりも多くの文字が使える。
+  \end{itemize}
+\end{enumerate}
+
+
 %===========================================================
 \section{注意事項}
 \label{sec:Notice}

Modified: trunk/Master/texmf-dist/fonts/sfd/pxchfon/PXcjk0.sfd
===================================================================
--- trunk/Master/texmf-dist/fonts/sfd/pxchfon/PXcjk0.sfd	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/sfd/pxchfon/PXcjk0.sfd	2019-05-19 21:25:06 UTC (rev 51164)
@@ -8,3 +8,29 @@
      0x2018 0x0061_0x007A 124: 0x2015 0x02DD 0x007E 0x00A8 129: 0x0022 \
      0x0027 0x003C 0x003E 0x005C 0x005F 0x0060 0x007B 0x007C 0x007D \
      0x00A2_0x00A3 0x00A5 0x00AC 161: 0xFF61_0xFF9F
+l4j  18: 0x0060 0x00B4 33: 0x0021_0x007E 0x00A8 128: 0x2018_0x2019 \
+     0x201C_0x201D 161: 0xFF61_0xFF9F
+l5j  13: 0x0027 0x00A1 0x00BF 0x0131 18: 0x0060 0x00B4 22: 0x00AF \
+     25: 0x00DF 0x00E6 0x0153 0x00F8 0x00C6 0x0152 0x00D8 0x0020_0x0021 \
+     0x201D 0x0023_0x0026 0x2019 0x0028_0x005B 0x201C 0x005D_0x005F \
+     0x2018 0x0061_0x007A 124: 0x2015 126: 0x007E 0x00A8 \
+     161: 0xFF61_0xFF9F
+t1   0x02CB 0x02CA 0x02C6 0x02DC 0x00A8 0x02DD 0x02DA 0x02C7 0x02D8 \
+     0x02C9 0x02D9 0x00B8 0x02DB 0x201A 0x2039_0x203A 0x201C_0x201E \
+     0x00AB 0x00BB 0x2013 0x2015 25: 0x0131 0x0237 32: 0x0020_0x0026 \
+     0x2019 0x0028_0x005F 0x2018 0x0061_0x007E 128: 0x0102 0x0104 0x0106 \
+     0x010C 0x010E 0x011A 0x0118 0x011E 0x0139 0x013D 0x0141 0x0143 \
+     0x0147 0x014A 0x0150 0x0154 0x0158 0x015A 0x0160 0x015E 0x0164 \
+     0x0162 0x0170 0x016E 0x0178_0x0179 0x017D 0x017B 0x0132 0x0130 \
+     0x0111 0x00A7 0x0103 0x0105 0x0107 0x010D 0x010F 0x011B 0x0119 \
+     0x011F 0x013A 0x013E 0x0142 0x0144 0x0148 0x014B 0x0151 0x0155 \
+     0x0159 0x015B 0x0161 0x015F 0x0165 0x0163 0x0171 0x016F 0x00FF \
+     0x017A 0x017E 0x017C 0x0133 0x00A1 0x00BF 0x00A3 0x00C0_0x00D6 \
+     0x0152 0x00D8_0x00DE 224: 0x00E0_0x00F6 0x0153 0x00F8_0x00FE \
+     0x00DF
+ts1  11: 0x00B8 0x02DB 36: 0x0024 39: 0x0027 42: 0x204E 44: 0x002C \
+     46: 0x002E 0x2044 61: 0x2212 87: 0x2126 91: 0x301A 93: 0x301B \
+     96: 0x0060 126: 0x02F7 128: 0x02D8 0x02C7 0x02DD 132: 0x2020_0x2021 \
+     0x2016 0x2030 0x2022 0x2103 140: 0x0192 151: 0x2122 157: 0x212E \
+     162: 0x00A2_0x00AA 172: 0x00AC 174: 0x00AE_0x00B7 \
+     185: 0x00B9_0x00BA 188: 0x00BC_0x00BE 0x20AC 214: 0x00D7 246: 0x00F7

Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjam-r-l5j.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjam-r-l5j.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjam-r-l5j.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjam-r-l5j.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjam-r-l5j.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjam-r-t1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjam-r-t1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjam-r-t1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjam-r-t1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjam-r-t1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjam-r-ts1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjam-r-ts1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjam-r-ts1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjam-r-ts1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjam-r-ts1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-b-l5j.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-b-l5j.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-b-l5j.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-b-l5j.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-b-l5j.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-b-t1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-b-t1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-b-t1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-b-t1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-b-t1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-b-ts1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-b-ts1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-b-ts1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-b-ts1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-b-ts1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-l-l5j.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-l-l5j.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-l-l5j.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-l-l5j.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-l-l5j.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-l-t1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-l-t1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-l-t1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-l-t1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-l-t1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-l-ts1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-l-ts1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-l-ts1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-l-ts1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-l-ts1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-r-l5j.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-r-l5j.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-r-l5j.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-r-l5j.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-r-l5j.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-r-t1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-r-t1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-r-t1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-r-t1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-r-t1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-r-ts1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-r-ts1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-r-ts1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-r-ts1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjar-r-ts1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-b-l5j.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-b-l5j.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-b-l5j.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-b-l5j.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-b-l5j.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-b-t1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-b-t1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-b-t1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-b-t1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-b-t1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-b-ts1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-b-ts1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-b-ts1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-b-ts1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-b-ts1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-r-l5j.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-r-l5j.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-r-l5j.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-r-l5j.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-r-l5j.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-r-t1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-r-t1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-r-t1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-r-t1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-r-t1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-r-ts1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-r-ts1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-r-ts1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-r-ts1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-r-ts1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-x-l5j.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-x-l5j.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-x-l5j.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-x-l5j.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-x-l5j.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-x-t1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-x-t1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-x-t1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-x-t1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-x-t1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-x-ts1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-x-ts1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-x-ts1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-x-ts1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/cfjas-x-ts1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjam-r-t1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjam-r-t1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjam-r-t1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjam-r-t1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjam-r-t1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjam-r-ts1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjam-r-ts1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjam-r-ts1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjam-r-ts1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjam-r-ts1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-b-t1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-b-t1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-b-t1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-b-t1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-b-t1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-b-ts1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-b-ts1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-b-ts1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-b-ts1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-b-ts1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-l-t1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-l-t1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-l-t1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-l-t1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-l-t1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-l-ts1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-l-ts1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-l-ts1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-l-ts1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-l-ts1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-r-t1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-r-t1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-r-t1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-r-t1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-r-t1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-r-ts1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-r-ts1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-r-ts1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-r-ts1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjar-r-ts1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-b-t1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-b-t1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-b-t1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-b-t1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-b-t1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-b-ts1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-b-ts1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-b-ts1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-b-ts1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-b-ts1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-r-t1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-r-t1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-r-t1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-r-t1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-r-t1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-r-ts1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-r-ts1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-r-ts1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-r-ts1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-r-ts1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-x-t1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-x-t1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-x-t1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-x-t1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-x-t1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-x-ts1.tfm
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-x-ts1.tfm
===================================================================
--- trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-x-ts1.tfm	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-x-ts1.tfm	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/tfm/public/pxchfon/r-cfjas-x-ts1.tfm
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjam-r-l5j.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjam-r-l5j.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjam-r-l5j.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjam-r-l5j.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjam-r-l5j.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjam-r-t1.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjam-r-t1.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjam-r-t1.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjam-r-t1.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjam-r-t1.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjam-r-ts1.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjam-r-ts1.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjam-r-ts1.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjam-r-ts1.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjam-r-ts1.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-b-l5j.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-b-l5j.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-b-l5j.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-b-l5j.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-b-l5j.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-b-t1.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-b-t1.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-b-t1.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-b-t1.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-b-t1.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-b-ts1.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-b-ts1.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-b-ts1.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-b-ts1.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-b-ts1.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-l-l5j.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-l-l5j.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-l-l5j.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-l-l5j.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-l-l5j.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-l-t1.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-l-t1.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-l-t1.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-l-t1.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-l-t1.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-l-ts1.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-l-ts1.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-l-ts1.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-l-ts1.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-l-ts1.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-r-l5j.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-r-l5j.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-r-l5j.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-r-l5j.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-r-l5j.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-r-t1.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-r-t1.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-r-t1.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-r-t1.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-r-t1.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-r-ts1.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-r-ts1.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-r-ts1.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-r-ts1.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjar-r-ts1.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-b-l5j.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-b-l5j.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-b-l5j.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-b-l5j.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-b-l5j.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-b-t1.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-b-t1.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-b-t1.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-b-t1.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-b-t1.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-b-ts1.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-b-ts1.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-b-ts1.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-b-ts1.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-b-ts1.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-r-l5j.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-r-l5j.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-r-l5j.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-r-l5j.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-r-l5j.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-r-t1.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-r-t1.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-r-t1.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-r-t1.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-r-t1.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-r-ts1.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-r-ts1.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-r-ts1.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-r-ts1.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-r-ts1.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-x-l5j.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-x-l5j.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-x-l5j.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-x-l5j.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-x-l5j.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-x-t1.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-x-t1.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-x-t1.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-x-t1.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-x-t1.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-x-ts1.vf
===================================================================
(Binary files differ)

Index: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-x-ts1.vf
===================================================================
--- trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-x-ts1.vf	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-x-ts1.vf	2019-05-19 21:25:06 UTC (rev 51164)

Property changes on: trunk/Master/texmf-dist/fonts/vf/public/pxchfon/cfjas-x-ts1.vf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
===================================================================
--- trunk/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty	2019-05-19 21:10:57 UTC (rev 51163)
+++ trunk/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty	2019-05-19 21:25:06 UTC (rev 51164)
@@ -10,14 +10,9 @@
 
 %% package declaration
 \NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxchfon}[2019/03/24 v1.4a]
+\ProvidesPackage{pxchfon}[2019/05/15 v1.5]
 \def\pxcz at pkgname{pxchfon}
 
-%% preparations
-\def\pxcz at error{\PackageError\pxcz at pkgname}
-\def\pxcz at warn{\PackageWarning\pxcz at pkgname}
-\def\pxcz at info{\PackageInfo\pxcz at pkgname}
-
 %--------------------------------------- general
 
 %% variables
@@ -44,6 +39,9 @@
 %% \pxcz at onlypreamble@def\CS
 \def\pxcz at onlypreamble@def#1{%
   \@onlypreamble#1\def#1}
+%% \pxcz at onlypreamble@let\CS
+\def\pxcz at onlypreamble@let#1{%
+  \@onlypreamble#1\let#1}
 
 %% \pxcz at csuse@or{<csname>}{<default>}
 \def\pxcz at csuse@or#1#2{%
@@ -238,15 +236,15 @@
 % dvipdfmx of version 20170627 or later. The 'unicode-fwid' is a variant.
 % The 'unicode*(-fwid)' option is a transitional (deteriorated) version
 % of 'unicode(-fwid)' and can work with dvipdfmx of version 20170318.
-\@namedef{pxcz at POPT/unicode}{%
+\pxcz at onlypreamble@csdef{pxcz at POPT/unicode}{%
   \let\pxcz at directunicode\pxcz at directunicode@full}
-\@namedef{pxcz at POPT/unicode*}{%
+\pxcz at onlypreamble@csdef{pxcz at POPT/unicode*}{%
   \pxcz at uniquifytrue
   \let\pxcz at directunicode\pxcz at directunicode@full}
-\@namedef{pxcz at POPT/unicode-fwid}{%
+\pxcz at onlypreamble@csdef{pxcz at POPT/unicode-fwid}{%
   \pxcz at fullwidthtrue
   \let\pxcz at directunicode\pxcz at directunicode@full}
-\@namedef{pxcz at POPT/unicode*-fwid}{%
+\pxcz at onlypreamble@csdef{pxcz at POPT/unicode*-fwid}{%
   \pxcz at fullwidthtrue \pxcz at uniquifytrue
   \let\pxcz at directunicode\pxcz at directunicode@full}
 \DeclareOption*{%
@@ -253,14 +251,11 @@
   \pxcz at csuse@or{pxcz at POPT/\CurrentOption}{%
     \pxcz at parse@opt\CurrentOption
     \ifpxcz at ok\else \@unknownoptionerror \fi}}
-\@onlypreamble\pxcz at parse@opt
-\def\pxcz at parse@opt#1{%
+\pxcz at onlypreamble@def\pxcz at parse@opt#1{%
   \expandafter\pxcz at parse@opt at a#1\@nnil}
-\@onlypreamble\pxcz at parse@opt at a
-\def\pxcz at parse@opt at a{%
+\pxcz at onlypreamble@def\pxcz at parse@opt at a{%
   \futurelet\pxcz at tok\pxcz at parse@opt at b}
-\@onlypreamble\pxcz at parse@opt at b
-\def\pxcz at parse@opt at b{%
+\pxcz at onlypreamble@def\pxcz at parse@opt at b{%
   \pxcz at okfalse
   \let\pxcz at tmpa\remove at to@nnil
   \ifx+\pxcz at tok
@@ -268,13 +263,24 @@
   \else\ifx*\pxcz at tok
     \pxcz at file@preset at tlfalse \let\pxcz at tmpa\pxcz at parse@opt at c
   \fi\fi \pxcz at tmpa}
-\@onlypreamble\pxcz at parse@opt at c
-\def\pxcz at parse@opt at c#1#2\@nnil{%
+\pxcz at onlypreamble@def\pxcz at parse@opt at c#1#2\@nnil{%
   \pxcz at oktrue
   \edef\pxcz at file@preset{#2}}
 % dispatch
 \ProcessOptions*
 
+%% 'unicode*' and 'unicode*-fwid' are DEPRECATED
+\ifpxcz at uniquify
+  \PackageWarningNoLine\pxcz at pkgname
+   {IMPORTANT: Option 'unicode*\ifpxcz at fullwidth -fwid\fi'
+    is DEPRECATED!\MessageBreak
+    This option invokes a transitional setting that\MessageBreak
+    is specially tailored for TL2017, and will be\MessageBreak
+    abolished in near future.\MessageBreak
+    You should update to TL2018 or later and use\MessageBreak
+    option 'unicode\ifpxcz at fullwidth -fwid\fi' instead}
+\fi
+
 %% 'everypage' needs 'atbegshi' package
 \ifpxcz at everypage
 \RequirePackage{atbegshi}
@@ -304,10 +310,11 @@
 \else  \pxcz at alphafalse
 \fi\fi\fi\fi
 \ifpxcz at alpha
-  \IfFileExists{pxchfon0.def}{\relax}{%
-    \pxcz at error{Option 'alphabet' not available in Lite edition}%
-    {You must install full edition of PXchfon bundle, or specify
-    'noalphabet'\MessageBreak as package option.}%
+  \IfFileExists{pxchfon0.def}{}{%else
+    \PackageError\pxcz at pkgname
+     {Option 'alphabet' not available in Lite edition}%
+     {You must install full edition of PXchfon bundle, or specify
+      'noalphabet'\MessageBreak as package option.}%
   \pxcz at alphafalse}
 \fi
 
@@ -316,9 +323,10 @@
 \else \pxcz at relfalse
 \fi
 \ifpxcz at rel
-  \IfFileExists{pxchfon0.def}{\relax}{%
-    \pxcz at error{Option 'relfont' not available in Lite edition}%
-    {You must install full edition of PXchfon bundle.}%
+  \IfFileExists{pxchfon0.def}{}{%else
+    \PackageError\pxcz at pkgname
+     {Option 'relfont' not available in Lite edition}%
+     {You must install full edition of PXchfon bundle.}%
   \pxcz at relfalse}
 \fi
 
@@ -359,11 +367,11 @@
 
 %% variables
 \newif\ifpxcz at warn@unless at all@defined
+\newif\ifpxcz at warn@unless at all@embedded
 
 %% \pxcz at apply@opt at unicode
 % Forces the 'unicode' setup (unless a directunicode option was given).
-\@onlypreamble\pxcz at apply@opt at unicode
-\def\pxcz at apply@opt at unicode{%
+\pxcz at onlypreamble@def\pxcz at apply@opt at unicode{%
   \ifpxcz at directunicode@default %  default -> unicode
     \pxcz at warn@unicode
     \let\pxcz at directunicode\pxcz at directunicode@full
@@ -377,8 +385,7 @@
 %% \pxcz at apply@opt at unicodeP
 % Forces the 'unicode+' setup, which is a 'unicode' with switch-font
 % enabled on the width features.
-\@onlypreamble\pxcz at apply@opt at unicodeP
-\def\pxcz at apply@opt at unicodeP{%
+\pxcz at onlypreamble@def\pxcz at apply@opt at unicodeP{%
   \pxcz at uniquifyfalse
   \pxcz at switch@font at xwidtrue % 'unicode+'
   \ifnum\pxcz at directunicode=\pxcz at directunicode@full\else
@@ -386,10 +393,9 @@
     \let\pxcz at directunicode\pxcz at directunicode@full
   \fi}
 %% \pxcz at warn@unicode
-\@onlypreamble\pxcz at warn@unicode
-\def\pxcz at warn@unicode{%
+\pxcz at onlypreamble@def\pxcz at warn@unicode{%
   \PackageWarningNoLine\pxcz at pkgname
-   {The option 'unicode(*)' is enforced, because the\MessageBreak
+   {The option 'unicode' is enforced, because the\MessageBreak
     preset '\pxcz at main@preset' is selected.}}
 
 %% the setup
@@ -412,6 +418,10 @@
 \pxcz at do{noto+}{\pxcz at apply@opt at unicodeP}
 \pxcz at do{noto-otc+}{\pxcz at apply@opt at unicodeP}
 \pxcz at do{yu-win10+}{\pxcz at apply@opt at unicodeP}
+% No-embed is not supported under the 'unicode' setup
+\ifnum\pxcz at directunicode=\pxcz at directunicode@full
+  \pxcz at warn@unless at all@embeddedtrue
+\fi
 
 %% apply default for \pxcz at legacycode
 \ifx\pxcz at legacycode\relax
@@ -507,11 +517,9 @@
 \newcommand*\setschinesegothicfont{\pxcz at setfont{scg}}
 \newcommand*\settchineseminchofont{\pxcz at setfont{tcm}}
 \newcommand*\settchinesegothicfont{\pxcz at setfont{tcg}}
-\@onlypreamble\pxcz at setfont
-\def\pxcz at setfont#1{\@ifnextchar[%]
+\pxcz at onlypreamble@def\pxcz at setfont#1{\@ifnextchar[%]
   {\pxcz at setfont@a{#1}}{\pxcz at setfont@a{#1}[0]}}
-\@onlypreamble\pxcz at setfont@a
-\def\pxcz at setfont@a#1[#2]#3{%
+\pxcz at onlypreamble@def\pxcz at setfont@a#1[#2]#3{%
   \edef\pxcz at tmpa{#3}\pxcz at lower\pxcz at tmpa
   \pxcz at split{?:}{?\pxcz at tmpa}%
   \ifx\pxcz at pre\relax
@@ -521,8 +529,7 @@
     \fi
   \else \pxcz at setfont@b{#1}{#3}%
   \fi}
-\@onlypreamble\pxcz at setfont@b
-\def\pxcz at setfont@b#1#2{%
+\pxcz at onlypreamble@def\pxcz at setfont@b#1#2{%
   \@for\pxcz at tmpx:=#1\do{%
     \@namedef{pxcz at FS/\pxcz at tmpx}{#2}}}
 \@for\pxcz at x:=\pxcz at sym@list\do{%
@@ -539,6 +546,7 @@
   }{}%
 }
 \def\pxcz at asutf@a#1{%
+  \pxcz at warn@depre at asutf
   \kchardef\pxcz at tmpa=`#1\relax
   \expandafter\pxcz at asutf@b\meaning\pxcz at tmpa\relax
 }
@@ -545,6 +553,11 @@
 \def\pxcz at asutf@b#1"#2\relax{%
   \UTF{#2}%
 }
+\def\pxcz at warn@depre at asutf{%
+  \PackageWarningNoLine\pxcz at pkgname
+   {Important: Command '\string\asUTF' is DEPRECATED}%
+  \global\let\pxcz at warn@depre at asutf\relax
+}
 
 \fi
 %--------------------------------------- fontmap internals
@@ -566,11 +579,9 @@
 
 %%<*> \usecmapforalphabet/\nousecmapforalphabet
 \newcommand*\usecmapforalphabet{%
-  \global\let\pxcz at cmap@uni\pxcz at cmap@hwuni}
+  \global\pxcz at cmap@alphatrue}
 \newcommand*\nousecmapforalphabet{%
-  \global\let\pxcz at cmap@uni\pxcz at cmap@directuni}
-\ifpxcz at cmap@alpha \usecmapforalphabet
-\else \nousecmapforalphabet \fi
+  \global\pxcz at cmap@alphafalse}
 
 %% \pxcz at NEF/<sym>
 \def\pxcz at do#1#2{%
@@ -643,18 +654,17 @@
 \let\pxcz at lopts\relax
 \let\pxcz at mopts\relax
 \let\pxcz at font@tribe\relax
+\newif\ifpxcz at noembed@used
 
 %% \pxcz@@jpXX
 \edef\pxcz@@jpXX{%
   \ifpxcz at mmivjis jp04\else jp90\fi}
 %% \pxcz at add@lopt
-\@onlypreamble\pxcz at add@lopt
-\def\pxcz at add@lopt#1{%
+\pxcz at onlypreamble@def\pxcz at add@lopt#1{%
   \edef\pxcz at lopts{%
     \ifx\pxcz at lopts\@empty\else \pxcz at lopts:\fi#1}}
 %% \pxcz at uniquify@lopts
-\@onlypreamble\pxcz at uniquify@lopts
-\def\pxcz at uniquify@lopts#1#2{%
+\pxcz at onlypreamble@def\pxcz at uniquify@lopts#1#2{%
   \pxcz at oktrue
   \def\pxcz at tmpb{jp90}\ifx\pxcz at tmpb\pxcz at lopts\pxcz at okfalse\fi
   \def\pxcz at tmpb{jp04}\ifx\pxcz at tmpb\pxcz at lopts\pxcz at okfalse\fi
@@ -664,17 +674,14 @@
   \fi}
 
 %% \pxcz at is@jis at cmap
-\@onlypreamble\pxcz at is@jis at cmap
-\def\pxcz at is@jis at cmap{%
+\pxcz at onlypreamble@def\pxcz at is@jis at cmap{%
   \pxcz at okfalse
   \expandafter\pxcz at is@jis at cmap@a\pxcz at cmap\pxcz at end}
-\@onlypreamble\pxcz at is@jis at cmap@a
-\def\pxcz at is@jis at cmap@a#1#2\pxcz at end{%
+\pxcz at onlypreamble@def\pxcz at is@jis at cmap@a#1#2\pxcz at end{%
   \ifx\pxcz at mt#2\pxcz at mt \pxcz at oktrue \fi}
 
 %% \pxcz at force@mmiv at cmap
-\@onlypreamble\pxcz at force@mmiv at cmap
-\def\pxcz at force@mmiv at cmap{%
+\pxcz at onlypreamble@def\pxcz at force@mmiv at cmap{%
   \pxcz at is@jis at cmap \ifpxcz at ok
     \edef\pxcz at cmap{\pxcz at pfx@jis\pxcz at cmap}%
   \else
@@ -685,8 +692,7 @@
   \fi}
 
 %% \pxcz at inspect@font at tribe
-\@onlypreamble\pxcz at inspect@font at tribe
-\def\pxcz at inspect@font at tribe{%
+\pxcz at onlypreamble@def\pxcz at inspect@font at tribe{%
   \let\pxcz at font@tribe\@empty
   \ifx\pxcz at font\@empty
   \else\ifx\pxcz at font\pxcz at noembed
@@ -711,8 +717,7 @@
      {Font tribe is '\pxcz at font@tribe':\MessageBreak
       \@spaces\pxcz at font\@gobble}%
   \fi}
-\@onlypreamble\pxcz at inspect@font at tribe@a
-\def\pxcz at inspect@font at tribe@a#1#2#3{%
+\pxcz at onlypreamble@def\pxcz at inspect@font at tribe@a#1#2#3{%
   \pxcz at split{#1}{?\pxcz at font}%
   \ifx\pxcz at pre\relax\else
     \pxcz at split{#2}{\pxcz at font?}%
@@ -723,8 +728,7 @@
 
 %% \pxcz at switch@font at for{<feature>}
 % Modifies \pxcz at font, assuming \pxcz at font@tribe is properly set.
-\@onlypreamble\pxcz at switch@font at for
-\def\pxcz at switch@font at for#1{%
+\pxcz at onlypreamble@def\pxcz at switch@font at for#1{%
   \pxcz at csletcs{pxcz at tmpb}{pxcz at switch@font@@\pxcz at font@tribe @#1}%
   \ifx\pxcz at tmpb\relax\else
 %\typeout{#1:\pxcz at font-->\expandafter\pxcz at tmpb\pxcz at font}%
@@ -772,8 +776,7 @@
 \fi
 
 %% \pxcz at declare@entry at modifier{<name>}
-\@onlypreamble\pxcz at declare@entry at modifier
-\def\pxcz at declare@entry at modifier#1{%
+\pxcz at onlypreamble@def\pxcz at declare@entry at modifier#1{%
   \pxcz at onlypreamble@csdef{pxcz at MEM/#1}}
 
 %% entry modifiers
@@ -808,14 +811,16 @@
   \pxcz at add@lopt{jp90}}
 % HWid
 \pxcz at declare@entry at modifier{HWid}{%
-  \ifx\pxcz at font\pxcz at noembed
-    \let\pxcz at cmap\pxcz at cmap@hwuni
-  \else\ifnum\pxcz at directunicode=\pxcz at directunicode@full
+  \ifx\pxcz at font\pxcz at noembed \pxcz at okfalse
+  \else\ifnum\pxcz at directunicode=\pxcz at directunicode@full \pxcz at oktrue
+  \else\ifpxcz at cmap@alpha \pxcz at okfalse
+  \else \pxcz at oktrue
+  \fi\fi\fi
+  \ifpxcz at ok
     \let\pxcz at cmap\pxcz at cmap@directuni
-  \else
-    \let\pxcz at cmap\pxcz at cmap@uni
     \pxcz at switch@font at for{hwid}%
-  \fi\fi
+  \else \let\pxcz at cmap\pxcz at cmap@hwuni
+  \fi
   \pxcz at add@lopt{hwid}}
 % FWid
 \pxcz at declare@entry at modifier{FWid}{%
@@ -865,15 +870,13 @@
 \let\pxcz at spec\@empty
 
 %% \pxcz at addtospec{<id>}
-\@onlypreamble\pxcz at addtospec
-\def\pxcz at addtospec#1{%
+\pxcz at onlypreamble@def\pxcz at addtospec#1{%
   \begingroup
     \let\Entry\pxcz at Entry
     \@nameuse{pxcz at ME/#1}%
   \endgroup}
 %% \Entry{<sym>}{<tfm>}{<cmap>}{<modify>,...}
-\@onlypreamble\pxcz at Entry
-\def\pxcz at Entry#1#2#3#4{%
+\pxcz at onlypreamble@def\pxcz at Entry#1#2#3#4{%
   \def\pxcz at sym{#1}\def\pxcz at cmap{#3}%
   \let\pxcz at csi\relax \let\pxcz at mopts\@empty \let\pxcz at lopts\@empty
   \pxcz at retainfalse \pxcz at retain@csifalse \pxcz at vertfalse
@@ -887,6 +890,8 @@
   % resolve no-embed font spec
   \ifx\pxcz at font\pxcz at noembed
     \edef\pxcz at font{!\@nameuse{pxcz at NEF/\pxcz at sym}}%
+    \pxcz at retaintrue
+    \global\pxcz at noembed@usedtrue
   \fi
   % apply layout options when using 'unicode'
   \ifnum\pxcz at directunicode<\pxcz at directunicode@full\else
@@ -927,8 +932,7 @@
   \fi\fi}
 
 %% \pxcz at do@file at preset
-\@onlypreamble\pxcz at do@file at preset
-\def\pxcz at do@file at preset{%
+\pxcz at onlypreamble@def\pxcz at do@file at preset{%
   \ifpxcz at file@preset at tl
     \pxcz at do@file at preset@a{ptex-}%
     \ifpxcz at uptex \pxcz at do@file at preset@a{uptex-}\fi
@@ -939,8 +943,7 @@
   \else
     \pxcz at do@file at preset@a{}%
   \fi}
-\@onlypreamble\pxcz at do@file at preset@a
-\def\pxcz at do@file at preset@a#1{%
+\pxcz at onlypreamble@def\pxcz at do@file at preset@a#1{%
   \pxcz at addtospec@alt\pxcz at mapfile{#1\pxcz at file@preset.map}}
 
 %% \pxcz at addtospec@alt
@@ -952,8 +955,7 @@
 %--------------------------------------- map entry definitions
 
 %% \pxcz at mapentry{<id>}{<text>}
-\@onlypreamble\pxcz at mapentry
-\def\pxcz at mapentry#1{%
+\pxcz at onlypreamble@def\pxcz at mapentry#1{%
   \pxcz at onlypreamble@csdef{pxcz at ME/#1}}
 
 %% map entries
@@ -1250,14 +1252,12 @@
 \fi
 
 %% \pxcz at du@decl at shape{<fam>}{<ser>}<sw>{<tfmname>}{<suffix>}
-\@onlypreamble\pxcz at du@decl at shape
-\def\pxcz at du@decl at shape#1#2#3#4#5{%
+\pxcz at onlypreamble@def\pxcz at du@decl at shape#1#2#3#4#5{%
 \DeclareFontShape{JY2}{#1}{#2}{diruni}{<->%
     \pxcz at du@shape at spec{#3}{#4}{#5}{h}}{}%
 \DeclareFontShape{JT2}{#1}{#2}{diruni}{<->%
     \pxcz at du@shape at spec{#3}{#4}{#5}{v}}{}}
-\@onlypreamble\pxcz at du@shape at spec
-\def\pxcz at du@shape at spec#1#2#3#4{%
+\pxcz at onlypreamble@def\pxcz at du@shape at spec#1#2#3#4{%
   \if#1t%
     s*[\pxcz at du@scale]#2\if t\pxcz at otf@mmivjis#3\fi-#4%
   \else#2\fi}
@@ -1303,8 +1303,7 @@
       \edef\pxcz at tmpb{{\f at encoding}{\pxcz at tmpa}{\pxcz at tmpb}}%
       \expandafter\pxcz at do\pxcz at tmpb}}%
 }
-\@onlypreamble\pxcz at force@load at font@fam
-\def\pxcz at force@load at font@fam#1{%
+\pxcz at onlypreamble@def\pxcz at force@load at font@fam#1{%
   \begingroup
     \edef\f at family{#1}\def\f at series{m}\def\f at shape{n}%
     \xdef\font at name{\csname\curr at fontshape/\f at size\endcsname}%
@@ -1323,14 +1322,12 @@
   \endgroup}
 
 %% \pxcz at dg@decl at shape{<fam>}{<ser>}<sw>{<tfmname>}
-\@onlypreamble\pxcz at dg@decl at shape
-\def\pxcz at dg@decl at shape#1#2#3#4{%
+\pxcz at onlypreamble@def\pxcz at dg@decl at shape#1#2#3#4{%
 \DeclareFontShape{JY2}{#1}{#2}{dirgid}{<->%
     \pxcz at dg@shape at spec{#3}{#4}{h}}{}%
 \DeclareFontShape{JT2}{#1}{#2}{dirgid}{<->%
     \pxcz at dg@shape at spec{#3}{#4}{v}}{}}
-\@onlypreamble\pxcz at dg@shape at spec
-\def\pxcz at dg@shape at spec#1#2#3{%
+\pxcz at onlypreamble@def\pxcz at dg@shape at spec#1#2#3{%
   \if#1t%
     s*[\pxcz at du@scale]#2-#3%
   \else#2\fi}
@@ -1373,7 +1370,8 @@
     You must use upLaTeX and load pxchfon after 'otf' package.}
 \fi
 \def\pxcz at err@diruni{%
-  \pxcz at error{Command '\string\diruni' not available}%
+  \PackageError\pxcz at pkgname
+   {Command '\string\diruni' not available}%
    {\pxcz at errhelp@diruni\MessageBreak\@ehc}%
   \global\let\pxcz at err@diruni\relax}
 \AtBeginDocument{%
@@ -1386,22 +1384,29 @@
 
 %--------------------------------------- 'alphabet' option
 
+%% check for textcomp
+\newif\ifpxcz at textcomp
+\@ifpackageloaded{textcomp}{\pxcz at textcomptrue}{}
+
 %% \pxcz at afont@enc at list
 \def\pxcz at afont@enc at list{OT1,T1}
+\ifpxcz at textcomp \g at addto@macro\pxcz at afont@enc at list{,TS1}\fi
 %% \pxcz at decl@family{<fam>}
-\@onlypreamble\pxcz at decl@family
-\def\pxcz at decl@family#1{%
+\pxcz at onlypreamble@def\pxcz at decl@family#1{%
+  \ifpxcz at textcomp \DeclareEncodingSubset{TS1}{#1}{3}\fi
   \@for\pxcz at x:=\pxcz at afont@enc at list\do{%
     \DeclareFontFamily{\pxcz at x}{#1}{}}}
 %% \pxcz at decl@shape{<fam>}{<ser>}<sw>{<font>}
-\@onlypreamble\pxcz at decl@shape
-\def\pxcz at decl@shape#1#2#3#4{%
+\pxcz at onlypreamble@def\pxcz at decl@shape#1#2#3#4{%
   \if s#3%
     \@for\pxcz at x:=\pxcz at afont@enc at list\do{%
       \DeclareFontShape{\pxcz at x}{#1}{#2}{n}{<->ssub*#4}{}}%
   \else
-    \DeclareFontShape{OT1}{#1}{#2}{n}{<->#4-l0j}{}%
-    \DeclareFontShape {T1}{#1}{#2}{n}{<->#4-l0j}{}% FIXME
+    \DeclareFontShape{OT1}{#1}{#2}{n}{<->#4-l5j}{}%
+    \DeclareFontShape {T1}{#1}{#2}{n}{<->#4-t1}{}%
+    \ifpxcz at textcomp
+      \DeclareFontShape{TS1}{#1}{#2}{n}{<->#4-ts1}{}%
+    \fi
   \fi
   \@for\pxcz at x:=\pxcz at afont@enc at list\do{%
     \DeclareFontShape{\pxcz at x}{#1}{#2}{it}{<->ssub*#1/#2/n}{}%
@@ -1435,11 +1440,11 @@
 \pxcz at decl@family{cfjas}%
 \pxcz at decl@shape{cfjas}{m}n{cfjas-r}%
 \pxcz at decl@shape{cfjas}{bx}s{cfjas/m/n}%
-\@onlypreamble\pxcz at err@dxotf
-\def\pxcz at err@dxotf#1{%
-  \pxcz at error{Loaded before '#1' with 'deluxe'}%
-  {This package must be loaded after '#1' with 'deluxe' option
-  when using both.}}
+\pxcz at onlypreamble@def\pxcz at err@dxotf#1{%
+  \PackageError\pxcz at pkgname
+   {Loaded before '#1' with 'deluxe'}%
+   {This package must be loaded after '#1' with 'deluxe' option
+    when using both.}}
 \g at addto@macro\pxcz at check@extra{%
   \expandafter\let\expandafter\pxcz at x\csname pxcz at FS/mnr\endcsname
   \ifx\pxcz at x\@empty\else
@@ -1463,21 +1468,19 @@
 \def\pxcz at mgfamily@hook{\romanfamily{cfjam}}
 
 %% \pxcz at set@page at hook{<text>}
-\@onlypreamble\pxcz at set@page at hook
 \ifpxcz at everypage
-\def\pxcz at set@page at hook#1{%
+\pxcz at onlypreamble@def\pxcz at set@page at hook#1{%
   \AtBeginShipout{\setbox\AtBeginShipoutBox=\vbox{%
      \baselineskip\z at skip\lineskip\z at skip\lineskiplimit\z@
      #1\copy\AtBeginShipoutBox}}}
 \else
-\def\pxcz at set@page at hook#1{%
+\pxcz at onlypreamble@def\pxcz at set@page at hook#1{%
   % this is \AtBeginDvi with forcing of yoko-dir added
   \global\setbox\@begindvibox\vbox{\yoko\unvbox\@begindvibox#1}}
 \fi
 
 %% \pxcz at check@alldefined{<sym>,...}
-\@onlypreamble\pxcz at check@alldefined
-\def\pxcz at check@alldefined#1{%
+\pxcz at onlypreamble@def\pxcz at check@alldefined#1{%
   \pxcz at oktrue
   \@for\pxcz at x:={#1}\do{%
     \expandafter\ifx\csname pxcz at FS/\pxcz at x\endcsname\@empty
@@ -1484,8 +1487,7 @@
       \pxcz at okfalse \fi}}
 
 %% \pxcz at decl@relfont{<fam>}{<afam>}{<ser>,...}
-\@onlypreamble\pxcz at decl@relfont
-\def\pxcz at decl@relfont#1#2#3{%
+\pxcz at onlypreamble@def\pxcz at decl@relfont#1#2#3{%
   \@for\pxcz at x:={#3}\do{%
     \expandafter\ifx\csname\k at encoding/#1/\pxcz at x/n\endcsname\relax\else
       \edef\pxcz at tmpa{\noexpand\DeclareRelationFont
@@ -1492,26 +1494,19 @@
         {\k at encoding}{#1}{\pxcz at x}{}{\pxcz at afont@enc}{#2}{\pxcz at x}{}%
       }\pxcz at tmpa
     \fi}%
-  \pxcz at info{Relation font set for \k at encoding/#1}}
+  \PackageInfo\pxcz at pkgname
+   {Relation font set for \k at encoding/#1}}
 
 %% \pxcz at check@afont at enc
-\@onlypreamble\pxcz at check@afont at enc
-\def\pxcz at check@afont at enc{%
+\pxcz at onlypreamble@def\pxcz at check@afont at enc{%
   \pxcz at oktrue % OT1 is always okay
-  \def\pxcz at tmpa{OT1}\ifx\pxcz at tmpa\pxcz at afont@enc\else
-    % otherwise, noembed must not be used
-    \@for\pxcz at x:=\pxcz at sym@list\do{%
-      \expandafter\ifx\csname pxcz at FS/\pxcz at x\endcsname\pxcz at noembed
-        \pxcz at okfalse \fi}%
-    \expandafter\ifx\csname\pxcz at afont@enc+cfjar\endcsname\relax
-      \pxcz at okfalse \fi
-  \fi
+  \expandafter\ifx\csname\pxcz at afont@enc+cfjar\endcsname\relax
+    \pxcz at okfalse \fi
   % if not okay, use OT1 instead
   \ifpxcz at ok\else \def\pxcz at afont@enc{OT1}\fi}
 
 %% the begin-document hook
-\@onlypreamble\pxcz at doc@hook
-\def\pxcz at doc@hook{%
+\pxcz at onlypreamble@def\pxcz at doc@hook{%
   \pxcz at user@hook
   \ifx\pxcz at file@preset\relax\else
     \pxcz at do@file at preset
@@ -1536,7 +1531,8 @@
     % decide alphabet font encoding
     \edef\pxcz at afont@enc{\encodingdefault}%
     \pxcz at check@afont at enc\ifpxcz at ok\else
-      \pxcz at warn{Default encoding is changed to 'OT1' because%
+      \PackageWarningNoLine\pxcz at pkgname
+       {Default encoding is changed to 'OT1' because%
         \MessageBreak'alphabet' option is in effect}%
       \renewcommand\encodingdefault{OT1}%
     \fi
@@ -1593,10 +1589,17 @@
     \ifpxcz at ok\else
       \PackageWarningNoLine\pxcz at pkgname
        {Some font weights are not substituted.\MessageBreak
-        Thus some features of pxchfon might not work\MessageBreak
+        So some features of pxchfon might not work\MessageBreak
         properly when applied to such weights}%
     \fi
   \fi
+  % warn if some weights are not embedded, and if necessaty
+  \ifpxcz at warn@unless at all@embedded \ifpxcz at noembed@used
+    \PackageWarningNoLine\pxcz at pkgname
+     {Some font weights have no-embed setting.\MessageBreak
+      So some features of pxchfon might not work\MessageBreak
+      properly when applied to such weights}%
+  \fi\fi
   %
   \pxcz at check@extra
   \pxcz at addtospec{USR}%
@@ -1636,8 +1639,7 @@
 %% \pxcz at insf@read at word{<offset>}
 % Reads a 32-bit integer from \pxcz at insf@file at the given offset,
 % and sets the value (or -1 on error) to \pxcz at cntr.
-\@onlypreamble\pxcz at insf@read at word
-\def\pxcz at insf@read at word#1{%
+\pxcz at onlypreamble@def\pxcz at insf@read at word#1{%
   \pxcz at cntr=#1\relax
   \edef\pxcz at tmpa{\pdffiledump offset\pxcz at cntr length1{\pxcz at insf@file}}%
   \ifnum"0\pxcz at tmpa<"80
@@ -1652,8 +1654,7 @@
 %% \pxcz at inspect@flavor{<path>}{<index>}
 % Sets the result to \pxcz at cntr.
 % 1=CFF, 0=TTF, <0 if error.
-\@onlypreamble\pxcz at inspect@flavor
-\def\pxcz at inspect@flavor#1#2{%
+\pxcz at onlypreamble@def\pxcz at inspect@flavor#1#2{%
   \edef\pxcz at insf@file{#1}%
   \mathchardef\pxcz at insf@idx=#2\relax
   \pxcz at insf@read at word{0}% outer tag
@@ -1684,14 +1685,12 @@
 
 %% \pxcz at kpse@dir at cache
 % to spped up \pxcz at kpsewhich
-\@onlypreamble\pxcz at kpse@dir at cache
-\let\pxcz at kpse@dir at cache\@empty
+\pxcz at onlypreamable@let\pxcz at kpse@dir at cache\@empty
 
 %% \pxcz at kpsewhich{<filename>}
 % Sets to \pxcz at kpse@dir the directory where the file is found
 % (or \relax if not found).
-\@onlypreamble\pxcz at kpsewhich
-\def\pxcz at kpsewhich#1{%
+\pxcz at onlypreamble@def\pxcz at kpsewhich#1{%
   \edef\pxcz at tmpa{#1}\let\pxcz at kpse@dir\relax
   \let\do\pxcz at kpsewhich@do \pxcz at kpse@dir at cache\relax
   \ifx\pxcz at kpse@dir\relax
@@ -1708,15 +1707,13 @@
     \fi
     \endlinechar\pxcz at tmpz
   \fi}
-\@onlypreamble\pxcz at kpsewhich@a
-\def\pxcz at kpsewhich@a#1/#2\pxcz at end{%
+\pxcz at onlypreamble@def\pxcz at kpsewhich@a#1/#2\pxcz at end{%
   \ifx\pxcz at end#2\pxcz at end \expandafter\@gobble
   \else \expandafter\@firstofone
   \fi{%
     \edef\pxcz at kpse@dir{\pxcz at kpse@dir#1/}%
     \pxcz at kpsewhich@a#2\pxcz at end}}
-\@onlypreamble\pxcz at kpsewhich@do
-\def\pxcz at kpsewhich@do#1{%
+\pxcz at onlypreamble@def\pxcz at kpsewhich@do#1{%
   \ifnum0\pdffilesize{#1\pxcz at tmpa}>\z@
     \def\pxcz at kpse@dir{#1}%
     \expandafter\pxcz at kpsewhich@do at a
@@ -1725,13 +1722,11 @@
 
 %% \pxcz at inspect@flavor at all
 % Sets \[pxcz at OT/<sym>].
-\@onlypreamble\pxcz at inspect@flavor at all
-\def\pxcz at inspect@flavor at all{%
+\pxcz at onlypreamble@def\pxcz at inspect@flavor at all{%
   \@for\pxcz at tmpa:=\pxcz at sym@list\do{%
     \edef\pxcz at tmpa{{\pxcz at tmpa}{\@nameuse{pxcz at FS/\pxcz at tmpa}}}%
     \expandafter\pxcz at inspect@flavor at all@a\pxcz at tmpa}}
-\@onlypreamble\pxcz at inspect@flavor at all@a
-\def\pxcz at inspect@flavor at all@a#1#2{%
+\pxcz at onlypreamble@def\pxcz at inspect@flavor at all@a#1#2{%
   \def\pxcz at tmpa{#2}%
   \ifx\pxcz at tmpa\@empty
   \else\ifx\pxcz at tmpa\pxcz at noembed
@@ -1738,12 +1733,10 @@
     \@namedef{pxcz at OT/#1}{t}%
   \else \pxcz at inspect@flavor at all@b#2\pxcz at end{#1}%
   \fi\fi}
-\@onlypreamble\pxcz at inspect@flavor at all@b
-\def\pxcz at inspect@flavor at all@b#1#2\pxcz at end{%
+\pxcz at onlypreamble@def\pxcz at inspect@flavor at all@b#1#2\pxcz at end{%
   \edef\pxcz at tmpa{\ifx:#1\else:0:\fi#1#2}%
   \expandafter\pxcz at inspect@flavor at all@c\pxcz at tmpa\pxcz at end}
-\@onlypreamble\pxcz at inspect@flavor at all@c
-\def\pxcz at inspect@flavor at all@c:#1:#2\pxcz at end#3{%
+\pxcz at onlypreamble@def\pxcz at inspect@flavor at all@c:#1:#2\pxcz at end#3{%
   \pxcz at kpsewhich{#2}%
   \unless\ifx\pxcz at kpse@dir\relax
     \pxcz at inspect@flavor{\pxcz at kpse@dir#2}{#1}%
@@ -1769,11 +1762,9 @@
   \edef\pxcz at dump@text{\pxcz at dump@text#1}}
 
 %% \pxcz at dump@special{<string>}
-\@onlypreamble\pxcz at dump@special
-\def\pxcz at dump@special#1{%
+\pxcz at onlypreamble@def\pxcz at dump@special#1{%
   \pxcz at dump@special at a#1\bxcz at end}
-\@onlypreamble\pxcz at dump@special at a
-\def\pxcz at dump@special at a#1 #2\bxcz at end{%
+\pxcz at onlypreamble@def\pxcz at dump@special at a#1 #2\bxcz at end{%
   \@nameuse{pxcz at dump@special@#1}\@gobble{#2}}
 \@namedef{pxcz at dump@special at pdf:mapline}#1#2{%
   \pxcz at add@to at dump@text{\pxcz at rmin#2^^J}}
@@ -1783,8 +1774,7 @@
   \ifx-#1\@percentchar\else#1\fi}
 
 %% \pxcz at dump@spec at to{<file-name>}
-\@onlypreamble\pxcz at dump@spec at to
-\def\pxcz at dump@spec at to#1{%
+\pxcz at onlypreamble@def\pxcz at dump@spec at to#1{%
   \def\pxcz at dump@text{\@percentchar\space#1^^J}%
   \let\special\pxcz at dump@special
   \pxcz at spec \let\special\relax
@@ -1794,15 +1784,13 @@
   \immediate\closeout\pxcz at fout}
 
 %% \pxcz at do@dumpmap
-\@onlypreamble\pxcz at do@dumpmap
-\def\pxcz at do@dumpmap{%
+\pxcz at onlypreamble@def\pxcz at do@dumpmap{%
   \begingroup
     \pxcz at dump@spec at to{\jobname.map}%
   \endgroup}
 
 %% \pxcz at do@dumpmap at tl
-\@onlypreamble\pxcz at do@dumpmap at tl
-\def\pxcz at do@dumpmap at tl{%
+\pxcz at onlypreamble@def\pxcz at do@dumpmap at tl{%
   \begingroup
     \let\pxcz at spec@save\pxcz at spec
     \pxcz at do@dumpmap at tl@a{STD}{ptex-\jobname}%
@@ -1811,8 +1799,7 @@
     \pxcz at do@dumpmap at tl@a{UPOTF}{otf-up-\jobname}%
     \global\let\pxcz at spec\pxcz at spec@save
   \endgroup}
-\@onlypreamble\pxcz at do@dumpmap at tl@a
-\def\pxcz at do@dumpmap at tl@a#1#2{%
+\pxcz at onlypreamble@def\pxcz at do@dumpmap at tl@a#1#2{%
   \global\let\pxcz at spec\@empty
   \pxcz at addtospec{#1}%
   \pxcz at dump@spec at to{#2.map}}
@@ -1821,16 +1808,13 @@
 %--------------------------------------- preset japanese font mappings
 
 %% \pxcz at declare@preset{<name>}{<text>}
-\@onlypreamble\pxcz at declare@preset
-\def\pxcz at declare@preset#1{%
+\pxcz at onlypreamble@def\pxcz at declare@preset#1{%
   \pxcz at onlypreamble@csdef{pxcz at the@preset@#1}}
 
 %% \pxcz at declare@preset at alias{<name1>}{<name2>}
-\@onlypreamble\pxcz at declare@preset at alias
-\def\pxcz at declare@preset at alias#1#2{%
-  \expandafter\pxcz at decl@preset at alias@a\csname pxcz at the@preset@#1%
+\pxcz at onlypreamble@def\pxcz at declare@preset at alias#1#2{%
+  \expandafter\pxcz at onlypreamble@let\csname pxcz at the@preset@#1%
   \expandafter\endcsname\csname pxcz at the@preset@#2\endcsname}
-\def\pxcz at decl@preset at alias@a#1#2{\@onlypreamble#1\let#1#2}
 
 %% \pxcz at abolished@preset
 \pxcz at onlypreamble@def\pxcz at abolished@preset{%
@@ -1841,14 +1825,12 @@
   \pxcz at onlypreamble@csdef{pxcz at the@preset@\pxcz at x}{\pxcz at abolished@preset}}
 
 %% \pxcz at uniweight{<font-mn>}{<font-gt>}
-\@onlypreamble\pxcz at uniweight
-\def\pxcz at uniweight#1#2{%
+\pxcz at onlypreamble@def\pxcz at uniweight#1#2{%
   \setminchofont{#1}\setgothicfont{#2}\setmarugothicfont{#2}}
 
 %% \pxcz at multiweight{<font-mnl>}{<font-mnr>}{<font-mnb>}
 %%   {<font-gtr>}{<font-gtb>}{<font-gtx>}{<font-gtu>}{<font-mgr>}
-\@onlypreamble\pxcz at multiweight
-\def\pxcz at multiweight#1#2#3#4#5#6#7#8{%
+\pxcz at onlypreamble@def\pxcz at multiweight#1#2#3#4#5#6#7#8{%
   \setminchofont{#2}\setgothicfont{#7}\setmarugothicfont{#8}%
   \ifpxcz at oneweight\else
   \setlightminchofont{#1}\setboldminchofont{#3}%



More information about the tex-live-commits mailing list