@coderline/alphatab 1.9.0-alpha.1852 → 1.9.0-alpha.1853

package/dist/alphaTab.core.mjs

@@ -1,5 +1,5 @@
 /*!
-* alphaTab v1.9.0-alpha.1852 (develop, build 1852)
+* alphaTab v1.9.0-alpha.1853 (develop, build 1853)
 *
 * Copyright © 2026, Daniel Kuschny and Contributors, All rights reserved.
 *
@@ -186,9 +186,9 @@ class AlphaTabError extends Error {
 * @internal
 */
 class VersionInfo {
-	static version = "1.9.0-alpha.1852";
-	static date = "2026-07-03T04:02:23.351Z";
-	static commit = "b053b63f5a438ad410d9b45fc8eca85cf5bc84ae";
+	static version = "1.9.0-alpha.1853";
+	static date = "2026-07-04T03:56:00.242Z";
+	static commit = "770d9e5f9fa71e92e08bdeb8b27a7144b1ef1418";
 	static print(print) {
 		print(`alphaTab ${VersionInfo.version}`);
 		print(`commit: ${VersionInfo.commit}`);
@@ -5765,7 +5765,7 @@ class PercussionMapper {
 			for (const a of PercussionMapper.instrumentArticulations.values()) if (!articulationsByOutputNumber.has(a.outputMidiNumber)) articulationsByOutputNumber.set(a.outputMidiNumber, a);
 			PercussionMapper._articulationsByOutputNumber = articulationsByOutputNumber;
 		}
-		return articulationsByOutputNumber.has(articulation.outputMidiNumber) ? articulationsByOutputNumber.get(articulation.outputMidiNumber).id : -1;
+		return articulationsByOutputNumber.has(articulation.outputMidiNumber) ? articulationsByOutputNumber.get(articulation.outputMidiNumber).id : NaN;
 	}
 	static _instrumentArticulationsByUniqueId;
 	static getInstrumentArticulationByUniqueId(uniqueId) {
@@ -5947,36 +5947,36 @@ class Note {
 		return this.bendPoints !== null && this.bendType !== BendType.None;
 	}
 	get isStringed() {
-		return this.string >= 0;
+		return !Number.isNaN(this.string) && !Number.isNaN(this.fret);
 	}
 	/**
 	* Gets or sets the fret on which this note is played on the instrument.
 	* 0 is the nut.
 	*/
-	fret = -1;
+	fret = NaN;
 	/**
 	* Gets or sets the string number where the note is placed.
 	* 1 is the lowest string on the guitar and the bottom line on the tablature.
 	* It then increases the the number of strings on available on the track.
 	*/
-	string = -1;
+	string = NaN;
 	/**
 	* Gets or sets whether the string number for this note should be shown.
 	*/
 	showStringNumber = false;
 	get isPiano() {
-		return !this.isStringed && this.octave >= 0 && this.tone >= 0;
+		return !this.isStringed && !Number.isNaN(this.octave) && !Number.isNaN(this.tone);
 	}
 	/**
 	* Gets or sets the octave on which this note is played.
 	*/
-	octave = -1;
+	octave = NaN;
 	/**
 	* Gets or sets the tone of this note within the octave.
 	*/
-	tone = -1;
+	tone = NaN;
 	get isPercussion() {
-		return !this.isStringed && this.percussionArticulation >= 0;
+		return !Number.isNaN(this.percussionArticulation);
 	}
 	/**
 	* Gets or sets the percusson element.
@@ -6091,7 +6091,7 @@ class Note {
 	* - 126 Ride (middle)
 	* - 127 Ride (bell)
 	*/
-	percussionArticulation = -1;
+	percussionArticulation = NaN;
 	/**
 	* Gets or sets whether this note is visible on the music sheet.
 	*/
@@ -6316,7 +6316,7 @@ class Note {
 		return this.beat.voice.bar.staff.capo + Note.getStringTuning(this.beat.voice.bar.staff, this.string);
 	}
 	static getStringTuning(staff, noteString) {
-		if (staff.tuning.length > 0) return staff.tuning[staff.tuning.length - (noteString - 1) - 1];
+		if (staff.tuning.length > 0 && noteString >= 0) return staff.tuning[staff.tuning.length - (noteString - 1) - 1];
 		return 0;
 	}
 	get realValue() {
@@ -6630,7 +6630,7 @@ class Note {
 			if (note.isStringed) {
 				const noteOnString = previousBeat.getNoteOnString(note.string);
 				if (noteOnString) return noteOnString;
-			} else if (note.octave === -1 && note.tone === -1) {
+			} else if (Number.isNaN(note.octave) && Number.isNaN(note.tone)) {
 				if (note.index < previousBeat.notes.length) return previousBeat.notes[note.index];
 			} else {
 				const noteWithValue = previousBeat.getNoteWithRealValue(note.realValue);
@@ -7352,14 +7352,14 @@ class Beat {
 	deadSlapped = false;
 	/**
 	* Gets or sets the chromatic tone value (0–11) of the pitch at which this rest should be displayed.
-	* A value of -1 means use the default position formula.
+	* A value of NaN means use the default position formula.
 	*/
-	restDisplayTone = -1;
+	restDisplayTone = NaN;
 	/**
 	* Gets or sets the octave at which this rest should be displayed.
-	* Only relevant when {@link restDisplayTone} is set. -1 means use the default position formula.
+	* Only relevant when {@link restDisplayTone} is set. NaN means use the default position formula.
 	*/
-	restDisplayOctave = -1;
+	restDisplayOctave = NaN;
 	/**
 	* Gets or sets the brush type applied to the notes of this beat.
 	*/
@@ -7660,13 +7660,13 @@ class Beat {
 		note.beat = this;
 		note.index = this.notes.length;
 		this.notes.push(note);
-		if (note.isStringed) this.noteStringLookup.set(note.string, note);
+		if (note.string >= 0) this.noteStringLookup.set(note.string, note);
 	}
 	removeNote(note) {
 		const index = this.notes.indexOf(note);
 		if (index >= 0) {
 			this.notes.splice(index, 1);
-			if (note.isStringed) this.noteStringLookup.delete(note.string);
+			if (note.string >= 0) this.noteStringLookup.delete(note.string);
 		}
 	}
 	getAutomation(type) {
@@ -8534,10 +8534,10 @@ class AlphaTex1LanguageDefinitions {
 	}
 	static scoreMetaDataSignatures = AlphaTex1LanguageDefinitions._signatures([
 		["title", [[
-			[[17, 10], 0],
-			[[17], 1],
+			[[107, 100], 0],
+			[[107], 1],
 			[
-				[10, 17],
+				[100, 107],
 				1,
 				[
 					"left",
@@ -8547,10 +8547,10 @@ class AlphaTex1LanguageDefinitions {
 			]
 		]]],
 		["subtitle", [[
-			[[17, 10], 0],
-			[[17], 1],
+			[[107, 100], 0],
+			[[107], 1],
 			[
-				[10, 17],
+				[100, 107],
 				1,
 				[
 					"left",
@@ -8560,10 +8560,10 @@ class AlphaTex1LanguageDefinitions {
 			]
 		]]],
 		["artist", [[
-			[[17, 10], 0],
-			[[17], 1],
+			[[107, 100], 0],
+			[[107], 1],
 			[
-				[10, 17],
+				[100, 107],
 				1,
 				[
 					"left",
@@ -8573,10 +8573,10 @@ class AlphaTex1LanguageDefinitions {
 			]
 		]]],
 		["album", [[
-			[[17, 10], 0],
-			[[17], 1],
+			[[107, 100], 0],
+			[[107], 1],
 			[
-				[10, 17],
+				[100, 107],
 				1,
 				[
 					"left",
@@ -8586,10 +8586,10 @@ class AlphaTex1LanguageDefinitions {
 			]
 		]]],
 		["words", [[
-			[[17, 10], 0],
-			[[17], 1],
+			[[107, 100], 0],
+			[[107], 1],
 			[
-				[10, 17],
+				[100, 107],
 				1,
 				[
 					"left",
@@ -8599,10 +8599,10 @@ class AlphaTex1LanguageDefinitions {
 			]
 		]]],
 		["music", [[
-			[[17, 10], 0],
-			[[17], 1],
+			[[107, 100], 0],
+			[[107], 1],
 			[
-				[10, 17],
+				[100, 107],
 				1,
 				[
 					"left",
@@ -8611,8 +8611,8 @@ class AlphaTex1LanguageDefinitions {
 				]
 			]
 		]]],
-		["wordsandmusic", [[[[17], 0], [
-			[10, 17],
+		["wordsandmusic", [[[[107], 0], [
+			[100, 107],
 			1,
 			[
 				"left",
@@ -8621,10 +8621,10 @@ class AlphaTex1LanguageDefinitions {
 			]
 		]]]],
 		["copyright", [[
-			[[17, 10], 0],
-			[[17], 1],
+			[[107, 100], 0],
+			[[107], 1],
 			[
-				[10, 17],
+				[100, 107],
 				1,
 				[
 					"left",
@@ -8633,8 +8633,8 @@ class AlphaTex1LanguageDefinitions {
 				]
 			]
 		]]],
-		["copyright2", [[[[17], 0], [
-			[10, 17],
+		["copyright2", [[[[107], 0], [
+			[100, 107],
 			1,
 			[
 				"left",
@@ -8642,13 +8642,13 @@ class AlphaTex1LanguageDefinitions {
 				"right"
 			]
 		]]]],
-		["instructions", [[[[17, 10], 0]]]],
-		["notices", [[[[17, 10], 0]]]],
+		["instructions", [[[[107, 100], 0]]]],
+		["notices", [[[[107, 100], 0]]]],
 		["tab", [[
-			[[17, 10], 0],
-			[[17], 1],
+			[[107, 100], 0],
+			[[107], 1],
 			[
-				[10, 17],
+				[100, 107],
 				1,
 				[
 					"left",
@@ -8657,19 +8657,19 @@ class AlphaTex1LanguageDefinitions {
 				]
 			]
 		]]],
-		["systemslayout", [[[[16], 5]]]],
-		["defaultsystemslayout", [[[[16], 0]]]],
+		["systemslayout", [[[[106], 5]]]],
+		["defaultsystemslayout", [[[[106], 0]]]],
 		["showdynamics", null],
 		["hidedynamics", null],
 		["usesystemsignseparator", null],
 		["tuningdisplaymode", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			["score", "staff"]
 		]]]],
 		["multibarrest", null],
 		["bracketextendmode", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			[
 				"nobrackets",
@@ -8678,7 +8678,7 @@ class AlphaTex1LanguageDefinitions {
 			]
 		]]]],
 		["singletracktracknamepolicy", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			[
 				"hidden",
@@ -8687,7 +8687,7 @@ class AlphaTex1LanguageDefinitions {
 			]
 		]]]],
 		["multitracktracknamepolicy", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			[
 				"hidden",
@@ -8696,28 +8696,28 @@ class AlphaTex1LanguageDefinitions {
 			]
 		]]]],
 		["firstsystemtracknamemode", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			["fullname", "shortname"]
 		]]]],
 		["othersystemstracknamemode", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			["fullname", "shortname"]
 		]]]],
 		["firstsystemtracknameorientation", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			["horizontal", "vertical"]
 		]]]],
 		["othersystemstracknameorientation", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			["horizontal", "vertical"]
 		]]]],
 		["extendbarlines", null],
 		["chorddiagramsinscore", [[[
-			[10],
+			[100],
 			1,
 			["true", "false"]
 		]]]],
@@ -8725,7 +8725,7 @@ class AlphaTex1LanguageDefinitions {
 		["hideemptystavesinfirstsystem", null],
 		["showsinglestaffbrackets", null],
 		["defaultbarnumberdisplay", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			[
 				"allbars",
@@ -8736,54 +8736,54 @@ class AlphaTex1LanguageDefinitions {
 	]);
 	static staffMetaDataSignatures = AlphaTex1LanguageDefinitions._signatures([
 		["tuning", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			[
 				"piano",
 				"none",
 				"voice"
 			]
-		]], [[[10, 17], 5]]]],
-		["chord", [[[[17, 10], 0], [[
-			10,
-			17,
-			16
+		]], [[[100, 107], 5]]]],
+		["chord", [[[[107, 100], 0], [[
+			100,
+			107,
+			106
 		], 5]]]],
-		["capo", [[[[16], 0]]]],
-		["lyrics", [[[[17], 0]], [[[16], 0], [[17], 0]]]],
+		["capo", [[[[106], 0]]]],
+		["lyrics", [[[[107], 0]], [[[106], 0], [[107], 0]]]],
 		["articulation", [[[
-			[10],
+			[100],
 			0,
 			["defaults"]
-		]], [[[17, 10], 0], [[16], 0]]]],
-		["displaytranspose", [[[[16], 0]]]],
-		["transpose", [[[[16], 0]]]],
+		]], [[[107, 100], 0], [[106], 0]]]],
+		["displaytranspose", [[[[106], 0]]]],
+		["transpose", [[[[106], 0]]]],
 		["instrument", [
-			[[[16], 0]],
-			[[[17, 10], 0]],
+			[[[106], 0]],
+			[[[107, 100], 0]],
 			[[
-				[10],
+				[100],
 				0,
 				["percussion"]
 			]]
 		]]
 	]);
 	static structuralMetaDataSignatures = AlphaTex1LanguageDefinitions._signatures([
-		["track", [[[[17], 1], [[17], 1]]]],
+		["track", [[[[107], 1], [[107], 1]]]],
 		["staff", null],
 		["voice", null]
 	]);
 	static barMetaDataSignatures = AlphaTex1LanguageDefinitions._signatures([
 		["ts", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			["common"]
-		]], [[[16], 0], [[16], 0]]]],
+		]], [[[106], 0], [[106], 0]]]],
 		["ro", null],
-		["rc", [[[[16], 0]]]],
-		["ae", [[[[16, 13], 4]]]],
+		["rc", [[[[106], 0]]]],
+		["ae", [[[[106, 103], 4]]]],
 		["ks", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			[
 				"cb",
@@ -8837,9 +8837,9 @@ class AlphaTex1LanguageDefinitions {
 		]]]],
 		["clef", [[[
 			[
-				10,
-				16,
-				17
+				100,
+				106,
+				107
 			],
 			0,
 			[
@@ -8856,7 +8856,7 @@ class AlphaTex1LanguageDefinitions {
 			]
 		]]]],
 		["ottava", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			[
 				"15ma",
@@ -8870,22 +8870,22 @@ class AlphaTex1LanguageDefinitions {
 				"15mb"
 			]
 		]]]],
