vexflow 5.4.0 → 5.6.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 (127) 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 +1740 -372
  6. package/build/cjs/vexflow-debug-with-tests.js.map +1 -1
  7. package/build/cjs/vexflow-debug.js +565 -258
  8. package/build/cjs/vexflow-debug.js.map +1 -1
  9. package/build/cjs/vexflow.js +2 -2
  10. package/build/cjs/vexflow.js.map +1 -1
  11. package/build/esm/src/annotation.js +2 -1
  12. package/build/esm/src/continuouslayout.js +107 -16
  13. package/build/esm/src/continuousspan.js +9 -1
  14. package/build/esm/src/easyscore/composition.js +83 -18
  15. package/build/esm/src/factory.js +2 -9
  16. package/build/esm/src/formatter.js +1 -1
  17. package/build/esm/src/fretdiagram.js +6 -2
  18. package/build/esm/src/gracenotegroup.js +4 -3
  19. package/build/esm/src/guitarmodifiers.js +4 -1
  20. package/build/esm/src/metrics.js +24 -5
  21. package/build/esm/src/note.js +1 -0
  22. package/build/esm/src/notehead.js +21 -10
  23. package/build/esm/src/phraselayout.js +13 -5
  24. package/build/esm/src/publication.js +10 -5
  25. package/build/esm/src/publicationview.js +3 -2
  26. package/build/esm/src/stave.js +4 -2
  27. package/build/esm/src/stavenote.js +56 -13
  28. package/build/esm/src/stavesection.js +15 -10
  29. package/build/esm/src/stavetie.js +3 -2
  30. package/build/esm/src/strokes.js +1 -1
  31. package/build/esm/src/svgcontext.js +11 -3
  32. package/build/esm/src/tabnote.js +6 -8
  33. package/build/esm/src/tabtie.js +3 -0
  34. package/build/esm/src/version.js +3 -3
  35. package/build/esm/tests/chordsymbol_tests.js +4 -1
  36. package/build/esm/tests/demo_petzold_tests.js +26 -14
  37. package/build/esm/tests/demo_repertoire_tests.js +5 -1
  38. package/build/esm/tests/demos/ballade.js +15 -0
  39. package/build/esm/tests/demos/electric.js +1 -3
  40. package/build/esm/tests/demos/fugue.js +19 -0
  41. package/build/esm/tests/demos/greensleeves.js +1 -2
  42. package/build/esm/tests/demos/kesh.js +2 -3
  43. package/build/esm/tests/demos/saints.js +17 -5
  44. package/build/esm/tests/engraving/continuous-studies.mjs +24 -0
  45. package/build/esm/tests/engraving/publication-studies.mjs +30 -0
  46. package/build/esm/tests/font_tests.js +8 -0
  47. package/build/esm/tests/gracenote_tests.js +1 -1
  48. package/build/esm/tests/gracetabnote_tests.js +19 -3
  49. package/build/esm/tests/node/chord-kerning-tests.mjs +2 -2
  50. package/build/esm/tests/node/continuous-score-tests.mjs +157 -2
  51. package/build/esm/tests/node/easyscore-tests.mjs +38 -0
  52. package/build/esm/tests/node/engraving-layout-tests.mjs +33 -0
  53. package/build/esm/tests/node/instrument-profile-tests.mjs +40 -0
  54. package/build/esm/tests/node/local-engraving-tests.mjs +58 -0
  55. package/build/esm/tests/node/metrics-tests.mjs +2 -0
  56. package/build/esm/tests/node/phrase-layout-tests.mjs +58 -5
  57. package/build/esm/tests/node/publication-tests.mjs +158 -2
  58. package/build/esm/tests/node/svg-export-tests.mjs +50 -21
  59. package/build/esm/tests/scores/ballade.js +399 -0
  60. package/build/esm/tests/scores/drums.js +93 -0
  61. package/build/esm/tests/scores/electric.js +83 -0
  62. package/build/esm/tests/scores/falseta.js +46 -0
  63. package/build/esm/tests/scores/fugue.js +366 -0
  64. package/build/esm/tests/scores/guitar.js +32 -0
  65. package/build/esm/tests/scores/kesh.js +146 -0
  66. package/build/esm/tests/scores/prelude.js +84 -0
  67. package/build/esm/tests/scores/quartertones.js +78 -0
  68. package/build/esm/tests/scores/saints.js +70 -0
  69. package/build/esm/tests/scores/sumer.js +126 -0
  70. package/build/esm/tests/scores/viewer.js +162 -0
  71. package/build/esm/tests/tabnote_tests.js +43 -0
  72. package/build/esm/tests/vexflow_test_helpers.js +1 -0
  73. package/build/esm/tools/explorer/catalog/expression.mjs +16 -6
  74. package/build/esm/tools/explorer/catalog/guitar.mjs +2 -2
  75. package/build/types/src/continuouslayout.d.ts +4 -0
  76. package/build/types/src/continuousspan.d.ts +10 -2
  77. package/build/types/src/easyscore/composition.d.ts +19 -0
  78. package/build/types/src/fretdiagram.d.ts +2 -0
  79. package/build/types/src/instrumentprofile.d.ts +4 -0
  80. package/build/types/src/note.d.ts +2 -0
  81. package/build/types/src/notehead.d.ts +2 -0
  82. package/build/types/src/publication.d.ts +3 -1
  83. package/build/types/src/stave.d.ts +4 -2
  84. package/build/types/src/stavenote.d.ts +10 -0
  85. package/build/types/src/stavesection.d.ts +3 -0
  86. package/build/types/src/svgcontext.d.ts +2 -0
  87. package/build/types/src/typeguard.d.ts +1 -0
  88. package/changelog/CHANGELOG.md +16 -0
  89. package/package.json +4 -1
  90. package/tests/all.html +9 -0
  91. package/tests/demo_petzold_tests.ts +30 -16
  92. package/tests/demos/ballade.ts +36 -0
  93. package/tests/demos/ballade.webp +0 -0
  94. package/tests/demos/electric.ts +1 -3
  95. package/tests/demos/electric.webp +0 -0
  96. package/tests/demos/fugue.ts +27 -0
  97. package/tests/demos/fugue.webp +0 -0
  98. package/tests/demos/greensleeves.ts +1 -3
  99. package/tests/demos/greensleeves.webp +0 -0
  100. package/tests/demos/kesh.ts +2 -4
  101. package/tests/demos/kesh.webp +0 -0
  102. package/tests/demos/saints.ts +20 -7
  103. package/tests/demos/saints.webp +0 -0
  104. package/tests/flow.html +165 -52
  105. package/tests/minuet.webp +0 -0
  106. package/tests/scores/ballade.js +445 -0
  107. package/tests/scores/drums.js +101 -0
  108. package/tests/scores/drums.webp +0 -0
  109. package/tests/scores/electric.js +93 -0
  110. package/tests/scores/electric.webp +0 -0
  111. package/tests/scores/falseta.js +53 -0
  112. package/tests/scores/falseta.webp +0 -0
  113. package/tests/scores/fugue.js +433 -0
  114. package/tests/scores/guitar.js +34 -0
  115. package/tests/scores/index.html +48 -0
  116. package/tests/scores/kesh.js +171 -0
  117. package/tests/scores/kesh.webp +0 -0
  118. package/tests/scores/prelude.js +90 -0
  119. package/tests/scores/prelude.webp +0 -0
  120. package/tests/scores/quartertones.js +83 -0
  121. package/tests/scores/quartertones.webp +0 -0
  122. package/tests/scores/saints.js +85 -0
  123. package/tests/scores/saints.webp +0 -0
  124. package/tests/scores/sumer.js +139 -0
  125. package/tests/scores/sumer.webp +0 -0
  126. package/tests/scores/viewer.css +132 -0
  127. package/tests/scores/viewer.js +150 -0
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * VexFlow 5.4.0 2026-11-19T00:43:30.372Z 30054199edf019f97dcea2f2939430198f387f49
2
+ * VexFlow 5.6.0 2026-11-19T20:58:10.569Z 39cf287f300f0ef6bd9b63cbf1d01ef0bbbd1c10
3
3
  * Copyright (c) 2023-present VexFlow contributors (see https://github.com/vexflow/vexflow/blob/main/AUTHORS.md).
4
4
  */
5
5
  (function webpackUniversalModuleDefinition(root, factory) {
@@ -29,9 +29,9 @@ __webpack_require__.r(__webpack_exports__);
29
29
  /* harmony export */ VERSION: () => (/* binding */ VERSION)
30
30
  /* harmony export */ });
31
31
  // Gruntfile.js uses string-replace-loader to replace these values during build time.
32
- const VERSION = '5.4.0';
33
- const ID = '30054199edf019f97dcea2f2939430198f387f49';
34
- const DATE = '2026-11-19T00:43:30.372Z';
32
+ const VERSION = '5.6.0';
33
+ const ID = '39cf287f300f0ef6bd9b63cbf1d01ef0bbbd1c10';
34
+ const DATE = '2026-11-19T20:58:10.569Z';
35
35
 
36
36
 
37
37
  /***/ },
@@ -911,7 +911,9 @@ class Annotation extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
911
911
  if (hasStem && stemDirection === _stem__WEBPACK_IMPORTED_MODULE_3__.Stem.UP) {
912
912
  // If the stem is above the stave already, go with default line width vs. actual
913
913
  // since the lines between don't really matter.
914
- spacing = stemExt.topY < stave.getTopLineTopY() ? _tables__WEBPACK_IMPORTED_MODULE_4__.Tables.STAVE_LINE_DISTANCE : spacing;
914
+ // Tab articulations stack in actual string spaces, including above an up-stem.
915
+ if (!(0,_typeguard__WEBPACK_IMPORTED_MODULE_5__.isTabNote)(note) && stemExt.topY < stave.getTopLineTopY())
916
+ spacing = _tables__WEBPACK_IMPORTED_MODULE_4__.Tables.STAVE_LINE_DISTANCE;
915
917
  y = Math.min(y, stemExt.topY - spacing * (this.textLine + 1));
916
918
  }
917
919
  } /* CENTER_STEM */
@@ -4027,24 +4029,25 @@ __webpack_require__.r(__webpack_exports__);
4027
4029
  /* harmony export */ ContinuousLayout: () => (/* binding */ ContinuousLayout)
4028
4030
  /* harmony export */ });
4029
4031
  /* harmony import */ var _accidental__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./accidental */ "./src/accidental.ts");
4030
- /* harmony import */ var _clef__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./clef */ "./src/clef.ts");
4031
- /* harmony import */ var _continuousspan__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./continuousspan */ "./src/continuousspan.ts");
4032
- /* harmony import */ var _element__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./element */ "./src/element.ts");
4033
- /* harmony import */ var _engravinggeometry__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./engravinggeometry */ "./src/engravinggeometry.ts");
4034
- /* harmony import */ var _fraction__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./fraction */ "./src/fraction.ts");
4035
- /* harmony import */ var _glyphs__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./glyphs */ "./src/glyphs.ts");
4036
- /* harmony import */ var _keysignature__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./keysignature */ "./src/keysignature.ts");
4037
- /* harmony import */ var _multimeasurerest__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./multimeasurerest */ "./src/multimeasurerest.ts");
4038
- /* harmony import */ var _note__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./note */ "./src/note.ts");
4039
- /* harmony import */ var _stavebarline__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./stavebarline */ "./src/stavebarline.ts");
4040
- /* harmony import */ var _staveconnector__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./staveconnector */ "./src/staveconnector.ts");
4041
- /* harmony import */ var _stavemodifier__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./stavemodifier */ "./src/stavemodifier.ts");
4042
- /* harmony import */ var _stavenote__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./stavenote */ "./src/stavenote.ts");
4043
- /* harmony import */ var _stem__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./stem */ "./src/stem.ts");
4044
- /* harmony import */ var _systembreaks__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./systembreaks */ "./src/systembreaks.ts");
4045
- /* harmony import */ var _tabnote__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./tabnote */ "./src/tabnote.ts");
4046
- /* harmony import */ var _timesignature__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./timesignature */ "./src/timesignature.ts");
4047
- /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./util */ "./src/util.ts");
4032
+ /* harmony import */ var _annotation__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./annotation */ "./src/annotation.ts");
4033
+ /* harmony import */ var _clef__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./clef */ "./src/clef.ts");
4034
+ /* harmony import */ var _continuousspan__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./continuousspan */ "./src/continuousspan.ts");
4035
+ /* harmony import */ var _element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./element */ "./src/element.ts");
4036
+ /* harmony import */ var _engravinggeometry__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./engravinggeometry */ "./src/engravinggeometry.ts");
4037
+ /* harmony import */ var _fraction__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./fraction */ "./src/fraction.ts");
4038
+ /* harmony import */ var _glyphs__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./glyphs */ "./src/glyphs.ts");
4039
+ /* harmony import */ var _keysignature__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./keysignature */ "./src/keysignature.ts");
4040
+ /* harmony import */ var _multimeasurerest__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./multimeasurerest */ "./src/multimeasurerest.ts");
4041
+ /* harmony import */ var _note__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./note */ "./src/note.ts");
4042
+ /* harmony import */ var _stavebarline__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./stavebarline */ "./src/stavebarline.ts");
4043
+ /* harmony import */ var _staveconnector__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./staveconnector */ "./src/staveconnector.ts");
4044
+ /* harmony import */ var _stavemodifier__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./stavemodifier */ "./src/stavemodifier.ts");
4045
+ /* harmony import */ var _stavenote__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./stavenote */ "./src/stavenote.ts");
4046
+ /* harmony import */ var _stem__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./stem */ "./src/stem.ts");
4047
+ /* harmony import */ var _systembreaks__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./systembreaks */ "./src/systembreaks.ts");
4048
+ /* harmony import */ var _tabnote__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./tabnote */ "./src/tabnote.ts");
4049
+ /* harmony import */ var _timesignature__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./timesignature */ "./src/timesignature.ts");
4050
+ /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ./util */ "./src/util.ts");
4048
4051
  // Row-dependent notation for a responsive EasyScore composition. Source measures and notes keep their identity.
4049
4052
 
4050
4053
 
@@ -4065,8 +4068,29 @@ __webpack_require__.r(__webpack_exports__);
4065
4068
 
4066
4069
 
4067
4070
 
4071
+
4068
4072
  function invalid(message) {
4069
- throw new _util__WEBPACK_IMPORTED_MODULE_18__.RuntimeError('BadContinuousScore', message);
4073
+ throw new _util__WEBPACK_IMPORTED_MODULE_19__.RuntimeError('BadContinuousScore', message);
4074
+ }
4075
+ /** Resolve each end independently because chord positions can be reordered between attacks. */
4076
+ function resolveTabTie(span, first, last) {
4077
+ var _a, _b, _c, _d, _e;
4078
+ const start = first.getPositions();
4079
+ const end = last.getPositions();
4080
+ for (const head of [span.fromHead, span.toHead]) {
4081
+ if (head !== undefined && (!Number.isInteger(head) || head < 0))
4082
+ invalid('Invalid tab tie position index.');
4083
+ }
4084
+ const selected = span.fromHead === undefined && span.toHead !== undefined ? end[span.toHead] : start[(_a = span.fromHead) !== null && _a !== void 0 ? _a : 0];
4085
+ const string = (_b = span.string) !== null && _b !== void 0 ? _b : selected === null || selected === void 0 ? void 0 : selected.str;
4086
+ if (string === undefined || !Number.isInteger(string) || string < 1 || string > first.checkStave().getNumLines())
4087
+ invalid('A tab tie needs a string on its staff.');
4088
+ const fromHead = (_c = span.fromHead) !== null && _c !== void 0 ? _c : start.findIndex((p) => p.str === string);
4089
+ const toHead = (_d = span.toHead) !== null && _d !== void 0 ? _d : end.findIndex((p) => p.str === string);
4090
+ const from = start[fromHead], to = end[toHead];
4091
+ if (!from || !to || from.str !== string || to.str !== string || String(from.fret) !== String(to.fret))
4092
+ invalid('Tab tie endpoints must play the same string and fret.');
4093
+ return Object.assign(Object.assign({}, span), { fromHead, toHead, string, side: (_e = span.side) !== null && _e !== void 0 ? _e : 'above' });
4070
4094
  }
4071
4095
  /** A row has one shared staff map. A compressed rest maps back to every original measure. */
