summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-22 22:35:14 +0000
committerKarl Berry <karl@freefriends.org>2017-01-22 22:35:14 +0000
commitb1eb6bba5161466e7401c67959dd5a849e500e9a (patch)
tree392684c46924224653af4dc15b507a911539c41c /Master/texmf-dist/tex
parent4c6b58ab43e9ecce8fea120a3c918f0e7c1a10d8 (diff)
pxchfon (22jan17)
git-svn-id: svn://tug.org/texlive/trunk@43018 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty111
-rw-r--r--Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty15
2 files changed, 83 insertions, 43 deletions
diff --git a/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty b/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
index c22984d33c0..dc69ce9fee3 100644
--- a/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
+++ b/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty
@@ -1,10 +1,16 @@
-%
-% pxchfon.sty
-%
+%%
+%% This is file 'pxchfon.sty'.
+%%
+%% Copyright (c) 2017 Takayuki YATO (aka. "ZR")
+%% GitHub: https://github.com/zr-tex8r
+%% Twitter: @zr_tex8r
+%%
+%% This package is distributed under the MIT License.
+%%
%%%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxchfon}[2015/10/14 v0.7h]
+\ProvidesPackage{pxchfon}[2017/01/13 v0.8]
\def\pxcz@pkgname{pxchfon}
%%%% definitions
@@ -62,7 +68,7 @@
%(uniweight)
ms,ipa,ipaex,%
%(multiweight)
- ms-hg,ipa-hg,ipaex-hg,moga-mobo,moga-maruberi,%
+ ms-hg,ipa-hg,ipaex-hg,moga-mobo,moga-mobo-ex,moga-maruberi,%
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,%
@@ -83,12 +89,17 @@
\ifx\pxcz@x\relax \@unknownoptionerror
\else \let\pxcz@file@preset\pxcz@x \fi}
\let\pxcz@file@preset\relax
+\newif\ifpxcz@file@preset@tl
\def\pxcz@popt{%
\futurelet\pxcz@tok\pxcz@popt@a}
\def\pxcz@popt@a{%
- \ifx+\pxcz@tok \expandafter\pxcz@popt@b
- \else \expandafter\remove@to@nnil \fi}
-\def\pxcz@popt@b+#1\@nnil{\edef\pxcz@x{#1}}
+ \let\pxcz@tmpa\remove@to@nnil
+ \ifx+\pxcz@tok
+ \pxcz@file@preset@tltrue \let\pxcz@tmpa\pxcz@popt@b
+ \else\ifx*\pxcz@tok
+ \pxcz@file@preset@tlfalse \let\pxcz@tmpa\pxcz@popt@b
+ \fi\fi \pxcz@tmpa}
+\def\pxcz@popt@b#1#2\@nnil{\edef\pxcz@x{#2}}
% dispatch
\ProcessOptions*
% 'everypage' needs 'atbegshi' package
@@ -225,11 +236,11 @@
}
\pxcz@do{mnl,mnr,mnb}{Ryumin-Light}
\pxcz@do{gtr,gtb,gtx,gtu,mgr}{GothicBBB-Medium}
-\pxcz@do{kom}{HYSMyeongJoStd-Medium}
+\pxcz@do{kom}{HYSMyeongJo-Medium}
\pxcz@do{kog}{HYGoThic-Medium}
-\pxcz@do{scm}{STSongStd-Light}
+\pxcz@do{scm}{STSong-Light}
\pxcz@do{scg}{STHeiti-Regular}
-\pxcz@do{tcm}{MSungStd-Light}
+\pxcz@do{tcm}{MSung-Light}
\pxcz@do{tcg}{MHei-Medium}
%%<+> \JaFontReplacementFor{<sym>}
@@ -293,7 +304,7 @@
%% \pxcz@MI
% NB: not \edef
-\def\pxcz@MI{\ifpxcz@mmivjis:0:\else:3:\fi}
+\def\pxcz@MI#1#2:{\ifpxcz@mmivjis:#1:\else:#2:\fi}
%% \pxcz@unidirect
\let\pxcz@unidirect\@empty
@@ -331,13 +342,16 @@
%% \pxcz@do@file@preset
\def\pxcz@do@file@preset{%
- \pxcz@do@file@preset@a{ptex-}%
- \ifpxcz@uptex \pxcz@do@file@preset@a{uptex-}\fi
- \ifpxcz@otf
- \pxcz@do@file@preset@a{otf-}%
- \ifpxcz@uptex \pxcz@do@file@preset@a{otf-up-}\fi
+ \ifpxcz@file@preset@tl
+ \pxcz@do@file@preset@a{ptex-}%
+ \ifpxcz@uptex \pxcz@do@file@preset@a{uptex-}\fi
+ \ifpxcz@otf
+ \pxcz@do@file@preset@a{otf-}%
+ \ifpxcz@uptex \pxcz@do@file@preset@a{otf-up-}\fi
+ \fi
+ \else
+ \pxcz@do@file@preset@a{}%
\fi}
-
\def\pxcz@do@file@preset@a#1{%
\pxcz@addtospec@alt\pxcz@mapfile{#1\pxcz@file@preset.map}}
@@ -509,20 +523,34 @@
\Entry{tcg}{upmhm-v UniCNS-UTF16-V \FONT}%
}
\pxcz@mapentry{UPOTF}{%
-\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}%
+\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}%
}
% for 'PXOTF'
\@onlypreamble\pxcz@entry@pxotf
@@ -652,7 +680,7 @@
\pxcz@err@diruni
}
\def\pxcz@err@diruni{%
- \pxcz@error{Command '\string\diruni' not availble}%
+ \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
@@ -848,14 +876,19 @@
{:0:hgrgm.ttc}{:0:hgrge.ttc}{:0:hgrsgu.ttc}{ipaexg.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@multiweight{\pxcz@MI03:mogam.ttc}{\pxcz@MI03:mogam.ttc}%
+ {\pxcz@MI03:mogamb.ttc}{\pxcz@MI02:mogag.ttc}{\pxcz@MI02:mogagb.ttc}%
+ {\pxcz@MI02:mogagb.ttc}{\pxcz@MI02:mogag.ttc}{\pxcz@MI02:mobog.ttc}}
+\pxcz@declare@preset{moga-mobo-ex}{%
+ \pxcz@enable@switch@realfont
+ \pxcz@multiweight{\pxcz@MI14:mogam.ttc}{\pxcz@MI14:mogam.ttc}%
+ {\pxcz@MI14:mogamb.ttc}{\pxcz@MI13:mogag.ttc}{\pxcz@MI13:mogagb.ttc}%
+ {\pxcz@MI13:mogagb.ttc}{\pxcz@MI13:mogag.ttc}{\pxcz@MI13: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@multiweight{\pxcz@MI03:mogam.ttc}{\pxcz@MI03:mogam.ttc}%
+ {\pxcz@MI03:mogamb.ttc}{\pxcz@MI02:mogag.ttc}{\pxcz@MI02:mogagb.ttc}%
+ {\pxcz@MI02:mogagb.ttc}{\pxcz@MI02:mogag.ttc}{MTLmr3m.ttf}}
\pxcz@declare@preset{kozuka-pro}{%
\usecmapforalphabet
\pxcz@multiweight{KozMinPro-Light.otf}{KozMinPro-Regular.otf}%
diff --git a/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty b/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty
index 2119a43440f..f2c6a4803ed 100644
--- a/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty
+++ b/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty
@@ -1,9 +1,16 @@
-%
-% pxjafont.sty
-%
+%%
+%% This is file 'pxjafont.sty'.
+%%
+%% Copyright (c) 2017 Takayuki YATO (aka. "ZR")
+%% GitHub: https://github.com/zr-tex8r
+%% Twitter: @zr_tex8r
+%%
+%% This package is distributed under the MIT License.
+%%
+
%%%% package declaration
\NeedsTeXFormat{pLaTeX2e}
-\ProvidesPackage{pxjafont}[2010/05/12 v0.5]
+\ProvidesPackage{pxjafont}[2016/01/13 v0.8]
\let\pxAliasedPxjafont=t
\RequirePackageWithOptions{pxchfon}[2010/05/12]
\endinput