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.sty
diff --git
a/src/addons/luatexja-fontspec.sty
b/src/addons/luatexja-fontspec.sty
index
7d5ad32
..
e32d20a
100644
(file)
--- a/
src/addons/luatexja-fontspec.sty
+++ b/
src/addons/luatexja-fontspec.sty
@@
-3,14
+3,22
@@
%
\NeedsTeXFormat{LaTeX2e}
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec}[201
7/12/15
fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec}[201
9/09/26
fontspec support of LuaTeX-ja]
\RequirePackage{l3keys2e,luatexja}
\ExplSyntaxOn
\RequirePackage{l3keys2e,luatexja}
\ExplSyntaxOn
-\bool_new:N \ltj_fontspec_match_bool
+\cs_if_exist:NF \Cjascale {
+ %% Default scale value for jfont.
+ \group_begin:
+ \fontsize{16}{16}\selectfont
+ \cs_gset:Npx \Cjascale { \fp_to_decimal:n {\zw / 16} }
+ \group_end:
+}
+
+\bool_new:N \__ltj_fontspec_match_bool
\keys_define:nn { luatexja-fontspec }
{
\keys_define:nn { luatexja-fontspec }
{
- match .bool_set:N = \ltj_fontspec_match_bool,
+ match .bool_set:N = \
__
ltj_fontspec_match_bool,
match .default:n = true,
pass .code:n = \PassOptionsToPackage{#1} {fontspec},
% 互換性のために残したオプション
match .default:n = true,
pass .code:n = \PassOptionsToPackage{#1} {fontspec},
% 互換性のために残したオプション
@@
-19,11
+27,8
@@
}
\ProcessKeysOptions{ luatexja-fontspec }
}
\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{fontspec}[2019/03/15]% v2.7c
+\RequirePackage{luatexja-fontspec-27c} % v2.7c
\ExplSyntaxOff
%%%%%%%% Now we completely ignore kanjifont definition file.
\ExplSyntaxOff
%%%%%%%% Now we completely ignore kanjifont definition file.
@@
-35,7
+40,7
@@
\ifx\csname \f@encoding+\f@family\endcsname\relax
\directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f@encoding}')}%
\ifin@\else % Alphabetic font
\ifx\csname \f@encoding+\f@family\endcsname\relax
\directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f@encoding}')}%
\ifin@\else % Alphabetic font
- \@font@info{Try loading font information for \f@encoding+\f@family}%
+ \@font@info{Try
ing
loading font information for \f@encoding+\f@family}%
\global\expandafter\let
\csname\f@encoding+\f@family\endcsname\@empty
\nfss@catcodes
\global\expandafter\let
\csname\f@encoding+\f@family\endcsname\@empty
\nfss@catcodes