4072
4096
  class ContinuousLayout {
@@ -4075,7 +4099,7 @@ class ContinuousLayout {
4075
4099
  const key = (symbol ? 'glyph:' : 'text:') + text;
4076
4100
  let mark = this.headerLabels.get(key);
4077
4101
  if (!mark) {
4078
- mark = new _element__WEBPACK_IMPORTED_MODULE_3__.Element(symbol ? 'Repetition' : 'Annotation').setText(text);
4102
+ mark = new _element__WEBPACK_IMPORTED_MODULE_4__.Element(symbol ? 'Repetition' : 'Annotation').setText(text);
4079
4103
  if (symbol)
4080
4104
  mark.setFontSize(18);
4081
4105
  this.headerLabels.set(key, mark);
@@ -4086,7 +4110,7 @@ class ContinuousLayout {
4086
4110
  var _a;
4087
4111
  const boundary = this.boundaries.get(i), kind = (_a = boundary === null || boundary === void 0 ? void 0 : boundary.navigation) === null || _a === void 0 ? void 0 : _a.kind;
4088
4112
  const nav = kind
4089
- ? { segno: _glyphs__WEBPACK_IMPORTED_MODULE_6__.Glyphs.segno, coda: _glyphs__WEBPACK_IMPORTED_MODULE_6__.Glyphs.coda, dalSegno: 'D.S.', toCoda: 'To Coda', daCapo: 'D.C.', fine: 'Fine' }[kind]
4113
+ ? { segno: _glyphs__WEBPACK_IMPORTED_MODULE_7__.Glyphs.segno, coda: _glyphs__WEBPACK_IMPORTED_MODULE_7__.Glyphs.coda, dalSegno: 'D.S.', toCoda: 'To Coda', daCapo: 'D.C.', fine: 'Fine' }[kind]
4090
4114
  : '';
4091
4115
  const texts = [
4092
4116
  this.options.measureNumbers && atStart ? String(i + 1) : '',
@@ -4117,6 +4141,8 @@ class ContinuousLayout {
4117
4141
  this.headerLabels = new Map();
4118
4142
  this.splitChords = [];
4119
4143
  this.spelledSpans = new Set();
4144
+ /** A leading tab fret needs room for the incoming tie after the repeated clef. */
4145
+ this.tabTiePadding = new Map();
4120
4146
  this.arrivals = new Map();
4121
4147
  this.options = (_a = spec.continuous) !== null && _a !== void 0 ? _a : {};
4122
4148
  for (const voice of score.voices.flat(2))
@@ -4150,7 +4176,7 @@ class ContinuousLayout {
4150
4176
  invalid('Invalid staff group.');
4151
4177
  return Object.assign(Object.assign({}, g), { first, last });
4152
4178
  });
4153
- const label = (text) => (text ? new _element__WEBPACK_IMPORTED_MODULE_3__.Element('Annotation').setText(text) : undefined);
4179
+ const label = (text) => (text ? new _element__WEBPACK_IMPORTED_MODULE_4__.Element('Annotation').setText(text) : undefined);
4154
4180
  const names = spec.staves.map((s) => { var _a; return ({ full: label(s.name), short: label((_a = s.shortName) !== null && _a !== void 0 ? _a : s.name) }); });
4155
4181
  this.names = score.systems.map((_, i) => spec.staves.map((s, j) => {
4156
4182
  var _a;
@@ -4164,36 +4190,36 @@ class ContinuousLayout {
4164
4190
  const stave = score.staves[i][j];
4165
4191
  const boundary = this.boundaries.get(i);
4166
4192
  if (boundary === null || boundary === void 0 ? void 0 : boundary.repeatStart)
4167
- stave.setBegBarType(_stavebarline__WEBPACK_IMPORTED_MODULE_10__.BarlineType.REPEAT_BEGIN);
4193
+ stave.setBegBarType(_stavebarline__WEBPACK_IMPORTED_MODULE_11__.BarlineType.REPEAT_BEGIN);
4168
4194
  if (boundary === null || boundary === void 0 ? void 0 : boundary.repeatEnd)
4169
- stave.setEndBarType(_stavebarline__WEBPACK_IMPORTED_MODULE_10__.BarlineType.REPEAT_END);
4195
+ stave.setEndBarType(_stavebarline__WEBPACK_IMPORTED_MODULE_11__.BarlineType.REPEAT_END);
4170
4196
  const start = [], end = [];
4171
- const present = (category) => stave.getModifiers(_stavemodifier__WEBPACK_IMPORTED_MODULE_12__.StaveModifierPosition.BEGIN, category).length > 0;
4172
- if (!present(_clef__WEBPACK_IMPORTED_MODULE_1__.Clef.CATEGORY))
4173
- start.push(new _clef__WEBPACK_IMPORTED_MODULE_1__.Clef(state.clef));
4174
- if (state.clef !== 'tab' && state.key !== 'C' && !present(_keysignature__WEBPACK_IMPORTED_MODULE_7__.KeySignature.CATEGORY))
4175
- start.push(new _keysignature__WEBPACK_IMPORTED_MODULE_7__.KeySignature(state.key));
4197
+ const present = (category) => stave.getModifiers(_stavemodifier__WEBPACK_IMPORTED_MODULE_13__.StaveModifierPosition.BEGIN, category).length > 0;
4198
+ if (!present(_clef__WEBPACK_IMPORTED_MODULE_2__.Clef.CATEGORY))
4199
+ start.push(new _clef__WEBPACK_IMPORTED_MODULE_2__.Clef(state.clef));
4200
+ if (state.clef !== 'tab' && state.key !== 'C' && !present(_keysignature__WEBPACK_IMPORTED_MODULE_8__.KeySignature.CATEGORY))
4201
+ start.push(new _keysignature__WEBPACK_IMPORTED_MODULE_8__.KeySignature(state.key));
4176
4202
  // Meter is carried silently at a repeated row start. Explicit changes remain native modifiers.
4177
4203
  const next = (_a = starts[i + 1]) === null || _a === void 0 ? void 0 : _a[j], current = ends[i][j];
4178
4204
  if (next && this.options.courtesy !== false) {
4179
4205
  if (next.clef !== current.clef)
4180
- end.push(new _clef__WEBPACK_IMPORTED_MODULE_1__.Clef(next.clef, 'small'));
4206
+ end.push(new _clef__WEBPACK_IMPORTED_MODULE_2__.Clef(next.clef, 'small'));
4181
4207
  if (next.clef !== 'tab' && next.key !== current.key)
4182
- end.push(new _keysignature__WEBPACK_IMPORTED_MODULE_7__.KeySignature(next.key, current.key));
4183
- if (next.time !== current.time)
4184
- end.push(new _timesignature__WEBPACK_IMPORTED_MODULE_17__.TimeSignature(next.time));
4208
+ end.push(new _keysignature__WEBPACK_IMPORTED_MODULE_8__.KeySignature(next.key, current.key));
4209
+ if (next.showTimeSignature && next.time !== current.time)
4210
+ end.push(new _timesignature__WEBPACK_IMPORTED_MODULE_18__.TimeSignature(next.time));
4185
4211
  }
4186
- end.forEach((m) => m.setPosition(_stavemodifier__WEBPACK_IMPORTED_MODULE_12__.StaveModifierPosition.END));
4212
+ end.forEach((m) => m.setPosition(_stavemodifier__WEBPACK_IMPORTED_MODULE_13__.StaveModifierPosition.END));
4187
4213
  return { start, end };
4188
4214
  }));
4189
4215
  const locations = new Map();
4190
4216
  score.notes.forEach((parts, measure) => parts.flat(2).forEach((n) => {
4191
- if (n instanceof _note__WEBPACK_IMPORTED_MODULE_9__.Note)
4217
+ if (n instanceof _note__WEBPACK_IMPORTED_MODULE_10__.Note)
4192
4218
  locations.set(n, { note: n, measure, staff: score.staves[measure].indexOf(n.checkStave()) });
4193
4219
  }));
4194
4220
  const seen = new Set();
4195
4221
  const onset = (n) => {
4196
- const time = new _fraction__WEBPACK_IMPORTED_MODULE_5__.Fraction(0, 1);
4222
+ const time = new _fraction__WEBPACK_IMPORTED_MODULE_6__.Fraction(0, 1);
4197
4223
  for (const tick of n.getVoice().getTickables()) {
4198
4224
  if (tick === n)
4199
4225
  break;
@@ -4216,8 +4242,8 @@ class ContinuousLayout {
4216
4242
  !b ||
4217
4243
  a.measure !== b.measure ||
4218
4244
  a.staff >= b.staff ||
4219
- !(a.note instanceof _stavenote__WEBPACK_IMPORTED_MODULE_13__.StaveNote) ||
4220
- !(b.note instanceof _stavenote__WEBPACK_IMPORTED_MODULE_13__.StaveNote) ||
4245
+ !(a.note instanceof _stavenote__WEBPACK_IMPORTED_MODULE_14__.StaveNote) ||
4246
+ !(b.note instanceof _stavenote__WEBPACK_IMPORTED_MODULE_14__.StaveNote) ||
4221
4247
  a.note.isRest() ||
4222
4248
  b.note.isRest() ||
4223
4249
  !['h', 'q', '2', '4'].includes(a.note.getDuration()) ||
@@ -4252,8 +4278,11 @@ class ContinuousLayout {
4252
4278
  !last ||
4253
4279
  first.measure > last.measure)
4254
4280
  invalid('Expected a unique span ID and ordered composition anchors.');
4281
+ let spec = Object.assign({}, span);
4282
+ if (span.string !== undefined && !(span.kind === 'tie' && first.note instanceof _tabnote__WEBPACK_IMPORTED_MODULE_17__.TabNote))
4283
+ invalid('A string selector requires a tab tie.');
4255
4284
  if (span.kind === 'palmMute') {
4256
- if (!(first.note instanceof _tabnote__WEBPACK_IMPORTED_MODULE_16__.TabNote) || !(last.note instanceof _tabnote__WEBPACK_IMPORTED_MODULE_16__.TabNote) || first.staff !== last.staff)
4285
+ if (!(first.note instanceof _tabnote__WEBPACK_IMPORTED_MODULE_17__.TabNote) || !(last.note instanceof _tabnote__WEBPACK_IMPORTED_MODULE_17__.TabNote) || first.staff !== last.staff)
4257
4286
  invalid('A palm mute needs two TAB anchors on the same staff.');
4258
4287
  if (!((_g = span.strings) === null || _g === void 0 ? void 0 : _g.length) ||
4259
4288
  new Set(span.strings).size !== span.strings.length ||
@@ -4262,9 +4291,21 @@ class ContinuousLayout {
4262
4291
  for (const note of [first.note, last.note])
4263
4292
  if (!note.getPositions().some((p) => span.strings.includes(p.str)))
4264
4293
  invalid('Each palm-mute anchor must play a targeted string.');
4294
+ spec.strings = [...span.strings];
4295
+ }
4296
+ else if (first.note instanceof _tabnote__WEBPACK_IMPORTED_MODULE_17__.TabNote && last.note instanceof _tabnote__WEBPACK_IMPORTED_MODULE_17__.TabNote) {
4297
+ if (first.staff !== last.staff || (span.kind !== 'tie' && span.kind !== 'volta'))
4298
+ invalid('Tab ties and endings need anchors on the same tab staff.');
4299
+ if (span.kind === 'tie') {
4300
+ spec = resolveTabTie(span, first.note, last.note);
4301
+ if (first.measure !== last.measure && onset(last.note).numerator === 0) {
4302
+ const stave = last.note.checkStave();
4303
+ this.tabTiePadding.set(stave, stave.space(1.5));
4304
+ }
4305
+ }
4265
4306
  }
4266
4307
  else {
4267
- if (!(first.note instanceof _stavenote__WEBPACK_IMPORTED_MODULE_13__.StaveNote) || !(last.note instanceof _stavenote__WEBPACK_IMPORTED_MODULE_13__.StaveNote))
4308
+ if (!(first.note instanceof _stavenote__WEBPACK_IMPORTED_MODULE_14__.StaveNote) || !(last.note instanceof _stavenote__WEBPACK_IMPORTED_MODULE_14__.StaveNote))
4268
4309
  invalid('Continuous spans need staff-note anchors.');
4269
4310
  for (const [head, n] of [
4270
4311
  [(_h = span.fromHead) !== null && _h !== void 0 ? _h : 0, first.note],
@@ -4275,7 +4316,15 @@ class ContinuousLayout {
4275
4316
  }
4276
4317
  if (first.measure === last.measure && onset(first.note).greaterThan(onset(last.note)))
4277
4318
  invalid('Reversed span.');
4278
- if (span.kind === 'tie' && first.measure !== last.measure) {
4319
+ if (span.syllableId !== undefined &&
4320
+ (typeof span.syllableId !== 'string' ||
4321
+ span.syllableId.length === 0 ||
4322
+ span.kind !== 'lyric' ||
4323
+ first.staff !== last.staff ||
4324
+ span.text !== undefined ||
4325
+ span.labelFontSize !== undefined))
4326
+ invalid('An anchored lyric extender needs a syllable ID and two notes on the same staff. Its annotation supplies the text and font.');
4327
+ if (span.kind === 'tie' && first.note instanceof _stavenote__WEBPACK_IMPORTED_MODULE_14__.StaveNote && first.measure !== last.measure) {
4279
4328
  const fi = (_k = span.fromHead) !== null && _k !== void 0 ? _k : 0, li = (_l = span.toHead) !== null && _l !== void 0 ? _l : 0;
4280
4329
  if (first.note.getKeys()[fi].toLowerCase() !== last.note.getKeys()[li].toLowerCase())
4281
4330
  invalid('Tied heads must have the same written pitch.');
@@ -4289,8 +4338,7 @@ class ContinuousLayout {
4289
4338
  }
4290
4339
  }
4291
4340
  seen.add(span.id);
4292
- const spec = span.kind === 'palmMute' ? Object.assign(Object.assign({}, span), { strings: [...span.strings] }) : Object.assign({}, span);
4293
- this.spans.push({ spec, first, last, label: (0,_continuousspan__WEBPACK_IMPORTED_MODULE_2__.spanLabel)(spec) });
4341
+ this.spans.push({ spec, first, last, label: (0,_continuousspan__WEBPACK_IMPORTED_MODULE_3__.spanLabel)(spec) });
4294
4342
  }
4295
4343
  }
4296
4344
  /** Only undecorated, wholly resting measures can disappear into a numbered rest. */
@@ -4303,11 +4351,16 @@ class ContinuousLayout {
4303
4351
  return false;
4304
4352
  if (this.score.staves[i].some((s) => s
4305
4353
  .getModifiers()
4306
- .some((m) => !(m instanceof _stavebarline__WEBPACK_IMPORTED_MODULE_10__.Barline) || ![_stavebarline__WEBPACK_IMPORTED_MODULE_10__.BarlineType.SINGLE, _stavebarline__WEBPACK_IMPORTED_MODULE_10__.BarlineType.NONE].includes(m.getType()))))
4354
+ .some((m) => !(m instanceof _stavebarline__WEBPACK_IMPORTED_MODULE_11__.Barline) || ![_stavebarline__WEBPACK_IMPORTED_MODULE_11__.BarlineType.SINGLE, _stavebarline__WEBPACK_IMPORTED_MODULE_11__.BarlineType.NONE].includes(m.getType()))))
4307
4355
  return false;
4308
4356
  return this.score.notes[i]
4309
4357
  .flat(2)
4310
- .every((n) => n instanceof _stavenote__WEBPACK_IMPORTED_MODULE_13__.StaveNote && n.isRest() && !n.getModifiers().length && !n.getBeam() && !n.getTupletStack().length);
4358
+ .every((n) => n instanceof _stavenote__WEBPACK_IMPORTED_MODULE_14__.StaveNote &&
4359
+ n.isRest() &&
4360
+ n.restLine === undefined &&
4361
+ !n.getModifiers().length &&
4362
+ !n.getBeam() &&
4363
+ !n.getTupletStack().length);
4311
4364
  }
4312
4365
  /** Add cached signs for the candidate boundaries and reserve actual end-modifier width. */
4313
4366
  boundaryWidth(i, start, end) {
@@ -4324,8 +4377,8 @@ class ContinuousLayout {
4324
4377
  return Math.max(...staves.map((s, j) => {
4325
4378
  var _a, _b;
4326
4379
  const marks = this.marks[i][j];
4327
- s.setBoundaryModifiers([...(start ? marks.start : []), ...(end ? marks.end : [])]);
4328
- const bar = s.getModifiers(_stavemodifier__WEBPACK_IMPORTED_MODULE_12__.StaveModifierPosition.END, _stavebarline__WEBPACK_IMPORTED_MODULE_10__.Barline.CATEGORY)[0];
4380
+ s.setBoundaryModifiers([...(start ? marks.start : []), ...(end ? marks.end : [])], start ? this.tabTiePadding.get(s) : 0);
4381
+ const bar = s.getModifiers(_stavemodifier__WEBPACK_IMPORTED_MODULE_13__.StaveModifierPosition.END, _stavebarline__WEBPACK_IMPORTED_MODULE_11__.Barline.CATEGORY)[0];
4329
4382
  return Math.max(s.getX() + s.getWidth() - s.getNoteEndX(), -((_b = (_a = bar === null || bar === void 0 ? void 0 : bar.getLayoutMetrics()) === null || _a === void 0 ? void 0 : _a.xMin) !== null && _b !== void 0 ? _b : 0));
4330
4383
  }));
4331
4384
  }
@@ -4391,7 +4444,8 @@ class ContinuousLayout {
4391
4444
  const used = new Set();
4392
4445
  for (let i = first; i <= last; i++) {
4393
4446
  this.score.notes[i].flat(2).forEach((n) => {
4394
- if (n instanceof _note__WEBPACK_IMPORTED_MODULE_9__.Note && (!(n instanceof _stavenote__WEBPACK_IMPORTED_MODULE_13__.StaveNote) || !n.isRest() || n.getModifiers().length))
4447
+ if (n instanceof _note__WEBPACK_IMPORTED_MODULE_10__.Note &&
4448
+ (!(n instanceof _stavenote__WEBPACK_IMPORTED_MODULE_14__.StaveNote) || !n.isRest() || n.restLine !== undefined || n.getModifiers().length))
4395
4449
  used.add(this.score.staves[i].indexOf(n.checkStave()));
4396
4450
  });
4397
4451
  }
@@ -4419,13 +4473,24 @@ class ContinuousLayout {
4419
4473
  }
4420
4474
  format(options) {
4421
4475
  var _a;
4476
+ // A verse can be attached after composition. Resolve its current mark before every reflow.
4477
+ for (const span of this.spans) {
4478
+ if (!span.spec.syllableId)
4479
+ continue;
4480
+ const matches = span.first.note
4481
+ .getModifiers()
4482
+ .filter((m) => m instanceof _annotation__WEBPACK_IMPORTED_MODULE_1__.Annotation && m.getAttribute('id') === span.spec.syllableId);
4483
+ if (matches.length !== 1)
4484
+ invalid('Expected one lyric annotation on the source note: ' + span.spec.syllableId);
4485
+ span.syllable = matches[0];
4486
+ }
4422
4487
  this.hidden.clear();
4423
4488
  this.diagnostics.length = 0;
4424
4489
  this.fragments.length = 0;
4425
4490
  this.rows.length = 0;
4426
4491
  this.drawing = [];
4427
4492
  const units = this.units(options.measurePadding);
4428
- const groups = (0,_systembreaks__WEBPACK_IMPORTED_MODULE_15__.chooseSystemBreaks)(units, options.width, options.measureGap, (i) => this.indent(units[i].first), (_a = this.options.mode) !== null && _a !== void 0 ? _a : 'balanced');
4493
+ const groups = (0,_systembreaks__WEBPACK_IMPORTED_MODULE_16__.chooseSystemBreaks)(units, options.width, options.measureGap, (i) => this.indent(units[i].first), (_a = this.options.mode) !== null && _a !== void 0 ? _a : 'balanced');
4429
4494
  let y = options.y;
4430
4495
  for (const indices of groups) {
4431
4496
  const row = this.layoutRow(indices.map((i) => units[i]), options, y);
@@ -4439,7 +4504,7 @@ class ContinuousLayout {
4439
4504
  for (const f of parts) {
4440
4505
  f.progress = [prior / total, (prior + f.x2 - f.x1) / total];
4441
4506
  prior += f.x2 - f.x1;
4442
- this.drawing.push((ctx) => (0,_continuousspan__WEBPACK_IMPORTED_MODULE_2__.drawSpan)(ctx, f, s.label));
4507
+ this.drawing.push((ctx) => (0,_continuousspan__WEBPACK_IMPORTED_MODULE_3__.drawSpan)(ctx, f, s.label));
4443
4508
  }
4444
4509
  }
4445
4510
  return this.rows;
@@ -4458,9 +4523,9 @@ class ContinuousLayout {
4458
4523
  };
4459
4524
  take(stave.getYForLine(0) - stave.space(1.6), stave.getYForLine(stave.getNumLines() - 1) + stave.space(1.6));
4460
4525
  for (const m of stave.getModifiers()) {
4461
- const boxes = m instanceof _clef__WEBPACK_IMPORTED_MODULE_1__.Clef || m instanceof _timesignature__WEBPACK_IMPORTED_MODULE_17__.TimeSignature
4526
+ const boxes = m instanceof _clef__WEBPACK_IMPORTED_MODULE_2__.Clef || m instanceof _timesignature__WEBPACK_IMPORTED_MODULE_18__.TimeSignature
4462
4527
  ? [m.getInkBounds()]
4463
- : m instanceof _keysignature__WEBPACK_IMPORTED_MODULE_7__.KeySignature
4528
+ : m instanceof _keysignature__WEBPACK_IMPORTED_MODULE_8__.KeySignature
4464
4529
  ? m.getInkParts()
4465
4530
  : [];
4466
4531
  for (const box of boxes)
@@ -4468,15 +4533,15 @@ class ContinuousLayout {
4468
4533
  }
4469
4534
  if (u.first === u.last)
4470
4535
  for (const n of this.score.notes[u.first].flat(2)) {
4471
- if (n instanceof _tabnote__WEBPACK_IMPORTED_MODULE_16__.TabNote && n.getStave() === stave && n.hasStem()) {
4536
+ if (n instanceof _tabnote__WEBPACK_IMPORTED_MODULE_17__.TabNote && n.getStave() === stave && n.hasStem()) {
4472
4537
  const { topY, baseY } = n.getStemExtents();
4473
4538
  take(Math.min(topY, baseY), Math.max(topY, baseY));
4474
4539
  }
4475
- if (!(n instanceof _stavenote__WEBPACK_IMPORTED_MODULE_13__.StaveNote) || n.getStave() !== stave)
4540
+ if (!(n instanceof _stavenote__WEBPACK_IMPORTED_MODULE_14__.StaveNote) || n.getStave() !== stave)
4476
4541
  continue;
4477
4542
  const bridge = (_a = n
4478
4543
  .getBeam()) === null || _a === void 0 ? void 0 : _a.getNotes().some((p) => p.getStave() !== stave);
4479
- for (const box of bridge ? n.getHeadInk() : (0,_engravinggeometry__WEBPACK_IMPORTED_MODULE_4__.measureEngraving)(n).parts)
4544
+ for (const box of bridge ? n.getHeadInk() : (0,_engravinggeometry__WEBPACK_IMPORTED_MODULE_5__.measureEngraving)(n).parts)
4480
4545
  take(box.y, box.y + box.h);
4481
4546
  if (n.getBeam() && !bridge) {
4482
4547
  const box = n.getBeam().getBoundingBox();
@@ -4550,7 +4615,16 @@ class ContinuousLayout {
4550
4615
  for (const s of spans) {
4551
4616
  if (s.spec.kind === 'tie' || s.spec.kind === 'slur')
4552
4617
  continue;
4553
- const side = (0,_continuousspan__WEBPACK_IMPORTED_MODULE_2__.spanAbove)(s.spec), staff = s.first.staff, key = staff + '-' + side;
4618
+ if (s.syllable) {
4619
+ // A continuation row may have no sung words of its own. Include the extender in that staff's envelope.
4620
+ const stave = this.score.staves[first][s.first.staff];
4621
+ const relativeY = this.lyricBaseline(s.syllable, stave) - stave.getY();
4622
+ const bounds = ink[s.first.staff];
4623
+ bounds.top = Math.min(bounds.top, relativeY);
4624
+ bounds.bottom = Math.max(bounds.bottom, relativeY + 2);
4625
+ continue;
4626
+ }
4627
+ const side = (0,_continuousspan__WEBPACK_IMPORTED_MODULE_3__.spanAbove)(s.spec), staff = s.first.staff, key = staff + '-' + side;
4554
4628
  const ends = (_a = laneEnds.get(key)) !== null && _a !== void 0 ? _a : [];
4555
4629
  let lane = ends.findIndex((v) => v < s.first.measure);
4556
4630
  if (lane < 0)
@@ -4600,11 +4674,11 @@ class ContinuousLayout {
4600
4674
  if (chord.measure < first || chord.measure > last)
4601
4675
  continue;
4602
4676
  const a = chord.upper, b = chord.lower, x = a.getStemX(), top = Math.max(...a.getYs()), bottom = Math.min(...b.getYs());
4603
- if (Math.abs(x - b.getStemX()) > _stem__WEBPACK_IMPORTED_MODULE_14__.Stem.WIDTH)
4677
+ if (Math.abs(x - b.getStemX()) > _stem__WEBPACK_IMPORTED_MODULE_15__.Stem.WIDTH)
4604
4678
  this.diagnostics.push({ code: 'SplitStemAlignment', measures: [chord.measure + 1], source: chord.id });
4605
4679
  else
4606
4680
  this.drawing.push((ctx) => {
4607
- ctx.fillRect(x - _stem__WEBPACK_IMPORTED_MODULE_14__.Stem.WIDTH / 2, top, _stem__WEBPACK_IMPORTED_MODULE_14__.Stem.WIDTH, bottom - top);
4681
+ ctx.fillRect(x - _stem__WEBPACK_IMPORTED_MODULE_15__.Stem.WIDTH / 2, top, _stem__WEBPACK_IMPORTED_MODULE_15__.Stem.WIDTH, bottom - top);
4608
4682
  });
4609
4683
  }
4610
4684
  for (const s of spans) {
@@ -4612,35 +4686,61 @@ class ContinuousLayout {
4612
4686
  const lane = (_b = lanes.get(s)) !== null && _b !== void 0 ? _b : 0;
4613
4687
  const yBase = origin +
4614
4688
  offsets[staff] +
4615
- ((0,_continuousspan__WEBPACK_IMPORTED_MODULE_2__.spanAbove)(s.spec) ? ink[staff].top - lane * 25 - 4 : ink[staff].bottom + lane * 25 + 14);
4689
+ ((0,_continuousspan__WEBPACK_IMPORTED_MODULE_3__.spanAbove)(s.spec) ? ink[staff].top - lane * 25 - 4 : ink[staff].bottom + lane * 25 + 14);
4616
4690
  this.addFragment(s, units, row, yBase);
4617
4691
  }
4618
4692
  return row;
4619
4693
  }
4694
+ /** Carry the source syllable's distance from its top staff line to each continuation. */
4695
+ lyricBaseline(word, stave) {
4696
+ const source = word.checkAttachedNote().checkStave();
4697
+ const spaces = (word.computeY().y + word.getYShift() - source.getYForLine(0)) / source.space(1);
4698
+ return stave.getYForLine(0) + stave.space(spaces);
4699
+ }
4620
4700
  /** Keep continuation hooks and labels on the correct end when a span crosses a row. */
4621
4701
  addFragment(s, units, row, baseline) {
4622
- var _a, _b;
4702
+ var _a, _b, _c;
4623
4703
  const first = units[0].first, last = units[units.length - 1].first;
4624
4704
  const starts = s.first.measure >= first, ends = s.last.measure <= units[units.length - 1].last;
4625
- const { kind } = s.spec, above = (0,_continuousspan__WEBPACK_IMPORTED_MODULE_2__.spanAbove)(s.spec);
4705
+ const { kind } = s.spec, above = (0,_continuousspan__WEBPACK_IMPORTED_MODULE_3__.spanAbove)(s.spec);
4626
4706
  const startStaff = this.score.staves[first][s.first.staff], endStaff = this.score.staves[last][ends ? s.last.staff : s.first.staff];
4627
4707
  const space = startStaff.space(1), sign = above ? -1 : 1;
4628
4708
  let x1 = starts ? s.first.note.getAbsoluteX() : startStaff.getNoteStartX() + 2;
4629
4709
  let x2 = ends ? s.last.note.getAbsoluteX() + s.last.note.getGlyphWidth() : endStaff.getNoteEndX() - 3;
4630
4710
  let y1 = baseline, y2 = baseline;
4711
+ if (s.syllable) {
4712
+ y1 = y2 = this.lyricBaseline(s.syllable, startStaff);
4713
+ if (starts) {
4714
+ const ink = s.syllable.getTextInk(s.syllable.computeX().x, s.syllable.computeY().y);
4715
+ x1 = ink.x + ink.w + space * 0.35;
4716
+ }
4717
+ if (ends)
4718
+ x2 = s.last.note.getNoteHeadBeginX() + s.last.note.getGlyphWidth();
4719
+ }
4631
4720
  if (kind === 'tie' || kind === 'slur') {
4632
4721
  if (starts)
4633
4722
  x1 = s.first.note.getTieRightX();
4634
4723
  if (ends)
4635
4724
  x2 = s.last.note.getTieLeftX();
4636
- y1 =
4637
- (starts
4638
- ? s.first.note.getYs()[(_a = s.spec.fromHead) !== null && _a !== void 0 ? _a : 0]
4639
- : (0,_continuousspan__WEBPACK_IMPORTED_MODULE_2__.continuationPitch)(s.first, startStaff, s.spec.fromHead)) +
4640
- sign * space * (starts ? 0.5 : 1.1);
4641
- y2 =
4642
- (ends ? s.last.note.getYs()[(_b = s.spec.toHead) !== null && _b !== void 0 ? _b : 0] : (0,_continuousspan__WEBPACK_IMPORTED_MODULE_2__.continuationPitch)(s.last, endStaff, s.spec.toHead)) +
4643
- sign * space * (ends ? 0.5 : 1.1);
4725
+ if (s.spec.string !== undefined) {
4726
+ // Follow the same physical string at both row edges, with clearance for the fret numbers.
4727
+ if (!starts)
4728
+ x1 -= (_a = this.tabTiePadding.get(startStaff)) !== null && _a !== void 0 ? _a : 0;
4729
+ const line = s.spec.string - 1;
4730
+ const clearance = sign * space * 0.3;
4731
+ y1 = (starts ? s.first.note.checkStave() : startStaff).getYForLine(line) + clearance;
4732
+ y2 = (ends ? s.last.note.checkStave() : endStaff).getYForLine(line) + clearance;
4733
+ }
4734
+ else {
4735
+ y1 =
4736
+ (starts
4737
+ ? s.first.note.getYs()[(_b = s.spec.fromHead) !== null && _b !== void 0 ? _b : 0]
4738
+ : (0,_continuousspan__WEBPACK_IMPORTED_MODULE_3__.continuationPitch)(s.first, startStaff, s.spec.fromHead)) +
4739
+ sign * space * (starts ? 0.5 : 1.1);
4740
+ y2 =
4741
+ (ends ? s.last.note.getYs()[(_c = s.spec.toHead) !== null && _c !== void 0 ? _c : 0] : (0,_continuousspan__WEBPACK_IMPORTED_MODULE_3__.continuationPitch)(s.last, endStaff, s.spec.toHead)) +
4742
+ sign * space * (ends ? 0.5 : 1.1);
4743
+ }
4644
4744
  }
4645
4745
  if (kind === 'volta') {
4646
4746
  x1 = starts ? this.score.staves[s.first.measure][s.first.staff].getX() + 1 : startStaff.getX() + 1;
@@ -4660,19 +4760,19 @@ class ContinuousLayout {
4660
4760
  const fragment = Object.assign(Object.assign({ id: s.spec.id, kind, row: this.rows.length, part: starts ? (ends ? 'single' : 'first') : ends ? 'last' : 'middle', x1,
4661
4761
  x2,
4662
4762
  y1,
4663
- y2, progress: [0, 1] }, (kind === 'palmMute' && Object.assign(Object.assign({ strings: s.spec.strings }, (starts && { from: s.spec.from })), (ends && { to: s.spec.to })))), { above,
4763
+ y2, progress: [0, 1] }, ((kind === 'palmMute' || s.spec.string !== undefined) && Object.assign(Object.assign({ strings: s.spec.string !== undefined ? [s.spec.string] : s.spec.strings }, (starts && { from: s.spec.from })), (ends && { to: s.spec.to })))), { above,
4664
4764
  space });
4665
4765
  if (kind === 'tie' || kind === 'slur') {
4666
4766
  const events = units.flatMap((u) => {
4667
4767
  const staves = this.score.staves[u.first];
4668
4768
  return this.score.notes[u.first]
4669
4769
  .flat(2)
4670
- .filter((n) => n instanceof _stavenote__WEBPACK_IMPORTED_MODULE_13__.StaveNote &&
4770
+ .filter((n) => n instanceof _stavenote__WEBPACK_IMPORTED_MODULE_14__.StaveNote &&
4671
4771
  (n.getStave() === staves[s.first.staff] || n.getStave() === staves[s.last.staff]));
4672
4772
  });
4673
4773
  const obstacles = events
4674
4774
  .filter((n) => n !== s.first.note && n !== s.last.note)
4675
- .flatMap((n) => (0,_engravinggeometry__WEBPACK_IMPORTED_MODULE_4__.measureEngraving)(n).parts);
4775
+ .flatMap((n) => (0,_engravinggeometry__WEBPACK_IMPORTED_MODULE_5__.measureEngraving)(n).parts);
4676
4776
  if (kind === 'slur') {
4677
4777
  const endpoint = (n, y) => n.hasStem() && n.getStemDirection() === -sign ? n.getStemExtents().topY + sign * space * 0.4 : y;
4678
4778
  if (starts)
@@ -4688,7 +4788,7 @@ class ContinuousLayout {
4688
4788
  if (!ends)
4689
4789
  fragment.y2 = edge;
4690
4790
  }
4691
- if (!(0,_continuousspan__WEBPACK_IMPORTED_MODULE_2__.fitSpan)(fragment, obstacles))
4791
+ if (!(0,_continuousspan__WEBPACK_IMPORTED_MODULE_3__.fitSpan)(fragment, obstacles))
4692
4792
  this.diagnostics.push({ code: 'CurveCollision', measures: row.measures, source: s.spec.id });
4693
4793
  }
4694
4794
  this.fragments.push(fragment);
@@ -4708,12 +4808,12 @@ class ContinuousLayout {
4708
4808
  if (members.length < 2)
4709
4809
  continue;
4710
4810
  const top = members[0], bottom = members[members.length - 1];
4711
- const connector = new _staveconnector__WEBPACK_IMPORTED_MODULE_11__.StaveConnector(head[top], head[bottom]).setType(g.type).setXShift(-index * 8);
4811
+ const connector = new _staveconnector__WEBPACK_IMPORTED_MODULE_12__.StaveConnector(head[top], head[bottom]).setType(g.type).setXShift(-index * 8);
4712
4812
  this.drawing.push((ctx) => connector.setContext(ctx).drawWithStyle());
4713
4813
  if (g.barlines)
4714
4814
  for (const u of units) {
4715
4815
  const staves = this.score.staves[u.first];
4716
- const line = new _staveconnector__WEBPACK_IMPORTED_MODULE_11__.StaveConnector(staves[top], staves[bottom]).setType('singleRight');
4816
+ const line = new _staveconnector__WEBPACK_IMPORTED_MODULE_12__.StaveConnector(staves[top], staves[bottom]).setType('singleRight');
4717
4817
  this.drawing.push((ctx) => line.setContext(ctx).drawWithStyle());
4718
4818
  }
4719
4819
  }
@@ -4735,7 +4835,7 @@ class ContinuousLayout {
4735
4835
  }
4736
4836
  if (u.last > u.first)
4737
4837
  for (const j of visible) {
4738
- const count = u.last - u.first + 1, rest = new _multimeasurerest__WEBPACK_IMPORTED_MODULE_8__.MultiMeasureRest(count, { numberOfMeasures: count }).setStave(staves[j]);
4838
+ const count = u.last - u.first + 1, rest = new _multimeasurerest__WEBPACK_IMPORTED_MODULE_9__.MultiMeasureRest(count, { numberOfMeasures: count }).setStave(staves[j]);
4739
4839
  this.drawing.push((ctx) => rest.setContext(ctx).drawWithStyle());
4740
4840
  }
4741
4841
  }
@@ -4777,7 +4877,15 @@ function spanLabel(spec) {
4777
4877
  const text = (_b = (_a = spec.text) !== null && _a !== void 0 ? _a : (spec.kind === 'palmMute' ? 'P.M. ' + spec.strings.join(',') : undefined)) !== null && _b !== void 0 ? _b : { volta: '1.', ottava: '8va', trill: _glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.ornamentTrill, tuplet: '3' }[spec.kind];
4778
4878
  if (!text)
4779
4879
  return;
4780
- return new _element__WEBPACK_IMPORTED_MODULE_0__.Element(spec.kind === 'trill' ? 'Ornament' : 'Annotation').setText(text);
4880
+ let category = 'Annotation';
4881
+ if (spec.kind === 'trill')
4882
+ category = 'Ornament';
4883
+ if (spec.kind === 'lyric' || spec.kind === 'hyphen')
4884
+ category = 'Annotation.lyric';
4885
+ const label = new _element__WEBPACK_IMPORTED_MODULE_0__.Element(category).setText(text);
4886
+ if (spec.labelFontSize !== undefined)
4887
+ label.setFontSize(spec.labelFontSize);
4888
+ return label;
4781
4889
  }
4782
4890
  function spanAbove(span) {
4783
4891
  return span.side ? span.side === 'above' : ['slur', 'volta', 'ottava', 'trill', 'tuplet'].includes(span.kind);
@@ -6428,15 +6536,19 @@ __webpack_require__.r(__webpack_exports__);
6428
6536
  /* harmony export */ compose: () => (/* binding */ compose)
6429
6537
  /* harmony export */ });
6430
6538
  /* harmony import */ var _continuouslayout__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../continuouslayout */ "./src/continuouslayout.ts");
6431
- /* harmony import */ var _factory__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../factory */ "./src/factory.ts");
6432
- /* harmony import */ var _fraction__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../fraction */ "./src/fraction.ts");
6433
- /* harmony import */ var _modifier__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../modifier */ "./src/modifier.ts");
6434
- /* harmony import */ var _note__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../note */ "./src/note.ts");
6435
- /* harmony import */ var _stemmablenote__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../stemmablenote */ "./src/stemmablenote.ts");
6436
- /* harmony import */ var _tickable__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../tickable */ "./src/tickable.ts");
6437
- /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../util */ "./src/util.ts");
6438
- /* harmony import */ var _voice__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../voice */ "./src/voice.ts");
6439
- /* harmony import */ var _policies__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./policies */ "./src/easyscore/policies.ts");
6539
+ /* harmony import */ var _dot__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../dot */ "./src/dot.ts");
6540
+ /* harmony import */ var _factory__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../factory */ "./src/factory.ts");
6541
+ /* harmony import */ var _fraction__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../fraction */ "./src/fraction.ts");
6542
+ /* harmony import */ var _metrics__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../metrics */ "./src/metrics.ts");
6543
+ /* harmony import */ var _modifier__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../modifier */ "./src/modifier.ts");
6544
+ /* harmony import */ var _note__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../note */ "./src/note.ts");
6545
+ /* harmony import */ var _stavebarline__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../stavebarline */ "./src/stavebarline.ts");
6546
+ /* harmony import */ var _stavenote__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../stavenote */ "./src/stavenote.ts");
6547
+ /* harmony import */ var _stemmablenote__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../stemmablenote */ "./src/stemmablenote.ts");
6548
+ /* harmony import */ var _tickable__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../tickable */ "./src/tickable.ts");
6549
+ /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../util */ "./src/util.ts");
6550
+ /* harmony import */ var _voice__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../voice */ "./src/voice.ts");
6551
+ /* harmony import */ var _policies__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./policies */ "./src/easyscore/policies.ts");
6440
6552
  var __rest = (undefined && undefined.__rest) || function (s, e) {
6441
6553
  var t = {};
6442
6554
  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -6458,6 +6570,10 @@ var __rest = (undefined && undefined.__rest) || function (s, e) {
6458
6570
 
6459
6571
 
6460
6572
 
6573
+
6574
+
6575
+
6576
+
6461
6577
  /** Construct and validate the host's complete grace group inside the composition transaction. */
6462
6578
  function buildGraceGroup(score, { side, notes, slur, beam }) {
6463
6579
  if (!['before', 'after'].includes(side) || !notes.length)
@@ -6474,18 +6590,18 @@ function buildGraceGroup(score, { side, notes, slur, beam }) {
6474
6590
  return child;
6475
6591
  });
6476
6592
  const group = score.make.graceNoteGroup({ notes: children, slur });
6477
- group.setPosition(side === 'after' ? _modifier__WEBPACK_IMPORTED_MODULE_3__.Modifier.Position.RIGHT : _modifier__WEBPACK_IMPORTED_MODULE_3__.Modifier.Position.LEFT);
6593
+ group.setPosition(side === 'after' ? _modifier__WEBPACK_IMPORTED_MODULE_5__.Modifier.Position.RIGHT : _modifier__WEBPACK_IMPORTED_MODULE_5__.Modifier.Position.LEFT);
6478
6594
  if (beam)
6479
6595
  group.beamNotes();
6480
6596
  return group;
6481
6597
  }
6482
6598
  /** Fail with a consistent construction error before drawing. */
6483
6599
  function invalid(message) {
6484
- throw new _util__WEBPACK_IMPORTED_MODULE_7__.RuntimeError('BadComposition', message);
6600
+ throw new _util__WEBPACK_IMPORTED_MODULE_11__.RuntimeError('BadComposition', message);
6485
6601
  }
6486
6602
  /** Return exact native ticks for a declared meter, including a pickup span. */
6487
6603
  function ticksFor(time) {
6488
- return new _voice__WEBPACK_IMPORTED_MODULE_8__.Voice(time).getTotalTicks().clone();
6604
+ return new _voice__WEBPACK_IMPORTED_MODULE_12__.Voice(time).getTotalTicks().clone();
6489
6605
  }
6490
6606
  /** Scope staff defaults and build one voice's notation, without assigning a Voice yet. */
6491
6607
  function buildVoice(score, spec, initial, display) {
@@ -6508,15 +6624,15 @@ function buildVoice(score, spec, initial, display) {
6508
6624
  generated.add(mark);
6509
6625
  });
6510
6626
  }
6511
- else if (item instanceof _tickable__WEBPACK_IMPORTED_MODULE_6__.Tickable) {
6512
- if (_factory__WEBPACK_IMPORTED_MODULE_1__.Factory.getOwner(item) !== score.factory)
6627
+ else if (item instanceof _tickable__WEBPACK_IMPORTED_MODULE_10__.Tickable) {
6628
+ if (_factory__WEBPACK_IMPORTED_MODULE_2__.Factory.getOwner(item) !== score.factory)
6513
6629
  invalid('Adopt native notes before composing them.');
6514
6630
  try {
6515
6631
  item.getVoice();
6516
6632
  invalid('Composition requires notes that are not already in a voice.');
6517
6633
  }
6518
6634
  catch (error) {
6519
- if (!(error instanceof _util__WEBPACK_IMPORTED_MODULE_7__.RuntimeError) || error.code !== 'NoVoice')
6635
+ if (!(error instanceof _util__WEBPACK_IMPORTED_MODULE_11__.RuntimeError) || error.code !== 'NoVoice')
6520
6636
  throw error;
6521
6637
  }
6522
6638
  notes.push(item);
@@ -6530,15 +6646,21 @@ function buildVoice(score, spec, initial, display) {
6530
6646
  notes.push(score.make.clefNote({ type: state.clef, options: { size: 'small' } }));
6531
6647
  if (item.change.key)
6532
6648
  notes.push(score.make.keySigNote({ key: state.key, cancelKey: previous.key, clef: state.clef }));
6533
- if (item.change.time)
6649
+ if (state.showTimeSignature && (item.change.time || !previous.showTimeSignature))
6534
6650
  notes.push(score.make.timeSigNote({ time: state.time }));
6535
6651
  }
6536
6652
  score.set({ clef: state.clef, time: state.time });
6537
6653
  }
6538
6654
  else {
6539
- const note = 'tab' in item
6655
+ const tab = 'tab' in item;
6656
+ const note = tab
6540
6657
  ? score.make.tabNote(item.tab, item.drawStem)
6541
6658
  : score.make.note('note' in item ? item.note : item);
6659
+ // Each pitched head gets its own dots. Rhythmic tab shares one set at the stem.
6660
+ if (!tab || item.drawStem) {
6661
+ for (let i = 0; i < note.writtenDots; i++)
6662
+ _dot__WEBPACK_IMPORTED_MODULE_1__.Dot.buildAndAttach([note], { all: !tab });
6663
+ }
6542
6664
  if ('grace' in item && item.grace) {
6543
6665
  score.attach(note, buildGraceGroup(score, item.grace), 0);
6544
6666
  }
@@ -6558,12 +6680,12 @@ function buildVoice(score, spec, initial, display) {
6558
6680
  group.start + group.count > timed.length)
6559
6681
  invalid('Tuplet range is outside its voice.');
6560
6682
  const members = timed.slice(group.start, group.start + group.count);
6561
- if (!members.every((note) => note instanceof _note__WEBPACK_IMPORTED_MODULE_4__.Note))
6683
+ if (!members.every((note) => note instanceof _note__WEBPACK_IMPORTED_MODULE_6__.Note))
6562
6684
  invalid('Tuplets require native notes.');
6563
6685
  score.make.tuplet({ notes: members, options: group.options });
6564
6686
  }
6565
6687
  if (spec.autoBeam) {
6566
- if (!timed.every((note) => note instanceof _stemmablenote__WEBPACK_IMPORTED_MODULE_5__.StemmableNote))
6688
+ if (!timed.every((note) => note instanceof _stemmablenote__WEBPACK_IMPORTED_MODULE_9__.StemmableNote))
6567
6689
  invalid('Automatic beams require stemmable notes.');
6568
6690
  score.set({ time: initial.time });
6569
6691
  score.autoBeam(timed, typeof spec.autoBeam === 'boolean' ? {} : spec.autoBeam);
@@ -6576,7 +6698,7 @@ function stateChanges(voice) {
6576
6698
  return voice.changes.map(({ index, state }) => ({
6577
6699
  at: voice.notes
6578
6700
  .slice(0, index)
6579
- .reduce((sum, note) => (note.shouldIgnoreTicks() ? sum : sum.add(note.getTicks())), new _fraction__WEBPACK_IMPORTED_MODULE_2__.Fraction(0, 1)),
6701
+ .reduce((sum, note) => (note.shouldIgnoreTicks() ? sum : sum.add(note.getTicks())), new _fraction__WEBPACK_IMPORTED_MODULE_3__.Fraction(0, 1)),
6580
6702
  state,
6581
6703
  }));
6582
6704
  }
@@ -6586,7 +6708,7 @@ function addSignatures(score, stave, state, previous) {
6586
6708
  score.attachToStave(stave, score.make.clef(state.clef));
6587
6709
  if (state.clef !== 'tab' && (!previous || previous.key !== state.key))
6588
6710
  score.attachToStave(stave, score.make.keySignature(state.key, previous === null || previous === void 0 ? void 0 : previous.key));
6589
- if (!previous || previous.time !== state.time)
6711
+ if (state.showTimeSignature && (!(previous === null || previous === void 0 ? void 0 : previous.showTimeSignature) || previous.time !== state.time))
6590
6712
  score.attachToStave(stave, score.make.timeSignature(state.time));
6591
6713
  }
6592
6714
  /** Resolve owned notes only after the entire composition is constructed. */
@@ -6615,19 +6737,71 @@ function buildSpans(score, spec, measures, diagnostics) {
6615
6737
  return score.make.hairpin({ from, to, type: span.type, options: span.options });
6616
6738
  });
6617
6739
  }
6740
+ /** Rebuild the same native chord and lyric lanes for screen systems and independent publication views. */
6741
+ function addLeadMarks(score, system, measure, voices) {
6742
+ var _a, _b, _c, _d, _e;
6743
+ if (!((_a = measure.chords) === null || _a === void 0 ? void 0 : _a.length) && !((_b = measure.verses) === null || _b === void 0 ? void 0 : _b.length))
6744
+ return;
6745
+ const members = new Set(voices.flat());
6746
+ const anchor = (id) => {
6747
+ const note = score.getNote(id);
6748
+ if (!members.has(note))
6749
+ invalid(`Lead mark anchor ${id} belongs to another staff or measure.`);
6750
+ return note;
6751
+ };
6752
+ const chordLanes = new Map();
6753
+ for (const chord of (_c = measure.chords) !== null && _c !== void 0 ? _c : []) {
6754
+ const note = anchor(chord.note);
6755
+ if (!chord.text)
6756
+ invalid('A chord label needs text.');
6757
+ const mark = score.make.annotation({ text: chord.text, vJustify: 'top', font: _metrics__WEBPACK_IMPORTED_MODULE_4__.Metrics.getFontInfo('ChordSymbol') });
6758
+ score.attach(note, mark);
6759
+ if (note instanceof _stavenote__WEBPACK_IMPORTED_MODULE_8__.StaveNote) {
6760
+ const stave = note.checkStave();
6761
+ const lane = (_d = chordLanes.get(stave)) !== null && _d !== void 0 ? _d : [];
6762
+ lane.push(mark);
6763
+ chordLanes.set(stave, lane);
6764
+ }
6765
+ }
6766
+ for (const [stave, marks] of chordLanes)
6767
+ system.getPhraseLayout().addLane(stave, marks, { side: 'above' });
6768
+ const lyricAnchor = (id) => {
6769
+ const note = anchor(id);
6770
+ if (!(note instanceof _stavenote__WEBPACK_IMPORTED_MODULE_8__.StaveNote))
6771
+ invalid('A lyric needs a pitched staff note.');
6772
+ return note;
6773
+ };
6774
+ for (const verse of (_e = measure.verses) !== null && _e !== void 0 ? _e : []) {
6775
+ if (!verse.length)
6776
+ invalid('A verse needs at least one syllable.');
6777
+ const syllables = verse.map(({ note, text, hyphenAfter, extendTo }) => ({
6778
+ note: lyricAnchor(note),
6779
+ text,
6780
+ hyphenAfter,
6781
+ extendTo: extendTo === undefined ? undefined : lyricAnchor(extendTo),
6782
+ }));
6783
+ system.getPhraseLayout().addVerse(syllables[0].note.checkStave(), syllables);
6784
+ }
6785
+ }
6786
+ /** Carry the previous written state through omitted measure fields. */
6787
+ function measureState(measure, previous) {
6788
+ var _a, _b, _c, _d;
6789
+ return {
6790
+ clef: (_a = measure.clef) !== null && _a !== void 0 ? _a : previous.clef,
6791
+ key: (_b = measure.key) !== null && _b !== void 0 ? _b : previous.key,
6792
+ time: (_c = measure.time) !== null && _c !== void 0 ? _c : previous.time,
6793
+ showTimeSignature: (_d = measure.showTimeSignature) !== null && _d !== void 0 ? _d : previous.showTimeSignature,
6794
+ };
6795
+ }
6618
6796
  /** Build one staff measure before joining it to the shared native System. */
