abcjs 6.0.2 → 6.0.3

package/package.json

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

package/src/parse/abc_parse_header.js

@@ -364,7 +364,7 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 						multilineVars.meter = meter;
 					return [ e-i+1+ws ];
 				case "[K:":
-					var result = parseKeyVoice.parseKey(line.substring(i+3, e));
+					var result = parseKeyVoice.parseKey(line.substring(i+3, e), true);
 					if (result.foundClef && tuneBuilder.hasBeginMusic())
 						tuneBuilder.appendStartingElement('clef', startChar, endChar, multilineVars.clef);
 					if (result.foundKey && tuneBuilder.hasBeginMusic())
@@ -426,7 +426,7 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 						tuneBuilder.appendStartingElement('meter', multilineVars.iChar + i, multilineVars.iChar + line.length, meter);
 					return [ line.length ];
 				case "K:":
-					var result = parseKeyVoice.parseKey(line.substring(i+2));
+					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())
@@ -498,7 +498,7 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 				case  'K':
 					// 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));
+					var result = parseKeyVoice.parseKey(line.substring(2), false);
 					if (!multilineVars.is_in_header && tuneBuilder.hasBeginMusic()) {
 						if (result.foundClef)
 							tuneBuilder.appendStartingElement('clef', startChar, endChar, multilineVars.clef);

package/src/parse/abc_parse_key_voice.js

@@ -340,7 +340,7 @@ var parseKeyVoice = {};
 		}
 	};
 
