X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Faddons%2Fluatexja-fontspec.sty;h=4a037d640cd16caf22ad9b24316eb02803746328;hb=4aeb2912489ca475608050536696dc1e569727c4;hp=3a81907855574c995b08587747cf1355a219227a;hpb=a15809ed77d030114ba89caff38e71b36e53cbcf;p=luatex-ja%2Fluatexja.git

diff --git a/src/addons/luatexja-fontspec.sty b/src/addons/luatexja-fontspec.sty
index 3a81907..4a037d6 100644
--- a/src/addons/luatexja-fontspec.sty
+++ b/src/addons/luatexja-fontspec.sty
@@ -3,12 +3,12 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec}[2011/09/23 v0.2]
+\ProvidesPackage{luatexja-fontspec}[2012/09/17 v0.2a]
 
 \RequirePackage{fontspec,luatexja}
-
 \ExplSyntaxOn
 
+%%%%%%%% Messages
 \cs_new:Npn \ltj_fontspec_warning:n   { \msg_warning:nn   {ltj-fontspec} }
 
 \msg_new:nnn {ltj-fontspec} {addjfontfeatures-ignored}
@@ -19,12 +19,22 @@
 
 \cs_generate_variant:Nn \prg_new_conditional:Nnn {Nnx}
 
+%%%%%%%% For compatibility with old fontspec.
 \prg_new_conditional:Nnx \ltj_fontspec_if_liiikeys: {TF,F} {
   \@ifpackagelater {fontspec} {2011/09/13}
   { \exp_not:N \prg_return_true: }  % fontspec >= 2.2 (l3keys)
   { \exp_not:N \prg_return_false: } % fontspec <  2.2 (xkeyval)
 }
 
+%%%%%%%% \g_ltj_fontspec_scale_fp
+%% Default scale value for jfont.
+\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 {
   \ltj_fontspec_if_liiikeys:TF {
     \keys_define:nn {fontspec} { #1 .code:n = {#2}}
@@ -43,13 +53,17 @@
 
 \cs_new:Nn \ltj_fontspec_select:nn {
   \group_begin:
+  \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}      
+    \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}      
+    \fontspec_update_featstr:n {jfmvar=##1}
   }
   \ltj_fontspec_define_preparse_external:nn {NoEmbed} {
     \cs_set:Nn \fontspec_namewrap:n {psft:####1}
@@ -58,15 +72,15 @@
   %% "OpenType feature 'Kerning=Off' (-kern) not available ..."
   \ltj_fontspec_define_option:nn {Kerning/Off} {
     \fontspec_update_fontid:n  {-kern}
-    \fontspec_update_featstr:n {-kern}      
-  }  
+    \fontspec_update_featstr:n {-kern}
+  }
   \ltj_fontspec_if_liiikeys:TF {
     \tl_set:Nn \g_fontspec_encoding_tl {JY3}
   } {
     \tl_set:Nn \zf@enc {JY3}
   }
-  \tl_set:Nx \g_fontspec_default_fontopts_tl 
-             {JFM=ujis,Scale=0.962216,Kerning=Off,\g_ltj_fontspec_default_fontopts_tl}
+  \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}
   \cs_set_eq:NN \DeclareFontFamily \DeclareKanjiFamily
   \fontspec_select:nn{#1}{#2}
   \group_end:
@@ -80,6 +94,7 @@
   \tl_set_eq:NN #1 \l_fontspec_family_tl
 }
 
+%%%%%%%% User commands
 \DeclareDocumentCommand \jfontspec { O{} m } {
   \ltj_fontspec_set_family:Nnn \k@family {#1}{#2}
   \selectfont