abcjs 6.4.3 → 6.5.0

package/dist/abcjs-basic.js

@@ -617,6 +617,7 @@ var tunebook = {};
         }
       }
     }
+
     return staves;
   }
   function measuresParser(staff, tune) {
@@ -1340,6 +1341,7 @@ var Tune = function Tune() {
     };
     return this.meter; // TODO-PER: is this saved value used anywhere? A get function shouldn't change state.
   };
+
   this.getKeySignature = function () {
     for (var i = 0; i < this.lines.length; i++) {
       var line = this.lines[i];
@@ -1494,6 +1496,7 @@ var Tune = function Tune() {
         // 	isTiedState = voiceTimeMilliseconds;
       }
     }
+
     return {
       isTiedState: isTiedState,
       duration: realDuration / timeDivider,
@@ -3119,6 +3122,7 @@ var Parse = function Parse() {
       multilineVars.lineBreaks = switches.lineBreaks;
       //multilineVars.continueall = true;
     }
+
     header.reset(tokenizer, warn, multilineVars, tune);
     try {
       if (switches.format) {
@@ -3208,6 +3212,7 @@ var bookParser = function bookParser(book) {
     });
     pos += tune.length + 1; // We also lost a newline when splitting, so count that.
   });
+
   if (tunes.length > 1 && !parseCommon.startsWith(tunes[0].abc, 'X:')) {
     // If there is only one tune, the X: might be missing, otherwise assume the top of the file is "intertune"
     // There could be file-wide directives in this, if so, we need to insert it into each tune. We can probably get away with
@@ -4314,11 +4319,24 @@ 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, {
@@ -4503,6 +4521,14 @@ 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);
@@ -4563,6 +4589,10 @@ var parseDirective = {};
           tune.formatting.percmap[percmap.key] = percmap.value;
         }
         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":
@@ -4780,6 +4810,7 @@ var ParseHeader = function ParseHeader(tokenizer, warn, multilineVars, tune, tun
           }
           return ret; // just to suppress warning
         };
+
         var parseFraction = function parseFraction() {
           // handles this much: parseNum slash decimal
           var ret = parseNum();
@@ -4810,6 +4841,7 @@ var ParseHeader = function ParseHeader(tokenizer, warn, multilineVars, tune, tun
           //var tok = tokens.shift();
           //if (tok.token !== '+') throw "Extra characters in M: line";
         }
+
         if (multilineVars.havent_set_length === true) {
           multilineVars.default_length = totalLength < 0.75 ? 0.0625 : 0.125;
           multilineVars.havent_set_length = false;
@@ -5085,6 +5117,7 @@ var ParseHeader = function ParseHeader(tokenizer, warn, multilineVars, tune, tun
         // TODO: complain about unhandled header
       }
     }
+
     return [0];
   };
   this.letter_to_body_header = function (line, i) {
@@ -5101,8 +5134,8 @@ var ParseHeader = function ParseHeader(tokenizer, warn, multilineVars, tune, tun
           return [line.length];
         case "K:":
           var result = parseKeyVoice.parseKey(line.substring(i + 2), tuneBuilder.hasBeginMusic());
-          if (result.foundClef && tuneBuilder.hasBeginMusic()) tuneBuilder.appendStartingElement('clef', multilineVars.iChar + i, multilineVars.iChar + line.length, multilineVars.clef);
-          if (result.foundKey && tuneBuilder.hasBeginMusic()) tuneBuilder.appendStartingElement('key', multilineVars.iChar + i, multilineVars.iChar + line.length, parseKeyVoice.fixKey(multilineVars.clef, multilineVars.key));
+          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() && multilineVars.keywarn !== false) tuneBuilder.appendStartingElement('key', multilineVars.iChar + i, multilineVars.iChar + line.length, parseKeyVoice.fixKey(multilineVars.clef, multilineVars.key));
           return [line.length];
         case "P:":
           if (tuneBuilder.hasBeginMusic()) tuneBuilder.appendElement('part', multilineVars.iChar + i, multilineVars.iChar + line.length, {
@@ -5126,6 +5159,7 @@ var ParseHeader = function ParseHeader(tokenizer, warn, multilineVars, tune, tun
         // TODO: complain about unhandled header
       }
     }
+
     return [0];
   };
   var metaTextHeaders = {
@@ -5183,7 +5217,7 @@ var ParseHeader = function ParseHeader(tokenizer, warn, multilineVars, tune, tun
           // 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) tuneBuilder.appendStartingElement('key', startChar, endChar, parseKeyVoice.fixKey(multilineVars.clef, multilineVars.key));
           }
@@ -5592,6 +5626,7 @@ var parseKeyVoice = {};
       str: str.substring(i)
     }; // We get the note in the middle of the staff. We want the note that appears as the first ledger line below the staff.
   };
+
   var normalizeAccidentals = function normalizeAccidentals(accs) {
     for (var i = 0; i < accs.length; i++) {
       if (accs[i].note === 'b') accs[i].note = 'B';else if (accs[i].note === 'a') accs[i].note = 'A';else if (accs[i].note === 'F') accs[i].note = 'f';else if (accs[i].note === 'E') accs[i].note = 'e';else if (accs[i].note === 'D') accs[i].note = 'd';else if (accs[i].note === 'C') accs[i].note = 'c';else if (accs[i].note === 'G' && accs[i].acc === 'sharp') accs[i].note = 'g';else if (accs[i].note === 'g' && accs[i].acc === 'flat') accs[i].note = 'G';
@@ -5714,7 +5749,7 @@ var parseKeyVoice = {};
           multilineVars.key = parseKeyVoice.deepCopyKey(parseKeyVoice.standardKey(key, retPitch.token, acc, keyCompensate));
           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++) {
@@ -6008,6 +6043,7 @@ var parseKeyVoice = {};
     if (multilineVars.currentVoice) {
       if (multilineVars.currentVoice.index === currentVoice.index && multilineVars.currentVoice.staffNum === currentVoice.staffNum) return; // there was no change so don't reset it.
     }
+
     multilineVars.currentVoice = currentVoice;
     return tuneBuilder.setCurrentVoice(currentVoice.staffNum, currentVoice.index, id);
   };
@@ -6124,12 +6160,47 @@ 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.verticalPos = calcMiddle(staffInfo.clef, oct2);
             multilineVars.voices[id].clef = token.token;
@@ -6223,6 +6294,7 @@ var parseKeyVoice = {};
           // 	console.log("parse voice", token, tune.metaText.title);
         }
       }
+
       start += tokenizer.eatWhiteSpace(line, start);
     }
 
@@ -6397,6 +6469,7 @@ MusicParser.prototype.parseMusic = function (line) {
     // delayStartNewLine = true;
     // TODO-PER: Handle inline headers
   }
+
   var overlayLevel = 0;
   while (i < line.length) {
     var startI = i;
@@ -6535,8 +6608,7 @@ MusicParser.prototype.parseMusic = function (line) {
           if (el.chord !== undefined) bar.chord = el.chord;
           if (bar.startEnding && multilineVars.barFirstEndingNum === undefined) multilineVars.barFirstEndingNum = multilineVars.currBarNumber;else if (bar.startEnding && bar.endEnding && multilineVars.barFirstEndingNum) multilineVars.currBarNumber = multilineVars.barFirstEndingNum;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;
             }
@@ -6731,6 +6803,7 @@ 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;
@@ -7023,6 +7096,8 @@ var letter_to_accent = function letter_to_accent(line, i) {
       return [1, 'segno'];
     case 'T':
       return [1, 'trill'];
+    case 't':
+      return [1, 'trillh'];
   }
   return [0, 0];
 };
@@ -7191,8 +7266,7 @@ MusicParser.prototype.startNewLine = function () {
       if (params.currentVoice.staffNum === multilineVars.voices[voices[mv]].staffNum && params.currentVoice.index === multilineVars.voices[voices[mv]].index) 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) params.barNumber = multilineVars.currBarNumber;
+  if (multilineVars.barNumbers === 0 && isFirstVoice() && multilineVars.currBarNumber !== 1) params.barNumber = multilineVars.currBarNumber;
   tuneBuilder.startNewLine(params);
   if (multilineVars.key.impliedNaturals) delete multilineVars.key.impliedNaturals;
   multilineVars.partForNextLine = {};
