%
-% luatexja-fontspec-25c.sty
+% luatexja-fontspec-26h.sty
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec-25c}[2018/06/15 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec-26h}[2018/07/31 fontspec support of LuaTeX-ja]
\RequirePackage{l3keys2e,luatexja}
\ExplSyntaxOn
\tl_set_eq:NN \l__fontspec_saved_fontname_tl \l_fontspec_fontname_tl
\tl_set:Nn \g_fontspec_encoding_tl {#5}
- \tl_set:Nn \l__fontspec_nfss_enc_tl {#5}
+ \cs_if_exist:NTF \l__fontspec_nfss_enc_tl
+ { \tl_set:Nn \l__fontspec_nfss_enc_tl {#5} }
+ { \tl_set:Nn \g__fontspec_nfss_enc_tl {#5} }
\exp_args:Nx \clist_map_inline:nn {#4}
{
\tl_clear:N \l__fontspec_size_tl
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec}[2017/12/31 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec}[2018/07/31 fontspec support of LuaTeX-ja]
\RequirePackage{l3keys2e,luatexja}
\ExplSyntaxOn
\ProcessKeysOptions{ luatexja-fontspec }
\RequirePackage{fontspec}[2017/01/01]% v2.5c
-\RequirePackage{luatexja-fontspec-25c}
-%\@ifpackagelater{fontspec}{2017/01/01}%
-% {\RequirePackage{luatexja-fontspec-25c}}% v2.5c
-% {\RequirePackage{luatexja-fontspec-24}}% --v2.5a
+\RequirePackage{luatexja-fontspec-26h}
\ExplSyntaxOff
%%%%%%%% Now we completely ignore kanjifont definition file.
\RequirePackage{fontspec,luatexja}
\ExplSyntaxOn
+% <= v2.6g uses \l__fontspec_nfss_enc_tl instead of \g__fontspec_nfss_enc_tl
+\ifdefined \g__fontspec_nfss_enc_tl \else
+ \def \g__fontspec_nfss_enc_tl { \l__fontspec_nfss_enc_tl }
+\fi
+
\@ifpackagelater{fontspec}{2017/01/01}{
%%%%%%%% fontspec v2.5c overwrites \rmfamily etc. in \setmainfont
\DeclareDocumentCommand \setmainfont { O{} m O{} }
\tl_set_eq:NN \rmdefault \g__fontspec_rmfamily_family
\use:x { \exp_not:n { \DeclareRobustCommand \rmfamily }
{
- \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl }
+ \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl }
\exp_not:N \fontfamily { \g__fontspec_rmfamily_family }
\exp_not:N\if@ltj@match@family\exp_not:N\kanjifamily\exp_not:N\mcdefault\exp_not:N\fi%%%
\exp_not:N \selectfont
}
}
\str_if_eq_x:nnT {\familydefault} {\rmdefault}
- { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl }
+ { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
\normalfont
\ignorespaces
}
\tl_set_eq:NN \sfdefault \g__fontspec_sffamily_family
\use:x { \exp_not:n { \DeclareRobustCommand \sffamily }
{
- \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl }
+ \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl }
\exp_not:N \fontfamily { \g__fontspec_sffamily_family }
\exp_not:N\if@ltj@match@family\exp_not:N\kanjifamily\exp_not:N\gtdefault\exp_not:N\fi%%%
\exp_not:N \selectfont
}
}
\str_if_eq_x:nnT {\familydefault} {\sfdefault}
- { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl }
+ { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
\normalfont
\ignorespaces
}
\tl_set_eq:NN \ttdefault \g__fontspec_ttfamily_family
\use:x { \exp_not:n { \DeclareRobustCommand \ttfamily }
{
- \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl }
+ \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl }
\exp_not:N \fontfamily { \g__fontspec_ttfamily_family }
\exp_not:N\if@ltj@match@family\exp_not:N\kanjifamily\exp_not:N\jttdefault\exp_not:N\fi%%%
\exp_not:N \selectfont
}
}
\str_if_eq_x:nnT {\familydefault} {\ttdefault}
- { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl }
+ { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl }
\normalfont
\ignorespaces
}