abcjs 6.0.0-beta.32 → 6.0.0-beta.36

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;
 						}
 					}
@@ -461,7 +462,7 @@ MusicParser.prototype.parseMusic = function(line) {
 								}
 
 								multilineVars.addFormattingOptions(el, tune.formatting, 'note');
-								tuneBuilder.appendElement('note', startOfLine+chordStartChar, startOfLine+i, el);
+								tuneBuilder.appendElement('note', startOfLine+startI, startOfLine+i, el);
 								multilineVars.measureNotEmpty = true;
 								el = {};
 							}
@@ -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] &&
@@ -612,7 +599,7 @@ var TuneBuilder = function(tune) {
 		// Clone the object because it will be sticking around for the next line and we don't want the extra fields in it.
 		var hashParams = parseCommon.clone(hashParams2);
 
-		if (tune.lines[tune.lineNum].staff) { // be sure that we are on a music type line before doing the following.
+		if (tune.lines[tune.lineNum] && tune.lines[tune.lineNum].staff) { // be sure that we are on a music type line before doing the following.
 			// If tune is the first item in tune staff, then we might have to initialize the staff, first.
 			if (tune.lines[tune.lineNum].staff.length <= tune.staffNum) {
 				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/parse/wrap_lines.js

@@ -7,7 +7,7 @@ function wrapLines(tune, lineBreaks) {
 	// tune.lines contains nested arrays: there is an array of lines (that's the part this function rewrites),
 	// there is an array of staffs per line (for instance, piano will have 2, orchestra will have many)
 	// there is an array of voices per staff (for instance, 4-part harmony might have bass and tenor on a single staff)
-	var lines = removeLineBreaks(tune.lines);
+	var lines = tune.deline({lineBreaks: false});
 	var linesBreakElements = findLineBreaks(lines, lineBreaks);
 	//console.log(JSON.stringify(linesBreakElements))
 	tune.lines = addLineBreaks(lines, linesBreakElements);
@@ -24,6 +24,7 @@ function addLineBreaks(lines, linesBreakElements) {
 	// If the item doesn't contain "staff" then it is a non music line and should just be copied.
 	var outputLines = [];
 	var lastKeySig = []; // This is per staff - if the key changed then this will be populated.
+	var lastStem = [];
 	for (var i = 0; i < linesBreakElements.length; i++) {
 		var action = linesBreakElements[i];
 		if (lines[action.ogLine].staff) {
@@ -43,12 +44,15 @@ function addLineBreaks(lines, linesBreakElements) {
 				}
 				if (lastKeySig[action.staff])
 					outputLines[action.line].staff[action.staff].key = lastKeySig[action.staff];
+
 			}
 			if (!outputLines[action.line].staff[action.staff].voices[action.voice]) {
 				outputLines[action.line].staff[action.staff].voices[action.voice] = [];
 			}
 			outputLines[action.line].staff[action.staff].voices[action.voice] =
 				lines[action.ogLine].staff[action.staff].voices[action.voice].slice(action.start, action.end+1);
+			if (lastStem[action.staff*10+action.voice])
+				outputLines[action.line].staff[action.staff].voices[action.voice].unshift({el_type: "stem", direction: lastStem[action.staff*10+action.voice].direction})
 			var currVoice = outputLines[action.line].staff[action.staff].voices[action.voice];
 			for (var kk = currVoice.length-1; kk >= 0; kk--) {
 				if (currVoice[kk].el_type === "key") {
@@ -61,6 +65,14 @@ function addLineBreaks(lines, linesBreakElements) {
 					break;
 				}
 			}
+			for (kk = currVoice.length-1; kk >= 0; kk--) {
+				if (currVoice[kk].el_type === "stem") {
+					lastStem[action.staff*10+action.voice] = {
+						direction: currVoice[kk].direction,
+					};
+					break;
+				}
+			}
 		} else {
 			outputLines[action.line] = lines[action.ogLine];
 		}
@@ -128,41 +140,6 @@ function findLineBreaks(lines, lineBreakArray) {
 	return lineBreakIndexes;
 }
 
-function removeLineBreaks(lines) {
-	// This concatenates all the music lines. If there is a non-music line then it leaves it,
-	// so it returns an array of lines where there is no more than one staff line in a row.
-	var outputLines = [];
-	var startLine = true;
-	for (var i = 0; i < lines.length; i++) {
-		var line = lines[i];
-		if (line.staff) {
-			if (startLine) {
-				outputLines.push(line);
-				startLine = false;
-			} else {
-				//	copy all voices to the previous line
-				var output = outputLines[outputLines.length - 1];
-				var staffs = line.staff;
-				for (var j = 0; j < staffs.length; j++) {
-					if (output.staff.length <= j)
-						output.staff.push({ voices: []})
-					var staff = staffs[j];
-					var voices = staff.voices;
-					for (var k = 0; k < voices.length; k++) {
-						if (output.staff[j].voices.length < k)
-							output.staff[j].voices.push([]);
-						var voice = voices[k];
-						output.staff[j].voices[k] = output.staff[j].voices[k].concat(voice);
-					}
-				}
-			}
-		} else {
-			startLine = true;
-			outputLines.push(line);
-		}
-	}
-	return outputLines;
-}
 
 function freeFormLineBreaks(widths, lineBreakPoint) {
 	var lineBreaks = [];

package/src/synth/abc_midi_flattener.js

@@ -69,7 +69,7 @@ var pitchesToPerc = require('./pitches-to-perc');
 		accidentals = [0,0,0,0,0,0,0];
 		bagpipes = false;
 		tracks = [];
-		startingTempo = undefined;
+		startingTempo = options.qpm;
 		startingMeter = undefined;
 		tempoChangeFactor = 1;
 		instrument = undefined;
@@ -112,7 +112,7 @@ var pitchesToPerc = require('./pitches-to-perc');
 			pickupLength = voices[0][0].pickupLength;
 
 		// First adjust the input to resolve ties, set the starting time for each note, etc. That will make the rest of the logic easier
-		preProcess(voices);
+		preProcess(voices, options);
 
 		for (var i = 0; i < voices.length; i++) {
 			transpose = 0;
@@ -225,35 +225,14 @@ var pitchesToPerc = require('./pitches-to-perc');
 			if (drumTrack.length > 0) // Don't do drums on more than one track, so turn off drum after we create it.
 				drumTrackFinished = true;
 		}
+		// See if any notes are octaves played at the same time. If so, raise the pitch of the higher one.
+		if (options.detuneOctave)
+			findOctaves(tracks, parseInt(options.detuneOctave, 10));
+
 		if (chordTrack.length > 0)
 			tracks.push(chordTrack);
 		if (drumTrack.length > 0)
 			tracks.push(drumTrack);
-		// Adjust the tempo according to the meter. The rules are this:
-		// 1) If the denominator is 2 or 4, then always make a beat be the denominator.
-		//
-		// 2) If the denominator is 8 or 16, then:
-		// a) If the numerator is divisible by 3, the beat is 3*denominator.
-		// b) Otherwise the beat is the denominator.
-		//
-		// 3) If the denominator is anything else, then don't worry about it because it doesn't make sense. Don't modify it and hope for the best.
-		//
-		// Right now, the startingTempo is calculated for a quarter note, so modify it if necessary.
-		// var num = startingMeter ? parseInt(startingMeter.num, 10) : meter.num;
-		// var den = startingMeter ? parseInt(startingMeter.den, 10) : meter.den;
-		// if (den === 2)
-		// 	startingTempo *= 2;
-		// else if (den === 8) {
-		// 	if (parseInt(num, 10) % 3 === 0)
-		// 		startingTempo *= 3/2;
-		// 	else
-		// 		startingTempo /= 2;
-		// } else if (den === 16) {
-		// 	if (num % 3 === 0)
-		// 		startingTempo *= 3/4;
-		// 	else
-		// 		startingTempo /= 4;
-		// }
 
 		return { tempo: startingTempo, instrument: instrument, tracks: tracks, totalDuration: lastEventTime };
 	};
@@ -275,11 +254,11 @@ var pitchesToPerc = require('./pitches-to-perc');
 		return Math.round(duration*tempoChangeFactor*1000000)/1000000;
 	}
 
-	function preProcess(voices) {
+	function preProcess(voices, options) {
 		for (var i = 0; i < voices.length; i++) {
 			var voice = voices[i];
 			var ties = {};
-			var startingTempo = 0;
+			var startingTempo = options.qpm;
 			var timeCounter = 0;
 			var tempoMultiplier = 1;
 			for (var j = 0; j < voice.length; j++) {
@@ -1257,6 +1236,42 @@ var pitchesToPerc = require('./pitches-to-perc');
 			start += len;
 		}
 	}
+
+	function findOctaves(tracks, detuneCents) {
+		var timing = {};
+		for (var i = 0; i < tracks.length; i++) {
+			for (var j = 0; j < tracks[i].length; j++) {
+				var note = tracks[i][j];
+				if (note.cmd === "note") {
+					if (timing[note.start] === undefined)
+						timing[note.start] = [];
+					timing[note.start].push({track: i, event: j, pitch: note.pitch});
+				}
+			}
+		}
+		var keys = Object.keys(timing);
+		for (i = 0; i < keys.length; i++) {
+			var arr = timing[keys[i]];
+			if (arr.length > 1) {
+				arr = arr.sort(function(a,b) {
+					return a.pitch - b.pitch;
+				});
+				var topEvent = arr[arr.length-1];
+				var topNote = topEvent.pitch % 12;
+				var found = false;
+				for (j = 0; !found && j < arr.length-1; j++) {
+					if (arr[j].pitch % 12 === topNote)
+						found = true;
+				}
+				if (found) {
+					var event = tracks[topEvent.track][topEvent.event];
+					if (!event.cents)
+						event.cents = 0;
+					event.cents += detuneCents;
+				}
+			}
+		}
+	}
 })();
 
 module.exports = flatten;