6619
6797
  function buildStaffMeasure(score, spec, staff, index, previous, tracking) {
6620
- var _a, _b, _c, _d;
6798
+ var _a;
6621
6799
  const assignments = new Map();
6622
6800
  const measure = staff.measures[index];
6623
6801
  if (!measure.voices.length)
6624
6802
  invalid('Every stave measure needs at least one voice.');
6625
- const state = {
6626
- clef: (_a = measure.clef) !== null && _a !== void 0 ? _a : previous.clef,
6627
- key: (_b = measure.key) !== null && _b !== void 0 ? _b : previous.key,
6628
- time: (_c = measure.time) !== null && _c !== void 0 ? _c : previous.time,
6629
- };
6630
- const span = (_d = measure.span) !== null && _d !== void 0 ? _d : state.time;
6803
+ const state = measureState(measure, previous);
6804
+ const span = (_a = measure.span) !== null && _a !== void 0 ? _a : state.time;
6631
6805
  const ticks = ticksFor(span);
6632
6806
  const built = measure.voices.map((voice, voiceIndex) => buildVoice(score, voice, state, voiceIndex === 0));
6633
6807
  const changes = stateChanges(built[0]);
@@ -6635,14 +6809,14 @@ function buildStaffMeasure(score, spec, staff, index, previous, tracking) {
6635
6809
  for (const voice of built) {
6636
6810
  if (signature(stateChanges(voice)) !== signature(changes))
6637
6811
  invalid('Inline staff changes must agree in all voices.');
6638
- const actual = voice.notes.reduce((sum, note) => (note.shouldIgnoreTicks() ? sum : sum.add(note.getTicks())), new _fraction__WEBPACK_IMPORTED_MODULE_2__.Fraction(0, 1));
6812
+ const actual = voice.notes.reduce((sum, note) => (note.shouldIgnoreTicks() ? sum : sum.add(note.getTicks())), new _fraction__WEBPACK_IMPORTED_MODULE_3__.Fraction(0, 1));
6639
6813
  if (!actual.equals(ticks))
6640
6814
  invalid(`Measure ${index + 1} on ${staff.id} does not fill its declared span.`);
6641
6815
  for (const note of voice.notes) {
6642
6816
  if (tracking.seen.has(note))
6643
6817
  invalid('A note cannot belong to two composition voices.');
6644
6818
  tracking.seen.add(note);
6645
- if (note instanceof _note__WEBPACK_IMPORTED_MODULE_4__.Note)
6819
+ if (note instanceof _note__WEBPACK_IMPORTED_MODULE_6__.Note)
6646
6820
  tracking.noteMeasures.set(note, index);
6647
6821
  }
6648
6822
  voice.assignments.forEach((id, note) => assignments.set(note, id));
@@ -6663,6 +6837,13 @@ function buildStaffMeasure(score, spec, staff, index, previous, tracking) {
6663
6837
  const stave = staff.kind === 'tab'
6664
6838
  ? score.make.tabStave({ options: staff.options })
6665
6839
  : score.make.stave({ options: Object.assign(Object.assign({}, staff.options), { clef: state.clef }) });
6840
+ if (measure.endBarline !== undefined) {
6841
+ if (!Number.isInteger(measure.endBarline) ||
6842
+ !_stavebarline__WEBPACK_IMPORTED_MODULE_7__.BarlineType[measure.endBarline] ||
6843
+ measure.endBarline === _stavebarline__WEBPACK_IMPORTED_MODULE_7__.BarlineType.REPEAT_BEGIN)
6844
+ invalid('Invalid end barline.');
6845
+ stave.setEndBarType(measure.endBarline);
6846
+ }
6666
6847
  addSignatures(score, stave, state, index && spec.signatures !== 'every-measure' ? previous : undefined);
6667
6848
  return {
6668
6849
  stave,
@@ -6701,13 +6882,13 @@ function compose(score, spec) {
6701
6882
  for (const voice of measure.voices)
6702
6883
  if (typeof voice.notes !== 'string')
6703
6884
  for (const item of voice.notes)
6704
- if (item instanceof _note__WEBPACK_IMPORTED_MODULE_4__.Note)
6885
+ if (item instanceof _note__WEBPACK_IMPORTED_MODULE_6__.Note)
6705
6886
  nativeInputs.push(item);
6706
6887
  if (nativeInputs.length &&
6707
6888
  (spec.accidentals === 'key-aware' ||
6708
6889
  spec.staves.some((stave) => stave.measures.some((measure) => measure.voices.some((voice) => { var _a; return voice.autoBeam || ((_a = voice.tuplets) === null || _a === void 0 ? void 0 : _a.length); })))))
6709
6890
  invalid('Apply rhythm and accidental policies before adopting native inputs, or use typed note descriptions.');
6710
- const priorStaves = new Map(nativeInputs.map((note) => [note, note.getStave()]));
6891
+ const priorNative = new Map(nativeInputs.map((note) => [note, { stave: note.getStave(), modifiers: note.getModifiers().length }]));
6711
6892
  // Avoid assigning the same note to more than one voice, even when references are supplied directly.
6712
6893
  const seen = new Set();
6713
6894
  try {
@@ -6729,22 +6910,19 @@ function compose(score, spec) {
6729
6910
  message: 'Signatures appear at the first measure and explicit changes. Sheet does not repeat them at wrapped row starts.',
6730
6911
  });
6731
6912
  const states = spec.staves.map((stave) => {
6732
- var _a, _b, _c;
6913
+ var _a, _b, _c, _d;
6733
6914
  return ({
6734
6915
  clef: (_a = stave.clef) !== null && _a !== void 0 ? _a : (stave.kind === 'tab' ? 'tab' : 'treble'),
6735
6916
  key: (_b = stave.key) !== null && _b !== void 0 ? _b : 'C',
6736
6917
  time: (_c = stave.time) !== null && _c !== void 0 ? _c : '4/4',
6918
+ showTimeSignature: (_d = stave.showTimeSignature) !== null && _d !== void 0 ? _d : true,
6737
6919
  });
6738
6920
  });
6739
6921
  const starts = [], ends = [];
6740
6922
  const placed = spec.continuous ? new Set() : undefined;
6741
6923
  const noteMeasures = new Map();
6742
6924
  for (let index = 0; index < count; index++) {
6743
- starts.push(spec.staves.map((staff, j) => {
6744
- var _a, _b, _c;
6745
- const m = staff.measures[index], p = states[j];
6746
- return { clef: (_a = m.clef) !== null && _a !== void 0 ? _a : p.clef, key: (_b = m.key) !== null && _b !== void 0 ? _b : p.key, time: (_c = m.time) !== null && _c !== void 0 ? _c : p.time };
6747
- }));
6925
+ starts.push(spec.staves.map((staff, j) => measureState(staff.measures[index], states[j])));
6748
6926
  const system = result.sheet.addSystem(spec.system);
6749
6927
  result.systems.push(system);
6750
6928
  const parts = spec.staves.map((staff, staffIndex) => {
@@ -6768,8 +6946,9 @@ function compose(score, spec) {
6768
6946
  });
6769
6947
  if (spec.accidentals === 'key-aware') {
6770
6948
  const generated = new Set(policies.flatMap((policy) => [...policy.generated]));
6771
- policies.forEach((policy, staffIndex) => (0,_policies__WEBPACK_IMPORTED_MODULE_9__.applyCompositionAccidentals)(score, voices.flat(), policy.key, policy.changes, generated, staves[staffIndex], spec.graceAccidentals === 'ordered', placed));
6949
+ policies.forEach((policy, staffIndex) => (0,_policies__WEBPACK_IMPORTED_MODULE_13__.applyCompositionAccidentals)(score, voices.flat(), policy.key, policy.changes, generated, staves[staffIndex], spec.graceAccidentals === 'ordered', placed));
6772
6950
  }
6951
+ spec.staves.forEach((staff, j) => addLeadMarks(score, system, staff.measures[index], notes[j]));
6773
6952
  ends.push(states.slice());
6774
6953
  result.staves.push(staves);
6775
6954
  result.voices.push(voices);
@@ -6786,7 +6965,8 @@ function compose(score, spec) {
6786
6965
  for (const note of nativeInputs)
6787
6966
  if (seen.has(note)) {
6788
6967
  note.clearVoice();
6789
- const stave = priorStaves.get(note);
6968
+ const { stave, modifiers } = priorNative.get(note);
6969
+ note.getModifiers().splice(modifiers);
6790
6970
  if (stave)
6791
6971
  note.setStave(stave);
6792
6972
  else
@@ -8923,21 +9103,13 @@ class Factory {
8923
9103
  return this.own(annotation);
8924
9104
  }
8925
9105
  ChordSymbol(params) {
9106
+ var _a, _b, _c;
8926
9107
  const p = Object.assign({ vJustify: 'top', hJustify: 'center' }, params);
8927
9108
  const chordSymbol = new _chordsymbol__WEBPACK_IMPORTED_MODULE_6__.ChordSymbol();
8928
9109
  chordSymbol.setHorizontal(p.hJustify);
8929
9110
  chordSymbol.setVertical(p.vJustify);
8930
- // There is a default font based on the engraving font. Only set then
8931
- // font if it is specific, else use the default
8932
- if (typeof p.fontFamily === 'string' && typeof p.fontSize === 'number') {
8933
- if (typeof p.fontWeight === 'string')
8934
- chordSymbol.setFont(p.fontFamily, p.fontSize, p.fontWeight);
8935
- else
8936
- chordSymbol.setFont(p.fontFamily, p.fontSize, '');
8937
- }
8938
- else if (typeof p.fontSize === 'number') {
8939
- chordSymbol.setFontSize(p.fontSize);
8940
- }
9111
+ // Override individual properties so a custom family can still follow the score's chord size.
9112
+ chordSymbol.setFont((_a = p.fontFamily) !== null && _a !== void 0 ? _a : chordSymbol.fontInfo.family, (_b = p.fontSize) !== null && _b !== void 0 ? _b : chordSymbol.fontInfo.size, (_c = p.fontWeight) !== null && _c !== void 0 ? _c : chordSymbol.fontInfo.weight, chordSymbol.fontInfo.style);
8941
9113
  chordSymbol.setContext(this.context);
8942
9114
  return this.own(chordSymbol);
8943
9115
  }
@@ -9997,7 +10169,7 @@ class Formatter {
9997
10169
  }
9998
10170
  // If activated rests not on default can be rendered as specified.
9999
10171
  const line = currTickable.getLineForRest();
10000
- if (line !== 3) {
10172
+ if (currTickable.restLine !== undefined || line !== 3) {
10001
10173
  return;
10002
10174
  }
10003
10175
  if (alignAllNotes || currTickable.getBeam()) {
@@ -10951,6 +11123,10 @@ __webpack_require__.r(__webpack_exports__);
10951
11123
 
10952
11124
 
10953
11125
  class FretDiagram extends _element__WEBPACK_IMPORTED_MODULE_1__.Element {
11126
+ /** The registry and font metrics both use the diagram category. */
11127
+ static get CATEGORY() {
11128
+ return "FretDiagram" /* Category.FretDiagram */;
11129
+ }
10954
11130
  constructor(spec) {
10955
11131
  var _a, _b;
10956
11132
  super();
@@ -10992,9 +11168,10 @@ class FretDiagram extends _element__WEBPACK_IMPORTED_MODULE_1__.Element {
10992
11168
  ctx.save();
10993
11169
  const group = ctx.openGroup('fret-diagram', this.getAttribute('id'));
10994
11170
  group === null || group === void 0 ? void 0 : group.setAttribute('aria-label', 'Chord frame, low to high: ' + this.frets.join(', ') + (this.barre ? ', barre at fret ' + this.barre.fret : ''));
10995
- ctx.setFont('sans-serif', 9);
10996
- if (this.first > 1)
11171
+ if (this.first > 1) {
11172
+ ctx.setFont(this.fontInfo);
10997
11173
  ctx.fillText(String(this.first), this.getX() + 2, top + 9);
11174
+ }
10998
11175
  for (let row = 0; row <= this.rows; row++) {
10999
11176
  ctx.setLineWidth(row === 0 && this.first === 1 ? 2.5 : 1);
11000
11177
  line(left, top + row * 11, right, top + row * 11);
@@ -17493,12 +17670,14 @@ class GraceNoteGroup extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
17493
17670
  note.checkStave();
17494
17671
  this.preFormat();
17495
17672
  this.alignSubNotesWithNote(this.getGraceNotes(), note, this.position);
17496
- if (this.afterWidth) {
17673
+ // Tab fret numbers extend left of their tick. A before-grace must clear that edge as well.
17674
+ const fretOverhang = (0,_typeguard__WEBPACK_IMPORTED_MODULE_7__.isTabNote)(note) ? note.getLeftDisplacedHeadPx() : 0;
17675
+ if (this.afterWidth || fretOverhang) {
17497
17676
  for (const grace of this.graceNotes) {
17498
17677
  const tick = grace.getTickContext();
17499
17678
  tick.setXOffset(this.position === _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier.Position.RIGHT
17500
17679
  ? note.getTickContext().getX() + this.afterOffset
17501
- : tick.getXOffset() + this.afterWidth);
17680
+ : tick.getXOffset() + this.afterWidth - fretOverhang);
17502
17681
  }
17503
17682
  }
17504
17683
  this.beams.forEach((beam) => beam.postFormat());
@@ -17660,34 +17839,38 @@ __webpack_require__.r(__webpack_exports__);
17660
17839
  /* harmony export */ });
17661
17840
  /* harmony import */ var _annotation__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./annotation */ "./src/annotation.ts");
17662
17841
  /* harmony import */ var _bend__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./bend */ "./src/bend.ts");
17663
- /* harmony import */ var _strokes__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./strokes */ "./src/strokes.ts");
17664
- /* harmony import */ var _typeguard__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./typeguard */ "./src/typeguard.ts");
17665
- /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./util */ "./src/util.ts");
17842
+ /* harmony import */ var _metrics__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./metrics */ "./src/metrics.ts");
17843
+ /* harmony import */ var _strokes__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./strokes */ "./src/strokes.ts");
17844
+ /* harmony import */ var _typeguard__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./typeguard */ "./src/typeguard.ts");
17845
+ /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./util */ "./src/util.ts");
17666
17846
  // Engrave structured guitar actions using native note modifiers on either backend.
17667
17847
 
17668
17848
 
17669
17849
 
17670
17850
 
17671
17851
 
17852
+
17672
17853
  /** Both arrow conventions describe the same order of physical strings. */
17673
17854
  function printedStroke(stroke) {
17674
17855
  const down = (stroke.direction === 'bass-to-treble') !== (stroke.arrows === 'hand');
17675
17856
  if (stroke.roll)
17676
- return down ? _strokes__WEBPACK_IMPORTED_MODULE_2__.Stroke.Type.RASGUEADO_DOWN : _strokes__WEBPACK_IMPORTED_MODULE_2__.Stroke.Type.RASGUEADO_UP;
17677
- return down ? _strokes__WEBPACK_IMPORTED_MODULE_2__.Stroke.Type.BRUSH_DOWN : _strokes__WEBPACK_IMPORTED_MODULE_2__.Stroke.Type.BRUSH_UP;
17857
+ return down ? _strokes__WEBPACK_IMPORTED_MODULE_3__.Stroke.Type.RASGUEADO_DOWN : _strokes__WEBPACK_IMPORTED_MODULE_3__.Stroke.Type.RASGUEADO_UP;
17858
+ return down ? _strokes__WEBPACK_IMPORTED_MODULE_3__.Stroke.Type.BRUSH_DOWN : _strokes__WEBPACK_IMPORTED_MODULE_3__.Stroke.Type.BRUSH_UP;
17678
17859
  }
17679
17860
  /** Attach native modifiers once, after a new note has initialized its heads or string positions. */
17680
17861
  function attachGuitarGestures(note) {
17681
17862
  for (const entry of note.notation) {
17682
17863
  const { stroke, bend } = entry;
17683
17864
  if (stroke) {
17684
- note.addModifier(new _strokes__WEBPACK_IMPORTED_MODULE_2__.Stroke(printedStroke(stroke), { allVoices: false }), 0);
17685
- note.addModifier(new _annotation__WEBPACK_IMPORTED_MODULE_0__.Annotation(stroke.finger + (stroke.golpe ? ' + golpe' : '')).setVerticalJustification(_annotation__WEBPACK_IMPORTED_MODULE_0__.Annotation.VerticalJustify.TOP), 0);
17865
+ note.addModifier(new _strokes__WEBPACK_IMPORTED_MODULE_3__.Stroke(printedStroke(stroke), { allVoices: false }), 0);
17866
+ note.addModifier(new _annotation__WEBPACK_IMPORTED_MODULE_0__.Annotation(stroke.finger + (stroke.golpe ? ' + golpe' : ''))
17867
+ .setFont(_metrics__WEBPACK_IMPORTED_MODULE_2__.Metrics.getFontInfo('Annotation.guitarStroke'))
17868
+ .setVerticalJustification(_annotation__WEBPACK_IMPORTED_MODULE_0__.Annotation.VerticalJustify.TOP), 0);
17686
17869
  }
17687
- if (bend && (0,_typeguard__WEBPACK_IMPORTED_MODULE_3__.isTabNote)(note)) {
17870
+ if (bend && (0,_typeguard__WEBPACK_IMPORTED_MODULE_4__.isTabNote)(note)) {
17688
17871
  const index = note.getPositions().findIndex((p) => p.str === bend.string);
17689
17872
  if (index < 0)
17690
- throw new _util__WEBPACK_IMPORTED_MODULE_4__.RuntimeError('BadArguments', 'The bent string must occur in the chord.');
17873
+ throw new _util__WEBPACK_IMPORTED_MODULE_5__.RuntimeError('BadArguments', 'The bent string must occur in the chord.');
17691
17874
  note.addModifier(_bend__WEBPACK_IMPORTED_MODULE_1__.Bend.timed(bend), index);
17692
17875
  }
17693
17876
  }
@@ -18725,8 +18908,13 @@ class Metrics {
18725
18908
  static clear(key) {
18726
18909
  _textmetricscache__WEBPACK_IMPORTED_MODULE_0__.TextMetricsCache.clear();
18727
18910
  if (key) {
18728
- this.cacheFont.delete(key);
18729
- this.cacheStyle.delete(key);
18911
+ // Nested roles such as Annotation.lyric inherit values from the parent category.
18912
+ for (const cache of [this.cacheFont, this.cacheStyle]) {
18913
+ for (const category of cache.keys()) {
18914
+ if (category === key || category.startsWith(key + '.'))
18915
+ cache.delete(category);
18916
+ }
18917
+ }
18730
18918
  }
18731
18919
  else {
18732
18920
  this.cacheFont.clear();
@@ -18838,6 +19026,12 @@ const MetricsDefaults = {
18838
19026
  Annotation: {
18839
19027
  isText: true,
18840
19028
  fontSize: 10,
19029
+ guitarStroke: {
19030
+ fontSize: 11,
19031
+ },
19032
+ lyric: {
19033
+ fontSize: 12,
19034
+ },
18841
19035
  },
18842
19036
  Bend: {
18843
19037
  isText: true,
@@ -18849,12 +19043,16 @@ const MetricsDefaults = {
18849
19043
  },
18850
19044
  ChordSymbol: {
18851
19045
  isText: true,
18852
- fontSize: 12,
19046
+ fontSize: 14,
18853
19047
  spacing: 0.05,
18854
19048
  subscriptOffset: 0.2,
18855
19049
  superscriptOffset: -0.4,
18856
19050
  superSubRatio: 0.6,
18857
19051
  },
19052
+ FretDiagram: {
19053
+ isText: true,
19054
+ fontSize: 9,
19055
+ },
18858
19056
  FretHandFinger: {
18859
19057
  isText: true,
18860
19058
  fontSize: 9,
@@ -18956,7 +19154,7 @@ const MetricsDefaults = {
18956
19154
  Stroke: {
18957
19155
  text: {
18958
19156
  isText: true,
18959
- fontSize: 10,
19157
+ fontSize: 11,
18960
19158
  fontStyle: 'italic',
18961
19159
  fontWeight: 'bold',
18962
19160
  },
@@ -18964,7 +19162,7 @@ const MetricsDefaults = {
18964
19162
  TabNote: {
18965
19163
  text: {
18966
19164
  isText: true,
18967
- fontSize: 9,
19165
+ fontSize: 11,
18968
19166
  },
18969
19167
  },
18970
19168
  TabSlide: {
@@ -18981,6 +19179,11 @@ const MetricsDefaults = {
18981
19179
  TabTie: {
18982
19180
  isText: true,
18983
19181
  fontSize: 10,
19182
+ techniqueLetter: {
19183
+ fontFamily: 'Arial, Helvetica, sans-serif',
19184
+ fontSize: 11,
19185
+ fontWeight: 'bold',
19186
+ },
18984
19187
  },
18985
19188
  TextBracket: {
18986
19189
  isText: true,
@@ -20254,6 +20457,7 @@ class Note extends _tickable__WEBPACK_IMPORTED_MODULE_5__.Tickable {
20254
20457
  // per-pitch properties
20255
20458
  this.keyProps = [];
20256
20459
  this.duration = parsedNoteStruct.duration;
20460
+ this.writtenDots = parsedNoteStruct.dots;
20257
20461
  this.noteType = parsedNoteStruct.type;
20258
20462
  this.customTypes = parsedNoteStruct.customTypes;
20259
20463
  if (noteStruct.durationOverride) {
@@ -20617,18 +20821,21 @@ __webpack_require__.r(__webpack_exports__);
20617
20821
  /* harmony export */ __webpack_require__.d(__webpack_exports__, {
20618
20822
  /* harmony export */ NoteHead: () => (/* binding */ NoteHead)
20619
20823
  /* harmony export */ });
20620
- /* harmony import */ var _note__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./note */ "./src/note.ts");
20621
- /* harmony import */ var _stem__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./stem */ "./src/stem.ts");
20622
- /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./util */ "./src/util.ts");
20824
+ /* harmony import */ var _glyphs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./glyphs */ "./src/glyphs.ts");
20825
+ /* harmony import */ var _note__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./note */ "./src/note.ts");
20826
+ /* harmony import */ var _stem__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./stem */ "./src/stem.ts");
20827
+ /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./util */ "./src/util.ts");
20623
20828
  // Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
20624
20829
  // MIT License
20830
+ // Notehead geometry and selection of rest glyphs for the attached stave.
20831
+
20625
20832
 
20626
20833
 
20627
20834
 
20628
20835
  // eslint-disable-next-line
20629
20836
  function L(...args) {
20630
20837
  if (NoteHead.DEBUG)
20631
- (0,_util__WEBPACK_IMPORTED_MODULE_2__.log)('VexFlow.NoteHead', args);
20838
+ (0,_util__WEBPACK_IMPORTED_MODULE_3__.log)('VexFlow.NoteHead', args);
20632
20839
  }
20633
20840
  /**
20634
20841
  * `NoteHeads` are typically not manipulated
@@ -20636,7 +20843,7 @@ function L(...args) {
20636
20843
  *
20637
20844
  * See `tests/notehead_tests.ts` for usage examples.
20638
20845
  */
20639
- class NoteHead extends _note__WEBPACK_IMPORTED_MODULE_0__.Note {
20846
+ class NoteHead extends _note__WEBPACK_IMPORTED_MODULE_1__.Note {
20640
20847
  static get CATEGORY() {
20641
20848
  return "NoteHead" /* Category.NoteHead */;
20642
20849
  }
@@ -20646,8 +20853,8 @@ class NoteHead extends _note__WEBPACK_IMPORTED_MODULE_0__.Note {
20646
20853
  this.customGlyph = false;
20647
20854
  // map notehead SMuFL codes to the corresponding SMuFL code with ledger line
20648
20855
  this.ledger = {
20649
- '\ue4e3' /*restWhole*/: '\ue4f4' /*restWholeLegerLine*/,
20650
- '\ue4e4' /*restHalf*/: '\ue4f5' /*restHalfLegerLine*/,
20856
+ [_glyphs__WEBPACK_IMPORTED_MODULE_0__.Glyphs.restWhole]: _glyphs__WEBPACK_IMPORTED_MODULE_0__.Glyphs.restWholeLegerLine,
20857
+ [_glyphs__WEBPACK_IMPORTED_MODULE_0__.Glyphs.restHalf]: _glyphs__WEBPACK_IMPORTED_MODULE_0__.Glyphs.restHalfLegerLine,
20651
20858
  };
20652
20859
  this.index = noteStruct.index;
20653
20860
  this.x = noteStruct.x || 0;
@@ -20656,27 +20863,34 @@ class NoteHead extends _note__WEBPACK_IMPORTED_MODULE_0__.Note {
20656
20863
  this.noteType = noteStruct.noteType;
20657
20864
  this.displacementColumn = (_a = noteStruct.displacementColumn) !== null && _a !== void 0 ? _a : (noteStruct.displaced ? 1 : 0);
20658
20865
  if (!Number.isSafeInteger(this.displacementColumn) || this.displacementColumn < 0)
20659
- throw new _util__WEBPACK_IMPORTED_MODULE_2__.RuntimeError('BadArguments', 'Head displacement column must be a nonnegative integer.');
20866
+ throw new _util__WEBPACK_IMPORTED_MODULE_3__.RuntimeError('BadArguments', 'Head displacement column must be a nonnegative integer.');
20660
20867
  this.displaced = this.displacementColumn !== 0;
20661
- this.stemDirection = noteStruct.stemDirection || _stem__WEBPACK_IMPORTED_MODULE_1__.Stem.UP;
20868
+ this.stemDirection = noteStruct.stemDirection || _stem__WEBPACK_IMPORTED_MODULE_2__.Stem.UP;
20662
20869
  this.line = noteStruct.line || 0;
20663
20870
  // Get glyph code based on duration and note type. This could be
20664
20871
  // regular notes, rests, or other custom codes.
20665
- this.glyphProps = _note__WEBPACK_IMPORTED_MODULE_0__.Note.getGlyphProps(this.duration, this.noteType);
20666
- (0,_util__WEBPACK_IMPORTED_MODULE_2__.defined)(this.glyphProps, 'BadArguments', `No glyph found for duration '${this.duration}' and type '${this.noteType}'`);
20667
- // Swap out the glyph with ledger lines
20668
- if ((this.line > 5 || this.line < 0) && this.ledger[this.glyphProps.codeHead]) {
20669
- this.glyphProps.codeHead = this.ledger[this.glyphProps.codeHead];
20670
- }
20671
- this.text = this.glyphProps.codeHead;
20672
- if (noteStruct.customGlyphCode) {
20673
- this.customGlyph = true;
20674
- this.text = noteStruct.customGlyphCode;
20675
- }
20872
+ this.glyphProps = _note__WEBPACK_IMPORTED_MODULE_1__.Note.getGlyphProps(this.duration, this.noteType);
20873
+ (0,_util__WEBPACK_IMPORTED_MODULE_3__.defined)(this.glyphProps, 'BadArguments', `No glyph found for duration '${this.duration}' and type '${this.noteType}'`);
20874
+ this.text = noteStruct.customGlyphCode || this.glyphProps.codeHead;
20875
+ this.customGlyph = !!noteStruct.customGlyphCode;
20876
+ this.updateRestGlyph();
20676
20877
  this.setStyle((_b = noteStruct.style) !== null && _b !== void 0 ? _b : {});
20677
20878
  this.slashed = noteStruct.slashed || false;
20678
20879
  this.renderOptions = Object.assign({}, this.renderOptions);
20679
20880
  }
20881
+ /** Select the supporting ledger at the actual note position, preserving custom head glyphs. */
20882
+ updateRestGlyph() {
20883
+ var _a, _b;
20884
+ const plain = this.glyphProps.codeHead;
20885
+ const ledger = this.ledger[plain];
20886
+ if (!ledger || (this.text !== plain && this.text !== ledger))
20887
+ return;
20888
+ // getYForNote anchors key line 5 at the top on staves of every size.
20889
+ const bottomLine = 6 - ((_b = (_a = this.stave) === null || _a === void 0 ? void 0 : _a.getNumLines()) !== null && _b !== void 0 ? _b : 5);
20890
+ const glyph = this.line > 5 || this.line < bottomLine ? ledger : plain;
20891
+ if (this.text !== glyph)
20892
+ this.setText(glyph);
20893
+ }
20680
20894
  /** Get the width of the notehead. */
20681
20895
  getWidth() {
20682
20896
  return this.width;
@@ -20692,6 +20906,9 @@ class NoteHead extends _note__WEBPACK_IMPORTED_MODULE_0__.Note {
20692
20906
  /** Set the stave line the notehead is placed on. */
20693
20907
  setLine(line) {
20694
20908
  this.line = line;
20909
+ if (this.stave)
20910
+ return this.setStave(this.stave);
20911
+ this.updateRestGlyph();
20695
20912
  return this;
20696
20913
  }
20697
20914
  /** Get the canvas `x` coordinate position of the notehead. */
@@ -20704,12 +20921,13 @@ class NoteHead extends _note__WEBPACK_IMPORTED_MODULE_0__.Note {
20704
20921
  }
20705
20922
  /** Offset shared by drawing, head geometry and ledger lines. */
20706
20923
  getDisplacementX() {
20707
- return this.displacementColumn * (this.width - _stem__WEBPACK_IMPORTED_MODULE_1__.Stem.WIDTH / 2) * this.stemDirection;
20924
+ return this.displacementColumn * (this.width - _stem__WEBPACK_IMPORTED_MODULE_2__.Stem.WIDTH / 2) * this.stemDirection;
20708
20925
  }
20709
20926
  /** Set notehead to a provided `stave`. */
20710
20927
  setStave(stave) {
20711
20928
  const line = this.getLine();
20712
20929
  this.stave = stave;
20930
+ this.updateRestGlyph();
20713
20931
  if (this.stave) {
20714
20932
  this.setY(this.stave.getYForNote(line));
20715
20933
  this.setContext(this.stave.getContext());
@@ -21842,15 +22060,16 @@ __webpack_require__.r(__webpack_exports__);
21842
22060
  /* harmony import */ var _engravinggeometry__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./engravinggeometry */ "./src/engravinggeometry.ts");
21843
22061
  /* harmony import */ var _ghostnote__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./ghostnote */ "./src/ghostnote.ts");
21844
22062
  /* harmony import */ var _keysignature__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./keysignature */ "./src/keysignature.ts");
21845
- /* harmony import */ var _modifier__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./modifier */ "./src/modifier.ts");
21846
- /* harmony import */ var _ornament__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./ornament */ "./src/ornament.ts");
21847
- /* harmony import */ var _stavebarline__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./stavebarline */ "./src/stavebarline.ts");
21848
- /* harmony import */ var _stavehairpin__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./stavehairpin */ "./src/stavehairpin.ts");
21849
- /* harmony import */ var _stavenote__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./stavenote */ "./src/stavenote.ts");
21850
- /* harmony import */ var _stavetie__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./stavetie */ "./src/stavetie.ts");
21851
- /* harmony import */ var _textbracket__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./textbracket */ "./src/textbracket.ts");
21852
- /* harmony import */ var _timesignature__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./timesignature */ "./src/timesignature.ts");
21853
- /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./util */ "./src/util.ts");
22063
+ /* harmony import */ var _metrics__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./metrics */ "./src/metrics.ts");
22064
+ /* harmony import */ var _modifier__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./modifier */ "./src/modifier.ts");
22065
+ /* harmony import */ var _ornament__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./ornament */ "./src/ornament.ts");
22066
+ /* harmony import */ var _stavebarline__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./stavebarline */ "./src/stavebarline.ts");
22067
+ /* harmony import */ var _stavehairpin__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./stavehairpin */ "./src/stavehairpin.ts");
22068
+ /* harmony import */ var _stavenote__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./stavenote */ "./src/stavenote.ts");
22069
+ /* harmony import */ var _stavetie__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./stavetie */ "./src/stavetie.ts");
22070
+ /* harmony import */ var _textbracket__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./textbracket */ "./src/textbracket.ts");
22071
+ /* harmony import */ var _timesignature__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./timesignature */ "./src/timesignature.ts");
22072
+ /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./util */ "./src/util.ts");
21854
22073
  // Place attachments and lyrics within one formatted system. All solver coordinates are renderer pixels.
21855
22074
 
21856
22075
 
@@ -21868,6 +22087,7 @@ __webpack_require__.r(__webpack_exports__);
21868
22087
 
21869
22088
 
21870
22089
 
22090
+
21871
22091
  const supportedText = new RegExp('^[\\p{Script=Latin}\\p{Script=Greek}\\p{Script=Cyrillic}\\p{Script=Han}\\p{Script=Hiragana}\\p{Script=Katakana}\\p{Script=Hangul}\\p{M}\\p{N}\\p{P}\\p{Zs}]*$', 'u');
21872
22092
  /** Signed clearance tests use visible parts, never pairwise collisions within a single glyph or note. */
