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.
Files changed (64) hide show
  1. package/build/cjs/vexflow-bravura.js +2 -2
  2. package/build/cjs/vexflow-bravura.js.map +1 -1
  3. package/build/cjs/vexflow-core.js +2 -2
  4. package/build/cjs/vexflow-core.js.map +1 -1
  5. package/build/cjs/vexflow-debug-with-tests.js +135 -73
  6. package/build/cjs/vexflow-debug-with-tests.js.map +1 -1
  7. package/build/cjs/vexflow-debug.js +123 -44
  8. package/build/cjs/vexflow-debug.js.map +1 -1
  9. package/build/cjs/vexflow-font-bravura.js +1 -1
  10. package/build/cjs/vexflow-font-bravura.js.map +1 -1
  11. package/build/cjs/vexflow-font-gonville.js +1 -1
  12. package/build/cjs/vexflow-font-gonville.js.map +1 -1
  13. package/build/cjs/vexflow-font-petaluma.js +1 -1
  14. package/build/cjs/vexflow-font-petaluma.js.map +1 -1
  15. package/build/cjs/vexflow-gonville.js +2 -2
  16. package/build/cjs/vexflow-gonville.js.map +1 -1
  17. package/build/cjs/vexflow-petaluma.js +2 -2
  18. package/build/cjs/vexflow-petaluma.js.map +1 -1
  19. package/build/cjs/vexflow.js +2 -2
  20. package/build/cjs/vexflow.js.map +1 -1
  21. package/build/esm/src/accidental.js +1 -1
  22. package/build/esm/src/beam.js +4 -0
  23. package/build/esm/src/fonts/bravura_metrics.js +8 -5
  24. package/build/esm/src/fonts/gonville_metrics.js +8 -2
  25. package/build/esm/src/fonts/petaluma_metrics.js +8 -5
  26. package/build/esm/src/gracenote.js +2 -0
  27. package/build/esm/src/stavenote.js +15 -5
  28. package/build/esm/src/staverepetition.js +8 -8
  29. package/build/esm/src/stavetie.js +2 -0
  30. package/build/esm/src/stemmablenote.js +4 -2
  31. package/build/esm/src/tables.js +36 -0
  32. package/build/esm/src/tabnote.js +12 -9
  33. package/build/esm/src/version.js +3 -3
  34. package/build/esm/tests/articulation_tests.js +11 -24
  35. package/build/esm/tests/ornament_tests.js +0 -1
  36. package/build/types/entry/vexflow-font-bravura.d.ts +8 -5
  37. package/build/types/entry/vexflow-font-gonville.d.ts +8 -2
  38. package/build/types/entry/vexflow-font-petaluma.d.ts +8 -5
  39. package/build/types/src/fonts/bravura_metrics.d.ts +8 -5
  40. package/build/types/src/fonts/gonville_metrics.d.ts +8 -2
  41. package/build/types/src/fonts/petaluma_metrics.d.ts +8 -5
  42. package/build/types/src/glyph.d.ts +4 -0
  43. package/build/types/src/stavenote.d.ts +2 -0
  44. package/build/types/src/stem.d.ts +4 -1
  45. package/build/types/src/stemmablenote.d.ts +4 -1
  46. package/build/types/src/tabnote.d.ts +4 -1
  47. package/package.json +1 -1
  48. package/src/accidental.ts +1 -1
  49. package/src/beam.ts +4 -0
  50. package/src/fonts/bravura_metrics.ts +8 -5
  51. package/src/fonts/gonville_metrics.ts +8 -2
  52. package/src/fonts/petaluma_metrics.ts +8 -5
  53. package/src/glyph.ts +4 -0
  54. package/src/gracenote.ts +4 -1
  55. package/src/stavenote.ts +17 -5
  56. package/src/staverepetition.ts +8 -8
  57. package/src/stavetie.ts +8 -0
  58. package/src/stem.ts +1 -1
  59. package/src/stemmablenote.ts +6 -4
  60. package/src/tables.ts +36 -0
  61. package/src/tabnote.ts +16 -13
  62. package/build/esm/src/publicpath.js +0 -1
  63. package/build/types/src/publicpath.d.ts +0 -0
  64. package/src/publicpath.ts +0 -0
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * VexFlow 4.0.1-alpha.2 2022-02-02T09:30:30.784Z 0df10df6d1fab3a99f5aa306341a31c6e686d659
2
+ * VexFlow 4.0.1-beta.0 2022-02-17T01:06:16.478Z 9fbdff60979ed561ff45bc4ab0b0a9dc18fde898
3
3
  * Copyright (c) 2010 Mohit Muthanna Cheppudira <mohit@muthanna.com>
4
4
  * https://www.vexflow.com https://github.com/0xfe/vexflow
5
5
  */
@@ -29,9 +29,9 @@ __webpack_require__.r(__webpack_exports__);
29
29
  /* harmony export */ "ID": () => (/* binding */ ID),
30
30
  /* harmony export */ "DATE": () => (/* binding */ DATE)
31
31
  /* harmony export */ });
