diff options
Diffstat (limited to 'macros/luatex/generic/luatexja/src/addons/luatexja-preset.sty')
-rw-r--r-- | macros/luatex/generic/luatexja/src/addons/luatexja-preset.sty | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/macros/luatex/generic/luatexja/src/addons/luatexja-preset.sty b/macros/luatex/generic/luatexja/src/addons/luatexja-preset.sty index b64f7887ef..58a585768a 100644 --- a/macros/luatex/generic/luatexja/src/addons/luatexja-preset.sty +++ b/macros/luatex/generic/luatexja/src/addons/luatexja-preset.sty @@ -1,5 +1,5 @@ % luatexja-preset.sty -\ProvidesPackage{luatexja-preset}[2020/03/27 Japanese font presets] +\ProvidesPackage{luatexja-preset}[2020-05-15 Japanese font presets] \RequirePackage{expl3,l3keys2e} \RequirePackage{luatexja} @@ -278,7 +278,7 @@ gt-b = Source~Han~Sans~Bold, gt-u = Source~Han~Sans~Medium, gt-eb = Source~Han~Sans~Heavy, - mg-m = Source~Han~Sans~Heavy, + mg-m = Source~Han~Sans~Medium, mc-l = Source~Han~Serif~Light, __custom = false, __office = false, __noembed = false, } @@ -289,7 +289,7 @@ gt-b = Source~Han~Sans~JP~Bold, gt-u = Source~Han~Sans~JP~Medium, gt-eb = Source~Han~Sans~JP~Heavy, - mg-m = Source~Han~Sans~JP~Heavy, + mg-m = Source~Han~Sans~JP~Medium, mc-l = Source~Han~Serif~JP~Light, __custom = false, __office = false, __noembed = false, } @@ -300,7 +300,7 @@ gt-b = Noto~Sans~CJK~Bold, gt-u = Noto~Sans~CJK~Medium, gt-eb = Noto~Sans~CJK~Black, - mg-m = Noto~Sans~CJK~Black, + mg-m = Noto~Sans~CJK~Medium, mc-l = Noto~Serif~CJK~Light, __custom = false, __office = false, __noembed = false, } @@ -311,7 +311,7 @@ gt-b = Noto~Sans~CJK~JP~Bold, gt-u = Noto~Sans~CJK~JP~Medium, gt-eb = Noto~Sans~CJK~JP~Black, - mg-m = Noto~Sans~CJK~JP~Black, + mg-m = Noto~Sans~CJK~JP~Medium, mc-l = Noto~Serif~CJK~JP~Light, __custom = false, __office = false, __noembed = false, } @@ -324,7 +324,7 @@ gt-b = HaranoAjiGothic-Bold.otf, gt-u = HaranoAjiGothic-Medium.otf, gt-eb = HaranoAjiGothic-Heavy.otf, - mg-m = HaranoAjiGothic-Heavy.otf, + mg-m = HaranoAjiGothic-Medium.otf, mc-l = HaranoAjiMincho-Light.otf, __custom = false, __office = false, __noembed = false, } @@ -463,16 +463,16 @@ \cs_new:Nn \__ltjpreset_substitute:nnnn { \group_begin: \suppressfontnotfounderror=1 - \cs_if_exist:cT {ltjpreset_font_#1_#2:} { - \__ltjpreset_wrap_fontname:e { \cs:w ltjpreset_font_#1_#2: \cs_end: } - \font \g__ltjpreset_font_test: = \l__preset_font_name:\relax + \cs_if_exist:cTF { __ltjpreset_font_#1_#2: } { + \__ltjpreset_wrap_fontname:e { \cs:w __ltjpreset_font_#1_#2: \cs_end: } + \font \g__ltjpreset_font_test: = \l__ltjpreset_font_name:\relax \ifx \g__ltjpreset_font_test: \nullfont \msg_warning:nnxxxx { luatexja-preset }{ no-font } - { \cs:w ltjpreset_font_#1_#2: \cs_end: }{ #1/#2 } - { \cs:w ltjpreset_font_#3_#4: \cs_end: }{ #3/#4 } - \cs_gset_eq:cc { ltjpreset_font_#1_#2: } { ltjpreset_font_#3_#4: } + { \cs:w __ltjpreset_font_#1_#2: \cs_end: }{ #1/#2 } + { \cs:w __ltjpreset_font_#3_#4: \cs_end: }{ #3/#4 } + \cs_gset_eq:cc { __ltjpreset_font_#1_#2: } { __ltjpreset_font_#3_#4: } \fi - } { \cs_gset_eq:cc { ltjpreset_font_#1_#2: } { ltjpreset_font_#3_#4: } } + } { \cs_gset_eq:cc { __ltjpreset_font_#1_#2: } { __ltjpreset_font_#3_#4: } } \group_end: } |