summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-24 21:39:24 +0000
committerKarl Berry <karl@freefriends.org>2017-01-24 21:39:24 +0000
commit999d009f24141c1562b4712c69bd57cb7fd7ad3f (patch)
treea41c54e2761ed7988d5bb2c530f63a78bc29a2f6 /Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
parent86a1f26765430f88d161714db0e3c7b59a6c9d33 (diff)
luatexja (24jan17)
git-svn-id: svn://tug.org/texlive/trunk@43045 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty44
1 files changed, 38 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
index 42528e2cc9f..d6354dd5326 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
@@ -1,5 +1,5 @@
% luatexja-preset.sty
-\ProvidesPackage{luatexja-preset}[2016/01/30 Japanese font presets]
+\ProvidesPackage{luatexja-preset}[2017/01/24 Japanese font presets]
\RequirePackage{expl3,l3keys2e}
\RequirePackage{luatexja}
@@ -170,8 +170,17 @@
\ltjpreset_declare_option:nn{yu-win}{
\ltjpreset_set_multi:n {
YuMincho-Regular , YuMincho-Demibold , % mc/m, mc/bx
- YuGothic-Regular , YuGothic-Bold , % gt/m, gt/bx (multiweight))
- YuGothic-Bold , YuGothic-Bold , % gt/m (uni), gt/eb
+ YuGothic-Regular , YuGothic-Bold , % gt/m, gt/bx (multiweight))
+ YuGothic-Regular , YuGothic-Bold , % gt/m (uni), gt/eb
+ YuGothic-Bold % mg/m
+ }
+}
+% Win10
+\ltjpreset_declare_option:nn{yu-win10}{
+ \ltjpreset_set_multi:n {
+ YuMincho-Regular , YuMincho-Demibold , % mc/m, mc/bx
+ YuGothic-Regular , YuGothic-Bold , % gt/m, gt/bx (multiweight))
+ YuGothic-Medium , YuGothic-Bold , % gt/m (uni), gt/eb
YuGothic-Bold % mg/m
}
}
@@ -182,7 +191,7 @@
\ltjpreset_set_multi:n {
YuMincho~Medium , YuMincho~Demibold , % mc/m, mc/bx
YuGothic~Medium , YuGothic~Bold , % gt/m, gt/bx (multiweight))
- YuGothic~Bold , YuGothic~Bold , % gt/m (uni), gt/eb
+ YuGothic~Medium , YuGothic~Bold , % gt/m (uni), gt/eb
YuGothic~Bold % mg/m
}
}
@@ -191,11 +200,29 @@
\ltjpreset_declare_option:nn{moga-mobo}{
\ltjpreset_set_multi:n {
Moga90Mincho, Moga90Mincho~Bold , % mc/m, mc/bx
- Moga90Gothic, Moga90Gothic~Bold , % gt/m, gt/bx (multiweight))
- Moga90Gothic~Bold, Moga90Gothic~Bold, % gt/m (uni), gt/eb
+ Moga90Gothic, Moga90Gothic~Bold, % gt/m, gt/bx (multiweight))
+ Moga90Gothic, Moga90Gothic~Bold, % gt/m (uni), gt/eb
Mobo90Gothic % mg/m
}
}
+\ltjpreset_declare_option:nn{moga-mobo-ex}{
+ \ltjpreset_set_multi:n {
+ MogaEx90Mincho, MogaEx90Mincho~Bold , % mc/m, mc/bx
+ MogaEx90Gothic, MogaEx90Gothic~Bold, % gt/m, gt/bx (multiweight))
+ MogaEx90Gothic, MogaEx90Gothic~Bold, % gt/m (uni), gt/eb
+ MoboEx90Gothic % mg/m
+ }
+}
+
+% Ume fones
+\ltjpreset_declare_option:nn{ume}{
+ \ltjpreset_set_multi:n {
+ Ume~Mincho, Ume~Mincho,
+ Ume~Gothic, Ume~Gothic~O5,
+ Ume~Gothic~O5, Ume~Gothic~O5,
+ Ume~Gothic~O4
+ }
+}
% ipa, ipaex, ms
@@ -255,6 +282,11 @@
\tl_remove_all:Nn \l_ltjpreset_font_list {90}
\tl_clear:N \l_ltjpreset_kanji_shape_tl
}
+ \clist_if_in:NnT \l_ltjpreset_font_list { MogaEx90Mincho }
+ {
+ \tl_remove_all:Nn \l_ltjpreset_font_list {90}
+ \tl_clear:N \l_ltjpreset_kanji_shape_tl
+ }
}{
\tl_set:Nn \l_tmpa_tl {, CJKShape=JIS1990 }
\tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {