X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Faddons%2Fluatexja-fontspec.sty;h=0a170a94389d275a6a6f8a7c956463192454d9ab;hb=43b3b49da87473dc407934da9fd9c652b938ba54;hp=f351ce81f453c0ffb7e52d4514d5aa85ec4a3a06;hpb=61a103f99ea08fc8b455515cae283ae8f3d542e4;p=luatex-ja%2Fluatexja.git

diff --git a/src/addons/luatexja-fontspec.sty b/src/addons/luatexja-fontspec.sty
index f351ce8..0a170a9 100644
--- a/src/addons/luatexja-fontspec.sty
+++ b/src/addons/luatexja-fontspec.sty
@@ -3,311 +3,42 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec}[2014/03/25 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec}[2015/06/28 fontspec support of LuaTeX-ja]
 \RequirePackage{l3keys2e,luatexja}
 \ExplSyntaxOn
 
-\bool_new:N \ltj_fontspec_match
-\cs_set:Nn  \ltj_fontspec_pass_opts: {}
-\keys_define:nn { luatexja-fontspec }
-  {
-    match .bool_set:N = \ltj_fontspec_match,
-    match .default:n  = true,
-    pass .code:n = \cs_set:Nn \ltj_fontspec_pass_opts: {#1},
-  }
-\ProcessKeysOptions { luatexja-fontspec }
-\RequirePackage[\ltj_fontspec_pass_opts:]{fontspec}[2011/09/13]
-
-%%%%%%%% Change Japanese font family by \rmfamily or not
-\bool_if:NTF  \ltj_fontspec_match 
-{
-  \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}
-  \DeclareDocumentCommand \setmonojfont { O{} m } {
-    \ltj_fontspec_set_family:Nnn \jttdefault {#1}{#2}
-    \normalfont
-  }
-}{
-}
-
-%%%%%%%% Messages
-\cs_new:Npn \ltj_fontspec_warning:n   { \msg_warning:nn   {ltj-fontspec} }
-
-\msg_new:nnn {ltj-fontspec} {addjfontfeatures-ignored}
-{
-  \string\addjfontfeature (s)~ ignored;\\
-  it~ cannot~ be~ used~ with~ a~ font~ that~ wasn't~ selected~ by~ luatexja-fontspec.
-}
-
-\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 {
-  \keys_define:nn {fontspec} { #1 .code:n = {#2}}
-}
-
-\cs_new:Nn \ltj_fontspec_define_preparse_external:nn {
-  \keys_define:nn {fontspec-preparse-external} { #1 .code:n = {#2}}
-}
-
-%% Alternate Fonts
-\bool_new:N \l_fontspec_alt_bool
-\tl_clear:N \ltj_fontspec_fontname_alt_tl
-\tl_clear:N \ltj_fontspec_fontfeat_alt_clist
-\tl_clear:N \ltj_fontspec_altrange_clist
-
-\cs_new:Nn \__ltj_fontspec_altfontrange_key_code:n
- {
-  \bool_if:NF \l_fontspec_firsttime_bool
-   {
-    \tl_set:Nn \ltj_fontspec_altrange_clist {#1}
-   }
- }
-\cs_new:Nn \__ltj_fontspec_altfontfeature_key_code:n
- {
-  \fontspec_update_fontid:n {altfeat:#1}
-  \bool_if:NF \l_fontspec_firsttime_bool
-   {
-     \tl_if_empty:nTF {#1}
-      { \bool_set_false:N \ltj_fontspec_alt_bool }
-      { \bool_set_true:N \ltj_fontspec_alt_bool  }
-     \tl_set:Nn \ltj_fontspec_fontfeat_alt_clist {, #1}
-   }
- }
-\cs_new:Nn \__ltj_fontspec_altfont_key_code:n
- {
-  \tl_if_empty:nF {#1}
-   {
-    \fontspec_complete_fontname:Nn \ltj_fontspec_fontname_alt_tl {#1}
-    \fontspec_update_fontid:n {alt:#1}
-   }
- }
-
-\cs_new:Nn \ltj_fontspec_select:nn {
-  \group_begin:
-  \bool_set_false:N \ltj_fontspec_alt_bool
-  \ltj_fontspec_define_option:nn {AltFont} {
-    \__ltj_fontspec_altfont_key_code:n { ##1 }
-  }
-  \ltj_fontspec_define_option:nn {AltFontFeatures} {
-    \__ltj_fontspec_altfontfeature_key_code:n { ##1 }
-  }
-  \ltj_fontspec_define_option:nn {AltFontRange} {
-    \__ltj_fontspec_altfontrange_key_code:n { ##1 }
-  }
-  \ltj_fontspec_define_option:nn {CID} {
-    \fontspec_update_fontid:n  {+cid=##1}
-    \fontspec_update_featstr:n {cid=##1}
-  }
-  \ltj_fontspec_define_option:nn {JFM} {
-    \fontspec_update_fontid:n  {+jfm=##1}
-    \fontspec_update_featstr:n {jfm=##1}
-  }
-  \ltj_fontspec_define_option:nn {JFM-var} {
-    \fontspec_update_fontid:n  {+jfmvar=##1}
-    \fontspec_update_featstr:n {jfmvar=##1}
-  }
-  \ltj_fontspec_define_preparse_external:nn {NoEmbed} {
-    \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_fontid:n  {-kern}
-    \fontspec_update_featstr:n {-kern}
-  }
-  \tl_set:Nn \g_fontspec_encoding_tl {JY3}
-  \tl_set:Nx \g_fontspec_default_fontopts_tl
-             {JFM=ujis, Scale=\fp_use:N \g_ltj_fontspec_scale_fp,
-              Kerning=Off, \g_ltj_fontspec_default_fontopts_tl}
-  \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}
-  \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
-}
-\cs_set_eq:NN \ltj_orig_fontspec_make_font_shapes:nnnn \fontspec_make_font_shapes:nnnn
-\cs_set_eq:NN \ltj_fontspec_orig_DeclareFontShape \DeclareFontShape
-\def \ltj_fontspec_dummy_DeclareFontShape #1#2#3#4#5#6 {}
-\cs_new:Nn \ltj_fontspec_make_font_shapes:nnnn {
-  \ltj_orig_fontspec_make_font_shapes:nnnn {#1} {#2} {#3} {#4}
-  \group_begin:
-    %% Parse font features. However, we have to avoid redefine already defined shape.
-    \__fontspec_load_fontname:n {#1}
-    \cs_set_eq:NN \DeclareFontShape \ltj_fontspec_dummy_DeclareFontShape
-    \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
-    \tl_if_empty:NTF \ltj_fontspec_fontname_alt_tl
-     {
-      \bool_if:NT \ltj_fontspec_alt_bool
-       {
-         \fontspec_declare_shape:nnn {#2} { #3 _alt }
-          {
-            \quark_if_no_value:NF \l__fontspec_fontopts_clist {\l__fontspec_fontopts_clist,}
-            #4 , \ltj_fontspec_fontfeat_alt_clist
-          }
-          \DeclareAlternateKanjiFont {JY3}{ \l_fontspec_family_tl }{#2}{#3}%
-            {JY3}{ \l_fontspec_family_tl }{#2}{ #3 _alt }{ \ltj_fontspec_altrange_clist }
-       }
-     }
-     {
-       \__fontspec_load_fontname:n {\ltj_fontspec_fontname_alt_tl}
-       \fontspec_declare_shape:nnn {#2} { #3 _alt }
-        {
-          \quark_if_no_value:NF \l__fontspec_fontopts_clist {\l__fontspec_fontopts_clist,}
-          #4 , \ltj_fontspec_fontfeat_alt_clist
-        }
-        \DeclareAlternateKanjiFont {JY3}{ \l_fontspec_family_tl }{#2}{#3}%
-          {JY3}{ \l_fontspec_family_tl }{#2}{ #3 _alt }{ \ltj_fontspec_altrange_clist }
-     }
-  \group_end:
- }
-
-%%%%%%%% User commands
-\DeclareDocumentCommand \jfontspec { O{} m } {
-  \ltj_fontspec_set_family:Nnn \k@family {#1}{#2}
-  \selectfont
-  \ignorespaces
-}
-
-\DeclareDocumentCommand \setmainjfont { O{} m } {
-  \ltj_fontspec_set_family:Nnn \mcdefault {#1}{#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}
-  \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
-    }
+\bool_new:N \ltj_fontspec_match
+\keys_define:nn { luatexja-fontspec }
+  {
+    match .bool_set:N = \ltj_fontspec_match_bool,
+    match .default:n  = true,
+    pass .code:n = \PassOptionsToPackage{#1} {fontspec},
+      % 互換性のために残したオプション
+    scale .fp_gset:N = \g_ltj_fontspec_scale_fp,
+    unknown .code:n = \PassOptionsToPackage { \l_keys_key_tl } {fontspec},
   }
-}
-
-\DeclareDocumentCommand \newjfontface { m O{} m } {
-  \newjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2 ] {#3}
-}
-
-\tl_new:N \g_ltj_fontspec_default_fontopts_tl
-\prop_new:N \g__ltj_fontspec_fontopts_prop
-\DeclareDocumentCommand \defaultjfontfeatures { o m }
- {
-  \IfNoValueTF {#1}
-   { \__ltj_fontspec_set_default_features:n {#2} }
-   { \__ltj_fontspec_set_font_default_features:nn {#1} {#2} }
- }
-\cs_new:Nn \__ltj_fontspec_set_default_features:n
- {
-  \tl_set:Nn \g_ltj_fontspec_default_fontopts_tl {#1,}
- }
-\cs_new:Nn \__ltj_fontspec_set_font_default_features:nn
- {
-  \__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} }
- }
-
-\DeclareDocumentCommand \addjfontfeatures {m} {
-  \ifcsname zf@family@fontdef\k@family\endcsname
-    \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}
-      }
-    \group_end:
-    \fontfamily\l_fontspec_family_tl\selectfont
-  \else
-    \ltj_fontspec_warning:n {addjfontfeatures-ignored}
-  \fi
-  \ignorespaces
-}
-
-\cs_set_eq:NN \addjfontfeature \addjfontfeatures
-
-%%% CJKShape=JIS2004
-\fontspec_define_feature_option:nnnnn{CJKShape}{JIS2004}{20}{5}{+jp04}
+\ProcessKeysOptions{ luatexja-fontspec }
+\RequirePackage{fontspec}[2014/06/01]% v2.4
+\RequirePackage{luatexja-fontspec-24}
 
 \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
-}
+\def\@ltj@use@fd{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
+\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
@@ -321,5 +52,4 @@
 \fi
    \fi}
 
-
 \endinput