Skip to content

Commit c7ab29f

Browse files
0xfe0xfe
authored
Merge pull request 0xfe#797 from AaronDavidNewman/master
Merge fixes from smoosic branch
2 parents 0c51ce4 + a6c4871 commit c7ab29f

11 files changed

+2204
-186
lines changed

‎releases/fonts/petalumascript-webfont.woff

44.4 KB
Binary file not shown.

‎releases/fonts/petalumascript-webfont.woff2

35.6 KB
Binary file not shown.

‎src/chordsymbol.js

Lines changed: 208 additions & 49 deletions
Large diffs are not rendered by default.

‎src/fonts/bravura_metrics.js

Lines changed: 65 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -308,59 +308,97 @@ export const BravuraMetrics = {
308308
},
309309
chordSymbol: {
310310
global: {
311-
superscriptOffset: -8,
312-
subscriptOffset: 4,
313-
kerningOffset: -2
311+
superscriptOffset: -400,
312+
subscriptOffset: 300,
313+
kerningOffset: -250,
314+
lowerKerningText: ['D', 'F', 'P', 'T', 'V', 'Y'],
315+
upperKerningText: ['A', 'L'],
316+
spacing: 100,
317+
superSubRatio: 0.66
318+
},
319+
csymDiminished: {
320+
scale: 1,
321+
leftSideBearing: -32,
322+
advanceWidth: 506,
323+
yOffset: 0
324+
},
325+
csymHalfDiminished: {
326+
scale: 1,
327+
leftSideBearing: -32,
328+
advanceWidth: 506,
329+
yOffset: 0
314330
},
315331
csymAugmented: {
316332
scale: 1,
317-
shiftY: -2,
318-
shiftX: 0
333+
leftSideBearing: 0,
334+
advanceWidth: 530,
335+
yOffset: 0
319336
},
320337
csymParensLeftTall: {
321338
scale: 0.8,
322-
shiftY: 1,
323-
shiftX: 0
339+
leftSideBearing: -20,
340+
advanceWidth: 184,
341+
yOffset: 250
324342
},
325343
csymParensRightTall: {
326344
scale: 0.8,
327-
shiftY: 1,
328-
shiftX: 0
345+
leftSideBearing: 0,
346+
advanceWidth: 189,
347+
yOffset: 250
329348
},
330349
csymBracketLeftTall: {
331350
scale: 0.8,
332-
shiftY: 1,
333-
shiftX: 0
351+
leftSideBearing: 0,
352+
advanceWidth: 328,
353+
yOffset: 0
334354
},
335355
csymBracketRightTall: {
336356
scale: 0.8,
337-
shiftY: 1,
338-
shiftX: 0
357+
leftSideBearing: 1,
358+
advanceWidth: 600,
359+
yOffset: 0
339360
},
340361
csymParensLeftVeryTall: {
341-
scale: 0.8,
342-
shiftY: 0,
343-
shiftX: 0
362+
scale: 0.9,
363+
leftSideBearing: 0,
364+
advanceWidth: 101,
365+
yOffset: 350
344366
},
345367
csymParensRightVeryTall: {
346-
scale: 0.8,
347-
shiftY: 0,
348-
shiftX: 0
368+
scale: 0.9,
369+
leftSideBearing: 50,
370+
advanceWidth: 111,
371+
yOffset: 350
349372
},
350373
csymDiagonalArrangementSlash: {
351374
scale: 0.6,
352-
shiftY: 0,
353-
shiftX: -2
375+
leftSideBearing: -1,
376+
advanceWidth: 990,
377+
yOffset: 0
354378
},
355-
accidentalSharp: {
379+
csymMinor: {
356380
scale: 1,
357-
shiftY: -3,
358-
shiftX: 0
381+
leftSideBearing: 0,
382+
advanceWidth: 482,
383+
yOffset: 0
359384
},
360-
accidentalFlat: {
385+
csymMajorSeventh: {
361386
scale: 1,
362-
shiftY: -2,
363-
shiftX: 0
387+
leftSideBearing: 0,
388+
yOffset: 0,
389+
advanceWidth: 600
390+
},
391+
accidentalSharp: {
392+
scale: 0.75,
393+
leftSideBearing: 20,
394+
advanceWidth: 250,
395+
yOffset: -302
396+
},
397+
accidentalFlat: {
398+
scale: 0.9,
399+
leftSideBearing: -20,
400+
advanceWidth: 226,
401+
yOffset: -184
364402
}
365403
}
366404
}

‎src/fonts/gonville_metrics.js

Lines changed: 65 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -170,59 +170,97 @@ export const GonvilleMetrics = {
170170
},
171171
chordSymbol: {
172172
global: {
173-
superscriptOffset: -8,
174-
subscriptOffset: 4,
175-
kerningOffset: -2
173+
superscriptOffset: -400,
174+
subscriptOffset: 300,
175+
kerningOffset: -250,
176+
lowerKerningText: ['D', 'F', 'P', 'T', 'V', 'Y'],
177+
upperKerningText: ['A', 'L'],
178+
spacing: 100,
179+
superSubRatio: 0.66
180+
},
181+
csymDiminished: {
182+
scale: 1,
183+
leftSideBearing: 0,
184+
advanceWidth: 506,
185+
yOffset: 0
186+
},
187+
csymHalfDiminished: {
188+
scale: 1,
189+
leftSideBearing: -32,
190+
advanceWidth: 506,
191+
yOffset: 0
176192
},
177193
csymAugmented: {
178194
scale: 1,
179-
shiftY: -2,
180-
shiftX: 0
195+
leftSideBearing: 0,
196+
advanceWidth: 530,
197+
yOffset: 0
181198
},
182199
csymParensLeftTall: {
183200
scale: 0.8,
184-
shiftY: 1,
185-
shiftX: 0
201+
leftSideBearing: 0,
202+
advanceWidth: 155,
203+
yOffset: 250
186204
},
187205
csymParensRightTall: {
188206
scale: 0.8,
189-
shiftY: 1,
190-
shiftX: 0
207+
leftSideBearing: -40,
208+
advanceWidth: 189,
209+
yOffset: 250
191210
},
192211
csymBracketLeftTall: {
193212
scale: 0.8,
194-
shiftY: 1,
195-
shiftX: 0
213+
leftSideBearing: 0,
214+
advanceWidth: 328,
215+
yOffset: 0
196216
},
197217
csymBracketRightTall: {
198218
scale: 0.8,
199-
shiftY: 1,
200-
shiftX: 0
219+
leftSideBearing: 1,
220+
advanceWidth: 600,
221+
yOffset: 0
201222
},
202223
csymParensLeftVeryTall: {
203-
scale: 0.8,
204-
shiftY: 0,
205-
shiftX: 0
224+
scale: 0.9,
225+
leftSideBearing: 0,
226+
advanceWidth: 101,
227+
yOffset: 350
206228
},
207229
csymParensRightVeryTall: {
208-
scale: 0.8,
209-
shiftY: 0,
210-
shiftX: 0
230+
scale: 0.9,
231+
leftSideBearing: 50,
232+
advanceWidth: 111,
233+
yOffset: 350
211234
},
212235
csymDiagonalArrangementSlash: {
213236
scale: 0.6,
214-
shiftY: 0,
215-
shiftX: -2
237+
leftSideBearing: -1,
238+
advanceWidth: 990,
239+
yOffset: 0
216240
},
217-
accidentalSharp: {
241+
csymMinor: {
218242
scale: 1,
219-
shiftY: -3,
220-
shiftX: 0
243+
leftSideBearing: 0,
244+
advanceWidth: 482,
245+
yOffset: 0
221246
},
222-
accidentalFlat: {
247+
csymMajorSeventh: {
223248
scale: 1,
224-
shiftY: -2,
225-
shiftX: 0
249+
leftSideBearing: 0,
250+
yOffset: 0,
251+
advanceWidth: 600
252+
},
253+
accidentalSharp: {
254+
scale: 0.75,
255+
leftSideBearing: 40,
256+
advanceWidth: 250,
257+
yOffset: -402
258+
},
259+
accidentalFlat: {
260+
scale: 0.95,
261+
leftSideBearing: -50,
262+
advanceWidth: 208,
263+
yOffset: -184
226264
}
227265
}
228266
}

0 commit comments

Comments
 (0)