abcjs 6.0.0-beta.33 → 6.0.0-beta.37

package/src/parse/abc_parse_directive.js

@@ -39,6 +39,9 @@ var parseDirective = {};
 		tune.formatting.footerfont  = { face: "\"Times New Roman\"", size: 12, weight: "normal", style: "normal", decoration: "none" };
 		tune.formatting.headerfont  = { face: "\"Times New Roman\"", size: 12, weight: "normal", style: "normal", decoration: "none" };
 		tune.formatting.voicefont  = { face: "\"Times New Roman\"", size: 13, weight: "bold", style: "normal", decoration: "none" };
+		tune.formatting.tablabelfont  = { face: "\"Trebuchet MS\"", size: 16, weight: "normal", style: "normal", decoration: "none" };
+		tune.formatting.tabnumberfont = { face: "\"Arial\"", size: 11, weight: "normal", style: "normal", decoration: "none" };
+		tune.formatting.tabgracefont = { face: "\"Arial\"", size: 8, weight: "normal", style: "normal", decoration: "none" };
 
 		// these are the default fonts for these element types. In the printer, these fonts might change as the tune progresses.
 		tune.formatting.annotationfont  = multilineVars.annotationfont;
@@ -390,7 +393,7 @@ var parseDirective = {};
 	var interpretPercMap = function(restOfString) {
 		var tokens = restOfString.split(/\s+/); // Allow multiple spaces.
 		if (tokens.length !== 2 && tokens.length !== 3)
-			return { error: 'Expected parameters "abc-note", "drum-sound", and optionally "note-head"'}
+			return { error: 'Expected parameters "abc-note", "drum-sound", and optionally "note-head"'};
 		var key = tokens[0];
 		// The percussion sound can either be a MIDI number or a drum name. If it is not a number then check for a name.
 		var pitch = parseInt(tokens[1], 10);
@@ -403,7 +406,7 @@ var parseDirective = {};
 		if (tokens.length === 3)
 			value.noteHead = tokens[2];
 		return { key: key, value: value };
-	}
+	};
 
 	var getRequiredMeasurement = function(cmd, tokens) {
 		var points = tokenizer.getMeasurement(tokens);
@@ -742,6 +745,7 @@ var parseDirective = {};
 			//					titleformat: { type: "string", optional: true },
 			case "bagpipes":tune.formatting.bagpipes = true;break;
 			case "flatbeams":tune.formatting.flatbeams = true;break;
+			case "jazzchords":tune.formatting.jazzchords = true;break;
 			case "landscape":multilineVars.landscape = true;break;
 			case "papersize":multilineVars.papersize = restOfString;break;
 			case "graceslurs":
@@ -814,7 +818,7 @@ var parseDirective = {};
 				break;
 			case "sep":
 				if (tokens.length === 0)
-					tuneBuilder.addSeparator(14,14,85); // If no parameters are given, then there is a default size.
+					tuneBuilder.addSeparator(14,14,85, { startChar: multilineVars.iChar, endChar: multilineVars.iChar+5}); // If no parameters are given, then there is a default size.
 				else {
 					var points = tokenizer.getMeasurement(tokens);
 					if (points.used === 0)
@@ -830,7 +834,7 @@ var parseDirective = {};
 					if (points.used === 0 || tokens.length !== 0)
 						return "Directive \"" + cmd + "\" requires 3 numbers: space above, space below, length of line";
 					var lenLine = points.value;
-					tuneBuilder.addSeparator(spaceAbove, spaceBelow, lenLine);
+					tuneBuilder.addSeparator(spaceAbove, spaceBelow, lenLine, { startChar: multilineVars.iChar, endChar: multilineVars.iChar+restOfString.length});
 				}
 				break;
 			case "barsperstaff":
@@ -874,23 +878,23 @@ var parseDirective = {};
 				break;
 			case "begintext":
 				var textBlock = '';
-				line = tokenizer.nextLine()
+				line = tokenizer.nextLine();
 				while(line && line.indexOf('%%endtext') !== 0) {
 					if (parseCommon.startsWith(line, "%%"))
 						textBlock += line.substring(2) + "\n";
 					else
 						textBlock += line + "\n";
-					line = tokenizer.nextLine()
+					line = tokenizer.nextLine();
 				}
-				tuneBuilder.addText(textBlock);
+				tuneBuilder.addText(textBlock, { startChar: multilineVars.iChar, endChar: multilineVars.iChar+textBlock.length+7});
 				break;
 			case "continueall":
 				multilineVars.continueall = true;
 				break;
 			case "beginps":
-				line = tokenizer.nextLine()
+				line = tokenizer.nextLine();
 				while(line && line.indexOf('%%endps') !== 0) {
-					tokenizer.nextLine()
+					tokenizer.nextLine();
 				}
 				warn("Postscript ignored", str, 0);
 				break;
@@ -901,7 +905,7 @@ var parseDirective = {};
 				break;
 			case "text":
 				var textstr = tokenizer.translateString(restOfString);
-				tuneBuilder.addText(parseDirective.parseFontChangeLine(textstr));
+				tuneBuilder.addText(parseDirective.parseFontChangeLine(textstr), { startChar: multilineVars.iChar, endChar: multilineVars.iChar+restOfString.length+7});
 				break;
 			case "center":
 				var centerstr = tokenizer.translateString(restOfString);
@@ -1067,7 +1071,7 @@ var parseDirective = {};
 					case "-version":
 					case "-charset":
 						var subCmd = arr.shift();
-						tuneBuilder.addMetaText(cmd+subCmd, arr.join(' '));
+						tuneBuilder.addMetaText(cmd+subCmd, arr.join(' '), { startChar: multilineVars.iChar, endChar: multilineVars.iChar+restOfString.length+5});
 						break;
 					default:
 						return "Unknown directive: " + cmd+arr[0];
@@ -1090,7 +1094,7 @@ var parseDirective = {};
 				if (footerArr.length > 3)
 					warn("Too many tabs in " + cmd + ": " + footerArr.length + " found.", restOfString, 0);
 
-				tuneBuilder.addMetaTextObj(cmd, footer);
+				tuneBuilder.addMetaTextObj(cmd, footer, { startChar: multilineVars.iChar, endChar: multilineVars.iChar+str.length});
 				break;
 
 			case "midi":
@@ -1151,6 +1155,9 @@ var parseDirective = {};
 					case "vocalfont":
 					case "wordsfont":
 					case "annotationfont":
+					case "tablabelfont":
+					case "tabnumberfont":
+					case "tabgracefont":
 						getChangingFont(cmd, tokens, value);
 						break;
 					case "scale":

package/src/parse/abc_parse_header.js

@@ -13,13 +13,13 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 
 	this.setTitle = function(title) {
 		if (multilineVars.hasMainTitle)
-			tuneBuilder.addSubtitle(tokenizer.translateString(tokenizer.stripComment(title)));	// display secondary title
+			tuneBuilder.addSubtitle(tokenizer.translateString(tokenizer.stripComment(title)), { startChar: multilineVars.iChar, endChar: multilineVars.iChar+title.length+2});	// display secondary title
 		else
 		{
 			var titleStr = tokenizer.translateString(tokenizer.theReverser(tokenizer.stripComment(title)));
 			if (multilineVars.titlecaps)
 				titleStr = titleStr.toUpperCase();
-			tuneBuilder.addMetaText("title", titleStr);
+			tuneBuilder.addMetaText("title", titleStr, { startChar: multilineVars.iChar, endChar: multilineVars.iChar+title.length+2});
 			multilineVars.hasMainTitle = true;
 		}
 	};
@@ -235,7 +235,7 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 		prestissimo: 210,
 	};
 