@@ -7488,6 +7562,9 @@ var getBrokenRhythm = function getBrokenRhythm(line, index) {
   }
   return null;
 };
+function isFirstVoice() {
+  return multilineVars.currentVoice === undefined || multilineVars.currentVoice.staffNum === 0 && multilineVars.currentVoice.index === 0;
+}
 module.exports = MusicParser;
 
 /***/ }),
@@ -7498,7 +7575,7 @@ module.exports = MusicParser;
   \*****************************************/
 /***/ (function(module) {
 
-module.exports.legalAccents = ['trill', 'lowermordent', 'uppermordent', 'mordent', 'pralltriller', 'accent', 'fermata', 'invertedfermata', 'tenuto', '0', '1', '2', '3', '4', '5', '+', 'wedge', 'open', 'thumb', 'snap', 'turn', 'roll', 'breath', 'shortphrase', 'mediumphrase', 'longphrase', 'segno', 'coda', 'D.S.', 'D.C.', 'fine', 'beambr1', 'beambr2', 'slide', 'marcato', 'upbow', 'downbow', '/', '//', '///', '////', 'trem1', 'trem2', 'trem3', 'trem4', 'turnx', 'invertedturn', 'invertedturnx', 'trill(', 'trill)', 'arpeggio', 'xstem', 'mark', 'umarcato', 'style=normal', 'style=harmonic', 'style=rhythm', 'style=x', 'style=triangle', 'D.C.alcoda', 'D.C.alfine', 'D.S.alcoda', 'D.S.alfine', 'editorial', 'courtesy'];
+module.exports.legalAccents = ['trill', 'trillh', 'lowermordent', 'uppermordent', 'mordent', 'pralltriller', 'accent', 'fermata', 'invertedfermata', 'tenuto', '0', '1', '2', '3', '4', '5', '+', 'wedge', 'open', 'thumb', 'snap', 'turn', 'roll', 'breath', 'shortphrase', 'mediumphrase', 'longphrase', 'segno', 'coda', 'D.S.', 'D.C.', 'fine', 'beambr1', 'beambr2', 'slide', 'marcato', 'upbow', 'downbow', '/', '//', '///', '////', 'trem1', 'trem2', 'trem3', 'trem4', 'turnx', 'invertedturn', 'invertedturnx', 'trill(', 'trill)', 'arpeggio', 'xstem', 'mark', 'umarcato', 'style=normal', 'style=harmonic', 'style=rhythm', 'style=x', 'style=triangle', 'D.C.alcoda', 'D.C.alfine', 'D.S.alcoda', 'D.S.alfine', 'editorial', 'courtesy'];
 module.exports.volumeDecorations = ['p', 'pp', 'f', 'ff', 'mf', 'mp', 'ppp', 'pppp', 'fff', 'ffff', 'sfz'];
 module.exports.dynamicDecorations = ['crescendo(', 'crescendo)', 'diminuendo(', 'diminuendo)', 'glissando(', 'glissando)', '~(', '~)'];
 module.exports.accentPseudonyms = [['<', 'accent'], ['>', 'accent'], ['tr', 'trill'], ['plus', '+'], ['emphasis', 'accent'], ['^', 'umarcato'], ['marcato', 'umarcato']];
@@ -7577,6 +7654,7 @@ var Tokenizer = function Tokenizer(lines, multilineVars) {
     }
     return str.length; // It must have been all white space
   };
+
   var finished = function finished(str, i) {
     return i >= str.length;
   };
@@ -7637,6 +7715,7 @@ var Tokenizer = function Tokenizer(lines, multilineVars) {
       //			case 'f':return {len: i+1, token: 'F'};
       //			case 'g':return {len: i+1, token: 'G'};
     }
+
     return {
       len: 0
     };
@@ -8468,6 +8547,7 @@ var Tokenizer = function Tokenizer(lines, multilineVars) {
 
     // More chars: IJ ij Ď ď Đ đ Ĝ ĝ Ğ ğ Ġ ġ Ģ ģ Ĥ ĥ Ħ ħ Ĵ ĵ Ķ ķ ĸ Ĺ ĺ Ļ ļ Ľ ľ Ŀ ŀ Ł ł Ń ń Ņ ņ Ň ň ʼn Ŋ ŋ Ŕ ŕ Ŗ ŗ Ř ř Ś ś Ŝ ŝ Ş ş Š Ţ ţ Ť ť Ŧ ŧ Ŵ ŵ Ź ź Ż ż Ž
   };
+
   var charMap1 = {
     "#": "♯",
     "b": "♭",
@@ -8713,14 +8793,38 @@ var Tokenizer = function Tokenizer(lines, multilineVars) {
     }
   }
   var thePatterns = [{
-    match: /,\s*[Tt]he$/,
+    match: /,\s*The$/,
     replace: "The "
   }, {
-    match: /,\s*[Aa]$/,
+    match: /,\s*the$/,
+    replace: "the "
+  }, {
+    match: /,\s*A$/,
     replace: "A "
   }, {
-    match: /,\s*[Aa]n$/,
+    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) {
     for (var i = 0; i < thePatterns.length; i++) {
@@ -8970,7 +9074,9 @@ transpose.keySignature = function (multilineVars, keyName, root, acc, localTrans
   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') multilineVars.localTransposePreferFlats = true;
+  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) {
     if (distance < 0) distance += 7;else if (distance === 0) {
@@ -9142,6 +9248,13 @@ function transposeChordName(chord, steps, preferFlats, freeGCchord) {
   } else {
     if (freeGCchord) chord = sharpChordsFree[index];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;
   if (bass) {
     var index = sharpChords.indexOf(bass);
@@ -9159,6 +9272,7 @@ function transposeChordName(chord, steps, preferFlats, freeGCchord) {
       }
     } else chord += bass; // Don't know what to do so do nothing
   }
+
   if (extra2) chord += extra2;
   return chord;
 }
@@ -9182,7 +9296,7 @@ var TuneBuilder = function TuneBuilder(tune) {
   var currentVoiceName = '';
   tune.reset();
   this.setVisualTranspose = function (visualTranspose) {
-    if (visualTranspose) tune.visualTranspose = visualTranspose;
+    if (visualTranspose !== undefined) tune.visualTranspose = visualTranspose;
   };
   this.cleanUp = function (barsperstaff, staffnonote, currSlur) {
     closeLine(tune); // Close the last line.
@@ -9369,6 +9483,7 @@ var TuneBuilder = function TuneBuilder(tune) {
     if (hashParams.rest && hashParams.rest.type === 'invisible') {
       delete hashParams.decoration; // the decorations on invisible rests should be invisible, too.
     }
+
     if (tune.lines.length <= tune.lineNum || tune.lines[tune.lineNum].staff.length <= tune.staffNum) {
       //console.log("pushNote IGNORED", tune.lines[tune.lineNum])
       // TODO-PER: This prevents a crash, but it drops the element. Need to figure out how to start a new line, or delay adding this.
@@ -9556,7 +9671,7 @@ var TuneBuilder = function TuneBuilder(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];
     if (!currStaff) return null;
@@ -9836,6 +9951,7 @@ function cleanUpSlursInLine(line, staffNum, voiceNum, currSlur) {
       obj.endSlur.push(slurNum);
       //					lyr.syllable += '<' + slurNum;	// TODO-PER: debugging
     }
+
     if (currSlur[staffNum][voiceNum][chordPos].length === 0) delete currSlur[staffNum][voiceNum][chordPos];
     return slurNum;
   };
@@ -9978,6 +10094,15 @@ 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) {
@@ -10716,16 +10841,16 @@ 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 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[4]
+          mode: match[5]
         }, steps);
-        var dest = destinationKey.root + destinationKey.acc + destinationKey.mode;
+        var dest = destinationKey.root + destinationKey.acc + match[4] + destinationKey.mode;
         changes.push({
           start: start,
           end: start + key.length,
@@ -11085,6 +11210,7 @@ var strTranspose;
             return 0;
           // this should never happen
         }
+
       case '_':
         switch (thisAccidental) {
           case '__':
@@ -11101,6 +11227,7 @@ var strTranspose;
             return 0;
           // this should never happen
         }
+
       case '^':
         switch (thisAccidental) {
           case '__':
@@ -11118,9 +11245,11 @@ var strTranspose;
           // this should never happen
         }
     }
+
     return 0; // this should never happen
   }
 })();
+
 module.exports = strTranspose;
 
 /***/ }),
@@ -11169,6 +11298,7 @@ var pitchesToPerc = __webpack_require__(/*! ./pitches-to-perc */ "./src/synth/pi
   var stressBeat1 = 105;
   var stressBeatDown = 95;
   var stressBeatUp = 85;
+  var volumesPerNotePitch = [[stressBeat1, stressBeatDown, stressBeatUp]];
   var beatFraction = 0.25;
   var nextVolume;
   var nextVolumeDelta;
@@ -11210,6 +11340,7 @@ var pitchesToPerc = __webpack_require__(/*! ./pitches-to-perc */ "./src/synth/pi
     stressBeat1 = 105;
     stressBeatDown = 95;
     stressBeatUp = 85;
+    volumesPerNotePitch = [];
     beatFraction = 0.25;
     nextVolume = undefined;
     nextVolumeDelta = undefined;
@@ -11320,6 +11451,7 @@ var pitchesToPerc = __webpack_require__(/*! ./pitches-to-perc */ "./src/synth/pi
             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":
@@ -11445,6 +11577,7 @@ var pitchesToPerc = __webpack_require__(/*! ./pitches-to-perc */ "./src/synth/pi
       // console.log(JSON.stringify(voices))
     }
   }
+
   function getBeatFraction(meter) {
     switch (parseInt(meter.den, 10)) {
       case 2:
@@ -11462,21 +11595,29 @@ var pitchesToPerc = __webpack_require__(/*! ./pitches-to-perc */ "./src/synth/pi
     var distanceFromStart = currTime - measureStart;
     return distanceFromStart / beatLength;
   }
-  function processVolume(beat, voiceOff) {
+  function processVolume(beat, voiceOff, pitchIndexOfNote) {
     if (voiceOff) return 0;
+    var pitchStressBeat1 = stressBeat1;
+    var pitchStressBeatDown = stressBeatDown;
+    var 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;else if (parseInt(barBeat, 10) === barBeat) volume = stressBeatDown;else volume = stressBeatUp;
+      if (barBeat === 0) volume = pitchStressBeat1;else if (parseInt(barBeat, 10) === barBeat) volume = pitchStressBeatDown;else volume = pitchStressBeatUp;
     }
     if (nextVolumeDelta) {
       volume += nextVolumeDelta;
@@ -11490,7 +11631,7 @@ var pitchesToPerc = __webpack_require__(/*! ./pitches-to-perc */ "./src/synth/pi
     var ret = {};
     if (elem.decoration) {
       for (var d = 0; d < elem.decoration.length; d++) {
-        if (elem.decoration[d] === 'staccato') ret.thisBreakBetweenNotes = 'staccato';else if (elem.decoration[d] === 'tenuto') ret.thisBreakBetweenNotes = 'tenuto';else if (elem.decoration[d] === 'accent') ret.velocity = Math.min(127, velocity * 1.5);else if (elem.decoration[d] === 'trill') ret.noteModification = "trill";else if (elem.decoration[d] === 'lowermordent') ret.noteModification = "lowermordent";else if (elem.decoration[d] === 'uppermordent') ret.noteModification = "mordent";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";
+        if (elem.decoration[d] === 'staccato') ret.thisBreakBetweenNotes = 'staccato';else if (elem.decoration[d] === 'tenuto') ret.thisBreakBetweenNotes = 'tenuto';else if (elem.decoration[d] === 'accent') ret.velocity = Math.min(127, velocity * 1.5);else if (elem.decoration[d] === 'trill') ret.noteModification = "trill";else if (elem.decoration[d] === 'lowermordent') ret.noteModification = "lowermordent";else if (elem.decoration[d] === 'uppermordent') 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;
@@ -11504,6 +11645,24 @@ var pitchesToPerc = __webpack_require__(/*! ./pitches-to-perc */ "./src/synth/pi
     var shortestNote = durationRounded(1.0 / 32);
     switch (noteModification) {
       case "trill":
+        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 === 2 ? 0 : 2;
+          runningDuration -= shortestNote;
+          start += shortestNote;
+        }
+        break;
+      case "trillh":
         var note = 1;
         while (runningDuration > 0) {
           currentTrack.push({
@@ -11521,7 +11680,7 @@ var pitchesToPerc = __webpack_require__(/*! ./pitches-to-perc */ "./src/synth/pi
           start += shortestNote;
         }
         break;
-      case "mordent":
+      case "pralltriller":
         currentTrack.push({
           cmd: 'note',
           pitch: p.pitch,
@@ -11536,7 +11695,7 @@ var pitchesToPerc = __webpack_require__(/*! ./pitches-to-perc */ "./src/synth/pi
         start += shortestNote;
         currentTrack.push({
           cmd: 'note',
-          pitch: p.pitch + 1,
+          pitch: p.pitch + 2,
           volume: p.volume,
           start: start,
           duration: shortestNote,
@@ -11556,6 +11715,7 @@ var pitchesToPerc = __webpack_require__(/*! ./pitches-to-perc */ "./src/synth/pi
           instrument: currentInstrument
         });
         break;
+      case "mordent":
       case "lowermordent":
         currentTrack.push({
           cmd: 'note',
@@ -11571,7 +11731,7 @@ var pitchesToPerc = __webpack_require__(/*! ./pitches-to-perc */ "./src/synth/pi
         start += shortestNote;
         currentTrack.push({
           cmd: 'note',
-          pitch: p.pitch - 1,
+          pitch: p.pitch - 2,
           volume: p.volume,
           start: start,
           duration: shortestNote,
@@ -11592,10 +11752,10 @@ var pitchesToPerc = __webpack_require__(/*! ./pitches-to-perc */ "./src/synth/pi
         });
         break;
       case "turn":
-        shortestNote = p.duration / 5;
+        shortestNote = p.duration / 4;
         currentTrack.push({
           cmd: 'note',
-          pitch: p.pitch,
+          pitch: p.pitch + 2,
           volume: p.volume,
           start: start,
           duration: shortestNote,
@@ -11605,7 +11765,7 @@ var pitchesToPerc = __webpack_require__(/*! ./pitches-to-perc */ "./src/synth/pi
         });
         currentTrack.push({
           cmd: 'note',
-          pitch: p.pitch + 1,
+          pitch: p.pitch,
           volume: p.volume,
           start: start + shortestNote,
           duration: shortestNote,
@@ -11615,7 +11775,7 @@ var pitchesToPerc = __webpack_require__(/*! ./pitches-to-perc */ "./src/synth/pi
         });
         currentTrack.push({
           cmd: 'note',
-          pitch: p.pitch,
+          pitch: p.pitch - 1,
           volume: p.volume,
           start: start + shortestNote * 2,
           duration: shortestNote,
@@ -11625,7 +11785,7 @@ var pitchesToPerc = __webpack_require__(/*! ./pitches-to-perc */ "./src/synth/pi
         });
         currentTrack.push({
           cmd: 'note',
-          pitch: p.pitch + 1,
+          pitch: p.pitch,
           volume: p.volume,
           start: start + shortestNote * 3,
           duration: shortestNote,
@@ -11633,15 +11793,6 @@ var pitchesToPerc = __webpack_require__(/*! ./pitches-to-perc */ "./src/synth/pi
           instrument: currentInstrument,
           style: 'decoration'
         });
-        currentTrack.push({
-          cmd: 'note',
-          pitch: p.pitch,
-          volume: p.volume,
-          start: start + shortestNote * 4,
-          duration: shortestNote,
-          gap: 0,
-          instrument: currentInstrument
-        });
         break;
       case "roll":
         while (runningDuration > 0) {
@@ -11729,6 +11880,11 @@ var pitchesToPerc = __webpack_require__(/*! ./pitches-to-perc */ "./src/synth/pi
       }
       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
+        var 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;
         if (note.startSlur) slurCount += note.startSlur.length;
@@ -11741,7 +11897,7 @@ var pitchesToPerc = __webpack_require__(/*! ./pitches-to-perc */ "./src/synth/pi
         var p = {
           cmd: 'note',
           pitch: actualPitch,
-          volume: velocity,
+          volume: pitchVelocity,
           start: timeToRealTime(elem.time),
           duration: durationRounded(note.duration),
           instrument: currentInstrument,
@@ -12220,6 +12376,7 @@ var rendererFactory;
     this.track += this.noteOnAndChannel;
     this.track += "%" + pitch.toString(16) + toHex(loudness, 2); //note
   };
+
   Midi.prototype.endNote = function (pitch) {
     this.track += toDurationHex(this.silencelength); // only need to shift by amount of silence (if there is any)
     this.silencelength = 0;
@@ -12233,6 +12390,7 @@ var rendererFactory;
     this.track += this.noteOffAndChannel;
     this.track += "%" + pitch.toString(16) + "%00"; //end note
   };
+
   Midi.prototype.addRest = function (length) {
     this.silencelength += length;
     if (this.silencelength < 0) this.silencelength = 0;
@@ -12269,6 +12427,7 @@ var rendererFactory;
     }
     return "%00%FF" + cmdType + toHex(nameArray.length / 3, 2) + nameArray; // Each byte is represented by three chars "%XX", so divide by 3 to get the length.
   }
+
   function keySignature(key) {
     //00 FF 5902 03 00 - key signature
     if (!key || !key.accidentals) return "";
@@ -12521,6 +12680,7 @@ var parseCommon = __webpack_require__(/*! ../parse/abc_common */ "./src/parse/ab
 
     // visit each voice completely in turn
     var voices = [];
+    var clefTransposeActive = [];
     var inCrescendo = [];
     var inDiminuendo = [];
     var durationCounter = [0];
@@ -12541,6 +12701,7 @@ var parseCommon = __webpack_require__(/*! ../parse/abc_common */ "./src/parse/ab
       if (line.staff) {
         var setDynamics = function setDynamics(elem) {
           var volumes = {
+            //stressBeat1, stressBeatDown, stressBeatUp
             'pppp': [15, 10, 5, 1],
             'ppp': [30, 20, 10, 1],
             'pp': [45, 35, 20, 1],
@@ -12557,9 +12718,17 @@ var parseCommon = __webpack_require__(/*! ../parse/abc_common */ "./src/parse/ab
             if (elem.decoration.indexOf('pppp') >= 0) dynamicType = 'pppp';else if (elem.decoration.indexOf('ppp') >= 0) dynamicType = 'ppp';else if (elem.decoration.indexOf('pp') >= 0) dynamicType = 'pp';else if (elem.decoration.indexOf('p') >= 0) dynamicType = 'p';else if (elem.decoration.indexOf('mp') >= 0) dynamicType = 'mp';else if (elem.decoration.indexOf('mf') >= 0) dynamicType = 'mf';else if (elem.decoration.indexOf('f') >= 0) dynamicType = 'f';else if (elem.decoration.indexOf('ff') >= 0) dynamicType = 'ff';else if (elem.decoration.indexOf('fff') >= 0) dynamicType = 'fff';else if (elem.decoration.indexOf('ffff') >= 0) dynamicType = 'ffff';
             if (dynamicType) {
               currentVolume = volumes[dynamicType].slice(0);
+              var volumesPerNotePitch = [currentVolume];
+              if (Array.isArray(elem.decoration)) {
+                volumesPerNotePitch = [];
+                elem.decoration.forEach(function (d) {
+                  volumesPerNotePitch.push(volumes[d].slice(0));
+                });
+              }
               voices[voiceNumber].push({
                 el_type: 'beat',
-                beats: currentVolume.slice(0)
+                beats: currentVolume.slice(0),
+                volumesPerNotePitch: volumesPerNotePitch
               });
               inCrescendo[k] = false;
               inDiminuendo[k] = false;
@@ -12637,15 +12806,31 @@ var parseCommon = __webpack_require__(/*! ../parse/abc_common */ "./src/parse/ab
                 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) {
               // If there is a drum off command right at the beginning it is put in the metaText instead of the stream,
@@ -13058,6 +13243,7 @@ var parseCommon = __webpack_require__(/*! ../parse/abc_common */ "./src/parse/ab
       }
     }
   }
+
   function chordVoiceOffThisBar(voices) {
     for (var i = 0; i < voices.length; i++) {
       var voice = voices[i];
@@ -13365,7 +13551,7 @@ ChordTrack.prototype.interpretChord = function (name) {
   };
   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);
   }
@@ -13529,6 +13715,7 @@ ChordTrack.prototype.resolveChords = function (startTime, endTime) {
       if (newBass) newBass = false;else isBoom = false; // only the first note in a chord is a bass note. This handles the case where bass and chord are played at the same time.
     }
   }
+
   return;
 };
 ChordTrack.prototype.processChord = function (elem) {
@@ -14136,7 +14323,7 @@ function CreateSynth() {
   self.audioBuffers = []; // cache of the buffers so starting play can be fast.
   self.duration = undefined; // the duration of the tune in seconds.
   self.isRunning = false; // whether there is currently a sound buffer running.
-  self.options = undefined;
+  self.options = {}; // Thx tomohirohiratsuka
   self.pickupLength = 0;
 
   // Load and cache all needed sounds
@@ -14364,87 +14551,93 @@ function CreateSynth() {
     self.isRunning = false;
     if (!self.audioBufferPossible) return Promise.reject(new Error(notSupportedMessage));
     if (self.debugCallback) self.debugCallback("prime called");
-    return new Promise(function (resolve) {
-      var startTime = activeAudioContext().currentTime;
-      var tempoMultiplier = self.millisecondsPerMeasure / 1000 / self.meterSize;
-      self.duration = self.flattened.totalDuration * tempoMultiplier;
-      if (self.duration <= 0) {
-        self.audioBuffers = [];
-        return resolve({
-          status: "empty",
-          seconds: 0
-        });
-      }
-      self.duration += fadeTimeSec;
-      var totalSamples = Math.floor(activeAudioContext().sampleRate * self.duration);
-
-      // There might be a previous run that needs to be turned off.
-      self.stop();
-      var noteMapTracks = createNoteMap(self.flattened);
-      if (self.options.swing) addSwing(noteMapTracks, self.options.swing, self.meterFraction, self.pickupLength);
-      if (self.sequenceCallback) self.sequenceCallback(noteMapTracks, self.callbackContext);
-      var panDistances = setPan(noteMapTracks.length, self.pan);
-
-      // Create a simple list of all the unique sounds in this music and where they should be placed.
-      // There appears to be a limit on how many audio buffers can be created at once so this technique limits the number needed.
-      var uniqueSounds = {};
-      noteMapTracks.forEach(function (noteMap, trackNumber) {
-        var panDistance = panDistances && panDistances.length > trackNumber ? panDistances[trackNumber] : 0;
-        noteMap.forEach(function (note) {
-          var key = note.instrument + ':' + note.pitch + ':' + note.volume + ':' + Math.round((note.end - note.start) * 1000) / 1000 + ':' + panDistance + ':' + tempoMultiplier + ':' + (note.cents ? note.cents : 0);
-          if (self.debugCallback) self.debugCallback("noteMapTrack " + key);
-          if (!uniqueSounds[key]) uniqueSounds[key] = [];
-          uniqueSounds[key].push(note.start);
-        });
-      });
-
-      // Now that we know what we are trying to create, construct the audio buffer by creating each sound and placing it.
-      var allPromises = [];
-      var audioBuffer = activeAudioContext().createBuffer(2, totalSamples, activeAudioContext().sampleRate);
-      for (var key2 = 0; key2 < Object.keys(uniqueSounds).length; key2++) {
-        var k = Object.keys(uniqueSounds)[key2];
-        var parts = k.split(":");
-        var cents = parts[6] !== undefined ? parseFloat(parts[6]) : 0;
-        parts = {
-          instrument: parts[0],
-          pitch: parseInt(parts[1], 10),
-          volume: parseInt(parts[2], 10),
-          len: parseFloat(parts[3]),
-          pan: parseFloat(parts[4]),
-          tempoMultiplier: parseFloat(parts[5]),
-          cents: cents
-        };
-        allPromises.push(placeNote(audioBuffer, activeAudioContext().sampleRate, parts, uniqueSounds[k], self.soundFontVolumeMultiplier, self.programOffsets[parts.instrument], fadeTimeSec, self.noteEnd / 1000, self.debugCallback));
-      }
-      self.audioBuffers = [audioBuffer];
-      if (self.debugCallback) {
-        self.debugCallback("sampleRate = " + activeAudioContext().sampleRate);
-        self.debugCallback("totalSamples = " + totalSamples);
-        self.debugCallback("creationTime = " + Math.floor((activeAudioContext().currentTime - startTime) * 1000) + "ms");
-      }
-      function resolveData(me) {
-        var duration = me && me.audioBuffers && me.audioBuffers.length > 0 ? me.audioBuffers[0].duration : 0;
-        return {
-          status: activeAudioContext().state,
-          duration: duration
+    return new Promise(function (resolve, reject) {
+      try {
+        var resolveData = function resolveData(me) {
+          var duration = me && me.audioBuffers && me.audioBuffers.length > 0 ? me.audioBuffers[0].duration : 0;
+          return {
+            status: activeAudioContext().state,
+            duration: duration
+          };
         };
-      }
-      Promise.all(allPromises).then(function () {
-        // Safari iOS can mess with the audioContext state, so resume if needed.
-        if (activeAudioContext().state === "suspended") {
-          activeAudioContext().resume().then(function () {
-            resolve(resolveData(self));
+        var startTime = activeAudioContext().currentTime;
+        var tempoMultiplier = self.millisecondsPerMeasure / 1000 / self.meterSize;
+        self.duration = self.flattened.totalDuration * tempoMultiplier;
+        if (self.duration <= 0) {
+          self.audioBuffers = [];
+          return resolve({
+            status: "empty",
+            seconds: 0
+          });
+        }
+        self.duration += fadeTimeSec;
+        var totalSamples = Math.floor(activeAudioContext().sampleRate * self.duration);
+
+        // There might be a previous run that needs to be turned off.
+        self.stop();
+        var noteMapTracks = createNoteMap(self.flattened);
+        if (self.options.swing) addSwing(noteMapTracks, self.options.swing, self.meterFraction, self.pickupLength);
+        if (self.sequenceCallback) self.sequenceCallback(noteMapTracks, self.callbackContext);
+        var panDistances = setPan(noteMapTracks.length, self.pan);
+
+        // Create a simple list of all the unique sounds in this music and where they should be placed.
+        // There appears to be a limit on how many audio buffers can be created at once so this technique limits the number needed.
+        var uniqueSounds = {};
+        noteMapTracks.forEach(function (noteMap, trackNumber) {
+          var panDistance = panDistances && panDistances.length > trackNumber ? panDistances[trackNumber] : 0;
+          noteMap.forEach(function (note) {
+            var key = note.instrument + ':' + note.pitch + ':' + note.volume + ':' + Math.round((note.end - note.start) * 1000) / 1000 + ':' + panDistance + ':' + tempoMultiplier + ':' + (note.cents ? note.cents : 0);
+            if (self.debugCallback) self.debugCallback("noteMapTrack " + key);
+            if (!uniqueSounds[key]) uniqueSounds[key] = [];
+            uniqueSounds[key].push(note.start);
           });
-        } else if (activeAudioContext().state === "interrupted") {
-          activeAudioContext().suspend().then(function () {
+        });
+
+        // Now that we know what we are trying to create, construct the audio buffer by creating each sound and placing it.
+        var allPromises = [];
+        var audioBuffer = activeAudioContext().createBuffer(2, totalSamples, activeAudioContext().sampleRate);
+        for (var key2 = 0; key2 < Object.keys(uniqueSounds).length; key2++) {
+          var k = Object.keys(uniqueSounds)[key2];
+          var parts = k.split(":");
+          var cents = parts[6] !== undefined ? parseFloat(parts[6]) : 0;
+          parts = {
+            instrument: parts[0],
+            pitch: parseInt(parts[1], 10),
+            volume: parseInt(parts[2], 10),
+            len: parseFloat(parts[3]),
+            pan: parseFloat(parts[4]),
+            tempoMultiplier: parseFloat(parts[5]),
+            cents: cents
+          };
+          allPromises.push(placeNote(audioBuffer, activeAudioContext().sampleRate, parts, uniqueSounds[k], self.soundFontVolumeMultiplier, self.programOffsets[parts.instrument], fadeTimeSec, self.noteEnd / 1000, self.debugCallback));
+        }
+        self.audioBuffers = [audioBuffer];
+        if (self.debugCallback) {
+          self.debugCallback("sampleRate = " + activeAudioContext().sampleRate);
+          self.debugCallback("totalSamples = " + totalSamples);
+          self.debugCallback("creationTime = " + Math.floor((activeAudioContext().currentTime - startTime) * 1000) + "ms");
+        }
+        Promise.all(allPromises).then(function () {
+          // Safari iOS can mess with the audioContext state, so resume if needed.
+          if (activeAudioContext().state === "suspended") {
             activeAudioContext().resume().then(function () {
               resolve(resolveData(self));
             });
-          });
-        } else {
-          resolve(resolveData(self));
-        }
-      });
+          } else if (activeAudioContext().state === "interrupted") {
+            activeAudioContext().suspend().then(function () {
+              activeAudioContext().resume().then(function () {
+                resolve(resolveData(self));
+              });
+            });
+          } else {
+            resolve(resolveData(self));
+          }
+        })["catch"](function (error) {
+          reject(error);
+        });
+      } catch (error) {
+        reject(error);
+      }
     });
   };
   function setPan(numTracks, panParam) {
@@ -14584,6 +14777,7 @@ function CreateSynth() {
       self.directSource[trackNum].buffer = audioBuffer; // tell the source which sound to play
       self.directSource[trackNum].connect(activeAudioContext().destination); // connect the source to the context's destination (the speakers)
     });
+
     self.directSource.forEach(function (source) {
       source.start(0, seconds);
     });
@@ -15257,7 +15451,7 @@ function placeNote(outputAudioBuffer, sampleRate, sound, startArray, volumeMulti
     });
   })["catch"](function (error) {
     if (debugCallback) debugCallback('placeNote catch: ' + error.message);
-    return Promise.resolve();
+    return Promise.reject(error);
   });
 }
 var copyToChannel = function copyToChannel(toBuffer, fromBuffer, start) {
@@ -16769,6 +16963,7 @@ function convertToNumber(plugin, pitches, graceNotes) {
     plugin.setError(tabPos.error);
     return tabPos; // give up on error here
   }
+
   if (tabPos.graces && tabPos.notes) {
     // add graces to last note in notes
     var posNote = tabPos.notes.length - 1;
@@ -16966,6 +17161,7 @@ function getLyricHeight(voice) {
   }
   return maxLyricHeight; // add spacing
 }
+
 function buildTabName(plugin, renderer, dest) {
   var stringSemantics = plugin.semantics;
   var textSize = renderer.controller.getTextSize;
@@ -17044,6 +17240,7 @@ function getNextTabPos(tabIndex, staffGroup) {
     if (!staffGroup[startIndex].isTabStaff) {
       nbVoices = staffGroup[startIndex].voices.length; // get number of staff voices
     }
+
     if (staffGroup[startIndex].isTabStaff) {
       handledVoices++;
       if (islastTabInStaff(startIndex, staffGroup)) {
@@ -17156,6 +17353,7 @@ function tabRenderer(plugin, renderer, line, staffIndex) {
   }
   linkStaffAndTabs(staffGroup.staffs); // crossreference tabs and staff
 }
+
 module.exports = tabRenderer;
 
 /***/ }),
@@ -17375,6 +17573,7 @@ AbstractEngraver.prototype.createABCStaff = function (staffgroup, abcstaff, temp
     } else {
       voice.duplicate = true; // bar lines and other duplicate info need not be created
     }
+
     if (abcstaff.title && abcstaff.title[v]) {
       voice.header = abcstaff.title[v].replace(/\\n/g, "\n");
       voice.headerPosition = 6 + staffgroup.getTextSize.baselineToCenter(voice.header, "voicefont", 'staff-extra voice-name', v, abcstaff.voices.length) / spacing.STEP;
@@ -17388,11 +17587,13 @@ AbstractEngraver.prototype.createABCStaff = function (staffgroup, abcstaff, temp
       voice.addChild(clef);
       this.startlimitelem = clef; // limit ties here
     }
+
     var keySig = createKeySignature(abcstaff.key, this.tuneNumber);
     if (keySig) {
       voice.addChild(keySig);
       this.startlimitelem = keySig; // limit ties here
     }
+
     if (abcstaff.meter) {
       if (abcstaff.meter.type === 'specified') {
         this.measureLength = abcstaff.meter.value[0].num / abcstaff.meter.value[0].den;
@@ -17401,6 +17602,7 @@ AbstractEngraver.prototype.createABCStaff = function (staffgroup, abcstaff, temp
       voice.addChild(ts);
       this.startlimitelem = ts; // limit ties here
     }
+
     if (voice.duplicate) voice.children = []; // we shouldn't reprint the above if we're reusing the same staff. We just created them to get the right spacing.
     var staffLines = abcstaff.clef.stafflines || abcstaff.clef.stafflines === 0 ? abcstaff.clef.stafflines : 5;
     staffgroup.addVoice(voice, s, staffLines);
@@ -17564,6 +17766,7 @@ AbstractEngraver.prototype.createABCElement = function (isFirstStaff, isSingleLi
         elemset[0] = absKey;
         this.startlimitelem = elemset[0]; // limit ties here
       }
+
       if (voice.duplicate && elemset.length > 0) elemset[0].invisible = true;
       break;
     case "stem":
@@ -17697,6 +17900,7 @@ AbstractEngraver.prototype.addGraceNotes = function (elem, voice, abselem, noteh
     if (hint) gracebeam.setHint();
     gracebeam.mainNote = abselem; // this gives us a reference back to the note this is attached to so that the stems can be attached somewhere.
   }
+
   var i;
   var graceoffsets = [];
   for (i = elem.gracenotes.length - 1; i >= 0; i--) {
@@ -17796,6 +18000,7 @@ function addRestToAbsElement(abselem, elem, duration, dot, isMultiVoice, stemdir
     if (duration < 0.5) restpitch = 7;else if (duration < 1) restpitch = 7; // half rest
     else restpitch = 5; // whole rest
   }
+
   switch (elem.rest.type) {
     case "whole":
       c = chartable.rest[0];
@@ -17934,6 +18139,7 @@ AbstractEngraver.prototype.addNoteToAbcElement = function (abselem, elem, dot, s
         elem.pitches[p].highestVert = elem.pitches[pp - 1].verticalPos;
         if (getDuration(elem) < 1 && (stemdir === "up" || dir === "up")) elem.pitches[p].highestVert += 6; // If the stem is up, then compensate for the length of the stem
       }
+
       if (elem.startSlur) {
         if (!elem.pitches[p].startSlur) elem.pitches[p].startSlur = []; //TODO possibly redundant, provided array is not optional
         for (i = 0; i < elem.startSlur.length; i++) {
@@ -18103,6 +18309,7 @@ AbstractEngraver.prototype.createNote = function (elem, nostem, isSingleLineStaf
       flatBeams: this.flatBeams
     }); // above is opposite from case of slurs
   }
+
   if (elem.endTriplet && this.triplet) {
     this.triplet.setCloseAnchor(notehead);
   }
@@ -18201,7 +18408,8 @@ AbstractEngraver.prototype.addMeasureNumber = function (number, abselem) {
   if (abselem.isClef)
     // If this is a clef rather than bar line, then the number shouldn't be centered because it could overlap the left side. This is an easy way to let it be centered but move it over, too.
     dx += measureNumDim.width / 2;
-  var vert = measureNumDim.width > 10 && abselem.abcelem.type === "treble" ? 13 : 11;
+  // MAE 1 Oct 2024 - Change 13 to 13.5 since previously bar numbers were very slightly overlapping the top of the clef
+  var vert = measureNumDim.width > 10 && abselem.abcelem.type === "treble" ? 13.5 : 11;
   abselem.addFixed(new RelativeElement(number, dx, measureNumDim.width, vert + measureNumDim.height / spacing.STEP, {
     type: "barNumber",
     dim: this.getTextSize.attr("measurefont", 'bar-number')
@@ -18236,6 +18444,7 @@ AbstractEngraver.prototype.createBarLine = function (voice, elem, isFirstStaff)
     abselem.addRight(new RelativeElement("dots.dot", dx, 1, 5));
     dx += 6; //2 hardcoded, twice;
   }
+
   if (firstthin) {
     anchor = new RelativeElement(null, dx, 1, 2, {
       "type": "bar",
@@ -18284,6 +18493,7 @@ AbstractEngraver.prototype.createBarLine = function (voice, elem, isFirstStaff)
     });
     abselem.addRight(anchor); // 3 is hardcoded
   }
+
   if (seconddots) {
     dx += 3; //3 hardcoded;
     abselem.addRight(new RelativeElement("dots.dot", dx, 1, 7));
@@ -18291,13 +18501,15 @@ AbstractEngraver.prototype.createBarLine = function (voice, elem, isFirstStaff)
   } // 2 is hardcoded
 
   if (elem.startEnding && isFirstStaff) {
-    // only put the first & second ending marks on the first staff
-    var textWidth = this.getTextSize.calc(elem.startEnding, "repeatfont", '').width;
-    abselem.minspacing += textWidth + 10; // Give plenty of room for the ending number.
-    this.partstartelem = new EndingElem(elem.startEnding, anchor, null);
-    voice.addOther(this.partstartelem);
+    // MAE 17 May 2025 - Fixes drawing issue
+    if (voice.voicenumber === 0) {
+      // only put the first & second ending marks on the first staff
+      var textWidth = this.getTextSize.calc(elem.startEnding, "repeatfont", '').width;
+      abselem.minspacing += textWidth + 10; // Give plenty of room for the ending number.
+      this.partstartelem = new EndingElem(elem.startEnding, anchor, null);
+      voice.addOther(this.partstartelem);
+    }
   }
-
   // Add a little space to the left of the bar line so that nothing can crowd it.
   abselem.extraw -= 5;
   if (elem.chord !== undefined) {
@@ -18617,6 +18829,7 @@ var createClef = function createClef(elem, tuneNumber) {
       //abselem.top += 2;
     }
   }
+
   return abselem;
 };
 function clefOffsets(clef) {
@@ -18808,6 +19021,7 @@ var createNoteHead = function createNoteHead(abselem, c, pitchelem, options) {
     }));
     extraLeft = glyphs.getSymbolWidth(symb) / 2; // TODO-PER: We need a little extra width if there is an accidental, but I'm not sure why it isn't the full width of the accidental.
   }
+
   return {
     notehead: notehead,
     accidentalshiftx: accidentalshiftx,
@@ -19088,6 +19302,7 @@ var stackedDecoration = function stackedDecoration(decoration, width, abselem, y
     "mediumphrase": "scripts.mediumphrase",
     "longphrase": "scripts.longphrase",
     "trill": "scripts.trill",
+    "trillh": "scripts.trill",
     "roll": "scripts.roll",
     "irishroll": "scripts.roll",
     "marcato": "scripts.umarcato",
@@ -19149,6 +19364,7 @@ var stackedDecoration = function stackedDecoration(decoration, width, abselem, y
       case "mediumphrase":
       case "longphrase":
       case "trill":
+      case "trillh":
       case "roll":
       case "irishroll":
       case "marcato":
@@ -19462,10 +19678,18 @@ AbsoluteElement.prototype.setLimit = function (member, child) {
   if (!this.specialY[member]) this.specialY[member] = child[member];else this.specialY[member] = Math.max(this.specialY[member], child[member]);
 };
 AbsoluteElement.prototype._addChild = function (child) {
-  //	console.log("Relative:",child);
+  //  console.log("Relative:",child);
+
+  // MAE 30 Sep 2024 - To avoid extra space for chords if there is only a bar number on the clef
+  var okToPushTop = true;
+  if (this.abcelem.el_type == "clef" && child.type == "barNumber") {
+    okToPushTop = false;
+  }
   child.parent = this;
   this.children[this.children.length] = child;
-  this.pushTop(child.top);
+  if (okToPushTop) {
+    this.pushTop(child.top);
+  }
   this.pushBottom(child.bottom);
   this.setLimit('tempoHeightAbove', child);
   this.setLimit('partHeightAbove', child);
@@ -19598,6 +19822,7 @@ BeamElem.prototype.setStemDirection = function () {
     var middleLine = 6; // hardcoded 6 is B
     this.stemsUp = this.average < middleLine; // true is up, false is down;
   }
+
   delete this.count;
   this.total = 0;
 };
@@ -19611,6 +19836,7 @@ BeamElem.prototype.calcDir = function () {
     var middleLine = 6; // hardcoded 6 is B
     this.stemsUp = this.average < middleLine; // true is up, false is down;
   }
+
   var dir = this.stemsUp ? 'up' : 'down';
   for (var i = 0; i < this.elems.length; i++) {
     for (var j = 0; j < this.elems[i].heads.length; j++) {
@@ -19800,6 +20026,7 @@ BraceElem.prototype.continuing = function (voice) {
 BraceElem.prototype.getWidth = function () {
   return 10; // TODO-PER: right now the drawing function doesn't vary the width at all. If it does in the future then this will change.
 };
+
 BraceElem.prototype.isStartVoice = function (voice) {
   if (this.startVoice && this.startVoice.staff && this.startVoice.staff.voices.length > 0 && this.startVoice.staff.voices[0] === voice) return true;
   return false;
@@ -19824,6 +20051,7 @@ var CrescendoElem = function CrescendoElem(anchor1, anchor2, dir, positioning) {
   if (positioning === 'above') this.dynamicHeightAbove = 6;else this.dynamicHeightBelow = 6;
   this.pitch = undefined; // This will be set later
 };
+
 module.exports = CrescendoElem;
 
 /***/ }),
@@ -19843,6 +20071,7 @@ var DynamicDecoration = function DynamicDecoration(anchor, dec, position) {
   if (position === 'below') this.volumeHeightBelow = 6;else this.volumeHeightAbove = 6;
   this.pitch = undefined; // This will be set later
 };
+
 module.exports = DynamicDecoration;
 
 /***/ }),
@@ -19863,6 +20092,7 @@ var EndingElem = function EndingElem(text, anchor1, anchor2) {
   this.endingHeightAbove = 5;
   this.pitch = undefined; // This will be set later
 };
+
 module.exports = EndingElem;
 
 /***/ }),
@@ -19887,6 +20117,11 @@ function FreeText(info, vskip, getFontAndAttr, paddingLeft, width, getTextSize)
       move: hash.attr['font-size'] * 2
     }); // move the distance of the line, plus the distance of the margin, which is also one line.
   } else if (typeof text === 'string') {
+    // MAE 9 May 2025 - Force blank text lines in a text block to have height
+    var replaceStandaloneNewlinesForTextBlocks = function replaceStandaloneNewlinesForTextBlocks(input) {
+      return input.replace(/^[ \t]*\n/gm, 'X\n');
+      ;
+    };
     this.rows.push({
       move: hash.attr['font-size'] / 2
     }); // TODO-PER: move down some - the y location should be the top of the text, but we output text specifying the center line.
@@ -19901,7 +20136,8 @@ function FreeText(info, vskip, getFontAndAttr, paddingLeft, width, getTextSize)
       absElemType: "freeText",
       name: "free-text"
     });
-    size = getTextSize.calc(text, 'textfont', 'defined-text');
+    var textForSize = replaceStandaloneNewlinesForTextBlocks(text);
+    size = getTextSize.calc(textForSize, 'textfont', 'defined-text'); // was text
     this.rows.push({
       move: size.height
     });
@@ -19968,6 +20204,7 @@ var GlissandoElem = function GlissandoElem(anchor1, anchor2) {
   this.anchor1 = anchor1; // must have a .x and a .parent property or be null (means starts at the "beginning" of the line - after keysig)
   this.anchor2 = anchor2; // must have a .x property or be null (means ends at the end of the line)
 };
+
 module.exports = GlissandoElem;
 
 /***/ }),
@@ -20502,12 +20739,14 @@ TieElem.prototype.calcX = function (lineStartX, lineEndX) {
     if (this.anchor2) this.startX = this.anchor2.x - 20; // There is no element and no repeat mark: make a small arc
     else this.startX = lineStartX; // Don't have any guidance, so extend to beginning of line
   }
+
   if (!this.anchor1 && this.dotted) this.startX -= 3; // The arc needs to be long enough to tell that it is dotted.
 
   if (this.anchor2) this.endX = this.anchor2.x; // The normal case where there is a starting element to attach to.
   else if (this.endLimitX) this.endX = this.endLimitX.x; // if there is no start element, but there is a repeat mark before the start of the line.
   else this.endX = lineEndX; // There is no element and no repeat mark: extend to the beginning of the line.
 };
+
 TieElem.prototype.calcTieY = function () {
   // If the tie comes from another line, then one or both anchors will be missing.
   if (this.anchor1) this.startY = this.anchor1.pitch;else if (this.anchor2) this.startY = this.anchor2.pitch;else this.startY = this.above ? 14 : 0;
@@ -20644,6 +20883,7 @@ function TopText(metaText, metaTextInfo, formatting, lines, width, isPrint, padd
 
     //		TopText.prototype.addTextIf = function (marginLeft, text, font, klass, marginTop, marginBottom, anchor, getTextSize, absElemType, noMove) {
   }
+
   if (isPrint) this.rows.push({
     move: spacing.top
   });
@@ -21715,6 +21955,7 @@ function straightPath(renderer, xLeft, yTop, yBottom, type) {
   // right point
   -wCurve * 0.1, -hCurve * 0.3, -wCurve, -hCurve - spacing.STEP // left bottom
   );
+
   return renderer.paper.path({
     path: pathString,
     stroke: renderer.foregroundColor,
@@ -21866,10 +22107,18 @@ function draw(renderer, classes, abcTune, width, maxWidth, responsive, scale, se
   renderer.paper.closeGroup();
   renderer.moveY(renderer.spacing.music);
   var staffgroups = [];
+  var nStaves = 0;
   for (var line = 0; line < abcTune.lines.length; line++) {
     classes.incrLine();
     var abcLine = abcTune.lines[line];
     if (abcLine.staff) {
+      // MAE 26 May 2025 - for incipits staff count limiting
+      nStaves++;
+      if (abcTune.formatting.maxStaves) {
+        if (nStaves > abcTune.formatting.maxStaves) {
+          break;
+        }
+      }
       if (classes.shouldAddClasses) groupClasses.klass = "abcjs-staff-wrapper abcjs-l" + classes.lineNumber;
       renderer.paper.openGroup(groupClasses);
       if (abcLine.vskip) {
@@ -21976,6 +22225,8 @@ function drawEnding(renderer, params, linestartx, lineendx, selectables) {
   pathString += sprintf("M %f %f L %f %f ", linestartx, y, lineendx, y);
   renderer.paper.openGroup({
     klass: renderer.controller.classes.generate("ending"),
+    // MAE 17 May 2025 - Ending numbers not being drawn in correct color
+    fill: renderer.foregroundColor,
     "data-name": "ending"
   });
   printPath(renderer, {
@@ -22993,6 +23244,7 @@ function drawStaffGroup(renderer, params, selectables, lineNumber) {
       //				renderer.moveY(spacing.STEP, -staff.bottom);
     }
   }
+
   renderer.controller.classes.newMeasure();
 
   // connect all the staves together with a vertical line
@@ -23214,6 +23466,7 @@ function drawTempo(renderer, params) {
   //	});
   //return [tempoGroup];
 }
+
 module.exports = drawTempo;
 
 /***/ }),
@@ -23255,7 +23508,14 @@ function renderText(renderer, params, alreadyInGroup) {
   if (params.cursor) {
     hash.attr.cursor = params.cursor;
   }
-  var text = params.text.replace(/\n\n/g, "\n \n");
+
+  // MAE 9 May 2025 for free text blocks
+  var text;
+  if (params.name == "free-text") {
+    text = params.text.replace(/^[ \t]*\n/gm, ' \n');
+  } else {
+    text = params.text.replace(/\n\n/g, "\n \n");
+  }
   text = text.replace(/^\n/, "\xA0\n");
   if (hash.font.box) {
     if (!alreadyInGroup) renderer.paper.openGroup({
@@ -23550,6 +23810,7 @@ function drawVoice(renderer, params, bartop, selectables, staffPos) {
       renderer.controller.classes.incrMeasure();
     } else drawBeam(renderer, beam, selectables); // beams must be drawn first for proper printing of triplets, slurs and ties.
   }
+
   renderer.controller.classes.startMeasure();
   for (i = 0; i < params.otherchildren.length; i++) {
     child = params.otherchildren[i];
@@ -23658,6 +23919,7 @@ var EngraverController = function EngraverController(paper, params) {
     this.staffwidthScreen = 740; // TODO-PER: Not sure where this number comes from, but this is how it's always been.
     this.staffwidthPrint = 680; // The number of pixels in 8.5", after 1cm of margin has been removed.
   }
+
   this.listeners = [];
   if (params.clickListener) this.addSelectListener(params.clickListener);
   this.renderer = new Renderer(paper);
@@ -24476,8 +24738,13 @@ function keyboardSelection(ev) {
 }
 function findElementInHistory(selectables, el) {
   if (!el) return -1;
+  // This should always exist, but it occasionally causes an exception, so check first.
+  var dataset = el.dataset;
+  if (!dataset) return -1;
+  var index = dataset.index;
   for (var i = 0; i < selectables.length; i++) {
-    if (el.dataset.index === selectables[i].svgEl.dataset.index) return i;
+    var svgDataset = selectables[i].svgEl.dataset;
+    if (svgDataset && index === svgDataset.index) return i;
   }
   return -1;
 }
@@ -24567,6 +24834,7 @@ function getMousePosition(self, ev) {
     clickedOn = findElementByCoord(self, x, y);
     //console.log("clicked near", clickedOn, x, y, printEl(ev.target));
   }
+
   return {
     x: x,
     y: y,
@@ -24804,6 +25072,7 @@ function minStem(element, stemsUp, referencePitch, minStemHeight) {
     var elem = element.children[i];
     if (stemsUp && elem.top !== undefined && elem.c === "flags.ugrace") minStemHeight = Math.max(minStemHeight, elem.top - referencePitch);else if (!stemsUp && elem.bottom !== undefined && elem.c === "flags.ugrace") minStemHeight = Math.max(minStemHeight, referencePitch - elem.bottom + 7); // The extra 7 is because we are measuring the slash from the top.
   }
+
   return minStemHeight;
 }
 function calcSlant(leftAveragePitch, rightAveragePitch, numStems, isFlat) {
@@ -25208,6 +25477,7 @@ function calcHorizontalSpacing(isLastLine, stretchLast, targetWidth, lineWidth,
       if (!stretch) return null; // don't stretch last line too much
     }
   }
+
   if (Math.abs(targetWidth - lineWidth) < 2) return null; // if we are already near the target width, we're done.
   var relSpace = spacingUnits * spacing;
   var constSpace = lineWidth - relSpace;
@@ -25272,6 +25542,7 @@ var setUpperAndLowerElements = function setUpperAndLowerElements(renderer, staff
       staff.originalTop = staff.top; // This is just being stored for debugging purposes.
       staff.originalBottom = staff.bottom; // This is just being stored for debugging purposes.
     }
+
     incTop(staff, positionY, 'lyricHeightAbove');
     incTop(staff, positionY, 'chordHeightAbove', staff.specialY.chordLines.above);
     if (staff.specialY.endingHeightAbove) {
@@ -25334,6 +25605,7 @@ var setUpperAndLowerElements = function setUpperAndLowerElements(renderer, staff
   }
   //console.log("Staff Height: ",heightInPitches,this.height);
 };
+
 var margin = 1;
 function incTop(staff, positionY, item, count) {
   if (staff.specialY[item]) {
@@ -25598,6 +25870,7 @@ function finished(voices) {
 function getDurationIndex(element) {
   return element.durationindex - (element.children[element.i] && element.children[element.i].duration > 0 ? 0 : 0.0000005); // if the ith element doesn't have a duration (is not a note), its duration index is fractionally before. This enables CLEF KEYSIG TIMESIG PART, etc. to be laid out before we get to the first note of other voices
 }
+
 function isSameStaff(voice1, voice2) {
   if (!voice1 || !voice1.staff || !voice1.staff.voices || voice1.staff.voices.length === 0) return false;
   if (!voice2 || !voice2.staff || !voice2.staff.voices || voice2.staff.voices.length === 0) return false;
@@ -25695,6 +25968,7 @@ VoiceElement.beginLayout = function (startx, voice) {
   voice.nextx = startx; // x position where the next element of this voice should be placed assuming no other voices and no fixed width constraints
   voice.spacingduration = 0; // duration left to be laid out in current iteration (omitting additional spacing due to other aspects, such as bars, dots, sharps and flats)
 };
+
 VoiceElement.layoutEnded = function (voice) {
   return voice.i >= voice.children.length;
 };
@@ -25760,6 +26034,7 @@ VoiceElement.layoutOneItem = function (x, spacing, voice, minPadding, firstVoice
 
   return x; // where we end up having placed the child
 };
+
 VoiceElement.shiftRight = function (dx, voice) {
   var child = voice.children[voice.i];
   if (!child) return;
@@ -25922,6 +26197,7 @@ function setLane(absElems, numLanesAbove, numLanesBelow) {
     }
   }
 }
+
 function yAtNote(element, beam) {
   beam = beam.beams[0];
   return getBarYAt(beam.startX, beam.startY, beam.endX, beam.endY, element.x);
@@ -26080,6 +26356,7 @@ Renderer.prototype.initVerticalSpace = function () {
   <float> range is 0.0 to 1.0.
    */
 };
+
 Renderer.prototype.setVerticalSpace = function (formatting) {
   // conversion from pts to px 4/3
   if (formatting.staffsep !== undefined) this.spacing.staffSeparation = formatting.staffsep * 4 / 3;
@@ -26201,6 +26478,7 @@ Svg.prototype.insertStyles = function (styles) {
   this.svg.insertBefore(el, this.svg.firstChild); // prepend is not available on older browsers.
   //	this.svg.prepend(el);
 };
+
 Svg.prototype.setParentStyles = function (attr) {
   // This is needed to get the size right when there is scaling involved.
   for (var key in attr) {
@@ -26270,8 +26548,13 @@ Svg.prototype.text = function (text, attr, target) {
       el.setAttribute(key, attr[key]);
     }
   }
+  var isFreeText = attr["data-name"] == "free-text";
   var lines = ("" + text).split("\n");
   for (var i = 0; i < lines.length; i++) {
+    if (isFreeText && lines[i] == "") {
+      // Don't draw empty lines
+      continue;
+    }
     var line = document.createElementNS(svgNS, 'tspan');
     line.setAttribute("x", attr.x ? attr.x : 0);
     if (i !== 0) line.setAttribute("dy", "1.2em");
@@ -26293,7 +26576,19 @@ Svg.prototype.text = function (text, attr, target) {
         ts3.textContent = parts[2];
         line.appendChild(ts3);
       }
-    } else line.textContent = lines[i];
+    } else {
+      // MAE 9 May 2025 - For improved block text
+      if (isFreeText) {
+        // Fixes issue where blank lines in text blocks didn't take up any vertical
+        if (lines[i].trim() == "") {
+          line.innerHTML = "&nbsp;";
+        } else {
+          line.textContent = lines[i];
+        }
+      } else {
+        line.textContent = lines[i];
+      }
+    }
     el.appendChild(line);
   }
   if (target) target.appendChild(el);else this.append(el);
@@ -26343,6 +26638,7 @@ Svg.prototype.guessWidth = function (text, attr) {
       height: attr['font-size'] + 2
     }; // Just a wild guess.
   }
+
   svg.removeChild(el);
   return size;
 };
@@ -26471,7 +26767,7 @@ module.exports = Svg;
   \********************/
 /***/ (function(module) {
 
-var version = '6.4.3';
+var version = '6.5.0';
 module.exports = version;
 
 /***/ })