abcjs 6.4.3 → 6.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abcjs",
-  "version": "6.4.3",
+  "version": "6.5.0",
   "description": "Renderer for abc music notation",
   "main": "index.js",
   "types": "types/index.d.ts",

package/src/parse/abc_parse_directive.js

@@ -938,14 +938,27 @@ var parseDirective = {};
 				}
 				multilineVars.currBarNumber = tuneBuilder.setBarNumberImmediate(tokens[0].intt);
 				break;
+			case "keywarn":
+				if (tokens.length !== 1 || tokens[0].type !== 'number' || (tokens[0].intt !== 1 && tokens[0].intt !== 0)) {
+					return 'Directive ' + cmd + ' requires 0 or 1 as a parameter.';
+				}
+				multilineVars[cmd] = tokens[0].intt === 1
+				break;
 			case "begintext":
 				var textBlock = '';
 				line = tokenizer.nextLine();
 				while(line && line.indexOf('%%endtext') !== 0) {
-					if (parseCommon.startsWith(line, "%%"))
-						textBlock += line.substring(2) + "\n";
-					else
-						textBlock += line + "\n";
+		          // MAE 9 May 2025 - for text blocks with just white space
+		          if (parseCommon.startsWith(line, "%%")){
+
+		            var theLine = line.substring(2);
+		            theLine = theLine.trim() + "\n";
+		            textBlock += theLine;
+
+		          }
+		          else{
+		            textBlock += line.trim() + "\n";
+		          }
 					line = tokenizer.nextLine();
 				}
 				tuneBuilder.addText(textBlock, { startChar: multilineVars.iChar, endChar: multilineVars.iChar+textBlock.length+7});
@@ -1119,6 +1132,17 @@ var parseDirective = {};
 				}
 				break;
 
+			case "maxstaves":
+				var nStaves = tokenizer.getInt(restOfString)
+				if (nStaves.digits === 0)
+					warn("Expected number of staves in maxstaves")
+				else{
+					if (nStaves.value > 0){
+						tune.formatting.maxStaves = nStaves.value;
+					}
+				}
+				break;
+
 			case "newpage":
 				var pgNum = tokenizer.getInt(restOfString);
 				tuneBuilder.addNewPage(pgNum.digits === 0 ? -1 : pgNum.value);
@@ -1179,6 +1203,14 @@ var parseDirective = {};
 				}
 				break;
 
+			case "visualtranspose":
+				var halfSteps = tokenizer.getInt(restOfString)
+				if (halfSteps.digits === 0)
+					warn("Expected number of half steps in visualTranspose")
+				else
+					multilineVars.globalTranspose = halfSteps.value
+				break;
+
 			case "map":
 			case "playtempo":
 			case "auquality":

package/src/parse/abc_parse_header.js

@@ -429,9 +429,9 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 					return [ line.length ];
 				case "K:":
 					var result = parseKeyVoice.parseKey(line.substring(i+2), tuneBuilder.hasBeginMusic());
-					if (result.foundClef && tuneBuilder.hasBeginMusic())
+					if (result.foundClef && tuneBuilder.hasBeginMusic() && multilineVars.keywarn !== false)
 						tuneBuilder.appendStartingElement('clef', multilineVars.iChar + i, multilineVars.iChar + line.length, multilineVars.clef);
-					if (result.foundKey && tuneBuilder.hasBeginMusic())
+					if (result.foundKey && tuneBuilder.hasBeginMusic() && multilineVars.keywarn !== false)
 						tuneBuilder.appendStartingElement('key', multilineVars.iChar + i, multilineVars.iChar + line.length, parseKeyVoice.fixKey(multilineVars.clef, multilineVars.key));
 					return [ line.length ];
 				case "P:":
@@ -504,7 +504,7 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 					// since the key is the last thing that can happen in the header, we can resolve the tempo now
 					this.resolveTempo();
 					var result = parseKeyVoice.parseKey(line.substring(2), false);
