texlive[49925] Master/texmf-dist: pxchfon (3feb19)
commits+karl at tug.org
commits+karl at tug.org
Sun Feb 3 23:47:16 CET 2019
Revision: 49925
http://tug.org/svn/texlive?view=revision&revision=49925
Author: karl
Date: 2019-02-03 23:47:16 +0100 (Sun, 03 Feb 2019)
Log Message:
-----------
pxchfon (3feb19)
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/tex/platex/pxchfon/pxchfon.sty
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-02-03 22:47:00 UTC (rev 49924)
+++ trunk/Master/texmf-dist/doc/platex/pxchfon/pxchfon.tex 2019-02-03 22:47:16 UTC (rev 49925)
@@ -10,8 +10,8 @@
\usepackage{metalogo}
\usepackage{shortvrb}
\MakeShortVerb{\|}
-\newcommand{\PkgVersion}{1.2b}
-\newcommand{\PkgDate}{2019/01/21}
+\newcommand{\PkgVersion}{1.3}
+\newcommand{\PkgDate}{2019/02/03}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$}
\newcommand{\Note}{\par\noindent ※}
Modified: trunk/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
===================================================================
--- trunk/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty 2019-02-03 22:47:00 UTC (rev 49924)
+++ trunk/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty 2019-02-03 22:47:16 UTC (rev 49925)
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxchfon}[2019/01/21 v1.2b]
+\ProvidesPackage{pxchfon}[2019/02/03 v1.3]
\def\pxcz at pkgname{pxchfon}
%% preparations
@@ -123,6 +123,8 @@
\let\pxcz at strict@csi\relax
\newif\ifpxcz at directunicode@default
\let\pxcz at legacycode\relax
+\let\pxcz at expert\relax
+\newif\ifpxcz at glyphid
%% process options
% drivers
@@ -183,6 +185,12 @@
\DeclareOption{ignore-legacycode}{\let\pxcz at legacycode\pxcz at legacycode@ignore}
\DeclareOption{suppress-legacycode}{\let\pxcz at legacycode\pxcz at legacycode@suppress}
\DeclareOption{replace-legacycode}{\let\pxcz at legacycode\pxcz at legacycode@replace}
+% (no)expert
+\DeclareOption{expert}{\let\pxcz at expert=t}
+\DeclareOption{noexpert}{\let\pxcz at expert=f}
+% (no)glyphid
+\DeclareOption{glyphid}{\pxcz at glyphidtrue}
+\DeclareOption{noglyphid}{\pxcz at glyphidfalse}
% preset spec options
\pxcz at onlypreamble@def\pxcz at all@main at preset{%
noembed,%
@@ -308,7 +316,7 @@
\if t\pxcz at strict@csi
% 'strictcsi' requires some pdfTeX feature.
\ifx\pdffiledump\@undefined
- \PackageWarning\pxcz at pkgname
+ \PackageWarningNoLine\pxcz at pkgname
{The option 'strictcsi' cannot be used, because\MessageBreak
the engine does not support '\string\pdffiledump'}
\let\pxcz at strict@csi=f
@@ -394,6 +402,42 @@
\let\pxcz at legacycode\pxcz at legacycode@suppress}%
\fi
+%% 'glyphid' requires 'replace-' or 'suppress-legacycode'
+\pxcz at okfalse
+\ifnum\pxcz at legacycode=\pxcz at legacycode@replace \pxcz at oktrue \fi
+\ifnum\pxcz at legacycode=\pxcz at legacycode@suppress \pxcz at oktrue \fi
+\ifpxcz at uptex\else \pxcz at okfalse \fi
+\ifpxcz at ok\else
+ \ifpxcz at glyphid
+ \PackageError\pxcz at pkgname
+ {The option 'glyphid' cannot be used here. You must\MessageBreak
+ use upLaTeX and the 'unicode' option}
+ {\@ehc}
+ \pxcz at glyphidfalse
+ \fi
+ \if t\pxcz at expert % explicitly given
+ \PackageError\pxcz at pkgname
+ {The option 'expert' cannot be used here. You must\MessageBreak
+ use upLaTeX and the 'unicode' option}
+ {\@ehc}
+ \fi
+ \let\pxcz at expert=f
+\fi
+
+%% apply default for \pxcz at expert
+\@ifpackagewith{otf}{expert}{%
+ \ifx\pxcz at expert\relax
+ \let\pxcz at expert=t
+ \fi
+}{%else
+ \if t\pxcz at expert
+ \PackageWarningNoLine\pxcz at pkgname
+ {The 'expert' option will be ignored, since the\MessageBreak
+ expert mode of the 'otf' package is not enabled}
+ \fi
+ \let\pxcz at expert=f
+}
+
%--------------------------------------- user interface
%% \pxcz at sym@list
@@ -542,7 +586,9 @@
\let\pxcz at cmap\relax
\let\pxcz at font\relax
\let\pxcz at csi\relax
-\newif\ifpxcz at ext
+\newif\ifpxcz at vert
+\newif\ifpxcz at retain
+\newif\ifpxcz at retain@csi
\let\pxcz at lopts\relax
\let\pxcz at mopts\relax
\let\pxcz at font@tribe\relax
@@ -678,6 +724,7 @@
\@onlypreamble\pxcz at declare@entry at modifier
\def\pxcz at declare@entry at modifier#1{%
\pxcz at onlypreamble@csdef{pxcz at MEM/#1}}
+
%% entry modifiers
% Uni: Changes cmap to 'unicode' if directunicode.
\pxcz at declare@entry at modifier{Uni}{%
@@ -693,7 +740,7 @@
\let\pxcz at cmap\pxcz at cmap@directuni
\fi
\fi}
-% Switch
+% Switch: Selects 90 or 04 (according to mmivjis)
\pxcz at declare@entry at modifier{Switch}{%
\ifpxcz at mmivjis
\pxcz at force@mmiv at cmap
@@ -725,23 +772,45 @@
\pxcz at switch@font at for{fwid}%
\pxcz at add@lopt{fwid}}
% AJ16/AK12/AG14/AC14
-\pxcz at declare@entry at modifier{AJ16}{\def\pxcz at csi{AJ16}}
-\pxcz at declare@entry at modifier{AK12}{\def\pxcz at csi{AK12}\pxcz at exttrue}
-\pxcz at declare@entry at modifier{AG14}{\def\pxcz at csi{AG14}\pxcz at exttrue}
-\pxcz at declare@entry at modifier{AC14}{\def\pxcz at csi{AC14}\pxcz at exttrue}
+\pxcz at declare@entry at modifier{AJ16}{%
+ \def\pxcz at csi{AJ16}%
+ \if t\pxcz at expert \ifnum\pxcz at directunicode<\pxcz at directunicode@all\else
+ \ifx\pxcz at font\pxcz at noembed\else
+ \let\pxcz at cmap\pxcz at cmap@directuni \let\pxcz at csi\relax
+ \pxcz at add@lopt{ruby}%
+ \fi\fi\fi}
+\pxcz at declare@entry at modifier{AK12}{\def\pxcz at csi{AK12}\pxcz at retaintrue}
+\pxcz at declare@entry at modifier{AG14}{\def\pxcz at csi{AG14}\pxcz at retaintrue}
+\pxcz at declare@entry at modifier{AC14}{\def\pxcz at csi{AC14}\pxcz at retaintrue}
% V: Adds '-w 1' if cmap is 'unicode'.
\pxcz at declare@entry at modifier{V}{%
+ \pxcz at verttrue
\ifx\pxcz at cmap\pxcz at cmap@directuni
\edef\pxcz at mopts{ -w 1\pxcz at mopts}%
\fi}
+% Exp: Adds 'hkna/vkna' if cmap is 'unicode'.
+\pxcz at declare@entry at modifier{Exp}{%
+ \if t\pxcz at expert \ifx\pxcz at cmap\pxcz at cmap@directuni
+ \ifpxcz at vert \pxcz at add@lopt{vkna}%
+ \else \pxcz at add@lopt{hkna}%
+ \fi
+ \fi\fi}
+% SubG
+\pxcz at declare@entry at modifier{SubG}{%
+ \ifpxcz at glyphid
+ \edef\pxcz at cmap{Identity-\pxcz at cmap}\def\pxcz at csi{I}%
+ \pxcz at retaintrue \pxcz at retain@csitrue
+ \fi}
% Fin: final step
\pxcz at declare@entry at modifier{Fin}{%
\ifx\pxcz at csi\relax\else
- \expandafter\ifx\csname pxcz at OT/\pxcz at sym\endcsname\relax
+ \ifpxcz at retain@csi
\edef\pxcz at mopts{/\pxcz at csi}%
+ \else\expandafter\ifx\csname pxcz at OT/\pxcz at sym\endcsname\relax
+ \edef\pxcz at mopts{/\pxcz at csi}%
\else % omit CSI part for CFF fonts
\let\pxcz at mopts\@empty
- \fi
+ \fi\fi
\fi}
%% \pxcz at spec
@@ -759,7 +828,7 @@
\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 extfalse
+ \pxcz at retainfalse \pxcz at retain@csifalse \pxcz at vertfalse
\edef\pxcz at font{\@nameuse{pxcz at FS/\pxcz at sym}}%
\pxcz at inspect@font at tribe
% apply modifiers
@@ -792,7 +861,7 @@
\fi
\fi
% suppress legacy-code mappings unless 'apply-legacycode'
- \ifx\pxcz at cmap\pxcz at cmap@directuni\else \ifpxcz at ext\else
+ \ifx\pxcz at cmap\pxcz at cmap@directuni\else \ifpxcz at retain\else
\ifnum\pxcz at legacycode=\pxcz at legacycode@apply % no-op
\else\ifnum\pxcz at legacycode=\pxcz at legacycode@ignore
\let\pxcz at font\@empty % skip
@@ -878,8 +947,8 @@
\Entry{mnl}{hminl-v} {V} {90,V}%
\Entry{mnl}{otf-ujmln-h} {UniJIS2004-UTF16-H} {Uni,04,FWid}%
\Entry{mnl}{otf-ujmln-v} {UniJIS2004-UTF16-V} {Uni,04,FWid,V}%
-\Entry{mnl}{hminln-h} {H} {}%
-\Entry{mnl}{hminln-v} {V} {V}%
+\Entry{mnl}{hminln-h} {H} {SubG}%
+\Entry{mnl}{hminln-v} {V} {SubG,V}%
\Entry{mnr}{otf-ujmr-h} {UniJIS-UTF16-H} {Uni,90,FWid}%
\Entry{mnr}{otf-ujmr-v} {UniJIS-UTF16-V} {Uni,90,FWid,V}%
\Entry{mnr}{otf-cjmr-h} {Identity-H} {AJ16}%
@@ -888,8 +957,8 @@
\Entry{mnr}{hminr-v} {V} {90,V}%
\Entry{mnr}{otf-ujmrn-h} {UniJIS2004-UTF16-H} {Uni,04,FWid}%
\Entry{mnr}{otf-ujmrn-v} {UniJIS2004-UTF16-V} {Uni,04,FWid,V}%
-\Entry{mnr}{hminrn-h} {H} {}%
-\Entry{mnr}{hminrn-v} {V} {V}%
+\Entry{mnr}{hminrn-h} {H} {SubG}%
+\Entry{mnr}{hminrn-v} {V} {SubG,V}%
\Entry{mnb}{otf-ujmb-h} {UniJIS-UTF16-H} {Uni,90,FWid}%
\Entry{mnb}{otf-ujmb-v} {UniJIS-UTF16-V} {Uni,90,FWid,V}%
\Entry{mnb}{otf-cjmb-h} {Identity-H} {AJ16}%
@@ -898,8 +967,8 @@
\Entry{mnb}{hminb-v} {V} {90,V}%
\Entry{mnb}{otf-ujmbn-h} {UniJIS2004-UTF16-H} {Uni,04,FWid}%
\Entry{mnb}{otf-ujmbn-v} {UniJIS2004-UTF16-V} {Uni,04,FWid,V}%
-\Entry{mnb}{hminbn-h} {H} {}%
-\Entry{mnb}{hminbn-v} {V} {V}%
+\Entry{mnb}{hminbn-h} {H} {SubG}%
+\Entry{mnb}{hminbn-v} {V} {SubG,V}%
\Entry{gtr}{otf-ujgr-h} {UniJIS-UTF16-H} {Uni,90,FWid}%
\Entry{gtr}{otf-ujgr-v} {UniJIS-UTF16-V} {Uni,90,FWid,V}%
\Entry{gtr}{otf-cjgr-h} {Identity-H} {AJ16}%
@@ -908,8 +977,8 @@
\Entry{gtr}{hgothr-v} {V} {90,V}%
\Entry{gtr}{otf-ujgrn-h} {UniJIS2004-UTF16-H} {Uni,04,FWid}%
\Entry{gtr}{otf-ujgrn-v} {UniJIS2004-UTF16-V} {Uni,04,FWid,V}%
-\Entry{gtr}{hgothrn-h} {H} {}%
-\Entry{gtr}{hgothrn-v} {V} {V}%
+\Entry{gtr}{hgothrn-h} {H} {SubG}%
+\Entry{gtr}{hgothrn-v} {V} {SubG,V}%
\Entry{gtb}{otf-ujgb-h} {UniJIS-UTF16-H} {Uni,90,FWid}%
\Entry{gtb}{otf-ujgb-v} {UniJIS-UTF16-V} {Uni,90,FWid,V}%
\Entry{gtb}{otf-cjgb-h} {Identity-H} {AJ16}%
@@ -918,8 +987,8 @@
\Entry{gtb}{hgothb-v} {V} {90,V}%
\Entry{gtb}{otf-ujgbn-h} {UniJIS2004-UTF16-H} {Uni,04,FWid}%
\Entry{gtb}{otf-ujgbn-v} {UniJIS2004-UTF16-V} {Uni,04,FWid,V}%
-\Entry{gtb}{hgothbn-h} {H} {}%
-\Entry{gtb}{hgothbn-v} {V} {V}%
+\Entry{gtb}{hgothbn-h} {H} {SubG}%
+\Entry{gtb}{hgothbn-v} {V} {SubG,V}%
\Entry{gtx}{otf-ujge-h} {UniJIS-UTF16-H} {Uni,90,FWid}%
\Entry{gtx}{otf-ujge-v} {UniJIS-UTF16-V} {Uni,90,FWid,V}%
\Entry{gtx}{otf-cjge-h} {Identity-H} {AJ16}%
@@ -928,8 +997,8 @@
\Entry{gtx}{hgotheb-v} {V} {90,V}%
\Entry{gtx}{otf-ujgen-h} {UniJIS2004-UTF16-H} {Uni,04,FWid}%
\Entry{gtx}{otf-ujgen-v} {UniJIS2004-UTF16-V} {Uni,04,FWid,V}%
-\Entry{gtx}{hgothebn-h} {H} {}%
-\Entry{gtx}{hgothebn-v} {V} {V}%
+\Entry{gtx}{hgothebn-h} {H} {SubG}%
+\Entry{gtx}{hgothebn-v} {V} {SubG,V}%
\Entry{mgr}{otf-ujmgr-h} {UniJIS-UTF16-H} {Uni,90,FWid}%
\Entry{mgr}{otf-ujmgr-v} {UniJIS-UTF16-V} {Uni,90,FWid,V}%
\Entry{mgr}{otf-cjmgr-h} {Identity-H} {AJ16}%
@@ -938,8 +1007,8 @@
\Entry{mgr}{hmgothr-v} {V} {90,V}%
\Entry{mgr}{otf-ujmgrn-h} {UniJIS2004-UTF16-H} {Uni,04,FWid}%
\Entry{mgr}{otf-ujmgrn-v} {UniJIS2004-UTF16-V} {Uni,04,FWid,V}%
-\Entry{mgr}{hmgothrn-h} {H} {}%
-\Entry{mgr}{hmgothrn-v} {V} {V}%
+\Entry{mgr}{hmgothrn-h} {H} {SubG}%
+\Entry{mgr}{hmgothrn-v} {V} {SubG,V}%
%
\ifpxcz at otf@multi
\Entry{kom}{otf-ukmr-h} {UniKS-UTF16-H} {Uni,FWid}%
@@ -994,35 +1063,41 @@
\Entry{tcg}{upmhm-v} {UniCNS-UTF16-V} {Uni*,V}%
}
\pxcz at mapentry{UPOTF}{%
-\Entry{mnl}{uphminl-h} {UniJIS-UTF16-H} {Uni*,90}%
-\Entry{mnl}{uphminl-v} {UniJIS-UTF16-V} {Uni*,90,V}%
-\Entry{mnl}{uphminln-h} {UniJIS2004-UTF16-H} {Uni*,04}%
-\Entry{mnl}{uphminln-v} {UniJIS2004-UTF16-V} {Uni*,04,V}%
-\Entry{mnr}{uphminr-h} {UniJIS-UTF16-H} {Uni*,90}%
-\Entry{mnr}{uphminr-v} {UniJIS-UTF16-V} {Uni*,90,V}%
-\Entry{mnr}{uphminrn-h} {UniJIS2004-UTF16-H} {Uni*,04}%
-\Entry{mnr}{uphminrn-v} {UniJIS2004-UTF16-V} {Uni*,04,V}%
-\Entry{mnb}{uphminb-h} {UniJIS-UTF16-H} {Uni*,90}%
-\Entry{mnb}{uphminb-v} {UniJIS-UTF16-V} {Uni*,90,V}%
-\Entry{mnb}{uphminbn-h} {UniJIS2004-UTF16-H} {Uni*,04}%
-\Entry{mnb}{uphminbn-v} {UniJIS2004-UTF16-V} {Uni*,04,V}%
-\Entry{gtr}{uphgothr-h} {UniJIS-UTF16-H} {Uni*,90}%
-\Entry{gtr}{uphgothr-v} {UniJIS-UTF16-V} {Uni*,90,V}%
-\Entry{gtr}{uphgothrn-h} {UniJIS2004-UTF16-H} {Uni*,04}%
-\Entry{gtr}{uphgothrn-v} {UniJIS2004-UTF16-V} {Uni*,04,V}%
-\Entry{gtb}{uphgothb-h} {UniJIS-UTF16-H} {Uni*,90}%
-\Entry{gtb}{uphgothb-v} {UniJIS-UTF16-V} {Uni*,90,V}%
-\Entry{gtb}{uphgothbn-h} {UniJIS2004-UTF16-H} {Uni*,04}%
-\Entry{gtb}{uphgothbn-v} {UniJIS2004-UTF16-V} {Uni*,04,V}%
-\Entry{gtx}{uphgotheb-h} {UniJIS-UTF16-H} {Uni*,90}%
-\Entry{gtx}{uphgotheb-v} {UniJIS-UTF16-V} {Uni*,90,V}%
-\Entry{gtx}{uphgothebn-h} {UniJIS2004-UTF16-H} {Uni*,04}%
-\Entry{gtx}{uphgothebn-v} {UniJIS2004-UTF16-V} {Uni*,04,V}%
-\Entry{mgr}{uphmgothr-h} {UniJIS-UTF16-H} {Uni*,90}%
-\Entry{mgr}{uphmgothr-v} {UniJIS-UTF16-V} {Uni*,90,V}%
-\Entry{mgr}{uphmgothrn-h} {UniJIS2004-UTF16-H} {Uni*,04}%
-\Entry{mgr}{uphmgothrn-v} {UniJIS2004-UTF16-V} {Uni*,04,V}%
+\Entry{mnl}{uphminl-h} {UniJIS-UTF16-H} {Uni*,90,Exp}%
+\Entry{mnl}{uphminl-v} {UniJIS-UTF16-V} {Uni*,90,V,Exp}%
+\Entry{mnl}{uphminln-h} {UniJIS2004-UTF16-H} {Uni*,04,Exp}%
+\Entry{mnl}{uphminln-v} {UniJIS2004-UTF16-V} {Uni*,04,V,Exp}%
+\Entry{mnr}{uphminr-h} {UniJIS-UTF16-H} {Uni*,90,Exp}%
+\Entry{mnr}{uphminr-v} {UniJIS-UTF16-V} {Uni*,90,V,Exp}%
+\Entry{mnr}{uphminrn-h} {UniJIS2004-UTF16-H} {Uni*,04,Exp}%
+\Entry{mnr}{uphminrn-v} {UniJIS2004-UTF16-V} {Uni*,04,V,Exp}%
+\Entry{mnb}{uphminb-h} {UniJIS-UTF16-H} {Uni*,90,Exp}%
+\Entry{mnb}{uphminb-v} {UniJIS-UTF16-V} {Uni*,90,V,Exp}%
+\Entry{mnb}{uphminbn-h} {UniJIS2004-UTF16-H} {Uni*,04,Exp}%
+\Entry{mnb}{uphminbn-v} {UniJIS2004-UTF16-V} {Uni*,04,V,Exp}%
+\Entry{gtr}{uphgothr-h} {UniJIS-UTF16-H} {Uni*,90,Exp}%
+\Entry{gtr}{uphgothr-v} {UniJIS-UTF16-V} {Uni*,90,V,Exp}%
+\Entry{gtr}{uphgothrn-h} {UniJIS2004-UTF16-H} {Uni*,04,Exp}%
+\Entry{gtr}{uphgothrn-v} {UniJIS2004-UTF16-V} {Uni*,04,V,Exp}%
+\Entry{gtb}{uphgothb-h} {UniJIS-UTF16-H} {Uni*,90,Exp}%
+\Entry{gtb}{uphgothb-v} {UniJIS-UTF16-V} {Uni*,90,V,Exp}%
+\Entry{gtb}{uphgothbn-h} {UniJIS2004-UTF16-H} {Uni*,04,Exp}%
+\Entry{gtb}{uphgothbn-v} {UniJIS2004-UTF16-V} {Uni*,04,V,Exp}%
+\Entry{gtx}{uphgotheb-h} {UniJIS-UTF16-H} {Uni*,90,Exp}%
+\Entry{gtx}{uphgotheb-v} {UniJIS-UTF16-V} {Uni*,90,V,Exp}%
+\Entry{gtx}{uphgothebn-h} {UniJIS2004-UTF16-H} {Uni*,04,Exp}%
+\Entry{gtx}{uphgothebn-v} {UniJIS2004-UTF16-V} {Uni*,04,V,Exp}%
+\Entry{mgr}{uphmgothr-h} {UniJIS-UTF16-H} {Uni*,90,Exp}%
+\Entry{mgr}{uphmgothr-v} {UniJIS-UTF16-V} {Uni*,90,V,Exp}%
+\Entry{mgr}{uphmgothrn-h} {UniJIS2004-UTF16-H} {Uni*,04,Exp}%
+\Entry{mgr}{uphmgothrn-v} {UniJIS2004-UTF16-V} {Uni*,04,V,Exp}%
}
+\pxcz at mapentry{GID}{%
+\Entry{mnr}{hminrn-h} {H} {SubG}%
+\Entry{mnr}{hminrn-v} {V} {SubG,V}%
+\Entry{gtr}{hgothrn-h} {H} {SubG}%
+\Entry{gtr}{hgothrn-v} {V} {SubG,V}%
+}
\pxcz at mapentry{PXOTF}{%
}
@@ -1069,6 +1144,8 @@
\let\pxcz at otf@weight=d
}{\@ifpackagewith{otf}{bold}{%
\let\pxcz at otf@weight=b
+}{\@ifpackagewith{otf}{expert}{%
+ \let\pxcz at otf@weight=r % 'expert' cancels 'noreplace'
}{\@ifpackagewith{otf}{noreplace}{%
\let\pxcz at otf@weight=n
}{\@ifpackageloaded{otf}{%
@@ -1075,7 +1152,7 @@
\let\pxcz at otf@weight=r
}{%else
\let\pxcz at otf@weight=n
-}}}}
+}}}}}
%% \pxcz at otf@mmivjis: otf jis2004
\@ifpackagewith{otf}{jis2004}{%
\let\pxcz at otf@mmivjis=t%
@@ -1091,7 +1168,7 @@
\edef\pxcz at du@scale{\ifx\jsc at JYn\@undefined 0.962216\else 0.924715\fi}%
\fi
-%% \pxcz at du@decl at shape{<fam>}{<ser>}{<font>}
+%% \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{%
\DeclareFontShape{JY2}{#1}{#2}{diruni}{<->%
@@ -1155,6 +1232,90 @@
\endgroup
}
+\ifpxcz at glyphid %---- <*glyphid>
+
+%%<*> \gid{<number>}
+\DeclareRobustCommand*{\gid}[1]{%
+ \begingroup
+ \kanjishape{dirgid}\selectfont
+ \kchar#1\relax
+ \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{%
+\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{%
+ \if#1t%
+ s*[\pxcz at du@scale]#2-#3%
+ \else#2\fi}
+
+\if d\pxcz at otf@weight % deluxe
+\pxcz at dg@decl at shape{hmc}{l}t{hminln}%
+\pxcz at dg@decl at shape{hmc}{m}t{hminrn}%
+\pxcz at dg@decl at shape{hmc}{bx}t{hminbn}%
+\pxcz at dg@decl at shape{hgt}{m}t{hgothrn}%
+\pxcz at dg@decl at shape{hgt}{bx}t{hgothbn}%
+\pxcz at dg@decl at shape{hgt}{eb}t{hgothebn}%
+\pxcz at dg@decl at shape{mg}{m}t{hmgothrn}%
+\else\if b\pxcz at otf@weight % bold
+\pxcz at dg@decl at shape{hmc}{m}t{hminrn}%
+\pxcz at dg@decl at shape{hmc}{bx}f{ssub*hgt/m/dirgid}{}%
+\pxcz at dg@decl at shape{hgt}{m}t{hgothbn}%
+\pxcz at dg@decl at shape{hgt}{bx}f{ssub*hgt/m/dirgid}{}%
+\else\if r\pxcz at otf@weight % default
+\pxcz at dg@decl at shape{hmc}{m}t{hminrn}%
+\pxcz at dg@decl at shape{hmc}{bx}f{ssub*hgt/m/dirgid}{}%
+\pxcz at dg@decl at shape{hgt}{m}t{hgothrn}%
+\pxcz at dg@decl at shape{hgt}{bx}f{ssub*hgt/m/dirgid}{}%
+\else % noreplace
+\pxcz at dg@decl at shape{mc}{m}t{hminrn}%
+\pxcz at dg@decl at shape{mc}{bx}f{ssub*gt/m/dirgid}{}%
+\pxcz at dg@decl at shape{gt}{m}t{hgothrn}%
+\pxcz at dg@decl at shape{gt}{bx}f{ssub*gt/m/dirgid}{}%
+\fi\fi\fi
+
+\fi %---- </glyphid>
+
+\ifx t\pxcz at expert %---- <*expert>
+
+%% \pxcz at dx@decl at shape{<fam>}{<ser>}<sw>{<tfmname>}
+\@onlypreamble\pxcz at dx@decl at shape
+\def\pxcz at dx@decl at shape#1#2#3#4{%
+\DeclareFontShape{JY2}{#1}{#2}{n}{<->%
+ \pxcz at dx@shape at spec{#3}{#4}{h}}{}%
+\DeclareFontShape{JT2}{#1}{#2}{n}{<->%
+ \pxcz at dx@shape at spec{#3}{#4}{v}}{}}
+\@onlypreamble\pxcz at dx@shape at spec
+\def\pxcz at dx@shape at spec#1#2#3{%
+ \if#1t%
+ s*[\pxcz at du@scale]#2-#3%
+ \else#2\fi}
+
+\AtEndOfPackage{% this must be after loading pxufont
+\if d\pxcz at otf@weight % deluxe
+\pxcz at dx@decl at shape{ruby}{l}t{otf-cjml}%
+\pxcz at dx@decl at shape{ruby}{m}t{otf-cjmr}%
+\pxcz at dx@decl at shape{ruby}{bx}t{otf-cjmb}%
+\pxcz at dx@decl at shape{rubyg}{m}t{otf-cjgr}%
+\pxcz at dx@decl at shape{rubyg}{bx}t{otf-cjgb}%
+\pxcz at dx@decl at shape{rubyg}{eb}t{otf-cjge}%
+\pxcz at dx@decl at shape{rubymg}{m}t{otf-cjmgr}%
+\else\if b\pxcz at otf@weight % bold
+\pxcz at dx@decl at shape{ruby}{m}t{otf-cjmr}%
+\pxcz at dx@decl at shape{ruby}{bx}t{otf-cjgb}%
+\else % default
+\pxcz at dx@decl at shape{ruby}{m}t{otf-cjmr}%
+\pxcz at dx@decl at shape{ruby}{bx}t{otf-cjgr}%
+\fi\fi
+}
+
+\fi %---- </expert>
+
\fi %---- </diruni-ok>
%% \pxcz at err@diruni
@@ -1301,6 +1462,9 @@
\pxcz at addtospec{UPOTF}%
\fi
\pxcz at addtospec{OTF}%
+ \else
+ \ifpxcz at glyphid \pxcz at addtospec{GID}%
+ \fi
\fi
\ifpxcz at utf \pxcz at addtospec{UTF}%
\fi
More information about the tex-live-commits
mailing list