OSDN Git Service
(root)
/
luatex-ja
/
luatexja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Target release date: 2019-11-17
[luatex-ja/luatexja.git]
/
src
/
addons
/
luatexja-fontspec-25c.sty
diff --git
a/src/addons/luatexja-fontspec-25c.sty
b/src/addons/luatexja-fontspec-25c.sty
index
7998e96
..
1e227b4
100644
(file)
--- a/
src/addons/luatexja-fontspec-25c.sty
+++ b/
src/addons/luatexja-fontspec-25c.sty
@@
-3,20
+3,20
@@
%
\NeedsTeXFormat{LaTeX2e}
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-25c}[201
7/12/15
fontspec support of LuaTeX-ja]
-\RequirePackage{l3keys2e
,luatexja
}
+\ProvidesPackage{luatexja-fontspec-25c}[201
9/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
\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
}
}
\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}
%%%%%%%% Messages
\msg_new:nnn {luatexja-fontspec} {addjfontfeatures-ignored}
@@
-104,7
+104,7
@@
\__fontspec_update_featstr:n {cid=##1}
}
\ltj_fontspec_define_option:nn {Kanjiskip} {
\__fontspec_update_featstr:n {cid=##1}
}
\ltj_fontspec_define_option:nn {Kanjiskip} {
- \str_if_eq
_x:nn
TF {false} { \str_lower_case:n { ##1 } }{
+ \str_if_eq
:ee
TF {false} { \str_lower_case:n { ##1 } }{
\__fontspec_update_featstr:n {-ltjksp}
} {
\__fontspec_update_featstr:n {+ltjksp}
\__fontspec_update_featstr:n {-ltjksp}
} {
\__fontspec_update_featstr:n {+ltjksp}
@@
-139,7
+139,7
@@
Kerning/Off.code:n=\__fontspec_update_featstr:n {-kern}
}
\clist_set:Nx \g__fontspec_default_fontopts_clist {
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
}
Scale=\Cjascale, Kerning=Off, Script=CJK,
\g__ltj_fontspec_default_fontopts_clist
}
@@
-281,14
+281,18
@@
\DeclareDocumentCommand \setmainjfont { O{} m O{} } {
\ltj_fontspec_set_family:Nnn \mcdefault {#1,#3}{#2}
\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}
\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
}
\normalfont
}