abcjs 6.0.0-beta.7 → 6.0.0

package/src/parse/abc_parse_header.js

@@ -1,41 +1,25 @@
 //    abc_parse_header.js: parses a the header fields from a string representing ABC Music Notation into a usable internal structure.
-//    Copyright (C) 2010-2020 Paul Rosen (paul at paulrosen dot net)
-//
-//    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-//    documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-//    the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
-//    to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-//    BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-//    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-/*global window */
 
 var parseCommon = require('./abc_common');
 var parseDirective = require('./abc_parse_directive');
 var parseKeyVoice = require('./abc_parse_key_voice');
 
-var ParseHeader = function(tokenizer, warn, multilineVars, tune) {
+var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 	this.reset = function(tokenizer, warn, multilineVars, tune) {
-		parseKeyVoice.initialize(tokenizer, warn, multilineVars, tune);
-		parseDirective.initialize(tokenizer, warn, multilineVars, tune);
+		parseKeyVoice.initialize(tokenizer, warn, multilineVars, tune, tuneBuilder);
+		parseDirective.initialize(tokenizer, warn, multilineVars, tune, tuneBuilder);
 	};
 	this.reset(tokenizer, warn, multilineVars, tune);
 
 	this.setTitle = function(title) {
 		if (multilineVars.hasMainTitle)
-			tune.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();
-			tune.addMetaText("title", titleStr);
+			tuneBuilder.addMetaText("title", titleStr, { startChar: multilineVars.iChar, endChar: multilineVars.iChar+title.length+2});
 			multilineVars.hasMainTitle = true;
 		}
 	};
@@ -251,7 +235,7 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune) {
 		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
@@ -271,7 +255,7 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune) {
 
 			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') {
@@ -358,7 +342,7 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune) {
 		}
 	};
 
-	this.letter_to_inline_header = function(line, i)
+	this.letter_to_inline_header = function(line, i, startLine)
 	{
 		var ws = tokenizer.eatWhiteSpace(line, i);
 		i +=ws;
@@ -374,32 +358,41 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune) {
 					return [ e-i+1+ws ];
 				case "[M:":
 					var meter = this.setMeter(line.substring(i+3, e));
-					if (tune.hasBeginMusic() && meter)
-						tune.appendStartingElement('meter', startChar, endChar, meter);
+					if (tuneBuilder.hasBeginMusic() && meter)
+						tuneBuilder.appendStartingElement('meter', startChar, endChar, meter);
 					else
 						multilineVars.meter = meter;
 					return [ e-i+1+ws ];
 				case "[K:":
 					var result = parseKeyVoice.parseKey(line.substring(i+3, e));
-					if (result.foundClef && tune.hasBeginMusic())
-						tune.appendStartingElement('clef', startChar, endChar, multilineVars.clef);
-					if (result.foundKey && tune.hasBeginMusic())
-						tune.appendStartingElement('key', startChar, endChar, parseKeyVoice.fixKey(multilineVars.clef, multilineVars.key));
+					if (result.foundClef && tuneBuilder.hasBeginMusic())
+						tuneBuilder.appendStartingElement('clef', startChar, endChar, multilineVars.clef);
+					if (result.foundKey && tuneBuilder.hasBeginMusic())
+						tuneBuilder.appendStartingElement('key', startChar, endChar, parseKeyVoice.fixKey(multilineVars.clef, multilineVars.key));
 					return [ e-i+1+ws ];
 				case "[P:":
-					if (tune.lines.length <= tune.lineNum)
+					if (startLine || tune.lines.length <= tune.lineNum)
 						multilineVars.partForNextLine = { title: line.substring(i+3, e), startChar: startChar, endChar: endChar };
 					else
-						tune.appendElement('part', startChar, endChar, {title: line.substring(i+3, e)});
+						tuneBuilder.appendElement('part', startChar, endChar, {title: line.substring(i+3, e)});
 					return [ e-i+1+ws ];
 				case "[L:":
 					this.setDefaultLength(line, i+3, e);
 					return [ e-i+1+ws ];
 				case "[Q:":
 					if (e > 0) {
-						var tempo = this.setTempo(line, i+3, e);
-						if (tempo.type === 'delaySet') tune.appendElement('tempo', startChar, endChar, this.calcTempo(tempo.tempo));
-						else if (tempo.type === 'immediate') tune.appendElement('tempo', startChar, endChar, tempo.tempo);
+						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));
+							else
+								multilineVars.tempoForNextLine = ['tempo', startChar, endChar, this.calcTempo(tempo.tempo)]
+						} else if (tempo.type === 'immediate') {
+							if (!startLine && tuneBuilder.hasBeginMusic())
+								tuneBuilder.appendElement('tempo', startChar, endChar, tempo.tempo);
+							else
+								multilineVars.tempoForNextLine = ['tempo', startChar, endChar, tempo.tempo]
+						}
 						return [ e-i+1+ws, line.charAt(i+1), line.substring(i+3, e)];
 					}
 					break;
@@ -429,19 +422,19 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune) {
 					return [ line.length ];
 				case "M:":
 					var meter = this.setMeter(line.substring(i+2));
-					if (tune.hasBeginMusic() && meter)
-						tune.appendStartingElement('meter', multilineVars.iChar + i, multilineVars.iChar + line.length, meter);
+					if (tuneBuilder.hasBeginMusic() && meter)
+						tuneBuilder.appendStartingElement('meter', multilineVars.iChar + i, multilineVars.iChar + line.length, meter);
 					return [ line.length ];
 				case "K:":
 					var result = parseKeyVoice.parseKey(line.substring(i+2));
-					if (result.foundClef && tune.hasBeginMusic())
-						tune.appendStartingElement('clef', multilineVars.iChar + i, multilineVars.iChar + line.length, multilineVars.clef);
-					if (result.foundKey && tune.hasBeginMusic())
-						tune.appendStartingElement('key', multilineVars.iChar + i, multilineVars.iChar + line.length, parseKeyVoice.fixKey(multilineVars.clef, multilineVars.key));
+					if (result.foundClef && tuneBuilder.hasBeginMusic())
+						tuneBuilder.appendStartingElement('clef', multilineVars.iChar + i, multilineVars.iChar + line.length, multilineVars.clef);
+					if (result.foundKey && tuneBuilder.hasBeginMusic())
+						tuneBuilder.appendStartingElement('key', multilineVars.iChar + i, multilineVars.iChar + line.length, parseKeyVoice.fixKey(multilineVars.clef, multilineVars.key));
 					return [ line.length ];
 				case "P:":
-					if (tune.hasBeginMusic())
-						tune.appendElement('part', multilineVars.iChar + i, multilineVars.iChar + line.length, {title: line.substring(i+2)});
+					if (tuneBuilder.hasBeginMusic())
+						tuneBuilder.appendElement('part', multilineVars.iChar + i, multilineVars.iChar + line.length, {title: line.substring(i+2)});
 					return [ line.length ];
 				case "L:":
 					this.setDefaultLength(line, i+2, line.length);
@@ -449,9 +442,9 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune) {
 				case "Q:":
 					var e = line.indexOf('\x12', i+2);
 					if (e === -1) e = line.length;
-					var tempo = this.setTempo(line, i+2, e);
-					if (tempo.type === 'delaySet') tune.appendElement('tempo', multilineVars.iChar + i, multilineVars.iChar + line.length, this.calcTempo(tempo.tempo));
-					else if (tempo.type === 'immediate') tune.appendElement('tempo', multilineVars.iChar + i, multilineVars.iChar + line.length, tempo.tempo);
+					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))];
 				case "V:":
 					parseKeyVoice.parseVoice(line, i+2, line.length);
@@ -481,110 +474,88 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune) {
 	};
 
 	this.parseHeader = function(line) {
-		if (parseCommon.startsWith(line, '%%')) {
-			var err = parseDirective.addDirective(line.substring(2));
-			if (err) warn(err, line, 2);
-			return {};
-		}
-		var i = line.indexOf('%');
-		if (i >= 0)
-			line = line.substring(0, i);
-		line = line.replace(/\s+$/, '');
-
-		if (line.length === 0)
+		var field = metaTextHeaders[line.charAt(0)];
+		if (field !== undefined) {
+			if (field === 'unalignedWords')
+				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))), { startChar: multilineVars.iChar, endChar: multilineVars.iChar+line.length});
 			return {};
