X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Faddons%2Fluatexja-fontspec-24.sty;h=38ca8eedaca2cad9834dc41c00c91eb3fd55987d;hb=ab23049deb6fb90ca689fdf4924b3783f08f8f2e;hp=7696714edcd4e1df71bbc66a732c34c360a6270e;hpb=785aff3590a192c7fe47be7531441e03ca051705;p=luatex-ja%2Fluatexja.git

diff --git a/src/addons/luatexja-fontspec-24.sty b/src/addons/luatexja-fontspec-24.sty
index 7696714..38ca8ee 100644
--- a/src/addons/luatexja-fontspec-24.sty
+++ b/src/addons/luatexja-fontspec-24.sty
@@ -3,30 +3,20 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-24}[2014/06/19 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec-24}[2016/01/30 fontspec support of LuaTeX-ja]
 \RequirePackage{l3keys2e,luatexja}
 \ExplSyntaxOn
 
 %%%%%%%% Change Japanese font family by \rmfamily or not
-\bool_if:NTF  \ltj_fontspec_match
-{
+\cs_new:Npn \ltj_fontspec_match_cmd {
   \renewcommand\jttdefault{\gtdefault}
-  \DeclareRobustCommand\rmfamily
-  {\not@math@alphabet\rmfamily\mathrm
-     \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
-  \DeclareRobustCommand\sffamily
-  {\not@math@alphabet\sffamily\mathsf
-     \romanfamily\sfdefault\kanjifamily\gtdefault\selectfont}
-  \DeclareRobustCommand\ttfamily
-  {\not@math@alphabet\ttfamily\mathtt
-     \romanfamily\ttdefault\kanjifamily\jttdefault\selectfont}
+  \@ltj@match@familytrue
   \DeclareDocumentCommand \setmonojfont { O{} m } {
-    \__ltj_fontspec_set_family:Nnn \jttdefault {#1}{#2}
+    \ltj_fontspec_set_family:Nnn \jttdefault {##1}{##2}
     \normalfont
   }
-}{
 }
-
+\bool_if:NT  \ltj_fontspec_match_bool \ltj_fontspec_match_cmd
 %%%%%%%% Messages
 
 \msg_new:nnn {luatexja-fontspec} {addjfontfeatures-ignored}
@@ -47,24 +37,14 @@
 
 \cs_generate_variant:Nn \prg_new_conditional:Nnn {Nnx}
 
-%%%%%%%% \g_ltj_fontspec_scale_fp
-%% Default scale value for jfont.
-\fp_new:N \g_ltj_fontspec_scale_fp
-\group_begin:
-\fontsize{10}{10}\selectfont
-\fp_gset:Nn \g_ltj_fontspec_scale_fp {\zw / 10}
-\group_end:
-
 %%%%%%%% Internal control sequences
 %% Each CS is ltj_fontspec version that corresponds to original CS of fontspec.
 \cs_new:Nn \ltj_fontspec_define_option:nn {
   \__fontspec_keys_define_code:nnn {fontspec} {#1} {#2}
 }
-
 \cs_new:Nn \ltj_fontspec_define_preparse_external:nn {
   \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {#1} {#2}
 }
-
 \cs_new:Nn \ltj_fontspec_define_altfont_option:nn {
   \__fontspec_keys_define_code:nnn {fontspec-ltjaltfont} {#1} {#2}
 }
@@ -89,63 +69,167 @@
 \ltj_fontspec_define_altfont_option:nn {Font} {
   \fontspec_complete_fontname:Nn \l_ltj_fontspec_altname_tl {#1}
 }
+\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {AltFont} {
+  \clist_put_right:Nn \l_ltj_fontspec_altfont_clist  { #1 }
+}
+\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {YokoFeatures} {
+  \clist_put_right:Nn \l_ltj_fontspec_fontfeat_yoko_clist { #1 }
+}
+\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {TateFeatures} {
+  \clist_put_right:Nn \l_ltj_fontspec_fontfeat_tate_clist { #1 }
+}
+\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {TateFont} {
+  \tl_if_empty:nF {#1} {
+    \fontspec_complete_fontname:Nn \l_ltj_fontspec_fontname_tate_tl {#1}
+  }
+}
+%%
+\clist_new:N \l_ltj_fontspec_fontfeat_yoko_clist
+\clist_new:N \l_ltj_fontspec_fontfeat_tate_clist
+\tl_new:N    \l_ltj_fontspec_fontname_tate_tl
+
+\cs_new:Npn \ltj_fontspec_DeclareFontFamily #1 #2 #3 {
+  \DeclareKanjiFamily {JY3} {#2} {#3}
+  \DeclareKanjiFamily {JT3} {#2} {#3}
+}
 
-\cs_new:Nn \__ltj_fontspec_altfont_key_code:n
- {
-  \clist_set:Nn \l_ltj_fontspec_altfont_clist  {#1}
-  \fontspec_update_fontid:n {alt:#1}
- }
-
+\cs_set_eq:NN \__ltj_orig_fontspec_select:nn \fontspec_select:nn
 \cs_new:Nn \ltj_fontspec_select:nn {
   \group_begin:
   \ltj_fontspec_define_option:nn {AltFont} {
-    \__ltj_fontspec_altfont_key_code:n { ##1 }
+    \clist_put_right:Nn \l_ltj_fontspec_altfont_clist  {##1}
   }
   \ltj_fontspec_define_option:nn {CID} {
     \__fontspec_update_featstr:n {cid=##1}
   }
+  \ltj_fontspec_define_option:nn {Kanjiskip} {
+    \str_if_eq_x:nnTF {false} { \str_lower_case:n { ##1 } }{
+      \__fontspec_update_featstr:n {-ltjksp}
+    } {
+      \__fontspec_update_featstr:n {+ltjksp}
+    }
+  }
   \ltj_fontspec_define_option:nn {JFM} {
     \__fontspec_update_featstr:n {jfm=##1}
   }
-
+  % vary by shape
+  \ltj_fontspec_define_option:nn {YokoFeatures} {
+    \clist_put_right:Nn \l_ltj_fontspec_fontfeat_yoko_clist { ##1 }
+  }
+  \ltj_fontspec_define_option:nn {TateFeatures} {
+    \clist_put_right:Nn \l_ltj_fontspec_fontfeat_tate_clist { ##1 }
+  }
+  \ltj_fontspec_define_option:nn {TateFont}
+  {
+    \tl_if_empty:nF {##1} {
+      \fontspec_complete_fontname:Nn \l_ltj_fontspec_fontname_tate_tl {##1}
+    }
+  }
   \ltj_fontspec_define_option:nn {JFM-var} {
     \__fontspec_update_featstr:n {jfmvar=##1}
   }
   \ltj_fontspec_define_preparse_external:nn {NoEmbed} {
-    \cs_set:Nn \fontspec_namewrap:n {psft:####1}
+    \cs_set:Nn \__fontspec_namewrap:n {psft:####1}
   }
   %% Omit the warning message
   %% "OpenType feature 'Kerning=Off' (-kern) not available ..."
   \ltj_fontspec_define_option:nn {Kerning/Off} {
     \__fontspec_update_featstr:n {-kern}
   }
-  \tl_set:Nn \g_fontspec_encoding_tl {JY3}
-  \clist_set:Nx \g__fontspec_default_fontopts_clist
-             {JFM=ujis, Scale=\fp_use:N \g_ltj_fontspec_scale_fp,
-              Kerning=Off, \g_ltj_fontspec_default_fontopts_tl}
+  \clist_set:Nx \g__fontspec_default_fontopts_clist {
+    YokoFeatures = { JFM=ujis }, TateFeatures = { JFM=ujisv },
+    Scale=\fp_use:N \g_ltj_fontspec_scale_fp, Kerning=Off,
+    \g__ltj_fontspec_default_fontopts_clist
+  }
   \prop_set_eq:NN \g__fontspec_fontopts_prop \g__ltj_fontspec_fontopts_prop
-  \cs_set_eq:NN \fontspec_make_font_shapes:nnnn \ltj_fontspec_make_font_shapes:nnnn
-  \cs_set_eq:NN \DeclareFontFamily \DeclareKanjiFamily
-  \fontspec_select:nn{#1}{#2}
+  \cs_set_eq:NN \__fontspec_make_font_shapes:Nnnnn \ltj_fontspec_make_font_shapes:Nnnnn
+  \cs_set_eq:NN \DeclareFontFamily \ltj_fontspec_DeclareFontFamily
+  \tl_set:Nn \g_fontspec_encoding_tl {JY3}
+  \__ltj_orig_fontspec_select:nn{#1}{#2}
   \group_end:
 }
 
-\cs_new:Nn \__ltj_fontspec_set_family:Nnn {
-  \ltj_fontspec_select:nn{#2}{#3}
-  \tl_set_eq:NN #1 \l_fontspec_family_tl
+%% declare_shape
+
+\cs_new:Nn \ltj_fontspec_declare_shape_yoko:nnnn {
+  \ltj_fontspec_declare_shape_aux:nnnnnn {#1} {#2} {#3} {#4} { JY3 } { \l_ltj_fontspec_fontfeat_yoko_clist }
 }
-\cs_set_eq:NN \__ltj_orig_fontspec_make_font_shapes:nnnn \fontspec_make_font_shapes:nnnn
+\cs_new:Nn \ltj_fontspec_declare_shape_tate:nnnn {
+  \ltj_fontspec_declare_shape_aux:nnnnnn {#1} {#2} {#3} {#4} { JT3 } { \l_ltj_fontspec_fontfeat_tate_clist }
+}
+\cs_new:Nn \ltj_fontspec_declare_shape:nnnn {
+  \ltj_fontspec_declare_shape_yoko:nnnn {#1} {#2} {#3} {#4}
+  \ltj_fontspec_declare_shape_tate:nnnn {#1} {#2} {#3} {#4}
+}
+\cs_generate_variant:Nn \ltj_fontspec_declare_shape:nnnn {nnxx}
+\cs_generate_variant:Nn \ltj_fontspec_declare_shape_yoko:nnnn {nnxx}
+\cs_generate_variant:Nn \ltj_fontspec_declare_shape_tate:nnnn {nnxx}
+
+\cs_new:Nn \ltj_fontspec_declare_shape_aux:nnnnnn
+ {
+  \tl_clear:N \l__fontspec_nfss_tl
+  \tl_clear:N \l__fontspec_nfss_sc_tl
+  \tl_set_eq:NN \l__fontspec_saved_fontname_tl \l_fontspec_fontname_tl
+
+  \tl_set:Nn \g_fontspec_encoding_tl {#5}
+  \tl_set:Nn \l__fontspec_nfss_enc_tl {#5}
+  \exp_args:Nx \clist_map_inline:nn {#4}
+   {
+    \tl_clear:N \l__fontspec_size_tl
+    \tl_set_eq:NN \l__fontspec_sizedfont_tl \l__fontspec_saved_fontname_tl % in case not spec'ed
+
+    \keys_set_known:nxN {fontspec-sizing} { \exp_after:wN \use:n ##1 }
+      \l__fontspec_sizing_leftover_clist
+    \tl_if_empty:NT \l__fontspec_size_tl { \__fontspec_error:n {no-size-info} }
+
+    \str_if_eq:nnTF { #5 } { JY3 } {
+      % "normal"
+      \__fontspec_load_fontname:n {\l__fontspec_sizedfont_tl}
+    } {
+      \tl_if_empty:NTF \l_ltj_fontspec_fontname_tate_tl
+        { \__fontspec_load_fontname:n {\l__fontspec_sizedfont_tl} }
+        { \__fontspec_load_fontname:n {\l_ltj_fontspec_fontname_tate_tl} }
+    }
+    \__fontspec_setup_nfss:Nnn \l__fontspec_nfss_tl {#3} {#6}
+   }
+  \bool_set_true:N \l__fontspec_nosc_bool
+  \__fontspec_declare_shapes_normal:nn  {#1} {#2}
+  \__fontspec_declare_shape_slanted:nn  {#1} {#2}
+ }
+
+\cs_new:Nn \ltj_fontspec_set_family:Nnn {
+  \cs_set_eq:NN \fontspec_select:nn \ltj_fontspec_select:nn
+  \__ltj_orig_fontspec_set_family:Nnn #1 {#2} {#3}
+  \cs_set_eq:NN \fontspec_select:nn \__ltj_orig_fontspec_select:nn
+}
+\cs_set_eq:NN \__ltj_orig_fontspec_set_family:Nnn \fontspec_set_family:Nnn
+\cs_set_eq:NN \__ltj_orig_fontspec_make_font_shapes:Nnnnn \__fontspec_make_font_shapes:Nnnnn
 \cs_set_eq:NN \__ltj_fontspec_orig_DeclareFontShape \DeclareFontShape
-\cs_new:Nn \ltj_fontspec_make_font_shapes:nnnn {
-  \__ltj_orig_fontspec_make_font_shapes:nnnn {#1} {#2} {#3} {#4}
+
+\cs_new:Nn \ltj_fontspec_make_font_shapes:Nnnnn {
   \group_begin:
-    %% Parse font features. However, we have to avoid redefine already defined shape.
-    \__fontspec_load_fontname:n {#1}
-    \cs_set_eq:NN \DeclareFontShape \use_none:nnnnnn
-    \fontspec_declare_shape:nnn {#2}{#3}
-     { \quark_if_no_value:NF \l__fontspec_fontopts_clist {\l__fontspec_fontopts_clist,} #4 }
-    \cs_set_eq:NN \DeclareFontShape \__ltj_fontspec_orig_DeclareFontShape
+    %% 基底フォント
+    \cs_set_eq:NN \__fontspec_font_set:Nnn \use_none:nnn
+    \cs_set_eq:NN \__fontspec_font_if_null:NT \use_none:nn
+    \cs_set_eq:NN \__fontspec_declare_shape:nnxx \ltj_fontspec_declare_shape:nnxx
+    \__ltj_orig_fontspec_make_font_shapes:Nnnnn {#1} {#2} {#3} {#4} {#5}
     %%
+    \ltj_fontspec_make_font_shapes_alt:Nnnnnn {#1}{#2}{#3}
+     {#4, \l_ltj_fontspec_fontfeat_yoko_clist}{#5} {JY3 }
+    \ltj_fontspec_make_font_shapes_alt:Nnnnnn {#1}{#2}{#3}
+     {#4, \l_ltj_fontspec_fontfeat_tate_clist}{#5} {JT3}
+  \group_end:
+ }
+
+%%% Altfont 内部処理部
+\cs_new:Nn \ltj_fontspec_make_font_shapes_alt:Nnnnnn {
+  \group_begin:
+    \str_if_eq:nnTF { #6 } { JY3 } {
+      \cs_set_eq:NN \__fontspec_declare_shape:nnxx \ltj_fontspec_declare_shape_yoko:nnxx
+    }{
+      \cs_set_eq:NN \__fontspec_declare_shape:nnxx \ltj_fontspec_declare_shape_tate:nnxx
+    }
+    \keys_set_known:nn {fontspec-ltjaltfont-reparse} { #4 }
     \clist_if_empty:NF \l_ltj_fontspec_altfont_clist {
       \int_gzero:N \g_ltj_fontspec_altnumber_int
       \clist_map_inline:Nn \l_ltj_fontspec_altfont_clist {
@@ -155,6 +239,7 @@
 
         \keys_set_known:nxN {fontspec-ltjaltfont} { \exp_after:wN \use:n ##1 }
           \l_ltj_fontspec_altfont_leftover_clist
+        \keys_set_known:nn {fontspec-ltjaltfont-reparse} { \exp_after:wN \use:n ##1 }
 
         \tl_if_empty:NT \l_ltj_fontspec_altrange_tl {
           \msg_warning:nnn  {luatexja-fontspec} {altfont-ignored-by-norange} { ##1 }
@@ -166,18 +251,14 @@
           } {
             \msg_warning:nnn  {luatexja-fontspec} {altfont-ignored-by-rangeonly} { ##1 }
           } {
-            \group_begin:
-              \__fontspec_load_fontname:n { \l_ltj_fontspec_altname_tl }
-              \fontspec_declare_shape:nnn {#2}
+            \__ltj_orig_fontspec_make_font_shapes:Nnnnn
+                { \l_ltj_fontspec_altname_tl } {#2}
                 {#3 _ alt \int_use:N \g_ltj_fontspec_altnumber_int }
-                {
-                  \quark_if_no_value:NF \l__fontspec_fontopts_clist {\l__fontspec_fontopts_clist,}
-                  #4 , \l_ltj_fontspec_altfont_leftover_clist
-                }
-            \group_end:
+                {#4, \l_ltj_fontspec_altfont_leftover_clist }
+                {#5}
             \DeclareAlternateKanjiFont
-              {JY3}{ \l_fontspec_family_tl }{#2}{#3}%
-              {JY3}{ \l_fontspec_family_tl }{#2}
+              { #6 }{ \l_fontspec_family_tl }{#2}{#3}%
+              { #6 }{ \l_fontspec_family_tl }{#2}
               { #3 _alt \int_use:N \g_ltj_fontspec_altnumber_int }
               { \l_ltj_fontspec_altrange_tl }
             \int_gincr:N \g_ltj_fontspec_altnumber_int
@@ -186,142 +267,92 @@
       }
     }
   \group_end:
- }
+}
+
 
 %%%%%%%% User commands
-\DeclareDocumentCommand \jfontspec { O{} m } {
-  \__ltj_fontspec_set_family:Nnn \k@family {#1}{#2}
+\DeclareDocumentCommand \jfontspec { O{} m O{} } {
+  \ltj_fontspec_set_family:Nnn \k@family {#1,#3}{#2}
   \selectfont
   \ignorespaces
 }
 
-\DeclareDocumentCommand \setmainjfont { O{} m } {
-  \__ltj_fontspec_set_family:Nnn \mcdefault {#1}{#2}
+\DeclareDocumentCommand \setmainjfont { O{} m O{} } {
+  \ltj_fontspec_set_family:Nnn \mcdefault {#1,#3}{#2}
   \DeclareSymbolFont{mincho}{JY3}{\l_fontspec_family_tl}{m}{n}
   \SetSymbolFont{mincho}{bold}{JY3}{\l_fontspec_family_tl}{bx}{n}
   \normalfont
 }
 
-\DeclareDocumentCommand \setsansjfont { O{} m } {
-  \__ltj_fontspec_set_family:Nnn \gtdefault {#1}{#2}
+\DeclareDocumentCommand \setsansjfont { O{} m O{} } {
+  \ltj_fontspec_set_family:Nnn \gtdefault {#1,#3}{#2}
   \DeclareMathAlphabet{\mathgt}{JY3}{\l_fontspec_family_tl}{m}{n}
   \normalfont
 }
 
-\DeclareDocumentCommand \newjfontfamily { m O{} m } {
-  \ltj_fontspec_select:nn{#2}{#3}
-  \use:x {
-    \exp_not:N \DeclareRobustCommand \exp_not:N #1 {
-      \exp_not:N \kanjifamily {\l_fontspec_family_tl} \exp_not:N \selectfont
-    }
-  }
+\DeclareDocumentCommand \newjfontfamily { m O{} m O{} } {
+  \cs_set_eq:NN \fontspec_set_family:Nnn \ltj_fontspec_set_family:Nnn
+  \newfontfamily #1 [#2,#4] {#3}
+  \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
 }
 
-\DeclareDocumentCommand \newjfontface { m O{} m } {
-  \newjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2 ] {#3}
+\DeclareDocumentCommand \newjfontface { m O{} m O{} } {
+  \newjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3}
 }
 
-\tl_new:N \g_ltj_fontspec_default_fontopts_tl
+\clist_new:N \g__ltj_fontspec_default_fontopts_clist
 \prop_new:N \g__ltj_fontspec_fontopts_prop
-\DeclareDocumentCommand \defaultjfontfeatures { o m }
+\DeclareDocumentCommand \defaultjfontfeatures { t+ o m }
  {
-  \IfNoValueTF {#1}
-   { \__ltj_fontspec_set_default_features:n {#2} }
-   { \__ltj_fontspec_set_font_default_features:nn {#1} {#2} }
+  \IfNoValueTF {#2}
+   { \__ltj_fontspec_set_default_features:nn {#1} {#3} }
+   { \__ltj_fontspec_set_font_default_features:nnn {#1} {#2} {#3} }
+  \ignorespaces
  }
-\cs_new:Nn \__ltj_fontspec_set_default_features:n
+\cs_new:Nn \__ltj_fontspec_set_default_features:nn
  {
-  \tl_set:Nn \g_ltj_fontspec_default_fontopts_tl {#1,}
+   \clist_set_eq:NN \l__ltj_fontspec_tmp_clist \g__fontspec_default_fontopts_clist
+   \clist_set_eq:NN \g__fontspec_default_fontopts_clist \g__ltj_fontspec_default_fontopts_clist
+   \__fontspec_set_default_features:nn {#1} {#2}
+   \clist_set_eq:NN \g__ltj_fontspec_default_fontopts_clist \g__fontspec_default_fontopts_clist
+   \clist_set_eq:NN \g__fontspec_default_fontopts_clist \l__ltj_fontspec_tmp_clist
  }
-\cs_new:Nn \__ltj_fontspec_set_font_default_features:nn
+\cs_new:Nn \__ltj_fontspec_set_font_default_features:nnn
  {
-  \__fontspec_sanitise_fontname:Nn \l__fontspec_tmp_tl {#1}
-  \tl_if_empty:nTF {#2}
-   { \prop_gremove:NV \g__ltj_fontspec_fontopts_prop \l__fontspec_tmp_tl }
-   { \prop_gput:NVn   \g__ltj_fontspec_fontopts_prop \l__fontspec_tmp_tl {#2} }
+   \prop_set_eq:NN \l__ltj_fontspec_tmp_prop \g__fontspec_fontopts_prop
+   \prop_set_eq:NN \g__fontspec_fontopts_prop \g__ltj_fontspec_fontopts_prop
+   \__fontspec_set_font_default_features:nnn {#1} {#2} {#3}
+   \prop_set_eq:NN \g__ltj_fontspec_fontopts_prop \g__fontspec_fontopts_prop
+   \prop_set_eq:NN \g__fontspec_fontopts_prop \l__ltj_fontspec_tmp_prop
  }
 
 \DeclareDocumentCommand \addjfontfeatures {m} {
-  \ifcsname zf@family@fontdef\k@family\endcsname
+  \ltj_fontspec_if_fontspec_font:TF
+   {
     \group_begin:
-      \tl_clear:N \g_ltj_fontspec_default_fontopts_tl
-      \use:x {
-        \exp_not:N\ltj_fontspec_select:nn
-          {\csname zf@family@options\k@family\endcsname,#1}
-          {\csname zf@family@fontname\k@family\endcsname}
-      }
+      \tl_set_eq:NN \f@family \k@family
+      \cs_set_eq:NN \fontspec_select:nn \ltj_fontspec_select:nn
+      \addfontfeatures {#1}
     \group_end:
     \fontfamily\l_fontspec_family_tl\selectfont
-  \else
+   }{
     \msg_warning:nn  {luatexja-fontspec} {addjfontfeatures-ignored}
-  \fi
+   }
   \ignorespaces
 }
 
 \cs_set_eq:NN \addjfontfeature \addjfontfeatures
 
-%%% CJKShape=JIS2004
-\__fontspec_define_feature_option:nnnnn{CJKShape}{JIS2004}{20}{5}{+jp04}
-
-\ExplSyntaxOff
-%%%%%%%% Now we completely ignore kanjifont definition file.
-
-\DeclareRobustCommand\fontfamily[1]{%
-  \@notkfamfalse\@notffamfalse
-  \edef\tmp@item{'\luatexluaescapestring{#1}'}%
-  \edef\tmp@enc{'\luatexluaescapestring{\f@encoding}'}%
-  \ifcsname \k@encoding+#1\endcsname % if \k@encoding+#1 is already defined
-    \edef\k@family{#1}%
-  \else\@notkfamtrue\fi
-  \ifcsname \f@encoding+#1\endcsname
-    \edef\f@family{#1}%
-  \else % search font definition file...
-    \directlua{luatexja.jfont.is_ffam(\tmp@enc, \tmp@item)}%
-    \ifin@\edef\k@family{#1}\else%
-      \directlua{luatexja.jfont.is_Nffam(\tmp@enc, \tmp@item)}%
-      \ifin@\@notffamtrue\else%
-        % filename of font definition file is always lowercase
-        \edef\@temp{\lowercase{\noexpand\IfFileExists{\f@encoding#1.fd}}}%
-        \message{(I search font definition file)}%
-        \@temp{\@tempswztrue}{\@tempswzfalse}%
-        \if@tempswz
-          \directlua{luatexja.jfont.add_ffam_list(\tmp@enc, \tmp@item)}%
-   	  \edef\f@family{#1}%
-        \else
-          \directlua{luatexja.jfont.add_Nffam_list(\tmp@enc, \tmp@item)}%
-	  \@notffamtrue%
-        \fi
-      \fi
-    \fi
-  \fi
-  \if@notkfam\if@notffam
-      {\ifcsname D@\k@encoding\endcsname\@nameuse{D@\k@encoding}\fi
-        \xdef\@@temp{\default@family}}\edef\k@family{\@@temp}%
-      {\ifcsname D@\f@encoding\endcsname\@nameuse{D@\f@encoding}\fi
-        \xdef\@@temp{\default@family}}\edef\f@family{\@@temp}%
-  \fi\fi
+\prg_new_conditional:Nnn \ltj_fontspec_if_fontspec_font: {TF,T,F}
+{
+  \cs_if_exist:cTF {g__fontspec_ \k@family _prop} \prg_return_true: \prg_return_false:
 }
 
-% We must redefine \try@load@fontshape to ignore kanjifont definitions at all.
-\def\try@load@fontshape{%
-   \expandafter
-   \ifx\csname \f@encoding+\f@family\endcsname\relax
-       \directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f@encoding}')}%
-\ifin@ % Japanese font: we don't search fd.
-    \@font@warning{We don't search kanjifont definition
-      \MessageBreak for \f@encoding/\f@family}%
-\else % Alphabetic font
-    \@font@info{Try loading font information for \f@encoding+\f@family}%
-    \global\expandafter\let
-       \csname\f@encoding+\f@family\endcsname\@empty
-     \nfss@catcodes
-     \let\nfss@catcodes\relax
-     \edef\reserved@a{%
-       \lowercase{%
-         \noexpand\InputIfFileExists{\f@encoding\f@family.fd}}}%
-     \reserved@a\relax
-          {\@input@{\f@encoding\f@family.fd}}%
-\fi
-   \fi}
+%%% CJKShape=JIS2004
+\__fontspec_define_feature_option:nnnnn{CJKShape}{JIS2004}{20}{100}{+jp04}
+%%% CharacterWidth={VerticalAlternateProportional, VerticalAlternateHalf}
+\__fontspec_define_feature_option:nnnnn{CharacterWidth}{VerticalAlternateProportional}{22}{100}{+vpal}
+\__fontspec_define_feature_option:nnnnn{CharacterWidth}{VerticalAlternateHalf}{22}{101}{+vhal}
+\__fontspec_define_feature_option:nnnnn{Kerning}{Vertical}       {}{}{+vkrn}
 
 \endinput