Another optimization in jfmglue.lua.

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

diff --git a/src/luatexja-fontspec.sty b/src/luatexja-fontspec.sty
index 962db02..80d80d9 100644 (file)
--- a/src/luatexja-fontspec.sty
+++ b/src/luatexja-fontspec.sty
@@ -3,54 +3,102 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec}[2011/08/17 v0.1]
+\ProvidesPackage{luatexja-fontspec}[2011/09/23 v0.2]
 
-\RequirePackage{luatexja,fontspec}
+\RequirePackage{fontspec}[2011/09/18] % v2.2a
+\RequirePackage{luatexja}
 
 \ExplSyntaxOn
 
-\define@key[zf]{options}{JFM}{
-  \fontspec_update_fontid:n  {+jfm=#1}
-  \fontspec_update_featstr:n {jfm=#1}
+\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_new:Nn \ltj_fontspec_select:nn {
   \group_begin:
-  \tl_set:Nn \zf@enc {JY3}
-  \fontspec_select:nn{JFM=ujis,#1}{#2}
+  \keys_define:nn {fontspec} { JFM .code:n = {
+      \fontspec_update_fontid:n  {+jfm=##1}
+      \fontspec_update_featstr:n {jfm=##1}      
+    }
+  }
+  \keys_define:nn {fontspec} { JFM-var .code:n = {
+      \fontspec_update_fontid:n  {+jfmvar=##1}
+      \fontspec_update_featstr:n {jfmvar=##1}      
+    }
+  }
+  \keys_define:nn {fontspec-preparse-external} { NoEmbed .code:n = {
+      \cs_set:Nn \fontspec_namewrap:n {psft:####1}
+    }
+  }
+  \tl_set:Nn \g_fontspec_encoding_tl {JY3}
+  \tl_set:Nx \g_fontspec_default_fontopts_tl 
+             {JFM=ujis,Scale=0.960444,Kerning=Off,\g_ltj_fontspec_default_fontopts_tl}
+  \cs_set_eq:NN \DeclareFontFamily \DeclareKanjiFamily
+  \fontspec_select:nn{#1}{#2}
   \group_end:
 }
 
-\cs_new:Nn \ltj_fontspec_set_newjfamily:Nnn {
+\cs_new:Nn \ltj_fontspec_set_family:Nnn {
   \ltj_fontspec_select:nn{#2}{#3}
-  \tl_set_eq:NN #1 \zf@family
+  \tl_set_eq:NN #1 \l_fontspec_family_tl
 }
 
 \DeclareDocumentCommand \jfontspec { O{} m } {
-  \ltj_fontspec_set_newjfamily:Nnn \k@family {#1}{#2}
+  \ltj_fontspec_set_family:Nnn \k@family {#1}{#2}
   \selectfont
   \ignorespaces
 }
 
 \DeclareDocumentCommand \setmainjfont { O{} m } {
-  \ltj_fontspec_set_newjfamily:Nnn \mcdefault {#1}{#2}
+  \ltj_fontspec_set_family:Nnn \mcdefault {#1}{#2}
   \normalfont
 }
 
 \DeclareDocumentCommand \setsansjfont { O{} m } {
-  \ltj_fontspec_set_newjfamily:Nnn \gtdefault {#1}{#2}
+  \ltj_fontspec_set_family:Nnn \gtdefault {#1}{#2}
   \normalfont
 }
 
-\DeclareRobustCommand\jfontfamily[1]{\edef\k@family{#1}}
-
 \DeclareDocumentCommand \newjfontfamily { m O{} m } {
   \ltj_fontspec_select:nn{#2}{#3}
   \use:x {
     \exp_not:N \DeclareRobustCommand \exp_not:N #1 {
-      \exp_not:N \jfontfamily {\zf@family} \exp_not:N \selectfont
+      \exp_not:N \kanjifamily {\l_fontspec_family_tl} \exp_not:N \selectfont
     }
   }
 }
 
+\DeclareDocumentCommand \newjfontface { m O{} m } {
+  \newjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2 ] {#3}
+}
+
+\DeclareDocumentCommand \defaultjfontfeatures {m} {
+  \tl_set:Nn \g_ltj_fontspec_default_fontopts_tl {#1,}
+}
+
+\tl_clear:N \g_ltj_fontspec_default_fontopts_tl
+
+\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
+
 \endinput