-	this.setTempo = function(line, start, end) {
+	this.setTempo = function(line, start, end, iChar) {
 		//Q - tempo; can be used to specify the notes per minute, e.g. If
 		//the meter denominator is a 4 note then Q:120 or Q:C=120
 		//is 120 quarter notes per minute. Similarly  Q:C3=40 would be 40
@@ -255,7 +255,7 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 
 			if (tokens.length === 0) throw "Missing parameter in Q: field";
 
-			var tempo = {};
+			var tempo = { startChar: iChar+start-2, endChar: iChar+end };
 			var delaySet = true;
 			var token = tokens.shift();
 			if (token.type === 'quote') {
@@ -381,7 +381,7 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 					return [ e-i+1+ws ];
 				case "[Q:":
 					if (e > 0) {
-						var tempo = this.setTempo(line, i+3, e);
+						var tempo = this.setTempo(line, i+3, e, multilineVars.iChar);
 						if (tempo.type === 'delaySet') {
 							if (tuneBuilder.hasBeginMusic())
 								tuneBuilder.appendElement('tempo', startChar, endChar, this.calcTempo(tempo.tempo));
@@ -442,7 +442,7 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 				case "Q:":
 					var e = line.indexOf('\x12', i+2);
 					if (e === -1) e = line.length;
-					var tempo = this.setTempo(line, i+2, e);
+					var tempo = this.setTempo(line, i+2, e, multilineVars.iChar);
 					if (tempo.type === 'delaySet') tuneBuilder.appendElement('tempo', multilineVars.iChar + i, multilineVars.iChar + line.length, this.calcTempo(tempo.tempo));
 					else if (tempo.type === 'immediate') tuneBuilder.appendElement('tempo', multilineVars.iChar + i, multilineVars.iChar + line.length, tempo.tempo);
 				return [ e, line.charAt(i), parseCommon.strip(line.substring(i+2))];
@@ -477,9 +477,9 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 		var field = metaTextHeaders[line.charAt(0)];
 		if (field !== undefined) {
 			if (field === 'unalignedWords')
-				tuneBuilder.addMetaTextArray(field, parseDirective.parseFontChangeLine(tokenizer.translateString(tokenizer.stripComment(line.substring(2)))));
+				tuneBuilder.addMetaTextArray(field, parseDirective.parseFontChangeLine(tokenizer.translateString(tokenizer.stripComment(line.substring(2)))), { startChar: multilineVars.iChar, endChar: multilineVars.iChar+line.length});
 			else
-				tuneBuilder.addMetaText(field, tokenizer.translateString(tokenizer.stripComment(line.substring(2))));
+				tuneBuilder.addMetaText(field, tokenizer.translateString(tokenizer.stripComment(line.substring(2))), { startChar: multilineVars.iChar, endChar: multilineVars.iChar+line.length});
 			return {};
 		} else {
 			var startChar = multilineVars.iChar;
@@ -487,11 +487,11 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 			switch(line.charAt(0))
 			{
 				case  'H':
-					tuneBuilder.addMetaText("history", tokenizer.translateString(tokenizer.stripComment(line.substring(2))));
+					tuneBuilder.addMetaText("history", tokenizer.translateString(tokenizer.stripComment(line.substring(2))), { startChar: multilineVars.iChar, endChar: multilineVars.iChar+line.length});
 					line = tokenizer.peekLine()
 					while (line && line.charAt(1) !== ':') {
 						tokenizer.nextLine()
-						tuneBuilder.addMetaText("history", tokenizer.translateString(tokenizer.stripComment(line)));
+						tuneBuilder.addMetaText("history", tokenizer.translateString(tokenizer.stripComment(line)), { startChar: multilineVars.iChar, endChar: multilineVars.iChar+line.length});
 						line = tokenizer.peekLine()
 					}
 					break;
@@ -516,12 +516,12 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 				case  'P':
 					// TODO-PER: There is more to do with parts, but the writer doesn't care.
 					if (multilineVars.is_in_header)
-						tuneBuilder.addMetaText("partOrder", tokenizer.translateString(tokenizer.stripComment(line.substring(2))));
+						tuneBuilder.addMetaText("partOrder", tokenizer.translateString(tokenizer.stripComment(line.substring(2))), { startChar: multilineVars.iChar, endChar: multilineVars.iChar+line.length});
 					else
 						multilineVars.partForNextLine = { title: tokenizer.translateString(tokenizer.stripComment(line.substring(2))), startChar: startChar, endChar: endChar};
 					break;
 				case  'Q':
-					var tempo = this.setTempo(line, 2, line.length);
+					var tempo = this.setTempo(line, 2, line.length, multilineVars.iChar);
 					if (tempo.type === 'delaySet') multilineVars.tempo = tempo.tempo;
 					else if (tempo.type === 'immediate') {
 						if (!tune.metaText.tempo)

package/src/parse/abc_parse_music.js

@@ -318,6 +318,7 @@ MusicParser.prototype.parseMusic = function(line) {
 						else {
 							el.startTriplet = ret.triplet;
 							el.tripletMultiplier = ret.tripletQ / ret.triplet;
+							el.tripletR = ret.num_notes;
 							tripletNotesLeft = ret.num_notes === undefined ? ret.triplet : ret.num_notes;
 						}
 					}
@@ -480,6 +481,7 @@ MusicParser.prototype.parseMusic = function(line) {
 							// TODO-PER: straighten this out so there is not so much copying: getCoreNote shouldn't change e'
 							if (core.accidental !== undefined) el.pitches[0].accidental = core.accidental;
 							el.pitches[0].pitch = core.pitch;
+							el.pitches[0].name = core.name;
 							if (core.midipitch || core.midipitch === 0)
 								el.pitches[0].midipitch = core.midipitch;
 							if (core.endSlur !== undefined) el.pitches[0].endSlur = core.endSlur;
@@ -672,12 +674,17 @@ var letter_to_grace =  function(line, i) {
 
 				ii  = note.endChar;
 				delete note.endChar;
+
+				if (note.end_beam) {
+					note.endBeam = true;
+					delete note.end_beam;
+				}
 			}
 			else {
 				// We shouldn't get anything but notes or a space here, so report an error
 				if (gra[1].charAt(ii) === ' ') {
 					if (gracenotes.length > 0)
-						gracenotes[gracenotes.length-1].end_beam = true;
+						gracenotes[gracenotes.length-1].endBeam = true;
 				} else
 					warn("Unknown character '" + gra[1].charAt(ii) + "' while parsing grace note", line, i);
 				ii++;
@@ -1062,6 +1069,7 @@ var addEndBeam = function(el) {
 
 var pitches = {A: 5, B: 6, C: 0, D: 1, E: 2, F: 3, G: 4, a: 12, b: 13, c: 7, d: 8, e: 9, f: 10, g: 11};
 var rests = {x: 'invisible', X: 'invisible-multimeasure', y: 'spacer', z: 'rest', Z: 'multimeasure' };
+var accMap = { 'dblflat': '__', 'flat': '_', 'natural': '=', 'sharp': '^', 'dblsharp': '^^', 'quarterflat': '_/', 'quartersharp': '^/'};
 var getCoreNote = function(line, index, el, canHaveBrokenRhythm) {
 	//var el = { startChar: index };
 	var isComplete = function(state) {
@@ -1120,6 +1128,9 @@ var getCoreNote = function(line, index, el, canHaveBrokenRhythm) {
 			case 'g':
 				if (state === 'startSlur' || state === 'sharp2' || state === 'flat2' || state === 'pitch') {
 					el.pitch = pitches[line.charAt(index)];
+					el.name = line.charAt(index);
+					if (el.accidental)
+						el.name = accMap[el.accidental] + el.name;
 					transpose.note(multilineVars, el);
 					state = 'octave';
 					// At this point we have a valid note. The rest is optional. Set the duration in case we don't get one below
@@ -1134,7 +1145,6 @@ var getCoreNote = function(line, index, el, canHaveBrokenRhythm) {
 						(multilineVars.currentVoice && multilineVars.currentVoice.clef === "perc")) {
 						var key = line.charAt(index);
 						if (el.accidental) {
-							var accMap = { 'dblflat': '__', 'flat': '_', 'natural': '=', 'sharp': '^', 'dblsharp': '^^'};
 							key = accMap[el.accidental] + key;
 						}
 						if (tune.formatting && tune.formatting.midi && tune.formatting.midi.drummap)
@@ -1144,12 +1154,12 @@ var getCoreNote = function(line, index, el, canHaveBrokenRhythm) {
 				else return null;
 				break;
 			case ',':
-				if (state === 'octave') {el.pitch -= 7; }
+				if (state === 'octave') {el.pitch -= 7; el.name += ','; }
 				else if (isComplete(state)) {el.endChar = index;return el;}
 				else return null;
 				break;
 			case '\'':
-				if (state === 'octave') {el.pitch += 7; }
+				if (state === 'octave') {el.pitch += 7; el.name += "'";  }
 				else if (isComplete(state)) {el.endChar = index;return el;}
 				else return null;
 				break;

package/src/parse/tune-builder.js

@@ -4,19 +4,6 @@ var parseCommon = require('../parse/abc_common');
 var TuneBuilder = function(tune) {
 	var self = this;
 
-	this.reset = function () {
-		tune.version = "1.1.0";
-		tune.media = "screen";
-		tune.metaText = {};
-		tune.formatting = {};
-		tune.lines = [];
-		tune.staffNum = 0;
-		tune.voiceNum = 0;
-		tune.lineNum = 0;
-		tune.runningFonts = {};
-		delete tune.visualTranspose;
-	};
-
 	this.setVisualTranspose = function(visualTranspose) {
 		if (visualTranspose)
 			tune.visualTranspose = visualTranspose;
@@ -472,7 +459,7 @@ var TuneBuilder = function(tune) {
 		return currSlur;
 	};
 
-	this.reset();
+	tune.reset();
 
 	this.getLastNote = function() {
 		if (tune.lines[tune.lineNum] && tune.lines[tune.lineNum].staff && tune.lines[tune.lineNum].staff[tune.staffNum] &&
@@ -665,8 +652,8 @@ var TuneBuilder = function(tune) {
 		tune.lines.push(hash);
 	};
 
-	this.addSubtitle = function(str) {
-		this.pushLine({subtitle: str});
+	this.addSubtitle = function(str, info) {
+		this.pushLine({subtitle: { text: str, startChar: info.startChar, endChar: info.endChar}});
 	};
 
 	this.addSpacing = function(num) {
@@ -677,12 +664,12 @@ var TuneBuilder = function(tune) {
 		this.pushLine({newpage: num});
 	};
 
-	this.addSeparator = function(spaceAbove, spaceBelow, lineLength) {
-		this.pushLine({separator: {spaceAbove: Math.round(spaceAbove), spaceBelow: Math.round(spaceBelow), lineLength: Math.round(lineLength)}});
+	this.addSeparator = function(spaceAbove, spaceBelow, lineLength, info) {
+		this.pushLine({separator: {spaceAbove: Math.round(spaceAbove), spaceBelow: Math.round(spaceBelow), lineLength: Math.round(lineLength), startChar: info.startChar, endChar: info.endChar}});
 	};
 
-	this.addText = function(str) {
-		this.pushLine({text: str});
+	this.addText = function(str, info) {
+		this.pushLine({text: { text: str, startChar: info.startChar, endChar: info.endChar}});
 	};
 
 	this.addCentered = function(str) {
@@ -699,7 +686,7 @@ var TuneBuilder = function(tune) {
 
 	this.containsNotesStrict = function(voice) {
 		for (var i = 0; i < voice.length; i++) {
-			if (voice[i].el_type === 'note' && voice[i].rest === undefined)
+			if (voice[i].el_type === 'note' && (voice[i].rest === undefined || voice[i].chord !== undefined))
 				return true;
 		}
 		return false;
@@ -881,23 +868,29 @@ var TuneBuilder = function(tune) {
 		tune.lineNum =  i;
 	};
 
-	this.addMetaText = function(key, value) {
-		if (tune.metaText[key] === undefined)
+	this.addMetaText = function(key, value, info) {
+		if (tune.metaText[key] === undefined) {
 			tune.metaText[key] = value;
-		else
+			tune.metaTextInfo[key] = info;
+		} else {
 			tune.metaText[key] += "\n" + value;
+			tune.metaTextInfo[key].endChar = info.endChar;
+		}
 	};
 
-	this.addMetaTextArray = function(key, value) {
-		if (tune.metaText[key] === undefined)
+	this.addMetaTextArray = function(key, value, info) {
+		if (tune.metaText[key] === undefined) {
 			tune.metaText[key] = [value];
-		else
+			tune.metaTextInfo[key] = info;
+		} else {
 			tune.metaText[key].push(value);
+			tune.metaTextInfo[key].endChar = info.endChar;
+		}
 	};
-	this.addMetaTextObj = function(key, value) {
+	this.addMetaTextObj = function(key, value, info) {
 		tune.metaText[key] = value;
+		tune.metaTextInfo[key] = info;
 	};
-
 };
 
 module.exports = TuneBuilder;

package/src/synth/abc_midi_sequencer.js

@@ -235,6 +235,15 @@ var parseCommon = require("../parse/abc_common");
 										if (elem.startTriplet) {
 											tripletMultiplier = elem.tripletMultiplier;
 											tripletDurationTotal = elem.startTriplet * tripletMultiplier * elem.duration;
+											if (elem.startTriplet != elem.tripletR) { // most commonly (3:2:2
+												if (v + elem.tripletR <= voice.length) {
+													var durationTotal = 0;
+													for (var w = v; w < v + elem.tripletR; w++) {
+														durationTotal += voice[w].duration;
+													}
+													tripletDurationTotal = tripletMultiplier * durationTotal;
+												}
+											}
 											noteElem.duration = noteElem.duration * tripletMultiplier;
 											noteElem.duration = Math.round(noteElem.duration*1000000)/1000000;
 											tripletDurationCount = noteElem.duration;
@@ -264,6 +273,7 @@ var parseCommon = require("../parse/abc_common");
 									}
 									break;
 								case "key":
+								case "keySignature":
 									addKey(voices[voiceNumber], elem);
 									break;
 								case "meter":

package/src/synth/create-synth.js

@@ -12,10 +12,10 @@ var soundsCache = require('./sounds-cache');
 // TODO-PER: remove the midi tests from here: I don't think the object can be constructed unless it passes.
 var notSupportedMessage = "MIDI is not supported in this browser.";
 
-var defaultSoundFontUrl = "https://paulrosen.github.io/midi-js-soundfonts/abcjs/";
+var originalSoundFontUrl = "https://paulrosen.github.io/midi-js-soundfonts/abcjs/";
 // These are the original soundfonts supplied. They will need a volume boost:
-var alternateSoundFontUrl = "https://paulrosen.github.io/midi-js-soundfonts/FluidR3_GM/";
-var alternateSoundFontUrl2 = "https://paulrosen.github.io/midi-js-soundfonts/MusyngKite/";
+var defaultSoundFontUrl = "https://paulrosen.github.io/midi-js-soundfonts/FluidR3_GM/";
+var alternateSoundFontUrl = "https://paulrosen.github.io/midi-js-soundfonts/MusyngKite/";
 
 function CreateSynth() {
 	var self = this;
@@ -43,20 +43,61 @@ function CreateSynth() {
 		self.soundFontUrl = params.soundFontUrl ? params.soundFontUrl : defaultSoundFontUrl;
 		if (self.soundFontUrl[self.soundFontUrl.length-1] !== '/')
 			self.soundFontUrl += '/';
-		if (params.soundFontVolumeMultiplier)
+		if (params.soundFontVolumeMultiplier || params.soundFontVolumeMultiplier === 0)
 			self.soundFontVolumeMultiplier = params.soundFontVolumeMultiplier;
-		else if (self.soundFontUrl === alternateSoundFontUrl || self.soundFontUrl === alternateSoundFontUrl2)
-			self.soundFontVolumeMultiplier = 5.0;
-		else if (self.soundFontUrl === defaultSoundFontUrl)
-			self.soundFontVolumeMultiplier = 0.5;
+		else if (self.soundFontUrl === defaultSoundFontUrl || self.soundFontUrl === alternateSoundFontUrl)
+			self.soundFontVolumeMultiplier = 3.0;
+		else if (self.soundFontUrl === originalSoundFontUrl)
+			self.soundFontVolumeMultiplier = 0.4;
 		else
 			self.soundFontVolumeMultiplier = 1.0;
 		if (params.programOffsets)
 			self.programOffsets = params.programOffsets;
-		else if (self.soundFontUrl === defaultSoundFontUrl)
+		else if (self.soundFontUrl === originalSoundFontUrl)
 			self.programOffsets = {
-				"violin": 113,
-				"trombone": 200,
+				"bright_acoustic_piano": 20,
+				"honkytonk_piano": 20,
+				"electric_piano_1": 30,
+				"electric_piano_2": 30,
+				"harpsichord": 40,
+				"clavinet": 20,
+				"celesta": 20,
+				"glockenspiel": 40,
+				"vibraphone": 30,
+				"marimba": 35,
+				"xylophone": 30,
+				"tubular_bells": 35,
+				"dulcimer": 30,
+				"drawbar_organ": 20,
+				"percussive_organ": 25,
+				"rock_organ": 20,
+				"church_organ": 40,
+				"reed_organ": 40,
+				"accordion": 40,
+				"harmonica": 40,
+				"acoustic_guitar_nylon": 20,
+				"acoustic_guitar_steel": 30,
+				"electric_guitar_jazz": 25,
+				"electric_guitar_clean": 15,
+				"electric_guitar_muted": 35,
+				"overdriven_guitar": 25,
+				"distortion_guitar": 20,
+				"guitar_harmonics": 30,
+				"electric_bass_finger": 15,
+				"electric_bass_pick": 30,
+				"fretless_bass": 40,
+				"violin": 105,
+				"viola": 50,
+				"cello": 40,
+				"contrabass": 60,
+				"trumpet": 10,
+				"trombone": 90,
+				"alto_sax": 20,
+				"tenor_sax": 20,
+				"clarinet": 20,
+				"flute": 50,
+				"banjo": 50,
+				"woodblock": 20,
 			};
 		else
 			self.programOffsets = {};
@@ -345,8 +386,8 @@ function CreateSynth() {
 		if (self.debugCallback)
 			self.debugCallback("pause called");
 
-	 	self.stop();
-		self.pausedTimeSec = activeAudioContext().currentTime - self.startTimeSec;
+		self.pausedTimeSec = self.stop();
+		return self.pausedTimeSec;
 	};
 
 	self.resume = function() {
@@ -395,6 +436,8 @@ function CreateSynth() {
 			}
 		});
 		self.directSource = [];
+		var elapsed = activeAudioContext().currentTime - self.startTimeSec;
+		return elapsed;
 	};
 	self.finished = function() {
 		self.startTimeSec = undefined;

package/src/synth/load-note.js

@@ -2,74 +2,40 @@
 // url = the base url for the soundfont
 // instrument = the instrument name (e.g. "acoustic_grand_piano")
 // name = the pitch name (e.g. "A3")
-var soundsCache = require('./sounds-cache');
+var soundsCache = require("./sounds-cache");
 
-var getNote = function(url, instrument, name, audioContext) {
-	return new Promise(function (resolve, reject) {
-		if (!soundsCache[instrument])
-			soundsCache[instrument] = {};
-		var instrumentCache = soundsCache[instrument];
+var getNote = function (url, instrument, name, audioContext) {
+	if (!soundsCache[instrument]) soundsCache[instrument] = {};
+	var instrumentCache = soundsCache[instrument];
 
-		if (instrumentCache[name] === 'error') {
-			return resolve({instrument: instrument, name: name, status: "error", message: "Unable to load sound font" + ' ' + url + ' ' + instrument + ' ' + name });
-		}
-		if (instrumentCache[name] === 'pending') {
-			return resolve({instrument: instrument, name: name, status: "pending"});
-		}
-		if (instrumentCache[name]) {
-			return resolve({instrument: instrument, name: name, status: "cached"});
-		}
-
-		// if (this.debugCallback)
-		// 	this.debugCallback(`Loading sound: ${instrument} ${name}`);
-		instrumentCache[name] = "pending"; // This can be called in parallel, so don't call it a second time before the first one has loaded.
-		var xhr = new XMLHttpRequest();
-		xhr.open('GET', url+instrument+'-mp3/'+name+'.mp3', true);
-		xhr.responseType = 'arraybuffer';
-
-		var self = this;
-		function onSuccess(audioBuffer) {
-			instrumentCache[name] = audioBuffer;
-			// if (self.debugCallback)
-			// 	self.debugCallback(`Sound loaded: ${instrument} ${name} ${url}`);
-			resolve({instrument: instrument, name: name, status: "loaded"});
-		}
-
-		function onFailure(error) {
-			error = "Can't decode sound. " + url + ' ' + instrument + ' ' + name + ' ' + error;
-			if (self.debugCallback)
-				self.debugCallback(error);
-			return resolve({instrument: instrument, name: name, status: "error", message: error });
-		}
-
-		xhr.onload = function (e) {
-			if (this.status === 200) {
-				try {
-					var promise = audioContext.decodeAudioData(this.response, onSuccess, onFailure);
-					// older browsers only have the callback. Newer ones will report an unhandled
-					// rejection if catch isn't handled so we need both. We don't need to report it twice, though.
-					if (promise && promise.catch)
-						promise.catch(function () {});
-				} catch(error) {
-					reject(error);
+	if (!instrumentCache[name])
+		instrumentCache[name] = new Promise(function (resolve, reject) {
+			var xhr = new XMLHttpRequest();
+			let noteUrl = url + instrument + "-mp3/" + name + ".mp3";
+			xhr.open("GET", noteUrl, true);
+			xhr.responseType = "arraybuffer";
+			xhr.onload = function () {
+				if (xhr.status !== 200) {
+					reject(Error("Can't load sound at " + noteUrl));
+					return
 				}
-			} else {
-				instrumentCache[name] = "error"; // To keep this from trying to load repeatedly.
-				var cantLoadMp3 = "Onload error loading sound: " +  name + " " + url + " " + e.currentTarget.status + " " + e.currentTarget.statusText;
-				if (self.debugCallback)
-					self.debugCallback(cantLoadMp3);
-				return resolve({instrument: instrument, name: name, status: "error", message: cantLoadMp3 });
-			}
-		};
-		xhr.addEventListener("error", function () {
-			instrumentCache[name] = "error"; // To keep this from trying to load repeatedly.
-			var cantLoadMp3 = "Error in loading sound: " + " " + url;
-			if (self.debugCallback)
-				self.debugCallback(cantLoadMp3);
-			return resolve({instrument: instrument, name: name, status: "error", message: cantLoadMp3 });
-		}, false);
-		xhr.send();
-	});
+				var maybePromise = audioContext.decodeAudioData(xhr.response, resolve, function () {
+					reject(Error("Can't decode sound at " + noteUrl));
+				});
+				// In older browsers `BaseAudioContext.decodeAudio()` did not return a promise
+				if (maybePromise && typeof maybePromise.catch === "function") maybePromise.catch(reject);
+			};
+			xhr.onerror = function () {
+				reject(Error("Can't load sound at " + noteUrl));
+			};
+			xhr.send();
+		})
+			.catch(err => {
+				console.error("Didn't load note", instrument, name, ":", err.message);
+				throw err;
+			});
+
+	return instrumentCache[name];
 };
 
 module.exports = getNote;