-		["tempo", [[[[16], 2], [[17], 1]], [
+		["tempo", [[[[106], 2], [[107], 1]], [
 			null,
-			[[16], 2],
-			[[17], 0],
-			[[16], 1],
+			[[106], 2],
+			[[107], 0],
+			[[106], 1],
 			[
-				[10],
+				[100],
 				1,
 				["hide"]
 			]
 		]]],
 		["tf", [[[
 			[
-				10,
-				16,
-				17
+				100,
+				106,
+				107
 			],
 			0,
 			[
@@ -8914,8 +8914,8 @@ class AlphaTex1LanguageDefinitions {
 			]
 		]]]],
 		["ac", null],
-		["section", [[[[17, 10], 0]], [[[17, 10], 0], [
-			[17, 10],
+		["section", [[[[107, 100], 0]], [[[107, 100], 0], [
+			[107, 100],
 			0,
 			null,
 			[
@@ -8925,7 +8925,7 @@ class AlphaTex1LanguageDefinitions {
 			]
 		]]]],
 		["jump", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			[
 				"fine",
@@ -8951,7 +8951,7 @@ class AlphaTex1LanguageDefinitions {
 		]]]],
 		["ft", null],
 		["simile", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			[
 				"none",
@@ -8961,7 +8961,7 @@ class AlphaTex1LanguageDefinitions {
 			]
 		]]]],
 		["barlineleft", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			[
 				"automatic",
@@ -8979,7 +8979,7 @@ class AlphaTex1LanguageDefinitions {
 			]
 		]]]],
 		["barlineright", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			[
 				"automatic",
@@ -8996,30 +8996,30 @@ class AlphaTex1LanguageDefinitions {
 				"tick"
 			]
 		]]]],
-		["scale", [[[[16], 2]]]],
-		["width", [[[[16], 2]]]],
+		["scale", [[[[106], 2]]]],
+		["width", [[[[106], 2]]]],
 		["sync", [[
-			[[16], 0],
-			[[16], 0],
-			[[16], 0],
-			[[16], 3]
+			[[106], 0],
+			[[106], 0],
+			[[106], 0],
+			[[106], 3]
 		]]],
 		["accidentals", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			["auto", "explicit"]
 		]]]],
