@coderline/alphatab 1.7.0-alpha.1589 → 1.7.0-alpha.1596
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/dist/alphaTab.core.min.mjs +2 -2
- package/dist/alphaTab.core.mjs +32 -31
- package/dist/alphaTab.d.ts +13 -12
- package/dist/alphaTab.js +32 -31
- package/dist/alphaTab.min.js +2 -2
- package/dist/alphaTab.min.mjs +1 -1
- package/dist/alphaTab.mjs +1 -1
- package/dist/alphaTab.vite.core.js +1 -1
- package/dist/alphaTab.vite.core.mjs +1 -1
- package/dist/alphaTab.webpack.core.js +1 -1
- package/dist/alphaTab.webpack.core.mjs +1 -1
- package/dist/alphaTab.worker.min.mjs +1 -1
- package/dist/alphaTab.worker.mjs +1 -1
- package/dist/alphaTab.worklet.min.mjs +1 -1
- package/dist/alphaTab.worklet.mjs +1 -1
- package/package.json +2 -2
package/dist/alphaTab.core.mjs
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*!
|
|
2
|
-
* alphaTab v1.7.0-alpha.
|
|
2
|
+
* alphaTab v1.7.0-alpha.1596 (develop, build 1596)
|
|
3
3
|
*
|
|
4
4
|
* Copyright © 2025, Daniel Kuschny and Contributors, All rights reserved.
|
|
5
5
|
*
|
|
@@ -203,9 +203,9 @@ class AlphaTabError extends Error {
|
|
|
203
203
|
* @internal
|
|
204
204
|
*/
|
|
205
205
|
class VersionInfo {
|
|
206
|
-
static version = '1.7.0-alpha.
|
|
207
|
-
static date = '2025-
|
|
208
|
-
static commit = '
|
|
206
|
+
static version = '1.7.0-alpha.1596';
|
|
207
|
+
static date = '2025-11-04T02:05:51.319Z';
|
|
208
|
+
static commit = 'c2d7d17223e664c007da687afb2476d092ace2e1';
|
|
209
209
|
static print(print) {
|
|
210
210
|
print(`alphaTab ${VersionInfo.version}`);
|
|
211
211
|
print(`commit: ${VersionInfo.commit}`);
|
|
@@ -8183,12 +8183,12 @@ var AlphaTexAccidentalMode;
|
|
|
8183
8183
|
* Lists the note kinds we can detect
|
|
8184
8184
|
* @public
|
|
8185
8185
|
*/
|
|
8186
|
-
var
|
|
8187
|
-
(function (
|
|
8188
|
-
|
|
8189
|
-
|
|
8190
|
-
|
|
8191
|
-
})(
|
|
8186
|
+
var AlphaTexStaffNoteKind;
|
|
8187
|
+
(function (AlphaTexStaffNoteKind) {
|
|
8188
|
+
AlphaTexStaffNoteKind[AlphaTexStaffNoteKind["Pitched"] = 0] = "Pitched";
|
|
8189
|
+
AlphaTexStaffNoteKind[AlphaTexStaffNoteKind["Fretted"] = 1] = "Fretted";
|
|
8190
|
+
AlphaTexStaffNoteKind[AlphaTexStaffNoteKind["Articulation"] = 2] = "Articulation";
|
|
8191
|
+
})(AlphaTexStaffNoteKind || (AlphaTexStaffNoteKind = {}));
|
|
8192
8192
|
|
|
8193
8193
|
/**
|
|
8194
8194
|
* Lists all directions which can be applied to a masterbar.
|
|
@@ -11531,7 +11531,7 @@ class AlphaTex1LanguageHandler {
|
|
|
11531
11531
|
case 'piano':
|
|
11532
11532
|
case 'none':
|
|
11533
11533
|
case 'voice':
|
|
11534
|
-
importer.applyStaffNoteKind(staff,
|
|
11534
|
+
importer.applyStaffNoteKind(staff, AlphaTexStaffNoteKind.Pitched);
|
|
11535
11535
|
i = metaData.values.values.length;
|
|
11536
11536
|
break;
|
|
11537
11537
|
// backwards compatibility only
|
|
@@ -12217,7 +12217,7 @@ class AlphaTex1LanguageHandler {
|
|
|
12217
12217
|
const instrumentName = values.values[0].text.toLowerCase();
|
|
12218
12218
|
if (instrumentName === 'percussion') {
|
|
12219
12219
|
for (const staff of track.staves) {
|
|
12220
|
-
importer.applyStaffNoteKind(staff,
|
|
12220
|
+
importer.applyStaffNoteKind(staff, AlphaTexStaffNoteKind.Articulation);
|
|
12221
12221
|
}
|
|
12222
12222
|
track.playbackInfo.primaryChannel = SynthConstants.PercussionChannel;
|
|
12223
12223
|
track.playbackInfo.secondaryChannel = SynthConstants.PercussionChannel;
|
|
@@ -16229,10 +16229,10 @@ class AlphaTexImporter extends ScoreImporter {
|
|
|
16229
16229
|
case AlphaTexNodeType.Number:
|
|
16230
16230
|
numericValue = noteValue.value;
|
|
16231
16231
|
if (node.noteString !== undefined) {
|
|
16232
|
-
detectedNoteKind =
|
|
16232
|
+
detectedNoteKind = AlphaTexStaffNoteKind.Fretted;
|
|
16233
16233
|
}
|
|
16234
16234
|
else {
|
|
16235
|
-
detectedNoteKind =
|
|
16235
|
+
detectedNoteKind = AlphaTexStaffNoteKind.Articulation;
|
|
16236
16236
|
}
|
|
16237
16237
|
break;
|
|
16238
16238
|
case AlphaTexNodeType.String:
|
|
@@ -16247,7 +16247,7 @@ class AlphaTexImporter extends ScoreImporter {
|
|
|
16247
16247
|
else {
|
|
16248
16248
|
const tuning = ModelUtils.parseTuning(str);
|
|
16249
16249
|
if (tuning) {
|
|
16250
|
-
detectedNoteKind =
|
|
16250
|
+
detectedNoteKind = AlphaTexStaffNoteKind.Pitched;
|
|
16251
16251
|
octave = tuning.octave;
|
|
16252
16252
|
tone = tuning.tone.noteValue;
|
|
16253
16253
|
if (this._state.accidentalMode === AlphaTexAccidentalMode.Explicit) {
|
|
@@ -16255,7 +16255,7 @@ class AlphaTexImporter extends ScoreImporter {
|
|
|
16255
16255
|
}
|
|
16256
16256
|
}
|
|
16257
16257
|
else {
|
|
16258
|
-
detectedNoteKind =
|
|
16258
|
+
detectedNoteKind = AlphaTexStaffNoteKind.Articulation;
|
|
16259
16259
|
const articulationName = str.toLowerCase();
|
|
16260
16260
|
// apply defaults
|
|
16261
16261
|
const percussionArticulationNames = this._state.percussionArticulationNames;
|
|
@@ -16292,7 +16292,7 @@ class AlphaTexImporter extends ScoreImporter {
|
|
|
16292
16292
|
else if (staffNoteKind !== detectedNoteKind) {
|
|
16293
16293
|
this.addSemanticDiagnostic({
|
|
16294
16294
|
code: AlphaTexDiagnosticCode.AT218,
|
|
16295
|
-
message: `Wrong note kind '${
|
|
16295
|
+
message: `Wrong note kind '${AlphaTexStaffNoteKind[detectedNoteKind]}' for staff with note kind ''${AlphaTexStaffNoteKind[staffNoteKind]}'. Do not mix incompatible staves and notes.`,
|
|
16296
16296
|
severity: AlphaTexDiagnosticsSeverity.Error
|
|
16297
16297
|
});
|
|
16298
16298
|
}
|
|
@@ -16311,12 +16311,12 @@ class AlphaTexImporter extends ScoreImporter {
|
|
|
16311
16311
|
// valid note kind detected, apply values, tied/dead notes at start might be rare, but can happen.
|
|
16312
16312
|
if (detectedNoteKind !== undefined && detectedNoteKind === staffNoteKind) {
|
|
16313
16313
|
switch (detectedNoteKind) {
|
|
16314
|
-
case
|
|
16314
|
+
case AlphaTexStaffNoteKind.Pitched:
|
|
16315
16315
|
note.octave = octave;
|
|
16316
16316
|
note.tone = tone;
|
|
16317
16317
|
note.accidentalMode = accidentalMode;
|
|
16318
16318
|
break;
|
|
16319
|
-
case
|
|
16319
|
+
case AlphaTexStaffNoteKind.Fretted:
|
|
16320
16320
|
// Fret [Dot] String
|
|
16321
16321
|
if (!node.noteString) {
|
|
16322
16322
|
this.addSemanticDiagnostic({
|
|
@@ -16344,7 +16344,7 @@ class AlphaTexImporter extends ScoreImporter {
|
|
|
16344
16344
|
note.fret = numericValue;
|
|
16345
16345
|
}
|
|
16346
16346
|
break;
|
|
16347
|
-
case
|
|
16347
|
+
case AlphaTexStaffNoteKind.Articulation:
|
|
16348
16348
|
let articulationIndex = 0;
|
|
16349
16349
|
if (this._state.articulationValueToIndex.has(numericValue)) {
|
|
16350
16350
|
articulationIndex = this._state.articulationValueToIndex.get(numericValue);
|
|
@@ -16386,19 +16386,19 @@ class AlphaTexImporter extends ScoreImporter {
|
|
|
16386
16386
|
applyStaffNoteKind(staff, staffNoteKind) {
|
|
16387
16387
|
this._state.staffNoteKind.set(staff, staffNoteKind);
|
|
16388
16388
|
switch (staffNoteKind) {
|
|
16389
|
-
case
|
|
16389
|
+
case AlphaTexStaffNoteKind.Pitched:
|
|
16390
16390
|
staff.isPercussion = false;
|
|
16391
16391
|
staff.stringTuning.reset();
|
|
16392
16392
|
if (!this._state.staffHasExplicitDisplayTransposition.has(staff)) {
|
|
16393
16393
|
staff.displayTranspositionPitch = 0;
|
|
16394
16394
|
}
|
|
16395
16395
|
break;
|
|
16396
|
-
case
|
|
16396
|
+
case AlphaTexStaffNoteKind.Fretted:
|
|
16397
16397
|
staff.isPercussion = false;
|
|
16398
16398
|
this._detectTuningForStaff(staff);
|
|
16399
16399
|
this._handleTransposition(staff);
|
|
16400
16400
|
break;
|
|
16401
|
-
case
|
|
16401
|
+
case AlphaTexStaffNoteKind.Articulation:
|
|
16402
16402
|
staff.isPercussion = true;
|
|
16403
16403
|
staff.stringTuning.reset();
|
|
16404
16404
|
if (!this._state.staffHasExplicitDisplayTransposition.has(staff)) {
|
|
@@ -16511,7 +16511,7 @@ class AlphaTexImporter extends ScoreImporter {
|
|
|
16511
16511
|
else {
|
|
16512
16512
|
// any non-guitar instrument -> use guitar 6 string tuning
|
|
16513
16513
|
if (this._state.staffNoteKind.has(staff) &&
|
|
16514
|
-
this._state.staffNoteKind.get(staff) ===
|
|
16514
|
+
this._state.staffNoteKind.get(staff) === AlphaTexStaffNoteKind.Fretted) {
|
|
16515
16515
|
staff.stringTuning = Tuning.getDefaultTuningFor(6);
|
|
16516
16516
|
}
|
|
16517
16517
|
}
|
|
@@ -62262,9 +62262,8 @@ class HorizontalScreenLayout extends ScoreLayout {
|
|
|
62262
62262
|
Logger.debug(this.name, `Finished partial from bar ${currentPartial.masterBars[0].index} to ${currentPartial.masterBars[currentPartial.masterBars.length - 1].index}`, null);
|
|
62263
62263
|
}
|
|
62264
62264
|
this._finalizeStaffSystem();
|
|
62265
|
-
|
|
62266
|
-
this.
|
|
62267
|
-
this.width = (this._system.x + this._system.width + this.pagePadding[2]) * scale;
|
|
62265
|
+
this.height = Math.floor(this._system.y + this._system.height);
|
|
62266
|
+
this.width = (this._system.x + this._system.width + this.pagePadding[2]);
|
|
62268
62267
|
currentBarIndex = 0;
|
|
62269
62268
|
let x = 0;
|
|
62270
62269
|
for (let i = 0; i < partials.length; i++) {
|
|
@@ -62272,10 +62271,10 @@ class HorizontalScreenLayout extends ScoreLayout {
|
|
|
62272
62271
|
const e = new RenderFinishedEventArgs();
|
|
62273
62272
|
e.x = x;
|
|
62274
62273
|
e.y = 0;
|
|
62275
|
-
e.totalWidth = this.width
|
|
62276
|
-
e.totalHeight = this.height
|
|
62274
|
+
e.totalWidth = this.width;
|
|
62275
|
+
e.totalHeight = this.height;
|
|
62277
62276
|
e.width = partial.width;
|
|
62278
|
-
e.height = this.height
|
|
62277
|
+
e.height = this.height;
|
|
62279
62278
|
e.firstMasterBarIndex = partial.masterBars[0].index;
|
|
62280
62279
|
e.lastMasterBarIndex = partial.masterBars[partial.masterBars.length - 1].index;
|
|
62281
62280
|
x += partial.width;
|
|
@@ -62298,6 +62297,7 @@ class HorizontalScreenLayout extends ScoreLayout {
|
|
|
62298
62297
|
this.height = this.layoutAndRenderBottomScoreInfo(this.height);
|
|
62299
62298
|
this.height = this.layoutAndRenderAnnotation(this.height);
|
|
62300
62299
|
this.height += this.pagePadding[3];
|
|
62300
|
+
this.height *= this.renderer.settings.display.scale;
|
|
62301
62301
|
}
|
|
62302
62302
|
_finalizeStaffSystem() {
|
|
62303
62303
|
this._system.scaleToWidth(this._system.width);
|
|
@@ -71618,7 +71618,8 @@ const _barrel$7 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty(
|
|
|
71618
71618
|
get AlphaTexDiagnosticsSeverity () { return AlphaTexDiagnosticsSeverity; },
|
|
71619
71619
|
AlphaTexLexer,
|
|
71620
71620
|
get AlphaTexNodeType () { return AlphaTexNodeType; },
|
|
71621
|
-
AlphaTexParser
|
|
71621
|
+
AlphaTexParser,
|
|
71622
|
+
get AlphaTexStaffNoteKind () { return AlphaTexStaffNoteKind; }
|
|
71622
71623
|
}, Symbol.toStringTag, { value: 'Module' }));
|
|
71623
71624
|
|
|
71624
71625
|
const _barrel$6 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
|
package/dist/alphaTab.d.ts
CHANGED
|
@@ -2976,6 +2976,7 @@ export declare namespace alphaTex {
|
|
|
2976
2976
|
AlphaTexDiagnosticBag,
|
|
2977
2977
|
AlphaTexDiagnosticCode,
|
|
2978
2978
|
AlphaTexDiagnosticsSeverity,
|
|
2979
|
+
AlphaTexStaffNoteKind,
|
|
2979
2980
|
IAlphaTexImporter,
|
|
2980
2981
|
IAlphaTexImporterState
|
|
2981
2982
|
}
|
|
@@ -3442,7 +3443,7 @@ declare class AlphaTexImporter extends ScoreImporter implements IAlphaTexImporte
|
|
|
3442
3443
|
private _parseDuration;
|
|
3443
3444
|
private _note;
|
|
3444
3445
|
|
|
3445
|
-
applyStaffNoteKind(staff: Staff, staffNoteKind:
|
|
3446
|
+
applyStaffNoteKind(staff: Staff, staffNoteKind: AlphaTexStaffNoteKind): void;
|
|
3446
3447
|
private _noteEffects;
|
|
3447
3448
|
private _handleTransposition;
|
|
3448
3449
|
private _detectTuningForStaff;
|
|
@@ -3742,6 +3743,16 @@ declare interface AlphaTexScoreNode extends AlphaTexAstNode {
|
|
|
3742
3743
|
bars: AlphaTexBarNode[];
|
|
3743
3744
|
}
|
|
3744
3745
|
|
|
3746
|
+
/**
|
|
3747
|
+
* Lists the note kinds we can detect
|
|
3748
|
+
* @public
|
|
3749
|
+
*/
|
|
3750
|
+
declare enum AlphaTexStaffNoteKind {
|
|
3751
|
+
Pitched = 0,
|
|
3752
|
+
Fretted = 1,
|
|
3753
|
+
Articulation = 2
|
|
3754
|
+
}
|
|
3755
|
+
|
|
3745
3756
|
/**
|
|
3746
3757
|
* A string literal within alphaTex.
|
|
3747
3758
|
* @record
|
|
@@ -8531,7 +8542,7 @@ declare interface IAlphaTexAstNode {
|
|
|
8531
8542
|
*/
|
|
8532
8543
|
declare interface IAlphaTexImporter {
|
|
8533
8544
|
readonly state: IAlphaTexImporterState;
|
|
8534
|
-
applyStaffNoteKind(staff: Staff, staffNoteKind:
|
|
8545
|
+
applyStaffNoteKind(staff: Staff, staffNoteKind: AlphaTexStaffNoteKind): void;
|
|
8535
8546
|
startNewVoice(): void;
|
|
8536
8547
|
startNewTrack(): Track;
|
|
8537
8548
|
startNewStaff(): Staff;
|
|
@@ -14692,16 +14703,6 @@ declare class Staff {
|
|
|
14692
14703
|
addBar(bar: Bar): void;
|
|
14693
14704
|
}
|
|
14694
14705
|
|
|
14695
|
-
/**
|
|
14696
|
-
* Lists the note kinds we can detect
|
|
14697
|
-
* @public
|
|
14698
|
-
*/
|
|
14699
|
-
declare enum StaffNoteKind {
|
|
14700
|
-
Pitched = 0,
|
|
14701
|
-
Fretted = 1,
|
|
14702
|
-
Articulation = 2
|
|
14703
|
-
}
|
|
14704
|
-
|
|
14705
14706
|
/**
|
|
14706
14707
|
* Represents the bounds of a staff system.
|
|
14707
14708
|
* @public
|
package/dist/alphaTab.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*!
|
|
2
|
-
* alphaTab v1.7.0-alpha.
|
|
2
|
+
* alphaTab v1.7.0-alpha.1596 (develop, build 1596)
|
|
3
3
|
*
|
|
4
4
|
* Copyright © 2025, Daniel Kuschny and Contributors, All rights reserved.
|
|
5
5
|
*
|
|
@@ -209,9 +209,9 @@
|
|
|
209
209
|
* @internal
|
|
210
210
|
*/
|
|
211
211
|
class VersionInfo {
|
|
212
|
-
static version = '1.7.0-alpha.
|
|
213
|
-
static date = '2025-
|
|
214
|
-
static commit = '
|
|
212
|
+
static version = '1.7.0-alpha.1596';
|
|
213
|
+
static date = '2025-11-04T02:05:51.319Z';
|
|
214
|
+
static commit = 'c2d7d17223e664c007da687afb2476d092ace2e1';
|
|
215
215
|
static print(print) {
|
|
216
216
|
print(`alphaTab ${VersionInfo.version}`);
|
|
217
217
|
print(`commit: ${VersionInfo.commit}`);
|
|
@@ -8189,12 +8189,12 @@
|
|
|
8189
8189
|
* Lists the note kinds we can detect
|
|
8190
8190
|
* @public
|
|
8191
8191
|
*/
|
|
8192
|
-
var
|
|
8193
|
-
(function (
|
|
8194
|
-
|
|
8195
|
-
|
|
8196
|
-
|
|
8197
|
-
})(
|
|
8192
|
+
var AlphaTexStaffNoteKind;
|
|
8193
|
+
(function (AlphaTexStaffNoteKind) {
|
|
8194
|
+
AlphaTexStaffNoteKind[AlphaTexStaffNoteKind["Pitched"] = 0] = "Pitched";
|
|
8195
|
+
AlphaTexStaffNoteKind[AlphaTexStaffNoteKind["Fretted"] = 1] = "Fretted";
|
|
8196
|
+
AlphaTexStaffNoteKind[AlphaTexStaffNoteKind["Articulation"] = 2] = "Articulation";
|
|
8197
|
+
})(AlphaTexStaffNoteKind || (AlphaTexStaffNoteKind = {}));
|
|
8198
8198
|
|
|
8199
8199
|
/**
|
|
8200
8200
|
* Lists all directions which can be applied to a masterbar.
|
|
@@ -11537,7 +11537,7 @@
|
|
|
11537
11537
|
case 'piano':
|
|
11538
11538
|
case 'none':
|
|
11539
11539
|
case 'voice':
|
|
11540
|
-
importer.applyStaffNoteKind(staff,
|
|
11540
|
+
importer.applyStaffNoteKind(staff, AlphaTexStaffNoteKind.Pitched);
|
|
11541
11541
|
i = metaData.values.values.length;
|
|
11542
11542
|
break;
|
|
11543
11543
|
// backwards compatibility only
|
|
@@ -12223,7 +12223,7 @@
|
|
|
12223
12223
|
const instrumentName = values.values[0].text.toLowerCase();
|
|
12224
12224
|
if (instrumentName === 'percussion') {
|
|
12225
12225
|
for (const staff of track.staves) {
|
|
12226
|
-
importer.applyStaffNoteKind(staff,
|
|
12226
|
+
importer.applyStaffNoteKind(staff, AlphaTexStaffNoteKind.Articulation);
|
|
12227
12227
|
}
|
|
12228
12228
|
track.playbackInfo.primaryChannel = SynthConstants.PercussionChannel;
|
|
12229
12229
|
track.playbackInfo.secondaryChannel = SynthConstants.PercussionChannel;
|
|
@@ -16235,10 +16235,10 @@
|
|
|
16235
16235
|
case AlphaTexNodeType.Number:
|
|
16236
16236
|
numericValue = noteValue.value;
|
|
16237
16237
|
if (node.noteString !== undefined) {
|
|
16238
|
-
detectedNoteKind =
|
|
16238
|
+
detectedNoteKind = AlphaTexStaffNoteKind.Fretted;
|
|
16239
16239
|
}
|
|
16240
16240
|
else {
|
|
16241
|
-
detectedNoteKind =
|
|
16241
|
+
detectedNoteKind = AlphaTexStaffNoteKind.Articulation;
|
|
16242
16242
|
}
|
|
16243
16243
|
break;
|
|
16244
16244
|
case AlphaTexNodeType.String:
|
|
@@ -16253,7 +16253,7 @@
|
|
|
16253
16253
|
else {
|
|
16254
16254
|
const tuning = ModelUtils.parseTuning(str);
|
|
16255
16255
|
if (tuning) {
|
|
16256
|
-
detectedNoteKind =
|
|
16256
|
+
detectedNoteKind = AlphaTexStaffNoteKind.Pitched;
|
|
16257
16257
|
octave = tuning.octave;
|
|
16258
16258
|
tone = tuning.tone.noteValue;
|
|
16259
16259
|
if (this._state.accidentalMode === AlphaTexAccidentalMode.Explicit) {
|
|
@@ -16261,7 +16261,7 @@
|
|
|
16261
16261
|
}
|
|
16262
16262
|
}
|
|
16263
16263
|
else {
|
|
16264
|
-
detectedNoteKind =
|
|
16264
|
+
detectedNoteKind = AlphaTexStaffNoteKind.Articulation;
|
|
16265
16265
|
const articulationName = str.toLowerCase();
|
|
16266
16266
|
// apply defaults
|
|
16267
16267
|
const percussionArticulationNames = this._state.percussionArticulationNames;
|
|
@@ -16298,7 +16298,7 @@
|
|
|
16298
16298
|
else if (staffNoteKind !== detectedNoteKind) {
|
|
16299
16299
|
this.addSemanticDiagnostic({
|
|
16300
16300
|
code: AlphaTexDiagnosticCode.AT218,
|
|
16301
|
-
message: `Wrong note kind '${
|
|
16301
|
+
message: `Wrong note kind '${AlphaTexStaffNoteKind[detectedNoteKind]}' for staff with note kind ''${AlphaTexStaffNoteKind[staffNoteKind]}'. Do not mix incompatible staves and notes.`,
|
|
16302
16302
|
severity: AlphaTexDiagnosticsSeverity.Error
|
|
16303
16303
|
});
|
|
16304
16304
|
}
|
|
@@ -16317,12 +16317,12 @@
|
|
|
16317
16317
|
// valid note kind detected, apply values, tied/dead notes at start might be rare, but can happen.
|
|
16318
16318
|
if (detectedNoteKind !== undefined && detectedNoteKind === staffNoteKind) {
|
|
16319
16319
|
switch (detectedNoteKind) {
|
|
16320
|
-
case
|
|
16320
|
+
case AlphaTexStaffNoteKind.Pitched:
|
|
16321
16321
|
note.octave = octave;
|
|
16322
16322
|
note.tone = tone;
|
|
16323
16323
|
note.accidentalMode = accidentalMode;
|
|
16324
16324
|
break;
|
|
16325
|
-
case
|
|
16325
|
+
case AlphaTexStaffNoteKind.Fretted:
|
|
16326
16326
|
// Fret [Dot] String
|
|
16327
16327
|
if (!node.noteString) {
|
|
16328
16328
|
this.addSemanticDiagnostic({
|
|
@@ -16350,7 +16350,7 @@
|
|
|
16350
16350
|
note.fret = numericValue;
|
|
16351
16351
|
}
|
|
16352
16352
|
break;
|
|
16353
|
-
case
|
|
16353
|
+
case AlphaTexStaffNoteKind.Articulation:
|
|
16354
16354
|
let articulationIndex = 0;
|
|
16355
16355
|
if (this._state.articulationValueToIndex.has(numericValue)) {
|
|
16356
16356
|
articulationIndex = this._state.articulationValueToIndex.get(numericValue);
|
|
@@ -16392,19 +16392,19 @@
|
|
|
16392
16392
|
applyStaffNoteKind(staff, staffNoteKind) {
|
|
16393
16393
|
this._state.staffNoteKind.set(staff, staffNoteKind);
|
|
16394
16394
|
switch (staffNoteKind) {
|
|
16395
|
-
case
|
|
16395
|
+
case AlphaTexStaffNoteKind.Pitched:
|
|
16396
16396
|
staff.isPercussion = false;
|
|
16397
16397
|
staff.stringTuning.reset();
|
|
16398
16398
|
if (!this._state.staffHasExplicitDisplayTransposition.has(staff)) {
|
|
16399
16399
|
staff.displayTranspositionPitch = 0;
|
|
16400
16400
|
}
|
|
16401
16401
|
break;
|
|
16402
|
-
case
|
|
16402
|
+
case AlphaTexStaffNoteKind.Fretted:
|
|
16403
16403
|
staff.isPercussion = false;
|
|
16404
16404
|
this._detectTuningForStaff(staff);
|
|
16405
16405
|
this._handleTransposition(staff);
|
|
16406
16406
|
break;
|
|
16407
|
-
case
|
|
16407
|
+
case AlphaTexStaffNoteKind.Articulation:
|
|
16408
16408
|
staff.isPercussion = true;
|
|
16409
16409
|
staff.stringTuning.reset();
|
|
16410
16410
|
if (!this._state.staffHasExplicitDisplayTransposition.has(staff)) {
|
|
@@ -16517,7 +16517,7 @@
|
|
|
16517
16517
|
else {
|
|
16518
16518
|
// any non-guitar instrument -> use guitar 6 string tuning
|
|
16519
16519
|
if (this._state.staffNoteKind.has(staff) &&
|
|
16520
|
-
this._state.staffNoteKind.get(staff) ===
|
|
16520
|
+
this._state.staffNoteKind.get(staff) === AlphaTexStaffNoteKind.Fretted) {
|
|
16521
16521
|
staff.stringTuning = Tuning.getDefaultTuningFor(6);
|
|
16522
16522
|
}
|
|
16523
16523
|
}
|
|
@@ -62268,9 +62268,8 @@
|
|
|
62268
62268
|
Logger.debug(this.name, `Finished partial from bar ${currentPartial.masterBars[0].index} to ${currentPartial.masterBars[currentPartial.masterBars.length - 1].index}`, null);
|
|
62269
62269
|
}
|
|
62270
62270
|
this._finalizeStaffSystem();
|
|
62271
|
-
|
|
62272
|
-
this.
|
|
62273
|
-
this.width = (this._system.x + this._system.width + this.pagePadding[2]) * scale;
|
|
62271
|
+
this.height = Math.floor(this._system.y + this._system.height);
|
|
62272
|
+
this.width = (this._system.x + this._system.width + this.pagePadding[2]);
|
|
62274
62273
|
currentBarIndex = 0;
|
|
62275
62274
|
let x = 0;
|
|
62276
62275
|
for (let i = 0; i < partials.length; i++) {
|
|
@@ -62278,10 +62277,10 @@
|
|
|
62278
62277
|
const e = new RenderFinishedEventArgs();
|
|
62279
62278
|
e.x = x;
|
|
62280
62279
|
e.y = 0;
|
|
62281
|
-
e.totalWidth = this.width
|
|
62282
|
-
e.totalHeight = this.height
|
|
62280
|
+
e.totalWidth = this.width;
|
|
62281
|
+
e.totalHeight = this.height;
|
|
62283
62282
|
e.width = partial.width;
|
|
62284
|
-
e.height = this.height
|
|
62283
|
+
e.height = this.height;
|
|
62285
62284
|
e.firstMasterBarIndex = partial.masterBars[0].index;
|
|
62286
62285
|
e.lastMasterBarIndex = partial.masterBars[partial.masterBars.length - 1].index;
|
|
62287
62286
|
x += partial.width;
|
|
@@ -62304,6 +62303,7 @@
|
|
|
62304
62303
|
this.height = this.layoutAndRenderBottomScoreInfo(this.height);
|
|
62305
62304
|
this.height = this.layoutAndRenderAnnotation(this.height);
|
|
62306
62305
|
this.height += this.pagePadding[3];
|
|
62306
|
+
this.height *= this.renderer.settings.display.scale;
|
|
62307
62307
|
}
|
|
62308
62308
|
_finalizeStaffSystem() {
|
|
62309
62309
|
this._system.scaleToWidth(this._system.width);
|
|
@@ -71624,7 +71624,8 @@
|
|
|
71624
71624
|
get AlphaTexDiagnosticsSeverity () { return AlphaTexDiagnosticsSeverity; },
|
|
71625
71625
|
AlphaTexLexer,
|
|
71626
71626
|
get AlphaTexNodeType () { return AlphaTexNodeType; },
|
|
71627
|
-
AlphaTexParser
|
|
71627
|
+
AlphaTexParser,
|
|
71628
|
+
get AlphaTexStaffNoteKind () { return AlphaTexStaffNoteKind; }
|
|
71628
71629
|
}, Symbol.toStringTag, { value: 'Module' }));
|
|
71629
71630
|
|
|
71630
71631
|
const _barrel$6 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
|