From 54bd17db5b455409d7e0466642ea6f9a7ea5ecc5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 12 Jan 2020 21:39:47 +0000 Subject: zxjafont (12jan20) git-svn-id: svn://tug.org/texlive/trunk@53380 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/zxjafont/zxjafont.sty | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'Master/texmf-dist/tex/latex/zxjafont') diff --git a/Master/texmf-dist/tex/latex/zxjafont/zxjafont.sty b/Master/texmf-dist/tex/latex/zxjafont/zxjafont.sty index 4ba6b6a64a0..3966a5929b2 100644 --- a/Master/texmf-dist/tex/latex/zxjafont/zxjafont.sty +++ b/Master/texmf-dist/tex/latex/zxjafont/zxjafont.sty @@ -1,7 +1,7 @@ %% %% This is file 'zxjafont.sty'. %% -%% Copyright (c) 2018 Takayuki YATO (aka. "ZR") +%% Copyright (c) 2009-2020 Takayuki YATO (aka. "ZR") %% GitHub: https://github.com/zr-tex8r %% Twitter: @zr_tex8r %% @@ -10,7 +10,7 @@ %% package declaration \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{zxjafont}[2019/06/29 v0.5] +\ProvidesPackage{zxjafont}[2020/01/12 v0.6] \def\zxjf@pkgname{zxjafont} %% preparation @@ -54,9 +54,9 @@ 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,% + sourcehan,sourcehan-jp,noto,noto-jp,haranoaji,% %(alias) - kozuka,morisawa,moga-mobo-ex,noto-otf} + kozuka,morisawa,moga-mobo-ex,noto-otf,hiragino} %% \zxjf@main@sub@preset \def\zxjf@all@sub@preset{% @@ -90,7 +90,7 @@ \PackageError\zxjf@pkgname {The old preset '#1' is *abolished*}{\@ehc}} \@for\zxjf@x:={% - kozuka4,kozuka6,kozuka6n,hiragino,ms-dx,ipa-dx,hiragino-dx% + kozuka4,kozuka6,kozuka6n,ms-dx,ipa-dx,hiragino-dx% }\do{\DeclareOption{\zxjf@x}{\zxjf@err@abpre{\CurrentOption}}} %% options using keyval @@ -362,11 +362,16 @@ \zxjf@multiweight@opt{NotoSerifJP-Regular}{NotoSerifJP-Bold}% {NotoSansJP-Regular}{NotoSansJP-Bold}% {NotoSansJP-Medium}} +\zxjf@declare@preset@with@prop{haranoaji}{% + \zxjf@multiweight@opt{HaranoAjiMincho-Regular}{HaranoAjiMincho-Bold}% + {HaranoAjiGothic-Regular}{HaranoAjiGothic-Bold}% + {HaranoAjiGothic-Medium}} %(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-ex}{moga} \zxjf@declare@preset@alias{noto-otf}{noto} +\zxjf@declare@preset@alias{hiragino}{hiragino-pro} %% definitions of sub preset mappings \zxjf@declare@preset{hg}{% -- cgit v1.2.3