abcjs 6.6.3 → 6.6.4

package/package.json

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

package/src/api/abc_timing_callbacks.js

@@ -2,10 +2,6 @@ var TimingCallbacks = function(target, params) {
 	var self = this;
 	if (!params) params = {};
 	self.qpm = params.qpm ? parseInt(params.qpm, 10) : null;
-	if (!self.qpm) {
-		var tempo = target.metaText ? target.metaText.tempo : null;
-		self.qpm = target.getBpm(tempo);
-	}
 	self.extraMeasuresAtBeginning = params.extraMeasuresAtBeginning ? parseInt(params.extraMeasuresAtBeginning, 10) : 0;
 	self.beatCallback = params.beatCallback; // This is called for each beat.
 	self.eventCallback = params.eventCallback;   // This is called for each note or rest encountered.
@@ -16,6 +12,10 @@ var TimingCallbacks = function(target, params) {
 	self.joggerTimer = null;
 
 	self.replaceTarget = function(newTarget) {
+		if (!params.qpm) {
+			var tempo = newTarget.metaText ? newTarget.metaText.tempo : null;
+			self.qpm = newTarget.getBpm(tempo);
+		}
 		self.noteTimings = newTarget.setTiming(self.qpm, self.extraMeasuresAtBeginning);
 		if (newTarget.noteTimings.length === 0)
 			self.noteTimings = newTarget.setTiming(0,0);
@@ -245,17 +245,47 @@ var TimingCallbacks = function(target, params) {
 				};
 			}
 
-			var thisStartTime = self.startTime; // the beat callback can call seek and change the position from beneath us.
-			self.beatCallback(
-				self.beatStarts[self.currentBeat].b,
-				self.totalBeats / self.beatSubdivisions,
-				self.lastMoment,
-				position,
-				debugInfo);
-			if (thisStartTime !== self.startTime) {
-				return timestamp - self.startTime;
-			} // else
-			// 	self.currentBeat++;
+			// there is a case where self.beatStarts[self.currentBeat] doesn't exist, but I don't know how. Give more info in that case for better debugging.
+			if (self.currentBeat < 0 || self.currentBeat >= self.beatStarts.length || !self.beatStarts[self.currentBeat]) {
+				var obj = {
+					currentBeat: self.currentBeat,
+					beatStartLength: self.beatStarts.length,
+					totalBeats: self.totalBeats,
+
+					startTime: self.startTime,
+					currentTime: self.currentTime,
+					lastMoment: self.lastMoment,
+					lastTimestamp: self.lastTimestamp,
+
+					qpm: self.qpm,
+					millisecondsPerBeat: self.millisecondsPerBeat,
+					beatSubdivisions: self.beatSubdivisions,
+
+					currentEvent: self.currentEvent,
+					currentLine: self.currentLine,
+
+					isPaused: self.isPaused,
+					isRunning: self.isRunning,
+					pausedPercent: self.pausedPercent,
+					justUnpaused: self.justUnpaused,
+					newSeekPercent: self.newSeekPercent,
+				}
+				setTimeout(function() {
+					// throw the error outside of the normal processing so that everything else continues working.
+					throw new Error("abcjs-timing-callback error: " + JSON.stringify(obj))
+				}, 1)
+			} else {
+				var thisStartTime = self.startTime; // the beat callback can call seek and change the position from beneath us.
+				self.beatCallback(
+					self.beatStarts[self.currentBeat].b,
+					self.totalBeats / self.beatSubdivisions,
+					self.lastMoment,
+					position,
+					debugInfo);
+				if (thisStartTime !== self.startTime) {
+					return timestamp - self.startTime;
+				}
+			}
 		}
 		return null;
 	};

package/src/parse/abc_parse.js

@@ -508,6 +508,8 @@ var Parse = function() {
 			}
 			strTune = arr.join("  "); //. the split removed two characters, so this puts them back
 		}
