summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-04-09 22:39:12 +0000
committerKarl Berry <karl@freefriends.org>2017-04-09 22:39:12 +0000
commita62d427cc23b32f39be7c5c901c3cb0fb985edc6 (patch)
tree883253199749f3ccc33bbf5cb7b726985ae23a6a /Master/texmf-dist/tex
parentc6a345d0c297efae1097f447b5fd87e613264c4a (diff)
pxchfon (9apr17)
git-svn-id: svn://tug.org/texlive/trunk@43722 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty172
-rw-r--r--Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty4
2 files changed, 101 insertions, 75 deletions
diff --git a/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty b/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
index dc69ce9fee3..3bbf3de30e3 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/01/13 v0.8]
+\ProvidesPackage{pxchfon}[2017/04/08 v0.9]
\def\pxcz@pkgname{pxchfon}
%%%% definitions
@@ -59,9 +59,10 @@
\newif\ifpxcz@oneweight
\DeclareOption{oneweight}{\pxcz@oneweighttrue}
\DeclareOption{nooneweight}{\pxcz@oneweightfalse}
-\newif\ifpxcz@directunicode
-\DeclareOption{directunicode}{\pxcz@directunicodetrue}
-\DeclareOption{nodirectunicode}{\pxcz@directunicodefalse}
+\chardef\pxcz@directunicode=0
+\DeclareOption{directunicode*}{\chardef\pxcz@directunicode=2 }
+\DeclareOption{directunicode}{\chardef\pxcz@directunicode=1 }
+\DeclareOption{nodirectunicode}{\chardef\pxcz@directunicode=0 }
% preset spec options
\def\pxcz@all@main@preset{%
noembed,%
@@ -308,29 +309,36 @@
%% \pxcz@unidirect
\let\pxcz@unidirect\@empty
+\let\pxcz@unidirectX\@empty
\let\pxcz@unidirect@wopt\@empty
-\ifpxcz@directunicode
-\def\pxcz@unidirect#116-#2{\pxcz@cmap@directuni}
+\let\pxcz@unidirectX@wopt\@empty
+\ifnum\pxcz@directunicode>\z@
+\def\pxcz@unidirect#1-#2-#3{\pxcz@cmap@directuni}
\def\pxcz@unidirect@wopt{ -w 1}
\fi
+\ifnum\pxcz@directunicode>\@ne
+\let\pxcz@unidirectX\pxcz@unidirect
+\let\pxcz@unidirectX@wopt\pxcz@unidirect@wopt
+\fi
%% \pxcz@addtospec{<id>}
\def\pxcz@addtospec#1{%
\bgroup \let\Entry\pxcz@Entry
\let\ \space \let\*\pxcz@pfx@jis
- \let\UniJIS\pxcz@pfx@unijis
+ \def\UniJIS{\pxcz@unidirectX\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
\ifx\FONT\pxcz@noembed
\let\UniCMap\pxcz@cmap@hwuni
- \let\+\@empty \let\w\@empty
+ \let\+\@empty \let\w\@empty \def\@+{}\let\@w\@empty
\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
\pxcz@switch@realfont
\fi\fi
\ifx\FONT\@empty \expandafter\@gobble
@@ -386,13 +394,13 @@
}
\pxcz@mapentry{UTF}{%
\Entry{mnr}{unijmin-h \UniJIS-UTF16-H \FONTs}%
-\Entry{mnr}{unijmin-v \UniJIS-UTF16-V \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}%
+\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}%
@@ -498,59 +506,59 @@
\fi
}
\pxcz@mapentry{UPSTD}{%
-\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{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}%
+\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{kom}{uphysmjm-h UniKS-UTF16-H \FONT}%
-\Entry{kom}{uphysmjm-v UniKS-UTF16-V \FONT}%
-\Entry{kog}{uphygt-h UniKS-UTF16-H \FONT}%
-\Entry{kog}{uphygt-v UniKS-UTF16-V \FONT}%
-\Entry{scm}{upstsl-h UniGB-UTF16-H \FONT}%
-\Entry{scm}{upstsl-v UniGB-UTF16-V \FONT}%
-\Entry{scg}{upstht-h UniGB-UTF16-H \FONT}%
-\Entry{scg}{upstht-v UniGB-UTF16-V \FONT}%
-\Entry{tcm}{upmsl-h UniCNS-UTF16-H \FONT}%
-\Entry{tcm}{upmsl-v UniCNS-UTF16-V \FONT}%
-\Entry{tcg}{upmhm-h UniCNS-UTF16-H \FONT}%
-\Entry{tcg}{upmhm-v UniCNS-UTF16-V \FONT}%
+\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}%
}
\pxcz@mapentry{UPOTF}{%
-\Entry{mnl}{uphminl-h UniJIS-UTF16-H \FONTs}%
-\Entry{mnl}{uphminl-v UniJIS-UTF16-V \FONTs}%
-\Entry{mnl}{uphminln-h UniJIS2004-UTF16-H \FONTs}%
-\Entry{mnl}{uphminln-v UniJIS2004-UTF16-V \FONTs}%
-\Entry{mnr}{uphminr-h UniJIS-UTF16-H \FONTs}%
-\Entry{mnr}{uphminr-v UniJIS-UTF16-V \FONTs}%
-\Entry{mnr}{uphminrn-h UniJIS2004-UTF16-H \FONTs}%
-\Entry{mnr}{uphminrn-v UniJIS2004-UTF16-V \FONTs}%
-\Entry{mnb}{uphminb-h UniJIS-UTF16-H \FONTs}%
-\Entry{mnb}{uphminb-v UniJIS-UTF16-V \FONTs}%
-\Entry{mnb}{uphminbn-h UniJIS2004-UTF16-H \FONTs}%
-\Entry{mnb}{uphminbn-v UniJIS2004-UTF16-V \FONTs}%
-\Entry{gtr}{uphgothr-h UniJIS-UTF16-H \FONTs}%
-\Entry{gtr}{uphgothr-v UniJIS-UTF16-V \FONTs}%
-\Entry{gtr}{uphgothrn-h UniJIS2004-UTF16-H \FONTs}%
-\Entry{gtr}{uphgothrn-v UniJIS2004-UTF16-V \FONTs}%
-\Entry{gtb}{uphgothb-h UniJIS-UTF16-H \FONTs}%
-\Entry{gtb}{uphgothb-v UniJIS-UTF16-V \FONTs}%
-\Entry{gtb}{uphgothbn-h UniJIS2004-UTF16-H \FONTs}%
-\Entry{gtb}{uphgothbn-v UniJIS2004-UTF16-V \FONTs}%
-\Entry{gtx}{uphgotheb-h UniJIS-UTF16-H \FONTs}%
-\Entry{gtx}{uphgotheb-v UniJIS-UTF16-V \FONTs}%
-\Entry{gtx}{uphgothebn-h UniJIS2004-UTF16-H \FONTs}%
-\Entry{gtx}{uphgothebn-v UniJIS2004-UTF16-V \FONTs}%
-\Entry{mgr}{uphmgothr-h UniJIS-UTF16-H \FONTs}%
-\Entry{mgr}{uphmgothr-v UniJIS-UTF16-V \FONTs}%
-\Entry{mgr}{uphmgothrn-h UniJIS2004-UTF16-H \FONTs}%
-\Entry{mgr}{uphmgothrn-v UniJIS2004-UTF16-V \FONTs}%
+\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
@@ -592,7 +600,7 @@
%% check if \diruni is available
\ifpxcz@uptex
\@ifpackageloaded{otf}{%
- \ifpxcz@directunicode \pxcz@diruni@oktrue \fi
+ \ifnum\pxcz@directunicode>\z@ \pxcz@diruni@oktrue \fi
}{}
\fi
@@ -834,6 +842,18 @@
\expandafter\endcsname\csname pxcz@the@preset@#2\endcsname}
\def\pxcz@decl@preset@alias@a#1#2{\@onlypreamble#1\let#1#2}
+%% \pxcz@declare@depre@preset
+\def\pxcz@declare@depre@preset#1{%
+ \pxcz@declare@deprecated{#1}%
+ \pxcz@declare@preset{#1}}
+%% \pxcz@declare@depre@preset@alias
+\def\pxcz@declare@depre@preset@alias#1{%
+ \pxcz@declare@deprecated{#1}%
+ \pxcz@declare@preset@alias{#1}}
+%% \pxcz@declare@deprecated{<name>}
+\def\pxcz@declare@deprecated#1{%
+ \expandafter\let\csname pxcz@depre@preset@#1\endcsname=t}
+
%% \pxcz@uniweight{<font-mn>}{<font-gt>}
\@onlypreamble\pxcz@uniweight
\def\pxcz@uniweight#1#2{%
@@ -851,6 +871,10 @@
%% \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*,}%
+ \fi
\csname pxcz@the@preset@#1\endcsname}
%%%% definitions of main preset mappings
@@ -950,31 +974,31 @@
{YuMin-Demibold.otf}{YuGo-Medium.otf}{YuGo-Bold.otf}%
{YuGo-Bold.otf}{YuGo-Medium.otf}{YuGo-Medium.otf}}
%(obsolete)
-\pxcz@declare@preset{ipa-otf}{%
+\pxcz@declare@depre@preset{ipa-otf}{%
\pxcz@uniweight{ipam.otf}{ipag.otf}}
-\pxcz@declare@preset{ipa-otf-dx}{%
+\pxcz@declare@depre@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{kozuka4}{%
+\pxcz@declare@depre@preset{kozuka4}{%
\usecmapforalphabet
\pxcz@uniweight{KozMinPro-Regular-Acro.otf}{KozGoPro-Medium-Acro.otf}}
-\pxcz@declare@preset{kozuka6}{%
+\pxcz@declare@depre@preset{kozuka6}{%
\usecmapforalphabet
\pxcz@uniweight{KozMinProVI-Regular.otf}{KozGoProVI-Medium.otf}}
-\pxcz@declare@preset{kozuka6n}{%
+\pxcz@declare@depre@preset{kozuka6n}{%
\usecmapforalphabet
\pxcz@uniweight{KozMinPr6N-Regular.otf}{KozGoPr6N-Medium.otf}}
-\pxcz@declare@preset{hiragino}{%
+\pxcz@declare@depre@preset{hiragino}{%
\usecmapforalphabet
\pxcz@uniweight{HiraMinPro-W3.otf}{HiraKakuPro-W6.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}
+\pxcz@declare@depre@preset@alias{ms-dx}{ms-hg}
+\pxcz@declare@depre@preset@alias{ipa-ttf}{ipa}
+\pxcz@declare@depre@preset@alias{ipa-ttf-dx}{ipa-hg}
+\pxcz@declare@depre@preset@alias{ipav2}{ipa}
+\pxcz@declare@depre@preset@alias{ipav2-dx}{ipa-hg}
+\pxcz@declare@depre@preset@alias{ipa-dx}{ipa-hg}
+\pxcz@declare@depre@preset@alias{hiragino-dx}{hiragino-pro}
\pxcz@declare@preset@alias{noEmbed}{noembed}
\pxcz@declare@preset@alias{kozuka}{kozuka-pro}
\pxcz@declare@preset@alias{hiragino-elcapitan}{hiragino-elcapitan-pro}
diff --git a/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty b/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty
index f2c6a4803ed..7be855cb78b 100644
--- a/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty
+++ b/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty
@@ -8,9 +8,11 @@
%% This package is distributed under the MIT License.
%%
+% TODO: Should 'pxjafont' package be abolished?
+
%%%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxjafont}[2016/01/13 v0.8]
+\ProvidesPackage{pxjafont}[2016/04/08 v0.9]
\let\pxAliasedPxjafont=t
\RequirePackageWithOptions{pxchfon}[2010/05/12]
\endinput