From: Kazuki Maeda <kmaeda@users.sourceforge.jp>
Date: Sun, 25 Sep 2011 02:01:24 +0000 (+0900)
Subject: luatexja-fontspec.sty: Fix the error "Can be used only in preamble."
X-Git-Tag: 20120419.0~75
X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=86a7c4047ac2c2563501767826991b1975da0c4c;p=luatex-ja%2Fluatexja.git

luatexja-fontspec.sty: Fix the error "Can be used only in preamble."
---

diff --git a/src/luatexja-fontspec.sty b/src/luatexja-fontspec.sty
index 5b69f7e..fbfbbd2 100644
--- a/src/luatexja-fontspec.sty
+++ b/src/luatexja-fontspec.sty
@@ -18,10 +18,12 @@
   it~ cannot~ be~ used~ with~ a~ font~ that~ wasn't~ selected~ by~ luatexja-fontspec.
 }
 
-\prg_new_conditional:Nnn \ltj_fontspec_if_liiikeys: {TF,F} {
+\cs_generate_variant:Nn \prg_new_conditional:Nnn {Nnx}
+
+\prg_new_conditional:Nnx \ltj_fontspec_if_liiikeys: {TF,F} {
   \@ifpackagelater {fontspec} {2011/09/13}
-  { \prg_return_true: }  % fontspec >= 2.2 (l3keys)
-  { \prg_return_false: } % fontspec <  2.2 (xkeyval)
+  { \exp_not:N \prg_return_true: }  % fontspec >= 2.2 (l3keys)
+  { \exp_not:N \prg_return_false: } % fontspec <  2.2 (xkeyval)
 }
 
 \cs_new:Nn \ltj_fontspec_define_option:nn {