Update luatexja-fontspec.sty with fontspec v2.2a.

diff --git a/src/luatexja-fontspec.sty b/src/luatexja-fontspec.sty
index 886c7f6..0d5f25a 100644 (file)
--- a/src/luatexja-fontspec.sty
+++ b/src/luatexja-fontspec.sty
@@ -3,9 +3,10 @@
 %
 
 \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
 
@@ -19,14 +20,16 @@
 
 \cs_new:Nn \ltj_fontspec_select:nn {
   \group_begin:
-  \define@key[zf]{options}{JFM}{
-    \fontspec_update_fontid:n  {+jfm=##1}
-    \fontspec_update_featstr:n {jfm=##1}
+  \keys_define:nn {fontspec} { JFM .code:n = {
+      \fontspec_update_fontid:n  {+jfm=##1}
+      \fontspec_update_featstr:n {jfm=##1}      
+    }
   }
-  \define@key[zf]{preparse-external}{NoEmbed}[]{
-    \cs_set:Nn \fontspec_namewrap:n {psft:####1}
+  \keys_define:nn {fontspec-preparse-external} { NoEmbed .code:n = {
+      \cs_set:Nn \fontspec_namewrap:n {psft:####1}
+    }
   }
-  \tl_set:Nn \zf@enc {JY3}
+  \tl_set:Nn \g_fontspec_encoding_tl {JY3}
   \tl_set:Nx \g_fontspec_default_fontopts_tl 
              {JFM=ujis,Scale=0.960444,\g_ltj_fontspec_default_fontopts_tl}
   \cs_set_eq:NN \DeclareFontFamily \DeclareKanjiFamily
@@ -36,7 +39,7 @@
 
 \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 } {
@@ -59,7 +62,7 @@
   \ltj_fontspec_select:nn{#2}{#3}
   \use:x {
     \exp_not:N \DeclareRobustCommand \exp_not:N #1 {
-      \exp_not:N \kanjifamily {\zf@family} \exp_not:N \selectfont
+      \exp_not:N \kanjifamily {\l_fontspec_family_tl} \exp_not:N \selectfont
     }
   }
 }
@@ -84,7 +87,7 @@
           {\csname zf@family@fontname\k@family\endcsname}
       }
     \group_end:
-    \fontfamily\zf@family\selectfont
+    \fontfamily\l_fontspec_family_tl\selectfont
   \else
     \ltj_fontspec_warning:n {addjfontfeatures-ignored}
   \fi

diff --git a/test/test09-fontspec.pdf b/test/test09-fontspec.pdf
index 39aa78e..aaaa9c4 100644 (file)
Binary files a/test/test09-fontspec.pdf and b/test/test09-fontspec.pdf differ