abcjs 6.4.3 → 6.4.4

package/package.json

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

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;
@@ -1030,8 +1031,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 +1315,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/tune-builder.js

@@ -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,16 @@ function wrapMusicLines(lines, barsperstaff) {
 	return false;
 }
 
+function getPrevMusicLine(lines, currentLine) {
+	// 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/synth/abc_midi_flattener.js

@@ -415,10 +415,10 @@ 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;
 				}
@@ -427,7 +427,7 @@ var pitchesToPerc = require('./pitches-to-perc');
 				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 });
@@ -436,18 +436,17 @@ var pitchesToPerc = require('./pitches-to-perc');
 				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) {

package/src/test/abc_midi_sequencer_lint.js

@@ -104,7 +104,7 @@ var midiSequencerLint = function(tune) {
 					ret += element.channel;
 					ret += '\n';
 					break;
-				case "gchord":
+				case "gchordOn":
 					ret += "\t\t";
 					ret += element.tacet ? 'tacet' : 'on';
 					ret += '\n';

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

@@ -943,7 +943,8 @@ AbstractEngraver.prototype.addMeasureNumber = function (number, abselem) {
 	var dx = 0;
 	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') }));
 };
 

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

@@ -177,22 +177,33 @@ AbsoluteElement.prototype.setLimit = function (member, child) {
 };
 
 AbsoluteElement.prototype._addChild = function (child) {
-	//	console.log("Relative:",child);
-	child.parent = this;
-	this.children[this.children.length] = child;
-	this.pushTop(child.top);
-	this.pushBottom(child.bottom);
-	this.setLimit('tempoHeightAbove', child);
-	this.setLimit('partHeightAbove', child);
-	this.setLimit('volumeHeightAbove', child);
-	this.setLimit('dynamicHeightAbove', child);
-	this.setLimit('endingHeightAbove', child);
-	this.setLimit('chordHeightAbove', child);
-	this.setLimit('lyricHeightAbove', child);
-	this.setLimit('lyricHeightBelow', child);
-	this.setLimit('chordHeightBelow', child);
-	this.setLimit('volumeHeightBelow', child);
-	this.setLimit('dynamicHeightBelow', 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;
+
+  if (okToPushTop){
+    this.pushTop(child.top);
+  }
+  
+  this.pushBottom(child.bottom);
+  this.setLimit('tempoHeightAbove', child);
+  this.setLimit('partHeightAbove', child);
+  this.setLimit('volumeHeightAbove', child);
+  this.setLimit('dynamicHeightAbove', child);
+  this.setLimit('endingHeightAbove', child);
+  this.setLimit('chordHeightAbove', child);
+  this.setLimit('lyricHeightAbove', child);
+  this.setLimit('lyricHeightBelow', child);
+  this.setLimit('chordHeightBelow', child);
+  this.setLimit('volumeHeightBelow', child);
+  this.setLimit('dynamicHeightBelow', child);
 };
 
 AbsoluteElement.prototype.pushTop = function (top) {

package/version.js

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