zxjafont (2jul19)

git-svn-id: svn://tug.org/texlive/trunk@51531 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 24 insertions, 50 deletions

diff --git a/Master/texmf-dist/tex/latex/zxjafont/zxjafont.sty b/Master/texmf-dist/tex/latex/zxjafont/zxjafont.sty
index d935bc8309c..4ba6b6a64a0 100644
--- a/Master/texmf-dist/tex/latex/zxjafont/zxjafont.sty
+++ b/Master/texmf-dist/tex/latex/zxjafont/zxjafont.sty
@@ -10,7 +10,7 @@
 
 %% package declaration
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{zxjafont}[2018/05/03 v0.4-pre]
+\ProvidesPackage{zxjafont}[2019/06/29 v0.5]
 \def\zxjf@pkgname{zxjafont}
 
 %% preparation
@@ -48,13 +48,15 @@
 
 %% \zxjf@main@preset
 \def\zxjf@all@main@preset{%
+  %(uniweight)
   ms,ipa,ipaex,%
+  %(multiweight)
   ms-hg,ipa-hg,ipaex-hg,moga,moga-90,ume,%
   kozuka-pro,kozuka-pr6,kozuka-pr6n,hiragino-pro,hiragino-pron,%
   morisawa-pro,morisawa-pr6n,yu-win,yu-win10,yu-osx,%
   sourcehan,sourcehan-jp,noto,noto-jp,%
-  kozuka4,kozuka6,kozuka6n,hiragino,%
-  ms-dx,ipa-dx,hiragino-dx,moga-mobo}
+  %(alias)
+  kozuka,morisawa,moga-mobo-ex,noto-otf}
 
 %% \zxjf@main@sub@preset
 \def\zxjf@all@sub@preset{%
@@ -72,11 +74,24 @@
   \edef\zxjf@sub@preset{\zxjf@sub@preset#1,}}
 % 'prop'
 \DeclareOption{prop}{\zxjf@proptrue}
+\DeclareOption{noprop}{\zxjf@propfalse}
 % 'oneweight'
 \DeclareOption{oneweight}{\zxjf@oneweighttrue}
+\DeclareOption{nooneweight}{\zxjf@oneweightfalse}
 % '90jis'/'jis2004'
+\DeclareOption{jis90}{\let\zxjf@cjkshape\zxjf@cjkshape@@xc}
 \DeclareOption{90jis}{\let\zxjf@cjkshape\zxjf@cjkshape@@xc}
 \DeclareOption{jis2004}{\let\zxjf@cjkshape\zxjf@cjkshape@@mmiv}
+\DeclareOption{2004jis}{\let\zxjf@cjkshape\zxjf@cjkshape@@mmiv}
+
+% abolished presets
+\@onlypreamble\zxjf@err@abpre
+\def\zxjf@err@abpre#1{%
+  \PackageError\zxjf@pkgname
+   {The old preset '#1' is *abolished*}{\@ehc}}
+\@for\zxjf@x:={%
+  kozuka4,kozuka6,kozuka6n,hiragino,ms-dx,ipa-dx,hiragino-dx%
+}\do{\DeclareOption{\zxjf@x}{\zxjf@err@abpre{\CurrentOption}}}
 
 %% options using keyval
 \DeclareOption*{\def\zxjf@nxt{\setkeys{zxjf}}%
@@ -203,7 +218,7 @@
 %% \zxjf@declare@preset@with@prop{<name>}{<text>}
 \def\zxjf@declare@preset@with@prop#1#2{%
   \zxjf@declare@preset{#1}{#2{RawFeature=-palt;-kern}}%
-  \zxjf@declare@preset{#1/prop}{#2{RawFeature=+palt;+Wkern}}}
+  \zxjf@declare@preset{#1/prop}{#2{RawFeature=+palt;+kern}}}
 
 %% \zxjf@declare@preset@alias{<name1>}{<name2>}
 \def\zxjf@declare@preset@alias#1#2{%
@@ -242,10 +257,10 @@
   \zxjf@multiweight{IPAPMincho}{HGPMinchoE}%
     {HGPGothicM}{HGGothicE}{IPAPGothic}}
 \zxjf@declare@preset{ipaex}{%
-  \zxjf@uniweight{IPAexMincho}{IPAexGothic}}
+  \zxjf@uniweight{ipaexm.ttf}{ipaexg.ttf}}
 \zxjf@declare@preset{ipaex-hg}{%
-  \zxjf@multiweight{IPAexMincho}{HGSMinchoE}%
-    {HGSGothicM}{HGSGothicE}{IPAexGothic}}
+  \zxjf@multiweight{ipaexm.ttf}{HGSMinchoE}%
+    {HGSGothicM}{HGSGothicE}{ipaexg.ttf}}
 \zxjf@declare@preset{moga}{%
   \zxjf@multiweight{MogaExMincho}{MogaExMincho Bold}%
     {MogaExGothic}{MogaExGothic Bold}{MogaExGothic}}
@@ -347,42 +362,11 @@
   \zxjf@multiweight@opt{NotoSerifJP-Regular}{NotoSerifJP-Bold}%
     {NotoSansJP-Regular}{NotoSansJP-Bold}%
     {NotoSansJP-Medium}}
-%(obsolete)
-\zxjf@declare@preset{kozuka4}{%
-  \zxjf@uniweight@opt{Kozuka Mincho Pro}{Kozuka Gothic Pro}%
-    {RawFeature=-palt;-kern}}
-\zxjf@declare@preset{kozuka4/prop}{%
-  \zxjf@uniweight@opt{Kozuka Mincho Pro}{Kozuka Gothic Pro}%
-    {RawFeature=+palt;+kern}}
-\zxjf@declare@preset{kozuka6}{%
-  \zxjf@uniweight@opt{Kozuka Mincho Pro-VI}{Kozuka Gothic Pro-VI}%
-    {RawFeature=-palt;-kern}}
-\zxjf@declare@preset{kozuka6/prop}{%
-  \zxjf@uniweight@opt{Kozuka Mincho Pro-VI}{Kozuka Gothic Pro-VI}%
-    {RawFeature=+palt;+kern}}
-\zxjf@declare@preset{kozuka6n}{%
-  \zxjf@uniweight@opt{Kozuka Mincho Pr6N}{Kozuka Gothic Pr6N}%
-    {RawFeature=-palt;-kern}}
-\zxjf@declare@preset{kozuka6n/prop}{%
-  \zxjf@uniweight@opt{Kozuka Mincho Pr6N}{Kozuka Gothic Pr6N}%
-    {RawFeature=+palt;+kern}}
-\zxjf@declare@preset{hiragino}{%
-  \zxjf@uniweight@opt{Hiragino Mincho Pro W3}{Hiragino Kaku Gothic Pro W6}%
-    {RawFeature=-palt;-kern}}
-\zxjf@declare@preset{hiragino/prop}{%
-  \zxjf@uniweight@opt{Hiragino Mincho Pro W3}{Hiragino Kaku Gothic Pro W6}%
-    {RawFeature=+palt;+kern}}
 %(alias)
 \zxjf@declare@preset@alias@with@prop{kozuka}{kozuka-pro}
 \zxjf@declare@preset@alias@with@prop{morisawa}{morisawa-pro}
-\zxjf@declare@preset@alias{moga-mobo}{moga}
-%(alias-obsolete)
-\zxjf@declare@preset@alias{ms-dx}{ms-hg}
-\zxjf@declare@preset@alias{ms-dx/prop}{ms-hg/prop}
-\zxjf@declare@preset@alias{ipa-dx}{ipa-hg}
-\zxjf@declare@preset@alias{ipa-dx/prop}{ipa-hg/prop}
-\zxjf@declare@preset@alias{hiragino-dx}{hiragino-pro}
-\zxjf@declare@preset@alias{hiragino-dx/prop}{hiragino-pro/prop}
+\zxjf@declare@preset@alias{moga-mobo-ex}{moga}
+\zxjf@declare@preset@alias{noto-otf}{noto}
 
 %% definitions of sub preset mappings
 \zxjf@declare@preset{hg}{%
@@ -425,16 +409,6 @@
 \zxjf@declare@preset{maruberi}{%
   \zxjf@newfamily{mmg}{}{MotoyaLMaru}}
 
-%% warn for deprecated presets
-\@for\zxjf@x:={%
-  kozuka4,kozuka6,kozuka6n,hiragino,ms-dx,ipa-dx,hiragino-dx%
-}\do{%
-  \ifx\zxjf@x\zxjf@main@preset
-    \PackageWarningNoLine\zxjf@pkgname
-     {Old preset '\zxjf@x' is deprecated\MessageBreak
-      (see the manual for detail)}%
-  \fi}
-
 %% ... and invokes the specified one!
 \zxjf@use@preset{\zxjf@main@preset}
 \@for\zxjf@x:=\zxjf@sub@preset\do{\zxjf@use@preset\zxjf@x}