OSDN Git Service

luatexja-preset: add hook (only in nfssonly mode)
authorHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Tue, 29 Jan 2019 04:49:41 +0000 (13:49 +0900)
committerHironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Tue, 29 Jan 2019 04:49:41 +0000 (13:49 +0900)
src/addons/luatexja-preset.sty

index e3054d3..ac4bccd 100644 (file)
@@ -1,5 +1,5 @@
 % luatexja-preset.sty
-\ProvidesPackage{luatexja-preset}[2019/01/28 Japanese font presets]
+\ProvidesPackage{luatexja-preset}[2019/01/29 Japanese font presets]
 
 \RequirePackage{expl3,l3keys2e}
 \RequirePackage{luatexja}
   }
   \cs_new:Nn \ltj_preset_define_family:nnn {
     \ltj_preset_declare_font_shape:nnnnnn { JY3 }
-      { #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { n }
+      { ltjp #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { n }
       { "#3" : jfm=\tl_use:N \__ltjpreset_use_jfm_yoko_tl }
       { script=hani \bool_if:NT \g__ltjpreset_expert_bool { ;+hkna } }
     \ltj_preset_declare_font_shape:nnnnnn { JT3 }
-      { #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { n }
+      { ltjp #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { n }
       { "#3" : jfm=\tl_use:N \__ltjpreset_use_jfm_tate_tl }
       { script=hani \bool_if:NT \g__ltjpreset_expert_bool { ;+vkna } }
     \bool_if:NT \g__ltjpreset_expert_bool {
       \ltj_preset_declare_font_shape:nnnnnn { JY3 }
-        { #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { rb }
+        { ltjp #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { rb }
         { "#3" : jfm=\tl_use:N \__ltjpreset_use_jfm_yoko_tl } { script=kana; +ruby }
       \ltj_preset_declare_font_shape:nnnnnn { JT3 }
-        { #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { rb }
+        { ltjp #1 \int_to_arabic:n { \g__ltjpreset_applycount_int }} { #2 } { rb }
         { "#3" : jfm=\tl_use:N \__ltjpreset_use_jfm_tate_tl } { script=kana; +ruby }
     }
+    \cs_if_exist_use:N \ltj_preset_define_family_hook:nnn { #1 } { #2 } { #3 }
   }
   \bool_if:NT \g__ltjpreset_deluxe_bool {
     \let\mgfamily\undefined
   %
   \cs_new:Nn \__ltjpreset_do_fontset: { \group_begin:
     % ======
-    \xdef\mcdefault{ltjpm \int_to_arabic:n { \g__ltjpreset_applycount_int }}
-    \xdef\gtdefault{ltjpg \int_to_arabic:n { \g__ltjpreset_applycount_int }}
+    \xdef\mcdefault{ltjpmc \int_to_arabic:n { \g__ltjpreset_applycount_int }}
+    \xdef\gtdefault{ltjpgt \int_to_arabic:n { \g__ltjpreset_applycount_int }}
     \DeclareKanjiFamily{JY3}{\mcdefault}{}
     \DeclareKanjiFamily{JT3}{\mcdefault}{}
     \DeclareKanjiFamily{JY3}{\gtdefault}{}
     \tl_if_eq:NNT \l__ltjpreset_kanji_shape_tl \l_tmpa_tl {
       \tl_set:Nx \l__ltjpreset_kanji_shape_tl { ;+jp04 }
     }
-    \ltj_preset_define_family:nnn {ltjpm} {m}  {\__ltjpreset_font_mc_m:}
-    \ltj_preset_define_family:nnn {ltjpm} {bx} {\__ltjpreset_font_mc_bx:}
-    \ltj_preset_define_family:nnn {ltjpm} {b}  {\__ltjpreset_font_mc_bx:}
-    \ltj_preset_define_family:nnn {ltjpg} {m}  {\__ltjpreset_font_gt_m:}
-    \ltj_preset_define_family:nnn {ltjpg} {bx} {\__ltjpreset_font_gt_bx:}
-    \ltj_preset_define_family:nnn {ltjpg} {b}  {\__ltjpreset_font_gt_bx:}
+    \ltj_preset_define_family:nnn {mc} {m}  {\__ltjpreset_font_mc_m:}
+    \ltj_preset_define_family:nnn {mc} {bx} {\__ltjpreset_font_mc_bx:}
+    \ltj_preset_define_family:nnn {mc} {b}  {\__ltjpreset_font_mc_bx:}
+    \ltj_preset_define_family:nnn {gt} {m}  {\__ltjpreset_font_gt_m:}
+    \ltj_preset_define_family:nnn {gt} {bx} {\__ltjpreset_font_gt_bx:}
+    \ltj_preset_define_family:nnn {gt} {b}  {\__ltjpreset_font_gt_bx:}
     \normalfont
     \bool_if:NT \g__ltjpreset_deluxe_bool {
-      \ltj_preset_define_family:nnn {ltjpm}  {l} {\__ltjpreset_font_mc_l:}
-      \ltj_preset_define_family:nnn {ltjpg}  {eb} {\__ltjpreset_font_gt_eb:}
-      \ltj_preset_define_family:nnn {ltjpmg} {m}  {\__ltjpreset_font_mg_m:}
+      \ltj_preset_define_family:nnn {mc}  {l} {\__ltjpreset_font_mc_l:}
+      \ltj_preset_define_family:nnn {gt}  {eb} {\__ltjpreset_font_gt_eb:}
+      \ltj_preset_define_family:nnn {mg} {m}  {\__ltjpreset_font_mg_m:}
     }
     \group_end:
   }