+		// If there is an escaped percent, then temporarily change it so it doesn't affect the processing.
+		strTune = strTune.replace(/\\%/g,"\u200B\uFF05")
 		// take care of line continuations right away, but keep the same number of characters
 		strTune = strTune.replace(/\\([ \t]*)(%.*)*\n/g, function(all, backslash, comment){
 			var padding = comment ? Array(comment.length +1).join(' ') : "";

package/src/parse/abc_parse_header.js

@@ -356,7 +356,9 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 					return [ e-i+1+ws ];
 				case "[M:":
 					var meter = this.setMeter(line.substring(i+3, e));
-					if (tuneBuilder.hasBeginMusic() && meter)
+					if (startLine && multilineVars.currentVoice && meter)
+						multilineVars.staves[multilineVars.currentVoice.staffNum].meter = meter;
+					else if (tuneBuilder.hasBeginMusic() && meter)
 						tuneBuilder.appendStartingElement('meter', startChar, endChar, meter);
 					else
 						multilineVars.meter = meter;

package/src/parse/abc_parse_key_voice.js

@@ -85,9 +85,20 @@ var parseKeyVoice = {};
 		key.accidentals.forEach(function(k) {
 		ret.accidentals.push(Object.assign({},k));
 		});
+		if (key.explicitAccidentals) {
+			ret.explicitAccidentals = [];
+			key.explicitAccidentals.forEach(function(k) {
+				ret.explicitAccidentals.push(Object.assign({},k));
+			});
+		}
 		return ret;
 	};
 
+	var setVoiceKey = function() {
+		if (multilineVars.currentVoice)
+			multilineVars.currentVoice.key = parseKeyVoice.deepCopyKey(multilineVars.key);
+	};
+
 	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};
 
 	parseKeyVoice.addPosToKey = function(clef, key) {
@@ -230,18 +241,30 @@ var parseKeyVoice = {};
 				multilineVars.key = { root: "HP", accidentals: [], acc: "", mode: "" };
 				ret.foundKey = true;
 				tokens.shift();
+				if (!isInline) {
+					multilineVars.globalKey = parseKeyVoice.deepCopyKey(multilineVars.key);
+				}
+				setVoiceKey();
 				break;
 			case 'Hp':
 				parseDirective.addDirective("bagpipes");
 				multilineVars.key = { root: "Hp", accidentals: [{acc: 'natural', note: 'g'}, {acc: 'sharp', note: 'f'}, {acc: 'sharp', note: 'c'}], acc: "", mode: "" };
 				ret.foundKey = true;
 				tokens.shift();
+				if (!isInline) {
+					multilineVars.globalKey = parseKeyVoice.deepCopyKey(multilineVars.key);
+				}
+				setVoiceKey();
 				break;
 			case 'none':
 				// we got the none key - that's the same as C to us
 				multilineVars.key = { root: "none", accidentals: [], acc: "", mode: "" };
 				ret.foundKey = true;
 				tokens.shift();
+				if (!isInline) {
+					multilineVars.globalKey = parseKeyVoice.deepCopyKey(multilineVars.key);
+				}
+				setVoiceKey();
 				break;
 			default:
 				var retPitch = tokenizer.getKeyPitch(tokens[0].token);
@@ -309,6 +332,10 @@ var parseKeyVoice = {};
 							}
 						}
 					}
+					if (!isInline) {
+						multilineVars.globalKey = parseKeyVoice.deepCopyKey(multilineVars.key);
+					}
+					setVoiceKey();
 				}
 				break;
 		}
@@ -358,6 +385,10 @@ var parseKeyVoice = {};
 					}
 				}
 			}
+			if (!isInline) {
+				multilineVars.globalKey = parseKeyVoice.deepCopyKey(multilineVars.key);
+			}
+			setVoiceKey();
 		}
 
 		// Now see if any optional parameters are present. They have the form "key=value", except that "clef=" is optional
@@ -499,6 +530,10 @@ var parseKeyVoice = {};
 				return // there was no change so don't reset it.
 		}
 		multilineVars.currentVoice = currentVoice;
+		if (currentVoice.key)
+			multilineVars.key = parseKeyVoice.deepCopyKey(currentVoice.key);
+		else if (multilineVars.globalKey)
+			multilineVars.key = parseKeyVoice.deepCopyKey(multilineVars.globalKey);
 		return tuneBuilder.setCurrentVoice(currentVoice.staffNum, currentVoice.index, id);
 	};