vexflow 4.0.2 → 4.0.3
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/README.md +3 -1
- 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 +508 -265
- package/build/cjs/vexflow-debug-with-tests.js.map +1 -1
- package/build/cjs/vexflow-debug.js +232 -127
- 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/annotation.js +1 -1
- package/build/esm/src/chordsymbol.js +33 -9
- package/build/esm/src/element.js +10 -0
- package/build/esm/src/factory.js +20 -2
- package/build/esm/src/flow.js +6 -0
- package/build/esm/src/fonts/bravura_metrics.js +12 -12
- package/build/esm/src/fonts/gonville_metrics.js +8 -8
- package/build/esm/src/fonts/petaluma_metrics.js +8 -8
- package/build/esm/src/formatter.js +1 -1
- package/build/esm/src/gracenotegroup.js +3 -2
- package/build/esm/src/ornament.js +6 -2
- package/build/esm/src/stavenote.js +34 -9
- package/build/esm/src/stemmablenote.js +1 -0
- package/build/esm/src/stringnumber.js +12 -5
- package/build/esm/src/tables.js +1 -0
- package/build/esm/src/version.js +3 -3
- package/build/esm/src/voice.js +4 -2
- package/build/esm/tests/chordsymbol_tests.js +91 -9
- package/build/esm/tests/ornament_tests.js +98 -94
- package/build/esm/tests/stavenote_tests.js +36 -0
- package/build/esm/tests/stringnumber_tests.js +28 -23
- package/build/types/src/chordsymbol.d.ts +1 -0
- package/build/types/src/element.d.ts +4 -1
- package/build/types/src/factory.d.ts +8 -4
- package/build/types/src/flow.d.ts +2 -0
- package/build/types/src/ornament.d.ts +1 -0
- package/build/types/src/stringnumber.d.ts +3 -1
- package/build/types/src/tables.d.ts +1 -0
- package/build/types/src/voice.d.ts +1 -3
- package/package.json +1 -1
- package/src/annotation.ts +1 -1
- package/src/chordsymbol.ts +35 -10
- package/src/element.ts +13 -1
- package/src/factory.ts +30 -3
- package/src/flow.ts +8 -0
- package/src/fonts/bravura_metrics.ts +12 -12
- package/src/fonts/gonville_metrics.ts +8 -8
- package/src/fonts/petaluma_metrics.ts +8 -8
- package/src/formatter.ts +1 -1
- package/src/gracenotegroup.ts +5 -2
- package/src/ornament.ts +6 -2
- package/src/stavenote.ts +36 -8
- package/src/stemmablenote.ts +1 -0
- package/src/stringnumber.ts +15 -6
- package/src/tables.ts +1 -0
- package/src/voice.ts +2 -3
package/src/stringnumber.ts
CHANGED
|
@@ -132,7 +132,8 @@ export class StringNumber extends Modifier {
|
|
|
132
132
|
return true;
|
|
133
133
|
}
|
|
134
134
|
|
|
135
|
-
|
|
135
|
+
protected radius: number;
|
|
136
|
+
protected drawCircle: boolean;
|
|
136
137
|
protected last_note?: Note;
|
|
137
138
|
protected string_number: string;
|
|
138
139
|
protected x_offset: number;
|
|
@@ -146,7 +147,6 @@ export class StringNumber extends Modifier {
|
|
|
146
147
|
super();
|
|
147
148
|
|
|
148
149
|
this.string_number = number;
|
|
149
|
-
this.setWidth(20); // ???
|
|
150
150
|
this.position = Modifier.Position.ABOVE; // Default position above stem or note head
|
|
151
151
|
this.x_shift = 0;
|
|
152
152
|
this.y_shift = 0;
|
|
@@ -157,6 +157,8 @@ export class StringNumber extends Modifier {
|
|
|
157
157
|
this.dashed = true; // true - draw dashed extension false - no extension
|
|
158
158
|
this.leg = Renderer.LineEndType.NONE; // draw upward/downward leg at the of extension line
|
|
159
159
|
this.radius = 8;
|
|
160
|
+
this.drawCircle = true;
|
|
161
|
+
this.setWidth(this.radius * 2 + 4);
|
|
160
162
|
this.resetFont();
|
|
161
163
|
}
|
|
162
164
|
|
|
@@ -192,6 +194,11 @@ export class StringNumber extends Modifier {
|
|
|
192
194
|
return this;
|
|
193
195
|
}
|
|
194
196
|
|
|
197
|
+
setDrawCircle(drawCircle: boolean): this {
|
|
198
|
+
this.drawCircle = drawCircle;
|
|
199
|
+
return this;
|
|
200
|
+
}
|
|
201
|
+
|
|
195
202
|
draw(): void {
|
|
196
203
|
const ctx = this.checkContext();
|
|
197
204
|
const note = this.checkAttachedNote();
|
|
@@ -238,10 +245,12 @@ export class StringNumber extends Modifier {
|
|
|
238
245
|
}
|
|
239
246
|
|
|
240
247
|
ctx.save();
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
248
|
+
if (this.drawCircle) {
|
|
249
|
+
ctx.beginPath();
|
|
250
|
+
ctx.arc(dot_x, dot_y, this.radius, 0, Math.PI * 2, false);
|
|
251
|
+
ctx.setLineWidth(1.5);
|
|
252
|
+
ctx.stroke();
|
|
253
|
+
}
|
|
245
254
|
ctx.setFont(this.textFont);
|
|
246
255
|
const x = dot_x - ctx.measureText(this.string_number).width / 2;
|
|
247
256
|
ctx.fillText('' + this.string_number, x, dot_y + 4.5);
|
package/src/tables.ts
CHANGED
package/src/voice.ts
CHANGED
|
@@ -56,12 +56,11 @@ export class Voice extends Element {
|
|
|
56
56
|
protected readonly tickables: Tickable[] = [];
|
|
57
57
|
protected readonly time: Required<VoiceTime>;
|
|
58
58
|
|
|
59
|
-
constructor(time?: VoiceTime | string
|
|
59
|
+
constructor(time?: VoiceTime | string) {
|
|
60
60
|
super();
|
|
61
61
|
|
|
62
62
|
this.options = {
|
|
63
|
-
softmaxFactor:
|
|
64
|
-
...options,
|
|
63
|
+
softmaxFactor: Tables.SOFTMAX_FACTOR,
|
|
65
64
|
};
|
|
66
65
|
|
|
67
66
|
// Convert the `time` string into a VoiceTime object if necessary.
|