32
- const VERSION = '4.0.1-alpha.2';
33
- const ID = '0df10df6d1fab3a99f5aa306341a31c6e686d659';
34
- const DATE = '2022-02-02T09:30:30.784Z';
32
+ const VERSION = '4.0.1-beta.0';
33
+ const ID = '9fbdff60979ed561ff45bc4ab0b0a9dc18fde898';
34
+ const DATE = '2022-02-17T01:06:16.478Z';
35
35
 
36
36
 
37
37
  /***/ }),
@@ -295,7 +295,7 @@ class Accidental extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
295
295
  if (note !== prevNote) {
296
296
  // Iterate through all notes to get the displaced pixels
297
297
  for (let n = 0; n < note.keys.length; ++n) {
298
- shiftL = Math.max(note.getLeftDisplacedHeadPx(), shiftL);
298
+ shiftL = Math.max(note.getLeftDisplacedHeadPx() - note.getXShift(), shiftL);
299
299
  }
300
300
  prevNote = note;
301
301
  }
@@ -2138,7 +2138,9 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
2138
2138
  this.notes.forEach((note) => {
2139
2139
  const stem = note.getStem();
2140
2140
  if (stem) {
2141
+ ctx.openGroup('stem', note.getAttribute('id') + '-stem');
2141
2142
  stem.setContext(ctx).draw();
2143
+ ctx.closeGroup();
2142
2144
  }
2143
2145
  }, this);
2144
2146
  }
@@ -2160,6 +2162,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
2160
2162
  const lastBeamX = beam_line.end;
2161
2163
  if (lastBeamX) {
2162
2164
  const lastBeamY = this.getSlopeY(lastBeamX, firstStemX, beamY, this.slope);
2165
+ this.setAttribute('el', ctx.openGroup('beam'));
2163
2166
  ctx.beginPath();
2164
2167
  ctx.moveTo(startBeamX, startBeamY);
2165
2168
  ctx.lineTo(startBeamX, startBeamY + beamThickness);
@@ -2167,6 +2170,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
2167
2170
  ctx.lineTo(lastBeamX + 1, lastBeamY);
2168
2171
  ctx.closePath();
2169
2172
  ctx.fill();
2173
+ ctx.closeGroup();
2170
2174
  }
2171
2175
  else {
2172
2176
  throw new _util__WEBPACK_IMPORTED_MODULE_6__.RuntimeError('NoLastBeamX', 'lastBeamX undefined.');
@@ -9974,11 +9978,17 @@ const BravuraMetrics = {
9974
9978
  },
9975
9979
  },
