%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-25c}[2017/12/15 fontspec support of LuaTeX-ja]
-\RequirePackage{l3keys2e,luatexja}
+\ProvidesPackage{luatexja-fontspec-25c}[2019/05/14 fontspec support of LuaTeX-ja]
+\RequirePackage{l3keys2e}
\ExplSyntaxOn
%%%%%%%% Change Japanese font family by \rmfamily or not
\cs_new:Npn \ltj_fontspec_match_cmd {
\renewcommand\jttdefault{\gtdefault}
\@ltj@match@familytrue
- \DeclareDocumentCommand \setmonojfont { O{} m } {
- \ltj_fontspec_set_family:Nnn \jttdefault {##1}{##2}
+ \DeclareDocumentCommand \setmonojfont { O{} m O{} } {
+ \ltj_fontspec_set_family:Nnn \jttdefault {##1,##3}{##2}
\normalfont
}
}
-\bool_if:NT \ltj_fontspec_match_bool \ltj_fontspec_match_cmd
+\bool_if:NT \__ltj_fontspec_match_bool \ltj_fontspec_match_cmd
%%%%%%%% Messages
\msg_new:nnn {luatexja-fontspec} {addjfontfeatures-ignored}
\__fontspec_update_featstr:n {cid=##1}
}
\ltj_fontspec_define_option:nn {Kanjiskip} {
- \str_if_eq_x:nnTF {false} { \str_lower_case:n { ##1 } }{
+ \str_if_eq:eeTF {false} { \str_lower_case:n { ##1 } }{
\__fontspec_update_featstr:n {-ltjksp}
} {
\__fontspec_update_featstr:n {+ltjksp}
Kerning/Off.code:n=\__fontspec_update_featstr:n {-kern}
}
\clist_set:Nx \g__fontspec_default_fontopts_clist {
- YokoFeatures = { JFM=ujis }, TateFeatures = { JFM=ujisv },
+ YokoFeatures = { JFM=\ltj@stdyokojfm }, TateFeatures = { JFM=\ltj@stdtatejfm },
Scale=\Cjascale, Kerning=Off, Script=CJK,
\g__ltj_fontspec_default_fontopts_clist
}
\DeclareDocumentCommand \setmainjfont { O{} m O{} } {
\ltj_fontspec_set_family:Nnn \mcdefault {#1,#3}{#2}
- \DeclareSymbolFont{mincho}{JY3}{\l_fontspec_family_tl}{\mddefault}{n}
- \SetSymbolFont{mincho}{bold}{JY3}{\l_fontspec_family_tl}{\bfdefault}{n}
+ \unless\ifltj@disablejfam
+ \DeclareSymbolFont{mincho}{JY3}{\l_fontspec_family_tl}{\mddefault}{n}
+ \SetSymbolFont{mincho}{bold}{JY3}{\l_fontspec_family_tl}{\bfdefault}{n}
+ \fi
\normalfont
}
\DeclareDocumentCommand \setsansjfont { O{} m O{} } {
\ltj_fontspec_set_family:Nnn \gtdefault {#1,#3}{#2}
- \DeclareMathAlphabet{\mathgt}{JY3}{\l_fontspec_family_tl}{\mddefault}{n}
+ \unless\ifltj@disablejfam
+ \DeclareMathAlphabet{\mathgt}{JY3}{\l_fontspec_family_tl}{\mddefault}{n}
+ \fi
\normalfont
}