vexflow 5.0.0-alpha.3 → 5.0.0-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +6 -6
- 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 +2066 -1877
- package/build/cjs/vexflow-debug-with-tests.js.map +1 -1
- package/build/cjs/vexflow-debug.js +1052 -993
- 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/annotation.js +0 -2
- package/build/esm/src/barnote.js +3 -3
- package/build/esm/src/beam.js +26 -46
- package/build/esm/src/bend.js +11 -3
- package/build/esm/src/chordsymbol.js +0 -4
- package/build/esm/src/clef.js +0 -2
- package/build/esm/src/clefnote.js +6 -1
- package/build/esm/src/curve.js +8 -5
- package/build/esm/src/element.js +94 -118
- package/build/esm/src/factory.js +4 -4
- package/build/esm/src/flag.js +20 -0
- package/build/esm/src/fonts/gonville.js +1 -1
- package/build/esm/src/formatter.js +13 -21
- package/build/esm/src/fraction.js +15 -22
- package/build/esm/src/glyphnote.js +3 -4
- package/build/esm/src/gracenote.js +0 -2
- package/build/esm/src/gracenotegroup.js +17 -8
- package/build/esm/src/index.js +1 -0
- package/build/esm/src/keysignature.js +38 -31
- package/build/esm/src/keysignote.js +1 -1
- package/build/esm/src/metrics.js +58 -7
- package/build/esm/src/modifier.js +10 -23
- package/build/esm/src/multimeasurerest.js +16 -25
- package/build/esm/src/note.js +7 -0
- package/build/esm/src/notehead.js +6 -1
- package/build/esm/src/ornament.js +0 -2
- package/build/esm/src/pedalmarking.js +33 -41
- package/build/esm/src/registry.js +5 -19
- package/build/esm/src/stave.js +11 -19
- package/build/esm/src/stavebarline.js +2 -3
- package/build/esm/src/stavehairpin.js +1 -1
- package/build/esm/src/staveline.js +0 -4
- package/build/esm/src/stavemodifier.js +0 -2
- package/build/esm/src/stavenote.js +42 -68
- package/build/esm/src/staverepetition.js +3 -2
- package/build/esm/src/stavesection.js +13 -15
- package/build/esm/src/stavetempo.js +7 -13
- package/build/esm/src/stavetext.js +2 -2
- package/build/esm/src/stavetie.js +82 -40
- package/build/esm/src/stavevolta.js +3 -2
- package/build/esm/src/stem.js +0 -4
- package/build/esm/src/stemmablenote.js +5 -6
- package/build/esm/src/stringnumber.js +0 -2
- package/build/esm/src/svgcontext.js +5 -13
- package/build/esm/src/tabnote.js +2 -8
- package/build/esm/src/textbracket.js +0 -3
- package/build/esm/src/textnote.js +0 -2
- package/build/esm/src/tickable.js +13 -26
- package/build/esm/src/tickcontext.js +20 -2
- package/build/esm/src/timesignature.js +2 -4
- package/build/esm/src/timesignote.js +2 -0
- package/build/esm/src/tuplet.js +37 -30
- package/build/esm/src/version.js +3 -3
- package/build/esm/src/vexflow.js +6 -2
- package/build/esm/src/vibrato.js +6 -1
- package/build/esm/tests/accidental_tests.js +30 -17
- package/build/esm/tests/annotation_tests.js +12 -12
- package/build/esm/tests/articulation_tests.js +13 -13
- package/build/esm/tests/auto_beam_formatting_tests.js +33 -33
- package/build/esm/tests/beam_tests.js +1 -1
- package/build/esm/tests/bend_tests.js +7 -7
- package/build/esm/tests/chordsymbol_tests.js +8 -8
- package/build/esm/tests/clef_tests.js +5 -1
- package/build/esm/tests/curve_tests.js +34 -0
- package/build/esm/tests/{bach_tests.js → demo_petzold_tests.js} +7 -7
- package/build/esm/tests/dot_tests.js +4 -4
- package/build/esm/tests/formatter_tests.js +25 -25
- package/build/esm/tests/glyphnote_tests.js +6 -0
- package/build/esm/tests/gracenote_tests.js +2 -1
- package/build/esm/tests/gracetabnote_tests.js +1 -1
- package/build/esm/tests/index.js +1 -1
- package/build/esm/tests/key_clef_tests.js +6 -6
- package/build/esm/tests/keysignature_tests.js +20 -17
- package/build/esm/tests/notehead_tests.js +10 -7
- package/build/esm/tests/offscreencanvas_tests.js +1 -1
- package/build/esm/tests/ornament_tests.js +8 -8
- package/build/esm/tests/pedalmarking_tests.js +27 -0
- package/build/esm/tests/percussion_tests.js +6 -3
- package/build/esm/tests/renderer_tests.js +1 -1
- package/build/esm/tests/rests_tests.js +26 -26
- package/build/esm/tests/rhythm_tests.js +15 -15
- package/build/esm/tests/stave_tests.js +44 -43
- package/build/esm/tests/staveconnector_tests.js +73 -73
- package/build/esm/tests/stavehairpin_tests.js +1 -1
- package/build/esm/tests/stavemodifier_tests.js +3 -3
- package/build/esm/tests/stavenote_tests.js +29 -29
- package/build/esm/tests/stavetie_tests.js +29 -0
- package/build/esm/tests/stringnumber_tests.js +1 -1
- package/build/esm/tests/strokes_tests.js +1 -1
- package/build/esm/tests/style_tests.js +1 -1
- package/build/esm/tests/tabnote_tests.js +7 -7
- package/build/esm/tests/tabslide_tests.js +6 -6
- package/build/esm/tests/tabstave_tests.js +2 -1
- package/build/esm/tests/tabtie_tests.js +8 -8
- package/build/esm/tests/textnote_tests.js +1 -1
- package/build/esm/tests/threevoice_tests.js +2 -2
- package/build/esm/tests/timesignature_tests.js +23 -13
- package/build/esm/tests/vexflow_test_helpers.js +25 -39
- package/build/esm/tests/vibrato_tests.js +3 -3
- package/build/esm/tests/voice_tests.js +1 -1
- 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/bend.d.ts +6 -0
- package/build/types/src/clefnote.d.ts +2 -0
- package/build/types/src/curve.d.ts +5 -4
- package/build/types/src/element.d.ts +23 -14
- package/build/types/src/factory.d.ts +2 -2
- package/build/types/src/flag.d.ts +12 -0
- 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/frethandfinger.d.ts +1 -1
- package/build/types/src/index.d.ts +1 -0
- package/build/types/src/keysignature.d.ts +7 -7
- package/build/types/src/metrics.d.ts +5 -0
- package/build/types/src/modifier.d.ts +3 -2
- package/build/types/src/multimeasurerest.d.ts +4 -1
- package/build/types/src/note.d.ts +2 -0
- package/build/types/src/pedalmarking.d.ts +2 -2
- package/build/types/src/registry.d.ts +1 -1
- package/build/types/src/stave.d.ts +1 -3
- package/build/types/src/stavebarline.d.ts +1 -1
- package/build/types/src/staveline.d.ts +1 -1
- package/build/types/src/stavemodifier.d.ts +0 -1
- package/build/types/src/stavenote.d.ts +2 -1
- package/build/types/src/staverepetition.d.ts +1 -1
- package/build/types/src/stavesection.d.ts +3 -4
- package/build/types/src/stavetempo.d.ts +4 -5
- package/build/types/src/stavetext.d.ts +1 -2
- package/build/types/src/stavetie.d.ts +39 -2
- package/build/types/src/stavevolta.d.ts +1 -2
- package/build/types/src/stemmablenote.d.ts +2 -3
- 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/build/types/src/tuplet.d.ts +2 -12
- package/build/types/src/typeguard.d.ts +1 -0
- package/package.json +33 -29
- package/tests/flow.html +2 -2
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*!
|
|
2
|
-
* VexFlow 5.0.0-
|
|
2
|
+
* VexFlow 5.0.0-beta.0 2024-09-12T19:16:57.446Z 2daeb4def8b685227f2a3c924177b40ddcc5bda3
|
|
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-
|
|
33
|
-
const ID = '
|
|
34
|
-
const DATE = '2024-
|
|
32
|
+
const VERSION = '5.0.0-beta.0';
|
|
33
|
+
const ID = '2daeb4def8b685227f2a3c924177b40ddcc5bda3';
|
|
34
|
+
const DATE = '2024-09-12T19:16:57.446Z';
|
|
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,10 +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
|
-
this.applyStyle();
|
|
733
724
|
ctx.openGroup('annotation', this.getAttribute('id'));
|
|
734
725
|
const textWidth = this.getWidth();
|
|
735
726
|
const textHeight = _font__WEBPACK_IMPORTED_MODULE_0__.Font.convertSizeToPixelValue(this.fontInfo.size);
|
|
@@ -790,7 +781,6 @@ class Annotation extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
|
|
|
790
781
|
this.y = y;
|
|
791
782
|
this.renderText(ctx, 0, 0);
|
|
792
783
|
ctx.closeGroup();
|
|
793
|
-
this.restoreStyle();
|
|
794
784
|
}
|
|
795
785
|
}
|
|
796
786
|
/** To enable logging for this class. Set `VexFlow.Annotation.DEBUG` to `true`. */
|
|
@@ -1262,11 +1252,11 @@ class BarNote extends _note__WEBPACK_IMPORTED_MODULE_0__.Note {
|
|
|
1262
1252
|
draw() {
|
|
1263
1253
|
const ctx = this.checkContext();
|
|
1264
1254
|
L('Rendering bar line at: ', this.getAbsoluteX());
|
|
1265
|
-
this.applyStyle(ctx);
|
|
1266
1255
|
const barline = new _stavebarline__WEBPACK_IMPORTED_MODULE_1__.Barline(this.type);
|
|
1267
1256
|
barline.setX(this.getAbsoluteX());
|
|
1268
|
-
barline.
|
|
1269
|
-
|
|
1257
|
+
barline.setStave(this.checkStave());
|
|
1258
|
+
barline.setContext(ctx);
|
|
1259
|
+
barline.drawWithStyle();
|
|
1270
1260
|
this.setRendered();
|
|
1271
1261
|
}
|
|
1272
1262
|
}
|
|
@@ -1298,18 +1288,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
1298
1288
|
/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./util */ "./src/util.ts");
|
|
1299
1289
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
1300
1290
|
// 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
1291
|
|
|
1314
1292
|
|
|
1315
1293
|
|
|
@@ -1348,7 +1326,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1348
1326
|
}
|
|
1349
1327
|
/** Get the direction of the beam */
|
|
1350
1328
|
getStemDirection() {
|
|
1351
|
-
return
|
|
1329
|
+
return this._stemDirection;
|
|
1352
1330
|
}
|
|
1353
1331
|
/**
|
|
1354
1332
|
* Get the default beam groups for a provided time signature.
|
|
@@ -1661,18 +1639,13 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1661
1639
|
constructor(notes, autoStem = false) {
|
|
1662
1640
|
super();
|
|
1663
1641
|
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);
|
|
1642
|
+
this.yShift = 0;
|
|
1670
1643
|
/**
|
|
1671
1644
|
* Overrides to default beam directions for secondary-level beams that do not
|
|
1672
1645
|
* connect to any other note. See further explanation at
|
|
1673
1646
|
* `setPartialBeamSideAt`
|
|
1674
1647
|
*/
|
|
1675
|
-
|
|
1648
|
+
this.forcedPartialDirections = {};
|
|
1676
1649
|
if (!notes || notes.length === 0) {
|
|
1677
1650
|
throw new _util__WEBPACK_IMPORTED_MODULE_6__.RuntimeError('BadArguments', 'No notes provided for beam.');
|
|
1678
1651
|
}
|
|
@@ -1680,14 +1653,15 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1680
1653
|
throw new _util__WEBPACK_IMPORTED_MODULE_6__.RuntimeError('BadArguments', 'Too few notes for beam.');
|
|
1681
1654
|
}
|
|
1682
1655
|
// Validate beam line, direction and ticks.
|
|
1683
|
-
|
|
1684
|
-
if (
|
|
1656
|
+
this._ticks = notes[0].getIntrinsicTicks();
|
|
1657
|
+
if (this._ticks >= _tables__WEBPACK_IMPORTED_MODULE_3__.Tables.durationToTicks('4')) {
|
|
1658
|
+
// Q(MSAC) -- what about beamed half-note measured tremolos?
|
|
1685
1659
|
throw new _util__WEBPACK_IMPORTED_MODULE_6__.RuntimeError('BadArguments', 'Beams can only be applied to notes shorter than a quarter note.');
|
|
1686
1660
|
}
|
|
1687
1661
|
let i; // shared iterator
|
|
1688
1662
|
let note;
|
|
1689
|
-
|
|
1690
|
-
let stemDirection =
|
|
1663
|
+
this._stemDirection = notes[0].getStemDirection();
|
|
1664
|
+
let stemDirection = this._stemDirection;
|
|
1691
1665
|
// Figure out optimal stem direction based on given notes
|
|
1692
1666
|
if (autoStem && (0,_typeguard__WEBPACK_IMPORTED_MODULE_5__.isStaveNote)(notes[0])) {
|
|
1693
1667
|
stemDirection = calculateStemDirection(notes);
|
|
@@ -1702,14 +1676,14 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1702
1676
|
note = notes[i];
|
|
1703
1677
|
if (autoStem) {
|
|
1704
1678
|
note.setStemDirection(stemDirection);
|
|
1705
|
-
|
|
1679
|
+
this._stemDirection = stemDirection;
|
|
1706
1680
|
}
|
|
1707
1681
|
note.setBeam(this);
|
|
1708
1682
|
}
|
|
1709
1683
|
this.postFormatted = false;
|
|
1710
1684
|
this.notes = notes;
|
|
1711
|
-
|
|
1712
|
-
|
|
1685
|
+
this._beamCount = this.getBeamCount();
|
|
1686
|
+
this.breakOnIndexes = [];
|
|
1713
1687
|
this.renderOptions = {
|
|
1714
1688
|
beamWidth: 5,
|
|
1715
1689
|
maxSlope: 0.25,
|
|
@@ -1735,7 +1709,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1735
1709
|
}
|
|
1736
1710
|
/** Set which note `indexes` to break the secondary beam at. */
|
|
1737
1711
|
breakSecondaryAt(indexes) {
|
|
1738
|
-
|
|
1712
|
+
this.breakOnIndexes = indexes;
|
|
1739
1713
|
return this;
|
|
1740
1714
|
}
|
|
1741
1715
|
/**
|
|
@@ -1752,7 +1726,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1752
1726
|
* ```
|
|
1753
1727
|
*/
|
|
1754
1728
|
setPartialBeamSideAt(noteIndex, side) {
|
|
1755
|
-
|
|
1729
|
+
this.forcedPartialDirections[noteIndex] = side;
|
|
1756
1730
|
return this;
|
|
1757
1731
|
}
|
|
1758
1732
|
/**
|
|
@@ -1760,7 +1734,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1760
1734
|
* that does not connect to any other notes).
|
|
1761
1735
|
*/
|
|
1762
1736
|
unsetPartialBeamSideAt(noteIndex) {
|
|
1763
|
-
delete
|
|
1737
|
+
delete this.forcedPartialDirections[noteIndex];
|
|
1764
1738
|
return this;
|
|
1765
1739
|
}
|
|
1766
1740
|
/**
|
|
@@ -1775,7 +1749,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1775
1749
|
/** Calculate the best possible slope for the provided notes. */
|
|
1776
1750
|
calculateSlope() {
|
|
1777
1751
|
const { notes, renderOptions: { maxSlope, minSlope, slopeIterations, slopeCost }, } = this;
|
|
1778
|
-
const stemDirection =
|
|
1752
|
+
const stemDirection = this._stemDirection;
|
|
1779
1753
|
const firstNote = notes[0];
|
|
1780
1754
|
const initialSlope = getStemSlope(firstNote, notes[notes.length - 1]);
|
|
1781
1755
|
const increment = (maxSlope - minSlope) / slopeIterations;
|
|
@@ -1819,12 +1793,12 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1819
1793
|
}
|
|
1820
1794
|
}
|
|
1821
1795
|
this.slope = bestSlope;
|
|
1822
|
-
|
|
1796
|
+
this.yShift = yShift;
|
|
1823
1797
|
}
|
|
1824
1798
|
/** Calculate a slope and y-shift for flat beams. */
|
|
1825
1799
|
calculateFlatSlope() {
|
|
1826
1800
|
const { notes, renderOptions: { beamWidth, minFlatBeamOffset, flatBeamOffset }, } = this;
|
|
1827
|
-
const stemDirection =
|
|
1801
|
+
const stemDirection = this._stemDirection;
|
|
1828
1802
|
// If a flat beam offset has not yet been supplied or calculated,
|
|
1829
1803
|
// generate one based on the notes in this particular note group
|
|
1830
1804
|
let total = 0;
|
|
@@ -1876,7 +1850,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1876
1850
|
}
|
|
1877
1851
|
// For flat beams, the slope and yShift are 0.
|
|
1878
1852
|
this.slope = 0;
|
|
1879
|
-
|
|
1853
|
+
this.yShift = 0;
|
|
1880
1854
|
}
|
|
1881
1855
|
/** Return the Beam y offset. */
|
|
1882
1856
|
getBeamYToDraw() {
|
|
@@ -1896,8 +1870,8 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1896
1870
|
*/
|
|
1897
1871
|
applyStemExtensions() {
|
|
1898
1872
|
const { notes, slope, renderOptions: { showStemlets, stemletExtension, beamWidth }, } = this;
|
|
1899
|
-
const yShift =
|
|
1900
|
-
const beamCount =
|
|
1873
|
+
const yShift = this.yShift;
|
|
1874
|
+
const beamCount = this._beamCount;
|
|
1901
1875
|
const firstNote = notes[0];
|
|
1902
1876
|
const firstStemTipY = this.getBeamYToDraw();
|
|
1903
1877
|
const firstStemX = firstNote.getStemX();
|
|
@@ -1912,7 +1886,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1912
1886
|
const beamExtension = note.getStemDirection() === _stem__WEBPACK_IMPORTED_MODULE_2__.Stem.UP ? stemTipY - beamedStemTipY : beamedStemTipY - stemTipY;
|
|
1913
1887
|
// Determine necessary extension for cross-stave notes in the beam group
|
|
1914
1888
|
let crossStemExtension = 0;
|
|
1915
|
-
if (note.getStemDirection() !==
|
|
1889
|
+
if (note.getStemDirection() !== this._stemDirection) {
|
|
1916
1890
|
const beamCount = note.getGlyphProps().beamCount;
|
|
1917
1891
|
crossStemExtension = (1 + (beamCount - 1) * 1.5) * this.renderOptions.beamWidth;
|
|
1918
1892
|
/* This will be required if the partial beams are moved to the note side.
|
|
@@ -1937,7 +1911,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1937
1911
|
if (duration === '4') {
|
|
1938
1912
|
return BEAM_LEFT;
|
|
1939
1913
|
}
|
|
1940
|
-
const forcedBeamDirection =
|
|
1914
|
+
const forcedBeamDirection = this.forcedPartialDirections[noteIndex];
|
|
1941
1915
|
if (forcedBeamDirection)
|
|
1942
1916
|
return forcedBeamDirection;
|
|
1943
1917
|
const lookupDuration = `${_tables__WEBPACK_IMPORTED_MODULE_3__.Tables.durationToNumber(duration) / 2}`;
|
|
@@ -1973,7 +1947,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
1973
1947
|
// 8th note beams are always drawn.
|
|
1974
1948
|
if (parseInt(duration, 10) >= 8) {
|
|
1975
1949
|
// First, check to see if any indexes were set up through breakSecondaryAt()
|
|
1976
|
-
shouldBreak =
|
|
1950
|
+
shouldBreak = this.breakOnIndexes.indexOf(i) !== -1;
|
|
1977
1951
|
// If the secondary breaks were auto-configured in the render options,
|
|
1978
1952
|
// handle that as well.
|
|
1979
1953
|
if (this.renderOptions.secondaryBreakTicks && tickTally >= this.renderOptions.secondaryBreakTicks) {
|
|
@@ -2068,7 +2042,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
2068
2042
|
if (stem) {
|
|
2069
2043
|
const stemX = note.getStemX();
|
|
2070
2044
|
stem.setNoteHeadXBounds(stemX, stemX);
|
|
2071
|
-
stem.setContext(ctx).
|
|
2045
|
+
stem.setContext(ctx).drawWithStyle();
|
|
2072
2046
|
}
|
|
2073
2047
|
}, this);
|
|
2074
2048
|
}
|
|
@@ -2078,7 +2052,7 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
2078
2052
|
const firstNote = this.notes[0];
|
|
2079
2053
|
let beamY = this.getBeamYToDraw();
|
|
2080
2054
|
const firstStemX = firstNote.getStemX();
|
|
2081
|
-
const beamThickness = this.renderOptions.beamWidth *
|
|
2055
|
+
const beamThickness = this.renderOptions.beamWidth * this._stemDirection;
|
|
2082
2056
|
// Draw the beams.
|
|
2083
2057
|
for (let i = 0; i < validBeamDurations.length; ++i) {
|
|
2084
2058
|
const duration = validBeamDurations[i];
|
|
@@ -2131,20 +2105,17 @@ class Beam extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
2131
2105
|
draw() {
|
|
2132
2106
|
const ctx = this.checkContext();
|
|
2133
2107
|
this.setRendered();
|
|
2134
|
-
if (
|
|
2108
|
+
if (this.unbeamable)
|
|
2135
2109
|
return;
|
|
2136
2110
|
if (!this.postFormatted) {
|
|
2137
2111
|
this.postFormat();
|
|
2138
2112
|
}
|
|
2139
|
-
this.drawStems(ctx);
|
|
2140
|
-
this.applyStyle();
|
|
2141
2113
|
ctx.openGroup('beam', this.getAttribute('id'));
|
|
2114
|
+
this.drawStems(ctx);
|
|
2142
2115
|
this.drawBeamLines(ctx);
|
|
2143
2116
|
ctx.closeGroup();
|
|
2144
|
-
this.restoreStyle();
|
|
2145
2117
|
}
|
|
2146
2118
|
}
|
|
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
2119
|
|
|
2149
2120
|
|
|
2150
2121
|
/***/ }),
|
|
@@ -2160,19 +2131,21 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
2160
2131
|
/* harmony export */ Bend: () => (/* binding */ Bend)
|
|
2161
2132
|
/* harmony export */ });
|
|
2162
2133
|
/* harmony import */ var _element__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./element */ "./src/element.ts");
|
|
2163
|
-
/* harmony import */ var
|
|
2164
|
-
/* harmony import */ var
|
|
2165
|
-
/* harmony import */ var
|
|
2134
|
+
/* harmony import */ var _metrics__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./metrics */ "./src/metrics.ts");
|
|
2135
|
+
/* harmony import */ var _modifier__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./modifier */ "./src/modifier.ts");
|
|
2136
|
+
/* harmony import */ var _typeguard__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./typeguard */ "./src/typeguard.ts");
|
|
2137
|
+
/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./util */ "./src/util.ts");
|
|
2166
2138
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
2167
2139
|
// MIT License
|
|
2168
2140
|
|
|
2169
2141
|
|
|
2170
2142
|
|
|
2171
2143
|
|
|
2144
|
+
|
|
2172
2145
|
/** Bend implements tablature bends. */
|
|
2173
|
-
class Bend extends
|
|
2146
|
+
class Bend extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
|
|
2174
2147
|
static get CATEGORY() {
|
|
2175
|
-
return
|
|
2148
|
+
return _typeguard__WEBPACK_IMPORTED_MODULE_3__.Category.Bend;
|
|
2176
2149
|
}
|
|
2177
2150
|
static get UP() {
|
|
2178
2151
|
return 0;
|
|
@@ -2189,7 +2162,7 @@ class Bend extends _modifier__WEBPACK_IMPORTED_MODULE_1__.Modifier {
|
|
|
2189
2162
|
for (let i = 0; i < bends.length; ++i) {
|
|
2190
2163
|
const bend = bends[i];
|
|
2191
2164
|
const note = bend.checkAttachedNote();
|
|
2192
|
-
if ((0,
|
|
2165
|
+
if ((0,_typeguard__WEBPACK_IMPORTED_MODULE_3__.isTabNote)(note)) {
|
|
2193
2166
|
const stringPos = note.leastString() - 1;
|
|
2194
2167
|
if (state.topTextLine < stringPos) {
|
|
2195
2168
|
state.topTextLine = stringPos;
|
|
@@ -2203,6 +2176,15 @@ class Bend extends _modifier__WEBPACK_IMPORTED_MODULE_1__.Modifier {
|
|
|
2203
2176
|
state.topTextLine += 1;
|
|
2204
2177
|
return true;
|
|
2205
2178
|
}
|
|
2179
|
+
/** Set the element style used for rendering the lines. */
|
|
2180
|
+
setStyleLine(style) {
|
|
2181
|
+
this.styleLine = style;
|
|
2182
|
+
return this;
|
|
2183
|
+
}
|
|
2184
|
+
/** Get the element style used for rendering the lines. */
|
|
2185
|
+
getStyleLine() {
|
|
2186
|
+
return this.styleLine;
|
|
2187
|
+
}
|
|
2206
2188
|
/**
|
|
2207
2189
|
* Example of a phrase:
|
|
2208
2190
|
* ```
|
|
@@ -2235,13 +2217,13 @@ class Bend extends _modifier__WEBPACK_IMPORTED_MODULE_1__.Modifier {
|
|
|
2235
2217
|
*/
|
|
2236
2218
|
constructor(phrase) {
|
|
2237
2219
|
super();
|
|
2220
|
+
this.styleLine = _metrics__WEBPACK_IMPORTED_MODULE_1__.Metrics.getStyle('Bend.line');
|
|
2238
2221
|
this.xShift = 0;
|
|
2239
2222
|
this.tap = '';
|
|
2240
2223
|
this.renderOptions = {
|
|
2241
2224
|
bendWidth: 8,
|
|
2242
2225
|
releaseWidth: 8,
|
|
2243
2226
|
};
|
|
2244
|
-
this.setStyle({ lineWidth: 1.0, strokeStyle: 'black', fillStyle: 'black' });
|
|
2245
2227
|
this.phrase = phrase;
|
|
2246
2228
|
this.updateWidth();
|
|
2247
2229
|
}
|
|
@@ -2256,14 +2238,14 @@ class Bend extends _modifier__WEBPACK_IMPORTED_MODULE_1__.Modifier {
|
|
|
2256
2238
|
return this;
|
|
2257
2239
|
}
|
|
2258
2240
|
getTextHeight() {
|
|
2259
|
-
const element = new _element__WEBPACK_IMPORTED_MODULE_0__.Element(
|
|
2241
|
+
const element = new _element__WEBPACK_IMPORTED_MODULE_0__.Element(_typeguard__WEBPACK_IMPORTED_MODULE_3__.Category.Bend);
|
|
2260
2242
|
element.setText(this.phrase[0].text);
|
|
2261
2243
|
return element.getHeight();
|
|
2262
2244
|
}
|
|
2263
2245
|
/** Recalculate width. */
|
|
2264
2246
|
updateWidth() {
|
|
2265
2247
|
const measureText = (text) => {
|
|
2266
|
-
const element = new _element__WEBPACK_IMPORTED_MODULE_0__.Element(
|
|
2248
|
+
const element = new _element__WEBPACK_IMPORTED_MODULE_0__.Element(_typeguard__WEBPACK_IMPORTED_MODULE_3__.Category.Bend);
|
|
2267
2249
|
element.setText(text);
|
|
2268
2250
|
return element.getWidth();
|
|
2269
2251
|
};
|
|
@@ -2289,8 +2271,7 @@ class Bend extends _modifier__WEBPACK_IMPORTED_MODULE_1__.Modifier {
|
|
|
2289
2271
|
const ctx = this.checkContext();
|
|
2290
2272
|
const note = this.checkAttachedNote();
|
|
2291
2273
|
this.setRendered();
|
|
2292
|
-
this.
|
|
2293
|
-
const start = note.getModifierStartXY(_modifier__WEBPACK_IMPORTED_MODULE_1__.Modifier.Position.RIGHT, this.index);
|
|
2274
|
+
const start = note.getModifierStartXY(_modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier.Position.RIGHT, this.index);
|
|
2294
2275
|
start.x += 3;
|
|
2295
2276
|
start.y += 0.5;
|
|
2296
2277
|
const xShift = this.xShift;
|
|
@@ -2303,12 +2284,14 @@ class Bend extends _modifier__WEBPACK_IMPORTED_MODULE_1__.Modifier {
|
|
|
2303
2284
|
const renderBend = (x, y, width, height) => {
|
|
2304
2285
|
const cpX = x + width;
|
|
2305
2286
|
const cpY = y;
|
|
2287
|
+
this.applyStyle(ctx, this.styleLine);
|
|
2306
2288
|
ctx.beginPath();
|
|
2307
2289
|
ctx.moveTo(x, y);
|
|
2308
2290
|
ctx.quadraticCurveTo(cpX, cpY, x + width, height);
|
|
2309
2291
|
ctx.stroke();
|
|
2310
2292
|
};
|
|
2311
2293
|
const renderRelease = (x, y, width, height) => {
|
|
2294
|
+
this.applyStyle(ctx, this.styleLine);
|
|
2312
2295
|
ctx.beginPath();
|
|
2313
2296
|
ctx.moveTo(x, height);
|
|
2314
2297
|
ctx.quadraticCurveTo(x + width, height, x + width, y);
|
|
@@ -2333,7 +2316,7 @@ class Bend extends _modifier__WEBPACK_IMPORTED_MODULE_1__.Modifier {
|
|
|
2333
2316
|
let lastBendDrawWidth = 0;
|
|
2334
2317
|
let lastDrawnWidth = 0;
|
|
2335
2318
|
if ((_a = this.tap) === null || _a === void 0 ? void 0 : _a.length) {
|
|
2336
|
-
const tapStart = note.getModifierStartXY(
|
|
2319
|
+
const tapStart = note.getModifierStartXY(_modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier.Position.CENTER, this.index);
|
|
2337
2320
|
renderText(tapStart.x, this.tap);
|
|
2338
2321
|
}
|
|
2339
2322
|
for (let i = 0; i < this.phrase.length; ++i) {
|
|
@@ -2369,7 +2352,7 @@ class Bend extends _modifier__WEBPACK_IMPORTED_MODULE_1__.Modifier {
|
|
|
2369
2352
|
start.x += lastDrawnWidth;
|
|
2370
2353
|
}
|
|
2371
2354
|
if (!lastBend || lastBend.x === undefined) {
|
|
2372
|
-
throw new
|
|
2355
|
+
throw new _util__WEBPACK_IMPORTED_MODULE_4__.RuntimeError('NoLastBendForBend', 'Internal error.');
|
|
2373
2356
|
}
|
|
2374
2357
|
// Final arrowhead and text
|
|
2375
2358
|
if (lastBend.type === Bend.UP) {
|
|
@@ -2378,7 +2361,6 @@ class Bend extends _modifier__WEBPACK_IMPORTED_MODULE_1__.Modifier {
|
|
|
2378
2361
|
else if (lastBend.type === Bend.DOWN) {
|
|
2379
2362
|
renderArrowHead(lastBend.x + lastDrawnWidth, start.y, -1);
|
|
2380
2363
|
}
|
|
2381
|
-
this.restoreStyle();
|
|
2382
2364
|
}
|
|
2383
2365
|
}
|
|
2384
2366
|
|
|
@@ -3057,9 +3039,6 @@ class ChordSymbol extends _modifier__WEBPACK_IMPORTED_MODULE_4__.Modifier {
|
|
|
3057
3039
|
const ctx = this.checkContext();
|
|
3058
3040
|
const note = this.checkAttachedNote();
|
|
3059
3041
|
this.setRendered();
|
|
3060
|
-
// We're changing context parameters. Save current state.
|
|
3061
|
-
ctx.save();
|
|
3062
|
-
this.applyStyle();
|
|
3063
3042
|
ctx.openGroup('chordsymbol', this.getAttribute('id'));
|
|
3064
3043
|
const start = note.getModifierStartXY(_modifier__WEBPACK_IMPORTED_MODULE_4__.Modifier.Position.ABOVE, this.index);
|
|
3065
3044
|
ctx.setFont(this.fontInfo);
|
|
@@ -3110,8 +3089,6 @@ class ChordSymbol extends _modifier__WEBPACK_IMPORTED_MODULE_4__.Modifier {
|
|
|
3110
3089
|
symbol.renderText(ctx, 0, 0);
|
|
3111
3090
|
});
|
|
3112
3091
|
ctx.closeGroup();
|
|
3113
|
-
this.restoreStyle();
|
|
3114
|
-
ctx.restore();
|
|
3115
3092
|
}
|
|
3116
3093
|
// Get the `BoundingBox` for the entire chord
|
|
3117
3094
|
getBoundingBox() {
|
|
@@ -3317,12 +3294,10 @@ class Clef extends _stavemodifier__WEBPACK_IMPORTED_MODULE_2__.StaveModifier {
|
|
|
3317
3294
|
const stave = this.checkStave();
|
|
3318
3295
|
const ctx = stave.checkContext();
|
|
3319
3296
|
this.setRendered();
|
|
3320
|
-
this.applyStyle(ctx);
|
|
3321
3297
|
ctx.openGroup('clef', this.getAttribute('id'));
|
|
3322
3298
|
this.y = stave.getYForLine(this.line);
|
|
3323
3299
|
this.renderText(ctx, 0, 0);
|
|
3324
3300
|
ctx.closeGroup();
|
|
3325
|
-
this.restoreStyle(ctx);
|
|
3326
3301
|
}
|
|
3327
3302
|
}
|
|
3328
3303
|
/** To enable logging for this class, set `VexFlow.Clef.DEBUG` to `true`. */
|
|
@@ -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
|
|
|
@@ -3555,9 +3535,8 @@ class Curve extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
3555
3535
|
this.renderOptions = Object.assign({ thickness: 2, xShift: 0, yShift: 10, position: CurvePosition.NEAR_HEAD, positionEnd: CurvePosition.NEAR_HEAD, invert: false, cps: [
|
|
3556
3536
|
{ x: 0, y: 10 },
|
|
3557
3537
|
{ x: 0, y: 10 },
|
|
3558
|
-
] }, options);
|
|
3559
|
-
this.from
|
|
3560
|
-
this.to = to;
|
|
3538
|
+
], openingDirection: 'auto' }, options);
|
|
3539
|
+
this.setNotes(from, to);
|
|
3561
3540
|
}
|
|
3562
3541
|
setNotes(from, to) {
|
|
3563
3542
|
if (!from && !to) {
|
|
@@ -3576,7 +3555,6 @@ class Curve extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
3576
3555
|
renderCurve(params) {
|
|
3577
3556
|
var _a, _b;
|
|
3578
3557
|
const ctx = this.checkContext();
|
|
3579
|
-
this.applyStyle();
|
|
3580
3558
|
const xShift = this.renderOptions.xShift;
|
|
3581
3559
|
const yShift = this.renderOptions.yShift * params.direction;
|
|
3582
3560
|
const firstX = params.firstX + xShift;
|
|
@@ -3597,7 +3575,6 @@ class Curve extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
3597
3575
|
ctx.closePath();
|
|
3598
3576
|
if (!((_b = this.style) === null || _b === void 0 ? void 0 : _b.lineDash))
|
|
3599
3577
|
ctx.fill();
|
|
3600
|
-
this.restoreStyle();
|
|
3601
3578
|
}
|
|
3602
3579
|
draw() {
|
|
3603
3580
|
this.checkContext();
|
|
@@ -3646,6 +3623,12 @@ class Curve extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
3646
3623
|
lastX = stave.getTieEndX();
|
|
3647
3624
|
lastY = firstNote.getStemExtents()[endMetric];
|
|
3648
3625
|
}
|
|
3626
|
+
if (this.renderOptions.openingDirection === 'up') {
|
|
3627
|
+
stemDirection = 1;
|
|
3628
|
+
}
|
|
3629
|
+
if (this.renderOptions.openingDirection === 'down') {
|
|
3630
|
+
stemDirection = -1;
|
|
3631
|
+
}
|
|
3649
3632
|
this.renderCurve({
|
|
3650
3633
|
firstX,
|
|
3651
3634
|
lastX,
|
|
@@ -3897,7 +3880,6 @@ class EasyScoreGrammar {
|
|
|
3897
3880
|
CHORD() {
|
|
3898
3881
|
return {
|
|
3899
3882
|
expect: [this.LPAREN, this.NOTES, this.RPAREN],
|
|
3900
|
-
// eslint-disable-next-line
|
|
3901
3883
|
run: (state) => this.builder.addChord(state.matches[1]),
|
|
3902
3884
|
};
|
|
3903
3885
|
}
|
|
@@ -3916,7 +3898,6 @@ class EasyScoreGrammar {
|
|
|
3916
3898
|
return {
|
|
3917
3899
|
expect: [this.NOTENAME, this.ACCIDENTAL, this.OCTAVE],
|
|
3918
3900
|
run: (state) => {
|
|
3919
|
-
// eslint-disable-next-line
|
|
3920
3901
|
const s = state;
|
|
3921
3902
|
this.builder.addSingleNote(s.matches[0], s.matches[1], s.matches[2]);
|
|
3922
3903
|
},
|
|
@@ -3933,7 +3914,6 @@ class EasyScoreGrammar {
|
|
|
3933
3914
|
return {
|
|
3934
3915
|
expect: [this.DOT],
|
|
3935
3916
|
zeroOrMore: true,
|
|
3936
|
-
// eslint-disable-next-line
|
|
3937
3917
|
run: (state) => this.builder.setNoteDots(state.matches),
|
|
3938
3918
|
};
|
|
3939
3919
|
}
|
|
@@ -3941,7 +3921,6 @@ class EasyScoreGrammar {
|
|
|
3941
3921
|
return {
|
|
3942
3922
|
expect: [this.SLASH, this.MAYBESLASH, this.TYPES],
|
|
3943
3923
|
maybe: true,
|
|
3944
|
-
// eslint-disable-next-line
|
|
3945
3924
|
run: (state) => this.builder.setNoteType(state.matches[2]),
|
|
3946
3925
|
};
|
|
3947
3926
|
}
|
|
@@ -3949,7 +3928,6 @@ class EasyScoreGrammar {
|
|
|
3949
3928
|
return {
|
|
3950
3929
|
expect: [this.SLASH, this.DURATIONS],
|
|
3951
3930
|
maybe: true,
|
|
3952
|
-
// eslint-disable-next-line
|
|
3953
3931
|
run: (state) => this.builder.setNoteDuration(state.matches[1]),
|
|
3954
3932
|
};
|
|
3955
3933
|
}
|
|
@@ -3969,7 +3947,6 @@ class EasyScoreGrammar {
|
|
|
3969
3947
|
const unquote = (str) => str.slice(1, -1);
|
|
3970
3948
|
return {
|
|
3971
3949
|
expect: [this.KEY, this.EQUALS, this.VAL],
|
|
3972
|
-
// eslint-disable-next-line
|
|
3973
3950
|
run: (state) => this.builder.addNoteOption(state.matches[0], unquote(state.matches[2])),
|
|
3974
3951
|
};
|
|
3975
3952
|
}
|
|
@@ -4214,7 +4191,6 @@ class EasyScore {
|
|
|
4214
4191
|
*/
|
|
4215
4192
|
setOptions(options) {
|
|
4216
4193
|
var _a, _b;
|
|
4217
|
-
// eslint-disable-next-line
|
|
4218
4194
|
const factory = options.factory; // ! operator, because options.factory was set in Factory.EasyScore().
|
|
4219
4195
|
const builder = (_a = options.builder) !== null && _a !== void 0 ? _a : new Builder(factory);
|
|
4220
4196
|
this.options = Object.assign(Object.assign({ commitHooks: [setId, setClass, _articulation__WEBPACK_IMPORTED_MODULE_0__.Articulation.easyScoreHook, _frethandfinger__WEBPACK_IMPORTED_MODULE_2__.FretHandFinger.easyScoreHook], throwOnError: false }, options), { factory,
|
|
@@ -4284,18 +4260,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
4284
4260
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
4285
4261
|
// MIT License
|
|
4286
4262
|
// @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
4263
|
|
|
4300
4264
|
|
|
4301
4265
|
|
|
@@ -4321,15 +4285,15 @@ class Element {
|
|
|
4321
4285
|
return _typeguard__WEBPACK_IMPORTED_MODULE_4__.Category.Element;
|
|
4322
4286
|
}
|
|
4323
4287
|
static newID() {
|
|
4324
|
-
return `auto${
|
|
4288
|
+
return `auto${Element.ID++}`;
|
|
4325
4289
|
}
|
|
4326
4290
|
// Note: Canvas is node-canvas.
|
|
4327
4291
|
// https://www.npmjs.com/package/canvas
|
|
4328
4292
|
static setTextMeasurementCanvas(canvas /* | Canvas */) {
|
|
4329
|
-
|
|
4293
|
+
Element.txtCanvas = canvas;
|
|
4330
4294
|
}
|
|
4331
4295
|
static getTextMeasurementCanvas() {
|
|
4332
|
-
let txtCanvas =
|
|
4296
|
+
let txtCanvas = Element.txtCanvas;
|
|
4333
4297
|
// Create the canvas element that will be used to measure text.
|
|
4334
4298
|
if (!txtCanvas) {
|
|
4335
4299
|
if (typeof document !== 'undefined') {
|
|
@@ -4338,22 +4302,17 @@ class Element {
|
|
|
4338
4302
|
else if (typeof OffscreenCanvas !== 'undefined') {
|
|
4339
4303
|
txtCanvas = new OffscreenCanvas(300, 150);
|
|
4340
4304
|
}
|
|
4341
|
-
|
|
4305
|
+
Element.txtCanvas = txtCanvas;
|
|
4342
4306
|
}
|
|
4343
4307
|
return txtCanvas;
|
|
4344
4308
|
}
|
|
4345
4309
|
constructor(category) {
|
|
4346
|
-
var
|
|
4347
|
-
// Element objects keep a list of children that they are responsible for.
|
|
4348
|
-
// Children inherit the style from their parents (see: setGroupStyle(s)).
|
|
4310
|
+
var _a;
|
|
4349
4311
|
this.children = [];
|
|
4350
|
-
|
|
4351
|
-
|
|
4352
|
-
|
|
4353
|
-
|
|
4354
|
-
_Element_text.set(this, '');
|
|
4355
|
-
_Element_metricsValid.set(this, false);
|
|
4356
|
-
_Element_textMetrics.set(this, {
|
|
4312
|
+
this.style = {};
|
|
4313
|
+
this._text = '';
|
|
4314
|
+
this.metricsValid = false;
|
|
4315
|
+
this._textMetrics = {
|
|
4357
4316
|
fontBoundingBoxAscent: 0,
|
|
4358
4317
|
fontBoundingBoxDescent: 0,
|
|
4359
4318
|
actualBoundingBoxAscent: 0,
|
|
@@ -4366,26 +4325,27 @@ class Element {
|
|
|
4366
4325
|
emHeightDescent: 0,
|
|
4367
4326
|
hangingBaseline: 0,
|
|
4368
4327
|
ideographicBaseline: 0,
|
|
4369
|
-
}
|
|
4370
|
-
|
|
4371
|
-
|
|
4328
|
+
};
|
|
4329
|
+
this._height = 0;
|
|
4330
|
+
this._width = 0;
|
|
4372
4331
|
this.xShift = 0;
|
|
4373
4332
|
this.yShift = 0;
|
|
4374
4333
|
this.x = 0;
|
|
4375
4334
|
this.y = 0;
|
|
4376
|
-
|
|
4377
|
-
id:
|
|
4335
|
+
this.attrs = {
|
|
4336
|
+
id: Element.newID(),
|
|
4378
4337
|
type: category !== null && category !== void 0 ? category : this.constructor.CATEGORY,
|
|
4379
4338
|
class: '',
|
|
4380
|
-
}
|
|
4339
|
+
};
|
|
4381
4340
|
this.rendered = false;
|
|
4382
|
-
|
|
4383
|
-
|
|
4341
|
+
this._fontInfo = _metrics__WEBPACK_IMPORTED_MODULE_2__.Metrics.getFontInfo(this.attrs.type);
|
|
4342
|
+
this.style = _metrics__WEBPACK_IMPORTED_MODULE_2__.Metrics.getStyle(this.attrs.type);
|
|
4343
|
+
this.fontScale = _metrics__WEBPACK_IMPORTED_MODULE_2__.Metrics.get(`${this.attrs.type}.fontScale`);
|
|
4384
4344
|
// If a default registry exist, then register with it right away.
|
|
4385
|
-
(
|
|
4345
|
+
(_a = _registry__WEBPACK_IMPORTED_MODULE_3__.Registry.getDefaultRegistry()) === null || _a === void 0 ? void 0 : _a.register(this);
|
|
4386
4346
|
}
|
|
4387
4347
|
/**
|
|
4388
|
-
* Adds a child
|
|
4348
|
+
* Adds a child to the Element, which lets it inherit the
|
|
4389
4349
|
* same style as the parent when setGroupStyle() is called.
|
|
4390
4350
|
*
|
|
4391
4351
|
* Examples of children are noteheads and stems. Modifiers such
|
|
@@ -4393,12 +4353,15 @@ class Element {
|
|
|
4393
4353
|
*
|
|
4394
4354
|
* Note that StaveNote calls setGroupStyle() when setStyle() is called.
|
|
4395
4355
|
*/
|
|
4396
|
-
|
|
4356
|
+
addChild(child) {
|
|
4357
|
+
if (child.parent)
|
|
4358
|
+
throw new _util__WEBPACK_IMPORTED_MODULE_5__.RuntimeError('Element', 'Parent already defined');
|
|
4359
|
+
child.parent = this;
|
|
4397
4360
|
this.children.push(child);
|
|
4398
4361
|
return this;
|
|
4399
4362
|
}
|
|
4400
4363
|
getCategory() {
|
|
4401
|
-
return
|
|
4364
|
+
return this.attrs.type;
|
|
4402
4365
|
}
|
|
4403
4366
|
/**
|
|
4404
4367
|
* Set the element style used to render.
|
|
@@ -4406,15 +4369,15 @@ class Element {
|
|
|
4406
4369
|
* Example:
|
|
4407
4370
|
* ```typescript
|
|
4408
4371
|
* element.setStyle({ fillStyle: 'red', strokeStyle: 'red' });
|
|
4409
|
-
* element.
|
|
4372
|
+
* element.drawWithStyle();
|
|
4410
4373
|
* ```
|
|
4411
|
-
* Note: If the element draws additional sub-elements (
|
|
4374
|
+
* Note: If the element draws additional sub-elements (i.e.: Modifiers in a Stave),
|
|
4412
4375
|
* the style can be applied to all of them by means of the context:
|
|
4413
4376
|
* ```typescript
|
|
4414
4377
|
* element.setStyle({ fillStyle: 'red', strokeStyle: 'red' });
|
|
4415
4378
|
* element.getContext().setFillStyle('red');
|
|
4416
4379
|
* element.getContext().setStrokeStyle('red');
|
|
4417
|
-
* element.
|
|
4380
|
+
* element.drawWithStyle();
|
|
4418
4381
|
* ```
|
|
4419
4382
|
* or using drawWithStyle:
|
|
4420
4383
|
* ```typescript
|
|
@@ -4437,12 +4400,9 @@ class Element {
|
|
|
4437
4400
|
return this.style;
|
|
4438
4401
|
}
|
|
4439
4402
|
/** Apply the element style to `context`. */
|
|
4440
|
-
applyStyle(context =
|
|
4441
|
-
if (!style)
|
|
4442
|
-
return this;
|
|
4403
|
+
applyStyle(context = this.context, style = this.getStyle()) {
|
|
4443
4404
|
if (!context)
|
|
4444
4405
|
return this;
|
|
4445
|
-
context.save();
|
|
4446
4406
|
if (style.shadowColor)
|
|
4447
4407
|
context.setShadowColor(style.shadowColor);
|
|
4448
4408
|
if (style.shadowBlur)
|
|
@@ -4457,24 +4417,17 @@ class Element {
|
|
|
4457
4417
|
context.setLineDash(style.lineDash.split(' ').map(Number));
|
|
4458
4418
|
return this;
|
|
4459
4419
|
}
|
|
4460
|
-
/** Restore the style of `context`. */
|
|
4461
|
-
restoreStyle(context = __classPrivateFieldGet(this, _Element_context, "f"), style = this.getStyle()) {
|
|
4462
|
-
if (!style)
|
|
4463
|
-
return this;
|
|
4464
|
-
if (!context)
|
|
4465
|
-
return this;
|
|
4466
|
-
context.restore();
|
|
4467
|
-
return this;
|
|
4468
|
-
}
|
|
4469
4420
|
/**
|
|
4470
|
-
* Draw the element and all its sub-elements (
|
|
4421
|
+
* Draw the element and all its sub-elements (i.e.: Modifiers in a Stave)
|
|
4471
4422
|
* with the element's style (see `getStyle()` and `setStyle()`)
|
|
4472
4423
|
*/
|
|
4473
4424
|
drawWithStyle() {
|
|
4474
|
-
this.checkContext();
|
|
4475
|
-
|
|
4425
|
+
const ctx = this.checkContext();
|
|
4426
|
+
ctx.save();
|
|
4427
|
+
this.applyStyle(ctx);
|
|
4476
4428
|
this.draw();
|
|
4477
|
-
|
|
4429
|
+
ctx.restore();
|
|
4430
|
+
return this;
|
|
4478
4431
|
}
|
|
4479
4432
|
/** Draw an element. */
|
|
4480
4433
|
draw() {
|
|
@@ -4482,22 +4435,22 @@ class Element {
|
|
|
4482
4435
|
}
|
|
4483
4436
|
/** Check if it has a class label (An element can have multiple class labels). */
|
|
4484
4437
|
hasClass(className) {
|
|
4485
|
-
var
|
|
4486
|
-
if (!
|
|
4438
|
+
var _a;
|
|
4439
|
+
if (!this.attrs.class)
|
|
4487
4440
|
return false;
|
|
4488
|
-
return ((
|
|
4441
|
+
return ((_a = this.attrs.class) === null || _a === void 0 ? void 0 : _a.split(' ').indexOf(className)) !== -1;
|
|
4489
4442
|
}
|
|
4490
4443
|
/** Add a class label (An element can have multiple class labels). */
|
|
4491
4444
|
addClass(className) {
|
|
4492
|
-
var
|
|
4445
|
+
var _a;
|
|
4493
4446
|
if (this.hasClass(className))
|
|
4494
4447
|
return this;
|
|
4495
|
-
if (!
|
|
4496
|
-
|
|
4448
|
+
if (!this.attrs.class)
|
|
4449
|
+
this.attrs.class = `${className}`;
|
|
4497
4450
|
else
|
|
4498
|
-
|
|
4499
|
-
(
|
|
4500
|
-
id:
|
|
4451
|
+
this.attrs.class = `${this.attrs.class} ${className}`;
|
|
4452
|
+
(_a = this.registry) === null || _a === void 0 ? void 0 : _a.onUpdate({
|
|
4453
|
+
id: this.attrs.id,
|
|
4501
4454
|
name: 'class',
|
|
4502
4455
|
value: className,
|
|
4503
4456
|
oldValue: undefined,
|
|
@@ -4506,16 +4459,16 @@ class Element {
|
|
|
4506
4459
|
}
|
|
4507
4460
|
/** Remove a class label (An element can have multiple class labels). */
|
|
4508
4461
|
removeClass(className) {
|
|
4509
|
-
var
|
|
4462
|
+
var _a, _b;
|
|
4510
4463
|
if (!this.hasClass(className))
|
|
4511
4464
|
return this;
|
|
4512
|
-
const arr = (
|
|
4465
|
+
const arr = (_a = this.attrs.class) === null || _a === void 0 ? void 0 : _a.split(' ');
|
|
4513
4466
|
if (arr) {
|
|
4514
4467
|
arr.splice(arr.indexOf(className));
|
|
4515
|
-
|
|
4468
|
+
this.attrs.class = arr.join(' ');
|
|
4516
4469
|
}
|
|
4517
|
-
(
|
|
4518
|
-
id:
|
|
4470
|
+
(_b = this.registry) === null || _b === void 0 ? void 0 : _b.onUpdate({
|
|
4471
|
+
id: this.attrs.id,
|
|
4519
4472
|
name: 'class',
|
|
4520
4473
|
value: undefined,
|
|
4521
4474
|
oldValue: className,
|
|
@@ -4538,28 +4491,28 @@ class Element {
|
|
|
4538
4491
|
}
|
|
4539
4492
|
/** Return the element attributes. */
|
|
4540
4493
|
getAttributes() {
|
|
4541
|
-
return
|
|
4494
|
+
return this.attrs;
|
|
4542
4495
|
}
|
|
4543
4496
|
/** Return an attribute, such as 'id', 'type' or 'class'. */
|
|
4544
4497
|
// eslint-disable-next-line
|
|
4545
4498
|
getAttribute(name) {
|
|
4546
|
-
return
|
|
4499
|
+
return this.attrs[name];
|
|
4547
4500
|
}
|
|
4548
4501
|
/** Return associated SVGElement. */
|
|
4549
4502
|
getSVGElement(suffix = '') {
|
|
4550
|
-
const id = (0,_util__WEBPACK_IMPORTED_MODULE_5__.prefix)(
|
|
4503
|
+
const id = (0,_util__WEBPACK_IMPORTED_MODULE_5__.prefix)(this.attrs.id + suffix);
|
|
4551
4504
|
const element = document.getElementById(id);
|
|
4552
4505
|
if (element)
|
|
4553
4506
|
return element;
|
|
4554
4507
|
}
|
|
4555
4508
|
/** Set an attribute such as 'id', 'class', or 'type'. */
|
|
4556
4509
|
setAttribute(name, value) {
|
|
4557
|
-
var
|
|
4558
|
-
const oldID =
|
|
4559
|
-
const oldValue =
|
|
4560
|
-
|
|
4510
|
+
var _a;
|
|
4511
|
+
const oldID = this.attrs.id;
|
|
4512
|
+
const oldValue = this.attrs[name];
|
|
4513
|
+
this.attrs[name] = value;
|
|
4561
4514
|
// Register with old id to support id changes.
|
|
4562
|
-
(
|
|
4515
|
+
(_a = this.registry) === null || _a === void 0 ? void 0 : _a.onUpdate({ id: oldID, name, value, oldValue });
|
|
4563
4516
|
return this;
|
|
4564
4517
|
}
|
|
4565
4518
|
/** Get the boundingBox. */
|
|
@@ -4568,16 +4521,16 @@ class Element {
|
|
|
4568
4521
|
}
|
|
4569
4522
|
/** Return the context, such as an SVGContext or CanvasContext object. */
|
|
4570
4523
|
getContext() {
|
|
4571
|
-
return
|
|
4524
|
+
return this.context;
|
|
4572
4525
|
}
|
|
4573
4526
|
/** Set the context to an SVGContext or CanvasContext object */
|
|
4574
4527
|
setContext(context) {
|
|
4575
|
-
|
|
4528
|
+
this.context = context;
|
|
4576
4529
|
return this;
|
|
4577
4530
|
}
|
|
4578
4531
|
/** Validate and return the rendering context. */
|
|
4579
4532
|
checkContext() {
|
|
4580
|
-
return (0,_util__WEBPACK_IMPORTED_MODULE_5__.defined)(
|
|
4533
|
+
return (0,_util__WEBPACK_IMPORTED_MODULE_5__.defined)(this.context, 'NoContext', 'No rendering context attached to instance.');
|
|
4581
4534
|
}
|
|
4582
4535
|
//////////////////////////////////////////////////////////////////////////////////////////////////
|
|
4583
4536
|
// Font Handling
|
|
@@ -4590,7 +4543,7 @@ class Element {
|
|
|
4590
4543
|
}
|
|
4591
4544
|
/** Returns the CSS compatible font string for the text font. */
|
|
4592
4545
|
get font() {
|
|
4593
|
-
return _font__WEBPACK_IMPORTED_MODULE_1__.Font.toCSSString(
|
|
4546
|
+
return _font__WEBPACK_IMPORTED_MODULE_1__.Font.toCSSString(this._fontInfo);
|
|
4594
4547
|
}
|
|
4595
4548
|
/**
|
|
4596
4549
|
* Set the element's text font family, size, weight, style
|
|
@@ -4608,25 +4561,25 @@ class Element {
|
|
|
4608
4561
|
* Each Element subclass may specify its own default by overriding the static `TEXT_FONT` property.
|
|
4609
4562
|
*/
|
|
4610
4563
|
setFont(font, size, weight, style) {
|
|
4611
|
-
const defaultTextFont = _metrics__WEBPACK_IMPORTED_MODULE_2__.Metrics.getFontInfo(
|
|
4564
|
+
const defaultTextFont = _metrics__WEBPACK_IMPORTED_MODULE_2__.Metrics.getFontInfo(this.attrs.type);
|
|
4612
4565
|
const fontIsObject = typeof font === 'object';
|
|
4613
4566
|
const fontIsString = typeof font === 'string';
|
|
4614
4567
|
const sizeWeightStyleAreUndefined = size === undefined && weight === undefined && style === undefined;
|
|
4615
|
-
|
|
4568
|
+
this.metricsValid = false;
|
|
4616
4569
|
if (fontIsObject) {
|
|
4617
4570
|
// `font` is case 1) a FontInfo object
|
|
4618
|
-
|
|
4571
|
+
this._fontInfo = Object.assign(Object.assign({}, defaultTextFont), font);
|
|
4619
4572
|
}
|
|
4620
4573
|
else if (fontIsString && sizeWeightStyleAreUndefined) {
|
|
4621
4574
|
// `font` is case 2) CSS font shorthand.
|
|
4622
|
-
|
|
4575
|
+
this._fontInfo = _font__WEBPACK_IMPORTED_MODULE_1__.Font.fromCSSString(font);
|
|
4623
4576
|
}
|
|
4624
4577
|
else {
|
|
4625
4578
|
// `font` is case 3) a font family string (e.g., 'Times New Roman').
|
|
4626
4579
|
// The other parameters represent the size, weight, and style.
|
|
4627
4580
|
// It is okay for `font` to be undefined while one or more of the other arguments is provided.
|
|
4628
4581
|
// Following CSS conventions, unspecified params are reset to the default.
|
|
4629
|
-
|
|
4582
|
+
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
4583
|
}
|
|
4631
4584
|
return this;
|
|
4632
4585
|
}
|
|
@@ -4635,13 +4588,13 @@ class Element {
|
|
|
4635
4588
|
* 'bold 10pt Arial'.
|
|
4636
4589
|
*/
|
|
4637
4590
|
getFont() {
|
|
4638
|
-
return _font__WEBPACK_IMPORTED_MODULE_1__.Font.toCSSString(
|
|
4591
|
+
return _font__WEBPACK_IMPORTED_MODULE_1__.Font.toCSSString(this._fontInfo);
|
|
4639
4592
|
}
|
|
4640
4593
|
/** Return a copy of the current FontInfo object. */
|
|
4641
4594
|
get fontInfo() {
|
|
4642
4595
|
// We can cast to Required<FontInfo> here, because
|
|
4643
4596
|
// we just called resetFont() above to ensure this.fontInfo is set.
|
|
4644
|
-
return
|
|
4597
|
+
return this._fontInfo;
|
|
4645
4598
|
}
|
|
4646
4599
|
/** Set the current FontInfo object. */
|
|
4647
4600
|
set fontInfo(fontInfo) {
|
|
@@ -4661,7 +4614,7 @@ class Element {
|
|
|
4661
4614
|
return this.fontSize;
|
|
4662
4615
|
}
|
|
4663
4616
|
getFontScale() {
|
|
4664
|
-
return
|
|
4617
|
+
return this.fontScale;
|
|
4665
4618
|
}
|
|
4666
4619
|
/**
|
|
4667
4620
|
* The size is 1) a string of the form '10pt' or '16px', compatible with the CSS font-size property.
|
|
@@ -4712,9 +4665,9 @@ class Element {
|
|
|
4712
4665
|
return this.width;
|
|
4713
4666
|
}
|
|
4714
4667
|
get width() {
|
|
4715
|
-
if (!
|
|
4668
|
+
if (!this.metricsValid)
|
|
4716
4669
|
this.measureText();
|
|
4717
|
-
return
|
|
4670
|
+
return this._width;
|
|
4718
4671
|
}
|
|
4719
4672
|
/** Set element width. */
|
|
4720
4673
|
setWidth(width) {
|
|
@@ -4722,9 +4675,9 @@ class Element {
|
|
|
4722
4675
|
return this;
|
|
4723
4676
|
}
|
|
4724
4677
|
set width(width) {
|
|
4725
|
-
if (!
|
|
4678
|
+
if (!this.metricsValid)
|
|
4726
4679
|
this.measureText();
|
|
4727
|
-
|
|
4680
|
+
this._width = width;
|
|
4728
4681
|
}
|
|
4729
4682
|
/** Set the X coordinate. */
|
|
4730
4683
|
setX(x) {
|
|
@@ -4768,49 +4721,48 @@ class Element {
|
|
|
4768
4721
|
return this;
|
|
4769
4722
|
}
|
|
4770
4723
|
set text(text) {
|
|
4771
|
-
|
|
4772
|
-
|
|
4724
|
+
this.metricsValid = false;
|
|
4725
|
+
this._text = text;
|
|
4773
4726
|
}
|
|
4774
4727
|
/** Get element text. */
|
|
4775
4728
|
getText() {
|
|
4776
|
-
return
|
|
4729
|
+
return this._text;
|
|
4777
4730
|
}
|
|
4778
4731
|
get text() {
|
|
4779
|
-
return
|
|
4732
|
+
return this._text;
|
|
4780
4733
|
}
|
|
4781
4734
|
/** Render the element text. */
|
|
4782
4735
|
renderText(ctx, xPos, yPos) {
|
|
4783
|
-
ctx.
|
|
4784
|
-
ctx.
|
|
4785
|
-
ctx.fillText(__classPrivateFieldGet(this, _Element_text, "f"), xPos + this.x + this.xShift, yPos + this.y + this.yShift);
|
|
4736
|
+
ctx.setFont(this._fontInfo);
|
|
4737
|
+
ctx.fillText(this._text, xPos + this.x + this.xShift, yPos + this.y + this.yShift);
|
|
4786
4738
|
this.children.forEach((child) => {
|
|
4787
|
-
|
|
4788
|
-
ctx.
|
|
4739
|
+
// changed -- do not look at private attributes of children.
|
|
4740
|
+
ctx.setFont(child.fontInfo);
|
|
4741
|
+
ctx.fillText(child.text, xPos + child.x + child.xShift, yPos + child.y + child.yShift);
|
|
4789
4742
|
});
|
|
4790
|
-
ctx.restore();
|
|
4791
4743
|
}
|
|
4792
4744
|
/** Measure the text using the textFont. */
|
|
4793
4745
|
measureText() {
|
|
4794
|
-
var
|
|
4746
|
+
var _a;
|
|
4795
4747
|
// TODO: What about SVG.getBBox()?
|
|
4796
4748
|
// https://developer.mozilla.org/en-US/docs/Web/API/SVGGraphicsElement/getBBox
|
|
4797
|
-
const context = (
|
|
4749
|
+
const context = (_a = Element.getTextMeasurementCanvas()) === null || _a === void 0 ? void 0 : _a.getContext('2d');
|
|
4798
4750
|
if (!context) {
|
|
4799
4751
|
// eslint-disable-next-line no-console
|
|
4800
4752
|
console.warn('Element: No context for txtCanvas. Returning empty text metrics.');
|
|
4801
|
-
return
|
|
4753
|
+
return this._textMetrics;
|
|
4802
4754
|
}
|
|
4803
|
-
context.font = _font__WEBPACK_IMPORTED_MODULE_1__.Font.toCSSString(_font__WEBPACK_IMPORTED_MODULE_1__.Font.validate(
|
|
4804
|
-
|
|
4805
|
-
|
|
4806
|
-
|
|
4807
|
-
|
|
4808
|
-
return
|
|
4755
|
+
context.font = _font__WEBPACK_IMPORTED_MODULE_1__.Font.toCSSString(_font__WEBPACK_IMPORTED_MODULE_1__.Font.validate(this.fontInfo));
|
|
4756
|
+
this._textMetrics = context.measureText(this.text);
|
|
4757
|
+
this._height = this._textMetrics.actualBoundingBoxAscent + this._textMetrics.actualBoundingBoxDescent;
|
|
4758
|
+
this._width = this._textMetrics.width;
|
|
4759
|
+
this.metricsValid = true;
|
|
4760
|
+
return this._textMetrics;
|
|
4809
4761
|
}
|
|
4810
4762
|
/** Measure the text using the FontInfo related with key. */
|
|
4811
4763
|
static measureWidth(text, key = '') {
|
|
4812
|
-
var
|
|
4813
|
-
const context = (
|
|
4764
|
+
var _a;
|
|
4765
|
+
const context = (_a = Element.getTextMeasurementCanvas()) === null || _a === void 0 ? void 0 : _a.getContext('2d');
|
|
4814
4766
|
if (!context) {
|
|
4815
4767
|
// eslint-disable-next-line no-console
|
|
4816
4768
|
console.warn('Element: No context for txtCanvas. Returning empty text metrics.');
|
|
@@ -4824,23 +4776,23 @@ class Element {
|
|
|
4824
4776
|
return this.textMetrics;
|
|
4825
4777
|
}
|
|
4826
4778
|
get textMetrics() {
|
|
4827
|
-
if (!
|
|
4779
|
+
if (!this.metricsValid)
|
|
4828
4780
|
this.measureText();
|
|
4829
|
-
return
|
|
4781
|
+
return this._textMetrics;
|
|
4830
4782
|
}
|
|
4831
4783
|
/** Get the text height. */
|
|
4832
4784
|
getHeight() {
|
|
4833
4785
|
return this.height;
|
|
4834
4786
|
}
|
|
4835
4787
|
get height() {
|
|
4836
|
-
if (!
|
|
4788
|
+
if (!this.metricsValid)
|
|
4837
4789
|
this.measureText();
|
|
4838
|
-
return
|
|
4790
|
+
return this._height;
|
|
4839
4791
|
}
|
|
4840
4792
|
set height(height) {
|
|
4841
|
-
if (!
|
|
4793
|
+
if (!this.metricsValid)
|
|
4842
4794
|
this.measureText();
|
|
4843
|
-
|
|
4795
|
+
this._height = height;
|
|
4844
4796
|
}
|
|
4845
4797
|
setOriginX(x) {
|
|
4846
4798
|
const bbox = this.getBoundingBox();
|
|
@@ -4859,10 +4811,7 @@ class Element {
|
|
|
4859
4811
|
this.setOriginY(y);
|
|
4860
4812
|
}
|
|
4861
4813
|
}
|
|
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
4814
|
Element.ID = 1000;
|
|
4864
|
-
/** Canvas used to measure text. See measureText(): TextMetrics. */
|
|
4865
|
-
_Element_txtCanvas = { value: void 0 };
|
|
4866
4815
|
|
|
4867
4816
|
|
|
4868
4817
|
/***/ }),
|
|
@@ -5414,13 +5363,13 @@ class Factory {
|
|
|
5414
5363
|
draw() {
|
|
5415
5364
|
const ctx = this.context;
|
|
5416
5365
|
this.systems.forEach((s) => s.setContext(ctx).format());
|
|
5417
|
-
this.staves.forEach((s) => s.setContext(ctx).
|
|
5418
|
-
this.voices.forEach((v) => v.setContext(ctx).
|
|
5366
|
+
this.staves.forEach((s) => s.setContext(ctx).drawWithStyle());
|
|
5367
|
+
this.voices.forEach((v) => v.setContext(ctx).drawWithStyle());
|
|
5419
5368
|
this.renderQ.forEach((e) => {
|
|
5420
5369
|
if (!e.isRendered())
|
|
5421
|
-
e.setContext(ctx).
|
|
5370
|
+
e.setContext(ctx).drawWithStyle();
|
|
5422
5371
|
});
|
|
5423
|
-
this.systems.forEach((s) => s.setContext(ctx).
|
|
5372
|
+
this.systems.forEach((s) => s.setContext(ctx).drawWithStyle());
|
|
5424
5373
|
this.reset();
|
|
5425
5374
|
}
|
|
5426
5375
|
}
|
|
@@ -5428,6 +5377,53 @@ class Factory {
|
|
|
5428
5377
|
Factory.DEBUG = false;
|
|
5429
5378
|
|
|
5430
5379
|
|
|
5380
|
+
/***/ }),
|
|
5381
|
+
|
|
5382
|
+
/***/ "./src/flag.ts":
|
|
5383
|
+
/*!*********************!*\
|
|
5384
|
+
!*** ./src/flag.ts ***!
|
|
5385
|
+
\*********************/
|
|
5386
|
+
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
|
|
5387
|
+
|
|
5388
|
+
__webpack_require__.r(__webpack_exports__);
|
|
5389
|
+
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
5390
|
+
/* harmony export */ Flag: () => (/* binding */ Flag)
|
|
5391
|
+
/* harmony export */ });
|
|
5392
|
+
/* harmony import */ var _element__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./element */ "./src/element.ts");
|
|
5393
|
+
/* harmony import */ var _typeguard__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./typeguard */ "./src/typeguard.ts");
|
|
5394
|
+
/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./util */ "./src/util.ts");
|
|
5395
|
+
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
5396
|
+
// MIT License
|
|
5397
|
+
|
|
5398
|
+
|
|
5399
|
+
|
|
5400
|
+
// eslint-disable-next-line
|
|
5401
|
+
function L(...args) {
|
|
5402
|
+
if (Flag.DEBUG)
|
|
5403
|
+
(0,_util__WEBPACK_IMPORTED_MODULE_2__.log)('VexFlow.Flag', args);
|
|
5404
|
+
}
|
|
5405
|
+
/**
|
|
5406
|
+
* `Flags` are typically not manipulated
|
|
5407
|
+
* directly, but used internally in `StaveNote`.
|
|
5408
|
+
*/
|
|
5409
|
+
class Flag extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
5410
|
+
static get CATEGORY() {
|
|
5411
|
+
return _typeguard__WEBPACK_IMPORTED_MODULE_1__.Category.Flag;
|
|
5412
|
+
}
|
|
5413
|
+
/** Draw the notehead. */
|
|
5414
|
+
draw() {
|
|
5415
|
+
const ctx = this.checkContext();
|
|
5416
|
+
this.setRendered();
|
|
5417
|
+
ctx.openGroup('flag', this.getAttribute('id'));
|
|
5418
|
+
L("Drawing flag '", this.text, "' at", this.x, this.y);
|
|
5419
|
+
this.renderText(ctx, 0, 0);
|
|
5420
|
+
ctx.closeGroup();
|
|
5421
|
+
}
|
|
5422
|
+
}
|
|
5423
|
+
/** To enable logging for this class. Set `VexFlow.NoteHead.DEBUG` to `true`. */
|
|
5424
|
+
Flag.DEBUG = false;
|
|
5425
|
+
|
|
5426
|
+
|
|
5431
5427
|
/***/ }),
|
|
5432
5428
|
|
|
5433
5429
|
/***/ "./src/font.ts":
|
|
@@ -5822,7 +5818,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
5822
5818
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
5823
5819
|
/* harmony export */ Gonville: () => (/* binding */ Gonville)
|
|
5824
5820
|
/* harmony export */ });
|
|
5825
|
-
const Gonville = 'data:font/woff2;charset=utf-8;base64,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';
|
|
5821
|
+
const Gonville = 'data:font/woff2;charset=utf-8;base64,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';
|
|
5826
5822
|
|
|
5827
5823
|
|
|
5828
5824
|
/***/ }),
|
|
@@ -5960,7 +5956,7 @@ function getRestLineForNextNoteGroup(notes, currRestLine, currNoteIndex, compare
|
|
|
5960
5956
|
break;
|
|
5961
5957
|
}
|
|
5962
5958
|
}
|
|
5963
|
-
// Locate the
|
|
5959
|
+
// Locate the midpoint between two lines.
|
|
5964
5960
|
if (compare && currRestLine !== nextRestLine) {
|
|
5965
5961
|
const top = Math.max(currRestLine, nextRestLine);
|
|
5966
5962
|
const bot = Math.min(currRestLine, nextRestLine);
|
|
@@ -5992,10 +5988,10 @@ class Formatter {
|
|
|
5992
5988
|
static SimpleFormat(notes, x = 0, { paddingBetween = 10 } = {}) {
|
|
5993
5989
|
notes.reduce((accumulator, note) => {
|
|
5994
5990
|
note.addToModifierContext(new _modifiercontext__WEBPACK_IMPORTED_MODULE_3__.ModifierContext());
|
|
5995
|
-
const
|
|
5996
|
-
const metrics =
|
|
5997
|
-
|
|
5998
|
-
return accumulator +
|
|
5991
|
+
const tickContext = new _tickcontext__WEBPACK_IMPORTED_MODULE_7__.TickContext().addTickable(note).preFormat();
|
|
5992
|
+
const metrics = tickContext.getMetrics();
|
|
5993
|
+
tickContext.setX(accumulator + metrics.totalLeftPx);
|
|
5994
|
+
return accumulator + tickContext.getWidth() + metrics.totalRightPx + paddingBetween;
|
|
5999
5995
|
}, x);
|
|
6000
5996
|
}
|
|
6001
5997
|
/** Helper function to plot formatter debug info. */
|
|
@@ -6057,8 +6053,8 @@ class Formatter {
|
|
|
6057
6053
|
.joinVoices([voice]) // , { alignRests: options.alignRests })
|
|
6058
6054
|
.formatToStave([voice], stave, { alignRests: options.alignRests, stave });
|
|
6059
6055
|
// Render the voice and beams to the stave.
|
|
6060
|
-
voice.setStave(stave).
|
|
6061
|
-
beams.forEach((beam) => beam.setContext(ctx).
|
|
6056
|
+
voice.setContext(ctx).setStave(stave).drawWithStyle();
|
|
6057
|
+
beams.forEach((beam) => beam.setContext(ctx).drawWithStyle());
|
|
6062
6058
|
// Return the bounding box of the voice.
|
|
6063
6059
|
return voice.getBoundingBox();
|
|
6064
6060
|
}
|
|
@@ -6100,9 +6096,9 @@ class Formatter {
|
|
|
6100
6096
|
// Render voices and beams to staves.
|
|
6101
6097
|
notevoice.draw(ctx, stave);
|
|
6102
6098
|
tabvoice.draw(ctx, tabstave);
|
|
6103
|
-
beams.forEach((beam) => beam.setContext(ctx).
|
|
6099
|
+
beams.forEach((beam) => beam.setContext(ctx).drawWithStyle());
|
|
6104
6100
|
// Draw a connector between tab and note staves.
|
|
6105
|
-
new _staveconnector__WEBPACK_IMPORTED_MODULE_5__.StaveConnector(stave, tabstave).setContext(ctx).
|
|
6101
|
+
new _staveconnector__WEBPACK_IMPORTED_MODULE_5__.StaveConnector(stave, tabstave).setContext(ctx).drawWithStyle();
|
|
6106
6102
|
}
|
|
6107
6103
|
/**
|
|
6108
6104
|
* Automatically set the vertical position of rests based on previous/next note positions.
|
|
@@ -6174,7 +6170,7 @@ class Formatter {
|
|
|
6174
6170
|
this.lossHistory = [];
|
|
6175
6171
|
}
|
|
6176
6172
|
/**
|
|
6177
|
-
* Find all the rests in each of the `voices` and align them to neighboring notes.
|
|
6173
|
+
* Find all the rests in each of the `voices` and align them vertically to neighboring notes.
|
|
6178
6174
|
*
|
|
6179
6175
|
* @param voices
|
|
6180
6176
|
* @param alignAllNotes If `false`, only align rests within beamed groups of notes. If `true`, align all rests.
|
|
@@ -6222,7 +6218,6 @@ class Formatter {
|
|
|
6222
6218
|
throw new _util__WEBPACK_IMPORTED_MODULE_9__.RuntimeError('BadArgument', "'voices' required to run preCalculateMinTotalWidth");
|
|
6223
6219
|
}
|
|
6224
6220
|
this.createTickContexts(voices);
|
|
6225
|
-
// eslint-disable-next-line
|
|
6226
6221
|
const { list: contextList, map: contextMap } = this.tickContexts;
|
|
6227
6222
|
this.minTotalWidth = 0;
|
|
6228
6223
|
// Go through each tick context and calculate total width,
|
|
@@ -6310,11 +6305,9 @@ class Formatter {
|
|
|
6310
6305
|
if (!(staveTickToContextMap ? staveTickToContextMap[integerTicks] : undefined)) {
|
|
6311
6306
|
const newContext = new _modifiercontext__WEBPACK_IMPORTED_MODULE_3__.ModifierContext();
|
|
6312
6307
|
contexts.push(newContext);
|
|
6313
|
-
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
6314
6308
|
staveTickToContextMap[integerTicks] = newContext;
|
|
6315
6309
|
}
|
|
6316
6310
|
// Add this tickable to the TickContext.
|
|
6317
|
-
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
6318
6311
|
tickable.addToModifierContext(staveTickToContextMap[integerTicks]);
|
|
6319
6312
|
ticksUsed.add(tickable.getTicks());
|
|
6320
6313
|
});
|
|
@@ -6585,11 +6578,12 @@ class Formatter {
|
|
|
6585
6578
|
function updateStats(duration, space) {
|
|
6586
6579
|
const stats = durationStats[duration];
|
|
6587
6580
|
if (stats === undefined) {
|
|
6588
|
-
durationStats[duration] = { mean: space, count: 1 };
|
|
6581
|
+
durationStats[duration] = { mean: space, count: 1, total: space };
|
|
6589
6582
|
}
|
|
6590
6583
|
else {
|
|
6591
6584
|
stats.count += 1;
|
|
6592
|
-
stats.
|
|
6585
|
+
stats.total += space;
|
|
6586
|
+
stats.mean = stats.total / stats.count;
|
|
6593
6587
|
}
|
|
6594
6588
|
}
|
|
6595
6589
|
this.voices.forEach((voice) => {
|
|
@@ -6638,8 +6632,9 @@ class Formatter {
|
|
|
6638
6632
|
* the overall "loss" (or cost) of this layout, and repositions tickcontexts in an
|
|
6639
6633
|
* attempt to reduce the cost. You can call this method multiple times until it finds
|
|
6640
6634
|
* and oscillates around a global minimum.
|
|
6635
|
+
* @param options parameters for tuning, currently just "alpha".
|
|
6641
6636
|
* @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.
|
|
6637
|
+
* the formatter should make based on its cost function. Defaults to 0.5.
|
|
6643
6638
|
*/
|
|
6644
6639
|
tune(options) {
|
|
6645
6640
|
var _a;
|
|
@@ -6648,25 +6643,17 @@ class Formatter {
|
|
|
6648
6643
|
return 0;
|
|
6649
6644
|
}
|
|
6650
6645
|
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
|
-
}
|
|
6646
|
+
// function `move` moved to tickcontext.
|
|
6662
6647
|
let shift = 0;
|
|
6663
6648
|
this.totalShift = 0;
|
|
6664
6649
|
contexts.list.forEach((tick, index, list) => {
|
|
6665
6650
|
const context = contexts.map[tick];
|
|
6666
6651
|
const prevContext = index > 0 ? contexts.map[list[index - 1]] : undefined;
|
|
6667
6652
|
const nextContext = index < list.length - 1 ? contexts.map[list[index + 1]] : undefined;
|
|
6668
|
-
move(
|
|
6669
|
-
|
|
6653
|
+
context.move(shift, prevContext, nextContext);
|
|
6654
|
+
// Q(msac): Should the cost by normalized by the number
|
|
6655
|
+
// of tickables at this position? If so, switch this to getAverageDeviationCost()
|
|
6656
|
+
const cost = -context.getDeviationCost();
|
|
6670
6657
|
if (cost > 0) {
|
|
6671
6658
|
shift = -Math.min(context.getFormatterMetrics().freedom.right, Math.abs(cost));
|
|
6672
6659
|
}
|
|
@@ -6714,7 +6701,7 @@ class Formatter {
|
|
|
6714
6701
|
* Voices are full justified to fit in `justifyWidth` pixels.
|
|
6715
6702
|
*
|
|
6716
6703
|
* Set `options.context` to the rendering context. Set `options.alignRests`
|
|
6717
|
-
* to true to enable rest alignment.
|
|
6704
|
+
* to true to enable rest vertical alignment.
|
|
6718
6705
|
*/
|
|
6719
6706
|
format(voices, justifyWidth, options) {
|
|
6720
6707
|
const opts = Object.assign({ alignRests: false }, options);
|
|
@@ -6734,7 +6721,6 @@ class Formatter {
|
|
|
6734
6721
|
// This method is just like `format` except that the `justifyWidth` is inferred from the `stave`.
|
|
6735
6722
|
formatToStave(voices, stave, optionsParam) {
|
|
6736
6723
|
const options = Object.assign({ context: stave.getContext() }, optionsParam);
|
|
6737
|
-
// eslint-disable-next-line
|
|
6738
6724
|
const justifyWidth = stave.getNoteEndX() - stave.getNoteStartX() - _stave__WEBPACK_IMPORTED_MODULE_4__.Stave.defaultPadding;
|
|
6739
6725
|
L('Formatting voices to width: ', justifyWidth);
|
|
6740
6726
|
return this.format(voices, justifyWidth, options);
|
|
@@ -6767,12 +6753,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
6767
6753
|
//
|
|
6768
6754
|
// @author Joshua Koo / @zz85
|
|
6769
6755
|
// @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
6756
|
|
|
6777
6757
|
|
|
6778
6758
|
/** Fraction represents a rational number. */
|
|
@@ -6798,9 +6778,13 @@ class Fraction {
|
|
|
6798
6778
|
}
|
|
6799
6779
|
/** LCM: Lowest common multiple. */
|
|
6800
6780
|
static LCM(a, b) {
|
|
6801
|
-
return (a * b) /
|
|
6781
|
+
return (a * b) / Fraction.GCD(a, b);
|
|
6802
6782
|
}
|
|
6803
|
-
/** Lowest common multiple for more than two numbers.
|
|
6783
|
+
/** Lowest common multiple for more than two numbers.
|
|
6784
|
+
*
|
|
6785
|
+
* Note that the `args` array will be manipulated and shortened recursively during
|
|
6786
|
+
* computation.
|
|
6787
|
+
*/
|
|
6804
6788
|
static LCMM(args) {
|
|
6805
6789
|
if (args.length === 0) {
|
|
6806
6790
|
return 0;
|
|
@@ -6809,12 +6793,12 @@ class Fraction {
|
|
|
6809
6793
|
return args[0];
|
|
6810
6794
|
}
|
|
6811
6795
|
else if (args.length === 2) {
|
|
6812
|
-
return
|
|
6796
|
+
return Fraction.LCM(args[0], args[1]);
|
|
6813
6797
|
}
|
|
6814
6798
|
else {
|
|
6815
6799
|
// args.shift() removes the first number.
|
|
6816
6800
|
// LCM the first number with the rest of the numbers.
|
|
6817
|
-
return
|
|
6801
|
+
return Fraction.LCM(args.shift(), Fraction.LCMM(args));
|
|
6818
6802
|
}
|
|
6819
6803
|
}
|
|
6820
6804
|
/** Set the numerator and denominator. */
|
|
@@ -6837,7 +6821,7 @@ class Fraction {
|
|
|
6837
6821
|
simplify() {
|
|
6838
6822
|
let u = this.numerator;
|
|
6839
6823
|
let d = this.denominator;
|
|
6840
|
-
const gcd =
|
|
6824
|
+
const gcd = Fraction.GCD(u, d);
|
|
6841
6825
|
u /= gcd;
|
|
6842
6826
|
d /= gcd;
|
|
6843
6827
|
if (d < 0) {
|
|
@@ -6849,16 +6833,16 @@ class Fraction {
|
|
|
6849
6833
|
/** Add value of another fraction. */
|
|
6850
6834
|
add(param1 = 0, param2 = 1) {
|
|
6851
6835
|
const [otherNumerator, otherDenominator] = getNumeratorAndDenominator(param1, param2);
|
|
6852
|
-
const lcm =
|
|
6836
|
+
const lcm = Fraction.LCM(this.denominator, otherDenominator);
|
|
6853
6837
|
const a = lcm / this.denominator;
|
|
6854
6838
|
const b = lcm / otherDenominator;
|
|
6855
6839
|
const u = this.numerator * a + otherNumerator * b;
|
|
6856
6840
|
return this.set(u, lcm);
|
|
6857
6841
|
}
|
|
6858
|
-
/**
|
|
6842
|
+
/** Subtract value of another fraction. */
|
|
6859
6843
|
subtract(param1 = 0, param2 = 1) {
|
|
6860
6844
|
const [otherNumerator, otherDenominator] = getNumeratorAndDenominator(param1, param2);
|
|
6861
|
-
const lcm =
|
|
6845
|
+
const lcm = Fraction.LCM(this.denominator, otherDenominator);
|
|
6862
6846
|
const a = lcm / this.denominator;
|
|
6863
6847
|
const b = lcm / otherDenominator;
|
|
6864
6848
|
const u = this.numerator * a - otherNumerator * b;
|
|
@@ -6876,19 +6860,19 @@ class Fraction {
|
|
|
6876
6860
|
}
|
|
6877
6861
|
/** Simplify both sides and check if they are equal. */
|
|
6878
6862
|
equals(compare) {
|
|
6879
|
-
const a =
|
|
6880
|
-
const b =
|
|
6863
|
+
const a = Fraction.fractionA.copy(compare).simplify();
|
|
6864
|
+
const b = Fraction.fractionB.copy(this).simplify();
|
|
6881
6865
|
return a.numerator === b.numerator && a.denominator === b.denominator;
|
|
6882
6866
|
}
|
|
6883
6867
|
/** Greater than operator. */
|
|
6884
6868
|
greaterThan(compare) {
|
|
6885
|
-
const a =
|
|
6869
|
+
const a = Fraction.fractionA.copy(this);
|
|
6886
6870
|
a.subtract(compare);
|
|
6887
6871
|
return a.numerator > 0;
|
|
6888
6872
|
}
|
|
6889
6873
|
/** Greater than or equals operator. */
|
|
6890
6874
|
greaterThanEquals(compare) {
|
|
6891
|
-
const a =
|
|
6875
|
+
const a = Fraction.fractionA.copy(this);
|
|
6892
6876
|
a.subtract(compare);
|
|
6893
6877
|
return a.numerator >= 0;
|
|
6894
6878
|
}
|
|
@@ -6902,7 +6886,7 @@ class Fraction {
|
|
|
6902
6886
|
}
|
|
6903
6887
|
/** Return a new copy with current values. */
|
|
6904
6888
|
clone() {
|
|
6905
|
-
return new
|
|
6889
|
+
return new Fraction(this.numerator, this.denominator);
|
|
6906
6890
|
}
|
|
6907
6891
|
/** Copy value of another fraction. */
|
|
6908
6892
|
copy(other) {
|
|
@@ -6913,11 +6897,11 @@ class Fraction {
|
|
|
6913
6897
|
return this.set(other.numerator, other.denominator);
|
|
6914
6898
|
}
|
|
6915
6899
|
}
|
|
6916
|
-
/** Return the integer component (
|
|
6900
|
+
/** Return the integer component (e.g. 5/2 => 2). */
|
|
6917
6901
|
quotient() {
|
|
6918
6902
|
return Math.floor(this.numerator / this.denominator);
|
|
6919
6903
|
}
|
|
6920
|
-
/** Return the remainder component (
|
|
6904
|
+
/** Return the remainder component (e.g. 5/2 => 1). */
|
|
6921
6905
|
remainder() {
|
|
6922
6906
|
return this.numerator % this.denominator;
|
|
6923
6907
|
}
|
|
@@ -6927,19 +6911,19 @@ class Fraction {
|
|
|
6927
6911
|
this.numerator = Math.abs(this.numerator);
|
|
6928
6912
|
return this;
|
|
6929
6913
|
}
|
|
6930
|
-
/** Return a raw string representation (
|
|
6914
|
+
/** Return a raw string representation (e.g. "5/2"). */
|
|
6931
6915
|
toString() {
|
|
6932
6916
|
return `${this.numerator}/${this.denominator}`;
|
|
6933
6917
|
}
|
|
6934
|
-
/** Return a simplified string
|
|
6918
|
+
/** Return a simplified string representation. */
|
|
6935
6919
|
toSimplifiedString() {
|
|
6936
|
-
return
|
|
6920
|
+
return Fraction.fractionA.copy(this).simplify().toString();
|
|
6937
6921
|
}
|
|
6938
6922
|
/** Return string representation in mixed form. */
|
|
6939
6923
|
toMixedString() {
|
|
6940
6924
|
let s = '';
|
|
6941
6925
|
const q = this.quotient();
|
|
6942
|
-
const f =
|
|
6926
|
+
const f = Fraction.fractionA.copy(this);
|
|
6943
6927
|
if (q < 0) {
|
|
6944
6928
|
f.makeAbs();
|
|
6945
6929
|
}
|
|
@@ -6965,10 +6949,9 @@ class Fraction {
|
|
|
6965
6949
|
return this.set(n, d);
|
|
6966
6950
|
}
|
|
6967
6951
|
}
|
|
6968
|
-
_a = Fraction;
|
|
6969
6952
|
// Cached objects for comparisons.
|
|
6970
|
-
|
|
6971
|
-
|
|
6953
|
+
Fraction.fractionA = new Fraction();
|
|
6954
|
+
Fraction.fractionB = new Fraction();
|
|
6972
6955
|
/** Helper function to extract the numerator and denominator from another fraction. */
|
|
6973
6956
|
function getNumeratorAndDenominator(n, d = 1) {
|
|
6974
6957
|
if (typeof n === 'number') {
|
|
@@ -7281,13 +7264,12 @@ class GlyphNote extends _note__WEBPACK_IMPORTED_MODULE_0__.Note {
|
|
|
7281
7264
|
const stave = this.checkStave();
|
|
7282
7265
|
const ctx = stave.checkContext();
|
|
7283
7266
|
this.setRendered();
|
|
7284
|
-
this.applyStyle(ctx);
|
|
7285
7267
|
ctx.openGroup('glyphNote', this.getAttribute('id'));
|
|
7286
|
-
|
|
7287
|
-
this.
|
|
7268
|
+
this.x = this.isCenterAligned() ? this.getAbsoluteX() - this.getWidth() / 2 : this.getAbsoluteX();
|
|
7269
|
+
this.y = stave.getYForLine(this.options.line);
|
|
7270
|
+
this.renderText(ctx, 0, 0);
|
|
7288
7271
|
this.drawModifiers();
|
|
7289
7272
|
ctx.closeGroup();
|
|
7290
|
-
this.restoreStyle(ctx);
|
|
7291
7273
|
}
|
|
7292
7274
|
}
|
|
7293
7275
|
|
|
@@ -13275,14 +13257,12 @@ class GraceNote extends _stavenote__WEBPACK_IMPORTED_MODULE_0__.StaveNote {
|
|
|
13275
13257
|
}
|
|
13276
13258
|
// FIXME: avoid staff lines, ledger lines or others.
|
|
13277
13259
|
const ctx = this.checkContext();
|
|
13278
|
-
ctx.save();
|
|
13279
13260
|
ctx.setLineWidth(1 * scale); // FIXME: use more appropriate value.
|
|
13280
13261
|
ctx.beginPath();
|
|
13281
13262
|
ctx.moveTo(slashBBox.x1, slashBBox.y1);
|
|
13282
13263
|
ctx.lineTo(slashBBox.x2, slashBBox.y2);
|
|
13283
13264
|
ctx.closePath();
|
|
13284
13265
|
ctx.stroke();
|
|
13285
|
-
ctx.restore();
|
|
13286
13266
|
}
|
|
13287
13267
|
}
|
|
13288
13268
|
calcBeamedNotesSlashBBox(slashStemOffset, slashBeamOffset, protrusions) {
|
|
@@ -13375,7 +13355,7 @@ class GraceNoteGroup extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
|
|
|
13375
13355
|
return false;
|
|
13376
13356
|
const groupList = [];
|
|
13377
13357
|
let prevNote = null;
|
|
13378
|
-
let
|
|
13358
|
+
let shift = 0;
|
|
13379
13359
|
for (let i = 0; i < gracenoteGroups.length; ++i) {
|
|
13380
13360
|
const gracenoteGroup = gracenoteGroups[i];
|
|
13381
13361
|
const note = gracenoteGroup.getNote();
|
|
@@ -13384,17 +13364,23 @@ class GraceNoteGroup extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
|
|
|
13384
13364
|
if (isStavenote && note !== prevNote) {
|
|
13385
13365
|
// Iterate through all notes to get the displaced pixels
|
|
13386
13366
|
for (let n = 0; n < note.keys.length; ++n) {
|
|
13387
|
-
|
|
13367
|
+
shift = Math.max(note.getLeftDisplacedHeadPx(), shift);
|
|
13388
13368
|
}
|
|
13389
13369
|
prevNote = note;
|
|
13390
13370
|
}
|
|
13391
|
-
groupList.push({ shift:
|
|
13371
|
+
groupList.push({ shift: shift, gracenoteGroup, spacing });
|
|
13392
13372
|
}
|
|
13393
13373
|
// If first note left shift in case it is displaced
|
|
13394
13374
|
let groupShift = groupList[0].shift;
|
|
13395
13375
|
let formatWidth;
|
|
13376
|
+
let right = false;
|
|
13377
|
+
let left = false;
|
|
13396
13378
|
for (let i = 0; i < groupList.length; ++i) {
|
|
13397
13379
|
const gracenoteGroup = groupList[i].gracenoteGroup;
|
|
13380
|
+
if (gracenoteGroup.position === _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier.Position.RIGHT)
|
|
13381
|
+
right = true;
|
|
13382
|
+
else
|
|
13383
|
+
left = true;
|
|
13398
13384
|
gracenoteGroup.preFormat();
|
|
13399
13385
|
formatWidth = gracenoteGroup.getWidth() + groupList[i].spacing;
|
|
13400
13386
|
groupShift = Math.max(formatWidth, groupShift);
|
|
@@ -13404,7 +13390,10 @@ class GraceNoteGroup extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
|
|
|
13404
13390
|
formatWidth = gracenoteGroup.getWidth() + groupList[i].spacing;
|
|
13405
13391
|
gracenoteGroup.setSpacingFromNextModifier(groupShift - Math.min(formatWidth, groupShift) + _stavenote__WEBPACK_IMPORTED_MODULE_3__.StaveNote.minNoteheadPadding);
|
|
13406
13392
|
}
|
|
13407
|
-
|
|
13393
|
+
if (right)
|
|
13394
|
+
state.rightShift += groupShift;
|
|
13395
|
+
if (left)
|
|
13396
|
+
state.leftShift += groupShift;
|
|
13408
13397
|
return true;
|
|
13409
13398
|
}
|
|
13410
13399
|
//** `GraceNoteGroup` inherits from `Modifier` and is placed inside a `ModifierContext`. */
|
|
@@ -13463,11 +13452,11 @@ class GraceNoteGroup extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
|
|
|
13463
13452
|
const note = this.checkAttachedNote();
|
|
13464
13453
|
this.setRendered();
|
|
13465
13454
|
L('Drawing grace note group for:', note);
|
|
13466
|
-
this.alignSubNotesWithNote(this.getGraceNotes(), note); // Modifier function
|
|
13455
|
+
this.alignSubNotesWithNote(this.getGraceNotes(), note, this.position); // Modifier function
|
|
13467
13456
|
// Draw grace notes.
|
|
13468
|
-
this.graceNotes.forEach((graceNote) => graceNote.setContext(ctx).
|
|
13457
|
+
this.graceNotes.forEach((graceNote) => graceNote.setContext(ctx).drawWithStyle());
|
|
13469
13458
|
// Draw beams.
|
|
13470
|
-
this.beams.forEach((beam) => beam.setContext(ctx).
|
|
13459
|
+
this.beams.forEach((beam) => beam.setContext(ctx).drawWithStyle());
|
|
13471
13460
|
if (this.showSlur) {
|
|
13472
13461
|
// Create and draw slur.
|
|
13473
13462
|
const isStavenote = (0,_typeguard__WEBPACK_IMPORTED_MODULE_7__.isStaveNote)(note);
|
|
@@ -13480,7 +13469,7 @@ class GraceNoteGroup extends _modifier__WEBPACK_IMPORTED_MODULE_2__.Modifier {
|
|
|
13480
13469
|
});
|
|
13481
13470
|
this.slur.renderOptions.cp2 = 12;
|
|
13482
13471
|
this.slur.renderOptions.yShift = (isStavenote ? 7 : 5) + this.renderOptions.slurYShift;
|
|
13483
|
-
this.slur.setContext(ctx).
|
|
13472
|
+
this.slur.setContext(ctx).drawWithStyle();
|
|
13484
13473
|
}
|
|
13485
13474
|
}
|
|
13486
13475
|
}
|
|
@@ -13545,14 +13534,14 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
13545
13534
|
/* harmony export */ BEAM_LEFT: () => (/* reexport safe */ _beam__WEBPACK_IMPORTED_MODULE_4__.BEAM_LEFT),
|
|
13546
13535
|
/* harmony export */ BEAM_RIGHT: () => (/* reexport safe */ _beam__WEBPACK_IMPORTED_MODULE_4__.BEAM_RIGHT),
|
|
13547
13536
|
/* harmony export */ BarNote: () => (/* reexport safe */ _barnote__WEBPACK_IMPORTED_MODULE_3__.BarNote),
|
|
13548
|
-
/* harmony export */ Barline: () => (/* reexport safe */
|
|
13549
|
-
/* harmony export */ BarlineType: () => (/* reexport safe */
|
|
13537
|
+
/* harmony export */ Barline: () => (/* reexport safe */ _stavebarline__WEBPACK_IMPORTED_MODULE_46__.Barline),
|
|
13538
|
+
/* harmony export */ BarlineType: () => (/* reexport safe */ _stavebarline__WEBPACK_IMPORTED_MODULE_46__.BarlineType),
|
|
13550
13539
|
/* harmony export */ Beam: () => (/* reexport safe */ _beam__WEBPACK_IMPORTED_MODULE_4__.Beam),
|
|
13551
13540
|
/* harmony export */ Bend: () => (/* reexport safe */ _bend__WEBPACK_IMPORTED_MODULE_5__.Bend),
|
|
13552
13541
|
/* harmony export */ BoundingBox: () => (/* reexport safe */ _boundingbox__WEBPACK_IMPORTED_MODULE_6__.BoundingBox),
|
|
13553
13542
|
/* harmony export */ Builder: () => (/* reexport safe */ _easyscore__WEBPACK_IMPORTED_MODULE_14__.Builder),
|
|
13554
13543
|
/* harmony export */ CanvasContext: () => (/* reexport safe */ _canvascontext__WEBPACK_IMPORTED_MODULE_7__.CanvasContext),
|
|
13555
|
-
/* harmony export */ Category: () => (/* reexport safe */
|
|
13544
|
+
/* harmony export */ Category: () => (/* reexport safe */ _typeguard__WEBPACK_IMPORTED_MODULE_78__.Category),
|
|
13556
13545
|
/* harmony export */ ChordSymbol: () => (/* reexport safe */ _chordsymbol__WEBPACK_IMPORTED_MODULE_8__.ChordSymbol),
|
|
13557
13546
|
/* harmony export */ ChordSymbolBlock: () => (/* reexport safe */ _chordsymbol__WEBPACK_IMPORTED_MODULE_8__.ChordSymbolBlock),
|
|
13558
13547
|
/* harmony export */ ChordSymbolHorizontalJustify: () => (/* reexport safe */ _chordsymbol__WEBPACK_IMPORTED_MODULE_8__.ChordSymbolHorizontalJustify),
|
|
@@ -13567,110 +13556,111 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
13567
13556
|
/* harmony export */ EasyScoreGrammar: () => (/* reexport safe */ _easyscore__WEBPACK_IMPORTED_MODULE_14__.EasyScoreGrammar),
|
|
13568
13557
|
/* harmony export */ Element: () => (/* reexport safe */ _element__WEBPACK_IMPORTED_MODULE_15__.Element),
|
|
13569
13558
|
/* harmony export */ Factory: () => (/* reexport safe */ _factory__WEBPACK_IMPORTED_MODULE_16__.Factory),
|
|
13559
|
+
/* harmony export */ Flag: () => (/* reexport safe */ _flag__WEBPACK_IMPORTED_MODULE_18__.Flag),
|
|
13570
13560
|
/* harmony export */ Font: () => (/* reexport safe */ _font__WEBPACK_IMPORTED_MODULE_17__.Font),
|
|
13571
13561
|
/* harmony export */ FontStyle: () => (/* reexport safe */ _font__WEBPACK_IMPORTED_MODULE_17__.FontStyle),
|
|
13572
13562
|
/* harmony export */ FontWeight: () => (/* reexport safe */ _font__WEBPACK_IMPORTED_MODULE_17__.FontWeight),
|
|
13573
|
-
/* harmony export */ Formatter: () => (/* reexport safe */
|
|
13574
|
-
/* harmony export */ Fraction: () => (/* reexport safe */
|
|
13575
|
-
/* harmony export */ FretHandFinger: () => (/* reexport safe */
|
|
13576
|
-
/* harmony export */ GhostNote: () => (/* reexport safe */
|
|
13577
|
-
/* harmony export */ GlyphNote: () => (/* reexport safe */
|
|
13578
|
-
/* harmony export */ GraceNote: () => (/* reexport safe */
|
|
13579
|
-
/* harmony export */ GraceNoteGroup: () => (/* reexport safe */
|
|
13580
|
-
/* harmony export */ GraceTabNote: () => (/* reexport safe */
|
|
13581
|
-
/* harmony export */ KeyManager: () => (/* reexport safe */
|
|
13582
|
-
/* harmony export */ KeySigNote: () => (/* reexport safe */
|
|
13583
|
-
/* harmony export */ KeySignature: () => (/* reexport safe */
|
|
13584
|
-
/* harmony export */ Modifier: () => (/* reexport safe */
|
|
13585
|
-
/* harmony export */ ModifierContext: () => (/* reexport safe */
|
|
13586
|
-
/* harmony export */ ModifierPosition: () => (/* reexport safe */
|
|
13587
|
-
/* harmony export */ MultiMeasureRest: () => (/* reexport safe */
|
|
13588
|
-
/* harmony export */ Music: () => (/* reexport safe */
|
|
13589
|
-
/* harmony export */ Note: () => (/* reexport safe */
|
|
13590
|
-
/* harmony export */ NoteHead: () => (/* reexport safe */
|
|
13591
|
-
/* harmony export */ NoteSubGroup: () => (/* reexport safe */
|
|
13592
|
-
/* harmony export */ Ornament: () => (/* reexport safe */
|
|
13593
|
-
/* harmony export */ Parenthesis: () => (/* reexport safe */
|
|
13594
|
-
/* harmony export */ Parser: () => (/* reexport safe */
|
|
13595
|
-
/* harmony export */ PedalMarking: () => (/* reexport safe */
|
|
13563
|
+
/* harmony export */ Formatter: () => (/* reexport safe */ _formatter__WEBPACK_IMPORTED_MODULE_19__.Formatter),
|
|
13564
|
+
/* harmony export */ Fraction: () => (/* reexport safe */ _fraction__WEBPACK_IMPORTED_MODULE_20__.Fraction),
|
|
13565
|
+
/* harmony export */ FretHandFinger: () => (/* reexport safe */ _frethandfinger__WEBPACK_IMPORTED_MODULE_21__.FretHandFinger),
|
|
13566
|
+
/* harmony export */ GhostNote: () => (/* reexport safe */ _ghostnote__WEBPACK_IMPORTED_MODULE_22__.GhostNote),
|
|
13567
|
+
/* harmony export */ GlyphNote: () => (/* reexport safe */ _glyphnote__WEBPACK_IMPORTED_MODULE_23__.GlyphNote),
|
|
13568
|
+
/* harmony export */ GraceNote: () => (/* reexport safe */ _gracenote__WEBPACK_IMPORTED_MODULE_24__.GraceNote),
|
|
13569
|
+
/* harmony export */ GraceNoteGroup: () => (/* reexport safe */ _gracenotegroup__WEBPACK_IMPORTED_MODULE_25__.GraceNoteGroup),
|
|
13570
|
+
/* harmony export */ GraceTabNote: () => (/* reexport safe */ _gracetabnote__WEBPACK_IMPORTED_MODULE_26__.GraceTabNote),
|
|
13571
|
+
/* harmony export */ KeyManager: () => (/* reexport safe */ _keymanager__WEBPACK_IMPORTED_MODULE_27__.KeyManager),
|
|
13572
|
+
/* harmony export */ KeySigNote: () => (/* reexport safe */ _keysignote__WEBPACK_IMPORTED_MODULE_29__.KeySigNote),
|
|
13573
|
+
/* harmony export */ KeySignature: () => (/* reexport safe */ _keysignature__WEBPACK_IMPORTED_MODULE_28__.KeySignature),
|
|
13574
|
+
/* harmony export */ Modifier: () => (/* reexport safe */ _modifier__WEBPACK_IMPORTED_MODULE_30__.Modifier),
|
|
13575
|
+
/* harmony export */ ModifierContext: () => (/* reexport safe */ _modifiercontext__WEBPACK_IMPORTED_MODULE_31__.ModifierContext),
|
|
13576
|
+
/* harmony export */ ModifierPosition: () => (/* reexport safe */ _modifier__WEBPACK_IMPORTED_MODULE_30__.ModifierPosition),
|
|
13577
|
+
/* harmony export */ MultiMeasureRest: () => (/* reexport safe */ _multimeasurerest__WEBPACK_IMPORTED_MODULE_32__.MultiMeasureRest),
|
|
13578
|
+
/* harmony export */ Music: () => (/* reexport safe */ _music__WEBPACK_IMPORTED_MODULE_33__.Music),
|
|
13579
|
+
/* harmony export */ Note: () => (/* reexport safe */ _note__WEBPACK_IMPORTED_MODULE_34__.Note),
|
|
13580
|
+
/* harmony export */ NoteHead: () => (/* reexport safe */ _notehead__WEBPACK_IMPORTED_MODULE_35__.NoteHead),
|
|
13581
|
+
/* harmony export */ NoteSubGroup: () => (/* reexport safe */ _notesubgroup__WEBPACK_IMPORTED_MODULE_36__.NoteSubGroup),
|
|
13582
|
+
/* harmony export */ Ornament: () => (/* reexport safe */ _ornament__WEBPACK_IMPORTED_MODULE_37__.Ornament),
|
|
13583
|
+
/* harmony export */ Parenthesis: () => (/* reexport safe */ _parenthesis__WEBPACK_IMPORTED_MODULE_38__.Parenthesis),
|
|
13584
|
+
/* harmony export */ Parser: () => (/* reexport safe */ _parser__WEBPACK_IMPORTED_MODULE_39__.Parser),
|
|
13585
|
+
/* harmony export */ PedalMarking: () => (/* reexport safe */ _pedalmarking__WEBPACK_IMPORTED_MODULE_40__.PedalMarking),
|
|
13596
13586
|
/* harmony export */ Piece: () => (/* reexport safe */ _easyscore__WEBPACK_IMPORTED_MODULE_14__.Piece),
|
|
13597
|
-
/* harmony export */ Registry: () => (/* reexport safe */
|
|
13598
|
-
/* harmony export */ RenderContext: () => (/* reexport safe */
|
|
13599
|
-
/* harmony export */ Renderer: () => (/* reexport safe */
|
|
13600
|
-
/* harmony export */ RendererBackends: () => (/* reexport safe */
|
|
13601
|
-
/* harmony export */ RendererLineEndType: () => (/* reexport safe */
|
|
13602
|
-
/* harmony export */ RepeatNote: () => (/* reexport safe */
|
|
13603
|
-
/* harmony export */ Repetition: () => (/* reexport safe */
|
|
13604
|
-
/* harmony export */ RuntimeError: () => (/* reexport safe */
|
|
13605
|
-
/* harmony export */ SVGContext: () => (/* reexport safe */
|
|
13606
|
-
/* harmony export */ Stave: () => (/* reexport safe */
|
|
13607
|
-
/* harmony export */ StaveConnector: () => (/* reexport safe */
|
|
13608
|
-
/* harmony export */ StaveHairpin: () => (/* reexport safe */
|
|
13609
|
-
/* harmony export */ StaveLine: () => (/* reexport safe */
|
|
13610
|
-
/* harmony export */ StaveModifier: () => (/* reexport safe */
|
|
13611
|
-
/* harmony export */ StaveModifierPosition: () => (/* reexport safe */
|
|
13612
|
-
/* harmony export */ StaveNote: () => (/* reexport safe */
|
|
13613
|
-
/* harmony export */ StaveSection: () => (/* reexport safe */
|
|
13614
|
-
/* harmony export */ StaveTempo: () => (/* reexport safe */
|
|
13615
|
-
/* harmony export */ StaveText: () => (/* reexport safe */
|
|
13616
|
-
/* harmony export */ StaveTie: () => (/* reexport safe */
|
|
13617
|
-
/* harmony export */ Stem: () => (/* reexport safe */
|
|
13618
|
-
/* harmony export */ StemmableNote: () => (/* reexport safe */
|
|
13619
|
-
/* harmony export */ StringNumber: () => (/* reexport safe */
|
|
13620
|
-
/* harmony export */ Stroke: () => (/* reexport safe */
|
|
13587
|
+
/* harmony export */ Registry: () => (/* reexport safe */ _registry__WEBPACK_IMPORTED_MODULE_41__.Registry),
|
|
13588
|
+
/* harmony export */ RenderContext: () => (/* reexport safe */ _rendercontext__WEBPACK_IMPORTED_MODULE_42__.RenderContext),
|
|
13589
|
+
/* harmony export */ Renderer: () => (/* reexport safe */ _renderer__WEBPACK_IMPORTED_MODULE_43__.Renderer),
|
|
13590
|
+
/* harmony export */ RendererBackends: () => (/* reexport safe */ _renderer__WEBPACK_IMPORTED_MODULE_43__.RendererBackends),
|
|
13591
|
+
/* harmony export */ RendererLineEndType: () => (/* reexport safe */ _renderer__WEBPACK_IMPORTED_MODULE_43__.RendererLineEndType),
|
|
13592
|
+
/* harmony export */ RepeatNote: () => (/* reexport safe */ _repeatnote__WEBPACK_IMPORTED_MODULE_44__.RepeatNote),
|
|
13593
|
+
/* harmony export */ Repetition: () => (/* reexport safe */ _staverepetition__WEBPACK_IMPORTED_MODULE_52__.Repetition),
|
|
13594
|
+
/* harmony export */ RuntimeError: () => (/* reexport safe */ _util__WEBPACK_IMPORTED_MODULE_79__.RuntimeError),
|
|
13595
|
+
/* harmony export */ SVGContext: () => (/* reexport safe */ _svgcontext__WEBPACK_IMPORTED_MODULE_62__.SVGContext),
|
|
13596
|
+
/* harmony export */ Stave: () => (/* reexport safe */ _stave__WEBPACK_IMPORTED_MODULE_45__.Stave),
|
|
13597
|
+
/* harmony export */ StaveConnector: () => (/* reexport safe */ _staveconnector__WEBPACK_IMPORTED_MODULE_47__.StaveConnector),
|
|
13598
|
+
/* harmony export */ StaveHairpin: () => (/* reexport safe */ _stavehairpin__WEBPACK_IMPORTED_MODULE_48__.StaveHairpin),
|
|
13599
|
+
/* harmony export */ StaveLine: () => (/* reexport safe */ _staveline__WEBPACK_IMPORTED_MODULE_49__.StaveLine),
|
|
13600
|
+
/* harmony export */ StaveModifier: () => (/* reexport safe */ _stavemodifier__WEBPACK_IMPORTED_MODULE_50__.StaveModifier),
|
|
13601
|
+
/* harmony export */ StaveModifierPosition: () => (/* reexport safe */ _stavemodifier__WEBPACK_IMPORTED_MODULE_50__.StaveModifierPosition),
|
|
13602
|
+
/* harmony export */ StaveNote: () => (/* reexport safe */ _stavenote__WEBPACK_IMPORTED_MODULE_51__.StaveNote),
|
|
13603
|
+
/* harmony export */ StaveSection: () => (/* reexport safe */ _stavesection__WEBPACK_IMPORTED_MODULE_53__.StaveSection),
|
|
13604
|
+
/* harmony export */ StaveTempo: () => (/* reexport safe */ _stavetempo__WEBPACK_IMPORTED_MODULE_54__.StaveTempo),
|
|
13605
|
+
/* harmony export */ StaveText: () => (/* reexport safe */ _stavetext__WEBPACK_IMPORTED_MODULE_55__.StaveText),
|
|
13606
|
+
/* harmony export */ StaveTie: () => (/* reexport safe */ _stavetie__WEBPACK_IMPORTED_MODULE_56__.StaveTie),
|
|
13607
|
+
/* harmony export */ Stem: () => (/* reexport safe */ _stem__WEBPACK_IMPORTED_MODULE_58__.Stem),
|
|
13608
|
+
/* harmony export */ StemmableNote: () => (/* reexport safe */ _stemmablenote__WEBPACK_IMPORTED_MODULE_59__.StemmableNote),
|
|
13609
|
+
/* harmony export */ StringNumber: () => (/* reexport safe */ _stringnumber__WEBPACK_IMPORTED_MODULE_60__.StringNumber),
|
|
13610
|
+
/* harmony export */ Stroke: () => (/* reexport safe */ _strokes__WEBPACK_IMPORTED_MODULE_61__.Stroke),
|
|
13621
13611
|
/* harmony export */ SymbolModifiers: () => (/* reexport safe */ _chordsymbol__WEBPACK_IMPORTED_MODULE_8__.SymbolModifiers),
|
|
13622
|
-
/* harmony export */ System: () => (/* reexport safe */
|
|
13623
|
-
/* harmony export */ TabNote: () => (/* reexport safe */
|
|
13624
|
-
/* harmony export */ TabSlide: () => (/* reexport safe */
|
|
13625
|
-
/* harmony export */ TabStave: () => (/* reexport safe */
|
|
13626
|
-
/* harmony export */ TabTie: () => (/* reexport safe */
|
|
13627
|
-
/* harmony export */ TextBracket: () => (/* reexport safe */
|
|
13628
|
-
/* harmony export */ TextBracketPosition: () => (/* reexport safe */
|
|
13629
|
-
/* harmony export */ TextDynamics: () => (/* reexport safe */
|
|
13630
|
-
/* harmony export */ TextJustification: () => (/* reexport safe */
|
|
13631
|
-
/* harmony export */ TextNote: () => (/* reexport safe */
|
|
13632
|
-
/* harmony export */ TickContext: () => (/* reexport safe */
|
|
13633
|
-
/* harmony export */ Tickable: () => (/* reexport safe */
|
|
13634
|
-
/* harmony export */ TimeSigNote: () => (/* reexport safe */
|
|
13635
|
-
/* harmony export */ TimeSignature: () => (/* reexport safe */
|
|
13636
|
-
/* harmony export */ Tremolo: () => (/* reexport safe */
|
|
13637
|
-
/* harmony export */ Tuning: () => (/* reexport safe */
|
|
13638
|
-
/* harmony export */ Tuplet: () => (/* reexport safe */
|
|
13639
|
-
/* harmony export */ TupletLocation: () => (/* reexport safe */
|
|
13640
|
-
/* harmony export */ VexFlow: () => (/* reexport safe */
|
|
13641
|
-
/* harmony export */ Vibrato: () => (/* reexport safe */
|
|
13642
|
-
/* harmony export */ VibratoBracket: () => (/* reexport safe */
|
|
13643
|
-
/* harmony export */ Voice: () => (/* reexport safe */
|
|
13644
|
-
/* harmony export */ VoiceMode: () => (/* reexport safe */
|
|
13645
|
-
/* harmony export */ Volta: () => (/* reexport safe */
|
|
13646
|
-
/* harmony export */ VoltaType: () => (/* reexport safe */
|
|
13647
|
-
/* harmony export */ defined: () => (/* reexport safe */
|
|
13648
|
-
/* harmony export */ drawDot: () => (/* reexport safe */
|
|
13612
|
+
/* harmony export */ System: () => (/* reexport safe */ _system__WEBPACK_IMPORTED_MODULE_63__.System),
|
|
13613
|
+
/* harmony export */ TabNote: () => (/* reexport safe */ _tabnote__WEBPACK_IMPORTED_MODULE_64__.TabNote),
|
|
13614
|
+
/* harmony export */ TabSlide: () => (/* reexport safe */ _tabslide__WEBPACK_IMPORTED_MODULE_65__.TabSlide),
|
|
13615
|
+
/* harmony export */ TabStave: () => (/* reexport safe */ _tabstave__WEBPACK_IMPORTED_MODULE_66__.TabStave),
|
|
13616
|
+
/* harmony export */ TabTie: () => (/* reexport safe */ _tabtie__WEBPACK_IMPORTED_MODULE_67__.TabTie),
|
|
13617
|
+
/* harmony export */ TextBracket: () => (/* reexport safe */ _textbracket__WEBPACK_IMPORTED_MODULE_68__.TextBracket),
|
|
13618
|
+
/* harmony export */ TextBracketPosition: () => (/* reexport safe */ _textbracket__WEBPACK_IMPORTED_MODULE_68__.TextBracketPosition),
|
|
13619
|
+
/* harmony export */ TextDynamics: () => (/* reexport safe */ _textdynamics__WEBPACK_IMPORTED_MODULE_69__.TextDynamics),
|
|
13620
|
+
/* harmony export */ TextJustification: () => (/* reexport safe */ _textnote__WEBPACK_IMPORTED_MODULE_70__.TextJustification),
|
|
13621
|
+
/* harmony export */ TextNote: () => (/* reexport safe */ _textnote__WEBPACK_IMPORTED_MODULE_70__.TextNote),
|
|
13622
|
+
/* harmony export */ TickContext: () => (/* reexport safe */ _tickcontext__WEBPACK_IMPORTED_MODULE_72__.TickContext),
|
|
13623
|
+
/* harmony export */ Tickable: () => (/* reexport safe */ _tickable__WEBPACK_IMPORTED_MODULE_71__.Tickable),
|
|
13624
|
+
/* harmony export */ TimeSigNote: () => (/* reexport safe */ _timesignote__WEBPACK_IMPORTED_MODULE_74__.TimeSigNote),
|
|
13625
|
+
/* harmony export */ TimeSignature: () => (/* reexport safe */ _timesignature__WEBPACK_IMPORTED_MODULE_73__.TimeSignature),
|
|
13626
|
+
/* harmony export */ Tremolo: () => (/* reexport safe */ _tremolo__WEBPACK_IMPORTED_MODULE_75__.Tremolo),
|
|
13627
|
+
/* harmony export */ Tuning: () => (/* reexport safe */ _tuning__WEBPACK_IMPORTED_MODULE_76__.Tuning),
|
|
13628
|
+
/* harmony export */ Tuplet: () => (/* reexport safe */ _tuplet__WEBPACK_IMPORTED_MODULE_77__.Tuplet),
|
|
13629
|
+
/* harmony export */ TupletLocation: () => (/* reexport safe */ _tuplet__WEBPACK_IMPORTED_MODULE_77__.TupletLocation),
|
|
13630
|
+
/* harmony export */ VexFlow: () => (/* reexport safe */ _vexflow__WEBPACK_IMPORTED_MODULE_80__.VexFlow),
|
|
13631
|
+
/* harmony export */ Vibrato: () => (/* reexport safe */ _vibrato__WEBPACK_IMPORTED_MODULE_81__.Vibrato),
|
|
13632
|
+
/* harmony export */ VibratoBracket: () => (/* reexport safe */ _vibratobracket__WEBPACK_IMPORTED_MODULE_82__.VibratoBracket),
|
|
13633
|
+
/* harmony export */ Voice: () => (/* reexport safe */ _voice__WEBPACK_IMPORTED_MODULE_83__.Voice),
|
|
13634
|
+
/* harmony export */ VoiceMode: () => (/* reexport safe */ _voice__WEBPACK_IMPORTED_MODULE_83__.VoiceMode),
|
|
13635
|
+
/* harmony export */ Volta: () => (/* reexport safe */ _stavevolta__WEBPACK_IMPORTED_MODULE_57__.Volta),
|
|
13636
|
+
/* harmony export */ VoltaType: () => (/* reexport safe */ _stavevolta__WEBPACK_IMPORTED_MODULE_57__.VoltaType),
|
|
13637
|
+
/* harmony export */ defined: () => (/* reexport safe */ _util__WEBPACK_IMPORTED_MODULE_79__.defined),
|
|
13638
|
+
/* harmony export */ drawDot: () => (/* reexport safe */ _rendercontext__WEBPACK_IMPORTED_MODULE_42__.drawDot),
|
|
13649
13639
|
/* harmony export */ getBottomY: () => (/* reexport safe */ _articulation__WEBPACK_IMPORTED_MODULE_2__.getBottomY),
|
|
13650
13640
|
/* harmony export */ getInitialOffset: () => (/* reexport safe */ _articulation__WEBPACK_IMPORTED_MODULE_2__.getInitialOffset),
|
|
13651
13641
|
/* harmony export */ getTopY: () => (/* reexport safe */ _articulation__WEBPACK_IMPORTED_MODULE_2__.getTopY),
|
|
13652
|
-
/* harmony export */ globalObject: () => (/* reexport safe */
|
|
13653
|
-
/* harmony export */ isAccidental: () => (/* reexport safe */
|
|
13654
|
-
/* harmony export */ isAnnotation: () => (/* reexport safe */
|
|
13655
|
-
/* harmony export */ isBarline: () => (/* reexport safe */
|
|
13656
|
-
/* harmony export */ isCategory: () => (/* reexport safe */
|
|
13657
|
-
/* harmony export */ isDot: () => (/* reexport safe */
|
|
13658
|
-
/* harmony export */ isGraceNote: () => (/* reexport safe */
|
|
13659
|
-
/* harmony export */ isGraceNoteGroup: () => (/* reexport safe */
|
|
13660
|
-
/* harmony export */ isHTMLCanvas: () => (/* reexport safe */
|
|
13661
|
-
/* harmony export */ isHTMLDiv: () => (/* reexport safe */
|
|
13662
|
-
/* harmony export */ isNote: () => (/* reexport safe */
|
|
13663
|
-
/* harmony export */ isRenderContext: () => (/* reexport safe */
|
|
13664
|
-
/* harmony export */ isStaveNote: () => (/* reexport safe */
|
|
13665
|
-
/* harmony export */ isStemmableNote: () => (/* reexport safe */
|
|
13666
|
-
/* harmony export */ isTabNote: () => (/* reexport safe */
|
|
13667
|
-
/* harmony export */ log: () => (/* reexport safe */
|
|
13668
|
-
/* harmony export */ midLine: () => (/* reexport safe */
|
|
13669
|
-
/* harmony export */ normalizeAngle: () => (/* reexport safe */
|
|
13670
|
-
/* harmony export */ prefix: () => (/* reexport safe */
|
|
13671
|
-
/* harmony export */ sumArray: () => (/* reexport safe */
|
|
13672
|
-
/* harmony export */ upperFirst: () => (/* reexport safe */
|
|
13673
|
-
/* harmony export */ warn: () => (/* reexport safe */
|
|
13642
|
+
/* harmony export */ globalObject: () => (/* reexport safe */ _util__WEBPACK_IMPORTED_MODULE_79__.globalObject),
|
|
13643
|
+
/* harmony export */ isAccidental: () => (/* reexport safe */ _typeguard__WEBPACK_IMPORTED_MODULE_78__.isAccidental),
|
|
13644
|
+
/* harmony export */ isAnnotation: () => (/* reexport safe */ _typeguard__WEBPACK_IMPORTED_MODULE_78__.isAnnotation),
|
|
13645
|
+
/* harmony export */ isBarline: () => (/* reexport safe */ _typeguard__WEBPACK_IMPORTED_MODULE_78__.isBarline),
|
|
13646
|
+
/* harmony export */ isCategory: () => (/* reexport safe */ _typeguard__WEBPACK_IMPORTED_MODULE_78__.isCategory),
|
|
13647
|
+
/* harmony export */ isDot: () => (/* reexport safe */ _typeguard__WEBPACK_IMPORTED_MODULE_78__.isDot),
|
|
13648
|
+
/* harmony export */ isGraceNote: () => (/* reexport safe */ _typeguard__WEBPACK_IMPORTED_MODULE_78__.isGraceNote),
|
|
13649
|
+
/* harmony export */ isGraceNoteGroup: () => (/* reexport safe */ _typeguard__WEBPACK_IMPORTED_MODULE_78__.isGraceNoteGroup),
|
|
13650
|
+
/* harmony export */ isHTMLCanvas: () => (/* reexport safe */ _web__WEBPACK_IMPORTED_MODULE_84__.isHTMLCanvas),
|
|
13651
|
+
/* harmony export */ isHTMLDiv: () => (/* reexport safe */ _web__WEBPACK_IMPORTED_MODULE_84__.isHTMLDiv),
|
|
13652
|
+
/* harmony export */ isNote: () => (/* reexport safe */ _typeguard__WEBPACK_IMPORTED_MODULE_78__.isNote),
|
|
13653
|
+
/* harmony export */ isRenderContext: () => (/* reexport safe */ _typeguard__WEBPACK_IMPORTED_MODULE_78__.isRenderContext),
|
|
13654
|
+
/* harmony export */ isStaveNote: () => (/* reexport safe */ _typeguard__WEBPACK_IMPORTED_MODULE_78__.isStaveNote),
|
|
13655
|
+
/* harmony export */ isStemmableNote: () => (/* reexport safe */ _typeguard__WEBPACK_IMPORTED_MODULE_78__.isStemmableNote),
|
|
13656
|
+
/* harmony export */ isTabNote: () => (/* reexport safe */ _typeguard__WEBPACK_IMPORTED_MODULE_78__.isTabNote),
|
|
13657
|
+
/* harmony export */ log: () => (/* reexport safe */ _util__WEBPACK_IMPORTED_MODULE_79__.log),
|
|
13658
|
+
/* harmony export */ midLine: () => (/* reexport safe */ _util__WEBPACK_IMPORTED_MODULE_79__.midLine),
|
|
13659
|
+
/* harmony export */ normalizeAngle: () => (/* reexport safe */ _util__WEBPACK_IMPORTED_MODULE_79__.normalizeAngle),
|
|
13660
|
+
/* harmony export */ prefix: () => (/* reexport safe */ _util__WEBPACK_IMPORTED_MODULE_79__.prefix),
|
|
13661
|
+
/* harmony export */ sumArray: () => (/* reexport safe */ _util__WEBPACK_IMPORTED_MODULE_79__.sumArray),
|
|
13662
|
+
/* harmony export */ upperFirst: () => (/* reexport safe */ _util__WEBPACK_IMPORTED_MODULE_79__.upperFirst),
|
|
13663
|
+
/* harmony export */ warn: () => (/* reexport safe */ _util__WEBPACK_IMPORTED_MODULE_79__.warn)
|
|
13674
13664
|
/* harmony export */ });
|
|
13675
13665
|
/* harmony import */ var _accidental__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./accidental */ "./src/accidental.ts");
|
|
13676
13666
|
/* harmony import */ var _annotation__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./annotation */ "./src/annotation.ts");
|
|
@@ -13690,72 +13680,73 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
13690
13680
|
/* harmony import */ var _element__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./element */ "./src/element.ts");
|
|
13691
13681
|
/* harmony import */ var _factory__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./factory */ "./src/factory.ts");
|
|
13692
13682
|
/* harmony import */ var _font__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./font */ "./src/font.ts");
|
|
13693
|
-
/* harmony import */ var
|
|
13694
|
-
/* harmony import */ var
|
|
13695
|
-
/* harmony import */ var
|
|
13696
|
-
/* harmony import */ var
|
|
13697
|
-
/* harmony import */ var
|
|
13698
|
-
/* harmony import */ var
|
|
13699
|
-
/* harmony import */ var
|
|
13700
|
-
/* harmony import */ var
|
|
13701
|
-
/* harmony import */ var
|
|
13702
|
-
/* harmony import */ var
|
|
13703
|
-
/* harmony import */ var
|
|
13704
|
-
/* harmony import */ var
|
|
13705
|
-
/* harmony import */ var
|
|
13706
|
-
/* harmony import */ var
|
|
13707
|
-
/* harmony import */ var
|
|
13708
|
-
/* harmony import */ var
|
|
13709
|
-
/* harmony import */ var
|
|
13710
|
-
/* harmony import */ var
|
|
13711
|
-
/* harmony import */ var
|
|
13712
|
-
/* harmony import */ var
|
|
13713
|
-
/* harmony import */ var
|
|
13714
|
-
/* harmony import */ var
|
|
13715
|
-
/* harmony import */ var
|
|
13716
|
-
/* harmony import */ var
|
|
13717
|
-
/* harmony import */ var
|
|
13718
|
-
/* harmony import */ var
|
|
13719
|
-
/* harmony import */ var
|
|
13720
|
-
/* harmony import */ var
|
|
13721
|
-
/* harmony import */ var
|
|
13722
|
-
/* harmony import */ var
|
|
13723
|
-
/* harmony import */ var
|
|
13724
|
-
/* harmony import */ var
|
|
13725
|
-
/* harmony import */ var
|
|
13726
|
-
/* harmony import */ var
|
|
13727
|
-
/* harmony import */ var
|
|
13728
|
-
/* harmony import */ var
|
|
13729
|
-
/* harmony import */ var
|
|
13730
|
-
/* harmony import */ var
|
|
13731
|
-
/* harmony import */ var
|
|
13732
|
-
/* harmony import */ var
|
|
13733
|
-
/* harmony import */ var
|
|
13734
|
-
/* harmony import */ var
|
|
13735
|
-
/* harmony import */ var
|
|
13736
|
-
/* harmony import */ var
|
|
13737
|
-
/* harmony import */ var
|
|
13738
|
-
/* harmony import */ var
|
|
13739
|
-
/* harmony import */ var
|
|
13740
|
-
/* harmony import */ var
|
|
13741
|
-
/* harmony import */ var
|
|
13742
|
-
/* harmony import */ var
|
|
13743
|
-
/* harmony import */ var
|
|
13744
|
-
/* harmony import */ var
|
|
13745
|
-
/* harmony import */ var
|
|
13746
|
-
/* harmony import */ var
|
|
13747
|
-
/* harmony import */ var
|
|
13748
|
-
/* harmony import */ var
|
|
13749
|
-
/* harmony import */ var
|
|
13750
|
-
/* harmony import */ var
|
|
13751
|
-
/* harmony import */ var
|
|
13752
|
-
/* harmony import */ var
|
|
13753
|
-
/* harmony import */ var
|
|
13754
|
-
/* harmony import */ var
|
|
13755
|
-
/* harmony import */ var
|
|
13756
|
-
/* harmony import */ var
|
|
13757
|
-
/* harmony import */ var
|
|
13758
|
-
/* harmony import */ var
|
|
13683
|
+
/* harmony import */ var _flag__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./flag */ "./src/flag.ts");
|
|
13684
|
+
/* harmony import */ var _formatter__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ./formatter */ "./src/formatter.ts");
|
|
13685
|
+
/* harmony import */ var _fraction__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ./fraction */ "./src/fraction.ts");
|
|
13686
|
+
/* harmony import */ var _frethandfinger__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ./frethandfinger */ "./src/frethandfinger.ts");
|
|
13687
|
+
/* harmony import */ var _ghostnote__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ./ghostnote */ "./src/ghostnote.ts");
|
|
13688
|
+
/* harmony import */ var _glyphnote__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ./glyphnote */ "./src/glyphnote.ts");
|
|
13689
|
+
/* harmony import */ var _gracenote__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ./gracenote */ "./src/gracenote.ts");
|
|
13690
|
+
/* harmony import */ var _gracenotegroup__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ./gracenotegroup */ "./src/gracenotegroup.ts");
|
|
13691
|
+
/* harmony import */ var _gracetabnote__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ./gracetabnote */ "./src/gracetabnote.ts");
|
|
13692
|
+
/* harmony import */ var _keymanager__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(/*! ./keymanager */ "./src/keymanager.ts");
|
|
13693
|
+
/* harmony import */ var _keysignature__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(/*! ./keysignature */ "./src/keysignature.ts");
|
|
13694
|
+
/* harmony import */ var _keysignote__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__(/*! ./keysignote */ "./src/keysignote.ts");
|
|
13695
|
+
/* harmony import */ var _modifier__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__(/*! ./modifier */ "./src/modifier.ts");
|
|
13696
|
+
/* harmony import */ var _modifiercontext__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__(/*! ./modifiercontext */ "./src/modifiercontext.ts");
|
|
13697
|
+
/* harmony import */ var _multimeasurerest__WEBPACK_IMPORTED_MODULE_32__ = __webpack_require__(/*! ./multimeasurerest */ "./src/multimeasurerest.ts");
|
|
13698
|
+
/* harmony import */ var _music__WEBPACK_IMPORTED_MODULE_33__ = __webpack_require__(/*! ./music */ "./src/music.ts");
|
|
13699
|
+
/* harmony import */ var _note__WEBPACK_IMPORTED_MODULE_34__ = __webpack_require__(/*! ./note */ "./src/note.ts");
|
|
13700
|
+
/* harmony import */ var _notehead__WEBPACK_IMPORTED_MODULE_35__ = __webpack_require__(/*! ./notehead */ "./src/notehead.ts");
|
|
13701
|
+
/* harmony import */ var _notesubgroup__WEBPACK_IMPORTED_MODULE_36__ = __webpack_require__(/*! ./notesubgroup */ "./src/notesubgroup.ts");
|
|
13702
|
+
/* harmony import */ var _ornament__WEBPACK_IMPORTED_MODULE_37__ = __webpack_require__(/*! ./ornament */ "./src/ornament.ts");
|
|
13703
|
+
/* harmony import */ var _parenthesis__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__(/*! ./parenthesis */ "./src/parenthesis.ts");
|
|
13704
|
+
/* harmony import */ var _parser__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__(/*! ./parser */ "./src/parser.ts");
|
|
13705
|
+
/* harmony import */ var _pedalmarking__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__(/*! ./pedalmarking */ "./src/pedalmarking.ts");
|
|
13706
|
+
/* harmony import */ var _registry__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__(/*! ./registry */ "./src/registry.ts");
|
|
13707
|
+
/* harmony import */ var _rendercontext__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__(/*! ./rendercontext */ "./src/rendercontext.ts");
|
|
13708
|
+
/* harmony import */ var _renderer__WEBPACK_IMPORTED_MODULE_43__ = __webpack_require__(/*! ./renderer */ "./src/renderer.ts");
|
|
13709
|
+
/* harmony import */ var _repeatnote__WEBPACK_IMPORTED_MODULE_44__ = __webpack_require__(/*! ./repeatnote */ "./src/repeatnote.ts");
|
|
13710
|
+
/* harmony import */ var _stave__WEBPACK_IMPORTED_MODULE_45__ = __webpack_require__(/*! ./stave */ "./src/stave.ts");
|
|
13711
|
+
/* harmony import */ var _stavebarline__WEBPACK_IMPORTED_MODULE_46__ = __webpack_require__(/*! ./stavebarline */ "./src/stavebarline.ts");
|
|
13712
|
+
/* harmony import */ var _staveconnector__WEBPACK_IMPORTED_MODULE_47__ = __webpack_require__(/*! ./staveconnector */ "./src/staveconnector.ts");
|
|
13713
|
+
/* harmony import */ var _stavehairpin__WEBPACK_IMPORTED_MODULE_48__ = __webpack_require__(/*! ./stavehairpin */ "./src/stavehairpin.ts");
|
|
13714
|
+
/* harmony import */ var _staveline__WEBPACK_IMPORTED_MODULE_49__ = __webpack_require__(/*! ./staveline */ "./src/staveline.ts");
|
|
13715
|
+
/* harmony import */ var _stavemodifier__WEBPACK_IMPORTED_MODULE_50__ = __webpack_require__(/*! ./stavemodifier */ "./src/stavemodifier.ts");
|
|
13716
|
+
/* harmony import */ var _stavenote__WEBPACK_IMPORTED_MODULE_51__ = __webpack_require__(/*! ./stavenote */ "./src/stavenote.ts");
|
|
13717
|
+
/* harmony import */ var _staverepetition__WEBPACK_IMPORTED_MODULE_52__ = __webpack_require__(/*! ./staverepetition */ "./src/staverepetition.ts");
|
|
13718
|
+
/* harmony import */ var _stavesection__WEBPACK_IMPORTED_MODULE_53__ = __webpack_require__(/*! ./stavesection */ "./src/stavesection.ts");
|
|
13719
|
+
/* harmony import */ var _stavetempo__WEBPACK_IMPORTED_MODULE_54__ = __webpack_require__(/*! ./stavetempo */ "./src/stavetempo.ts");
|
|
13720
|
+
/* harmony import */ var _stavetext__WEBPACK_IMPORTED_MODULE_55__ = __webpack_require__(/*! ./stavetext */ "./src/stavetext.ts");
|
|
13721
|
+
/* harmony import */ var _stavetie__WEBPACK_IMPORTED_MODULE_56__ = __webpack_require__(/*! ./stavetie */ "./src/stavetie.ts");
|
|
13722
|
+
/* harmony import */ var _stavevolta__WEBPACK_IMPORTED_MODULE_57__ = __webpack_require__(/*! ./stavevolta */ "./src/stavevolta.ts");
|
|
13723
|
+
/* harmony import */ var _stem__WEBPACK_IMPORTED_MODULE_58__ = __webpack_require__(/*! ./stem */ "./src/stem.ts");
|
|
13724
|
+
/* harmony import */ var _stemmablenote__WEBPACK_IMPORTED_MODULE_59__ = __webpack_require__(/*! ./stemmablenote */ "./src/stemmablenote.ts");
|
|
13725
|
+
/* harmony import */ var _stringnumber__WEBPACK_IMPORTED_MODULE_60__ = __webpack_require__(/*! ./stringnumber */ "./src/stringnumber.ts");
|
|
13726
|
+
/* harmony import */ var _strokes__WEBPACK_IMPORTED_MODULE_61__ = __webpack_require__(/*! ./strokes */ "./src/strokes.ts");
|
|
13727
|
+
/* harmony import */ var _svgcontext__WEBPACK_IMPORTED_MODULE_62__ = __webpack_require__(/*! ./svgcontext */ "./src/svgcontext.ts");
|
|
13728
|
+
/* harmony import */ var _system__WEBPACK_IMPORTED_MODULE_63__ = __webpack_require__(/*! ./system */ "./src/system.ts");
|
|
13729
|
+
/* harmony import */ var _tabnote__WEBPACK_IMPORTED_MODULE_64__ = __webpack_require__(/*! ./tabnote */ "./src/tabnote.ts");
|
|
13730
|
+
/* harmony import */ var _tabslide__WEBPACK_IMPORTED_MODULE_65__ = __webpack_require__(/*! ./tabslide */ "./src/tabslide.ts");
|
|
13731
|
+
/* harmony import */ var _tabstave__WEBPACK_IMPORTED_MODULE_66__ = __webpack_require__(/*! ./tabstave */ "./src/tabstave.ts");
|
|
13732
|
+
/* harmony import */ var _tabtie__WEBPACK_IMPORTED_MODULE_67__ = __webpack_require__(/*! ./tabtie */ "./src/tabtie.ts");
|
|
13733
|
+
/* harmony import */ var _textbracket__WEBPACK_IMPORTED_MODULE_68__ = __webpack_require__(/*! ./textbracket */ "./src/textbracket.ts");
|
|
13734
|
+
/* harmony import */ var _textdynamics__WEBPACK_IMPORTED_MODULE_69__ = __webpack_require__(/*! ./textdynamics */ "./src/textdynamics.ts");
|
|
13735
|
+
/* harmony import */ var _textnote__WEBPACK_IMPORTED_MODULE_70__ = __webpack_require__(/*! ./textnote */ "./src/textnote.ts");
|
|
13736
|
+
/* harmony import */ var _tickable__WEBPACK_IMPORTED_MODULE_71__ = __webpack_require__(/*! ./tickable */ "./src/tickable.ts");
|
|
13737
|
+
/* harmony import */ var _tickcontext__WEBPACK_IMPORTED_MODULE_72__ = __webpack_require__(/*! ./tickcontext */ "./src/tickcontext.ts");
|
|
13738
|
+
/* harmony import */ var _timesignature__WEBPACK_IMPORTED_MODULE_73__ = __webpack_require__(/*! ./timesignature */ "./src/timesignature.ts");
|
|
13739
|
+
/* harmony import */ var _timesignote__WEBPACK_IMPORTED_MODULE_74__ = __webpack_require__(/*! ./timesignote */ "./src/timesignote.ts");
|
|
13740
|
+
/* harmony import */ var _tremolo__WEBPACK_IMPORTED_MODULE_75__ = __webpack_require__(/*! ./tremolo */ "./src/tremolo.ts");
|
|
13741
|
+
/* harmony import */ var _tuning__WEBPACK_IMPORTED_MODULE_76__ = __webpack_require__(/*! ./tuning */ "./src/tuning.ts");
|
|
13742
|
+
/* harmony import */ var _tuplet__WEBPACK_IMPORTED_MODULE_77__ = __webpack_require__(/*! ./tuplet */ "./src/tuplet.ts");
|
|
13743
|
+
/* harmony import */ var _typeguard__WEBPACK_IMPORTED_MODULE_78__ = __webpack_require__(/*! ./typeguard */ "./src/typeguard.ts");
|
|
13744
|
+
/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_79__ = __webpack_require__(/*! ./util */ "./src/util.ts");
|
|
13745
|
+
/* harmony import */ var _vexflow__WEBPACK_IMPORTED_MODULE_80__ = __webpack_require__(/*! ./vexflow */ "./src/vexflow.ts");
|
|
13746
|
+
/* harmony import */ var _vibrato__WEBPACK_IMPORTED_MODULE_81__ = __webpack_require__(/*! ./vibrato */ "./src/vibrato.ts");
|
|
13747
|
+
/* harmony import */ var _vibratobracket__WEBPACK_IMPORTED_MODULE_82__ = __webpack_require__(/*! ./vibratobracket */ "./src/vibratobracket.ts");
|
|
13748
|
+
/* harmony import */ var _voice__WEBPACK_IMPORTED_MODULE_83__ = __webpack_require__(/*! ./voice */ "./src/voice.ts");
|
|
13749
|
+
/* harmony import */ var _web__WEBPACK_IMPORTED_MODULE_84__ = __webpack_require__(/*! ./web */ "./src/web.ts");
|
|
13759
13750
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
13760
13751
|
// MIT License
|
|
13761
13752
|
|
|
@@ -13820,6 +13811,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
13820
13811
|
|
|
13821
13812
|
|
|
13822
13813
|
|
|
13814
|
+
|
|
13823
13815
|
|
|
13824
13816
|
|
|
13825
13817
|
// Do not export './tables' because it is internal. Its public API is accessible via VexFlow.*.
|
|
@@ -13984,11 +13976,13 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
13984
13976
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
13985
13977
|
/* harmony export */ KeySignature: () => (/* binding */ KeySignature)
|
|
13986
13978
|
/* harmony export */ });
|
|
13987
|
-
/* harmony import */ var
|
|
13988
|
-
/* harmony import */ var
|
|
13989
|
-
/* harmony import */ var
|
|
13990
|
-
/* harmony import */ var
|
|
13991
|
-
/* harmony import */ var
|
|
13979
|
+
/* harmony import */ var _boundingbox__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./boundingbox */ "./src/boundingbox.ts");
|
|
13980
|
+
/* harmony import */ var _element__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./element */ "./src/element.ts");
|
|
13981
|
+
/* harmony import */ var _glyphs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./glyphs */ "./src/glyphs.ts");
|
|
13982
|
+
/* harmony import */ var _stavemodifier__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./stavemodifier */ "./src/stavemodifier.ts");
|
|
13983
|
+
/* harmony import */ var _tables__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./tables */ "./src/tables.ts");
|
|
13984
|
+
/* harmony import */ var _typeguard__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./typeguard */ "./src/typeguard.ts");
|
|
13985
|
+
/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./util */ "./src/util.ts");
|
|
13992
13986
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
13993
13987
|
// @author Cyril Silverman
|
|
13994
13988
|
//
|
|
@@ -14001,35 +13995,42 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
14001
13995
|
|
|
14002
13996
|
|
|
14003
13997
|
|
|
14004
|
-
|
|
13998
|
+
|
|
13999
|
+
|
|
14000
|
+
class KeySignature extends _stavemodifier__WEBPACK_IMPORTED_MODULE_3__.StaveModifier {
|
|
14005
14001
|
static get CATEGORY() {
|
|
14006
|
-
return
|
|
14002
|
+
return _typeguard__WEBPACK_IMPORTED_MODULE_5__.Category.KeySignature;
|
|
14007
14003
|
}
|
|
14008
14004
|
// Create a new Key Signature based on a `keySpec`
|
|
14009
14005
|
constructor(keySpec, cancelKeySpec, alterKeySpec) {
|
|
14010
14006
|
super();
|
|
14011
14007
|
this.accList = [];
|
|
14012
14008
|
this.setKeySig(keySpec, cancelKeySpec, alterKeySpec);
|
|
14013
|
-
this.setPosition(
|
|
14014
|
-
this.
|
|
14009
|
+
this.setPosition(_stavemodifier__WEBPACK_IMPORTED_MODULE_3__.StaveModifierPosition.BEGIN);
|
|
14010
|
+
this.children = [];
|
|
14015
14011
|
this.paddingForced = false;
|
|
14016
14012
|
}
|
|
14017
14013
|
// Add an accidental glyph to the `KeySignature` instance which represents
|
|
14018
14014
|
// the provided `acc`. If `nextAcc` is also provided, the appropriate
|
|
14019
14015
|
// spacing will be included in the glyph's position
|
|
14020
14016
|
convertToGlyph(acc, nextAcc, stave) {
|
|
14021
|
-
const code =
|
|
14022
|
-
const glyph = new
|
|
14017
|
+
const code = _tables__WEBPACK_IMPORTED_MODULE_4__.Tables.accidentalCodes(acc.type);
|
|
14018
|
+
const glyph = new _element__WEBPACK_IMPORTED_MODULE_1__.Element(_typeguard__WEBPACK_IMPORTED_MODULE_5__.Category.KeySignature);
|
|
14023
14019
|
glyph.setText(code);
|
|
14024
14020
|
// Determine spacing between current accidental and the next accidental
|
|
14025
|
-
|
|
14021
|
+
let extraWidth = 1;
|
|
14026
14022
|
// Place the glyph on the stave
|
|
14027
14023
|
glyph.setYShift(stave.getYForLine(acc.line));
|
|
14028
|
-
if (this.
|
|
14029
|
-
const prevGlyph = this.
|
|
14024
|
+
if (this.children.length > 0) {
|
|
14025
|
+
const prevGlyph = this.children[this.children.length - 1];
|
|
14026
|
+
const isNatural = (el) => el.getText() === _glyphs__WEBPACK_IMPORTED_MODULE_2__.Glyphs.accidentalNatural;
|
|
14027
|
+
const yShiftDiff = (el1, el2) => Math.abs(el2.getYShift() - el1.getYShift());
|
|
14028
|
+
if ((isNatural(prevGlyph) || isNatural(glyph)) && yShiftDiff(prevGlyph, glyph) < 10) {
|
|
14029
|
+
extraWidth = 2;
|
|
14030
|
+
}
|
|
14030
14031
|
glyph.setXShift(prevGlyph.getXShift() + prevGlyph.getWidth() + extraWidth);
|
|
14031
14032
|
}
|
|
14032
|
-
this.
|
|
14033
|
+
this.children.push(glyph);
|
|
14033
14034
|
// Expand size of key signature
|
|
14034
14035
|
this.width += glyph.getWidth() + extraWidth;
|
|
14035
14036
|
}
|
|
@@ -14040,9 +14041,10 @@ class KeySignature extends _stavemodifier__WEBPACK_IMPORTED_MODULE_1__.StaveModi
|
|
|
14040
14041
|
this.cancelKeySpec = spec;
|
|
14041
14042
|
return this;
|
|
14042
14043
|
}
|
|
14044
|
+
// Convert the `cancelKeySpec` into a list of naturals to be displayed
|
|
14043
14045
|
convertToCancelAccList(spec) {
|
|
14044
14046
|
// Get the accidental list for the cancelled key signature
|
|
14045
|
-
const cancelAccList =
|
|
14047
|
+
const cancelAccList = _tables__WEBPACK_IMPORTED_MODULE_4__.Tables.keySignature(spec);
|
|
14046
14048
|
// If the cancelled key has a different accidental type, ie: # vs b
|
|
14047
14049
|
const differentTypes = this.accList.length > 0 && cancelAccList.length > 0 && cancelAccList[0].type !== this.accList[0].type;
|
|
14048
14050
|
// Determine how many naturals needed to add
|
|
@@ -14067,11 +14069,34 @@ class KeySignature extends _stavemodifier__WEBPACK_IMPORTED_MODULE_1__.StaveModi
|
|
|
14067
14069
|
type: cancelAccList[0].type,
|
|
14068
14070
|
};
|
|
14069
14071
|
}
|
|
14072
|
+
// Add this key signature to the start of a stave.
|
|
14070
14073
|
addToStave(stave) {
|
|
14071
14074
|
this.paddingForced = true;
|
|
14072
14075
|
stave.addModifier(this);
|
|
14073
14076
|
return this;
|
|
14074
14077
|
}
|
|
14078
|
+
// Get the `BoundingBox`
|
|
14079
|
+
getBoundingBox() {
|
|
14080
|
+
if (!this.formatted)
|
|
14081
|
+
this.format();
|
|
14082
|
+
return super.getBoundingBox();
|
|
14083
|
+
}
|
|
14084
|
+
// Calculate the width and height for the entire signature
|
|
14085
|
+
calculateDimensions() {
|
|
14086
|
+
let boundingBox;
|
|
14087
|
+
if (this.children.length > 0) {
|
|
14088
|
+
boundingBox = this.children[0].getBoundingBox();
|
|
14089
|
+
}
|
|
14090
|
+
else {
|
|
14091
|
+
boundingBox = new _boundingbox__WEBPACK_IMPORTED_MODULE_0__.BoundingBox(this.x + this.xShift, this.y + this.yShift, 0, 0);
|
|
14092
|
+
}
|
|
14093
|
+
this.children.forEach((glyph) => {
|
|
14094
|
+
boundingBox.mergeWith(glyph.getBoundingBox());
|
|
14095
|
+
});
|
|
14096
|
+
this.width = boundingBox.getW();
|
|
14097
|
+
this.height = boundingBox.getH();
|
|
14098
|
+
this.y = boundingBox.getY();
|
|
14099
|
+
}
|
|
14075
14100
|
// Apply the accidental staff line placement based on the `clef` and
|
|
14076
14101
|
// the accidental `type` for the key signature ('# or 'b').
|
|
14077
14102
|
convertAccLines(clef, type, accList = this.accList) {
|
|
@@ -14127,16 +14152,19 @@ class KeySignature extends _stavemodifier__WEBPACK_IMPORTED_MODULE_1__.StaveModi
|
|
|
14127
14152
|
}
|
|
14128
14153
|
}
|
|
14129
14154
|
}
|
|
14155
|
+
// Get the padding required for this modifier
|
|
14130
14156
|
getPadding(index) {
|
|
14131
14157
|
if (!this.formatted)
|
|
14132
14158
|
this.format();
|
|
14133
|
-
return this.
|
|
14159
|
+
return this.children.length === 0 || (!this.paddingForced && index < 2) ? 0 : this.padding;
|
|
14134
14160
|
}
|
|
14161
|
+
// Get the width of the modifier
|
|
14135
14162
|
getWidth() {
|
|
14136
14163
|
if (!this.formatted)
|
|
14137
|
-
this.
|
|
14164
|
+
this.format();
|
|
14138
14165
|
return this.width;
|
|
14139
14166
|
}
|
|
14167
|
+
// Set the key signature to a specific key, ie: 'C' or 'Gm'
|
|
14140
14168
|
setKeySig(keySpec, cancelKeySpec, alterKeySpec) {
|
|
14141
14169
|
this.formatted = false;
|
|
14142
14170
|
this.keySpec = keySpec;
|
|
@@ -14152,6 +14180,7 @@ class KeySignature extends _stavemodifier__WEBPACK_IMPORTED_MODULE_1__.StaveModi
|
|
|
14152
14180
|
this.alterKeySpec = alterKeySpec;
|
|
14153
14181
|
return this;
|
|
14154
14182
|
}
|
|
14183
|
+
// Convert the `alterKeySpec` into a list of accidentals to be displayed
|
|
14155
14184
|
convertToAlterAccList(alterKeySpec) {
|
|
14156
14185
|
const max = Math.min(alterKeySpec.length, this.accList.length);
|
|
14157
14186
|
for (let i = 0; i < max; ++i) {
|
|
@@ -14160,11 +14189,12 @@ class KeySignature extends _stavemodifier__WEBPACK_IMPORTED_MODULE_1__.StaveModi
|
|
|
14160
14189
|
}
|
|
14161
14190
|
}
|
|
14162
14191
|
}
|
|
14192
|
+
// Format and position the modifier
|
|
14163
14193
|
format() {
|
|
14164
14194
|
const stave = this.checkStave();
|
|
14165
14195
|
this.width = 0;
|
|
14166
|
-
this.
|
|
14167
|
-
this.accList =
|
|
14196
|
+
this.children = [];
|
|
14197
|
+
this.accList = _tables__WEBPACK_IMPORTED_MODULE_4__.Tables.keySignature((0,_util__WEBPACK_IMPORTED_MODULE_6__.defined)(this.keySpec));
|
|
14168
14198
|
const accList = this.accList;
|
|
14169
14199
|
const firstAccidentalType = accList.length > 0 ? accList[0].type : undefined;
|
|
14170
14200
|
let cancelAccList;
|
|
@@ -14175,7 +14205,7 @@ class KeySignature extends _stavemodifier__WEBPACK_IMPORTED_MODULE_1__.StaveModi
|
|
|
14175
14205
|
this.convertToAlterAccList(this.alterKeySpec);
|
|
14176
14206
|
}
|
|
14177
14207
|
if (this.accList.length > 0) {
|
|
14178
|
-
const clef = (this.position ===
|
|
14208
|
+
const clef = (this.position === _stavemodifier__WEBPACK_IMPORTED_MODULE_3__.StaveModifierPosition.END ? stave.getEndClef() : stave.getClef()) || stave.getClef();
|
|
14179
14209
|
if (cancelAccList) {
|
|
14180
14210
|
this.convertAccLines(clef, cancelAccList.type, cancelAccList.accList);
|
|
14181
14211
|
}
|
|
@@ -14184,43 +14214,22 @@ class KeySignature extends _stavemodifier__WEBPACK_IMPORTED_MODULE_1__.StaveModi
|
|
|
14184
14214
|
this.convertToGlyph(this.accList[i], this.accList[i + 1], stave);
|
|
14185
14215
|
}
|
|
14186
14216
|
}
|
|
14217
|
+
this.calculateDimensions();
|
|
14187
14218
|
this.formatted = true;
|
|
14188
14219
|
}
|
|
14189
|
-
|
|
14190
|
-
this.width = 0;
|
|
14191
|
-
this.accList = _tables__WEBPACK_IMPORTED_MODULE_2__.Tables.keySignature((0,_util__WEBPACK_IMPORTED_MODULE_4__.defined)(this.keySpec));
|
|
14192
|
-
if (this.cancelKeySpec) {
|
|
14193
|
-
this.convertToCancelAccList(this.cancelKeySpec);
|
|
14194
|
-
}
|
|
14195
|
-
if (this.alterKeySpec) {
|
|
14196
|
-
this.convertToAlterAccList(this.alterKeySpec);
|
|
14197
|
-
}
|
|
14198
|
-
if (this.accList.length > 0) {
|
|
14199
|
-
for (let i = 0; i < this.accList.length; ++i) {
|
|
14200
|
-
const code = _tables__WEBPACK_IMPORTED_MODULE_2__.Tables.accidentalCodes(this.accList[i].type);
|
|
14201
|
-
const glyph = new _element__WEBPACK_IMPORTED_MODULE_0__.Element(_typeguard__WEBPACK_IMPORTED_MODULE_3__.Category.KeySignature);
|
|
14202
|
-
glyph.setText(code);
|
|
14203
|
-
// Determine spacing between current accidental and the next accidental
|
|
14204
|
-
const extraWidth = 1;
|
|
14205
|
-
// Expand size of key signature
|
|
14206
|
-
this.width += glyph.getWidth() + extraWidth;
|
|
14207
|
-
}
|
|
14208
|
-
}
|
|
14209
|
-
}
|
|
14220
|
+
// Render the key signature
|
|
14210
14221
|
draw() {
|
|
14211
14222
|
const stave = this.checkStave();
|
|
14212
14223
|
const ctx = stave.checkContext();
|
|
14213
14224
|
if (!this.formatted)
|
|
14214
14225
|
this.format();
|
|
14215
14226
|
this.setRendered();
|
|
14216
|
-
this.applyStyle(ctx);
|
|
14217
14227
|
ctx.openGroup('keysignature', this.getAttribute('id'));
|
|
14218
|
-
for (let i = 0; i < this.
|
|
14219
|
-
const glyph = this.
|
|
14228
|
+
for (let i = 0; i < this.children.length; i++) {
|
|
14229
|
+
const glyph = this.children[i];
|
|
14220
14230
|
glyph.renderText(ctx, this.x, 0);
|
|
14221
14231
|
}
|
|
14222
14232
|
ctx.closeGroup();
|
|
14223
|
-
this.restoreStyle(ctx);
|
|
14224
14233
|
}
|
|
14225
14234
|
}
|
|
14226
14235
|
|
|
@@ -14272,7 +14281,7 @@ class KeySigNote extends _note__WEBPACK_IMPORTED_MODULE_1__.Note {
|
|
|
14272
14281
|
this.setRendered();
|
|
14273
14282
|
this.keySignature.setX(this.getAbsoluteX());
|
|
14274
14283
|
this.keySignature.setContext(ctx);
|
|
14275
|
-
this.keySignature.
|
|
14284
|
+
this.keySignature.drawWithStyle();
|
|
14276
14285
|
}
|
|
14277
14286
|
}
|
|
14278
14287
|
|
|
@@ -14293,13 +14302,43 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
14293
14302
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
14294
14303
|
class Metrics {
|
|
14295
14304
|
/** Use the provided key to look up a FontInfo in CommonMetrics. **/
|
|
14305
|
+
static clear(key) {
|
|
14306
|
+
if (key) {
|
|
14307
|
+
this.cacheFont.delete(key);
|
|
14308
|
+
this.cacheStyle.delete(key);
|
|
14309
|
+
}
|
|
14310
|
+
else {
|
|
14311
|
+
this.cacheFont.clear();
|
|
14312
|
+
this.cacheStyle.clear();
|
|
14313
|
+
}
|
|
14314
|
+
}
|
|
14296
14315
|
static getFontInfo(key) {
|
|
14297
|
-
|
|
14298
|
-
|
|
14299
|
-
|
|
14300
|
-
|
|
14301
|
-
|
|
14302
|
-
|
|
14316
|
+
let font = this.cacheFont.get(key);
|
|
14317
|
+
if (!font) {
|
|
14318
|
+
font = {
|
|
14319
|
+
family: Metrics.get(`${key}.fontFamily`),
|
|
14320
|
+
size: Metrics.get(`${key}.fontSize`) * Metrics.get(`${key}.fontScale`),
|
|
14321
|
+
weight: Metrics.get(`${key}.fontWeight`),
|
|
14322
|
+
style: Metrics.get(`${key}.fontStyle`),
|
|
14323
|
+
};
|
|
14324
|
+
this.cacheFont.set(key, font);
|
|
14325
|
+
}
|
|
14326
|
+
return structuredClone(font);
|
|
14327
|
+
}
|
|
14328
|
+
static getStyle(key) {
|
|
14329
|
+
let style = this.cacheStyle.get(key);
|
|
14330
|
+
if (!style) {
|
|
14331
|
+
style = {
|
|
14332
|
+
fillStyle: Metrics.get(`${key}.fillStyle`),
|
|
14333
|
+
strokeStyle: Metrics.get(`${key}.strokeStyle`),
|
|
14334
|
+
lineWidth: Metrics.get(`${key}.lineWidth`),
|
|
14335
|
+
lineDash: Metrics.get(`${key}.lineDash`),
|
|
14336
|
+
shadowBlur: Metrics.get(`${key}.shadowBlur`),
|
|
14337
|
+
shadowColor: Metrics.get(`${key}.shadowColor`),
|
|
14338
|
+
};
|
|
14339
|
+
this.cacheStyle.set(key, style);
|
|
14340
|
+
}
|
|
14341
|
+
return structuredClone(style);
|
|
14303
14342
|
}
|
|
14304
14343
|
/**
|
|
14305
14344
|
* Use the provided key to look up a value in CommonMetrics.
|
|
@@ -14336,6 +14375,8 @@ class Metrics {
|
|
|
14336
14375
|
return retVal;
|
|
14337
14376
|
}
|
|
14338
14377
|
}
|
|
14378
|
+
Metrics.cacheStyle = new Map();
|
|
14379
|
+
Metrics.cacheFont = new Map();
|
|
14339
14380
|
// eslint-disable-next-line
|
|
14340
14381
|
const MetricsDefaults = {
|
|
14341
14382
|
fontFamily: 'Bravura,Academico',
|
|
@@ -14348,7 +14389,7 @@ const MetricsDefaults = {
|
|
|
14348
14389
|
fontSize: 20,
|
|
14349
14390
|
},
|
|
14350
14391
|
grace: {
|
|
14351
|
-
fontSize:
|
|
14392
|
+
fontSize: 20,
|
|
14352
14393
|
},
|
|
14353
14394
|
noteheadAccidentalPadding: 1,
|
|
14354
14395
|
leftPadding: 2,
|
|
@@ -14359,6 +14400,10 @@ const MetricsDefaults = {
|
|
|
14359
14400
|
},
|
|
14360
14401
|
Bend: {
|
|
14361
14402
|
fontSize: 10,
|
|
14403
|
+
line: {
|
|
14404
|
+
strokeStyle: '#777777',
|
|
14405
|
+
lineWidth: 1,
|
|
14406
|
+
},
|
|
14362
14407
|
},
|
|
14363
14408
|
ChordSymbol: {
|
|
14364
14409
|
fontSize: 12,
|
|
@@ -14402,6 +14447,7 @@ const MetricsDefaults = {
|
|
|
14402
14447
|
},
|
|
14403
14448
|
},
|
|
14404
14449
|
Stave: {
|
|
14450
|
+
strokeStyle: '#999999',
|
|
14405
14451
|
fontSize: 8,
|
|
14406
14452
|
padding: 12,
|
|
14407
14453
|
endPaddingMax: 10,
|
|
@@ -14419,6 +14465,9 @@ const MetricsDefaults = {
|
|
|
14419
14465
|
StaveSection: {
|
|
14420
14466
|
fontSize: 10,
|
|
14421
14467
|
fontWeight: 'bold',
|
|
14468
|
+
lineWidth: 2,
|
|
14469
|
+
padding: 2,
|
|
14470
|
+
strokeStyle: 'black',
|
|
14422
14471
|
},
|
|
14423
14472
|
StaveTempo: {
|
|
14424
14473
|
fontSize: 14,
|
|
@@ -14435,6 +14484,9 @@ const MetricsDefaults = {
|
|
|
14435
14484
|
StaveTie: {
|
|
14436
14485
|
fontSize: 10,
|
|
14437
14486
|
},
|
|
14487
|
+
Stem: {
|
|
14488
|
+
strokeStyle: 'black',
|
|
14489
|
+
},
|
|
14438
14490
|
StringNumber: {
|
|
14439
14491
|
fontSize: 10,
|
|
14440
14492
|
fontWeight: 'bold',
|
|
@@ -14460,6 +14512,10 @@ const MetricsDefaults = {
|
|
|
14460
14512
|
fontStyle: 'italic',
|
|
14461
14513
|
fontWeight: 'bold',
|
|
14462
14514
|
},
|
|
14515
|
+
TabStave: {
|
|
14516
|
+
strokeStyle: '#999999',
|
|
14517
|
+
fontSize: 8,
|
|
14518
|
+
},
|
|
14463
14519
|
TabTie: {
|
|
14464
14520
|
fontSize: 10,
|
|
14465
14521
|
},
|
|
@@ -14475,6 +14531,10 @@ const MetricsDefaults = {
|
|
|
14475
14531
|
Tremolo: {
|
|
14476
14532
|
spacing: 7,
|
|
14477
14533
|
},
|
|
14534
|
+
Tuplet: {
|
|
14535
|
+
yOffset: 0,
|
|
14536
|
+
textYOffset: 2,
|
|
14537
|
+
},
|
|
14478
14538
|
Volta: {
|
|
14479
14539
|
fontSize: 9,
|
|
14480
14540
|
fontWeight: 'bold',
|
|
@@ -14500,18 +14560,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
14500
14560
|
/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./util */ "./src/util.ts");
|
|
14501
14561
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
14502
14562
|
// 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
14563
|
|
|
14516
14564
|
|
|
14517
14565
|
|
|
@@ -14560,13 +14608,11 @@ class Modifier extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
14560
14608
|
}
|
|
14561
14609
|
constructor() {
|
|
14562
14610
|
super();
|
|
14563
|
-
_Modifier_spacingFromNextModifier.set(this, void 0);
|
|
14564
|
-
_Modifier_modifierContext.set(this, void 0);
|
|
14565
14611
|
this.width = 0;
|
|
14566
14612
|
// The `textLine` is reserved space above or below a stave.
|
|
14567
14613
|
this.textLine = 0;
|
|
14568
14614
|
this.position = Modifier.Position.LEFT;
|
|
14569
|
-
|
|
14615
|
+
this.spacingFromNextModifier = 0;
|
|
14570
14616
|
}
|
|
14571
14617
|
/** Called when position changes. */
|
|
14572
14618
|
reset() {
|
|
@@ -14608,15 +14654,15 @@ class Modifier extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
14608
14654
|
}
|
|
14609
14655
|
/** Get `ModifierContext`. */
|
|
14610
14656
|
getModifierContext() {
|
|
14611
|
-
return
|
|
14657
|
+
return this.modifierContext;
|
|
14612
14658
|
}
|
|
14613
14659
|
/** Check and get `ModifierContext`. */
|
|
14614
14660
|
checkModifierContext() {
|
|
14615
|
-
return (0,_util__WEBPACK_IMPORTED_MODULE_2__.defined)(
|
|
14661
|
+
return (0,_util__WEBPACK_IMPORTED_MODULE_2__.defined)(this.modifierContext, 'NoModifierContext', 'Modifier Context Required');
|
|
14616
14662
|
}
|
|
14617
14663
|
/** Every modifier must be part of a `ModifierContext`. */
|
|
14618
14664
|
setModifierContext(c) {
|
|
14619
|
-
|
|
14665
|
+
this.modifierContext = c;
|
|
14620
14666
|
return this;
|
|
14621
14667
|
}
|
|
14622
14668
|
/** Get position. */
|
|
@@ -14644,11 +14690,11 @@ class Modifier extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
14644
14690
|
}
|
|
14645
14691
|
/** Set spacing from next modifier. */
|
|
14646
14692
|
setSpacingFromNextModifier(x) {
|
|
14647
|
-
|
|
14693
|
+
this.spacingFromNextModifier = x;
|
|
14648
14694
|
}
|
|
14649
14695
|
/** Get spacing from next modifier. */
|
|
14650
14696
|
getSpacingFromNextModifier() {
|
|
14651
|
-
return
|
|
14697
|
+
return this.spacingFromNextModifier;
|
|
14652
14698
|
}
|
|
14653
14699
|
/**
|
|
14654
14700
|
* Shift modifier `x` pixels in the direction of the modifier. Negative values
|
|
@@ -14674,12 +14720,14 @@ class Modifier extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
14674
14720
|
throw new _util__WEBPACK_IMPORTED_MODULE_2__.RuntimeError('NotImplemented', 'draw() not implemented for this modifier.');
|
|
14675
14721
|
}
|
|
14676
14722
|
// aligns sub notes of NoteSubGroup (or GraceNoteGroup) to the main note with correct x-offset
|
|
14677
|
-
alignSubNotesWithNote(subNotes, note) {
|
|
14723
|
+
alignSubNotesWithNote(subNotes, note, position = Modifier.Position.LEFT) {
|
|
14678
14724
|
// Shift over the tick contexts of each note
|
|
14679
14725
|
const tickContext = note.getTickContext();
|
|
14680
14726
|
const metrics = tickContext.getMetrics();
|
|
14681
14727
|
const stave = note.getStave();
|
|
14682
|
-
const subNoteXOffset =
|
|
14728
|
+
const subNoteXOffset = position === Modifier.Position.RIGHT
|
|
14729
|
+
? tickContext.getX() + this.getSpacingFromNextModifier() * subNotes.length + 10
|
|
14730
|
+
: tickContext.getX() - metrics.modLeftPx - metrics.modRightPx + this.getSpacingFromNextModifier();
|
|
14683
14731
|
subNotes.forEach((subNote) => {
|
|
14684
14732
|
const subTickContext = subNote.getTickContext();
|
|
14685
14733
|
if (stave)
|
|
@@ -14688,7 +14736,6 @@ class Modifier extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
14688
14736
|
});
|
|
14689
14737
|
}
|
|
14690
14738
|
}
|
|
14691
|
-
_Modifier_spacingFromNextModifier = new WeakMap(), _Modifier_modifierContext = new WeakMap();
|
|
14692
14739
|
|
|
14693
14740
|
|
|
14694
14741
|
/***/ }),
|
|
@@ -14886,18 +14933,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
14886
14933
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
14887
14934
|
//
|
|
14888
14935
|
// 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
14936
|
|
|
14902
14937
|
|
|
14903
14938
|
|
|
@@ -14918,10 +14953,10 @@ class MultiMeasureRest extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
14918
14953
|
var _a;
|
|
14919
14954
|
super();
|
|
14920
14955
|
this.xs = { left: NaN, right: NaN };
|
|
14921
|
-
|
|
14922
|
-
|
|
14923
|
-
|
|
14924
|
-
|
|
14956
|
+
this.hasPaddingLeft = false;
|
|
14957
|
+
this.hasPaddingRight = false;
|
|
14958
|
+
this.hasLineThickness = false;
|
|
14959
|
+
this.hasSymbolSpacing = false;
|
|
14925
14960
|
const fontSize = (_a = options.numberGlyphPoint) !== null && _a !== void 0 ? _a : _metrics__WEBPACK_IMPORTED_MODULE_2__.Metrics.get('MultiMeasureRest.fontSize'); // same as TimeSignature.
|
|
14926
14961
|
this.fontInfo.size = fontSize;
|
|
14927
14962
|
this.numberOfMeasures = numberOfMeasures;
|
|
@@ -14932,10 +14967,10 @@ class MultiMeasureRest extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
14932
14967
|
this.text += String.fromCodePoint(0xe080 + Number(digit));
|
|
14933
14968
|
}
|
|
14934
14969
|
// Keep track of whether these four options were provided.
|
|
14935
|
-
|
|
14936
|
-
|
|
14937
|
-
|
|
14938
|
-
|
|
14970
|
+
this.hasPaddingLeft = typeof options.paddingLeft === 'number';
|
|
14971
|
+
this.hasPaddingRight = typeof options.paddingRight === 'number';
|
|
14972
|
+
this.hasLineThickness = typeof options.lineThickness === 'number';
|
|
14973
|
+
this.hasSymbolSpacing = typeof options.symbolSpacing === 'number';
|
|
14939
14974
|
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
14975
|
}
|
|
14941
14976
|
getXs() {
|
|
@@ -14961,7 +14996,11 @@ class MultiMeasureRest extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
14961
14996
|
const el = new _element__WEBPACK_IMPORTED_MODULE_0__.Element();
|
|
14962
14997
|
el.setText(txt);
|
|
14963
14998
|
// Add middle bars until the right padding is reached
|
|
14964
|
-
|
|
14999
|
+
const elWidth = el.getWidth();
|
|
15000
|
+
if (!elWidth) {
|
|
15001
|
+
throw new _util__WEBPACK_IMPORTED_MODULE_6__.RuntimeError('Cannot drawLine if width is 0');
|
|
15002
|
+
}
|
|
15003
|
+
for (let i = 1; (i + 2) * elWidth + left <= right; i++) {
|
|
14965
15004
|
txt += '\ue4f0'; /*restHBarMiddle*/
|
|
14966
15005
|
}
|
|
14967
15006
|
txt += '\ue4f1'; /*restHBarRight*/
|
|
@@ -15014,10 +15053,10 @@ class MultiMeasureRest extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
15014
15053
|
left -= begModifiers[0].getWidth();
|
|
15015
15054
|
}
|
|
15016
15055
|
const options = this.renderOptions;
|
|
15017
|
-
if (
|
|
15056
|
+
if (this.hasPaddingLeft) {
|
|
15018
15057
|
left = stave.getX() + options.paddingLeft;
|
|
15019
15058
|
}
|
|
15020
|
-
if (
|
|
15059
|
+
if (this.hasPaddingRight) {
|
|
15021
15060
|
right = stave.getX() + stave.getWidth() - options.paddingRight;
|
|
15022
15061
|
}
|
|
15023
15062
|
this.xs.left = left;
|
|
@@ -15033,7 +15072,6 @@ class MultiMeasureRest extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
15033
15072
|
}
|
|
15034
15073
|
}
|
|
15035
15074
|
}
|
|
15036
|
-
_MultiMeasureRest_hasPaddingLeft = new WeakMap(), _MultiMeasureRest_hasPaddingRight = new WeakMap(), _MultiMeasureRest_hasLineThickness = new WeakMap(), _MultiMeasureRest_hasSymbolSpacing = new WeakMap();
|
|
15037
15075
|
|
|
15038
15076
|
|
|
15039
15077
|
/***/ }),
|
|
@@ -15943,6 +15981,14 @@ class Note extends _tickable__WEBPACK_IMPORTED_MODULE_4__.Tickable {
|
|
|
15943
15981
|
getKeyProps() {
|
|
15944
15982
|
return this.keyProps;
|
|
15945
15983
|
}
|
|
15984
|
+
// Get the `BoundingBox` for the entire note
|
|
15985
|
+
getBoundingBox() {
|
|
15986
|
+
const boundingBox = super.getBoundingBox();
|
|
15987
|
+
for (let i = 0; i < this.modifiers.length; i++) {
|
|
15988
|
+
boundingBox.mergeWith(this.modifiers[i].getBoundingBox());
|
|
15989
|
+
}
|
|
15990
|
+
return boundingBox;
|
|
15991
|
+
}
|
|
15946
15992
|
}
|
|
15947
15993
|
|
|
15948
15994
|
|
|
@@ -15984,6 +16030,7 @@ class NoteHead extends _note__WEBPACK_IMPORTED_MODULE_0__.Note {
|
|
|
15984
16030
|
return _typeguard__WEBPACK_IMPORTED_MODULE_2__.Category.NoteHead;
|
|
15985
16031
|
}
|
|
15986
16032
|
constructor(noteStruct) {
|
|
16033
|
+
var _a;
|
|
15987
16034
|
super(noteStruct);
|
|
15988
16035
|
this.customGlyph = false;
|
|
15989
16036
|
// map notehead SMuFL codes to the corresponding SMuFL code with ledger line
|
|
@@ -16012,7 +16059,7 @@ class NoteHead extends _note__WEBPACK_IMPORTED_MODULE_0__.Note {
|
|
|
16012
16059
|
this.customGlyph = true;
|
|
16013
16060
|
this.text = noteStruct.customGlyphCode;
|
|
16014
16061
|
}
|
|
16015
|
-
this.setStyle(noteStruct.style);
|
|
16062
|
+
this.setStyle((_a = noteStruct.style) !== null && _a !== void 0 ? _a : {});
|
|
16016
16063
|
this.slashed = noteStruct.slashed || false;
|
|
16017
16064
|
this.renderOptions = Object.assign({}, this.renderOptions);
|
|
16018
16065
|
}
|
|
@@ -16063,11 +16110,15 @@ class NoteHead extends _note__WEBPACK_IMPORTED_MODULE_0__.Note {
|
|
|
16063
16110
|
}
|
|
16064
16111
|
/** Draw the notehead. */
|
|
16065
16112
|
draw() {
|
|
16113
|
+
var _a;
|
|
16066
16114
|
const ctx = this.checkContext();
|
|
16067
16115
|
this.setRendered();
|
|
16116
|
+
ctx.openGroup('notehead', this.getAttribute('id'));
|
|
16068
16117
|
L("Drawing note head '", this.noteType, this.duration, "' at", this.x, this.y);
|
|
16069
16118
|
this.x = this.getAbsoluteX();
|
|
16070
16119
|
this.renderText(ctx, 0, 0);
|
|
16120
|
+
(_a = this.parent) === null || _a === void 0 ? void 0 : _a.drawModifiers(this);
|
|
16121
|
+
ctx.closeGroup();
|
|
16071
16122
|
}
|
|
16072
16123
|
}
|
|
16073
16124
|
/** To enable logging for this class. Set `VexFlow.NoteHead.DEBUG` to `true`. */
|
|
@@ -16368,7 +16419,6 @@ class Ornament extends _modifier__WEBPACK_IMPORTED_MODULE_3__.Modifier {
|
|
|
16368
16419
|
const note = this.checkAttachedNote();
|
|
16369
16420
|
this.setRendered();
|
|
16370
16421
|
const stave = note.checkStave();
|
|
16371
|
-
this.applyStyle();
|
|
16372
16422
|
ctx.openGroup('ornament', this.getAttribute('id'));
|
|
16373
16423
|
// Get initial coordinates for the modifier position
|
|
16374
16424
|
const start = note.getModifierStartXY(this.position, this.index);
|
|
@@ -16424,7 +16474,6 @@ class Ornament extends _modifier__WEBPACK_IMPORTED_MODULE_3__.Modifier {
|
|
|
16424
16474
|
this.accidentalUpper.renderText(ctx, glyphX + this.xShift - this.accidentalUpper.getWidth() * 0.5, glyphY + this.yShift - this.accidentalUpper.getTextMetrics().actualBoundingBoxDescent);
|
|
16425
16475
|
}
|
|
16426
16476
|
ctx.closeGroup();
|
|
16427
|
-
this.restoreStyle();
|
|
16428
16477
|
}
|
|
16429
16478
|
}
|
|
16430
16479
|
/** To enable logging for this class. Set `VexFlow.Ornament.DEBUG` to `true`. */
|
|
@@ -16764,9 +16813,8 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
16764
16813
|
/* harmony import */ var _element__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./element */ "./src/element.ts");
|
|
16765
16814
|
/* harmony import */ var _glyphs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./glyphs */ "./src/glyphs.ts");
|
|
16766
16815
|
/* harmony import */ var _metrics__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./metrics */ "./src/metrics.ts");
|
|
16767
|
-
/* harmony import */ var
|
|
16768
|
-
/* harmony import */ var
|
|
16769
|
-
/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./util */ "./src/util.ts");
|
|
16816
|
+
/* harmony import */ var _typeguard__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./typeguard */ "./src/typeguard.ts");
|
|
16817
|
+
/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./util */ "./src/util.ts");
|
|
16770
16818
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
16771
16819
|
// MIT License
|
|
16772
16820
|
|
|
@@ -16774,22 +16822,10 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
16774
16822
|
|
|
16775
16823
|
|
|
16776
16824
|
|
|
16777
|
-
|
|
16778
16825
|
// eslint-disable-next-line
|
|
16779
16826
|
function L(...args) {
|
|
16780
16827
|
if (PedalMarking.DEBUG)
|
|
16781
|
-
(0,
|
|
16782
|
-
}
|
|
16783
|
-
/**
|
|
16784
|
-
* Draws a pedal glyph with the provided `name` on a rendering `context`
|
|
16785
|
-
* at the coordinates `x` and `y. Takes into account the glyph data
|
|
16786
|
-
* coordinate shifts.
|
|
16787
|
-
*/
|
|
16788
|
-
function drawPedalGlyph(name, ctx, x, y) {
|
|
16789
|
-
var _a;
|
|
16790
|
-
const glyph = new _element__WEBPACK_IMPORTED_MODULE_0__.Element(PedalMarking.CATEGORY);
|
|
16791
|
-
glyph.setText((_a = PedalMarking.GLYPHS[name]) !== null && _a !== void 0 ? _a : name);
|
|
16792
|
-
glyph.renderText(ctx, x - (glyph.getWidth() - _tables__WEBPACK_IMPORTED_MODULE_3__.Tables.STAVE_LINE_DISTANCE) / 2, y);
|
|
16828
|
+
(0,_util__WEBPACK_IMPORTED_MODULE_4__.log)('VexFlow.PedalMarking', args);
|
|
16793
16829
|
}
|
|
16794
16830
|
/**
|
|
16795
16831
|
* PedalMarking implements different types of pedal markings. These notation
|
|
@@ -16800,7 +16836,7 @@ function drawPedalGlyph(name, ctx, x, y) {
|
|
|
16800
16836
|
*/
|
|
16801
16837
|
class PedalMarking extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
16802
16838
|
static get CATEGORY() {
|
|
16803
|
-
return
|
|
16839
|
+
return _typeguard__WEBPACK_IMPORTED_MODULE_3__.Category.PedalMarking;
|
|
16804
16840
|
}
|
|
16805
16841
|
/**
|
|
16806
16842
|
* Create a sustain pedal marking. Returns the defaults PedalMarking.
|
|
@@ -16829,9 +16865,9 @@ class PedalMarking extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
16829
16865
|
this.notes = notes;
|
|
16830
16866
|
this.type = PedalMarking.type.TEXT;
|
|
16831
16867
|
this.line = 0;
|
|
16832
|
-
//
|
|
16833
|
-
this.
|
|
16834
|
-
this.
|
|
16868
|
+
// Text for the release/depress markings
|
|
16869
|
+
this.depressText = PedalMarking.GLYPHS.pedalDepress;
|
|
16870
|
+
this.releaseText = PedalMarking.GLYPHS.pedalRelease;
|
|
16835
16871
|
this.renderOptions = {
|
|
16836
16872
|
bracketHeight: 10,
|
|
16837
16873
|
textMarginRight: 6,
|
|
@@ -16852,8 +16888,9 @@ class PedalMarking extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
16852
16888
|
* set if the parameter is falsy.
|
|
16853
16889
|
*/
|
|
16854
16890
|
setCustomText(depress, release) {
|
|
16855
|
-
this.
|
|
16856
|
-
this.
|
|
16891
|
+
this.depressText = depress || '';
|
|
16892
|
+
this.releaseText = release || '';
|
|
16893
|
+
this.setFont(_metrics__WEBPACK_IMPORTED_MODULE_2__.Metrics.getFontInfo('PedalMarking.text'));
|
|
16857
16894
|
return this;
|
|
16858
16895
|
}
|
|
16859
16896
|
/** Set the staff line to render the markings on. */
|
|
@@ -16867,8 +16904,10 @@ class PedalMarking extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
16867
16904
|
let isPedalDepressed = false;
|
|
16868
16905
|
let prevX;
|
|
16869
16906
|
let prevY;
|
|
16907
|
+
let textWidth = 0;
|
|
16870
16908
|
// Iterate through each note
|
|
16871
16909
|
this.notes.forEach((note, index, notes) => {
|
|
16910
|
+
var _a, _b, _c, _d;
|
|
16872
16911
|
// Each note triggers the opposite pedal action
|
|
16873
16912
|
isPedalDepressed = !isPedalDepressed;
|
|
16874
16913
|
// Get the initial coordinates for the note
|
|
@@ -16876,7 +16915,7 @@ class PedalMarking extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
16876
16915
|
const y = note.checkStave().getYForBottomText(this.line + 3);
|
|
16877
16916
|
// Throw if current note is positioned before the previous note
|
|
16878
16917
|
if (x < prevX) {
|
|
16879
|
-
throw new
|
|
16918
|
+
throw new _util__WEBPACK_IMPORTED_MODULE_4__.RuntimeError('InvalidConfiguration', 'The notes provided must be in order of ascending x positions');
|
|
16880
16919
|
}
|
|
16881
16920
|
// Determine if the previous or next note are the same
|
|
16882
16921
|
// as the current note. We need to keep track of this for
|
|
@@ -16889,17 +16928,10 @@ class PedalMarking extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
16889
16928
|
xShift = prevNoteIsSame ? 5 : 0;
|
|
16890
16929
|
if (this.type === PedalMarking.type.MIXED && !prevNoteIsSame) {
|
|
16891
16930
|
// For MIXED style, start with text instead of bracket
|
|
16892
|
-
|
|
16893
|
-
|
|
16894
|
-
|
|
16895
|
-
|
|
16896
|
-
xShift = textWidth / 2 + this.renderOptions.textMarginRight;
|
|
16897
|
-
}
|
|
16898
|
-
else {
|
|
16899
|
-
// Render the Ped glyph in position
|
|
16900
|
-
drawPedalGlyph('pedalDepress', ctx, x, y);
|
|
16901
|
-
xShift = 20 + this.renderOptions.textMarginRight;
|
|
16902
|
-
}
|
|
16931
|
+
textWidth = ctx.measureText(this.depressText).width;
|
|
16932
|
+
ctx.fillText(this.depressText, x, y);
|
|
16933
|
+
// Adjust the xShift for the next note
|
|
16934
|
+
xShift = textWidth + this.renderOptions.textMarginRight;
|
|
16903
16935
|
}
|
|
16904
16936
|
else {
|
|
16905
16937
|
// Draw start bracket
|
|
@@ -16911,13 +16943,21 @@ class PedalMarking extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
16911
16943
|
}
|
|
16912
16944
|
}
|
|
16913
16945
|
else {
|
|
16914
|
-
//
|
|
16915
|
-
|
|
16946
|
+
// Get the current note index and the total notes in the associated voice
|
|
16947
|
+
const noteNdx = note.getVoice().getTickables().indexOf(note);
|
|
16948
|
+
const voiceNotes = note.getVoice().getTickables().length;
|
|
16949
|
+
// Get the absolute x position of the end of the current note
|
|
16950
|
+
const noteEndX = noteNdx + 1 < voiceNotes
|
|
16951
|
+
? // If the next note is in the same voice, use the x position of the next note
|
|
16952
|
+
note.getVoice().getTickables()[noteNdx + 1].getAbsoluteX()
|
|
16953
|
+
: // If this is the last note is the voice, use the x position of the next stave
|
|
16954
|
+
((_b = (_a = note.getStave()) === null || _a === void 0 ? void 0 : _a.getX()) !== null && _b !== void 0 ? _b : 0) + ((_d = (_c = note.getStave()) === null || _c === void 0 ? void 0 : _c.getWidth()) !== null && _d !== void 0 ? _d : 0);
|
|
16916
16955
|
// Draw end bracket
|
|
16917
16956
|
ctx.beginPath();
|
|
16918
16957
|
ctx.moveTo(prevX, prevY);
|
|
16919
|
-
ctx.lineTo(x
|
|
16920
|
-
|
|
16958
|
+
ctx.lineTo(nextNoteIsSame ? x - 5 : noteEndX - 5, y);
|
|
16959
|
+
// No shift if next note is the same
|
|
16960
|
+
ctx.lineTo(nextNoteIsSame ? x : noteEndX - 5, y - this.renderOptions.bracketHeight);
|
|
16921
16961
|
ctx.stroke();
|
|
16922
16962
|
ctx.closePath();
|
|
16923
16963
|
}
|
|
@@ -16933,30 +16973,29 @@ class PedalMarking extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
16933
16973
|
drawText() {
|
|
16934
16974
|
const ctx = this.checkContext();
|
|
16935
16975
|
let isPedalDepressed = false;
|
|
16976
|
+
let textWidth = 0;
|
|
16936
16977
|
// Iterate through each note, placing glyphs or custom text accordingly
|
|
16937
16978
|
this.notes.forEach((note) => {
|
|
16979
|
+
var _a, _b, _c, _d;
|
|
16938
16980
|
isPedalDepressed = !isPedalDepressed;
|
|
16939
16981
|
const stave = note.checkStave();
|
|
16940
16982
|
const x = note.getAbsoluteX();
|
|
16941
16983
|
const y = stave.getYForBottomText(this.line + 3);
|
|
16942
|
-
let textWidth = 0;
|
|
16943
16984
|
if (isPedalDepressed) {
|
|
16944
|
-
|
|
16945
|
-
|
|
16946
|
-
ctx.fillText(this.customDepressText, x - textWidth / 2, y);
|
|
16947
|
-
}
|
|
16948
|
-
else {
|
|
16949
|
-
drawPedalGlyph('pedalDepress', ctx, x, y);
|
|
16950
|
-
}
|
|
16985
|
+
textWidth = ctx.measureText(this.depressText).width;
|
|
16986
|
+
ctx.fillText(this.depressText, x, y);
|
|
16951
16987
|
}
|
|
16952
16988
|
else {
|
|
16953
|
-
|
|
16954
|
-
|
|
16955
|
-
|
|
16956
|
-
|
|
16957
|
-
|
|
16958
|
-
|
|
16959
|
-
|
|
16989
|
+
const noteNdx = note.getVoice().getTickables().indexOf(note);
|
|
16990
|
+
const voiceNotes = note.getVoice().getTickables().length;
|
|
16991
|
+
// Get the shift for the next note
|
|
16992
|
+
const noteEndX = noteNdx + 1 < voiceNotes
|
|
16993
|
+
? // If the next note is in the same voice, use the x position of the next note
|
|
16994
|
+
note.getVoice().getTickables()[noteNdx + 1].getAbsoluteX()
|
|
16995
|
+
: // If this is the last note is the voice, use the x position of the next stave
|
|
16996
|
+
((_b = (_a = note.getStave()) === null || _a === void 0 ? void 0 : _a.getX()) !== null && _b !== void 0 ? _b : 0) + ((_d = (_c = note.getStave()) === null || _c === void 0 ? void 0 : _c.getWidth()) !== null && _d !== void 0 ? _d : 0);
|
|
16997
|
+
textWidth = ctx.measureText(this.releaseText).width;
|
|
16998
|
+
ctx.fillText(this.releaseText, noteEndX - textWidth, y);
|
|
16960
16999
|
}
|
|
16961
17000
|
});
|
|
16962
17001
|
}
|
|
@@ -16964,10 +17003,9 @@ class PedalMarking extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
16964
17003
|
draw() {
|
|
16965
17004
|
const ctx = this.checkContext();
|
|
16966
17005
|
this.setRendered();
|
|
16967
|
-
ctx.save();
|
|
16968
17006
|
ctx.setStrokeStyle(this.renderOptions.color);
|
|
16969
17007
|
ctx.setFillStyle(this.renderOptions.color);
|
|
16970
|
-
ctx.setFont(
|
|
17008
|
+
ctx.setFont(this.font);
|
|
16971
17009
|
L('Rendering Pedal Marking');
|
|
16972
17010
|
if (this.type === PedalMarking.type.BRACKET || this.type === PedalMarking.type.MIXED) {
|
|
16973
17011
|
ctx.setLineWidth(this.renderOptions.bracketLineWidth);
|
|
@@ -16976,7 +17014,6 @@ class PedalMarking extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
16976
17014
|
else if (this.type === PedalMarking.type.TEXT) {
|
|
16977
17015
|
this.drawText();
|
|
16978
17016
|
}
|
|
16979
|
-
ctx.restore();
|
|
16980
17017
|
}
|
|
16981
17018
|
}
|
|
16982
17019
|
/** To enable logging for this class. Set `VexFlow.PedalMarking.DEBUG` to `true`. */
|
|
@@ -17032,18 +17069,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
17032
17069
|
// Once an element is registered, selected attributes are tracked and indexed by
|
|
17033
17070
|
// the registry. This allows fast look up of elements by attributes like id, type,
|
|
17034
17071
|
// 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
17072
|
|
|
17048
17073
|
// Indexes are represented as maps of maps of maps. This allows
|
|
17049
17074
|
// for both multi-labeling (e.g., an element can have multiple classes)
|
|
@@ -17057,15 +17082,15 @@ class Index {
|
|
|
17057
17082
|
}
|
|
17058
17083
|
class Registry {
|
|
17059
17084
|
static getDefaultRegistry() {
|
|
17060
|
-
return
|
|
17085
|
+
return Registry.defaultRegistry;
|
|
17061
17086
|
}
|
|
17062
17087
|
// If you call `enableDefaultRegistry`, any new elements will auto-register with
|
|
17063
17088
|
// the provided registry as soon as they're constructed.
|
|
17064
17089
|
static enableDefaultRegistry(registry) {
|
|
17065
|
-
|
|
17090
|
+
Registry.defaultRegistry = registry;
|
|
17066
17091
|
}
|
|
17067
17092
|
static disableDefaultRegistry() {
|
|
17068
|
-
|
|
17093
|
+
Registry.defaultRegistry = undefined;
|
|
17069
17094
|
}
|
|
17070
17095
|
constructor() {
|
|
17071
17096
|
this.index = new Index();
|
|
@@ -17112,8 +17137,8 @@ class Registry {
|
|
|
17112
17137
|
return this;
|
|
17113
17138
|
}
|
|
17114
17139
|
getElementById(id) {
|
|
17115
|
-
var
|
|
17116
|
-
return (
|
|
17140
|
+
var _a, _b;
|
|
17141
|
+
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
17142
|
}
|
|
17118
17143
|
getElementsByAttribute(attribute, value) {
|
|
17119
17144
|
const indexAttr = this.index[attribute];
|
|
@@ -17142,8 +17167,6 @@ class Registry {
|
|
|
17142
17167
|
return this;
|
|
17143
17168
|
}
|
|
17144
17169
|
}
|
|
17145
|
-
_a = Registry;
|
|
17146
|
-
_Registry_defaultRegistry = { value: void 0 };
|
|
17147
17170
|
|
|
17148
17171
|
|
|
17149
17172
|
/***/ }),
|
|
@@ -17464,7 +17487,7 @@ class Stave extends _element__WEBPACK_IMPORTED_MODULE_2__.Element {
|
|
|
17464
17487
|
this.measure = 0;
|
|
17465
17488
|
this.clef = 'treble';
|
|
17466
17489
|
this.endClef = undefined;
|
|
17467
|
-
this.options = Object.assign({ verticalBarWidth: 10, numLines: 5,
|
|
17490
|
+
this.options = Object.assign({ verticalBarWidth: 10, numLines: 5, leftBar: true, rightBar: true, spacingBetweenLinesPx: _tables__WEBPACK_IMPORTED_MODULE_12__.Tables.STAVE_LINE_DISTANCE, spaceAboveStaffLn: 4, spaceBelowStaffLn: 4, topTextPosition: 1, bottomTextPosition: 4, lineConfig: [] }, options);
|
|
17468
17491
|
this.bounds = { x: this.x, y: this.y, w: this.width, h: 0 };
|
|
17469
17492
|
this.defaultLedgerLineStyle = { strokeStyle: '#444', lineWidth: 1.4 };
|
|
17470
17493
|
this.resetLines();
|
|
@@ -17523,10 +17546,12 @@ class Stave extends _element__WEBPACK_IMPORTED_MODULE_2__.Element {
|
|
|
17523
17546
|
return this;
|
|
17524
17547
|
}
|
|
17525
17548
|
getTopLineTopY() {
|
|
17526
|
-
|
|
17549
|
+
var _a;
|
|
17550
|
+
return this.getYForLine(0) - ((_a = this.getStyle().lineWidth) !== null && _a !== void 0 ? _a : 1) / 2;
|
|
17527
17551
|
}
|
|
17528
17552
|
getBottomLineBottomY() {
|
|
17529
|
-
|
|
17553
|
+
var _a;
|
|
17554
|
+
return this.getYForLine(this.getNumLines() - 1) + ((_a = this.getStyle().lineWidth) !== null && _a !== void 0 ? _a : 1) / 2;
|
|
17530
17555
|
}
|
|
17531
17556
|
setX(x) {
|
|
17532
17557
|
const shift = x - this.x;
|
|
@@ -17548,9 +17573,6 @@ class Stave extends _element__WEBPACK_IMPORTED_MODULE_2__.Element {
|
|
|
17548
17573
|
// this.modifiers[1].setX(this.endX);
|
|
17549
17574
|
return this;
|
|
17550
17575
|
}
|
|
17551
|
-
getStyle() {
|
|
17552
|
-
return Object.assign({ fillStyle: this.options.fillStyle, strokeStyle: this.options.fillStyle, lineWidth: _tables__WEBPACK_IMPORTED_MODULE_12__.Tables.STAVE_LINE_THICKNESS }, super.getStyle());
|
|
17553
|
-
}
|
|
17554
17576
|
/**
|
|
17555
17577
|
* Set the measure number of this Stave.
|
|
17556
17578
|
*/
|
|
@@ -17602,11 +17624,11 @@ class Stave extends _element__WEBPACK_IMPORTED_MODULE_2__.Element {
|
|
|
17602
17624
|
}
|
|
17603
17625
|
// Section functions
|
|
17604
17626
|
setSection(section, y, xOffset = 0, fontSize, drawRect = true) {
|
|
17605
|
-
const staveSection = new _stavesection__WEBPACK_IMPORTED_MODULE_8__.StaveSection(section
|
|
17627
|
+
const staveSection = new _stavesection__WEBPACK_IMPORTED_MODULE_8__.StaveSection(section).setYShift(y).setXShift(xOffset).setDrawRect(drawRect);
|
|
17606
17628
|
if (fontSize) {
|
|
17607
17629
|
staveSection.setFontSize(fontSize);
|
|
17608
17630
|
}
|
|
17609
|
-
this.
|
|
17631
|
+
this.addModifier(staveSection);
|
|
17610
17632
|
return this;
|
|
17611
17633
|
}
|
|
17612
17634
|
// Tempo functions
|
|
@@ -17838,7 +17860,7 @@ class Stave extends _element__WEBPACK_IMPORTED_MODULE_2__.Element {
|
|
|
17838
17860
|
const noPosition = position === undefined;
|
|
17839
17861
|
const noCategory = category === undefined;
|
|
17840
17862
|
if (noPosition && noCategory) {
|
|
17841
|
-
return this.modifiers;
|
|
17863
|
+
return this.modifiers; // Should this be [...this.modifiers]?
|
|
17842
17864
|
}
|
|
17843
17865
|
else if (noPosition) {
|
|
17844
17866
|
// A category was provided.
|
|
@@ -17920,7 +17942,7 @@ class Stave extends _element__WEBPACK_IMPORTED_MODULE_2__.Element {
|
|
|
17920
17942
|
widths.right = (_a = layoutMetrics.xMax) !== null && _a !== void 0 ? _a : 0;
|
|
17921
17943
|
widths.paddingRight = (_b = layoutMetrics.paddingRight) !== null && _b !== void 0 ? _b : 0;
|
|
17922
17944
|
}
|
|
17923
|
-
widths.left = (_c =
|
|
17945
|
+
widths.left = -((_c = layoutMetrics.xMin) !== null && _c !== void 0 ? _c : 0);
|
|
17924
17946
|
widths.paddingLeft = (_d = layoutMetrics.paddingLeft) !== null && _d !== void 0 ? _d : 0;
|
|
17925
17947
|
if (i === endModifiers.length - 1) {
|
|
17926
17948
|
widths.paddingLeft = 0;
|
|
@@ -17950,7 +17972,6 @@ class Stave extends _element__WEBPACK_IMPORTED_MODULE_2__.Element {
|
|
|
17950
17972
|
draw() {
|
|
17951
17973
|
const ctx = this.checkContext();
|
|
17952
17974
|
this.setRendered();
|
|
17953
|
-
this.applyStyle();
|
|
17954
17975
|
ctx.openGroup('stave', this.getAttribute('id'));
|
|
17955
17976
|
if (!this.formatted)
|
|
17956
17977
|
this.format();
|
|
@@ -17969,27 +17990,20 @@ class Stave extends _element__WEBPACK_IMPORTED_MODULE_2__.Element {
|
|
|
17969
17990
|
}
|
|
17970
17991
|
}
|
|
17971
17992
|
ctx.closeGroup();
|
|
17972
|
-
this.restoreStyle();
|
|
17973
17993
|
// Draw the modifiers (bar lines, coda, segno, repeat brackets, etc.)
|
|
17974
17994
|
for (let i = 0; i < this.modifiers.length; i++) {
|
|
17975
17995
|
const modifier = this.modifiers[i];
|
|
17976
|
-
|
|
17977
|
-
|
|
17978
|
-
|
|
17979
|
-
modifier.draw(this, this.getModifierXShift(i));
|
|
17980
|
-
modifier.restoreStyle(ctx);
|
|
17981
|
-
}
|
|
17996
|
+
modifier.setContext(ctx);
|
|
17997
|
+
modifier.setStave(this);
|
|
17998
|
+
modifier.drawWithStyle();
|
|
17982
17999
|
}
|
|
17983
18000
|
// Render measure numbers
|
|
17984
18001
|
if (this.measure > 0) {
|
|
17985
|
-
ctx.save();
|
|
17986
18002
|
ctx.setFont(this.fontInfo);
|
|
17987
18003
|
const textWidth = ctx.measureText('' + this.measure).width;
|
|
17988
18004
|
y = this.getYForTopText(0) + 3;
|
|
17989
18005
|
ctx.fillText('' + this.measure, this.x - textWidth / 2, y);
|
|
17990
|
-
ctx.restore();
|
|
17991
18006
|
}
|
|
17992
|
-
return this;
|
|
17993
18007
|
}
|
|
17994
18008
|
getVerticalBarWidth() {
|
|
17995
18009
|
return this.options.verticalBarWidth;
|
|
@@ -18036,7 +18050,6 @@ class Stave extends _element__WEBPACK_IMPORTED_MODULE_2__.Element {
|
|
|
18036
18050
|
}
|
|
18037
18051
|
// Make sure the defaults are present in case an incomplete set of
|
|
18038
18052
|
// configuration options were supplied.
|
|
18039
|
-
// eslint-disable-next-line
|
|
18040
18053
|
for (const lineConfig in linesConfiguration) {
|
|
18041
18054
|
// Allow '{}' to be used if the caller just wants the default for a particular node.
|
|
18042
18055
|
if (linesConfiguration[lineConfig].visible === undefined) {
|
|
@@ -18247,10 +18260,10 @@ class Barline extends _stavemodifier__WEBPACK_IMPORTED_MODULE_0__.StaveModifier
|
|
|
18247
18260
|
return this;
|
|
18248
18261
|
}
|
|
18249
18262
|
// Draw barlines
|
|
18250
|
-
draw(
|
|
18263
|
+
draw() {
|
|
18264
|
+
const stave = this.checkStave();
|
|
18251
18265
|
const ctx = stave.checkContext();
|
|
18252
18266
|
this.setRendered();
|
|
18253
|
-
this.applyStyle(ctx);
|
|
18254
18267
|
ctx.openGroup('stavebarline', this.getAttribute('id'));
|
|
18255
18268
|
switch (this.type) {
|
|
18256
18269
|
case BarlineType.SINGLE:
|
|
@@ -18282,7 +18295,6 @@ class Barline extends _stavemodifier__WEBPACK_IMPORTED_MODULE_0__.StaveModifier
|
|
|
18282
18295
|
break;
|
|
18283
18296
|
}
|
|
18284
18297
|
ctx.closeGroup();
|
|
18285
|
-
this.restoreStyle(ctx);
|
|
18286
18298
|
}
|
|
18287
18299
|
drawVerticalBar(stave, x, doubleBar) {
|
|
18288
18300
|
const staveCtx = stave.checkContext();
|
|
@@ -18643,7 +18655,7 @@ class StaveHairpin extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
18643
18655
|
.setContext(ctx)
|
|
18644
18656
|
.setRenderOptions(hairpinOptions)
|
|
18645
18657
|
.setPosition(position)
|
|
18646
|
-
.
|
|
18658
|
+
.drawWithStyle();
|
|
18647
18659
|
}
|
|
18648
18660
|
/**
|
|
18649
18661
|
* Create a new hairpin from the specified notes.
|
|
@@ -18956,7 +18968,6 @@ class StaveLine extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
18956
18968
|
const firstNote = this.firstNote;
|
|
18957
18969
|
const lastNote = this.lastNote;
|
|
18958
18970
|
const renderOptions = this.renderOptions;
|
|
18959
|
-
ctx.save();
|
|
18960
18971
|
this.applyLineStyle();
|
|
18961
18972
|
// Cycle through each set of indexes and draw lines
|
|
18962
18973
|
let startPosition = { x: 0, y: 0 };
|
|
@@ -18986,7 +18997,6 @@ class StaveLine extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
18986
18997
|
endPosition.y += upwardsSlope ? 2 : 0;
|
|
18987
18998
|
this.drawArrowLine(ctx, startPosition, endPosition);
|
|
18988
18999
|
});
|
|
18989
|
-
ctx.restore();
|
|
18990
19000
|
// Determine the x coordinate where to start the text
|
|
18991
19001
|
const textWidth = this.width;
|
|
18992
19002
|
const justification = renderOptions.textJustification;
|
|
@@ -19015,8 +19025,6 @@ class StaveLine extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
19015
19025
|
const color = renderOptions.color;
|
|
19016
19026
|
this.applyStyle(ctx, { fillStyle: color, strokeStyle: color });
|
|
19017
19027
|
this.renderText(ctx, x, y);
|
|
19018
|
-
this.restoreStyle(ctx);
|
|
19019
|
-
return this;
|
|
19020
19028
|
}
|
|
19021
19029
|
}
|
|
19022
19030
|
// Text Positioning
|
|
@@ -19103,10 +19111,6 @@ class StaveModifier extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
19103
19111
|
getLayoutMetrics() {
|
|
19104
19112
|
return this.layoutMetrics;
|
|
19105
19113
|
}
|
|
19106
|
-
// eslint-disable-next-line
|
|
19107
|
-
draw(...args) {
|
|
19108
|
-
// DO NOTHING.
|
|
19109
|
-
}
|
|
19110
19114
|
}
|
|
19111
19115
|
|
|
19112
19116
|
|
|
@@ -19142,18 +19146,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
19142
19146
|
// and a "key" refers to a specific pitch/notehead within a note.
|
|
19143
19147
|
//
|
|
19144
19148
|
// 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
19149
|
|
|
19158
19150
|
|
|
19159
19151
|
|
|
@@ -19205,7 +19197,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19205
19197
|
const notesList = [];
|
|
19206
19198
|
for (let i = 0; i < notes.length; i++) {
|
|
19207
19199
|
// Formatting uses sortedKeyProps to calculate line and minL.
|
|
19208
|
-
const props =
|
|
19200
|
+
const props = notes[i].sortedKeyProps;
|
|
19209
19201
|
const line = props[0].keyProps.line;
|
|
19210
19202
|
let minL = props[props.length - 1].keyProps.line;
|
|
19211
19203
|
const stemDirection = notes[i].getStemDirection();
|
|
@@ -19215,10 +19207,10 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19215
19207
|
if (notes[i].isRest()) {
|
|
19216
19208
|
maxL =
|
|
19217
19209
|
line +
|
|
19218
|
-
Math.ceil(
|
|
19210
|
+
Math.ceil(notes[i]._noteHeads[0].getTextMetrics().actualBoundingBoxAscent / _tables__WEBPACK_IMPORTED_MODULE_8__.Tables.STAVE_LINE_DISTANCE);
|
|
19219
19211
|
minL =
|
|
19220
19212
|
line -
|
|
19221
|
-
Math.ceil(
|
|
19213
|
+
Math.ceil(notes[i]._noteHeads[0].getTextMetrics().actualBoundingBoxDescent / _tables__WEBPACK_IMPORTED_MODULE_8__.Tables.STAVE_LINE_DISTANCE);
|
|
19222
19214
|
}
|
|
19223
19215
|
else {
|
|
19224
19216
|
maxL =
|
|
@@ -19305,8 +19297,8 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19305
19297
|
//If we are sharing a line and in the same voice, only then offset one note
|
|
19306
19298
|
const lineDiff = Math.abs(noteU.line - noteL.line);
|
|
19307
19299
|
if (noteU.note.hasStem() && noteL.note.hasStem()) {
|
|
19308
|
-
const noteUHead =
|
|
19309
|
-
const noteLHead =
|
|
19300
|
+
const noteUHead = noteU.note.sortedKeyProps[0].keyProps.code;
|
|
19301
|
+
const noteLHead = noteL.note.sortedKeyProps[noteL.note.sortedKeyProps.length - 1].keyProps.code;
|
|
19310
19302
|
if (
|
|
19311
19303
|
// If unison is not configured, shift
|
|
19312
19304
|
!_tables__WEBPACK_IMPORTED_MODULE_8__.Tables.UNISON ||
|
|
@@ -19461,9 +19453,8 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19461
19453
|
// INSTANCE MEMBERS
|
|
19462
19454
|
this.minLine = 0;
|
|
19463
19455
|
this.maxLine = 0;
|
|
19464
|
-
_StaveNote_noteHeads.set(this, void 0);
|
|
19465
19456
|
// Sorted variant of keyProps used internally.
|
|
19466
|
-
|
|
19457
|
+
this.sortedKeyProps = [];
|
|
19467
19458
|
this.ledgerLineStyle = {};
|
|
19468
19459
|
this.clef = (_a = noteStruct.clef) !== null && _a !== void 0 ? _a : 'treble';
|
|
19469
19460
|
this.octaveShift = (_b = noteStruct.octaveShift) !== null && _b !== void 0 ? _b : 0;
|
|
@@ -19476,7 +19467,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19476
19467
|
// for displaced ledger lines
|
|
19477
19468
|
this.useDefaultHeadX = false;
|
|
19478
19469
|
// Drawing
|
|
19479
|
-
|
|
19470
|
+
this._noteHeads = [];
|
|
19480
19471
|
this.modifiers = [];
|
|
19481
19472
|
this.renderOptions = Object.assign(Object.assign({}, this.renderOptions), {
|
|
19482
19473
|
// number of stroke px to the left and right of head
|
|
@@ -19496,9 +19487,9 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19496
19487
|
reset() {
|
|
19497
19488
|
super.reset();
|
|
19498
19489
|
// Save prior noteHead styles & reapply them after making new noteheads.
|
|
19499
|
-
const noteHeadStyles =
|
|
19490
|
+
const noteHeadStyles = this._noteHeads.map((noteHead) => noteHead.getStyle());
|
|
19500
19491
|
this.buildNoteHeads();
|
|
19501
|
-
|
|
19492
|
+
this._noteHeads.forEach((noteHead, index) => {
|
|
19502
19493
|
const noteHeadStyle = noteHeadStyles[index];
|
|
19503
19494
|
if (noteHeadStyle)
|
|
19504
19495
|
noteHead.setStyle(noteHeadStyle);
|
|
@@ -19521,12 +19512,12 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19521
19512
|
}
|
|
19522
19513
|
// Builds a `Stem` for the note
|
|
19523
19514
|
buildStem() {
|
|
19524
|
-
this.setStem(new _stem__WEBPACK_IMPORTED_MODULE_6__.Stem({ hide:
|
|
19515
|
+
this.setStem(new _stem__WEBPACK_IMPORTED_MODULE_6__.Stem({ hide: this.isRest() }));
|
|
19525
19516
|
return this;
|
|
19526
19517
|
}
|
|
19527
19518
|
// Builds a `NoteHead` for each key in the note
|
|
19528
19519
|
buildNoteHeads() {
|
|
19529
|
-
|
|
19520
|
+
this._noteHeads = [];
|
|
19530
19521
|
const stemDirection = this.getStemDirection();
|
|
19531
19522
|
const keys = this.getKeys();
|
|
19532
19523
|
let lastLine = undefined;
|
|
@@ -19549,7 +19540,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19549
19540
|
}
|
|
19550
19541
|
for (let i = start; i !== end; i += step) {
|
|
19551
19542
|
// Building noteheads rely on sortedKeNotes in order to calculate the displacements
|
|
19552
|
-
const noteProps =
|
|
19543
|
+
const noteProps = this.sortedKeyProps[i].keyProps;
|
|
19553
19544
|
const line = noteProps.line;
|
|
19554
19545
|
// Keep track of last line with a note head, so that consecutive heads
|
|
19555
19546
|
// are correctly displaced.
|
|
@@ -19576,10 +19567,10 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19576
19567
|
line: noteProps.line,
|
|
19577
19568
|
});
|
|
19578
19569
|
notehead.fontInfo = this.fontInfo;
|
|
19579
|
-
this.
|
|
19580
|
-
|
|
19570
|
+
this.addChild(notehead);
|
|
19571
|
+
this._noteHeads[this.sortedKeyProps[i].index] = notehead;
|
|
19581
19572
|
}
|
|
19582
|
-
return
|
|
19573
|
+
return this._noteHeads;
|
|
19583
19574
|
}
|
|
19584
19575
|
// Automatically sets the stem direction based on the keys in the note
|
|
19585
19576
|
autoStem() {
|
|
@@ -19588,8 +19579,8 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19588
19579
|
calculateOptimalStemDirection() {
|
|
19589
19580
|
// Figure out optimal stem direction based on given notes
|
|
19590
19581
|
// minLine & maxLine rely on sortedKeyProps
|
|
19591
|
-
this.minLine =
|
|
19592
|
-
this.maxLine =
|
|
19582
|
+
this.minLine = this.sortedKeyProps[0].keyProps.line;
|
|
19583
|
+
this.maxLine = this.sortedKeyProps[this.keyProps.length - 1].keyProps.line;
|
|
19593
19584
|
const MIDDLE_LINE = 3;
|
|
19594
19585
|
const decider = (this.minLine + this.maxLine) / 2;
|
|
19595
19586
|
const stemDirection = decider < MIDDLE_LINE ? _stem__WEBPACK_IMPORTED_MODULE_6__.Stem.UP : _stem__WEBPACK_IMPORTED_MODULE_6__.Stem.DOWN;
|
|
@@ -19621,7 +19612,8 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19621
19612
|
lastLine = line;
|
|
19622
19613
|
}
|
|
19623
19614
|
else {
|
|
19624
|
-
|
|
19615
|
+
// < 1 means == 0.5 (second) or 0.0 (unison)
|
|
19616
|
+
if (Math.abs(lastLine - line) < 1) {
|
|
19625
19617
|
this.displaced = true;
|
|
19626
19618
|
props.displaced = true;
|
|
19627
19619
|
// Have to mark the previous note as
|
|
@@ -19637,29 +19629,27 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19637
19629
|
// Sort the notes from lowest line to highest line in sortedKeyProps
|
|
19638
19630
|
// Warn no longer required as keyProps remains unsorted
|
|
19639
19631
|
this.keyProps.forEach((keyProps, index) => {
|
|
19640
|
-
|
|
19632
|
+
this.sortedKeyProps.push({ keyProps, index });
|
|
19641
19633
|
});
|
|
19642
|
-
|
|
19634
|
+
this.sortedKeyProps.sort((a, b) => a.keyProps.line - b.keyProps.line);
|
|
19643
19635
|
}
|
|
19644
19636
|
// Get the `BoundingBox` for the entire note
|
|
19645
19637
|
getBoundingBox() {
|
|
19646
19638
|
const boundingBox = new _boundingbox__WEBPACK_IMPORTED_MODULE_0__.BoundingBox(this.getAbsoluteX(), this.ys[0], 0, 0);
|
|
19647
|
-
|
|
19639
|
+
this._noteHeads.forEach((notehead) => {
|
|
19648
19640
|
boundingBox.mergeWith(notehead.getBoundingBox());
|
|
19649
19641
|
});
|
|
19650
19642
|
const { yTop, yBottom } = this.getNoteHeadBounds();
|
|
19651
|
-
// eslint-disable-next-line
|
|
19652
|
-
const noteStemHeight = this.stem.getHeight();
|
|
19653
|
-
const flagX = this.getStemX() - _tables__WEBPACK_IMPORTED_MODULE_8__.Tables.STEM_WIDTH / 2;
|
|
19654
|
-
const flagY = this.getStemDirection() === _stem__WEBPACK_IMPORTED_MODULE_6__.Stem.DOWN
|
|
19655
|
-
? yTop - noteStemHeight - this.flag.getTextMetrics().actualBoundingBoxDescent
|
|
19656
|
-
: yBottom - noteStemHeight + this.flag.getTextMetrics().actualBoundingBoxAscent;
|
|
19657
19643
|
if (!this.isRest() && this.hasStem()) {
|
|
19658
|
-
|
|
19644
|
+
const noteStemHeight = this.stem.getHeight();
|
|
19645
|
+
const stemY = this.getStemDirection() === _stem__WEBPACK_IMPORTED_MODULE_6__.Stem.DOWN
|
|
19646
|
+
? yTop - noteStemHeight - this.flag.getTextMetrics().actualBoundingBoxDescent
|
|
19647
|
+
: yBottom - noteStemHeight + this.flag.getTextMetrics().actualBoundingBoxAscent;
|
|
19648
|
+
boundingBox.mergeWith(new _boundingbox__WEBPACK_IMPORTED_MODULE_0__.BoundingBox(this.getAbsoluteX(), stemY, 0, 0));
|
|
19659
19649
|
}
|
|
19660
19650
|
if (this.hasFlag()) {
|
|
19661
19651
|
const bbFlag = this.flag.getBoundingBox();
|
|
19662
|
-
boundingBox.mergeWith(bbFlag
|
|
19652
|
+
boundingBox.mergeWith(bbFlag);
|
|
19663
19653
|
}
|
|
19664
19654
|
for (let i = 0; i < this.modifiers.length; i++) {
|
|
19665
19655
|
boundingBox.mergeWith(this.modifiers[i].getBoundingBox());
|
|
@@ -19729,7 +19719,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19729
19719
|
// `y` values to the `NoteHeads`.
|
|
19730
19720
|
setStave(stave) {
|
|
19731
19721
|
super.setStave(stave);
|
|
19732
|
-
const ys =
|
|
19722
|
+
const ys = this._noteHeads.map((notehead) => {
|
|
19733
19723
|
notehead.setStave(stave);
|
|
19734
19724
|
return notehead.getY();
|
|
19735
19725
|
});
|
|
@@ -19803,7 +19793,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19803
19793
|
}
|
|
19804
19794
|
// addtional y shifts for rests
|
|
19805
19795
|
let restShift = 0;
|
|
19806
|
-
switch (
|
|
19796
|
+
switch (this._noteHeads[index].getText()) {
|
|
19807
19797
|
case _glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.restDoubleWhole:
|
|
19808
19798
|
case _glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.restWhole:
|
|
19809
19799
|
restShift += 0.5;
|
|
@@ -19849,10 +19839,10 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19849
19839
|
return this.ledgerLineStyle;
|
|
19850
19840
|
}
|
|
19851
19841
|
setFlagStyle(style) {
|
|
19852
|
-
this.
|
|
19842
|
+
this.flag.setStyle(style);
|
|
19853
19843
|
}
|
|
19854
19844
|
getFlagStyle() {
|
|
19855
|
-
return this.
|
|
19845
|
+
return this.flag.getStyle();
|
|
19856
19846
|
}
|
|
19857
19847
|
/** Get the glyph width. */
|
|
19858
19848
|
getGlyphWidth() {
|
|
@@ -19863,7 +19853,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19863
19853
|
// `style` is an `object` with the following properties: `shadowColor`,
|
|
19864
19854
|
// `shadowBlur`, `fillStyle`, `strokeStyle`
|
|
19865
19855
|
setKeyStyle(index, style) {
|
|
19866
|
-
|
|
19856
|
+
this._noteHeads[index].setStyle(style);
|
|
19867
19857
|
return this;
|
|
19868
19858
|
}
|
|
19869
19859
|
setKeyLine(index, line) {
|
|
@@ -19941,7 +19931,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19941
19931
|
let lowestDisplacedLine;
|
|
19942
19932
|
let highestNonDisplacedLine = highestLine;
|
|
19943
19933
|
let lowestNonDisplacedLine = lowestLine;
|
|
19944
|
-
|
|
19934
|
+
this._noteHeads.forEach((notehead) => {
|
|
19945
19935
|
const line = notehead.getLine();
|
|
19946
19936
|
const y = notehead.getY();
|
|
19947
19937
|
yTop = Math.min(y, yTop);
|
|
@@ -19986,7 +19976,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
19986
19976
|
return xBegin + this.getGlyphWidth();
|
|
19987
19977
|
}
|
|
19988
19978
|
get noteHeads() {
|
|
19989
|
-
return
|
|
19979
|
+
return this._noteHeads.slice();
|
|
19990
19980
|
}
|
|
19991
19981
|
// Draw the ledger lines between the stave and the highest/lowest keys
|
|
19992
19982
|
drawLedgerLines() {
|
|
@@ -20020,6 +20010,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
20020
20010
|
ctx.stroke();
|
|
20021
20011
|
};
|
|
20022
20012
|
const style = Object.assign(Object.assign({}, stave.getDefaultLedgerLineStyle()), this.getLedgerLineStyle());
|
|
20013
|
+
ctx.save();
|
|
20023
20014
|
this.applyStyle(ctx, style);
|
|
20024
20015
|
// Draw ledger lines below the staff:
|
|
20025
20016
|
for (let line = 6; line <= highestLine; ++line) {
|
|
@@ -20033,7 +20024,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
20033
20024
|
const displaced = lowestDisplacedLine !== undefined && line >= lowestDisplacedLine;
|
|
20034
20025
|
drawLedgerLine(stave.getYForNote(line), normal, displaced);
|
|
20035
20026
|
}
|
|
20036
|
-
|
|
20027
|
+
ctx.restore();
|
|
20037
20028
|
}
|
|
20038
20029
|
// Draw all key modifiers
|
|
20039
20030
|
drawModifiers(noteheadParam) {
|
|
@@ -20041,13 +20032,10 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
20041
20032
|
for (let i = 0; i < this.modifiers.length; i++) {
|
|
20042
20033
|
const modifier = this.modifiers[i];
|
|
20043
20034
|
const index = modifier.checkIndex();
|
|
20044
|
-
const notehead =
|
|
20035
|
+
const notehead = this._noteHeads[index];
|
|
20045
20036
|
if (notehead === noteheadParam) {
|
|
20046
|
-
const noteheadStyle = notehead.getStyle();
|
|
20047
|
-
notehead.applyStyle(ctx, noteheadStyle);
|
|
20048
20037
|
modifier.setContext(ctx);
|
|
20049
20038
|
modifier.drawWithStyle();
|
|
20050
|
-
notehead.restoreStyle(ctx, noteheadStyle);
|
|
20051
20039
|
}
|
|
20052
20040
|
}
|
|
20053
20041
|
}
|
|
@@ -20065,7 +20053,6 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
20065
20053
|
}
|
|
20066
20054
|
if (this.shouldDrawFlag()) {
|
|
20067
20055
|
const { yTop, yBottom } = this.getNoteHeadBounds();
|
|
20068
|
-
// eslint-disable-next-line
|
|
20069
20056
|
const noteStemHeight = this.stem.getHeight();
|
|
20070
20057
|
const flagX = this.getStemX() - _tables__WEBPACK_IMPORTED_MODULE_8__.Tables.STEM_WIDTH / 2;
|
|
20071
20058
|
const flagY = this.getStemDirection() === _stem__WEBPACK_IMPORTED_MODULE_6__.Stem.DOWN
|
|
@@ -20074,21 +20061,14 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
20074
20061
|
: // Up stems are above the note head and have flags on the right.
|
|
20075
20062
|
yBottom - noteStemHeight + this.flag.getTextMetrics().actualBoundingBoxAscent;
|
|
20076
20063
|
// Draw the Flag
|
|
20077
|
-
this.
|
|
20078
|
-
this.flag.renderText(ctx, flagX, flagY);
|
|
20079
|
-
this.restoreStyle(ctx, this.flagStyle);
|
|
20064
|
+
this.flag.setContext(ctx).setX(flagX).setY(flagY).drawWithStyle();
|
|
20080
20065
|
}
|
|
20081
20066
|
}
|
|
20082
20067
|
// Draw the NoteHeads
|
|
20083
20068
|
drawNoteHeads() {
|
|
20084
20069
|
const ctx = this.checkContext();
|
|
20085
|
-
|
|
20086
|
-
notehead.
|
|
20087
|
-
ctx.openGroup('notehead', notehead.getAttribute('id'));
|
|
20088
|
-
notehead.setContext(ctx).draw();
|
|
20089
|
-
this.drawModifiers(notehead);
|
|
20090
|
-
ctx.closeGroup();
|
|
20091
|
-
notehead.restoreStyle(ctx);
|
|
20070
|
+
this._noteHeads.forEach((notehead) => {
|
|
20071
|
+
notehead.setContext(ctx).drawWithStyle();
|
|
20092
20072
|
});
|
|
20093
20073
|
}
|
|
20094
20074
|
drawStem(stemOptions) {
|
|
@@ -20105,7 +20085,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
20105
20085
|
this.stem.adjustHeightForFlag();
|
|
20106
20086
|
}
|
|
20107
20087
|
if (this.stem) {
|
|
20108
|
-
this.stem.setContext(ctx).
|
|
20088
|
+
this.stem.setContext(ctx).drawWithStyle();
|
|
20109
20089
|
}
|
|
20110
20090
|
}
|
|
20111
20091
|
/**
|
|
@@ -20158,7 +20138,7 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
20158
20138
|
const xBegin = this.getNoteHeadBeginX();
|
|
20159
20139
|
const shouldRenderStem = this.hasStem() && !this.beam;
|
|
20160
20140
|
// Format note head x positions
|
|
20161
|
-
|
|
20141
|
+
this._noteHeads.forEach((notehead) => notehead.setX(xBegin));
|
|
20162
20142
|
if (this.stem) {
|
|
20163
20143
|
// Format stem x positions
|
|
20164
20144
|
const stemX = this.getStemX();
|
|
@@ -20166,7 +20146,6 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
20166
20146
|
}
|
|
20167
20147
|
L('Rendering ', this.isChord() ? 'chord :' : 'note :', this.keys);
|
|
20168
20148
|
// Apply the overall style -- may be contradicted by local settings:
|
|
20169
|
-
this.applyStyle();
|
|
20170
20149
|
ctx.openGroup('stavenote', this.getAttribute('id'));
|
|
20171
20150
|
this.drawLedgerLines();
|
|
20172
20151
|
if (shouldRenderStem)
|
|
@@ -20176,11 +20155,9 @@ class StaveNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_7__.StemmableNot
|
|
|
20176
20155
|
const bb = this.getBoundingBox();
|
|
20177
20156
|
ctx.pointerRect(bb.getX(), bb.getY(), bb.getW(), bb.getH());
|
|
20178
20157
|
ctx.closeGroup();
|
|
20179
|
-
this.restoreStyle();
|
|
20180
20158
|
this.setRendered();
|
|
20181
20159
|
}
|
|
20182
20160
|
}
|
|
20183
|
-
_StaveNote_noteHeads = new WeakMap(), _StaveNote_sortedKeyProps = new WeakMap();
|
|
20184
20161
|
StaveNote.DEBUG = false;
|
|
20185
20162
|
|
|
20186
20163
|
|
|
@@ -20225,7 +20202,9 @@ class Repetition extends _stavemodifier__WEBPACK_IMPORTED_MODULE_2__.StaveModifi
|
|
|
20225
20202
|
this.yShift = y;
|
|
20226
20203
|
return this;
|
|
20227
20204
|
}
|
|
20228
|
-
draw(
|
|
20205
|
+
draw() {
|
|
20206
|
+
const stave = this.checkStave();
|
|
20207
|
+
const x = stave.getModifierXShift(this.getPosition());
|
|
20229
20208
|
this.setRendered();
|
|
20230
20209
|
switch (this.symbolType) {
|
|
20231
20210
|
case Repetition.type.CODA_RIGHT:
|
|
@@ -20267,7 +20246,6 @@ class Repetition extends _stavemodifier__WEBPACK_IMPORTED_MODULE_2__.StaveModifi
|
|
|
20267
20246
|
default:
|
|
20268
20247
|
break;
|
|
20269
20248
|
}
|
|
20270
|
-
return this;
|
|
20271
20249
|
}
|
|
20272
20250
|
drawCodaFixed(stave, x) {
|
|
20273
20251
|
const y = stave.getYForTopText(stave.getNumLines());
|
|
@@ -20339,48 +20317,47 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
20339
20317
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
20340
20318
|
/* harmony export */ StaveSection: () => (/* binding */ StaveSection)
|
|
20341
20319
|
/* harmony export */ });
|
|
20342
|
-
/* harmony import */ var
|
|
20343
|
-
/* harmony import */ var
|
|
20320
|
+
/* harmony import */ var _metrics__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./metrics */ "./src/metrics.ts");
|
|
20321
|
+
/* harmony import */ var _stavemodifier__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./stavemodifier */ "./src/stavemodifier.ts");
|
|
20322
|
+
/* harmony import */ var _typeguard__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./typeguard */ "./src/typeguard.ts");
|
|
20344
20323
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
20345
20324
|
// @author: Larry Kuhns 2011
|
|
20346
20325
|
|
|
20347
20326
|
|
|
20348
|
-
|
|
20327
|
+
|
|
20328
|
+
class StaveSection extends _stavemodifier__WEBPACK_IMPORTED_MODULE_1__.StaveModifier {
|
|
20349
20329
|
static get CATEGORY() {
|
|
20350
|
-
return
|
|
20330
|
+
return _typeguard__WEBPACK_IMPORTED_MODULE_2__.Category.StaveSection;
|
|
20351
20331
|
}
|
|
20352
|
-
constructor(section, x, yShift, drawRect = true) {
|
|
20332
|
+
constructor(section, x = 0, yShift = 0, drawRect = true) {
|
|
20353
20333
|
super();
|
|
20354
|
-
this.
|
|
20334
|
+
this.setText(section);
|
|
20355
20335
|
this.x = x;
|
|
20356
20336
|
this.yShift = yShift;
|
|
20357
20337
|
this.drawRect = drawRect;
|
|
20338
|
+
this.padding = _metrics__WEBPACK_IMPORTED_MODULE_0__.Metrics.get('StaveSection.padding');
|
|
20358
20339
|
}
|
|
20359
|
-
|
|
20360
|
-
this.
|
|
20340
|
+
setDrawRect(drawRect) {
|
|
20341
|
+
this.drawRect = drawRect;
|
|
20361
20342
|
return this;
|
|
20362
20343
|
}
|
|
20363
|
-
draw(
|
|
20364
|
-
const
|
|
20365
|
-
const padding = 2;
|
|
20344
|
+
draw() {
|
|
20345
|
+
const stave = this.checkStave();
|
|
20366
20346
|
const ctx = stave.checkContext();
|
|
20367
20347
|
this.setRendered();
|
|
20368
|
-
|
|
20369
|
-
ctx.setLineWidth(borderWidth);
|
|
20348
|
+
this.x = stave.getX() + stave.getModifierXShift(this.getPosition());
|
|
20370
20349
|
const headroom = -1 * this.textMetrics.actualBoundingBoxDescent;
|
|
20371
|
-
const width = this.width + 2 * padding; // add left & right padding
|
|
20372
|
-
const height = this.height + 2 * padding; // add top & bottom padding
|
|
20350
|
+
const width = this.width + 2 * this.padding; // add left & right padding
|
|
20351
|
+
const height = this.height + 2 * this.padding; // add top & bottom padding
|
|
20373
20352
|
// Seems to be a good default y
|
|
20374
20353
|
const y = stave.getYForTopText(1.5) + this.yShift;
|
|
20375
|
-
const x = this.x + xShift;
|
|
20354
|
+
const x = this.x + this.xShift;
|
|
20376
20355
|
if (this.drawRect) {
|
|
20377
20356
|
ctx.beginPath();
|
|
20378
20357
|
ctx.rect(x, y - height + headroom, width, height);
|
|
20379
20358
|
ctx.stroke();
|
|
20380
20359
|
}
|
|
20381
|
-
this.renderText(ctx, xShift + padding, y - padding);
|
|
20382
|
-
ctx.restore();
|
|
20383
|
-
return this;
|
|
20360
|
+
this.renderText(ctx, this.xShift + this.padding, y - this.padding);
|
|
20384
20361
|
}
|
|
20385
20362
|
}
|
|
20386
20363
|
|
|
@@ -20404,12 +20381,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
20404
20381
|
/* harmony import */ var _typeguard__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./typeguard */ "./src/typeguard.ts");
|
|
20405
20382
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
20406
20383
|
// @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
20384
|
|
|
20414
20385
|
|
|
20415
20386
|
|
|
@@ -20421,7 +20392,7 @@ class StaveTempo extends _stavemodifier__WEBPACK_IMPORTED_MODULE_3__.StaveModifi
|
|
|
20421
20392
|
}
|
|
20422
20393
|
constructor(tempo, x, shiftY) {
|
|
20423
20394
|
super();
|
|
20424
|
-
|
|
20395
|
+
this.durationToCode = {
|
|
20425
20396
|
'1/4': _glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.metNoteDoubleWholeSquare,
|
|
20426
20397
|
long: _glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.metNoteDoubleWholeSquare,
|
|
20427
20398
|
'1/2': _glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.metNoteDoubleWhole,
|
|
@@ -20451,7 +20422,7 @@ class StaveTempo extends _stavemodifier__WEBPACK_IMPORTED_MODULE_3__.StaveModifi
|
|
|
20451
20422
|
'512th': _glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.metNote512thUp,
|
|
20452
20423
|
1024: _glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.metNote1024thUp,
|
|
20453
20424
|
'1024th': _glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.metNote1024thUp,
|
|
20454
|
-
}
|
|
20425
|
+
};
|
|
20455
20426
|
this.tempo = tempo;
|
|
20456
20427
|
this.position = _stavemodifier__WEBPACK_IMPORTED_MODULE_3__.StaveModifierPosition.ABOVE;
|
|
20457
20428
|
this.x = x;
|
|
@@ -20462,7 +20433,9 @@ class StaveTempo extends _stavemodifier__WEBPACK_IMPORTED_MODULE_3__.StaveModifi
|
|
|
20462
20433
|
this.tempo = tempo;
|
|
20463
20434
|
return this;
|
|
20464
20435
|
}
|
|
20465
|
-
draw(
|
|
20436
|
+
draw() {
|
|
20437
|
+
const stave = this.checkStave();
|
|
20438
|
+
const shiftX = stave.getModifierXShift(this.getPosition());
|
|
20466
20439
|
const ctx = stave.checkContext();
|
|
20467
20440
|
this.setRendered();
|
|
20468
20441
|
const { name, duration, dots, bpm, duration2, dots2, parenthesis } = this.tempo;
|
|
@@ -20482,7 +20455,7 @@ class StaveTempo extends _stavemodifier__WEBPACK_IMPORTED_MODULE_3__.StaveModifi
|
|
|
20482
20455
|
x += elText.getWidth() + 3;
|
|
20483
20456
|
}
|
|
20484
20457
|
if (duration) {
|
|
20485
|
-
el.setText(
|
|
20458
|
+
el.setText(this.durationToCode[duration]);
|
|
20486
20459
|
el.renderText(ctx, x + this.xShift, y + this.yShift);
|
|
20487
20460
|
x += el.getWidth() + 3;
|
|
20488
20461
|
if (dots) {
|
|
@@ -20497,7 +20470,7 @@ class StaveTempo extends _stavemodifier__WEBPACK_IMPORTED_MODULE_3__.StaveModifi
|
|
|
20497
20470
|
elText.renderText(ctx, x + this.xShift, y + this.yShift);
|
|
20498
20471
|
x += elText.getWidth() + 3;
|
|
20499
20472
|
if (duration2) {
|
|
20500
|
-
el.setText(
|
|
20473
|
+
el.setText(this.durationToCode[duration2]);
|
|
20501
20474
|
el.renderText(ctx, x + this.xShift, y + this.yShift);
|
|
20502
20475
|
x += el.getWidth() + 3;
|
|
20503
20476
|
if (dots2) {
|
|
@@ -20519,10 +20492,8 @@ class StaveTempo extends _stavemodifier__WEBPACK_IMPORTED_MODULE_3__.StaveModifi
|
|
|
20519
20492
|
elText.renderText(ctx, x + this.xShift, y + this.yShift);
|
|
20520
20493
|
}
|
|
20521
20494
|
}
|
|
20522
|
-
return this;
|
|
20523
20495
|
}
|
|
20524
20496
|
}
|
|
20525
|
-
_StaveTempo_durationToCode = new WeakMap();
|
|
20526
20497
|
|
|
20527
20498
|
|
|
20528
20499
|
/***/ }),
|
|
@@ -20560,7 +20531,8 @@ class StaveText extends _stavemodifier__WEBPACK_IMPORTED_MODULE_0__.StaveModifie
|
|
|
20560
20531
|
this.position = position;
|
|
20561
20532
|
this.justification = (_c = options.justification) !== null && _c !== void 0 ? _c : _textnote__WEBPACK_IMPORTED_MODULE_1__.TextNote.Justification.CENTER;
|
|
20562
20533
|
}
|
|
20563
|
-
draw(
|
|
20534
|
+
draw() {
|
|
20535
|
+
const stave = this.checkStave();
|
|
20564
20536
|
const ctx = stave.checkContext();
|
|
20565
20537
|
this.setRendered();
|
|
20566
20538
|
let x;
|
|
@@ -20596,7 +20568,6 @@ class StaveText extends _stavemodifier__WEBPACK_IMPORTED_MODULE_0__.StaveModifie
|
|
|
20596
20568
|
throw new _util__WEBPACK_IMPORTED_MODULE_3__.RuntimeError('InvalidPosition', 'Value Must be in Modifier.Position.');
|
|
20597
20569
|
}
|
|
20598
20570
|
this.renderText(ctx, x, y + 4);
|
|
20599
|
-
return this;
|
|
20600
20571
|
}
|
|
20601
20572
|
}
|
|
20602
20573
|
|
|
@@ -20646,6 +20617,9 @@ class StaveTie extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
20646
20617
|
this.renderOptions = {
|
|
20647
20618
|
cp1: 8, // Curve control point 1
|
|
20648
20619
|
cp2: 12, // Curve control point 2
|
|
20620
|
+
shortTieCutoff: 10,
|
|
20621
|
+
cp1Short: 2,
|
|
20622
|
+
cp2Short: 8,
|
|
20649
20623
|
textShiftX: 0,
|
|
20650
20624
|
firstXShift: 0,
|
|
20651
20625
|
lastXShift: 0,
|
|
@@ -20653,6 +20627,24 @@ class StaveTie extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
20653
20627
|
tieSpacing: 0,
|
|
20654
20628
|
};
|
|
20655
20629
|
}
|
|
20630
|
+
/**
|
|
20631
|
+
* Returns either the direction explicitly set with setDirection, or
|
|
20632
|
+
* a logical direction based on lastNote or firstNote.
|
|
20633
|
+
*/
|
|
20634
|
+
getDirection() {
|
|
20635
|
+
if (this.direction !== undefined && this.direction !== null) {
|
|
20636
|
+
return this.direction;
|
|
20637
|
+
}
|
|
20638
|
+
else if (this.notes.lastNote) {
|
|
20639
|
+
return this.notes.lastNote.getStemDirection();
|
|
20640
|
+
}
|
|
20641
|
+
else if (this.notes.firstNote) {
|
|
20642
|
+
return this.notes.firstNote.getStemDirection();
|
|
20643
|
+
}
|
|
20644
|
+
else {
|
|
20645
|
+
return 0;
|
|
20646
|
+
}
|
|
20647
|
+
}
|
|
20656
20648
|
setDirection(direction) {
|
|
20657
20649
|
this.direction = direction;
|
|
20658
20650
|
return this;
|
|
@@ -20695,20 +20687,18 @@ class StaveTie extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
20695
20687
|
const ctx = this.checkContext();
|
|
20696
20688
|
let cp1 = this.renderOptions.cp1;
|
|
20697
20689
|
let cp2 = this.renderOptions.cp2;
|
|
20698
|
-
if (Math.abs(params.lastX - params.firstX) <
|
|
20699
|
-
|
|
20700
|
-
|
|
20690
|
+
if (Math.abs(params.lastX - params.firstX) < this.renderOptions.shortTieCutoff) {
|
|
20691
|
+
// do not get super exaggerated curves for very short ties
|
|
20692
|
+
cp1 = this.renderOptions.cp1Short;
|
|
20693
|
+
cp2 = this.renderOptions.cp2Short;
|
|
20701
20694
|
}
|
|
20702
20695
|
const firstXShift = this.renderOptions.firstXShift;
|
|
20703
20696
|
const lastXShift = this.renderOptions.lastXShift;
|
|
20704
20697
|
const yShift = this.renderOptions.yShift * params.direction;
|
|
20705
20698
|
// setNotes(...) verified that firstIndexes and lastIndexes are not undefined.
|
|
20706
20699
|
// As a result, we use the ! non-null assertion operator here.
|
|
20707
|
-
// eslint-disable-next-line
|
|
20708
20700
|
const firstIndexes = this.notes.firstIndexes;
|
|
20709
|
-
// eslint-disable-next-line
|
|
20710
20701
|
const lastIndexes = this.notes.lastIndexes;
|
|
20711
|
-
this.applyStyle();
|
|
20712
20702
|
ctx.openGroup('stavetie', this.getAttribute('id'));
|
|
20713
20703
|
for (let i = 0; i < firstIndexes.length; ++i) {
|
|
20714
20704
|
const cpX = (params.lastX + lastXShift + (params.firstX + firstXShift)) / 2;
|
|
@@ -20728,7 +20718,6 @@ class StaveTie extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
20728
20718
|
ctx.fill();
|
|
20729
20719
|
}
|
|
20730
20720
|
ctx.closeGroup();
|
|
20731
|
-
this.restoreStyle();
|
|
20732
20721
|
}
|
|
20733
20722
|
/**
|
|
20734
20723
|
* @param firstX specified in pixels
|
|
@@ -20741,10 +20730,8 @@ class StaveTie extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
20741
20730
|
centerX -= ctx.measureText(this.text).width / 2;
|
|
20742
20731
|
const stave = (_b = (_a = this.notes.firstNote) === null || _a === void 0 ? void 0 : _a.checkStave()) !== null && _b !== void 0 ? _b : (_c = this.notes.lastNote) === null || _c === void 0 ? void 0 : _c.checkStave();
|
|
20743
20732
|
if (stave) {
|
|
20744
|
-
ctx.save();
|
|
20745
20733
|
ctx.setFont(this.fontInfo);
|
|
20746
20734
|
ctx.fillText(this.text, centerX + this.renderOptions.textShiftX, stave.getYForTopText() - 1);
|
|
20747
|
-
ctx.restore();
|
|
20748
20735
|
}
|
|
20749
20736
|
}
|
|
20750
20737
|
/**
|
|
@@ -20753,49 +20740,101 @@ class StaveTie extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
20753
20740
|
getNotes() {
|
|
20754
20741
|
return this.notes;
|
|
20755
20742
|
}
|
|
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();
|
|
20743
|
+
/**
|
|
20744
|
+
* Returns the X position in pixels that the tie will be drawn starting from;
|
|
20745
|
+
* ideally from the firstNote, alternatively from the lastNote, or 0 if all else fails.
|
|
20746
|
+
*/
|
|
20747
|
+
getFirstX() {
|
|
20748
|
+
if (this.notes.firstNote) {
|
|
20749
|
+
return this.notes.firstNote.getTieRightX() + this.renderOptions.tieSpacing;
|
|
20772
20750
|
}
|
|
20773
|
-
else if (lastNote) {
|
|
20774
|
-
|
|
20775
|
-
firstX = stave.getTieStartX();
|
|
20776
|
-
firstYs = lastNote.getYs();
|
|
20777
|
-
this.notes.firstIndexes = this.notes.lastIndexes;
|
|
20751
|
+
else if (this.notes.lastNote) {
|
|
20752
|
+
return this.notes.lastNote.checkStave().getTieStartX();
|
|
20778
20753
|
}
|
|
20779
|
-
|
|
20780
|
-
|
|
20781
|
-
stemDirection = lastNote.getStemDirection();
|
|
20782
|
-
lastYs = lastNote.getYs();
|
|
20754
|
+
else {
|
|
20755
|
+
return 0;
|
|
20783
20756
|
}
|
|
20784
|
-
|
|
20785
|
-
|
|
20786
|
-
|
|
20787
|
-
|
|
20757
|
+
}
|
|
20758
|
+
/**
|
|
20759
|
+
* Returns the X position in pixels that the tie will be drawn ending at;
|
|
20760
|
+
* ideally from the firstNote, alternatively from the lastNote, or 0 if all else fails.
|
|
20761
|
+
*/
|
|
20762
|
+
getLastX() {
|
|
20763
|
+
if (this.notes.lastNote) {
|
|
20764
|
+
return this.notes.lastNote.getTieLeftX() + this.renderOptions.tieSpacing;
|
|
20765
|
+
}
|
|
20766
|
+
else if (this.notes.firstNote) {
|
|
20767
|
+
return this.notes.firstNote.checkStave().getTieEndX();
|
|
20768
|
+
}
|
|
20769
|
+
else {
|
|
20770
|
+
return 0;
|
|
20771
|
+
}
|
|
20772
|
+
}
|
|
20773
|
+
/**
|
|
20774
|
+
* Get the Y positions of the places where a tie needs to be drawn starting from.
|
|
20775
|
+
*/
|
|
20776
|
+
getFirstYs() {
|
|
20777
|
+
if (this.notes.firstNote) {
|
|
20778
|
+
return this.notes.firstNote.getYs();
|
|
20779
|
+
}
|
|
20780
|
+
else if (this.notes.lastNote) {
|
|
20781
|
+
return this.notes.lastNote.getYs();
|
|
20782
|
+
}
|
|
20783
|
+
else {
|
|
20784
|
+
return [0];
|
|
20785
|
+
}
|
|
20786
|
+
}
|
|
20787
|
+
/**
|
|
20788
|
+
* Get the Y positions of the places where a tie needs to be drawn ending at.
|
|
20789
|
+
*/
|
|
20790
|
+
getLastYs() {
|
|
20791
|
+
if (this.notes.lastNote) {
|
|
20792
|
+
return this.notes.lastNote.getYs();
|
|
20793
|
+
}
|
|
20794
|
+
else if (this.notes.firstNote) {
|
|
20795
|
+
return this.notes.firstNote.getYs();
|
|
20796
|
+
}
|
|
20797
|
+
else {
|
|
20798
|
+
return [0];
|
|
20799
|
+
}
|
|
20800
|
+
}
|
|
20801
|
+
/**
|
|
20802
|
+
* If a tie has firstNote and not lastNote, or vice-versa, then their
|
|
20803
|
+
* firstIndexes and lastIndexes need to be equal to each other.
|
|
20804
|
+
*
|
|
20805
|
+
* Does nothing if both notes.firstNote and notes.lastNote are defined (or
|
|
20806
|
+
* if neither are)
|
|
20807
|
+
*
|
|
20808
|
+
* (Note that after doing so they share a common Array object, so any change
|
|
20809
|
+
* to one will affect the other; this behavior may change in a future release)
|
|
20810
|
+
*/
|
|
20811
|
+
synchronizeIndexes() {
|
|
20812
|
+
if (this.notes.firstNote && this.notes.lastNote) {
|
|
20813
|
+
return;
|
|
20814
|
+
}
|
|
20815
|
+
else if (!this.notes.firstNote && !this.notes.lastNote) {
|
|
20816
|
+
return;
|
|
20817
|
+
}
|
|
20818
|
+
else if (this.notes.firstNote) {
|
|
20788
20819
|
this.notes.lastIndexes = this.notes.firstIndexes;
|
|
20789
20820
|
}
|
|
20790
|
-
|
|
20791
|
-
|
|
20821
|
+
else {
|
|
20822
|
+
// this.notes.lastNote defined, but not firstNote
|
|
20823
|
+
this.notes.firstIndexes = this.notes.lastIndexes;
|
|
20792
20824
|
}
|
|
20825
|
+
}
|
|
20826
|
+
draw() {
|
|
20827
|
+
this.checkContext();
|
|
20828
|
+
this.setRendered();
|
|
20829
|
+
this.synchronizeIndexes();
|
|
20830
|
+
const firstX = this.getFirstX();
|
|
20831
|
+
const lastX = this.getLastX();
|
|
20793
20832
|
this.renderTie({
|
|
20794
20833
|
firstX,
|
|
20795
20834
|
lastX,
|
|
20796
|
-
firstYs,
|
|
20797
|
-
lastYs,
|
|
20798
|
-
direction:
|
|
20835
|
+
firstYs: this.getFirstYs(),
|
|
20836
|
+
lastYs: this.getLastYs(),
|
|
20837
|
+
direction: this.getDirection(), // note: not this.direction
|
|
20799
20838
|
});
|
|
20800
20839
|
this.renderTieText(firstX, lastX);
|
|
20801
20840
|
return true;
|
|
@@ -20844,7 +20883,9 @@ class Volta extends _stavemodifier__WEBPACK_IMPORTED_MODULE_0__.StaveModifier {
|
|
|
20844
20883
|
this.yShift = yShift;
|
|
20845
20884
|
this.text = label;
|
|
20846
20885
|
}
|
|
20847
|
-
draw(
|
|
20886
|
+
draw() {
|
|
20887
|
+
const stave = this.checkStave();
|
|
20888
|
+
const x = stave.getModifierXShift(this.getPosition());
|
|
20848
20889
|
const ctx = stave.checkContext();
|
|
20849
20890
|
this.setRendered();
|
|
20850
20891
|
let width = stave.getWidth() - x; // don't include x (offset) for width
|
|
@@ -20871,7 +20912,6 @@ class Volta extends _stavemodifier__WEBPACK_IMPORTED_MODULE_0__.StaveModifier {
|
|
|
20871
20912
|
this.renderText(ctx, x + 5, topY - this.yShift + 15);
|
|
20872
20913
|
}
|
|
20873
20914
|
ctx.fillRect(this.x + x, topY, width, 1);
|
|
20874
|
-
return this;
|
|
20875
20915
|
}
|
|
20876
20916
|
}
|
|
20877
20917
|
|
|
@@ -21044,8 +21084,6 @@ class Stem extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
21044
21084
|
// The offset from the stem's base which is required fo satisfy the stemlet height
|
|
21045
21085
|
const stemletYOffset = this.isStemlet ? stemHeight - this.stemletHeight * this.stemDirection : 0;
|
|
21046
21086
|
// Draw the stem
|
|
21047
|
-
ctx.save();
|
|
21048
|
-
this.applyStyle();
|
|
21049
21087
|
ctx.openGroup('stem', this.getAttribute('id'));
|
|
21050
21088
|
ctx.beginPath();
|
|
21051
21089
|
ctx.setLineWidth(Stem.WIDTH);
|
|
@@ -21053,8 +21091,6 @@ class Stem extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
21053
21091
|
ctx.lineTo(stemX, stemY - stemHeight - this.renderHeightAdjustment * stemDirection);
|
|
21054
21092
|
ctx.stroke();
|
|
21055
21093
|
ctx.closeGroup();
|
|
21056
|
-
this.restoreStyle();
|
|
21057
|
-
ctx.restore();
|
|
21058
21094
|
}
|
|
21059
21095
|
}
|
|
21060
21096
|
/** To enable logging for this class. Set `VexFlow.Stem.DEBUG` to `true`. */
|
|
@@ -21073,7 +21109,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
21073
21109
|
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
|
|
21074
21110
|
/* harmony export */ StemmableNote: () => (/* binding */ StemmableNote)
|
|
21075
21111
|
/* harmony export */ });
|
|
21076
|
-
/* harmony import */ var
|
|
21112
|
+
/* harmony import */ var _flag__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./flag */ "./src/flag.ts");
|
|
21077
21113
|
/* harmony import */ var _glyphs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./glyphs */ "./src/glyphs.ts");
|
|
21078
21114
|
/* harmony import */ var _note__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./note */ "./src/note.ts");
|
|
21079
21115
|
/* harmony import */ var _stem__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./stem */ "./src/stem.ts");
|
|
@@ -21098,8 +21134,7 @@ class StemmableNote extends _note__WEBPACK_IMPORTED_MODULE_2__.Note {
|
|
|
21098
21134
|
}
|
|
21099
21135
|
constructor(noteStruct) {
|
|
21100
21136
|
super(noteStruct);
|
|
21101
|
-
this.flag = new
|
|
21102
|
-
this.flagStyle = {};
|
|
21137
|
+
this.flag = new _flag__WEBPACK_IMPORTED_MODULE_0__.Flag();
|
|
21103
21138
|
}
|
|
21104
21139
|
// Get and set the note's `Stem`
|
|
21105
21140
|
getStem() {
|
|
@@ -21113,7 +21148,7 @@ class StemmableNote extends _note__WEBPACK_IMPORTED_MODULE_2__.Note {
|
|
|
21113
21148
|
}
|
|
21114
21149
|
setStem(stem) {
|
|
21115
21150
|
this.stem = stem;
|
|
21116
|
-
this.
|
|
21151
|
+
this.addChild(stem);
|
|
21117
21152
|
return this;
|
|
21118
21153
|
}
|
|
21119
21154
|
// Builds and sets a new stem
|
|
@@ -21131,7 +21166,7 @@ class StemmableNote extends _note__WEBPACK_IMPORTED_MODULE_2__.Note {
|
|
|
21131
21166
|
// if codeFlagUp is undefined, codePoint will be 0
|
|
21132
21167
|
this.getStemDirection() === _stem__WEBPACK_IMPORTED_MODULE_3__.Stem.DOWN
|
|
21133
21168
|
? String.fromCodePoint(((_b = (_a = glyphProps.codeFlagUp) === null || _a === void 0 ? void 0 : _a.codePointAt(0)) !== null && _b !== void 0 ? _b : -1) + 1)
|
|
21134
|
-
: (_c = glyphProps.codeFlagUp) !== null && _c !== void 0 ? _c : _glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.null;
|
|
21169
|
+
: ((_c = glyphProps.codeFlagUp) !== null && _c !== void 0 ? _c : _glyphs__WEBPACK_IMPORTED_MODULE_1__.Glyphs.null);
|
|
21135
21170
|
this.flag.setText(flagCode);
|
|
21136
21171
|
this.flag.fontInfo = this.fontInfo;
|
|
21137
21172
|
}
|
|
@@ -21292,7 +21327,7 @@ class StemmableNote extends _note__WEBPACK_IMPORTED_MODULE_2__.Note {
|
|
|
21292
21327
|
this.checkContext();
|
|
21293
21328
|
this.setRendered();
|
|
21294
21329
|
this.setStem(new _stem__WEBPACK_IMPORTED_MODULE_3__.Stem(stemOptions));
|
|
21295
|
-
(_a = this.stem) === null || _a === void 0 ? void 0 : _a.setContext(this.getContext()).
|
|
21330
|
+
(_a = this.stem) === null || _a === void 0 ? void 0 : _a.setContext(this.getContext()).drawWithStyle();
|
|
21296
21331
|
}
|
|
21297
21332
|
}
|
|
21298
21333
|
|
|
@@ -21519,7 +21554,6 @@ class StringNumber extends _modifier__WEBPACK_IMPORTED_MODULE_1__.Modifier {
|
|
|
21519
21554
|
default:
|
|
21520
21555
|
throw new _util__WEBPACK_IMPORTED_MODULE_6__.RuntimeError('InvalidPosition', `The position ${this.position} is invalid`);
|
|
21521
21556
|
}
|
|
21522
|
-
ctx.save();
|
|
21523
21557
|
if (this.drawCircle) {
|
|
21524
21558
|
ctx.beginPath();
|
|
21525
21559
|
ctx.arc(dotX, dotY, this.radius, 0, Math.PI * 2, false);
|
|
@@ -21559,7 +21593,6 @@ class StringNumber extends _modifier__WEBPACK_IMPORTED_MODULE_1__.Modifier {
|
|
|
21559
21593
|
break;
|
|
21560
21594
|
}
|
|
21561
21595
|
}
|
|
21562
|
-
ctx.restore();
|
|
21563
21596
|
}
|
|
21564
21597
|
}
|
|
21565
21598
|
|
|
@@ -21779,12 +21812,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
21779
21812
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
21780
21813
|
// MIT License
|
|
21781
21814
|
// @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
21815
|
|
|
21789
21816
|
|
|
21790
21817
|
|
|
@@ -21823,7 +21850,6 @@ const TWO_PI = 2 * Math.PI;
|
|
|
21823
21850
|
class SVGContext extends _rendercontext__WEBPACK_IMPORTED_MODULE_3__.RenderContext {
|
|
21824
21851
|
constructor(element) {
|
|
21825
21852
|
super();
|
|
21826
|
-
_SVGContext_instances.add(this);
|
|
21827
21853
|
this.width = 0;
|
|
21828
21854
|
this.height = 0;
|
|
21829
21855
|
this.precision = 1;
|
|
@@ -21832,7 +21858,7 @@ class SVGContext extends _rendercontext__WEBPACK_IMPORTED_MODULE_3__.RenderConte
|
|
|
21832
21858
|
this.fontCSSString = '';
|
|
21833
21859
|
this.element = element;
|
|
21834
21860
|
this.precision = Math.pow(10, _tables__WEBPACK_IMPORTED_MODULE_4__.Tables.RENDER_PRECISION_PLACES);
|
|
21835
|
-
// Create
|
|
21861
|
+
// Create an SVG element and add it to the container element.
|
|
21836
21862
|
const svg = this.create('svg');
|
|
21837
21863
|
svg.setAttribute('pointer-events', 'none');
|
|
21838
21864
|
this.element.appendChild(svg);
|
|
@@ -21973,7 +21999,7 @@ class SVGContext extends _rendercontext__WEBPACK_IMPORTED_MODULE_3__.RenderConte
|
|
|
21973
21999
|
// style.width / style.height properties that are applied to
|
|
21974
22000
|
// the SVG object from our internal conception of the SVG
|
|
21975
22001
|
// width/height. This would allow us to create automatically
|
|
21976
|
-
// scaling
|
|
22002
|
+
// scaling SVGs that filled their containers, for instance.
|
|
21977
22003
|
//
|
|
21978
22004
|
// As this isn't implemented in Canvas contexts,
|
|
21979
22005
|
// I've left as is for now, but in using the viewBox to
|
|
@@ -22026,8 +22052,6 @@ class SVGContext extends _rendercontext__WEBPACK_IMPORTED_MODULE_3__.RenderConte
|
|
|
22026
22052
|
while (this.svg.lastChild) {
|
|
22027
22053
|
this.svg.removeChild(this.svg.lastChild);
|
|
22028
22054
|
}
|
|
22029
|
-
// Replace the viewbox attribute we just removed.
|
|
22030
|
-
this.scale(this.state.scaleX, this.state.scaleY);
|
|
22031
22055
|
}
|
|
22032
22056
|
// ## Rectangles:
|
|
22033
22057
|
rect(x, y, width, height, attributes) {
|
|
@@ -22164,6 +22188,12 @@ class SVGContext extends _rendercontext__WEBPACK_IMPORTED_MODULE_3__.RenderConte
|
|
|
22164
22188
|
this.path += 'Z';
|
|
22165
22189
|
return this;
|
|
22166
22190
|
}
|
|
22191
|
+
getShadowStyle() {
|
|
22192
|
+
// A CSS drop-shadow filter blur looks different than a canvas shadowBlur
|
|
22193
|
+
// of the same radius, so we scale the drop-shadow radius here to make it
|
|
22194
|
+
// look close to the canvas shadow.
|
|
22195
|
+
return `filter: drop-shadow(0 0 ${this.attributes.shadowBlur / 1.5}px ${this.attributes.shadowColor})`;
|
|
22196
|
+
}
|
|
22167
22197
|
fill(attributes) {
|
|
22168
22198
|
const path = this.create('path');
|
|
22169
22199
|
if (typeof attributes === 'undefined') {
|
|
@@ -22171,7 +22201,7 @@ class SVGContext extends _rendercontext__WEBPACK_IMPORTED_MODULE_3__.RenderConte
|
|
|
22171
22201
|
}
|
|
22172
22202
|
attributes.d = this.path;
|
|
22173
22203
|
if (this.attributes.shadowBlur > 0) {
|
|
22174
|
-
attributes.style =
|
|
22204
|
+
attributes.style = this.getShadowStyle();
|
|
22175
22205
|
}
|
|
22176
22206
|
this.applyAttributes(path, attributes);
|
|
22177
22207
|
this.add(path);
|
|
@@ -22181,7 +22211,7 @@ class SVGContext extends _rendercontext__WEBPACK_IMPORTED_MODULE_3__.RenderConte
|
|
|
22181
22211
|
const path = this.create('path');
|
|
22182
22212
|
const attributes = Object.assign(Object.assign({}, this.attributes), { fill: 'none', d: this.path });
|
|
22183
22213
|
if (this.attributes.shadowBlur > 0) {
|
|
22184
|
-
attributes.style =
|
|
22214
|
+
attributes.style = this.getShadowStyle();
|
|
22185
22215
|
}
|
|
22186
22216
|
this.applyAttributes(path, attributes);
|
|
22187
22217
|
this.add(path);
|
|
@@ -22264,12 +22294,6 @@ class SVGContext extends _rendercontext__WEBPACK_IMPORTED_MODULE_3__.RenderConte
|
|
|
22264
22294
|
return this.fontCSSString;
|
|
22265
22295
|
}
|
|
22266
22296
|
}
|
|
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
22297
|
SVGContext.measureTextElement = new _element__WEBPACK_IMPORTED_MODULE_0__.Element();
|
|
22274
22298
|
|
|
22275
22299
|
|
|
@@ -23541,9 +23565,7 @@ class TabNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_5__.StemmableNote
|
|
|
23541
23565
|
: // Up stems are above the note head and have flags on the right.
|
|
23542
23566
|
this.getStemY() - this.checkStem().getHeight() + this.getStemExtension();
|
|
23543
23567
|
// Draw the Flag
|
|
23544
|
-
this.
|
|
23545
|
-
this.flag.renderText(context, flagX, flagY);
|
|
23546
|
-
this.restoreStyle(context, this.flagStyle);
|
|
23568
|
+
this.flag.setContext(context).setX(flagX).setY(flagY).drawWithStyle();
|
|
23547
23569
|
}
|
|
23548
23570
|
}
|
|
23549
23571
|
// Render the modifiers onto the context.
|
|
@@ -23569,7 +23591,6 @@ class TabNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_5__.StemmableNote
|
|
|
23569
23591
|
const stringsUsed = this.positions.map((position) => Number(position.str));
|
|
23570
23592
|
const unusedStrings = getUnusedStringGroups(numLines, stringsUsed);
|
|
23571
23593
|
const stemLines = getPartialStemLines(stemY, unusedStrings, this.checkStave(), this.getStemDirection());
|
|
23572
|
-
ctx.save();
|
|
23573
23594
|
ctx.setLineWidth(_stem__WEBPACK_IMPORTED_MODULE_4__.Stem.WIDTH);
|
|
23574
23595
|
stemLines.forEach((bounds) => {
|
|
23575
23596
|
if (bounds.length === 0)
|
|
@@ -23580,7 +23601,6 @@ class TabNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_5__.StemmableNote
|
|
|
23580
23601
|
ctx.stroke();
|
|
23581
23602
|
ctx.closePath();
|
|
23582
23603
|
});
|
|
23583
|
-
ctx.restore();
|
|
23584
23604
|
}
|
|
23585
23605
|
}
|
|
23586
23606
|
// Render the fret positions onto the context
|
|
@@ -23606,19 +23626,17 @@ class TabNote extends _stemmablenote__WEBPACK_IMPORTED_MODULE_5__.StemmableNote
|
|
|
23606
23626
|
}
|
|
23607
23627
|
this.setRendered();
|
|
23608
23628
|
const renderStem = this.beam === undefined && this.renderOptions.drawStem;
|
|
23609
|
-
this.applyStyle();
|
|
23610
23629
|
ctx.openGroup('tabnote', this.getAttribute('id'));
|
|
23611
23630
|
this.drawPositions();
|
|
23612
23631
|
this.drawStemThrough();
|
|
23613
23632
|
if (this.stem && renderStem) {
|
|
23614
23633
|
const stemX = this.getStemX();
|
|
23615
23634
|
this.stem.setNoteHeadXBounds(stemX, stemX);
|
|
23616
|
-
this.stem.setContext(ctx).
|
|
23635
|
+
this.stem.setContext(ctx).drawWithStyle();
|
|
23617
23636
|
}
|
|
23618
23637
|
this.drawFlag();
|
|
23619
23638
|
this.drawModifiers();
|
|
23620
23639
|
ctx.closeGroup();
|
|
23621
|
-
this.restoreStyle();
|
|
23622
23640
|
}
|
|
23623
23641
|
}
|
|
23624
23642
|
|
|
@@ -23719,7 +23737,6 @@ class TabSlide extends _tabtie__WEBPACK_IMPORTED_MODULE_0__.TabTie {
|
|
|
23719
23737
|
if (direction !== TabSlide.SLIDE_UP && direction !== TabSlide.SLIDE_DOWN) {
|
|
23720
23738
|
throw new _util__WEBPACK_IMPORTED_MODULE_2__.RuntimeError('BadSlide', 'Invalid slide direction');
|
|
23721
23739
|
}
|
|
23722
|
-
// eslint-disable-next-line
|
|
23723
23740
|
const firstIndexes = this.notes.firstIndexes;
|
|
23724
23741
|
for (let i = 0; i < firstIndexes.length; ++i) {
|
|
23725
23742
|
const slideY = firstYs[firstIndexes[i]] + this.renderOptions.yShift;
|
|
@@ -23956,8 +23973,6 @@ class TextBracket extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
23956
23973
|
const stop = { x: this.stop.getAbsoluteX(), y };
|
|
23957
23974
|
L('Rendering TextBracket: start:', start, 'stop:', stop, 'y:', y);
|
|
23958
23975
|
const bracketHeight = this.renderOptions.bracketHeight * this.position;
|
|
23959
|
-
ctx.save();
|
|
23960
|
-
this.applyStyle(ctx);
|
|
23961
23976
|
// Draw text
|
|
23962
23977
|
this.textElement.renderText(ctx, start.x, start.y);
|
|
23963
23978
|
// Get the width and height for the octave number
|
|
@@ -24006,7 +24021,6 @@ class TextBracket extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
24006
24021
|
ctx.stroke();
|
|
24007
24022
|
ctx.closePath();
|
|
24008
24023
|
}
|
|
24009
|
-
ctx.restore();
|
|
24010
24024
|
}
|
|
24011
24025
|
}
|
|
24012
24026
|
TextBracket.DEBUG = false;
|
|
@@ -24260,7 +24274,6 @@ class TextNote extends _note__WEBPACK_IMPORTED_MODULE_4__.Note {
|
|
|
24260
24274
|
x -= width;
|
|
24261
24275
|
}
|
|
24262
24276
|
const y = stave.getYForLine(this.line + -3);
|
|
24263
|
-
this.applyStyle(ctx);
|
|
24264
24277
|
this.renderText(ctx, x, y);
|
|
24265
24278
|
const height = this.getHeight();
|
|
24266
24279
|
if (this.superscript) {
|
|
@@ -24269,7 +24282,6 @@ class TextNote extends _note__WEBPACK_IMPORTED_MODULE_4__.Note {
|
|
|
24269
24282
|
if (this.subscript) {
|
|
24270
24283
|
this.subscript.renderText(ctx, x + this.width + 2, y + height / 2.2 - 1);
|
|
24271
24284
|
}
|
|
24272
|
-
this.restoreStyle(ctx);
|
|
24273
24285
|
}
|
|
24274
24286
|
}
|
|
24275
24287
|
TextNote.Justification = TextJustification;
|
|
@@ -24294,18 +24306,6 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
24294
24306
|
/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./util */ "./src/util.ts");
|
|
24295
24307
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
24296
24308
|
// 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
24309
|
|
|
24310
24310
|
|
|
24311
24311
|
|
|
@@ -24321,8 +24321,8 @@ class Tickable extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
24321
24321
|
}
|
|
24322
24322
|
constructor() {
|
|
24323
24323
|
super();
|
|
24324
|
-
|
|
24325
|
-
|
|
24324
|
+
this._preFormatted = false;
|
|
24325
|
+
this._postFormatted = false;
|
|
24326
24326
|
// These properties represent the duration of
|
|
24327
24327
|
// this tickable element.
|
|
24328
24328
|
this.ticks = new _fraction__WEBPACK_IMPORTED_MODULE_1__.Fraction(0, 1); // Fractional value of ticks
|
|
@@ -24375,7 +24375,7 @@ class Tickable extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
24375
24375
|
}
|
|
24376
24376
|
/** Get width of note. Used by the formatter for positioning. */
|
|
24377
24377
|
getWidth() {
|
|
24378
|
-
if (!
|
|
24378
|
+
if (!this._preFormatted) {
|
|
24379
24379
|
throw new _util__WEBPACK_IMPORTED_MODULE_4__.RuntimeError('UnformattedNote', "Can't call GetWidth on an unformatted note.");
|
|
24380
24380
|
}
|
|
24381
24381
|
return this.width + (this.modifierContext ? this.modifierContext.getWidth() : 0);
|
|
@@ -24479,7 +24479,7 @@ class Tickable extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
24479
24479
|
this.modifierContext.addMember(this.modifiers[i]);
|
|
24480
24480
|
}
|
|
24481
24481
|
this.modifierContext.addMember(this);
|
|
24482
|
-
|
|
24482
|
+
this._preFormatted = false;
|
|
24483
24483
|
return this;
|
|
24484
24484
|
}
|
|
24485
24485
|
/**
|
|
@@ -24489,7 +24489,7 @@ class Tickable extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
24489
24489
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
24490
24490
|
addModifier(modifier, index = 0) {
|
|
24491
24491
|
this.modifiers.push(modifier);
|
|
24492
|
-
|
|
24492
|
+
this._preFormatted = false;
|
|
24493
24493
|
return this;
|
|
24494
24494
|
}
|
|
24495
24495
|
/** Get the list of associated modifiers. */
|
|
@@ -24499,14 +24499,14 @@ class Tickable extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
24499
24499
|
/** Set the Tick Context. */
|
|
24500
24500
|
setTickContext(tc) {
|
|
24501
24501
|
this.tickContext = tc;
|
|
24502
|
-
|
|
24502
|
+
this._preFormatted = false;
|
|
24503
24503
|
}
|
|
24504
24504
|
checkTickContext(message = 'Tickable has no tick context.') {
|
|
24505
24505
|
return (0,_util__WEBPACK_IMPORTED_MODULE_4__.defined)(this.tickContext, 'NoTickContext', message);
|
|
24506
24506
|
}
|
|
24507
24507
|
/** Preformat the Tickable. */
|
|
24508
24508
|
preFormat() {
|
|
24509
|
-
if (
|
|
24509
|
+
if (this._preFormatted)
|
|
24510
24510
|
return;
|
|
24511
24511
|
this.width = 0;
|
|
24512
24512
|
if (this.modifierContext) {
|
|
@@ -24516,24 +24516,24 @@ class Tickable extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
24516
24516
|
}
|
|
24517
24517
|
/** Set preformatted status. */
|
|
24518
24518
|
set preFormatted(value) {
|
|
24519
|
-
|
|
24519
|
+
this._preFormatted = value;
|
|
24520
24520
|
}
|
|
24521
24521
|
get preFormatted() {
|
|
24522
|
-
return
|
|
24522
|
+
return this._preFormatted;
|
|
24523
24523
|
}
|
|
24524
24524
|
/** Postformat the Tickable. */
|
|
24525
24525
|
postFormat() {
|
|
24526
|
-
if (
|
|
24526
|
+
if (this._postFormatted)
|
|
24527
24527
|
return this;
|
|
24528
|
-
|
|
24528
|
+
this._postFormatted = true;
|
|
24529
24529
|
return this;
|
|
24530
24530
|
}
|
|
24531
24531
|
/** Set postformatted status. */
|
|
24532
24532
|
set postFormatted(value) {
|
|
24533
|
-
|
|
24533
|
+
this._postFormatted = value;
|
|
24534
24534
|
}
|
|
24535
24535
|
get postFormatted() {
|
|
24536
|
-
return
|
|
24536
|
+
return this._postFormatted;
|
|
24537
24537
|
}
|
|
24538
24538
|
/** Return the intrinsic ticks. */
|
|
24539
24539
|
getIntrinsicTicks() {
|
|
@@ -24577,7 +24577,6 @@ class Tickable extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
24577
24577
|
return (0,_util__WEBPACK_IMPORTED_MODULE_4__.defined)(this.modifierContext, 'NoModifierContext', 'No modifier context attached to this tickable.');
|
|
24578
24578
|
}
|
|
24579
24579
|
}
|
|
24580
|
-
_Tickable_preFormatted = new WeakMap(), _Tickable_postFormatted = new WeakMap();
|
|
24581
24580
|
|
|
24582
24581
|
|
|
24583
24582
|
/***/ }),
|
|
@@ -24603,8 +24602,14 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
24603
24602
|
|
|
24604
24603
|
/**
|
|
24605
24604
|
* TickContext formats abstract tickable objects, such as notes, chords, tabs, etc.
|
|
24605
|
+
*
|
|
24606
|
+
* It has a public attribute of `tContexts` which is a parent array of the TickContexts
|
|
24607
|
+
* in which this TickContext belongs.
|
|
24606
24608
|
*/
|
|
24607
24609
|
class TickContext {
|
|
24610
|
+
/**
|
|
24611
|
+
* Get the next TickContext from another TickContext, from the `.tContexts` array.
|
|
24612
|
+
*/
|
|
24608
24613
|
static getNextContext(tContext) {
|
|
24609
24614
|
const contexts = tContext.tContexts;
|
|
24610
24615
|
const index = contexts.indexOf(tContext);
|
|
@@ -24612,20 +24617,21 @@ class TickContext {
|
|
|
24612
24617
|
return contexts[index + 1];
|
|
24613
24618
|
}
|
|
24614
24619
|
constructor(options) {
|
|
24620
|
+
var _a;
|
|
24615
24621
|
this.preFormatted = false;
|
|
24616
24622
|
this.postFormatted = false;
|
|
24617
|
-
this.tickID = options
|
|
24623
|
+
this.tickID = (_a = options === null || options === void 0 ? void 0 : options.tickID) !== null && _a !== void 0 ? _a : 0;
|
|
24618
24624
|
this.currentTick = new _fraction__WEBPACK_IMPORTED_MODULE_0__.Fraction(0, 1);
|
|
24619
24625
|
this.maxTicks = new _fraction__WEBPACK_IMPORTED_MODULE_0__.Fraction(0, 1);
|
|
24620
24626
|
this.maxTickable = undefined; // Biggest tickable
|
|
24621
|
-
this.minTicks = undefined; // this can
|
|
24627
|
+
this.minTicks = undefined; // this can remain null if all tickables have ignoreTicks
|
|
24622
24628
|
this.minTickable = undefined;
|
|
24623
24629
|
this.padding = 1; // padding on each side (width += padding * 2)
|
|
24624
24630
|
this.x = 0;
|
|
24625
24631
|
this.xBase = 0; // base x position without xOffset
|
|
24626
24632
|
this.xOffset = 0; // xBase and xOffset are an alternative way to describe x (x = xB + xO)
|
|
24627
24633
|
this.tickables = []; // Notes, tabs, chords, lyrics.
|
|
24628
|
-
this.tickablesByVoice = {}; // Tickables indexed by voice number
|
|
24634
|
+
this.tickablesByVoice = {}; // Tickables indexed by voice number (as string)
|
|
24629
24635
|
// Formatting metrics
|
|
24630
24636
|
this.notePx = 0; // width of widest note in this context
|
|
24631
24637
|
this.glyphPx = 0; // width of glyph (note head)
|
|
@@ -24636,7 +24642,7 @@ class TickContext {
|
|
|
24636
24642
|
this.totalLeftPx = 0; // Total left pixels
|
|
24637
24643
|
this.totalRightPx = 0; // Total right pixels
|
|
24638
24644
|
this.tContexts = []; // Parent array of tick contexts
|
|
24639
|
-
this.width = 0;
|
|
24645
|
+
this.width = 0; // in pixels
|
|
24640
24646
|
this.formatterMetrics = {
|
|
24641
24647
|
// The freedom of a tickcontext is the distance it can move without colliding
|
|
24642
24648
|
// with neighboring elements. A formatter can set these values during its
|
|
@@ -24788,6 +24794,44 @@ class TickContext {
|
|
|
24788
24794
|
getFormatterMetrics() {
|
|
24789
24795
|
return this.formatterMetrics;
|
|
24790
24796
|
}
|
|
24797
|
+
/**
|
|
24798
|
+
* Move this tick context by `shift` pixels rightward, and adjust the
|
|
24799
|
+
* freedom on adjacent tickcontexts.
|
|
24800
|
+
* @param shift pixels to shift rightward.
|
|
24801
|
+
* @param prev the previous TickContext, whose right freedom will be increased by `shift`.
|
|
24802
|
+
* @param next the next TickContext, whose left freedom will be decreased by `shift`.
|
|
24803
|
+
*/
|
|
24804
|
+
move(shift, prev, next) {
|
|
24805
|
+
this.setX(this.getX() + shift);
|
|
24806
|
+
this.getFormatterMetrics().freedom.left += shift;
|
|
24807
|
+
this.getFormatterMetrics().freedom.right -= shift;
|
|
24808
|
+
if (prev)
|
|
24809
|
+
prev.getFormatterMetrics().freedom.right += shift;
|
|
24810
|
+
if (next)
|
|
24811
|
+
next.getFormatterMetrics().freedom.left -= shift;
|
|
24812
|
+
}
|
|
24813
|
+
/**
|
|
24814
|
+
* Return the total cost of space deviations from formatter metrics for
|
|
24815
|
+
* each tickable in the context. Used by formatters.
|
|
24816
|
+
*
|
|
24817
|
+
* Since FormatterMetrics.space.deviation is the amount each tickable is smaller
|
|
24818
|
+
* (negative) or wider (positive) than the mean amount of space allocated to that
|
|
24819
|
+
* duration, a negative return value means the tickables at this position are on average
|
|
24820
|
+
* getting less space than they should, while a positive number means they are getting
|
|
24821
|
+
* more space than they should.
|
|
24822
|
+
*/
|
|
24823
|
+
getDeviationCost() {
|
|
24824
|
+
return (0,_util__WEBPACK_IMPORTED_MODULE_1__.sumArray)(this.tickables.map((t) => t.getFormatterMetrics().space.deviation));
|
|
24825
|
+
}
|
|
24826
|
+
/**
|
|
24827
|
+
* Like getDeviationCost, but averages the cost of space deviations so that TickContexts
|
|
24828
|
+
* with more Tickables are not weighted more heavily.
|
|
24829
|
+
*/
|
|
24830
|
+
getAverageDeviationCost() {
|
|
24831
|
+
if (!this.tickables.length)
|
|
24832
|
+
return 0;
|
|
24833
|
+
return this.getDeviationCost() / this.tickables.length;
|
|
24834
|
+
}
|
|
24791
24835
|
}
|
|
24792
24836
|
|
|
24793
24837
|
|
|
@@ -24981,12 +25025,12 @@ class TimeSignature extends _stavemodifier__WEBPACK_IMPORTED_MODULE_2__.StaveMod
|
|
|
24981
25025
|
const stave = this.checkStave();
|
|
24982
25026
|
const ctx = stave.checkContext();
|
|
24983
25027
|
this.setRendered();
|
|
25028
|
+
ctx.openGroup('timesignature', this.getAttribute('id'));
|
|
24984
25029
|
this.drawAt(ctx, stave, this.x);
|
|
25030
|
+
ctx.closeGroup();
|
|
24985
25031
|
}
|
|
24986
25032
|
drawAt(ctx, stave, x) {
|
|
24987
25033
|
this.setRendered();
|
|
24988
|
-
this.applyStyle(ctx);
|
|
24989
|
-
ctx.openGroup('timesignature', this.getAttribute('id'));
|
|
24990
25034
|
if (this.isNumeric) {
|
|
24991
25035
|
let startX = x + this.topStartX;
|
|
24992
25036
|
let y = 0;
|
|
@@ -25002,8 +25046,6 @@ class TimeSignature extends _stavemodifier__WEBPACK_IMPORTED_MODULE_2__.StaveMod
|
|
|
25002
25046
|
else {
|
|
25003
25047
|
this.renderText(ctx, x - this.x, stave.getYForLine(this.line));
|
|
25004
25048
|
}
|
|
25005
|
-
ctx.closeGroup();
|
|
25006
|
-
this.restoreStyle(ctx);
|
|
25007
25049
|
}
|
|
25008
25050
|
}
|
|
25009
25051
|
|
|
@@ -25053,7 +25095,9 @@ class TimeSigNote extends _note__WEBPACK_IMPORTED_MODULE_0__.Note {
|
|
|
25053
25095
|
const stave = this.checkStave();
|
|
25054
25096
|
const ctx = this.checkContext();
|
|
25055
25097
|
this.setRendered();
|
|
25098
|
+
ctx.openGroup('timesignote', this.getAttribute('id'));
|
|
25056
25099
|
this.timeSig.drawAt(ctx, stave, this.getAbsoluteX());
|
|
25100
|
+
ctx.closeGroup();
|
|
25057
25101
|
}
|
|
25058
25102
|
}
|
|
25059
25103
|
|
|
@@ -25219,10 +25263,11 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
25219
25263
|
/* harmony import */ var _element__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./element */ "./src/element.ts");
|
|
25220
25264
|
/* harmony import */ var _formatter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./formatter */ "./src/formatter.ts");
|
|
25221
25265
|
/* harmony import */ var _glyphs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./glyphs */ "./src/glyphs.ts");
|
|
25222
|
-
/* harmony import */ var
|
|
25223
|
-
/* harmony import */ var
|
|
25224
|
-
/* harmony import */ var
|
|
25225
|
-
/* harmony import */ var
|
|
25266
|
+
/* harmony import */ var _metrics__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./metrics */ "./src/metrics.ts");
|
|
25267
|
+
/* harmony import */ var _stem__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./stem */ "./src/stem.ts");
|
|
25268
|
+
/* harmony import */ var _tables__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./tables */ "./src/tables.ts");
|
|
25269
|
+
/* harmony import */ var _typeguard__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./typeguard */ "./src/typeguard.ts");
|
|
25270
|
+
/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./util */ "./src/util.ts");
|
|
25226
25271
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
25227
25272
|
/**
|
|
25228
25273
|
* ## Description
|
|
@@ -25274,6 +25319,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
25274
25319
|
|
|
25275
25320
|
|
|
25276
25321
|
|
|
25322
|
+
|
|
25277
25323
|
var TupletLocation;
|
|
25278
25324
|
(function (TupletLocation) {
|
|
25279
25325
|
TupletLocation[TupletLocation["BOTTOM"] = -1] = "BOTTOM";
|
|
@@ -25281,7 +25327,7 @@ var TupletLocation;
|
|
|
25281
25327
|
})(TupletLocation || (TupletLocation = {}));
|
|
25282
25328
|
class Tuplet extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
25283
25329
|
static get CATEGORY() {
|
|
25284
|
-
return
|
|
25330
|
+
return _typeguard__WEBPACK_IMPORTED_MODULE_6__.Category.Tuplet;
|
|
25285
25331
|
}
|
|
25286
25332
|
static get LOCATION_TOP() {
|
|
25287
25333
|
return TupletLocation.TOP;
|
|
@@ -25295,22 +25341,27 @@ class Tuplet extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
25295
25341
|
constructor(notes, options = {}) {
|
|
25296
25342
|
super();
|
|
25297
25343
|
if (!notes || !notes.length) {
|
|
25298
|
-
throw new
|
|
25344
|
+
throw new _util__WEBPACK_IMPORTED_MODULE_7__.RuntimeError('BadArguments', 'No notes provided for tuplet.');
|
|
25299
25345
|
}
|
|
25300
|
-
this.options = options;
|
|
25301
25346
|
this.notes = notes;
|
|
25302
|
-
|
|
25303
|
-
|
|
25304
|
-
|
|
25305
|
-
|
|
25306
|
-
|
|
25307
|
-
|
|
25308
|
-
|
|
25309
|
-
|
|
25310
|
-
|
|
25311
|
-
|
|
25347
|
+
const numNotes = options.numNotes !== undefined ? options.numNotes : notes.length;
|
|
25348
|
+
const notesOccupied = options.notesOccupied || 2;
|
|
25349
|
+
const bracketed = options.bracketed !== undefined ? options.bracketed : notes.some((note) => !note.hasBeam());
|
|
25350
|
+
const ratioed = options.ratioed !== undefined ? options.ratioed : Math.abs(notesOccupied - numNotes) > 1;
|
|
25351
|
+
const location = options.location || Tuplet.LOCATION_TOP;
|
|
25352
|
+
const yOffset = options.yOffset || _metrics__WEBPACK_IMPORTED_MODULE_3__.Metrics.get('Tuplet.yOffset');
|
|
25353
|
+
const textYOffset = options.textYOffset || _metrics__WEBPACK_IMPORTED_MODULE_3__.Metrics.get('Tuplet.textYOffset');
|
|
25354
|
+
this.options = {
|
|
25355
|
+
bracketed,
|
|
25356
|
+
location,
|
|
25357
|
+
notesOccupied,
|
|
25358
|
+
numNotes,
|
|
25359
|
+
ratioed,
|
|
25360
|
+
yOffset,
|
|
25361
|
+
textYOffset,
|
|
25362
|
+
};
|
|
25312
25363
|
this.textElement = new _element__WEBPACK_IMPORTED_MODULE_0__.Element('Tuplet');
|
|
25313
|
-
this.setTupletLocation(
|
|
25364
|
+
this.setTupletLocation(location || Tuplet.LOCATION_TOP);
|
|
25314
25365
|
_formatter__WEBPACK_IMPORTED_MODULE_1__.Formatter.AlignRestsToNotes(notes, true, true);
|
|
25315
25366
|
this.resolveGlyphs();
|
|
25316
25367
|
this.attach();
|
|
@@ -25331,14 +25382,14 @@ class Tuplet extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
25331
25382
|
* Set whether or not the bracket is drawn.
|
|
25332
25383
|
*/
|
|
25333
25384
|
setBracketed(bracketed) {
|
|
25334
|
-
this.bracketed =
|
|
25385
|
+
this.options.bracketed = bracketed;
|
|
25335
25386
|
return this;
|
|
25336
25387
|
}
|
|
25337
25388
|
/**
|
|
25338
25389
|
* Set whether or not the ratio is shown.
|
|
25339
25390
|
*/
|
|
25340
25391
|
setRatioed(ratioed) {
|
|
25341
|
-
this.ratioed =
|
|
25392
|
+
this.options.ratioed = ratioed;
|
|
25342
25393
|
return this;
|
|
25343
25394
|
}
|
|
25344
25395
|
/**
|
|
@@ -25350,34 +25401,34 @@ class Tuplet extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
25350
25401
|
console.warn(`Invalid tuplet location [${location}]. Using Tuplet.LOCATION_TOP.`);
|
|
25351
25402
|
location = Tuplet.LOCATION_TOP;
|
|
25352
25403
|
}
|
|
25353
|
-
this.location = location;
|
|
25404
|
+
this.options.location = location;
|
|
25354
25405
|
return this;
|
|
25355
25406
|
}
|
|
25356
25407
|
getNotes() {
|
|
25357
25408
|
return this.notes;
|
|
25358
25409
|
}
|
|
25359
25410
|
getNoteCount() {
|
|
25360
|
-
return this.numNotes;
|
|
25411
|
+
return this.options.numNotes;
|
|
25361
25412
|
}
|
|
25362
25413
|
getNotesOccupied() {
|
|
25363
|
-
return this.notesOccupied;
|
|
25414
|
+
return this.options.notesOccupied;
|
|
25364
25415
|
}
|
|
25365
25416
|
setNotesOccupied(notes) {
|
|
25366
25417
|
this.detach();
|
|
25367
|
-
this.notesOccupied = notes;
|
|
25418
|
+
this.options.notesOccupied = notes;
|
|
25368
25419
|
this.resolveGlyphs();
|
|
25369
25420
|
this.attach();
|
|
25370
25421
|
}
|
|
25371
25422
|
resolveGlyphs() {
|
|
25372
25423
|
let numerator = '';
|
|
25373
25424
|
let denominator = '';
|
|
25374
|
-
let n = this.numNotes;
|
|
25425
|
+
let n = this.options.numNotes;
|
|
25375
25426
|
while (n >= 1) {
|
|
25376
25427
|
numerator = String.fromCharCode(0xe880 /* tuplet0 */ + (n % 10)) + numerator;
|
|
25377
25428
|
n = Math.floor(n / 10);
|
|
25378
25429
|
}
|
|
25379
|
-
if (this.ratioed) {
|
|
25380
|
-
n = this.notesOccupied;
|
|
25430
|
+
if (this.options.ratioed) {
|
|
25431
|
+
n = this.options.notesOccupied;
|
|
25381
25432
|
while (n >= 1) {
|
|
25382
25433
|
denominator = String.fromCharCode(0xe880 /* tuplet0 */ + (n % 10)) + denominator;
|
|
25383
25434
|
n = Math.floor(n / 10);
|
|
@@ -25390,14 +25441,14 @@ class Tuplet extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
25390
25441
|
// on the same side (above/below), to calculate a y
|
|
25391
25442
|
// offset for this tuplet:
|
|
25392
25443
|
getNestedTupletCount() {
|
|
25393
|
-
const location = this.
|
|
25444
|
+
const { location } = this.options;
|
|
25394
25445
|
const firstNote = this.notes[0];
|
|
25395
25446
|
let maxTupletCount = countTuplets(firstNote, location);
|
|
25396
25447
|
let minTupletCount = countTuplets(firstNote, location);
|
|
25397
25448
|
// Count the tuplets that are on the same side (above/below)
|
|
25398
25449
|
// as this tuplet:
|
|
25399
25450
|
function countTuplets(note, location) {
|
|
25400
|
-
return note.getTupletStack().filter((tuplet) => tuplet.location === location).length;
|
|
25451
|
+
return note.getTupletStack().filter((tuplet) => tuplet.options.location === location).length;
|
|
25401
25452
|
}
|
|
25402
25453
|
this.notes.forEach((note) => {
|
|
25403
25454
|
const tupletCount = countTuplets(note, location);
|
|
@@ -25411,15 +25462,15 @@ class Tuplet extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
25411
25462
|
var _a;
|
|
25412
25463
|
// offset the tuplet for any nested tuplets between
|
|
25413
25464
|
// it and the notes:
|
|
25414
|
-
const nestedTupletYOffset = this.getNestedTupletCount() * Tuplet.NESTING_OFFSET * -this.location;
|
|
25465
|
+
const nestedTupletYOffset = this.getNestedTupletCount() * Tuplet.NESTING_OFFSET * -this.options.location;
|
|
25415
25466
|
// offset the tuplet for any manual yOffset:
|
|
25416
25467
|
const yOffset = (_a = this.options.yOffset) !== null && _a !== void 0 ? _a : 0;
|
|
25417
25468
|
// now iterate through the notes and find our highest
|
|
25418
25469
|
// or lowest locations, to form a base yPosition
|
|
25419
25470
|
const firstNote = this.notes[0];
|
|
25420
25471
|
let yPosition;
|
|
25421
|
-
if (this.location === Tuplet.LOCATION_TOP) {
|
|
25422
|
-
yPosition = firstNote.checkStave().getYForLine(0) - 1.5 *
|
|
25472
|
+
if (this.options.location === Tuplet.LOCATION_TOP) {
|
|
25473
|
+
yPosition = firstNote.checkStave().getYForLine(0) - 1.5 * _tables__WEBPACK_IMPORTED_MODULE_5__.Tables.STAVE_LINE_DISTANCE;
|
|
25423
25474
|
// check modifiers above note to see if they will collide with tuplet beam
|
|
25424
25475
|
for (let i = 0; i < this.notes.length; ++i) {
|
|
25425
25476
|
const note = this.notes[i];
|
|
@@ -25428,11 +25479,11 @@ class Tuplet extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
25428
25479
|
if (mc) {
|
|
25429
25480
|
modLines = Math.max(modLines, mc.getState().topTextLine);
|
|
25430
25481
|
}
|
|
25431
|
-
const modY = note.getYForTopText(modLines) - 2 *
|
|
25482
|
+
const modY = note.getYForTopText(modLines) - 2 * _tables__WEBPACK_IMPORTED_MODULE_5__.Tables.STAVE_LINE_DISTANCE;
|
|
25432
25483
|
if (note.hasStem() || note.isRest()) {
|
|
25433
|
-
const topY = note.getStemDirection() ===
|
|
25434
|
-
? note.getStemExtents().topY -
|
|
25435
|
-
: note.getStemExtents().baseY - 2 *
|
|
25484
|
+
const topY = note.getStemDirection() === _stem__WEBPACK_IMPORTED_MODULE_4__.Stem.UP
|
|
25485
|
+
? note.getStemExtents().topY - _tables__WEBPACK_IMPORTED_MODULE_5__.Tables.STAVE_LINE_DISTANCE
|
|
25486
|
+
: note.getStemExtents().baseY - 2 * _tables__WEBPACK_IMPORTED_MODULE_5__.Tables.STAVE_LINE_DISTANCE;
|
|
25436
25487
|
yPosition = Math.min(topY, yPosition);
|
|
25437
25488
|
if (modLines > 0) {
|
|
25438
25489
|
yPosition = Math.min(modY, yPosition);
|
|
@@ -25449,12 +25500,12 @@ class Tuplet extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
25449
25500
|
lineCheck = Math.max(lineCheck, mc.getState().textLine + 1);
|
|
25450
25501
|
}
|
|
25451
25502
|
});
|
|
25452
|
-
yPosition = firstNote.checkStave().getYForLine(lineCheck) + 2 *
|
|
25503
|
+
yPosition = firstNote.checkStave().getYForLine(lineCheck) + 2 * _tables__WEBPACK_IMPORTED_MODULE_5__.Tables.STAVE_LINE_DISTANCE;
|
|
25453
25504
|
for (let i = 0; i < this.notes.length; ++i) {
|
|
25454
25505
|
if (this.notes[i].hasStem() || this.notes[i].isRest()) {
|
|
25455
|
-
const bottomY = this.notes[i].getStemDirection() ===
|
|
25456
|
-
? this.notes[i].getStemExtents().baseY + 2 *
|
|
25457
|
-
: this.notes[i].getStemExtents().topY +
|
|
25506
|
+
const bottomY = this.notes[i].getStemDirection() === _stem__WEBPACK_IMPORTED_MODULE_4__.Stem.UP
|
|
25507
|
+
? this.notes[i].getStemExtents().baseY + 2 * _tables__WEBPACK_IMPORTED_MODULE_5__.Tables.STAVE_LINE_DISTANCE
|
|
25508
|
+
: this.notes[i].getStemExtents().topY + _tables__WEBPACK_IMPORTED_MODULE_5__.Tables.STAVE_LINE_DISTANCE;
|
|
25458
25509
|
if (bottomY > yPosition) {
|
|
25459
25510
|
yPosition = bottomY;
|
|
25460
25511
|
}
|
|
@@ -25464,6 +25515,7 @@ class Tuplet extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
25464
25515
|
return yPosition + nestedTupletYOffset + yOffset;
|
|
25465
25516
|
}
|
|
25466
25517
|
draw() {
|
|
25518
|
+
const { location, bracketed, textYOffset } = this.options;
|
|
25467
25519
|
const ctx = this.checkContext();
|
|
25468
25520
|
let xPos = 0;
|
|
25469
25521
|
let yPos = 0;
|
|
@@ -25471,7 +25523,7 @@ class Tuplet extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
25471
25523
|
// determine x value of left bound of tuplet
|
|
25472
25524
|
const firstNote = this.notes[0];
|
|
25473
25525
|
const lastNote = this.notes[this.notes.length - 1];
|
|
25474
|
-
if (!
|
|
25526
|
+
if (!bracketed) {
|
|
25475
25527
|
xPos = firstNote.getStemX();
|
|
25476
25528
|
this.width = lastNote.getStemX() - xPos;
|
|
25477
25529
|
}
|
|
@@ -25484,18 +25536,18 @@ class Tuplet extends _element__WEBPACK_IMPORTED_MODULE_0__.Element {
|
|
|
25484
25536
|
const notationCenterX = xPos + this.width / 2;
|
|
25485
25537
|
const notationStartX = notationCenterX - this.textElement.getWidth() / 2;
|
|
25486
25538
|
// draw bracket if the tuplet is not beamed
|
|
25487
|
-
if (
|
|
25539
|
+
if (bracketed) {
|
|
25488
25540
|
const lineWidth = this.width / 2 - this.textElement.getWidth() / 2 - 5;
|
|
25489
25541
|
// only draw the bracket if it has positive length
|
|
25490
25542
|
if (lineWidth > 0) {
|
|
25491
25543
|
ctx.fillRect(xPos, yPos, lineWidth, 1);
|
|
25492
25544
|
ctx.fillRect(xPos + this.width / 2 + this.textElement.getWidth() / 2 + 5, yPos, lineWidth, 1);
|
|
25493
|
-
ctx.fillRect(xPos, yPos + (
|
|
25494
|
-
ctx.fillRect(xPos + this.width, yPos + (
|
|
25545
|
+
ctx.fillRect(xPos, yPos + (location === Tuplet.LOCATION_BOTTOM ? 1 : 0), 1, location * 10);
|
|
25546
|
+
ctx.fillRect(xPos + this.width, yPos + (location === Tuplet.LOCATION_BOTTOM ? 1 : 0), 1, location * 10);
|
|
25495
25547
|
}
|
|
25496
25548
|
}
|
|
25497
25549
|
// draw text
|
|
25498
|
-
this.textElement.renderText(ctx, notationStartX, yPos + this.textElement.getHeight() / 2);
|
|
25550
|
+
this.textElement.renderText(ctx, notationStartX, yPos + this.textElement.getHeight() / 2 + (location === Tuplet.LOCATION_TOP ? -1 : 1) * textYOffset);
|
|
25499
25551
|
}
|
|
25500
25552
|
}
|
|
25501
25553
|
|
|
@@ -25590,6 +25642,7 @@ var Category;
|
|
|
25590
25642
|
Category["Curve"] = "Curve";
|
|
25591
25643
|
Category["Dot"] = "Dot";
|
|
25592
25644
|
Category["Element"] = "Element";
|
|
25645
|
+
Category["Flag"] = "Flag";
|
|
25593
25646
|
Category["Fraction"] = "Fraction";
|
|
25594
25647
|
Category["FretHandFinger"] = "FretHandFinger";
|
|
25595
25648
|
Category["GhostNote"] = "GhostNote";
|
|
@@ -25766,7 +25819,6 @@ function sumArray(arr) {
|
|
|
25766
25819
|
* Take `arr` and return a new array consisting of the sorted, unique'd,
|
|
25767
25820
|
* contents of arr. Does not modify `arr`.
|
|
25768
25821
|
*/
|
|
25769
|
-
// eslint-disable-next-line
|
|
25770
25822
|
/*
|
|
25771
25823
|
static sortAndUnique(arr: any[], cmp: any, eq: any): any[] {
|
|
25772
25824
|
if (arr.length > 1) {
|
|
@@ -26056,6 +26108,7 @@ class VexFlow {
|
|
|
26056
26108
|
static setFonts(...fontNames) {
|
|
26057
26109
|
// Convert the array of font names into an array of Font objects.
|
|
26058
26110
|
_metrics__WEBPACK_IMPORTED_MODULE_30__.MetricsDefaults.fontFamily = fontNames.join(',');
|
|
26111
|
+
_metrics__WEBPACK_IMPORTED_MODULE_30__.Metrics.clear();
|
|
26059
26112
|
}
|
|
26060
26113
|
static getFonts() {
|
|
26061
26114
|
return _metrics__WEBPACK_IMPORTED_MODULE_30__.Metrics.get('fontFamily').split(',');
|
|
@@ -26109,10 +26162,13 @@ class VexFlow {
|
|
|
26109
26162
|
_tables__WEBPACK_IMPORTED_MODULE_63__.Tables.STAVE_LINE_DISTANCE = value;
|
|
26110
26163
|
}
|
|
26111
26164
|
static get STAVE_LINE_THICKNESS() {
|
|
26112
|
-
return
|
|
26165
|
+
return _metrics__WEBPACK_IMPORTED_MODULE_30__.MetricsDefaults.Stave.lineWidth;
|
|
26113
26166
|
}
|
|
26114
26167
|
static set STAVE_LINE_THICKNESS(value) {
|
|
26115
|
-
|
|
26168
|
+
_metrics__WEBPACK_IMPORTED_MODULE_30__.MetricsDefaults.Stave.lineWidth = value;
|
|
26169
|
+
_metrics__WEBPACK_IMPORTED_MODULE_30__.MetricsDefaults.TabStave.lineWidth = value;
|
|
26170
|
+
_metrics__WEBPACK_IMPORTED_MODULE_30__.Metrics.clear('Stave');
|
|
26171
|
+
_metrics__WEBPACK_IMPORTED_MODULE_30__.Metrics.clear('TabStave');
|
|
26116
26172
|
}
|
|
26117
26173
|
static get STEM_HEIGHT() {
|
|
26118
26174
|
return _tables__WEBPACK_IMPORTED_MODULE_63__.Tables.STEM_HEIGHT;
|
|
@@ -26281,12 +26337,14 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
26281
26337
|
/* harmony import */ var _modifier__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./modifier */ "./src/modifier.ts");
|
|
26282
26338
|
/* harmony import */ var _tables__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./tables */ "./src/tables.ts");
|
|
26283
26339
|
/* harmony import */ var _typeguard__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./typeguard */ "./src/typeguard.ts");
|
|
26340
|
+
/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./util */ "./src/util.ts");
|
|
26284
26341
|
// Copyright (c) 2023-present VexFlow contributors: https://github.com/vexflow/vexflow/graphs/contributors
|
|
26285
26342
|
// MIT License
|
|
26286
26343
|
|
|
26287
26344
|
|
|
26288
26345
|
|
|
26289
26346
|
|
|
26347
|
+
|
|
26290
26348
|
/** `Vibrato` implements diverse vibratos. */
|
|
26291
26349
|
class Vibrato extends _modifier__WEBPACK_IMPORTED_MODULE_1__.Modifier {
|
|
26292
26350
|
static get CATEGORY() {
|
|
@@ -26333,7 +26391,11 @@ class Vibrato extends _modifier__WEBPACK_IMPORTED_MODULE_1__.Modifier {
|
|
|
26333
26391
|
setVibratoWidth(width) {
|
|
26334
26392
|
this.renderOptions.width = width;
|
|
26335
26393
|
this.text = String.fromCodePoint(this.renderOptions.code);
|
|
26336
|
-
const
|
|
26394
|
+
const myWidth = this.getWidth();
|
|
26395
|
+
if (!myWidth) {
|
|
26396
|
+
throw new _util__WEBPACK_IMPORTED_MODULE_4__.RuntimeError('Cannot set vibrato width if width is 0');
|
|
26397
|
+
}
|
|
26398
|
+
const items = Math.round(this.renderOptions.width / myWidth);
|
|
26337
26399
|
for (let i = 1; i < items; i++) {
|
|
26338
26400
|
this.text += String.fromCodePoint(this.renderOptions.code);
|
|
26339
26401
|
}
|
|
@@ -26817,8 +26879,6 @@ function isHTMLDiv(element) {
|
|
|
26817
26879
|
/******/
|
|
26818
26880
|
/************************************************************************/
|
|
26819
26881
|
var __webpack_exports__ = {};
|
|
26820
|
-
// This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk.
|
|
26821
|
-
(() => {
|
|
26822
26882
|
/*!********************************!*\
|
|
26823
26883
|
!*** ./entry/vexflow-debug.ts ***!
|
|
26824
26884
|
\********************************/
|
|
@@ -26855,6 +26915,7 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
26855
26915
|
/* harmony export */ EasyScoreGrammar: () => (/* reexport safe */ _src_index__WEBPACK_IMPORTED_MODULE_8__.EasyScoreGrammar),
|
|
26856
26916
|
/* harmony export */ Element: () => (/* reexport safe */ _src_index__WEBPACK_IMPORTED_MODULE_8__.Element),
|
|
26857
26917
|
/* harmony export */ Factory: () => (/* reexport safe */ _src_index__WEBPACK_IMPORTED_MODULE_8__.Factory),
|
|
26918
|
+
/* harmony export */ Flag: () => (/* reexport safe */ _src_index__WEBPACK_IMPORTED_MODULE_8__.Flag),
|
|
26858
26919
|
/* harmony export */ Font: () => (/* reexport safe */ _src_index__WEBPACK_IMPORTED_MODULE_8__.Font),
|
|
26859
26920
|
/* harmony export */ FontStyle: () => (/* reexport safe */ _src_index__WEBPACK_IMPORTED_MODULE_8__.FontStyle),
|
|
26860
26921
|
/* harmony export */ FontWeight: () => (/* reexport safe */ _src_index__WEBPACK_IMPORTED_MODULE_8__.FontWeight),
|
|
@@ -27017,8 +27078,6 @@ Promise.allSettled(fontLoadPromises).then(() => {
|
|
|
27017
27078
|
|
|
27018
27079
|
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (_src_vexflow__WEBPACK_IMPORTED_MODULE_0__.VexFlow);
|
|
27019
27080
|
|
|
27020
|
-
})();
|
|
27021
|
-
|
|
27022
27081
|
__webpack_exports__ = __webpack_exports__["default"];
|
|
27023
27082
|
/******/ return __webpack_exports__;
|
|
27024
27083
|
/******/ })()
|