21873
22093
  function overlaps(a, b, gap) {
@@ -21945,6 +22165,7 @@ class PhraseLayout {
21945
22165
  const marks = syllables.map((s, i) => {
21946
22166
  var _a;
21947
22167
  return new _annotation__WEBPACK_IMPORTED_MODULE_0__.Annotation(s.text)
22168
+ .setFont(_metrics__WEBPACK_IMPORTED_MODULE_7__.Metrics.getFontInfo('Annotation.lyric'))
21948
22169
  .setVerticalJustification(options.side === 'above' ? 'top' : 'bottom')
21949
22170
  .setConnectorPadding(s.hyphenAfter || ((_a = syllables[i - 1]) === null || _a === void 0 ? void 0 : _a.hyphenAfter) ? stave.space(0.4) : 0);
21950
22171
  });
@@ -21960,9 +22181,10 @@ class PhraseLayout {
21960
22181
  mark.setLayoutBaseline(undefined);
21961
22182
  for (const route of this.routes)
21962
22183
  route.setLayoutRise(0);
21963
- for (const [note, line] of this.restLines)
21964
- if (note.getKeyLine(0) === line.after)
22184
+ for (const [note, line] of this.restLines) {
22185
+ if (note.restLine === undefined && note.getKeyLine(0) === line.after)
21965
22186
  note.setKeyLine(0, line.before);
22187
+ }
21966
22188
  this.restLines.clear();
21967
22189
  }
21968
22190
  report(code, ...owners) {
@@ -22008,8 +22230,8 @@ class PhraseLayout {
22008
22230
  for (const m of n.getModifiers()) {
22009
22231
  if (this.managed.has(m))
22010
22232
  continue;
22011
- if ((m instanceof _articulation__WEBPACK_IMPORTED_MODULE_1__.Articulation || m instanceof _ornament__WEBPACK_IMPORTED_MODULE_8__.Ornament) &&
22012
- [_modifier__WEBPACK_IMPORTED_MODULE_7__.Modifier.Position.ABOVE, _modifier__WEBPACK_IMPORTED_MODULE_7__.Modifier.Position.BELOW].includes(m.getPosition()))
22233
+ if ((m instanceof _articulation__WEBPACK_IMPORTED_MODULE_1__.Articulation || m instanceof _ornament__WEBPACK_IMPORTED_MODULE_9__.Ornament) &&
22234
+ [_modifier__WEBPACK_IMPORTED_MODULE_8__.Modifier.Position.ABOVE, _modifier__WEBPACK_IMPORTED_MODULE_8__.Modifier.Position.BELOW].includes(m.getPosition()))
22013
22235
  marks.push(m);
22014
22236
  else
22015
22237
  this.measure(m, stave);
@@ -22032,11 +22254,11 @@ class PhraseLayout {
22032
22254
  }
22033
22255
  for (const stave of staves) {
22034
22256
  for (const modifier of stave.getModifiers()) {
22035
- if (modifier instanceof _clef__WEBPACK_IMPORTED_MODULE_3__.Clef || modifier instanceof _timesignature__WEBPACK_IMPORTED_MODULE_14__.TimeSignature)
22257
+ if (modifier instanceof _clef__WEBPACK_IMPORTED_MODULE_3__.Clef || modifier instanceof _timesignature__WEBPACK_IMPORTED_MODULE_15__.TimeSignature)
22036
22258
  this.addParts(modifier, stave, [modifier.getInkBounds()]);
22037
22259
  else if (modifier instanceof _keysignature__WEBPACK_IMPORTED_MODULE_6__.KeySignature)
22038
22260
  this.addParts(modifier, stave, modifier.getInkParts());
22039
- else if (!(modifier instanceof _stavebarline__WEBPACK_IMPORTED_MODULE_9__.Barline))
22261
+ else if (!(modifier instanceof _stavebarline__WEBPACK_IMPORTED_MODULE_10__.Barline))
22040
22262
  this.report('UnsupportedGeometry', modifier);
22041
22263
  }
22042
22264
  }
@@ -22050,8 +22272,13 @@ class PhraseLayout {
22050
22272
  for (const { owner, stave } of this.fixed)
22051
22273
  if (!tuplets.has(owner))
22052
22274
  this.measure(owner, stave);
22275
+ // Record authored rest positions first so automatic rests can clear them in either voice order.
22276
+ for (const n of rests)
22277
+ if (n.restLine !== undefined)
22278
+ this.placeRest(n);
22053
22279
  for (const n of rests)
22054
- this.placeRest(n);
22280
+ if (n.restLine === undefined)
22281
+ this.placeRest(n);
22055
22282
  for (const m of marks)
22056
22283
  this.placeAttachment(m);
22057
22284
  for (const t of tuplets)
@@ -22073,7 +22300,8 @@ class PhraseLayout {
22073
22300
  this.report('UnsupportedGeometry', note);
22074
22301
  let parts = original.parts;
22075
22302
  const hits = this.hits(parts, stave, gap);
22076
- if (hits.length && !this.pins.has(note)) {
22303
+ const pinned = note.restLine !== undefined || this.pins.has(note);
22304
+ if (hits.length && !pinned) {
22077
22305
  // Try whole staff spaces, nearest first, on both sides of the authored rest.
22078
22306
  const sign = note.getStemDirection();
22079
22307
  for (const step of [1, -1, 2, -2, 3, -3, 4, -4]) {
@@ -22091,11 +22319,11 @@ class PhraseLayout {
22091
22319
  }
22092
22320
  const remaining = this.hits(parts, stave, gap);
22093
22321
  if (remaining.length)
22094
- this.report(this.pins.has(note) ? 'PinnedCollision' : 'UnresolvedCollision', note, remaining[0].owner);
22322
+ this.report(pinned ? 'PinnedCollision' : 'UnresolvedCollision', note, remaining[0].owner);
22095
22323
  this.addParts(note, stave, parts);
22096
22324
  }
22097
22325
  placeAttachment(mark) {
22098
- const stave = mark.checkAttachedNote().checkStave(), gap = stave.space(0.2), above = mark.getPosition() === _modifier__WEBPACK_IMPORTED_MODULE_7__.Modifier.Position.ABOVE;
22326
+ const stave = mark.checkAttachedNote().checkStave(), gap = stave.space(0.2), above = mark.getPosition() === _modifier__WEBPACK_IMPORTED_MODULE_8__.Modifier.Position.ABOVE;
22099
22327
  mark.setLayoutShiftY(0);
22100
22328
  let parts = (0,_engravinggeometry__WEBPACK_IMPORTED_MODULE_4__.measureEngraving)(mark).parts;
22101
22329
  for (let step = 1; step <= 12 && !this.pins.has(mark) && this.hits(parts, stave, gap).length; step++) {
@@ -22113,7 +22341,7 @@ class PhraseLayout {
22113
22341
  const routes = this.routes
22114
22342
  .flatMap((span) => {
22115
22343
  var _a, _b;
22116
- if (span instanceof _stavetie__WEBPACK_IMPORTED_MODULE_12__.StaveTie && span.text)
22344
+ if (span instanceof _stavetie__WEBPACK_IMPORTED_MODULE_13__.StaveTie && span.text)
22117
22345
  this.report('UnsupportedGeometry', span);
22118
22346
  const { firstNote: first, lastNote: last } = span.getNotes();
22119
22347
  if (!first ||
@@ -22122,7 +22350,7 @@ class PhraseLayout {
22122
22350
  !membership.has(last) ||
22123
22351
  first.getStave() !== last.getStave() ||
22124
22352
  last.getAbsoluteX() <= first.getAbsoluteX() ||
22125
- (span instanceof _stavetie__WEBPACK_IMPORTED_MODULE_12__.StaveTie &&
22353
+ (span instanceof _stavetie__WEBPACK_IMPORTED_MODULE_13__.StaveTie &&
22126
22354
  (((_a = span.getNotes().firstIndexes) === null || _a === void 0 ? void 0 : _a.some((i) => !Number.isInteger(i) || i < 0 || i >= first.getYs().length)) ||
22127
22355
  ((_b = span.getNotes().lastIndexes) === null || _b === void 0 ? void 0 : _b.some((i) => !Number.isInteger(i) || i < 0 || i >= last.getYs().length))))) {
22128
22356
  this.report('InvalidAnchor', span);
@@ -22130,7 +22358,7 @@ class PhraseLayout {
22130
22358
  }
22131
22359
  return [{ span, first, last, stave: first.checkStave(), x: first.getAbsoluteX(), end: last.getAbsoluteX() }];
22132
22360
  })
22133
- .sort((a, b) => Number(b.span instanceof _stavetie__WEBPACK_IMPORTED_MODULE_12__.StaveTie) - Number(a.span instanceof _stavetie__WEBPACK_IMPORTED_MODULE_12__.StaveTie) || a.end - a.x - (b.end - b.x));
22361
+ .sort((a, b) => Number(b.span instanceof _stavetie__WEBPACK_IMPORTED_MODULE_13__.StaveTie) - Number(a.span instanceof _stavetie__WEBPACK_IMPORTED_MODULE_13__.StaveTie) || a.end - a.x - (b.end - b.x));
22134
22362
  for (const [index, r] of routes.entries()) {
22135
22363
  const { span, stave } = r;
22136
22364
  const crossing = routes
@@ -22143,7 +22371,7 @@ class PhraseLayout {
22143
22371
  const fixed = this.obstacles.filter((o) => o.stave === stave && o.owner !== stave && o.owner !== r.first && o.owner !== r.last);
22144
22372
  const gap = stave.space(0.2);
22145
22373
  let bestRise = 0, bestCost = Infinity;
22146
- const limit = pinned || crossing ? 0 : span instanceof _stavetie__WEBPACK_IMPORTED_MODULE_12__.StaveTie ? 6 : 16;
22374
+ const limit = pinned || crossing ? 0 : span instanceof _stavetie__WEBPACK_IMPORTED_MODULE_13__.StaveTie ? 6 : 16;
22147
22375
  for (let step = 0; step <= limit; step++) {
22148
22376
  const rise = stave.space(step / 2);
22149
22377
  span.setLayoutRise(rise);
@@ -22172,13 +22400,13 @@ class PhraseLayout {
22172
22400
  try {
22173
22401
  if (mark instanceof _annotation__WEBPACK_IMPORTED_MODULE_0__.Annotation)
22174
22402
  anchors = [mark.checkAttachedNote()];
22175
- else if (mark instanceof _textbracket__WEBPACK_IMPORTED_MODULE_13__.TextBracket)
22403
+ else if (mark instanceof _textbracket__WEBPACK_IMPORTED_MODULE_14__.TextBracket)
22176
22404
  anchors = [mark.start, mark.stop];
22177
22405
  else
22178
22406
  anchors = mark.getNotes();
22179
22407
  }
22180
22408
  catch (error) {
22181
- if (!(error instanceof _util__WEBPACK_IMPORTED_MODULE_15__.RuntimeError))
22409
+ if (!(error instanceof _util__WEBPACK_IMPORTED_MODULE_16__.RuntimeError))
22182
22410
  throw error;
22183
22411
  return false;
22184
22412
  }
@@ -22239,7 +22467,7 @@ class PhraseLayout {
22239
22467
  const middle = boxes.length ? boxes.reduce((sum, b) => sum + b.y + b.h / 2 - y, 0) / boxes.length : 0;
22240
22468
  const trims = new Map();
22241
22469
  for (const m of marks)
22242
- if (m instanceof _stavehairpin__WEBPACK_IMPORTED_MODULE_10__.StaveHairpin) {
22470
+ if (m instanceof _stavehairpin__WEBPACK_IMPORTED_MODULE_11__.StaveHairpin) {
22243
22471
  const { left, right } = m.getLayoutEdges();
22244
22472
  let l = 0, r = 0;
22245
22473
  for (const b of boxes) {
@@ -22267,7 +22495,7 @@ class PhraseLayout {
22267
22495
  y += shift;
22268
22496
  }
22269
22497
  for (const m of marks) {
22270
- if (m instanceof _stavehairpin__WEBPACK_IMPORTED_MODULE_10__.StaveHairpin)
22498
+ if (m instanceof _stavehairpin__WEBPACK_IMPORTED_MODULE_11__.StaveHairpin)
22271
22499
  m.setLayoutBaseline(y + middle, ...trims.get(m));
22272
22500
  else
22273
22501
  m.setLayoutBaseline(y);
@@ -22292,7 +22520,7 @@ class PhraseLayout {
22292
22520
  format(staves, voices) {
22293
22521
  var _a;
22294
22522
  const ticks = voices.flatMap((v) => v.getTickables());
22295
- const notes = ticks.filter((n) => n instanceof _stavenote__WEBPACK_IMPORTED_MODULE_11__.StaveNote);
22523
+ const notes = ticks.filter((n) => n instanceof _stavenote__WEBPACK_IMPORTED_MODULE_12__.StaveNote);
22296
22524
  const members = new Set(notes);
22297
22525
  const beams = new Set(notes.map((n) => n.getBeam()).filter((b) => !!b));
22298
22526
  for (let pass = 1; pass <= this.iterationLimit; pass++) {
@@ -22301,7 +22529,7 @@ class PhraseLayout {
22301
22529
  this.connectors = [];
22302
22530
  this.diagnostics.length = 0;
22303
22531
  this.messages.clear();
22304
- this.collect(notes, staves, ticks.filter((n) => !(n instanceof _stavenote__WEBPACK_IMPORTED_MODULE_11__.StaveNote)));
22532
+ this.collect(notes, staves, ticks.filter((n) => !(n instanceof _stavenote__WEBPACK_IMPORTED_MODULE_12__.StaveNote)));
22305
22533
  const isPinned = (l) => l.options.baselineSpaces !== undefined ||
22306
22534
  l.marks.some((m) => m instanceof _annotation__WEBPACK_IMPORTED_MODULE_0__.Annotation && m.getTextBaseline() !== undefined);
22307
22535
  const automatic = [];
@@ -22749,10 +22977,13 @@ function dimensions(o) {
22749
22977
  return Object.assign(Object.assign({}, size), { margin, musicWidth: width, scale: staff / (4 * _tables__WEBPACK_IMPORTED_MODULE_7__.Tables.STAVE_LINE_DISTANCE), gap, extra });
22750
22978
  }
22751
22979
  /** The staging SVG must participate in browser font measurement, including for detached destinations. */
22752
- function compose(host, spec) {
22980
+ function compose(host, spec, hooks = []) {
22753
22981
  const ctx = new _svgcontext__WEBPACK_IMPORTED_MODULE_6__.SVGContext(host);
22754
22982
  const factory = new _factory__WEBPACK_IMPORTED_MODULE_0__.Factory({ renderer: { elementId: null, width: 1, height: 1 } }).setContext(ctx);
22755
- const score = factory.EasyScore().compose(spec);
22983
+ const easyScore = factory.EasyScore();
22984
+ for (const hook of hooks)
22985
+ easyScore.addCommitHook(hook);
22986
+ const score = easyScore.compose(spec);
22756
22987
  return { ctx, factory, score };
22757
22988
  }
22758
22989
  /** Preserve inherited renderer styles while moving actual graphics to their owning system. */
@@ -22766,6 +22997,9 @@ function musicGroup(svg) {
22766
22997
  /** SVG text boxes include an entire music font's ascent. Use glyph ink to keep cues close to their notes. */
22767
22998
  function inkBox(el, context) {
22768
22999
  var _a, _b;
23000
+ // Invisible pointer targets can extend well beyond a modifier's ink. They must not move notes to another system.
23001
+ if (el.getAttribute('opacity') === '0')
23002
+ return;
22769
23003
  let box;
22770
23004
  if (el.tagName === 'g') {
22771
23005
  const children = Array.from(el.children).flatMap((c) => { var _a; return (_a = inkBox(c, context)) !== null && _a !== void 0 ? _a : []; });
@@ -22914,7 +23148,7 @@ function addInsets(host, spec, o, score, rows, diagnostics) {
22914
23148
  sheet: { x: 0, y: 0, width: stave.getWidth() / scale, measurePadding: 4 },
22915
23149
  continuous: {},
22916
23150
  };
22917
- const inset = compose(host, insetSpec);
23151
+ const inset = compose(host, insetSpec, o.noteHooks);
22918
23152
  inset.factory.draw();
22919
23153
  row.references.push(Object.assign(Object.assign({}, r), { events: semanticEvents(inset.score, insetSpec, 1).map((e) => (Object.assign(Object.assign({}, e), { measure: r.measure }))) }));
22920
23154
  const g = musicGroup(inset.ctx.svg);
@@ -23091,12 +23325,12 @@ class Publication {
23091
23325
  (((_a = this.source.spans) === null || _a === void 0 ? void 0 : _a.length) ||
23092
23326
  ((_c = (_b = this.source.continuous) === null || _b === void 0 ? void 0 : _b.spans) === null || _c === void 0 ? void 0 : _c.length) ||
23093
23327
  ((_e = (_d = this.source.continuous) === null || _d === void 0 ? void 0 : _d.splitChords) === null || _e === void 0 ? void 0 : _e.length))
23094
- ? compose(host, this.source).score
23328
+ ? compose(host, this.source, options.noteHooks).score
23095
23329
  : undefined;
23096
23330
  // A one-unit inset keeps edge strokes inside the requested margin.
23097
23331
  const width = size.musicWidth / size.scale - 2;
23098
23332
  const spec = (0,_publicationview__WEBPACK_IMPORTED_MODULE_4__.projectScore)(this.source, options, width, ref, (id, measures) => diagnostics.push({ code: 'ExcludedAnchor', measures, detail: id }));
23099
- const { ctx, factory, score } = compose(host, spec);
23333
+ const { ctx, factory, score } = compose(host, spec, options.noteHooks);
23100
23334
  factory.draw();
23101
23335
  const layout = score.sheet.getContinuousLayout();
23102
23336
  for (const d of layout.diagnostics)
@@ -23258,12 +23492,13 @@ function homeStaff(staff, selected) {
23258
23492
  }
23259
23493
  /** Carry written clef, key and meter into a one-measure inset, including preceding inline changes. */
23260
23494
  function insetStaff(staff, measure) {
23261
- var _a, _b, _c;
23262
- const state = { clef: staff.clef, key: staff.key, time: staff.time };
23495
+ var _a, _b, _c, _d;
23496
+ const state = { clef: staff.clef, key: staff.key, time: staff.time, showTimeSignature: staff.showTimeSignature };
23263
23497
  for (const m of staff.measures.slice(0, measure - 1)) {
23264
23498
  state.clef = (_a = m.clef) !== null && _a !== void 0 ? _a : state.clef;
23265
23499
  state.key = (_b = m.key) !== null && _b !== void 0 ? _b : state.key;
23266
23500
  state.time = (_c = m.time) !== null && _c !== void 0 ? _c : state.time;
23501
+ state.showTimeSignature = (_d = m.showTimeSignature) !== null && _d !== void 0 ? _d : state.showTimeSignature;
23267
23502
  for (const v of m.voices.slice(0, 1))
23268
23503
  if (typeof v.notes !== 'string')
23269
23504
  for (const item of v.notes)
@@ -24144,8 +24379,9 @@ class Stave extends _element__WEBPACK_IMPORTED_MODULE_2__.Element {
24144
24379
  static get CATEGORY() {
24145
24380
  return "Stave" /* Category.Stave */;
24146
24381
  }
24147
- /** Replace only the derived row-start and courtesy signs on a responsive sheet. */
24148
- setBoundaryModifiers(modifiers) {
24382
+ /** Replace the derived row-start and courtesy signs and their note clearance. */
24383
+ setBoundaryModifiers(modifiers, notePadding = 0) {
24384
+ this.boundaryNotePadding = notePadding;
24149
24385
  this.boundaryModifiers = modifiers;
24150
24386
  for (const mark of modifiers)
24151
24387
  mark.setStave(this);
@@ -24164,6 +24400,8 @@ class Stave extends _element__WEBPACK_IMPORTED_MODULE_2__.Element {
24164
24400
  var _a;
24165
24401
  super();
24166
24402
  this.boundaryModifiers = [];
24403
+ /** Space after the row-start signs for a continuation arriving at the first note. */
24404
+ this.boundaryNotePadding = 0;
24167
24405
  this.x = x;
24168
24406
  this.y = y;
24169
24407
  this.width = width;
@@ -24627,7 +24865,7 @@ class Stave extends _element__WEBPACK_IMPORTED_MODULE_2__.Element {
24627
24865
  if (padding + width === 0)
24628
24866
  offset--;
24629
24867
  }
24630
- this.startX = x;
24868
+ this.startX = x + this.boundaryNotePadding;
24631
24869
  x = this.x + this.width;
24632
24870
  const widths = {
24633
24871
  left: 0,
@@ -25945,6 +26183,11 @@ __webpack_require__.r(__webpack_exports__);
25945
26183
 
25946
26184
 
25947
26185
 
26186
+ /** Bravura's SMuFL stemUpSE and stemDownNW anchors, in staff spaces from the glyph origin. */
26187
+ const bravuraSlashAnchors = {
26188
+ [_glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.noteheadSlashVerticalEnds]: { up: [1.46, 0.656], down: [0, -0.664] },
26189
+ [_glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.noteheadSlashWhiteHalf]: { up: [3.12, 1], down: [0, -1] },
26190
+ };
25948
26191
  // To enable logging for this class. Set `VexFlow.StaveNote.DEBUG` to `true`.
25949
26192
  // eslint-disable-next-line
25950
26193
  function L(...args) {
@@ -26025,7 +26268,19 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_8__.StemmableNot
26025
26268
  const visible = notesList.filter((item) => item.note.renderOptions.draw !== false);
26026
26269
  if (visible.length < 2)
26027
26270
  return true;
26028
- if (visible.length > 3) {
26271
+ const positioned = visible.some(({ note }) => note.restLine !== undefined);
26272
+ if (positioned && visible.length <= 3) {
26273
+ // Move only automatic rests. Visit obstacles in travel order so each shift clears earlier ones.
26274
+ for (const rest of visible.filter((v) => v.isrest && v.note.restLine === undefined)) {
26275
+ const direction = rest.note.getStemDirection();
26276
+ const peers = visible.filter((v) => v !== rest).sort((a, b) => direction * (a.minLine - b.minLine));
26277
+ for (const peer of peers) {
26278
+ if (rest.minLine <= peer.maxLine && peer.minLine <= rest.maxLine)
26279
+ shiftRestVertical(rest, peer, direction);
26280
+ }
26281
+ }
26282
+ }
26283
+ if (visible.length > 3 || positioned) {
26029
26284
  // Keep overlapping stem/head envelopes in separate columns. Pitch order makes
26030
26285
  // placement independent of voice insertion for voices at distinct pitches.
26031
26286
  const columns = [];
@@ -26267,6 +26522,8 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_8__.StemmableNot
26267
26522
  else {
26268
26523
  this.setStemDirection((_e = noteStruct.stemDirection) !== null && _e !== void 0 ? _e : _stem__WEBPACK_IMPORTED_MODULE_7__.Stem.UP);
26269
26524
  }
26525
+ if (noteStruct.restLine !== undefined)
26526
+ this.setRestLine(noteStruct.restLine);
26270
26527
  if (this.notation.length)
26271
26528
  (0,_guitarmodifiers__WEBPACK_IMPORTED_MODULE_2__.attachGuitarGestures)(this);
26272
26529
  }
@@ -26493,21 +26750,32 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_8__.StemmableNot
26493
26750
  hasFlag() {
26494
26751
  return super.hasFlag() && !this.isRest();
26495
26752
  }
26496
- getStemX() {
26753
+ /** Use explicit font metadata first, then the bundled anchors for Bravura rhythm slashes. */
26754
+ stemAnchor(head, direction) {
26497
26755
  var _a;
26756
+ const family = head.fontInfo.family;
26757
+ if (((_a = this.engraving) === null || _a === void 0 ? void 0 : _a.musicFont) === family) {
26758
+ const anchor = this.engraving.stemAnchor(head.text, direction);
26759
+ if (anchor)
26760
+ return anchor;
26761
+ }
26762
+ const slash = bravuraSlashAnchors[head.text];
26763
+ if (slash && /^\s*(?:Bravura|"Bravura"|'Bravura')\s*(?:,|$)/i.test(family))
26764
+ return slash[direction];
26765
+ }
26766
+ getStemX() {
26498
26767
  if (this.noteType === 'r') {
26499
26768
  return this.getCenterGlyphX();
26500
26769
  }
26501
26770
  else {
26502
26771
  const up = this.stemDirection === _stem__WEBPACK_IMPORTED_MODULE_7__.Stem.UP;
26503
- const head = this.engraving && this._noteHeads.find((h) => !h.isDisplaced());
26504
- if (head && ((_a = this.engraving) === null || _a === void 0 ? void 0 : _a.musicFont) === head.fontInfo.family) {
26505
- const anchor = this.engraving.stemAnchor(head.text, up ? 'up' : 'down');
26506
- if (anchor)
26507
- return (this.getNoteHeadBeginX() +
26508
- head.getXShift() +
26509
- (anchor[0] * head.fontSizeInPixels) / 4 +
26510
- ((up ? -1 : 1) * _stem__WEBPACK_IMPORTED_MODULE_7__.Stem.WIDTH) / 2);
26772
+ const head = this._noteHeads.find((h) => !h.isDisplaced());
26773
+ const anchor = head && this.stemAnchor(head, up ? 'up' : 'down');
26774
+ if (head && anchor) {
26775
+ return (this.getNoteHeadBeginX() +
26776
+ head.getXShift() +
26777
+ (anchor[0] * head.fontSizeInPixels) / 4 +
26778
+ ((up ? -1 : 1) * _stem__WEBPACK_IMPORTED_MODULE_7__.Stem.WIDTH) / 2);
26511
26779
  }
26512
26780
  // We adjust the origin of the stem because we want the stem left-aligned
26513
26781
  // with the notehead if stemmed-down, and right-aligned if stemmed-up
@@ -26671,6 +26939,26 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_8__.StemmableNot
26671
26939
  this._noteHeads[index].setStyle(style);
26672
26940
  return this;
26673
26941
  }
26942
+ /** The explicit key line, or undefined when rest placement is automatic. */
26943
+ get restLine() {
26944
+ return this.lineBeforeRestPin === undefined ? undefined : this.getKeyLine(0);
26945
+ }
26946
+ /** Pin this rest to a line. Passing undefined releases it for automatic placement. */
26947
+ setRestLine(line) {
26948
+ var _a;
26949
+ if (!this.isRest() || (line !== undefined && !Number.isFinite(line)))
26950
+ throw new _util__WEBPACK_IMPORTED_MODULE_10__.RuntimeError('BadArguments', 'Rest positioning requires a rest and a finite line.');
26951
+ if (line !== undefined) {
26952
+ (_a = this.lineBeforeRestPin) !== null && _a !== void 0 ? _a : (this.lineBeforeRestPin = this.getKeyLine(0));
26953
+ return this.setKeyLine(0, line);
26954
+ }
26955
+ if (this.lineBeforeRestPin !== undefined) {
26956
+ const previous = this.lineBeforeRestPin;
26957
+ this.lineBeforeRestPin = undefined;
26958
+ this.setKeyLine(0, previous);
26959
+ }
26960
+ return this;
26961
+ }
26674
26962
  setKeyLine(index, line) {
26675
26963
  this.keyProps[index].line = line;
26676
26964
  this.reset();
@@ -26743,9 +27031,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_8__.StemmableNot
26743
27031
  this._noteHeads.forEach((nh) => {
26744
27032
  const offset = _tables__WEBPACK_IMPORTED_MODULE_9__.Tables.noteHeadStemYOffsets[nh.text];
26745
27033
  const anchor = offset ? offset[anchorKey] : 0;
26746
- const fontAnchor = this.engraving && this.engraving.musicFont === nh.fontInfo.family
26747
- ? this.engraving.stemAnchor(nh.text, anchorKey)
26748
- : undefined;
27034
+ const fontAnchor = this.stemAnchor(nh, anchorKey);
26749
27035
  // SMuFL specifies four staff spaces per em. Follow the glyph scale for grace notes too.
26750
27036
  const y = nh.getY() - (fontAnchor ? (fontAnchor[1] * nh.fontSizeInPixels) / 4 : anchor * _tables__WEBPACK_IMPORTED_MODULE_9__.Tables.STAVE_LINE_DISTANCE);
26751
27037
  yTop = Math.min(y, yTop);
@@ -27154,13 +27440,16 @@ __webpack_require__.r(__webpack_exports__);
27154
27440
  /* harmony export */ __webpack_require__.d(__webpack_exports__, {
27155
27441
  /* harmony export */ StaveSection: () => (/* binding */ StaveSection)
27156
27442
  /* harmony export */ });
27157
- /* harmony import */ var _metrics__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./metrics */ "./src/metrics.ts");
27158
- /* harmony import */ var _stavemodifier__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./stavemodifier */ "./src/stavemodifier.ts");
27443
+ /* harmony import */ var _boundingbox__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./boundingbox */ "./src/boundingbox.ts");
27444
+ /* harmony import */ var _metrics__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./metrics */ "./src/metrics.ts");
27445
+ /* harmony import */ var _stavemodifier__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./stavemodifier */ "./src/stavemodifier.ts");
27159
27446
  // Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
27160
27447
  // @author: Larry Kuhns 2011
27448
+ // Draw rehearsal lettering and its optional frame from the same positioned text.
27449
+
27161
27450
 
27162
27451
 
27163
- class StaveSection extends _stavemodifier__WEBPACK_IMPORTED_MODULE_1__.StaveModifier {
27452
+ class StaveSection extends _stavemodifier__WEBPACK_IMPORTED_MODULE_2__.StaveModifier {
27164
27453
  static get CATEGORY() {
27165
27454
  return "StaveSection" /* Category.StaveSection */;
27166
27455
  }
@@ -27170,29 +27459,33 @@ class StaveSection extends _stavemodifier__WEBPACK_IMPORTED_MODULE_1__.StaveModi
27170
27459
  this.x = x;
27171
27460
  this.yShift = yShift;
27172
27461
  this.drawRect = drawRect;
27173
- this.padding = _metrics__WEBPACK_IMPORTED_MODULE_0__.Metrics.get('StaveSection.padding');
27462
+ this.padding = _metrics__WEBPACK_IMPORTED_MODULE_1__.Metrics.get('StaveSection.padding');
27174
27463
  }
27175
27464
  setDrawRect(drawRect) {
27176
27465
  this.drawRect = drawRect;
27177
27466
  return this;
27178
27467
  }
27468
+ /** Report the same ink and padding before drawing as after a stave has moved. */
27469
+ getBoundingBox() {
27470
+ if (this.stave) {
27471
+ this.x = this.stave.getX() + this.stave.getModifierXShift(this.getPosition()) + this.padding;
27472
+ this.y = this.stave.getYForTopText(1.5) - this.padding;
27473
+ }
27474
+ const ink = this.getTextInk(this.x, this.y);
27475
+ if (!this.drawRect)
27476
+ return ink;
27477
+ return new _boundingbox__WEBPACK_IMPORTED_MODULE_0__.BoundingBox(ink.x - this.padding, ink.y - this.padding, ink.w + 2 * this.padding, ink.h + 2 * this.padding);
27478
+ }
27179
27479
  draw() {
27180
- const stave = this.checkStave();
27181
- const ctx = stave.checkContext();
27480
+ const ctx = this.checkStave().checkContext();
27481
+ const bounds = this.getBoundingBox();
27182
27482
  this.setRendered();
27183
- this.x = stave.getX() + stave.getModifierXShift(this.getPosition());
27184
- const headroom = -1 * this.textMetrics.actualBoundingBoxDescent;
27185
- const width = this.width + 2 * this.padding; // add left & right padding
27186
- const height = this.height + 2 * this.padding; // add top & bottom padding
27187
- // Seems to be a good default y
27188
- const y = stave.getYForTopText(1.5) + this.yShift;
27189
- const x = this.x + this.xShift;
27190
27483
  if (this.drawRect) {
27191
27484
  ctx.beginPath();
27192
- ctx.rect(x, y - height + headroom, width, height);
27485
+ ctx.rect(bounds.x, bounds.y, bounds.w, bounds.h);
27193
27486
  ctx.stroke();
27194
27487
  }
27195
- this.renderText(ctx, this.xShift + this.padding, y - this.padding);
27488
+ this.renderText(ctx, 0, 0);
27196
27489
  }
27197
27490
  }
27198
27491
 
@@ -27618,12 +27911,13 @@ class StaveTie extends _element__WEBPACK_IMPORTED_MODULE_1__.Element {
27618
27911
  renderTieText(firstX, lastX) {
27619
27912
  var _a, _b, _c;
27620
27913
  const ctx = this.checkContext();
27621
- let centerX = (firstX + lastX) / 2;
27622
- centerX -= ctx.measureText(this.text).width / 2;
27623
27914
  const stave = (_b = (_a = this.notes.firstNote) === null || _a === void 0 ? void 0 : _a.checkStave()) !== null && _b !== void 0 ? _b : (_c = this.notes.lastNote) === null || _c === void 0 ? void 0 : _c.checkStave();
27624
27915
  if (stave) {
27916
+ ctx.save();
27625
27917
  ctx.setFont(this.fontInfo);
27918
+ const centerX = (firstX + lastX - ctx.measureText(this.text).width) / 2;
27626
27919
  ctx.fillText(this.text, centerX + this.renderOptions.textShiftX, stave.getYForTopText() - 1);
27920
+ ctx.restore();
27627
27921
  }
27628
27922
  }
27629
27923
  /**
@@ -28618,7 +28912,8 @@ class Stroke extends _modifier__WEBPACK_IMPORTED_MODULE_4__.Modifier {
28618
28912
  let yPositions = note.getYs();
28619
28913
  let topY = start.y;
28620
28914
  let botY = start.y;
28621
- const x = start.x - 5;
28915
+ // Leave a visible gap between a tab fret's string mask and the tip of a broad arrow.
28916
+ const x = start.x - 5 - ((0,_typeguard__WEBPACK_IMPORTED_MODULE_5__.isTabNote)(note) ? _metrics__WEBPACK_IMPORTED_MODULE_3__.Metrics.get('NoteHead.minPadding') : 0);
28622
28917
  const lineSpace = note.checkStave().getSpacingBetweenLines();
28623
28918
  const notes = this.checkModifierContext().getMembers(note.getCategory());
28624
28919
  for (let i = 0; i < notes.length; i++) {
@@ -29196,17 +29491,25 @@ class SVGContext extends _rendercontext__WEBPACK_IMPORTED_MODULE_3__.RenderConte
29196
29491
  }
29197
29492
  save() {
29198
29493
  this.stateStack.push({
29494
+ font: this.fontCSSString,
29199
29495
  state: (0,_util__WEBPACK_IMPORTED_MODULE_6__.structuredClone)(this.state),
29200
29496
  attributes: (0,_util__WEBPACK_IMPORTED_MODULE_6__.structuredClone)(this.attributes),
29201
29497
  });
29202
29498
  return this;
29203
29499
  }
29204
29500
  restore() {
29501
+ var _a;
29205
29502
  const savedState = this.stateStack.pop();
29206
29503
  if (savedState) {
29207
- const state = savedState;
29208
- this.state = (0,_util__WEBPACK_IMPORTED_MODULE_6__.structuredClone)(state.state);
29209
- this.attributes = (0,_util__WEBPACK_IMPORTED_MODULE_6__.structuredClone)(state.attributes);
29504
+ this.state = (0,_util__WEBPACK_IMPORTED_MODULE_6__.structuredClone)(savedState.state);
29505
+ this.attributes = (0,_util__WEBPACK_IMPORTED_MODULE_6__.structuredClone)(savedState.attributes);
29506
+ this.fontCSSString =
29507
+ (_a = savedState.font) !== null && _a !== void 0 ? _a : _font__WEBPACK_IMPORTED_MODULE_1__.Font.toCSSString({
29508
+ family: this.attributes['font-family'],
29509
+ size: this.attributes['font-size'],
29510
+ weight: this.attributes['font-weight'],
29511
+ style: this.attributes['font-style'],
29512
+ });
29210
29513
  }
29211
29514
  return this;
29212
29515
  }
@@ -30683,6 +30986,9 @@ class TabNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_8__.StemmableNote
30683
30986
  this.fretElement.push(el);
30684
30987
  this.width = Math.max(el.getWidth(), this.width);
30685
30988
  }
30989
+ // The tick lies at the middle of a fret. Reserve its two halves on the corresponding sides.
30990
+ this.setLeftDisplacedHeadPx(this.width / 2);
30991
+ this.setRightDisplacedHeadPx(this.width / 2);
30686
30992
  }
30687
30993
  // Set the `stave` to the note
30688
30994
  setStave(stave) {
@@ -30711,19 +31017,16 @@ class TabNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_8__.StemmableNote
30711
31017
  if (this.ys.length === 0) {
30712
31018
  throw new _util__WEBPACK_IMPORTED_MODULE_10__.RuntimeError('NoYValues', 'No Y-Values calculated for this note.');
30713
31019
  }
30714
- let x = 0;
31020
+ // Frets straddle the tick. Keep side modifiers outside the widest member of the chord.
31021
+ let x = this.getAbsoluteX();
30715
31022
  if (position === _modifier__WEBPACK_IMPORTED_MODULE_5__.Modifier.Position.LEFT) {
30716
- x = -1 * 2; // FIXME: modifier padding, move to font file
31023
+ x = this.getTieLeftX();
30717
31024
  }
30718
31025
  else if (position === _modifier__WEBPACK_IMPORTED_MODULE_5__.Modifier.Position.RIGHT) {
30719
- x = this.width + 2; // FIXME: modifier padding, move to font file
30720
- }
30721
- else if (position === _modifier__WEBPACK_IMPORTED_MODULE_5__.Modifier.Position.BELOW || position === _modifier__WEBPACK_IMPORTED_MODULE_5__.Modifier.Position.ABOVE) {
30722
- const noteGlyphWidth = this.width;
30723
- x = noteGlyphWidth / 2;
31026
+ x = this.getTieRightX();
30724
31027
  }
30725
31028
  return {
30726
- x: this.getAbsoluteX() + x,
31029
+ x,
30727
31030
  y: this.ys[index],
30728
31031
  };
30729
31032
  }
@@ -31009,15 +31312,16 @@ __webpack_require__.r(__webpack_exports__);
31009
31312
  /* harmony export */ __webpack_require__.d(__webpack_exports__, {
31010
31313
  /* harmony export */ TabTie: () => (/* binding */ TabTie)
31011
31314
  /* harmony export */ });
31012
- /* harmony import */ var _stavetie__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./stavetie */ "./src/stavetie.ts");
31315
+ /* harmony import */ var _metrics__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./metrics */ "./src/metrics.ts");
31316
+ /* harmony import */ var _stavetie__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./stavetie */ "./src/stavetie.ts");
31013
31317
  // Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
31014
31318
  // MIT License
31015
31319
  //
31016
31320
  // ## Description
31017
- // This class implements varies types of ties between contiguous notes. The
31018
- // ties include: regular ties, hammer ons, pull offs, and slides.
31321
+ // Tablature ties carry technique letters between frets, including hammer-ons and pull-offs.
31019
31322
 
31020
- class TabTie extends _stavetie__WEBPACK_IMPORTED_MODULE_0__.StaveTie {
31323
+
31324
+ class TabTie extends _stavetie__WEBPACK_IMPORTED_MODULE_1__.StaveTie {
31021
31325
  static get CATEGORY() {
31022
31326
  return "TabTie" /* Category.TabTie */;
31023
31327
  }
@@ -31040,6 +31344,9 @@ class TabTie extends _stavetie__WEBPACK_IMPORTED_MODULE_0__.StaveTie {
31040
31344
  */
31041
31345
  constructor(notes, text) {
31042
31346
  super(notes, text);
31347
+ // A one-letter tab technique has a distinct face from a written direction or a slide abbreviation.
31348
+ if (text && /^[a-z]$/i.test(text))
31349
+ this.setFont(_metrics__WEBPACK_IMPORTED_MODULE_0__.Metrics.getFontInfo('TabTie.techniqueLetter'));
31043
31350
  this.renderOptions.cp1 = 9;
31044
31351
  this.renderOptions.cp2 = 11;
31045
31352
  this.renderOptions.yShift = 3;
@@ -38737,7 +39044,9 @@ function doubleBottom(options) {
38737
39044
  options.assert.ok(true, '2 Bottom Chord Symbol');
38738
39045
  }
38739
39046
  function wide(options) {
38740
- const f = _vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__.VexFlowTests.makeFactory(options, 300 * 1.5, 680);
39047
+ // A left-justified extension can extend beyond the last barline. Keep its ink on the page.
39048
+ const pageWidth = 370;
39049
+ const f = _vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__.VexFlowTests.makeFactory(options, pageWidth * 1.5, 680);
38741
39050
  const ctx = f.getContext();
38742
39051
  ctx.scale(1.5, 1.5);
38743
39052
  function draw(chord1, chord2, y) {
@@ -38747,6 +39056,8 @@ function wide(options) {
38747
39056
  note(f, ['c/4', 'e/4', 'B/4'], 'h', chord2),
38748
39057
  ];
38749
39058
  _src_formatter__WEBPACK_IMPORTED_MODULE_4__.Formatter.FormatAndDraw(ctx, stave, notes);
39059
+ const last = chord2.getBoundingBox();
39060
+ options.assert.ok(last.x + last.w < pageWidth, 'The final chord and its extension fit on the page');
38750
39061
  }
38751
39062
  let chord1 = f.ChordSymbol().addText('FrogToad7').setHorizontal('left').addGlyphOrText('(#11b9)', superscript);
38752
39063
  let chord2 = f.ChordSymbol({ hJustify: 'left' }).addText('CToShiningC').addGlyphSuperscript('majorSeventh');
@@ -39553,7 +39864,7 @@ __webpack_require__.r(__webpack_exports__);
39553
39864
  // Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
39554
39865
  // MIT License
39555
39866
  //
39556
- // Demo - Petzold
39867
+ // Petzold’s Minuet in G, an 18-bar keyboard excerpt with editorial performance markings.
39557
39868
 
39558
39869
 
39559
39870
  const DemoPetzoldTests = {
@@ -39594,15 +39905,17 @@ function minuetInG(options) {
39594
39905
  .addClef('treble')
39595
39906
  .addKeySignature('G')
39596
39907
  .addTimeSignature('3/4')
39597
- .setTempo({ name: 'Allegretto', duration: 'h', dots: 1, bpm: 66 }, -30);
39908
+ .setTempo({ name: 'Allegretto', duration: 'q', bpm: 132 }, -30);
39598
39909
  system
39599
- .addStave({ voices: [voice(notes('(G3 B3 D4)/h, A3/q', { clef: 'bass' }))] })
39910
+ .addStave({ voices: [voice(notes('(G3 B3 D4)/h[id="ped1"], A3/q[id="lift1"]', { clef: 'bass' }))] })
39600
39911
  .addClef('bass')
39601
39912
  .addKeySignature('G')
39602
39913
  .addTimeSignature('3/4');
39603
39914
  system.addConnector('brace');
39604
39915
  system.addConnector('singleRight');
39605
39916
  system.addConnector('singleLeft');
39917
+ // Release the pedal as the bass moves off G.
39918
+ f.PedalMarking({ notes: [id('ped1'), id('lift1')] });
39606
39919
  id('m1a').addModifier(f.Fingering({ number: '5' }), 0);
39607
39920
  /* Measure 2 */
39608
39921
  system = appendSystem(150);
@@ -39625,8 +39938,11 @@ function minuetInG(options) {
39625
39938
  /* Measure 3 */
39626
39939
  system = appendSystem(150);
39627
39940
  system.addStave({
39628
- voices: [voice([notes('E5/q[id="m3a"]'), beam(notes('C5/8, D5, E5, F5', { stem: 'down' }))].reduce(_vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__.concat))],
39941
+ voices: [
39942
+ voice([notes('E5/q[id="m3a"]'), beam(notes('C5/8[id="m3cut"], D5, E5, F5', { stem: 'down' }))].reduce(_vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__.concat)),
39943
+ ],
39629
39944
  });
39945
+ id('m3cut').addModifier(f.Ornament('mordent'));
39630
39946
  id('m3a').addModifier(f.Fingering({ number: '3', position: 'above' }), 0);
39631
39947
  system.addStave({ voices: [voice(notes('C4/h.', { clef: 'bass' }))] });
39632
39948
  system.addConnector('singleRight');
@@ -39643,8 +39959,8 @@ function minuetInG(options) {
39643
39959
  to: id('m4a'),
39644
39960
  options: {
39645
39961
  cps: [
39646
- { x: 0, y: 20 },
39647
- { x: 0, y: 20 },
39962
+ { x: 0, y: 39 },
39963
+ { x: 0, y: 39 },
39648
39964
  ],
39649
39965
  },
39650
39966
  });
@@ -39683,6 +39999,7 @@ function minuetInG(options) {
39683
39999
  system
39684
40000
  .addStave({
39685
40001
  voices: [
40002
+ voice([f.TextDynamics({ text: 'mf', duration: 'h', dots: 1, line: 10 })]),
39686
40003
  voice([notes('F4/q[id="m7a"]'), beam(notes('G4/8[id="m7b"], A4, B4, G4', { stem: 'up' }))].reduce(_vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__.concat)),
39687
40004
  ],
39688
40005
  })
@@ -39695,12 +40012,13 @@ function minuetInG(options) {
39695
40012
  system.addConnector('brace');
39696
40013
  system.addConnector('singleRight');
39697
40014
  system.addConnector('singleLeft');
40015
+ id('m7a').addModifier(f.Articulation({ type: 'a-', position: 'above' }));
39698
40016
  id('m7a').addModifier(f.Fingering({ number: '2', position: 'below' }), 0);
39699
40017
  id('m7b').addModifier(f.Fingering({ number: '1' }), 0);
39700
40018
  id('m7c').addModifier(f.Fingering({ number: '3', position: 'above' }), 0);
39701
40019
  /* Measure 8 */
39702
40020
  system = appendSystem(180);
39703
- const grace = f.GraceNote({ keys: ['d/3'], clef: 'bass', duration: '4', slash: false });
40021
+ const grace = f.GraceNote({ keys: ['b/4'], duration: '8', slash: true });
39704
40022
  system.addStave({ voices: [voice(notes('A4/h.[id="m8c"]'))] });
39705
40023
  system.addStave({
39706
40024
  voices: [
@@ -39711,7 +40029,7 @@ function minuetInG(options) {
39711
40029
  });
39712
40030
  system.addConnector('singleRight');
39713
40031
  id('m8b').addModifier(f.Fingering({ number: '1', position: 'above' }), 0);
39714
- id('m8c').addModifier(f.GraceNoteGroup({ notes: [grace] }), 0);
40032
+ id('m8c').addModifier(f.GraceNoteGroup({ notes: [grace], slur: true }), 0);
39715
40033
  f.Curve({
39716
40034
  from: id('m7a'),
39717
40035
  to: id('m8c'),
@@ -39725,11 +40043,11 @@ function minuetInG(options) {
39725
40043
  positionEnd: 'nearTop',
39726
40044
  },
39727
40045
  });
39728
- f.StaveTie({ from: grace, to: id('m8c') });
39729
40046
  /* Measure 9 */
39730
40047
  system = appendSystem(180);
39731
40048
  system.addStave({
39732
40049
  voices: [
40050
+ voice([f.TextDynamics({ text: 'pp', duration: 'h', dots: 1, line: 9 })]),
39733
40051
  score
39734
40052
  .set({ clef: 'treble' })
39735
40053
  .voice([notes('D5/q[id="m9a"]'), beam(notes('G4/8, A4, B4, C5', { stem: 'up' }))].reduce(_vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__.concat)),
@@ -39760,8 +40078,11 @@ function minuetInG(options) {
39760
40078
  /* Measure 11 */
39761
40079
  system = appendSystem(150);
39762
40080
  system.addStave({
39763
- voices: [voice([notes('E5/q[id="m11a"]'), beam(notes('C5/8, D5, E5, F5', { stem: 'down' }))].reduce(_vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__.concat))],
40081
+ voices: [
40082
+ voice([notes('E5/q[id="m11a"]'), beam(notes('C5/8[id="m11cut"], D5, E5, F5', { stem: 'down' }))].reduce(_vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__.concat)),
40083
+ ],
39764
40084
  });
40085
+ id('m11cut').addModifier(f.Ornament('mordent'));
39765
40086
  id('m11a').addModifier(f.Fingering({ number: '3', position: 'above' }), 0);
39766
40087
  system.addStave({ voices: [voice(notes('C4/h.', { clef: 'bass' }))] });
39767
40088
  system.addConnector('singleRight');
@@ -39786,8 +40107,8 @@ function minuetInG(options) {
39786
40107
  to: id('m12a'),
39787
40108
  options: {
39788
40109
  cps: [
39789
- { x: 0, y: 20 },
39790
- { x: 0, y: 20 },
40110
+ { x: 0, y: 39 },
40111
+ { x: 0, y: 39 },
39791
40112
  ],
39792
40113
  },
39793
40114
  });
@@ -39821,7 +40142,7 @@ function minuetInG(options) {
39821
40142
  voices: [
39822
40143
  score
39823
40144
  .set({ clef: 'treble' })
39824
- .voice([notes('B4/q'), beam(notes('C5/8, b4, a4, g4', { stem: 'up' }))].reduce(_vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__.concat)),
40145
+ .voice([notes('B4/q'), beam(notes('C5/8, b4, a4, g4[id="m14end"]', { stem: 'up' }))].reduce(_vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__.concat)),
39825
40146
  ],
39826
40147
  });
39827
40148
  system.addStave({ voices: [voice(notes('g3/h[id="m14a"], b3/q[id="m14b"]', { clef: 'bass' }))] });
@@ -39849,7 +40170,7 @@ function minuetInG(options) {
39849
40170
  })
39850
40171
  .setEndBarType(_src_index__WEBPACK_IMPORTED_MODULE_1__.BarlineType.REPEAT_END);
39851
40172
  system
39852
- .addStave({ voices: [voice(notes('g3/h[id="m16b"], g2/q', { clef: 'bass' }))] })
40173
+ .addStave({ voices: [voice(notes('g3/h[id="m16b"], g2/q[id="lift16"]', { clef: 'bass' }))] })
39853
40174
  .setEndBarType(_src_index__WEBPACK_IMPORTED_MODULE_1__.BarlineType.REPEAT_END);
39854
40175
  system.addConnector('boldDoubleRight');
39855
40176
  id('m16a').addModifier(f.Fingering({ number: '1' }), 0);
@@ -39904,6 +40225,10 @@ function minuetInG(options) {
39904
40225
  ],
39905
40226
  },
39906
40227
  });
40228
+ // Shape the two descents differently and clear the pedal before the repeat.
40229
+ f.StaveHairpin({ from: id('m5a'), to: id('m6a'), type: _src_index__WEBPACK_IMPORTED_MODULE_1__.StaveHairpin.type.CRESC });
40230
+ f.StaveHairpin({ from: id('m13a'), to: id('m14end'), type: _src_index__WEBPACK_IMPORTED_MODULE_1__.StaveHairpin.type.DECRESC });
40231
+ f.PedalMarking({ notes: [id('m16b'), id('lift16')] });
39907
40232
  /* Done */
39908
40233
  f.draw();
39909
40234
  _src_index__WEBPACK_IMPORTED_MODULE_1__.Registry.disableDefaultRegistry();
@@ -39923,14 +40248,16 @@ _vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__.VexFlowTests.register(DemoPet
39923
40248
 
39924
40249
  __webpack_require__.r(__webpack_exports__);
39925
40250
  /* harmony import */ var _vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./vexflow_test_helpers */ "./tests/vexflow_test_helpers.ts");
39926
- /* harmony import */ var _demos_drums__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./demos/drums */ "./tests/demos/drums.ts");
39927
- /* harmony import */ var _demos_electric__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./demos/electric */ "./tests/demos/electric.ts");
39928
- /* harmony import */ var _demos_greensleeves__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./demos/greensleeves */ "./tests/demos/greensleeves.ts");
39929
- /* harmony import */ var _demos_joy__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./demos/joy */ "./tests/demos/joy.ts");
39930
- /* harmony import */ var _demos_kesh__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./demos/kesh */ "./tests/demos/kesh.ts");
39931
- /* harmony import */ var _demos_prelude__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./demos/prelude */ "./tests/demos/prelude.ts");
39932
- /* harmony import */ var _demos_quartertones__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./demos/quartertones */ "./tests/demos/quartertones.ts");
39933
- /* harmony import */ var _demos_saints__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./demos/saints */ "./tests/demos/saints.ts");
40251
+ /* harmony import */ var _demos_ballade__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./demos/ballade */ "./tests/demos/ballade.ts");
40252
+ /* harmony import */ var _demos_drums__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./demos/drums */ "./tests/demos/drums.ts");
40253
+ /* harmony import */ var _demos_electric__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./demos/electric */ "./tests/demos/electric.ts");
40254
+ /* harmony import */ var _demos_fugue__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./demos/fugue */ "./tests/demos/fugue.ts");
40255
+ /* harmony import */ var _demos_greensleeves__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./demos/greensleeves */ "./tests/demos/greensleeves.ts");
40256
+ /* harmony import */ var _demos_joy__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./demos/joy */ "./tests/demos/joy.ts");
40257
+ /* harmony import */ var _demos_kesh__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./demos/kesh */ "./tests/demos/kesh.ts");
40258
+ /* harmony import */ var _demos_prelude__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./demos/prelude */ "./tests/demos/prelude.ts");
40259
+ /* harmony import */ var _demos_quartertones__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./demos/quartertones */ "./tests/demos/quartertones.ts");
40260
+ /* harmony import */ var _demos_saints__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./demos/saints */ "./tests/demos/saints.ts");
39934
40261
  // Register each gallery arrangement as its own runnable module in the visual test suite.
39935
40262
 
39936
40263
 
@@ -39941,16 +40268,20 @@ __webpack_require__.r(__webpack_exports__);
39941
40268
 
39942
40269
 
39943
40270
 
39944
- /** Keep the lead sheet in its handwritten face on every enabled backend. */
40271
+
40272
+
40273
+ /** Pair the lead sheet's handwritten music with engraved words and chord names. */
39945
40274
  const repertoire = [
39946
- { title: 'When the Saints Go Marching In', render: _demos_saints__WEBPACK_IMPORTED_MODULE_8__.saints, fonts: ['Petaluma'] },
39947
- { title: 'Greensleeves', render: _demos_greensleeves__WEBPACK_IMPORTED_MODULE_3__.greensleeves },
39948
- { title: 'Prelude in C major', render: _demos_prelude__WEBPACK_IMPORTED_MODULE_6__.prelude },
39949
- { title: 'The Kesh Jig', render: _demos_kesh__WEBPACK_IMPORTED_MODULE_5__.kesh },
39950
- { title: 'Ode to Joy', render: _demos_joy__WEBPACK_IMPORTED_MODULE_4__.joy },
39951
- { title: 'High Wire', render: _demos_electric__WEBPACK_IMPORTED_MODULE_2__.electric },
39952
- { title: 'Pocket Change', render: _demos_drums__WEBPACK_IMPORTED_MODULE_1__.drums },
39953
- { title: 'Narrow Steps', render: _demos_quartertones__WEBPACK_IMPORTED_MODULE_7__.quartertones },
40275
+ { title: 'When the Saints Go Marching In', render: _demos_saints__WEBPACK_IMPORTED_MODULE_10__.saints, fonts: ['Petaluma with Academico'] },
40276
+ { title: 'Greensleeves', render: _demos_greensleeves__WEBPACK_IMPORTED_MODULE_5__.greensleeves },
40277
+ { title: 'Prelude in C major', render: _demos_prelude__WEBPACK_IMPORTED_MODULE_8__.prelude },
40278
+ { title: 'Fugue No. 6 in D minor', render: _demos_fugue__WEBPACK_IMPORTED_MODULE_4__.fugue },
40279
+ { title: 'Ballade No. 3 in A-flat major', render: _demos_ballade__WEBPACK_IMPORTED_MODULE_1__.ballade },
40280
+ { title: 'The Kesh Jig', render: _demos_kesh__WEBPACK_IMPORTED_MODULE_7__.kesh },
40281
+ { title: 'Ode to Joy', render: _demos_joy__WEBPACK_IMPORTED_MODULE_6__.joy },
40282
+ { title: 'High Wire', render: _demos_electric__WEBPACK_IMPORTED_MODULE_3__.electric },
40283
+ { title: 'Pocket Change', render: _demos_drums__WEBPACK_IMPORTED_MODULE_2__.drums },
40284
+ { title: 'Narrow Steps', render: _demos_quartertones__WEBPACK_IMPORTED_MODULE_9__.quartertones },
39954
40285
  ];
39955
40286
  for (const piece of repertoire) {
39956
40287
  _vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__.VexFlowTests.register({
@@ -39962,6 +40293,41 @@ for (const piece of repertoire) {
39962
40293
  }
39963
40294
 
39964
40295
 
40296
+ /***/ },
40297
+
40298
+ /***/ "./tests/demos/ballade.ts"
40299
+ /*!********************************!*\
40300
+ !*** ./tests/demos/ballade.ts ***!
40301
+ \********************************/
40302
+ (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
40303
+
40304
+ __webpack_require__.r(__webpack_exports__);
40305
+ /* harmony export */ __webpack_require__.d(__webpack_exports__, {
40306
+ /* harmony export */ ballade: () => (/* binding */ ballade)
40307
+ /* harmony export */ });
40308
+ /* harmony import */ var _vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../vexflow_test_helpers */ "./tests/vexflow_test_helpers.ts");
40309
+ /* harmony import */ var _src_index__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../src/index */ "./src/index.ts");
40310
+ /* harmony import */ var _scores_ballade__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../scores/ballade */ "./tests/scores/ballade.js");
40311
+ /* harmony import */ var _scores_ballade__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_scores_ballade__WEBPACK_IMPORTED_MODULE_2__);
40312
+ // Run the first printed page of Chopin's third Ballade on every visual test backend.
40313
+
40314
+
40315
+
40316
+ /** The reference turns the page after bar 24, with six bars in each of the first two systems. */
40317
+ function ballade(options) {
40318
+ const { draw, width, height } = globalThis.ChopinBallade;
40319
+ const factory = _vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__.VexFlowTests.makeFactory(options, width, Math.ceil(height));
40320
+ const systems = draw({ Accidental: _src_index__WEBPACK_IMPORTED_MODULE_1__.Accidental, Factory: _src_index__WEBPACK_IMPORTED_MODULE_1__.Factory, Fraction: _src_index__WEBPACK_IMPORTED_MODULE_1__.Fraction, PedalMarking: _src_index__WEBPACK_IMPORTED_MODULE_1__.PedalMarking, StaveHairpin: _src_index__WEBPACK_IMPORTED_MODULE_1__.StaveHairpin, Stroke: _src_index__WEBPACK_IMPORTED_MODULE_1__.Stroke, TextDynamics: _src_index__WEBPACK_IMPORTED_MODULE_1__.TextDynamics, Tuplet: _src_index__WEBPACK_IMPORTED_MODULE_1__.Tuplet }, factory);
40321
+ options.assert.deepEqual(systems.map((system) => system.measures), [
40322
+ [1, 2, 3, 4, 5, 6],
40323
+ [7, 8, 9, 10, 11, 12],
40324
+ [13, 14, 15, 16],
40325
+ [17, 18, 19, 20],
40326
+ [21, 22, 23, 24],
40327
+ ], 'All five systems retain the breaks of the printed page');
40328
+ }
40329
+
40330
+
39965
40331
  /***/ },
39966
40332
 
39967
40333
  /***/ "./tests/demos/drums.ts"
@@ -40081,9 +40447,7 @@ function electric(options) {
40081
40447
  stave.addTimeSignature('4/4').setTempo({ duration: 'q', bpm: 96 }, -8);
40082
40448
  if (i === 3)
40083
40449
  stave.setEndBarType(_src_index__WEBPACK_IMPORTED_MODULE_1__.BarlineType.END);
40084
- const legato = (start, label) => score.make
40085
- .tabTie({ firstNote: notes[start], lastNote: notes[start + 1] }, label)
40086
- .setFont('Arial, Helvetica, sans-serif', 9, 'bold');
40450
+ const legato = (start, label) => score.make.tabTie({ firstNote: notes[start], lastNote: notes[start + 1] }, label);
40087
40451
  if (i === 0) {
40088
40452
  score.beam(notes.slice(1, 3));
40089
40453
  legato(1, 'H');
@@ -40119,6 +40483,45 @@ function electric(options) {
40119
40483
  }
40120
40484
 
40121
40485
 
40486
+ /***/ },
40487
+
40488
+ /***/ "./tests/demos/fugue.ts"
40489
+ /*!******************************!*\
40490
+ !*** ./tests/demos/fugue.ts ***!
40491
+ \******************************/
40492
+ (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
40493
+
40494
+ __webpack_require__.r(__webpack_exports__);
40495
+ /* harmony export */ __webpack_require__.d(__webpack_exports__, {
40496
+ /* harmony export */ fugue: () => (/* binding */ fugue)
40497
+ /* harmony export */ });
40498
+ /* harmony import */ var _vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../vexflow_test_helpers */ "./tests/vexflow_test_helpers.ts");
40499
+ /* harmony import */ var _src_index__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../src/index */ "./src/index.ts");
40500
+ /* harmony import */ var _scores_fugue__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../scores/fugue */ "./tests/scores/fugue.js");
40501
+ /* harmony import */ var _scores_fugue__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_scores_fugue__WEBPACK_IMPORTED_MODULE_2__);
40502
+ // Engrave Bach's opening eight bars on each backend using the print edition's source.
40503
+
40504
+
40505
+
40506
+ /** The excerpt includes the subject, answer, and third entrance in the bass. */
40507
+ function fugue(options) {
40508
+ const width = 1300;
40509
+ const factory = _vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__.VexFlowTests.makeFactory(options, width, 640);
40510
+ const score = factory.EasyScore({ throwOnError: true, extensions: ['spacer', 'ornament', 'dynamic'] });
40511
+ const notation = { Fraction: _src_index__WEBPACK_IMPORTED_MODULE_1__.Fraction, TextDynamics: _src_index__WEBPACK_IMPORTED_MODULE_1__.TextDynamics };
40512
+ score.addCommitHook(globalThis.BachFugue.noteMarks(notation));
40513
+ const music = globalThis.BachFugue.music(notation, 8);
40514
+ music.system = Object.assign(Object.assign({}, music.system), { spaceBetweenStaves: 6 });
40515
+ music.sheet = { x: 18, y: 18, width: width - 36, measurePadding: 18, rowGap: 18 };
40516
+ const { sheet, systems, staves } = score.compose(music);
40517
+ sheet.format();
40518
+ factory.getContext().resize(width, Math.ceil(sheet.getHeight() + 24));
40519
+ factory.draw();
40520
+ options.assert.equal(systems.length, 8, 'Eight complete measures');
40521
+ options.assert.ok(staves.every((pair) => pair.length === 2), 'Both hands share the grand staff throughout');
40522
+ }
40523
+
40524
+
40122
40525
  /***/ },
40123
40526
 
40124
40527
  /***/ "./tests/demos/greensleeves.ts"
@@ -40160,8 +40563,6 @@ const positions = {
40160
40563
  function greensleeves(options) {
40161
40564
  const f = _vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__.VexFlowTests.makeFactory(options, 900, 486);
40162
40565
  const score = f.EasyScore({ throwOnError: true });
40163
- // Upright sans-serif chord names sit above the melody, including the slash bass in Dm/F.
40164
- const chordFont = { fontFamily: 'Arial, Helvetica, sans-serif', fontSize: 12 };
40165
40566
  const bars = [
40166
40567
  ['', 'A4/q'],
40167
40568
  ['Am', 'A3+E4+A4+C5/h D5/q'],
@@ -40189,7 +40590,7 @@ function greensleeves(options) {
40189
40590
  });
40190
40591
  const notes = score.notes(music.join(', '));
40191
40592
  if (chordName)
40192
- notes[0].addModifier(score.make.chordSymbol(chordFont).addText(chordName));
40593
+ notes[0].addModifier(score.make.chordSymbol().addText(chordName));
40193
40594
  const tab = events.map(({ pitches, duration }) => score.make.tabNote({
40194
40595
  positions: pitches.map((pitch) => {
40195
40596
  const [str, fret] = positions[pitch];
@@ -40334,8 +40735,6 @@ function kesh(options) {
40334
40735
  const f = _vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__.VexFlowTests.makeFactory(options, 900, 580);
40335
40736
  const score = f.EasyScore({ throwOnError: true });
40336
40737
  score.set({ time: '6/8' });
40337
- // Use the same upright lettering for a change on either beat of the bar.
40338
- const chordFont = { fontFamily: 'Arial, Helvetica, sans-serif', fontSize: 12 };
40339
40738
  // The McNeela chart suggests two changes within some bars and different pickups at the repeats.
40340
40739
  const strains = [
40341
40740
  [
@@ -40377,9 +40776,9 @@ function kesh(options) {
40377
40776
  score.beam(beat);
40378
40777
  }
40379
40778
  if (chord)
40380
- beats[0][0].addModifier(score.make.chordSymbol(chordFont).addText(chord));
40779
+ beats[0][0].addModifier(score.make.chordSymbol().addText(chord));
40381
40780
  if (nextChord)
40382
- beats[1][0].addModifier(score.make.chordSymbol(chordFont).addText(nextChord));
40781
+ beats[1][0].addModifier(score.make.chordSymbol().addText(nextChord));
40383
40782
  if (i === 0 || i === 4) {
40384
40783
  const grace = score.make.graceNote({ keys: [part ? 'd/5' : 'b/4'], duration: '8', slash: true });
40385
40784
  notes[1].addModifier(score.make.graceNoteGroup({ notes: [grace], slur: true }));
@@ -40575,13 +40974,21 @@ __webpack_require__.r(__webpack_exports__);
40575
40974
  /* harmony export */ });
40576
40975
  /* harmony import */ var _vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../vexflow_test_helpers */ "./tests/vexflow_test_helpers.ts");
40577
40976
  /* harmony import */ var _src_index__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../src/index */ "./src/index.ts");
40977
+ /* harmony import */ var _src_metrics__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../src/metrics */ "./src/metrics.ts");
40578
40978
  // A New Orleans lead-sheet chorus. EasyScore supplies the melody; native modifiers carry the words and changes.
40579
40979
 
40580
40980
 
40981
+
40581
40982
  /** Render a compact, sixteen-bar setting of the traditional refrain, with its three-note pickup. */
40582
40983
  function saints(options) {
40583
40984
  const factory = _vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__.VexFlowTests.makeFactory(options, 900, 540);
40584
40985
  const score = factory.EasyScore({ throwOnError: true });
40986
+ const lyricFont = _src_metrics__WEBPACK_IMPORTED_MODULE_2__.Metrics.getFontInfo('Annotation.lyric');
40987
+ // Use the same baseline throughout each row, below the pickup's low C.
40988
+ const word = (text, rowY) => factory
40989
+ .Annotation({ text, font: lyricFont, vJustify: 'bottom' })
40990
+ .setTextBaseline(rowY + 116)
40991
+ .setConnectorPadding(2);
40585
40992
  const bars = [
40586
40993
  ['G4/w', 'saints', 'C:6/9'],
40587
40994
  ['B4/q/r, C4/q, E4, F4', '|go|march-|ing', 'Am:7'],
@@ -40603,18 +41010,24 @@ function saints(options) {
40603
41010
  // The first system includes a short anacrusis before its four complete measures.
40604
41011
  const pickup = score.notes('C4/q, E4, F4');
40605
41012
  const pickupLabels = ['Oh', 'when', 'the'];
40606
- pickup.forEach((note, i) => note.addModifier(factory.Annotation({ text: pickupLabels[i], vJustify: 'bottom' }).setTextBaseline(123)));
41013
+ pickup.forEach((note, i) => note.addModifier(word(pickupLabels[i], 16)));
41014
+ const pickupWidth = 210;
40607
41015
  factory
40608
- .System({ x: 10, y: 16, width: 180 })
41016
+ .System({ x: 10, y: 16, width: pickupWidth })
40609
41017
  .addStave({ voices: [score.voice(pickup, { time: '3/4' })] })
40610
41018
  .addClef('treble')
40611
41019
  .addTimeSignature('4/4');
41020
+ // The first row shares space between the pickup, two single-word bars and two busier bars.
41021
+ const openingWidths = [120, 212, 122, 212];
41022
+ let x = 10 + pickupWidth;
40612
41023
  let sustained;
40613
41024
  bars.forEach(([music, words, harmony], i) => {
40614
41025
  const row = Math.floor(i / 4);
40615
41026
  const column = i % 4;
40616
41027
  const y = 16 + row * 130;
40617
- const width = row === 0 ? 174 : 219;
41028
+ if (column === 0 && row > 0)
41029
+ x = 10;
41030
+ const width = row === 0 ? openingWidths[column] : 219;
40618
41031
  const notes = score.notes(music);
40619
41032
  // Carry the sustained D and the final tonic across the barline without repeating a syllable.
40620
41033
  if (i === 5 || i === 14)
@@ -40623,7 +41036,7 @@ function saints(options) {
40623
41036
  score.make.tie({ from: sustained, to: notes[0] });
40624
41037
  words.split('|').forEach((text, n) => {
40625
41038
  if (text)
40626
- notes[n].addModifier(factory.Annotation({ text, vJustify: 'bottom' }).setTextBaseline(y + 107));
41039
+ notes[n].addModifier(word(text, y));
40627
41040
  });
40628
41041
  // Split the chord into root and extension so Petaluma supplies proper accidental glyphs.
40629
41042
  if (harmony) {
@@ -40635,8 +41048,9 @@ function saints(options) {
40635
41048
  notes[0].addModifier(chord);
40636
41049
  }
40637
41050
  const stave = factory
40638
- .System({ x: (row === 0 ? 190 : 10) + column * width, y, width })
41051
+ .System({ x, y, width })
40639
41052
  .addStave({ voices: [score.voice(notes, { time: i === 15 ? '1/4' : '4/4' })] });
41053
+ x += width;
40640
41054
  if (column === 0 && row > 0)
40641
41055
  stave.addClef('treble');
40642
41056
  if (i === bars.length - 1)
@@ -41615,6 +42029,14 @@ function textFontDefaults(assert) {
41615
42029
  const previous = _src_metrics__WEBPACK_IMPORTED_MODULE_6__.MetricsDefaults.Annotation.fontFamily;
41616
42030
  try {
41617
42031
  _src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.setFonts('Bravura', 'Academico');
42032
+ const note = new _src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.TabNote({ positions: [{ str: 1, fret: 5 }], duration: 'q' });
42033
+ const ends = { firstNote: note, lastNote: note };
42034
+ assert.equal(new _src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.ChordSymbol().fontSizeInPoints, 14);
42035
+ assert.equal(_src_metrics__WEBPACK_IMPORTED_MODULE_6__.Metrics.getFontInfo('Annotation.lyric').size, 12);
42036
+ assert.equal(new _src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.TabTie(ends, 'H').fontInfo.family.split(',')[0], 'Arial');
42037
+ assert.equal(new _src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.StaveTie(ends, 'H').fontInfo.family.split(',')[0], 'Academico');
42038
+ assert.equal(new _src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.TabTie(ends, 'hold').fontInfo.family.split(',')[0], 'Academico');
42039
+ assert.equal(new _src_bend__WEBPACK_IMPORTED_MODULE_3__.Bend([{ type: _src_bend__WEBPACK_IMPORTED_MODULE_3__.Bend.UP, text: 'full' }]).fontInfo.family.split(',')[0], 'Academico');
41618
42040
  const annotation = new _src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.Annotation('Sing with gentle voices');
41619
42041
  const ctx = document.createElement('canvas').getContext('2d');
41620
42042
  ctx.font = _src_font__WEBPACK_IMPORTED_MODULE_5__.Font.toCSSString(annotation.fontInfo);
@@ -42872,14 +43294,14 @@ __webpack_require__.r(__webpack_exports__);
42872
43294
  /* harmony export */ });
42873
43295
  /* harmony import */ var _src_vexflow__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../src/vexflow */ "./src/vexflow.ts");
42874
43296
  /* harmony import */ var _vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./vexflow_test_helpers */ "./tests/vexflow_test_helpers.ts");
42875
- /* harmony import */ var _src__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../src */ "./src/index.ts");
42876
- /* harmony import */ var _src_accidental__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../src/accidental */ "./src/accidental.ts");
42877
- /* harmony import */ var _src_annotation__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../src/annotation */ "./src/annotation.ts");
42878
- /* harmony import */ var _src_articulation__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../src/articulation */ "./src/articulation.ts");
42879
- /* harmony import */ var _src_dot__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../src/dot */ "./src/dot.ts");
42880
- /* harmony import */ var _src_formatter__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../src/formatter */ "./src/formatter.ts");
42881
- /* harmony import */ var _src_gracenote__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../src/gracenote */ "./src/gracenote.ts");
42882
- /* harmony import */ var _src_gracenotegroup__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../src/gracenotegroup */ "./src/gracenotegroup.ts");
43297
+ /* harmony import */ var _src_accidental__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../src/accidental */ "./src/accidental.ts");
43298
+ /* harmony import */ var _src_annotation__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../src/annotation */ "./src/annotation.ts");
43299
+ /* harmony import */ var _src_articulation__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../src/articulation */ "./src/articulation.ts");
43300
+ /* harmony import */ var _src_dot__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../src/dot */ "./src/dot.ts");
43301
+ /* harmony import */ var _src_formatter__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../src/formatter */ "./src/formatter.ts");
43302
+ /* harmony import */ var _src_gracenote__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../src/gracenote */ "./src/gracenote.ts");
43303
+ /* harmony import */ var _src_gracenotegroup__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../src/gracenotegroup */ "./src/gracenotegroup.ts");
43304
+ /* harmony import */ var _src_modifier__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../src/modifier */ "./src/modifier.ts");
42883
43305
  /* harmony import */ var _src_stavenote__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../src/stavenote */ "./src/stavenote.ts");
42884
43306
  // Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
42885
43307
  // MIT License
@@ -42954,7 +43376,7 @@ function boundingBox(options) {
42954
43376
  options.assert.ok(bb.getY() > stave.getTopLineTopY() - 40, 'Group box is near the stave');
42955
43377
  // The box of the main note is no longer stretched to the origin by the group.
42956
43378
  options.assert.ok(note.getBoundingBox().getX() >= bb.getX() - 10, 'Main note box is not stretched to the origin');
42957
- options.assert.ok(new _src_gracenotegroup__WEBPACK_IMPORTED_MODULE_9__.GraceNoteGroup([]).getBoundingBox() !== undefined, 'Empty group has a box');
43379
+ options.assert.ok(new _src_gracenotegroup__WEBPACK_IMPORTED_MODULE_8__.GraceNoteGroup([]).getBoundingBox() !== undefined, 'Empty group has a box');
42958
43380
  }
42959
43381
  function basic(options) {
42960
43382
  const f = _vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_1__.VexFlowTests.makeFactory(options, 700, 130);
@@ -42981,7 +43403,7 @@ function basic(options) {
42981
43403
  ].map(f.GraceNote.bind(f));
42982
43404
  gracenotes[1].addModifier(f.Accidental({ type: '##' }), 0);
42983
43405
  gracenotes3[3].addModifier(f.Accidental({ type: 'bb' }), 0);
42984
- _src_dot__WEBPACK_IMPORTED_MODULE_6__.Dot.buildAndAttach([gracenotes4[0]], { all: true });
43406
+ _src_dot__WEBPACK_IMPORTED_MODULE_5__.Dot.buildAndAttach([gracenotes4[0]], { all: true });
42985
43407
  const notes = [
42986
43408
  f
42987
43409
  .StaveNote({ keys: ['b/4'], duration: '4', autoStem: true })
@@ -42998,10 +43420,10 @@ function basic(options) {
42998
43420
  .addModifier(f.GraceNoteGroup({ notes: gracenotes3 }).beamNotes(), 0),
42999
43421
  f
43000
43422
  .StaveNote({ keys: ['a/4'], duration: '4', autoStem: true })
43001
- .addModifier(f.GraceNoteGroup({ notes: gracenotes4 }).beamNotes().setPosition(_src__WEBPACK_IMPORTED_MODULE_2__.ModifierPosition.RIGHT), 0),
43423
+ .addModifier(f.GraceNoteGroup({ notes: gracenotes4 }).beamNotes().setPosition(_src_modifier__WEBPACK_IMPORTED_MODULE_9__.ModifierPosition.RIGHT), 0),
43002
43424
  ];
43003
43425
  const voice = f.Voice().setStrict(false).addTickables(notes);
43004
- new _src_formatter__WEBPACK_IMPORTED_MODULE_7__.Formatter().joinVoices([voice]).formatToStave([voice], stave);
43426
+ new _src_formatter__WEBPACK_IMPORTED_MODULE_6__.Formatter().joinVoices([voice]).formatToStave([voice], stave);
43005
43427
  f.draw();
43006
43428
  options.assert.ok(true, 'GraceNoteBasic');
43007
43429
  }
@@ -43016,31 +43438,31 @@ function graceNoteModifiers(options) {
43016
43438
  f
43017
43439
  .StaveNote({ keys: ['c/5'], duration: '4', autoStem: true })
43018
43440
  .addModifier(f.GraceNoteGroup({ notes: gracenotes }), 0)
43019
- .addModifier(new _src_articulation__WEBPACK_IMPORTED_MODULE_5__.Articulation('a-').setPosition(3), 0),
43441
+ .addModifier(new _src_articulation__WEBPACK_IMPORTED_MODULE_4__.Articulation('a-').setPosition(3), 0),
43020
43442
  f
43021
43443
  .StaveNote({ keys: ['c/5'], duration: '4', autoStem: true })
43022
43444
  .addModifier(f.GraceNoteGroup({ notes: gracenotes }), 0)
43023
- .addModifier(new _src_articulation__WEBPACK_IMPORTED_MODULE_5__.Articulation('a-').setPosition(3), 0)
43024
- .addModifier(new _src_accidental__WEBPACK_IMPORTED_MODULE_3__.Accidental('#')),
43445
+ .addModifier(new _src_articulation__WEBPACK_IMPORTED_MODULE_4__.Articulation('a-').setPosition(3), 0)
43446
+ .addModifier(new _src_accidental__WEBPACK_IMPORTED_MODULE_2__.Accidental('#')),
43025
43447
  f
43026
43448
  .StaveNote({ keys: ['c/5'], duration: '4', autoStem: true })
43027
43449
  .addModifier(f.GraceNoteGroup({ notes: gracenotes }), 0)
43028
- .addModifier(new _src_articulation__WEBPACK_IMPORTED_MODULE_5__.Articulation('a-').setPosition(3), 0)
43029
- .addModifier(new _src_annotation__WEBPACK_IMPORTED_MODULE_4__.Annotation('words')),
43450
+ .addModifier(new _src_articulation__WEBPACK_IMPORTED_MODULE_4__.Articulation('a-').setPosition(3), 0)
43451
+ .addModifier(new _src_annotation__WEBPACK_IMPORTED_MODULE_3__.Annotation('words')),
43030
43452
  f
43031
43453
  .StaveNote({ keys: ['c/5'], duration: '4', autoStem: true })
43032
43454
  .addModifier(f.GraceNoteGroup({ notes: gracenotes }), 0)
43033
- .addModifier(new _src_articulation__WEBPACK_IMPORTED_MODULE_5__.Articulation('a-').setPosition(3), 0)
43034
- .addModifier(new _src_articulation__WEBPACK_IMPORTED_MODULE_5__.Articulation('a>').setPosition(3), 0),
43455
+ .addModifier(new _src_articulation__WEBPACK_IMPORTED_MODULE_4__.Articulation('a-').setPosition(3), 0)
43456
+ .addModifier(new _src_articulation__WEBPACK_IMPORTED_MODULE_4__.Articulation('a>').setPosition(3), 0),
43035
43457
  f
43036
43458
  .StaveNote({ keys: ['c/5'], duration: '4', autoStem: true })
43037
43459
  .addModifier(f.GraceNoteGroup({ notes: gracenotes }), 0)
43038
- .addModifier(new _src_articulation__WEBPACK_IMPORTED_MODULE_5__.Articulation('a-').setPosition(3), 0)
43039
- .addModifier(new _src_articulation__WEBPACK_IMPORTED_MODULE_5__.Articulation('a>').setPosition(3), 0)
43040
- .addModifier(new _src_articulation__WEBPACK_IMPORTED_MODULE_5__.Articulation('a@a').setPosition(3), 0),
43460
+ .addModifier(new _src_articulation__WEBPACK_IMPORTED_MODULE_4__.Articulation('a-').setPosition(3), 0)
43461
+ .addModifier(new _src_articulation__WEBPACK_IMPORTED_MODULE_4__.Articulation('a>').setPosition(3), 0)
43462
+ .addModifier(new _src_articulation__WEBPACK_IMPORTED_MODULE_4__.Articulation('a@a').setPosition(3), 0),
43041
43463
  ];
43042
43464
  const voice = f.Voice().setStrict(false).addTickables(notes);
43043
- new _src_formatter__WEBPACK_IMPORTED_MODULE_7__.Formatter().joinVoices([voice]).formatToStave([voice], stave);
43465
+ new _src_formatter__WEBPACK_IMPORTED_MODULE_6__.Formatter().joinVoices([voice]).formatToStave([voice], stave);
43044
43466
  f.draw();
43045
43467
  options.assert.ok(true, 'GraceNoteModifiers');
43046
43468
  }
@@ -43070,7 +43492,7 @@ function basicSlurred(options) {
43070
43492
  gracenotes0[1].addModifier(f.Accidental({ type: '#' }), 0);
43071
43493
  gracenotes3[3].addModifier(f.Accidental({ type: 'b' }), 0);
43072
43494
  gracenotes3[2].addModifier(f.Accidental({ type: 'n' }), 0);
43073
- _src_dot__WEBPACK_IMPORTED_MODULE_6__.Dot.buildAndAttach([gracenotes4[0]], { all: true });
43495
+ _src_dot__WEBPACK_IMPORTED_MODULE_5__.Dot.buildAndAttach([gracenotes4[0]], { all: true });
43074
43496
  const notes = [
43075
43497
  f
43076
43498
  .StaveNote({ keys: ['b/4'], duration: '4', autoStem: true })
@@ -43091,7 +43513,7 @@ function basicSlurred(options) {
43091
43513
  f.StaveNote({ keys: ['a/4'], duration: '4', autoStem: true }),
43092
43514
  ];
43093
43515
  const voice = f.Voice().setStrict(false).addTickables(notes);
43094
- new _src_formatter__WEBPACK_IMPORTED_MODULE_7__.Formatter().joinVoices([voice]).formatToStave([voice], stave);
43516
+ new _src_formatter__WEBPACK_IMPORTED_MODULE_6__.Formatter().joinVoices([voice]).formatToStave([voice], stave);
43095
43517
  f.draw();
43096
43518
  options.assert.ok(true, 'GraceNoteBasic');
43097
43519
  }
@@ -43343,16 +43765,16 @@ function boundsBeforeDrawing(assert) {
43343
43765
  const ctx = new _src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.SVGContext(document.createElement('div'));
43344
43766
  const stave = new _src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.Stave(80, 75, 550).setContext(ctx);
43345
43767
  const grace = [
43346
- new _src_gracenote__WEBPACK_IMPORTED_MODULE_8__.GraceNote({ keys: ['d/4', 'e/4'], duration: '8', stemDirection: beamed ? -1 : 1 }),
43347
- new _src_gracenote__WEBPACK_IMPORTED_MODULE_8__.GraceNote({ keys: ['g/4'], duration: '8', stemDirection: beamed ? -1 : 1 }),
43768
+ new _src_gracenote__WEBPACK_IMPORTED_MODULE_7__.GraceNote({ keys: ['d/4', 'e/4'], duration: '8', stemDirection: beamed ? -1 : 1 }),
43769
+ new _src_gracenote__WEBPACK_IMPORTED_MODULE_7__.GraceNote({ keys: ['g/4'], duration: '8', stemDirection: beamed ? -1 : 1 }),
43348
43770
  ];
43349
- const group = new _src_gracenotegroup__WEBPACK_IMPORTED_MODULE_9__.GraceNoteGroup(grace);
43771
+ const group = new _src_gracenotegroup__WEBPACK_IMPORTED_MODULE_8__.GraceNoteGroup(grace);
43350
43772
  if (beamed)
43351
43773
  group.beamNotes();
43352
43774
  const parent = new _src_stavenote__WEBPACK_IMPORTED_MODULE_10__.StaveNote({ keys: ['c/5'], duration: 'q' }).setStave(stave).addModifier(group, 0);
43353
43775
  const dynamics = new _src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.TextDynamics({ text: 'sfz', duration: 'q', line: 8 }).setStave(stave);
43354
43776
  const voice = new _src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.Voice('2/4').addTickables([parent, dynamics]);
43355
- new _src_formatter__WEBPACK_IMPORTED_MODULE_7__.Formatter().joinVoices([voice]).formatToStave([voice], stave);
43777
+ new _src_formatter__WEBPACK_IMPORTED_MODULE_6__.Formatter().joinVoices([voice]).formatToStave([voice], stave);
43356
43778
  const before = group.getBoundingBox(), dynamicsBefore = dynamics.getBoundingBox();
43357
43779
  assert.deepEqual(group.getBoundingBox(), before);
43358
43780
  assert.notOk(grace.some((note) => note.isRendered()));
@@ -43388,9 +43810,10 @@ __webpack_require__.r(__webpack_exports__);
43388
43810
  /* harmony import */ var _src_gracenotegroup__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../src/gracenotegroup */ "./src/gracenotegroup.ts");
43389
43811
  /* harmony import */ var _src_gracetabnote__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../src/gracetabnote */ "./src/gracetabnote.ts");
43390
43812
  /* harmony import */ var _src_metrics__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../src/metrics */ "./src/metrics.ts");
43391
- /* harmony import */ var _src_tabnote__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../src/tabnote */ "./src/tabnote.ts");
43392
- /* harmony import */ var _src_tabstave__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../src/tabstave */ "./src/tabstave.ts");
43393
- /* harmony import */ var _src_voice__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../src/voice */ "./src/voice.ts");
43813
+ /* harmony import */ var _src_modifier__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../src/modifier */ "./src/modifier.ts");
43814
+ /* harmony import */ var _src_tabnote__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../src/tabnote */ "./src/tabnote.ts");
43815
+ /* harmony import */ var _src_tabstave__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../src/tabstave */ "./src/tabstave.ts");
43816
+ /* harmony import */ var _src_voice__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../src/voice */ "./src/voice.ts");
43394
43817
  // Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
43395
43818
  // MIT License
43396
43819
  //
@@ -43405,6 +43828,7 @@ __webpack_require__.r(__webpack_exports__);
43405
43828
 
43406
43829
 
43407
43830
 
43831
+
43408
43832
  const GraceTabNoteTests = {
43409
43833
  Start() {
43410
43834
  QUnit.module('Grace Tab Notes');
@@ -43412,21 +43836,36 @@ const GraceTabNoteTests = {
43412
43836
  // TODO: Rename tests below since it is redundant with the module name.
43413
43837
  // Remove "Grace Tab Note "
43414
43838
  const run = _vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_1__.VexFlowTests.runTests;
43839
+ run('Grace frets beside a two-digit host', graceClearance, undefined, ['Bravura']);
43415
43840
  run('Grace Tab Note Simple', simple);
43416
43841
  run('Grace Tab Note Slurred', slurred);
43417
43842
  },
43418
43843
  };
43419
43844
  // Helper functions to create TabNote and GraceTabNote objects.
43420
- const tabNote = (noteStruct) => new _src_tabnote__WEBPACK_IMPORTED_MODULE_7__.TabNote(noteStruct);
43845
+ const tabNote = (noteStruct) => new _src_tabnote__WEBPACK_IMPORTED_MODULE_8__.TabNote(noteStruct);
43421
43846
  const graceTabNote = (noteStruct) => new _src_gracetabnote__WEBPACK_IMPORTED_MODULE_5__.GraceTabNote(noteStruct);
43422
43847
  /**
43423
43848
  * Helper function to build a RenderContext and TabStave.
43424
43849
  */
43425
43850
  function setupContext(opts, ctxBuilder) {
43426
43851
  const context = ctxBuilder(opts.elementId, 350, 140);
43427
- const stave = new _src_tabstave__WEBPACK_IMPORTED_MODULE_8__.TabStave(10, 10, 350).addTabGlyph().setContext(context).drawWithStyle();
43852
+ const stave = new _src_tabstave__WEBPACK_IMPORTED_MODULE_9__.TabStave(10, 10, 350).addTabGlyph().setContext(context).drawWithStyle();
43428
43853
  return { context, stave };
43429
43854
  }
43855
+ /** Both sides of a wide host must leave visible space around the smaller fret. */
43856
+ function graceClearance(options, contextBuilder) {
43857
+ const { context, stave } = setupContext(options, contextBuilder);
43858
+ const positions = [{ str: 2, fret: 12 }];
43859
+ const host = new _src_tabnote__WEBPACK_IMPORTED_MODULE_8__.TabNote({ positions, duration: 'w' });
43860
+ const before = new _src_gracetabnote__WEBPACK_IMPORTED_MODULE_5__.GraceTabNote({ positions: [{ str: 2, fret: 2 }], duration: '8' });
43861
+ const after = new _src_gracetabnote__WEBPACK_IMPORTED_MODULE_5__.GraceTabNote({ positions, duration: '8' });
43862
+ host.addModifier(new _src_gracenotegroup__WEBPACK_IMPORTED_MODULE_4__.GraceNoteGroup([before]));
43863
+ host.addModifier(new _src_gracenotegroup__WEBPACK_IMPORTED_MODULE_4__.GraceNoteGroup([after]).setPosition(_src_modifier__WEBPACK_IMPORTED_MODULE_7__.ModifierPosition.RIGHT));
43864
+ _src_formatter__WEBPACK_IMPORTED_MODULE_3__.Formatter.FormatAndDraw(context, stave, [host]);
43865
+ const hostHalfWidth = _src_tabnote__WEBPACK_IMPORTED_MODULE_8__.TabNote.tabToElement('12').getWidth() / 2;
43866
+ options.assert.ok(before.getAbsoluteX() + before.getWidth() / 2 + 2 <= host.getAbsoluteX() - hostHalfWidth);
43867
+ options.assert.ok(after.getAbsoluteX() - after.getWidth() / 2 - 2 >= host.getAbsoluteX() + hostHalfWidth);
43868
+ }
43430
43869
  function simple(options, contextBuilder) {
43431
43870
  const { context, stave } = setupContext(options, contextBuilder);
43432
43871
  const note0 = tabNote({ positions: [{ str: 4, fret: 6 }], duration: '4' });
@@ -43452,7 +43891,7 @@ function simple(options, contextBuilder) {
43452
43891
  note1.addModifier(new _src_gracenotegroup__WEBPACK_IMPORTED_MODULE_4__.GraceNoteGroup(gracenotes1), 0);
43453
43892
  note2.addModifier(new _src_gracenotegroup__WEBPACK_IMPORTED_MODULE_4__.GraceNoteGroup(gracenotes2), 0);
43454
43893
  note3.addModifier(new _src_gracenotegroup__WEBPACK_IMPORTED_MODULE_4__.GraceNoteGroup(gracenotes3), 0);
43455
- const voice = new _src_voice__WEBPACK_IMPORTED_MODULE_9__.Voice(_src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.TIME4_4);
43894
+ const voice = new _src_voice__WEBPACK_IMPORTED_MODULE_10__.Voice(_src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.TIME4_4);
43456
43895
  voice.addTickables([note0, note1, note2, note3]);
43457
43896
  new _src_formatter__WEBPACK_IMPORTED_MODULE_3__.Formatter().joinVoices([voice]).format([voice], 250);
43458
43897
  voice.draw(context, stave);
@@ -43475,7 +43914,7 @@ function slurred(options, contextBuilder) {
43475
43914
  const gracenotes1 = gracenoteGroup1.map(graceTabNote);
43476
43915
  note0.addModifier(new _src_gracenotegroup__WEBPACK_IMPORTED_MODULE_4__.GraceNoteGroup(gracenotes0, true), 0);
43477
43916
  note1.addModifier(new _src_gracenotegroup__WEBPACK_IMPORTED_MODULE_4__.GraceNoteGroup(gracenotes1, true), 0);
43478
- const voice = new _src_voice__WEBPACK_IMPORTED_MODULE_9__.Voice(_src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.TIME4_4);
43917
+ const voice = new _src_voice__WEBPACK_IMPORTED_MODULE_10__.Voice(_src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.TIME4_4);
43479
43918
  voice.addTickables([note0, note1]);
43480
43919
  new _src_formatter__WEBPACK_IMPORTED_MODULE_3__.Formatter().joinVoices([voice]).format([voice], 200);
43481
43920
  voice.draw(context, stave);
@@ -43508,13 +43947,14 @@ function fretSizing(assert) {
43508
43947
  }
43509
43948
  }
43510
43949
  note.setFontSize(7).setGhost(true);
43511
- assert.equal(_src_font__WEBPACK_IMPORTED_MODULE_2__.Font.convertSizeToPointValue(note.getFrets()[0].fontInfo.size), 7);
43950
+ assert.equal(note.getFrets()[0].fontSizeInPoints, 7);
43512
43951
  note.setGhost(false).setFontSize();
43513
- assert.equal(_src_font__WEBPACK_IMPORTED_MODULE_2__.Font.convertSizeToPointValue(note.getFrets()[0].fontInfo.size), 6);
43952
+ const normalSize = _src_font__WEBPACK_IMPORTED_MODULE_2__.Font.convertSizeToPointValue(_src_metrics__WEBPACK_IMPORTED_MODULE_6__.Metrics.getFontInfo('TabNote.text').size);
43953
+ assert.ok(Math.abs(note.getFrets()[0].fontSizeInPoints - normalSize * scale) < 0.001);
43514
43954
  _src_metrics__WEBPACK_IMPORTED_MODULE_6__.MetricsDefaults.GraceTabNote.fontScale = 1 / 3;
43515
43955
  _src_metrics__WEBPACK_IMPORTED_MODULE_6__.Metrics.clear('GraceTabNote');
43516
43956
  const small = new InspectableGraceTabNote({ positions: [{ str: 2, fret: 12 }], duration: '8' });
43517
- assert.equal(_src_font__WEBPACK_IMPORTED_MODULE_2__.Font.convertSizeToPointValue(small.getFrets()[0].fontInfo.size), 3);
43957
+ assert.ok(Math.abs(small.getFrets()[0].fontSizeInPoints - normalSize / 3) < 0.001);
43518
43958
  }
43519
43959
  finally {
43520
43960
  _src_metrics__WEBPACK_IMPORTED_MODULE_6__.MetricsDefaults.GraceTabNote.fontScale = scale;
@@ -47316,6 +47756,876 @@ _vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_0__.VexFlowTests.register(RhythmT
47316
47756
 
47317
47757
 
47318
47758
 
47759
+ /***/ },
47760
+
47761
+ /***/ "./tests/scores/ballade.js"
47762
+ /*!*********************************!*\
47763
+ !*** ./tests/scores/ballade.js ***!
47764
+ \*********************************/
47765
+ () {
47766
+
47767
+
47768
+ // Frédéric Chopin, Ballade No. 3, Op. 47. A reading of the supplied opening page.
47769
+ // Pitch and rhythm cross-check: Fryderyk Chopin Institute, first-edition encoding 047-1-BH.krn.
47770
+ // Each pair is one 6/8 measure, right hand then left. Arrays hold independently stemmed voices.
47771
+ var ChopinBallade = (() => {
47772
+ const bars = [
47773
+ // First system. The F and D in the two hands lead into the first crescendo.
47774
+ ['Eb4/q, F4/8, (Eb4 G4)/8, (Eb4 Ab4)/8, (Eb4 Bb4)/8', 'D3/q/r, D4/8, Db4/8, C4/8, G3/8'],
47775
+ ['(Eb4 C5)/q, (F4 Ab4 F5)/8, (Eb4 Ab4 Eb5)/q.', 'Ab3/q, (Eb3 B3 D4)/8, (Eb3 C4)/q.'],
47776
+ [['Eb5/h.', '(Eb4 G4)/q., (Eb4 G4 Db5)/q.'], 'Db4/8, C4/8, Bb3/8, Bb3/8, A3/8, Bb3/8'],
47777
+ ['(Eb4 Ab4 C5 Eb5)/h.', 'C4/8, Ab3/8., Eb3/16, Eb3/q.'],
47778
+ [['Eb4/h.', 'G3/q, Ab3/8, Bb3/8, C4/8, G3/8', 'Db4/q., B4/q/r.[quiet="yes"]'], 'Eb2/q, F2/8, G2/8, Ab2/8, Bb2/8'],
47779
+ ['(Ab3 Eb4)/q, (Ab3 B3 D4)/8, (Ab3 C4 Eb4)/q.', 'C3/q, F3/8, Eb3/q.'],
47780
+ // Second system. Small inline clefs keep the high left-hand chords on the lower staff.
47781
+ ['(Ab3 C4 Eb4)/8, (C4 Eb4 Ab4)/8, (Db4 Eb4 Bb4)/8, (Eb4 Ab4 C5)/q, (Db4 Eb4 Bb4)/8', 'Eb3/q., Eb3/q, Eb2/8'],
47782
+ ['(Eb4 Ab4 C5)/q, (C4 Eb4 Ab4)/8, (C4 Eb4 Ab4)/q, B4/8/r', 'Ab2/q, Eb3/8, Ab3/q, D3/8/r'],
47783
+ ['(Ab5 Ab6)/q., B4/q/r, B4/8/r', '(Ab1 Ab2)/8, D3/8/r ;treble; (Gb4 Ab4 Eb5)/8, (F4 Ab4 D5)/q, B4/8/r'],
47784
+ ['(Ab4 Ab5)/q., B4/8/r., (C4 C5)/16, (F4 F5)/8', '(Ab1 Ab2)/8, D3/8/r, (Fb3 Ab3 Db4)/8, (Eb3 Ab3 C4)/q, D3/8/r'],
47785
+ [
47786
+ 'B4/8/r., (Eb4 Eb5)/16, (Eb4 Eb5)/8, B4/8/r., (Eb4 Eb5)/16, (Eb4 Eb5)/8',
47787
+ '(Eb1 Eb2)/8, D3/8/r, (Eb3 C4)/8, (D3 F3 B3)/q, D3/8/r',
47788
+ ],
47789
+ [
47790
+ 'B4/8/r., (Eb4 Eb5)/16, (Eb4 Eb5)/8, B4/8/r., (Eb4 Eb5)/16, (Eb4 Eb5)/8',
47791
+ 'Eb2/8, D3/8/r, (D3 F3 B3)/8, (Db3 G3 Bb3)/q, D3/8/r',
47792
+ ],
47793
+ // Third system. Bar 14 compresses the chromatic octave flourish into the second dotted beat.
47794
+ [
47795
+ '(Ab5 Ab6)/q., B4/q/r, B4/8/r',
47796
+ '(Ab1 Ab2)/8, D3/16/r ;treble; (Gb4 Ab4 Eb5)/16, (Gb4 Ab4 Eb5)/8, (F4 Ab4 D5)/q, B4/8/r',
47797
+ ],
47798
+ [
47799
+ '(Ab4 Ab5)/q., B4/16/r, (C4 C5)/16, (Db4 Db5)/16, (D4 D5)/16, (Eb4 Eb5)/16, (E4 E5)/16, (G4 G5)/16, B4/32/r, (F4 F5)/32',
47800
+ '(Ab1 Ab2)/8, D3/16/r, (Fb3 Ab3 Db4)/16, (Fb3 Ab3 Db4)/8, (Eb3 Ab3 C4)/8, D3/q/r',
47801
+ ],
47802
+ [
47803
+ '(F4 F5)/8., (Eb4 Eb5)/16, (Eb4 Eb5)/8, B4/8/r., (Eb4 Eb5)/16, (Eb4 Eb5)/8',
47804
+ '(Eb1 Eb2)/8, D3/8/r, (Eb3 C4)/8, (D3 F3 B3)/q, D3/8/r',
47805
+ ],
47806
+ [
47807
+ '(Eb4 Eb5)/8., (Eb4 Eb5)/16, (Eb4 Eb5)/8, B4/8/r., (Eb4 Eb5)/16, (Eb4 Eb5)/8',
47808
+ 'Eb2/8, D3/8/r, (D3 F3 B3)/8, (Db3 G3 Bb3)/q, D3/8/r',
47809
+ ],
47810
+ // Fourth system. Keep the long upper notes sounding over the repeated chords in bars 19–20.
47811
+ [
47812
+ '(Eb4 Eb5)/8., Ab4/16, (F4 F5)/8, (F4 F5)/8., (Eb4 Eb5)/16, (D4 D5)/8',
47813
+ '(Ab1 Ab2)/8, D3/8/r, (C3 Gb3 Ab3)/8, (B2 F3 Ab3)/q.',
47814
+ ],
47815
+ [
47816
+ 'B4/8/r., Db5/16, (Db4 G4 Db5)/8, B4/8/r., (C4 Ab4 C5)/16, (Db4 Ab4 Db5)/8',
47817
+ '(Ab1 Ab2)/8, D3/8/r, (Ab2 Eb3 Bb3)/8, (Ab2 Eb3 Ab3)/q.',
47818
+ ],
47819
+ [
47820
+ ['(Ab4 C5)/8., Bb4/16, Bb4/8, Bb4/q.', 'C4/8, E4/8/r, (Bb3 D4 Ab4)/8, E4/8/r., (Bb3 D4 Ab4)/16, (Bb3 D4 Ab4)/8'],
47821
+ '(F1 F2)/8, D3/8/r, (G2 G3)/8, (F2 F3)/q, D3/8/r',
47822
+ ],
47823
+ [
47824
+ [
47825
+ 'Bb4/q., B4/q/r.[quiet="yes"]',
47826
+ 'E4/8/r., (Bb3 Db4 G4)/16, (Bb3 Db4 G4)/8, E4/8/r., (G3 Db4 Eb4)/16, (G3 Db4 Eb4)/8',
47827
+ ],
47828
+ '(Eb1 Eb2)/8, D3/8/r, (F2 F3)/8, (Eb2 Eb3)/q, D3/8/r',
47829
+ ],
47830
+ // Fifth system. The same figure returns an octave higher, with a little grace chord in bar 22.
47831
+ [
47832
+ '(Ab3 C4 Ab4)/8, B4/16/r, (Eb5 Ab5 Eb6)/16, (Eb5 Ab5 Eb6)/8, (Eb5 Ab5 Eb6)/8., (D5 D6)/16, (Ab5 Ab6)/8',
47833
+ '(Ab1 Ab2)/8, D3/16/r, (Gb3 Ab3 Gb4)/16, (Gb3 Ab3 Gb4)/8, (F3 Ab3 F4)/q, D3/8/r',
47834
+ ],
47835
+ [
47836
+ 'B4/8/r., (Db5 Ab5 Db6)/16, (Db5 Ab5 Db6)/8, (Db5 Ab5 Db6)/8., (C5 C6)/16, (Db5 Ab5 Db6)/8',
47837
+ '(Ab1 Ab2)/8, D3/16/r, (Fb3 Ab3 Fb4)/16, (Fb3 Ab3 Fb4)/8, (Eb3 Ab3 Eb4)/q, D3/8/r',
47838
+ ],
47839
+ [
47840
+ [
47841
+ 'B4/q/r[quiet="yes"], Bb5/8, Bb5/q.',
47842
+ '(C5 Ab5 C6)/8., (Bb4 D5 Ab5 Bb5)/16, (Bb4 D5 Ab5)/8, E5/8/r., (Bb4 D5 Ab5)/16, (Bb4 D5 Ab5)/8',
47843
+ ],
47844
+ '(F1 F2)/8, D3/16/r, (G3 G4)/16, (G3 G4)/8, (F3 F4)/q, D3/8/r',
47845
+ ],
47846
+ [
47847
+ [
47848
+ 'Bb5/q., B4/q/r.[quiet="yes"]',
47849
+ 'E5/8/r., (Bb4 Db5 G5)/16, (Bb4 Db5 G5)/8, E5/8/r., (G4 Db5 Eb5)/16, (G4 Db5 Eb5)/8',
47850
+ ],
47851
+ '(Eb1 Eb2)/8, D3/16/r, (F3 F4)/16, (F3 F4)/8, (Eb3 Eb4)/q, D3/8/r',
47852
+ ],
47853
+ ];
47854
+ // Barline positions follow the five systems of the scan. Only the first system is indented.
47855
+ // Coordinates use the reference page at 888 units wide; the staves are drawn at normal VexFlow size.
47856
+ const rows = [
47857
+ { first: 1, top: 164, bass: 242, edges: [102, 288, 380, 506, 600, 721, 828] },
47858
+ { first: 7, top: 358, bass: 428, edges: [55, 242, 340, 480, 589, 707, 830] },
47859
+ { first: 13, top: 545, bass: 614, edges: [55, 285, 546, 690, 832] },
47860
+ { first: 17, top: 732, bass: 811, edges: [55, 302, 467, 645, 833] },
47861
+ { first: 21, top: 942, bass: 1010, edges: [55, 311, 504, 658, 837] },
47862
+ ];
47863
+ const scale = 1.5;
47864
+ const width = 1332;
47865
+ const height = (width * 11) / 8.5;
47866
+ /** Make each voice in order; inline clefs take no time. The source does not number its octave flourish. */
47867
+ function makeVoice(VF, factory, score, music, clef, stem, flourish) {
47868
+ const [first, treble] = music.split(' ;treble; ');
47869
+ const notes = score.notes(first, { clef, stem });
47870
+ const items = [...notes];
47871
+ if (treble) {
47872
+ const high = score.notes(treble, { clef: 'treble', stem });
47873
+ items.push(factory.ClefNote({ type: 'treble', options: { size: 'small' } }), ...high);
47874
+ notes.push(...high);
47875
+ }
47876
+ // The low bass octaves have a short downward stem, leaving room for the pedal glyph below.
47877
+ if (clef === 'bass' && (first.startsWith('(') || first.startsWith('Eb2/8,')))
47878
+ notes[0].setStemLength(16).setStemDirection(-1);
47879
+ if (flourish) {
47880
+ notes[0].setStemDirection(-1);
47881
+ const run = notes.slice(2);
47882
+ new VF.Tuplet(run, { numNotes: 7, notesOccupied: 5 });
47883
+ score.beam(run, { autoStem: false });
47884
+ }
47885
+ else {
47886
+ score.autoBeam(notes, { groups: [new VF.Fraction(3, 8)] });
47887
+ }
47888
+ return { notes, voice: score.voice(items, { time: '6/8' }) };
47889
+ }
47890
+ /** Engrave both hands on a common rhythmic grid. Spelling is reset at each barline. */
47891
+ function measure(VF, factory, score, row, offset) {
47892
+ const bar = row.first + offset;
47893
+ const system = factory.System({
47894
+ x: row.edges[offset] * scale,
47895
+ y: row.top * scale - 40,
47896
+ width: (row.edges[offset + 1] - row.edges[offset]) * scale,
47897
+ spaceBetweenStaves: ((row.bass - row.top) * scale) / 10,
47898
+ });
47899
+ const hands = bars[bar - 1].map((music, hand) => {
47900
+ const clef = hand ? 'bass' : 'treble';
47901
+ const parts = Array.isArray(music) ? music : [music];
47902
+ const voices = parts.map((part, i) => makeVoice(VF, factory, score, part, clef, parts.length > 1
47903
+ ? i
47904
+ ? 'down'
47905
+ : 'up'
47906
+ : (hand && bar >= 9 && bar <= 20) || (!hand && bar === 14)
47907
+ ? 'up'
47908
+ : 'auto', bar === 14 && !hand));
47909
+ const stave = system.addStave({ voices: voices.map((v) => v.voice) });
47910
+ if (!offset) {
47911
+ stave.addClef(clef).addKeySignature('Ab');
47912
+ if (bar === 1)
47913
+ stave.addTimeSignature('6/8');
47914
+ }
47915
+ if (hand && (bar === 9 || bar === 13))
47916
+ stave.addEndClef('bass', 'small');
47917
+ VF.Accidental.applyAccidentals(voices.map((v) => v.voice), 'Ab');
47918
+ return { stave, voices };
47919
+ });
47920
+ if (!offset)
47921
+ system.addConnector('brace');
47922
+ system.addConnector('singleRight');
47923
+ return hands;
47924
+ }
47925
+ /** Phrase endpoints are written as [bar, note, optional voice], all notes counted from zero. */
47926
+ function decorate(VF, factory, measures) {
47927
+ const note = (hand, [bar, index, voice = 0]) => measures[bar - 1][hand].voices[voice].notes[index];
47928
+ const right = (bar, i, v) => note(0, [bar, i, v]);
47929
+ const left = (bar, i) => note(1, [bar, i]);
47930
+ function slur(hand, start, end, side, rise, clearance = 5) {
47931
+ factory.Curve({
47932
+ from: note(hand, start),
47933
+ to: note(hand, end),
47934
+ options: {
47935
+ openingDirection: side === 'above' ? 'down' : 'up',
47936
+ position: 'auto',
47937
+ positionEnd: 'auto',
47938
+ // Widen short two-note slurs to reach over the stems of a beamed octave pair.
47939
+ xShift: rise <= 6 ? -6 : 0,
47940
+ yShift: clearance,
47941
+ cps: [
47942
+ { x: 0, y: rise },
47943
+ { x: 0, y: rise },
47944
+ ],
47945
+ },
47946
+ });
47947
+ }
47948
+ function tie(from, to, heads, endHeads = heads, direction = 1) {
47949
+ factory.StaveTie({ from, to, firstIndexes: heads, lastIndexes: endHeads, options: { direction } });
47950
+ }
47951
+ // Where a phrase turns the line, use partial ties at the two actual system edges.
47952
+ const chordTie = (bar, a, b, heads) => {
47953
+ const last = right(bar, a), next = right(bar + 1, b);
47954
+ if (rows.some((row) => row.first === bar + 1)) {
47955
+ tie(last, null, heads);
47956
+ tie(null, next, heads);
47957
+ }
47958
+ else
47959
+ tie(last, next, heads);
47960
+ };
47961
+ slur(0, [1, 0], [2, 2], 'above', 20);
47962
+ slur(1, [1, 0], [2, 2], 'below', 24);
47963
+ tie(right(2, 2), right(3, 0), [2], [0], -1);
47964
+ tie(right(3, 0), right(4, 0), [0], [3], -1);
47965
+ slur(1, [3, 0], [4, 3], 'above', 18);
47966
+ slur(0, [5, 0], [6, 2], 'above', 15);
47967
+ tie(right(5, 0), right(6, 0), [0], [1], -1);
47968
+ slur(1, [5, 0], [6, 2], 'below', 18);
47969
+ chordTie(6, 2, 0, [0, 1, 2]);
47970
+ tie(left(6, 2), null, [0], [0], -1);
47971
+ tie(null, left(7, 0), [0], [0], -1);
47972
+ tie(left(7, 0), left(7, 1), [0], [0], -1);
47973
+ slur(0, [7, 0], [8, 2], 'above', 19);
47974
+ slur(1, [7, 2], [8, 2], 'above', 25);
47975
+ for (let bar = 9; bar <= 24; bar++) {
47976
+ if (bar <= 16)
47977
+ slur(1, [bar, 2], [bar, bar === 13 || bar === 14 ? 4 : 3], 'above', 6);
47978
+ else if (bar <= 20)
47979
+ slur(1, [bar, 2], [bar, 3], 'below', 8);
47980
+ else
47981
+ slur(1, [bar, 3], [bar, 4], 'above', 7);
47982
+ left(bar, 0).addModifier(factory.Articulation({ type: 'a.', position: 'above' }));
47983
+ }
47984
+ for (const bar of [9, 10, 13, 14])
47985
+ right(bar, 0).addModifier(factory.Articulation({ type: 'a^', position: 'above' }));
47986
+ left(2, 2).addModifier(factory.Stroke(VF.Stroke.Type.ARPEGGIO_DIRECTIONLESS, { allVoices: false }));
47987
+ for (const [bar, index, voice] of [
47988
+ [6, 2, 0],
47989
+ [15, 0, 0],
47990
+ [19, 2, 1],
47991
+ ]) {
47992
+ right(bar, index, voice).addModifier(factory.Stroke(VF.Stroke.Type.ARPEGGIO_DIRECTIONLESS, { allVoices: false }));
47993
+ }
47994
+ slur(0, [10, 0], [10, 3], 'above', 15);
47995
+ slur(0, [11, 1], [12, 5], 'above', 22);
47996
+ slur(0, [14, 0], [14, 9], 'above', 17);
47997
+ slur(0, [15, 0], [16, 5], 'above', 12, 1);
47998
+ slur(0, [17, 2], [18, 4], 'above', 34);
47999
+ slur(0, [19, 0], [20, 5, 1], 'above', 22, 18);
48000
+ slur(0, [21, 3], [21, 6], 'above', 16);
48001
+ slur(0, [22, 2], [22, 5], 'above', 15);
48002
+ slur(0, [23, 0, 1], [24, 5, 1], 'above', 40, 17);
48003
+ for (const [bar, last] of [
48004
+ [15, 5],
48005
+ [16, 5],
48006
+ ])
48007
+ chordTie(bar, last, 0, [0, 1]);
48008
+ // Short paired articulations inside the longer octave phrases.
48009
+ for (const [bar, a, b] of [
48010
+ [10, 2, 3],
48011
+ [11, 1, 2],
48012
+ [11, 4, 5],
48013
+ [12, 1, 2],
48014
+ [12, 4, 5],
48015
+ [18, 1, 2],
48016
+ [21, 5, 6],
48017
+ ]) {
48018
+ slur(0, [bar, a], [bar, b], 'above', 5);
48019
+ }
48020
+ chordTie(14, 9, 0, [0, 1]);
48021
+ tie(right(17, 2), right(17, 3), [0, 1]);
48022
+ tie(right(19, 2), right(19, 3), [0], [0], -1);
48023
+ tie(right(21, 3), right(21, 4), [0, 1, 2]);
48024
+ tie(right(22, 2), right(22, 3), [0, 1, 2]);
48025
+ tie(right(23, 1), right(23, 2), [0], [0], -1);
48026
+ const grace = (host, keys, clef) => host.addModifier(factory.GraceNoteGroup({
48027
+ notes: [factory.GraceNote({ keys, clef, duration: '8', slash: true })],
48028
+ slur: true,
48029
+ }));
48030
+ grace(left(3, 3), ['c/4'], 'bass');
48031
+ grace(right(22, 5), ['eb/5', 'ab/5', 'eb/6'], 'treble');
48032
+ fingerings(factory, right, left);
48033
+ hairpins(VF, factory, right, left);
48034
+ }
48035
+ /** Fingerings apply to specific chord heads. Keep the alternating fingers of each octave pair together. */
48036
+ function fingerings(factory, right, left) {
48037
+ function mark(note, number, position, head = 0) {
48038
+ note.addModifier(factory.Fingering({ number, position }).setFont('Times New Roman', 10, 'bold'), head);
48039
+ }
48040
+ // prettier-ignore
48041
+ const upper = [
48042
+ [1, 0, '3'], [1, 3, '5'], [1, 4, '3'], [2, 2, '45'], [5, 0, '5'], [7, 1, '5'], [7, 2, '5'], [7, 4, '4'], [8, 1, '4'],
48043
+ [10, 2, '4'], [10, 3, '5'], [11, 1, '4'], [11, 2, '5'], [11, 4, '4'], [11, 5, '5'], [12, 1, '4'], [12, 2, '5'], [12, 4, '4'], [12, 5, '5'],
48044
+ [14, 2, '5'], [14, 3, '4'], [14, 5, '3'], [14, 9, '5'], [15, 1, '4'], [15, 2, '5'], [15, 4, '4'], [15, 5, '5'],
48045
+ [16, 1, '4'], [16, 2, '5'], [16, 4, '4'], [16, 5, '5'], [17, 1, '2'], [17, 4, '4'], [18, 1, '4'], [18, 2, '5'],
48046
+ [19, 0, '5'], [19, 1, '4'], [19, 2, '5'], [20, 1, '4', 1], [20, 4, '4', 1], [20, 5, '3', 1],
48047
+ [21, 5, '4'], [22, 5, '4'], [23, 0, '5', 1], [23, 4, '3', 1], [23, 5, '4', 1], [24, 4, '4', 1], [24, 5, '3', 1]
48048
+ ];
48049
+ for (const [bar, i, finger, voice] of upper) {
48050
+ const n = right(bar, i, voice);
48051
+ mark(n, finger, 'above', n.keys.length - 1);
48052
+ }
48053
+ // prettier-ignore
48054
+ const lower = [
48055
+ [1, 1, '1'], [1, 3, '1'], [1, 4, '4'], [3, 0, '2'], [4, 2, '4'], [5, 0, '3'], [6, 2, '21'], [8, 0, '4'],
48056
+ [9, 2, '3'], [10, 2, '4'], [11, 2, '4'], [12, 2, '5'], [13, 2, '4'], [17, 2, '4'], [19, 2, '4'], [20, 2, '4']
48057
+ ];
48058
+ for (const [bar, i, finger] of lower)
48059
+ mark(left(bar, i), finger, 'below');
48060
+ }
48061
+ /** Wedges sit between the hands, except for the left hand's rising entry in measure 5. */
48062
+ function hairpins(VF, factory, right, left) {
48063
+ for (const [from, to, baseline] of [
48064
+ [left(5, 1), left(6, 0), 281],
48065
+ [right(10, 2), right(10, 3), 386],
48066
+ [right(18, 4), right(19, 1), 788],
48067
+ [right(22, 4), right(23, 1, 1), 977],
48068
+ ])
48069
+ factory
48070
+ .StaveHairpin({ from, to, type: VF.StaveHairpin.type.CRESC, options: { height: 9 } })
48071
+ .setLayoutBaseline(baseline * scale);
48072
+ // Wedges use the same between-staff baselines as the edition's expression words.
48073
+ for (const [bar, a, b, growing, voice = 0] of [
48074
+ [1, 0, 4, true],
48075
+ [2, 0, 2, false],
48076
+ [7, 0, 4, true],
48077
+ [8, 0, 2, false],
48078
+ [14, 2, 7, true],
48079
+ [15, 0, 2, false],
48080
+ [16, 0, 2, false],
48081
+ [17, 1, 3, true],
48082
+ [19, 2, 3, false],
48083
+ [20, 4, 5, true, 1],
48084
+ [21, 5, 6, true],
48085
+ ]) {
48086
+ const row = rows.findLast((r) => r.first <= bar);
48087
+ factory
48088
+ .StaveHairpin({
48089
+ from: right(bar, a, voice),
48090
+ to: right(bar, b, voice),
48091
+ type: growing ? VF.StaveHairpin.type.CRESC : VF.StaveHairpin.type.DECRESC,
48092
+ options: { height: 8, leftShiftPx: bar === 1 ? 32 : 0 },
48093
+ })
48094
+ .setLayoutBaseline((row.top + 45) * scale);
48095
+ }
48096
+ }
48097
+ /** Place the pedal glyph below the actual low-octave stem after the music has been formatted. */
48098
+ function pedals(VF, ctx, measures) {
48099
+ for (let bar = 9; bar <= 24; bar++) {
48100
+ const bass = measures[bar - 1][1].voices[0].notes;
48101
+ const row = rows.findLast((row) => row.first <= bar);
48102
+ // A text-style release is anchored to the end of the preceding note.
48103
+ const beforeRelease = bar === 13 || bar === 14 || bar >= 21 ? 3 : 2;
48104
+ const pedal = new VF.PedalMarking([bass[0], bass[beforeRelease]]).setContext(ctx).setFontSize(27);
48105
+ pedal.setLayoutBaseline(Math.max((row.bass + 66) * scale, bass[0].getStemExtents().topY + 23));
48106
+ pedal.drawWithStyle();
48107
+ }
48108
+ }
48109
+ /** Use the same physical page coordinates for the scan's title, dedication, tempo, and dynamic words. */
48110
+ function lettering(VF, ctx, measures) {
48111
+ function text(label, x, y, size, weight = 'normal', style = 'normal', align = 'left', family = 'Times New Roman') {
48112
+ ctx.save().setFont(family, size, weight, style);
48113
+ const advance = ctx.measureText(label).width;
48114
+ ctx.fillText(label, x - (align === 'center' ? advance / 2 : align === 'right' ? advance : 0), y);
48115
+ ctx.restore();
48116
+ }
48117
+ text('3ᵐᵉ Ballade.', width / 2, 132, 34, 'bold', 'normal', 'center');
48118
+ text('À Mˡˡᵉ Pauline de Noailles.', 82, 171, 18, 'bold', 'italic');
48119
+ text('Allegretto.', 243, 207, 23, 'bold');
48120
+ text('Fr. Chopin, Op. 47.', 1237, 214, 19, 'bold', 'normal', 'right');
48121
+ for (const [bar, label] of [
48122
+ [1, 'm. v.'],
48123
+ [3, 'dolce'],
48124
+ [9, 'f'],
48125
+ [10, 'meno f'],
48126
+ [11, 'p'],
48127
+ [13, 'f'],
48128
+ [14, 'meno f'],
48129
+ [15, 'p'],
48130
+ [18, 'poco cresc.'],
48131
+ [20, 'dim.'],
48132
+ [21, 'rf'],
48133
+ [24, 'poco dim.'],
48134
+ ]) {
48135
+ const row = rows.findLast((r) => r.first <= bar);
48136
+ const n = measures[bar - 1][0].voices[0].notes[0];
48137
+ const x = n.getAbsoluteX();
48138
+ const y = (row.top + (bar === 21 ? 62 : bar === 24 ? 45 : 52)) * scale;
48139
+ if (['f', 'p', 'rf', 'meno f'].includes(label)) {
48140
+ const glyphs = [...(label === 'meno f' ? 'f' : label)].map((letter) => VF.TextDynamics.GLYPHS[letter]).join('');
48141
+ if (label === 'meno f')
48142
+ text('meno', x + 3, y - 3, 17, 'normal', 'italic', 'right');
48143
+ text(glyphs, x + (label === 'meno f' ? 11 : 0), y, 30, 'normal', 'normal', 'left', 'Bravura');
48144
+ }
48145
+ else {
48146
+ text(label, x - 4, y, 18, 'normal', 'italic');
48147
+ }
48148
+ }
48149
+ }
48150
+ /** The small alternative in measure 3 replaces the grace note with a mordent on B-flat. */
48151
+ function ossia(VF, ctx, bar) {
48152
+ const small = 0.63, x = bar[1].voices[0].notes[3].getAbsoluteX() - 8, y = bar[1].stave.getYForLine(6.2);
48153
+ ctx.save();
48154
+ const group = ctx.openGroup('ossia');
48155
+ if (group)
48156
+ group.setAttribute('transform', 'scale(' + small + ')');
48157
+ else
48158
+ ctx.scale(small, small);
48159
+ const f = new VF.Factory({ renderer: { elementId: null } }).setContext(ctx);
48160
+ const score = f.EasyScore();
48161
+ const notes = score.notes('Bb3/8, A3/8, Bb3/8', { clef: 'bass', stem: 'down' });
48162
+ notes[0].addModifier(f.Ornament('mordent', { position: 'above' }));
48163
+ score.beam(notes, { autoStem: false });
48164
+ const system = f.System({ x: x / small, y: y / small - 40, width: 125 });
48165
+ const voice = score.voice(notes, { time: '3/8' });
48166
+ VF.Accidental.applyAccidentals([voice], 'Ab');
48167
+ system.addStave({ voices: [voice] });
48168
+ f.draw();
48169
+ ctx.setFont('Times New Roman', 21, 'bold').fillText('Ossia.', x / small - 75, y / small + 30);
48170
+ ctx.closeGroup();
48171
+ ctx.restore();
48172
+ }
48173
+ /** Render the complete opening page with the native Canvas or SVG backend. */
48174
+ function draw(VF, factory) {
48175
+ const score = factory.EasyScore({ throwOnError: true, extensions: ['quiet'] });
48176
+ score.set({ time: '6/8' });
48177
+ score.addCommitHook(({ quiet }, n) => {
48178
+ // An inaudible gap lets a secondary voice enter at its written rhythmic position.
48179
+ if (quiet)
48180
+ n.setStyle({ fillStyle: 'transparent', strokeStyle: 'transparent' });
48181
+ });
48182
+ const measures = rows.flatMap((row) => row.edges.slice(1).map((_, offset) => measure(VF, factory, score, row, offset)));
48183
+ decorate(VF, factory, measures);
48184
+ factory.draw();
48185
+ const ctx = factory.getContext();
48186
+ pedals(VF, ctx, measures);
48187
+ lettering(VF, ctx, measures);
48188
+ ossia(VF, ctx, measures[2]);
48189
+ return rows.map(({ first, edges }) => ({ measures: edges.slice(1).map((_, i) => first + i) }));
48190
+ }
48191
+ return { draw, width, height };
48192
+ })();
48193
+ globalThis.ChopinBallade = ChopinBallade;
48194
+
48195
+
48196
+ /***/ },
48197
+
48198
+ /***/ "./tests/scores/fugue.js"
48199
+ /*!*******************************!*\
48200
+ !*** ./tests/scores/fugue.js ***!
48201
+ \*******************************/
48202
+ () {
48203
+
48204
+
48205
+ // J. S. Bach, BWV 851. Both editions use the same 44-bar transcription.
48206
+ // Source: Bach-Gesellschaft (1866), public-domain engraving by Stelios Samelis for Mutopia, no. 988.
48207
+ // Each bar lists treble then bass. Parallel voices on a staff are ordered high to low.
48208
+ // A null staff has a whole-measure rest. Spacers let a voice enter partway through a bar.
48209
+ var BachFugue = (() => {
48210
+ const fugueBars = [
48211
+ // Bar 1
48212
+ ['B4/8/r, D4/8[dynamic="mp"], E4/8, F4/8, G4/8, E4/8', null],
48213
+ // Bar 2
48214
+ [
48215
+ 'F4/16[id="r2-0-0"], D4/16, C#4/16, D4/16[id="r2-3-0"], Bb4/q[id="r2-4-0",articulations="staccatissimo.above"], G4/q[ornament="tr.above"]',
48216
+ null,
48217
+ ],
48218
+ // Bar 3
48219
+ [
48220
+ 'A4/q[id="r3-0-0",dynamic="p"], A4/16[id="r3-4-0"], G4/16, F4/16, E4/16, G4/16, F4/16, E4/16, D4/16',
48221
+ 'C4/8/r, A3/8, B3/8, C4/8, D4/8, B3/8',
48222
+ ],
48223
+ // Bar 4
48224
+ [
48225
+ [
48226
+ 'E4/8, C5/8[id="r4-2-0"], C5/16[id="r4-4-0"], B4/16, A4/16, B4/16, B4/16, A4/16, G#4/16, A4/16',
48227
+ 'B4/q/r[spacer="yes"], F4/q, D4/q[ornament="tr.below"]',
48228
+ ],
48229
+ 'C4/16, A3/16, G#3/16, A3/16, D3/h/r[spacer="yes"]',
48230
+ ],
48231
+ // Bar 5
48232
+ [
48233
+ [
48234
+ 'A4/16[id="r5-0-0"], G4/16, F#4/16, G4/16, E5/q[articulations="staccatissimo.above"], G4/q[id="r5-8-0"]',
48235
+ 'E4/q[id="r5-0-1"], E4/16[id="r5-4-1"], D4/16, C#4/16, B3/16, D4/16, C#4/16, B3/16, A3/16',
48236
+ ],
48237
+ null,
48238
+ ],
48239
+ // Bar 6
48240
+ [
48241
+ [
48242
+ 'F4/8, D5/8[id="r6-2-0"], D5/16[id="r6-4-0"], C5/16, Bb4/16, A4/16, C5/16, Bb4/16, A4/16, G4/16',
48243
+ 'D4/q[dynamic="mf"], D4/q/r, D4/q/r',
48244
+ ],
48245
+ 'D3/8/r, D3/8, E3/8, F3/8, G3/8, E3/8',
48246
+ ],
48247
+ // Bar 7
48248
+ [
48249
+ [
48250
+ 'A4/q, G4/h[id="r7-4-0"]',
48251
+ 'C4/8/r, F4/8[id="r7-2-1"], F4/16[id="r7-4-1"], E4/16, D4/16, E4/16, E4/16, D4/16, C#4/16, D4/16',
48252
+ ],
48253
+ 'F3/16, D3/16, C#3/16, D3/16, Bb3/q[articulations="staccatissimo.above"], G3/q[ornament="tr.above"]',
48254
+ ],
48255
+ // Bar 8
48256
+ [
48257
+ ['G4/8[id="r8-0-0"], E4/8, F4/8, G4/8, A4/8, F4/8', 'C#4/q, D4/8, E4/8, C#4/8, D4/8'],
48258
+ 'A3/q[id="l8-0-0"], A3/16[id="l8-4-0"], G3/16, F3/16, E3/16, G3/16, F3/16, E3/16, D3/16',
48259
+ ],
48260
+ // Bar 9
48261
+ [
48262
+ [
48263
+ 'Bb4/16, G4/16, F#4/16, G4/16, Eb5/q[articulations="staccatissimo.above"], C#5/q[ornament="turn.above"]',
48264
+ 'Eb4/8, D4/8, G4/q, E4/q',
48265
+ ],
48266
+ 'G3/8, Bb3/8[id="l9-2-0"], Bb3/16[id="l9-4-0"], A3/16, G3/16, A3/16, A3/16, G3/16, F3/16, G3/16',
48267
+ ],
48268
+ // Bar 10
48269
+ [
48270
+ [
48271
+ 'D5/q, D5/q[articulations="staccatissimo.above"], B4/q[ornament="turn.above"]',
48272
+ 'E4/16/r, A4/16, G4/16, A4/16, F4/q, D4/q',
48273
+ ],
48274
+ 'G3/16, F3/16, E3/16, F3/16, A3/16, G3/16, F3/16, G3/16, G3/16, F3/16, E3/16, F3/16',
48275
+ ],
48276
+ // Bar 11
48277
+ [
48278
+ [
48279
+ 'C5/q, C5/q[articulations="staccatissimo.above"], A4/q[ornament="turn.above"]',
48280
+ 'E4/16/r, G4/16, F4/16, G4/16, Eb4/q, C4/q',
48281
+ ],
48282
+ 'F3/16, E3/16, D3/16, E3/16, G3/16, F3/16, Eb3/16, F3/16, F3/16, Eb3/16, D3/16, Eb3/16',
48283
+ ],
48284
+ // Bar 12
48285
+ [
48286
+ ['Bb4/h.[id="r12-0-0"]', 'E4/8/r, A4/8, G4/8, F4/8, E4/8, G4/8'],
48287
+ 'Eb3/16, D3/16, C#3/16, D3/16, Bb3/q[articulations="staccatissimo.above"], G3/q[ornament="tr.above"]',
48288
+ ],
48289
+ // Bar 13
48290
+ [
48291
+ ['Bb4/8[id="r13-0-0"], A4/8, B4/8, C#5/8, D5/8, B4/8', 'C#4/q[dynamic="p"], D4/8, E4/8, B4/q/r[spacer="yes"]'],
48292
+ [
48293
+ 'A3/q[id="l13-0-0"], A3/16[id="l13-4-0"], G3/16, F3/16, E3/16, A3/q',
48294
+ 'D3/h/r[spacer="yes"], G3/16, F3/16, E3/16, D3/16',
48295
+ ],
48296
+ ],
48297
+ // Bar 14
48298
+ [
48299
+ [
48300
+ 'C#5/16, A4/16, G#4/16, A4/16, F5/q[articulations="staccatissimo.above"], D5/q[ornament="tr.above"]',
48301
+ 'C4/8/r, E4/8, D4/8, C#4/8, B3/8, D4/8',
48302
+ ],
48303
+ 'E3/8, C#3/8, D3/8, E3/8, F3/8, D3/8',
48304
+ ],
48305
+ // Bar 15
48306
+ [
48307
+ [
48308
+ 'E5/8, A5/8[id="r15-2-0"], A5/16[id="r15-4-0"], G5/16, F#5/16, E5/16, G5/16, F#5/16, E5/16, D5/16',
48309
+ 'C#4/16, E4/16, F4/16, E4/16, B4/q/r[spacer="yes"], C4/q',
48310
+ ],
48311
+ ['A3/q, A3/q, D3/q/r[spacer="yes"]', 'D3/q/r[spacer="yes"], F#3/8, E3/8, D3/8, F#3/8'],
48312
+ ],
48313
+ // Bar 16
48314
+ [
48315
+ [
48316
+ 'Eb5/16, C6/16, Bb5/8, G5/16/r, A5/16, G#5/16, F#5/16, A5/16, G#5/16, F#5/16, E5/16',
48317
+ 'Bb3/16[dynamic="f"], D4/16, Eb4/16, D4/16, B3/q, E4/q[id="r16-8-1"]',
48318
+ ],
48319
+ 'G3/q, G#3/8, F#3/8, E3/8, G#3/8',
48320
+ ],
48321
+ // Bar 17
48322
+ [
48323
+ [
48324
+ 'D5/16, C5/16, B4/16, C5/16, C5/16, B4/16, A4/16, B4/16, B4/16, A4/16, G#4/16, A4/16',
48325
+ 'E4/8[id="r17-0-1"], D4/8/r, D4/q/r, D4/q/r',
48326
+ ],
48327
+ 'A3/8, A2/8, B2/8, C3/8, D3/8, B2/8',
48328
+ ],
48329
+ // Bar 18
48330
+ [
48331
+ 'G4/q[id="r18-0-0"], G4/16[id="r18-4-0"], F4/16, E4/16, F4/16, F4/16, E4/16, D4/16, A4/16',
48332
+ ['B3/8/r, A3/8, B3/8, C#4/8, D4/8, B3/8', 'C#3/16, A2/16, G#2/16, A2/16, F3/q, D3/q[ornament="tr.below"]'],
48333
+ ],
48334
+ // Bar 19
48335
+ [
48336
+ [
48337
+ 'A4/h.[id="r19-0-0"]',
48338
+ 'B4/q/r[spacer="yes"], F4/q[articulations="staccatissimo.below"], D4/q[ornament="tr.below"]',
48339
+ ],
48340
+ [
48341
+ 'C4/16, A3/16, G#3/16, A3/16, E3/16, D3/16, C3/16, D3/16, D3/16, C3/16, B2/16, C3/16',
48342
+ 'E3/8, F3/8, D3/h/r[spacer="yes"]',
48343
+ ],
48344
+ ],
48345
+ // Bar 20
48346
+ [
48347
+ [
48348
+ 'A4/q[id="r20-0-0"], A4/16[id="r20-4-0"], D#5/16, E5/16, A4/16, C5/16, B4/16, A4/16, G#4/16',
48349
+ 'E4/8, F4/8, B4/q/r[spacer="yes"], B4/q/r[spacer="yes"]',
48350
+ ],
48351
+ ['D3/q/r[spacer="yes"], B3/h[ornament="tr.above"]', 'C3/8, D3/8, E3/8, D3/8, E3/q'],
48352
+ ],
48353
+ // Bar 21
48354
+ [
48355
+ 'A4/q[id="r21-0-0",dynamic="mp",ornament="mordentInverted.above"], A4/16[id="r21-4-0"], G4/16, F4/16, E4/16, G4/16, F4/16, E4/16, D4/16',
48356
+ ['A3/q, B3/q/r, B3/q/r', 'A3/8[id="l21-0-1"], A2/8, B2/8[id="l21-4-1"], C#3/8, D3/8, B2/8'],
48357
+ ],
48358
+ // Bar 22
48359
+ [
48360
+ 'E4/8, E5/8, D5/8, C#5/8, B4/8, D5/8',
48361
+ 'C#3/16, A2/16, G#2/16, A2/16, F3/q[articulations="staccatissimo.above"], D3/q[ornament="tr.above"]',
48362
+ ],
48363
+ // Bar 23
48364
+ [
48365
+ 'C#5/16, E5/16, F5/16, E5/16, G4/q[articulations="staccatissimo.below"], Bb4/q[id="r23-8-0"]',
48366
+ 'A3/8, F3/8, E3/8, D3/8, C#3/8, E3/8',
48367
+ ],
48368
+ // Bar 24
48369
+ [
48370
+ 'Bb4/16[id="r24-0-0"], A4/16, G4/16, A4/16, A4/16, G4/16, F4/16, G4/16, G4/16, F4/16, E4/16, F4/16',
48371
+ 'D3/16, F3/16, G3/16, F3/16, A2/q[articulations="staccatissimo.above"], C#3/q[ornament="tr.above"]',
48372
+ ],
48373
+ // Bar 25
48374
+ [
48375
+ 'F4/q[id="r25-0-0",dynamic="p"], F4/16[id="r25-4-0"], E4/16, F#4/16, G4/16, F#4/16, G4/16, A4/16, G4/16',
48376
+ ['C4/8/r, D4/8, C4/8, Bb3/8, A3/8, C4/8', 'D3/h.'],
48377
+ ],
48378
+ // Bar 26
48379
+ [
48380
+ 'G4/16, A4/16, Bb4/16, A4/16, A4/16, B4/16, C5/16, B4/16, B4/16, C#5/16, D5/16, C#5/16',
48381
+ ['Bb3/q, D4/h', 'B2/8/r, G3/8, F#3/8, E3/8, D3/8, F3/8'],
48382
+ ],
48383
+ // Bar 27
48384
+ [
48385
+ 'C#5/8, A5/8, G5/8, F5/8, E5/8, G5/8',
48386
+ [
48387
+ 'G3/q, B3/q/r, B3/q/r',
48388
+ 'E3/q[id="l27-0-1"], E3/16[id="l27-4-1"], D3/16, C#3/16, B2/16, D3/16, C#3/16, B2/16, A2/16',
48389
+ ],
48390
+ ],
48391
+ // Bar 28
48392
+ [
48393
+ ['F5/16, A5/16, Bb5/16, A5/16, C#5/q, E5/q[id="r28-8-0"]', 'E4/8/r, D4/8, E4/8, F4/8, G4/8, E4/8'],
48394
+ 'D3/q[id="l28-0-0"], D3/q/r[id="l28-4-0"], D3/q/r',
48395
+ ],
48396
+ // Bar 29
48397
+ [
48398
+ [
48399
+ 'E5/8[id="r29-0-0"], A4/8, D5/q, C5/q[id="r29-8-0"]',
48400
+ 'F4/16, D4/16, C#4/16, D4/16, Bb4/q, G4/q[ornament="mordent.below"]',
48401
+ ],
48402
+ 'D3/8/r, A3/8, G3/8, F3/8, E3/8, G3/8',
48403
+ ],
48404
+ // Bar 30
48405
+ [
48406
+ [
48407
+ 'C5/8[id="r30-0-0"], Eb5/8[id="r30-2-0"], Eb5/16[id="r30-4-0"], D5/16, C5/16, D5/16, D5/16, C5/16, Bb4/16, C5/16',
48408
+ 'A4/q, B4/h/r[spacer="yes"]',
48409
+ ],
48410
+ [
48411
+ 'F#3/16, A3/16, Bb3/16, A3/16, F#3/q[articulations="staccatissimo.above"], A3/q[articulations="staccatissimo.above"]',
48412
+ 'D3/q/r[spacer="yes"], D3/q, F#3/q',
48413
+ ],
48414
+ ],
48415
+ // Bar 31
48416
+ [
48417
+ 'C5/16, Bb4/16, A4/16, Bb4/16, D5/16, C5/16, Bb4/16, C5/16, C5/16, Bb4/16, A4/16, Bb4/16',
48418
+ [
48419
+ 'A3/16/r, G3/16, F#3/16, G3/16, E3/q[articulations="staccatissimo.above"], G3/q[articulations="staccatissimo.above"]',
48420
+ 'G2/q, C3/q, E3/q',
48421
+ ],
48422
+ ],
48423
+ // Bar 32
48424
+ [
48425
+ 'Bb4/16, A4/16, G4/16, A4/16, C5/16, Bb4/16, A4/16, Bb4/16, Bb4/16, A4/16, G4/16, A4/16',
48426
+ [
48427
+ 'A3/16/r, F3/16, E3/16, F3/16, D3/q[articulations="staccatissimo.above"], F3/q[articulations="staccatissimo.above"]',
48428
+ 'F2/q, Bb2/q, D3/q',
48429
+ ],
48430
+ ],
48431
+ // Bar 33
48432
+ [
48433
+ 'A4/16, G4/16, F4/16, G4/16, E5/q[articulations="staccatissimo.above"], C#5/q[ornament="tr.above"]',
48434
+ ['C4/8/r, F3/8, G3/8, A3/8, Bb3/8, G3/8', 'E3/h.'],
48435
+ ],
48436
+ // Bar 34
48437
+ [
48438
+ 'D5/q[id="r34-0-0",dynamic="mf"], D5/16[id="r34-4-0"], C5/16, Bb4/16, A4/16, C5/16, Bb4/16, A4/16, G4/16',
48439
+ ['A3/8, F3/8, G3/8, A3/8, G3/q', 'F3/8, D3/8, E3/8, F#3/8, G3/8, E3/8'],
48440
+ ],
48441
+ // Bar 35
48442
+ [
48443
+ 'A4/8, F#4/8, G4/8, A4/8, Bb4/8, G4/8',
48444
+ ['C4/8/r, A3/8, G3/8, F3/8, E3/8, G3/8', 'F#3/16, D3/16, C#3/16, D3/16, Bb3/8, A3/8, G3/8, Bb3/8'],
48445
+ ],
48446
+ // Bar 36
48447
+ [
48448
+ 'A4/16, C5/16, Eb5/8[id="r36-2-0"], Eb5/16[id="r36-4-0"], D5/16, C5/16, Bb4/16, D5/16, C5/16, Bb4/16, A4/16',
48449
+ ['F#3/8, Bb3/8, A3/8, G3/8, F#3/8, A3/8', 'A3/8, G3/8, F#3/8, E3/8, D3/8, F#3/8'],
48450
+ ],
48451
+ // Bar 37
48452
+ [
48453
+ 'Bb4/16, D5/16, F5/8[id="r37-2-0"], F5/16[id="r37-4-0"], E5/16, D5/16, C#5/16, E5/16, D5/16, C#5/16, B4/16',
48454
+ ['G3/8, C4/8, B3/8, A3/8, G#3/8, B3/8', 'A2/8, A3/8, G#3/8, F#3/8, E3/8, G#3/8'],
48455
+ ],
48456
+ // Bar 38
48457
+ [
48458
+ 'C#5/16[id="r38-0-0"], E5/16, Bb5/8[id="r38-2-0"], Bb5/16[id="r38-4-0"], A5/16, G5/16, F5/16, A5/16, G5/16, F5/16, E5/16[id="r38-11-0"]',
48459
+ ['A3/8, F4/8, E4/8, D4/8, C#4/8, E4/8', 'A2/8, D4/8, C#4/8, B3/8, A3/8, C#4/8'],
48460
+ ],
48461
+ // Bar 39
48462
+ [
48463
+ 'G5/16[dynamic="f"], F5/16, E5/16, F5/16, F5/16, E5/16, D5/16, E5/16, E5/16, D5/16, C#5/16, D5/16',
48464
+ ['D4/8, D4/8/r, D4/q/r, D4/q/r', 'D4/8, D3/8, E3/8, F3/8, G3/8, E3/8'],
48465
+ ],
48466
+ // Bar 40
48467
+ [
48468
+ [
48469
+ 'C5/q[id="r40-0-0"], C5/16[id="r40-4-0"], Bb4/16, A4/16, Bb4/16, Bb4/16, A4/16, G4/16, D5/16',
48470
+ 'D4/8/r, D4/8, E4/8, F#4/8, G4/8, E4/8',
48471
+ ],
48472
+ 'F#3/16, D3/16, C#3/16, D3/16, Bb3/q[articulations="staccatissimo.above"], G3/q[ornament="tr.above"]',
48473
+ ],
48474
+ // Bar 41
48475
+ [
48476
+ [
48477
+ 'D5/h.[id="r41-0-0"]',
48478
+ 'F4/16, D#4/16, C#4/16, D4/16, Bb4/q[articulations="staccatissimo.below"], G4/q[ornament="tr.below"]',
48479
+ ],
48480
+ 'A3/8, Bb3/8, A3/16, G3/16, F3/16, G3/16, G3/16, F3/16, E3/16, F3/16',
48481
+ ],
48482
+ // Bar 42
48483
+ [
48484
+ [
48485
+ 'D5/q[id="r42-0-0"], D5/16[id="r42-4-0"], G#5/16, A5/16, D5/16, F5/16, E5/16, D5/16, C#5/16',
48486
+ 'A4/8, Bb4/8, E4/h[ornament="tr.below"]',
48487
+ ],
48488
+ 'F3/8, G3/8, A3/8, G3/8, A3/q',
48489
+ ],
48490
+ // Bar 43
48491
+ [
48492
+ ['D5/h.[dynamic="mf"]', 'E4/8/r, (A4 C5)/8, (G4 Bb4)/8, (F#4 A4)/8, (E4 G4)/8, (G4 Bb4)/8'],
48493
+ ['D4/8/r, (D3 F#3)/8[id="l43-2-0"], (E3 G3)/8[id="l43-4-0"], (F#3 A3)/8, (G3 Bb3)/8, (E3 G3)/8', 'D3/h.'],
48494
+ ],
48495
+ // Bar 44
48496
+ [
48497
+ ['D5/h.[articulations="fermata.above"]', '(F#4 A4)/h.'],
48498
+ ['(F#3 A3)/h.', 'D3/h.[articulations="fermata.below"]'],
48499
+ ],
48500
+ ];
48501
+ // Named endpoints keep sustained notes connected when the music wraps to a new system.
48502
+ const fuguePhrases = [
48503
+ ['crescendo', 'r5-0-0', 'r5-8-0', 'below'],
48504
+ ['crescendo', 'r38-0-0', 'r38-11-0', 'below'],
48505
+ ['diminuendo', 'r2-0-0', 'r2-4-0', 'below'],
48506
+ ['slur', 'r2-0-0', 'r2-3-0', 'above'],
48507
+ ['tie', 'r3-0-0', 'r3-4-0', 'above'],
48508
+ ['tie', 'r4-2-0', 'r4-4-0', 'above'],
48509
+ ['tie', 'r6-2-0', 'r6-4-0', 'above'],
48510
+ ['tie', 'r7-4-0', 'r8-0-0', 'above'],
48511
+ ['tie', 'r12-0-0', 'r13-0-0', 'above'],
48512
+ ['tie', 'r15-2-0', 'r15-4-0', 'above'],
48513
+ ['tie', 'r5-0-1', 'r5-4-1', 'below'],
48514
+ ['tie', 'r7-2-1', 'r7-4-1', 'below'],
48515
+ ['tie', 'r16-8-1', 'r17-0-1', 'below'],
48516
+ ['tie', 'r18-0-0', 'r18-4-0', 'above'],
48517
+ ['tie', 'r19-0-0', 'r20-0-0', 'above'],
48518
+ ['tie', 'r20-0-0', 'r20-4-0', 'above'],
48519
+ ['tie', 'r21-0-0', 'r21-4-0', 'above'],
48520
+ ['tie', 'r23-8-0', 'r24-0-0', 'above'],
48521
+ ['tie', 'r25-0-0', 'r25-4-0', 'above'],
48522
+ ['tie', 'r28-8-0', 'r29-0-0', 'above'],
48523
+ ['tie', 'r29-8-0', 'r30-0-0', 'above'],
48524
+ ['tie', 'r30-2-0', 'r30-4-0', 'above'],
48525
+ ['tie', 'r34-0-0', 'r34-4-0', 'above'],
48526
+ ['tie', 'r36-2-0', 'r36-4-0', 'above'],
48527
+ ['tie', 'r37-2-0', 'r37-4-0', 'above'],
48528
+ ['tie', 'r38-2-0', 'r38-4-0', 'above'],
48529
+ ['tie', 'r40-0-0', 'r40-4-0', 'above'],
48530
+ ['tie', 'r41-0-0', 'r42-0-0', 'above'],
48531
+ ['tie', 'r42-0-0', 'r42-4-0', 'above'],
48532
+ ['tie', 'l8-0-0', 'l8-4-0', 'above'],
48533
+ ['tie', 'l9-2-0', 'l9-4-0', 'above'],
48534
+ ['tie', 'l13-0-0', 'l13-4-0', 'above'],
48535
+ ['tie', 'l27-0-1', 'l27-4-1', 'below'],
48536
+ ];
48537
+ /** Format the ornaments on their own voice's side of the staff. Spacers carry time through a hand change. */
48538
+ function fugueNoteMarks(VF) {
48539
+ return ({ ornament, spacer, dynamic }, note, builder) => {
48540
+ if (dynamic) {
48541
+ const text = [...dynamic].map((letter) => VF.TextDynamics.GLYPHS[letter]).join('');
48542
+ note.addModifier(builder
48543
+ .getFactory()
48544
+ .Annotation({ text, vJustify: 'bottom', font: { family: 'Bravura', size: 23 } })
48545
+ .setYShift(5));
48546
+ }
48547
+ if (ornament) {
48548
+ const [type, position] = ornament.split('.');
48549
+ note.addModifier(builder.getFactory().Ornament(type, { position }));
48550
+ }
48551
+ if (spacer)
48552
+ note.setStyle({ fillStyle: 'transparent', strokeStyle: 'transparent' });
48553
+ };
48554
+ }
48555
+ /** Share the music through the requested bar, omitting ties that end beyond the excerpt.
48556
+ * @returns {import('../../src/easyscore').EasyScoreCompositionSpec}
48557
+ */
48558
+ function fugueMusic(VF, count) {
48559
+ const bars = fugueBars.slice(0, count);
48560
+ const staves = ['treble', 'bass'].map((clef, hand) => (Object.assign(Object.assign({ id: clef, clef, key: 'Dm', time: '3/4' }, (hand === 0 ? { name: 'Piano', shortName: 'Pno.' } : {})), { measures: bars.map((bar, index) => {
48561
+ const music = bar[hand];
48562
+ if (music === null) {
48563
+ // A centered whole rest fills this silent 3/4 bar before the next subject entry.
48564
+ return {
48565
+ voices: [
48566
+ {
48567
+ notes: [
48568
+ { keys: ['d/3'], clef, duration: 'wr', alignCenter: true, durationOverride: new VF.Fraction(3, 4) },
48569
+ ],
48570
+ },
48571
+ ],
48572
+ };
48573
+ }
48574
+ // Beam the five eighths of the opening subject and its two answers as a single gesture.
48575
+ const entrance = hand === 0 ? index === 0 : index === 2 || index === 5;
48576
+ const autoBeam = entrance ? { groups: [new VF.Fraction(3, 4)] } : true;
48577
+ const voices = Array.isArray(music)
48578
+ ? music.map((notes, i) => ({
48579
+ notes,
48580
+ stem: i === 0 ? 'up' : 'down',
48581
+ autoBeam: { autoStem: false },
48582
+ }))
48583
+ : [{ notes: music, autoBeam }];
48584
+ return { voices };
48585
+ }) })));
48586
+ // Give the moving voices room. Catch only the held bass and release at the next attack.
48587
+ const pedal = [
48588
+ [8, 'l8-0-0', 'l8-4-0'],
48589
+ [21, 'l21-0-1', 'l21-4-1'],
48590
+ [28, 'l28-0-0', 'l28-4-0'],
48591
+ [43, 'l43-2-0', 'l43-4-0'],
48592
+ ];
48593
+ const sections = [
48594
+ [1, 'Subject'],
48595
+ [3, 'Answer'],
48596
+ [6, 'Bass entry'],
48597
+ [22, 'Inversion'],
48598
+ [34, 'Stretto'],
48599
+ [43, 'Cadence'],
48600
+ ];
48601
+ const spans = fuguePhrases
48602
+ .filter(([, , to]) => Number(to.slice(1).split('-')[0]) <= count)
48603
+ .map(([kind, from, to, side]) => ({ kind, from, to, side, id: kind + '-' + from }));
48604
+ for (const [bar, from, to] of pedal) {
48605
+ if (bar <= count)
48606
+ spans.push({ kind: 'pedal', id: 'pedal-' + bar, from, to, text: 'Ped.' });
48607
+ }
48608
+ return {
48609
+ accidentals: 'key-aware',
48610
+ staves,
48611
+ sheet: { measurePadding: 15 },
48612
+ system: { spaceBetweenStaves: 9, details: { spacing: { mode: 'optical' } } },
48613
+ continuous: {
48614
+ measureNumbers: true,
48615
+ boundaries: sections
48616
+ .filter(([measure]) => measure <= count)
48617
+ .map(([measure, rehearsal]) => ({ measure, rehearsal })),
48618
+ groups: [{ first: 'treble', last: 'bass', type: 'brace', barlines: true }],
48619
+ spans,
48620
+ },
48621
+ };
48622
+ }
48623
+ return { music: fugueMusic, noteMarks: fugueNoteMarks };
48624
+ })();
48625
+ // Bundled and ESM tests use the same namespace as the standalone, file-based reader.
48626
+ globalThis.BachFugue = BachFugue;
48627
+
48628
+
47319
48629
  /***/ },
47320
48630
 
47321
48631
  /***/ "./tests/stave_tests.ts"
@@ -50847,11 +52157,12 @@ __webpack_require__.r(__webpack_exports__);
50847
52157
  /* harmony import */ var _src_dot__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../src/dot */ "./src/dot.ts");
50848
52158
  /* harmony import */ var _src_formatter__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../src/formatter */ "./src/formatter.ts");
50849
52159
  /* harmony import */ var _src_metrics__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../src/metrics */ "./src/metrics.ts");
50850
- /* harmony import */ var _src_stave__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../src/stave */ "./src/stave.ts");
50851
- /* harmony import */ var _src_tabnote__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../src/tabnote */ "./src/tabnote.ts");
50852
- /* harmony import */ var _src_tabstave__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../src/tabstave */ "./src/tabstave.ts");
50853
- /* harmony import */ var _src_tickcontext__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../src/tickcontext */ "./src/tickcontext.ts");
50854
- /* harmony import */ var _src_voice__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../src/voice */ "./src/voice.ts");
52160
+ /* harmony import */ var _src_modifier__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../src/modifier */ "./src/modifier.ts");
52161
+ /* harmony import */ var _src_stave__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../src/stave */ "./src/stave.ts");
52162
+ /* harmony import */ var _src_tabnote__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../src/tabnote */ "./src/tabnote.ts");
52163
+ /* harmony import */ var _src_tabstave__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../src/tabstave */ "./src/tabstave.ts");
52164
+ /* harmony import */ var _src_tickcontext__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../src/tickcontext */ "./src/tickcontext.ts");
52165
+ /* harmony import */ var _src_voice__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../src/voice */ "./src/voice.ts");
50855
52166
  // Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
50856
52167
  // MIT License
50857
52168
  //
@@ -50866,6 +52177,7 @@ __webpack_require__.r(__webpack_exports__);
50866
52177
 
50867
52178
 
50868
52179
 
52180
+
50869
52181
  const TabNoteTests = {
50870
52182
  Start() {
50871
52183
  QUnit.module('TabNote');
@@ -50873,6 +52185,7 @@ const TabNoteTests = {
50873
52185
  QUnit.test('TabStave Line', tabStaveLine);
50874
52186
  QUnit.test('Width', width);
50875
52187
  const run = _vexflow_test_helpers__WEBPACK_IMPORTED_MODULE_1__.VexFlowTests.runTests;
52188
+ run('Fret size and string clearance', fretClearance, undefined, ['Bravura']);
50876
52189
  run('TabNote Draw', draw);
50877
52190
  run('TabNote Stems Up', drawStemsUp);
50878
52191
  run('TabNote Stems Down', drawStemsDown);
@@ -50883,13 +52196,13 @@ const TabNoteTests = {
50883
52196
  };
50884
52197
  function ticks(assert) {
50885
52198
  const BEAT = (1 * _src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.RESOLUTION) / 4;
50886
- let note = new _src_tabnote__WEBPACK_IMPORTED_MODULE_6__.TabNote({ positions: [{ str: 6, fret: 6 }], duration: '1' });
52199
+ let note = new _src_tabnote__WEBPACK_IMPORTED_MODULE_7__.TabNote({ positions: [{ str: 6, fret: 6 }], duration: '1' });
50887
52200
  assert.equal(note.getTicks().value(), BEAT * 4, 'Whole note has 4 beats');
50888
- note = new _src_tabnote__WEBPACK_IMPORTED_MODULE_6__.TabNote({ positions: [{ str: 3, fret: 4 }], duration: '4' });
52201
+ note = new _src_tabnote__WEBPACK_IMPORTED_MODULE_7__.TabNote({ positions: [{ str: 3, fret: 4 }], duration: '4' });
50889
52202
  assert.equal(note.getTicks().value(), BEAT, 'Quarter note has 1 beat');
50890
52203
  }
50891
52204
  function tabStaveLine(assert) {
50892
- const note = new _src_tabnote__WEBPACK_IMPORTED_MODULE_6__.TabNote({
52205
+ const note = new _src_tabnote__WEBPACK_IMPORTED_MODULE_7__.TabNote({
50893
52206
  positions: [
50894
52207
  { str: 6, fret: 6 },
50895
52208
  { str: 4, fret: 5 },
@@ -50901,7 +52214,7 @@ function tabStaveLine(assert) {
50901
52214
  assert.equal(positions[0].fret, 6, 'String 6, Fret 6');
50902
52215
  assert.equal(positions[1].str, 4, 'String 4, Fret 5');
50903
52216
  assert.equal(positions[1].fret, 5, 'String 4, Fret 5');
50904
- const stave = new _src_stave__WEBPACK_IMPORTED_MODULE_5__.Stave(10, 10, 300);
52217
+ const stave = new _src_stave__WEBPACK_IMPORTED_MODULE_6__.Stave(10, 10, 300);
50905
52218
  note.setStave(stave);
50906
52219
  const ys = note.getYs();
50907
52220
  assert.equal(ys.length, 2, 'Chord should be rendered on two lines');
@@ -50910,7 +52223,7 @@ function tabStaveLine(assert) {
50910
52223
  }
50911
52224
  function width(assert) {
50912
52225
  assert.expect(1);
50913
- const note = new _src_tabnote__WEBPACK_IMPORTED_MODULE_6__.TabNote({
52226
+ const note = new _src_tabnote__WEBPACK_IMPORTED_MODULE_7__.TabNote({
50914
52227
  positions: [
50915
52228
  { str: 6, fret: 6 },
50916
52229
  { str: 4, fret: 5 },
@@ -50919,10 +52232,52 @@ function width(assert) {
50919
52232
  });
50920
52233
  assert.throws(() => note.getWidth(), /UnformattedNote/, 'Unformatted note should have no width');
50921
52234
  }
52235
+ /** Check the ink and string masks from a six-string chord at the normal tab stave spacing. */
52236
+ function fretClearance({ assert, elementId }, contextBuilder) {
52237
+ const ctx = contextBuilder(elementId, 280, 140);
52238
+ const stave = new _src_tabstave__WEBPACK_IMPORTED_MODULE_8__.TabStave(10, 10, 260).addTabGlyph().setContext(ctx).drawWithStyle();
52239
+ const positions = [0, 12, 10, 15, 13, 11].map((fret, i) => ({ str: i + 1, fret }));
52240
+ class TestChord extends _src_tabnote__WEBPACK_IMPORTED_MODULE_7__.TabNote {
52241
+ get frets() {
52242
+ return this.fretElement;
52243
+ }
52244
+ }
52245
+ const chord = new TestChord({ duration: 'q', positions });
52246
+ const small = new TestChord({ duration: 'q', positions }).setFontSize(9);
52247
+ const gaps = [];
52248
+ const clearRect = ctx.clearRect.bind(ctx);
52249
+ ctx.clearRect = (x, y, w, h) => {
52250
+ gaps.push({ left: x, right: x + w, centerY: y + h / 2 });
52251
+ return clearRect(x, y, w, h);
52252
+ };
52253
+ _src_formatter__WEBPACK_IMPORTED_MODULE_3__.Formatter.FormatAndDraw(ctx, stave, [chord, small]);
52254
+ assert.equal(gaps.length, positions.length * 2, 'Each fret clears its own string');
52255
+ assert.ok(chord.getWidth() > small.getWidth(), 'Formatting reserves the measured fret width');
52256
+ for (const [index, note] of [chord, small].entries()) {
52257
+ let previousBottom = -Infinity;
52258
+ const leftAnchor = note.getModifierStartXY(_src_modifier__WEBPACK_IMPORTED_MODULE_5__.ModifierPosition.LEFT, 0).x;
52259
+ const rightAnchor = note.getModifierStartXY(_src_modifier__WEBPACK_IMPORTED_MODULE_5__.ModifierPosition.RIGHT, 0).x;
52260
+ assert.equal(note.getModifierStartXY(_src_modifier__WEBPACK_IMPORTED_MODULE_5__.ModifierPosition.ABOVE, 0).x, note.getStemX());
52261
+ for (const [i, fret] of note.frets.entries()) {
52262
+ const ink = fret.getTextMetrics();
52263
+ const { left, right, centerY } = gaps[index * positions.length + i];
52264
+ assert.ok(leftAnchor <= left + 0.01 && rightAnchor >= right - 0.01, 'Side markings clear every string gap');
52265
+ const x = note.getAbsoluteX() - fret.getWidth() / 2;
52266
+ const baseline = note.getYs()[i] + fret.getYShift();
52267
+ const top = baseline - ink.actualBoundingBoxAscent;
52268
+ const bottom = baseline + ink.actualBoundingBoxDescent;
52269
+ assert.equal(fret.fontSizeInPoints, index === 0 ? 11 : 9);
52270
+ assert.ok(Math.abs((bottom + top) / 2 - centerY) < 0.01, 'Ink centers on the cleared string');
52271
+ assert.ok(x - ink.actualBoundingBoxLeft >= left + 1 && x + ink.actualBoundingBoxRight <= right - 1);
52272
+ assert.ok(top >= previousBottom + 2, 'Adjacent strings have at least two pixels of clear space');
52273
+ previousBottom = bottom;
52274
+ }
52275
+ }
52276
+ }
50922
52277
  function draw(options, contextBuilder) {
50923
52278
  const ctx = contextBuilder(options.elementId, 600, 140);
50924
52279
  ctx.font = '10pt Arial';
50925
- const stave = new _src_tabstave__WEBPACK_IMPORTED_MODULE_7__.TabStave(10, 10, 550);
52280
+ const stave = new _src_tabstave__WEBPACK_IMPORTED_MODULE_8__.TabStave(10, 10, 550);
50926
52281
  stave.setContext(ctx);
50927
52282
  stave.drawWithStyle();
50928
52283
  const notes = [
@@ -50976,8 +52331,8 @@ function draw(options, contextBuilder) {
50976
52331
  ];
50977
52332
  // Helper function
50978
52333
  function showNote(noteStruct, stave, ctx, x) {
50979
- const tabNote = new _src_tabnote__WEBPACK_IMPORTED_MODULE_6__.TabNote(noteStruct);
50980
- const tickContext = new _src_tickcontext__WEBPACK_IMPORTED_MODULE_8__.TickContext();
52334
+ const tabNote = new _src_tabnote__WEBPACK_IMPORTED_MODULE_7__.TabNote(noteStruct);
52335
+ const tickContext = new _src_tickcontext__WEBPACK_IMPORTED_MODULE_9__.TickContext();
50981
52336
  tickContext.addTickable(tabNote).preFormat().setX(x);
50982
52337
  tabNote.setContext(ctx).setStave(stave);
50983
52338
  tabNote.drawWithStyle();
@@ -50993,7 +52348,7 @@ function draw(options, contextBuilder) {
50993
52348
  function drawStemsUp(options, contextBuilder) {
50994
52349
  const ctx = contextBuilder(options.elementId, 600, 200);
50995
52350
  ctx.font = '10pt Arial';
50996
- const stave = new _src_tabstave__WEBPACK_IMPORTED_MODULE_7__.TabStave(10, 30, 550);
52351
+ const stave = new _src_tabstave__WEBPACK_IMPORTED_MODULE_8__.TabStave(10, 30, 550);
50997
52352
  stave.setContext(ctx);
50998
52353
  stave.drawWithStyle();
50999
52354
  const specs = [
@@ -51048,11 +52403,11 @@ function drawStemsUp(options, contextBuilder) {
51048
52403
  },
51049
52404
  ];
51050
52405
  const notes = specs.map((struct) => {
51051
- const tabNote = new _src_tabnote__WEBPACK_IMPORTED_MODULE_6__.TabNote(struct);
52406
+ const tabNote = new _src_tabnote__WEBPACK_IMPORTED_MODULE_7__.TabNote(struct);
51052
52407
  tabNote.renderOptions.drawStem = true;
51053
52408
  return tabNote;
51054
52409
  });
51055
- const voice = new _src_voice__WEBPACK_IMPORTED_MODULE_9__.Voice(_src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.TIME4_4).setMode(_src_voice__WEBPACK_IMPORTED_MODULE_9__.VoiceMode.SOFT);
52410
+ const voice = new _src_voice__WEBPACK_IMPORTED_MODULE_10__.Voice(_src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.TIME4_4).setMode(_src_voice__WEBPACK_IMPORTED_MODULE_10__.VoiceMode.SOFT);
51056
52411
  voice.addTickables(notes);
51057
52412
  new _src_formatter__WEBPACK_IMPORTED_MODULE_3__.Formatter().joinVoices([voice]).formatToStave([voice], stave);
51058
52413
  voice.draw(ctx, stave);
@@ -51061,7 +52416,7 @@ function drawStemsUp(options, contextBuilder) {
51061
52416
  function drawStemsDown(options, contextBuilder) {
51062
52417
  const ctx = contextBuilder(options.elementId, 600, 200);
51063
52418
  ctx.font = '10pt Arial';
51064
- const stave = new _src_tabstave__WEBPACK_IMPORTED_MODULE_7__.TabStave(10, 10, 550);
52419
+ const stave = new _src_tabstave__WEBPACK_IMPORTED_MODULE_8__.TabStave(10, 10, 550);
51065
52420
  stave.setContext(ctx);
51066
52421
  stave.drawWithStyle();
51067
52422
  const specs = [
@@ -51116,12 +52471,12 @@ function drawStemsDown(options, contextBuilder) {
51116
52471
  },
51117
52472
  ];
51118
52473
  const notes = specs.map((struct) => {
51119
- const tabNote = new _src_tabnote__WEBPACK_IMPORTED_MODULE_6__.TabNote(struct);
52474
+ const tabNote = new _src_tabnote__WEBPACK_IMPORTED_MODULE_7__.TabNote(struct);
51120
52475
  tabNote.renderOptions.drawStem = true;
51121
52476
  tabNote.setStemDirection(-1);
51122
52477
  return tabNote;
51123
52478
  });
51124
- const voice = new _src_voice__WEBPACK_IMPORTED_MODULE_9__.Voice(_src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.TIME4_4).setMode(_src_voice__WEBPACK_IMPORTED_MODULE_9__.VoiceMode.SOFT);
52479
+ const voice = new _src_voice__WEBPACK_IMPORTED_MODULE_10__.Voice(_src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.TIME4_4).setMode(_src_voice__WEBPACK_IMPORTED_MODULE_10__.VoiceMode.SOFT);
51125
52480
  voice.addTickables(notes);
51126
52481
  new _src_formatter__WEBPACK_IMPORTED_MODULE_3__.Formatter().joinVoices([voice]).formatToStave([voice], stave);
51127
52482
  voice.draw(ctx, stave);
@@ -51130,7 +52485,7 @@ function drawStemsDown(options, contextBuilder) {
51130
52485
  function drawStemsUpThrough(options, contextBuilder) {
51131
52486
  const ctx = contextBuilder(options.elementId, 600, 200);
51132
52487
  ctx.font = '10pt Arial';
51133
- const stave = new _src_tabstave__WEBPACK_IMPORTED_MODULE_7__.TabStave(10, 30, 550);
52488
+ const stave = new _src_tabstave__WEBPACK_IMPORTED_MODULE_8__.TabStave(10, 30, 550);
51134
52489
  stave.setContext(ctx);
51135
52490
  stave.drawWithStyle();
51136
52491
  const specs = [
@@ -51185,13 +52540,13 @@ function drawStemsUpThrough(options, contextBuilder) {
51185
52540
  },
51186
52541
  ];
51187
52542
  const notes = specs.map((struct) => {
51188
- const tabNote = new _src_tabnote__WEBPACK_IMPORTED_MODULE_6__.TabNote(struct);
52543
+ const tabNote = new _src_tabnote__WEBPACK_IMPORTED_MODULE_7__.TabNote(struct);
51189
52544
  tabNote.renderOptions.drawStem = true;
51190
52545
  tabNote.renderOptions.drawStemThroughStave = true;
51191
52546
  return tabNote;
51192
52547
  });
51193
52548
  ctx.setFont(_src_metrics__WEBPACK_IMPORTED_MODULE_4__.Metrics.get('fontFamily'), 10, 'bold');
51194
- const voice = new _src_voice__WEBPACK_IMPORTED_MODULE_9__.Voice(_src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.TIME4_4).setMode(_src_voice__WEBPACK_IMPORTED_MODULE_9__.VoiceMode.SOFT);
52549
+ const voice = new _src_voice__WEBPACK_IMPORTED_MODULE_10__.Voice(_src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.TIME4_4).setMode(_src_voice__WEBPACK_IMPORTED_MODULE_10__.VoiceMode.SOFT);
51195
52550
  voice.addTickables(notes);
51196
52551
  new _src_formatter__WEBPACK_IMPORTED_MODULE_3__.Formatter().joinVoices([voice]).formatToStave([voice], stave);
51197
52552
  voice.draw(ctx, stave);
@@ -51200,7 +52555,7 @@ function drawStemsUpThrough(options, contextBuilder) {
51200
52555
  function drawStemsDownThrough(options, contextBuilder) {
51201
52556
  const ctx = contextBuilder(options.elementId, 600, 250);
51202
52557
  ctx.font = '10pt Arial';
51203
- const stave = new _src_tabstave__WEBPACK_IMPORTED_MODULE_7__.TabStave(10, 10, 550, { numLines: 8 });
52558
+ const stave = new _src_tabstave__WEBPACK_IMPORTED_MODULE_8__.TabStave(10, 10, 550, { numLines: 8 });
51204
52559
  stave.setContext(ctx);
51205
52560
  stave.drawWithStyle();
51206
52561
  const specs = [
@@ -51258,14 +52613,14 @@ function drawStemsDownThrough(options, contextBuilder) {
51258
52613
  },
51259
52614
  ];
51260
52615
  const notes = specs.map((struct) => {
51261
- const tabNote = new _src_tabnote__WEBPACK_IMPORTED_MODULE_6__.TabNote(struct);
52616
+ const tabNote = new _src_tabnote__WEBPACK_IMPORTED_MODULE_7__.TabNote(struct);
51262
52617
  tabNote.renderOptions.drawStem = true;
51263
52618
  tabNote.renderOptions.drawStemThroughStave = true;
51264
52619
  tabNote.setStemDirection(-1);
51265
52620
  return tabNote;
51266
52621
  });
51267
52622
  ctx.setFont('Arial', 10, 'bold');
51268
- const voice = new _src_voice__WEBPACK_IMPORTED_MODULE_9__.Voice(_src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.TIME4_4).setMode(_src_voice__WEBPACK_IMPORTED_MODULE_9__.VoiceMode.SOFT);
52623
+ const voice = new _src_voice__WEBPACK_IMPORTED_MODULE_10__.Voice(_src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.TIME4_4).setMode(_src_voice__WEBPACK_IMPORTED_MODULE_10__.VoiceMode.SOFT);
51269
52624
  voice.addTickables(notes);
51270
52625
  new _src_formatter__WEBPACK_IMPORTED_MODULE_3__.Formatter().joinVoices([voice]).formatToStave([voice], stave);
51271
52626
  voice.draw(ctx, stave);
@@ -51274,7 +52629,7 @@ function drawStemsDownThrough(options, contextBuilder) {
51274
52629
  function drawStemsDotted(options, contextBuilder) {
51275
52630
  const ctx = contextBuilder(options.elementId, 600, 200);
51276
52631
  ctx.font = '10pt Arial';
51277
- const stave = new _src_tabstave__WEBPACK_IMPORTED_MODULE_7__.TabStave(10, 10, 550);
52632
+ const stave = new _src_tabstave__WEBPACK_IMPORTED_MODULE_8__.TabStave(10, 10, 550);
51278
52633
  stave.setContext(ctx);
51279
52634
  stave.drawWithStyle();
51280
52635
  const specs = [
@@ -51309,9 +52664,9 @@ function drawStemsDotted(options, contextBuilder) {
51309
52664
  stemDirection: -1,
51310
52665
  },
51311
52666
  ];
51312
- const notes = specs.map((struct) => new _src_tabnote__WEBPACK_IMPORTED_MODULE_6__.TabNote(struct, true /* drawStem */));
52667
+ const notes = specs.map((struct) => new _src_tabnote__WEBPACK_IMPORTED_MODULE_7__.TabNote(struct, true /* drawStem */));
51313
52668
  _src_dot__WEBPACK_IMPORTED_MODULE_2__.Dot.buildAndAttach([notes[0], notes[2], notes[2]]);
51314
- const voice = new _src_voice__WEBPACK_IMPORTED_MODULE_9__.Voice(_src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.TIME4_4).setMode(_src_voice__WEBPACK_IMPORTED_MODULE_9__.VoiceMode.SOFT);
52669
+ const voice = new _src_voice__WEBPACK_IMPORTED_MODULE_10__.Voice(_src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow.TIME4_4).setMode(_src_voice__WEBPACK_IMPORTED_MODULE_10__.VoiceMode.SOFT);
51315
52670
  voice.addTickables(notes);
51316
52671
  new _src_formatter__WEBPACK_IMPORTED_MODULE_3__.Formatter().joinVoices([voice]).formatToStave([voice], stave);
51317
52672
  voice.draw(ctx, stave);
@@ -54026,6 +55381,7 @@ VexFlowTests.FONT_STACKS = {
54026
55381
  Leipzig: ['Leipzig', 'Academico'],
54027
55382
  MuseJazz: ['MuseJazz', 'MuseJazz Text'],
54028
55383
  Petaluma: ['Petaluma', 'Petaluma Script'],
55384
+ 'Petaluma with Academico': ['Petaluma', 'Academico'],
54029
55385
  Sebastian: ['Sebastian', 'Nepomuk'],
54030
55386
  };
54031
55387
  VexFlowTests.NEXT_TEST_ID = 0;
@@ -54860,6 +56216,18 @@ const structuredClone$1 = _structuredClone;
54860
56216
  /******/ }
54861
56217
  /******/
54862
56218
  /************************************************************************/
56219
+ /******/ /* webpack/runtime/compat get default export */
56220
+ /******/ (() => {
56221
+ /******/ // getDefaultExport function for compatibility with non-harmony modules
56222
+ /******/ __webpack_require__.n = (module) => {
56223
+ /******/ const getter = module && module.__esModule ?
56224
+ /******/ () => (module['default']) :
56225
+ /******/ () => (module);
56226
+ /******/ __webpack_require__.d(getter, { a: getter });
56227
+ /******/ return getter;
56228
+ /******/ };
56229
+ /******/ })();
56230
+ /******/
54863
56231
  /******/ /* webpack/runtime/define property getters */
54864
56232
  /******/ (() => {
54865
56233
  /******/ // define getter/value functions for harmony exports