summaryrefslogtreecommitdiff
path: root/language/japanese/zxjafont/zxjafont.sty
diff options
context:
space:
mode:
Diffstat (limited to 'language/japanese/zxjafont/zxjafont.sty')
-rw-r--r--language/japanese/zxjafont/zxjafont.sty50
1 files changed, 39 insertions, 11 deletions
diff --git a/language/japanese/zxjafont/zxjafont.sty b/language/japanese/zxjafont/zxjafont.sty
index 60327c52f5..7c297fd291 100644
--- a/language/japanese/zxjafont/zxjafont.sty
+++ b/language/japanese/zxjafont/zxjafont.sty
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{zxjafont}[2020/02/15 v1.1a]
+\ProvidesPackage{zxjafont}[2020/02/24 v1.2]
\def\zxjf@pkgname{zxjafont}
%% preparation
@@ -90,6 +90,7 @@
\let\zxjf@feature\@empty
\let\zxjf@jatype\zxjf@jatype@@none
\newif\ifzxjf@ignore@jatype
+\newif\ifzxjf@expert
%% default for 'threeweight'
\ifzxjf@fontspec@mw
@@ -98,13 +99,15 @@
%% \zxjf@all@main@preset
\zxjf@onlypreamble@def\zxjf@all@main@preset{%
+ nopreset,noembed,%
%(uniweight)
ms,ipa,ipaex,%
%(multiweight)
- ms-hg,ipa-hg,ipaex-hg,moga,moga-90,ume,%
+ ms-hg,ipa-hg,ipaex-hg,moga,moga-90,mogaN-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,haranoaji,%
+ moga-mobo,moga-mobo-ex,%
%(alias)
kozuka,morisawa,moga-mobo-ex,noto-otf,hiragino}
@@ -143,9 +146,12 @@
% 'ignorejatype'
\DeclareOption{ignorejatype}{\zxjf@ignore@jatypetrue}
\DeclareOption{noignorejatype}{\zxjf@ignore@jatypefalse}
+% 'expert'
+\DeclareOption{expert}{\zxjf@experttrue}
% dummy options for compatibility with luatexja-preset
\DeclareOption{match}{}% xeCJK always work as 'match' is on
-\DeclareOption{expert}{\zxjf@warn@niopt{expert}}
+\DeclareOption{fontspec}{}% always on
+\DeclareOption{nfssonly}{\zxjf@warn@niopt{nfssonly}}
% abolished presets
\zxjf@onlypreamble@def\zxjf@err@abpre#1{%
@@ -231,6 +237,9 @@
\or ,CJKShape=JIS1990% 90jis
\or ,CJKShape=JIS2004% jis2004
\fi
+ \ifzxjf@expert
+ ,Style=HorizontalKana%
+ \fi
\ifdefined\zxjafontFeature
,\expandonce\zxjafontFeature
\fi
@@ -366,6 +375,12 @@
\zxjf@do}
%% definitions of main preset mappings
+\zxjf@declare@preset{nopreset}{}
+\zxjf@declare@preset{noembed}{%
+ \PackageWarningNoLine\zxjf@pkgname
+ {Preset 'noembed' is not supported, because\MessageBreak
+ XeTeX does not support non-embedded fonts,\MessageBreak
+ fallback to preset 'nopreset'}}
\zxjf@declare@preset{ms}{%
\zxjf@uniweight{MS-Mincho}{MS-Gothic}{}}
\zxjf@declare@preset{ms/prop}{%
@@ -397,11 +412,21 @@
{HGSGothicM}{HGSGothicE}{hgrsgu.ttc}{\zxjf@Fb}{}}
\zxjf@declare@preproc@alias{ipaex-hg}{ipaex}
\zxjf@declare@preset{moga}{%
- \zxjf@multiweight{MogaExMincho}{MogaExMincho}{MogaExMincho Bold}%
- {MogaExGothic}{MogaExGothic Bold}{MogaExGothic Bold}{MogaExGothic}{}}
-\zxjf@declare@preset{moga-90}{%
- \zxjf@multiweight{MogaEx90Mincho}{MogaEx90Mincho}{MogaEx90Mincho Bold}%
- {MogaEx90Gothic}{MogaEx90Gothic Bold}{MogaEx90Gothic Bold}{MogaEx90Gothic}{}}
+ \zxjf@multiweight{MogaEx\zxjf@Fa Mincho}{MogaEx\zxjf@Fa Mincho}%
+ {MogaEx\zxjf@Fa Mincho Bold}{MogaEx\zxjf@Fa Gothic}%
+ {MogaEx\zxjf@Fa Gothic Bold}{MogaEx\zxjf@Fa Gothic Bold}%
+ {MogaEx\zxjf@Fa Gothic}{}}
+\zxjf@declare@preset@alias{moga-90}{moga}
+\zxjf@declare@preset{mogaN-90}{%
+ \zxjf@multiweight{Moga\zxjf@Fa Mincho}{Moga\zxjf@Fa Mincho}%
+ {Moga\zxjf@Fa Mincho Bold}{Moga\zxjf@Fa Gothic}%
+ {Moga\zxjf@Fa Gothic Bold}{Moga\zxjf@Fa Gothic Bold}%
+ {Moga\zxjf@Fa Gothic}{}}
+\zxjf@declare@preproc{moga}{%
+ \edef\zxjf@Fa{\ifcase\zxjf@cjkshape \or 90\or \fi}}
+\zxjf@declare@preproc{moga-90}{%
+ \edef\zxjf@Fa{\ifcase\zxjf@cjkshape 90\or 90\or \fi}}
+\zxjf@declare@preproc@alias{mogaN-90}{moga-90}
\zxjf@declare@preset{ume}{%
\zxjf@multiweight{Ume Mincho}{Ume Mincho}{Ume Mincho}%
{Ume Gothic}{Ume Gothic O5}{Ume Gothic O5}{Ume Gothic O5}{}}
@@ -471,7 +496,10 @@
%(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{moga-mobo-ex}{moga-90}
+\zxjf@declare@preproc@alias{moga-mobo-ex}{moga-90}
+\zxjf@declare@preset@alias{moga-mobo}{mogaN-90}
+\zxjf@declare@preproc@alias{moga-mobo}{mogaN-90}
\zxjf@declare@preset@alias@with@prop{noto-otf}{noto}
\zxjf@declare@preset@alias@with@prop{hiragino}{hiragino-pro}
@@ -523,7 +551,7 @@
\ifzxjf@threeweight
%%<*> \ltdefault/\ltseries
- \def\ltdefault{l}
+ \providecommand*\ltdefault{l}
\DeclareRobustCommand\ltseries{%
\not@math@alphabet\ltseries\relax
% \fontseries{\ltdefault} fails on New NFSS
@@ -531,7 +559,7 @@
\edef\f@series{\ltdefault}\selectfont
}
%%<*> \ebdefault/\ebseries
- \def\ebdefault{eb}
+ \providecommand*\ebdefault{eb}
\DeclareRobustCommand\ebseries{%
\not@math@alphabet\ebseries\relax
\edef\f@series{\ebdefault}\selectfont