-	parseKeyVoice.parseKey = function(str)	// (and clef)
+	parseKeyVoice.parseKey = function(str, isInline)	// (and clef)
 	{
 		// returns:
 		//		{ foundClef: true, foundKey: true }
@@ -431,8 +431,14 @@ var parseKeyVoice = {};
 					// We need to do a deep copy because we are going to modify it
 					var oldKey = parseKeyVoice.deepCopyKey(multilineVars.key);
 					//TODO-PER: HACK! To get the local transpose to work, the transposition is done for each line. This caused the global transposition variable to be factored in twice, so, instead of rewriting that right now, I'm just subtracting one of them here.
-					var keyCompensate = multilineVars.globalTranspose ? -multilineVars.globalTranspose : 0;
+					var keyCompensate = !isInline && multilineVars.globalTranspose ? -multilineVars.globalTranspose : 0;
+					//console.log("parse", JSON.stringify(multilineVars), isInline)
+					var savedOrigKey;
+					if (isInline)
+						savedOrigKey = multilineVars.globalTransposeOrigKeySig
 					multilineVars.key = parseKeyVoice.deepCopyKey(parseKeyVoice.standardKey(key, retPitch.token, acc, keyCompensate));
+					if (isInline)
+						multilineVars.globalTransposeOrigKeySig = savedOrigKey
 					multilineVars.key.mode = mode;
 					if (oldKey) {
 						// Add natural in all places that the old key had an accidental.

package/src/parse/abc_tokenizer.js

@@ -702,18 +702,15 @@ var Tokenizer = function(lines, multilineVars) {
 		}
 		switch (x.token) {
 			case 'pt': return { used: used+1, value: parseFloat(num) };
+			case 'px': return { used: used+1, value: parseFloat(num) };
 			case 'cm': return { used: used+1, value: parseFloat(num)/2.54*72 };
 			case 'in': return { used: used+1, value: parseFloat(num)*72 };
 			default: tokens.unshift(x); return { used: used, value: parseFloat(num) };
 		}
-		return { used: 0 };
 	};
-	var substInChord = function(str)
-	{
-		while ( str.indexOf("\\n") !== -1)
-		{
-			str = str.replace("\\n", "\n");
-		}
+	var substInChord = function(str) {
+		str = str.replace(/\\n/g, "\n");
+		str = str.replace(/\\"/g, '"');
 		return str;
 	};
 	this.getBrackettedSubstring = function(line, i, maxErrorChars, _matchChar)
@@ -728,8 +725,11 @@ var Tokenizer = function(lines, multilineVars) {
 		// but in the error case it might not be.
 		var matchChar = _matchChar || line.charAt(i);
 		var pos = i+1;
-		while ((pos < line.length) && (line.charAt(pos) !== matchChar))
+		var esc = false;
+		while ((pos < line.length) && (esc || line[pos] !== matchChar)) {
+			esc = line[pos] === '\\';
 			++pos;
+		}
 		if (line.charAt(pos) === matchChar)
 			return [pos-i+1,substInChord(line.substring(i+1, pos)), true];
 		else	// we hit the end of line, so we'll just pick an arbitrary num of chars so the line doesn't disappear.

package/src/parse/abc_transpose.js

@@ -1,5 +1,6 @@
 //    abc_transpose.js: Handles the automatic transposition of key signatures, chord symbols, and notes.
 
+const allNotes = require("./all-notes");
 var transpose = {};
 
 var keyIndex = {
@@ -196,19 +197,39 @@ var accidentals2 = {
 	"1": "sharp",
 	"2": "dblsharp"
 };
+var accidentals3 = {
+	"-2": "__",
+	"-1": "_",
+	"0": "=",
+	"1": "^",
+	"2": "^^"
+};
+var count = 0
 transpose.note = function(multilineVars, el) {
-	// the "el" that is passed in has el.accidental, and el.pitch. "pitch" is the vertical position (0=middle C)
+	// the "el" that is passed in has el.name, el.accidental, and el.pitch. "pitch" is the vertical position (0=middle C)
 	// localTranspose is the number of half steps
 	// localTransposeVerticalMovement is the vertical distance to move.
+	//console.log(count++,multilineVars.localTranspose, el)
 	if (!multilineVars.localTranspose || multilineVars.clef.type === "perc")
 		return;
 	var origPitch = el.pitch;
-	el.pitch = el.pitch + multilineVars.localTransposeVerticalMovement;
+	if (multilineVars.localTransposeVerticalMovement) {
+		el.pitch = el.pitch + multilineVars.localTransposeVerticalMovement;
+		if (el.name) {
+			var actual = el.accidental ? el.name.substring(1) : el.name
+			var acc = el.accidental ? el.name[0] : ''
+			var p = allNotes.pitchIndex(actual)
+			el.name = acc + allNotes.noteName(p+multilineVars.localTransposeVerticalMovement)
+		}
+	}
 
 	if (el.accidental) {
 		var ret = accidentalChange(origPitch, el.pitch, el.accidental, multilineVars.globalTransposeOrigKeySig, multilineVars.targetKey);
 		el.pitch = ret[0];
 		el.accidental = accidentals2[ret[1]];
+		if (el.name) {
+			el.name = accidentals3[ret[1]] + el.name.replace(/[_^=]/g,'');
+		}
 	}
 
 };

package/src/parse/all-notes.js

@@ -0,0 +1,22 @@
+var allNotes = {};
+
+const allPitches = [
+	'C,,,', 'D,,,', 'E,,,', 'F,,,', 'G,,,', 'A,,,', 'B,,,',
+	'C,,', 'D,,', 'E,,', 'F,,', 'G,,', 'A,,', 'B,,',
+	'C,', 'D,', 'E,', 'F,', 'G,', 'A,', 'B,',
+	'C', 'D', 'E', 'F', 'G', 'A', 'B',
+	'c', 'd', 'e', 'f', 'g', 'a', 'b',
+	"c'", "d'", "e'", "f'", "g'", "a'", "b'",
+	"c''", "d''", "e''", "f''", "g''", "a''", "b''",
+	"c'''", "d'''", "e'''", "f'''", "g'''", "a'''", "b'''",
+];
+
+allNotes.pitchIndex = function(noteName) {
+	return allPitches.indexOf(noteName)
+}
+
+allNotes.noteName = function(pitchIndex) {
+	return allPitches[pitchIndex]
+}
+
+module.exports = allNotes;

package/src/synth/place-note.js

@@ -69,7 +69,7 @@ function placeNote(outputAudioBuffer, sampleRate, sound, startArray, volumeMulti
 			}
 			var fnResolve;
 			offlineCtx.oncomplete = function(e) {
-				if (e.renderedBuffer) { // If the system gets overloaded then this can start failing. Just drop the note if so.
+				if (e.renderedBuffer && e.renderedBuffer.getChannelData) { // If the system gets overloaded or there are network problems then this can start failing. Just drop the note if so.
 					for (var i = 0; i < startArray.length; i++) {
 						//Math.floor(startArray[i] * sound.tempoMultiplier * sampleRate)
 						var start = startArray[i] * sound.tempoMultiplier;

package/src/write/abc_abstract_engraver.js

@@ -845,6 +845,7 @@ AbstractEngraver.prototype.createNote = function(elem, nostem, isSingleLineStaff
 				for (var j = 0; j < this.ties.length; j++) {
 					if (this.ties[j].anchor1 && this.ties[j].anchor1.pitch === notehead.pitch) {
 						this.ties[j].setEndAnchor(notehead);
+						voice.setRange(this.ties[j])
 						this.ties.splice(j, 1);
 						found = true;
 						break;
@@ -852,6 +853,7 @@ AbstractEngraver.prototype.createNote = function(elem, nostem, isSingleLineStaff
 				}
 				if (!found) {
 					this.ties[0].setEndAnchor(notehead);
+					voice.setRange(this.ties[0])
 					this.ties.splice(0, 1);
 				}
 			}
@@ -878,6 +880,7 @@ AbstractEngraver.prototype.createNote = function(elem, nostem, isSingleLineStaff
 				if (this.slurs[slurid]) {
 					slur = this.slurs[slurid];
 					slur.setEndAnchor(notehead);
+					voice.setRange(slur)
 					delete this.slurs[slurid];
 				} else {
 					slur = new TieElem({ anchor2: notehead, stemDir: this.stemdir, voiceNumber: voiceNumber});

package/src/write/abc_tie_element.js

@@ -25,6 +25,17 @@ TieElem.prototype.addInternalNote = function(note) {
 TieElem.prototype.setEndAnchor = function(anchor2) {
 //	console.log("end", this.anchor1 ? this.anchor1.pitch : "N/A", anchor2 ? anchor2.pitch : "N/A", this.isTie, this.isGrace);
 	this.anchor2 = anchor2; // must have a .x and a .pitch property or be null (means ends at the end of the line)
+
+	// we don't really have enough info to know what the vertical extent is yet and we won't until drawing. This will just give it enough
+	// room on either side (we don't even know if the slur will be above yet). We need to set this so that we can make sure the voice has
+	// at least enough room that the line doesn't get cut off if the tie or slur is the lowest thing.
+	if (this.anchor1) {
+		this.top = Math.max(this.anchor1.pitch, this.anchor2.pitch) + 4
+		this.bottom = Math.min(this.anchor1.pitch, this.anchor2.pitch) - 4
+	} else {
+		this.top = this.anchor2.pitch + 4
+		this.bottom = this.anchor2.pitch - 4
+	}
 };
 
 // If we encounter a repeat sign, then we don't want to extend either a tie or a slur past it, so these are called to be a limit.

package/src/write/format-jazz-chord.js

@@ -5,7 +5,7 @@ function formatJazzChord(chordString) {
 	for (var i = 0; i < lines.length; i++) {
 		var chord = lines[i];
 		// If the chord isn't in a recognizable format then just skip the formatting.
-		var reg = chord.match(/^([ABCDEFG][♯♭]?)?([^\/]+)?(\/[ABCDEFG][#b]?)?/);
+		var reg = chord.match(/^([ABCDEFG][♯♭]?)?([^\/]+)?(\/[ABCDEFG][#b♯♭]?)?/);
 		if (reg)
 			lines[i] = (reg[1]?reg[1]:'') + "\x03" + (reg[2]?reg[2]:'')  + "\x03" + (reg[3]?reg[3]:'');
 	}

package/temp.txt

@@ -0,0 +1,16 @@
+    Fix unhandled rejection if there is a problem with an input note when creating notes.
+
+    put the height of ties/slurs in the line height calculation
+
+    Add transposition tests.
+
+    Add example of reusing created synth buffers.
+
+    Measurements that used "px" were reporting a warning.
+
+    Add quote to be escaped in chord.
+
+    Fix example in docs on creating a drum rhythm
+
+    Fix bass note in jazz chord when it contains a sharp or flat
+

package/version.js

@@ -1,3 +1,3 @@
-var version = '6.0.2';
+var version = '6.0.3';
 
 module.exports = version;