abcjs 6.1.8 → 6.2.0

package/index.js

@@ -42,7 +42,7 @@ Object.keys(tuneBook).forEach(function (key) {
 abcjs.renderAbc = require('./src/api/abc_tunebook_svg');
 abcjs.TimingCallbacks = require('./src/api/abc_timing_callbacks');
 
-var glyphs = require('./src/write/abc_glyphs');
+var glyphs = require('./src/write/creation/glyphs');
 abcjs.setGlyph = glyphs.setSymbol;
 abcjs.strTranspose = strTranspose;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abcjs",
-  "version": "6.1.8",
+  "version": "6.2.0",
   "description": "Renderer for abc music notation",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -44,16 +44,16 @@
   },
   "homepage": "https://abcjs.net",
   "devDependencies": {
-    "@babel/core": "7.20.2",
+    "@babel/core": "7.20.12",
     "@babel/preset-env": "7.20.2",
     "@tarp/require": "1.4.3",
-    "babel-loader": "9.1.0",
+    "babel-loader": "9.1.2",
     "chai": "4.3.7",
-    "concurrently": "7.5.0",
+    "concurrently": "7.6.0",
     "http-server": "14.1.1",
-    "mocha": "10.1.0",
+    "mocha": "10.2.0",
     "opener": "1.5.2",
-    "vuepress": "2.0.0-beta.26",
+    "vuepress": "2.0.0-beta.60",
     "vuex": "4.1.0",
     "webpack-bundle-analyzer": "4.7.0",
     "webpack-cli": "4.10.0"

package/plugin.js

@@ -28,7 +28,7 @@ THE SOFTWARE.
 
 var TuneBook = require('./src/api/abc_tunebook').TuneBook;
 var Parse = require('./src/parse/abc_parse');
-var EngraverController = require('./src/write/abc_engraver_controller');
+var EngraverController = require('./src/write/engraver-controller');
 
 var Plugin = function() {
 	"use strict";

package/src/api/abc_timing_callbacks.js

@@ -128,7 +128,7 @@ var TimingCallbacks = function(target, params) {
 			var ev;
 			if (next < self.noteTimings.length) {
 				endMs = self.noteTimings[next].milliseconds;
-				next = self.currentEvent - 1;
+				next = Math.max(0, self.currentEvent - 1);
 				while (next >= 0 && self.noteTimings[next].left === null)
 					next--;
 
@@ -153,15 +153,19 @@ var TimingCallbacks = function(target, params) {
 				var offMs = Math.max(0, timestamp-self.startTime-ev.milliseconds); // Offset in time from the last beat
 				var gapMs = endMs - ev.milliseconds; // Length of this event in time
 				var gapPx = ev.endX - ev.left; // The length in pixels
-				var offPx = offMs * gapPx / gapMs;
+				var offPx = gapMs ? offMs * gapPx / gapMs : 0;
 				position.left = ev.left + offPx;
+				// See if this is before the first event - that is the case where there are "prep beats"
+				if (self.currentEvent === 0 && ev.milliseconds > timestamp-self.startTime)
+					position.left = undefined
+				
 				debugInfo = {
 					timestamp: timestamp,
 					startTime: self.startTime,
 					ev: ev,
 					endMs: endMs,
 					offMs: offMs,
-					offPs: offPx,
+					offPx: offPx,
 					gapMs: gapMs,
 					gapPx: gapPx
 				};

package/src/api/abc_tunebook_svg.js

@@ -1,10 +1,9 @@
 var tunebook = require('./abc_tunebook');
 var Tune = require('../data/abc_tune');
 
-var EngraverController = require('../write/abc_engraver_controller');
+var EngraverController = require('../write/engraver-controller');
 var Parse = require('../parse/abc_parse');
 var wrap = require('../parse/wrap_lines');
-var parseCommon = require("../parse/abc_common");
 // var tablatures = require('./abc_tablatures');
 
 

package/src/data/abc_tune.js

@@ -1,7 +1,7 @@
 //    abc_tune.js: a computer usable internal structure representing one tune.
 
 var parseCommon = require('../parse/abc_common');
-var spacing = require('../write/abc_spacing');
+var spacing = require('../write/helpers/spacing');
 var sequence = require('../synth/abc_midi_sequencer');
 var flatten = require('../synth/abc_midi_flattener');
 var delineTune = require("./deline-tune");
@@ -611,7 +611,7 @@ var Tune = function() {
 	this.setUpAudio = function(options) {
 		if (!options) options = {};
 		var seq = sequence(this, options);
-		return flatten(seq, options, this.formatting.percmap);
+		return flatten(seq, options, this.formatting.percmap, this.formatting.midi);
 	};
 	this.deline = function(options) {
 		return delineTune(this.lines, options);

package/src/midi/abc_midi_create.js

@@ -36,8 +36,14 @@ var create;
 						var pan = 0;
 						if (options.pan && options.pan.length > i)
 							pan = options.pan[i];
-						midi.setChannel(event.channel, pan);
-						midi.setInstrument(event.instrument);
+						if (event.instrument === 128) {
+							// If we're using the percussion voice, change to Channel 10
+							midi.setChannel(9, pan);
+							midi.setInstrument(0);
+						} else {
+							midi.setChannel(event.channel, pan);
+							midi.setInstrument(event.instrument);
+						}
 						break;
 					case 'note':
 						var gapLengthInBeats = event.gap * beatsPerSecond;

package/src/parse/abc_common.js

@@ -34,10 +34,6 @@ parseCommon.cloneHashOfArrayOfHash = function(source) {
 	return destination;
 };
 
-parseCommon.gsub = function(source, pattern, replacement) {
-	return source.split(pattern).join(replacement);
-};
-
 parseCommon.strip = function(str) {
 	return str.replace(/^\s+/, '').replace(/\s+$/, '');
 };
@@ -51,54 +47,11 @@ parseCommon.endsWith = function(str, pattern) {
 	return d >= 0 && str.lastIndexOf(pattern) === d;
 };
 
-parseCommon.each = function(arr, iterator, context) {
-	for (var i = 0, length = arr.length; i < length; i++)
-	  iterator.apply(context, [arr[i],i]);
-};
-
 parseCommon.last = function(arr) {
 	if (arr.length === 0)
 		return null;
 	return arr[arr.length-1];
 };
 
-parseCommon.compact = function(arr) {
-	var output = [];
-	for (var i = 0; i < arr.length; i++) {
-		if (arr[i])
-			output.push(arr[i]);
-	}
-	return output;
-};
-
-parseCommon.detect = function(arr, iterator) {
-	for (var i = 0; i < arr.length; i++) {
-		if (iterator(arr[i]))
-			return true;
-	}
-	return false;
-};
 
-// The following is a polyfill for Object.remove for IE9, IE10, and IE11.
-// from:https://github.com/jserz/js_piece/blob/master/DOM/ChildNode/remove()/remove().md
-try {
-	(function (arr) {
-		arr.forEach(function (item) {
-			if (item.hasOwnProperty('remove')) {
-				return;
-			}
-			Object.defineProperty(item, 'remove', {
-				configurable: true,
-				enumerable: true,
-				writable: true,
-				value: function remove() {
-					if (this.parentNode !== null)
-						this.parentNode.removeChild(this);
-				}
-			});
-		});
-	})([Element.prototype, CharacterData.prototype, DocumentType.prototype]);
-} catch(e) {
-	// if we aren't in a browser, this code will crash, but it is not needed then either.
-}
 module.exports = parseCommon;

package/src/parse/abc_parse.js

@@ -181,16 +181,16 @@ var Parse = function() {
 	};
 
 	var encode = function(str) {
-		var ret = parseCommon.gsub(str, '\x12', ' ');
-		ret = parseCommon.gsub(ret, '&', '&');
-		ret = parseCommon.gsub(ret, '<', '&lt;');
-		return parseCommon.gsub(ret, '>', '&gt;');
+		var ret = str.replace(/\x12/g, ' ');
+		ret = ret.replace(/&/g, '&amp;');
+		ret = ret.replace(/</g, '&lt;');
+		return ret.replace(/>/g, '&gt;');
 	};
 
 	var warn = function(str, line, col_num) {
 		if (!line) line = " ";
-		var bad_char = line.charAt(col_num);
-		if (bad_char === ' ')
+		var bad_char = line[col_num];
+		if (bad_char === ' ' || !bad_char)
 			bad_char = "SPACE";
 		var clean_line = encode(line.substring(col_num - 64, col_num)) + '<span style="text-decoration:underline;font-size:1.3em;font-weight:bold;">' + bad_char + '</span>' + encode(line.substring(col_num + 1).substring(0,64));
 		addWarning("Music Line:" + tokenizer.lineIndex + ":" + (col_num+1) + ': ' + str + ":  " + clean_line);
@@ -217,7 +217,7 @@ var Parse = function() {
 
 		if (!line) { warn("Can't add words before the first line of music", line, 0); return; }
 		words = parseCommon.strip(words);
-		if (words.charAt(words.length-1) !== '-')
+		if (words[words.length-1] !== '-')
 			words = words + ' ';	// Just makes it easier to parse below, since every word has a divider after it.
 		var word_list = [];
 		// first make a list of words from the string we are passed. A word is divided on either a space or dash.
@@ -229,8 +229,8 @@ var Parse = function() {
 			last_divider = i+1;
 			if (word.length > 0) {
 				if (replace)
-					word = parseCommon.gsub(word,'~', ' ');
-				var div = words.charAt(i);
+					word = word.replace(/~/g, ' ');
+				var div = words[i];
 				if (div !== '_' && div !== '-')
 					div = ' ';
 				word_list.push({syllable: tokenizer.translateString(word), divider: div});
@@ -280,7 +280,7 @@ var Parse = function() {
 		}
 
 		var inSlur = false;
-		parseCommon.each(line, function(el) {
+		line.forEach(function(el) {
 			if (word_list.length !== 0) {
 				if (word_list[0].skip) {
 					switch (word_list[0].to) {
@@ -320,7 +320,7 @@ var Parse = function() {
 		// TODO-PER: Currently copied from w: line. This needs to be read as symbols instead.
 		if (!line) { warn("Can't add symbols before the first line of music", line, 0); return; }
 		words = parseCommon.strip(words);
-		if (words.charAt(words.length-1) !== '-')
+		if (words[words.length-1] !== '-')
 			words = words + ' ';	// Just makes it easier to parse below, since every word has a divider after it.
 		var word_list = [];
 		// first make a list of words from the string we are passed. A word is divided on either a space or dash.
@@ -331,8 +331,8 @@ var Parse = function() {
 			last_divider = i+1;
 			if (word.length > 0) {
 				if (replace)
-					word = parseCommon.gsub(word, '~', ' ');
-				var div = words.charAt(i);
+					word = word.replace(/~/g, ' ');
+				var div = words[i];
 				if (div !== '_' && div !== '-')
 					div = ' ';
 				word_list.push({syllable: tokenizer.translateString(word), divider: div});
@@ -342,7 +342,7 @@ var Parse = function() {
 			return false;
 		};
 		for (var i = 0; i < words.length; i++) {
-			switch (words.charAt(i)) {
+			switch (words[i]) {
 				case ' ':
 				case '\x12':
 					addWord(i);
@@ -372,7 +372,7 @@ var Parse = function() {
 		}
 
 		var inSlur = false;
-		parseCommon.each(line, function(el) {
+		line.forEach(function(el) {
 			if (word_list.length !== 0) {
 				if (word_list[0].skip) {
 					switch (word_list[0].to) {
@@ -416,7 +416,7 @@ var Parse = function() {
 			addSymbols(tuneBuilder.getCurrentVoice(), line.substring(2));
 			return
 		}
-		if (line.length < 2 || line.charAt(1) !== ':' || music.lineContinuation) {
+		if (line.length < 2 || line[1] !== ':' || music.lineContinuation) {
 			music.parseMusic(line);
 			return
 		}

package/src/parse/abc_parse_book.js

@@ -15,7 +15,7 @@ var bookParser = function(book) {
 	// Keep track of the character position each tune starts with. If the string starts with white space, count that, too.
 	var pos = initialWhiteSpace ? initialWhiteSpace[0].length : 0;
 	var tunes = [];
-	parseCommon.each(tuneStrings, function(tune) {
+	tuneStrings.forEach(function(tune) {
 		tunes.push({ abc: tune, startPos: pos});
 		pos += tune.length + 1; // We also lost a newline when splitting, so count that.
 	});
@@ -25,7 +25,7 @@ var bookParser = function(book) {
 		// the tune is parsed all at once. The directives will be seen before the engraver begins processing.
 		var dir = tunes.shift();
 		var arrDir = dir.abc.split('\n');
-		parseCommon.each(arrDir, function(line) {
+		arrDir.forEach(function(line) {
 			if (parseCommon.startsWith(line, '%%'))
 				directives += line + '\n';
 		});
@@ -33,7 +33,7 @@ var bookParser = function(book) {
 	var header = directives;
 
 	// Now, the tune ends at a blank line, so truncate it if needed. There may be "intertune" stuff.
-	parseCommon.each(tunes, function(tune) {
+	tunes.forEach(function(tune) {
 		var end = tune.abc.indexOf('\n\n');
 		if (end > 0)
 			tune.abc = tune.abc.substring(0, end);

package/src/parse/abc_parse_directive.js

@@ -330,7 +330,7 @@ var parseDirective = {};
 
 	var setScale = function(cmd, tokens) {
 		var scratch = "";
-		parseCommon.each(tokens, function(tok) {
+		tokens.forEach(function(tok) {
 			scratch += tok.token;
 		});
 		var num = parseFloat(scratch);
@@ -485,6 +485,8 @@ var parseDirective = {};
 	var midiCmdParam1Integer = [
 		"bassvol",
 		"chordvol",
+		"bassprog",
+		"chordprog",
 		"c",
 		"channel",
 		"beatmod",
@@ -686,15 +688,15 @@ var parseDirective = {};
 		if (textParts.length > 1 && multilineVars.setfont) {
 			var textarr = [ { text: textParts[0] }];
 			for (var i = 1; i < textParts.length; i++) {
-				if (textParts[i].charAt(0) === '0')
+				if (textParts[i][0] === '0')
 					textarr.push({ text: textParts[i].substring(1) });
-				else if (textParts[i].charAt(0) === '1' && multilineVars.setfont[1])
+				else if (textParts[i][0] === '1' && multilineVars.setfont[1])
 					textarr.push({font: multilineVars.setfont[1], text: textParts[i].substring(1) });
-				else if (textParts[i].charAt(0) === '2' && multilineVars.setfont[2])
+				else if (textParts[i][0] === '2' && multilineVars.setfont[2])
 					textarr.push({font: multilineVars.setfont[2], text: textParts[i].substring(1) });
-				else if (textParts[i].charAt(0) === '3' && multilineVars.setfont[3])
+				else if (textParts[i][0] === '3' && multilineVars.setfont[3])
 					textarr.push({font: multilineVars.setfont[3], text: textParts[i].substring(1) });
-				else if (textParts[i].charAt(0) === '4' && multilineVars.setfont[4])
+				else if (textParts[i][0] === '4' && multilineVars.setfont[4])
 					textarr.push({font: multilineVars.setfont[4], text: textParts[i].substring(1) });
 				else
 					textarr[textarr.length-1].text += '$' + textParts[i];
@@ -746,6 +748,7 @@ var parseDirective = {};
 			case "bagpipes":tune.formatting.bagpipes = true;break;
 			case "flatbeams":tune.formatting.flatbeams = true;break;
 			case "jazzchords":tune.formatting.jazzchords = true;break;
+			case "germanAlphabet":tune.formatting.germanAlphabet = true;break;
 			case "landscape":multilineVars.landscape = true;break;
 			case "papersize":multilineVars.papersize = restOfString;break;
 			case "graceslurs":
@@ -758,6 +761,13 @@ var parseDirective = {};
 				else
 					return "Directive graceslurs requires one parameter: 0 or 1 (received " + tokens[0].token + ')';
 				break;
+			case "lineThickness":
+				var lt = parseStretchLast(tokens);
+				if (lt.value !== undefined)
+					tune.formatting.lineThickness = lt.value;
+				if (lt.error)
+					return lt.error;
+				break;
 			case "stretchlast":
 				var sl = parseStretchLast(tokens);
 				if (sl.value !== undefined)
@@ -807,6 +817,15 @@ var parseDirective = {};
 					tuneBuilder.changeVoiceScale(multilineVars.currentVoice.scale);
 				}
 				return null;
+			case "voicecolor":
+				if (tokens.length !== 1) // this could either be of type alpha or quote, but it's ok if it is a number
+					return "voicecolor requires one string as a parameter";
+				var voiceColor = tokens.shift();
+				if (multilineVars.currentVoice) {
+					multilineVars.currentVoice.color = voiceColor.token;
+					tuneBuilder.changeVoiceColor(multilineVars.currentVoice.color);
+				}
+				return null;
 			case "vskip":
 				var vskip = Math.round(getRequiredMeasurement(cmd, tokens));
 				if (vskip.error)
@@ -1081,7 +1100,7 @@ var parseDirective = {};
 			case "footer":
 				var footerStr = tokenizer.getMeat(restOfString, 0, restOfString.length);
 				footerStr = restOfString.substring(footerStr.start, footerStr.end);
-				if (footerStr.charAt(0) === '"' && footerStr.charAt(footerStr.length-1) === '"' )
+				if (footerStr[0] === '"' && footerStr[footerStr.length-1] === '"' )
 					footerStr = footerStr.substring(1, footerStr.length-1);
 				var footerArr = footerStr.split('\t');
 				var footer = {};

package/src/parse/abc_parse_header.js

@@ -189,7 +189,7 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 	};
 
 	this.setDefaultLength = function(line, start, end) {
-		var len = parseCommon.gsub(line.substring(start, end), " ", "");
+		var len = line.substring(start, end).replace(/ /g, "");
 		var len_arr = len.split('/');
 		if (len_arr.length === 2) {
 			var n = parseInt(len_arr[0]);
@@ -346,7 +346,7 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 	{
 		var ws = tokenizer.eatWhiteSpace(line, i);
 		i +=ws;
-		if (line.length >= i+5 && line.charAt(i) === '[' && line.charAt(i+2) === ':') {
+		if (line.length >= i+5 && line[i] === '[' && line[i+2] === ':') {
 			var e = line.indexOf(']', i);
 			var startChar = multilineVars.iChar + i;
 			var endChar = multilineVars.iChar + e + 1;
@@ -393,16 +393,18 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 							else
 								multilineVars.tempoForNextLine = ['tempo', startChar, endChar, tempo.tempo]
 						}
-						return [ e-i+1+ws, line.charAt(i+1), line.substring(i+3, e)];
+						return [ e-i+1+ws, line[i+1], line.substring(i+3, e)];
 					}
 					break;
 				case "[V:":
 					if (e > 0) {
 						parseKeyVoice.parseVoice(line, i+3, e);
 						//startNewLine();
-						return [ e-i+1+ws, line.charAt(i+1), line.substring(i+3, e)];
+						return [ e-i+1+ws, line[i+1], line.substring(i+3, e)];
 					}
 					break;
+				case "[r:":
+					return [ e-i+1+ws ];
 
 				default:
 					// TODO: complain about unhandled header
@@ -445,11 +447,11 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 					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))];
+				return [ e, line[i], parseCommon.strip(line.substring(i+2))];
 				case "V:":
 					parseKeyVoice.parseVoice(line, i+2, line.length);
 //						startNewLine();
-					return [ line.length, line.charAt(i), parseCommon.strip(line.substring(i+2))];
+					return [ line.length, line[i], parseCommon.strip(line.substring(i+2))];
 				default:
 					// TODO: complain about unhandled header
 			}
@@ -474,7 +476,7 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 	};
 
 	this.parseHeader = function(line) {
-		var field = metaTextHeaders[line.charAt(0)];
+		var field = metaTextHeaders[line[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});
@@ -484,12 +486,12 @@ var ParseHeader = function(tokenizer, warn, multilineVars, tune, tuneBuilder) {
 		} else {
 			var startChar = multilineVars.iChar;
 			var endChar = startChar + line.length;
-			switch(line.charAt(0))
+			switch(line[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) !== ':') {
+					while (line && line[1] !== ':') {
 						tokenizer.nextLine()
 						tuneBuilder.addMetaText("history", tokenizer.translateString(tokenizer.stripComment(line)), { startChar: multilineVars.iChar, endChar: multilineVars.iChar+line.length});
 						line = tokenizer.peekLine()

package/src/parse/abc_parse_key_voice.js

@@ -83,7 +83,7 @@ var parseKeyVoice = {};
 
 	parseKeyVoice.deepCopyKey = function(key) {
 		var ret = { accidentals: [], root: key.root, acc: key.acc, mode: key.mode };
-		parseCommon.each(key.accidentals, function(k) {
+		key.accidentals.forEach(function(k) {
 		ret.accidentals.push(parseCommon.clone(k));
 		});
 		return ret;
@@ -95,20 +95,20 @@ var parseKeyVoice = {};
 		// Shift the key signature from the treble positions to whatever position is needed for the clef.
 		// This may put the key signature unnaturally high or low, so if it does, then shift it.
 		var mid = clef.verticalPos;
-		parseCommon.each(key.accidentals, function(acc) {
+		key.accidentals.forEach(function(acc) {
 			var pitch = pitches[acc.note];
 			pitch = pitch - mid;
 			acc.verticalPos = pitch;
 		});
 		if (key.impliedNaturals)
-			parseCommon.each(key.impliedNaturals, function(acc) {
+			key.impliedNaturals.forEach(function(acc) {
 				var pitch = pitches[acc.note];
 				pitch = pitch - mid;
 				acc.verticalPos = pitch;
 			});
 
 		if (mid < -10) {
-			parseCommon.each(key.accidentals, function(acc) {
+			key.accidentals.forEach(function(acc) {
 				acc.verticalPos -= 7;
 				if (acc.verticalPos >= 11 || (acc.verticalPos === 10 && acc.acc === 'flat'))
 					acc.verticalPos -= 7;
@@ -118,7 +118,7 @@ var parseKeyVoice = {};
 					acc.verticalPos -=7;
 			});
 			if (key.impliedNaturals)
-				parseCommon.each(key.impliedNaturals, function(acc) {
+				key.impliedNaturals.forEach(function(acc) {
 					acc.verticalPos -= 7;
 					if (acc.verticalPos >= 11 || (acc.verticalPos === 10 && acc.acc === 'flat'))
 						acc.verticalPos -= 7;
@@ -128,23 +128,23 @@ var parseKeyVoice = {};
 						acc.verticalPos -=7;
 				});
 		} else if (mid < -4) {
-			parseCommon.each(key.accidentals, function(acc) {
+			key.accidentals.forEach(function(acc) {
 				acc.verticalPos -= 7;
 				if (mid === -8 && (acc.note === 'f' || acc.note === 'g') && acc.acc === 'sharp' )
 					acc.verticalPos -=7;
 			});
 			if (key.impliedNaturals)
-				parseCommon.each(key.impliedNaturals, function(acc) {
+				key.impliedNaturals.forEach(function(acc) {
 					acc.verticalPos -= 7;
 					if (mid === -8 && (acc.note === 'f' || acc.note === 'g') && acc.acc === 'sharp' )
 						acc.verticalPos -=7;
 				});
 		} else if (mid >= 7) {
-			parseCommon.each(key.accidentals, function(acc) {
+			key.accidentals.forEach(function(acc) {
 				acc.verticalPos += 7;
 			});
 			if (key.impliedNaturals)
-				parseCommon.each(key.impliedNaturals, function(acc) {
+				key.impliedNaturals.forEach(function(acc) {
 					acc.verticalPos += 7;
 				});
 		}
@@ -158,15 +158,15 @@ var parseKeyVoice = {};
 
 	var parseMiddle = function(str) {
 		var i = 0;
-		var p = str.charAt(i++);
+		var p = str[i++];
 		if (p === '^' || p === '_')
-			p = str.charAt(i++);
+			p = str[i++];
 	  var mid = pitches[p];
 		if (mid === undefined)
 			mid = 6; // If a legal middle note wasn't received, just ignore it.
 		for ( ; i < str.length; i++) {
-			if (str.charAt(i) === ',') mid -= 7;
-			else if (str.charAt(i) === "'") mid += 7;
+			if (str[i] === ',') mid -= 7;
+			else if (str[i] === "'") mid += 7;
 			else break;
 		}
 		return { mid: mid - 6, str: str.substring(i) };	// We get the note in the middle of the staff. We want the note that appears as the first ledger line below the staff.
@@ -528,7 +528,7 @@ var parseKeyVoice = {};
 				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) !== '"')
+			else if (attr.token.length === 0 && line[start] !== '"')
 				warn("Expected value for " + name + " in voice", line, start);
 			else
 				staffInfo[name] = attr.token;
@@ -540,7 +540,7 @@ var parseKeyVoice = {};
 				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) !== '"')
+			else if (attr.token.length === 0 && line[start] !== '"')
 				warn("Expected value for " + name + " in voice", line, start);
 			else {
 				if (type === 'number')
@@ -555,7 +555,7 @@ var parseKeyVoice = {};
 				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) !== '"')
+			else if (attr.token.length === 0 && line[start] !== '"')
 				warn("Expected value for " + name + " in voice", line, start);
 			else {
 				if (type === 'number')
@@ -574,7 +574,7 @@ var parseKeyVoice = {};
 			var attr = tokenizer.getVoiceToken(line, start, end);
 			if (attr.warn !== undefined)
 				warn("Expected one of (_B, _E, _b, _e) for " + name + " in voice: " + attr.warn, line, start);
-			else if (attr.token.length === 0 && line.charAt(start) !== '"')
+			else if (attr.token.length === 0 && line[start] !== '"')
 				warn("Expected one of (_B, _E, _b, _e) for " + name + " in voice", line, start);
 			else {
 				var t = noteToTransposition[attr.token];