OSDN Git Service
(root)
/
luatex-ja
/
luatexja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c28036e
)
luatexja-fontspec: Fix \addjfontfeatures.
author
Kazuki Maeda
<kmaeda@kmaeda.net>
Sat, 21 Jun 2014 03:15:26 +0000
(12:15 +0900)
committer
Kazuki Maeda
<kmaeda@kmaeda.net>
Sat, 21 Jun 2014 03:15:26 +0000
(12:15 +0900)
src/addons/luatexja-fontspec-24.sty
patch
|
blob
|
history
diff --git
a/src/addons/luatexja-fontspec-24.sty
b/src/addons/luatexja-fontspec-24.sty
index
9ecba71
..
894f3cf
100644
(file)
--- a/
src/addons/luatexja-fontspec-24.sty
+++ b/
src/addons/luatexja-fontspec-24.sty
@@
-95,6
+95,7
@@
\clist_set:Nn \l_ltj_fontspec_altfont_clist {#1}
}
\clist_set:Nn \l_ltj_fontspec_altfont_clist {#1}
}
+\cs_set_eq:NN \__ltj_orig_fontspec_select:nn \fontspec_select:nn
\cs_new:Nn \ltj_fontspec_select:nn {
\group_begin:
\ltj_fontspec_define_option:nn {AltFont} {
\cs_new:Nn \ltj_fontspec_select:nn {
\group_begin:
\ltj_fontspec_define_option:nn {AltFont} {
@@
-125,7
+126,7
@@
\prop_set_eq:NN \g__fontspec_fontopts_prop \g__ltj_fontspec_fontopts_prop
\cs_set_eq:NN \__fontspec_make_font_shapes:Nnnnn \ltj_fontspec_make_font_shapes:Nnnnn
\cs_set_eq:NN \DeclareFontFamily \DeclareKanjiFamily
\prop_set_eq:NN \g__fontspec_fontopts_prop \g__ltj_fontspec_fontopts_prop
\cs_set_eq:NN \__fontspec_make_font_shapes:Nnnnn \ltj_fontspec_make_font_shapes:Nnnnn
\cs_set_eq:NN \DeclareFontFamily \DeclareKanjiFamily
- \fontspec_select:nn{#1}{#2}
+ \
__ltj_orig_
fontspec_select:nn{#1}{#2}
\group_end:
}
\group_end:
}
@@
-238,24
+239,28
@@
}
\DeclareDocumentCommand \addjfontfeatures {m} {
}
\DeclareDocumentCommand \addjfontfeatures {m} {
- \ifcsname zf@family@fontdef\k@family\endcsname
+ \ltj_fontspec_if_fontspec_font:TF
+ {
\group_begin:
\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}
- }
+ \tl_set_eq:NN \f@family \k@family
+ \cs_set_eq:NN \fontspec_select:nn \ltj_fontspec_select:nn
+ \addfontfeatures {#1}
\group_end:
\fontfamily\l_fontspec_family_tl\selectfont
\group_end:
\fontfamily\l_fontspec_family_tl\selectfont
- \else
+ }{
\msg_warning:nn {luatexja-fontspec} {addjfontfeatures-ignored}
\msg_warning:nn {luatexja-fontspec} {addjfontfeatures-ignored}
- \fi
+ }
\ignorespaces
}
\cs_set_eq:NN \addjfontfeature \addjfontfeatures
\ignorespaces
}
\cs_set_eq:NN \addjfontfeature \addjfontfeatures
+\prg_new_conditional:Nnn \ltj_fontspec_if_fontspec_font: {TF,T,F}
+{
+ \cs_if_exist:cTF {g__fontspec_ \k@family _prop} \prg_return_true: \prg_return_false:
+}
+
+
%%% CJKShape=JIS2004
\__fontspec_define_feature_option:nnnnn{CJKShape}{JIS2004}{20}{5}{+jp04}
%%% CJKShape=JIS2004
\__fontspec_define_feature_option:nnnnn{CJKShape}{JIS2004}{20}{5}{+jp04}