9976
9980
  staveRepetition: {
9977
- default: {
9981
+ symbolText: {
9982
+ offsetX: 12,
9978
9983
  offsetY: 25,
9979
- offsetSymbol: 12,
9980
9984
  spacing: 5,
9981
9985
  },
9986
+ coda: {
9987
+ offsetY: 25,
9988
+ },
9989
+ segno: {
9990
+ offsetY: 10,
9991
+ },
9982
9992
  },
9983
9993
  // noteHead: {
9984
9994
  // },
@@ -10045,9 +10055,6 @@ const BravuraMetrics = {
10045
10055
  },
10046
10056
  flag: {
10047
10057
  shiftX: -0.75,
10048
- tabStem: {
10049
- shiftX: -1.75,
10050
- },
10051
10058
  staveTempo: {
10052
10059
  shiftX: -1,
10053
10060
  },
@@ -11456,11 +11463,17 @@ const GonvilleMetrics = {
11456
11463
  },
11457
11464
  },
11458
11465
  staveRepetition: {
11459
- default: {
11466
+ symbolText: {
11467
+ offsetX: 12,
11460
11468
  offsetY: 25,
11461
- offsetSymbol: 12,
11462
11469
  spacing: 5,
11463
11470
  },
11471
+ coda: {
11472
+ offsetY: 25,
11473
+ },
11474
+ segno: {
11475
+ offsetY: 0,
11476
+ },
11464
11477
  },
11465
11478
  // noteHead: {
11466
11479
  // },
@@ -13401,11 +13414,17 @@ const PetalumaMetrics = {
13401
13414
  },
13402
13415
  },
13403
13416
  staveRepetition: {
13404
- default: {
13417
+ symbolText: {
13418
+ offsetX: 12,
13405
13419
  offsetY: 25,
13406
- offsetSymbol: 12,
13407
13420
  spacing: 5,
13408
13421
  },
13422
+ coda: {
13423
+ offsetY: 25,
13424
+ },
13425
+ segno: {
13426
+ offsetY: 10,
13427
+ },
13409
13428
  },
13410
13429
  noteHead: {
13411
13430
  displaced: {
@@ -13499,9 +13518,6 @@ const PetalumaMetrics = {
13499
13518
  flag128thDown: {
13500
13519
  shiftX: -1.2,
13501
13520
  },
13502
- tabStem: {
13503
- shiftX: -1.75,
13504
- },
13505
13521
  staveTempo: {
13506
13522
  shiftX: -1,
13507
13523
  },
@@ -17498,7 +17514,6 @@ class GraceNote extends _stavenote__WEBPACK_IMPORTED_MODULE_0__.StaveNote {
17498
17514
  }
17499
17515
  return 0;
17500
17516
  }
17501
- // FIXME: move this to more basic class.
17502
17517
  getStaveNoteScale() {
17503
17518
  return this.render_options.glyph_font_scale / _tables__WEBPACK_IMPORTED_MODULE_2__.Tables.NOTATION_FONT_SCALE;
17504
17519
  }
@@ -17530,8 +17545,10 @@ class GraceNote extends _stavenote__WEBPACK_IMPORTED_MODULE_0__.StaveNote {
17530
17545
  let y = stem_direction === _stem__WEBPACK_IMPORTED_MODULE_1__.Stem.DOWN
17531
17546
  ? noteHeadBounds.y_top - noteStemHeight
17532
17547
  : noteHeadBounds.y_bottom - noteStemHeight;
17548
+ const defaultStemExtention = stem_direction === _stem__WEBPACK_IMPORTED_MODULE_1__.Stem.DOWN ? this.glyph.stem_down_extension : this.glyph.stem_up_extension;
17533
17549
  let defaultOffsetY = _tables__WEBPACK_IMPORTED_MODULE_2__.Tables.STEM_HEIGHT;
17534
17550
  defaultOffsetY -= defaultOffsetY / 2.8;
17551
+ defaultOffsetY += defaultStemExtention;
17535
17552
  y += defaultOffsetY * staveNoteScale * stem_direction;
17536
17553
  const offsets = stem_direction === _stem__WEBPACK_IMPORTED_MODULE_1__.Stem.UP
17537
17554
  ? {
@@ -23725,7 +23742,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_4__.StemmableNot
23725
23742
  setBeam(beam) {
23726
23743
  this.beam = beam;
23727
23744
  this.calcNoteDisplacements();
23728
- // Update stem extension is a beam is assigned.
23745
+ // Update stem extension if a beam is assigned.
23729
23746
  if (this.stem) {
23730
23747
  this.stem.setExtension(this.getStemExtension());
23731
23748
  }
@@ -24283,7 +24300,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_4__.StemmableNot
24283
24300
  }
24284
24301
  // Draw the flag for the note
24285
24302
  drawFlag() {
24286
- var _a;
24303
+ var _a, _b, _c, _d, _e;
24287
24304
  const ctx = this.checkContext();
24288
24305
  if (!ctx) {
24289
24306
  throw new _util__WEBPACK_IMPORTED_MODULE_7__.RuntimeError('NoCanvasContext', "Can't draw without a canvas context.");
@@ -24293,20 +24310,27 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_4__.StemmableNot
24293
24310
  // eslint-disable-next-line
24294
24311
  const noteStemHeight = this.stem.getHeight();
24295
24312
  const flagX = this.getStemX();
24296
- // FIXME: What's with the magic +/- 2
24313
+ // What's with the magic +/- 2
24297
24314
  // ANSWER: a corner of the note stem pokes out beyond the tip of the flag.
24298
24315
  // The extra +/- 2 pushes the flag glyph outward so it covers the stem entirely.
24299
24316
  // Alternatively, we could shorten the stem.
24300
- const extension = this.flag !== undefined ? this.flag.checkMetrics().y_shift : 0;
24301
24317
  const flagY = this.getStemDirection() === _stem__WEBPACK_IMPORTED_MODULE_3__.Stem.DOWN
24302
24318
  ? // Down stems are below the note head and have flags on the right.
24303
- y_top - noteStemHeight + 2 - extension
24319
+ y_top -
24320
+ noteStemHeight +
24321
+ 2 -
24322
+ (this.glyph ? this.glyph.stem_down_extension : 0) * this.getStaveNoteScale() -
24323
+ ((_b = (_a = this.flag) === null || _a === void 0 ? void 0 : _a.getMetrics().y_shift) !== null && _b !== void 0 ? _b : 0) * (1 - this.getStaveNoteScale())
24304
24324
  : // Up stems are above the note head and have flags on the right.
24305
- y_bottom - noteStemHeight - 2 - extension;
24325
+ y_bottom -
24326
+ noteStemHeight -
24327
+ 2 +
24328
+ (this.glyph ? this.glyph.stem_up_extension : 0) * this.getStaveNoteScale() -
24329
+ ((_d = (_c = this.flag) === null || _c === void 0 ? void 0 : _c.getMetrics().y_shift) !== null && _d !== void 0 ? _d : 0) * (1 - this.getStaveNoteScale());
24306
24330
  // Draw the Flag
24307
24331
  ctx.openGroup('flag', undefined, { pointerBBox: true });
24308
24332
  this.applyStyle(ctx, this.getFlagStyle());
24309
- (_a = this.flag) === null || _a === void 0 ? void 0 : _a.render(ctx, flagX, flagY);
24333
+ (_e = this.flag) === null || _e === void 0 ? void 0 : _e.render(ctx, flagX, flagY);
24310
24334
  this.restoreStyle(ctx, this.getFlagStyle());
24311
24335
  ctx.closeGroup();
24312
24336
  }
@@ -24338,6 +24362,10 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_4__.StemmableNot
24338
24362
  (_a = this.stem) === null || _a === void 0 ? void 0 : _a.setContext(ctx).draw();
24339
24363
  ctx.closeGroup();
24340
24364
  }
24365
+ /** Primarily used as the scaling factor for grace notes, GraceNote will return the required scale. */
24366
+ getStaveNoteScale() {
24367
+ return 1.0;
24368
+ }
24341
24369
  /**
24342
24370
  * Override stemmablenote stem extension to adjust for distance from middle line.
24343
24371
  */
@@ -24501,12 +24529,12 @@ class Repetition extends _stavemodifier__WEBPACK_IMPORTED_MODULE_2__.StaveModifi
24501
24529
  }
24502
24530
  drawCodaFixed(stave, x) {
24503
24531
  const y = stave.getYForTopText(stave.getNumLines()) + this.y_shift;
24504
- _glyph__WEBPACK_IMPORTED_MODULE_1__.Glyph.renderGlyph(stave.checkContext(), this.x + x + this.x_shift, y + _tables__WEBPACK_IMPORTED_MODULE_3__.Tables.currentMusicFont().lookupMetric('staveRepetition.default.offsetY'), 40, 'coda', { category: 'coda' });
24532
+ _glyph__WEBPACK_IMPORTED_MODULE_1__.Glyph.renderGlyph(stave.checkContext(), this.x + x + this.x_shift, y + _tables__WEBPACK_IMPORTED_MODULE_3__.Tables.currentMusicFont().lookupMetric('staveRepetition.coda.offsetY'), 40, 'coda', { category: 'coda' });
24505
24533
  return this;
24506
24534
  }
24507
24535
  drawSignoFixed(stave, x) {
24508
24536
  const y = stave.getYForTopText(stave.getNumLines()) + this.y_shift;
24509
- _glyph__WEBPACK_IMPORTED_MODULE_1__.Glyph.renderGlyph(stave.checkContext(), this.x + x + this.x_shift, y + _tables__WEBPACK_IMPORTED_MODULE_3__.Tables.currentMusicFont().lookupMetric('staveRepetition.default.offsetY'), 30, 'segno', { category: 'segno' });
24537
+ _glyph__WEBPACK_IMPORTED_MODULE_1__.Glyph.renderGlyph(stave.checkContext(), this.x + x + this.x_shift, y + _tables__WEBPACK_IMPORTED_MODULE_3__.Tables.currentMusicFont().lookupMetric('staveRepetition.segno.offsetY'), 30, 'segno', { category: 'segno' });
24510
24538
  return this;
24511
24539
  }
24512
24540
  drawSymbolText(stave, x, text, draw_coda) {
@@ -24524,7 +24552,7 @@ class Repetition extends _stavemodifier__WEBPACK_IMPORTED_MODULE_2__.StaveModifi
24524
24552
  symbol_x =
24525
24553
  text_x +
24526
24554
  ctx.measureText(text).width +
24527
- _tables__WEBPACK_IMPORTED_MODULE_3__.Tables.currentMusicFont().lookupMetric('staveRepetition.default.offsetSymbol');
24555
+ _tables__WEBPACK_IMPORTED_MODULE_3__.Tables.currentMusicFont().lookupMetric('staveRepetition.symbolText.offsetX');
24528
24556
  break;
24529
24557
  // To the right without symbol
24530
24558
  case Repetition.type.DC:
@@ -24537,7 +24565,7 @@ class Repetition extends _stavemodifier__WEBPACK_IMPORTED_MODULE_2__.StaveModifi
24537
24565
  x +
24538
24566
  this.x_shift +
24539
24567
  stave.getWidth() -
24540
- _tables__WEBPACK_IMPORTED_MODULE_3__.Tables.currentMusicFont().lookupMetric('staveRepetition.default.spacing') -
24568
+ _tables__WEBPACK_IMPORTED_MODULE_3__.Tables.currentMusicFont().lookupMetric('staveRepetition.symbolText.spacing') -
24541
24569
  modifierWidth -
24542
24570
  ctx.measureText(text).width;
24543
24571
  break;
@@ -24548,19 +24576,19 @@ class Repetition extends _stavemodifier__WEBPACK_IMPORTED_MODULE_2__.StaveModifi
24548
24576
  x +
24549
24577
  this.x_shift +
24550
24578
  stave.getWidth() -
24551
- _tables__WEBPACK_IMPORTED_MODULE_3__.Tables.currentMusicFont().lookupMetric('staveRepetition.default.spacing') -
24579
+ _tables__WEBPACK_IMPORTED_MODULE_3__.Tables.currentMusicFont().lookupMetric('staveRepetition.symbolText.spacing') -
24552
24580
  modifierWidth -
24553
24581
  ctx.measureText(text).width -
24554
- _tables__WEBPACK_IMPORTED_MODULE_3__.Tables.currentMusicFont().lookupMetric('staveRepetition.default.offsetSymbol');
24582
+ _tables__WEBPACK_IMPORTED_MODULE_3__.Tables.currentMusicFont().lookupMetric('staveRepetition.symbolText.offsetX');
24555
24583
  symbol_x =
24556
24584
  text_x +
24557
24585
  ctx.measureText(text).width +
24558
- _tables__WEBPACK_IMPORTED_MODULE_3__.Tables.currentMusicFont().lookupMetric('staveRepetition.default.offsetSymbol');
24586
+ _tables__WEBPACK_IMPORTED_MODULE_3__.Tables.currentMusicFont().lookupMetric('staveRepetition.symbolText.offsetX');
24559
24587
  break;
24560
24588
  }
24561
24589
  const y = stave.getYForTopText(stave.getNumLines()) +
24562
24590
  this.y_shift +
24563
- _tables__WEBPACK_IMPORTED_MODULE_3__.Tables.currentMusicFont().lookupMetric('staveRepetition.default.offsetY');
24591
+ _tables__WEBPACK_IMPORTED_MODULE_3__.Tables.currentMusicFont().lookupMetric('staveRepetition.symbolText.offsetY');
24564
24592
  if (draw_coda) {
24565
24593
  _glyph__WEBPACK_IMPORTED_MODULE_1__.Glyph.renderGlyph(ctx, symbol_x, y, 40, 'coda', { category: 'coda' });
24566
24594
  }
@@ -25007,12 +25035,20 @@ class StaveTie extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
25007
25035
  }
25008
25036
  const top_cp_y = (first_y_px + last_y_px) / 2 + cp1 * params.direction;
25009
25037
  const bottom_cp_y = (first_y_px + last_y_px) / 2 + cp2 * params.direction;
25038
+ // id probably unnecessary if we save the group to 'el' via setAttribute
25039
+ // let id: string = "";
25040
+ // if (this.notes.first_note) {
25041
+ // id = this.notes.first_note.getAttribute('id') + '-tie';
25042
+ // }
25043
+ // this.setAttribute('el', ctx.openGroup('stavetie', id));
25044
+ this.setAttribute('el', ctx.openGroup('stavetie'));
25010
25045
  ctx.beginPath();
25011
25046
  ctx.moveTo(params.first_x_px + first_x_shift, first_y_px);
25012
25047
  ctx.quadraticCurveTo(cp_x, top_cp_y, params.last_x_px + last_x_shift, last_y_px);
25013
25048
  ctx.quadraticCurveTo(cp_x, bottom_cp_y, params.first_x_px + first_x_shift, first_y_px);
25014
25049
  ctx.closePath();
25015
25050
  ctx.fill();
25051
+ ctx.closeGroup();
25016
25052
  }
25017
25053
  }
25018
25054
  renderText(first_x_px, last_x_px) {
@@ -25529,8 +25565,10 @@ class StemmableNote extends _note__WEBPACK_IMPORTED_MODULE_1__.Note {
25529
25565
  if (this.beam) {
25530
25566
  return glyph.stem_beam_extension;
25531
25567
  }
25532
- const flagCode = this.getStemDirection() === _stem__WEBPACK_IMPORTED_MODULE_2__.Stem.DOWN ? this.glyph.code_flag_downstem : this.glyph.code_flag_upstem;
25533
- return Math.abs(_tables__WEBPACK_IMPORTED_MODULE_3__.Tables.currentMusicFont().lookupMetric(`glyphs.flag.${flagCode}.shiftY`, 0));
25568
+ if (glyph) {
25569
+ return this.getStemDirection() === _stem__WEBPACK_IMPORTED_MODULE_2__.Stem.UP ? glyph.stem_up_extension : glyph.stem_down_extension;
25570
+ }
25571
+ return 0;
25534
25572
  }
25535
25573
  // Set the stem length to a specific. Will override the default length.
25536
25574
  setStemLength(height) {
@@ -27597,6 +27635,10 @@ const durationCodes = {
27597
27635
  stem: false,
27598
27636
  stem_offset: 0,
27599
27637
  flag: false,
27638
+ stem_up_extension: -Tables.STEM_HEIGHT,
27639
+ stem_down_extension: -Tables.STEM_HEIGHT,
27640
+ tabnote_stem_up_extension: -Tables.STEM_HEIGHT,
27641
+ tabnote_stem_down_extension: -Tables.STEM_HEIGHT,
27600
27642
  dot_shiftY: 0,
27601
27643
  line_above: 0,
27602
27644
  line_below: 0,
@@ -27651,6 +27693,10 @@ const durationCodes = {
27651
27693
  stem: false,
27652
27694
  stem_offset: 0,
27653
27695
  flag: false,
27696
+ stem_up_extension: -Tables.STEM_HEIGHT,
27697
+ stem_down_extension: -Tables.STEM_HEIGHT,
27698
+ tabnote_stem_up_extension: -Tables.STEM_HEIGHT,
27699
+ tabnote_stem_down_extension: -Tables.STEM_HEIGHT,
27654
27700
  dot_shiftY: 0,
27655
27701
  line_above: 0,
27656
27702
  line_below: 0,
@@ -27705,6 +27751,10 @@ const durationCodes = {
27705
27751
  stem: true,
27706
27752
  stem_offset: 0,
27707
27753
  flag: false,
27754
+ stem_up_extension: 0,
27755
+ stem_down_extension: 0,
27756
+ tabnote_stem_up_extension: 0,
27757
+ tabnote_stem_down_extension: 0,
27708
27758
  dot_shiftY: 0,
27709
27759
  line_above: 0,
27710
27760
  line_below: 0,
@@ -27760,6 +27810,10 @@ const durationCodes = {
27760
27810
  stem: true,
27761
27811
  stem_offset: 0,
27762
27812
  flag: false,
27813
+ stem_up_extension: 0,
27814
+ stem_down_extension: 0,
27815
+ tabnote_stem_up_extension: 0,
27816
+ tabnote_stem_down_extension: 0,
27763
27817
  dot_shiftY: 0,
27764
27818
  line_above: 0,
27765
27819
  line_below: 0,
@@ -27820,6 +27874,10 @@ const durationCodes = {
27820
27874
  stem_beam_extension: 0,
27821
27875
  code_flag_upstem: 'flag8thUp',
27822
27876
  code_flag_downstem: 'flag8thDown',
27877
+ stem_up_extension: 0,
27878
+ stem_down_extension: 0,
27879
+ tabnote_stem_up_extension: 0,
27880
+ tabnote_stem_down_extension: 0,
27823
27881
  dot_shiftY: 0,
27824
27882
  line_above: 0,
27825
27883
  line_below: 0,
@@ -27881,6 +27939,10 @@ const durationCodes = {
27881
27939
  flag: true,
27882
27940
  code_flag_upstem: 'flag16thUp',
27883
27941
  code_flag_downstem: 'flag16thDown',
27942
+ stem_up_extension: 0,
27943
+ stem_down_extension: 0,
27944
+ tabnote_stem_up_extension: 0,
27945
+ tabnote_stem_down_extension: 0,
27884
27946
  dot_shiftY: 0,
27885
27947
  line_above: 0,
27886
27948
  line_below: 0,
@@ -27942,6 +28004,10 @@ const durationCodes = {
27942
28004
  flag: true,
27943
28005
  code_flag_upstem: 'flag32ndUp',
27944
28006
  code_flag_downstem: 'flag32ndDown',
28007
+ stem_up_extension: 9,
28008
+ stem_down_extension: 9,
28009
+ tabnote_stem_up_extension: 9,
28010
+ tabnote_stem_down_extension: 9,
27945
28011
  dot_shiftY: 0,
27946
28012
  line_above: 0,
27947
28013
  line_below: 0,
@@ -28003,6 +28069,10 @@ const durationCodes = {
28003
28069
  flag: true,
28004
28070
  code_flag_upstem: 'flag64thUp',
28005
28071
  code_flag_downstem: 'flag64thDown',
28072
+ stem_up_extension: 13,
28073
+ stem_down_extension: 13,
28074
+ tabnote_stem_up_extension: 13,
28075
+ tabnote_stem_down_extension: 13,
28006
28076
  dot_shiftY: 0,
28007
28077
  line_above: 0,
28008
28078
  line_below: 0,
@@ -28064,6 +28134,10 @@ const durationCodes = {
28064
28134
  flag: true,
28065
28135
  code_flag_upstem: 'flag128thUp',
28066
28136
  code_flag_downstem: 'flag128thDown',
28137
+ stem_up_extension: 22,
28138
+ stem_down_extension: 22,
28139
+ tabnote_stem_up_extension: 22,
28140
+ tabnote_stem_down_extension: 22,
28067
28141
  dot_shiftY: 0,
28068
28142
  line_above: 0,
28069
28143
  line_below: 0,
@@ -28306,11 +28380,12 @@ class TabNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_4__.StemmableNote
28306
28380
  }
28307
28381
  // Get the default stem extension for the note
28308
28382
  getStemExtension() {
28383
+ const glyph = this.getGlyph();
28309
28384
  if (this.stem_extension_override != null) {
28310
28385
  return this.stem_extension_override;
28311
28386
  }
28312
- if (this.flag) {
28313
- return this.getStemDirection() === 1 ? -this.flag.checkMetrics().y_shift : this.flag.checkMetrics().y_shift;
28387
+ if (glyph) {
28388
+ return this.getStemDirection() === _stem__WEBPACK_IMPORTED_MODULE_3__.Stem.UP ? glyph.tabnote_stem_up_extension : glyph.tabnote_stem_down_extension;
28314
28389
  }
28315
28390
  return 0;
28316
28391
  }
@@ -28426,18 +28501,22 @@ class TabNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_4__.StemmableNote
28426
28501
  }
28427
28502
  // Draw the fal onto the context
28428
28503
  drawFlag() {
28429
- const { beam, glyph, stem_direction, render_options: { draw_stem, glyph_font_scale }, } = this;
28504
+ var _a;
28505
+ const { beam, glyph, render_options: { draw_stem }, } = this;
28430
28506
  const context = this.checkContext();
28431
28507
  const shouldDrawFlag = beam == undefined && draw_stem;
28432
28508
  // Now it's the flag's turn.
28433
28509
  if (glyph.flag && shouldDrawFlag) {
28434
- const flag_x = this.getStemX() + 1;
28435
- const flag_y = this.getStemY() - this.checkStem().getHeight();
28436
- const flag_code = stem_direction === _stem__WEBPACK_IMPORTED_MODULE_3__.Stem.DOWN
28437
- ? glyph.code_flag_downstem // Down stems have flags on the left.
28438
- : glyph.code_flag_upstem;
28510
+ const flag_x = this.getStemX();
28511
+ const flag_y = this.getStemDirection() === _stem__WEBPACK_IMPORTED_MODULE_3__.Stem.DOWN
28512
+ ? // Down stems are below the note head and have flags on the right.
28513
+ this.getStemY() - this.checkStem().getHeight() - (this.glyph ? this.glyph.stem_down_extension : 0)
28514
+ : // Up stems are above the note head and have flags on the right.
28515
+ this.getStemY() - this.checkStem().getHeight() + (this.glyph ? this.glyph.stem_up_extension : 0);
28439
28516
  // Draw the Flag
28440
- _glyph__WEBPACK_IMPORTED_MODULE_1__.Glyph.renderGlyph(context, flag_x, flag_y, glyph_font_scale, flag_code, { category: 'flag.tabStem' });
28517
+ //this.flag?.setOptions({ category: 'flag.tabStem' });
28518
+ (_a = this.flag) === null || _a === void 0 ? void 0 : _a.render(context, flag_x, flag_y);
28519
+ //Glyph.renderGlyph(context, flag_x, flag_y, glyph_font_scale, flag_code, { category: 'flag.tabStem' });
28441
28520
  }
28442
28521
  }
28443
28522
  // Render the modifiers onto the context.
@@ -33448,30 +33527,12 @@ function verticalPlacement(options, contextBuilder) {
33448
33527
  function drawArticulations2(options) {
33449
33528
  expect(0);
33450
33529
  const scale = 0.8;
33451
- let x = 10;
33452
- const y = 30;
33453
- const width = 350 - _src_stave__WEBPACK_IMPORTED_MODULE_7__.Stave.defaultPadding;
33454
- const f = _vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__.VexFlowTests.makeFactory(options, 1000, 195);
33530
+ const f = _vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__.VexFlowTests.makeFactory(options, 1500, 195);
33531
+ // Get the rendering context
33455
33532
  const ctx = f.getContext();
33456
33533
  ctx.scale(scale, scale);
33457
- const score = f.EasyScore();
33458
- const formatAndDrawToWidth = (x, y, width, notes, barline, beams) => {
33459
- const voices = [score.voice(notes, { time: '4/4' })];
33460
- const formatter = f.Formatter();
33461
- voices.forEach((v) => formatter.joinVoices([v]));
33462
- const nwidth = Math.max(formatter.preCalculateMinTotalWidth(voices), width);
33463
- formatter.format(voices, nwidth);
33464
- const stave = f
33465
- .Stave({ x: x, y: y, width: nwidth + _src_stave__WEBPACK_IMPORTED_MODULE_7__.Stave.defaultPadding })
33466
- .setEndBarType(barline)
33467
- .setContext(ctx)
33468
- .draw();
33469
- voices.forEach((voice) => voice.draw(ctx, stave));
33470
- beams.forEach((beam) => beam.setContext(ctx).draw());
33471
- return stave.getWidth();
33472
- };
33473
- // Get the rendering context
33474
33534
  // bar 1
33535
+ const stave1 = new _src_stave__WEBPACK_IMPORTED_MODULE_7__.Stave(10, 50, 500).setContext(ctx).draw();
33475
33536
  const notesBar1 = [
33476
33537
  f.StaveNote({ keys: ['c/4'], duration: '16', stem_direction: 1 }),
33477
33538
  f.StaveNote({ keys: ['d/4'], duration: '16', stem_direction: 1 }),
@@ -33500,11 +33561,11 @@ function drawArticulations2(options) {
33500
33561
  }
33501
33562
  const beam1 = new _src_beam__WEBPACK_IMPORTED_MODULE_2__.Beam(notesBar1.slice(0, 8));
33502
33563
  const beam2 = new _src_beam__WEBPACK_IMPORTED_MODULE_2__.Beam(notesBar1.slice(8, 16));
33503
- x += formatAndDrawToWidth(x, y, width, notesBar1, _src_stavebarline__WEBPACK_IMPORTED_MODULE_8__.Barline.type.NONE, [beam1, beam2]);
33504
- // Helper function to justify and draw a 4/4 voice
33564
+ _src_formatter__WEBPACK_IMPORTED_MODULE_5__.Formatter.FormatAndDraw(ctx, stave1, notesBar1);
33505
33565
  beam1.setContext(ctx).draw();
33506
33566
  beam2.setContext(ctx).draw();
33507
33567
  // bar 2 - juxtaposing second bar next to first bar
33568
+ const stave2 = new _src_stave__WEBPACK_IMPORTED_MODULE_7__.Stave(510, 50, 500).setContext(ctx).draw();
33508
33569
  const notesBar2 = [
33509
33570
  f.StaveNote({ keys: ['f/3'], duration: '16', stem_direction: 1 }),
33510
33571
  f.StaveNote({ keys: ['g/3'], duration: '16', stem_direction: 1 }),
@@ -33532,15 +33593,18 @@ function drawArticulations2(options) {
33532
33593
  }
33533
33594
  const beam3 = new _src_beam__WEBPACK_IMPORTED_MODULE_2__.Beam(notesBar2.slice(0, 8));
33534
33595
  const beam4 = new _src_beam__WEBPACK_IMPORTED_MODULE_2__.Beam(notesBar2.slice(8, 16));
33535
- x += formatAndDrawToWidth(x, y, width, notesBar2, _src_stavebarline__WEBPACK_IMPORTED_MODULE_8__.Barline.type.NONE, [beam3, beam4]);
33596
+ _src_formatter__WEBPACK_IMPORTED_MODULE_5__.Formatter.FormatAndDraw(ctx, stave2, notesBar2);
33597
+ beam3.setContext(ctx).draw();
33598
+ beam4.setContext(ctx).draw();
33536
33599
  // bar 3 - juxtaposing second bar next to first bar
33600
+ const stave3 = new _src_stave__WEBPACK_IMPORTED_MODULE_7__.Stave(1010, 50, 100).setContext(ctx).draw();
33537
33601
  const notesBar3 = [f.StaveNote({ keys: ['c/4'], duration: 'w', stem_direction: 1 })];
33538
33602
  notesBar3[0].addModifier(new _src_articulation__WEBPACK_IMPORTED_MODULE_1__.Articulation('a-').setPosition(3), 0);
33539
33603
  notesBar3[0].addModifier(new _src_articulation__WEBPACK_IMPORTED_MODULE_1__.Articulation('a>').setPosition(3), 0);
33540
33604
  notesBar3[0].addModifier(new _src_articulation__WEBPACK_IMPORTED_MODULE_1__.Articulation('a@a').setPosition(3), 0);
33541
- // Helper function to justify and draw a 4/4 voice
33542
- x += formatAndDrawToWidth(x, y, width, notesBar3, _src_stavebarline__WEBPACK_IMPORTED_MODULE_8__.Barline.type.NONE, []);
33605
+ _src_formatter__WEBPACK_IMPORTED_MODULE_5__.Formatter.FormatAndDraw(ctx, stave3, notesBar3);
33543
33606
  // bar 4 - juxtaposing second bar next to first bar
33607
+ const stave4 = new _src_stave__WEBPACK_IMPORTED_MODULE_7__.Stave(1110, 50, 250).setContext(ctx).draw();
33544
33608
  const notesBar4 = [
33545
33609
  f.StaveNote({ keys: ['c/5'], duration: 'q', stem_direction: -1 }),
33546
33610
  f.StaveNote({ keys: ['a/5'], duration: 'q', stem_direction: -1 }),
@@ -33554,8 +33618,7 @@ function drawArticulations2(options) {
33554
33618
  }
33555
33619
  notesBar4[i].addModifier(new _src_articulation__WEBPACK_IMPORTED_MODULE_1__.Articulation('a-').setPosition(position1), 0);
33556
33620
  }
33557
- // Helper function to justify and draw a 4/4 voice
33558
- formatAndDrawToWidth(x, y, width, notesBar4, _src_stavebarline__WEBPACK_IMPORTED_MODULE_8__.Barline.type.END, []);
33621
+ _src_formatter__WEBPACK_IMPORTED_MODULE_5__.Formatter.FormatAndDraw(ctx, stave4, notesBar4);
33559
33622
  }
33560
33623
  function tabNotes(options, contextBuilder) {
33561
33624
  const ctx = contextBuilder(options.elementId, 600, 200);
@@ -40899,7 +40962,6 @@ function drawOrnamentsWithAccidentals(options, contextBuilder) {
40899
40962
  ];
40900
40963
  notes[0].addModifier(new _src_ornament__WEBPACK_IMPORTED_MODULE_6__.Ornament('mordent').setUpperAccidental('#').setLowerAccidental('#'), 0);
40901
40964
  notes[1].addModifier(new _src_ornament__WEBPACK_IMPORTED_MODULE_6__.Ornament('turn_inverted').setLowerAccidental('b').setUpperAccidental('b'), 0);
40902
- notes[1].addModifier(new _src_ornament__WEBPACK_IMPORTED_MODULE_6__.Ornament('turn_inverted').setLowerAccidental('b').setUpperAccidental('b'), 0);
40903
40965
  notes[2].addModifier(new _src_ornament__WEBPACK_IMPORTED_MODULE_6__.Ornament('turn').setUpperAccidental('##').setLowerAccidental('##'), 0);
40904
40966
  notes[3].addModifier(new _src_ornament__WEBPACK_IMPORTED_MODULE_6__.Ornament('mordent_inverted').setLowerAccidental('db').setUpperAccidental('db'), 0);
40905
40967
  notes[4].addModifier(new _src_ornament__WEBPACK_IMPORTED_MODULE_6__.Ornament('turn_inverted').setUpperAccidental('++').setLowerAccidental('++'), 0);