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

diff --git a/src/addons/luatexja-fontspec-24.sty b/src/addons/luatexja-fontspec-24.sty
index 14f3e3b..38ca8ee 100644
--- a/src/addons/luatexja-fontspec-24.sty
+++ b/src/addons/luatexja-fontspec-24.sty
@@ -3,22 +3,14 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-24}[2015/01/15 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
 \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}
     \normalfont
@@ -45,20 +37,11 @@
 
 \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}
 }
@@ -119,6 +102,13 @@
   \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}
   }
@@ -182,6 +172,7 @@
   \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
@@ -214,6 +205,7 @@
 \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:Nnnnn {
   \group_begin:
     %% 基底フォント