-					if (!multilineVars.is_in_header && tuneBuilder.hasBeginMusic()) {
+					if (!multilineVars.is_in_header && tuneBuilder.hasBeginMusic() && multilineVars.keywarn !== false) {
 						if (result.foundClef)
 							tuneBuilder.appendStartingElement('clef', startChar, endChar, multilineVars.clef);
 						if (result.foundKey)

package/src/parse/abc_parse_key_voice.js

@@ -292,7 +292,7 @@ var parseKeyVoice = {};
 					if (isInline)
 						multilineVars.globalTransposeOrigKeySig = savedOrigKey
 					multilineVars.key.mode = mode;
-					if (oldKey) {
+					if (oldKey && multilineVars.keywarn !== false) {
 						// Add natural in all places that the old key had an accidental.
 						var kk;
 						for (var k = 0; k < multilineVars.key.accidentals.length; k++) {
@@ -644,13 +644,48 @@ var parseKeyVoice = {};
 					case 'tenor,,':
 					case 'alto,,':
 					case 'none,,':
+// MAE 26 May 2025 Start of additional clefs
+					case 'treble+8':
+					case 'treble-8':
+					case 'treble^8':
+					case 'treble_8':
+					case 'treble1':
+					case 'treble2':
+					case 'treble3':
+					case 'treble4':
+					case 'treble5':
+					case 'bass+8':
+					case 'bass-8':
+					case 'bass^8':
+					case 'bass_8':
+					case 'bass+16':
+					case 'bass-16':
+					case 'bass^16':
+					case 'bass_16':
+					case 'bass1':
+					case 'bass2':
+					case 'bass3':
+					case 'bass4':
+					case 'bass5':
+					case 'tenor1':
+					case 'tenor2':
+					case 'tenor3':
+					case 'tenor4':
+					case 'tenor5':
+					case 'alto1':
+					case 'alto2':
+					case 'alto3':
+					case 'alto4':
+					case 'alto5':
+					case 'alto+8':
+					case 'alto-8':
+					case 'alto^8':
+					case 'alto_8':
+// MAE 26 May 2025 End of additional clefs
+
 						// TODO-PER: handle the octave indicators on the clef by changing the middle property
 						var oct2 = 0;
-	//							for (var iii = 0; iii < token.token.length; iii++) {
-	//								if (token.token[iii] === ',') oct2 -= 7;
-	//								else if (token.token[iii] === "'") oct2 += 7;
-	//							}
-											  staffInfo.clef = token.token.replace(/[',]/g, ""); //'//comment for emacs formatting of regexp
+						staffInfo.clef = token.token.replace(/[',]/g, ""); //'//comment for emacs formatting of regexp
 						staffInfo.verticalPos = calcMiddle(staffInfo.clef, oct2);
 						multilineVars.voices[id].clef = token.token;
 						break;

package/src/parse/abc_parse_music.js

@@ -294,8 +294,7 @@ MusicParser.prototype.parseMusic = function(line) {
 					else if (bar.endEnding)
 						multilineVars.barFirstEndingNum = undefined;
 					if (bar.type !== 'bar_invisible' && multilineVars.measureNotEmpty) {
-						var isFirstVoice = multilineVars.currentVoice === undefined || (multilineVars.currentVoice.staffNum ===  0 && multilineVars.currentVoice.index ===  0);
-						if (isFirstVoice) {
+						if (isFirstVoice()) {
 							multilineVars.currBarNumber++;
 							if (multilineVars.barNumbers && multilineVars.currBarNumber % multilineVars.barNumbers === 0)
 								bar.barNumber = multilineVars.currBarNumber;
@@ -510,6 +509,8 @@ MusicParser.prototype.parseMusic = function(line) {
 							if (el.startTie !== undefined) el.pitches[0].startTie = el.startTie;
 						} else {
 							el.rest = core.rest;
+							if (core.rest.type === 'multimeasure' && isFirstVoice())
+								multilineVars.currBarNumber += core.rest.text - 1 // The minus one is because the measure with the rest is already counted once normally.
 							if (core.endSlur !== undefined) el.endSlur = core.endSlur;
 							if (core.endTie !== undefined) el.rest.endTie = core.endTie;
 							if (core.startSlur !== undefined) el.startSlur = core.startSlur;
@@ -834,6 +835,8 @@ var letter_to_accent = function(line, i) {
 		case 'R':return [1, 'roll'];
 		case 'S':return [1, 'segno'];
 		case 'T':return [1, 'trill'];
+		case 't':return [1, 'trillh'];
+		
 	}
 	return [0, 0];
 };
@@ -1030,8 +1033,7 @@ MusicParser.prototype.startNewLine = function() {
 				params.currentVoiceName = voices[mv]
 		}
 	}
-	var isFirstVoice = multilineVars.currentVoice === undefined || (multilineVars.currentVoice.staffNum ===  0 && multilineVars.currentVoice.index ===  0);
-	if (multilineVars.barNumbers === 0 && isFirstVoice && multilineVars.currBarNumber !== 1)
+	if (multilineVars.barNumbers === 0 && isFirstVoice() && multilineVars.currBarNumber !== 1)
 		params.barNumber = multilineVars.currBarNumber;
 	tuneBuilder.startNewLine(params);
 	if (multilineVars.key.impliedNaturals)
@@ -1315,4 +1317,8 @@ var getBrokenRhythm = function(line, index) {
 	return null;
 };
 
+function isFirstVoice() {
+	return multilineVars.currentVoice === undefined || (multilineVars.currentVoice.staffNum ===  0 && multilineVars.currentVoice.index ===  0);
+}
+
 module.exports = MusicParser;

package/src/parse/abc_parse_settings.js

@@ -1,5 +1,6 @@
 module.exports.legalAccents = [
   'trill',
+  'trillh',
   'lowermordent',
   'uppermordent',
   'mordent',

package/src/parse/abc_tokenizer.js

@@ -677,9 +677,17 @@ function getTitleNumber(str){
 }
 
 var thePatterns = [
-	{ match: /,\s*[Tt]he$/, replace: "The " },
-	{ match: /,\s*[Aa]$/, replace: "A " },
-	{ match: /,\s*[Aa]n$/, replace: "An " },
+	{ match: /,\s*The$/, replace: "The " },
+	{ match: /,\s*the$/, replace: "the " },
+	{ match: /,\s*A$/, replace: "A " },
+	{ match: /,\s*a$/, replace: "a " },
+	{ match: /,\s*An$/, replace: "An " },
+	{ match: /,\s*an$/, replace: "an " },
+	{ match: /,\s*Da$/, replace: "Da " },
+	{ match: /,\s*La$/, replace: "La " },
+	{ match: /,\s*Le$/, replace: "Le " },
+	{ match: /,\s*Les$/, replace: "Les " },
+	{ match: /,\s*Ye$/, replace: "Ye " },
 ]
 
 this.theReverser = function (str) {

package/src/parse/abc_transpose.js

@@ -65,7 +65,7 @@ transpose.keySignature = function(multilineVars, keyName, root, acc, localTransp
 	var newKeyName = (keyName[0] === 'm' ? newKeyMinor[index] : newKey[index]);
 	var transposedKey = newKeyName + keyName;
 	var newKeySig = keyAccidentals(transposedKey);
-	if (newKeySig.length > 0 && newKeySig[0].acc === 'flat')
+	if (newKeySig.length === 0 || newKeySig[0].acc === 'flat') // key of C and all keys with flats should have chords with flats
 		multilineVars.localTransposePreferFlats = true;
 	var distance = transposedKey.charCodeAt(0) - baseKey.charCodeAt(0);
 	if (multilineVars.localTranspose > 0) {

package/src/parse/transpose-chord.js

@@ -45,6 +45,14 @@ function transposeChordName(chord, steps, preferFlats, freeGCchord) {
 		else chord = sharpChords[index]
 	}
 
+	var isDim = extra1 && (extra1.indexOf('dim') >= 0 || extra1.indexOf('°') >= 0)
+	console.log(isDim, chord, extra1)
+	// We never want A#dim or D#dim
+	if (isDim && chord === 'A#') chord = 'Bb'
+	if (isDim && chord === 'D#') chord = 'Eb'
+	if (isDim && chord === 'A♯') chord = 'B♭'
+	if (isDim && chord === 'D♯') chord = 'E♭'
+
 	if (extra1)
 		chord += extra1
 
@@ -77,4 +85,4 @@ function transposeChordName(chord, steps, preferFlats, freeGCchord) {
 	return chord;
 }
 
-module.exports = transposeChordName
+module.exports = transposeChordName

package/src/parse/tune-builder.js

@@ -9,7 +9,7 @@ var TuneBuilder = function (tune) {
 	tune.reset();
 
 	this.setVisualTranspose = function (visualTranspose) {
-		if (visualTranspose)
+		if (visualTranspose!==undefined)
 			tune.visualTranspose = visualTranspose;
 	};
 
@@ -382,7 +382,7 @@ var TuneBuilder = function (tune) {
 
 	this.getCurrentVoice = function () {
 		//console.log("getCurrentVoice", tune.lineNum)
-		var currLine = tune.lines[tune.lineNum];
+		var currLine = getPrevMusicLine(tune.lines, tune.lineNum)
 		if (!currLine)
 			return null;
 		var currStaff = currLine.staff[tune.staffNum];
@@ -803,6 +803,18 @@ function wrapMusicLines(lines, barsperstaff) {
 	return false;
 }
 
+function getPrevMusicLine(lines, currentLine) {
+	if (lines.length <= currentLine)
+		return null
+	// If the current line doesn't have music, search backwards until one is found.
+	while (currentLine >= 0) {
+		if (lines[currentLine].staff)
+			return lines[currentLine];
+		currentLine--;
+	}
+	return null;
+}
+
 function getNextMusicLine(lines, currentLine) {
 	currentLine++;
 	while (lines.length > currentLine) {

package/src/str/output.js

@@ -58,12 +58,12 @@ var strTranspose;
 		var count = arr[0].length
 		for (var i = 1; i < arr.length; i++) {
 			var segment = arr[i]
-			var match = segment.match(/^( *)([A-G])([#b]?)(\w*)/)
+			var match = segment.match(/^( *)([A-G])([#b]?)( ?)(\w*)/)
 			if (match) {
 				var start = count + 2 + match[1].length // move past the 'K:' and optional white space
-				var key = match[2] + match[3] + match[4] // key name, accidental, and mode
-				var destinationKey = newKey({ root: match[2], acc: match[3], mode: match[4] }, steps)
-				var dest = destinationKey.root + destinationKey.acc + destinationKey.mode
+				var key = match[2] + match[3] + match[4] + match[5] // key name, accidental, optional space, and mode
+				var destinationKey = newKey({ root: match[2], acc: match[3], mode: match[5] }, steps)
+				var dest = destinationKey.root + destinationKey.acc + match[4] + destinationKey.mode
 				changes.push({ start: start, end: start + key.length, note: dest })
 			}
 			count += segment.length + 2

package/src/synth/abc_midi_flattener.js

@@ -35,6 +35,7 @@ var pitchesToPerc = require('./pitches-to-perc');
 	var stressBeat1 = 105;
 	var stressBeatDown = 95;
 	var stressBeatUp = 85;
+	var volumesPerNotePitch = [[stressBeat1, stressBeatDown, stressBeatUp]];
 	var beatFraction = 0.25;
 	var nextVolume;
 	var nextVolumeDelta;
@@ -77,6 +78,7 @@ var pitchesToPerc = require('./pitches-to-perc');
 		stressBeat1 = 105;
 		stressBeatDown = 95;
 		stressBeatUp = 85;
+		volumesPerNotePitch = [];
 		beatFraction = 0.25;
 		nextVolume = undefined;
 		nextVolumeDelta = undefined;
@@ -193,6 +195,10 @@ var pitchesToPerc = require('./pitches-to-perc');
 						stressBeat1 = element.beats[0];
 						stressBeatDown = element.beats[1];
 						stressBeatUp = element.beats[2];
+						if (!element.volumesPerNotePitch)
+							volumesPerNotePitch = []
+						else
+							volumesPerNotePitch = element.volumesPerNotePitch;
 						// TODO-PER: also use the last parameter - which changes which beats are strong.
 						break;
 					case "vol":
@@ -343,28 +349,35 @@ var pitchesToPerc = require('./pitches-to-perc');
 		return distanceFromStart / beatLength;
 	}
 
-	function processVolume(beat, voiceOff) {
+	function processVolume(beat, voiceOff, pitchIndexOfNote) {
 		if (voiceOff)
 			return 0;
-
+		let pitchStressBeat1 = stressBeat1;
+		let pitchStressBeatDown = stressBeatDown;
+		let pitchStressBeatUp = stressBeatUp;
+		if(pitchIndexOfNote !== undefined && volumesPerNotePitch.length >= pitchIndexOfNote+1){
+			pitchStressBeat1 = volumesPerNotePitch[pitchIndexOfNote][0];
+			pitchStressBeatDown = volumesPerNotePitch[pitchIndexOfNote][1];
+			pitchStressBeatUp = volumesPerNotePitch[pitchIndexOfNote][2];
+		}
 		var volume;
     	// MAE 21 Jun 2024 - This previously wasn't allowing zero volume to be applied
-		if (nextVolume != undefined) {
+		if (nextVolume !== undefined) {
 			volume = nextVolume;
 			nextVolume = undefined;
 		} else if (!doBeatAccents) {
-			volume = stressBeatDown;
+			volume = pitchStressBeatDown;
 		} else if (pickupLength > beat) {
-			volume = stressBeatUp;
+			volume = pitchStressBeatUp;
 		} else {
 			//var barLength = meter.num / meter.den;
 			var barBeat = calcBeat(lastBarTime, getBeatFraction(meter), beat);
 			if (barBeat === 0)
-				volume = stressBeat1;
+				volume = pitchStressBeat1;
 			else if (parseInt(barBeat,10) === barBeat)
-				volume = stressBeatDown;
+				volume = pitchStressBeatDown;
 			else
-				volume = stressBeatUp;
+				volume = pitchStressBeatUp;
 		}
 		if (nextVolumeDelta) {
 			volume += nextVolumeDelta;
@@ -393,13 +406,17 @@ var pitchesToPerc = require('./pitches-to-perc');
 				else if (elem.decoration[d] === 'lowermordent')
 					ret.noteModification = "lowermordent";
 				else if (elem.decoration[d] === 'uppermordent')
-					ret.noteModification = "mordent";
+					ret.noteModification = "pralltriller";
 				else if (elem.decoration[d] === 'mordent')
 					ret.noteModification = "mordent";
 				else if (elem.decoration[d] === 'turn')
 					ret.noteModification = "turn";
 				else if (elem.decoration[d] === 'roll')
 					ret.noteModification = "roll";
+				else if (elem.decoration[d] === 'pralltriller')
+					ret.noteModification = "pralltriller";
+				else if (elem.decoration[d] === 'trillh') 
+					ret.noteModification = "trillh";
 			}
 		}
 		return ret;
@@ -415,39 +432,57 @@ var pitchesToPerc = require('./pitches-to-perc');
 
 		switch (noteModification) {
 			case "trill":
-				var note = 1;
+				var note = 2;
 				while (runningDuration > 0) {
 					currentTrack.push({ cmd: 'note', pitch: p.pitch+note, volume: p.volume, start: start, duration: shortestNote, gap: 0, instrument: currentInstrument, style: 'decoration' });
-					note = (note === 1) ? 0 : 1;
+					note = (note === 2) ? 0 : 2;
 					runningDuration -= shortestNote;
 					start += shortestNote;
 				}
 				break;
-			case "mordent":
+		      case "trillh":
+			        var note = 1;
+			        while (runningDuration > 0) {
+			          currentTrack.push({
+			            cmd: 'note',
+			            pitch: p.pitch + note,
+			            volume: p.volume,
+			            start: start,
+			            duration: shortestNote,
+			            gap: 0,
+			            instrument: currentInstrument,
+			            style: 'decoration'
+			          });
+			          note = note === 1 ? 0 : 1;
+			          runningDuration -= shortestNote;
+			          start += shortestNote;
+			        }
+			        break;
+			case "pralltriller":
 				currentTrack.push({ cmd: 'note', pitch: p.pitch, volume: p.volume, start: start, duration: shortestNote, gap: 0, instrument: currentInstrument, style: 'decoration' });
 				runningDuration -= shortestNote;
 				start += shortestNote;
-				currentTrack.push({ cmd: 'note', pitch: p.pitch+1, volume: p.volume, start: start, duration: shortestNote, gap: 0, instrument: currentInstrument, style: 'decoration' });
+				currentTrack.push({ cmd: 'note', pitch: p.pitch+2, volume: p.volume, start: start, duration: shortestNote, gap: 0, instrument: currentInstrument, style: 'decoration' });
 				runningDuration -= shortestNote;
 				start += shortestNote;
 				currentTrack.push({ cmd: 'note', pitch: p.pitch, volume: p.volume, start: start, duration: runningDuration, gap: 0, instrument: currentInstrument });
 				break;
+			case "mordent":
 			case "lowermordent":
 				currentTrack.push({ cmd: 'note', pitch: p.pitch, volume: p.volume, start: start, duration: shortestNote, gap: 0, instrument: currentInstrument, style: 'decoration' });
 				runningDuration -= shortestNote;
 				start += shortestNote;
-				currentTrack.push({ cmd: 'note', pitch: p.pitch-1, volume: p.volume, start: start, duration: shortestNote, gap: 0, instrument: currentInstrument, style: 'decoration' });
+				currentTrack.push({ cmd: 'note', pitch: p.pitch-2, volume: p.volume, start: start, duration: shortestNote, gap: 0, instrument: currentInstrument, style: 'decoration' });
 				runningDuration -= shortestNote;
 				start += shortestNote;
 				currentTrack.push({ cmd: 'note', pitch: p.pitch, volume: p.volume, start: start, duration: runningDuration, gap: 0, instrument: currentInstrument });
 				break;
 			case "turn":
-				shortestNote = p.duration / 5;
-				currentTrack.push({ cmd: 'note', pitch: p.pitch, volume: p.volume, start: start, duration: shortestNote, gap: 0, instrument: currentInstrument, style: 'decoration' });
-				currentTrack.push({ cmd: 'note', pitch: p.pitch+1, volume: p.volume, start: start+shortestNote, duration: shortestNote, gap: 0, instrument: currentInstrument, style: 'decoration' });
-				currentTrack.push({ cmd: 'note', pitch: p.pitch, volume: p.volume, start: start+shortestNote*2, duration: shortestNote, gap: 0, instrument: currentInstrument, style: 'decoration' });
-				currentTrack.push({ cmd: 'note', pitch: p.pitch+1, volume: p.volume, start: start+shortestNote*3, duration: shortestNote, gap: 0, instrument: currentInstrument, style: 'decoration' });
-				currentTrack.push({ cmd: 'note', pitch: p.pitch, volume: p.volume, start: start+shortestNote*4, duration: shortestNote, gap: 0, instrument: currentInstrument });
+				shortestNote = p.duration / 4;
+				currentTrack.push({ cmd: 'note', pitch: p.pitch+2, volume: p.volume, start: start, duration: shortestNote, gap: 0, instrument: currentInstrument, style: 'decoration' });
+				currentTrack.push({ cmd: 'note', pitch: p.pitch, volume: p.volume, start: start+shortestNote, duration: shortestNote, gap: 0, instrument: currentInstrument, style: 'decoration' });
+				currentTrack.push({ cmd: 'note', pitch: p.pitch-1, volume: p.volume, start: start+shortestNote*2, duration: shortestNote, gap: 0, instrument: currentInstrument, style: 'decoration' });
+				currentTrack.push({ cmd: 'note', pitch: p.pitch, volume: p.volume, start: start+shortestNote*3, duration: shortestNote, gap: 0, instrument: currentInstrument, style: 'decoration' });
 				break;
 			case "roll":
 				while (runningDuration > 0) {
@@ -533,6 +568,11 @@ var pitchesToPerc = require('./pitches-to-perc');
 			if (elem.elem)
 				elem.elem.midiPitches = [];
 			for (var i=0; i<ePitches.length; i++) {
+				//here we can set the volume for each note in a chord, if specified
+				let pitchVelocity = velocity;
+				if(!ret.velocity && Array.isArray(elem.decoration) && elem.decoration.length > i){
+					pitchVelocity = processVolume(timeToRealTime(elem.time), voiceOff, i)
+				}
 				var note = ePitches[i];
 				if (!note)
 					continue;
@@ -546,7 +586,7 @@ var pitchesToPerc = require('./pitches-to-perc');
 					if (name && percmap[name])
 						actualPitch = percmap[name].sound;
 				}
-				var p = { cmd: 'note', pitch: actualPitch, volume: velocity, start: timeToRealTime(elem.time), duration: durationRounded(note.duration), instrument: currentInstrument, startChar: elem.elem.startChar, endChar: elem.elem.endChar};
+				var p = { cmd: 'note', pitch: actualPitch, volume: pitchVelocity, start: timeToRealTime(elem.time), duration: durationRounded(note.duration), instrument: currentInstrument, startChar: elem.elem.startChar, endChar: elem.elem.endChar};
 				p = adjustForMicroTone(p);
 				if (elem.gracenotes) {
 					p.duration = p.duration / 2;

package/src/synth/abc_midi_sequencer.js

@@ -135,6 +135,7 @@ var parseCommon = require("../parse/abc_common");
 
 		// visit each voice completely in turn
 		var voices = [];
+		var clefTransposeActive = []
 		var inCrescendo = [];
 		var inDiminuendo = [];
 		var durationCounter = [0];
@@ -188,12 +189,24 @@ var parseCommon = require("../parse/abc_common");
 						if (staff.clef && staff.clef.type !== "perc" && staff.clef.transpose) {
 							staff.clef.el_type = 'clef';
 							voices[voiceNumber].push({ el_type: 'transpose', transpose: staff.clef.transpose });
+							clefTransposeActive[voiceNumber] = false
 						}
 						if (staff.clef && staff.clef.type) {
-							if (staff.clef.type.indexOf("-8") >= 0)
-								voices[voiceNumber].push({ el_type: 'transpose', transpose: -12 });
-							else if (staff.clef.type.indexOf("+8") >= 0)
-								voices[voiceNumber].push({ el_type: 'transpose', transpose: 12 });
+							if (staff.clef.type.indexOf("-8") >= 0) {
+								voices[voiceNumber].push({el_type: 'transpose', transpose: -12});
+								clefTransposeActive[voiceNumber] = true
+							}
+							else if (staff.clef.type.indexOf("+8") >= 0) {
+								voices[voiceNumber].push({el_type: 'transpose', transpose: 12});
+								clefTransposeActive[voiceNumber] = true
+							}
+							else {
+								// if we had a previous treble+8 and now have a regular clef, then cancel the transposition
+								if (clefTransposeActive[voiceNumber]) {
+									voices[voiceNumber].push({ el_type: 'transpose', transpose: 0 });
+									clefTransposeActive[voiceNumber] = false
+								}
+							}
 						}
 
 						if (abctune.formatting.midi && abctune.formatting.midi.drumoff) {
@@ -429,7 +442,7 @@ var parseCommon = require("../parse/abc_common");
 				}
 
 				function setDynamics(elem) {
-					var volumes = {
+					var volumes = {//stressBeat1, stressBeatDown, stressBeatUp
 						'pppp': [15, 10, 5, 1],
 						'ppp': [30, 20, 10, 1],
 						'pp': [45, 35, 20, 1],
@@ -467,7 +480,14 @@ var parseCommon = require("../parse/abc_common");
 
 						if (dynamicType) {
 							currentVolume = volumes[dynamicType].slice(0);
-							voices[voiceNumber].push({ el_type: 'beat', beats: currentVolume.slice(0) });
+							let volumesPerNotePitch = [currentVolume];
+							if(Array.isArray(elem.decoration)){
+								volumesPerNotePitch = [];
+								elem.decoration.forEach(d=>{
+									volumesPerNotePitch.push(volumes[d].slice(0));
+								});
+							}
+							voices[voiceNumber].push({ el_type: 'beat', beats: currentVolume.slice(0), volumesPerNotePitch: volumesPerNotePitch, });
 							inCrescendo[k] = false;
 							inDiminuendo[k] = false;
 						}

package/src/synth/chord-track.js

@@ -183,7 +183,7 @@ ChordTrack.prototype.interpretChord = function (name) {
 		return { chick: [] };
 	var root = name.substring(0, 1);
 	if (root === '(') {
-		name = name.substring(1, name.length - 2);
+		name = name.substring(1, name.length - 1);
 		if (name.length === 0)
 			return undefined;
 		root = name.substring(0, 1);