• R/O
  • HTTP
  • SSH
  • HTTPS

luatexja: Commit

ソースコードの管理場所


Commit MetaInfo

Revisionb60fb6a5ef0f0b92b04186fde7ae37d2760e2038 (tree)
Time2018-09-09 12:35:34
AuthorHironori Kitagawa <h_kitagawa2001@yaho...>
CommiterHironori Kitagawa

Log Message

luatexja-preset: gt-m key does not work without deluxe option

Change Summary

Incremental Difference

--- a/src/addons/luatexja-preset.sty
+++ b/src/addons/luatexja-preset.sty
@@ -1,5 +1,5 @@
11 % luatexja-preset.sty
2-\ProvidesPackage{luatexja-preset}[2018/09/07 Japanese font presets]
2+\ProvidesPackage{luatexja-preset}[2018/09/09 Japanese font presets]
33
44 \RequirePackage{expl3,l3keys2e}
55 \RequirePackage{luatexja}
@@ -102,9 +102,13 @@
102102 mc .groups:n = { preset }, mc .value_required:n = true,
103103 gt .code:n =
104104 \prop_put:Nnn \g_ltjpreset_font_prop { gt-u } {#1}
105- \prop_put:Nnn \g_ltjpreset_font_prop { gt-m } {#1}
105+ \prop_put:Nnn \g_ltjpreset_font_prop { gt-d } {#1}
106106 \prop_put:Nnn \g_ltjpreset_font_prop { gt-bx } {#1}
107107 \prop_put:Nnn \g_ltjpreset_font_prop { gt-eb } {#1},
108+ gt-m .code:n = % gtfamily , medium series
109+ \prop_put:Nnn \g_ltjpreset_font_prop { gt-u } {#1}
110+ \prop_put:Nnn \g_ltjpreset_font_prop { gt-d } {#1},
111+ % gt-d, gt-u は隠し
108112 gt .groups:n = { preset }, gt .value_required:n = true,
109113 }
110114 \cs_set:Nn \g_ltjpreset_tmp_cs:n {
@@ -117,7 +121,7 @@
117121 \g_ltjpreset_tmp_cs:n { mc-m }
118122 \g_ltjpreset_tmp_cs:n { mc-bx }
119123 \g_ltjpreset_tmp_cs:n { gt-u }
120-\g_ltjpreset_tmp_cs:n { gt-m }
124+\g_ltjpreset_tmp_cs:n { gt-d }
121125 \g_ltjpreset_tmp_cs:n { gt-bx }
122126 \g_ltjpreset_tmp_cs:n { gt-eb}
123127 \g_ltjpreset_tmp_cs:n { mg-m }
@@ -129,7 +133,7 @@
129133 }
130134 \cs_new:Npn \ltjpreset_set_office:nn #1 #2{
131135 mc = #1, mc-bx = HGMinchoE ,
132- gt-m = HGGothicM , gt-bx = HGGothicE ,
136+ gt-d = HGGothicM , gt-bx = HGGothicE ,
133137 gt-u = #2 , gt-eb = HGSoeiKakugothicUB ,
134138 mg-m = HGMaruGothicMPRO,
135139 __custom = false, __office = true, __noembed = false,
@@ -149,7 +153,7 @@
149153 %% Pro
150154 \ltjpreset_declare_preset:nx{kozuka-pro}{
151155 mc-m = KozMinPro-Regular, mc-bx = KozMinPro-Bold,
152- gt-m = KozGoPro-Regular, gt-bx = KozGoPro-Bold,
156+ gt-d = KozGoPro-Regular, gt-bx = KozGoPro-Bold,
153157 gt-u = KozGoPro-Medium, gt-eb = KozGoPro-Heavy,
154158 mg-m = KozGoPro-Heavy, mc-l = KozMinPro-Light,
155159 __custom = false, __office = false, __noembed = false,
@@ -157,7 +161,7 @@
157161 %% Pr6
158162 \ltjpreset_declare_preset:nx{kozuka-pr6}{
159163 mc-m = KozMinProVI-Regular, mc-bx = KozMinProVI-Bold,
160- gt-m = KozGoProVI-Regular, gt-bx = KozGoProVI-Bold,
164+ gt-d = KozGoProVI-Regular, gt-bx = KozGoProVI-Bold,
161165 gt-u = KozGoProVI-Medium, gt-eb = KozGoProVI-Heavy,
162166 mg-m = KozGoProVI-Heavy, mc-l = KozMinProVI-Light,
163167 __custom = false, __office = false, __noembed = false,
@@ -165,7 +169,7 @@
165169 %% Pr6N
166170 \ltjpreset_declare_preset:nx{kozuka-pr6n}{
167171 mc-m = KozMinPr6N-Regular, mc-bx = KozMinPr6N-Bold,
168- gt-m = KozGoPr6N-Regular, gt-bx = KozGoPr6N-Bold,
172+ gt-d = KozGoPr6N-Regular, gt-bx = KozGoPr6N-Bold,
169173 gt-u = KozGoPr6N-Medium, gt-eb = KozGoPr6N-Heavy,
170174 mg-m = KozGoPr6N-Heavy, mc-l = KozMinPr6N-Light,
171175 __custom = false, __office = false, __noembed = false,
@@ -174,14 +178,14 @@
174178 % ヒラギノ (OSX)
175179 \ltjpreset_declare_preset:nx{hiragino-pro}{
176180 mc-m = HiraMinPro-W3, mc-bx = HiraMinPro-W6,
177- gt-m = HiraKakuPro-W3, gt-bx = HiraKakuPro-W6,
181+ gt-d = HiraKakuPro-W3, gt-bx = HiraKakuPro-W6,
178182 gt-u = HiraKakuPro-W6, gt-eb = HiraKakuStd-W8,
179183 mg-m = HiraMaruPro-W4, mc-l = HiraMinPro-W2,
180184 __custom = false, __office = false, __noembed = false,
181185 }
182186 \ltjpreset_declare_preset:nx{hiragino-pron}{
183187 mc-m = HiraMinProN-W3, mc-bx = HiraMinProN-W6,
184- gt-m = HiraKakuProN-W3, gt-bx = HiraKakuProN-W6,
188+ gt-d = HiraKakuProN-W3, gt-bx = HiraKakuProN-W6,
185189 gt-u = HiraKakuProN-W6, gt-eb = HiraKakuStdN-W8,
186190 mg-m = HiraMaruProN-W4, mc-l = HiraMinProN-W2,
187191 __custom = false, __office = false, __noembed = false,
@@ -190,14 +194,14 @@
190194 % モリサワ
191195 \ltjpreset_declare_preset:nx{morisawa-pro}{
192196 mc = A-OTF-RyuminPro-Light.otf, mc-bx = A-OTF-FutoMinA101Pro-Bold.otf,
193- gt-m = A-OTF-GothicBBBPro-Medium.otf , gt-bx = A-OTF-FutoGoB101Pro-Bold.otf,
197+ gt-d = A-OTF-GothicBBBPro-Medium.otf , gt-bx = A-OTF-FutoGoB101Pro-Bold.otf,
194198 gt-u = A-OTF-GothicBBBPro-Medium.otf , gt-eb = A-OTF-MidashiGoPro-MB31.otf,
195199 mg-m = A-OTF-Jun101Pro-Light.otf,
196200 __custom = false, __office = false, __noembed = false,
197201 }
198202 \ltjpreset_declare_preset:nx{morisawa-pr6n}{
199203 mc = A-OTF-RyuminPr6N-Light.otf, mc-bx = A-OTF-FutoMinA101Pr6N-Bold.otf,
200- gt-m = A-OTF-GothicBBBPr6N-Medium.otf , gt-bx = A-OTF-FutoGoB101Pr6N-Bold.otf,
204+ gt-d = A-OTF-GothicBBBPr6N-Medium.otf , gt-bx = A-OTF-FutoGoB101Pr6N-Bold.otf,
201205 gt-u = A-OTF-GothicBBBPr6N-Medium.otf , gt-eb = A-OTF-MidashiGoPr6N-MB31.otf,
202206 mg-m = A-OTF-Jun101Pr6N-Light.otf,
203207 __custom = false, __office = false, __noembed = false,
@@ -206,7 +210,7 @@
206210 % 游明朝/游ゴシック (Win8.1)
207211 \ltjpreset_declare_preset:nx{yu-win}{
208212 mc-m = YuMincho-Regular, mc-bx = YuMincho-Demibold,
209- gt-m = YuGothic-Regular, gt-bx = YuGothic-Bold,
213+ gt-d = YuGothic-Regular, gt-bx = YuGothic-Bold,
210214 gt-u = YuGothic-Regular, gt-eb = YuGothic-Bold,
211215 mg-m = YuGothic-Bold, mc-l = YuMincho-Light,
212216 __custom = false, __office = false, __noembed = false,
@@ -214,7 +218,7 @@
214218 % Win10
215219 \ltjpreset_declare_preset:nx{yu-win10}{
216220 mc-m = YuMincho-Regular, mc-bx = YuMincho-Demibold,
217- gt-m = YuGothic-Regular, gt-bx = YuGothic-Bold,
221+ gt-d = YuGothic-Regular, gt-bx = YuGothic-Bold,
218222 gt-u = YuGothic-Medium, gt-eb = YuGothic-Bold,
219223 mg-m = YuGothic-Bold, mc-l = YuMincho-Light,
220224 __custom = false, __office = false, __noembed = false,
@@ -224,7 +228,7 @@
224228 % according to http://support.apple.com/kb/HT5944
225229 \ltjpreset_declare_preset:nx{yu-osx}{
226230 mc = YuMincho~Medium, mc-bx = YuMincho~Demibold,
227- gt-m = YuGothic~Medium, gt-u = YuGothic~Medium,
231+ gt-d = YuGothic~Medium, gt-u = YuGothic~Medium,
228232 gt-bx = YuGothic~Bold, gt-eb = YuGothic~Bold,
229233 mg-m = YuGothic~Bold,
230234 __custom = false, __office = false, __noembed = false,
@@ -233,14 +237,14 @@
233237 % moga-mobo
234238 \ltjpreset_declare_preset:nx{moga-mobo}{
235239 mc = Moga90Mincho, mc-bx = Moga90Mincho~Bold,
236- gt-m = Moga90Gothic, gt-bx = Moga90Gothic~Bold,
240+ gt-d = Moga90Gothic, gt-bx = Moga90Gothic~Bold,
237241 gt-u = Moga90Gothic, gt-eb = Moga90Gothic~Bold,
238242 mg-m = Mobo90Gothic,
239243 __custom = false, __office = false, __noembed = false,
240244 }
241245 \ltjpreset_declare_preset:nx{moga-mobo-ex}{
242246 mc = MogaEx90Mincho, mc-bx = MogaEx90Mincho~Bold,
243- gt-m = MogaEx90Gothic, gt-bx = MogaEx90Gothic~Bold,
247+ gt-d = MogaEx90Gothic, gt-bx = MogaEx90Gothic~Bold,
244248 gt-u = MogaEx90Gothic, gt-eb = MogaEx90Gothic~Bold,
245249 mg-m = MoboEx90Gothic,
246250 __custom = false, __office = false, __noembed = false,
@@ -249,7 +253,7 @@
249253 % Ume fones
250254 \ltjpreset_declare_preset:nx{ume}{
251255 mc = Ume~Mincho,
252- gt-m = Ume~Gothic, gt-bx = Ume~Gothic~O5,
256+ gt-d = Ume~Gothic, gt-bx = Ume~Gothic~O5,
253257 gt-u = Ume~Gothic~O5, gt-eb = Ume~Gothic~O5,
254258 mg-m = Ume~Gothic~O4,
255259 __custom = false, __office = false, __noembed = false,
@@ -259,7 +263,7 @@
259263 \ltjpreset_declare_preset:nx{sourcehan}{
260264 mc-m = Source~Han~Serif~Regular,
261265 mc-bx = Source~Han~Serif~Bold,
262- gt-m = Source~Han~Sans~Regular,
266+ gt-d = Source~Han~Sans~Regular,
263267 gt-bx = Source~Han~Sans~Bold,
264268 gt-u = Source~Han~Sans~Medium,
265269 gt-eb = Source~Han~Sans~Heavy,
@@ -270,7 +274,7 @@
270274 \ltjpreset_declare_preset:nx{sourcehan-jp}{
271275 mc-m = Source~Han~Serif~JP~Regular,
272276 mc-bx = Source~Han~Serif~JP~Bold,
273- gt-m = Source~Han~Sans~JP~Regular,
277+ gt-d = Source~Han~Sans~JP~Regular,
274278 gt-bx = Source~Han~Sans~JP~Bold,
275279 gt-u = Source~Han~Sans~JP~Medium,
276280 gt-eb = Source~Han~Sans~JP~Heavy,
@@ -281,7 +285,7 @@
281285 \ltjpreset_declare_preset:nx{noto-otc}{
282286 mc-m = Noto~Serif~CJK~Regular,
283287 mc-bx = Noto~Serif~CJK~Bold,
284- gt-m = Noto~Sans~CJK~Regular,
288+ gt-d = Noto~Sans~CJK~Regular,
285289 gt-bx = Noto~Sans~CJK~Bold,
286290 gt-u = Noto~Sans~CJK~Medium,
287291 gt-eb = Noto~Sans~CJK~Black,
@@ -292,7 +296,7 @@
292296 \ltjpreset_declare_preset:nx{noto-otf}{
293297 mc-m = Noto~Serif~CJK~JP~Regular,
294298 mc-bx = Noto~Serif~CJK~JP~Bold,
295- gt-m = Noto~Sans~CJK~JP~Regular,
299+ gt-d = Noto~Sans~CJK~JP~Regular,
296300 gt-bx = Noto~Sans~CJK~JP~Bold,
297301 gt-u = Noto~Sans~CJK~JP~Medium,
298302 gt-eb = Noto~Sans~CJK~JP~Black,
@@ -369,7 +373,7 @@
369373 \cs_set:Nx \ltjpreset_font_mc_l: { \prop_item:Nn \g_ltjpreset_font_prop { mc-l } }
370374 \cs_set:Nx \ltjpreset_font_mc_m: { \prop_item:Nn \g_ltjpreset_font_prop { mc-m } }
371375 \cs_set:Nx \ltjpreset_font_mc_bx: { \prop_item:Nn \g_ltjpreset_font_prop { mc-bx } }
372- \cs_set:Nx \ltjpreset_font_gt_m: { \prop_item:Nn \g_ltjpreset_font_prop { gt-m } }
376+ \cs_set:Nx \ltjpreset_font_gt_m: { \prop_item:Nn \g_ltjpreset_font_prop { gt-d } }
373377 \cs_set:Nx \ltjpreset_font_gt_u: { \prop_item:Nn \g_ltjpreset_font_prop { gt-u } }
374378 \cs_set:Nx \ltjpreset_font_gt_bx: { \prop_item:Nn \g_ltjpreset_font_prop { gt-bx } }
375379 \cs_set:Nx \ltjpreset_font_gt_eb: { \prop_item:Nn \g_ltjpreset_font_prop { gt-eb } }
Show on old repository browser