-
-		if (line.length >= 2) {
-			if (line.charAt(1) === ':') {
-				var nextLine = "";
-				if (line.indexOf('\x12') >= 0 && line.charAt(0) !== 'w') {	// w: is the only header field that can have a continuation.
-					nextLine = line.substring(line.indexOf('\x12')+1);
-					line = line.substring(0, line.indexOf('\x12'));	//This handles a continuation mark on a header field
-				}
-				var field = metaTextHeaders[line.charAt(0)];
-				if (field !== undefined) {
-					if (field === 'unalignedWords')
-						tune.addMetaTextArray(field, parseDirective.parseFontChangeLine(tokenizer.translateString(tokenizer.stripComment(line.substring(2)))));
+		} else {
+			var startChar = multilineVars.iChar;
+			var endChar = startChar + line.length;
+			switch(line.charAt(0))
+			{
+				case  'H':
+					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)), { startChar: multilineVars.iChar, endChar: multilineVars.iChar+line.length});
+						line = tokenizer.peekLine()
+					}
+					break;
+				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));
+					if (!multilineVars.is_in_header && tuneBuilder.hasBeginMusic()) {
+						if (result.foundClef)
+							tuneBuilder.appendStartingElement('clef', startChar, endChar, multilineVars.clef);
+						if (result.foundKey)
+							tuneBuilder.appendStartingElement('key', startChar, endChar, parseKeyVoice.fixKey(multilineVars.clef, multilineVars.key));
+					}
+					multilineVars.is_in_header = false;	// The first key signifies the end of the header.
+					break;
+				case  'L':
+					this.setDefaultLength(line, 2, line.length);
+					break;
+				case  'M':
+					multilineVars.origMeter = multilineVars.meter = this.setMeter(line.substring(2));
+					break;
+				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))), { startChar: multilineVars.iChar, endChar: multilineVars.iChar+line.length});
 					else
-						tune.addMetaText(field, tokenizer.translateString(tokenizer.stripComment(line.substring(2))));
-					return {};
-				} else {
-					var startChar = multilineVars.iChar;
-					var endChar = startChar + line.length;
-					switch(line.charAt(0))
-					{
-						case  'H':
-							tune.addMetaText("history", tokenizer.translateString(tokenizer.stripComment(line.substring(2))));
-							multilineVars.is_in_history = true;
-							break;
-						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));
-							if (!multilineVars.is_in_header && tune.hasBeginMusic()) {
-								if (result.foundClef)
-									tune.appendStartingElement('clef', startChar, endChar, multilineVars.clef);
-								if (result.foundKey)
-									tune.appendStartingElement('key', startChar, endChar, parseKeyVoice.fixKey(multilineVars.clef, multilineVars.key));
-							}
-							multilineVars.is_in_header = false;	// The first key signifies the end of the header.
-							break;
-						case  'L':
-							this.setDefaultLength(line, 2, line.length);
-							break;
-						case  'M':
-							multilineVars.origMeter = multilineVars.meter = this.setMeter(line.substring(2));
-							break;
-						case  'P':
-							// TODO-PER: There is more to do with parts, but the writer doesn't care.
-							if (multilineVars.is_in_header)
-								tune.addMetaText("partOrder", tokenizer.translateString(tokenizer.stripComment(line.substring(2))));
-							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);
-							if (tempo.type === 'delaySet') multilineVars.tempo = tempo.tempo;
-							else if (tempo.type === 'immediate') tune.metaText.tempo = tempo.tempo;
-							break;
-						case  'T':
-							this.setTitle(line.substring(2));
-							break;
-						case 'U':
-							this.addUserDefinition(line, 2, line.length);
-							break;
-						case  'V':
-							parseKeyVoice.parseVoice(line, 2, line.length);
-							if (!multilineVars.is_in_header)
-								return {newline: true};
-							break;
-						case  's':
-							return {symbols: true};
-						case  'w':
-							return {words: true};
-						case 'X':
-							break;
-						case 'E':
-						case 'm':
-							warn("Ignored header", line, 0);
-							break;
-						default:
-							// It wasn't a recognized header value, so parse it as music.
-							if (nextLine.length)
-								nextLine = "\x12" + nextLine;
-							//parseRegularMusicLine(line+nextLine);
-							//nextLine = "";
-							return {regular: true, str: line+nextLine};
+						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, multilineVars.iChar);
+					if (tempo.type === 'delaySet') multilineVars.tempo = tempo.tempo;
+					else if (tempo.type === 'immediate') {
+						if (!tune.metaText.tempo)
+							tune.metaText.tempo = tempo.tempo;
+						else
+							multilineVars.tempoForNextLine = ['tempo', startChar, endChar, tempo.tempo]
 					}
