abcjs-rails 1.11 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69dc7543800ee59c97f476146e4d23392cf201f0
-  data.tar.gz: f36703aa7021da85d79ca7e8e287749f28db1b24
+  metadata.gz: fa42e9ce9d4ae382cdf01127928c52e1baaa8741
+  data.tar.gz: 146f81c567ee9aee005ceb00f5d29800a40fcb19
 SHA512:
-  metadata.gz: ab12f67b09329ba8245b574c226519cb6fc8e202bf8cd9b6c6323662cedbfca851e1abde4b94d8d02961dd007aa19389043a7f7ed9dd6fc92ed6cb2bd4d0e39d
-  data.tar.gz: 6228eac5b18e3cc8d6ce3b56545c29d8c12f741f321da6cf95a55a8e92994273dc4763931eba3836199f11b5625522c540f2211aa193151adb839cebe735f219
+  metadata.gz: 97b5c92b0832f98646268224d823fe88f7021dfbd90a1b8a5af0e2356ce39c63e58f2abfff49c363e6ef1cccdd44b555e9251e0e5263b603464f175434d89888
+  data.tar.gz: 4c060e9e01c5490e2b481636873881a0189c7748db272375e80e8c48e5066dc122223613b4ed39c4247c9572a91864f32cdc617992a0418a06dc1029485d4575

data/app/assets/javascripts/abcjs/api/abc_animation.js

@@ -20,6 +20,10 @@ if (!window.ABCJS)
 	window.ABCJS = {};
 
 (function() {
+<<<<<<< HEAD
+	"use strict";
+=======
+>>>>>>> origin/master
 
 	function hasClass(element, cls) {
 		var elClass = element.getAttribute("class");
@@ -79,6 +83,10 @@ if (!window.ABCJS)
 		if (options.showCursor) {
 			cursor = $('<div class="cursor" style="position: absolute;"></div>');
 			$(paper).append(cursor);
+<<<<<<< HEAD
+			$(paper).css({ position: "relative" });
+=======
+>>>>>>> origin/master
 		}
 
 		stopNextTime = false;
@@ -107,7 +115,14 @@ if (!window.ABCJS)
 					arr.push(hash[k]);
 			}
 			arr = arr.sort(function(a,b) {
-				return a.time - b.time;
+				var diff = a.time - b.time;
+				// if the events have the same time, make sure a bar comes before a note
+				if (diff !== 0) {
+					return diff;
+				}
+				else {
+					return a.type === "bar" ? -1 : 1;
+				}
 			});
 			return arr;
 		}
@@ -121,8 +136,18 @@ if (!window.ABCJS)
 			for (var line=0;line<engraver.staffgroups.length; line++) {
 				var group = engraver.staffgroups[line];
 				var voices = group.voices;
+<<<<<<< HEAD
+				var firstStaff = group.staffs[0];
+				var middleC = firstStaff.absoluteY;
+				var top = middleC - firstStaff.top*ABCJS.write.spacing.STEP;
+				var lastStaff = group.staffs[group.staffs.length-1];
+				middleC = lastStaff.absoluteY;
+				var bottom = middleC - lastStaff.bottom*ABCJS.write.spacing.STEP;
+				var height = bottom - top;
+=======
 				var top = group.y;
 				var height = group.height;
+>>>>>>> origin/master
 				var maxVoiceTime = 0;
 				// Put in the notes for all voices, then sort them, then remove duplicates
 				for (var v = 0; v < voices.length; v++) {
@@ -140,7 +165,16 @@ if (!window.ABCJS)
 								// If the note is tied on both sides it can just be ignored.
 							} else {
 								// the last note wasn't tied.
+<<<<<<< HEAD
+								if (!eventHash["event"+voiceTime])
+									eventHash["event"+voiceTime] = { type: "event", time: voiceTime, top: top, height: height, left: element.x, width: element.w };
+								else {
+									// If there is more than one voice then two notes can fall at the same time. Usually they would be lined up in the same place, but if it is a whole rest, then it is placed funny. In any case, the left most element wins.
+									eventHash["event"+voiceTime].left = Math.min(eventHash["event"+voiceTime].left, element.x);
+								}
+=======
 								eventHash["event"+voiceTime] = { type: "event", time: voiceTime, top: top, height: height, left: element.x, width: element.w };
+>>>>>>> origin/master
 								if (isTiedToNext)
 									isTiedState = true;
 							}
@@ -184,7 +218,13 @@ if (!window.ABCJS)
 			if (currentNote.type === "bar") {
 				if (options.hideFinishedMeasures)
 					processMeasureHider(currentNote.lineNum, currentNote.measureNum);
+<<<<<<< HEAD
+				if (timingEvents.length > 0)
+					return timingEvents[0].time / beatLength;
+				return 0;
+=======
 				return processShowCursor();
+>>>>>>> origin/master
 			}
 			if (options.showCursor)
 				cursor.css({ left: currentNote.left + "px", top: currentNote.top + "px", width: currentNote.width + "px", height: currentNote.height + "px" });

data/app/assets/javascripts/abcjs/api/abc_tunebook.js

@@ -156,8 +156,13 @@ if (!window.ABCJS)
 			/* jshint -W064 */ var paper = Raphael(div, width, 400); /* jshint +W064 */
 			if (engraverParams === undefined)
 				engraverParams = {};
+<<<<<<< HEAD
+			var engraver_controller = new ABCJS.write.EngraverController(paper, engraverParams);
+			engraver_controller.engraveABC(tune);
+=======
 			var engraver_controller = new ABCJS.write.Printer(paper, engraverParams);
 			engraver_controller.printABC(tune);
+>>>>>>> origin/master
 			tune.engraver = engraver_controller;
 		}
 

data/app/assets/javascripts/abcjs/data/abc_tune.js

@@ -101,7 +101,7 @@ window.ABCJS.data.Tune = function() {
 		this.lineNum = 0;
 	};
 
-	this.cleanUp = function(defWidth, defLength, barsperstaff, staffnonote) {
+	this.cleanUp = function(defWidth, defLength, barsperstaff, staffnonote, currSlur) {
 		this.closeLine();	// Close the last line.
 
 		// Remove any blank lines
@@ -211,7 +211,6 @@ window.ABCJS.data.Tune = function() {
 		}
 
 		function cleanUpSlursInLine(line) {
-			var currSlur = [];
 			var x;
 //			var lyr = null;	// TODO-PER: debugging.
 
@@ -225,7 +224,7 @@ window.ABCJS.data.Tune = function() {
 						}
 					}
 					if (currSlur[chordPos] === undefined) {
-						var offNum = chordPos*100;
+						var offNum = chordPos*100+1;
 						window.ABCJS.parse.each(obj.endSlur, function(x) { if (offNum === x) --offNum; });
 						currSlur[chordPos] = [offNum];
 					}
@@ -399,6 +398,8 @@ window.ABCJS.data.Tune = function() {
 		delete this.potentialStartBeam;
 		delete this.potentialEndBeam;
 		delete this.vskipPending;
+
+		return currSlur;
 	};
 
 	this.reset();

data/app/assets/javascripts/abcjs/edit/abc_editor.js

@@ -241,8 +241,13 @@ window.ABCJS.Editor.prototype.renderTune = function(abc, params, div) {
   abcParser.parse(tunebook.tunes[0].abc, params); //TODO handle multiple tunes
   var tune = abcParser.getTune();
   var paper = Raphael(div, 800, 400);
+<<<<<<< HEAD
+  var engraver_controller = new ABCJS.write.EngraverController(paper, this.engraverparams);
+  engraver_controller.engraveABC(tune);
+=======
   var engraver_controller = new ABCJS.write.Printer(paper, this.engraverparams);
   engraver_controller.printABC(tune);
+>>>>>>> origin/master
 };
 
 window.ABCJS.Editor.prototype.modelChanged = function() {
@@ -259,8 +264,13 @@ window.ABCJS.Editor.prototype.modelChanged = function() {
   this.timerId = null;
   this.div.innerHTML = "";
   var paper = Raphael(this.div, 800, 400);
+<<<<<<< HEAD
+  this.engraver_controller = new ABCJS.write.EngraverController(paper, this.engraverparams);
+  this.engraver_controller.engraveABC(this.tunes);
+=======
   this.engraver_controller = new ABCJS.write.Printer(paper, this.engraverparams);
   this.engraver_controller.printABC(this.tunes);
+>>>>>>> origin/master
 	this.tunes[0].engraver = this.engraver_controller;	// TODO-PER: We actually want an output object for each tune, not the entire controller. When refactoring, don't save data in the controller.
   if (ABCJS.midi.MidiWriter && this.mididiv) {
     if (this.mididiv !== this.div)

data/app/assets/javascripts/abcjs/parse/abc_parse.js

@@ -23,6 +23,7 @@ if (!window.ABCJS.parse)
 	window.ABCJS.parse = {};
 
 window.ABCJS.parse.Parse = function() {
+	"use strict";
 	var tune = new window.ABCJS.data.Tune();
 	var tokenizer = new window.ABCJS.parse.tokenizer();
 
@@ -30,6 +31,16 @@ window.ABCJS.parse.Parse = function() {
 		return tune;
 	};
 
+	function addPositioning(el, type, value) {
+		if (!el.positioning) el.positioning = {};
+		el.positioning[type] = value;
+	}
+
+	function addFont(el, type, value) {
+		if (!el.fonts) el.fonts = {};
+		el.fonts[type] = value;
+	}
+
 	var multilineVars = {
 		reset: function() {
 			for (var property in this) {
@@ -62,6 +73,39 @@ window.ABCJS.parse.Parse = function() {
 			this.inEnding = false;
 			this.inTie = false;
 			this.inTieChord = {};
+			this.vocalPosition = "auto";
+			this.dynamicPosition = "auto";
+			this.chordPosition = "auto";
+			this.ornamentPosition = "auto";
+			this.volumePosition = "auto";
+			this.openSlurs = [];
+		},
+		differentFont: function(type, defaultFonts) {
+			if (this[type].decoration !== defaultFonts[type].decoration) return true;
+			if (this[type].face !== defaultFonts[type].face) return true;
+			if (this[type].size !== defaultFonts[type].size) return true;
+			if (this[type].style !== defaultFonts[type].style) return true;
+			if (this[type].weight !== defaultFonts[type].weight) return true;
+			return false;
+		},
+		addFormattingOptions: function(el, defaultFonts, elType) {
+			if (elType === 'note') {
+				if (this.vocalPosition !== 'auto') addPositioning(el, 'vocalPosition', this.vocalPosition);
+				if (this.dynamicPosition !== 'auto') addPositioning(el, 'dynamicPosition', this.dynamicPosition);
+				if (this.chordPosition !== 'auto') addPositioning(el, 'chordPosition', this.chordPosition);
+				if (this.ornamentPosition !== 'auto') addPositioning(el, 'ornamentPosition', this.ornamentPosition);
+				if (this.volumePosition !== 'auto') addPositioning(el, 'volumePosition', this.volumePosition);
+				if (this.differentFont("annotationfont", defaultFonts)) addFont(el, 'annotationfont', this.annotationfont);
+				if (this.differentFont("gchordfont", defaultFonts)) addFont(el, 'gchordfont', this.gchordfont);
+				if (this.differentFont("vocalfont", defaultFonts)) addFont(el, 'vocalfont', this.vocalfont);
+			} else if (elType === 'bar') {
+				if (this.dynamicPosition !== 'auto') addPositioning(el, 'dynamicPosition', this.dynamicPosition);
+				if (this.chordPosition !== 'auto') addPositioning(el, 'chordPosition', this.chordPosition);
+				if (this.ornamentPosition !== 'auto') addPositioning(el, 'ornamentPosition', this.ornamentPosition);
+				if (this.volumePosition !== 'auto') addPositioning(el, 'volumePosition', this.volumePosition);
+				if (this.differentFont("measurefont", defaultFonts)) addFont(el, 'measurefont', this.measurefont);
+				if (this.differentFont("repeatfont", defaultFonts)) addFont(el, 'repeatfont', this.repeatfont);
+			}
 		}
 	};
 
@@ -79,6 +123,7 @@ window.ABCJS.parse.Parse = function() {
 	};
 
 	var warn = function(str, line, col_num) {
+		if (!line) line = " ";
 		var bad_char = line.charAt(col_num);
 		if (bad_char === ' ')
 			bad_char = "SPACE";
@@ -146,14 +191,20 @@ window.ABCJS.parse.Parse = function() {
 	var legalAccents = [ "trill", "lowermordent", "uppermordent", "mordent", "pralltriller", "accent",
 		"fermata", "invertedfermata", "tenuto", "0", "1", "2", "3", "4", "5", "+", "wedge",
 		"open", "thumb", "snap", "turn", "roll", "breath", "shortphrase", "mediumphrase", "longphrase",
-		"segno", "coda", "D.S.", "D.C.", "fine", "crescendo(", "crescendo)", "diminuendo(", "diminuendo)",
-		"p", "pp", "f", "ff", "mf", "mp", "ppp", "pppp",  "fff", "ffff", "sfz", "repeatbar", "repeatbar2", "slide",
+		"segno", "coda", "D.S.", "D.C.", "fine",
+		"slide", "^", "marcato",
 		"upbow", "downbow", "/", "//", "///", "////", "trem1", "trem2", "trem3", "trem4",
 		"turnx", "invertedturn", "invertedturnx", "trill(", "trill)", "arpeggio", "xstem", "mark", "umarcato",
 		"style=normal", "style=harmonic", "style=rhythm", "style=x"
 	];
-	var accentPsuedonyms = [ ["<", "accent"], [">", "accent"], ["tr", "trill"], ["<(", "crescendo("], ["<)", "crescendo)"],
-		[">(", "diminuendo("], [">)", "diminuendo)"], ["plus", "+"], [ "emphasis", "accent"] ];
+	var volumeDecorations = [ "p", "pp", "f", "ff", "mf", "mp", "ppp", "pppp",  "fff", "ffff", "sfz" ];
+	var dynamicDecorations = ["crescendo(", "crescendo)", "diminuendo(", "diminuendo)"];
+
+	var accentPseudonyms = [ ["<", "accent"], [">", "accent"], ["tr", "trill"],
+		["plus", "+"], [ "emphasis", "accent"],
+		[ "^", "umarcato" ], [ "marcato", "umarcato" ] ];
+	var accentDynamicPseudonyms = [ ["<(", "crescendo("], ["<)", "crescendo)"],
+		[">(", "diminuendo("], [">)", "diminuendo)"] ];
 	var letter_to_accent = function(line, i)
 	{
 		var macro = multilineVars.macros[line.charAt(i)];
@@ -167,7 +218,19 @@ window.ABCJS.parse.Parse = function() {
 					return (macro === acc);
 				}))
 				return [ 1, macro ];
-			else {
+			else if (window.ABCJS.parse.detect(volumeDecorations, function(acc) {
+					return (macro === acc);
+				})) {
+				if (multilineVars.volumePosition === 'hidden')
+					macro = "";
+				return [1, macro];
+			} else if (window.ABCJS.parse.detect(dynamicDecorations, function(acc) {
+					if (multilineVars.dynamicPosition === 'hidden')
+						macro = "";
+					return (macro === acc);
+				})) {
+				return [1, macro];
+			} else {
 				if (!window.ABCJS.parse.detect(multilineVars.ignoredDecorations, function(dec) {
 					return (macro === dec);
 				}))
@@ -191,8 +254,22 @@ window.ABCJS.parse.Parse = function() {
 					return (ret[1] === acc);
 				}))
 					return ret;
+				if (window.ABCJS.parse.detect(volumeDecorations, function(acc) {
+						return (ret[1] === acc);
+					})) {
+					if (multilineVars.volumePosition === 'hidden' )
+						ret[1] = '';
+						return ret;
+				}
+				if (window.ABCJS.parse.detect(dynamicDecorations, function(acc) {
+						return (ret[1] === acc);
+					})) {
+					if (multilineVars.dynamicPosition === 'hidden' )
+						ret[1] = '';
+						return ret;
+				}
 
-				if (window.ABCJS.parse.detect(accentPsuedonyms, function(acc) {
+				if (window.ABCJS.parse.detect(accentPseudonyms, function(acc) {
 					if (ret[1] === acc[0]) {
 						ret[1] = acc[1];
 						return true;
@@ -201,6 +278,17 @@ window.ABCJS.parse.Parse = function() {
 				}))
 					return ret;
 
+				if (window.ABCJS.parse.detect(accentDynamicPseudonyms, function(acc) {
+					if (ret[1] === acc[0]) {
+						ret[1] = acc[1];
+						return true;
+					} else
+						return false;
+				})) {
+					if (multilineVars.dynamicPosition === 'hidden' )
+						ret[1] = '';
+						return ret;
+				}
 				// We didn't find the accent in the list, so consume the space, but don't return an accent.
 				// Although it is possible that ! was used as a line break, so accept that.
 			if (line.charAt(i) === '!' && (ret[0] === 1 || line.charAt(i+ret[0]-1) !== '!'))
@@ -319,7 +407,7 @@ window.ABCJS.parse.Parse = function() {
 	};
 
 	var addWords = function(line, words) {
-		if (!line) { warn("Can't add words before the first line of mulsic", line, 0); return; }
+		if (!line) { warn("Can't add words before the first line of music", line, 0); return; }
 		words = window.ABCJS.parse.strip(words);
 		if (words.charAt(words.length-1) !== '-')
 			words = words + ' ';	// Just makes it easier to parse below, since every word has a divider after it.
@@ -396,7 +484,7 @@ window.ABCJS.parse.Parse = function() {
 
 	var addSymbols = function(line, words) {
 		// 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 mulsic", line, 0); return; }
+		if (!line) { warn("Can't add symbols before the first line of music", line, 0); return; }
 		words = window.ABCJS.parse.strip(words);
 		if (words.charAt(words.length-1) !== '-')
 			words = words + ' ';	// Just makes it easier to parse below, since every word has a divider after it.
@@ -786,6 +874,8 @@ window.ABCJS.parse.Parse = function() {
 				}
 				var note = getCoreNote(gra[1], ii, {}, false);
 				if (note !== null) {
+					// The grace note durations should not be affected by the default length: they should be based on 1/16, so if that isn't the default, then multiply here.
+					note.duration = note.duration / (multilineVars.default_length * 8);
 					if (acciaccatura)
 						note.acciaccatura = true;
 					gracenotes.push(note);
@@ -1011,9 +1101,13 @@ window.ABCJS.parse.Parse = function() {
 								if (i + 1 < line.length)
 									startNewLine();	// There was a ! in the middle of the line. Start a new line if there is anything after it.
 							} else if (ret[1].length > 0) {
-								if (el.decoration === undefined)
-									el.decoration = [];
-								el.decoration.push(ret[1]);
+								if (ret[1].indexOf("style=") === 0) {
+									el.style = ret[1].substr(6);
+								} else {
+									if (el.decoration === undefined)
+										el.decoration = [];
+									el.decoration.push(ret[1]);
+								}
 							}
 							i += ret[0];
 						} else {
@@ -1035,6 +1129,7 @@ window.ABCJS.parse.Parse = function() {
 						// Attach the grace note to an invisible note
 						el.rest = { type: 'spacer' };
 						el.duration = 0.125; // TODO-PER: I don't think the duration of this matters much, but figure out if it does.
+						multilineVars.addFormattingOptions(el, tune.formatting, 'note');
 						tune.appendElement('note', startOfLine+i, startOfLine+i+ret[0], el);
 						multilineVars.measureNotEmpty = true;
 						el = {};
@@ -1068,6 +1163,7 @@ window.ABCJS.parse.Parse = function() {
 							if (multilineVars.barNumbers && multilineVars.currBarNumber % multilineVars.barNumbers === 0)
 								multilineVars.barNumOnNextNote = multilineVars.currBarNumber;
 						}
+						multilineVars.addFormattingOptions(el, tune.formatting, 'bar');
 						tune.appendElement('bar', startOfLine+i, startOfLine+i+ret[0], bar);
 						multilineVars.measureNotEmpty = false;
 						el = {};
@@ -1221,6 +1317,7 @@ window.ABCJS.parse.Parse = function() {
 										el.barNumber = multilineVars.barNumOnNextNote;
 										multilineVars.barNumOnNextNote = null;
 									}
+									multilineVars.addFormattingOptions(el, tune.formatting, 'note');
 									tune.appendElement('note', startOfLine+i, startOfLine+i, el);
 									multilineVars.measureNotEmpty = true;
 									el = {};
@@ -1293,6 +1390,7 @@ window.ABCJS.parse.Parse = function() {
 								el.barNumber = multilineVars.barNumOnNextNote;
 								multilineVars.barNumOnNextNote = null;
 							}
+							multilineVars.addFormattingOptions(el, tune.formatting, 'note');
 							tune.appendElement('note', startOfLine+startI, startOfLine+i, el);
 							multilineVars.measureNotEmpty = true;
 							el = {};
@@ -1329,8 +1427,10 @@ window.ABCJS.parse.Parse = function() {
 		// switches.header_only : stop parsing when the header is finished
 		// switches.stop_on_warning : stop at the first warning encountered.
 		// switches.print: format for the page instead of the browser.
+		// switches.format: a hash of the desired formatting commands.
+		if (!switches) switches = {};
 		tune.reset();
-		if (switches && switches.print)
+		if (switches.print)
 			tune.media = 'print';
 		multilineVars.reset();
 		header.reset(tokenizer, warn, multilineVars, tune);
@@ -1350,13 +1450,14 @@ window.ABCJS.parse.Parse = function() {
 		if (window.ABCJS.parse.last(lines).length === 0)	// remove the blank line we added above.
 			lines.pop();
 		try {
+			if (switches.format) {
+				window.ABCJS.parse.parseDirective.globalFormatting(switches.format);
+			}
 			window.ABCJS.parse.each(lines,  function(line) {
-				if (switches) {
-					if (switches.header_only && multilineVars.is_in_header === false)
-						throw "normal_abort";
-					if (switches.stop_on_warning && multilineVars.warnings)
-						throw "normal_abort";
-				}
+				if (switches.header_only && multilineVars.is_in_header === false)
+					throw "normal_abort";
+				if (switches.stop_on_warning && multilineVars.warnings)
+					throw "normal_abort";
 				if (multilineVars.is_in_history) {
 					if (line.charAt(1) === ':') {
 						multilineVars.is_in_history = false;
@@ -1398,7 +1499,7 @@ window.ABCJS.parse.Parse = function() {
 				ph = pl;
 				pl = x;
 			}
-			tune.cleanUp(pl, ph, multilineVars.barsperstaff, multilineVars.staffnonote);
+			multilineVars.openSlurs = tune.cleanUp(pl, ph, multilineVars.barsperstaff, multilineVars.staffnonote, multilineVars.openSlurs);
 		} catch (err) {
 			if (err !== "normal_abort")
 				throw err;

data/app/assets/javascripts/abcjs/parse/abc_parse_directive.js

@@ -9,6 +9,7 @@ if (!window.ABCJS.parse)
 window.ABCJS.parse.parseDirective = {};
 
 (function() {
+	"use strict";
 	var tokenizer;
 	var warn;
 	var multilineVars;
@@ -18,6 +19,377 @@ window.ABCJS.parse.parseDirective = {};
 		warn = warn_;
 		multilineVars = multilineVars_;
 		tune = tune_;
+		initializeFonts();
+	};
+
+	function initializeFonts() {
+		multilineVars.annotationfont  = { face: "Helvetica", size: 12, weight: "normal", style: "normal", decoration: "none" };
+		multilineVars.gchordfont  = { face: "Helvetica", size: 12, weight: "normal", style: "normal", decoration: "none" };
+		multilineVars.historyfont  = { face: "\"Times New Roman\"", size: 16, weight: "normal", style: "normal", decoration: "none" };
+		multilineVars.infofont  = { face: "\"Times New Roman\"", size: 14, weight: "normal", style: "italic", decoration: "none" };
+		multilineVars.measurefont  = { face: "\"Times New Roman\"", size: 14, weight: "normal", style: "italic", decoration: "none" };
+		multilineVars.partsfont  = { face: "\"Times New Roman\"", size: 15, weight: "normal", style: "normal", decoration: "none" };
+		multilineVars.repeatfont  = { face: "\"Times New Roman\"", size: 13, weight: "normal", style: "normal", decoration: "none" };
+		multilineVars.textfont  = { face: "\"Times New Roman\"", size: 16, weight: "normal", style: "normal", decoration: "none" };
+		multilineVars.vocalfont  = { face: "\"Times New Roman\"", size: 13, weight: "bold", style: "normal", decoration: "none" };
+		multilineVars.wordsfont  = { face: "\"Times New Roman\"", size: 16, weight: "normal", style: "normal", decoration: "none" };
+
+<<<<<<< HEAD
+		// These fonts are global for the entire tune.
+=======
+>>>>>>> origin/master
+		tune.formatting.composerfont  = { face: "\"Times New Roman\"", size: 14, weight: "normal", style: "italic", decoration: "none" };
+		tune.formatting.subtitlefont  = { face: "\"Times New Roman\"", size: 16, weight: "normal", style: "normal", decoration: "none" };
+		tune.formatting.tempofont  = { face: "\"Times New Roman\"", size: 15, weight: "bold", style: "normal", decoration: "none" };
+		tune.formatting.titlefont  = { face: "\"Times New Roman\"", size: 20, weight: "normal", style: "normal", decoration: "none" };
+		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" };
+<<<<<<< HEAD
+
+		// 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;
+		tune.formatting.gchordfont  = multilineVars.gchordfont;
+		tune.formatting.historyfont  = multilineVars.historyfont;
+		tune.formatting.infofont  = multilineVars.infofont;
+		tune.formatting.measurefont  = multilineVars.measurefont;
+		tune.formatting.partsfont  = multilineVars.partsfont;
+		tune.formatting.repeatfont  = multilineVars.repeatfont;
+		tune.formatting.textfont  = multilineVars.textfont;
+		tune.formatting.vocalfont  = multilineVars.vocalfont;
+		tune.formatting.wordsfont  = multilineVars.wordsfont;
+=======
+>>>>>>> origin/master
+	}
+
+	var fontTypeCanHaveBox = { gchordfont: true, measurefont: true, partsfont: true };
+
+	var fontTranslation = function(fontFace) {
+		// This translates Postscript fonts for a web alternative.
+		// Note that the postscript fonts contain italic and bold info in them, so what is returned is a hash.
+
+		switch (fontFace) {
+			case "Arial-Italic":
+				return { face: "Arial", weight: "normal", style: "italic", decoration: "none" };
+			case "Arial-Bold":
+				return { face: "Arial", weight: "bold", style: "normal", decoration: "none" };
+			case "Bookman-Demi":
+				return { face: "Bookman,serif", weight: "bold", style: "normal", decoration: "none" };
+			case "Bookman-DemiItalic":
+				return { face: "Bookman,serif", weight: "bold", style: "italic", decoration: "none" };
+			case "Bookman-Light":
+				return { face: "Bookman,serif", weight: "normal", style: "normal", decoration: "none" };
+			case "Bookman-LightItalic":
+				return { face: "Bookman,serif", weight: "normal", style: "italic", decoration: "none" };
+			case "Courier":
+				return { face: "\"Courier New\"", weight: "normal", style: "normal", decoration: "none" };
+			case "Courier-Oblique":
+				return { face: "\"Courier New\"", weight: "normal", style: "italic", decoration: "none" };
+			case "Courier-Bold":
+				return { face: "\"Courier New\"", weight: "bold", style: "normal", decoration: "none" };
+			case "Courier-BoldOblique":
+				return { face: "\"Courier New\"", weight: "bold", style: "italic", decoration: "none" };
+			case "AvantGarde-Book":
+				return { face: "AvantGarde,Arial", weight: "normal", style: "normal", decoration: "none" };
+			case "AvantGarde-BookOblique":
+				return { face: "AvantGarde,Arial", weight: "normal", style: "italic", decoration: "none" };
+			case "AvantGarde-Demi":
+			case "Avant-Garde-Demi":
+				return { face: "AvantGarde,Arial", weight: "bold", style: "normal", decoration: "none" };
+			case "AvantGarde-DemiOblique":
+				return { face: "AvantGarde,Arial", weight: "bold", style: "italic", decoration: "none" };
+			case "Helvetica-Oblique":
+				return { face: "Helvetica", weight: "normal", style: "italic", decoration: "none" };
+			case "Helvetica-Bold":
+				return { face: "Helvetica", weight: "bold", style: "normal", decoration: "none" };
+			case "Helvetica-BoldOblique":
+				return { face: "Helvetica", weight: "bold", style: "italic", decoration: "none" };
+			case "Helvetica-Narrow":
+				return { face: "\"Helvetica Narrow\",Helvetica", weight: "normal", style: "normal", decoration: "none" };
+			case "Helvetica-Narrow-Oblique":
+				return { face: "\"Helvetica Narrow\",Helvetica", weight: "normal", style: "italic", decoration: "none" };
+			case "Helvetica-Narrow-Bold":
+				return { face: "\"Helvetica Narrow\",Helvetica", weight: "bold", style: "normal", decoration: "none" };
+			case "Helvetica-Narrow-BoldOblique":
+				return { face: "\"Helvetica Narrow\",Helvetica", weight: "bold", style: "italic", decoration: "none" };
+			case "Palatino-Roman":
+				return { face: "Palatino", weight: "normal", style: "normal", decoration: "none" };
+			case "Palatino-Italic":
+				return { face: "Palatino", weight: "normal", style: "italic", decoration: "none" };
+			case "Palatino-Bold":
+				return { face: "Palatino", weight: "bold", style: "normal", decoration: "none" };
+			case "Palatino-BoldItalic":
+				return { face: "Palatino", weight: "bold", style: "italic", decoration: "none" };
+			case "NewCenturySchlbk-Roman":
+				return { face: "\"New Century\",serif", weight: "normal", style: "normal", decoration: "none" };
+			case "NewCenturySchlbk-Italic":
+				return { face: "\"New Century\",serif", weight: "normal", style: "italic", decoration: "none" };
+			case "NewCenturySchlbk-Bold":
+				return { face: "\"New Century\",serif", weight: "bold", style: "normal", decoration: "none" };
+			case "NewCenturySchlbk-BoldItalic":
+				return { face: "\"New Century\",serif", weight: "bold", style: "italic", decoration: "none" };
+			case "Times":
+			case "Times-Roman":
+			case "Times-Narrow":
+			case "Times-Courier":
+			case "Times-New-Roman":
+				return { face: "\"Times New Roman\"", weight: "normal", style: "normal", decoration: "none" };
+			case "Times-Italic":
+			case "Times-Italics":
+				return { face: "\"Times New Roman\"", weight: "normal", style: "italic", decoration: "none" };
+			case "Times-Bold":
+				return { face: "\"Times New Roman\"", weight: "bold", style: "normal", decoration: "none" };
+			case "Times-BoldItalic":
+				return { face: "\"Times New Roman\"", weight: "bold", style: "italic", decoration: "none" };
+			case "ZapfChancery-MediumItalic":
+				return { face: "\"Zapf Chancery\",cursive,serif", weight: "normal", style: "normal", decoration: "none" };
+			default:
+				return null;
+		}
+	};
+
+	var getFontParameter = function(tokens, currentSetting, str, position, cmd) {
+		// Every font parameter has the following format:
+		// <face> <utf8> <size> <modifiers> <box>
+		// Where:
+		// face: either a standard web font name, or a postscript font, enumerated in fontTranslation. This could also be an * or be missing if the face shouldn't change.
+		// utf8: This is optional, and specifies utf8. That's all that is supported so the field is just silently ignored.
+		// size: The size, in pixels. This may be omitted if the size is not changing.
+		// modifiers: zero or more of "bold", "italic", "underline"
+		// box: Only applies to the measure numbers, gchords, and the parts. If present, then a box is drawn around the characters.
+		// If face is present, then all the modifiers are cleared. If face is absent, then the modifiers are illegal.
+		// The face can be a single word, a set of words separated by hyphens, or a quoted string.
+		//
+		// So, in practicality, there are three types of font definitions: a number only, an asterisk and a number only, or the full definition (with an optional size).
+		function processNumberOnly() {
+			var size = parseInt(tokens[0].token);
+			tokens.shift();
+			if (!currentSetting) {
+				warn("Can't set just the size of the font since there is no default value.", str, position);
+				return { face: "\"Times New Roman\"", weight: "normal", style: "normal", decoration: "none", size: size};
+			}
+			if (tokens.length === 0) {
+				return { face: currentSetting.face, weight: currentSetting.weight, style: currentSetting.style, decoration: currentSetting.decoration, size: size};
+			}
+			if (tokens.length === 1 && tokens[0].token === "box" && fontTypeCanHaveBox[cmd])
+				return { face: currentSetting.face, weight: currentSetting.weight, style: currentSetting.style, decoration: currentSetting.decoration, size: size, box: true};
+			warn("Extra parameters in font definition.", str, position);
+			return { face: currentSetting.face, weight: currentSetting.weight, style: currentSetting.style, decoration: currentSetting.decoration, size: size};
+		}
+
+		// format 1: asterisk and number only
+		if (tokens[0].token === '*') {
+			tokens.shift();
+			if (tokens[0].type === 'number')
+				return processNumberOnly();
+			else {
+				warn("Expected font size number after *.", str, position);
+			}
+		}
+
+		// format 2: number only
+		if (tokens[0].type === 'number') {
+			return processNumberOnly();
+		}
+
+		// format 3: whole definition
+		var face = [];
+		var size;
+		var weight = "normal";
+		var style = "normal";
+		var decoration = "none";
+		var box = false;
+		var state = 'face';
+		var hyphenLast = false;
+		while (tokens.length) {
+			var currToken = tokens.shift();
+			var word = currToken.token.toLowerCase();
+			switch (state) {
+				case 'face':
+					if (hyphenLast || (word !== 'utf' && currToken.type !== 'number' && word !== "bold" && word !== "italic" && word !== "underline" && word !== "box")) {
+						if (face.length > 0 && currToken.token === '-') {
+							hyphenLast = true;
+							face[face.length-1] = face[face.length-1] + currToken.token;
+						}
+						else {
+							if (hyphenLast) {
+								hyphenLast = false;
+								face[face.length-1] = face[face.length-1] + currToken.token;
+							} else
+								face.push(currToken.token);
+						}
+					} else {
+						if (currToken.type === 'number') {
+							if (size) {
+								warn("Font size specified twice in font definition.", str, position);
+							} else {
+								size = currToken.token;
+							}
+							state = 'modifier';
+						} else if (word === "bold")
+							weight = "bold";
+						else if (word === "italic")
+							style = "italic";
+						else if (word === "underline")
+							decoration = "underline";
+						else if (word === "box") {
+							if (fontTypeCanHaveBox[cmd])
+								box = true;
+							else
+								warn("This font style doesn't support \"box\"", str, position);
+							state = "finished";
+						} else if (word === "utf") {
+							currToken = tokens.shift(); // this gets rid of the "8" after "utf"
+							state = "size";
+						} else
+							warn("Unknown parameter " + currToken.token + " in font definition.", str, position);
+					}
+					break;
+				case "size":
+					if (currToken.type === 'number') {
+						if (size) {
+							warn("Font size specified twice in font definition.", str, position);
+						} else {
+							size = currToken.token;
+						}
+					} else {
+						warn("Expected font size in font definition.", str, position);
+					}
+					state = 'modifier';
+					break;
+				case "modifier":
+					if (word === "bold")
+						weight = "bold";
+					else if (word === "italic")
+						style = "italic";
+					else if (word === "underline")
+						decoration = "underline";
+					else if (word === "box") {
+						if (fontTypeCanHaveBox[cmd])
+							box = true;
+						else
+							warn("This font style doesn't support \"box\"", str, position);
+						state = "finished";
+					} else
+						warn("Unknown parameter " + currToken.token + " in font definition.", str, position);
+					break;
+				case "finished":
+					warn("Extra characters found after \"box\" in font definition.", str, position);
+					break;
+			}
+		}
+
+		if (size === undefined) {
+			if (!currentSetting) {
+				warn("Must specify the size of the font since there is no default value.", str, position);
+				size = 12;
+<<<<<<< HEAD
+			} else
+				size = currentSetting.size;
+=======
+			}
+			size = currentSetting.size;
+>>>>>>> origin/master
+		} else
+			size = parseFloat(size);
+
+		face = face.join(' ');
+		var psFont = fontTranslation(face);
+		var font = {};
+		if (psFont) {
+			font.face = psFont.face;
+			font.weight = psFont.weight;
+			font.style = psFont.style;
+			font.decoration = psFont.decoration;
+			font.size = size;
+			if (box)
+				font.box = true;
+			return font;
+		}
+		font.face = face;
+		font.weight = weight;
+		font.style = style;
+		font.decoration = decoration;
+		font.size = size;
+		if (box)
+			font.box = true;
+		return font;
+	};
+
+	var getChangingFont = function(cmd, tokens, str) {
+		if (tokens.length === 0)
+			return "Directive \"" + cmd + "\" requires a font as a parameter.";
+		multilineVars[cmd] = getFontParameter(tokens, multilineVars[cmd], str, 0, cmd);
+		return null;
+	};
+	var getGlobalFont = function(cmd, tokens, str) {
+		if (tokens.length === 0)
+			return "Directive \"" + cmd + "\" requires a font as a parameter.";
+		tune.formatting[cmd] = getFontParameter(tokens, tune.formatting[cmd], str, 0, cmd);
+		return null;
+	};
+
+	var setScale = function(cmd, tokens) {
+		var scratch = "";
+		window.ABCJS.parse.each(tokens, function(tok) {
+			scratch += tok.token;
+		});
+		var num = parseFloat(scratch);
+		if (isNaN(num) || num === 0)
+			return "Directive \"" + cmd + "\" requires a number as a parameter.";
+		tune.formatting.scale = num;
+
+	};
+
+	var getRequiredMeasurement = function(cmd, tokens) {
+		var points = tokenizer.getMeasurement(tokens);
+		if (points.used === 0 || tokens.length !== 0)
+			return { error: "Directive \"" + cmd + "\" requires a measurement as a parameter."};
+		return points.value;
+	};
+	var oneParameterMeasurement = function(cmd, tokens) {
+		var points = tokenizer.getMeasurement(tokens);
+		if (points.used === 0 || tokens.length !== 0)
+			return "Directive \"" + cmd + "\" requires a measurement as a parameter.";
+		tune.formatting[cmd] = points.value;
+		return null;
+	};
+
+	var addMultilineVar = function(key, cmd, tokens, min, max) {
+		if (tokens.length !== 1 || tokens[0].type !== 'number')
+			return "Directive \"" + cmd + "\" requires a number as a parameter.";
+		var i = tokens[0].intt;
+		if (min !== undefined && i < min)
+			return "Directive \"" + cmd + "\" requires a number greater than or equal to " + min + " as a parameter.";
+		if (max !== undefined && i > max)
+			return "Directive \"" + cmd + "\" requires a number less than or equal to " + max + " as a parameter.";
+		multilineVars[key] = i;
+		return null;
+	};
+
+	var addMultilineVarBool = function(key, cmd, tokens) {
+		var str = addMultilineVar(key, cmd, tokens, 0, 1);
+		if (str !== null) return str;
+		multilineVars[key] = (multilineVars[key] === 1);
+		return null;
+<<<<<<< HEAD
+	};
+
+	var addMultilineVarOneParamChoice = function(key, cmd, tokens, choices) {
+		if (tokens.length !== 1)
+			return "Directive \"" + cmd + "\" requires one of [ " + choices.join(", ") + " ] as a parameter.";
+		var choice = tokens[0].token;
+		var found = false;
+		for (var i = 0; !found && i < choices.length; i++) {
+			if (choices[i] === choice)
+				found = true;
+		}
+		if (!found)
+			return "Directive \"" + cmd + "\" requires one of [ " + choices.join(", ") + " ] as a parameter.";
+		multilineVars[key] = choice;
+		return null;
+=======
+>>>>>>> origin/master
 	};
 
 	window.ABCJS.parse.parseDirective.parseFontChangeLine = function(textstr) {
@@ -44,77 +416,13 @@ window.ABCJS.parse.parseDirective = {};
 		return textstr;
 	};
 
+	var positionChoices = [ 'auto', 'above', 'below', 'hidden' ];
 	window.ABCJS.parse.parseDirective.addDirective = function(str) {
-		var getRequiredMeasurement = function(cmd, tokens) {
-			var points = tokenizer.getMeasurement(tokens);
-			if (points.used === 0 || tokens.length !== 0)
-				return { error: "Directive \"" + cmd + "\" requires a measurement as a parameter."};
-			return points.value;
-		};
-		var oneParameterMeasurement = function(cmd, tokens) {
-			var points = tokenizer.getMeasurement(tokens);
-			if (points.used === 0 || tokens.length !== 0)
-				return "Directive \"" + cmd + "\" requires a measurement as a parameter.";
-			tune.formatting[cmd] = points.value;
-			return null;
-		};
-		var getFontParameter = function(tokens) {
-			var font = {};
-			var token = window.ABCJS.parse.last(tokens);
-			if (token.type === 'number') {
-				font.size = parseInt(token.token);
-				tokens.pop();
-			}
-			if (tokens.length > 0) {
-				var scratch = "";
-				window.ABCJS.parse.each(tokens, function(tok) {
-					if (tok.token !== '-') {
-						if (scratch.length > 0) scratch += ' ';
-						scratch += tok.token;
-					}
-				});
-				font.font = scratch;
-			}
-			return font;
-		};
-		var getChangingFont = function(cmd, tokens) {
-			if (tokens.length === 0)
-				return "Directive \"" + cmd + "\" requires a font as a parameter.";
-			multilineVars[cmd] = getFontParameter(tokens);
-			return null;
-		};
-		var getGlobalFont = function(cmd, tokens) {
-			if (tokens.length === 0)
-				return "Directive \"" + cmd + "\" requires a font as a parameter.";
-			tune.formatting[cmd] = getFontParameter(tokens);
-			return null;
-		};
-
-		var addMultilineVar = function(key, cmd, tokens, min, max) {
-			if (tokens.length !== 1 || tokens[0].type !== 'number')
-				return "Directive \"" + cmd + "\" requires a number as a parameter.";
-			var i = tokens[0].intt;
-			if (min !== undefined && i < min)
-				return "Directive \"" + cmd + "\" requires a number greater than or equal to " + min + " as a parameter.";
-			if (max !== undefined && i > max)
-				return "Directive \"" + cmd + "\" requires a number less than or equal to " + max + " as a parameter.";
-			multilineVars[key] = i;
-			return null;
-		};
-
-		var addMultilineVarBool = function(key, cmd, tokens) {
-			var str = addMultilineVar(key, cmd, tokens, 0, 1);
-			if (str !== null) return str;
-			multilineVars[key] = (multilineVars[key] === 1);
-			return null;
-		};
-
 		var tokens = tokenizer.tokenize(str, 0, str.length);	// 3 or more % in a row, or just spaces after %% is just a comment
 		if (tokens.length === 0 || tokens[0].type !== 'alpha') return null;
 		var restOfString = str.substring(str.indexOf(tokens[0].token)+tokens[0].token.length);
 		restOfString = tokenizer.stripComment(restOfString);
 		var cmd = tokens.shift().token.toLowerCase();
-		var num;
 		var scratch = "";
 		switch (cmd)
 		{
@@ -122,47 +430,35 @@ window.ABCJS.parse.parseDirective = {};
 			// Most of them are direct translations from the directives that will be parsed in. See abcm2ps's format.txt for info on each of these.
 			//					alignbars: { type: "number", optional: true },
 			//					aligncomposer: { type: "string", Enum: [ 'left', 'center','right' ], optional: true },
-			//					annotationfont: fontType,
 			//					bstemdown: { type: "boolean", optional: true },
 			//					continueall: { type: "boolean", optional: true },
 			//					dynalign: { type: "boolean", optional: true },
 			//					exprabove: { type: "boolean", optional: true },
 			//					exprbelow: { type: "boolean", optional: true },
 			//					flatbeams: { type: "boolean", optional: true },
-			//					footer: { type: "string", optional: true },
-			//					footerfont: fontType,
 			//					gchordbox: { type: "boolean", optional: true },
 			//					graceslurs: { type: "boolean", optional: true },
 			//					gracespacebefore: { type: "number", optional: true },
 			//					gracespaceinside: { type: "number", optional: true },
 			//					gracespaceafter: { type: "number", optional: true },
-			//					header: { type: "string", optional: true },
-			//					headerfont: fontType,
-			//					historyfont: fontType,
-			//					infofont: fontType,
 			//					infospace: { type: "number", optional: true },
 			//					lineskipfac: { type: "number", optional: true },
 			//					maxshrink: { type: "number", optional: true },
 			//					maxstaffsep: { type: "number", optional: true },
 			//					maxsysstaffsep: { type: "number", optional: true },
-			//					measurebox: { type: "boolean", optional: true },
-			//					measurefont: fontType,
 			//					notespacingfactor: { type: "number", optional: true },
 			//					parskipfac: { type: "number", optional: true },
-			//					partsbox: { type: "boolean", optional: true },
-			//					repeatfont: fontType,
-			//					rightmargin: { type: "number", optional: true },
 			//					slurheight: { type: "number", optional: true },
 			//					splittune: { type: "boolean", optional: true },
 			//					squarebreve: { type: "boolean", optional: true },
 			//					stemheight: { type: "number", optional: true },
 			//					straightflags: { type: "boolean", optional: true },
 			//					stretchstaff: { type: "boolean", optional: true },
-			//					textfont: fontType,
 			//					titleformat: { type: "string", optional: true },
+<<<<<<< HEAD
+=======
 			//					vocalabove: { type: "boolean", optional: true },
-			//					vocalfont: fontType,
-			//					wordsfont: fontType,
+>>>>>>> origin/master
 			case "bagpipes":tune.formatting.bagpipes = true;break;
 			case "landscape":multilineVars.landscape = true;break;
 			case "papersize":multilineVars.papersize = restOfString;break;
@@ -172,6 +468,12 @@ window.ABCJS.parse.parseDirective = {};
 			case "titleleft":tune.formatting.titleleft = true;break;
 			case "measurebox":tune.formatting.measurebox = true;break;
 
+			case "vocal": return addMultilineVarOneParamChoice("vocalPosition", cmd, tokens, positionChoices);
+			case "dynamic": return addMultilineVarOneParamChoice("dynamicPosition", cmd, tokens, positionChoices);
+			case "gchord": return addMultilineVarOneParamChoice("chordPosition", cmd, tokens, positionChoices);
+			case "ornament": return addMultilineVarOneParamChoice("ornamentPosition", cmd, tokens, positionChoices);
+			case "volume": return addMultilineVarOneParamChoice("volumePosition", cmd, tokens, positionChoices);
+
 			case "botmargin":
 			case "botspace":
 			case "composerspace":
@@ -202,14 +504,7 @@ window.ABCJS.parse.parseDirective = {};
 				tune.addSpacing(vskip);
 				return null;
 			case "scale":
-				scratch = "";
-				window.ABCJS.parse.each(tokens, function(tok) {
-					scratch += tok.token;
-				});
-				num = parseFloat(scratch);
-				if (isNaN(num) || num === 0)
-					return "Directive \"" + cmd + "\" requires a number as a parameter.";
-				tune.formatting.scale = num;
+				setScale(cmd, tokens);
 				break;
 			case "sep":
 				if (tokens.length === 0)
@@ -244,6 +539,10 @@ window.ABCJS.parse.parseDirective = {};
 				scratch = addMultilineVarBool('printTempo', cmd, tokens);
 				if (scratch !== null) return scratch;
 				break;
+			case "partsbox":
+				scratch = addMultilineVarBool('partsBox', cmd, tokens);
+				if (scratch !== null) return scratch;
+				break;
 			case "measurenb":
 			case "barnumbers":
 				scratch = addMultilineVar('barNumbers', cmd, tokens);
@@ -277,43 +576,54 @@ window.ABCJS.parse.parseDirective = {};
 				break;
 			case "setfont":
 				var sfTokens = tokenizer.tokenize(restOfString, 0, restOfString.length);
-				var sfDone = false;
+//				var sfDone = false;
 				if (sfTokens.length >= 4) {
 					if (sfTokens[0].token === '-' && sfTokens[1].type === 'number') {
 						var sfNum = parseInt(sfTokens[1].token);
 						if (sfNum >= 1 && sfNum <= 4) {
 							if (!multilineVars.setfont)
 								multilineVars.setfont = [];
-							var sfSize = sfTokens.pop();
-							if (sfSize.type === 'number') {
-								sfSize = parseInt(sfSize.token);
-								var sfFontName = '';
-								for (var sfi = 2; sfi < sfTokens.length; sfi++)
-									sfFontName += sfTokens[sfi].token;
-								multilineVars.setfont[sfNum] = { font: sfFontName, size: sfSize };
-								sfDone = true;
-							}
+							sfTokens.shift();
+							sfTokens.shift();
+							multilineVars.setfont[sfNum] = getFontParameter(sfTokens, multilineVars.setfont[sfNum], str, 0, 'setfont');
+//							var sfSize = sfTokens.pop();
+//							if (sfSize.type === 'number') {
+//								sfSize = parseInt(sfSize.token);
+//								var sfFontName = '';
+//								for (var sfi = 2; sfi < sfTokens.length; sfi++)
+//									sfFontName += sfTokens[sfi].token;
+//								multilineVars.setfont[sfNum] = { face: sfFontName, size: sfSize };
+//								sfDone = true;
+//							}
 						}
 					}
 				}
-				if (!sfDone)
-					return "Bad parameters: " + cmd;
+//				if (!sfDone)
+//					return "Bad parameters: " + cmd;
 				break;
 			case "gchordfont":
 			case "partsfont":
 			case "vocalfont":
 			case "textfont":
-				return getChangingFont(cmd, tokens);
-			case "barlabelfont":
-			case "barnumberfont":
+			case "annotationfont":
+			case "historyfont":
+			case "infofont":
+			case "measurefont":
+			case "repeatfont":
+			case "wordsfont":
+				return getChangingFont(cmd, tokens, str);
 			case "composerfont":
 			case "subtitlefont":
 			case "tempofont":
 			case "titlefont":
 			case "voicefont":
-				return getGlobalFont(cmd, tokens);
+			case "footerfont":
+			case "headerfont":
+				return getGlobalFont(cmd, tokens, str);
+			case "barlabelfont":
+			case "barnumberfont":
 			case "barnumfont":
-				return getGlobalFont("barnumberfont", tokens);
+				return getChangingFont("measurefont", tokens, str);
 			case "staves":
 			case "score":
 				multilineVars.score_is_present = true;
@@ -411,19 +721,27 @@ window.ABCJS.parse.parseDirective = {};
 				tune.addNewPage(pgNum.digits === 0 ? -1 : pgNum.value);
 				break;
 
-			case "abc-copyright":
-			case "abc-creator":
-			case "abc-version":
-			case "abc-charset":
-			case "abc-edited-by":
-				tune.addMetaText(cmd, restOfString);
+			case "abc":
+				var arr = restOfString.split(' ');
+				switch (arr[0]) {
+					case "-copyright":
+					case "-creator":
+					case "-edited-by":
+					case "-version":
+					case "-charset":
+						var subCmd = arr.shift();
+						tune.addMetaText(cmd+subCmd, arr.join(' '));
+						break;
+					default:
+						return "Unknown directive: " + cmd+arr[0];
+				}
 				break;
 			case "header":
 			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) === '"' )
-					footerStr = footerStr.substring(1, footerStr.length-2);
+					footerStr = footerStr.substring(1, footerStr.length-1);
 				var footerArr = footerStr.split('\t');
 				var footer = {};
 				if (footerArr.length === 1)
@@ -432,8 +750,8 @@ window.ABCJS.parse.parseDirective = {};
 					footer = { left: footerArr[0], center: footerArr[1], right: "" };
 				else
 					footer = { left: footerArr[0], center: footerArr[1], right: footerArr[2] };
-				 if (footerArr.length > 3)
-					 warn("Too many tabs in "+cmd+": "+footerArr.length+" found.", restOfString, 0);
+				if (footerArr.length > 3)
+					warn("Too many tabs in " + cmd + ": " + footerArr.length + " found.", restOfString, 0);
 
 				tune.addMetaTextObj(cmd, footer);
 				break;
@@ -542,5 +860,28 @@ window.ABCJS.parse.parseDirective = {};
 		}
 		return null;
 	};
-
+	window.ABCJS.parse.parseDirective.globalFormatting = function(formatHash) {
+		for (var cmd in formatHash) {
+			if (formatHash.hasOwnProperty(cmd)) {
+				var value = ''+formatHash[cmd];
+				var tokens = tokenizer.tokenize(value, 0, value.length);
+				var scratch;
+				switch (cmd) {
+					case "titlefont":
+					case "gchordfont":
+						getChangingFont(cmd, tokens, value);
+						break;
+					case "scale":
+						setScale(cmd, tokens);
+						break;
+					case "partsbox":
+						scratch = addMultilineVarBool('partsBox', cmd, tokens);
+						if (scratch !== null) warn(scratch);
+						break;
+					default:
+						warn("Formatting directive unrecognized: ", cmd, 0);
+				}
+			}
+		}
+	};
 })();