• R/O
  • HTTP
  • SSH
  • HTTPS

luatexja: コミット

ソースコードの管理場所


コミットメタ情報

リビジョンbf02d2b769f5144c0cfdeacedb23e1b96c96b67f (tree)
日時2020-01-26 09:53:57
作者Hironori Kitagawa <h_kitagawa2001@yaho...>
コミッターHironori Kitagawa

ログメッセージ

Always define \setmonojfont in luatexja-fontspec, and bx->b in luatexja-preset.

変更サマリ

差分

--- a/README
+++ b/README
@@ -22,7 +22,7 @@ Installation
2222
2323 0. Please make sure that your TeX distribution is up-to-date.
2424 This version of LuaTeX-ja requires
25- - LuaTeX 1.0.0 or later
25+ - LuaTeX 1.07.0 (or later)
2626 - luaotfload (v3.1 or later recommended)
2727 - adobemapping (Adobe CMap files)
2828 - everysel package
@@ -38,7 +38,7 @@ Installation
3838 One might be able to typeset documents without an error, but with
3939 some unwanted results.
4040
41-1. If you are using TeX Live 2019 or later, you can install LuaTeX-ja via tlmgr.
41+1. If you are using TeX Live 2019, you can install LuaTeX-ja via tlmgr.
4242
4343 2. If you must/want to install manually:
4444
--- a/src/addons/luatexja-fontspec-27c.sty
+++ b/src/addons/luatexja-fontspec-27c.sty
@@ -3,21 +3,15 @@
33 %
44
55 \NeedsTeXFormat{LaTeX2e}
6-\ProvidesPackage{luatexja-fontspec-27c}[2019/11/15 fontspec support of LuaTeX-ja]
6+\ProvidesPackage{luatexja-fontspec-27c}[2020/01/26 fontspec support of LuaTeX-ja]
77 \RequirePackage{l3keys2e}
88 \ExplSyntaxOn
99
1010 %%%%%%%% Change Japanese font family by \rmfamily or not
11-\cs_new:Npn \__ltj_fontspec_match_cmd {
11+\bool_if:NT \__ltj_fontspec_match_bool {
1212 \renewcommand\jttdefault{\gtdefault}
1313 \@ltj@match@familytrue
14- \DeclareDocumentCommand \setmonojfont { O{} m O{} } {
15- \__ltj_fontspec_set_family:Nnn \jttdefault {##1,##3}{##2}
16- \normalfont
17- }
1814 }
19-\bool_if:NT \__ltj_fontspec_match_bool \__ltj_fontspec_match_cmd
20-
2115 %%%%%%%% Messages
2216 \msg_new:nnn {luatexja-fontspec} {addjfontfeatures-ignored}
2317 {
@@ -336,6 +330,11 @@
336330 \normalfont
337331 }
338332
333+\DeclareDocumentCommand \setmonojfont { O{} m O{} } {
334+ \__ltj_fontspec_set_family:Nnn \jttdefault {#1,#3}{#2}
335+ \normalfont
336+}
337+
339338 \DeclareDocumentCommand \newjfontfamily { m O{} m O{} } {
340339 \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_fontspec_set_family:Nnn
341340 \newfontfamily #1 [#2,#4] {#3}
--- a/src/addons/luatexja-preset.sty
+++ b/src/addons/luatexja-preset.sty
@@ -1,5 +1,5 @@
11 % luatexja-preset.sty
2-\ProvidesPackage{luatexja-preset}[2019/03/26 Japanese font presets]
2+\ProvidesPackage{luatexja-preset}[2020/01/26 Japanese font presets]
33
44 \RequirePackage{expl3,l3keys2e}
55 \RequirePackage{luatexja}
@@ -98,13 +98,17 @@
9898 mc .code:n =
9999 \prop_put:Nnn \g__ltjpreset_font_prop { mc-l } {#1}
100100 \prop_put:Nnn \g__ltjpreset_font_prop { mc-m } {#1}
101- \prop_put:Nnn \g__ltjpreset_font_prop { mc-bx } {#1},
101+ \prop_put:Nnn \g__ltjpreset_font_prop { mc-b } {#1},
102102 mc .groups:n = { preset }, mc .value_required:n = true,
103+ mc-bx .code:n =
104+ \prop_put:Nnn \g__ltjpreset_font_prop { mc-b } {#1},
103105 gt .code:n =
104106 \prop_put:Nnn \g__ltjpreset_font_prop { gt-u } {#1}
105107 \prop_put:Nnn \g__ltjpreset_font_prop { gt-d } {#1}
106- \prop_put:Nnn \g__ltjpreset_font_prop { gt-bx } {#1}
108+ \prop_put:Nnn \g__ltjpreset_font_prop { gt-b } {#1}
107109 \prop_put:Nnn \g__ltjpreset_font_prop { gt-eb } {#1},
110+ gt-bx .code:n =
111+ \prop_put:Nnn \g__ltjpreset_font_prop { gt-b } {#1},
108112 gt-m .code:n = % gtfamily , medium series
109113 \prop_put:Nnn \g__ltjpreset_font_prop { gt-u } {#1}
110114 \prop_put:Nnn \g__ltjpreset_font_prop { gt-d } {#1},
@@ -120,20 +124,20 @@
120124 }
121125 \ltjpreset_define_preset_prop:n { mc-l }
122126 \ltjpreset_define_preset_prop:n { mc-m }
123-\ltjpreset_define_preset_prop:n { mc-bx }
127+\ltjpreset_define_preset_prop:n { mc-b }
124128 \ltjpreset_define_preset_prop:n { gt-u }
125129 \ltjpreset_define_preset_prop:n { gt-d }
126-\ltjpreset_define_preset_prop:n { gt-bx }
130+\ltjpreset_define_preset_prop:n { gt-b }
127131 \ltjpreset_define_preset_prop:n { gt-eb}
128132 \ltjpreset_define_preset_prop:n { mg-m }
129133
130134 \cs_new:Nn \__ltjpreset_set_uni:nn {
131- mc = #1, gt = #2, mc-bx = #2, mg-m = #2,
135+ mc = #1, gt = #2, mc-b = #2, mg-m = #2,
132136 __custom = false, __office = false, __noembed = false,
133137 }
134138 \cs_new:Npn \__ltjpreset_set_office:nn #1 #2{
135- mc = #1, mc-bx = HGMinchoE ,
136- gt-d = HGGothicM , gt-bx = HGGothicE ,
139+ mc = #1, mc-b = HGMinchoE ,
140+ gt-d = HGGothicM , gt-b = HGGothicE ,
137141 gt-u = #2 , gt-eb = HGSoeiKakugothicUB ,
138142 mg-m = HGMaruGothicMPRO,
139143 __custom = false, __office = true, __noembed = false,
@@ -152,24 +156,24 @@
152156 % 小塚 (Adobe)
153157 %% Pro
154158 \ltjpreset_declare_preset:nx{kozuka-pro}{
155- mc-m = KozMinPro-Regular, mc-bx = KozMinPro-Bold,
156- gt-d = KozGoPro-Regular, gt-bx = KozGoPro-Bold,
159+ mc-m = KozMinPro-Regular, mc-b = KozMinPro-Bold,
160+ gt-d = KozGoPro-Regular, gt-b = KozGoPro-Bold,
157161 gt-u = KozGoPro-Medium, gt-eb = KozGoPro-Heavy,
158162 mg-m = KozGoPro-Heavy, mc-l = KozMinPro-Light,
159163 __custom = false, __office = false, __noembed = false,
160164 }
161165 %% Pr6
162166 \ltjpreset_declare_preset:nx{kozuka-pr6}{
163- mc-m = KozMinProVI-Regular, mc-bx = KozMinProVI-Bold,
164- gt-d = KozGoProVI-Regular, gt-bx = KozGoProVI-Bold,
167+ mc-m = KozMinProVI-Regular, mc-b = KozMinProVI-Bold,
168+ gt-d = KozGoProVI-Regular, gt-b = KozGoProVI-Bold,
165169 gt-u = KozGoProVI-Medium, gt-eb = KozGoProVI-Heavy,
166170 mg-m = KozGoProVI-Heavy, mc-l = KozMinProVI-Light,
167171 __custom = false, __office = false, __noembed = false,
168172 }
169173 %% Pr6N
170174 \ltjpreset_declare_preset:nx{kozuka-pr6n}{
171- mc-m = KozMinPr6N-Regular, mc-bx = KozMinPr6N-Bold,
172- gt-d = KozGoPr6N-Regular, gt-bx = KozGoPr6N-Bold,
175+ mc-m = KozMinPr6N-Regular, mc-b = KozMinPr6N-Bold,
176+ gt-d = KozGoPr6N-Regular, gt-b = KozGoPr6N-Bold,
173177 gt-u = KozGoPr6N-Medium, gt-eb = KozGoPr6N-Heavy,
174178 mg-m = KozGoPr6N-Heavy, mc-l = KozMinPr6N-Light,
175179 __custom = false, __office = false, __noembed = false,
@@ -177,15 +181,15 @@
177181
178182 % ヒラギノ (OSX)
179183 \ltjpreset_declare_preset:nx{hiragino-pro}{
180- mc-m = HiraMinPro-W3, mc-bx = HiraMinPro-W6,
181- gt-d = HiraKakuPro-W3, gt-bx = HiraKakuPro-W6,
184+ mc-m = HiraMinPro-W3, mc-b = HiraMinPro-W6,
185+ gt-d = HiraKakuPro-W3, gt-b = HiraKakuPro-W6,
182186 gt-u = HiraKakuPro-W6, gt-eb = HiraKakuStd-W8,
183187 mg-m = HiraMaruPro-W4, mc-l = HiraMinPro-W2,
184188 __custom = false, __office = false, __noembed = false,
185189 }
186190 \ltjpreset_declare_preset:nx{hiragino-pron}{
187- mc-m = HiraMinProN-W3, mc-bx = HiraMinProN-W6,
188- gt-d = HiraKakuProN-W3, gt-bx = HiraKakuProN-W6,
191+ mc-m = HiraMinProN-W3, mc-b = HiraMinProN-W6,
192+ gt-d = HiraKakuProN-W3, gt-b = HiraKakuProN-W6,
189193 gt-u = HiraKakuProN-W6, gt-eb = HiraKakuStdN-W8,
190194 mg-m = HiraMaruProN-W4, mc-l = HiraMinProN-W2,
191195 __custom = false, __office = false, __noembed = false,
@@ -194,21 +198,21 @@
194198 % モリサワ
195199 \ltjpreset_declare_preset:nx{bizud}{
196200 mc = BIZ-UDMinchoM.ttc,
197- gt-d = BIZ-UDGothicR.ttc, gt-bx = BIZ-UDGothicB.ttc,
201+ gt-d = BIZ-UDGothicR.ttc, gt-b = BIZ-UDGothicB.ttc,
198202 gt-u = BIZ-UDGothicR.ttc, gt-eb = BIZ-UDGothicB.ttc,
199203 mg-m = BIZ-UDGothicB.ttc,
200204 __custom = false, __office = false, __noembed = false,
201205 }
202206 \ltjpreset_declare_preset:nx{morisawa-pro}{
203- mc = A-OTF-RyuminPro-Light.otf, mc-bx = A-OTF-FutoMinA101Pro-Bold.otf,
204- gt-d = A-OTF-GothicBBBPro-Medium.otf , gt-bx = A-OTF-FutoGoB101Pro-Bold.otf,
207+ mc = A-OTF-RyuminPro-Light.otf, mc-b = A-OTF-FutoMinA101Pro-Bold.otf,
208+ gt-d = A-OTF-GothicBBBPro-Medium.otf , gt-b = A-OTF-FutoGoB101Pro-Bold.otf,
205209 gt-u = A-OTF-GothicBBBPro-Medium.otf , gt-eb = A-OTF-MidashiGoPro-MB31.otf,
206210 mg-m = A-OTF-Jun101Pro-Light.otf,
207211 __custom = false, __office = false, __noembed = false,
208212 }
209213 \ltjpreset_declare_preset:nx{morisawa-pr6n}{
210- mc = A-OTF-RyuminPr6N-Light.otf, mc-bx = A-OTF-FutoMinA101Pr6N-Bold.otf,
211- gt-d = A-OTF-GothicBBBPr6N-Medium.otf , gt-bx = A-OTF-FutoGoB101Pr6N-Bold.otf,
214+ mc = A-OTF-RyuminPr6N-Light.otf, mc-b = A-OTF-FutoMinA101Pr6N-Bold.otf,
215+ gt-d = A-OTF-GothicBBBPr6N-Medium.otf , gt-b = A-OTF-FutoGoB101Pr6N-Bold.otf,
212216 gt-u = A-OTF-GothicBBBPr6N-Medium.otf , gt-eb = A-OTF-MidashiGoPr6N-MB31.otf,
213217 mg-m = A-OTF-Jun101Pr6N-Light.otf,
214218 __custom = false, __office = false, __noembed = false,
@@ -216,16 +220,16 @@
216220
217221 % 游明朝/游ゴシック (Win8.1)
218222 \ltjpreset_declare_preset:nx{yu-win}{
219- mc-m = YuMincho-Regular, mc-bx = YuMincho-Demibold,
220- gt-d = YuGothic-Regular, gt-bx = YuGothic-Bold,
223+ mc-m = YuMincho-Regular, mc-b = YuMincho-Demibold,
224+ gt-d = YuGothic-Regular, gt-b = YuGothic-Bold,
221225 gt-u = YuGothic-Regular, gt-eb = YuGothic-Bold,
222226 mg-m = YuGothic-Bold, mc-l = YuMincho-Light,
223227 __custom = false, __office = false, __noembed = false,
224228 }
225229 % Win10
226230 \ltjpreset_declare_preset:nx{yu-win10}{
227- mc-m = YuMincho-Regular, mc-bx = YuMincho-Demibold,
228- gt-d = YuGothic-Regular, gt-bx = YuGothic-Bold,
231+ mc-m = YuMincho-Regular, mc-b = YuMincho-Demibold,
232+ gt-d = YuGothic-Regular, gt-b = YuGothic-Bold,
229233 gt-u = YuGothic-Medium, gt-eb = YuGothic-Bold,
230234 mg-m = YuGothic-Bold, mc-l = YuMincho-Light,
231235 __custom = false, __office = false, __noembed = false,
@@ -234,24 +238,24 @@
234238 % Yu fonts in OSX
235239 % according to http://support.apple.com/kb/HT5944
236240 \ltjpreset_declare_preset:nx{yu-osx}{
237- mc = YuMincho~Medium, mc-bx = YuMincho~Demibold,
241+ mc = YuMincho~Medium, mc-b = YuMincho~Demibold,
238242 gt-d = YuGothic~Medium, gt-u = YuGothic~Medium,
239- gt-bx = YuGothic~Bold, gt-eb = YuGothic~Bold,
243+ gt-b = YuGothic~Bold, gt-eb = YuGothic~Bold,
240244 mg-m = YuGothic~Bold,
241245 __custom = false, __office = false, __noembed = false,
242246 }
243247
244248 % moga-mobo
245249 \ltjpreset_declare_preset:nx{moga-mobo}{
246- mc = Moga90Mincho, mc-bx = Moga90Mincho~Bold,
247- gt-d = Moga90Gothic, gt-bx = Moga90Gothic~Bold,
250+ mc = Moga90Mincho, mc-b = Moga90Mincho~Bold,
251+ gt-d = Moga90Gothic, gt-b = Moga90Gothic~Bold,
248252 gt-u = Moga90Gothic, gt-eb = Moga90Gothic~Bold,
249253 mg-m = Mobo90Gothic,
250254 __custom = false, __office = false, __noembed = false,
251255 }
252256 \ltjpreset_declare_preset:nx{moga-mobo-ex}{
253- mc = MogaEx90Mincho, mc-bx = MogaEx90Mincho~Bold,
254- gt-d = MogaEx90Gothic, gt-bx = MogaEx90Gothic~Bold,
257+ mc = MogaEx90Mincho, mc-b = MogaEx90Mincho~Bold,
258+ gt-d = MogaEx90Gothic, gt-b = MogaEx90Gothic~Bold,
255259 gt-u = MogaEx90Gothic, gt-eb = MogaEx90Gothic~Bold,
256260 mg-m = MoboEx90Gothic,
257261 __custom = false, __office = false, __noembed = false,
@@ -260,7 +264,7 @@
260264 % Ume fones
261265 \ltjpreset_declare_preset:nx{ume}{
262266 mc = Ume~Mincho,
263- gt-d = Ume~Gothic, gt-bx = Ume~Gothic~O5,
267+ gt-d = Ume~Gothic, gt-b = Ume~Gothic~O5,
264268 gt-u = Ume~Gothic~O5, gt-eb = Ume~Gothic~O5,
265269 mg-m = Ume~Gothic~O4,
266270 __custom = false, __office = false, __noembed = false,
@@ -269,9 +273,9 @@
269273 % Source Han {Serif,Sans}
270274 \ltjpreset_declare_preset:nx{sourcehan}{
271275 mc-m = Source~Han~Serif~Regular,
272- mc-bx = Source~Han~Serif~Bold,
276+ mc-b = Source~Han~Serif~Bold,
273277 gt-d = Source~Han~Sans~Regular,
274- gt-bx = Source~Han~Sans~Bold,
278+ gt-b = Source~Han~Sans~Bold,
275279 gt-u = Source~Han~Sans~Medium,
276280 gt-eb = Source~Han~Sans~Heavy,
277281 mg-m = Source~Han~Sans~Heavy,
@@ -280,9 +284,9 @@
280284 }
281285 \ltjpreset_declare_preset:nx{sourcehan-jp}{
282286 mc-m = Source~Han~Serif~JP~Regular,
283- mc-bx = Source~Han~Serif~JP~Bold,
287+ mc-b = Source~Han~Serif~JP~Bold,
284288 gt-d = Source~Han~Sans~JP~Regular,
285- gt-bx = Source~Han~Sans~JP~Bold,
289+ gt-b = Source~Han~Sans~JP~Bold,
286290 gt-u = Source~Han~Sans~JP~Medium,
287291 gt-eb = Source~Han~Sans~JP~Heavy,
288292 mg-m = Source~Han~Sans~JP~Heavy,
@@ -291,9 +295,9 @@
291295 }
292296 \ltjpreset_declare_preset:nx{noto-otc}{
293297 mc-m = Noto~Serif~CJK~Regular,
294- mc-bx = Noto~Serif~CJK~Bold,
298+ mc-b = Noto~Serif~CJK~Bold,
295299 gt-d = Noto~Sans~CJK~Regular,
296- gt-bx = Noto~Sans~CJK~Bold,
300+ gt-b = Noto~Sans~CJK~Bold,
297301 gt-u = Noto~Sans~CJK~Medium,
298302 gt-eb = Noto~Sans~CJK~Black,
299303 mg-m = Noto~Sans~CJK~Black,
@@ -302,9 +306,9 @@
302306 }
303307 \ltjpreset_declare_preset:nx{noto-otf}{
304308 mc-m = Noto~Serif~CJK~JP~Regular,
305- mc-bx = Noto~Serif~CJK~JP~Bold,
309+ mc-b = Noto~Serif~CJK~JP~Bold,
306310 gt-d = Noto~Sans~CJK~JP~Regular,
307- gt-bx = Noto~Sans~CJK~JP~Bold,
311+ gt-b = Noto~Sans~CJK~JP~Bold,
308312 gt-u = Noto~Sans~CJK~JP~Medium,
309313 gt-eb = Noto~Sans~CJK~JP~Black,
310314 mg-m = Noto~Sans~CJK~JP~Black,
@@ -315,9 +319,9 @@
315319 % HaranoAji {Mincho, Gothic}
316320 \ltjpreset_declare_preset:nx{haranoaji}{
317321 mc-m = HaranoAjiMincho-Regular.otf,
318- mc-bx = HaranoAjiMincho-Bold.otf,
322+ mc-b = HaranoAjiMincho-Bold.otf,
319323 gt-d = HaranoAjiGothic-Regular.otf,
320- gt-bx = HaranoAjiGothic-Bold.otf,
324+ gt-b = HaranoAjiGothic-Bold.otf,
321325 gt-u = HaranoAjiGothic-Medium.otf,
322326 gt-eb = HaranoAjiGothic-Heavy.otf,
323327 mg-m = HaranoAjiGothic-Heavy.otf,
@@ -392,18 +396,18 @@
392396 %%%% リストからの展開
393397 \cs_set:Nx \__ltjpreset_font_mc_l: { \prop_item:Nn \g__ltjpreset_font_prop { mc-l } }
394398 \cs_set:Nx \__ltjpreset_font_mc_m: { \prop_item:Nn \g__ltjpreset_font_prop { mc-m } }
395- \cs_set:Nx \__ltjpreset_font_mc_bx: { \prop_item:Nn \g__ltjpreset_font_prop { mc-bx } }
399+ \cs_set:Nx \__ltjpreset_font_mc_b: { \prop_item:Nn \g__ltjpreset_font_prop { mc-b } }
396400 \cs_set:Nx \__ltjpreset_font_gt_m: { \prop_item:Nn \g__ltjpreset_font_prop { gt-d } }
397401 \cs_set:Nx \__ltjpreset_font_gt_u: { \prop_item:Nn \g__ltjpreset_font_prop { gt-u } }
398- \cs_set:Nx \__ltjpreset_font_gt_bx: { \prop_item:Nn \g__ltjpreset_font_prop { gt-bx } }
402+ \cs_set:Nx \__ltjpreset_font_gt_b: { \prop_item:Nn \g__ltjpreset_font_prop { gt-b } }
399403 \cs_set:Nx \__ltjpreset_font_gt_eb: { \prop_item:Nn \g__ltjpreset_font_prop { gt-eb } }
400404 \cs_set:Nx \__ltjpreset_font_mg_m: { \prop_item:Nn \g__ltjpreset_font_prop { mg-m } }
401405 %% HG 系フォント + JIS2004/90JIS のときはフォント名を置換
402406 \bool_if:nT { !\g__ltjpreset_custom_bool && \g__ltjpreset_office_bool } {
403407 \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS2004 }
404408 \tl_if_eq:NNT \l__ltjpreset_kanji_shape_tl \l_tmpa_tl {
405- \cs_set:Nx \__ltjpreset_font_mc_bx: { hgrme04.ttc }
406- \cs_set:Nx \__ltjpreset_font_gt_bx: { hgrge04.ttc }
409+ \cs_set:Nx \__ltjpreset_font_mc_b: { hgrme04.ttc }
410+ \cs_set:Nx \__ltjpreset_font_gt_b: { hgrge04.ttc }
407411 \cs_set:Nx \__ltjpreset_font_gt_eb: { hgrsgu04.ttc }
408412 \cs_set:Nx \__ltjpreset_font_mg_m: { hgrsmp04.ttf }
409413 \cs_set_eq:NN \__ltjpreset_font_gt_m: \__ltjpreset_font_gt_u:
@@ -411,8 +415,8 @@
411415 }
412416 \tl_set:Nn \l_tmpa_tl {, CJKShape=JIS1990 }
413417 \tl_if_eq:NNT \l__ltjpreset_kanji_shape_tl \l_tmpa_tl {
414- \cs_set:Nx \__ltjpreset_font_mc_bx: { hgrme.ttc }
415- \cs_set:Nx \__ltjpreset_font_gt_bx: { hgrge.ttc }
418+ \cs_set:Nx \__ltjpreset_font_mc_b: { hgrme.ttc }
419+ \cs_set:Nx \__ltjpreset_font_gt_b: { hgrge.ttc }
416420 \cs_set:Nx \__ltjpreset_font_gt_eb: { hgrsgu.ttc }
417421 \cs_set:Nx \__ltjpreset_font_mg_m: { hgrsmp.ttf }
418422 }
@@ -426,14 +430,14 @@
426430 %% bold オプションの処理
427431 \bool_if:NTF \g__ltjpreset_deluxe_bool {
428432 \bool_if:NT \g__ltjpreset_bold_bool {
429- \cs_set_eq:NN \__ltjpreset_font_mc_bx: \__ltjpreset_font_gt_bx:
433+ \cs_set_eq:NN \__ltjpreset_font_mc_b: \__ltjpreset_font_gt_b:
430434 }
431435 }{
432436 \bool_if:NTF \g__ltjpreset_bold_bool
433- { \cs_set_eq:NN \__ltjpreset_font_gt_m: \__ltjpreset_font_gt_bx: }
437+ { \cs_set_eq:NN \__ltjpreset_font_gt_m: \__ltjpreset_font_gt_b: }
434438 { \cs_set_eq:NN \__ltjpreset_font_gt_m: \__ltjpreset_font_gt_u: }
435- \cs_set_eq:NN \__ltjpreset_font_gt_bx: \__ltjpreset_font_gt_m:
436- \cs_set_eq:NN \__ltjpreset_font_mc_bx: \__ltjpreset_font_gt_m:
439+ \cs_set_eq:NN \__ltjpreset_font_gt_b: \__ltjpreset_font_gt_m:
440+ \cs_set_eq:NN \__ltjpreset_font_mc_b: \__ltjpreset_font_gt_m:
437441 }
438442 }
439443
@@ -475,9 +479,9 @@
475479 %%%%%%%% deluxe (\mgfamily はあとで定義)
476480 \bool_if:NTF \g__ltjpreset_deluxe_bool {
477481 \cs_new:Nn \__ltjpreset_check_deluxe_existence: {
478- \__ltjpreset_substitute:nnnn { gt } { eb } { gt } { bx }
479- \__ltjpreset_substitute:nnnn { mg } { m } { gt } { bx }
480- \__ltjpreset_substitute:nnnn { mc } { l } { mc } { m }
482+ \__ltjpreset_substitute:nnnn { gt } { eb } { gt } { b }
483+ \__ltjpreset_substitute:nnnn { mg } { m } { gt } { b }
484+ \__ltjpreset_substitute:nnnn { mc } { l } { mc } { m }
481485 }
482486 \def\ltdefault{l}
483487 \DeclareRobustCommand\ltseries { \not@math@alphabet\ltseries\relax\fontseries\ltdefault\selectfont }
@@ -555,7 +559,7 @@
555559 \DeclareKanjiFamily{JT3}{\gtdefault}{}
556560 \unless\ifltj@disablejfam
557561 \SetSymbolFont{mincho}{normal}{JY3}{\mcdefault}{m}{n}
558- \SetSymbolFont{mincho}{bold}{JY3}{\mcdefault}{bx}{n}
562+ \SetSymbolFont{mincho}{bold}{JY3}{\mcdefault}{b}{n}
559563 \DeclareMathAlphabet{\mathgt}{JY3}{\gtdefault}{m}{n}
560564 \fi
561565 \bool_if:NT \g__ltjpreset_deluxe_bool {
@@ -572,11 +576,11 @@
572576 \tl_set:Nx \l__ltjpreset_kanji_shape_tl { ;+jp04 }
573577 }
574578 \__ltjpreset_define_family:nnn {mc} {m} {\__ltjpreset_font_mc_m:}
575- \__ltjpreset_define_family:nnn {mc} {bx} {\__ltjpreset_font_mc_bx:}
576- \__ltjpreset_define_family:nnn {mc} {b} {\__ltjpreset_font_mc_bx:}
579+ \__ltjpreset_define_family:nnn {mc} {bx} {\__ltjpreset_font_mc_b:}
580+ \__ltjpreset_define_family:nnn {mc} {b} {\__ltjpreset_font_mc_b:}
577581 \__ltjpreset_define_family:nnn {gt} {m} {\__ltjpreset_font_gt_m:}
578- \__ltjpreset_define_family:nnn {gt} {bx} {\__ltjpreset_font_gt_bx:}
579- \__ltjpreset_define_family:nnn {gt} {b} {\__ltjpreset_font_gt_bx:}
582+ \__ltjpreset_define_family:nnn {gt} {bx} {\__ltjpreset_font_gt_b:}
583+ \__ltjpreset_define_family:nnn {gt} {b} {\__ltjpreset_font_gt_b:}
580584 \normalfont
581585 \bool_if:NT \g__ltjpreset_deluxe_bool {
582586 \__ltjpreset_define_family:nnn {mc} {l} {\__ltjpreset_font_mc_l:}
@@ -622,12 +626,12 @@
622626 }
623627 },
624628 }
625- BoldFont = \__ltjpreset_font_mc_bx: \tl_use:N \l__ltjpreset_add_features_tl,
629+ BoldFont = \__ltjpreset_font_mc_b: \tl_use:N \l__ltjpreset_add_features_tl,
626630 \cs_if_exist:NT \ltjpreset_define_family_hook_fontspec:nnn {
627631 UprightFeatures = { \ltjpreset_define_family_hook_fontspec:nnn
628632 { mc } { m } { \__ltjpreset_font_mc_m: } },
629633 BoldFeatures = { \ltjpreset_define_family_hook_fontspec:nnn
630- { mc } { bx } { \__ltjpreset_font_mc_bx: } },
634+ { mc } { b } { \__ltjpreset_font_mc_b: } },
631635 }
632636 ] { \__ltjpreset_font_mc_m: }
633637 \setsansjfont [
@@ -639,12 +643,12 @@
639643 }
640644 },
641645 }
642- BoldFont = \__ltjpreset_font_gt_bx: \tl_use:N \l__ltjpreset_add_features_tl,
646+ BoldFont = \__ltjpreset_font_gt_b: \tl_use:N \l__ltjpreset_add_features_tl,
643647 \cs_if_exist:NT \ltjpreset_define_family_hook_fontspec:nnn {
644648 UprightFeatures = { \ltjpreset_define_family_hook_fontspec:nnn
645649 { gt } { m } { \__ltjpreset_font_gt_m: } },
646650 BoldFeatures = { \ltjpreset_define_family_hook_fontspec:nnn
647- { gt } { bx } { \__ltjpreset_font_gt_bx: } },
651+ { gt } { b } { \__ltjpreset_font_gt_b: } },
648652 }
649653 ] { \__ltjpreset_font_gt_m: }
650654 \bool_if:NT \g__ltjpreset_deluxe_bool {
--- a/src/patches/lltjdefs.sty
+++ b/src/patches/lltjdefs.sty
@@ -84,6 +84,7 @@
8484 \fi
8585
8686 \ifdefined\fontseriesforce
87+%%%% LaTeX 2020-02-02
8788 \edef\bfseries@mc{\bfdefault}
8889 \edef\bfseries@gt{\bfdefault}
8990 \def\bfseries@jtt{\bfseries@gt}
--- a/src/patches/lltjfont.sty
+++ b/src/patches/lltjfont.sty
@@ -5,6 +5,7 @@
55 \NeedsTeXFormat{LaTeX2e}
66 \ProvidesPackage{lltjfont}[2020/01/12 Patch to NFSS2 for LuaTeX-ja]
77
8+%% pathing \DeclareTextComposite
89 \def\ltj@chardef@text@cmd#1{%
910 \let\@ifdefinable\@@ifdefinable%
1011 \edef\ltj@chardef@text@cmd@name{\expandafter\@gobble\string#1}%
@@ -23,13 +24,11 @@
2324 \@dec@text@cmd\ltj@chardef@text@cmd#1{#2}#3\relax
2425 }
2526
26-\ifdefined\UnicodeEncodingName
27- \let\ltj@temp@DeclareTextComposite=\DeclareTextComposite
28- \def\DeclareTextComposite#1#2#3#4{}%
29- \input{tuenc.def}
30- \let\DeclareTextComposite=\ltj@temp@DeclareTextComposite
31- \expandafter\patchcmd\csname TU\string\textasteriskcentered\endcsname{\char}{\ltjalchar}{}{}
32-\fi
27+\let\ltj@temp@DeclareTextComposite=\DeclareTextComposite
28+\def\DeclareTextComposite#1#2#3#4{}%
29+\input{tuenc.def}
30+\let\DeclareTextComposite=\ltj@temp@DeclareTextComposite
31+\expandafter\patchcmd\csname TU\string\textasteriskcentered\endcsname{\char}{\ltjalchar}{}{}
3332
3433
3534 \let\k@encoding\@empty
旧リポジトリブラウザで表示