abcjs 6.1.9 → 6.2.1

package/src/parse/abc_tokenizer.js

@@ -13,7 +13,7 @@ var Tokenizer = function(lines, multilineVars) {
 
 	this.skipWhiteSpace = function(str) {
 		for (var i = 0; i < str.length; i++) {
-		  if (!this.isWhiteSpace(str.charAt(i)))
+		  if (!this.isWhiteSpace(str[i]))
 				return i;
 		}
 		return str.length;	// It must have been all white space
@@ -23,7 +23,7 @@ var Tokenizer = function(lines, multilineVars) {
 	};
 	this.eatWhiteSpace = function(line, index) {
 		for (var i = index; i < line.length; i++) {
-		  if (!this.isWhiteSpace(line.charAt(i)))
+		  if (!this.isWhiteSpace(line[i]))
 				return i-index;
 		}
 		return i-index;
@@ -34,7 +34,7 @@ var Tokenizer = function(lines, multilineVars) {
 		var i = this.skipWhiteSpace(str);
 		if (finished(str, i))
 			return {len: 0};
-		switch (str.charAt(i)) {
+		switch (str[i]) {
 			case 'A':return {len: i+1, token: 'A'};
 			case 'B':return {len: i+1, token: 'B'};
 			case 'C':return {len: i+1, token: 'C'};
@@ -57,7 +57,7 @@ var Tokenizer = function(lines, multilineVars) {
 	this.getSharpFlat = function(str) {
 		if (str === 'bass')
 			return {len: 0};
-		switch (str.charAt(0)) {
+		switch (str[0]) {
 			case '#':return {len: 1, token: '#'};
 			case 'b':return {len: 1, token: 'b'};
 		}
@@ -67,7 +67,7 @@ var Tokenizer = function(lines, multilineVars) {
 	this.getMode = function(str) {
 		var skipAlpha = function(str, start) {
 			// This returns the index of the next non-alphabetic char, or the entire length of the string if not found.
-		  while (start < str.length && ((str.charAt(start) >= 'a' && str.charAt(start) <= 'z') || (str.charAt(start) >= 'A' && str.charAt(start) <= 'Z')))
+		  while (start < str.length && ((str[start] >= 'a' && str[start] <= 'z') || (str[start] >= 'A' && str[start] <= 'Z')))
 				start++;
 			return start;
 		};
@@ -76,7 +76,7 @@ var Tokenizer = function(lines, multilineVars) {
 		if (finished(str, i))
 			return {len: 0};
 		var firstThree = str.substring(i,i+3).toLowerCase();
-		if (firstThree.length > 1 && firstThree.charAt(1) === ' ' || firstThree.charAt(1) === '^' || firstThree.charAt(1) === '_' || firstThree.charAt(1) === '=') firstThree = firstThree.charAt(0);	// This will handle the case of 'm'
+		if (firstThree.length > 1 && firstThree[1] === ' ' || firstThree[1] === '^' || firstThree[1] === '_' || firstThree[1] === '=') firstThree = firstThree[0];	// This will handle the case of 'm'
 		switch (firstThree) {
 			case 'mix':return {len: skipAlpha(str, i), token: 'Mix'};
 			case 'dor':return {len: skipAlpha(str, i), token: 'Dor'};
@@ -158,14 +158,14 @@ var Tokenizer = function(lines, multilineVars) {
 	// This returns one of the legal bar lines
 	// This is called alot and there is no obvious tokenable items, so this is broken apart.
 	this.getBarLine = function(line, i) {
-		switch (line.charAt(i)) {
+		switch (line[i]) {
 			case ']':
 				++i;
-				switch (line.charAt(i)) {
+				switch (line[i]) {
 					case '|': return {len: 2, token: "bar_thick_thin"};
 					case '[':
 						++i;
-						if ((line.charAt(i) >= '1' && line.charAt(i) <= '9') || line.charAt(i) === '"')
+						if ((line[i] >= '1' && line[i] <= '9') || line[i] === '"')
 							return {len: 2, token: "bar_invisible"};
 						return {len: 1, warn: "Unknown bar symbol"};
 					default:
@@ -174,17 +174,17 @@ var Tokenizer = function(lines, multilineVars) {
 				break;
 			case ':':
 				++i;
-				switch (line.charAt(i)) {
+				switch (line[i]) {
 					case ':': return {len: 2, token: "bar_dbl_repeat"};
 					case '|':	// :|
 						++i;
-						switch (line.charAt(i)) {
+						switch (line[i]) {
 							case ']':	// :|]
 								++i;
-								switch (line.charAt(i)) {
+								switch (line[i]) {
 									case '|':	// :|]|
 										++i;
-										if (line.charAt(i) === ':')  return {len: 5, token: "bar_dbl_repeat"};
+										if (line[i] === ':')  return {len: 5, token: "bar_dbl_repeat"};
 										return {len: 3, token: "bar_right_repeat"};
 									default:
 										return {len: 3, token: "bar_right_repeat"};
@@ -192,7 +192,7 @@ var Tokenizer = function(lines, multilineVars) {
 								break;
 							case '|':	// :||
 								++i;
-								if (line.charAt(i) === ':')  return {len: 4, token: "bar_dbl_repeat"};
+								if (line[i] === ':')  return {len: 4, token: "bar_dbl_repeat"};
 								return {len: 3, token: "bar_right_repeat"};
 							default:
 								return {len: 2, token: "bar_right_repeat"};
@@ -204,30 +204,30 @@ var Tokenizer = function(lines, multilineVars) {
 				break;
 			case '[':	// [
 				++i;
-				if (line.charAt(i) === '|') {	// [|
+				if (line[i] === '|') {	// [|
 					++i;
-					switch (line.charAt(i)) {
+					switch (line[i]) {
 						case ':': return {len: 3, token: "bar_left_repeat"};
 						case ']': return {len: 3, token: "bar_invisible"};
 						default: return {len: 2, token: "bar_thick_thin"};
 					}
 				} else {
-					if ((line.charAt(i) >= '1' && line.charAt(i) <= '9') || line.charAt(i) === '"')
+					if ((line[i] >= '1' && line[i] <= '9') || line[i] === '"')
 						return {len: 1, token: "bar_invisible"};
 					return {len: 0};
 				}
 				break;
 			case '|':	// |
 				++i;
-				switch (line.charAt(i)) {
+				switch (line[i]) {
 					case ']': return {len: 2, token: "bar_thin_thick"};
 					case '|': // ||
 						++i;
-						if (line.charAt(i) === ':') return {len: 3, token: "bar_left_repeat"};
+						if (line[i] === ':') return {len: 3, token: "bar_left_repeat"};
 						return {len: 2, token: "bar_thin_thin"};
 					case ':':	// |:
 						var colons = 0;
-						while (line.charAt(i+colons) === ':') colons++;
+						while (line[i+colons] === ':') colons++;
 						return { len: 1+colons, token: "bar_left_repeat"};
 					default: return {len: 1, token: "bar_thin"};
 				}
@@ -239,7 +239,7 @@ var Tokenizer = function(lines, multilineVars) {
 	// this returns all the characters in the string that match one of the characters in the legalChars string
 	this.getTokenOf = function(str, legalChars) {
 		for (var i = 0; i < str.length; i++) {
-			if (legalChars.indexOf(str.charAt(i)) < 0)
+			if (legalChars.indexOf(str[i]) < 0)
 				return {len: i, token: str.substring(0, i)};
 		}
 		return {len: i, token: str};
@@ -248,7 +248,7 @@ var Tokenizer = function(lines, multilineVars) {
 	this.getToken = function(str, start, end) {
 		// This returns the next set of chars that doesn't contain spaces
 		var i = start;
-		while (i < end && !this.isWhiteSpace(str.charAt(i)))
+		while (i < end && !this.isWhiteSpace(str[i]))
 			i++;
 		return str.substring(start, i);
 	};
@@ -309,7 +309,7 @@ var Tokenizer = function(lines, multilineVars) {
 				return { accs: accs };
 			}
 			if (tokens.length === 0) return {accs: accs, warn: 'Expected note name after ' + acc};
-			switch (tokens[0].token.charAt(0))
+			switch (tokens[0].token[0])
 			{
 				case 'a':
 				case 'b':
@@ -327,7 +327,7 @@ var Tokenizer = function(lines, multilineVars) {
 				case 'G':
 					if (accs === undefined)
 						accs = [];
-					accs.push({ acc: acc, note: tokens[0].token.charAt(0) });
+					accs.push({ acc: acc, note: tokens[0].token[0] });
 					if (tokens[0].token.length === 1)
 						tokens.shift();
 					else
@@ -355,19 +355,19 @@ var Tokenizer = function(lines, multilineVars) {
 		if (finished(str, i))
 			return {len: 0};
 		var acc = null;
-		switch (str.charAt(i))
+		switch (str[i])
 		{
 			case '^':
 			case '_':
 			case '=':
-				acc = str.charAt(i);
+				acc = str[i];
 				break;
 			default:return {len: 0};
 		}
 		i++;
 		if (finished(str, i))
 			return {len: 1, warn: 'Expected note name after accidental'};
-		switch (str.charAt(i))
+		switch (str[i])
 		{
 			case 'a':
 			case 'b':
@@ -383,15 +383,15 @@ var Tokenizer = function(lines, multilineVars) {
 			case 'E':
 			case 'F':
 			case 'G':
-				return {len: i+1, token: {acc: accTranslation[acc], note: str.charAt(i)}};
+				return {len: i+1, token: {acc: accTranslation[acc], note: str[i]}};
 			case '^':
 			case '_':
 			case '/':
-				acc += str.charAt(i);
+				acc += str[i];
 				i++;
 				if (finished(str, i))
 					return {len: 2, warn: 'Expected note name after accidental'};
-				switch (str.charAt(i))
+				switch (str[i])
 				{
 					case 'a':
 					case 'b':
@@ -407,7 +407,7 @@ var Tokenizer = function(lines, multilineVars) {
 					case 'E':
 					case 'F':
 					case 'G':
-						return {len: i+1, token: {acc: accTranslation[acc], note: str.charAt(i)}};
+						return {len: i+1, token: {acc: accTranslation[acc], note: str[i]}};
 					default:
 						return {len: 2, warn: 'Expected note name after accidental'};
 				}
@@ -427,9 +427,9 @@ var Tokenizer = function(lines, multilineVars) {
 		var comment = line.indexOf('%', start);
 		if (comment >= 0 && comment < end)
 			end = comment;
-		while (start < end && (line.charAt(start) === ' ' || line.charAt(start) === '\t' || line.charAt(start) === '\x12'))
+		while (start < end && (line[start] === ' ' || line[start] === '\t' || line[start] === '\x12'))
 			start++;
-		while (start < end && (line.charAt(end-1) === ' ' || line.charAt(end-1) === '\t' || line.charAt(end-1) === '\x12'))
+		while (start < end && (line[end-1] === ' ' || line[end-1] === '\t' || line[end-1] === '\x12'))
 			end--;
 		return {start: start, end: end};
 	};
@@ -456,46 +456,46 @@ var Tokenizer = function(lines, multilineVars) {
 		var tokens = [];
 		var i;
 		while (start < end) {
-			if (line.charAt(start) === '"') {
+			if (line[start] === '"') {
 				i = start+1;
-				while (i < end && line.charAt(i) !== '"') i++;
+				while (i < end && line[i] !== '"') i++;
 				tokens.push({ type: 'quote', token: line.substring(start+1, i), start: start+1, end: i});
 				i++;
-			} else if (isLetter(line.charAt(start))) {
+			} else if (isLetter(line[start])) {
 				i = start+1;
 				if (alphaUntilWhiteSpace)
-					while (i < end && !this.isWhiteSpace(line.charAt(i))) i++;
+					while (i < end && !this.isWhiteSpace(line[i])) i++;
 				else
-					while (i < end && isLetter(line.charAt(i))) i++;
-				tokens.push({ type: 'alpha', token: line.substring(start, i), continueId: isNumber(line.charAt(i)), start: start, end: i});
+					while (i < end && isLetter(line[i])) i++;
+				tokens.push({ type: 'alpha', token: line.substring(start, i), continueId: isNumber(line[i]), start: start, end: i});
 				start = i + 1;
-			} else if (line.charAt(start) === '.' && isNumber(line.charAt(i+1))) {
+			} else if (line[start] === '.' && isNumber(line[i+1])) {
 				i = start+1;
 				var int2 = null;
 				var float2 = null;
-				while (i < end && isNumber(line.charAt(i))) i++;
+				while (i < end && isNumber(line[i])) i++;
 
 				float2 = parseFloat(line.substring(start, i));
-				tokens.push({ type: 'number', token: line.substring(start, i), intt: int2, floatt: float2, continueId: isLetter(line.charAt(i)), start: start, end: i});
+				tokens.push({ type: 'number', token: line.substring(start, i), intt: int2, floatt: float2, continueId: isLetter(line[i]), start: start, end: i});
 				start = i + 1;
-			} else if (isNumber(line.charAt(start)) || (line.charAt(start) === '-' && isNumber(line.charAt(i+1)))) {
+			} else if (isNumber(line[start]) || (line[start] === '-' && isNumber(line[i+1]))) {
 				i = start+1;
 				var intt = null;
 				var floatt = null;
-				while (i < end && isNumber(line.charAt(i))) i++;
-				if (line.charAt(i) === '.' && isNumber(line.charAt(i+1))) {
+				while (i < end && isNumber(line[i])) i++;
+				if (line[i] === '.' && isNumber(line[i+1])) {
 					i++;
-					while (i < end && isNumber(line.charAt(i))) i++;
+					while (i < end && isNumber(line[i])) i++;
 				} else
 					intt = parseInt(line.substring(start, i));
 
 				floatt = parseFloat(line.substring(start, i));
-				tokens.push({ type: 'number', token: line.substring(start, i), intt: intt, floatt: floatt, continueId: isLetter(line.charAt(i)), start: start, end: i});
+				tokens.push({ type: 'number', token: line.substring(start, i), intt: intt, floatt: floatt, continueId: isLetter(line[i]), start: start, end: i});
 				start = i + 1;
-			} else if (line.charAt(start) === ' ' || line.charAt(start) === '\t') {
+			} else if (line[start] === ' ' || line[start] === '\t') {
 				i = start+1;
 			} else {
-				tokens.push({ type: 'punct', token: line.charAt(start), start: start, end: start+1});
+				tokens.push({ type: 'punct', token: line[start], start: start, end: start+1});
 				i = start+1;
 			}
 			start = i;
@@ -506,17 +506,17 @@ var Tokenizer = function(lines, multilineVars) {
 	this.getVoiceToken = function(line, start, end) {
 		// This finds the next token. A token is delimited by a space or an equal sign. If it starts with a quote, then the portion between the quotes is returned.
 		var i = start;
-		while (i < end && this.isWhiteSpace(line.charAt(i)) || line.charAt(i) === '=')
+		while (i < end && this.isWhiteSpace(line[i]) || line[i] === '=')
 			i++;
 
-		if (line.charAt(i) === '"') {
+		if (line[i] === '"') {
 			var close = line.indexOf('"', i+1);
 			if (close === -1 || close >= end)
 				return {len: 1, err: "Missing close quote"};
 			return {len: close-start+1, token: this.translateString(line.substring(i+1, close))};
 		} else {
 			var ii = i;
-			while (ii < end && !this.isWhiteSpace(line.charAt(ii)) && line.charAt(ii) !== '=')
+			while (ii < end && !this.isWhiteSpace(line[ii]) && line[ii] !== '=')
 				ii++;
 			return {len: ii-start+1, token: line.substring(i, ii)};
 		}
@@ -566,7 +566,7 @@ var Tokenizer = function(lines, multilineVars) {
 		var arr = str.split('\\');
 		if (arr.length === 1) return str;
 		var out = null;
-		parseCommon.each(arr, function(s) {
+		arr.forEach(function(s) {
 			if (out === null)
 				out = s;
 			else {
@@ -592,7 +592,7 @@ var Tokenizer = function(lines, multilineVars) {
 	this.getNumber = function(line, index) {
 		var num = 0;
 		while (index < line.length) {
-			switch (line.charAt(index)) {
+			switch (line[index]) {
 				case '0':num = num*10;index++;break;
 				case '1':num = num*10+1;index++;break;
 				case '2':num = num*10+2;index++;break;
@@ -613,16 +613,16 @@ var Tokenizer = function(lines, multilineVars) {
 	this.getFraction = function(line, index) {
 		var num = 1;
 		var den = 1;
-		if (line.charAt(index) !== '/') {
+		if (line[index] !== '/') {
 			var ret = this.getNumber(line, index);
 			num = ret.num;
 			index = ret.index;
 		}
-		if (line.charAt(index) === '/') {
+		if (line[index] === '/') {
 			index++;
-			if (line.charAt(index) === '/') {
+			if (line[index] === '/') {
 				var div = 0.5;
-				while (line.charAt(index++) === '/')
+				while (line[index++] === '/')
 					div = div /2;
 				return {value: num * div, index: index-1};
 			} else {
@@ -723,14 +723,14 @@ var Tokenizer = function(lines, multilineVars) {
 		// It returns the substring and the number of characters consumed.
 		// The number of characters consumed is normally two more than the size of the substring,
 		// but in the error case it might not be.
-		var matchChar = _matchChar || line.charAt(i);
+		var matchChar = _matchChar || line[i];
 		var pos = i+1;
 		var esc = false;
 		while ((pos < line.length) && (esc || line[pos] !== matchChar)) {
 			esc = line[pos] === '\\';
 			++pos;
 		}
-		if (line.charAt(pos) === matchChar)
+		if (line[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/tune-builder.js

@@ -68,7 +68,7 @@ var TuneBuilder = function(tune) {
 									durationThisBar += event.duration;
 									durationsPerLines[i] += event.duration;
 								}
-							} else if (event.el_type === "scale" || event.el_type === "stem" || event.el_type === "overlay" || event.el_type === "style" || event.el_type === "transpose") {
+							} else if (event.el_type === "scale" || event.el_type === "stem" || event.el_type === "overlay" || event.el_type === "style" || event.el_type === "transpose" || event.el_type === "color") {
 								// These types of events are duplicated on the overlay layer.
 								overlayVoice[k].voice.push(event);
 							}
@@ -178,10 +178,10 @@ var TuneBuilder = function(tune) {
 			}
 		}
 		if (anyDeleted) {
-			tune.lines = parseCommon.compact(tune.lines);
-			parseCommon.each(tune.lines, function(line) {
+			tune.lines = tune.lines.filter(function (line) { return !!line });
+			tune.lines.forEach(function(line) {
 				if (line.staff)
-					line.staff = parseCommon.compact(line.staff);
+					line.staff = line.staff.filter(function (line) { return !!line });
 			});
 		}
 
@@ -212,9 +212,9 @@ var TuneBuilder = function(tune) {
 				}
 			}
 			if (anyDeleted) {
-				parseCommon.each(tune.lines, function(line) {
+				tune.lines.forEach(function(line) {
 					if (line.staff)
-						line.staff = parseCommon.compact(line.staff);
+						line.staff = line.staff.filter(function (staff) { return !!staff });
 				});
 			}
 		}
@@ -253,7 +253,7 @@ var TuneBuilder = function(tune) {
 					}
 					if (currSlur[staffNum][voiceNum][chordPos] === undefined) {
 						var offNum = chordPos*100+1;
-						parseCommon.each(obj.endSlur, function(x) { if (offNum === x) --offNum; });
+						obj.endSlur.forEach(function(x) { if (offNum === x) --offNum; });
 						currSlur[staffNum][voiceNum][chordPos] = [offNum];
 					}
 				}
@@ -276,12 +276,12 @@ var TuneBuilder = function(tune) {
 				var nextNum = chordPos*100+1;
 				for (var i = 0; i < num; i++) {
 					if (usedNums) {
-						parseCommon.each(usedNums, function(x) { if (nextNum === x) ++nextNum; });
-						parseCommon.each(usedNums, function(x) { if (nextNum === x) ++nextNum; });
-						parseCommon.each(usedNums, function(x) { if (nextNum === x) ++nextNum; });
+						usedNums.forEach(function(x) { if (nextNum === x) ++nextNum; });
+						usedNums.forEach(function(x) { if (nextNum === x) ++nextNum; });
+						usedNums.forEach(function(x) { if (nextNum === x) ++nextNum; });
 					}
-					parseCommon.each(currSlur[staffNum][voiceNum][chordPos], function(x) { if (nextNum === x) ++nextNum; });
-					parseCommon.each(currSlur[staffNum][voiceNum][chordPos], function(x) { if (nextNum === x) ++nextNum; });
+					currSlur[staffNum][voiceNum][chordPos].forEach(function(x) { if (nextNum === x) ++nextNum; });
+					currSlur[staffNum][voiceNum][chordPos].forEach(function(x) { if (nextNum === x) ++nextNum; });
 
 					currSlur[staffNum][voiceNum][chordPos].push(nextNum);
 					obj.startSlur.push({ label: nextNum });
@@ -512,11 +512,11 @@ var TuneBuilder = function(tune) {
 			}
 			if (hp.pitches !== undefined) {
 				var mid = currStaff.workingClef.verticalPos;
-				parseCommon.each(hp.pitches, function(p) { p.verticalPos = p.pitch - mid; });
+				hp.pitches.forEach(function(p) { p.verticalPos = p.pitch - mid; });
 			}
 			if (hp.gracenotes !== undefined) {
 				var mid2 = currStaff.workingClef.verticalPos;
-				parseCommon.each(hp.gracenotes, function(p) { p.verticalPos = p.pitch - mid2; });
+				hp.gracenotes.forEach(function(p) { p.verticalPos = p.pitch - mid2; });
 			}
 			currStaff.voices[This.voiceNum].push(hp);
 		};
@@ -702,6 +702,9 @@ var TuneBuilder = function(tune) {
 	this.changeVoiceScale = function(scale) {
 		self.appendElement('scale', null, null, { size: scale} );
 	};
+	this.changeVoiceColor = function(color) {
+		self.appendElement('color', null, null, { color: color} );
+	};
 
 	this.startNewLine = function(params) {
 		// If the pointed to line doesn't exist, just create that. If the line does exist, but doesn't have any music on it, just use it.
@@ -734,6 +737,8 @@ var TuneBuilder = function(tune) {
 			}
 			if (params.scale)
 				self.appendElement('scale', null, null, { size: params.scale} );
+			if (params.color)
+				self.appendElement('color', null, null, { color: params.color} );
 		};
 		var createStaff = function(params) {
 			if (params.key && params.key.impliedNaturals) {

package/src/synth/abc_midi_flattener.js

@@ -32,6 +32,7 @@ var pitchesToPerc = require('./pitches-to-perc');
 	var chordSourceTrack;
 	var chordTrackFinished;
 	var chordChannel;
+	var bassInstrument = 0;
 	var chordInstrument = 0;
 	var drumInstrument = 128;
 	var boomVolume = 64;
@@ -54,6 +55,7 @@ var pitchesToPerc = require('./pitches-to-perc');
 	var drumTrack;
 	var drumTrackFinished;
 	var drumDefinition = {};
+	var drumBars;
 
 	var pickupLength = 0;
 	var percmap;
@@ -63,8 +65,9 @@ var pitchesToPerc = require('./pitches-to-perc');
 	var slurredBreakBetweenNotes = -0.001; // make the slurred notes actually overlap
 	var staccatoBreakBetweenNotes = 0.4; // some people say staccato is half duration, some say 3/4 so this splits it
 
-	flatten = function(voices, options, percmap_) {
+	flatten = function(voices, options, percmap_, midiOptions) {
 		if (!options) options = {};
+		if (!midiOptions) midiOptions = {};
 		barAccidentals = [];
 		accidentals = [0,0,0,0,0,0,0];
 		bagpipes = false;
@@ -87,8 +90,10 @@ var pitchesToPerc = require('./pitches-to-perc');
 		chordChannel = voices.length; // first free channel for chords
 		chordTrackFinished = false;
 		currentChords = [];
-		boomVolume = 64;
-		chickVolume = 48;
+		bassInstrument = midiOptions.bassprog && midiOptions.bassprog.length === 1 ? midiOptions.bassprog[0] : 0;
+		chordInstrument = midiOptions.chordprog && midiOptions.chordprog.length === 1 ? midiOptions.chordprog[0] : 0;
+		boomVolume = midiOptions.bassvol && midiOptions.bassvol.length === 1 ? midiOptions.bassvol[0] : 64;
+		chickVolume = midiOptions.chordvol && midiOptions.chordvol.length === 1 ? midiOptions.chordvol[0] : 48;
 		lastChord = undefined;
 		chordLastBar = undefined;
 		gChordTacet = options.chordsOff ? true : false;
@@ -107,6 +112,7 @@ var pitchesToPerc = require('./pitches-to-perc');
 		drumTrack = [];
 		drumTrackFinished = false;
 		drumDefinition = {};
+		drumBars = 1;
 
 		if (voices.length > 0 && voices[0].length > 0)
 			pickupLength = voices[0][0].pickupLength;
@@ -145,6 +151,7 @@ var pitchesToPerc = require('./pitches-to-perc');
 							startingMeter = element;
 						meter = element;
 						beatFraction = getBeatFraction(meter);
+						alignDrumToMeter();
 						break;
 					case "tempo":
 						if (!startingTempo)
@@ -189,6 +196,7 @@ var pitchesToPerc = require('./pitches-to-perc');
 						break;
 					case "drum":
 						drumDefinition = normalizeDrumDefinition(element.params);
+						alignDrumToMeter();
 						break;
 					case "gchord":
 						if (!options.chordsOff)
@@ -995,9 +1003,9 @@ var pitchesToPerc = require('./pitches-to-perc');
 	function chordNotes(bass, modifier) {
 		var intervals = chordIntervals[modifier];
 		if (!intervals) {
-			if (modifier.slice(0,2).toLowerCase() === 'ma' || modifier.charAt(0) === 'M')
+			if (modifier.slice(0,2).toLowerCase() === 'ma' || modifier[0] === 'M')
 				intervals = chordIntervals.M;
-			else if (modifier.charAt(0) === 'm' || modifier.charAt(0) === '-')
+			else if (modifier[0] === 'm' || modifier[0] === '-')
 				intervals = chordIntervals.m;
 			else
 				intervals = chordIntervals.M;
@@ -1013,7 +1021,7 @@ var pitchesToPerc = require('./pitches-to-perc');
 	function writeBoom(boom, beatLength, volume, beat, noteLength) {
 		// undefined means there is a stop time.
 		if (boom !== undefined)
-			chordTrack.push({cmd: 'note', pitch: boom, volume: volume, start: lastBarTime+beat*durationRounded(beatLength), duration: durationRounded(noteLength), gap: 0, instrument: chordInstrument});
+			chordTrack.push({cmd: 'note', pitch: boom, volume: volume, start: lastBarTime+beat*durationRounded(beatLength), duration: durationRounded(noteLength), gap: 0, instrument: bassInstrument});
 	}
 
 	function writeChick(chick, beatLength, volume, beat, noteLength) {
@@ -1208,16 +1216,24 @@ var pitchesToPerc = require('./pitches-to-perc');
 			} else
 				ret.pattern.push({ len: len * beatLength, pitch: null});
 		}
+		drumBars = params.bars ? params.bars : 1;
+		return ret;
+	}
+
+	function alignDrumToMeter() {
+		if (!drumDefinition ||!drumDefinition.pattern) {
+			return;
+		}
+		var ret = drumDefinition;
 		// Now normalize the pattern to cover the correct number of measures. The note lengths passed are relative to each other and need to be scaled to fit a measure.
 		var totalTime = 0;
 		var measuresPerBeat = meter.num/meter.den;
 		for (var ii = 0; ii < ret.pattern.length; ii++)
 			totalTime += ret.pattern[ii].len;
-		var numBars = params.bars ? params.bars : 1;
-		var factor = totalTime /  numBars / measuresPerBeat;
+		var factor = totalTime /  drumBars / measuresPerBeat;
 		for (ii = 0; ii < ret.pattern.length; ii++)
 			ret.pattern[ii].len = ret.pattern[ii].len / factor;
-		return ret;
+		drumDefinition = ret;
 	}
 
 	function writeDrum(channel) {