abcjs 6.4.4 → 6.5.1

package/src/synth/place-note.js

@@ -101,7 +101,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)
 		});
 }
 

package/src/test/abc_parser_lint.js

@@ -53,7 +53,7 @@ var JSONSchema = require('./jsonschema-b4');
 var ParserLint = function() {
 	"use strict";
 	var decorationList = { type: 'array', optional: true, items: { type: 'string', Enum: [
-		"trill", "lowermordent", "uppermordent", "mordent", "pralltriller", "accent",
+		"trill", "trillh", "lowermordent", "uppermordent", "mordent", "pralltriller", "accent",
 		"fermata", "invertedfermata", "tenuto", "0", "1", "2", "3", "4", "5", "+", "wedge",
 		"open", "thumb", "snap", "turn", "roll", "irishroll", "breath", "shortphrase", "mediumphrase", "longphrase",
 		"segno", "coda", "D.S.", "D.C.", "fine", "crescendo(", "crescendo)", "diminuendo(", "diminuendo)", "glissando(", "glissando)",

package/src/write/creation/abstract-engraver.js

@@ -1026,13 +1026,16 @@ AbstractEngraver.prototype.createBarLine = function (voice, elem, isFirstStaff)
 		abselem.addRight(new RelativeElement("dots.dot", dx, 1, 5));
 	} // 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);
+	if (elem.startEnding && isFirstStaff) {
+		// 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;
 

package/src/write/creation/decoration.js

@@ -175,6 +175,7 @@ var stackedDecoration = function (decoration, width, abselem, yPos, positioning,
 		"mediumphrase": "scripts.mediumphrase",
 		"longphrase": "scripts.longphrase",
 		"trill": "scripts.trill",
+		"trillh": "scripts.trill",
 		"roll": "scripts.roll",
 		"irishroll": "scripts.roll",
 		"marcato": "scripts.umarcato",
@@ -237,6 +238,7 @@ var stackedDecoration = function (decoration, width, abselem, yPos, positioning,
 			case "mediumphrase":
 			case "longphrase":
 			case "trill":
+			case "trillh":
 			case "roll":
 			case "irishroll":
 			case "marcato":

package/src/write/creation/elements/free-text.js

@@ -10,7 +10,12 @@ function FreeText(info, vskip, getFontAndAttr, paddingLeft, width, getTextSize)
 	} else if (typeof text === 'string') {
 		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.
 		this.rows.push({ left: paddingLeft, text: text, font: 'textfont', klass: 'defined-text', anchor: "start", startChar: info.startChar, endChar: info.endChar, absElemType: "freeText", name: "free-text" });
-		size = getTextSize.calc(text, 'textfont', 'defined-text');
+	    // MAE 9 May 2025 - Force blank text lines in a text block to have height
+	    function replaceStandaloneNewlinesForTextBlocks(input) {
+	      return input.replace(/^[ \t]*\n/gm, 'X\n');;
+	    }
+	    var textForSize = replaceStandaloneNewlinesForTextBlocks(text);
+	    size = getTextSize.calc(textForSize, 'textfont', 'defined-text'); // was text
 		this.rows.push({ move: size.height });
 	} else if (text) {
 		var maxHeight = 0;

package/src/write/draw/draw.js

@@ -15,10 +15,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)

package/src/write/draw/ending.js

@@ -24,9 +24,18 @@ 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"), "data-name": "ending" });
-	printPath(renderer, { path: pathString, stroke: renderer.foregroundColor, fill: renderer.foregroundColor, "data-name": "line" });
+	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, {
+		path: pathString,
+		stroke: renderer.foregroundColor,
+		fill: renderer.foregroundColor,
+		"data-name": "line"
+	});
 	if (params.anchor1)
 		renderText(renderer, {
 			x: roundNumber(linestartx + 5),

package/src/write/draw/text.js

@@ -37,7 +37,14 @@ function renderText(renderer, params, alreadyInGroup) {
 		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) {

package/src/write/interactive/selection.js

@@ -130,8 +130,14 @@ 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)
+		var svgDataset = selectables[i].svgEl.dataset
+		if (svgDataset && index === svgDataset.index)
 			return i;
 	}
 	return -1;

package/src/write/svg.js

@@ -176,8 +176,14 @@ 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)
@@ -200,8 +206,23 @@ 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)

package/types/index.d.ts

@@ -61,7 +61,7 @@ declare module 'abcjs' {
 
 	export type NoteHeadType = 'normal' | 'harmonic' | 'rhythm' | 'x' | 'triangle';
 
-	export type Decorations = "trill" | "lowermordent" | "uppermordent" | "mordent" | "pralltriller" | "accent" |
+	export type Decorations = "trill" | "trillh" | "lowermordent" | "uppermordent" | "mordent" | "pralltriller" | "accent" |
 		"fermata" | "invertedfermata" | "tenuto" | "0" | "1" | "2" | "3" | "4" | "5" | "+" | "wedge" |
 		"open" | "thumb" | "snap" | "turn" | "roll" | "irishroll" | "breath" | "shortphrase" | "mediumphrase" | "longphrase" |
 		"segno" | "coda" | "D.S." | "D.C." | "fine" | "crescendo(" | "crescendo)" | "diminuendo(" | "diminuendo)" |"glissando(" | "glissando)" |

package/version.js

@@ -1,3 +1,3 @@
-var version = '6.4.4';
+var version = '6.5.1';
 
 module.exports = version;