-				}
-				if (nextLine.length > 0)
-					return {recurse: true, str: nextLine};
-				return {};
+					break;
+				case  'T':
+					this.setTitle(line.substring(2));
+					break;
+				case 'U':
+					this.addUserDefinition(line, 2, line.length);
+					break;
+				case  'V':
+					parseKeyVoice.parseVoice(line, 2, line.length);
+					if (!multilineVars.is_in_header)
+						return {newline: true};
+					break;
+				case  's':
+					return {symbols: true};
+				case  'w':
+					return {words: true};
+				case 'X':
+					break;
+				case 'E':
+				case 'm':
+					warn("Ignored header", line, 0);
+					break;
+				default:
+					return {regular: true};
 			}
 		}
-
-		// If we got this far, we have a regular line of mulsic
-		return {regular: true, str: line};
+		return {};
 	};
 };
 

package/src/parse/abc_parse_key_voice.js

@@ -1,18 +1,3 @@
-//    Copyright (C) 2010-2020 Paul Rosen (paul at paulrosen dot net)
-//
-//    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-//    documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-//    the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
-//    to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-//    BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-//    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 var parseCommon = require('./abc_common');
 var parseDirective = require('./abc_parse_directive');
 var transpose = require('./abc_transpose');
@@ -24,11 +9,13 @@ var parseKeyVoice = {};
 	var warn;
 	var multilineVars;
 	var tune;
