Dnode -> node.direct (WIP)

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

diff --git a/src/addons/luatexja-fontspec-24.sty b/src/addons/luatexja-fontspec-24.sty
index 90cccd7..38ca8ee 100644 (file)
--- 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/10/29 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,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}
 }
@@ -121,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}
   }
@@ -184,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
@@ -216,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:
     %% 基底フォント
@@ -302,7 +292,7 @@
 
 \DeclareDocumentCommand \newjfontfamily { m O{} m O{} } {
   \cs_set_eq:NN \fontspec_set_family:Nnn \ltj_fontspec_set_family:Nnn
-  \newfontfamily #1 [#2] {#3} [#4]
+  \newfontfamily #1 [#2,#4] {#3}
   \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn
 }
 
@@ -365,28 +355,4 @@
 \__fontspec_define_feature_option:nnnnn{CharacterWidth}{VerticalAlternateHalf}{22}{101}{+vhal}
 \__fontspec_define_feature_option:nnnnn{Kerning}{Vertical}       {}{}{+vkrn}
 
-
-\ExplSyntaxOff
-%%%%%%%% Now we completely ignore kanjifont definition file.
-\@ltj@use@fdfalse
-
-% 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@\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}
-
 \endinput