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.
Files changed (67) hide show
  1. package/README.md +3 -1
  2. package/build/cjs/vexflow-bravura.js +2 -2
  3. package/build/cjs/vexflow-bravura.js.map +1 -1
  4. package/build/cjs/vexflow-core.js +2 -2
  5. package/build/cjs/vexflow-core.js.map +1 -1
  6. package/build/cjs/vexflow-debug-with-tests.js +508 -265
  7. package/build/cjs/vexflow-debug-with-tests.js.map +1 -1
  8. package/build/cjs/vexflow-debug.js +232 -127
  9. package/build/cjs/vexflow-debug.js.map +1 -1
  10. package/build/cjs/vexflow-font-bravura.js +1 -1
  11. package/build/cjs/vexflow-font-bravura.js.map +1 -1
  12. package/build/cjs/vexflow-font-gonville.js +1 -1
  13. package/build/cjs/vexflow-font-gonville.js.map +1 -1
  14. package/build/cjs/vexflow-font-petaluma.js +1 -1
  15. package/build/cjs/vexflow-font-petaluma.js.map +1 -1
  16. package/build/cjs/vexflow-gonville.js +2 -2
  17. package/build/cjs/vexflow-gonville.js.map +1 -1
  18. package/build/cjs/vexflow-petaluma.js +2 -2
  19. package/build/cjs/vexflow-petaluma.js.map +1 -1
  20. package/build/cjs/vexflow.js +2 -2
  21. package/build/cjs/vexflow.js.map +1 -1
  22. package/build/esm/src/annotation.js +1 -1
  23. package/build/esm/src/chordsymbol.js +33 -9
  24. package/build/esm/src/element.js +10 -0
  25. package/build/esm/src/factory.js +20 -2
  26. package/build/esm/src/flow.js +6 -0
  27. package/build/esm/src/fonts/bravura_metrics.js +12 -12
  28. package/build/esm/src/fonts/gonville_metrics.js +8 -8
  29. package/build/esm/src/fonts/petaluma_metrics.js +8 -8
  30. package/build/esm/src/formatter.js +1 -1
  31. package/build/esm/src/gracenotegroup.js +3 -2
  32. package/build/esm/src/ornament.js +6 -2
  33. package/build/esm/src/stavenote.js +34 -9
  34. package/build/esm/src/stemmablenote.js +1 -0
  35. package/build/esm/src/stringnumber.js +12 -5
  36. package/build/esm/src/tables.js +1 -0
  37. package/build/esm/src/version.js +3 -3
  38. package/build/esm/src/voice.js +4 -2
  39. package/build/esm/tests/chordsymbol_tests.js +91 -9
  40. package/build/esm/tests/ornament_tests.js +98 -94
  41. package/build/esm/tests/stavenote_tests.js +36 -0
  42. package/build/esm/tests/stringnumber_tests.js +28 -23
  43. package/build/types/src/chordsymbol.d.ts +1 -0
  44. package/build/types/src/element.d.ts +4 -1
  45. package/build/types/src/factory.d.ts +8 -4
  46. package/build/types/src/flow.d.ts +2 -0
  47. package/build/types/src/ornament.d.ts +1 -0
  48. package/build/types/src/stringnumber.d.ts +3 -1
  49. package/build/types/src/tables.d.ts +1 -0
  50. package/build/types/src/voice.d.ts +1 -3
  51. package/package.json +1 -1
  52. package/src/annotation.ts +1 -1
  53. package/src/chordsymbol.ts +35 -10
  54. package/src/element.ts +13 -1
  55. package/src/factory.ts +30 -3
  56. package/src/flow.ts +8 -0
  57. package/src/fonts/bravura_metrics.ts +12 -12
  58. package/src/fonts/gonville_metrics.ts +8 -8
  59. package/src/fonts/petaluma_metrics.ts +8 -8
  60. package/src/formatter.ts +1 -1
  61. package/src/gracenotegroup.ts +5 -2
  62. package/src/ornament.ts +6 -2
  63. package/src/stavenote.ts +36 -8
  64. package/src/stemmablenote.ts +1 -0
  65. package/src/stringnumber.ts +15 -6
  66. package/src/tables.ts +1 -0
  67. package/src/voice.ts +2 -3
@@ -132,7 +132,8 @@ export class StringNumber extends Modifier {
132
132
  return true;
133
133
  }
134
134
 
135
- public radius: number;
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
- ctx.beginPath();
242
- ctx.arc(dot_x, dot_y, this.radius, 0, Math.PI * 2, false);
243
- ctx.setLineWidth(1.5);
244
- ctx.stroke();
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
@@ -550,6 +550,7 @@ const ornaments: Record<string, { code: string }> = {
550
550
  };
551
551
 
552
552
  export class Tables {
553
+ static SOFTMAX_FACTOR = 100;
553
554
  static STEM_WIDTH = 1.5;
554
555
  static STEM_HEIGHT = 35;
555
556
  static STAVE_LINE_THICKNESS = 1;
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, options?: { softmaxFactor: number }) {
59
+ constructor(time?: VoiceTime | string) {
60
60
  super();
61
61
 
62
62
  this.options = {
63
- softmaxFactor: 100,
64
- ...options,
63
+ softmaxFactor: Tables.SOFTMAX_FACTOR,
65
64
  };
66
65
 
67
66
  // Convert the `time` string into a VoiceTime object if necessary.