-	parseKeyVoice.initialize = function(tokenizer_, warn_, multilineVars_, tune_) {
+	var tuneBuilder;
+	parseKeyVoice.initialize = function(tokenizer_, warn_, multilineVars_, tune_, tuneBuilder_) {
 		tokenizer = tokenizer_;
 		warn = warn_;
 		multilineVars = multilineVars_;
 		tune = tune_;
+		tuneBuilder = tuneBuilder_;
 	};
 
 	parseKeyVoice.standardKey = function(keyName, root, acc, localTranspose) {
@@ -175,7 +162,8 @@ var parseKeyVoice = {};
 			'D#': [ key1flat, key2flat, key3flat ],
 			'E#': [ key1flat ],
 			'G#': [ key1flat, key2flat, key3flat, key4flat ],
-			'Gbm': [ key1sharp, key2sharp, key3sharp, key4sharp, key5sharp, key6sharp, key7sharp ]
+			'Gbm': [ key1sharp, key2sharp, key3sharp, key4sharp, key5sharp, key6sharp, key7sharp ],
+			'none': []
 		};
 
 		return transpose.keySignature(multilineVars, keys, keyName, root, acc, localTranspose);
@@ -377,6 +365,12 @@ var parseKeyVoice = {};
 		var tokens = tokenizer.tokenize(str, 0, str.length);
 		var ret = {};
 
+		// Be sure that a key was passed in
+		if (tokens.length === 0) {
+			warn("Must pass in key signature.", str, 0);
+			return ret;
+		}
+
 		// first the key
 		switch (tokens[0].token) {
 			case 'HP':
@@ -566,6 +560,7 @@ var parseKeyVoice = {};
 						case "harmonic":
 						case "rhythm":
 						case "x":
+						case "triangle":
 							multilineVars.style = tokens[0].token;
 							tokens.shift();
 							break;
@@ -586,6 +581,7 @@ var parseKeyVoice = {};
 				case "alto":
 				case "tenor":
 				case "perc":
+				case "none":
 					// clef is [clef=] [⟨clef type⟩] [⟨line number⟩] [+8|-8]
 					var clef = tokens.shift();
 					switch (clef.token) {
@@ -630,7 +626,7 @@ var parseKeyVoice = {};
 
 	var setCurrentVoice = function(id) {
 		multilineVars.currentVoice = multilineVars.voices[id];
-		tune.setCurrentVoice(multilineVars.currentVoice.staffNum, multilineVars.currentVoice.index);
+		tuneBuilder.setCurrentVoice(multilineVars.currentVoice.staffNum, multilineVars.currentVoice.index);
 	};
 
 	parseKeyVoice.parseVoice = function(line, i, e) {
@@ -661,6 +657,8 @@ var parseKeyVoice = {};
 			var attr = tokenizer.getVoiceToken(line, start, end);
 			if (attr.warn !== undefined)
 				warn("Expected value for " + name + " in voice: " + attr.warn, line, start);
+			else if (attr.err !== undefined)
+				warn("Expected value for " + name + " in voice: " + attr.err, line, start);
 			else if (attr.token.length === 0 && line.charAt(start) !== '"')
 				warn("Expected value for " + name + " in voice", line, start);
 			else
@@ -671,6 +669,8 @@ var parseKeyVoice = {};
 			var attr = tokenizer.getVoiceToken(line, start, end);
 			if (attr.warn !== undefined)
 				warn("Expected value for " + name + " in voice: " + attr.warn, line, start);
+			else if (attr.err !== undefined)
+				warn("Expected value for " + name + " in voice: " + attr.err, line, start);
 			else if (attr.token.length === 0 && line.charAt(start) !== '"')
 				warn("Expected value for " + name + " in voice", line, start);
 			else {
@@ -684,6 +684,8 @@ var parseKeyVoice = {};
 			var attr = tokenizer.getVoiceToken(line, start, end);
 			if (attr.warn !== undefined)
 				warn("Expected value for " + name + " in voice: " + attr.warn, line, start);
+			else if (attr.err !== undefined)
+				warn("Expected value for " + name + " in voice: " + attr.err, line, start);
 			else if (attr.token.length === 0 && line.charAt(start) !== '"')
 				warn("Expected value for " + name + " in voice", line, start);
 			else {
@@ -809,6 +811,8 @@ var parseKeyVoice = {};
 						attr = tokenizer.getVoiceToken(line, start, end);
 						if (attr.warn !== undefined)
 							warn("Expected value for stems in voice: " + attr.warn, line, start);
+						else if (attr.err !== undefined)
+							warn("Expected value for stems in voice: " + attr.err, line, start);
 						else if (attr.token === 'up' || attr.token === 'down')
 							multilineVars.voices[id].stem = attr.token;
 						else
@@ -871,10 +875,12 @@ var parseKeyVoice = {};
 						attr = tokenizer.getVoiceToken(line, start, end);
 						if (attr.warn !== undefined)
 							warn("Expected value for style in voice: " + attr.warn, line, start);
-						else if (attr.token === 'normal' || attr.token === 'harmonic' || attr.token === 'rhythm' || attr.token === 'x')
+						else if (attr.err !== undefined)
+							warn("Expected value for style in voice: " + attr.err, line, start);
+						else if (attr.token === 'normal' || attr.token === 'harmonic' || attr.token === 'rhythm' || attr.token === 'x' || attr.token === 'triangle')
 							multilineVars.voices[id].style = attr.token;
 						else
-							warn("Expected one of [normal, harmonic, rhythm, x] for voice style", line, start);
+							warn("Expected one of [normal, harmonic, rhythm, x, triangle] for voice style", line, start);
 						start += attr.len;
 						break;
 					// default: