From 4a623ac0c922a8da9459e237c8ed5fb42653f058 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 23 Apr 2013 16:29:42 +0000 Subject: pxchfon update (23Apr) git-svn-id: svn://tug.org/texlive/trunk@30067 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty | 383 ++++++++++++++++------- 1 file changed, 274 insertions(+), 109 deletions(-) (limited to 'Master/texmf-dist/tex/platex/pxchfon') diff --git a/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty b/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty index e6e94427232..52938d8ff44 100644 --- a/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty +++ b/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty @@ -4,7 +4,7 @@ %%%% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{pxchfon}[2010/05/12 v0.5] +\ProvidesPackage{pxchfon}[2013/04/20 v0.6c] \def\pxcz@pkgname{pxchfon} %%%% definitions @@ -48,11 +48,25 @@ \newif\ifpxcz@everypage \DeclareOption{everypage}{\pxcz@everypagetrue} \DeclareOption{noeverypage}{\pxcz@everypagefalse} +\newif\ifpxcz@oneweight +\DeclareOption{oneweight}{\pxcz@oneweighttrue} +\DeclareOption{nooneweight}{\pxcz@oneweightfalse} +\newif\ifpxcz@directunicode +\DeclareOption{directunicode}{\pxcz@directunicodetrue} +\DeclareOption{nodirectunicode}{\pxcz@directunicodefalse} % preset spec options \def\pxcz@all@main@preset{% - noembed,ms,ms-dx,ipa,ipa-dx,ipa-otf,ipa-otf-dx,% - kozuka4,kozuka6,kozuka6n,hiragino,hiragino-dx,% - ipa2,ipa2-dx,ipa-ttf,ipa-ttf-dx} + noembed,% + %(uniweight) + ms,ipa,ipaex,% + %(multiweight) + ms-hg,ipa-hg,moga-mobo,moga-maruberi,% + kozuka-pro,kozuka-pr6,kozuka-pr6n,% + hiragino-pro,hiragino-pron,morisawa-pro,morisawa-pr6n,% + %(obsolete) + ipa-otf,ipa-otf-dx,kozuka4,kozuka6,kozuka6n,hiragino,% + %(alias) + ms-dx,ipa-ttf,ipa-ttf-dx,ipav2,ipav2-dx,ipa-dx,hiragino-dx} \let\pxcz@main@preset\relax \def\pxcz@do#1{\DeclareOption{#1}{\def\pxcz@main@preset{#1}}} \@for\pxcz@x:=\pxcz@all@main@preset\do{% @@ -64,7 +78,6 @@ \RequirePackage{atbegshi} \fi - %% \ifpxcz@alpha \newif\ifpxcz@alpha \if t\pxcz@alphabet \pxcz@alphatrue @@ -84,13 +97,14 @@ %%%%<*> \setminchofont/\setgothicfont/etc. \newcommand*\setminchofont{\pxcz@setfont{mnl,mnr,mnb}} -\newcommand*\setgothicfont{\pxcz@setfont{gtr,gtb,gtx}} +\newcommand*\setgothicfont{\pxcz@setfont{gtr,gtb,gtx,gtu}} \newcommand*\setlightminchofont{\pxcz@setfont{mnl}} \newcommand*\setmediumminchofont{\pxcz@setfont{mnr}} \newcommand*\setboldminchofont{\pxcz@setfont{mnb}} \newcommand*\setmediumgothicfont{\pxcz@setfont{gtr}} \newcommand*\setboldgothicfont{\pxcz@setfont{gtb}} \newcommand*\setxboldgothicfont{\pxcz@setfont{gtx}} +\newcommand*\setuniweightgothicfont{\pxcz@setfont{gtu}} \newcommand*\setmarugothicfont{\pxcz@setfont{mgr}} \def\pxcz@setfont#1{\@ifnextchar[%] {\pxcz@setfont@a{#1}}{\pxcz@setfont@a{#1}[]}} @@ -98,7 +112,7 @@ \@for\pxcz@x:={#1}\do{% \ifx @#2@\@namedef{pxcz@FS/\pxcz@x}{#3}% \else\@namedef{pxcz@FS/\pxcz@x}{:#2:#3}\fi}} -\@for\pxcz@x:={mnl,mnr,mnb,gtr,gtb,gtx,mgr}\do +\@for\pxcz@x:={mnl,mnr,mnb,gtr,gtb,gtx,gtu,mgr}\do {\@namedef{pxcz@FS/\pxcz@x}{}} %%%% <*> \usecmapforalphabet/\nousecmapforalphabet @@ -107,10 +121,82 @@ \ifpxcz@cmap@alpha \usecmapforalphabet \else \nousecmapforalphabet \fi -%%------------------ map entry definitions +%%<+> \JaFontReplacementFor{} +\newcommand*\JaFontReplacementFor[1]{% + \csname pxcz@FS/#1\endcsname} + +%%<+> \JaFontReplacementHook{} +\newcommand*\JaFontReplacementHook{% + \g@addto@macro\pxcz@user@hook} +\let\pxcz@user@hook\@empty + +%%<+> \JaFontUserDefinedMap +\newcommand*\JaFontUserDefinedMap{% + \g@addto@macro\pxcz@user@map} +\let\pxcz@user@map\@empty +\@namedef{pxcz@FS/*}{\pxcz@empty} + +%%------------------ map entry handling + +%%<*> \setnewglyphcmapprefix{} +\def\pxcz@pfx@jis@dflt{2004-} +\def\pxcz@pfx@jis@star{JISX0213-2004-} +\newcommand*\setnewglyphcmapprefix{% + \@ifstar{\pxcz@set@pfx@jis\pxcz@pfx@jis@star}% + {\pxcz@set@pfx@jis}} +\def\pxcz@set@pfx@jis#1{% + \edef\pxcz@pfx@jis{\ifpxcz@mmivjis#1\fi}} +\setnewglyphcmapprefix{\pxcz@pfx@jis@dflt} + +%% \pxcz@pfx@unijis +\edef\pxcz@pfx@unijis{UniJIS\ifpxcz@mmivjis 2004\fi} + +%% \pxcz@enable@switch@realfont +\def\pxcz@enable@switch@realfont{% + \let\pxcz@switch@realfont\pxcz@do@switch@realfont +} +\let\pxcz@switch@realfont\relax + +%% \pxcz@do@switch@realfont +\def\pxcz@do@switch@realfont{% + \edef\pxcz@reset@mmivjis{% + \ifpxcz@mmivjis \noexpand\pxcz@mmivjistrue + \else \noexpand\pxcz@mmivjisfalse \fi}% + \let\pxcz@empty\relax + \pxcz@mmivjistrue \edef\FONT{\FONTs}% + \pxcz@mmivjisfalse \edef\FONTo{\FONTs}% + \pxcz@reset@mmivjis \edef\FONTs{\FONTs}% + \let\pxcz@empty\@empty} + +%% \pxcz@MI +% NB: not \edef +\def\pxcz@MI{\ifpxcz@mmivjis:0:\else:3:\fi} + +%% \pxcz@unidirect +\let\pxcz@unidirect\@empty +\ifpxcz@directunicode +\def\pxcz@unidirect#1-H{unicode} +\fi + +%% \pxcz@addtospec{} +\def\pxcz@addtospec#1{% + \bgroup \let\Entry\pxcz@Entry + \let\ \space \let\UniCMap\pxcz@unicmap + \let\*\pxcz@pfx@jis \let\+\pxcz@unidirect + \let\UniJIS\pxcz@pfx@unijis + \@nameuse{pxcz@ME/#1}\egroup} +\def\pxcz@Entry#1{% + \expandafter\let\expandafter\FONT\csname pxcz@FS/#1\endcsname + \let\FONTo\FONT \let\FONTs\FONT + \pxcz@switch@realfont + \ifx\FONT\@empty \expandafter\@gobble + \else \expandafter\pxcz@entry@a \fi} +\def\pxcz@entry@a#1{% + \xdef\pxcz@spec{\pxcz@spec\noexpand\special{\pxcz@line{#1}}}} +\let\pxcz@spec\@empty +\def\pxcz@line#1{pdf:mapline #1} -%% \pxcz@unijis -\edef\pxcz@unijis{UniJIS\ifpxcz@mmivjis 2004\fi} +%%------------------ map entry definitions %% \pxcz@mapentry{}{} \def\pxcz@mapentry#1{% @@ -119,10 +205,10 @@ %%%% map entries \pxcz@mapentry{STD}{% -\Entry{mnr}{rml H \FONT}% -\Entry{mnr}{rmlv V \FONT}% -\Entry{gtr}{gbm H \FONT}% -\Entry{gtr}{gbmv V \FONT}% +\Entry{mnr}{rml \*H \FONTs}% +\Entry{mnr}{rmlv \*V \FONTs}% +\Entry{gtu}{gbm \*H \FONTs}% +\Entry{gtu}{gbmv \*V \FONTs}% } \pxcz@mapentry{ALPHA}{% \Entry{mnl}{r-cfjar-l-@PXcjk0@ \UniCMap\ \FONT}% @@ -134,86 +220,118 @@ \Entry{mgr}{r-cfjas-r-@PXcjk0@ \UniCMap\ \FONT}% } \pxcz@mapentry{UTF}{% -\Entry{mnr}{unijmin-h UniJIS-UTF16-H \FONT}% -\Entry{mnr}{unijmin-v UniJIS-UTF16-V \FONT}% +\Entry{mnr}{unijmin-h \UniJIS-UTF16-H \FONTs}% +\Entry{mnr}{unijmin-v \UniJIS-UTF16-V \FONTs}% \Entry{mnr}{cidmin-h Identity-H \FONT/AJ16}% \Entry{mnr}{cidmin-v Identity-V \FONT/AJ16}% -\Entry{mnr}{hmr H \FONT}% -\Entry{mnr}{hmrv V \FONT}% -\Entry{gtr}{unijgoth-h UniJIS-UTF16-H \FONT}% -\Entry{gtr}{unijgoth-v UniJIS-UTF16-V \FONT}% -\Entry{gtr}{cidgoth-h Identity-H \FONT/AJ16}% -\Entry{gtr}{cidgoth-v Identity-V \FONT/AJ16}% -\Entry{gtr}{hkb H \FONT}% -\Entry{gtr}{hkbv V \FONT}% +\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}% +\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}% } \pxcz@mapentry{OTF}{% -\Entry{mnl}{otf-ujml-h UniJIS-UTF16-H \FONT}% -\Entry{mnl}{otf-ujml-v UniJIS-UTF16-V \FONT}% +\Entry{mnl}{otf-ujml-h \+UniJIS-UTF16-H \FONTo}% +\Entry{mnl}{otf-ujml-v UniJIS-UTF16-V \FONTo}% \Entry{mnl}{otf-cjml-h Identity-H \FONT/AJ16}% \Entry{mnl}{otf-cjml-v Identity-V \FONT/AJ16}% -\Entry{mnl}{hminl-h H \FONT}% -\Entry{mnl}{hminl-v V \FONT}% -\Entry{mnr}{otf-ujmr-h UniJIS-UTF16-H \FONT}% -\Entry{mnr}{otf-ujmr-v UniJIS-UTF16-V \FONT}% +\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}% +\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}% \Entry{mnr}{otf-cjmr-h Identity-H \FONT/AJ16}% \Entry{mnr}{otf-cjmr-v Identity-V \FONT/AJ16}% -\Entry{mnr}{hminr-h H \FONT}% -\Entry{mnr}{hminr-v V \FONT}% -\Entry{mnb}{otf-ujmb-h UniJIS-UTF16-H \FONT}% -\Entry{mnb}{otf-ujmb-v UniJIS-UTF16-V \FONT}% +\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}% +\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}% \Entry{mnb}{otf-cjmb-h Identity-H \FONT/AJ16}% \Entry{mnb}{otf-cjmb-v Identity-V \FONT/AJ16}% -\Entry{mnb}{hminb-h H \FONT}% -\Entry{mnb}{hminb-v V \FONT}% -\Entry{gtr}{otf-ujgr-h UniJIS-UTF16-H \FONT}% -\Entry{gtr}{otf-ujgr-v UniJIS-UTF16-V \FONT}% +\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}% +\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}% \Entry{gtr}{otf-cjgr-h Identity-H \FONT/AJ16}% \Entry{gtr}{otf-cjgr-v Identity-V \FONT/AJ16}% -\Entry{gtr}{hgothr-h H \FONT}% -\Entry{gtr}{hgothr-v V \FONT}% -\Entry{gtb}{otf-ujgb-h UniJIS-UTF16-H \FONT}% -\Entry{gtb}{otf-ujgb-v UniJIS-UTF16-V \FONT}% +\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}% +\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}% \Entry{gtb}{otf-cjgb-h Identity-H \FONT/AJ16}% \Entry{gtb}{otf-cjgb-v Identity-V \FONT/AJ16}% -\Entry{gtb}{hgothb-h H \FONT}% -\Entry{gtb}{hgothb-v V \FONT}% -\Entry{gtx}{hgotheb-h H \FONT}% -\Entry{gtx}{hgotheb-v V \FONT}% -\Entry{mgr}{otf-ujmgr-h UniJIS-UTF16-H \FONT}% -\Entry{mgr}{otf-ujmgr-v UniJIS-UTF16-V \FONT}% +\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}% +\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}% +\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}% +\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}% \Entry{mgr}{otf-cjmgr-h Identity-H \FONT/AJ16}% \Entry{mgr}{otf-cjmgr-v Identity-V \FONT/AJ16}% -\Entry{mgr}{hmgothr-h H \FONT}% -\Entry{mgr}{hmgothr-v V \FONT}% +\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}% +\Entry{mgr}{hmgothrn-h H \FONT}% +\Entry{mgr}{hmgothrn-v V \FONT}% } \pxcz@mapentry{UPSTD}{% -\Entry{mnr}{uprml-h \UniJIS-UTF16-H \FONT}% -\Entry{mnr}{uprml-v \UniJIS-UTF16-V \FONT}% +\Entry{mnr}{uprml-h \UniJIS-UTF16-H \FONTs}% +\Entry{mnr}{uprml-v \UniJIS-UTF16-V \FONTs}% \Entry{mnr}{uprml-hq UniJIS-UCS2-H \FONT}% -\Entry{gtr}{upgbm-h \UniJIS-UTF16-H \FONT}% -\Entry{gtr}{upgbm-v \UniJIS-UTF16-V \FONT}% -\Entry{gtr}{upgbm-hq UniJIS-UCS2-H \FONT}% -\Entry{mnr}{urml \UniJIS-UTF16-H \FONT}% -\Entry{mnr}{urmlv \UniJIS-UTF16-V \FONT}% -\Entry{gtr}{ugbm \UniJIS-UTF16-H \FONT}% -\Entry{gtr}{ugbmv \UniJIS-UTF16-V \FONT}% +\Entry{gtu}{upgbm-h \UniJIS-UTF16-H \FONTs}% +\Entry{gtu}{upgbm-v \UniJIS-UTF16-V \FONTs}% +\Entry{gtu}{upgbm-hq UniJIS-UCS2-H \FONT}% +\Entry{mnr}{urml \UniJIS-UTF16-H \FONTs}% +\Entry{mnr}{urmlv \UniJIS-UTF16-V \FONTs}% +\Entry{gtu}{ugbm \UniJIS-UTF16-H \FONTs}% +\Entry{gtu}{ugbmv \UniJIS-UTF16-V \FONTs}% } \pxcz@mapentry{UPOTF}{% -\Entry{mnl}{uphminl-h UniJIS-UTF16-H \FONT}% -\Entry{mnl}{uphminl-v UniJIS-UTF16-V \FONT}% -\Entry{mnr}{uphminr-h UniJIS-UTF16-H \FONT}% -\Entry{mnr}{uphminr-v UniJIS-UTF16-V \FONT}% -\Entry{mnb}{uphminb-h UniJIS-UTF16-H \FONT}% -\Entry{mnb}{uphminb-v UniJIS-UTF16-V \FONT}% -\Entry{gtr}{uphgothr-h UniJIS-UTF16-H \FONT}% -\Entry{gtr}{uphgothr-v UniJIS-UTF16-V \FONT}% -\Entry{gtb}{uphgothb-h UniJIS-UTF16-H \FONT}% -\Entry{gtb}{uphgothb-v UniJIS-UTF16-V \FONT}% -\Entry{gtx}{uphgotheb-h UniJIS-UTF16-H \FONT}% -\Entry{gtx}{uphgotheb-v UniJIS-UTF16-V \FONT}% -\Entry{mgr}{uphmgothr-h UniJIS-UTF16-H \FONT}% -\Entry{mgr}{uphmgothr-v UniJIS-UTF16-V \FONT}% +\Entry{mnl}{uphminl-h \UniJIS-UTF16-H \FONTs}% +\Entry{mnl}{uphminl-v \UniJIS-UTF16-V \FONTs}% +\Entry{mnr}{uphminr-h \UniJIS-UTF16-H \FONTs}% +\Entry{mnr}{uphminr-v \UniJIS-UTF16-V \FONTs}% +\Entry{mnb}{uphminb-h \UniJIS-UTF16-H \FONTs}% +\Entry{mnb}{uphminb-v \UniJIS-UTF16-V \FONTs}% +\Entry{gtr}{uphgothr-h \UniJIS-UTF16-H \FONTs}% +\Entry{gtr}{uphgothr-v \UniJIS-UTF16-V \FONTs}% +\Entry{gtb}{uphgothb-h \UniJIS-UTF16-H \FONTs}% +\Entry{gtb}{uphgothb-v \UniJIS-UTF16-V \FONTs}% +\Entry{gtx}{uphgotheb-h \UniJIS-UTF16-H \FONTs}% +\Entry{gtx}{uphgotheb-v \UniJIS-UTF16-V \FONTs}% +\Entry{mgr}{uphmgothr-h \UniJIS-UTF16-H \FONTs}% +\Entry{mgr}{uphmgothr-v \UniJIS-UTF16-V \FONTs}% } % for 'PXOTF' \@onlypreamble\pxcz@entry@pxotf @@ -241,20 +359,10 @@ \pxcz@entry@pxotf{mgr}{mgjas-r}% } -%% \pxcz@addtospec{} -\def\pxcz@addtospec#1{% - \bgroup \let\Entry\pxcz@Entry - \let\ \space \let\UniCMap\pxcz@unicmap - \let\UniJIS\pxcz@unijis - \@nameuse{pxcz@ME/#1}\egroup} -\def\pxcz@Entry#1{% - \expandafter\let\expandafter\FONT\csname pxcz@FS/#1\endcsname - \ifx\FONT\@empty \expandafter\@gobble - \else \expandafter\pxcz@entry@a \fi} -\def\pxcz@entry@a#1{% - \xdef\pxcz@spec{\pxcz@spec\noexpand\special{\pxcz@line{#1}}}} -\let\pxcz@spec\@empty -\def\pxcz@line#1{pdf:mapline #1} +% user-defined map +\pxcz@mapentry{USR}{% + \pxcz@user@map +} %%------------------ 'alphabet' option @@ -335,6 +443,7 @@ \expandafter\ifx\csname pxcz@FS/\pxcz@x\endcsname\@empty \pxcz@okfalse \fi}} \AtBeginDocument{% + \pxcz@user@hook \ifpxcz@alpha \pxcz@check@alldefined{mnl,mnr,mnb}% \ifpxcz@ok \renewcommand\rmdefault{cfjar}\fi @@ -362,6 +471,7 @@ \ifpxcz@ok \pxcz@addtospec{PXOTF}% \fi \pxcz@check@extra + \pxcz@addtospec{USR}% \pxcz@set@page@hook{\pxcz@spec}% } @@ -378,18 +488,20 @@ \expandafter\endcsname\csname pxcz@the@preset@#2\endcsname} \def\pxcz@decl@preset@alias@a#1#2{\@onlypreamble#1\let#1#2} -%% \pxcz@uniweight{}{} +%% \pxcz@uniweight{}{} \@onlypreamble\pxcz@uniweight \def\pxcz@uniweight#1#2{% \setminchofont{#1}\setgothicfont{#2}\setmarugothicfont{#2}} -%% \pxcz@multiweight{}{} -%% {}{}{}{} +%% \pxcz@multiweight{}{}{} +%% {}{}{}{}{} \@onlypreamble\pxcz@multiweight -\def\pxcz@multiweight#1#2#3#4#5#6{% - \setminchofont{#1}\setboldminchofont{#2}% - \setgothicfont{#3}\setboldgothicfont{#4}\setxboldgothicfont{#5}% - \setmarugothicfont{#6}} +\def\pxcz@multiweight#1#2#3#4#5#6#7#8{% + \setminchofont{#2}\setgothicfont{#7}\setmarugothicfont{#8}% + \ifpxcz@oneweight\else + \setlightminchofont{#1}\setboldminchofont{#3}% + \setmediumgothicfont{#4}\setboldgothicfont{#5}\setxboldgothicfont{#6}% + \fi} %% \pxcz@use@preset{} \def\pxcz@use@preset#1{% @@ -399,23 +511,73 @@ \pxcz@declare@preset{noembed}{% \usecmapforalphabet \pxcz@uniweight{Ryumin-Light}{GothicBBB-Medium}} +%(uniweight) \pxcz@declare@preset{ms}{% \pxcz@uniweight{:0:msmincho.ttc}{:0:msgothic.ttc}} -\pxcz@declare@preset{ms-dx}{% - \pxcz@multiweight{:0:msmincho.ttc}{:0:hgrme.ttc}% - {:0:hgrgm.ttc}{:0:hgrge.ttc}{:0:hgrsgu.ttc}{hgrsmp.ttf}} +\pxcz@declare@preset{ipa}{% + \pxcz@uniweight{ipam.ttf}{ipag.ttf}} +\pxcz@declare@preset{ipaex}{% + \pxcz@uniweight{ipaexm.ttf}{ipaexg.ttf}} +%(multiweight) +\pxcz@declare@preset{ms-hg}{% + \pxcz@multiweight{:0:msmincho.ttc}{:0:msmincho.ttc}{:0:hgrme.ttc}% + {:0:hgrgm.ttc}{:0:hgrge.ttc}{:0:hgrsgu.ttc}{:0:msgothic.ttc}{hgrsmp.ttf}} +\pxcz@declare@preset{ipa-hg}{% + \pxcz@multiweight{ipam.ttf}{ipam.ttf}{:0:hgrme.ttc}% + {:0:hgrgm.ttc}{:0:hgrge.ttc}{:0:hgrsgu.ttc}{ipag.ttf}{hgrsmp.ttf}} +\pxcz@declare@preset{moga-mobo}{% + \pxcz@enable@switch@realfont + \pxcz@multiweight{\pxcz@MI mogam.ttc}{\pxcz@MI mogam.ttc}% + {\pxcz@MI mogamb.ttc}{\pxcz@MI mogag.ttc}{\pxcz@MI mogagb.ttc}% + {\pxcz@MI mogagb.ttc}{\pxcz@MI mogag.ttc}{\pxcz@MI mobog.ttc}} +\pxcz@declare@preset{moga-maruberi}{% + \pxcz@enable@switch@realfont + \pxcz@multiweight{\pxcz@MI mogam.ttc}{\pxcz@MI mogam.ttc}% + {\pxcz@MI mogamb.ttc}{\pxcz@MI mogag.ttc}{\pxcz@MI mogagb.ttc}% + {\pxcz@MI mogagb.ttc}{\pxcz@MI mogag.ttc}{MTLmr3m.ttf}} +\pxcz@declare@preset{kozuka-pro}{% + \usecmapforalphabet + \pxcz@multiweight{KozMinPro-Light.otf}{KozMinPro-Regular.otf}% + {KozMinPro-Bold.otf}{KozGoPro-Regular.otf}{KozGoPro-Bold.otf}% + {KozGoPro-Heavy.otf}{KozGoPro-Medium.otf}{KozGoPro-Heavy.otf}} +\pxcz@declare@preset{kozuka-pr6}{% + \usecmapforalphabet + \pxcz@multiweight{KozMinProVI-Light.otf}{KozMinProVI-Regular.otf}% + {KozMinProVI-Bold.otf}{KozGoProVI-Regular.otf}{KozGoProVI-Bold.otf}% + {KozGoProVI-Heavy.otf}{KozGoProVI-Medium.otf}{KozGoProVI-Heavy.otf}} +\pxcz@declare@preset{kozuka-pr6n}{% + \usecmapforalphabet + \pxcz@multiweight{KozMinPr6N-Light.otf}{KozMinPr6N-Regular.otf}% + {KozMinPr6N-Bold.otf}{KozGoPr6N-Regular.otf}{KozGoPr6N-Bold.otf}% + {KozGoPr6N-Heavy.otf}{KozGoPr6N-Medium.otf}{KozGoPr6N-Heavy.otf}} +\pxcz@declare@preset{hiragino-pro}{% + \usecmapforalphabet + \pxcz@multiweight{HiraMinPro-W2.otf}{HiraMinPro-W3.otf}% + {HiraMinPro-W6.otf}{HiraKakuPro-W3.otf}{HiraKakuPro-W6.otf}% + {HiraKakuStd-W8.otf}{HiraKakuPro-W6.otf}{HiraMaruPro-W4.otf}} +\pxcz@declare@preset{hiragino-pron}{% + \usecmapforalphabet + \pxcz@multiweight{HiraMinProN-W2.otf}{HiraMinProN-W3.otf}% + {HiraMinProN-W6.otf}{HiraKakuProN-W3.otf}{HiraKakuProN-W6.otf}% + {HiraKakuStdN-W8.otf}{HiraKakuProN-W6.otf}{HiraMaruProN-W4.otf}} +\pxcz@declare@preset{morisawa-pro}{% + \usecmapforalphabet + \pxcz@multiweight{A-OTF-RyuminPro-Light.otf}{A-OTF-RyuminPro-Light.otf}% + {A-OTF-FutoMinA101Pro-Bold.otf}{A-OTF-GothicBBBPro-Medium.otf}% + {A-OTF-FutoGoB101Pro-Bold}{A-OTF-MidashiGoPro-MB31.otf}% + {A-OTF-GothicBBBPro-Medium.otf}{A-OTFJun101Pro-Light.otf}} +\pxcz@declare@preset{morisawa-pr6n}{% + \usecmapforalphabet + \pxcz@multiweight{A-OTF-RyuminPr6N-Light.otf}{A-OTF-RyuminPr6N-Light.otf}% + {A-OTF-FutoMinA101Pr6N-Bold.otf}{A-OTF-GothicBBBPr6N-Medium.otf}% + {A-OTF-FutoGoB101Pr6N-Bold}{A-OTF-MidashiGoPr6N-MB31.otf}% + {A-OTF-GothicBBBPr6N-Medium.otf}{A-OTFJun101Pr6N-Light.otf}} +%(obsolete) \pxcz@declare@preset{ipa-otf}{% \pxcz@uniweight{ipam.otf}{ipag.otf}} \pxcz@declare@preset{ipa-otf-dx}{% \pxcz@multiweight{ipam.otf}{:0:hgrme.ttc}% {:0:hgrgm.ttc}{:0:hgrge.ttc}{:0:hgrsgu.ttc}{hgrsmp.ttf}} -\pxcz@declare@preset{ipa-ttf}{% - \pxcz@uniweight{ipam.ttf}{ipag.ttf}} -\pxcz@declare@preset{ipa-ttf-dx}{% - \pxcz@multiweight{ipam.ttf}{:0:hgrme.ttc}% - {:0:hgrgm.ttc}{:0:hgrge.ttc}{:0:hgrsgu.ttc}{hgrsmp.ttf}} -\pxcz@declare@preset@alias{ipa}{ipa-ttf} -\pxcz@declare@preset@alias{ipav2}{ipa-ttf} \pxcz@declare@preset{kozuka4}{% \usecmapforalphabet \pxcz@uniweight{KozMinPro-Regular-Acro.otf}{KozGoPro-Medium-Acro.otf}} @@ -428,11 +590,14 @@ \pxcz@declare@preset{hiragino}{% \usecmapforalphabet \pxcz@uniweight{HiraMinPro-W3.otf}{HiraKakuPro-W6.otf}} -\pxcz@declare@preset{hiragino-dx}{% - \usecmapforalphabet - \pxcz@multiweight{HiraMinPro-W3.otf}{HiraMinPro-W6.otf}% - {HiraKakuPro-W3.otf}{HiraKakuPro-W6.otf}{HiraKakuStd-W8.otf}% - {HiraMaruPro-W4.otf}} +%(alias) +\pxcz@declare@preset@alias{ms-dx}{ms-hg} +\pxcz@declare@preset@alias{ipa-ttf}{ipa} +\pxcz@declare@preset@alias{ipa-ttf-dx}{ipa-hg} +\pxcz@declare@preset@alias{ipav2}{ipa} +\pxcz@declare@preset@alias{ipav2-dx}{ipa-hg} +\pxcz@declare@preset@alias{ipa-dx}{ipa-hg} +\pxcz@declare@preset@alias{hiragino-dx}{hiragino-pro} %%%% ... and invokes the specified one! \if\pxcz@main@preset\relax\else -- cgit v1.2.3