abcjs 6.4.2 → 6.4.3

package/dist/abcjs-plugin-min.js.LICENSE

@@ -1,5 +1,5 @@
 /**!
-Copyright (c) 2009-2023 Paul Rosen and Gregory Dyke
+Copyright (c) 2009-2024 Paul Rosen and Gregory Dyke
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/index.js

@@ -1,5 +1,5 @@
 /**!
-Copyright (c) 2009-2023 Paul Rosen and Gregory Dyke
+Copyright (c) 2009-2024 Paul Rosen and Gregory Dyke
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/license.js

@@ -1,5 +1,5 @@
 /**!
-Copyright (c) 2009-2023 Paul Rosen and Gregory Dyke
+Copyright (c) 2009-2024 Paul Rosen and Gregory Dyke
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

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

package/plugin.js

@@ -1,5 +1,5 @@
 /**!
-Copyright (c) 2009-2023 Paul Rosen and Gregory Dyke
+Copyright (c) 2009-2024 Paul Rosen and Gregory Dyke
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/src/data/abc_tune.js

@@ -551,6 +551,8 @@ var Tune = function() {
 
 	this.getBpm = function(tempo) {
 		var bpm;
+		if (!tempo)
+			tempo = this.metaText ? this.metaText.tempo : null;
 		if (tempo) {
 			bpm = tempo.bpm;
 			var beatLength = this.getBeatLength();

package/src/parse/abc_parse_music.js

@@ -615,23 +615,38 @@ var letter_to_chord = function(line, i) {
 			chord[1] = chord[1].substring(1);
 			chord[2] = 'right';
 		} else if (chord[0] > 0 && chord[1].length > 0 && chord[1][0] === '@') {
-			// @-15,5.7
-			chord[1] = chord[1].substring(1);
-			var x = tokenizer.getFloat(chord[1]);
-			if (x.digits === 0)
-				warn("Missing first position in absolutely positioned annotation.", line , i);
-			chord[1] = chord[1].substring(x.digits);
-			if (chord[1][0] !== ',')
-				warn("Missing comma absolutely positioned annotation.", line , i);
-			chord[1] = chord[1].substring(1);
-			var y = tokenizer.getFloat(chord[1]);
-			if (y.digits === 0)
-				warn("Missing second position in absolutely positioned annotation.", line , i);
-			chord[1] = chord[1].substring(y.digits);
-			var ws = tokenizer.skipWhiteSpace(chord[1]);
-			chord[1] = chord[1].substring(ws);
-			chord[2] = null;
-			chord[3] = { x: x.value, y: y.value };
+		      // @-15,5.7		
+		      chord[1] = chord[1].substring(1);
+		      var x = tokenizer.getFloat(chord[1]);
+		      if (x.digits === 0){
+			warn("Missing first position in absolutely positioned annotation.", line, i);
+			chord[1] = chord[1].replace("@","");
+			chord[2] = 'above';
+			return chord;
+		      }
+		      chord[1] = chord[1].substring(x.digits);
+		      if (chord[1][0] !== ','){
+			warn("Missing comma absolutely positioned annotation.", line, i);
+			chord[1] = chord[1].replace("@","");
+			chord[2] = 'above';
+			return chord;
+		      }
+		      chord[1] = chord[1].substring(1);
+		      var y = tokenizer.getFloat(chord[1]);
+		      if (y.digits === 0){
+			warn("Missing second position in absolutely positioned annotation.", line, i);
+			chord[1] = chord[1].replace("@","");
+			chord[2] = 'above';
+			return chord;
+		      }
+		      chord[1] = chord[1].substring(y.digits);
+		      var ws = tokenizer.skipWhiteSpace(chord[1]);
+		      chord[1] = chord[1].substring(ws);
+		      chord[2] = null;
+		      chord[3] = {
+			x: x.value,
+			y: y.value
+		      };	
 		} else {
 			if (multilineVars.freegchord !== true) {
 				chord[1] = chord[1].replace(/([ABCDEFG0-9])b/g, "$1♭");

package/src/synth/chord-track.js

@@ -198,6 +198,15 @@ ChordTrack.prototype.interpretChord = function (name) {
 	while (chordTranspose > 8)
 		chordTranspose -= 12;
 	bass += chordTranspose;
+	
+    	// MAE 31 Aug 2024 - For visual transpose backup range issue
+    	// If transposed below A or above G, bring it back in the normal backup range
+    	if (bass < 33){
+      		bass += 12;
+    	}
+    	else if (bass > 44){
+	     	 bass -= 12;
+    	}
 
 	// MAE 17 Jun 2024 - Supporting octave shifted bass and chords
 	var unshiftedBass = bass;

package/src/write/creation/elements/tie-element.js

@@ -225,4 +225,30 @@ TieElem.prototype.avoidCollisionAbove = function () {
 	}
 };
 
+TieElem.prototype.getYBounds = function () {
+	var lineStartX = 10 // TODO-PER: I'm not sure where to get this number from but it probably doesn't matter much
+	var lineEndX = 1000 // TODO-PER: I'm not sure where to get this number from but it probably doesn't matter much
+	if (this.isTie) {
+		this.calcTieDirection();
+		this.calcX(lineStartX, lineEndX);
+		this.calcTieY();
+
+	} else {
+		this.calcSlurDirection();
+		this.calcX(lineStartX, lineEndX);
+		this.calcSlurY();
+	}
+	var top;
+	var bottom;
+	// TODO-PER: It's hard to tell how far the arc is, so I'm just using 3 as the max
+	if (this.above) {
+		bottom = Math.min(this.startY, this.endY)
+		top = bottom + 3
+	} else {
+		top = Math.min(this.startY, this.endY)
+		bottom = top - 3
+	}
+	return [ top, bottom ]
+};
+
 module.exports = TieElem;

package/src/write/layout/set-upper-and-lower-elements.js

@@ -128,6 +128,14 @@ function setUpperAndLowerVoiceElements(positionY, voice, spacing) {
 			case 'EndingElem':
 				setUpperAndLowerEndingElements(positionY, abselem);
 				break;
+			case 'TieElem':
+				// If a tie element is the highest or lowest thing then space might need to make room for it.
+				var yBounds = abselem.getYBounds()
+				voice.staff.top = Math.max(voice.staff.top, yBounds[0])
+				voice.staff.top = Math.max(voice.staff.top, yBounds[1])
+				voice.staff.bottom = Math.min(voice.staff.bottom, yBounds[0])
+				voice.staff.bottom = Math.min(voice.staff.bottom, yBounds[1])
+				break;
 		}
 	}
 }

package/test.js

@@ -1,5 +1,5 @@
 /**!
-Copyright (c) 2009-2023 Paul Rosen and Gregory Dyke
+Copyright (c) 2009-2024 Paul Rosen and Gregory Dyke
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/types/index.d.ts

@@ -886,7 +886,7 @@ declare module 'abcjs' {
 		getBarLength: NumberFunction;
 		getBeatLength: NumberFunction;
 		getBeatsPerMeasure: NumberFunction;
-		getBpm: NumberFunction;
+		getBpm: (tempo?:TempoProperties) => number;
 		getMeter: () => Meter;
 		getMeterFraction: () => MeterFraction;
 		getPickupLength: NumberFunction;

package/version.js

@@ -1,3 +1,3 @@
-var version = '6.4.2';
+var version = '6.4.3';
 
 module.exports = version;

package/temp.txt

@@ -1,12 +0,0 @@
-commit 747c5538cdfbb37eb6234356944b05855ff2921a
-Author: paulrosen <junk@paulrosen.net>
-Date:   Sun Aug 4 10:08:14 2024 -0400
-
-    
-
-commit 5b3d3d0f3f951e6dea3c22ded60b6baa9776e64c
-Author: paulrosen <junk@paulrosen.net>
-Date:   Sun Jul 28 19:20:32 2024 -0400
-
-    Start to refactor tablature and flatten the structure.
-