Target release date: 2019-11-17

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

diff --git a/src/addons/luatexja-fontspec.sty b/src/addons/luatexja-fontspec.sty
index 34ef824..e32d20a 100644 (file)
--- a/src/addons/luatexja-fontspec.sty
+++ b/src/addons/luatexja-fontspec.sty
@@ -3,24 +3,22 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec}[2017/12/31 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec}[2019/09/26 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} }
   \group_end:
 }
 
-\bool_new:N \ltj_fontspec_match_bool
+\bool_new:N \__ltj_fontspec_match_bool
 \keys_define:nn { luatexja-fontspec }
   {
-    match .bool_set:N = \ltj_fontspec_match_bool,
+    match .bool_set:N = \__ltj_fontspec_match_bool,
     match .default:n  = true,
     pass .code:n = \PassOptionsToPackage{#1} {fontspec},
       % 互換性のために残したオプション
@@ -29,11 +27,8 @@
   }
 \ProcessKeysOptions{ luatexja-fontspec }
 
-\RequirePackage{fontspec}[2017/01/01]% v2.5c
-\RequirePackage{luatexja-fontspec-25c}
-%\@ifpackagelater{fontspec}{2017/01/01}%
-%  {\RequirePackage{luatexja-fontspec-25c}}% v2.5c
-%  {\RequirePackage{luatexja-fontspec-24}}% --v2.5a
+\RequirePackage{fontspec}[2019/03/15]% v2.7c
+\RequirePackage{luatexja-fontspec-27c} % v2.7c
 
 \ExplSyntaxOff
 %%%%%%%% Now we completely ignore kanjifont definition file.
@@ -45,7 +40,7 @@
    \ifx\csname \f@encoding+\f@family\endcsname\relax
        \directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f@encoding}')}%
 \ifin@\else % Alphabetic font
-    \@font@info{Try loading font information for \f@encoding+\f@family}%
+    \@font@info{Trying loading font information for \f@encoding+\f@family}%
     \global\expandafter\let
        \csname\f@encoding+\f@family\endcsname\@empty
      \nfss@catcodes