% luatexja-preset.sty
-\ProvidesPackage{luatexja-preset}[2020/01/26 Japanese font presets]
+\ProvidesPackage{luatexja-preset}[2020-09-14 Japanese font presets]
\RequirePackage{expl3,l3keys2e}
\RequirePackage{luatexja}
\keys_define:nn { luatexja-preset }{
unknown .code:n =
- \keys_set_known:noN { ltjpreset-presets } { \tl_use:N \l_keys_tl } \l_tmpa_tl
- \tl_if_empty:NT \l_tmpa_tl {
- \PassOptionsToPackage { \l_tmpa_tl } { luatexja-fontspec }
- },
+ \PassOptionsToPackage { \l_keys_key_str } { luatexja-fontspec },
scale .code:n = \gdef\Cjascale{#1},
- match .code: n =
+ match .code:n =
\renewcommand\jttdefault{\gtdefault}\@ltj@match@familytrue
\PassOptionsToPackage { match } { luatexja-fontspec },
match .value_forbidden:n = true,
\__ltjpreset_declare_bool_option:nn { bold }{ nobold }
\__ltjpreset_declare_bool_option:nn { expert }{ noexpert }
\__ltjpreset_declare_bool_option:nn { deluxe }{ nodeluxe }
+\__ltjpreset_declare_bool_option:nn { nocheck }{ check }
% JFM
\tl_new:N \__ltjpreset_use_jfm_yoko_tl % 使用する JFM(横)
gt-m .code:n = % gtfamily , medium series
\prop_put:Nnn \g__ltjpreset_font_prop { gt-u } {#1}
\prop_put:Nnn \g__ltjpreset_font_prop { gt-d } {#1},
- % gt-d, gt-u は隠し
gt .groups:n = { preset }, gt .value_required:n = true,
gt-m .groups:n = { preset }, gt-m .value_required:n = true,
}
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,
}
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,
}
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,
}
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,
}
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,
}
__custom = false, __office = false, __noembed = true,
}
-\keys_set:nn {luatexja-preset} { ipaex }
+\keys_set:nn {luatexja-preset} { haranoaji } %% old: ipaex
\ProcessKeysOptions { luatexja-preset }
\@ifpackageloaded{luatexja-fontspec}{
\bool_if:NT \g__ltjpreset_nfssonly_bool
\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
- \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: }
- \fi
- } { \cs_gset_eq:cc { ltjpreset_font_#1_#2: } { ltjpreset_font_#3_#4: } }
+ \cs_if_exist:cTF { __ltjpreset_font_#1_#2: } {
+ \bool_if:NF \g__ltjpreset_nocheck_bool {
+ \__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: }
+ \fi
+ }
+ } { \cs_gset_eq:cc { __ltjpreset_font_#1_#2: } { __ltjpreset_font_#3_#4: } }
\group_end:
}
\def\ebdefault{eb}
\DeclareRobustCommand\ebseries { \not@math@alphabet\ebseries\relax\fontseries\ebdefault\selectfont }
\DeclareRobustCommand\gtebfamily { \gtfamily\fontseries{\ebdefault}\selectfont }
+ \DeclareTextFontCommand{\textlt}{\ltseries}
+ \DeclareTextFontCommand{\texteb}{\ebseries}
} {
\cs_set_eq:NN \__ltjpreset_check_deluxe_existence: \prg_do_nothing:
}