-		["spd", [[[[16], 2]]]],
-		["sph", [[[[16], 2]]]],
-		["spu", [[[[16], 2]]]],
+		["spd", [[[[106], 2]]]],
+		["sph", [[[[106], 2]]]],
+		["spu", [[[[106], 2]]]],
 		["db", null],
 		["voicemode", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			["staffwise", "barwise"]
 		]]]],
 		["barnumberdisplay", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			[
 				"allbars",
@@ -9027,31 +9027,31 @@ class AlphaTex1LanguageDefinitions {
 				"hide"
 			]
 		]]]],
-		["beaming", [[[[16], 0], [[16], 5]]]]
+		["beaming", [[[[106], 0], [[106], 5]]]]
 	]);
 	static metaDataProperties = AlphaTex1LanguageDefinitions._metaProps([
 		["track", [
-			["color", [[[[17], 0]]]],
-			["systemslayout", [[[[16], 5]]]],
-			["defaultsystemslayout", [[[[16], 0]]]],
+			["color", [[[[107], 0]]]],
+			["systemslayout", [[[[106], 5]]]],
+			["defaultsystemslayout", [[[[106], 0]]]],
 			["solo", null],
 			["mute", null],
-			["volume", [[[[16], 0]]]],
-			["balance", [[[[16], 0]]]],
+			["volume", [[[[106], 0]]]],
+			["balance", [[[[106], 0]]]],
 			["instrument", [
-				[[[16], 0]],
-				[[[17, 10], 0]],
+				[[[106], 0]],
+				[[[107, 100], 0]],
 				[[
-					[10],
+					[100],
 					0,
 					["percussion"]
 				]]
 			]],
-			["bank", [[[[16], 0]]]],
+			["bank", [[[[106], 0]]]],
 			["multibarrest", null]
 		]],
 		["staff", [
-			["score", [[[[16], 1]]]],
+			["score", [[[[106], 1]]]],
 			["tabs", null],
 			["slash", null],
 			["numbered", null]
@@ -9089,24 +9089,24 @@ class AlphaTex1LanguageDefinitions {
 		["hideemptystavesinfirstsystem", null],
 		["showsinglestaffbrackets", null],
 		["defaultbarnumberdisplay", null],
-		["tuning", [["hide", null], ["label", [[[[17], 0]]]]]],
+		["tuning", [["hide", null], ["label", [[[[107], 0]]]]]],
 		["chord", [
-			["firstfret", [[[[16], 0]]]],
-			["barre", [[[[16], 5]]]],
+			["firstfret", [[[[106], 0]]]],
+			["barre", [[[[106], 5]]]],
 			["showdiagram", [
 				[],
 				[[
-					[17],
+					[107],
 					0,
 					["true", "false"]
 				]],
 				[[
-					[10],
+					[100],
 					0,
 					["true", "false"]
 				]],
 				[[
-					[16],
+					[106],
 					0,
 					["1", "0"]
 				]]
@@ -9114,17 +9114,17 @@ class AlphaTex1LanguageDefinitions {
 			["showfingering", [
 				[],
 				[[
-					[17],
+					[107],
 					0,
 					["true", "false"]
 				]],
 				[[
-					[10],
+					[100],
 					0,
 					["true", "false"]
 				]],
 				[[
-					[16],
+					[106],
 					0,
 					["1", "0"]
 				]]
@@ -9132,17 +9132,17 @@ class AlphaTex1LanguageDefinitions {
 			["showname", [
 				[],
 				[[
-					[17],
+					[107],
 					0,
 					["true", "false"]
 				]],
 				[[
-					[10],
+					[100],
 					0,
 					["true", "false"]
 				]],
 				[[
-					[16],
+					[106],
 					0,
 					["1", "0"]
 				]]
@@ -9189,7 +9189,7 @@ class AlphaTex1LanguageDefinitions {
 		AlphaTex1LanguageDefinitions.barMetaDataSignatures
 	];
 	static durationChangeProperties = AlphaTex1LanguageDefinitions._props([["tu", [[[
-		[16],
+		[106],
 		0,
 		[
 			"3",
@@ -9200,7 +9200,7 @@ class AlphaTex1LanguageDefinitions {
 			"10",
 			"12"
 		]
-	]], [[[16], 0], [[16], 0]]]]]);
+	]], [[[106], 0], [[106], 0]]]]]);
 	static beatProperties = AlphaTex1LanguageDefinitions._props([
 		["f", null],
 		["fo", null],
@@ -9229,7 +9229,7 @@ class AlphaTex1LanguageDefinitions {
 		["legatoorigin", null],
 		["timer", null],
 		["tu", [[[
-			[16],
+			[106],
 			0,
 			[
 				"3",
@@ -9240,14 +9240,13 @@ class AlphaTex1LanguageDefinitions {
 				"10",
 				"12"
 			]
-		]], [[[16], 0], [[16], 0]]]],
-		["txt", [[[[17, 10], 0]]]],
-		["restdisplaypitch", [[[[10, 17], 0]]]],
-		["lyrics", [[[[17], 0]], [[[16], 0], [[17], 0]]]],
+		]], [[[106], 0], [[106], 0]]]],
+		["txt", [[[[107, 100], 0]]]],
+		["lyrics", [[[[107], 0]], [[[106], 0], [[107], 0]]]],
 		["tb", [
-			[[[16], 5]],
+			[[[106], 5]],
 			[[
-				[10, 17],
+				[100, 107],
 				0,
 				[
 					"custom",
@@ -9257,19 +9256,19 @@ class AlphaTex1LanguageDefinitions {
 					"predive",
 					"predivedive"
 				]
-			], [[16], 5]],
+			], [[106], 5]],
 			[[
-				[10, 17],
+				[100, 107],
 				0,
 				[
 					"default",
 					"gradual",
 					"fast"
 				]
-			], [[16], 5]],
+			], [[106], 5]],
 			[
 				[
-					[10, 17],
+					[100, 107],
 					0,
 					[
 						"custom",
@@ -9281,7 +9280,7 @@ class AlphaTex1LanguageDefinitions {
 					]
 				],
 				[
-					[10, 17],
+					[100, 107],
 					0,
 					[
 						"default",
@@ -9289,13 +9288,13 @@ class AlphaTex1LanguageDefinitions {
 						"fast"
 					]
 				],
-				[[16], 5]
+				[[106], 5]
 			]
 		]],
 		["tbe", [
-			[[[16], 5]],
+			[[[106], 5]],
 			[[
-				[10, 17],
+				[100, 107],
 				0,
 				[
 					"custom",
@@ -9305,19 +9304,19 @@ class AlphaTex1LanguageDefinitions {
 					"predive",
 					"predivedive"
 				]
-			], [[16], 5]],
+			], [[106], 5]],
 			[[
-				[10, 17],
+				[100, 107],
 				0,
 				[
 					"default",
 					"gradual",
 					"fast"
 				]
-			], [[16], 5]],
+			], [[106], 5]],
 			[
 				[
-					[10, 17],
+					[100, 107],
 					0,
 					[
 						"custom",
@@ -9329,7 +9328,7 @@ class AlphaTex1LanguageDefinitions {
 					]
 				],
 				[
-					[10, 17],
+					[100, 107],
 					0,
 					[
 						"default",
@@ -9337,16 +9336,16 @@ class AlphaTex1LanguageDefinitions {
 						"fast"
 					]
 				],
-				[[16], 5]
+				[[106], 5]
 			]
 		]],
-		["bu", [[[[16], 1]]]],
-		["bd", [[[[16], 1]]]],
-		["au", [[[[16], 1]]]],
-		["ad", [[[[16], 1]]]],
-		["ch", [[[[17, 10], 0]]]],
+		["bu", [[[[106], 1]]]],
+		["bd", [[[[106], 1]]]],
+		["au", [[[[106], 1]]]],
+		["ad", [[[[106], 1]]]],
+		["ch", [[[[107, 100], 0]]]],
 		["gr", [[[
-			[10, 17],
+			[100, 107],
 			1,
 			[
 				"onbeat",
@@ -9358,7 +9357,7 @@ class AlphaTex1LanguageDefinitions {
 			]
 		]]]],
 		["dy", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			[
 				"ppp",
@@ -9389,33 +9388,33 @@ class AlphaTex1LanguageDefinitions {
 				"sfzp"
 			]
 		]]]],
-		["tempo", [[[[16], 0], [
-			[10],
+		["tempo", [[[[106], 0], [
+			[100],
 			1,
 			["hide"]
 		]], [
-			[[16], 0],
-			[[17], 0],
+			[[106], 0],
+			[[107], 0],
 			[
-				[10],
+				[100],
 				1,
 				["hide"]
 			]
 		]]],
-		["volume", [[[[16], 0]]]],
-		["balance", [[[[16], 0]]]],
-		["tp", [[[[16], 0], [
-			[10, 17],
+		["volume", [[[[106], 0]]]],
+		["balance", [[[[106], 0]]]],
+		["tp", [[[[106], 0], [
+			[100, 107],
 			1,
 			["default", "buzzroll"]
 		]]]],
-		["barre", [[[[16], 0], [
-			[10, 17],
+		["barre", [[[[106], 0], [
+			[100, 107],
 			1,
 			["full", "half"]
 		]]]],
 		["rasg", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			[
 				"ii",
@@ -9439,7 +9438,7 @@ class AlphaTex1LanguageDefinitions {
 			]
 		]]]],
 		["ot", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			[
 				"15ma",
@@ -9454,26 +9453,26 @@ class AlphaTex1LanguageDefinitions {
 			]
 		]]]],
 		["instrument", [
-			[[[16], 0]],
-			[[[17, 10], 0]],
+			[[[106], 0]],
+			[[[107, 100], 0]],
 			[[
-				[10],
+				[100],
 				0,
 				["percussion"]
 			]]
 		]],
-		["bank", [[[[16], 0]]]],
+		["bank", [[[[106], 0]]]],
 		["fermata", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			[
 				"short",
 				"medium",
 				"long"
 			]
-		], [[16], 3]]]],
+		], [[106], 3]]]],
 		["beam", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			[
 				"invert",
@@ -9484,15 +9483,16 @@ class AlphaTex1LanguageDefinitions {
 				"merge",
 				"splitsecondary"
 			]
-		]]]]
+		]]]],
+		["restdisplaypitch", [[[[100], 0]]]]
 	]);
 	static noteProperties = AlphaTex1LanguageDefinitions._props([
 		["nh", null],
-		["ah", [[[[16], 1]]]],
-		["th", [[[[16], 1]]]],
-		["ph", [[[[16], 1]]]],
-		["sh", [[[[16], 1]]]],
-		["fh", [[[[16], 1]]]],
+		["ah", [[[[106], 1]]]],
+		["th", [[[[106], 1]]]],
+		["ph", [[[[106], 1]]]],
+		["sh", [[[[106], 1]]]],
+		["fh", [[[[106], 1]]]],
 		["v", null],
 		["vw", null],
 		["sl", null],
@@ -9509,8 +9509,8 @@ class AlphaTex1LanguageDefinitions {
 		["ac", null],
 		["hac", null],
 		["ten", null],
-		["tr", [[[[16], 0], [
-			[16],
+		["tr", [[[[106], 0], [
+			[106],
 			1,
 			[
 				"16",
@@ -9530,9 +9530,9 @@ class AlphaTex1LanguageDefinitions {
 		["string", null],
 		["hide", null],
 		["b", [
-			[[[16], 5]],
+			[[[106], 5]],
 			[[
-				[10, 17],
+				[100, 107],
 				0,
 				[
 					"custom",
@@ -9544,19 +9544,19 @@ class AlphaTex1LanguageDefinitions {
 					"prebendbend",
 					"prebendrelease"
 				]
-			], [[16], 5]],
+			], [[106], 5]],
 			[[
-				[10, 17],
+				[100, 107],
 				0,
 				[
 					"default",
 					"gradual",
 					"fast"
 				]
-			], [[16], 5]],
+			], [[106], 5]],
 			[
 				[
-					[10, 17],
+					[100, 107],
 					0,
 					[
 						"custom",
@@ -9570,7 +9570,7 @@ class AlphaTex1LanguageDefinitions {
 					]
 				],
 				[
-					[10, 17],
+					[100, 107],
 					0,
 					[
 						"default",
@@ -9578,13 +9578,13 @@ class AlphaTex1LanguageDefinitions {
 						"fast"
 					]
 				],
-				[[16], 5]
+				[[106], 5]
 			]
 		]],
 		["be", [
-			[[[16], 5]],
+			[[[106], 5]],
 			[[
-				[10, 17],
+				[100, 107],
 				0,
 				[
 					"custom",
@@ -9596,19 +9596,19 @@ class AlphaTex1LanguageDefinitions {
 					"prebendbend",
 					"prebendrelease"
 				]
-			], [[16], 5]],
+			], [[106], 5]],
 			[[
-				[10, 17],
+				[100, 107],
 				0,
 				[
 					"default",
 					"gradual",
 					"fast"
 				]
-			], [[16], 5]],
+			], [[106], 5]],
 			[
 				[
-					[10, 17],
+					[100, 107],
 					0,
 					[
 						"custom",
@@ -9622,7 +9622,7 @@ class AlphaTex1LanguageDefinitions {
 					]
 				],
 				[
-					[10, 17],
+					[100, 107],
 					0,
 					[
 						"default",
@@ -9630,11 +9630,11 @@ class AlphaTex1LanguageDefinitions {
 						"fast"
 					]
 				],
-				[[16], 5]
+				[[106], 5]
 			]
 		]],
 		["lf", [[[
-			[16],
+			[106],
 			0,
 			[
 				"1",
@@ -9645,7 +9645,7 @@ class AlphaTex1LanguageDefinitions {
 			]
 		]]]],
 		["rf", [[[
-			[16],
+			[106],
 			0,
 			[
 				"1",
@@ -9656,7 +9656,7 @@ class AlphaTex1LanguageDefinitions {
 			]
 		]]]],
 		["acc", [[[
-			[10, 17],
+			[100, 107],
 			0,
 			[
 				"default",
@@ -9676,7 +9676,7 @@ class AlphaTex1LanguageDefinitions {
 				"bb"
 			]
 		]]]],
-		["slur", [[[[17], 0]], [[[10], 0]]]],
+		["slur", [[[[107], 0]], [[[100], 0]]]],
 		["-", null]
 	]);
 }
@@ -9697,20 +9697,21 @@ var AlphaTexNodeType = /* @__PURE__ */ function(AlphaTexNodeType) {
 	AlphaTexNodeType[AlphaTexNodeType["RParen"] = 7] = "RParen";
 	AlphaTexNodeType[AlphaTexNodeType["Colon"] = 8] = "Colon";
 	AlphaTexNodeType[AlphaTexNodeType["Asterisk"] = 9] = "Asterisk";
-	AlphaTexNodeType[AlphaTexNodeType["Ident"] = 10] = "Ident";
-	AlphaTexNodeType[AlphaTexNodeType["Tag"] = 11] = "Tag";
-	AlphaTexNodeType[AlphaTexNodeType["Meta"] = 12] = "Meta";
-	AlphaTexNodeType[AlphaTexNodeType["Arguments"] = 13] = "Arguments";
-	AlphaTexNodeType[AlphaTexNodeType["Props"] = 14] = "Props";
-	AlphaTexNodeType[AlphaTexNodeType["Prop"] = 15] = "Prop";
-	AlphaTexNodeType[AlphaTexNodeType["Number"] = 16] = "Number";
-	AlphaTexNodeType[AlphaTexNodeType["String"] = 17] = "String";
-	AlphaTexNodeType[AlphaTexNodeType["Score"] = 18] = "Score";
-	AlphaTexNodeType[AlphaTexNodeType["Bar"] = 19] = "Bar";
-	AlphaTexNodeType[AlphaTexNodeType["Beat"] = 20] = "Beat";
-	AlphaTexNodeType[AlphaTexNodeType["Duration"] = 21] = "Duration";
-	AlphaTexNodeType[AlphaTexNodeType["NoteList"] = 22] = "NoteList";
-	AlphaTexNodeType[AlphaTexNodeType["Note"] = 23] = "Note";
+	AlphaTexNodeType[AlphaTexNodeType["At"] = 10] = "At";
+	AlphaTexNodeType[AlphaTexNodeType["Ident"] = 100] = "Ident";
+	AlphaTexNodeType[AlphaTexNodeType["Tag"] = 101] = "Tag";
+	AlphaTexNodeType[AlphaTexNodeType["Meta"] = 102] = "Meta";
+	AlphaTexNodeType[AlphaTexNodeType["Arguments"] = 103] = "Arguments";
+	AlphaTexNodeType[AlphaTexNodeType["Props"] = 104] = "Props";
+	AlphaTexNodeType[AlphaTexNodeType["Prop"] = 105] = "Prop";
+	AlphaTexNodeType[AlphaTexNodeType["Number"] = 106] = "Number";
+	AlphaTexNodeType[AlphaTexNodeType["String"] = 107] = "String";
+	AlphaTexNodeType[AlphaTexNodeType["Score"] = 200] = "Score";
+	AlphaTexNodeType[AlphaTexNodeType["Bar"] = 201] = "Bar";
+	AlphaTexNodeType[AlphaTexNodeType["Beat"] = 202] = "Beat";
+	AlphaTexNodeType[AlphaTexNodeType["Duration"] = 203] = "Duration";
+	AlphaTexNodeType[AlphaTexNodeType["NoteList"] = 204] = "NoteList";
+	AlphaTexNodeType[AlphaTexNodeType["Note"] = 205] = "Note";
 	return AlphaTexNodeType;
 }({});
 //#endregion
@@ -10331,6 +10332,7 @@ class AlphaTexLexer {
 		[125, (l) => l._token({ nodeType: AlphaTexNodeType.RBrace })],
 		[124, (l) => l._token({ nodeType: AlphaTexNodeType.Pipe })],
 		[42, (l) => l._token({ nodeType: AlphaTexNodeType.Asterisk })],
+		[64, (l) => l._token({ nodeType: AlphaTexNodeType.At })],
 		[92, (l) => l._metaCommand()],
 		[9, (l) => l._whitespace()],
 		[10, (l) => l._whitespace()],
@@ -10901,12 +10903,12 @@ class AlphaTexParser {
 			start: noteValue.start
 		};
 		try {
-			let canHaveString = false;
+			let canHaveStringDot = false;
 			switch (noteValue.nodeType) {
 				case AlphaTexNodeType.Number:
 					note.noteValue = noteValue;
 					this.lexer.advance();
-					canHaveString = true;
+					canHaveStringDot = true;
 					break;
 				case AlphaTexNodeType.String:
 					note.noteValue = noteValue;
@@ -10914,7 +10916,7 @@ class AlphaTexParser {
 					switch (note.noteValue.text) {
 						case "x":
 						case "-":
-							canHaveString = true;
+							canHaveStringDot = true;
 							break;
 					}
 					break;
@@ -10924,7 +10926,7 @@ class AlphaTexParser {
 					switch (note.noteValue.text) {
 						case "x":
 						case "-":
-							canHaveString = true;
+							canHaveStringDot = true;
 							break;
 					}
 					break;
@@ -10936,25 +10938,23 @@ class AlphaTexParser {
 					], true);
 					return;
 			}
-			if (canHaveString) {
-				const dot = this.lexer.peekToken();
-				if (dot?.nodeType === AlphaTexNodeType.Dot) {
-					const noteStringDot = dot;
+			const separator = this.lexer.peekToken();
+			if (canHaveStringDot && separator?.nodeType === AlphaTexNodeType.Dot || separator?.nodeType === AlphaTexNodeType.At) {
+				const noteStringSeparator = separator;
+				this.lexer.advance();
+				const noteString = this.lexer.peekToken();
+				if (!noteString) {
+					this.unexpectedToken(noteString, [AlphaTexNodeType.Number], true);
+					return;
+				}
+				if (noteString.nodeType === AlphaTexNodeType.Tag) return note;
+				else if (noteString.nodeType === AlphaTexNodeType.Number) {
+					note.noteStringSeparator = noteStringSeparator;
+					note.noteString = noteString;
 					this.lexer.advance();
-					const noteString = this.lexer.peekToken();
-					if (!noteString) {
-						this.unexpectedToken(noteString, [AlphaTexNodeType.Number], true);
-						return;
-					}
-					if (noteString.nodeType === AlphaTexNodeType.Tag) return note;
-					else if (noteString.nodeType === AlphaTexNodeType.Number) {
-						note.noteStringDot = noteStringDot;
-						note.noteString = noteString;
-						this.lexer.advance();
-					} else {
-						this.unexpectedToken(noteString, [AlphaTexNodeType.Number], true);
-						return;
-					}
+				} else {
+					this.unexpectedToken(noteString, [AlphaTexNodeType.Number], true);
+					return;
 				}
 			}
 			note.noteEffects = this._properties((property) => this._metaDataReader.readNotePropertyArguments(this, property));
@@ -12678,12 +12678,18 @@ class Staff {
 		return this._filledVoices;
 	}
 	finish(settings, sharedDataBag = null) {
+		this.stringTuning.finish();
 		if (this.isPercussion) {
-			this.stringTuning.tunings = [];
-			this.showTablature = false;
 			this.displayTranspositionPitch = 0;
+			this.stringTuning.tunings = [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			];
 		}
-		this.stringTuning.finish();
 		if (this.stringTuning.tunings.length === 0) this.showTablature = false;
 		for (let i = 0, j = this.bars.length; i < j; i++) {
 			this.bars[i].finish(settings, sharedDataBag);
@@ -13673,7 +13679,10 @@ class AlphaTex1LanguageHandler {
 			case AlphaTexNodeType.String:
 				const instrumentName = args.arguments[0].text.toLowerCase();
 				if (instrumentName === "percussion") {
-					for (const staff of track.staves) importer.applyStaffNoteKind(staff, AlphaTexStaffNoteKind.Articulation);
+					for (const staff of track.staves) {
+						staff.showTablature = false;
+						importer.applyStaffNoteKind(staff, AlphaTexStaffNoteKind.Articulation);
+					}
 					track.playbackInfo.primaryChannel = SynthConstants.PercussionChannel;
 					track.playbackInfo.secondaryChannel = SynthConstants.PercussionChannel;
 				} else track.playbackInfo.program = GeneralMidi.getValue(instrumentName);
@@ -15604,10 +15613,10 @@ class AlphaTexImporter extends ScoreImporter {
 	_note(beat, node) {
 		let isDead = false;
 		let isTie = false;
-		let numericValue = -1;
+		let numericValue = NaN;
 		let articulationValue = "";
-		let octave = -1;
-		let tone = -1;
+		let octave = NaN;
+		let tone = NaN;
 		let accidentalMode = NoteAccidentalMode.Default;
 		const noteValue = node.noteValue;
 		let detectedNoteKind = void 0;
@@ -15625,7 +15634,7 @@ class AlphaTexImporter extends ScoreImporter {
 				isTie = str === "-";
 				if (isTie || isDead) {
 					numericValue = 0;
-					if (node.noteStringDot && node.noteString) detectedNoteKind = AlphaTexStaffNoteKind.Fretted;
+					if (node.noteStringSeparator && node.noteString) detectedNoteKind = AlphaTexStaffNoteKind.Fretted;
 					else detectedNoteKind = void 0;
 				} else {
 					const tuning = ModelUtils.parseTuning(str);
@@ -15693,18 +15702,18 @@ class AlphaTexImporter extends ScoreImporter {
 					});
 					return;
 				}
-				const noteString = node.noteString.value;
-				if (noteString < 1 || noteString > this._state.currentStaff.tuning.length) {
+				const frettedNoteString = node.noteString.value;
+				if (frettedNoteString < 1 || frettedNoteString > this._state.currentStaff.tuning.length) {
 					this.addSemanticDiagnostic({
 						code: AlphaTexDiagnosticCode.AT208,
 						message: `Note string is out of range. Available range: 1-${this._state.currentStaff.tuning.length}`,
 						severity: AlphaTexDiagnosticsSeverity.Error,
-						start: noteValue.end,
-						end: noteValue.end
+						start: node.noteString.start,
+						end: node.noteString.end
 					});
 					return;
 				}
-				note.string = this._state.currentStaff.tuning.length - (noteString - 1);
+				note.string = this._state.currentStaff.tuning.length - (frettedNoteString - 1);
 				if (!isTie) note.fret = numericValue;
 				break;
 			case AlphaTexStaffNoteKind.Articulation:
@@ -15731,6 +15740,29 @@ class AlphaTexImporter extends ScoreImporter {
 					this._state.articulationUniqueIdToIndex.set(articulationValue, articulationIndex);
 				}
 				note.percussionArticulation = articulationIndex;
+				if (node.noteString) {
+					const percussionNoteString = node.noteString.value;
+					if (percussionNoteString < 1 || percussionNoteString > this._state.currentStaff.tuning.length) {
+						this.addSemanticDiagnostic({
+							code: AlphaTexDiagnosticCode.AT208,
+							message: `Note string is out of range. Available range: 1-${this._state.currentStaff.tuning.length}`,
+							severity: AlphaTexDiagnosticsSeverity.Error,
+							start: node.noteString.start,
+							end: node.noteString.end
+						});
+						return;
+					}
+					note.string = this._state.currentStaff.tuning.length - (percussionNoteString - 1);
+				} else {
+					for (let i = 0; i < this._state.currentStaff.tuning.length; i++) {
+						const s = this._state.currentStaff.tuning.length - i;
+						if (!beat.noteStringLookup.has(s)) {
+							note.string = s;
+							break;
+						}
+					}
+					if (Number.isNaN(note.string)) note.string = this._state.currentStaff.tuning.length;
+				}
 				break;
 		}
 		beat.addNote(note);
@@ -15748,6 +15780,7 @@ class AlphaTexImporter extends ScoreImporter {
 		switch (staffNoteKind) {
 			case AlphaTexStaffNoteKind.Pitched:
 				staff.isPercussion = false;
+				staff.showTablature = false;
 				staff.stringTuning.reset();
 				if (!this._state.staffHasExplicitDisplayTransposition.has(staff)) staff.displayTranspositionPitch = 0;
 				break;
@@ -15759,6 +15792,14 @@ class AlphaTexImporter extends ScoreImporter {
 			case AlphaTexStaffNoteKind.Articulation:
 				staff.isPercussion = true;
 				staff.stringTuning.reset();
+				staff.stringTuning.tunings = [
+					0,
+					0,
+					0,
+					0,
+					0,
+					0
+				];
 				if (!this._state.staffHasExplicitDisplayTransposition.has(staff)) staff.displayTranspositionPitch = 0;
 				break;
 		}
@@ -15795,7 +15836,15 @@ class AlphaTexImporter extends ScoreImporter {
 		const program = staff.track.playbackInfo.program;
 		if (!this._state.staffTuningApplied.has(staff) && !this._state.staffHasExplicitTuning.has(staff)) {
 			staff.stringTuning.reset();
-			if (program === 15) staff.stringTuning.tunings = Tuning.getDefaultTuningFor(6).tunings;
+			if (staff.isPercussion) staff.stringTuning.tunings = [
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			];
+			else if (program === 15) staff.stringTuning.tunings = Tuning.getDefaultTuningFor(6).tunings;
 			else if (program >= 24 && program <= 31) staff.stringTuning.tunings = Tuning.getDefaultTuningFor(6).tunings;
 			else if (program >= 32 && program <= 39) {
 				staff.stringTuning.tunings = [
@@ -15987,7 +16036,6 @@ class AlphaTexImporter extends ScoreImporter {
 	}
 	applyPercussionStaff(staff) {
 		staff.isPercussion = true;
-		staff.showTablature = false;
 		staff.track.playbackInfo.program = 0;
 	}
 	startNewTrack() {
@@ -18817,8 +18865,7 @@ class Gp3To5Importer extends ScoreImporter {
 		if ((flags & 8) !== 0) this.readNoteEffects(track, voice, beat, newNote);
 		if (bar.staff.isPercussion) {
 			newNote.percussionArticulation = Gp3To5Importer._gp5PercussionInstrumentMap.has(newNote.fret) ? Gp3To5Importer._gp5PercussionInstrumentMap.get(newNote.fret) : newNote.fret;
-			newNote.string = -1;
-			newNote.fret = -1;
+			newNote.fret = NaN;
 		}
 		if (swapAccidentals) {
 			const accidental = ModelUtils.computeAccidental(bar.keySignature, NoteAccidentalMode.Default, newNote.realValueWithoutHarmonic, false);
@@ -20023,8 +20070,6 @@ class GpifParser {
 		this._articulationByName = /* @__PURE__ */ new Map();
 		const track = new Track();
 		track.ensureStaveCount(1);
-		const staff = track.staves[0];
-		staff.showStandardNotation = true;
 		const trackId = node.getAttribute("id");
 		for (const c of node.childElements()) switch (c.localName) {
 			case "Name":
@@ -20287,7 +20332,6 @@ class GpifParser {
 						staff.stringTuning.name = c.innerText;
 						break;
 				}
-				if (!staff.isPercussion) staff.showTablature = true;
 				break;
 			case "DiagramCollection":
 			case "ChordCollection":
@@ -20421,11 +20465,7 @@ class GpifParser {
 				const tuningParts = GpifParser._splitSafe(node.findChildElement("Pitches")?.innerText);
 				const tuning = new Array(tuningParts.length);
 				for (let i = 0; i < tuning.length; i++) tuning[tuning.length - 1 - i] = GpifParser._parseIntSafe(tuningParts[i], 0);
-				for (const staff of track.staves) {
-					staff.stringTuning.tunings = tuning;
-					staff.showStandardNotation = true;
-					staff.showTablature = true;
-				}
+				for (const staff of track.staves) staff.stringTuning.tunings = tuning;
 				break;
 			case "DiagramCollection":
 			case "ChordCollection":
@@ -21445,7 +21485,7 @@ class GpifParser {
 						break;
 					case "Octave":
 						note.octave = GpifParser._parseIntSafe(c.findChildElement("Number")?.innerText, 0);
-						if (note.tone === -1) note.tone = 0;
+						if (Number.isNaN(note.tone)) note.tone = 0;
 						break;
 					case "Tone":
 						note.tone = GpifParser._parseIntSafe(c.findChildElement("Step")?.innerText, 0);
@@ -21661,10 +21701,8 @@ class GpifParser {
 								if (this._notesOfBeat.has(beatId)) {
 									for (const noteId of this._notesOfBeat.get(beatId)) if (noteId !== GpifParser._invalidId) {
 										const note = NoteCloner.clone(this._noteById.get(noteId));
-										if (staff.isPercussion) {
-											note.fret = -1;
-											note.string = -1;
-										} else note.percussionArticulation = -1;
+										if (staff.isPercussion) note.fret = NaN;
+										else note.percussionArticulation = NaN;
 										beat.addNote(note);
 										if (this._tappedNotes.has(noteId)) beat.tap = true;
 									}
@@ -21764,7 +21802,7 @@ class PartConfiguration {
 				if (trackIndex < score.tracks.length) {
 					const track = score.tracks[trackIndex];
 					for (const staff of track.staves) {
-						if (!staff.isPercussion) staff.showTablature = trackConfig.showTablature;
+						staff.showTablature = trackConfig.showTablature;
 						staff.showStandardNotation = trackConfig.showStandardNotation;
 						staff.showSlash = trackConfig.showSlash;
 						staff.showNumbered = trackConfig.showNumbered;
@@ -23728,7 +23766,10 @@ class MusicXmlImporter extends ScoreImporter {
 				break;
 			case "percussion":
 				bar.clef = Clef.Neutral;
-				if (bar.index === 0) bar.staff.isPercussion = true;
+				if (bar.index === 0) {
+					bar.staff.isPercussion = true;
+					bar.staff.showTablature = false;
+				}
 				break;
 			case "tab":
 				bar.clef = Clef.G2;
@@ -58827,8 +58868,15 @@ class NoteNumberGlyph extends Glyph {
 	}
 	doLayout() {
 		const n = this._note;
-		let fret = n.fret - n.beat.voice.bar.staff.transpositionPitch;
-		if (n.harmonicType === HarmonicType.Natural && n.harmonicValue !== 0) fret = n.harmonicValue - n.beat.voice.bar.staff.transpositionPitch;
+		let fret;
+		if (n.isStringed) {
+			fret = n.fret - n.beat.voice.bar.staff.transpositionPitch;
+			if (n.harmonicType === HarmonicType.Natural && n.harmonicValue !== 0) fret = n.harmonicValue - n.beat.voice.bar.staff.transpositionPitch;
+		} else {
+			const articulation = PercussionMapper.getArticulation(n);
+			if (articulation) fret = articulation.id;
+			else fret = n.percussionArticulation;
+		}
 		if (!n.isTieDestination) {
 			this._noteString = n.isDead ? "x" : fret.toString();
 			if (n.isGhost) this._noteString = `(${this._noteString})`;
@@ -65764,7 +65812,7 @@ class ScoreBeatGlyph extends BeatOnNoteGlyphBase {
 		const beat = this.container.beat;
 		const lineCount = this.renderer.bar.staff.standardNotationLineCount;
 		let steps;
-		if (beat.restDisplayTone !== -1 && beat.restDisplayOctave !== -1) steps = AccidentalHelper.calculateRestDisplaySteps(sr.bar, beat.restDisplayTone, beat.restDisplayOctave);
+		if (!Number.isNaN(beat.restDisplayTone) && !Number.isNaN(beat.restDisplayOctave)) steps = AccidentalHelper.calculateRestDisplaySteps(sr.bar, beat.restDisplayTone, beat.restDisplayOctave);
 		else {
 			steps = Math.ceil((lineCount - 1) / 2) * 2;
 			if (beat.duration === Duration.Whole && lineCount !== 1 && lineCount !== 3) steps -= 2;
@@ -67507,10 +67555,6 @@ class TabBarRendererFactory extends BarRendererFactory {
 	get cascadePriority() {
 		return 1;
 	}
-	constructor(effectBands) {
-		super(effectBands);
-		this.hideOnPercussionTrack = true;
-	}
 	canCreate(track, staff) {
 		return staff.showTablature && staff.tuning.length > 0 && super.canCreate(track, staff);
 	}
@@ -68583,7 +68627,7 @@ class AlphaTexPrinter {
 	_writeNote(n) {
 		this._writeComments(n.leadingComments);
 		this._writeValue(n.noteValue);
-		this._writeToken(n.noteStringDot, false);
+		this._writeToken(n.noteStringSeparator, false);
 		this._writeValue(n.noteString);
 		if (n.noteEffects) this._writeProperties(n.noteEffects, false);
 		this._writeComments(n.trailingComments);
@@ -68727,6 +68771,9 @@ class AlphaTexPrinter {
 				case AlphaTexNodeType.Dot:
 					this._writer.write(".");
 					break;
+				case AlphaTexNodeType.At:
+					this._writer.write("@");
+					break;
 				case AlphaTexNodeType.Backslash:
 					this._writer.write("\\");
 					break;
@@ -68912,11 +68959,20 @@ class AlphaTexExporter extends ScoreExporter {
 				text: ""
 			}
 		};
-		if (data.isPercussion) note.noteValue = {
-			nodeType: AlphaTexNodeType.String,
-			text: PercussionMapper.getArticulationName(data)
-		};
-		else if (data.isPiano) note.noteValue = {
+		if (data.isPercussion) {
+			note.noteValue = {
+				nodeType: AlphaTexNodeType.String,
+				text: PercussionMapper.getArticulationName(data)
+			};
+			if (!Number.isNaN(data.string)) {
+				note.noteStringSeparator = { nodeType: AlphaTexNodeType.At };
+				const stringNumber = data.beat.voice.bar.staff.tuning.length - data.string + 1;
+				note.noteString = {
+					nodeType: AlphaTexNodeType.Number,
+					value: stringNumber
+				};
+			}
+		} else if (data.isPiano) note.noteValue = {
 			nodeType: AlphaTexNodeType.Ident,
 			text: Tuning.getTextForTuning(data.realValueWithoutHarmonic, true)
 		};
@@ -68925,7 +68981,7 @@ class AlphaTexExporter extends ScoreExporter {
 				nodeType: AlphaTexNodeType.Number,
 				value: data.fret
 			};
-			note.noteStringDot = { nodeType: AlphaTexNodeType.Dot };
+			note.noteStringSeparator = { nodeType: AlphaTexNodeType.Dot };
 			const stringNumber = data.beat.voice.bar.staff.tuning.length - data.string + 1;
 			note.noteString = {
 				nodeType: AlphaTexNodeType.Number,
@@ -69497,6 +69553,7 @@ class GpifWriter {
 			this._writeSimplePropertyNode(properties, "Midi", "Number", note.realValue.toString());
 			if (note.showStringNumber) this._writeSimplePropertyNode(properties, "ShowStringNumber", "Enable", null);
 		}
+		if (note.isPercussion) this._writeSimplePropertyNode(properties, "String", "String", (note.string - 1).toString());
 		if (note.isPiano) {
 			this._writeSimplePropertyNode(properties, "Octave", "Number", note.octave.toString());
 			this._writeSimplePropertyNode(properties, "Tone", "Step", note.tone.toString());