vexflow 4.0.1-alpha.2 → 4.0.1-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/cjs/vexflow-bravura.js +2 -2
- package/build/cjs/vexflow-bravura.js.map +1 -1
- package/build/cjs/vexflow-core.js +2 -2
- package/build/cjs/vexflow-core.js.map +1 -1
- package/build/cjs/vexflow-debug-with-tests.js +135 -73
- package/build/cjs/vexflow-debug-with-tests.js.map +1 -1
- package/build/cjs/vexflow-debug.js +123 -44
- package/build/cjs/vexflow-debug.js.map +1 -1
- package/build/cjs/vexflow-font-bravura.js +1 -1
- package/build/cjs/vexflow-font-bravura.js.map +1 -1
- package/build/cjs/vexflow-font-gonville.js +1 -1
- package/build/cjs/vexflow-font-gonville.js.map +1 -1
- package/build/cjs/vexflow-font-petaluma.js +1 -1
- package/build/cjs/vexflow-font-petaluma.js.map +1 -1
- package/build/cjs/vexflow-gonville.js +2 -2
- package/build/cjs/vexflow-gonville.js.map +1 -1
- package/build/cjs/vexflow-petaluma.js +2 -2
- package/build/cjs/vexflow-petaluma.js.map +1 -1
- package/build/cjs/vexflow.js +2 -2
- package/build/cjs/vexflow.js.map +1 -1
- package/build/esm/src/accidental.js +1 -1
- package/build/esm/src/beam.js +4 -0
- package/build/esm/src/fonts/bravura_metrics.js +8 -5
- package/build/esm/src/fonts/gonville_metrics.js +8 -2
- package/build/esm/src/fonts/petaluma_metrics.js +8 -5
- package/build/esm/src/gracenote.js +2 -0
- package/build/esm/src/stavenote.js +15 -5
- package/build/esm/src/staverepetition.js +8 -8
- package/build/esm/src/stavetie.js +2 -0
- package/build/esm/src/stemmablenote.js +4 -2
- package/build/esm/src/tables.js +36 -0
- package/build/esm/src/tabnote.js +12 -9
- package/build/esm/src/version.js +3 -3
- package/build/esm/tests/articulation_tests.js +11 -24
- package/build/esm/tests/ornament_tests.js +0 -1
- package/build/types/entry/vexflow-font-bravura.d.ts +8 -5
- package/build/types/entry/vexflow-font-gonville.d.ts +8 -2
- package/build/types/entry/vexflow-font-petaluma.d.ts +8 -5
- package/build/types/src/fonts/bravura_metrics.d.ts +8 -5
- package/build/types/src/fonts/gonville_metrics.d.ts +8 -2
- package/build/types/src/fonts/petaluma_metrics.d.ts +8 -5
- package/build/types/src/glyph.d.ts +4 -0
- package/build/types/src/stavenote.d.ts +2 -0
- package/build/types/src/stem.d.ts +4 -1
- package/build/types/src/stemmablenote.d.ts +4 -1
- package/build/types/src/tabnote.d.ts +4 -1
- package/package.json +1 -1
- package/src/accidental.ts +1 -1
- package/src/beam.ts +4 -0
- package/src/fonts/bravura_metrics.ts +8 -5
- package/src/fonts/gonville_metrics.ts +8 -2
- package/src/fonts/petaluma_metrics.ts +8 -5
- package/src/glyph.ts +4 -0
- package/src/gracenote.ts +4 -1
- package/src/stavenote.ts +17 -5
- package/src/staverepetition.ts +8 -8
- package/src/stavetie.ts +8 -0
- package/src/stem.ts +1 -1
- package/src/stemmablenote.ts +6 -4
- package/src/tables.ts +36 -0
- package/src/tabnote.ts +16 -13
- package/build/esm/src/publicpath.js +0 -1
- package/build/types/src/publicpath.d.ts +0 -0
- package/src/publicpath.ts +0 -0
|
@@ -12,6 +12,8 @@ export interface GlyphProps {
|
|
|
12
12
|
line_below: number;
|
|
13
13
|
line_above: number;
|
|
14
14
|
stem_beam_extension: number;
|
|
15
|
+
stem_up_extension: number;
|
|
16
|
+
stem_down_extension: number;
|
|
15
17
|
stem: Stem;
|
|
16
18
|
code: string;
|
|
17
19
|
code_flag_upstem: string;
|
|
@@ -19,6 +21,8 @@ export interface GlyphProps {
|
|
|
19
21
|
flag: boolean;
|
|
20
22
|
width: number;
|
|
21
23
|
text: string;
|
|
24
|
+
tabnote_stem_down_extension: number;
|
|
25
|
+
tabnote_stem_up_extension: number;
|
|
22
26
|
beam_count: number;
|
|
23
27
|
shift_y: number;
|
|
24
28
|
getWidth(a?: number): number;
|
|
@@ -144,6 +144,8 @@ export declare class StaveNote extends StemmableNote {
|
|
|
144
144
|
drawFlag(): void;
|
|
145
145
|
drawNoteHeads(): void;
|
|
146
146
|
drawStem(stemOptions?: StemOptions): void;
|
|
147
|
+
/** Primarily used as the scaling factor for grace notes, GraceNote will return the required scale. */
|
|
148
|
+
getStaveNoteScale(): number;
|
|
147
149
|
/**
|
|
148
150
|
* Override stemmablenote stem extension to adjust for distance from middle line.
|
|
149
151
|
*/
|
|
@@ -46,7 +46,10 @@ export declare class Stem extends Element {
|
|
|
46
46
|
setYBounds(y_top: number, y_bottom: number): void;
|
|
47
47
|
getHeight(): number;
|
|
48
48
|
getBoundingBox(): BoundingBox;
|
|
49
|
-
getExtents():
|
|
49
|
+
getExtents(): {
|
|
50
|
+
topY: number;
|
|
51
|
+
baseY: number;
|
|
52
|
+
};
|
|
50
53
|
setVisibility(isVisible: boolean): this;
|
|
51
54
|
setStemlet(isStemlet: boolean, stemletHeight: number): this;
|
|
52
55
|
adjustHeightForFlag(): void;
|
|
@@ -23,7 +23,10 @@ export declare abstract class StemmableNote extends Note {
|
|
|
23
23
|
getCenterGlyphX(): number;
|
|
24
24
|
getStemExtension(): number;
|
|
25
25
|
setStemLength(height: number): this;
|
|
26
|
-
getStemExtents():
|
|
26
|
+
getStemExtents(): {
|
|
27
|
+
topY: number;
|
|
28
|
+
baseY: number;
|
|
29
|
+
};
|
|
27
30
|
/** Gets the `y` value for the top modifiers at a specific `textLine`. */
|
|
28
31
|
getYForTopText(textLine: number): number;
|
|
29
32
|
/** Gets the `y` value for the bottom modifiers at a specific `textLine`. */
|
|
@@ -32,7 +32,10 @@ export declare class TabNote extends StemmableNote {
|
|
|
32
32
|
preFormat(): void;
|
|
33
33
|
getStemX(): number;
|
|
34
34
|
getStemY(): number;
|
|
35
|
-
getStemExtents():
|
|
35
|
+
getStemExtents(): {
|
|
36
|
+
topY: number;
|
|
37
|
+
baseY: number;
|
|
38
|
+
};
|
|
36
39
|
drawFlag(): void;
|
|
37
40
|
drawModifiers(): void;
|
|
38
41
|
drawStemThrough(): void;
|
package/package.json
CHANGED
package/src/accidental.ts
CHANGED
|
@@ -97,7 +97,7 @@ export class Accidental extends Modifier {
|
|
|
97
97
|
if (note !== prevNote) {
|
|
98
98
|
// Iterate through all notes to get the displaced pixels
|
|
99
99
|
for (let n = 0; n < note.keys.length; ++n) {
|
|
100
|
-
shiftL = Math.max(note.getLeftDisplacedHeadPx(), shiftL);
|
|
100
|
+
shiftL = Math.max(note.getLeftDisplacedHeadPx() - note.getXShift(), shiftL);
|
|
101
101
|
}
|
|
102
102
|
prevNote = note;
|
|
103
103
|
}
|
package/src/beam.ts
CHANGED
|
@@ -851,7 +851,9 @@ export class Beam extends Element {
|
|
|
851
851
|
this.notes.forEach((note) => {
|
|
852
852
|
const stem = note.getStem();
|
|
853
853
|
if (stem) {
|
|
854
|
+
ctx.openGroup('stem', note.getAttribute('id') + '-stem');
|
|
854
855
|
stem.setContext(ctx).draw();
|
|
856
|
+
ctx.closeGroup();
|
|
855
857
|
}
|
|
856
858
|
}, this);
|
|
857
859
|
}
|
|
@@ -879,6 +881,7 @@ export class Beam extends Element {
|
|
|
879
881
|
if (lastBeamX) {
|
|
880
882
|
const lastBeamY = this.getSlopeY(lastBeamX, firstStemX, beamY, this.slope);
|
|
881
883
|
|
|
884
|
+
this.setAttribute('el', ctx.openGroup('beam'));
|
|
882
885
|
ctx.beginPath();
|
|
883
886
|
ctx.moveTo(startBeamX, startBeamY);
|
|
884
887
|
ctx.lineTo(startBeamX, startBeamY + beamThickness);
|
|
@@ -886,6 +889,7 @@ export class Beam extends Element {
|
|
|
886
889
|
ctx.lineTo(lastBeamX + 1, lastBeamY);
|
|
887
890
|
ctx.closePath();
|
|
888
891
|
ctx.fill();
|
|
892
|
+
ctx.closeGroup();
|
|
889
893
|
} else {
|
|
890
894
|
throw new RuntimeError('NoLastBeamX', 'lastBeamX undefined.');
|
|
891
895
|
}
|
|
@@ -143,11 +143,17 @@ export const BravuraMetrics = {
|
|
|
143
143
|
},
|
|
144
144
|
|
|
145
145
|
staveRepetition: {
|
|
146
|
-
|
|
146
|
+
symbolText: {
|
|
147
|
+
offsetX: 12,
|
|
147
148
|
offsetY: 25,
|
|
148
|
-
offsetSymbol: 12,
|
|
149
149
|
spacing: 5,
|
|
150
150
|
},
|
|
151
|
+
coda: {
|
|
152
|
+
offsetY: 25,
|
|
153
|
+
},
|
|
154
|
+
segno: {
|
|
155
|
+
offsetY: 10,
|
|
156
|
+
},
|
|
151
157
|
},
|
|
152
158
|
|
|
153
159
|
// noteHead: {
|
|
@@ -217,9 +223,6 @@ export const BravuraMetrics = {
|
|
|
217
223
|
},
|
|
218
224
|
flag: {
|
|
219
225
|
shiftX: -0.75,
|
|
220
|
-
tabStem: {
|
|
221
|
-
shiftX: -1.75,
|
|
222
|
-
},
|
|
223
226
|
staveTempo: {
|
|
224
227
|
shiftX: -1,
|
|
225
228
|
},
|
|
@@ -133,11 +133,17 @@ export const GonvilleMetrics = {
|
|
|
133
133
|
},
|
|
134
134
|
|
|
135
135
|
staveRepetition: {
|
|
136
|
-
|
|
136
|
+
symbolText: {
|
|
137
|
+
offsetX: 12,
|
|
137
138
|
offsetY: 25,
|
|
138
|
-
offsetSymbol: 12,
|
|
139
139
|
spacing: 5,
|
|
140
140
|
},
|
|
141
|
+
coda: {
|
|
142
|
+
offsetY: 25,
|
|
143
|
+
},
|
|
144
|
+
segno: {
|
|
145
|
+
offsetY: 0,
|
|
146
|
+
},
|
|
141
147
|
},
|
|
142
148
|
|
|
143
149
|
// noteHead: {
|
|
@@ -144,11 +144,17 @@ export const PetalumaMetrics = {
|
|
|
144
144
|
},
|
|
145
145
|
|
|
146
146
|
staveRepetition: {
|
|
147
|
-
|
|
147
|
+
symbolText: {
|
|
148
|
+
offsetX: 12,
|
|
148
149
|
offsetY: 25,
|
|
149
|
-
offsetSymbol: 12,
|
|
150
150
|
spacing: 5,
|
|
151
151
|
},
|
|
152
|
+
coda: {
|
|
153
|
+
offsetY: 25,
|
|
154
|
+
},
|
|
155
|
+
segno: {
|
|
156
|
+
offsetY: 10,
|
|
157
|
+
},
|
|
152
158
|
},
|
|
153
159
|
|
|
154
160
|
noteHead: {
|
|
@@ -245,9 +251,6 @@ export const PetalumaMetrics = {
|
|
|
245
251
|
flag128thDown: {
|
|
246
252
|
shiftX: -1.2,
|
|
247
253
|
},
|
|
248
|
-
tabStem: {
|
|
249
|
-
shiftX: -1.75,
|
|
250
|
-
},
|
|
251
254
|
staveTempo: {
|
|
252
255
|
shiftX: -1,
|
|
253
256
|
},
|
package/src/glyph.ts
CHANGED
|
@@ -19,6 +19,8 @@ export interface GlyphProps {
|
|
|
19
19
|
line_below: number;
|
|
20
20
|
line_above: number;
|
|
21
21
|
stem_beam_extension: number;
|
|
22
|
+
stem_up_extension: number;
|
|
23
|
+
stem_down_extension: number;
|
|
22
24
|
stem: Stem;
|
|
23
25
|
code: string;
|
|
24
26
|
code_flag_upstem: string;
|
|
@@ -26,6 +28,8 @@ export interface GlyphProps {
|
|
|
26
28
|
flag: boolean;
|
|
27
29
|
width: number;
|
|
28
30
|
text: string;
|
|
31
|
+
tabnote_stem_down_extension: number;
|
|
32
|
+
tabnote_stem_up_extension: number;
|
|
29
33
|
beam_count: number;
|
|
30
34
|
shift_y: number;
|
|
31
35
|
getWidth(a?: number): number;
|
package/src/gracenote.ts
CHANGED
|
@@ -59,7 +59,6 @@ export class GraceNote extends StaveNote {
|
|
|
59
59
|
return 0;
|
|
60
60
|
}
|
|
61
61
|
|
|
62
|
-
// FIXME: move this to more basic class.
|
|
63
62
|
getStaveNoteScale(): number {
|
|
64
63
|
return this.render_options.glyph_font_scale / Tables.NOTATION_FONT_SCALE;
|
|
65
64
|
}
|
|
@@ -95,8 +94,12 @@ export class GraceNote extends StaveNote {
|
|
|
95
94
|
? noteHeadBounds.y_top - noteStemHeight
|
|
96
95
|
: noteHeadBounds.y_bottom - noteStemHeight;
|
|
97
96
|
|
|
97
|
+
const defaultStemExtention =
|
|
98
|
+
stem_direction === Stem.DOWN ? this.glyph.stem_down_extension : this.glyph.stem_up_extension;
|
|
99
|
+
|
|
98
100
|
let defaultOffsetY = Tables.STEM_HEIGHT;
|
|
99
101
|
defaultOffsetY -= defaultOffsetY / 2.8;
|
|
102
|
+
defaultOffsetY += defaultStemExtention;
|
|
100
103
|
y += defaultOffsetY * staveNoteScale * stem_direction;
|
|
101
104
|
|
|
102
105
|
const offsets =
|
package/src/stavenote.ts
CHANGED
|
@@ -373,7 +373,7 @@ export class StaveNote extends StemmableNote {
|
|
|
373
373
|
setBeam(beam: Beam): this {
|
|
374
374
|
this.beam = beam;
|
|
375
375
|
this.calcNoteDisplacements();
|
|
376
|
-
// Update stem extension
|
|
376
|
+
// Update stem extension if a beam is assigned.
|
|
377
377
|
if (this.stem) {
|
|
378
378
|
this.stem.setExtension(this.getStemExtension());
|
|
379
379
|
}
|
|
@@ -1037,17 +1037,24 @@ export class StaveNote extends StemmableNote {
|
|
|
1037
1037
|
// eslint-disable-next-line
|
|
1038
1038
|
const noteStemHeight = this.stem!.getHeight();
|
|
1039
1039
|
const flagX = this.getStemX();
|
|
1040
|
-
//
|
|
1040
|
+
// What's with the magic +/- 2
|
|
1041
1041
|
// ANSWER: a corner of the note stem pokes out beyond the tip of the flag.
|
|
1042
1042
|
// The extra +/- 2 pushes the flag glyph outward so it covers the stem entirely.
|
|
1043
1043
|
// Alternatively, we could shorten the stem.
|
|
1044
|
-
const extension = this.flag !== undefined ? this.flag.checkMetrics().y_shift : 0;
|
|
1045
1044
|
const flagY =
|
|
1046
1045
|
this.getStemDirection() === Stem.DOWN
|
|
1047
1046
|
? // Down stems are below the note head and have flags on the right.
|
|
1048
|
-
y_top -
|
|
1047
|
+
y_top -
|
|
1048
|
+
noteStemHeight +
|
|
1049
|
+
2 -
|
|
1050
|
+
(this.glyph ? this.glyph.stem_down_extension : 0) * this.getStaveNoteScale() -
|
|
1051
|
+
(this.flag?.getMetrics().y_shift ?? 0) * (1 - this.getStaveNoteScale())
|
|
1049
1052
|
: // Up stems are above the note head and have flags on the right.
|
|
1050
|
-
y_bottom -
|
|
1053
|
+
y_bottom -
|
|
1054
|
+
noteStemHeight -
|
|
1055
|
+
2 +
|
|
1056
|
+
(this.glyph ? this.glyph.stem_up_extension : 0) * this.getStaveNoteScale() -
|
|
1057
|
+
(this.flag?.getMetrics().y_shift ?? 0) * (1 - this.getStaveNoteScale());
|
|
1051
1058
|
|
|
1052
1059
|
// Draw the Flag
|
|
1053
1060
|
ctx.openGroup('flag', undefined, { pointerBBox: true });
|
|
@@ -1089,6 +1096,11 @@ export class StaveNote extends StemmableNote {
|
|
|
1089
1096
|
ctx.closeGroup();
|
|
1090
1097
|
}
|
|
1091
1098
|
|
|
1099
|
+
/** Primarily used as the scaling factor for grace notes, GraceNote will return the required scale. */
|
|
1100
|
+
getStaveNoteScale(): number {
|
|
1101
|
+
return 1.0;
|
|
1102
|
+
}
|
|
1103
|
+
|
|
1092
1104
|
/**
|
|
1093
1105
|
* Override stemmablenote stem extension to adjust for distance from middle line.
|
|
1094
1106
|
*/
|
package/src/staverepetition.ts
CHANGED
|
@@ -114,7 +114,7 @@ export class Repetition extends StaveModifier {
|
|
|
114
114
|
Glyph.renderGlyph(
|
|
115
115
|
stave.checkContext(),
|
|
116
116
|
this.x + x + this.x_shift,
|
|
117
|
-
y + Tables.currentMusicFont().lookupMetric('staveRepetition.
|
|
117
|
+
y + Tables.currentMusicFont().lookupMetric('staveRepetition.coda.offsetY'),
|
|
118
118
|
40,
|
|
119
119
|
'coda',
|
|
120
120
|
{ category: 'coda' }
|
|
@@ -127,7 +127,7 @@ export class Repetition extends StaveModifier {
|
|
|
127
127
|
Glyph.renderGlyph(
|
|
128
128
|
stave.checkContext(),
|
|
129
129
|
this.x + x + this.x_shift,
|
|
130
|
-
y + Tables.currentMusicFont().lookupMetric('staveRepetition.
|
|
130
|
+
y + Tables.currentMusicFont().lookupMetric('staveRepetition.segno.offsetY'),
|
|
131
131
|
30,
|
|
132
132
|
'segno',
|
|
133
133
|
{ category: 'segno' }
|
|
@@ -152,7 +152,7 @@ export class Repetition extends StaveModifier {
|
|
|
152
152
|
symbol_x =
|
|
153
153
|
text_x +
|
|
154
154
|
ctx.measureText(text).width +
|
|
155
|
-
Tables.currentMusicFont().lookupMetric('staveRepetition.
|
|
155
|
+
Tables.currentMusicFont().lookupMetric('staveRepetition.symbolText.offsetX');
|
|
156
156
|
break;
|
|
157
157
|
// To the right without symbol
|
|
158
158
|
case Repetition.type.DC:
|
|
@@ -165,7 +165,7 @@ export class Repetition extends StaveModifier {
|
|
|
165
165
|
x +
|
|
166
166
|
this.x_shift +
|
|
167
167
|
stave.getWidth() -
|
|
168
|
-
Tables.currentMusicFont().lookupMetric('staveRepetition.
|
|
168
|
+
Tables.currentMusicFont().lookupMetric('staveRepetition.symbolText.spacing') -
|
|
169
169
|
modifierWidth -
|
|
170
170
|
ctx.measureText(text).width;
|
|
171
171
|
break;
|
|
@@ -176,21 +176,21 @@ export class Repetition extends StaveModifier {
|
|
|
176
176
|
x +
|
|
177
177
|
this.x_shift +
|
|
178
178
|
stave.getWidth() -
|
|
179
|
-
Tables.currentMusicFont().lookupMetric('staveRepetition.
|
|
179
|
+
Tables.currentMusicFont().lookupMetric('staveRepetition.symbolText.spacing') -
|
|
180
180
|
modifierWidth -
|
|
181
181
|
ctx.measureText(text).width -
|
|
182
|
-
Tables.currentMusicFont().lookupMetric('staveRepetition.
|
|
182
|
+
Tables.currentMusicFont().lookupMetric('staveRepetition.symbolText.offsetX');
|
|
183
183
|
symbol_x =
|
|
184
184
|
text_x +
|
|
185
185
|
ctx.measureText(text).width +
|
|
186
|
-
Tables.currentMusicFont().lookupMetric('staveRepetition.
|
|
186
|
+
Tables.currentMusicFont().lookupMetric('staveRepetition.symbolText.offsetX');
|
|
187
187
|
break;
|
|
188
188
|
}
|
|
189
189
|
|
|
190
190
|
const y =
|
|
191
191
|
stave.getYForTopText(stave.getNumLines()) +
|
|
192
192
|
this.y_shift +
|
|
193
|
-
Tables.currentMusicFont().lookupMetric('staveRepetition.
|
|
193
|
+
Tables.currentMusicFont().lookupMetric('staveRepetition.symbolText.offsetY');
|
|
194
194
|
if (draw_coda) {
|
|
195
195
|
Glyph.renderGlyph(ctx, symbol_x, y, 40, 'coda', { category: 'coda' });
|
|
196
196
|
}
|
package/src/stavetie.ts
CHANGED
|
@@ -152,12 +152,20 @@ export class StaveTie extends Element {
|
|
|
152
152
|
const top_cp_y = (first_y_px + last_y_px) / 2 + cp1 * params.direction;
|
|
153
153
|
const bottom_cp_y = (first_y_px + last_y_px) / 2 + cp2 * params.direction;
|
|
154
154
|
|
|
155
|
+
// id probably unnecessary if we save the group to 'el' via setAttribute
|
|
156
|
+
// let id: string = "";
|
|
157
|
+
// if (this.notes.first_note) {
|
|
158
|
+
// id = this.notes.first_note.getAttribute('id') + '-tie';
|
|
159
|
+
// }
|
|
160
|
+
// this.setAttribute('el', ctx.openGroup('stavetie', id));
|
|
161
|
+
this.setAttribute('el', ctx.openGroup('stavetie'));
|
|
155
162
|
ctx.beginPath();
|
|
156
163
|
ctx.moveTo(params.first_x_px + first_x_shift, first_y_px);
|
|
157
164
|
ctx.quadraticCurveTo(cp_x, top_cp_y, params.last_x_px + last_x_shift, last_y_px);
|
|
158
165
|
ctx.quadraticCurveTo(cp_x, bottom_cp_y, params.first_x_px + first_x_shift, first_y_px);
|
|
159
166
|
ctx.closePath();
|
|
160
167
|
ctx.fill();
|
|
168
|
+
ctx.closeGroup();
|
|
161
169
|
}
|
|
162
170
|
}
|
|
163
171
|
|
package/src/stem.ts
CHANGED
|
@@ -147,7 +147,7 @@ export class Stem extends Element {
|
|
|
147
147
|
|
|
148
148
|
// Get the y coordinates for the very base of the stem to the top of
|
|
149
149
|
// the extension
|
|
150
|
-
getExtents():
|
|
150
|
+
getExtents(): { topY: number; baseY: number } {
|
|
151
151
|
const isStemUp = this.stem_direction === Stem.UP;
|
|
152
152
|
const ys = [this.y_top, this.y_bottom];
|
|
153
153
|
const stemHeight = Stem.HEIGHT + this.stem_extension;
|
package/src/stemmablenote.ts
CHANGED
|
@@ -191,9 +191,11 @@ export abstract class StemmableNote extends Note {
|
|
|
191
191
|
return glyph.stem_beam_extension;
|
|
192
192
|
}
|
|
193
193
|
|
|
194
|
-
|
|
195
|
-
this.getStemDirection() === Stem.
|
|
196
|
-
|
|
194
|
+
if (glyph) {
|
|
195
|
+
return this.getStemDirection() === Stem.UP ? glyph.stem_up_extension : glyph.stem_down_extension;
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
return 0;
|
|
197
199
|
}
|
|
198
200
|
|
|
199
201
|
// Set the stem length to a specific. Will override the default length.
|
|
@@ -203,7 +205,7 @@ export abstract class StemmableNote extends Note {
|
|
|
203
205
|
}
|
|
204
206
|
|
|
205
207
|
// Get the top and bottom `y` values of the stem.
|
|
206
|
-
getStemExtents():
|
|
208
|
+
getStemExtents(): { topY: number; baseY: number } {
|
|
207
209
|
if (!this.stem) throw new RuntimeError('NoStem', 'No stem attached to this note.');
|
|
208
210
|
return this.stem.getExtents();
|
|
209
211
|
}
|
package/src/tables.ts
CHANGED
|
@@ -890,6 +890,10 @@ const durationCodes: Record<string, any> = {
|
|
|
890
890
|
stem: false,
|
|
891
891
|
stem_offset: 0,
|
|
892
892
|
flag: false,
|
|
893
|
+
stem_up_extension: -Tables.STEM_HEIGHT,
|
|
894
|
+
stem_down_extension: -Tables.STEM_HEIGHT,
|
|
895
|
+
tabnote_stem_up_extension: -Tables.STEM_HEIGHT,
|
|
896
|
+
tabnote_stem_down_extension: -Tables.STEM_HEIGHT,
|
|
893
897
|
dot_shiftY: 0,
|
|
894
898
|
line_above: 0,
|
|
895
899
|
line_below: 0,
|
|
@@ -945,6 +949,10 @@ const durationCodes: Record<string, any> = {
|
|
|
945
949
|
stem: false,
|
|
946
950
|
stem_offset: 0,
|
|
947
951
|
flag: false,
|
|
952
|
+
stem_up_extension: -Tables.STEM_HEIGHT,
|
|
953
|
+
stem_down_extension: -Tables.STEM_HEIGHT,
|
|
954
|
+
tabnote_stem_up_extension: -Tables.STEM_HEIGHT,
|
|
955
|
+
tabnote_stem_down_extension: -Tables.STEM_HEIGHT,
|
|
948
956
|
dot_shiftY: 0,
|
|
949
957
|
line_above: 0,
|
|
950
958
|
line_below: 0,
|
|
@@ -1000,6 +1008,10 @@ const durationCodes: Record<string, any> = {
|
|
|
1000
1008
|
stem: true,
|
|
1001
1009
|
stem_offset: 0,
|
|
1002
1010
|
flag: false,
|
|
1011
|
+
stem_up_extension: 0,
|
|
1012
|
+
stem_down_extension: 0,
|
|
1013
|
+
tabnote_stem_up_extension: 0,
|
|
1014
|
+
tabnote_stem_down_extension: 0,
|
|
1003
1015
|
dot_shiftY: 0,
|
|
1004
1016
|
line_above: 0,
|
|
1005
1017
|
line_below: 0,
|
|
@@ -1056,6 +1068,10 @@ const durationCodes: Record<string, any> = {
|
|
|
1056
1068
|
stem: true,
|
|
1057
1069
|
stem_offset: 0,
|
|
1058
1070
|
flag: false,
|
|
1071
|
+
stem_up_extension: 0,
|
|
1072
|
+
stem_down_extension: 0,
|
|
1073
|
+
tabnote_stem_up_extension: 0,
|
|
1074
|
+
tabnote_stem_down_extension: 0,
|
|
1059
1075
|
dot_shiftY: 0,
|
|
1060
1076
|
line_above: 0,
|
|
1061
1077
|
line_below: 0,
|
|
@@ -1117,6 +1133,10 @@ const durationCodes: Record<string, any> = {
|
|
|
1117
1133
|
stem_beam_extension: 0,
|
|
1118
1134
|
code_flag_upstem: 'flag8thUp',
|
|
1119
1135
|
code_flag_downstem: 'flag8thDown',
|
|
1136
|
+
stem_up_extension: 0,
|
|
1137
|
+
stem_down_extension: 0,
|
|
1138
|
+
tabnote_stem_up_extension: 0,
|
|
1139
|
+
tabnote_stem_down_extension: 0,
|
|
1120
1140
|
dot_shiftY: 0,
|
|
1121
1141
|
line_above: 0,
|
|
1122
1142
|
line_below: 0,
|
|
@@ -1179,6 +1199,10 @@ const durationCodes: Record<string, any> = {
|
|
|
1179
1199
|
flag: true,
|
|
1180
1200
|
code_flag_upstem: 'flag16thUp',
|
|
1181
1201
|
code_flag_downstem: 'flag16thDown',
|
|
1202
|
+
stem_up_extension: 0,
|
|
1203
|
+
stem_down_extension: 0,
|
|
1204
|
+
tabnote_stem_up_extension: 0,
|
|
1205
|
+
tabnote_stem_down_extension: 0,
|
|
1182
1206
|
dot_shiftY: 0,
|
|
1183
1207
|
line_above: 0,
|
|
1184
1208
|
line_below: 0,
|
|
@@ -1241,6 +1265,10 @@ const durationCodes: Record<string, any> = {
|
|
|
1241
1265
|
flag: true,
|
|
1242
1266
|
code_flag_upstem: 'flag32ndUp',
|
|
1243
1267
|
code_flag_downstem: 'flag32ndDown',
|
|
1268
|
+
stem_up_extension: 9,
|
|
1269
|
+
stem_down_extension: 9,
|
|
1270
|
+
tabnote_stem_up_extension: 9,
|
|
1271
|
+
tabnote_stem_down_extension: 9,
|
|
1244
1272
|
dot_shiftY: 0,
|
|
1245
1273
|
line_above: 0,
|
|
1246
1274
|
line_below: 0,
|
|
@@ -1303,6 +1331,10 @@ const durationCodes: Record<string, any> = {
|
|
|
1303
1331
|
flag: true,
|
|
1304
1332
|
code_flag_upstem: 'flag64thUp',
|
|
1305
1333
|
code_flag_downstem: 'flag64thDown',
|
|
1334
|
+
stem_up_extension: 13,
|
|
1335
|
+
stem_down_extension: 13,
|
|
1336
|
+
tabnote_stem_up_extension: 13,
|
|
1337
|
+
tabnote_stem_down_extension: 13,
|
|
1306
1338
|
dot_shiftY: 0,
|
|
1307
1339
|
line_above: 0,
|
|
1308
1340
|
line_below: 0,
|
|
@@ -1365,6 +1397,10 @@ const durationCodes: Record<string, any> = {
|
|
|
1365
1397
|
flag: true,
|
|
1366
1398
|
code_flag_upstem: 'flag128thUp',
|
|
1367
1399
|
code_flag_downstem: 'flag128thDown',
|
|
1400
|
+
stem_up_extension: 22,
|
|
1401
|
+
stem_down_extension: 22,
|
|
1402
|
+
tabnote_stem_up_extension: 22,
|
|
1403
|
+
tabnote_stem_down_extension: 22,
|
|
1368
1404
|
dot_shiftY: 0,
|
|
1369
1405
|
line_above: 0,
|
|
1370
1406
|
line_below: 0,
|
package/src/tabnote.ts
CHANGED
|
@@ -208,12 +208,14 @@ export class TabNote extends StemmableNote {
|
|
|
208
208
|
|
|
209
209
|
// Get the default stem extension for the note
|
|
210
210
|
getStemExtension(): number {
|
|
211
|
+
const glyph = this.getGlyph();
|
|
212
|
+
|
|
211
213
|
if (this.stem_extension_override != null) {
|
|
212
214
|
return this.stem_extension_override;
|
|
213
215
|
}
|
|
214
216
|
|
|
215
|
-
if (
|
|
216
|
-
return this.getStemDirection() ===
|
|
217
|
+
if (glyph) {
|
|
218
|
+
return this.getStemDirection() === Stem.UP ? glyph.tabnote_stem_up_extension : glyph.tabnote_stem_down_extension;
|
|
217
219
|
}
|
|
218
220
|
|
|
219
221
|
return 0;
|
|
@@ -339,7 +341,7 @@ export class TabNote extends StemmableNote {
|
|
|
339
341
|
}
|
|
340
342
|
|
|
341
343
|
// Get the stem extents for the tabnote
|
|
342
|
-
getStemExtents():
|
|
344
|
+
getStemExtents(): { topY: number; baseY: number } {
|
|
343
345
|
return this.checkStem().getExtents();
|
|
344
346
|
}
|
|
345
347
|
|
|
@@ -348,8 +350,7 @@ export class TabNote extends StemmableNote {
|
|
|
348
350
|
const {
|
|
349
351
|
beam,
|
|
350
352
|
glyph,
|
|
351
|
-
|
|
352
|
-
render_options: { draw_stem, glyph_font_scale },
|
|
353
|
+
render_options: { draw_stem },
|
|
353
354
|
} = this;
|
|
354
355
|
const context = this.checkContext();
|
|
355
356
|
|
|
@@ -357,16 +358,18 @@ export class TabNote extends StemmableNote {
|
|
|
357
358
|
|
|
358
359
|
// Now it's the flag's turn.
|
|
359
360
|
if (glyph.flag && shouldDrawFlag) {
|
|
360
|
-
const flag_x = this.getStemX()
|
|
361
|
-
const flag_y =
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
361
|
+
const flag_x = this.getStemX();
|
|
362
|
+
const flag_y =
|
|
363
|
+
this.getStemDirection() === Stem.DOWN
|
|
364
|
+
? // Down stems are below the note head and have flags on the right.
|
|
365
|
+
this.getStemY() - this.checkStem().getHeight() - (this.glyph ? this.glyph.stem_down_extension : 0)
|
|
366
|
+
: // Up stems are above the note head and have flags on the right.
|
|
367
|
+
this.getStemY() - this.checkStem().getHeight() + (this.glyph ? this.glyph.stem_up_extension : 0);
|
|
367
368
|
|
|
368
369
|
// Draw the Flag
|
|
369
|
-
|
|
370
|
+
//this.flag?.setOptions({ category: 'flag.tabStem' });
|
|
371
|
+
this.flag?.render(context, flag_x, flag_y);
|
|
372
|
+
//Glyph.renderGlyph(context, flag_x, flag_y, glyph_font_scale, flag_code, { category: 'flag.tabStem' });
|
|
370
373
|
}
|
|
371
374
|
}
|
|
372
375
|
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
File without changes
|
package/src/publicpath.ts
DELETED
|
File without changes
|