Merge branch 'kitagawa_test' into cjascale

[luatex-ja/luatexja.git] / src / addons / luatexja-preset.sty

diff --git a/src/addons/luatexja-preset.sty b/src/addons/luatexja-preset.sty
index c81a15e..a5cf7b7 100644 (file)
--- a/src/addons/luatexja-preset.sty
+++ b/src/addons/luatexja-preset.sty
@@ -1,16 +1,10 @@
 % luatexja-preset.sty
-\ProvidesPackage{luatexja-preset}[2017/08/24 Japanese font presets]
+\ProvidesPackage{luatexja-preset}[2017/12/15 Japanese font presets]
 
 \RequirePackage{expl3,l3keys2e}
 \RequirePackage{luatexja}
 \ExplSyntaxOn
 
-\fp_new:N \g_ltjpreset_scale_fp
-\group_begin:
-\fontsize{10}{10}\selectfont
-\fp_gset:Nn \g_ltjpreset_scale_fp {\zw / 10}
-\group_end:
-
 %% messages
 \msg_new:nnn { luatexja-preset }{ ltj-fontspec }{
   The~ luatexja-fontspec~ package~ is~ loaded~ already.~
@@ -44,7 +38,7 @@
     \tl_if_empty:NT \l_tmpa_tl {
       \PassOptionsToPackage { \l_tmpa_tl } { luatexja-fontspec }
     },
-  scale .fp_gset:N = \g_ltjpreset_scale_fp,
+  scale .code:n  = \gdef\Cjascale{#1},
   match .code: n =
     \renewcommand\jttdefault{\gtdefault}\@ltj@match@familytrue
     \PassOptionsToPackage { match } { luatexja-fontspec },
@@ -78,7 +72,6 @@
 }
 
 %%%%%%%% bool options
-\bool_new:N \l_ltjpreset_shape_nlck_bool
 \ltjpreset_declare_bool_option:nn { nfssonly }{ fontspec }
 \ltjpreset_declare_bool_option:nn { bold }{ nobold }
 \ltjpreset_declare_bool_option:nn { expert }{ noexpert }
@@ -347,16 +340,11 @@
 %%%%%%%% main routine
 
 \cs_new:Nn \ltjpreset_extract_fonts: {
-  %% KozMinPr6N, HiraMinProN-W3 の場合はjp04 feature がないので，nlck にする
   %% MogaMincho の場合は 90 をつける/はずす
   \bool_if:NF \g_ltjpreset_custom_bool {
     \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 }
     \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
       \tl_set:Nx \l_tmpb_tl { \prop_item:Nn \g_ltjpreset_font_prop { mc-m } }
-      \tl_if_in:NnT  \l_tmpb_tl { KozMinPr6N-Regular }
-        { \bool_set_true:N \l_ltjpreset_shape_nlck_bool }
-      \tl_if_in:NnT  \l_tmpb_tl { HiraMinProN-W3 }
-        { \bool_set_true:N \l_ltjpreset_shape_nlck_bool }
       \tl_if_in:NnT  \l_tmpb_tl { Moga90Mincho } {
         \prop_clear:N \l_tmpa_prop
         \prop_map_inline:Nn \g_ltjpreset_font_prop {
@@ -456,11 +444,11 @@
 \bool_if:NTF \g_ltjpreset_nfssonly_bool {
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%% nfss only
-  \msg_warning:nnx { luatexja-preset }{ scale }{ \fp_use:N \g_ltjpreset_scale_fp }
+  \msg_warning:nnx { luatexja-preset }{ scale }{ \Cjascale }
 
   \cs_new:Nn \ltj_preset_declare_font_shape:nnnnnn {
     \cs_if_exist:cT { #1/#2/#3/#4/10 } { \cs_undefine:c { #1/#2/#3/#4/10 } }
-    \DeclareFontShape{#1}{#2}{#3}{#4}{ <-> s*[\fp_use:N \g_ltjpreset_scale_fp]
+    \DeclareFontShape{#1}{#2}{#3}{#4}{ <-> s*[\Cjascale]
       { \bool_if:NT \g_ltjpreset_noembed_bool {psft:} #5
        ;-kern \tl_use:N \l_ltjpreset_kanji_shape_tl; #6 } } {}
   }
@@ -504,9 +492,7 @@
     }
     \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 }
     \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
-      \tl_set:Nx \l_ltjpreset_kanji_shape_tl {
-       \bool_if:NTF \l_ltjpreset_shape_nlck_bool { ;+nlck } { ;+jp04 }
-      }
+      \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:}
@@ -523,10 +509,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%% fontspec
 } {
-  \PassOptionsToPackage { scale = \fp_use:N \g_ltjpreset_scale_fp } { luatexja-fontspec }
   \RequirePackage{luatexja-fontspec}
   % scale
-  \msg_warning:nnx { luatexja-preset }{ scale }{ \fp_use:N \g_ltj_fontspec_scale_fp }
+  \msg_warning:nnx { luatexja-preset }{ scale }{ \Cjascale }
   \tl_new:N \l_ltjpreset_add_features_tl
 
   \bool_if:NT \g_ltjpreset_expert_bool {
@@ -537,11 +522,6 @@
   \addjfontfeature{ Kerning=Off }
   % 実際の fontspec の呼びだし
   \cs_new:Nn \ltjpreset_do_fontset: { \group_begin:
-      \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 }
-      \tl_if_eq:NNT \l_ltjpreset_kanji_shape_tl \l_tmpa_tl {
-        \bool_if:NT \l_ltjpreset_shape_nlck_bool
-          { \tl_set:Nn \l_ltjpreset_kanji_shape_tl { , CJKShape=NLC } }
-      }
       \tl_gset:Nx \l_ltjpreset_add_features_tl {
         \tl_use:N \l_ltjpreset_kanji_shape_tl,
         YokoFeatures = { JFM = \tl_use:N \ltjpreset_use_jfm_yoko_tl },