vexflow 5.0.0-alpha.3 → 5.0.0-alpha.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/cjs/vexflow-bravura.js +2 -2
- package/build/cjs/vexflow-bravura.js.map +1 -1
- package/build/cjs/vexflow-core.js +2 -2
- package/build/cjs/vexflow-core.js.map +1 -1
- package/build/cjs/vexflow-debug-with-tests.js +528 -492
- package/build/cjs/vexflow-debug-with-tests.js.map +1 -1
- package/build/cjs/vexflow-debug.js +460 -452
- package/build/cjs/vexflow-debug.js.map +1 -1
- package/build/cjs/vexflow.js +2 -2
- package/build/cjs/vexflow.js.map +1 -1
- package/build/esm/src/accidental.js +22 -28
- package/build/esm/src/beam.js +24 -42
- package/build/esm/src/clefnote.js +6 -1
- package/build/esm/src/element.js +83 -101
- package/build/esm/src/fonts/gonville.js +1 -1
- package/build/esm/src/formatter.js +9 -17
- package/build/esm/src/fraction.js +15 -22
- package/build/esm/src/glyphnote.js +3 -2
- package/build/esm/src/metrics.js +3 -0
- package/build/esm/src/modifier.js +6 -21
- package/build/esm/src/multimeasurerest.js +16 -25
- package/build/esm/src/note.js +7 -0
- package/build/esm/src/registry.js +5 -19
- package/build/esm/src/stave.js +4 -6
- package/build/esm/src/stavenote.js +26 -40
- package/build/esm/src/stavetempo.js +4 -11
- package/build/esm/src/stavetie.js +82 -36
- package/build/esm/src/svgcontext.js +5 -12
- package/build/esm/src/tickable.js +13 -26
- package/build/esm/src/tickcontext.js +20 -2
- package/build/esm/src/version.js +3 -3
- package/build/esm/src/vibrato.js +6 -1
- package/build/esm/tests/clef_tests.js +5 -1
- package/build/esm/tests/glyphnote_tests.js +6 -0
- package/build/esm/tests/stavetie_tests.js +29 -0
- package/build/esm/tests/tabstave_tests.js +1 -0
- package/build/esm/tests/vexflow_test_helpers.js +25 -39
- package/build/types/src/accidental.d.ts +19 -1
- package/build/types/src/annotation.d.ts +1 -1
- package/build/types/src/beam.d.ts +12 -1
- package/build/types/src/clefnote.d.ts +2 -0
- package/build/types/src/element.d.ts +13 -3
- package/build/types/src/fonts/gonville.d.ts +1 -1
- package/build/types/src/formatter.d.ts +5 -3
- package/build/types/src/fraction.d.ts +12 -7
- package/build/types/src/modifier.d.ts +2 -1
- package/build/types/src/multimeasurerest.d.ts +4 -1
- package/build/types/src/note.d.ts +2 -0
- package/build/types/src/registry.d.ts +1 -1
- package/build/types/src/stavenote.d.ts +2 -1
- package/build/types/src/stavetempo.d.ts +3 -3
- package/build/types/src/stavetie.d.ts +39 -2
- package/build/types/src/svgcontext.d.ts +1 -1
- package/build/types/src/tickable.d.ts +2 -1
- package/build/types/src/tickcontext.d.ts +30 -0
- package/package.json +2 -2
- package/tests/flow.html +2 -2
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*!
|
|
2
|
-
* VexFlow 5.0.0-alpha.
|
|
2
|
+
* VexFlow 5.0.0-alpha.4 2024-06-24T05:25:46.334Z b71510759a0805f5a61170a47ec293256833eb35
|
|
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.0.0-alpha.
|
|
33
|
-
const ID = '
|
|
34
|
-
const DATE = '2024-
|
|
32
|
+
const VERSION = '5.0.0-alpha.4';
|
|
33
|
+
const ID = 'b71510759a0805f5a61170a47ec293256833eb35';
|
|
34
|
+
const DATE = '2024-06-24T05:25:46.334Z';
|
|
35
35
|
|
|
36
36
|
|
|
37
37
|
/***/ }),
|
|
@@ -57,12 +57,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
57
57
|
// MIT License
|
|
58
58
|
// @author Mohit Cheppudira
|
|
59
59
|
// @author Greg Ristow (modifications)
|
|
60
|
-
var __classPrivateFieldGet = (undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
61
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
62
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
63
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
64
|
-
};
|
|
65
|
-
var _a, _Accidental_checkCollision;
|
|
66
60
|
|
|
67
61
|
|
|
68
62
|
|
|
@@ -196,7 +190,7 @@ class Accidental extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
|
|
|
196
190
|
// in 'Tables.accidentalColumnsTable'
|
|
197
191
|
//
|
|
198
192
|
// Beyond 6 vertical accidentals, default to the parallel ascending lines approach,
|
|
199
|
-
// using as few columns as possible for the
|
|
193
|
+
// using as few columns as possible for the vertical structure.
|
|
200
194
|
//
|
|
201
195
|
// TODO (?): Allow column to be specified for an accidental at run-time?
|
|
202
196
|
let totalColumns = 0;
|
|
@@ -207,7 +201,7 @@ class Accidental extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
|
|
|
207
201
|
let groupEnd = i;
|
|
208
202
|
while (groupEnd + 1 < staveLineAccidentalLayoutMetrics.length && !noFurtherConflicts) {
|
|
209
203
|
// if this note conflicts with the next:
|
|
210
|
-
if (
|
|
204
|
+
if (this.checkCollision(staveLineAccidentalLayoutMetrics[groupEnd], staveLineAccidentalLayoutMetrics[groupEnd + 1])) {
|
|
211
205
|
// include the next note in the group:
|
|
212
206
|
groupEnd++;
|
|
213
207
|
}
|
|
@@ -215,18 +209,18 @@ class Accidental extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
|
|
|
215
209
|
noFurtherConflicts = true;
|
|
216
210
|
}
|
|
217
211
|
}
|
|
218
|
-
// Gets
|
|
212
|
+
// Gets a line from the `lineList`, relative to the current group
|
|
219
213
|
const getGroupLine = (index) => staveLineAccidentalLayoutMetrics[groupStart + index];
|
|
220
214
|
const getGroupLines = (indexes) => indexes.map(getGroupLine);
|
|
221
215
|
const lineDifference = (indexA, indexB) => {
|
|
222
216
|
const [a, b] = getGroupLines([indexA, indexB]).map((item) => item.line);
|
|
223
217
|
return a - b;
|
|
224
218
|
};
|
|
225
|
-
const notColliding = (...indexPairs) => indexPairs.map(getGroupLines).every(([line1, line2]) => !
|
|
219
|
+
const notColliding = (...indexPairs) => indexPairs.map(getGroupLines).every(([line1, line2]) => !this.checkCollision(line1, line2));
|
|
226
220
|
// Set columns for the lines in this group:
|
|
227
221
|
const groupLength = groupEnd - groupStart + 1;
|
|
228
222
|
// Set the accidental column for each line of the group
|
|
229
|
-
let endCase =
|
|
223
|
+
let endCase = this.checkCollision(staveLineAccidentalLayoutMetrics[groupStart], staveLineAccidentalLayoutMetrics[groupEnd])
|
|
230
224
|
? 'a'
|
|
231
225
|
: 'b';
|
|
232
226
|
switch (groupLength) {
|
|
@@ -270,7 +264,7 @@ class Accidental extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
|
|
|
270
264
|
while (collisionDetected === true) {
|
|
271
265
|
collisionDetected = false;
|
|
272
266
|
for (let line = 0; line + patternLength < staveLineAccidentalLayoutMetrics.length; line++) {
|
|
273
|
-
if (
|
|
267
|
+
if (this.checkCollision(staveLineAccidentalLayoutMetrics[line], staveLineAccidentalLayoutMetrics[line + patternLength])) {
|
|
274
268
|
collisionDetected = true;
|
|
275
269
|
patternLength++;
|
|
276
270
|
break;
|
|
@@ -317,7 +311,7 @@ class Accidental extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
|
|
|
317
311
|
}
|
|
318
312
|
columnWidths[0] = leftShift + maxExtraXSpaceNeeded;
|
|
319
313
|
columnXOffsets[0] = leftShift;
|
|
320
|
-
// Fill columnWidths with widest needed x-space;
|
|
314
|
+
// Fill columnWidths with the widest needed x-space;
|
|
321
315
|
// this is what keeps the columns parallel.
|
|
322
316
|
staveLineAccidentalLayoutMetrics.forEach((line) => {
|
|
323
317
|
if (line.width > columnWidths[line.column])
|
|
@@ -333,7 +327,7 @@ class Accidental extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
|
|
|
333
327
|
staveLineAccidentalLayoutMetrics.forEach((line) => {
|
|
334
328
|
let lineWidth = 0;
|
|
335
329
|
const lastAccOnLine = accCount + line.numAcc;
|
|
336
|
-
// handle all
|
|
330
|
+
// handle all accidentals on a given line:
|
|
337
331
|
for (accCount; accCount < lastAccOnLine; accCount++) {
|
|
338
332
|
const xShift = columnXOffsets[line.column - 1] + lineWidth + maxExtraXSpaceNeeded;
|
|
339
333
|
accidentalLinePositionsAndSpaceNeeds[accCount].accidental.setXShift(xShift);
|
|
@@ -346,6 +340,27 @@ class Accidental extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
|
|
|
346
340
|
// update the overall layout with the full width of the accidental shapes:
|
|
347
341
|
state.leftShift = totalShift + additionalPadding;
|
|
348
342
|
}
|
|
343
|
+
/** Helper function to determine whether two lines of accidentals collide vertically */
|
|
344
|
+
static checkCollision(line1, line2) {
|
|
345
|
+
let clearance = line2.line - line1.line;
|
|
346
|
+
let clearanceRequired = 3;
|
|
347
|
+
// But less clearance is required for certain accidentals: b, bb and ##.
|
|
348
|
+
if (clearance > 0) {
|
|
349
|
+
// then line 2 is on top
|
|
350
|
+
clearanceRequired = line2.flatLine || line2.dblSharpLine ? 2.5 : 3.0;
|
|
351
|
+
if (line1.dblSharpLine)
|
|
352
|
+
clearance -= 0.5;
|
|
353
|
+
}
|
|
354
|
+
else {
|
|
355
|
+
// line 1 is on top
|
|
356
|
+
clearanceRequired = line1.flatLine || line1.dblSharpLine ? 2.5 : 3.0;
|
|
357
|
+
if (line2.dblSharpLine)
|
|
358
|
+
clearance -= 0.5;
|
|
359
|
+
}
|
|
360
|
+
const collision = Math.abs(clearance) < clearanceRequired;
|
|
361
|
+
L('Line1, Line2, Collision: ', line1.line, line2.line, collision);
|
|
362
|
+
return collision;
|
|
363
|
+
}
|
|
349
364
|
/**
|
|
350
365
|
* Use this method to automatically apply accidentals to a set of `voices`.
|
|
351
366
|
* The accidentals will be remembered between all the voices provided.
|
|
@@ -417,7 +432,7 @@ class Accidental extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
|
|
|
417
432
|
// updated state
|
|
418
433
|
scaleMap[key.root + octave] = pitch;
|
|
419
434
|
// Create the accidental
|
|
420
|
-
const accidental = new
|
|
435
|
+
const accidental = new Accidental(accidentalString);
|
|
421
436
|
// Attach the accidental to the StaveNote
|
|
422
437
|
staveNote.addModifier(accidental, keyIndex);
|
|
423
438
|
// Add the pitch to list of pitches that modified accidentals
|
|
@@ -492,26 +507,6 @@ class Accidental extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
|
|
|
492
507
|
this.renderText(ctx, 0, 0);
|
|
493
508
|
}
|
|
494
509
|
}
|
|
495
|
-
_a = Accidental, _Accidental_checkCollision = function _Accidental_checkCollision(line1, line2) {
|
|
496
|
-
let clearance = line2.line - line1.line;
|
|
497
|
-
let clearanceRequired = 3;
|
|
498
|
-
// But less clearance is required for certain accidentals: b, bb and ##.
|
|
499
|
-
if (clearance > 0) {
|
|
500
|
-
// then line 2 is on top
|
|
501
|
-
clearanceRequired = line2.flatLine || line2.dblSharpLine ? 2.5 : 3.0;
|
|
502
|
-
if (line1.dblSharpLine)
|
|
503
|
-
clearance -= 0.5;
|
|
504
|
-
}
|
|
505
|
-
else {
|
|
506
|
-
// line 1 is on top
|
|
507
|
-
clearanceRequired = line1.flatLine || line1.dblSharpLine ? 2.5 : 3.0;
|
|
508
|
-
if (line2.dblSharpLine)
|
|
509
|
-
clearance -= 0.5;
|
|
510
|
-
}
|
|
511
|
-
const collision = Math.abs(clearance) < clearanceRequired;
|
|
512
|
-
L('Line1, Line2, Collision: ', line1.line, line2.line, collision);
|
|
513
|
-
return collision;
|
|
514
|
-
};
|
|
515
510
|
/** To enable logging for this class. Set `VexFlow.Accidental.DEBUG` to `true`. */
|
|
516
511
|
Accidental.DEBUG = false;
|
|
517
512
|
|
|
@@ -713,7 +708,7 @@ class Annotation extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
|
|
|
713
708
|
}
|
|
714
709
|
/**
|
|
715
710
|
* Set horizontal justification.
|
|
716
|
-
* @param
|
|
711
|
+
* @param just value in `Annotation.Justify`.
|
|
717
712
|
*/
|
|
718
713
|
setJustification(just) {
|
|
719
714
|
this.horizontalJustification = typeof just === 'string' ? Annotation.HorizontalJustifyString[just] : just;
|
|
@@ -726,9 +721,6 @@ class Annotation extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
|
|
|
726
721
|
const stemDirection = note.hasStem() ? note.getStemDirection() : _stem__WEBPACK_IMPORTED_MODULE_3__.Stem.UP;
|
|
727
722
|
const start = note.getModifierStartXY(_modifier__WEBPACK_IMPORTED_MODULE_2__.ModifierPosition.ABOVE, this.index);
|
|
728
723
|
this.setRendered();
|
|
729
|
-
// Apply style might not save context, if this.style is undefined, so we
|
|
730
|
-
// still need to save context state just before this, since we will be
|
|
731
|
-
// changing ctx parameters below.
|
|
732
724
|
this.applyStyle();
|
|
733
725
|
ctx.openGroup('annotation', this.getAttribute('id'));
|
|
734
726
|
const textWidth = this.getWidth();
|
|
@@ -1298,18 +1290,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
1298
1290
|
/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./util */ "./src/util.ts");
|
|
1299
1291
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
1300
1292
|
// MIT License
|
|
1301
|
-
var __classPrivateFieldGet = (undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
1302
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
1303
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
1304
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
1305
|
-
};
|
|
1306
|
-
var __classPrivateFieldSet = (undefined && undefined.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
1307
|
-
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
1308
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
1309
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
1310
|
-
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
1311
|
-
};
|
|
1312
|
-
var _Beam_stemDirection, _Beam_ticks, _Beam_yShift, _Beam_breakOnIndexes, _Beam_beamCount, _Beam_unbeamable, _Beam_forcedPartialDirections;
|
|
1313
1293
|
|
|
1314
1294
|
|
|
1315
1295
|
|
|
@@ -1348,7 +1328,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1348
1328
|
}
|
|
1349
1329
|
/** Get the direction of the beam */
|
|
1350
1330
|
getStemDirection() {
|
|
1351
|
-
return
|
|
1331
|
+
return this._stemDirection;
|
|
1352
1332
|
}
|
|
1353
1333
|
/**
|
|
1354
1334
|
* Get the default beam groups for a provided time signature.
|
|
@@ -1661,18 +1641,13 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1661
1641
|
constructor(notes, autoStem = false) {
|
|
1662
1642
|
super();
|
|
1663
1643
|
this.slope = 0;
|
|
1664
|
-
|
|
1665
|
-
_Beam_ticks.set(this, void 0);
|
|
1666
|
-
_Beam_yShift.set(this, 0);
|
|
1667
|
-
_Beam_breakOnIndexes.set(this, void 0);
|
|
1668
|
-
_Beam_beamCount.set(this, void 0);
|
|
1669
|
-
_Beam_unbeamable.set(this, void 0);
|
|
1644
|
+
this.yShift = 0;
|
|
1670
1645
|
/**
|
|
1671
1646
|
* Overrides to default beam directions for secondary-level beams that do not
|
|
1672
1647
|
* connect to any other note. See further explanation at
|
|
1673
1648
|
* `setPartialBeamSideAt`
|
|
1674
1649
|
*/
|
|
1675
|
-
|
|
1650
|
+
this.forcedPartialDirections = {};
|
|
1676
1651
|
if (!notes || notes.length === 0) {
|
|
1677
1652
|
throw new _util__WEBPACK_IMPORTED_MODULE_6__.RuntimeError('BadArguments', 'No notes provided for beam.');
|
|
1678
1653
|
}
|
|
@@ -1680,14 +1655,15 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1680
1655
|
throw new _util__WEBPACK_IMPORTED_MODULE_6__.RuntimeError('BadArguments', 'Too few notes for beam.');
|
|
1681
1656
|
}
|
|
1682
1657
|
// Validate beam line, direction and ticks.
|
|
1683
|
-
|
|
1684
|
-
if (
|
|
1658
|
+
this._ticks = notes[0].getIntrinsicTicks();
|
|
1659
|
+
if (this._ticks >= _tables__WEBPACK_IMPORTED_MODULE_3__.Tables.durationToTicks('4')) {
|
|
1660
|
+
// Q(MSAC) -- what about beamed half-note measured tremolos?
|
|
1685
1661
|
throw new _util__WEBPACK_IMPORTED_MODULE_6__.RuntimeError('BadArguments', 'Beams can only be applied to notes shorter than a quarter note.');
|
|
1686
1662
|
}
|
|
1687
1663
|
let i; // shared iterator
|
|
1688
1664
|
let note;
|
|
1689
|
-
|
|
1690
|
-
let stemDirection =
|
|
1665
|
+
this._stemDirection = notes[0].getStemDirection();
|
|
1666
|
+
let stemDirection = this._stemDirection;
|
|
1691
1667
|
// Figure out optimal stem direction based on given notes
|
|
1692
1668
|
if (autoStem && (0,_typeguard__WEBPACK_IMPORTED_MODULE_5__.isStaveNote)(notes[0])) {
|
|
1693
1669
|
stemDirection = calculateStemDirection(notes);
|
|
@@ -1702,14 +1678,14 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1702
1678
|
note = notes[i];
|
|
1703
1679
|
if (autoStem) {
|
|
1704
1680
|
note.setStemDirection(stemDirection);
|
|
1705
|
-
|
|
1681
|
+
this._stemDirection = stemDirection;
|
|
1706
1682
|
}
|
|
1707
1683
|
note.setBeam(this);
|
|
1708
1684
|
}
|
|
1709
1685
|
this.postFormatted = false;
|
|
1710
1686
|
this.notes = notes;
|
|
1711
|
-
|
|
1712
|
-
|
|
1687
|
+
this._beamCount = this.getBeamCount();
|
|
1688
|
+
this.breakOnIndexes = [];
|
|
1713
1689
|
this.renderOptions = {
|
|
1714
1690
|
beamWidth: 5,
|
|
1715
1691
|
maxSlope: 0.25,
|
|
@@ -1735,7 +1711,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1735
1711
|
}
|
|
1736
1712
|
/** Set which note `indexes` to break the secondary beam at. */
|
|
1737
1713
|
breakSecondaryAt(indexes) {
|
|
1738
|
-
|
|
1714
|
+
this.breakOnIndexes = indexes;
|
|
1739
1715
|
return this;
|
|
1740
1716
|
}
|
|
1741
1717
|
/**
|
|
@@ -1752,7 +1728,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1752
1728
|
* ```
|
|
1753
1729
|
*/
|
|
1754
1730
|
setPartialBeamSideAt(noteIndex, side) {
|
|
1755
|
-
|
|
1731
|
+
this.forcedPartialDirections[noteIndex] = side;
|
|
1756
1732
|
return this;
|
|
1757
1733
|
}
|
|
1758
1734
|
/**
|
|
@@ -1760,7 +1736,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1760
1736
|
* that does not connect to any other notes).
|
|
1761
1737
|
*/
|
|
1762
1738
|
unsetPartialBeamSideAt(noteIndex) {
|
|
1763
|
-
delete
|
|
1739
|
+
delete this.forcedPartialDirections[noteIndex];
|
|
1764
1740
|
return this;
|
|
1765
1741
|
}
|
|
1766
1742
|
/**
|
|
@@ -1775,7 +1751,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1775
1751
|
/** Calculate the best possible slope for the provided notes. */
|
|
1776
1752
|
calculateSlope() {
|
|
1777
1753
|
const { notes, renderOptions: { maxSlope, minSlope, slopeIterations, slopeCost }, } = this;
|
|
1778
|
-
const stemDirection =
|
|
1754
|
+
const stemDirection = this._stemDirection;
|
|
1779
1755
|
const firstNote = notes[0];
|
|
1780
1756
|
const initialSlope = getStemSlope(firstNote, notes[notes.length - 1]);
|
|
1781
1757
|
const increment = (maxSlope - minSlope) / slopeIterations;
|
|
@@ -1819,12 +1795,12 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1819
1795
|
}
|
|
1820
1796
|
}
|
|
1821
1797
|
this.slope = bestSlope;
|
|
1822
|
-
|
|
1798
|
+
this.yShift = yShift;
|
|
1823
1799
|
}
|
|
1824
1800
|
/** Calculate a slope and y-shift for flat beams. */
|
|
1825
1801
|
calculateFlatSlope() {
|
|
1826
1802
|
const { notes, renderOptions: { beamWidth, minFlatBeamOffset, flatBeamOffset }, } = this;
|
|
1827
|
-
const stemDirection =
|
|
1803
|
+
const stemDirection = this._stemDirection;
|
|
1828
1804
|
// If a flat beam offset has not yet been supplied or calculated,
|
|
1829
1805
|
// generate one based on the notes in this particular note group
|
|
1830
1806
|
let total = 0;
|
|
@@ -1876,7 +1852,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1876
1852
|
}
|
|
1877
1853
|
// For flat beams, the slope and yShift are 0.
|
|
1878
1854
|
this.slope = 0;
|
|
1879
|
-
|
|
1855
|
+
this.yShift = 0;
|
|
1880
1856
|
}
|
|
1881
1857
|
/** Return the Beam y offset. */
|
|
1882
1858
|
getBeamYToDraw() {
|
|
@@ -1896,8 +1872,8 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1896
1872
|
*/
|
|
1897
1873
|
applyStemExtensions() {
|
|
1898
1874
|
const { notes, slope, renderOptions: { showStemlets, stemletExtension, beamWidth }, } = this;
|
|
1899
|
-
const yShift =
|
|
1900
|
-
const beamCount =
|
|
1875
|
+
const yShift = this.yShift;
|
|
1876
|
+
const beamCount = this._beamCount;
|
|
1901
1877
|
const firstNote = notes[0];
|
|
1902
1878
|
const firstStemTipY = this.getBeamYToDraw();
|
|
1903
1879
|
const firstStemX = firstNote.getStemX();
|
|
@@ -1912,7 +1888,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1912
1888
|
const beamExtension = note.getStemDirection() === _stem__WEBPACK_IMPORTED_MODULE_2__.Stem.UP ? stemTipY - beamedStemTipY : beamedStemTipY - stemTipY;
|
|
1913
1889
|
// Determine necessary extension for cross-stave notes in the beam group
|
|
1914
1890
|
let crossStemExtension = 0;
|
|
1915
|
-
if (note.getStemDirection() !==
|
|
1891
|
+
if (note.getStemDirection() !== this._stemDirection) {
|
|
1916
1892
|
const beamCount = note.getGlyphProps().beamCount;
|
|
1917
1893
|
crossStemExtension = (1 + (beamCount - 1) * 1.5) * this.renderOptions.beamWidth;
|
|
1918
1894
|
/* This will be required if the partial beams are moved to the note side.
|
|
@@ -1937,7 +1913,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1937
1913
|
if (duration === '4') {
|
|
1938
1914
|
return BEAM_LEFT;
|
|
1939
1915
|
}
|
|
1940
|
-
const forcedBeamDirection =
|
|
1916
|
+
const forcedBeamDirection = this.forcedPartialDirections[noteIndex];
|
|
1941
1917
|
if (forcedBeamDirection)
|
|
1942
1918
|
return forcedBeamDirection;
|
|
1943
1919
|
const lookupDuration = `${_tables__WEBPACK_IMPORTED_MODULE_3__.Tables.durationToNumber(duration) / 2}`;
|
|
@@ -1973,7 +1949,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1973
1949
|
// 8th note beams are always drawn.
|
|
1974
1950
|
if (parseInt(duration, 10) >= 8) {
|
|
1975
1951
|
// First, check to see if any indexes were set up through breakSecondaryAt()
|
|
1976
|
-
shouldBreak =
|
|
1952
|
+
shouldBreak = this.breakOnIndexes.indexOf(i) !== -1;
|
|
1977
1953
|
// If the secondary breaks were auto-configured in the render options,
|
|
1978
1954
|
// handle that as well.
|
|
1979
1955
|
if (this.renderOptions.secondaryBreakTicks && tickTally >= this.renderOptions.secondaryBreakTicks) {
|
|
@@ -2078,7 +2054,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
2078
2054
|
const firstNote = this.notes[0];
|
|
2079
2055
|
let beamY = this.getBeamYToDraw();
|
|
2080
2056
|
const firstStemX = firstNote.getStemX();
|
|
2081
|
-
const beamThickness = this.renderOptions.beamWidth *
|
|
2057
|
+
const beamThickness = this.renderOptions.beamWidth * this._stemDirection;
|
|
2082
2058
|
// Draw the beams.
|
|
2083
2059
|
for (let i = 0; i < validBeamDurations.length; ++i) {
|
|
2084
2060
|
const duration = validBeamDurations[i];
|
|
@@ -2131,7 +2107,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
2131
2107
|
draw() {
|
|
2132
2108
|
const ctx = this.checkContext();
|
|
2133
2109
|
this.setRendered();
|
|
2134
|
-
if (
|
|
2110
|
+
if (this.unbeamable)
|
|
2135
2111
|
return;
|
|
2136
2112
|
if (!this.postFormatted) {
|
|
2137
2113
|
this.postFormat();
|
|
@@ -2144,7 +2120,6 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
2144
2120
|
this.restoreStyle();
|
|
2145
2121
|
}
|
|
2146
2122
|
}
|
|
2147
|
-
_Beam_stemDirection = new WeakMap(), _Beam_ticks = new WeakMap(), _Beam_yShift = new WeakMap(), _Beam_breakOnIndexes = new WeakMap(), _Beam_beamCount = new WeakMap(), _Beam_unbeamable = new WeakMap(), _Beam_forcedPartialDirections = new WeakMap();
|
|
2148
2123
|
|
|
2149
2124
|
|
|
2150
2125
|
/***/ }),
|
|
@@ -3379,7 +3354,12 @@ class ClefNote extends _note__WEBPACK_IMPORTED_MODULE_1__.Note {
|
|
|
3379
3354
|
const stave = this.checkStave();
|
|
3380
3355
|
const ctx = this.checkContext();
|
|
3381
3356
|
this.setRendered();
|
|
3382
|
-
this.clef.
|
|
3357
|
+
this.clef.setX(this.getAbsoluteX());
|
|
3358
|
+
this.clef.setY(stave.getYForLine(this.clef.line));
|
|
3359
|
+
this.clef.renderText(ctx, 0, 0);
|
|
3360
|
+
}
|
|
3361
|
+
getBoundingBox() {
|
|
3362
|
+
return this.clef.getBoundingBox();
|
|
3383
3363
|
}
|
|
3384
3364
|
}
|
|
3385
3365
|
|
|
@@ -4284,18 +4264,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
4284
4264
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
4285
4265
|
// MIT License
|
|
4286
4266
|
// @author Mohit Cheppudira
|
|
4287
|
-
var __classPrivateFieldSet = (undefined && undefined.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
4288
|
-
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
4289
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
4290
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
4291
|
-
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
4292
|
-
};
|
|
4293
|
-
var __classPrivateFieldGet = (undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
4294
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
4295
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
4296
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
4297
|
-
};
|
|
4298
|
-
var _a, _Element_txtCanvas, _Element_context, _Element_attrs, _Element_fontInfo, _Element_fontScale, _Element_text, _Element_metricsValid, _Element_textMetrics, _Element_height, _Element_width;
|
|
4299
4267
|
|
|
4300
4268
|
|
|
4301
4269
|
|
|
@@ -4321,15 +4289,15 @@ class Element {
|
|
|
4321
4289
|
return _typeguard__WEBPACK_IMPORTED_MODULE_4__.Category.Element;
|
|
4322
4290
|
}
|
|
4323
4291
|
static newID() {
|
|
4324
|
-
return `auto${
|
|
4292
|
+
return `auto${Element.ID++}`;
|
|
4325
4293
|
}
|
|
4326
4294
|
// Note: Canvas is node-canvas.
|
|
4327
4295
|
// https://www.npmjs.com/package/canvas
|
|
4328
4296
|
static setTextMeasurementCanvas(canvas /* | Canvas */) {
|
|
4329
|
-
|
|
4297
|
+
Element.txtCanvas = canvas;
|
|
4330
4298
|
}
|
|
4331
4299
|
static getTextMeasurementCanvas() {
|
|
4332
|
-
let txtCanvas =
|
|
4300
|
+
let txtCanvas = Element.txtCanvas;
|
|
4333
4301
|
// Create the canvas element that will be used to measure text.
|
|
4334
4302
|
if (!txtCanvas) {
|
|
4335
4303
|
if (typeof document !== 'undefined') {
|
|
@@ -4338,22 +4306,18 @@ class Element {
|
|
|
4338
4306
|
else if (typeof OffscreenCanvas !== 'undefined') {
|
|
4339
4307
|
txtCanvas = new OffscreenCanvas(300, 150);
|
|
4340
4308
|
}
|
|
4341
|
-
|
|
4309
|
+
Element.txtCanvas = txtCanvas;
|
|
4342
4310
|
}
|
|
4343
4311
|
return txtCanvas;
|
|
4344
4312
|
}
|
|
4345
4313
|
constructor(category) {
|
|
4346
|
-
var
|
|
4314
|
+
var _a;
|
|
4347
4315
|
// Element objects keep a list of children that they are responsible for.
|
|
4348
4316
|
// Children inherit the style from their parents (see: setGroupStyle(s)).
|
|
4349
4317
|
this.children = [];
|
|
4350
|
-
|
|
4351
|
-
|
|
4352
|
-
|
|
4353
|
-
_Element_fontScale.set(this, void 0);
|
|
4354
|
-
_Element_text.set(this, '');
|
|
4355
|
-
_Element_metricsValid.set(this, false);
|
|
4356
|
-
_Element_textMetrics.set(this, {
|
|
4318
|
+
this._text = '';
|
|
4319
|
+
this.metricsValid = false;
|
|
4320
|
+
this._textMetrics = {
|
|
4357
4321
|
fontBoundingBoxAscent: 0,
|
|
4358
4322
|
fontBoundingBoxDescent: 0,
|
|
4359
4323
|
actualBoundingBoxAscent: 0,
|
|
@@ -4366,23 +4330,23 @@ class Element {
|
|
|
4366
4330
|
emHeightDescent: 0,
|
|
4367
4331
|
hangingBaseline: 0,
|
|
4368
4332
|
ideographicBaseline: 0,
|
|
4369
|
-
}
|
|
4370
|
-
|
|
4371
|
-
|
|
4333
|
+
};
|
|
4334
|
+
this._height = 0;
|
|
4335
|
+
this._width = 0;
|
|
4372
4336
|
this.xShift = 0;
|
|
4373
4337
|
this.yShift = 0;
|
|
4374
4338
|
this.x = 0;
|
|
4375
4339
|
this.y = 0;
|
|
4376
|
-
|
|
4377
|
-
id:
|
|
4340
|
+
this.attrs = {
|
|
4341
|
+
id: Element.newID(),
|
|
4378
4342
|
type: category !== null && category !== void 0 ? category : this.constructor.CATEGORY,
|
|
4379
4343
|
class: '',
|
|
4380
|
-
}
|
|
4344
|
+
};
|
|
4381
4345
|
this.rendered = false;
|
|
4382
|
-
|
|
4383
|
-
|
|
4346
|
+
this._fontInfo = _metrics__WEBPACK_IMPORTED_MODULE_2__.Metrics.getFontInfo(this.attrs.type);
|
|
4347
|
+
this.fontScale = _metrics__WEBPACK_IMPORTED_MODULE_2__.Metrics.get(`${this.attrs.type}.fontScale`);
|
|
4384
4348
|
// If a default registry exist, then register with it right away.
|
|
4385
|
-
(
|
|
4349
|
+
(_a = _registry__WEBPACK_IMPORTED_MODULE_3__.Registry.getDefaultRegistry()) === null || _a === void 0 ? void 0 : _a.register(this);
|
|
4386
4350
|
}
|
|
4387
4351
|
/**
|
|
4388
4352
|
* Adds a child Element to the Element, which lets it inherit the
|
|
@@ -4398,7 +4362,7 @@ class Element {
|
|
|
4398
4362
|
return this;
|
|
4399
4363
|
}
|
|
4400
4364
|
getCategory() {
|
|
4401
|
-
return
|
|
4365
|
+
return this.attrs.type;
|
|
4402
4366
|
}
|
|
4403
4367
|
/**
|
|
4404
4368
|
* Set the element style used to render.
|
|
@@ -4408,7 +4372,7 @@ class Element {
|
|
|
4408
4372
|
* element.setStyle({ fillStyle: 'red', strokeStyle: 'red' });
|
|
4409
4373
|
* element.draw();
|
|
4410
4374
|
* ```
|
|
4411
|
-
* Note: If the element draws additional sub-elements (
|
|
4375
|
+
* Note: If the element draws additional sub-elements (i.e.: Modifiers in a Stave),
|
|
4412
4376
|
* the style can be applied to all of them by means of the context:
|
|
4413
4377
|
* ```typescript
|
|
4414
4378
|
* element.setStyle({ fillStyle: 'red', strokeStyle: 'red' });
|
|
@@ -4437,7 +4401,7 @@ class Element {
|
|
|
4437
4401
|
return this.style;
|
|
4438
4402
|
}
|
|
4439
4403
|
/** Apply the element style to `context`. */
|
|
4440
|
-
applyStyle(context =
|
|
4404
|
+
applyStyle(context = this.context, style = this.getStyle()) {
|
|
4441
4405
|
if (!style)
|
|
4442
4406
|
return this;
|
|
4443
4407
|
if (!context)
|
|
@@ -4458,7 +4422,7 @@ class Element {
|
|
|
4458
4422
|
return this;
|
|
4459
4423
|
}
|
|
4460
4424
|
/** Restore the style of `context`. */
|
|
4461
|
-
restoreStyle(context =
|
|
4425
|
+
restoreStyle(context = this.context, style = this.getStyle()) {
|
|
4462
4426
|
if (!style)
|
|
4463
4427
|
return this;
|
|
4464
4428
|
if (!context)
|
|
@@ -4467,7 +4431,7 @@ class Element {
|
|
|
4467
4431
|
return this;
|
|
4468
4432
|
}
|
|
4469
4433
|
/**
|
|
4470
|
-
* Draw the element and all its sub-elements (
|
|
4434
|
+
* Draw the element and all its sub-elements (i.e.: Modifiers in a Stave)
|
|
4471
4435
|
* with the element's style (see `getStyle()` and `setStyle()`)
|
|
4472
4436
|
*/
|
|
4473
4437
|
drawWithStyle() {
|
|
@@ -4482,22 +4446,22 @@ class Element {
|
|
|
4482
4446
|
}
|
|
4483
4447
|
/** Check if it has a class label (An element can have multiple class labels). */
|
|
4484
4448
|
hasClass(className) {
|
|
4485
|
-
var
|
|
4486
|
-
if (!
|
|
4449
|
+
var _a;
|
|
4450
|
+
if (!this.attrs.class)
|
|
4487
4451
|
return false;
|
|
4488
|
-
return ((
|
|
4452
|
+
return ((_a = this.attrs.class) === null || _a === void 0 ? void 0 : _a.split(' ').indexOf(className)) !== -1;
|
|
4489
4453
|
}
|
|
4490
4454
|
/** Add a class label (An element can have multiple class labels). */
|
|
4491
4455
|
addClass(className) {
|
|
4492
|
-
var
|
|
4456
|
+
var _a;
|
|
4493
4457
|
if (this.hasClass(className))
|
|
4494
4458
|
return this;
|
|
4495
|
-
if (!
|
|
4496
|
-
|
|
4459
|
+
if (!this.attrs.class)
|
|
4460
|
+
this.attrs.class = `${className}`;
|
|
4497
4461
|
else
|
|
4498
|
-
|
|
4499
|
-
(
|
|
4500
|
-
id:
|
|
4462
|
+
this.attrs.class = `${this.attrs.class} ${className}`;
|
|
4463
|
+
(_a = this.registry) === null || _a === void 0 ? void 0 : _a.onUpdate({
|
|
4464
|
+
id: this.attrs.id,
|
|
4501
4465
|
name: 'class',
|
|
4502
4466
|
value: className,
|
|
4503
4467
|
oldValue: undefined,
|
|
@@ -4506,16 +4470,16 @@ class Element {
|
|
|
4506
4470
|
}
|
|
4507
4471
|
/** Remove a class label (An element can have multiple class labels). */
|
|
4508
4472
|
removeClass(className) {
|
|
4509
|
-
var
|
|
4473
|
+
var _a, _b;
|
|
4510
4474
|
if (!this.hasClass(className))
|
|
4511
4475
|
return this;
|
|
4512
|
-
const arr = (
|
|
4476
|
+
const arr = (_a = this.attrs.class) === null || _a === void 0 ? void 0 : _a.split(' ');
|
|
4513
4477
|
if (arr) {
|
|
4514
4478
|
arr.splice(arr.indexOf(className));
|
|
4515
|
-
|
|
4479
|
+
this.attrs.class = arr.join(' ');
|
|
4516
4480
|
}
|
|
4517
|
-
(
|
|
4518
|
-
id:
|
|
4481
|
+
(_b = this.registry) === null || _b === void 0 ? void 0 : _b.onUpdate({
|
|
4482
|
+
id: this.attrs.id,
|
|
4519
4483
|
name: 'class',
|
|
4520
4484
|
value: undefined,
|
|
4521
4485
|
oldValue: className,
|
|
@@ -4538,28 +4502,28 @@ class Element {
|
|
|
4538
4502
|
}
|
|
4539
4503
|
/** Return the element attributes. */
|
|
4540
4504
|
getAttributes() {
|
|
4541
|
-
return
|
|
4505
|
+
return this.attrs;
|
|
4542
4506
|
}
|
|
4543
4507
|
/** Return an attribute, such as 'id', 'type' or 'class'. */
|
|
4544
4508
|
// eslint-disable-next-line
|
|
4545
4509
|
getAttribute(name) {
|
|
4546
|
-
return
|
|
4510
|
+
return this.attrs[name];
|
|
4547
4511
|
}
|
|
4548
4512
|
/** Return associated SVGElement. */
|
|
4549
4513
|
getSVGElement(suffix = '') {
|
|
4550
|
-
const id = (0,_util__WEBPACK_IMPORTED_MODULE_5__.prefix)(
|
|
4514
|
+
const id = (0,_util__WEBPACK_IMPORTED_MODULE_5__.prefix)(this.attrs.id + suffix);
|
|
4551
4515
|
const element = document.getElementById(id);
|
|
4552
4516
|
if (element)
|
|
4553
4517
|
return element;
|
|
4554
4518
|
}
|
|
4555
4519
|
/** Set an attribute such as 'id', 'class', or 'type'. */
|
|
4556
4520
|
setAttribute(name, value) {
|
|
4557
|
-
var
|
|
4558
|
-
const oldID =
|
|
4559
|
-
const oldValue =
|
|
4560
|
-
|
|
4521
|
+
var _a;
|
|
4522
|
+
const oldID = this.attrs.id;
|
|
4523
|
+
const oldValue = this.attrs[name];
|
|
4524
|
+
this.attrs[name] = value;
|
|
4561
4525
|
// Register with old id to support id changes.
|
|
4562
|
-
(
|
|
4526
|
+
(_a = this.registry) === null || _a === void 0 ? void 0 : _a.onUpdate({ id: oldID, name, value, oldValue });
|
|
4563
4527
|
return this;
|
|
4564
4528
|
}
|
|
4565
4529
|
/** Get the boundingBox. */
|
|
@@ -4568,16 +4532,16 @@ class Element {
|
|
|
4568
4532
|
}
|
|
4569
4533
|
/** Return the context, such as an SVGContext or CanvasContext object. */
|
|
4570
4534
|
getContext() {
|
|
4571
|
-
return
|
|
4535
|
+
return this.context;
|
|
4572
4536
|
}
|
|
4573
4537
|
/** Set the context to an SVGContext or CanvasContext object */
|
|
4574
4538
|
setContext(context) {
|
|
4575
|
-
|
|
4539
|
+
this.context = context;
|
|
4576
4540
|
return this;
|
|
4577
4541
|
}
|
|
4578
4542
|
/** Validate and return the rendering context. */
|
|
4579
4543
|
checkContext() {
|
|
4580
|
-
return (0,_util__WEBPACK_IMPORTED_MODULE_5__.defined)(
|
|
4544
|
+
return (0,_util__WEBPACK_IMPORTED_MODULE_5__.defined)(this.context, 'NoContext', 'No rendering context attached to instance.');
|
|
4581
4545
|
}
|
|
4582
4546
|
//////////////////////////////////////////////////////////////////////////////////////////////////
|
|
4583
4547
|
// Font Handling
|
|
@@ -4590,7 +4554,7 @@ class Element {
|
|
|
4590
4554
|
}
|
|
4591
4555
|
/** Returns the CSS compatible font string for the text font. */
|
|
4592
4556
|
get font() {
|
|
4593
|
-
return _font__WEBPACK_IMPORTED_MODULE_1__.Font.toCSSString(
|
|
4557
|
+
return _font__WEBPACK_IMPORTED_MODULE_1__.Font.toCSSString(this._fontInfo);
|
|
4594
4558
|
}
|
|
4595
4559
|
/**
|
|
4596
4560
|
* Set the element's text font family, size, weight, style
|
|
@@ -4608,25 +4572,25 @@ class Element {
|
|
|
4608
4572
|
* Each Element subclass may specify its own default by overriding the static `TEXT_FONT` property.
|
|
4609
4573
|
*/
|
|
4610
4574
|
setFont(font, size, weight, style) {
|
|
4611
|
-
const defaultTextFont = _metrics__WEBPACK_IMPORTED_MODULE_2__.Metrics.getFontInfo(
|
|
4575
|
+
const defaultTextFont = _metrics__WEBPACK_IMPORTED_MODULE_2__.Metrics.getFontInfo(this.attrs.type);
|
|
4612
4576
|
const fontIsObject = typeof font === 'object';
|
|
4613
4577
|
const fontIsString = typeof font === 'string';
|
|
4614
4578
|
const sizeWeightStyleAreUndefined = size === undefined && weight === undefined && style === undefined;
|
|
4615
|
-
|
|
4579
|
+
this.metricsValid = false;
|
|
4616
4580
|
if (fontIsObject) {
|
|
4617
4581
|
// `font` is case 1) a FontInfo object
|
|
4618
|
-
|
|
4582
|
+
this._fontInfo = Object.assign(Object.assign({}, defaultTextFont), font);
|
|
4619
4583
|
}
|
|
4620
4584
|
else if (fontIsString && sizeWeightStyleAreUndefined) {
|
|
4621
4585
|
// `font` is case 2) CSS font shorthand.
|
|
4622
|
-
|
|
4586
|
+
this._fontInfo = _font__WEBPACK_IMPORTED_MODULE_1__.Font.fromCSSString(font);
|
|
4623
4587
|
}
|
|
4624
4588
|
else {
|
|
4625
4589
|
// `font` is case 3) a font family string (e.g., 'Times New Roman').
|
|
4626
4590
|
// The other parameters represent the size, weight, and style.
|
|
4627
4591
|
// It is okay for `font` to be undefined while one or more of the other arguments is provided.
|
|
4628
4592
|
// Following CSS conventions, unspecified params are reset to the default.
|
|
4629
|
-
|
|
4593
|
+
this._fontInfo = _font__WEBPACK_IMPORTED_MODULE_1__.Font.validate(font !== null && font !== void 0 ? font : defaultTextFont.family, size !== null && size !== void 0 ? size : defaultTextFont.size, weight !== null && weight !== void 0 ? weight : defaultTextFont.weight, style !== null && style !== void 0 ? style : defaultTextFont.style);
|
|
4630
4594
|
}
|
|
4631
4595
|
return this;
|
|
4632
4596
|
}
|
|
@@ -4635,13 +4599,13 @@ class Element {
|
|
|
4635
4599
|
* 'bold 10pt Arial'.
|
|
4636
4600
|
*/
|
|
4637
4601
|
getFont() {
|
|
4638
|
-
return _font__WEBPACK_IMPORTED_MODULE_1__.Font.toCSSString(
|
|
4602
|
+
return _font__WEBPACK_IMPORTED_MODULE_1__.Font.toCSSString(this._fontInfo);
|
|
4639
4603
|
}
|
|
4640
4604
|
/** Return a copy of the current FontInfo object. */
|
|
4641
4605
|
get fontInfo() {
|
|
4642
4606
|
// We can cast to Required<FontInfo> here, because
|
|
4643
4607
|
// we just called resetFont() above to ensure this.fontInfo is set.
|
|
4644
|
-
return
|
|
4608
|
+
return this._fontInfo;
|
|
4645
4609
|
}
|
|
4646
4610
|
/** Set the current FontInfo object. */
|
|
4647
4611
|
set fontInfo(fontInfo) {
|
|
@@ -4661,7 +4625,7 @@ class Element {
|
|
|
4661
4625
|
return this.fontSize;
|
|
4662
4626
|
}
|
|
4663
4627
|
getFontScale() {
|
|
4664
|
-
return
|
|
4628
|
+
return this.fontScale;
|
|
4665
4629
|
}
|
|
4666
4630
|
/**
|
|
4667
4631
|
* The size is 1) a string of the form '10pt' or '16px', compatible with the CSS font-size property.
|
|
@@ -4712,9 +4676,9 @@ class Element {
|
|
|
4712
4676
|
return this.width;
|
|
4713
4677
|
}
|
|
4714
4678
|
get width() {
|
|
4715
|
-
if (!
|
|
4679
|
+
if (!this.metricsValid)
|
|
4716
4680
|
this.measureText();
|
|
4717
|
-
return
|
|
4681
|
+
return this._width;
|
|
4718
4682
|
}
|
|
4719
4683
|
/** Set element width. */
|
|
4720
4684
|
setWidth(width) {
|
|
@@ -4722,9 +4686,9 @@ class Element {
|
|
|
4722
4686
|
return this;
|
|
4723
4687
|
}
|
|
4724
4688
|
set width(width) {
|
|
4725
|
-
if (!
|
|
4689
|
+
if (!this.metricsValid)
|
|
4726
4690
|
this.measureText();
|
|
4727
|
-
|
|
4691
|
+
this._width = width;
|
|
4728
4692
|
}
|
|
4729
4693
|
/** Set the X coordinate. */
|
|
4730
4694
|
setX(x) {
|
|
@@ -4768,49 +4732,50 @@ class Element {
|
|
|
4768
4732
|
return this;
|
|
4769
4733
|
}
|
|
4770
4734
|
set text(text) {
|
|
4771
|
-
|
|
4772
|
-
|
|
4735
|
+
this.metricsValid = false;
|
|
4736
|
+
this._text = text;
|
|
4773
4737
|
}
|
|
4774
4738
|
/** Get element text. */
|
|
4775
4739
|
getText() {
|
|
4776
|
-
return
|
|
4740
|
+
return this._text;
|
|
4777
4741
|
}
|
|
4778
4742
|
get text() {
|
|
4779
|
-
return
|
|
4743
|
+
return this._text;
|
|
4780
4744
|
}
|
|
4781
4745
|
/** Render the element text. */
|
|
4782
4746
|
renderText(ctx, xPos, yPos) {
|
|
4783
4747
|
ctx.save();
|
|
4784
|
-
ctx.setFont(
|
|
4785
|
-
ctx.fillText(
|
|
4748
|
+
ctx.setFont(this._fontInfo);
|
|
4749
|
+
ctx.fillText(this._text, xPos + this.x + this.xShift, yPos + this.y + this.yShift);
|
|
4786
4750
|
this.children.forEach((child) => {
|
|
4787
|
-
|
|
4788
|
-
ctx.
|
|
4751
|
+
// changed -- do not look at private attributes of children.
|
|
4752
|
+
ctx.setFont(child.fontInfo);
|
|
4753
|
+
ctx.fillText(child.text, xPos + child.x + child.xShift, yPos + child.y + child.yShift);
|
|
4789
4754
|
});
|
|
4790
4755
|
ctx.restore();
|
|
4791
4756
|
}
|
|
4792
4757
|
/** Measure the text using the textFont. */
|
|
4793
4758
|
measureText() {
|
|
4794
|
-
var
|
|
4759
|
+
var _a;
|
|
4795
4760
|
// TODO: What about SVG.getBBox()?
|
|
4796
4761
|
// https://developer.mozilla.org/en-US/docs/Web/API/SVGGraphicsElement/getBBox
|
|
4797
|
-
const context = (
|
|
4762
|
+
const context = (_a = Element.getTextMeasurementCanvas()) === null || _a === void 0 ? void 0 : _a.getContext('2d');
|
|
4798
4763
|
if (!context) {
|
|
4799
4764
|
// eslint-disable-next-line no-console
|
|
4800
4765
|
console.warn('Element: No context for txtCanvas. Returning empty text metrics.');
|
|
4801
|
-
return
|
|
4766
|
+
return this._textMetrics;
|
|
4802
4767
|
}
|
|
4803
|
-
context.font = _font__WEBPACK_IMPORTED_MODULE_1__.Font.toCSSString(_font__WEBPACK_IMPORTED_MODULE_1__.Font.validate(
|
|
4804
|
-
|
|
4805
|
-
|
|
4806
|
-
|
|
4807
|
-
|
|
4808
|
-
return
|
|
4768
|
+
context.font = _font__WEBPACK_IMPORTED_MODULE_1__.Font.toCSSString(_font__WEBPACK_IMPORTED_MODULE_1__.Font.validate(this.fontInfo));
|
|
4769
|
+
this._textMetrics = context.measureText(this.text);
|
|
4770
|
+
this._height = this._textMetrics.actualBoundingBoxAscent + this._textMetrics.actualBoundingBoxDescent;
|
|
4771
|
+
this._width = this._textMetrics.width;
|
|
4772
|
+
this.metricsValid = true;
|
|
4773
|
+
return this._textMetrics;
|
|
4809
4774
|
}
|
|
4810
4775
|
/** Measure the text using the FontInfo related with key. */
|
|
4811
4776
|
static measureWidth(text, key = '') {
|
|
4812
|
-
var
|
|
4813
|
-
const context = (
|
|
4777
|
+
var _a;
|
|
4778
|
+
const context = (_a = Element.getTextMeasurementCanvas()) === null || _a === void 0 ? void 0 : _a.getContext('2d');
|
|
4814
4779
|
if (!context) {
|
|
4815
4780
|
// eslint-disable-next-line no-console
|
|
4816
4781
|
console.warn('Element: No context for txtCanvas. Returning empty text metrics.');
|
|
@@ -4824,23 +4789,23 @@ class Element {
|
|
|
4824
4789
|
return this.textMetrics;
|
|
4825
4790
|
}
|
|
4826
4791
|
get textMetrics() {
|
|
4827
|
-
if (!
|
|
4792
|
+
if (!this.metricsValid)
|
|
4828
4793
|
this.measureText();
|
|
4829
|
-
return
|
|
4794
|
+
return this._textMetrics;
|
|
4830
4795
|
}
|
|
4831
4796
|
/** Get the text height. */
|
|
4832
4797
|
getHeight() {
|
|
4833
4798
|
return this.height;
|
|
4834
4799
|
}
|
|
4835
4800
|
get height() {
|
|
4836
|
-
if (!
|
|
4801
|
+
if (!this.metricsValid)
|
|
4837
4802
|
this.measureText();
|
|
4838
|
-
return
|
|
4803
|
+
return this._height;
|
|
4839
4804
|
}
|
|
4840
4805
|
set height(height) {
|
|
4841
|
-
if (!
|
|
4806
|
+
if (!this.metricsValid)
|
|
4842
4807
|
this.measureText();
|
|
4843
|
-
|
|
4808
|
+
this._height = height;
|
|
4844
4809
|
}
|
|
4845
4810
|
setOriginX(x) {
|
|
4846
4811
|
const bbox = this.getBoundingBox();
|
|
@@ -4859,10 +4824,7 @@ class Element {
|
|
|
4859
4824
|
this.setOriginY(y);
|
|
4860
4825
|
}
|
|
4861
4826
|
}
|
|
4862
|
-
_a = Element, _Element_context = new WeakMap(), _Element_attrs = new WeakMap(), _Element_fontInfo = new WeakMap(), _Element_fontScale = new WeakMap(), _Element_text = new WeakMap(), _Element_metricsValid = new WeakMap(), _Element_textMetrics = new WeakMap(), _Element_height = new WeakMap(), _Element_width = new WeakMap();
|
|
4863
4827
|
Element.ID = 1000;
|
|
4864
|
-
/** Canvas used to measure text. See measureText(): TextMetrics. */
|
|
4865
|
-
_Element_txtCanvas = { value: void 0 };
|
|
4866
4828
|
|
|
4867
4829
|
|
|
4868
4830
|
/***/ }),
|
|
@@ -5822,7 +5784,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
5822
5784
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
5823
5785
|
/* harmony export */ Gonville: () => (/* binding */ Gonville)
|
|
5824
5786
|
/* harmony export */ });
|
|
5825
|
-
const Gonville = 'data:font/woff2;charset=utf-8;base64,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';
|
|
5787
|
+
const Gonville = 'data:font/woff2;charset=utf-8;base64,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';
|
|
5826
5788
|
|
|
5827
5789
|
|
|
5828
5790
|
/***/ }),
|
|
@@ -5960,7 +5922,7 @@ function getRestLineForNextNoteGroup(notes, currRestLine, currNoteIndex, compare
|
|
|
5960
5922
|
break;
|
|
5961
5923
|
}
|
|
5962
5924
|
}
|
|
5963
|
-
// Locate the
|
|
5925
|
+
// Locate the midpoint between two lines.
|
|
5964
5926
|
if (compare && currRestLine !== nextRestLine) {
|
|
5965
5927
|
const top = Math.max(currRestLine, nextRestLine);
|
|
5966
5928
|
const bot = Math.min(currRestLine, nextRestLine);
|
|
@@ -5992,10 +5954,10 @@ class Formatter {
|
|
|
5992
5954
|
static SimpleFormat(notes, x = 0, { paddingBetween = 10 } = {}) {
|
|
5993
5955
|
notes.reduce((accumulator, note) => {
|
|
5994
5956
|
note.addToModifierContext(new _modifiercontext__WEBPACK_IMPORTED_MODULE_3__.ModifierContext());
|
|
5995
|
-
const
|
|
5996
|
-
const metrics =
|
|
5997
|
-
|
|
5998
|
-
return accumulator +
|
|
5957
|
+
const tickContext = new _tickcontext__WEBPACK_IMPORTED_MODULE_7__.TickContext().addTickable(note).preFormat();
|
|
5958
|
+
const metrics = tickContext.getMetrics();
|
|
5959
|
+
tickContext.setX(accumulator + metrics.totalLeftPx);
|
|
5960
|
+
return accumulator + tickContext.getWidth() + metrics.totalRightPx + paddingBetween;
|
|
5999
5961
|
}, x);
|
|
6000
5962
|
}
|
|
6001
5963
|
/** Helper function to plot formatter debug info. */
|
|
@@ -6174,7 +6136,7 @@ class Formatter {
|
|
|
6174
6136
|
this.lossHistory = [];
|
|
6175
6137
|
}
|
|
6176
6138
|
/**
|
|
6177
|
-
* Find all the rests in each of the `voices` and align them to neighboring notes.
|
|
6139
|
+
* Find all the rests in each of the `voices` and align them vertically to neighboring notes.
|
|
6178
6140
|
*
|
|
6179
6141
|
* @param voices
|
|
6180
6142
|
* @param alignAllNotes If `false`, only align rests within beamed groups of notes. If `true`, align all rests.
|
|
@@ -6585,11 +6547,12 @@ class Formatter {
|
|
|
6585
6547
|
function updateStats(duration, space) {
|
|
6586
6548
|
const stats = durationStats[duration];
|
|
6587
6549
|
if (stats === undefined) {
|
|
6588
|
-
durationStats[duration] = { mean: space, count: 1 };
|
|
6550
|
+
durationStats[duration] = { mean: space, count: 1, total: space };
|
|
6589
6551
|
}
|
|
6590
6552
|
else {
|
|
6591
6553
|
stats.count += 1;
|
|
6592
|
-
stats.
|
|
6554
|
+
stats.total += space;
|
|
6555
|
+
stats.mean = stats.total / stats.count;
|
|
6593
6556
|
}
|
|
6594
6557
|
}
|
|
6595
6558
|
this.voices.forEach((voice) => {
|
|
@@ -6638,8 +6601,9 @@ class Formatter {
|
|
|
6638
6601
|
* the overall "loss" (or cost) of this layout, and repositions tickcontexts in an
|
|
6639
6602
|
* attempt to reduce the cost. You can call this method multiple times until it finds
|
|
6640
6603
|
* and oscillates around a global minimum.
|
|
6604
|
+
* @param options parameters for tuning, currently just "alpha".
|
|
6641
6605
|
* @param options[alpha] the "learning rate" for the formatter. It determines how much of a shift
|
|
6642
|
-
* the formatter should make based on its cost function.
|
|
6606
|
+
* the formatter should make based on its cost function. Defaults to 0.5.
|
|
6643
6607
|
*/
|
|
6644
6608
|
tune(options) {
|
|
6645
6609
|
var _a;
|
|
@@ -6648,25 +6612,17 @@ class Formatter {
|
|
|
6648
6612
|
return 0;
|
|
6649
6613
|
}
|
|
6650
6614
|
const alpha = (_a = options === null || options === void 0 ? void 0 : options.alpha) !== null && _a !== void 0 ? _a : 0.5;
|
|
6651
|
-
//
|
|
6652
|
-
// on adjacent tickcontexts.
|
|
6653
|
-
function move(current, shift, prev, next) {
|
|
6654
|
-
current.setX(current.getX() + shift);
|
|
6655
|
-
current.getFormatterMetrics().freedom.left += shift;
|
|
6656
|
-
current.getFormatterMetrics().freedom.right -= shift;
|
|
6657
|
-
if (prev)
|
|
6658
|
-
prev.getFormatterMetrics().freedom.right += shift;
|
|
6659
|
-
if (next)
|
|
6660
|
-
next.getFormatterMetrics().freedom.left -= shift;
|
|
6661
|
-
}
|
|
6615
|
+
// function `move` moved to tickcontext.
|
|
6662
6616
|
let shift = 0;
|
|
6663
6617
|
this.totalShift = 0;
|
|
6664
6618
|
contexts.list.forEach((tick, index, list) => {
|
|
6665
6619
|
const context = contexts.map[tick];
|
|
6666
6620
|
const prevContext = index > 0 ? contexts.map[list[index - 1]] : undefined;
|
|
6667
6621
|
const nextContext = index < list.length - 1 ? contexts.map[list[index + 1]] : undefined;
|
|
6668
|
-
move(
|
|
6669
|
-
|
|
6622
|
+
context.move(shift, prevContext, nextContext);
|
|
6623
|
+
// Q(msac): Should the cost by normalized by the number
|
|
6624
|
+
// of tickables at this position? If so, switch this to getAverageDeviationCost()
|
|
6625
|
+
const cost = -context.getDeviationCost();
|
|
6670
6626
|
if (cost > 0) {
|
|
6671
6627
|
shift = -Math.min(context.getFormatterMetrics().freedom.right, Math.abs(cost));
|
|
6672
6628
|
}
|
|
@@ -6714,7 +6670,7 @@ class Formatter {
|
|
|
6714
6670
|
* Voices are full justified to fit in `justifyWidth` pixels.
|
|
6715
6671
|
*
|
|
6716
6672
|
* Set `options.context` to the rendering context. Set `options.alignRests`
|
|
6717
|
-
* to true to enable rest alignment.
|
|
6673
|
+
* to true to enable rest vertical alignment.
|
|
6718
6674
|
*/
|
|
6719
6675
|
format(voices, justifyWidth, options) {
|
|
6720
6676
|
const opts = Object.assign({ alignRests: false }, options);
|
|
@@ -6767,12 +6723,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
6767
6723
|
//
|
|
6768
6724
|
// @author Joshua Koo / @zz85
|
|
6769
6725
|
// @author @incompleteopus
|
|
6770
|
-
var __classPrivateFieldGet = (undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
6771
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
6772
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
6773
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
6774
|
-
};
|
|
6775
|
-
var _a, _Fraction_fractionA, _Fraction_fractionB;
|
|
6776
6726
|
|
|
6777
6727
|
|
|
6778
6728
|
/** Fraction represents a rational number. */
|
|
@@ -6798,9 +6748,13 @@ class Fraction {
|
|
|
6798
6748
|
}
|
|
6799
6749
|
/** LCM: Lowest common multiple. */
|
|
6800
6750
|
static LCM(a, b) {
|
|
6801
|
-
return (a * b) /
|
|
6751
|
+
return (a * b) / Fraction.GCD(a, b);
|
|
6802
6752
|
}
|
|
6803
|
-
/** Lowest common multiple for more than two numbers.
|
|
6753
|
+
/** Lowest common multiple for more than two numbers.
|
|
6754
|
+
*
|
|
6755
|
+
* Note that the `args` array will be manipulated and shortened recursively during
|
|
6756
|
+
* computation.
|
|
6757
|
+
*/
|
|
6804
6758
|
static LCMM(args) {
|
|
6805
6759
|
if (args.length === 0) {
|
|
6806
6760
|
return 0;
|
|
@@ -6809,12 +6763,12 @@ class Fraction {
|
|
|
6809
6763
|
return args[0];
|
|
6810
6764
|
}
|
|
6811
6765
|
else if (args.length === 2) {
|
|
6812
|
-
return
|
|
6766
|
+
return Fraction.LCM(args[0], args[1]);
|
|
6813
6767
|
}
|
|
6814
6768
|
else {
|
|
6815
6769
|
// args.shift() removes the first number.
|
|
6816
6770
|
// LCM the first number with the rest of the numbers.
|
|
6817
|
-
return
|
|
6771
|
+
return Fraction.LCM(args.shift(), Fraction.LCMM(args));
|
|
6818
6772
|
}
|
|
6819
6773
|
}
|
|
6820
6774
|
/** Set the numerator and denominator. */
|
|
@@ -6837,7 +6791,7 @@ class Fraction {
|
|
|
6837
6791
|
simplify() {
|
|
6838
6792
|
let u = this.numerator;
|
|
6839
6793
|
let d = this.denominator;
|
|
6840
|
-
const gcd =
|
|
6794
|
+
const gcd = Fraction.GCD(u, d);
|
|
6841
6795
|
u /= gcd;
|
|
6842
6796
|
d /= gcd;
|
|
6843
6797
|
if (d < 0) {
|
|
@@ -6849,16 +6803,16 @@ class Fraction {
|
|
|
6849
6803
|
/** Add value of another fraction. */
|
|
6850
6804
|
add(param1 = 0, param2 = 1) {
|
|
6851
6805
|
const [otherNumerator, otherDenominator] = getNumeratorAndDenominator(param1, param2);
|
|
6852
|
-
const lcm =
|
|
6806
|
+
const lcm = Fraction.LCM(this.denominator, otherDenominator);
|
|
6853
6807
|
const a = lcm / this.denominator;
|
|
6854
6808
|
const b = lcm / otherDenominator;
|
|
6855
6809
|
const u = this.numerator * a + otherNumerator * b;
|
|
6856
6810
|
return this.set(u, lcm);
|
|
6857
6811
|
}
|
|
6858
|
-
/**
|
|
6812
|
+
/** Subtract value of another fraction. */
|
|
6859
6813
|
subtract(param1 = 0, param2 = 1) {
|
|
6860
6814
|
const [otherNumerator, otherDenominator] = getNumeratorAndDenominator(param1, param2);
|
|
6861
|
-
const lcm =
|
|
6815
|
+
const lcm = Fraction.LCM(this.denominator, otherDenominator);
|
|
6862
6816
|
const a = lcm / this.denominator;
|
|
6863
6817
|
const b = lcm / otherDenominator;
|
|
6864
6818
|
const u = this.numerator * a - otherNumerator * b;
|
|
@@ -6876,19 +6830,19 @@ class Fraction {
|
|
|
6876
6830
|
}
|
|
6877
6831
|
/** Simplify both sides and check if they are equal. */
|
|
6878
6832
|
equals(compare) {
|
|
6879
|
-
const a =
|
|
6880
|
-
const b =
|
|
6833
|
+
const a = Fraction.fractionA.copy(compare).simplify();
|
|
6834
|
+
const b = Fraction.fractionB.copy(this).simplify();
|
|
6881
6835
|
return a.numerator === b.numerator && a.denominator === b.denominator;
|
|
6882
6836
|
}
|
|
6883
6837
|
/** Greater than operator. */
|
|
6884
6838
|
greaterThan(compare) {
|
|
6885
|
-
const a =
|
|
6839
|
+
const a = Fraction.fractionA.copy(this);
|
|
6886
6840
|
a.subtract(compare);
|
|
6887
6841
|
return a.numerator > 0;
|
|
6888
6842
|
}
|
|
6889
6843
|
/** Greater than or equals operator. */
|
|
6890
6844
|
greaterThanEquals(compare) {
|
|
6891
|
-
const a =
|
|
6845
|
+
const a = Fraction.fractionA.copy(this);
|
|
6892
6846
|
a.subtract(compare);
|
|
6893
6847
|
return a.numerator >= 0;
|
|
6894
6848
|
}
|
|
@@ -6902,7 +6856,7 @@ class Fraction {
|
|
|
6902
6856
|
}
|
|
6903
6857
|
/** Return a new copy with current values. */
|
|
6904
6858
|
clone() {
|
|
6905
|
-
return new
|
|
6859
|
+
return new Fraction(this.numerator, this.denominator);
|
|
6906
6860
|
}
|
|
6907
6861
|
/** Copy value of another fraction. */
|
|
6908
6862
|
copy(other) {
|
|
@@ -6913,11 +6867,11 @@ class Fraction {
|
|
|
6913
6867
|
return this.set(other.numerator, other.denominator);
|
|
6914
6868
|
}
|
|
6915
6869
|
}
|
|
6916
|
-
/** Return the integer component (
|
|
6870
|
+
/** Return the integer component (e.g. 5/2 => 2). */
|
|
6917
6871
|
quotient() {
|
|
6918
6872
|
return Math.floor(this.numerator / this.denominator);
|
|
6919
6873
|
}
|
|
6920
|
-
/** Return the remainder component (
|
|
6874
|
+
/** Return the remainder component (e.g. 5/2 => 1). */
|
|
6921
6875
|
remainder() {
|
|
6922
6876
|
return this.numerator % this.denominator;
|
|
6923
6877
|
}
|
|
@@ -6927,19 +6881,19 @@ class Fraction {
|
|
|
6927
6881
|
this.numerator = Math.abs(this.numerator);
|
|
6928
6882
|
return this;
|
|
6929
6883
|
}
|
|
6930
|
-
/** Return a raw string representation (
|
|
6884
|
+
/** Return a raw string representation (e.g. "5/2"). */
|
|
6931
6885
|
toString() {
|
|
6932
6886
|
return `${this.numerator}/${this.denominator}`;
|
|
6933
6887
|
}
|
|
6934
|
-
/** Return a simplified string
|
|
6888
|
+
/** Return a simplified string representation. */
|
|
6935
6889
|
toSimplifiedString() {
|
|
6936
|
-
return
|
|
6890
|
+
return Fraction.fractionA.copy(this).simplify().toString();
|
|
6937
6891
|
}
|
|
6938
6892
|
/** Return string representation in mixed form. */
|
|
6939
6893
|
toMixedString() {
|
|
6940
6894
|
let s = '';
|
|
6941
6895
|
const q = this.quotient();
|
|
6942
|
-
const f =
|
|
6896
|
+
const f = Fraction.fractionA.copy(this);
|
|
6943
6897
|
if (q < 0) {
|
|
6944
6898
|
f.makeAbs();
|
|
6945
6899
|
}
|
|
@@ -6965,10 +6919,9 @@ class Fraction {
|
|
|
6965
6919
|
return this.set(n, d);
|
|
6966
6920
|
}
|
|
6967
6921
|
}
|
|
6968
|
-
_a = Fraction;
|
|
6969
6922
|
// Cached objects for comparisons.
|
|
6970
|
-
|
|
6971
|
-
|
|
6923
|
+
Fraction.fractionA = new Fraction();
|
|
6924
|
+
Fraction.fractionB = new Fraction();
|
|
6972
6925
|
/** Helper function to extract the numerator and denominator from another fraction. */
|
|
6973
6926
|
function getNumeratorAndDenominator(n, d = 1) {
|
|
6974
6927
|
if (typeof n === 'number') {
|
|
@@ -7283,8 +7236,9 @@ class GlyphNote extends _note__WEBPACK_IMPORTED_MODULE_0__.Note {
|
|
|
7283
7236
|
this.setRendered();
|
|
7284
7237
|
this.applyStyle(ctx);
|
|
7285
7238
|
ctx.openGroup('glyphNote', this.getAttribute('id'));
|
|
7286
|
-
|
|
7287
|
-
this.
|
|
7239
|
+
this.x = this.isCenterAligned() ? this.getAbsoluteX() - this.getWidth() / 2 : this.getAbsoluteX();
|
|
7240
|
+
this.y = stave.getYForLine(this.options.line);
|
|
7241
|
+
this.renderText(ctx, 0, 0);
|
|
7288
7242
|
this.drawModifiers();
|
|
7289
7243
|
ctx.closeGroup();
|
|
7290
7244
|
this.restoreStyle(ctx);
|
|
@@ -14460,6 +14414,9 @@ const MetricsDefaults = {
|
|
|
14460
14414
|
fontStyle: 'italic',
|
|
14461
14415
|
fontWeight: 'bold',
|
|
14462
14416
|
},
|
|
14417
|
+
TabStave: {
|
|
14418
|
+
fontSize: 8,
|
|
14419
|
+
},
|
|
14463
14420
|
TabTie: {
|
|
14464
14421
|
fontSize: 10,
|
|
14465
14422
|
},
|
|
@@ -14500,18 +14457,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
14500
14457
|
/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./util */ "./src/util.ts");
|
|
14501
14458
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
14502
14459
|
// MIT License
|
|
14503
|
-
var __classPrivateFieldSet = (undefined && undefined.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
14504
|
-
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
14505
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
14506
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
14507
|
-
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
14508
|
-
};
|
|
14509
|
-
var __classPrivateFieldGet = (undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
14510
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
14511
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
14512
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
14513
|
-
};
|
|
14514
|
-
var _Modifier_spacingFromNextModifier, _Modifier_modifierContext;
|
|
14515
14460
|
|
|
14516
14461
|
|
|
14517
14462
|
|
|
@@ -14560,13 +14505,11 @@ class Modifier extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
14560
14505
|
}
|
|
14561
14506
|
constructor() {
|
|
14562
14507
|
super();
|
|
14563
|
-
_Modifier_spacingFromNextModifier.set(this, void 0);
|
|
14564
|
-
_Modifier_modifierContext.set(this, void 0);
|
|
14565
14508
|
this.width = 0;
|
|
14566
14509
|
// The `textLine` is reserved space above or below a stave.
|
|
14567
14510
|
this.textLine = 0;
|
|
14568
14511
|
this.position = Modifier.Position.LEFT;
|
|
14569
|
-
|
|
14512
|
+
this.spacingFromNextModifier = 0;
|
|
14570
14513
|
}
|
|
14571
14514
|
/** Called when position changes. */
|
|
14572
14515
|
reset() {
|
|
@@ -14608,15 +14551,15 @@ class Modifier extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
14608
14551
|
}
|
|
14609
14552
|
/** Get `ModifierContext`. */
|
|
14610
14553
|
getModifierContext() {
|
|
14611
|
-
return
|
|
14554
|
+
return this.modifierContext;
|
|
14612
14555
|
}
|
|
14613
14556
|
/** Check and get `ModifierContext`. */
|
|
14614
14557
|
checkModifierContext() {
|
|
14615
|
-
return (0,_util__WEBPACK_IMPORTED_MODULE_2__.defined)(
|
|
14558
|
+
return (0,_util__WEBPACK_IMPORTED_MODULE_2__.defined)(this.modifierContext, 'NoModifierContext', 'Modifier Context Required');
|
|
14616
14559
|
}
|
|
14617
14560
|
/** Every modifier must be part of a `ModifierContext`. */
|
|
14618
14561
|
setModifierContext(c) {
|
|
14619
|
-
|
|
14562
|
+
this.modifierContext = c;
|
|
14620
14563
|
return this;
|
|
14621
14564
|
}
|
|
14622
14565
|
/** Get position. */
|
|
@@ -14644,11 +14587,11 @@ class Modifier extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
14644
14587
|
}
|
|
14645
14588
|
/** Set spacing from next modifier. */
|
|
14646
14589
|
setSpacingFromNextModifier(x) {
|
|
14647
|
-
|
|
14590
|
+
this.spacingFromNextModifier = x;
|
|
14648
14591
|
}
|
|
14649
14592
|
/** Get spacing from next modifier. */
|
|
14650
14593
|
getSpacingFromNextModifier() {
|
|
14651
|
-
return
|
|
14594
|
+
return this.spacingFromNextModifier;
|
|
14652
14595
|
}
|
|
14653
14596
|
/**
|
|
14654
14597
|
* Shift modifier `x` pixels in the direction of the modifier. Negative values
|
|
@@ -14688,7 +14631,6 @@ class Modifier extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
14688
14631
|
});
|
|
14689
14632
|
}
|
|
14690
14633
|
}
|
|
14691
|
-
_Modifier_spacingFromNextModifier = new WeakMap(), _Modifier_modifierContext = new WeakMap();
|
|
14692
14634
|
|
|
14693
14635
|
|
|
14694
14636
|
/***/ }),
|
|
@@ -14886,18 +14828,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
14886
14828
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
14887
14829
|
//
|
|
14888
14830
|
// This class implements multiple measure rests.
|
|
14889
|
-
var __classPrivateFieldSet = (undefined && undefined.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
14890
|
-
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
14891
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
14892
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
14893
|
-
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
14894
|
-
};
|
|
14895
|
-
var __classPrivateFieldGet = (undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
14896
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
14897
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
14898
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
14899
|
-
};
|
|
14900
|
-
var _MultiMeasureRest_hasPaddingLeft, _MultiMeasureRest_hasPaddingRight, _MultiMeasureRest_hasLineThickness, _MultiMeasureRest_hasSymbolSpacing;
|
|
14901
14831
|
|
|
14902
14832
|
|
|
14903
14833
|
|
|
@@ -14918,10 +14848,10 @@ class MultiMeasureRest extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
14918
14848
|
var _a;
|
|
14919
14849
|
super();
|
|
14920
14850
|
this.xs = { left: NaN, right: NaN };
|
|
14921
|
-
|
|
14922
|
-
|
|
14923
|
-
|
|
14924
|
-
|
|
14851
|
+
this.hasPaddingLeft = false;
|
|
14852
|
+
this.hasPaddingRight = false;
|
|
14853
|
+
this.hasLineThickness = false;
|
|
14854
|
+
this.hasSymbolSpacing = false;
|
|
14925
14855
|
const fontSize = (_a = options.numberGlyphPoint) !== null && _a !== void 0 ? _a : _metrics__WEBPACK_IMPORTED_MODULE_2__.Metrics.get('MultiMeasureRest.fontSize'); // same as TimeSignature.
|
|
14926
14856
|
this.fontInfo.size = fontSize;
|
|
14927
14857
|
this.numberOfMeasures = numberOfMeasures;
|
|
@@ -14932,10 +14862,10 @@ class MultiMeasureRest extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
14932
14862
|
this.text += String.fromCodePoint(0xe080 + Number(digit));
|
|
14933
14863
|
}
|
|
14934
14864
|
// Keep track of whether these four options were provided.
|
|
14935
|
-
|
|
14936
|
-
|
|
14937
|
-
|
|
14938
|
-
|
|
14865
|
+
this.hasPaddingLeft = typeof options.paddingLeft === 'number';
|
|
14866
|
+
this.hasPaddingRight = typeof options.paddingRight === 'number';
|
|
14867
|
+
this.hasLineThickness = typeof options.lineThickness === 'number';
|
|
14868
|
+
this.hasSymbolSpacing = typeof options.symbolSpacing === 'number';
|
|
14939
14869
|
this.renderOptions = Object.assign({ useSymbols: false, showNumber: true, numberLine: -0.5, numberGlyphPoint: fontSize, line: 2, spacingBetweenLinesPx: _tables__WEBPACK_IMPORTED_MODULE_4__.Tables.STAVE_LINE_DISTANCE, serifThickness: 2, semibreveRestGlyphScale: _metrics__WEBPACK_IMPORTED_MODULE_2__.Metrics.get('fontSize'), paddingLeft: 0, paddingRight: 0, lineThickness: 5, symbolSpacing: 0 }, options);
|
|
14940
14870
|
}
|
|
14941
14871
|
getXs() {
|
|
@@ -14961,7 +14891,11 @@ class MultiMeasureRest extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
14961
14891
|
const el = new _element__WEBPACK_IMPORTED_MODULE_0__.Element();
|
|
14962
14892
|
el.setText(txt);
|
|
14963
14893
|
// Add middle bars until the right padding is reached
|
|
14964
|
-
|
|
14894
|
+
const elWidth = el.getWidth();
|
|
14895
|
+
if (!elWidth) {
|
|
14896
|
+
throw new _util__WEBPACK_IMPORTED_MODULE_6__.RuntimeError('Cannot drawLine if width is 0');
|
|
14897
|
+
}
|
|
14898
|
+
for (let i = 1; (i + 2) * elWidth + left <= right; i++) {
|
|
14965
14899
|
txt += '\ue4f0'; /*restHBarMiddle*/
|
|
14966
14900
|
}
|
|
14967
14901
|
txt += '\ue4f1'; /*restHBarRight*/
|
|
@@ -15014,10 +14948,10 @@ class MultiMeasureRest extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
15014
14948
|
left -= begModifiers[0].getWidth();
|
|
15015
14949
|
}
|
|
15016
14950
|
const options = this.renderOptions;
|
|
15017
|
-
if (
|
|
14951
|
+
if (this.hasPaddingLeft) {
|
|
15018
14952
|
left = stave.getX() + options.paddingLeft;
|
|
15019
14953
|
}
|
|
15020
|
-
if (
|
|
14954
|
+
if (this.hasPaddingRight) {
|
|
15021
14955
|
right = stave.getX() + stave.getWidth() - options.paddingRight;
|
|
15022
14956
|
}
|
|
15023
14957
|
this.xs.left = left;
|
|
@@ -15033,7 +14967,6 @@ class MultiMeasureRest extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
15033
14967
|
}
|
|
15034
14968
|
}
|
|
15035
14969
|
}
|
|
15036
|
-
_MultiMeasureRest_hasPaddingLeft = new WeakMap(), _MultiMeasureRest_hasPaddingRight = new WeakMap(), _MultiMeasureRest_hasLineThickness = new WeakMap(), _MultiMeasureRest_hasSymbolSpacing = new WeakMap();
|
|
15037
14970
|
|
|
15038
14971
|
|
|
15039
14972
|
/***/ }),
|
|
@@ -15943,6 +15876,14 @@ class Note extends _tickable__WEBPACK_IMPORTED_MODULE_4__.Tickable {
|
|
|
15943
15876
|
getKeyProps() {
|
|
15944
15877
|
return this.keyProps;
|
|
15945
15878
|
}
|
|
15879
|
+
// Get the `BoundingBox` for the entire note
|
|
15880
|
+
getBoundingBox() {
|
|
15881
|
+
const boundingBox = super.getBoundingBox();
|
|
15882
|
+
for (let i = 0; i < this.modifiers.length; i++) {
|
|
15883
|
+
boundingBox.mergeWith(this.modifiers[i].getBoundingBox());
|
|
15884
|
+
}
|
|
15885
|
+
return boundingBox;
|
|
15886
|
+
}
|
|
15946
15887
|
}
|
|
15947
15888
|
|
|
15948
15889
|
|
|
@@ -17032,18 +16973,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
17032
16973
|
// Once an element is registered, selected attributes are tracked and indexed by
|
|
17033
16974
|
// the registry. This allows fast look up of elements by attributes like id, type,
|
|
17034
16975
|
// and class.
|
|
17035
|
-
var __classPrivateFieldGet = (undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
17036
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
17037
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
17038
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
17039
|
-
};
|
|
17040
|
-
var __classPrivateFieldSet = (undefined && undefined.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
17041
|
-
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
17042
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
17043
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
17044
|
-
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
17045
|
-
};
|
|
17046
|
-
var _a, _Registry_defaultRegistry;
|
|
17047
16976
|
|
|
17048
16977
|
// Indexes are represented as maps of maps of maps. This allows
|
|
17049
16978
|
// for both multi-labeling (e.g., an element can have multiple classes)
|
|
@@ -17057,15 +16986,15 @@ class Index {
|
|
|
17057
16986
|
}
|
|
17058
16987
|
class Registry {
|
|
17059
16988
|
static getDefaultRegistry() {
|
|
17060
|
-
return
|
|
16989
|
+
return Registry.defaultRegistry;
|
|
17061
16990
|
}
|
|
17062
16991
|
// If you call `enableDefaultRegistry`, any new elements will auto-register with
|
|
17063
16992
|
// the provided registry as soon as they're constructed.
|
|
17064
16993
|
static enableDefaultRegistry(registry) {
|
|
17065
|
-
|
|
16994
|
+
Registry.defaultRegistry = registry;
|
|
17066
16995
|
}
|
|
17067
16996
|
static disableDefaultRegistry() {
|
|
17068
|
-
|
|
16997
|
+
Registry.defaultRegistry = undefined;
|
|
17069
16998
|
}
|
|
17070
16999
|
constructor() {
|
|
17071
17000
|
this.index = new Index();
|
|
@@ -17112,8 +17041,8 @@ class Registry {
|
|
|
17112
17041
|
return this;
|
|
17113
17042
|
}
|
|
17114
17043
|
getElementById(id) {
|
|
17115
|
-
var
|
|
17116
|
-
return (
|
|
17044
|
+
var _a, _b;
|
|
17045
|
+
return (_b = (_a = this.index.id) === null || _a === void 0 ? void 0 : _a[id]) === null || _b === void 0 ? void 0 : _b[id]; // return undefined if the id is not found.
|
|
17117
17046
|
}
|
|
17118
17047
|
getElementsByAttribute(attribute, value) {
|
|
17119
17048
|
const indexAttr = this.index[attribute];
|
|
@@ -17142,8 +17071,6 @@ class Registry {
|
|
|
17142
17071
|
return this;
|
|
17143
17072
|
}
|
|
17144
17073
|
}
|
|
17145
|
-
_a = Registry;
|
|
17146
|
-
_Registry_defaultRegistry = { value: void 0 };
|
|
17147
17074
|
|
|
17148
17075
|
|
|
17149
17076
|
/***/ }),
|
|
@@ -17838,7 +17765,7 @@ class Stave extends _element__WEBPACK_IMPORTED_MODULE_2__.Element {
|
|
|
17838
17765
|
const noPosition = position === undefined;
|
|
17839
17766
|
const noCategory = category === undefined;
|
|
17840
17767
|
if (noPosition && noCategory) {
|
|
17841
|
-
return this.modifiers;
|
|
17768
|
+
return this.modifiers; // Should this be [...this.modifiers]?
|
|
17842
17769
|
}
|
|
17843
17770
|
else if (noPosition) {
|
|
17844
17771
|
// A category was provided.
|
|
@@ -17920,7 +17847,7 @@ class Stave extends _element__WEBPACK_IMPORTED_MODULE_2__.Element {
|
|
|
17920
17847
|
widths.right = (_a = layoutMetrics.xMax) !== null && _a !== void 0 ? _a : 0;
|
|
17921
17848
|
widths.paddingRight = (_b = layoutMetrics.paddingRight) !== null && _b !== void 0 ? _b : 0;
|
|
17922
17849
|
}
|
|
17923
|
-
widths.left = (_c =
|
|
17850
|
+
widths.left = -((_c = layoutMetrics.xMin) !== null && _c !== void 0 ? _c : 0);
|
|
17924
17851
|
widths.paddingLeft = (_d = layoutMetrics.paddingLeft) !== null && _d !== void 0 ? _d : 0;
|
|
17925
17852
|
if (i === endModifiers.length - 1) {
|
|
17926
17853
|
widths.paddingLeft = 0;
|
|
@@ -17973,12 +17900,9 @@ class Stave extends _element__WEBPACK_IMPORTED_MODULE_2__.Element {
|
|
|
17973
17900
|
// Draw the modifiers (bar lines, coda, segno, repeat brackets, etc.)
|
|
17974
17901
|
for (let i = 0; i < this.modifiers.length; i++) {
|
|
17975
17902
|
const modifier = this.modifiers[i];
|
|
17976
|
-
|
|
17977
|
-
|
|
17978
|
-
|
|
17979
|
-
modifier.draw(this, this.getModifierXShift(i));
|
|
17980
|
-
modifier.restoreStyle(ctx);
|
|
17981
|
-
}
|
|
17903
|
+
modifier.applyStyle(ctx);
|
|
17904
|
+
modifier.draw(this, this.getModifierXShift(i));
|
|
17905
|
+
modifier.restoreStyle(ctx);
|
|
17982
17906
|
}
|
|
17983
17907
|
// Render measure numbers
|
|
17984
17908
|
if (this.measure > 0) {
|
|
@@ -19142,18 +19066,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
19142
19066
|
// and a "key" refers to a specific pitch/notehead within a note.
|
|
19143
19067
|
//
|
|
19144
19068
|
// See `tests/stavenote_tests.ts` for usage examples.
|
|
19145
|
-
var __classPrivateFieldGet = (undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
19146
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
19147
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
19148
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
19149
|
-
};
|
|
19150
|
-
var __classPrivateFieldSet = (undefined && undefined.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
19151
|
-
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
19152
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
19153
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
19154
|
-
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
19155
|
-
};
|
|
19156
|
-
var _StaveNote_noteHeads, _StaveNote_sortedKeyProps;
|
|
19157
19069
|
|
|
19158
19070
|
|
|
19159
19071
|
|
|
@@ -19205,7 +19117,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19205
19117
|
const notesList = [];
|
|
19206
19118
|
for (let i = 0; i < notes.length; i++) {
|
|
19207
19119
|
// Formatting uses sortedKeyProps to calculate line and minL.
|
|
19208
|
-
const props =
|
|
19120
|
+
const props = notes[i].sortedKeyProps;
|
|
19209
19121
|
const line = props[0].keyProps.line;
|
|
19210
19122
|
let minL = props[props.length - 1].keyProps.line;
|
|
19211
19123
|
const stemDirection = notes[i].getStemDirection();
|
|
@@ -19215,10 +19127,10 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19215
19127
|
if (notes[i].isRest()) {
|
|
19216
19128
|
maxL =
|
|
19217
19129
|
line +
|
|
19218
|
-
Math.ceil(
|
|
19130
|
+
Math.ceil(notes[i]._noteHeads[0].getTextMetrics().actualBoundingBoxAscent / _tables__WEBPACK_IMPORTED_MODULE_8__.Tables.STAVE_LINE_DISTANCE);
|
|
19219
19131
|
minL =
|
|
19220
19132
|
line -
|
|
19221
|
-
Math.ceil(
|
|
19133
|
+
Math.ceil(notes[i]._noteHeads[0].getTextMetrics().actualBoundingBoxDescent / _tables__WEBPACK_IMPORTED_MODULE_8__.Tables.STAVE_LINE_DISTANCE);
|
|
19222
19134
|
}
|
|
19223
19135
|
else {
|
|
19224
19136
|
maxL =
|
|
@@ -19305,8 +19217,8 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19305
19217
|
//If we are sharing a line and in the same voice, only then offset one note
|
|
19306
19218
|
const lineDiff = Math.abs(noteU.line - noteL.line);
|
|
19307
19219
|
if (noteU.note.hasStem() && noteL.note.hasStem()) {
|
|
19308
|
-
const noteUHead =
|
|
19309
|
-
const noteLHead =
|
|
19220
|
+
const noteUHead = noteU.note.sortedKeyProps[0].keyProps.code;
|
|
19221
|
+
const noteLHead = noteL.note.sortedKeyProps[noteL.note.sortedKeyProps.length - 1].keyProps.code;
|
|
19310
19222
|
if (
|
|
19311
19223
|
// If unison is not configured, shift
|
|
19312
19224
|
!_tables__WEBPACK_IMPORTED_MODULE_8__.Tables.UNISON ||
|
|
@@ -19461,9 +19373,8 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19461
19373
|
// INSTANCE MEMBERS
|
|
19462
19374
|
this.minLine = 0;
|
|
19463
19375
|
this.maxLine = 0;
|
|
19464
|
-
_StaveNote_noteHeads.set(this, void 0);
|
|
19465
19376
|
// Sorted variant of keyProps used internally.
|
|
19466
|
-
|
|
19377
|
+
this.sortedKeyProps = [];
|
|
19467
19378
|
this.ledgerLineStyle = {};
|
|
19468
19379
|
this.clef = (_a = noteStruct.clef) !== null && _a !== void 0 ? _a : 'treble';
|
|
19469
19380
|
this.octaveShift = (_b = noteStruct.octaveShift) !== null && _b !== void 0 ? _b : 0;
|
|
@@ -19476,7 +19387,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19476
19387
|
// for displaced ledger lines
|
|
19477
19388
|
this.useDefaultHeadX = false;
|
|
19478
19389
|
// Drawing
|
|
19479
|
-
|
|
19390
|
+
this._noteHeads = [];
|
|
19480
19391
|
this.modifiers = [];
|
|
19481
19392
|
this.renderOptions = Object.assign(Object.assign({}, this.renderOptions), {
|
|
19482
19393
|
// number of stroke px to the left and right of head
|
|
@@ -19496,9 +19407,9 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19496
19407
|
reset() {
|
|
19497
19408
|
super.reset();
|
|
19498
19409
|
// Save prior noteHead styles & reapply them after making new noteheads.
|
|
19499
|
-
const noteHeadStyles =
|
|
19410
|
+
const noteHeadStyles = this._noteHeads.map((noteHead) => noteHead.getStyle());
|
|
19500
19411
|
this.buildNoteHeads();
|
|
19501
|
-
|
|
19412
|
+
this._noteHeads.forEach((noteHead, index) => {
|
|
19502
19413
|
const noteHeadStyle = noteHeadStyles[index];
|
|
19503
19414
|
if (noteHeadStyle)
|
|
19504
19415
|
noteHead.setStyle(noteHeadStyle);
|
|
@@ -19526,7 +19437,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19526
19437
|
}
|
|
19527
19438
|
// Builds a `NoteHead` for each key in the note
|
|
19528
19439
|
buildNoteHeads() {
|
|
19529
|
-
|
|
19440
|
+
this._noteHeads = [];
|
|
19530
19441
|
const stemDirection = this.getStemDirection();
|
|
19531
19442
|
const keys = this.getKeys();
|
|
19532
19443
|
let lastLine = undefined;
|
|
@@ -19549,7 +19460,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19549
19460
|
}
|
|
19550
19461
|
for (let i = start; i !== end; i += step) {
|
|
19551
19462
|
// Building noteheads rely on sortedKeNotes in order to calculate the displacements
|
|
19552
|
-
const noteProps =
|
|
19463
|
+
const noteProps = this.sortedKeyProps[i].keyProps;
|
|
19553
19464
|
const line = noteProps.line;
|
|
19554
19465
|
// Keep track of last line with a note head, so that consecutive heads
|
|
19555
19466
|
// are correctly displaced.
|
|
@@ -19577,9 +19488,9 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19577
19488
|
});
|
|
19578
19489
|
notehead.fontInfo = this.fontInfo;
|
|
19579
19490
|
this.addChildElement(notehead);
|
|
19580
|
-
|
|
19491
|
+
this._noteHeads[this.sortedKeyProps[i].index] = notehead;
|
|
19581
19492
|
}
|
|
19582
|
-
return
|
|
19493
|
+
return this._noteHeads;
|
|
19583
19494
|
}
|
|
19584
19495
|
// Automatically sets the stem direction based on the keys in the note
|
|
19585
19496
|
autoStem() {
|
|
@@ -19588,8 +19499,8 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19588
19499
|
calculateOptimalStemDirection() {
|
|
19589
19500
|
// Figure out optimal stem direction based on given notes
|
|
19590
19501
|
// minLine & maxLine rely on sortedKeyProps
|
|
19591
|
-
this.minLine =
|
|
19592
|
-
this.maxLine =
|
|
19502
|
+
this.minLine = this.sortedKeyProps[0].keyProps.line;
|
|
19503
|
+
this.maxLine = this.sortedKeyProps[this.keyProps.length - 1].keyProps.line;
|
|
19593
19504
|
const MIDDLE_LINE = 3;
|
|
19594
19505
|
const decider = (this.minLine + this.maxLine) / 2;
|
|
19595
19506
|
const stemDirection = decider < MIDDLE_LINE ? _stem__WEBPACK_IMPORTED_MODULE_6__.Stem.UP : _stem__WEBPACK_IMPORTED_MODULE_6__.Stem.DOWN;
|
|
@@ -19637,14 +19548,14 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19637
19548
|
// Sort the notes from lowest line to highest line in sortedKeyProps
|
|
19638
19549
|
// Warn no longer required as keyProps remains unsorted
|
|
19639
19550
|
this.keyProps.forEach((keyProps, index) => {
|
|
19640
|
-
|
|
19551
|
+
this.sortedKeyProps.push({ keyProps, index });
|
|
19641
19552
|
});
|
|
19642
|
-
|
|
19553
|
+
this.sortedKeyProps.sort((a, b) => a.keyProps.line - b.keyProps.line);
|
|
19643
19554
|
}
|
|
19644
19555
|
// Get the `BoundingBox` for the entire note
|
|
19645
19556
|
getBoundingBox() {
|
|
19646
19557
|
const boundingBox = new _boundingbox__WEBPACK_IMPORTED_MODULE_0__.BoundingBox(this.getAbsoluteX(), this.ys[0], 0, 0);
|
|
19647
|
-
|
|
19558
|
+
this._noteHeads.forEach((notehead) => {
|
|
19648
19559
|
boundingBox.mergeWith(notehead.getBoundingBox());
|
|
19649
19560
|
});
|
|
19650
19561
|
const { yTop, yBottom } = this.getNoteHeadBounds();
|
|
@@ -19729,7 +19640,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19729
19640
|
// `y` values to the `NoteHeads`.
|
|
19730
19641
|
setStave(stave) {
|
|
19731
19642
|
super.setStave(stave);
|
|
19732
|
-
const ys =
|
|
19643
|
+
const ys = this._noteHeads.map((notehead) => {
|
|
19733
19644
|
notehead.setStave(stave);
|
|
19734
19645
|
return notehead.getY();
|
|
19735
19646
|
});
|
|
@@ -19803,7 +19714,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19803
19714
|
}
|
|
19804
19715
|
// addtional y shifts for rests
|
|
19805
19716
|
let restShift = 0;
|
|
19806
|
-
switch (
|
|
19717
|
+
switch (this._noteHeads[index].getText()) {
|
|
19807
19718
|
case _glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.restDoubleWhole:
|
|
19808
19719
|
case _glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.restWhole:
|
|
19809
19720
|
restShift += 0.5;
|
|
@@ -19863,7 +19774,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19863
19774
|
// `style` is an `object` with the following properties: `shadowColor`,
|
|
19864
19775
|
// `shadowBlur`, `fillStyle`, `strokeStyle`
|
|
19865
19776
|
setKeyStyle(index, style) {
|
|
19866
|
-
|
|
19777
|
+
this._noteHeads[index].setStyle(style);
|
|
19867
19778
|
return this;
|
|
19868
19779
|
}
|
|
19869
19780
|
setKeyLine(index, line) {
|
|
@@ -19941,7 +19852,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19941
19852
|
let lowestDisplacedLine;
|
|
19942
19853
|
let highestNonDisplacedLine = highestLine;
|
|
19943
19854
|
let lowestNonDisplacedLine = lowestLine;
|
|
19944
|
-
|
|
19855
|
+
this._noteHeads.forEach((notehead) => {
|
|
19945
19856
|
const line = notehead.getLine();
|
|
19946
19857
|
const y = notehead.getY();
|
|
19947
19858
|
yTop = Math.min(y, yTop);
|
|
@@ -19986,7 +19897,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19986
19897
|
return xBegin + this.getGlyphWidth();
|
|
19987
19898
|
}
|
|
19988
19899
|
get noteHeads() {
|
|
19989
|
-
return
|
|
19900
|
+
return this._noteHeads.slice();
|
|
19990
19901
|
}
|
|
19991
19902
|
// Draw the ledger lines between the stave and the highest/lowest keys
|
|
19992
19903
|
drawLedgerLines() {
|
|
@@ -20041,7 +19952,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
20041
19952
|
for (let i = 0; i < this.modifiers.length; i++) {
|
|
20042
19953
|
const modifier = this.modifiers[i];
|
|
20043
19954
|
const index = modifier.checkIndex();
|
|
20044
|
-
const notehead =
|
|
19955
|
+
const notehead = this._noteHeads[index];
|
|
20045
19956
|
if (notehead === noteheadParam) {
|
|
20046
19957
|
const noteheadStyle = notehead.getStyle();
|
|
20047
19958
|
notehead.applyStyle(ctx, noteheadStyle);
|
|
@@ -20082,7 +19993,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
20082
19993
|
// Draw the NoteHeads
|
|
20083
19994
|
drawNoteHeads() {
|
|
20084
19995
|
const ctx = this.checkContext();
|
|
20085
|
-
|
|
19996
|
+
this._noteHeads.forEach((notehead) => {
|
|
20086
19997
|
notehead.applyStyle(ctx);
|
|
20087
19998
|
ctx.openGroup('notehead', notehead.getAttribute('id'));
|
|
20088
19999
|
notehead.setContext(ctx).draw();
|
|
@@ -20158,7 +20069,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
20158
20069
|
const xBegin = this.getNoteHeadBeginX();
|
|
20159
20070
|
const shouldRenderStem = this.hasStem() && !this.beam;
|
|
20160
20071
|
// Format note head x positions
|
|
20161
|
-
|
|
20072
|
+
this._noteHeads.forEach((notehead) => notehead.setX(xBegin));
|
|
20162
20073
|
if (this.stem) {
|
|
20163
20074
|
// Format stem x positions
|
|
20164
20075
|
const stemX = this.getStemX();
|
|
@@ -20180,7 +20091,6 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
20180
20091
|
this.setRendered();
|
|
20181
20092
|
}
|
|
20182
20093
|
}
|
|
20183
|
-
_StaveNote_noteHeads = new WeakMap(), _StaveNote_sortedKeyProps = new WeakMap();
|
|
20184
20094
|
StaveNote.DEBUG = false;
|
|
20185
20095
|
|
|
20186
20096
|
|
|
@@ -20404,12 +20314,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
20404
20314
|
/* harmony import */ var _typeguard__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./typeguard */ "./src/typeguard.ts");
|
|
20405
20315
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
20406
20316
|
// @author: Radosaw Eichler 2012
|
|
20407
|
-
var __classPrivateFieldGet = (undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
20408
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
20409
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
20410
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
20411
|
-
};
|
|
20412
|
-
var _StaveTempo_durationToCode;
|
|
20413
20317
|
|
|
20414
20318
|
|
|
20415
20319
|
|
|
@@ -20421,7 +20325,7 @@ class StaveTempo extends _stavemodifier__WEBPACK_IMPORTED_MODULE_3__.StaveModifi
|
|
|
20421
20325
|
}
|
|
20422
20326
|
constructor(tempo, x, shiftY) {
|
|
20423
20327
|
super();
|
|
20424
|
-
|
|
20328
|
+
this.durationToCode = {
|
|
20425
20329
|
'1/4': _glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.metNoteDoubleWholeSquare,
|
|
20426
20330
|
long: _glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.metNoteDoubleWholeSquare,
|
|
20427
20331
|
'1/2': _glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.metNoteDoubleWhole,
|
|
@@ -20451,7 +20355,7 @@ class StaveTempo extends _stavemodifier__WEBPACK_IMPORTED_MODULE_3__.StaveModifi
|
|
|
20451
20355
|
'512th': _glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.metNote512thUp,
|
|
20452
20356
|
1024: _glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.metNote1024thUp,
|
|
20453
20357
|
'1024th': _glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.metNote1024thUp,
|
|
20454
|
-
}
|
|
20358
|
+
};
|
|
20455
20359
|
this.tempo = tempo;
|
|
20456
20360
|
this.position = _stavemodifier__WEBPACK_IMPORTED_MODULE_3__.StaveModifierPosition.ABOVE;
|
|
20457
20361
|
this.x = x;
|
|
@@ -20482,7 +20386,7 @@ class StaveTempo extends _stavemodifier__WEBPACK_IMPORTED_MODULE_3__.StaveModifi
|
|
|
20482
20386
|
x += elText.getWidth() + 3;
|
|
20483
20387
|
}
|
|
20484
20388
|
if (duration) {
|
|
20485
|
-
el.setText(
|
|
20389
|
+
el.setText(this.durationToCode[duration]);
|
|
20486
20390
|
el.renderText(ctx, x + this.xShift, y + this.yShift);
|
|
20487
20391
|
x += el.getWidth() + 3;
|
|
20488
20392
|
if (dots) {
|
|
@@ -20497,7 +20401,7 @@ class StaveTempo extends _stavemodifier__WEBPACK_IMPORTED_MODULE_3__.StaveModifi
|
|
|
20497
20401
|
elText.renderText(ctx, x + this.xShift, y + this.yShift);
|
|
20498
20402
|
x += elText.getWidth() + 3;
|
|
20499
20403
|
if (duration2) {
|
|
20500
|
-
el.setText(
|
|
20404
|
+
el.setText(this.durationToCode[duration2]);
|
|
20501
20405
|
el.renderText(ctx, x + this.xShift, y + this.yShift);
|
|
20502
20406
|
x += el.getWidth() + 3;
|
|
20503
20407
|
if (dots2) {
|
|
@@ -20522,7 +20426,6 @@ class StaveTempo extends _stavemodifier__WEBPACK_IMPORTED_MODULE_3__.StaveModifi
|
|
|
20522
20426
|
return this;
|
|
20523
20427
|
}
|
|
20524
20428
|
}
|
|
20525
|
-
_StaveTempo_durationToCode = new WeakMap();
|
|
20526
20429
|
|
|
20527
20430
|
|
|
20528
20431
|
/***/ }),
|
|
@@ -20646,6 +20549,9 @@ class StaveTie extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
20646
20549
|
this.renderOptions = {
|
|
20647
20550
|
cp1: 8, // Curve control point 1
|
|
20648
20551
|
cp2: 12, // Curve control point 2
|
|
20552
|
+
shortTieCutoff: 10,
|
|
20553
|
+
cp1Short: 2,
|
|
20554
|
+
cp2Short: 8,
|
|
20649
20555
|
textShiftX: 0,
|
|
20650
20556
|
firstXShift: 0,
|
|
20651
20557
|
lastXShift: 0,
|
|
@@ -20653,6 +20559,24 @@ class StaveTie extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
20653
20559
|
tieSpacing: 0,
|
|
20654
20560
|
};
|
|
20655
20561
|
}
|
|
20562
|
+
/**
|
|
20563
|
+
* Returns either the direction explicitly set with setDirection, or
|
|
20564
|
+
* a logical direction based on lastNote or firstNote.
|
|
20565
|
+
*/
|
|
20566
|
+
getDirection() {
|
|
20567
|
+
if (this.direction !== undefined && this.direction !== null) {
|
|
20568
|
+
return this.direction;
|
|
20569
|
+
}
|
|
20570
|
+
else if (this.notes.lastNote) {
|
|
20571
|
+
return this.notes.lastNote.getStemDirection();
|
|
20572
|
+
}
|
|
20573
|
+
else if (this.notes.firstNote) {
|
|
20574
|
+
return this.notes.firstNote.getStemDirection();
|
|
20575
|
+
}
|
|
20576
|
+
else {
|
|
20577
|
+
return 0;
|
|
20578
|
+
}
|
|
20579
|
+
}
|
|
20656
20580
|
setDirection(direction) {
|
|
20657
20581
|
this.direction = direction;
|
|
20658
20582
|
return this;
|
|
@@ -20695,9 +20619,10 @@ class StaveTie extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
20695
20619
|
const ctx = this.checkContext();
|
|
20696
20620
|
let cp1 = this.renderOptions.cp1;
|
|
20697
20621
|
let cp2 = this.renderOptions.cp2;
|
|
20698
|
-
if (Math.abs(params.lastX - params.firstX) <
|
|
20699
|
-
|
|
20700
|
-
|
|
20622
|
+
if (Math.abs(params.lastX - params.firstX) < this.renderOptions.shortTieCutoff) {
|
|
20623
|
+
// do not get super exaggerated curves for very short ties
|
|
20624
|
+
cp1 = this.renderOptions.cp1Short;
|
|
20625
|
+
cp2 = this.renderOptions.cp2Short;
|
|
20701
20626
|
}
|
|
20702
20627
|
const firstXShift = this.renderOptions.firstXShift;
|
|
20703
20628
|
const lastXShift = this.renderOptions.lastXShift;
|
|
@@ -20753,49 +20678,101 @@ class StaveTie extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
20753
20678
|
getNotes() {
|
|
20754
20679
|
return this.notes;
|
|
20755
20680
|
}
|
|
20756
|
-
|
|
20757
|
-
|
|
20758
|
-
|
|
20759
|
-
|
|
20760
|
-
|
|
20761
|
-
|
|
20762
|
-
|
|
20763
|
-
let firstX = 0;
|
|
20764
|
-
let lastX = 0;
|
|
20765
|
-
let firstYs = [0];
|
|
20766
|
-
let lastYs = [0];
|
|
20767
|
-
let stemDirection = 0;
|
|
20768
|
-
if (firstNote) {
|
|
20769
|
-
firstX = firstNote.getTieRightX() + this.renderOptions.tieSpacing;
|
|
20770
|
-
stemDirection = firstNote.getStemDirection();
|
|
20771
|
-
firstYs = firstNote.getYs();
|
|
20681
|
+
/**
|
|
20682
|
+
* Returns the X position in pixels that the tie will be drawn starting from;
|
|
20683
|
+
* ideally from the firstNote, alternatively from the lastNote, or 0 if all else fails.
|
|
20684
|
+
*/
|
|
20685
|
+
getFirstX() {
|
|
20686
|
+
if (this.notes.firstNote) {
|
|
20687
|
+
return this.notes.firstNote.getTieRightX() + this.renderOptions.tieSpacing;
|
|
20772
20688
|
}
|
|
20773
|
-
else if (lastNote) {
|
|
20774
|
-
|
|
20775
|
-
firstX = stave.getTieStartX();
|
|
20776
|
-
firstYs = lastNote.getYs();
|
|
20777
|
-
this.notes.firstIndexes = this.notes.lastIndexes;
|
|
20689
|
+
else if (this.notes.lastNote) {
|
|
20690
|
+
return this.notes.lastNote.checkStave().getTieStartX();
|
|
20778
20691
|
}
|
|
20779
|
-
|
|
20780
|
-
|
|
20781
|
-
stemDirection = lastNote.getStemDirection();
|
|
20782
|
-
lastYs = lastNote.getYs();
|
|
20692
|
+
else {
|
|
20693
|
+
return 0;
|
|
20783
20694
|
}
|
|
20784
|
-
|
|
20785
|
-
|
|
20786
|
-
|
|
20787
|
-
|
|
20695
|
+
}
|
|
20696
|
+
/**
|
|
20697
|
+
* Returns the X position in pixels that the tie will be drawn ending at;
|
|
20698
|
+
* ideally from the firstNote, alternatively from the lastNote, or 0 if all else fails.
|
|
20699
|
+
*/
|
|
20700
|
+
getLastX() {
|
|
20701
|
+
if (this.notes.lastNote) {
|
|
20702
|
+
return this.notes.lastNote.getTieLeftX() + this.renderOptions.tieSpacing;
|
|
20703
|
+
}
|
|
20704
|
+
else if (this.notes.firstNote) {
|
|
20705
|
+
return this.notes.firstNote.checkStave().getTieEndX();
|
|
20706
|
+
}
|
|
20707
|
+
else {
|
|
20708
|
+
return 0;
|
|
20709
|
+
}
|
|
20710
|
+
}
|
|
20711
|
+
/**
|
|
20712
|
+
* Get the Y positions of the places where a tie needs to be drawn starting from.
|
|
20713
|
+
*/
|
|
20714
|
+
getFirstYs() {
|
|
20715
|
+
if (this.notes.firstNote) {
|
|
20716
|
+
return this.notes.firstNote.getYs();
|
|
20717
|
+
}
|
|
20718
|
+
else if (this.notes.lastNote) {
|
|
20719
|
+
return this.notes.lastNote.getYs();
|
|
20720
|
+
}
|
|
20721
|
+
else {
|
|
20722
|
+
return [0];
|
|
20723
|
+
}
|
|
20724
|
+
}
|
|
20725
|
+
/**
|
|
20726
|
+
* Get the Y positions of the places where a tie needs to be drawn ending at.
|
|
20727
|
+
*/
|
|
20728
|
+
getLastYs() {
|
|
20729
|
+
if (this.notes.lastNote) {
|
|
20730
|
+
return this.notes.lastNote.getYs();
|
|
20731
|
+
}
|
|
20732
|
+
else if (this.notes.firstNote) {
|
|
20733
|
+
return this.notes.firstNote.getYs();
|
|
20734
|
+
}
|
|
20735
|
+
else {
|
|
20736
|
+
return [0];
|
|
20737
|
+
}
|
|
20738
|
+
}
|
|
20739
|
+
/**
|
|
20740
|
+
* If a tie has firstNote and not lastNote, or vice-versa, then their
|
|
20741
|
+
* firstIndexes and lastIndexes need to be equal to each other.
|
|
20742
|
+
*
|
|
20743
|
+
* Does nothing if both notes.firstNote and notes.lastNote are defined (or
|
|
20744
|
+
* if neither are)
|
|
20745
|
+
*
|
|
20746
|
+
* (Note that after doing so they share a common Array object, so any change
|
|
20747
|
+
* to one will affect the other; this behavior may change in a future release)
|
|
20748
|
+
*/
|
|
20749
|
+
synchronizeIndexes() {
|
|
20750
|
+
if (this.notes.firstNote && this.notes.lastNote) {
|
|
20751
|
+
return;
|
|
20752
|
+
}
|
|
20753
|
+
else if (!this.notes.firstNote && !this.notes.lastNote) {
|
|
20754
|
+
return;
|
|
20755
|
+
}
|
|
20756
|
+
else if (this.notes.firstNote) {
|
|
20788
20757
|
this.notes.lastIndexes = this.notes.firstIndexes;
|
|
20789
20758
|
}
|
|
20790
|
-
|
|
20791
|
-
|
|
20759
|
+
else {
|
|
20760
|
+
// this.notes.lastNote defined, but not firstNote
|
|
20761
|
+
this.notes.firstIndexes = this.notes.lastIndexes;
|
|
20792
20762
|
}
|
|
20763
|
+
}
|
|
20764
|
+
draw() {
|
|
20765
|
+
this.checkContext();
|
|
20766
|
+
this.setRendered();
|
|
20767
|
+
this.synchronizeIndexes();
|
|
20768
|
+
const firstX = this.getFirstX();
|
|
20769
|
+
const lastX = this.getLastX();
|
|
20793
20770
|
this.renderTie({
|
|
20794
20771
|
firstX,
|
|
20795
20772
|
lastX,
|
|
20796
|
-
firstYs,
|
|
20797
|
-
lastYs,
|
|
20798
|
-
direction:
|
|
20773
|
+
firstYs: this.getFirstYs(),
|
|
20774
|
+
lastYs: this.getLastYs(),
|
|
20775
|
+
direction: this.getDirection(), // note: not this.direction
|
|
20799
20776
|
});
|
|
20800
20777
|
this.renderTieText(firstX, lastX);
|
|
20801
20778
|
return true;
|
|
@@ -21779,12 +21756,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
21779
21756
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
21780
21757
|
// MIT License
|
|
21781
21758
|
// @author Gregory Ristow (2015)
|
|
21782
|
-
var __classPrivateFieldGet = (undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
21783
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
21784
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
21785
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
21786
|
-
};
|
|
21787
|
-
var _SVGContext_instances, _SVGContext_getShadowStyle;
|
|
21788
21759
|
|
|
21789
21760
|
|
|
21790
21761
|
|
|
@@ -21823,7 +21794,6 @@ const TWO_PI = 2 * Math.PI;
|
|
|
21823
21794
|
class SVGContext extends _rendercontext__WEBPACK_IMPORTED_MODULE_3__.RenderContext {
|
|
21824
21795
|
constructor(element) {
|
|
21825
21796
|
super();
|
|
21826
|
-
_SVGContext_instances.add(this);
|
|
21827
21797
|
this.width = 0;
|
|
21828
21798
|
this.height = 0;
|
|
21829
21799
|
this.precision = 1;
|
|
@@ -21832,7 +21802,7 @@ class SVGContext extends _rendercontext__WEBPACK_IMPORTED_MODULE_3__.RenderConte
|
|
|
21832
21802
|
this.fontCSSString = '';
|
|
21833
21803
|
this.element = element;
|
|
21834
21804
|
this.precision = Math.pow(10, _tables__WEBPACK_IMPORTED_MODULE_4__.Tables.RENDER_PRECISION_PLACES);
|
|
21835
|
-
// Create
|
|
21805
|
+
// Create an SVG element and add it to the container element.
|
|
21836
21806
|
const svg = this.create('svg');
|
|
21837
21807
|
svg.setAttribute('pointer-events', 'none');
|
|
21838
21808
|
this.element.appendChild(svg);
|
|
@@ -21973,7 +21943,7 @@ class SVGContext extends _rendercontext__WEBPACK_IMPORTED_MODULE_3__.RenderConte
|
|
|
21973
21943
|
// style.width / style.height properties that are applied to
|
|
21974
21944
|
// the SVG object from our internal conception of the SVG
|
|
21975
21945
|
// width/height. This would allow us to create automatically
|
|
21976
|
-
// scaling
|
|
21946
|
+
// scaling SVGs that filled their containers, for instance.
|
|
21977
21947
|
//
|
|
21978
21948
|
// As this isn't implemented in Canvas contexts,
|
|
21979
21949
|
// I've left as is for now, but in using the viewBox to
|
|
@@ -22164,6 +22134,12 @@ class SVGContext extends _rendercontext__WEBPACK_IMPORTED_MODULE_3__.RenderConte
|
|
|
22164
22134
|
this.path += 'Z';
|
|
22165
22135
|
return this;
|
|
22166
22136
|
}
|
|
22137
|
+
getShadowStyle() {
|
|
22138
|
+
// A CSS drop-shadow filter blur looks different than a canvas shadowBlur
|
|
22139
|
+
// of the same radius, so we scale the drop-shadow radius here to make it
|
|
22140
|
+
// look close to the canvas shadow.
|
|
22141
|
+
return `filter: drop-shadow(0 0 ${this.attributes.shadowBlur / 1.5}px ${this.attributes.shadowColor})`;
|
|
22142
|
+
}
|
|
22167
22143
|
fill(attributes) {
|
|
22168
22144
|
const path = this.create('path');
|
|
22169
22145
|
if (typeof attributes === 'undefined') {
|
|
@@ -22171,7 +22147,7 @@ class SVGContext extends _rendercontext__WEBPACK_IMPORTED_MODULE_3__.RenderConte
|
|
|
22171
22147
|
}
|
|
22172
22148
|
attributes.d = this.path;
|
|
22173
22149
|
if (this.attributes.shadowBlur > 0) {
|
|
22174
|
-
attributes.style =
|
|
22150
|
+
attributes.style = this.getShadowStyle();
|
|
22175
22151
|
}
|
|
22176
22152
|
this.applyAttributes(path, attributes);
|
|
22177
22153
|
this.add(path);
|
|
@@ -22181,7 +22157,7 @@ class SVGContext extends _rendercontext__WEBPACK_IMPORTED_MODULE_3__.RenderConte
|
|
|
22181
22157
|
const path = this.create('path');
|
|
22182
22158
|
const attributes = Object.assign(Object.assign({}, this.attributes), { fill: 'none', d: this.path });
|
|
22183
22159
|
if (this.attributes.shadowBlur > 0) {
|
|
22184
|
-
attributes.style =
|
|
22160
|
+
attributes.style = this.getShadowStyle();
|
|
22185
22161
|
}
|
|
22186
22162
|
this.applyAttributes(path, attributes);
|
|
22187
22163
|
this.add(path);
|
|
@@ -22264,12 +22240,6 @@ class SVGContext extends _rendercontext__WEBPACK_IMPORTED_MODULE_3__.RenderConte
|
|
|
22264
22240
|
return this.fontCSSString;
|
|
22265
22241
|
}
|
|
22266
22242
|
}
|
|
22267
|
-
_SVGContext_instances = new WeakSet(), _SVGContext_getShadowStyle = function _SVGContext_getShadowStyle() {
|
|
22268
|
-
// A CSS drop-shadow filter blur looks different than a canvas shadowBlur
|
|
22269
|
-
// of the same radius, so we scale the drop-shadow radius here to make it
|
|
22270
|
-
// look close to the canvas shadow.
|
|
22271
|
-
return `filter: drop-shadow(0 0 ${this.attributes.shadowBlur / 1.5}px ${this.attributes.shadowColor})`;
|
|
22272
|
-
};
|
|
22273
22243
|
SVGContext.measureTextElement = new _element__WEBPACK_IMPORTED_MODULE_0__.Element();
|
|
22274
22244
|
|
|
22275
22245
|
|
|
@@ -24294,18 +24264,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
24294
24264
|
/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./util */ "./src/util.ts");
|
|
24295
24265
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
24296
24266
|
// MIT License
|
|
24297
|
-
var __classPrivateFieldGet = (undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
24298
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
24299
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
24300
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
24301
|
-
};
|
|
24302
|
-
var __classPrivateFieldSet = (undefined && undefined.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
24303
|
-
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
24304
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
24305
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
24306
|
-
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
24307
|
-
};
|
|
24308
|
-
var _Tickable_preFormatted, _Tickable_postFormatted;
|
|
24309
24267
|
|
|
24310
24268
|
|
|
24311
24269
|
|
|
@@ -24321,8 +24279,8 @@ class Tickable extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
24321
24279
|
}
|
|
24322
24280
|
constructor() {
|
|
24323
24281
|
super();
|
|
24324
|
-
|
|
24325
|
-
|
|
24282
|
+
this._preFormatted = false;
|
|
24283
|
+
this._postFormatted = false;
|
|
24326
24284
|
// These properties represent the duration of
|
|
24327
24285
|
// this tickable element.
|
|
24328
24286
|
this.ticks = new _fraction__WEBPACK_IMPORTED_MODULE_1__.Fraction(0, 1); // Fractional value of ticks
|
|
@@ -24375,7 +24333,7 @@ class Tickable extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
24375
24333
|
}
|
|
24376
24334
|
/** Get width of note. Used by the formatter for positioning. */
|
|
24377
24335
|
getWidth() {
|
|
24378
|
-
if (!
|
|
24336
|
+
if (!this._preFormatted) {
|
|
24379
24337
|
throw new _util__WEBPACK_IMPORTED_MODULE_4__.RuntimeError('UnformattedNote', "Can't call GetWidth on an unformatted note.");
|
|
24380
24338
|
}
|
|
24381
24339
|
return this.width + (this.modifierContext ? this.modifierContext.getWidth() : 0);
|
|
@@ -24479,7 +24437,7 @@ class Tickable extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
24479
24437
|
this.modifierContext.addMember(this.modifiers[i]);
|
|
24480
24438
|
}
|
|
24481
24439
|
this.modifierContext.addMember(this);
|
|
24482
|
-
|
|
24440
|
+
this._preFormatted = false;
|
|
24483
24441
|
return this;
|
|
24484
24442
|
}
|
|
24485
24443
|
/**
|
|
@@ -24489,7 +24447,7 @@ class Tickable extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
24489
24447
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
24490
24448
|
addModifier(modifier, index = 0) {
|
|
24491
24449
|
this.modifiers.push(modifier);
|
|
24492
|
-
|
|
24450
|
+
this._preFormatted = false;
|
|
24493
24451
|
return this;
|
|
24494
24452
|
}
|
|
24495
24453
|
/** Get the list of associated modifiers. */
|
|
@@ -24499,14 +24457,14 @@ class Tickable extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
24499
24457
|
/** Set the Tick Context. */
|
|
24500
24458
|
setTickContext(tc) {
|
|
24501
24459
|
this.tickContext = tc;
|
|
24502
|
-
|
|
24460
|
+
this._preFormatted = false;
|
|
24503
24461
|
}
|
|
24504
24462
|
checkTickContext(message = 'Tickable has no tick context.') {
|
|
24505
24463
|
return (0,_util__WEBPACK_IMPORTED_MODULE_4__.defined)(this.tickContext, 'NoTickContext', message);
|
|
24506
24464
|
}
|
|
24507
24465
|
/** Preformat the Tickable. */
|
|
24508
24466
|
preFormat() {
|
|
24509
|
-
if (
|
|
24467
|
+
if (this._preFormatted)
|
|
24510
24468
|
return;
|
|
24511
24469
|
this.width = 0;
|
|
24512
24470
|
if (this.modifierContext) {
|
|
@@ -24516,24 +24474,24 @@ class Tickable extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
24516
24474
|
}
|
|
24517
24475
|
/** Set preformatted status. */
|
|
24518
24476
|
set preFormatted(value) {
|
|
24519
|
-
|
|
24477
|
+
this._preFormatted = value;
|
|
24520
24478
|
}
|
|
24521
24479
|
get preFormatted() {
|
|
24522
|
-
return
|
|
24480
|
+
return this._preFormatted;
|
|
24523
24481
|
}
|
|
24524
24482
|
/** Postformat the Tickable. */
|
|
24525
24483
|
postFormat() {
|
|
24526
|
-
if (
|
|
24484
|
+
if (this._postFormatted)
|
|
24527
24485
|
return this;
|
|
24528
|
-
|
|
24486
|
+
this._postFormatted = true;
|
|
24529
24487
|
return this;
|
|
24530
24488
|
}
|
|
24531
24489
|
/** Set postformatted status. */
|
|
24532
24490
|
set postFormatted(value) {
|
|
24533
|
-
|
|
24491
|
+
this._postFormatted = value;
|
|
24534
24492
|
}
|
|
24535
24493
|
get postFormatted() {
|
|
24536
|
-
return
|
|
24494
|
+
return this._postFormatted;
|
|
24537
24495
|
}
|
|
24538
24496
|
/** Return the intrinsic ticks. */
|
|
24539
24497
|
getIntrinsicTicks() {
|
|
@@ -24577,7 +24535,6 @@ class Tickable extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
24577
24535
|
return (0,_util__WEBPACK_IMPORTED_MODULE_4__.defined)(this.modifierContext, 'NoModifierContext', 'No modifier context attached to this tickable.');
|
|
24578
24536
|
}
|
|
24579
24537
|
}
|
|
24580
|
-
_Tickable_preFormatted = new WeakMap(), _Tickable_postFormatted = new WeakMap();
|
|
24581
24538
|
|
|
24582
24539
|
|
|
24583
24540
|
/***/ }),
|
|
@@ -24603,8 +24560,14 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
24603
24560
|
|
|
24604
24561
|
/**
|
|
24605
24562
|
* TickContext formats abstract tickable objects, such as notes, chords, tabs, etc.
|
|
24563
|
+
*
|
|
24564
|
+
* It has a public attribute of `tContexts` which is a parent array of the TickContexts
|
|
24565
|
+
* in which this TickContext belongs.
|
|
24606
24566
|
*/
|
|
24607
24567
|
class TickContext {
|
|
24568
|
+
/**
|
|
24569
|
+
* Get the next TickContext from another TickContext, from the `.tContexts` array.
|
|
24570
|
+
*/
|
|
24608
24571
|
static getNextContext(tContext) {
|
|
24609
24572
|
const contexts = tContext.tContexts;
|
|
24610
24573
|
const index = contexts.indexOf(tContext);
|
|
@@ -24612,20 +24575,21 @@ class TickContext {
|
|
|
24612
24575
|
return contexts[index + 1];
|
|
24613
24576
|
}
|
|
24614
24577
|
constructor(options) {
|
|
24578
|
+
var _a;
|
|
24615
24579
|
this.preFormatted = false;
|
|
24616
24580
|
this.postFormatted = false;
|
|
24617
|
-
this.tickID = options
|
|
24581
|
+
this.tickID = (_a = options === null || options === void 0 ? void 0 : options.tickID) !== null && _a !== void 0 ? _a : 0;
|
|
24618
24582
|
this.currentTick = new _fraction__WEBPACK_IMPORTED_MODULE_0__.Fraction(0, 1);
|
|
24619
24583
|
this.maxTicks = new _fraction__WEBPACK_IMPORTED_MODULE_0__.Fraction(0, 1);
|
|
24620
24584
|
this.maxTickable = undefined; // Biggest tickable
|
|
24621
|
-
this.minTicks = undefined; // this can
|
|
24585
|
+
this.minTicks = undefined; // this can remain null if all tickables have ignoreTicks
|
|
24622
24586
|
this.minTickable = undefined;
|
|
24623
24587
|
this.padding = 1; // padding on each side (width += padding * 2)
|
|
24624
24588
|
this.x = 0;
|
|
24625
24589
|
this.xBase = 0; // base x position without xOffset
|
|
24626
24590
|
this.xOffset = 0; // xBase and xOffset are an alternative way to describe x (x = xB + xO)
|
|
24627
24591
|
this.tickables = []; // Notes, tabs, chords, lyrics.
|
|
24628
|
-
this.tickablesByVoice = {}; // Tickables indexed by voice number
|
|
24592
|
+
this.tickablesByVoice = {}; // Tickables indexed by voice number (as string)
|
|
24629
24593
|
// Formatting metrics
|
|
24630
24594
|
this.notePx = 0; // width of widest note in this context
|
|
24631
24595
|
this.glyphPx = 0; // width of glyph (note head)
|
|
@@ -24636,7 +24600,7 @@ class TickContext {
|
|
|
24636
24600
|
this.totalLeftPx = 0; // Total left pixels
|
|
24637
24601
|
this.totalRightPx = 0; // Total right pixels
|
|
24638
24602
|
this.tContexts = []; // Parent array of tick contexts
|
|
24639
|
-
this.width = 0;
|
|
24603
|
+
this.width = 0; // in pixels
|
|
24640
24604
|
this.formatterMetrics = {
|
|
24641
24605
|
// The freedom of a tickcontext is the distance it can move without colliding
|
|
24642
24606
|
// with neighboring elements. A formatter can set these values during its
|
|
@@ -24788,6 +24752,44 @@ class TickContext {
|
|
|
24788
24752
|
getFormatterMetrics() {
|
|
24789
24753
|
return this.formatterMetrics;
|
|
24790
24754
|
}
|
|
24755
|
+
/**
|
|
24756
|
+
* Move this tick context by `shift` pixels rightward, and adjust the
|
|
24757
|
+
* freedom on adjacent tickcontexts.
|
|
24758
|
+
* @param shift pixels to shift rightward.
|
|
24759
|
+
* @param prev the previous TickContext, whose right freedom will be increased by `shift`.
|
|
24760
|
+
* @param next the next TickContext, whose left freedom will be decreased by `shift`.
|
|
24761
|
+
*/
|
|
24762
|
+
move(shift, prev, next) {
|
|
24763
|
+
this.setX(this.getX() + shift);
|
|
24764
|
+
this.getFormatterMetrics().freedom.left += shift;
|
|
24765
|
+
this.getFormatterMetrics().freedom.right -= shift;
|
|
24766
|
+
if (prev)
|
|
24767
|
+
prev.getFormatterMetrics().freedom.right += shift;
|
|
24768
|
+
if (next)
|
|
24769
|
+
next.getFormatterMetrics().freedom.left -= shift;
|
|
24770
|
+
}
|
|
24771
|
+
/**
|
|
24772
|
+
* Return the total cost of space deviations from formatter metrics for
|
|
24773
|
+
* each tickable in the context. Used by formatters.
|
|
24774
|
+
*
|
|
24775
|
+
* Since FormatterMetrics.space.deviation is the amount each tickable is smaller
|
|
24776
|
+
* (negative) or wider (positive) than the mean amount of space allocated to that
|
|
24777
|
+
* duration, a negative return value means the tickables at this position are on average
|
|
24778
|
+
* getting less space than they should, while a positive number means they are getting
|
|
24779
|
+
* more space than they should.
|
|
24780
|
+
*/
|
|
24781
|
+
getDeviationCost() {
|
|
24782
|
+
return (0,_util__WEBPACK_IMPORTED_MODULE_1__.sumArray)(this.tickables.map((t) => t.getFormatterMetrics().space.deviation));
|
|
24783
|
+
}
|
|
24784
|
+
/**
|
|
24785
|
+
* Like getDeviationCost, but averages the cost of space deviations so that TickContexts
|
|
24786
|
+
* with more Tickables are not weighted more heavily.
|
|
24787
|
+
*/
|
|
24788
|
+
getAverageDeviationCost() {
|
|
24789
|
+
if (!this.tickables.length)
|
|
24790
|
+
return 0;
|
|
24791
|
+
return this.getDeviationCost() / this.tickables.length;
|
|
24792
|
+
}
|
|
24791
24793
|
}
|
|
24792
24794
|
|
|
24793
24795
|
|
|
@@ -26281,12 +26283,14 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
26281
26283
|
/* harmony import */ var _modifier__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./modifier */ "./src/modifier.ts");
|
|
26282
26284
|
/* harmony import */ var _tables__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./tables */ "./src/tables.ts");
|
|
26283
26285
|
/* harmony import */ var _typeguard__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./typeguard */ "./src/typeguard.ts");
|
|
26286
|
+
/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./util */ "./src/util.ts");
|
|
26284
26287
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
26285
26288
|
// MIT License
|
|
26286
26289
|
|
|
26287
26290
|
|
|
26288
26291
|
|
|
26289
26292
|
|
|
26293
|
+
|
|
26290
26294
|
/** `Vibrato` implements diverse vibratos. */
|
|
26291
26295
|
class Vibrato extends _modifier__WEBPACK_IMPORTED_MODULE_1__.Modifier {
|
|
26292
26296
|
static get CATEGORY() {
|
|
@@ -26333,7 +26337,11 @@ class Vibrato extends _modifier__WEBPACK_IMPORTED_MODULE_1__.Modifier {
|
|
|
26333
26337
|
setVibratoWidth(width) {
|
|
26334
26338
|
this.renderOptions.width = width;
|
|
26335
26339
|
this.text = String.fromCodePoint(this.renderOptions.code);
|
|
26336
|
-
const
|
|
26340
|
+
const myWidth = this.getWidth();
|
|
26341
|
+
if (!myWidth) {
|
|
26342
|
+
throw new _util__WEBPACK_IMPORTED_MODULE_4__.RuntimeError('Cannot set vibrato width if width is 0');
|
|
26343
|
+
}
|
|
26344
|
+
const items = Math.round(this.renderOptions.width / myWidth);
|
|
26337
26345
|
for (let i = 1; i < items; i++) {
|
|
26338
26346
|
this.text += String.fromCodePoint(this.renderOptions.code);
|
|
26339
26347
|
}
|