From 2353a9bd9e9d5e4118d0b36691af20b5d9b25516 Mon Sep 17 00:00:00 2001
From: Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Date: Sat, 1 Sep 2018 19:47:08 +0900
Subject: [PATCH] luatexja-{fontspec,preset}.sty: \Cjascale

---
 src/addons/luatexja-fontspec.sty | 4 +---
 src/addons/luatexja-preset.sty   | 9 ++++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/addons/luatexja-fontspec.sty b/src/addons/luatexja-fontspec.sty
index 8a686ea..a121b55 100644
--- a/src/addons/luatexja-fontspec.sty
+++ b/src/addons/luatexja-fontspec.sty
@@ -3,14 +3,12 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec}[2018/07/31 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec}[2018/09/01 fontspec support of LuaTeX-ja]
 \RequirePackage{l3keys2e,luatexja}
 \ExplSyntaxOn
 
 \cs_if_exist:NF \Cjascale {
-  %%%%%%%% \g_ltj_fontspec_scale_fp
   %% Default scale value for jfont.
-  \fp_new:N \g_ltj_fontspec_scale_fp
   \group_begin:
   \fontsize{16}{16}\selectfont
   \cs_gset:Npx \Cjascale { \fp_to_decimal:n {\zw / 16} }
diff --git a/src/addons/luatexja-preset.sty b/src/addons/luatexja-preset.sty
index 4e577aa..5b85ad4 100644
--- a/src/addons/luatexja-preset.sty
+++ b/src/addons/luatexja-preset.sty
@@ -1,5 +1,5 @@
 % luatexja-preset.sty
-\ProvidesPackage{luatexja-preset}[2018/08/01 Japanese font presets]
+\ProvidesPackage{luatexja-preset}[2018/09/01 Japanese font presets]
 
 \RequirePackage{expl3,l3keys2e}
 \RequirePackage{luatexja}
@@ -446,6 +446,13 @@
 \bool_if:NTF \g_ltjpreset_nfssonly_bool {
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%% nfss only
+  \cs_if_exist:NF \Cjascale {
+    \group_begin:
+    \fontsize{16}{16}\selectfont
+    \cs_gset:Npx \Cjascale { \fp_to_decimal:n {\zw / 16} }
+    \group_end:
+  }
+
   \msg_warning:nnx { luatexja-preset }{ scale }{ \Cjascale }
 
   \cs_new:Nn \ltj_preset_declare_font_shape:nnnnnn {
-- 
2.11.0