diff options
author | Karl Berry <karl@freefriends.org> | 2019-01-23 21:25:01 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-01-23 21:25:01 +0000 |
commit | ed60ba6a1ec160e6ce7abe75fa93a3127c7dc422 (patch) | |
tree | b8314a1b572edeb445d136019e6691eb7c0cee5d /Master/texmf-dist/tex/platex | |
parent | 8054198bc94efb96254d64cfb5a93191875459c2 (diff) |
pxchfon (23jan19)
git-svn-id: svn://tug.org/texlive/trunk@49799 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/platex')
-rw-r--r-- | Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty | 77 | ||||
-rw-r--r-- | Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty | 4 |
2 files changed, 27 insertions, 54 deletions
diff --git a/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty b/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty index 669191bda47..cd13b42101e 100644 --- a/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty +++ b/Master/texmf-dist/tex/platex/pxchfon/pxchfon.sty @@ -1,7 +1,7 @@ %% %% This is file 'pxchfon.sty'. %% -%% Copyright (c) 2018 Takayuki YATO (aka. "ZR") +%% Copyright (c) 2019 Takayuki YATO (aka. "ZR") %% GitHub: https://github.com/zr-tex8r %% Twitter: @zr_tex8r %% @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{pxchfon}[2018/03/15 v1.2] +\ProvidesPackage{pxchfon}[2019/01/21 v1.2b] \def\pxcz@pkgname{pxchfon} %% preparations @@ -184,25 +184,29 @@ \DeclareOption{suppress-legacycode}{\let\pxcz@legacycode\pxcz@legacycode@suppress} \DeclareOption{replace-legacycode}{\let\pxcz@legacycode\pxcz@legacycode@replace} % preset spec options -\def\pxcz@all@main@preset{% +\pxcz@onlypreamble@def\pxcz@all@main@preset{% noembed,% %(uniweight) ms,ipa,ipaex,% %(multiweight) - ms-hg,ipa-hg,ipaex-hg,moga-mobo,moga-mobo-ex,moga-maruberi,% + ms-hg,ipa-hg,ipaex-hg,moga-mobo,moga-mobo-ex,moga-maruberi,ume,% 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-win10+,yu-osx,% sourcehan-otc,sourcehan,noto-otc,noto,% - %(obsolete) - ipa-otf,ipa-otf-dx,kozuka4,kozuka6,kozuka6n,hiragino,% + sourcehan-otc+,sourcehan+,noto-otc+,noto+,% %(alias) - ms-dx,ipa-ttf,ipa-ttf-dx,ipav2,ipav2-dx,ipa-dx,hiragino-dx,% + hiragino,% noEmbed,kozuka,hiragino-elcapitan,morisawa} +\pxcz@onlypreamble@def\pxcz@all@abolished@preset{% + ipa-otf,ipa-otf-dx,kozuka4,kozuka6,kozuka6n, + ms-dx,ipa-ttf,ipa-ttf-dx,ipav2,ipav2-dx,ipa-dx,hiragino-dx} % But note, 'hiragino' != 'hiragino-pro' \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}} +\@for\pxcz@x:=\pxcz@all@abolished@preset\do{% + \expandafter\pxcz@do\expandafter{\pxcz@x}} % others % The 'unicode' option means a Unicode-oriented mapping, and requires % dvipdfmx of version 20170627 or later. The 'unicode-fwid' is a variant. @@ -1549,19 +1553,13 @@ \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 -\@onlypreamble\pxcz@declare@depre@preset -\def\pxcz@declare@depre@preset#1{% - \pxcz@declare@deprecated{#1}% - \pxcz@declare@preset{#1}} -%% \pxcz@declare@depre@preset@alias -\@onlypreamble\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@abolished@preset +\pxcz@onlypreamble@def\pxcz@abolished@preset{% + \PackageError\pxcz@pkgname + {The old preset '\pxcz@main@preset' is *abolished*}{\@ehc}% + \pxcz@uniweight{ERROR.ttf}{ERROR.ttf}} +\@for\pxcz@x:=\pxcz@all@abolished@preset\do{% + \pxcz@onlypreamble@csdef{pxcz@the@preset@\pxcz@x}{\pxcz@abolished@preset}} %% \pxcz@uniweight{<font-mn>}{<font-gt>} \@onlypreamble\pxcz@uniweight @@ -1579,11 +1577,7 @@ \fi} %% \pxcz@use@preset{<name>} -\def\pxcz@use@preset#1{% - \expandafter\ifx\csname pxcz@depre@preset@#1\endcsname t% - \pxcz@error{The old preset '#1' is *abolished*} - {\@ehc}% - \fi +\pxcz@onlypreamble@def\pxcz@use@preset#1{% \csname pxcz@the@preset@#1\endcsname} %% definitions of main preset mappings @@ -1615,6 +1609,9 @@ \pxcz@declare@preset{moga-maruberi}{% \pxcz@multiweight{:0:mogam.ttc}{:0:mogam.ttc}{:0:mogamb.ttc}% {:0:mogag.ttc}{:0:mogagb.ttc}{:0:mogagb.ttc}{:0:mogag.ttc}{MTLmr3m.ttf}} +\pxcz@declare@preset{ume}{% + \pxcz@multiweight{ume-tmo3.ttf}{ume-tmo3.ttf}{ume-tmo3.ttf}% + {ume-tgo4.ttf}{ume-tgo5.ttf}{ume-tgo5.ttf}{ume-tgo5.ttf}{ume-tgo4.ttf}} \pxcz@declare@preset{kozuka-pro}{% \usecmapforalphabet \pxcz@multiweight{KozMinPro-Light.otf}{KozMinPro-Regular.otf}% @@ -1655,13 +1652,13 @@ \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}} + {A-OTF-GothicBBBPro-Medium.otf}{A-OTF-Jun101Pro-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}} + {A-OTF-GothicBBBPr6N-Medium.otf}{A-OTF-Jun101Pro-Light.otf}} \pxcz@declare@preset{yu-win}{% \pxcz@multiweight{yuminl.ttf}{yumin.ttf}% {yumindb.ttf}{yugothic.ttf}{yugothib.ttf}% @@ -1703,32 +1700,8 @@ {NotoSansCJKjp-Regular.otf}{NotoSansCJKjp-Bold.otf}% {NotoSansCJKjp-Black.otf}{NotoSansCJKjp-Medium.otf}% {NotoSansCJKjp-Medium.otf}} -%(obsolete) -\pxcz@declare@depre@preset{ipa-otf}{% - \pxcz@uniweight{ipam.otf}{ipag.otf}} -\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@depre@preset{kozuka4}{% - \usecmapforalphabet - \pxcz@uniweight{KozMinPro-Regular-Acro.otf}{KozGoPro-Medium-Acro.otf}} -\pxcz@declare@depre@preset{kozuka6}{% - \usecmapforalphabet - \pxcz@uniweight{KozMinProVI-Regular.otf}{KozGoProVI-Medium.otf}} -\pxcz@declare@depre@preset{kozuka6n}{% - \usecmapforalphabet - \pxcz@uniweight{KozMinPr6N-Regular.otf}{KozGoPr6N-Medium.otf}} -\pxcz@declare@depre@preset{hiragino}{% - \usecmapforalphabet - \pxcz@uniweight{HiraMinPro-W3.otf}{HiraKakuPro-W6.otf}} %(alias) -\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{hiragino}{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 e4d70996d42..ad79f5bcbdb 100644 --- a/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty +++ b/Master/texmf-dist/tex/platex/pxchfon/pxjafont.sty @@ -1,7 +1,7 @@ %% %% This is file 'pxjafont.sty'. %% -%% Copyright (c) 2017 Takayuki YATO (aka. "ZR") +%% Copyright (c) 2019 Takayuki YATO (aka. "ZR") %% GitHub: https://github.com/zr-tex8r %% Twitter: @zr_tex8r %% @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{pLaTeX2e} -\ProvidesPackage{pxjafont}[2017/10/04 v1.1b] +\ProvidesPackage{pxjafont} %% show warning \PackageWarning{pxchfon} {!!!!!!!!!!!! IMPORTANT WARNING !!!!!!!!!!!!\MessageBreak |