diff options
Diffstat (limited to 'Master/texmf-dist/tex')
| -rw-r--r-- | Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty | 651 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty | 14 |
2 files changed, 406 insertions, 259 deletions
diff --git a/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty b/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty index 3bbf3de30e3..b3041e77703 100644 --- a/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty +++ b/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty @@ -10,7 +10,7 @@ %%%% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{pxchfon}[2017/04/08 v0.9] +\ProvidesPackage{pxchfon}[2017/05/31 v1.0] \def\pxcz@pkgname{pxchfon} %%%% definitions @@ -59,6 +59,7 @@ \newif\ifpxcz@oneweight \DeclareOption{oneweight}{\pxcz@oneweighttrue} \DeclareOption{nooneweight}{\pxcz@oneweightfalse} +\newif\ifpxcz@uniquify \chardef\pxcz@directunicode=0 \DeclareOption{directunicode*}{\chardef\pxcz@directunicode=2 } \DeclareOption{directunicode}{\chardef\pxcz@directunicode=1 } @@ -73,6 +74,7 @@ kozuka-pro,kozuka-pr6,kozuka-pr6n,hiragino-pro,hiragino-pron,% hiragino-elcapitan-pro,hiragino-elcapitan-pron,% morisawa-pro,morisawa-pr6n,yu-win,yu-win10,yu-osx,% + sourcehan-otc,sourcehan,noto-otc,noto% %(obsolete) ipa-otf,ipa-otf-dx,kozuka4,kozuka6,kozuka6n,hiragino,% %(alias) @@ -83,24 +85,35 @@ \def\pxcz@do#1{\DeclareOption{#1}{\def\pxcz@main@preset{#1}}} \@for\pxcz@x:=\pxcz@all@main@preset\do{% \expandafter\pxcz@do\expandafter{\pxcz@x}} -% file-preset handler +% others +\def\pxcz@opt@@unicode{unicode} +\def\pxcz@opt@@unicodeS{unicode*} \DeclareOption*{% - \let\pxcz@x\relax - \expandafter\pxcz@popt\CurrentOption\@nnil - \ifx\pxcz@x\relax \@unknownoptionerror - \else \let\pxcz@file@preset\pxcz@x \fi} + \ifx\CurrentOption\pxcz@opt@@unicode + \chardef\pxcz@directunicode=3 + \else\ifx\CurrentOption\pxcz@opt@@unicodeS + \pxcz@uniquifytrue + \chardef\pxcz@directunicode=3 + \else + \pxcz@parse@opt\CurrentOption + \ifpxcz@ok\else \@unknownoptionerror \fi + \fi\fi} \let\pxcz@file@preset\relax \newif\ifpxcz@file@preset@tl -\def\pxcz@popt{% - \futurelet\pxcz@tok\pxcz@popt@a} -\def\pxcz@popt@a{% +\def\pxcz@parse@opt#1{% + \expandafter\pxcz@parse@opt@a#1\@nnil} +\def\pxcz@parse@opt@a{% + \futurelet\pxcz@tok\pxcz@parse@opt@b} +\def\pxcz@parse@opt@b{% + \pxcz@okfalse \let\pxcz@tmpa\remove@to@nnil \ifx+\pxcz@tok - \pxcz@file@preset@tltrue \let\pxcz@tmpa\pxcz@popt@b + \pxcz@file@preset@tltrue \let\pxcz@tmpa\pxcz@parse@opt@c \else\ifx*\pxcz@tok - \pxcz@file@preset@tlfalse \let\pxcz@tmpa\pxcz@popt@b + \pxcz@file@preset@tlfalse \let\pxcz@tmpa\pxcz@parse@opt@c \fi\fi \pxcz@tmpa} -\def\pxcz@popt@b#1#2\@nnil{\edef\pxcz@x{#2}} +\def\pxcz@parse@opt@c#1#2\@nnil{% + \edef\pxcz@file@preset{#2}} % dispatch \ProcessOptions* % 'everypage' needs 'atbegshi' package @@ -157,6 +170,24 @@ \newif\ifpxcz@otf@multi \pxcz@otf@multifalse \@ifpackagewith{otf}{multi}{\pxcz@otf@multitrue}{} +%%------------------ preset-triggered setup + +%% \pxcz@if@main@preset{<name>}{<code>} +\def\pxcz@if@main@preset#1{% + \edef\pxcz@tmpa{#1}% + \ifx\pxcz@main@preset\pxcz@tmpa \expandafter\@firstofone + \else \expandafter\@gobble + \fi} +%% setup +\pxcz@if@main@preset{sourcehan}{% + \chardef\pxcz@directunicode=3 \pxcz@uniquifyfalse} +\pxcz@if@main@preset{sourcehan-otc}{% + \chardef\pxcz@directunicode=3 \pxcz@uniquifyfalse} +\pxcz@if@main@preset{noto}{% + \chardef\pxcz@directunicode=3 \pxcz@uniquifyfalse} +\pxcz@if@main@preset{noto-otc}{% + \chardef\pxcz@directunicode=3 \pxcz@uniquifyfalse} + %%------------------ user interface %%%%<*> \setminchofont/\setgothicfont/etc. @@ -188,7 +219,7 @@ }\do{\@namedef{pxcz@FS/\pxcz@x}{}} %%------------------ '\asUTF' -% NB. This feature is superseded by the pxasutf package. +% NB. This feature is superseded by the \diruni command. \ifpxcz@uptex %%<*> \asUTF{<jachar>} @@ -307,11 +338,34 @@ % NB: not \edef \def\pxcz@MI#1#2:{\ifpxcz@mmivjis:#1:\else:#2:\fi} -%% \pxcz@unidirect +%% \pxcz@SH +% NB: not \edef +\def\pxcz@SH#1{% + \ifx#1/\expandafter\pxcz@SH@otf@dif + \else \expandafter\pxcz@SH@otc@dif + \fi} +\def\pxcz@SH@otc@dif#1:{% + :\the\pxcz@entry@type:} +\def\pxcz@SH@otf@dif#1-{% + #1\ifcase\pxcz@entry@type\or K\or SC\fi-} + +%% \pxcz@NC +% NB: not \edef +\def\pxcz@NC#1{% + \ifx#1/\expandafter\pxcz@NC@otf@dif + \else \expandafter\pxcz@NC@otc@dif + \fi} +\def\pxcz@NC@otc@dif#1:{% + :\the\pxcz@entry@type:} +\def\pxcz@NC@otf@dif#1jp{% + #1\ifcase\pxcz@entry@type\or kr\or sc\fi} + +%% primary macros \let\pxcz@unidirect\@empty \let\pxcz@unidirectX\@empty \let\pxcz@unidirect@wopt\@empty \let\pxcz@unidirectX@wopt\@empty +\let\pxcz@unidirectX@lopt\@gobble \ifnum\pxcz@directunicode>\z@ \def\pxcz@unidirect#1-#2-#3{\pxcz@cmap@directuni} \def\pxcz@unidirect@wopt{ -w 1} @@ -320,12 +374,31 @@ \let\pxcz@unidirectX\pxcz@unidirect \let\pxcz@unidirectX@wopt\pxcz@unidirect@wopt \fi +\ifnum\pxcz@directunicode>\tw@ +\def\pxcz@unidirectX@lopt#1{ -l #1} +\fi +%% secondary macros +\def\pxcz@entry@UniJIS{\@+\pxcz@pfx@unijis}% +\def\pxcz@entry@@hwid{\@l{hwid}}% +\def\pxcz@entry@@fwid{\@l{fwid}}% +\def\pxcz@entry@@jp#1#2{\@l{jp#1#2}}% +\ifpxcz@mmivjis +\def\pxcz@entry@@jpXX{\@l{jp04}} +\else +\def\pxcz@entry@@jpXX{\@l{jp90}} +\fi +\ifpxcz@uniquify +\let\pxcz@entry@@hwid\pxcz@entry@@jpXX +\let\pxcz@entry@@fwid\pxcz@entry@@jpXX +\fi %% \pxcz@addtospec{<id>} \def\pxcz@addtospec#1{% \bgroup \let\Entry\pxcz@Entry - \let\ \space \let\*\pxcz@pfx@jis - \def\UniJIS{\pxcz@unidirectX\pxcz@pfx@unijis}% + \let\ \space \let\*\pxcz@pfx@jis + \let\UniJIS\pxcz@entry@UniJIS + \let\@hwid\pxcz@entry@@hwid \let\@fwid\pxcz@entry@@fwid + \let\@jp\pxcz@entry@@jp \let\@jpXX\pxcz@entry@@jpXX \@nameuse{pxcz@ME/#1}\egroup} \def\pxcz@Entry#1{% \expandafter\let\expandafter\FONT\csname pxcz@FS/#1\endcsname @@ -333,19 +406,22 @@ \ifx\FONT\pxcz@noembed \let\UniCMap\pxcz@cmap@hwuni \let\+\@empty \let\w\@empty \def\@+{}\let\@w\@empty + \let\@l\@gobble \edef\FONT{!\@nameuse{pxcz@NEF/#1}}% \let\FONTo\FONT \let\FONTs\FONT \else\ifx\FONT\@empty\else \let\UniCMap\pxcz@cmap@uni \let\+\pxcz@unidirect \let\w\pxcz@unidirect@wopt \def\@+{\pxcz@unidirectX}\let\@w\pxcz@unidirectX@wopt + \let\@l\pxcz@unidirectX@lopt \pxcz@switch@realfont \fi\fi - \ifx\FONT\@empty \expandafter\@gobble + \ifx\FONT\@empty \expandafter\@gobbletwo \else \expandafter\pxcz@entry@a \fi} -\def\pxcz@entry@a#1{% +\def\pxcz@entry@a#1#2{% + \chardef\pxcz@entry@type=#1\relax \xdef\pxcz@spec{% - \pxcz@spec\noexpand\special{\pxcz@mapline{#1}}}} + \pxcz@spec\noexpand\special{\pxcz@mapline{#2}}}} \let\pxcz@spec\@empty %% \pxcz@do@file@preset @@ -377,213 +453,199 @@ \def\pxcz@mapentry@a#1{\@onlypreamble#1\def#1} %%%% map entries +% \FONT: file name for the 2004JIS font +% \FONTo: file name for the 90JIS font +% \FONTs: \FONT if prefer2004jis, \FONTo otherwise +% \*H: 2004-H if prefer2004jis, H otherwise +% \UniJIS: UniJIS2004 if prefer2004jis, UniJIS otherwise +% \+Uni...-H: replaced by 'unicode' if directunicode +% \@+Uni...-H: replaced by 'unicode' if directunicode* +% \w: '-w 1' if directunicode +% \@w: '-w 1' if directunicode* \pxcz@mapentry{STD}{% -\Entry{mnr}{rml \*H \FONTs}% -\Entry{mnr}{rmlv \*V \FONTs}% -\Entry{gtu}{gbm \*H \FONTs}% -\Entry{gtu}{gbmv \*V \FONTs}% +\Entry{mnr}0{rml \*H \FONTs}% +\Entry{mnr}0{rmlv \*V \FONTs}% +\Entry{gtu}0{gbm \*H \FONTs}% +\Entry{gtu}0{gbmv \*V \FONTs}% } \pxcz@mapentry{ALPHA}{% -\Entry{mnl}{r-cfjar-l-@PXcjk0@ \UniCMap\ \FONT}% -\Entry{mnr}{r-cfjar-r-@PXcjk0@ \UniCMap\ \FONT}% -\Entry{mnb}{r-cfjar-b-@PXcjk0@ \UniCMap\ \FONT}% -\Entry{gtr}{r-cfjas-r-@PXcjk0@ \UniCMap\ \FONT}% -\Entry{gtb}{r-cfjas-b-@PXcjk0@ \UniCMap\ \FONT}% -\Entry{gtx}{r-cfjas-x-@PXcjk0@ \UniCMap\ \FONT}% -\Entry{mgr}{r-cfjas-r-@PXcjk0@ \UniCMap\ \FONT}% +\Entry{mnl}1{r-cfjar-l-@PXcjk0@ \UniCMap\ \FONT\@hwid}% +\Entry{mnr}1{r-cfjar-r-@PXcjk0@ \UniCMap\ \FONT\@hwid}% +\Entry{mnb}1{r-cfjar-b-@PXcjk0@ \UniCMap\ \FONT\@hwid}% +\Entry{gtr}1{r-cfjas-r-@PXcjk0@ \UniCMap\ \FONT\@hwid}% +\Entry{gtb}1{r-cfjas-b-@PXcjk0@ \UniCMap\ \FONT\@hwid}% +\Entry{gtx}1{r-cfjas-x-@PXcjk0@ \UniCMap\ \FONT\@hwid}% +\Entry{mgr}1{r-cfjas-r-@PXcjk0@ \UniCMap\ \FONT\@hwid}% } \pxcz@mapentry{UTF}{% -\Entry{mnr}{unijmin-h \UniJIS-UTF16-H \FONTs}% -\Entry{mnr}{unijmin-v \UniJIS-UTF16-V \FONTs\@w}% -\Entry{mnr}{cidmin-h Identity-H \FONT/AJ16}% -\Entry{mnr}{cidmin-v Identity-V \FONT/AJ16}% -\Entry{mnr}{hmr \*H \FONTs}% -\Entry{mnr}{hmrv \*V \FONTs}% -\Entry{gtu}{unijgoth-h \UniJIS-UTF16-H \FONTs}% -\Entry{gtu}{unijgoth-v \UniJIS-UTF16-V \FONTs\@w}% -\Entry{gtu}{cidgoth-h Identity-H \FONT/AJ16}% -\Entry{gtu}{cidgoth-v Identity-V \FONT/AJ16}% -\Entry{gtu}{hkb \*H \FONTs}% -\Entry{gtu}{hkbv \*V \FONTs}% +\Entry{mnr}0{unijmin-h \UniJIS-UTF16-H \FONTs}% +\Entry{mnr}0{unijmin-v \UniJIS-UTF16-V \FONTs\@w}% +\Entry{mnr}0{cidmin-h Identity-H \FONT/AJ16}% +\Entry{mnr}0{cidmin-v Identity-V \FONT/AJ16}% +\Entry{mnr}0{hmr \*H \FONTs}% +\Entry{mnr}0{hmrv \*V \FONTs}% +\Entry{gtu}0{unijgoth-h \UniJIS-UTF16-H \FONTs}% +\Entry{gtu}0{unijgoth-v \UniJIS-UTF16-V \FONTs\@w}% +\Entry{gtu}0{cidgoth-h Identity-H \FONT/AJ16}% +\Entry{gtu}0{cidgoth-v Identity-V \FONT/AJ16}% +\Entry{gtu}0{hkb \*H \FONTs}% +\Entry{gtu}0{hkbv \*V \FONTs}% } \pxcz@mapentry{OTF}{% -\Entry{mnl}{otf-ujml-h \+UniJIS-UTF16-H \FONTo}% -\Entry{mnl}{otf-ujml-v \+UniJIS-UTF16-V \FONTo\w}% -\Entry{mnl}{otf-cjml-h Identity-H \FONT/AJ16}% -\Entry{mnl}{otf-cjml-v Identity-V \FONT/AJ16}% -\Entry{mnl}{hminl-h H \FONTo}% -\Entry{mnl}{hminl-v V \FONTo}% -\Entry{mnl}{otf-ujmln-h \+UniJIS2004-UTF16-H \FONT}% -\Entry{mnl}{otf-ujmln-v \+UniJIS2004-UTF16-V \FONT\w}% -\Entry{mnl}{hminln-h H \FONT}% -\Entry{mnl}{hminln-v V \FONT}% -\Entry{mnr}{otf-ujmr-h \+UniJIS-UTF16-H \FONTo}% -\Entry{mnr}{otf-ujmr-v \+UniJIS-UTF16-V \FONTo\w}% -\Entry{mnr}{otf-cjmr-h Identity-H \FONT/AJ16}% -\Entry{mnr}{otf-cjmr-v Identity-V \FONT/AJ16}% -\Entry{mnr}{hminr-h H \FONTo}% -\Entry{mnr}{hminr-v V \FONTo}% -\Entry{mnr}{otf-ujmrn-h \+UniJIS2004-UTF16-H \FONT}% -\Entry{mnr}{otf-ujmrn-v \+UniJIS2004-UTF16-V \FONT\w}% -\Entry{mnr}{hminrn-h H \FONT}% -\Entry{mnr}{hminrn-v V \FONT}% -\Entry{mnb}{otf-ujmb-h \+UniJIS-UTF16-H \FONTo}% -\Entry{mnb}{otf-ujmb-v \+UniJIS-UTF16-V \FONTo\w}% -\Entry{mnb}{otf-cjmb-h Identity-H \FONT/AJ16}% -\Entry{mnb}{otf-cjmb-v Identity-V \FONT/AJ16}% -\Entry{mnb}{hminb-h H \FONTo}% -\Entry{mnb}{hminb-v V \FONTo}% -\Entry{mnb}{otf-ujmbn-h \+UniJIS2004-UTF16-H \FONT}% -\Entry{mnb}{otf-ujmbn-v \+UniJIS2004-UTF16-V \FONT\w}% -\Entry{mnb}{hminbn-h H \FONT}% -\Entry{mnb}{hminbn-v V \FONT}% -\Entry{gtr}{otf-ujgr-h \+UniJIS-UTF16-H \FONTo}% -\Entry{gtr}{otf-ujgr-v \+UniJIS-UTF16-V \FONTo\w}% -\Entry{gtr}{otf-cjgr-h Identity-H \FONT/AJ16}% -\Entry{gtr}{otf-cjgr-v Identity-V \FONT/AJ16}% -\Entry{gtr}{hgothr-h H \FONTo}% -\Entry{gtr}{hgothr-v V \FONTo}% -\Entry{gtr}{otf-ujgrn-h \+UniJIS2004-UTF16-H \FONT}% -\Entry{gtr}{otf-ujgrn-v \+UniJIS2004-UTF16-V \FONT\w}% -\Entry{gtr}{hgothrn-h H \FONT}% -\Entry{gtr}{hgothrn-v V \FONT}% -\Entry{gtb}{otf-ujgb-h \+UniJIS-UTF16-H \FONTo}% -\Entry{gtb}{otf-ujgb-v \+UniJIS-UTF16-V \FONTo\w}% -\Entry{gtb}{otf-cjgb-h Identity-H \FONT/AJ16}% -\Entry{gtb}{otf-cjgb-v Identity-V \FONT/AJ16}% -\Entry{gtb}{hgothb-h H \FONTo}% -\Entry{gtb}{hgothb-v V \FONTo}% -\Entry{gtb}{otf-ujgbn-h \+UniJIS2004-UTF16-H \FONT}% -\Entry{gtb}{otf-ujgbn-v \+UniJIS2004-UTF16-V \FONT\w}% -\Entry{gtb}{hgothbn-h H \FONT}% -\Entry{gtb}{hgothbn-v V \FONT}% -\Entry{gtx}{otf-ujge-h \+UniJIS-UTF16-H \FONTo}% -\Entry{gtx}{otf-ujge-v \+UniJIS-UTF16-V \FONTo\w}% -\Entry{gtx}{otf-cjge-h Identity-H \FONT/AJ16}% -\Entry{gtx}{otf-cjge-v Identity-V \FONT/AJ16}% -\Entry{gtx}{hgotheb-h H \FONTo}% -\Entry{gtx}{hgotheb-v V \FONTo}% -\Entry{gtx}{otf-ujgen-h \+UniJIS2004-UTF16-H \FONT}% -\Entry{gtx}{otf-ujgen-v \+UniJIS2004-UTF16-V \FONT\w}% -\Entry{gtx}{hgothebn-h H \FONT}% -\Entry{gtx}{hgothebn-v V \FONT}% -\Entry{mgr}{otf-ujmgr-h \+UniJIS-UTF16-H \FONTo}% -\Entry{mgr}{otf-ujmgr-v \+UniJIS-UTF16-V \FONTo\w}% -\Entry{mgr}{otf-cjmgr-h Identity-H \FONT/AJ16}% -\Entry{mgr}{otf-cjmgr-v Identity-V \FONT/AJ16}% -\Entry{mgr}{hmgothr-h H \FONTo}% -\Entry{mgr}{hmgothr-v V \FONTo}% -\Entry{mgr}{otf-ujmgrn-h \+UniJIS2004-UTF16-H \FONT}% -\Entry{mgr}{otf-ujmgrn-v \+UniJIS2004-UTF16-V \FONT\w}% -\Entry{mgr}{hmgothrn-h H \FONT}% -\Entry{mgr}{hmgothrn-v V \FONT}% +\Entry{mnl}0{otf-ujml-h \+UniJIS-UTF16-H \FONTo\@jp90}% +\Entry{mnl}0{otf-ujml-v \+UniJIS-UTF16-V \FONTo\w\@jp90}% +\Entry{mnl}0{otf-cjml-h Identity-H \FONT/AJ16}% +\Entry{mnl}0{otf-cjml-v Identity-V \FONT/AJ16}% +\Entry{mnl}0{hminl-h H \FONTo}% +\Entry{mnl}0{hminl-v V \FONTo}% +\Entry{mnl}0{otf-ujmln-h \+UniJIS2004-UTF16-H \FONT\@jp04}% +\Entry{mnl}0{otf-ujmln-v \+UniJIS2004-UTF16-V \FONT\w\@jp04}% +\Entry{mnl}0{hminln-h H \FONT}% +\Entry{mnl}0{hminln-v V \FONT}% +\Entry{mnr}0{otf-ujmr-h \+UniJIS-UTF16-H \FONTo\@jp90}% +\Entry{mnr}0{otf-ujmr-v \+UniJIS-UTF16-V \FONTo\w\@jp90}% +\Entry{mnr}0{otf-cjmr-h Identity-H \FONT/AJ16}% +\Entry{mnr}0{otf-cjmr-v Identity-V \FONT/AJ16}% +\Entry{mnr}0{hminr-h H \FONTo}% +\Entry{mnr}0{hminr-v V \FONTo}% +\Entry{mnr}0{otf-ujmrn-h \+UniJIS2004-UTF16-H \FONT\@jp04}% +\Entry{mnr}0{otf-ujmrn-v \+UniJIS2004-UTF16-V \FONT\w\@jp04}% +\Entry{mnr}0{hminrn-h H \FONT}% +\Entry{mnr}0{hminrn-v V \FONT}% +\Entry{mnb}0{otf-ujmb-h \+UniJIS-UTF16-H \FONTo\@jp90}% +\Entry{mnb}0{otf-ujmb-v \+UniJIS-UTF16-V \FONTo\w\@jp90}% +\Entry{mnb}0{otf-cjmb-h Identity-H \FONT/AJ16}% +\Entry{mnb}0{otf-cjmb-v Identity-V \FONT/AJ16}% +\Entry{mnb}0{hminb-h H \FONTo}% +\Entry{mnb}0{hminb-v V \FONTo}% +\Entry{mnb}0{otf-ujmbn-h \+UniJIS2004-UTF16-H \FONT\@jp04}% +\Entry{mnb}0{otf-ujmbn-v \+UniJIS2004-UTF16-V \FONT\w\@jp04}% +\Entry{mnb}0{hminbn-h H \FONT}% +\Entry{mnb}0{hminbn-v V \FONT}% +\Entry{gtr}0{otf-ujgr-h \+UniJIS-UTF16-H \FONTo\@jp90}% +\Entry{gtr}0{otf-ujgr-v \+UniJIS-UTF16-V \FONTo\w\@jp90}% +\Entry{gtr}0{otf-cjgr-h Identity-H \FONT/AJ16}% +\Entry{gtr}0{otf-cjgr-v Identity-V \FONT/AJ16}% +\Entry{gtr}0{hgothr-h H \FONTo}% +\Entry{gtr}0{hgothr-v V \FONTo}% +\Entry{gtr}0{otf-ujgrn-h \+UniJIS2004-UTF16-H \FONT\@jp04}% +\Entry{gtr}0{otf-ujgrn-v \+UniJIS2004-UTF16-V \FONT\w\@jp04}% +\Entry{gtr}0{hgothrn-h H \FONT}% +\Entry{gtr}0{hgothrn-v V \FONT}% +\Entry{gtb}0{otf-ujgb-h \+UniJIS-UTF16-H \FONTo\@jp90}% +\Entry{gtb}0{otf-ujgb-v \+UniJIS-UTF16-V \FONTo\w\@jp90}% +\Entry{gtb}0{otf-cjgb-h Identity-H \FONT/AJ16}% +\Entry{gtb}0{otf-cjgb-v Identity-V \FONT/AJ16}% +\Entry{gtb}0{hgothb-h H \FONTo}% +\Entry{gtb}0{hgothb-v V \FONTo}% +\Entry{gtb}0{otf-ujgbn-h \+UniJIS2004-UTF16-H \FONT\@jp04}% +\Entry{gtb}0{otf-ujgbn-v \+UniJIS2004-UTF16-V \FONT\w\@jp04}% +\Entry{gtb}0{hgothbn-h H \FONT}% +\Entry{gtb}0{hgothbn-v V \FONT}% +\Entry{gtx}0{otf-ujge-h \+UniJIS-UTF16-H \FONTo\@jp90}% +\Entry{gtx}0{otf-ujge-v \+UniJIS-UTF16-V \FONTo\w\@jp90}% +\Entry{gtx}0{otf-cjge-h Identity-H \FONT/AJ16}% +\Entry{gtx}0{otf-cjge-v Identity-V \FONT/AJ16}% +\Entry{gtx}0{hgotheb-h H \FONTo}% +\Entry{gtx}0{hgotheb-v V \FONTo}% +\Entry{gtx}0{otf-ujgen-h \+UniJIS2004-UTF16-H \FONT\@jp04}% +\Entry{gtx}0{otf-ujgen-v \+UniJIS2004-UTF16-V \FONT\w\@jp04}% +\Entry{gtx}0{hgothebn-h H \FONT}% +\Entry{gtx}0{hgothebn-v V \FONT}% +\Entry{mgr}0{otf-ujmgr-h \+UniJIS-UTF16-H \FONTo\@jp90}% +\Entry{mgr}0{otf-ujmgr-v \+UniJIS-UTF16-V \FONTo\w\@jp90}% +\Entry{mgr}0{otf-cjmgr-h Identity-H \FONT/AJ16}% +\Entry{mgr}0{otf-cjmgr-v Identity-V \FONT/AJ16}% +\Entry{mgr}0{hmgothr-h H \FONTo}% +\Entry{mgr}0{hmgothr-v V \FONTo}% +\Entry{mgr}0{otf-ujmgrn-h \+UniJIS2004-UTF16-H \FONT\@jp04}% +\Entry{mgr}0{otf-ujmgrn-v \+UniJIS2004-UTF16-V \FONT\w\@jp04}% +\Entry{mgr}0{hmgothrn-h H \FONT}% +\Entry{mgr}0{hmgothrn-v V \FONT}% % \ifpxcz@otf@multi -\Entry{kom}{otf-ukmr-h \+UniKS-UTF16-H \FONT}% -\Entry{kom}{otf-ukmr-v \+UniKS-UTF16-V \FONT\w}% -\Entry{kom}{otf-ckmr-h Identity-H \FONT/AK12}% -\Entry{kom}{otf-ckmr-v Identity-V \FONT/AK12}% -\Entry{kog}{otf-ukgr-h \+UniKS-UTF16-H \FONT}% -\Entry{kog}{otf-ukgr-v \+UniKS-UTF16-V \FONT\w}% -\Entry{kog}{otf-ckgr-h Identity-H \FONT/AK12}% -\Entry{kog}{otf-ckgr-v Identity-V \FONT/AK12}% -\Entry{scm}{otf-ucmr-h \+UniGB-UTF16-H \FONT}% -\Entry{scm}{otf-ucmr-v \+UniGB-UTF16-V \FONT\w}% -\Entry{scm}{otf-ccmr-h Identity-H \FONT/AG14}% -\Entry{scm}{otf-ccmr-v Identity-V \FONT/AG14}% -\Entry{scg}{otf-ucgr-h \+UniGB-UTF16-H \FONT}% -\Entry{scg}{otf-ucgr-v \+UniGB-UTF16-V \FONT\w}% -\Entry{scg}{otf-ccgr-h Identity-H \FONT/AG14}% -\Entry{scg}{otf-ccgr-v Identity-V \FONT/AG14}% -\Entry{tcm}{otf-utmr-h \+UniCNS-UTF16-H \FONT}% -\Entry{tcm}{otf-utmr-v \+UniCNS-UTF16-V \FONT\w}% -\Entry{tcm}{otf-ctmr-h Identity-H \FONT/AC14}% -\Entry{tcm}{otf-ctmr-v Identity-V \FONT/AC14}% -\Entry{tcg}{otf-utgr-h \+UniCNS-UTF16-H \FONT}% -\Entry{tcg}{otf-utgr-v \+UniCNS-UTF16-V \FONT\w}% -\Entry{tcg}{otf-ctgr-h Identity-H \FONT/AC14}% -\Entry{tcg}{otf-ctgr-v Identity-V \FONT/AC14}% +\Entry{kom}0{otf-ukmr-h \+UniKS-UTF16-H \FONT}% +\Entry{kom}0{otf-ukmr-v \+UniKS-UTF16-V \FONT\w}% +\Entry{kom}0{otf-ckmr-h Identity-H \FONT/AK12}% +\Entry{kom}0{otf-ckmr-v Identity-V \FONT/AK12}% +\Entry{kog}0{otf-ukgr-h \+UniKS-UTF16-H \FONT}% +\Entry{kog}0{otf-ukgr-v \+UniKS-UTF16-V \FONT\w}% +\Entry{kog}0{otf-ckgr-h Identity-H \FONT/AK12}% +\Entry{kog}0{otf-ckgr-v Identity-V \FONT/AK12}% +\Entry{scm}0{otf-ucmr-h \+UniGB-UTF16-H \FONT}% +\Entry{scm}0{otf-ucmr-v \+UniGB-UTF16-V \FONT\w}% +\Entry{scm}0{otf-ccmr-h Identity-H \FONT/AG14}% +\Entry{scm}0{otf-ccmr-v Identity-V \FONT/AG14}% +\Entry{scg}0{otf-ucgr-h \+UniGB-UTF16-H \FONT}% +\Entry{scg}0{otf-ucgr-v \+UniGB-UTF16-V \FONT\w}% +\Entry{scg}0{otf-ccgr-h Identity-H \FONT/AG14}% +\Entry{scg}0{otf-ccgr-v Identity-V \FONT/AG14}% +\Entry{tcm}0{otf-utmr-h \+UniCNS-UTF16-H \FONT}% +\Entry{tcm}0{otf-utmr-v \+UniCNS-UTF16-V \FONT\w}% +\Entry{tcm}0{otf-ctmr-h Identity-H \FONT/AC14}% +\Entry{tcm}0{otf-ctmr-v Identity-V \FONT/AC14}% +\Entry{tcg}0{otf-utgr-h \+UniCNS-UTF16-H \FONT}% +\Entry{tcg}0{otf-utgr-v \+UniCNS-UTF16-V \FONT\w}% +\Entry{tcg}0{otf-ctgr-h Identity-H \FONT/AC14}% +\Entry{tcg}0{otf-ctgr-v Identity-V \FONT/AC14}% \fi } \pxcz@mapentry{UPSTD}{% -\Entry{mnr}{uprml-h \UniJIS-UTF16-H \FONTs}% -\Entry{mnr}{uprml-v \UniJIS-UTF16-V \FONTs\@w}% -\Entry{mnr}{uprml-hq \@+UniJIS-UCS2-H \FONT}% -\Entry{gtu}{upgbm-h \UniJIS-UTF16-H \FONTs}% -\Entry{gtu}{upgbm-v \UniJIS-UTF16-V \FONTs\@w}% -\Entry{gtu}{upgbm-hq \@+UniJIS-UCS2-H \FONT}% -\Entry{mnr}{urml \UniJIS-UTF16-H \FONTs}% -\Entry{mnr}{urmlv \UniJIS-UTF16-V \FONTs\@w}% -\Entry{gtu}{ugbm \UniJIS-UTF16-H \FONTs}% -\Entry{gtu}{ugbmv \UniJIS-UTF16-V \FONTs\@w}% +\Entry{mnr}0{uprml-h \UniJIS-UTF16-H \FONTs\@jpXX}% +\Entry{mnr}0{uprml-v \UniJIS-UTF16-V \FONTs\@w\@jpXX}% +\Entry{mnr}2{uprml-hq \@+UniJIS-UCS2-H \FONT\@fwid}% +\Entry{gtu}0{upgbm-h \UniJIS-UTF16-H \FONTs\@jpXX}% +\Entry{gtu}0{upgbm-v \UniJIS-UTF16-V \FONTs\@w\@jpXX}% +\Entry{gtu}2{upgbm-hq \@+UniJIS-UCS2-H \FONT\@fwid}% +\Entry{mnr}0{urml \UniJIS-UTF16-H \FONTs\@jpXX}% +\Entry{mnr}0{urmlv \UniJIS-UTF16-V \FONTs\@w\@jpXX}% +\Entry{gtu}0{ugbm \UniJIS-UTF16-H \FONTs\@jpXX}% +\Entry{gtu}0{ugbmv \UniJIS-UTF16-V \FONTs\@w\@jpXX}% % -\Entry{kom}{uphysmjm-h \@+UniKS-UTF16-H \FONT}% -\Entry{kom}{uphysmjm-v \@+UniKS-UTF16-V \FONT\@w}% -\Entry{kog}{uphygt-h \@+UniKS-UTF16-H \FONT}% -\Entry{kog}{uphygt-v \@+UniKS-UTF16-V \FONT\@w}% -\Entry{scm}{upstsl-h \@+UniGB-UTF16-H \FONT}% -\Entry{scm}{upstsl-v \@+UniGB-UTF16-V \FONT\@w}% -\Entry{scg}{upstht-h \@+UniGB-UTF16-H \FONT}% -\Entry{scg}{upstht-v \@+UniGB-UTF16-V \FONT\@w}% -\Entry{tcm}{upmsl-h \@+UniCNS-UTF16-H \FONT}% -\Entry{tcm}{upmsl-v \@+UniCNS-UTF16-V \FONT\@w}% -\Entry{tcg}{upmhm-h \@+UniCNS-UTF16-H \FONT}% -\Entry{tcg}{upmhm-v \@+UniCNS-UTF16-V \FONT\@w}% +\Entry{kom}0{uphysmjm-h \@+UniKS-UTF16-H \FONT}% +\Entry{kom}0{uphysmjm-v \@+UniKS-UTF16-V \FONT\@w}% +\Entry{kog}0{uphygt-h \@+UniKS-UTF16-H \FONT}% +\Entry{kog}0{uphygt-v \@+UniKS-UTF16-V \FONT\@w}% +\Entry{scm}0{upstsl-h \@+UniGB-UTF16-H \FONT}% +\Entry{scm}0{upstsl-v \@+UniGB-UTF16-V \FONT\@w}% +\Entry{scg}0{upstht-h \@+UniGB-UTF16-H \FONT}% +\Entry{scg}0{upstht-v \@+UniGB-UTF16-V \FONT\@w}% +\Entry{tcm}0{upmsl-h \@+UniCNS-UTF16-H \FONT}% +\Entry{tcm}0{upmsl-v \@+UniCNS-UTF16-V \FONT\@w}% +\Entry{tcg}0{upmhm-h \@+UniCNS-UTF16-H \FONT}% +\Entry{tcg}0{upmhm-v \@+UniCNS-UTF16-V \FONT\@w}% } \pxcz@mapentry{UPOTF}{% -\Entry{mnl}{uphminl-h \@+UniJIS-UTF16-H \FONTs}% -\Entry{mnl}{uphminl-v \@+UniJIS-UTF16-V \FONTs\@w}% -\Entry{mnl}{uphminln-h \@+UniJIS2004-UTF16-H \FONTs}% -\Entry{mnl}{uphminln-v \@+UniJIS2004-UTF16-V \FONTs\@w}% -\Entry{mnr}{uphminr-h \@+UniJIS-UTF16-H \FONTs}% -\Entry{mnr}{uphminr-v \@+UniJIS-UTF16-V \FONTs\@w}% -\Entry{mnr}{uphminrn-h \@+UniJIS2004-UTF16-H \FONTs}% -\Entry{mnr}{uphminrn-v \@+UniJIS2004-UTF16-V \FONTs\@w}% -\Entry{mnb}{uphminb-h \@+UniJIS-UTF16-H \FONTs}% -\Entry{mnb}{uphminb-v \@+UniJIS-UTF16-V \FONTs\@w}% -\Entry{mnb}{uphminbn-h \@+UniJIS2004-UTF16-H \FONTs}% -\Entry{mnb}{uphminbn-v \@+UniJIS2004-UTF16-V \FONTs\@w}% -\Entry{gtr}{uphgothr-h \@+UniJIS-UTF16-H \FONTs}% -\Entry{gtr}{uphgothr-v \@+UniJIS-UTF16-V \FONTs\@w}% -\Entry{gtr}{uphgothrn-h \@+UniJIS2004-UTF16-H \FONTs}% -\Entry{gtr}{uphgothrn-v \@+UniJIS2004-UTF16-V \FONTs\@w}% -\Entry{gtb}{uphgothb-h \@+UniJIS-UTF16-H \FONTs}% -\Entry{gtb}{uphgothb-v \@+UniJIS-UTF16-V \FONTs\@w}% -\Entry{gtb}{uphgothbn-h \@+UniJIS2004-UTF16-H \FONTs}% -\Entry{gtb}{uphgothbn-v \@+UniJIS2004-UTF16-V \FONTs\@w}% -\Entry{gtx}{uphgotheb-h \@+UniJIS-UTF16-H \FONTs}% -\Entry{gtx}{uphgotheb-v \@+UniJIS-UTF16-V \FONTs\@w}% -\Entry{gtx}{uphgothebn-h \@+UniJIS2004-UTF16-H \FONTs}% -\Entry{gtx}{uphgothebn-v \@+UniJIS2004-UTF16-V \FONTs\@w}% -\Entry{mgr}{uphmgothr-h \@+UniJIS-UTF16-H \FONTs}% -\Entry{mgr}{uphmgothr-v \@+UniJIS-UTF16-V \FONTs\@w}% -\Entry{mgr}{uphmgothrn-h \@+UniJIS2004-UTF16-H \FONTs}% -\Entry{mgr}{uphmgothrn-v \@+UniJIS2004-UTF16-V \FONTs\@w}% -} -% for 'PXOTF' -\@onlypreamble\pxcz@entry@pxotf -\def\pxcz@entry@pxotf#1#2{% -\Entry{#1}{r-#2-jy1 H \FONT}% -\Entry{#1}{r-#2-j00 78-H \FONT}% -\Entry{#1}{r-#2-jt1 V \FONT}% -\Entry{#1}{r-#2-j10 78-V \FONT}% -\Entry{#1}{r-#2-jy2 \UniJIS-UTF16-H \FONT}% -\Entry{#1}{r-#2-j20 UniJIS-UTF16-H \FONT}% -\Entry{#1}{r-#2-j24 UniJIS2004-UTF16-H \FONT}% -\Entry{#1}{r-#2-jt2 \UniJIS-UTF16-V \FONT}% -\Entry{#1}{r-#2-j30 UniJIS-UTF16-V \FONT}% -\Entry{#1}{r-#2-j34 UniJIS2004-UTF16-V \FONT}% -\Entry{#1}{r-#2-j40 Identity-H \FONT/AJ16}% -\Entry{#1}{r-#2-j50 Identity-V \FONT/AJ16}% +\Entry{mnl}0{uphminl-h \@+UniJIS-UTF16-H \FONTs\@jp90}% +\Entry{mnl}0{uphminl-v \@+UniJIS-UTF16-V \FONTs\@w\@jp90}% +\Entry{mnl}0{uphminln-h \@+UniJIS2004-UTF16-H \FONTs\@jp04}% +\Entry{mnl}0{uphminln-v \@+UniJIS2004-UTF16-V \FONTs\@w\@jp04}% +\Entry{mnr}0{uphminr-h \@+UniJIS-UTF16-H \FONTs\@jp90}% +\Entry{mnr}0{uphminr-v \@+UniJIS-UTF16-V \FONTs\@w\@jp90}% +\Entry{mnr}0{uphminrn-h \@+UniJIS2004-UTF16-H \FONTs\@jp04}% +\Entry{mnr}0{uphminrn-v \@+UniJIS2004-UTF16-V \FONTs\@w\@jp04}% +\Entry{mnb}0{uphminb-h \@+UniJIS-UTF16-H \FONTs\@jp90}% +\Entry{mnb}0{uphminb-v \@+UniJIS-UTF16-V \FONTs\@w\@jp90}% +\Entry{mnb}0{uphminbn-h \@+UniJIS2004-UTF16-H \FONTs\@jp04}% +\Entry{mnb}0{uphminbn-v \@+UniJIS2004-UTF16-V \FONTs\@w\@jp04}% +\Entry{gtr}0{uphgothr-h \@+UniJIS-UTF16-H \FONTs\@jp90}% +\Entry{gtr}0{uphgothr-v \@+UniJIS-UTF16-V \FONTs\@w\@jp90}% +\Entry{gtr}0{uphgothrn-h \@+UniJIS2004-UTF16-H \FONTs\@jp04}% +\Entry{gtr}0{uphgothrn-v \@+UniJIS2004-UTF16-V \FONTs\@w\@jp04}% +\Entry{gtb}0{uphgothb-h \@+UniJIS-UTF16-H \FONTs\@jp90}% +\Entry{gtb}0{uphgothb-v \@+UniJIS-UTF16-V \FONTs\@w\@jp90}% +\Entry{gtb}0{uphgothbn-h \@+UniJIS2004-UTF16-H \FONTs\@jp04}% +\Entry{gtb}0{uphgothbn-v \@+UniJIS2004-UTF16-V \FONTs\@w\@jp04}% +\Entry{gtx}0{uphgotheb-h \@+UniJIS-UTF16-H \FONTs\@jp90}% +\Entry{gtx}0{uphgotheb-v \@+UniJIS-UTF16-V \FONTs\@w\@jp90}% +\Entry{gtx}0{uphgothebn-h \@+UniJIS2004-UTF16-H \FONTs\@jp04}% +\Entry{gtx}0{uphgothebn-v \@+UniJIS2004-UTF16-V \FONTs\@w\@jp04}% +\Entry{mgr}0{uphmgothr-h \@+UniJIS-UTF16-H \FONTs\@jp90}% +\Entry{mgr}0{uphmgothr-v \@+UniJIS-UTF16-V \FONTs\@w\@jp90}% +\Entry{mgr}0{uphmgothrn-h \@+UniJIS2004-UTF16-H \FONTs\@jp04}% +\Entry{mgr}0{uphmgothrn-v \@+UniJIS2004-UTF16-V \FONTs\@w\@jp04}% } \pxcz@mapentry{PXOTF}{% -\pxcz@entry@pxotf{mnl}{njar-l}% -\pxcz@entry@pxotf{mnr}{njar-r}% -\pxcz@entry@pxotf{mnb}{njar-b}% -\pxcz@entry@pxotf{gtr}{njas-r}% -\pxcz@entry@pxotf{gtb}{njas-b}% -\pxcz@entry@pxotf{gtx}{njas-x}% -\pxcz@entry@pxotf{mgr}{mgjas-r}% } % user-defined map @@ -599,11 +661,23 @@ %% check if \diruni is available \ifpxcz@uptex - \@ifpackageloaded{otf}{% + \@ifpackageloaded{otf}{% directunicode needs otf \ifnum\pxcz@directunicode>\z@ \pxcz@diruni@oktrue \fi - }{} + }{%else + \ifnum\pxcz@directunicode>\@ne + \pxcz@diruni@oktrue % directunicode* does not need otf + \AtBeginDocument{% to laod otf later causes inconsistency + \@ifpackageloaded{otf}{\pxcz@diruni@okfalse}{}}% + \fi + } \fi +%%<*> \diruni +\DeclareRobustCommand*{\diruni}{% + \not@math@alphabet\diruni\relax + \fontshape{diruni}\selectfont +} + %%<*> \textdiruni{<text>} \newcommand*{\textdiruni}[1]{% \relax\ifmmode\hbox\fi{\diruni#1}% @@ -611,7 +685,7 @@ \ifpxcz@diruni@ok %---- <*diruni-ok> -%% otf weight mode +%% \pxcz@otf@weight: otf weight mode % watch out for priority... \@ifpackagewith{otf}{deluxe}{% \let\pxcz@otf@weight=d @@ -619,47 +693,69 @@ \let\pxcz@otf@weight=b }{\@ifpackagewith{otf}{noreplace}{% \let\pxcz@otf@weight=n -}{%else +}{\@ifpackageloaded{otf}{% \let\pxcz@otf@weight=r -}}} - -%%<*> \diruni -\DeclareRobustCommand*{\diruni}{% - \not@math@alphabet\diruni\relax - \fontshape{diruni}\selectfont +}{%else + \let\pxcz@otf@weight=n +}}}} +%% \pxcz@otf@mmivjis: otf jis2004 +\@ifpackagewith{otf}{jis2004}{% + \let\pxcz@otf@mmivjis=t% +}{%else + \let\pxcz@otf@mmivjis=f% } +%% \pxcz@du@scale +\let\pxcz@du@scale\utf@sc@le +\ifx\pxcz@du@scale\@undefined + \let\pxcz@du@scale\Cjascale +\fi +\ifx\pxcz@du@scale\@undefined + \edef\pxcz@du@scale{\ifx\jsc@JYn\@undefined 0.962216\else 0.924715\fi}% +\fi %% \pxcz@du@decl@shape{<fam>}{<ser>}{<font>} \@onlypreamble\pxcz@du@decl@shape -\def\pxcz@du@decl@shape#1#2#3#4{% +\def\pxcz@du@decl@shape#1#2#3#4#5{% \DeclareFontShape{JY2}{#1}{#2}{diruni}{<->% - \if#3ts*[\utf@sc@le]#4-h\else#4\fi}{}% + \pxcz@du@shape@spec{#3}{#4}{#5}{h}}{}% \DeclareFontShape{JT2}{#1}{#2}{diruni}{<->% - \if#3ts*[\utf@sc@le]#4-v\else#4\fi}{}} + \pxcz@du@shape@spec{#3}{#4}{#5}{v}}{}} +\@onlypreamble\pxcz@du@shape@spec +\def\pxcz@du@shape@spec#1#2#3#4{% + \if#1t% + s*[\pxcz@du@scale]#2\if t\pxcz@otf@mmivjis#3\fi-#4% + \else#2\fi} \if d\pxcz@otf@weight % deluxe -\pxcz@du@decl@shape{hmc}{l}t{otf-ujml}% -\pxcz@du@decl@shape{hmc}{m}t{otf-ujmr}% -\pxcz@du@decl@shape{hmc}{bx}t{otf-ujmb}% -\pxcz@du@decl@shape{hgt}{m}t{otf-ujgr}% -\pxcz@du@decl@shape{hgt}{bx}t{otf-ujgb}% -\pxcz@du@decl@shape{hgt}{eb}t{otf-ujge}% -\pxcz@du@decl@shape{mg}{m}t{otf-ujmgr}% +\pxcz@du@decl@shape{hmc}{l}t{otf-ujml}{n}% +\pxcz@du@decl@shape{hmc}{m}t{otf-ujmr}{n}% +\pxcz@du@decl@shape{hmc}{bx}t{otf-ujmb}{n}% +\pxcz@du@decl@shape{hgt}{m}t{otf-ujgr}{n}% +\pxcz@du@decl@shape{hgt}{bx}t{otf-ujgb}{n}% +\pxcz@du@decl@shape{hgt}{eb}t{otf-ujge}{n}% +\pxcz@du@decl@shape{mg}{m}t{otf-ujmgr}{n}% \else\if b\pxcz@otf@weight % bold -\pxcz@du@decl@shape{hmc}{m}t{otf-ujmr}% -\pxcz@du@decl@shape{hmc}{bx}f{ssub*hgt/m/diruni}% -\pxcz@du@decl@shape{hgt}{m}t{otf-ujgb}% -\pxcz@du@decl@shape{hgt}{bx}f{ssub*hgt/m/diruni}% +\pxcz@du@decl@shape{hmc}{m}t{otf-ujmr}{n}% +\pxcz@du@decl@shape{hmc}{bx}f{ssub*hgt/m/diruni}{}% +\pxcz@du@decl@shape{hgt}{m}t{otf-ujgb}{n}% +\pxcz@du@decl@shape{hgt}{bx}f{ssub*hgt/m/diruni}{}% \else\if r\pxcz@otf@weight % default -\pxcz@du@decl@shape{hmc}{m}t{otf-ujmr}% -\pxcz@du@decl@shape{hmc}{bx}f{ssub*hgt/m/diruni}% -\pxcz@du@decl@shape{hgt}{m}t{otf-ujgr}% -\pxcz@du@decl@shape{hgt}{bx}f{ssub*hgt/m/diruni}% +\pxcz@du@decl@shape{hmc}{m}t{otf-ujmr}{n}% +\pxcz@du@decl@shape{hmc}{bx}f{ssub*hgt/m/diruni}{}% +\pxcz@du@decl@shape{hgt}{m}t{otf-ujgr}{n}% +\pxcz@du@decl@shape{hgt}{bx}f{ssub*hgt/m/diruni}{}% \else % noreplace -\pxcz@du@decl@shape{mc}{m}t{otf-ujmr}% -\pxcz@du@decl@shape{mc}{bx}f{ssub*gt/m/diruni}% -\pxcz@du@decl@shape{gt}{m}t{otf-ujgr}% -\pxcz@du@decl@shape{gt}{bx}f{ssub*gt/m/diruni}% +\ifnum\pxcz@directunicode>\@ne % (directunicode*) +\pxcz@du@decl@shape{mc}{m}t{uprml}{}% +\pxcz@du@decl@shape{mc}{bx}f{ssub*gt/m/diruni}{}% +\pxcz@du@decl@shape{gt}{m}t{upgbm}{}% +\pxcz@du@decl@shape{gt}{bx}f{ssub*gt/m/diruni}{}% +\else % (directunicode) +\pxcz@du@decl@shape{mc}{m}t{otf-ujmr}{n}% +\pxcz@du@decl@shape{mc}{bx}f{ssub*gt/m/diruni}{}% +\pxcz@du@decl@shape{gt}{m}t{otf-ujgr}{n}% +\pxcz@du@decl@shape{gt}{bx}f{ssub*gt/m/diruni}{}% +\fi \fi\fi\fi \AtBeginDocument{% @@ -681,20 +777,27 @@ \endgroup } -\else %---- <*!diruni-ok> +\fi %---- </diruni-ok> -%%<*> \diruni -\DeclareRobustCommand*{\diruni}{% - \pxcz@err@diruni -} +%% \pxcz@err@diruni +\ifcase\pxcz@directunicode + \def\pxcz@errhelp@diruni{% + You must use upLaTeX and load pxchfon with 'directunicode(*)' option.} +\else + \def\pxcz@errhelp@diruni{% + You must use upLaTeX and load pxchfon after 'otf' package.} +\fi \def\pxcz@err@diruni{% \pxcz@error{Command '\string\diruni' not available}% - {You must load this package with 'directunicode' option on upLaTeX,% - \MessageBreak after loading 'otf' package.\MessageBreak\@ehc}% - \global\let\pxcz@err@diruni\relax -} - -\fi %---- </diruni-ok> + {\pxcz@errhelp@diruni\MessageBreak\@ehc}% + \global\let\pxcz@err@diruni\relax} +\AtBeginDocument{% + \ifpxcz@diruni@ok + \let\pxcz@err@diruni\relax + \let\pxcz@errhelp@diruni\relax + \else + \let\diruni\pxcz@err@diruni + \fi} %%------------------ 'alphabet' option @@ -872,8 +975,8 @@ %% \pxcz@use@preset{<name>} \def\pxcz@use@preset#1{% \expandafter\ifx\csname pxcz@depre@preset@#1\endcsname t% - \pxcz@warn{Preset '#1' is obsolete and\MessageBreak - its use is *deprecated*,}% + \pxcz@error{The old preset '#1' is *abolished*} + {\@ehc}% \fi \csname pxcz@the@preset@#1\endcsname} @@ -973,6 +1076,46 @@ \pxcz@multiweight{YuMin-Medium.otf}{YuMin-Medium.otf}% {YuMin-Demibold.otf}{YuGo-Medium.otf}{YuGo-Bold.otf}% {YuGo-Bold.otf}{YuGo-Medium.otf}{YuGo-Medium.otf}} +% Source Han Sans/Serif, "OTC" +\pxcz@declare@preset{sourcehan-otc}{% + \pxcz@multiweight{\pxcz@SH:0:SourceHanSerif-Light.ttc}% + {\pxcz@SH:0:SourceHanSerif-Regular.ttc}% + {\pxcz@SH:0:SourceHanSerif-Bold.ttc}% + {\pxcz@SH:0:SourceHanSans-Regular.ttc}% + {\pxcz@SH:0:SourceHanSans-Bold.ttc}% + {\pxcz@SH:0:SourceHanSans-Heavy.ttc}% + {\pxcz@SH:0:SourceHanSans-Medium.ttc}% + {\pxcz@SH:0:SourceHanSans-Heavy.ttc}} +% Source Han Sans/Serif, "Language-specific OTF" +\pxcz@declare@preset{sourcehan}{% + \pxcz@multiweight{\pxcz@SH/SourceHanSerif-Light.otf}% + {\pxcz@SH/SourceHanSerif-Regular.otf}% + {\pxcz@SH/SourceHanSerif-Bold.otf}% + {\pxcz@SH/SourceHanSans-Regular.otf}% + {\pxcz@SH/SourceHanSans-Bold.otf}% + {\pxcz@SH/SourceHanSans-Heavy.otf}% + {\pxcz@SH/SourceHanSans-Medium.otf}% + {\pxcz@SH/SourceHanSans-Heavy.otf}} +% Noto Sans/Serif CJK, "OpenType/CFF Collection (OTC)" +\pxcz@declare@preset{noto-otc}{% + \pxcz@multiweight{\pxcz@NC:0:NotoSerifCJK-Light.ttc}% + {\pxcz@NC:0:NotoSerifCJK-Regular.ttc}% + {\pxcz@NC:0:NotoSerifCJK-Bold.ttc}% + {\pxcz@NC:0:NotoSansCJK-Regular.ttc}% + {\pxcz@NC:0:NotoSansCJK-Bold.ttc}% + {\pxcz@NC:0:NotoSansCJK-Black.ttc}% + {\pxcz@NC:0:NotoSansCJK-Medium.ttc}% + {\pxcz@NC:0:NotoSansCJK-Black.ttc}} +% Noto Sans/Serif CJK, "Language-specific OpenType/CFF (OTF)" +\pxcz@declare@preset{noto}{% + \pxcz@multiweight{\pxcz@NC/NotoSerifCJKjp-Light.otf}% + {\pxcz@NC/NotoSerifCJKjp-Regular.otf}% + {\pxcz@NC/NotoSerifCJKjp-Bold.otf}% + {\pxcz@NC/NotoSansCJKjp-Regular.otf}% + {\pxcz@NC/NotoSansCJKjp-Bold.otf}% + {\pxcz@NC/NotoSansCJKjp-Black.otf}% + {\pxcz@NC/NotoSansCJKjp-Medium.otf}% + {\pxcz@NC/NotoSansCJKjp-Black.otf}} %(obsolete) \pxcz@declare@depre@preset{ipa-otf}{% \pxcz@uniweight{ipam.otf}{ipag.otf}} diff --git a/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty b/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty index 7be855cb78b..3520368fbaf 100644 --- a/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty +++ b/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty @@ -8,12 +8,16 @@ %% This package is distributed under the MIT License. %% -% TODO: Should 'pxjafont' package be abolished? - -%%%% package declaration +%% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{pxjafont}[2016/04/08 v0.9] +\ProvidesPackage{pxjafont}[2017/05/31 v1.0] +%% show warning +\PackageWarning{pxchfon} + {The package 'pxjafont' is obsolete and its use is\MessageBreak + deprecated. please refer to the manual of pxchfon.\MessageBreak + The warning is issued} +%% delegate \let\pxAliasedPxjafont=t -\RequirePackageWithOptions{pxchfon}[2010/05/12] +\RequirePackageWithOptions{pxchfon}[2017/05/31] \endinput %% EOF |